302 files changed, 0 insertions, 249495 deletions

diff --git a/bfd/COPYING b/bfd/COPYING
deleted file mode 100644
index 60549be514a..00000000000
--- a/bfd/COPYING
+++ /dev/null
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) 19yy name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
deleted file mode 100644
index 66a5b243f36..00000000000
--- a/bfd/ChangeLog
+++ /dev/null
@@ -1,3066 +0,0 @@
-1999-04-29  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-mcore.c (coff_mcore_relocate_section): Fix typos.
-
-Fri Apr 28 16:36:19 1999  Stan Cox  <scox@cygnus.com>
-
-	* elf32-sh.c (sh_elf_relocate_section): Include relocation addend
-	in relocation calculation.
-
-1999-04-26  Tom Tromey  <tromey@cygnus.com>
-
-	* aclocal.m4, configure: Updated for new version of libtool.
-
-1999-04-21  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-mcore.c: Add support for mcore relocs.
-
-1999-04-20  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_print_private_bfd_data): Scrap the
-	incorrect use EF_MIPS_xxBITPTRS.
-
-1999-04-18  Ian Lance Taylor  <ian@zembu.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_section): Remove unused local
-	variable insn.
-
-	* bfd-in2.h: Rebuild.
-	* libbfd.h: Rebuild.
-
-Sat Apr 17 20:55:15 1999  Catherine Moore  <clm@cygnus.com>
- 
-	* coff-arm.c (coff_arm_rtype_to_howto): Remove ARM26D transform.
-	(coff_arm_relocate_section):  Add ARM26D transform.  Only
-	change to ARM26D for relocateable links.
-
-1999-04-16  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_print_private_bfd_data): New.
-	(bfd_elf32_bfd_print_private_bfd_data): New.
-
-1999-04-15  Doug Evans  <devans@casey.cygnus.com>
-
-	* elf32-arm.h (elf32_arm_final_link_relocate):  For R_ARM_THM_ABS5,
-	refetch addend if USE_REL, add many comments regarding current state.
-	For R_ARM_THM_PC22, refetch addend if USE_REL, simplify.
-	* elfarm-nabi.c (elf32_arm_howto_table): For R_ARM_THM_ABS5, fix
-	size and rightshift.  For R_ARM_THM_PC22, fix bitsize.
-	* elfarm-oabi.c (elf32_arm_howto_table): Ditto.
-
-Wed Apr 14 14:33:08 1999  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_read_ecoff_info): Zero `debug'.
-	* elf64-alpha.c (elf64_alpha_read_ecoff_info): Likewise.
-
-1999-04-13  David Mosberger  <davidm@hpl.hp.com>
-
-	* dwarf2.c (decode_line_info): Don't truncate address to least
-	significant 32 bits (breaks 64 bit targets).
-	(lookup_address_in_function_table): Ditto.
-	(comp_unit_contains_address): Ditto.
-
-Tue Apr 13 21:27:19 1999  Catherine Moore  <clm@cygnus.com>
-
-	* coff-arm.c (arm_emit_base_file_entry): New routine.
-	(A2T3_OFFSET): Define.
-	(T2A3_OFFSET): Define.
-	(coff_arm_relocate_section):  Emit base file entries for interworking
-	stubs.
-
-1999-04-13  Philip Blundell  <philb@gnu.org>
-
-	* elfarm-nabi.c (elf32_arm_howto_table): Add dummy entries for
-	relocs 17 through 19.
-
-Sun Apr 11 01:25:17 1999  Richard Henderson  <rth@cygnus.com>
-
-	* elfcode.h: Remove fnmatch.h.
-	* elflink.h (elf_link_assign_sym_version): Call back to ld
-	instead of calling fnmatch.
-
-	* config.bfd (i?86-*-beoself): Include pe vecs.
-
-Sun Apr 11 01:14:06 1999  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-i386.c (elf_i386_finish_dynamic_sections): Allow .plt
-	to go missing.
-
-1999-04-10  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-i386.c (elf_i386_relocate_section): Mind no_undefined
-	when trying to resolve dynamic symbol references.
-	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
-	* elf32-mips.c (mips_elf_relocate_section): Likewise.
-	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
-	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
-	* elflink.h (elf_link_output_extsym): Likewise.
-
-Sat Apr 10 15:12:09 1999  Richard Henderson  <rth@cygnus.com>
-
-	* section.c (_bfd_strip_section_from_output): New function moved from
-	* elf64-alpha.c (elf64_alpha_strip_section_from_output): ... here.
-	* elf32-i386.c (elf_i386_size_dynamic_sections): Use it.
-	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
-	* elf32-mips.c (mips_elf_size_dynamic_sections): Likewise.
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise.
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
-	* elf64-sparc.c (sparc64_elf_size_dynamic_sections): Likewise.
-	* bfd-in2.h: Update.
-
-1999-04-09  Ian Lance Taylor  <ian@zembu.com>
-
-	* elf64-sparc.c: Fix incorrect calls to bfd_check_overflow.
-
-1999-04-08  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-mcore.c: New File: Support for mcore-pe targets.
-	* cpu-mcore.c: New File: Support for mcore targets.
-	* elf32-mcore.c: New File: Support for mcore-elf target.
-	* pe-mcore.c: New File: Definitions for mcore-pe target.
-	* pei-mcore.c: New File: Definitions for mcore-pei target.
-	* Makefile.am: Add support for MCore targets.
-	* Makefile.in: Regenerate.
-	* config.bfd: Add support for MCore targets.
-	* configure.in: Add support for MCore targets.
-	* configure: Regenerate.
-	* archures.c: Add support for MCore architecture.
-	* bfd-in2.h: Regenerate. 
-	* coffcode.h: Add support for mcore-pe targets.
-	* elf.c: Add support for mcore-elf target.
-	* reloc.c: Add support for MCore relocs.
-	* targets.c: Add support for MCore targets.
-
-1999-04-07  Nick Clifton  <nickc@cygnus.com>
-
-	* elfarm-nabi.c (elf32_arm_howto_table): Add entries for
-	R_ARM_XPC25 and R_ARM_THM_XPC22.
-	(elf32_arm_reloc_map): Remove redundant entries.
-
-1999-04-06  Ian Lance Taylor  <ian@zembu.com>
-
-	* sysdep.h (LC_MESSAGES): Never define.
-
-1999-04-06  Chris Torek  <torek@bsdi.com>
-
-	* reloc.c (bfd_check_overflow): Add addrsize parameter.  Change
-	all callers.  Rewrite completely.
-	(_bfd_relocate_contents): Rewrite overflow checking.
-	* bfd-in2.h: Rebuild.
-
-1999-04-05  Ian Lance Taylor  <ian@zembu.com>
-
-	From Gabriel Paubert <paubert@iram.es>:
-	* elf32-ppc.c (ppc_elf_howto_raw): Set R_PPC_GOT16_LO,
-	R_PPC_PLT16_LO and R_PPC_SECTOFF_LO to be complain_overflow_dont.
-	Set R_PPC_PLT16_HA, R_PPC_SECTOFF_HA and R_PPC_EMB_NADDR16_HA to
-	have a rightshift of 16 and use ppc_elf_addr16_ha_reloc.
-	* ppcboot.c (ppcboot_vec): Use little endian routines for
-	headers.
-
-	* elf.c (elfcore_strndup): Only define if it will be used.
-	* elf32-ppc.c (ppc_elf_relax_section): Remove unused locals irel
-	and irelend.
-	(ppc_elf_check_relocs): Remove unused local i.
-	(ppc_elf_gc_mark_hook): Add default case to switch.
-
-	From Bernd Nitzler <nitzler@kagcpd01.ag01.kodak.COM>:
-	* srec.c (srec_scan): Accept \r in symbol definitions.
-	(srec_object_p): Set HAS_SYMS if we saw any symbols.
-	(symbolsrec_object_p): Likewise.
-
-1999-04-04  Don Bowman <don@pixsci.com>
-
-	* config.bfd: Add mips*el-*-vxworks* and mips*-*-vxworks*.
-
-1999-04-04  Ian Lance Taylor  <ian@zembu.com>
-
-	* dwarf1.c (parse_line_table): Remove unused locals last_pc and
-	last_line.
-	* elf-bfd.h (_bfd_elfcore_section_from_phdr): Declare.
-	* elf32-i386.c (elf_i386_gc_mark_hook): Add default case to
-	switch.
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Remove unused
-	local i.
-	* syms.c (_bfd_stab_section_find_nearest_line): Remove unused
-	local val.
-
-1999-03-31  Nick Clifton  <nickc@cygnus.com>
-
-	* config.bfd: Add support for arm-epoc-pe target.
-	* configure.in: Add support for arm-epoc-pe target.
-	* configure: Regenerate.
-	* targets.c: Add support for arm-epoc-pe target.
-	* coff-arm.c: Allow header files to override definition of
-	TARGET_UNDERSCORE and USER_LABEL_PREFIX.
-	* pe-arm.h: Allow previous header files to override definition of
-	TARGET_LITTLE_SYM and TARGET_BIG_SYM.
-	* pei-arm.h: Allow previous header files to override definition of 
-	TARGET_LITTLE_SYM and TARGET_BIG_SYM.
-	* epoc-pe-arm.c: New file.  Support arm-epoc-pe target.
-	* epoc-pei-arm.c: New file.  Support arm-epoc-pei target.
-	
-1999-03-30  Nick Clifton  <nickc@cygnus.com>
-
-	* elf.c (elf_map_symbols): Handle the case where section
-	symbols are generated for content-less sections which are
-	not mapped to the output file.
-
-	* linker.c: Replace direct references to fields in BFD structure
-	with accessor macros.
-
-	* elflink.h: Replace direct references to fields in BFD structure
-	with accessor macros.
-
-1999-03-25  Philip Blundell  <pb@nexus.co.uk>
-
-	* config.bfd: Eliminate redundancy in checks for Linux/ARM.
-	
-	* elf32-arm.h (elf32_arm_relocate_section): Take the rightshift into 
-	account when adjusting section symbols during a partial link.
-
-1999-03-24  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-sparc.c (struct coff_reloc_map): Change type of field
-	  'bfd_reloc_val' to bfd_reloc_code_real_type.
-	* elf-m10200.c (struct mn10200_reloc_map): Ditto.
-	* elf-m10300.c (struct mn10300_reloc_map): Ditto.
-	* elf32-arc.c (struct arc_reloc_map): Ditto.
-	* elf32-d10v.c (struct d10v_reloc_map): Ditto.
-	* elf32-d30v.c (struct d30v_reloc_map): Ditto.
-	* elf32-fr30.c (struct fr30_reloc_map): Ditto.
-	* elf32-m32r.c (struct m32r_reloc_map): Ditto.
-	* elf32-sh.c (struct elf_reloc_map): Ditto.
-	* elf32-sparc.c (struct elf_reloc_map): Ditto.
-	* elf32-v850.c (struct v850_reloc_map): Ditto.
-	* elf64-sparc.c (struct elf_reloc_map): Ditto.
-	* elfarm-nabi.c (struct elf32_arm_reloc_map): Ditto.
-	* elfarm-oabi.c (struct elf32_arm_reloc_map): Ditto.
-
-1999-03-17  Martin Hunt  <hunt@cygnus.com>
-
-	* syms.c (_bfd_stab_section_find_nearest_line): Changed this
-	function so source-level assembly works.  If multiple N_SOs
-	are seen without and N_FUNs, create an indextable entry with
-	a NULL function name.
-
-1999-03-16  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data) Allow merging
-	of certian similar cpus.
-
-1999-03-16  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_final_write_processing):
-	Add the 5000.  Change the architecture for the 5400 to mips4.
-	(elf_mips_mach): Add r5000.
-
-1999-03-11  Doug Evans  <devans@casey.cygnus.com>
-
-	* cpu-i960.c (scan_i960_mach): Recognize i960:ka_sa and i960:kb_sb.
-
-1999-03-11  Nick Clifton  <nickc@cygnus.com>
-
-	* binary.c (binary_set_section_contents): Generate warning about
-	huge file offsets for any section that will occupy file space, not
-	just those that are loadable.
-
-1999-02-24  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* libbfd.h: Regenerate after Nick Clifton's Feb 17 changes.
-
-1999-02-22  Jim Lemke  <jlemke@cygnus.com>
-
-	* elf32-ppc.c: Add ppc_elf_relax_section() for the ld option mpc860c0.
-
-Mon Feb 22 18:26:51 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf-bfd.h (ELF_LINK_HASH_REF_REGULAR_NONWEAK): Define.
-	* elflink.h: Revert all changes since Feb 16.  Instead:
-	(elf_link_add_object_symbols): Set REF_REGULAR_NONWEAK flag if
-	appropriate.  Copy it to version symbols.
-	(elf_fix_symbol_flags): Set REF_REGULAR_NONWEAK for non ELF
-	symbols if appropriate.
-	(elf_adjust_dynamic_symbol): Set REF_REGULAR_NONWEAK for weakdef
-	symbol if appropriate.
-	(elf_link_output_extsym): If symbol is marked as undefined, and
-	has no nonweak references, mark it as weak undefined.
-
-Fri Feb 19 16:01:12 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_merge_symbol): When overriding a dynamic
-	definition with a weak undefined symbol, set NEEDS_PLT if it is a
-	function.
-	(elf_link_add_object_symbols): Don't copy the other field if we
-	are overridding.
-
-Thu Feb 18 18:07:43 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_merge_symbol): Do not merge any symbol from a
-	shared object with a weak undefined symbol.
-
-1999-02-18  Nick Clifton  <nickc@cygnus.com>
-
-	* elfarm-nabi.c: Set partial_inplace back to false.
-
-1999-02-17  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (TARGET_UNDERSCORE): Re-enable.
-	(USER_LABEL_PREFIX): Set to "_".
-
-	The following patches are from: Scott Bambrough
-	<scottb@corelcomputer.com>
-	
-	* libaout.h (M_ARM6_NETBSD): Set to 143.
-
-	* reloc.c: Add ARM PIC relocs:   BFD_RELOC_ARM_GOT12,
-	BFD_RELOC_ARM_GOT32, BFD_RELOC_ARM_JUMP_SLOT, BFD_RELOC_ARM_COPY,
-	BFD_RELOC_ARM_GLOB_DAT, BFD_RELOC_ARM_PLT32,
-	BFD_RELOC_ARM_RELATIVE, BFD_RELOC_ARM_GOTOFF, BFD_RELOC_ARM_GOTPC.
-	* bfd-in2.h: Regenerate.
-
-	* elfarm-nabi.c (elf32_arm_howto_table): Set partial_inplace to
-	'true' as REL relocs are now being used.  Add new PIC relocs:
-	R_ARM_COPY, R_ARM_GLOB_DAT, R_ARM_JUMP_SLOT, R_ARM_RELATIVE,
-	R_ARM_GOTOFF, R_ARM_GOTPC, R_ARM_GOT32, R_ARM_PLT32.
-
-	* elf32-arm.h (elf32_arm_merge_private_bfd_data): Check byte order
-	of targets.
-	(elf32_arm_final_link_relocate): Change parameters so that entire
-	reloc is passed.  Add support for PIC relocs.
-	(elf32_arm_relocate_section): Pass entire reloc to
-	elf32_arm_final_link_relocate. 
-	(elf32_arm_check_relocs): Handle new PIC relocs.
-	(elf32_arm_adjust_dynamic_symbol): New function.
-	(elf32_arm_size_dynamic_sections): New function.
-	(elf32_arm_discard_copies): New function.
-	(elf32_arm_finish_dynamic_symbol): New function.
-	(elf32_arm_finish_dynamic_sections): New function.
-	(ELF_MAXPAGE_SIZE): Define.
-	(bfd_elf32_bfd_reloc_type_lookup): Define.
-	(elf_backend_relocate_section): Define.
-	(elf_backend_adjust_dynamic_symbol): Define.
-	(elf_backend_create_dynamic_sections): Define.
-	(elf_backend_finish_dynamic_symbol): Define.
-	(elf_backend_finish_dynamic_sections): Define.
-	(elf_backend_size_dynamic_sections): Define.
-	(elf_backend_plt_readonly): Define.
-	(elf_backend_want_got_plt): Define.
-	(elf_backend_want_plt_sym): Define.
-	
-Wed Feb 17 12:02:26 1999  Stan Cox  <scox@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_section_from_shdr): Make reginfo
-	sections SEC_LINK_ONCE and SEC_LINK_DUPLICATES_SAME_SIZE.
-	(_bfd_mips_elf_fake_sections): Likewise.
-
-Wed Feb 17 12:07:23 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
- 
-        * elfarm-oabi.c (bfd_elf32_arm_allocate_interworking_sections,
-        bfd_elf32_arm_get_bfd_for_interworking,
-        bfd_elf32_arm_process_before_allocation): Define to avoid clash
-        with elfarm-nabi.c.
- 
-        * elf32-arm.h: Don't declare elf32_arm_info_to_howto.
-        (elf32_thumb_to_arm_stub, elf32_arm_to_thumb_stub,
-        elf32_arm_find_nearest_line): Make them static.
-
-Tue Feb 16 22:44:37 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_merge_symbol): Add pflags parameter.  Change all
-	callers.  Do not merge a definition from a shared object with a
-	weak undefined symbol.
-	(elf_link_add_object_symbols): Do not change the symbol type or
-	size if the old symbol overrides the new one.
-
-1999-02-08  Nick Clifton  <nickc@cygnus.com>
-
-	* config.bfd: Add support for strongarm target.
-
-Mon Feb  8 11:18:14 1999  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* elf32-m68k.c (reloc_map): Use the correct types for the struct
-	fields instead of unsigned char.
-
-Fri Feb  5 00:22:36 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am: Rebuild dependencies.
-	* Makefile.in: Rebuild.
-
-Thu Feb  4 22:30:13 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Change AC_PREREQ to 2.13.  Remove AM_CYGWIN32.
-	Change AM_EXEEXT to AC_EXEEXT and AM_PROG_INSTALL to
-	AC_PROG_INSTALL.  Add comments to uses of AC_DEFINE.
-	* acinclude.m4: Add comments to uses of AC_DEFINE.
-	* acconfig.h: Remove.
-	* configure: Rebuild with current autoconf/automake.
-	* aclocal.m4: Likewise.
-	* config.in: Likewise.
-	* Makefile.in: Likewise.
-
-1999-02-04  DJ Delorie  <dj@cygnus.com>
-
-	* libbfd.c (real_read): don't call fread for zero bytes.  This
-	covers up a bug (or misuse of bfd) that's exposed by Solaris.
-
-Thu Feb  4 12:38:10 1999  Stan Cox  <scox@cygnus.com>
-
-	* elf32-mips.c (mips_elf_relocate_section): Insure that the target
-	of a jump is in the current 256 MB region.
-
-Thu Feb  4 12:15:38 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* format.c (bfd_check_format_matches): Change last patch to only
-	take effect for the binary target.
-
-Wed Feb  3 19:40:12 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-i386.c (elf_i386_reloc_type_lookup): Add BFD_RELOC_CTOR.
-
-Wed Feb  3 15:02:44 1999  Catherine Moore  <clm@cygnus.com>
-
-	* elf32-fr30.c (fr30_elf_check_relocs):  New routine.
-
-Tue Feb  2 21:38:28 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* format.c (bfd_check_format_matches): If the target was
-	previously specified, don't check other targets when checking for
-	an archive file.
-
-Tue Feb  2 18:16:43 1999  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-arm.h (elf32_arm_reloc_map):  Removed.
-        (elf32_arm_reloc_type_lookup):  Removed
-        * elfarm-nabi.c (elf32_arm_reloc_map):  New.
-        (elf32_arm_reloc_type_lookup):  New.
-        * elfarm-oabi.c (elf32_arm_reloc_map):  New.
-        (elf32_arm_reloc_type_lookup):  New.
-
-Mon Feb  1 19:49:21 1999  Catherine Moore  <clm@cygnus.com>
-
-        * elfarm-nabi.c:  Renamed from elf32-arm-newabi.c.
-        * elfarm-oabi.c:  Renamed from elf32-arm-oldabi.c
-        * Makefile.am:  Use new files.
-        * Makefile.in:  Regenerate.
-        * configure.in:  Use new files.
-        * configure:  Regenerate.       
-
-1999-02-01  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_elf_gc_mark_hook): New function.
-	(fr30_elf_gc_sweep_hook): New function.
-	(elf_backend_can_gc_sections): Define.
-
-Mon Feb  1 12:21:47 1999  Catherine Moore  <clm@cygnus.com>
-
-        * targets.c (bfd_target_vector):  Add bfd_elf32_littlearm_oabi_vec
-        and bfd_elf32_bigarm_oabi_vec.
-
-Mon Feb  1 11:46:31 1999  Catherine Moore  <clm@cygnus.com>
-
-        * Makefile.am (elf32-arm-oldabi.lo):  New.
-        (elf32-arm-newabi.lo):  New.
-        * Makefile.in:  Regenerate.
-        * config.bfd (thumb-*-elf):  Remove definition of targ_underscore.
-        (arm-*-elf):  Likewise.
-        (arm-*-oabi):  New.
-        (thumb-*-oabi):  New.
-        * configure:  Regenerate.
-        * configure.in (bfd_elf32_littlearm_oabi_vec):  New.
-        (bfd_elf32_bigarm_oabi_vec):  New.
-        * elf32-arm-newabi.c:  New.
-        * elf32-arm-oldabi.c:  New.
-        * elf32-arm.c:  Removed.
-        * elf32-arm.h:  New.
-
-Mon Feb  1 11:52:12 1999  Frank Ch. Eigler  <fche@cygnus.com>
-
-	* binary.c (binary_set_section_contents): Omit warnings for
-	unloadable sections.
-
-1999-01-31  Michael Meissner  <meissner@cygnus.com>
-
-	* config.bfd (powerpc{,le}-*-vxworks*): Add aliases to
-	powerpc{,le}-*-eabi.
-
-1999-01-29  Nick Clifton  <nickc@cygnus.com>
-
-	* dwarf2.c (read_unsigned_leb128): Remove unused variables.
-	* dwarf2.c (read_signed_leb128): Remove unused variables.
-
-Fri Jan 29 00:47:21 1999  H.J. Lu  <hjl@gnu.org>
-
-	* elf.c (assign_file_positions_for_segments): Only adjust
-	p_align when needed.
-
-Thu Jan 28 20:05:22 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* binary.c (binary_set_section_contents): Don't return early for a
- 	non-loadable section, in case the first section is non-loadable.
-  	Don't set the low lma for a SEC_NEVER_LOAD section.  From Maciej
-	W. Rozycki <macro@ds2.pg.gda.pl>.
-
-1999-01-28  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_reloc_map): Add R_FR30_GNU_VTINHERIT and
-	R_FR30_GNU_VTENTRY relocs.
-
-Thu Jan 28 11:08:16 1999  Catherine Moore  <clm@cygnus.com>
-
-       * elflink.h (elf_link_output_sym):  Zero syms which are
-       part of sections which have been excluded.
-
-Wed Jan 27 13:35:35 1999  Stan Cox  <scox@cygnus.com>
-
-	* coff-arm.c (_bfd_coff_arm_set_private_flags): Changed F_PIC
-	to F_PIC_INT.
-	* coffcode.h (coff_set_arch_mach_hook): Removed F_ARM_2a and
-	F_ARM_3M labels.  Changed F_PIC to F_PIC_INT.
-	
-1999-01-27  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_elf_howto_table): Fix name of R_FR30_48
-	relocation. 
-	(fr30_final_link_relocate): Use computed value as result of
-	relocation. 
-
-1999-01-26  Frank Ch. Eigler  <fche@cygnus.com>
-
-	* binary.c (binary_set_section_contents): Emit warning for
-	huge file offsets due to widely-dispersed section LMAs.
-
-Mon Jan 18 03:35:35 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): If not D_PAGED,
-	align first section to largest section alignment, not first
-	section alignment.
-
-1999-01-04  Jason Molenda  (jsm@bugshack.cygnus.com)
-
-	* configure.in: Require autoconf 2.12.1 or higher.
-
-Tue Dec 22 15:21:41 1998  Catherine Moore  <clm@cygnus.com>
-
-        * archures.c (bfd_mach_i386_i386_intel_syntax):  Define.
-        * bfd-in2.h:  Likewise.
-        * cpu-i386.c (bfd_i386_arch_intel_syntax):  New.
-
-1998-12-16  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* archures.c,bfd-in2.h (bfd_mach_mips4111): New.
-	* cpu-mips.c: Add support for and independent 4111.
-	* elf32-mips.c (elf_mips_mach): E_MIPS_MACH_4111 -> bfd_mach_mips4111.
-	(_bfd_mips_elf_final_write_processing): 
-	bfd_mach_mips4111 -> E_MIPS_ARCH_3 | E_MIPS_MACH_4111.
-
-1998-12-15  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* elf32-mips.c (elf_mips_abi_name): New.
-	(_bfd_mips_elf_merge_private_bfd_data): Compare EF_MIPS_ABI flags.
-
-1998-12-12  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_final_write_processing): 
-	Handle bfd_mach_mips4300.
-
-1998-12-11  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf32-i386.c: Remove leaked development code from patch
-	1998-12-10 by Richard Henderson.
-
-1998-12-10  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-i386.c (elf_i386_relocate_section): Don't fail relocations
-	in debug sections for symbol defined externally.
-
-Thu Dec 10 10:58:38 1998  Andreas Schwab  <schwab@issan.cs.uni-dortmund.de>
-
-	* targets.c (bfd_target_vector): Remove duplicate entry for
-	tekhex_vec.
-
-1998-12-09  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_elf_howto_table): Set src_mask fields to 0
-	since we are using RELAs.
-
-Tue Dec  8 22:15:48 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	SCO Open Server Release 5 core file support, from Jouke Numan
-	<jnuman@hiscom.nl>:
-	* sco5-core.c: New file.
-	* configure.in (i[3456]86-*-sco3.2v5*): Use sco5-core.lo.
-	(sco5-core.lo): Define SCO5_CORE in COREFLAG.
-	* Makefile.am: Rebuild dependencies.
-	(OPTIONAL_BACKENDS): Add sco5-core.lo.
-	(OPTIONAL_BACKENDS_CFILES): Add sco5-core.c.
-	* bfd.c (struct _bfd): Add sco5_core_data field to tdata.
-	* targets.c (sco5_core_vec): Add to target list if SCO5_CORE.
-	* bfd-in2.h, configure, Makefile.in: Rebuild.
-
-Tue Dec  8 19:38:42 1998  Mark Klein  <mklein@dis.com>
-
-	* config.bfd (hppa*-*-mpeix*): New target.
-	* configure.in: Add AC_HEADER_DIRENT.
-	(hppa*-*-mpeix*): New target.
-	* configure.host (hppa*-*-mpeix*): New host.
-	* hpux-core.c: Check HOST_HPPAMPEIX.  Use HAVE_DIRENT_H and
-	friends rather than just including <sys/dir.h>.
-	* som.h (struct som_symbol): Add hppa_priv_level and apto
-	tc_data.  Change all users.
-	(struct somdata): Add comp_unit field.
-	(obj_som_compilation_unit): Define.
-	(bfd_som_attach_compilation_unix): Declare.
-	* som.c: Check HOST_HPPAMPEIX.
-	(struct som_misc_symbol_info): Add new field priv_level.
-	(som_object_setup): Add current_offset parameter.  Change all
-	callers.
-	(setup_sections): Likewise.
-	(som_object_p): For EXECLIBMAGIC, read the lst header.
-	(som_write_symbol_strings): Add compilation_unit parameter.
-	Change all callers.
-	(som_finish_writing): Write out compilation_unit.
-	(som_bfd_derive_misc_symbol_info): Set priv_level.
-	(som_build_and_write_symbol_table): Set xleast field to 3.
-	(som_slurp_symbol_table): Set symbol priv_level.
-	(bfd_som_attach_compilation_unit): New function.
-	(som_bfd_ar_write_symbol_stuff): Set xleast field to 3.  Set
-	priv_level into symbol_value.
-	* configure, config.in: Rebuild.
-
-Tue Dec  8 16:21:35 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* hpux-core.c (hpux_core_core_file_p): Change call to nonexistent
-	warning function to call _bfd_error_handler instead.
-
-	* libbfd.c (COERCE32): Cast through unsigned long and long to
-	avoid bug in old version of gcc.
-
-	* elf64-alpha.c (elf64_alpha_additional_program_headers): Remove.
-	(elf_backend_additional_program_headers): Don't define.
-
-1998-12-08  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_final_link_relocate): Fix PC relative
-	relocations to include offset of 2 included in the insns, and the
-	offset of the relocs within the section.
-
-Wed Dec  2 15:03:59 1998  David Taylor  <taylor@texas.cygnus.com>
-
-	The following changes were made by David Taylor
- 	<taylor@texas.cygnus.com>, Edith Epstein
- 	<eepstein@sophia.cygnus.com>, Jim Blandy
- 	<jimb@zwingli.cygnus.com>, and Elena Zannoni
- 	<ezannoni@kwikemart.cygnus.com> as part of the project to merge in
- 	changes originally made by HP; HP did not create ChangeLog
- 	entries.
-
-	* aclocal.m4, configure, Makefile.in: Rebuilt using latest
- 	automake macro library.
-
-	* hpux-core.c (hpux_core_core_file_p): this function now
- 	understands HPUX 10.30 thread info. Yes, the thread stacks can be
- 	found in the corefile! Also, in hpux_core_core_file_p, if we
- 	encounter a section with an unknown type, don't punt.  Instead,
- 	just skip it.  Also, count the number of sections of known type
- 	that we encounter.  If we encounter at least one good one, then
- 	we'll declare that the file is a core file.  If we encounter any
- 	unknown ones but some known ones, then we'll issue a warning (but
- 	still declare it to be a core file). Also, correctly decide when a
- 	file is not a core.
-	(PROC_INFO_HAS_THREAD_ID): define if CORE_ANON_SHMEM defined.
-	(CORE_ANON_SHMEM): define if not defined.
-	(hpux_core_struct): add members lwpid and user_tid.
-	(core_kernel_thread_id, core_user_thread_id): new macros.
-	(make_bfd_asection): use bfd_alloc to allocate room for a copy of
- 	the name before storing it in the bfd.
-	(hpux_core_core_file_p): handle threads.
-
-	* libhppa.h (GET_FIELD): protect against redefinition.
-	(HPPA_WIDE): define.
-	(GET_FIELD): define.
-	(GET_BIT): define.
-	(MASK): define.
-	(CATENATE): define.
-	(ELEVEN): define.
-	(sign_extend): redefine.
-	(assemble_6): define.
-	(assemble_12): rewrite.
-	(assemble_16): define.
-	(assemble_16a): define.
-	(assemble_17): rewrite.
-	(assemble_22): define.
-
-1998-12-07  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_final_link_relocate): Using signed
-	relocations for signed values.
-
-Sun Dec  6 16:30:33 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* mipsbsd.c (MY(set_arch_mach)): Make static.
-	* aoutx.h (NAME(aout,machine_type)): For bfd_arch_mips, use
-	bfd_mach_mips* macros rather than simple numbers.
-
-	COFF weak symbol support, based on patches from Mark Elbrecht
-	<snowball3@usa.net>:
-	* coffcode.h (coff_slurp_symbol_table): Handle C_WEAKEXT.
-	* coffgen.c (coff_renumber_symbols): Handle weak symbols.
-	(coff_write_alien_symbol): Likewise.
-	* cofflink.c (coff_link_check_ar_symbols): Likewise.
-	(coff_link_add_symbols): Likewise.
-	(_bfd_coff_link_input_bfd): Likewise.
-	(_bfd_coff_write_global_sym): Likewise.
-
-	* elf.c (copy_private_bfd_data): Always initialize the
-	includes_phdrs field.
-
-	* elflink.h (elf_fix_symbol_flags): Check for case where a non-ELF
-	file defines a symbol first mentioned in an ELF file.
-
-	* bfd-in.h: Always define BFD_HOST_64_BIT and BFD_HOST_U_64_BIT if
-	possible, rather than only if BFD64.
-	* elflink.h (compute_bucket_count): Just check BFD_HOST_U_64_BIT,
-	not __GNUC__.
-	* bfd-in2.h: Rebuild.
-
-	* srec.c (srec_set_section_contents): Correct test to avoid
-	switching to 4 byte addresses after seeing a second section which
-	requires 3 byte addresses.  From Joel Schantz
-	<joel.schantz@argosys.boeing.com>.
-
-	* config.bfd (m68*-*-gnu*): New target.  From Aymeric Vincent
-	<aymeric.vincent@emi.u-bordeaux.fr>.
-
-1998-12-04  Jim Blandy  <jimb@zwingli.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Fix logic to
-	decide whether the output file is -mrelocatable-lib,
-	-mrelocatable, or neither.  (gdb.base/nodebug.exp)
-
-1998-12-03  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c: Add support for R_FR30_48 reloc.
-	* reloc.c: Add BFD_RELOC_FR30_48 relocation.
-	* bfd-in2.h: Regenerate.
-	* libbfd.h: Regenerate
-
-Wed Dec  2 00:58:37 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_adjust_dynamic_symbol): Warn on an attempt to
-	link against a dynamic symbol with no type or size.
-
-1998-12-01  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf32-i386.c (i386_check_relocs) [R_386_32]: Don't emit
-	relocation for section which does not get loaded.
-	(elf_i386_relocate_section) [R_386_32]: Likewise.
-
-Tue Dec  1 11:33:33 1998  Jim Wilson  <wilson@cygnus.com>
-
-	* coff-h8300.c (h8300_bfd_link_add_symbols): Make reloc_size,
-	reloc_count and i long instead of unsigned long.  Handle error
-	return from bfd_canonicalize_reloc.
-
-1998-12-01  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_relocate_section): Detect the absence of
-	a hash table.
-
-Mon Nov 30 15:28:09 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
-
-	* elf32-sh.c (elf/sh.h): Include.
-	sh_reloc_type: Delete.  Changed all references to elf_sh_reloc_type.
-	(sh_elf_howto_tab): Add HOWTO for R_SH_SWITCH8.
-	(sh_reloc_map): Map BFD_RELOC_8_PCREL to R_SH_SWITCH8.
-	(sh_elf_relax_delete_bytes): Handle R_SH_SWITCH8.
-	* Makefile.in: Add dependency of elf32-sh.lo on $(INCDIR)/elf/sh.h.
-
-Fri Nov 27 17:51:38 1998  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elflink.h (compute_bucket_count): Don't allow minsize==0, it
-	causes division by zero later on.
-
-Thu Nov 26 11:19:35 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* elf32-fr30.c (fr30_elf_pc9_reloc,fr30_elf_pc12_reloc): Not
-	needed.
-
-1998-11-25  DJ Delorie  <dj@cygnus.com>
-
-	* coff-i386.c (i3coff_object_p): Remove hack.  Use new emulation
-	hook now.
-
-Tue Nov 24 10:25:27 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_elf_relocate_section): Call
-	fr30_final_link_relocate.
-	(fr30_final_link_relocate): New function: Handle I20 and I32
-	relocs.
-	(fr30_elf_i32_reloc): New function: Handle I32 relocs.
-	(fr30_elf_pc9_reloc): New function: Handle 9_PCREL relocs.
-	(fr30_elf_pc12_reloc): New function: Handle 12_PCREL relocs.
-
-	* elf32-v850.c (v850_elf_relocate_section): Reset hi16s reloc
-	chain to empty.
-
-	The following changes are based on a patch submitted by Gianluca
-	Moro <glctr@abc.it>:
-
-	(v850_elf_perform_relocation): Only update a hi16s reloc if it has
-	not already been updated.
-	(find_remembered_hi16s_reloc): New parameter 'already_found'
-	returns state of remembered hi16s reloc.
-	(remember_hi16s_reloc): Set 'found' field to false.
-	(hi16s_location): Add 'found' field.
-
-1998-11-23  DJ Delorie  <dj@cygnus.com>
-
-	* coff-i386.c (bfd_pe_dll_not_recognized_hack): the linker wants
-	to see .DLL files as unrecognized.
-	(i3coff_object_p): Sorry, had to hack it to not recognize these
-	files (pei-i386) on request.
-
-1998-11-23  DJ Delorie  <dj@cygnus.com>
-
-	* opncls.c (bfd_make_readable): need more cleanup for symbols and
-	relents.  Call bfd_check_format to reinitialize.
-
-Fri Nov 20 14:21:36 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_elf_relocate_section): Remove spurious
-	warnings.
-
-Thu Nov 19 14:42:15 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* aclocal.m4: regenerate
-	* configure: regenerate
-
-Tue Nov 17 20:23:35 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf-bfd.h (struct elf_link_hash_entry): Add vtable_entries_size.
-	* elf.c (_bfd_elf_link_hash_newfunc): Clear it.
-	* elflink.h (elf_gc_propagate_vtable_entries_used): Copy it, and
-	respect it as an upper bound on what memory to reference.
-	(elf_gc_smash_unused_vtentry_relocs): Likewise.
-	(elf_gc_record_vtentry): Handle as-yet undefined vtables.  Set and
-	update vtable_entries_size appropriately.
-
-Tue Nov 17 15:28:31 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-fr30.c (fr30_reloc_type_lookup): Used integers to hold
-	reloc number.
-
-Mon Nov 16 22:19:21 1998  DJ Delorie  <dj@cygnus.com>
-
-	* archive.c (bfd_ar_hdr_from_filesystem): support BFD_IN_MEMORY
- 	bfds; they have no "file" so we fake it.
-	* bfd-in2.h: add bfd_make_writable and bfd_make_readable (regen)
-	* libbfd.c (bfd_write): Allow writing to BFD_IN_MEMORY bfds by
- 	resizing the memory buffer.
-	* opncls.c (bfd_make_writable): New function; lets you write a
- 	bfd_create'd bfd to an in-memory buffer.
-	(bfd_make_readable): New function; lets you read back that buffer
- 	as if it were from bfd_openr.  Used to build generated archive
- 	members (winsup's ld's dlltool)
-
-Mon Nov 16 19:15:19 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* po/bfd.pot: Regenerated.
-
-Mon Nov 16 10:57:06 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (hi16s_location): Replaced fixed size array with
-	linked list.
-
-Sun Nov 15 20:28:25 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_section): Search for the proper
-	element of the gotentry list for local symbols too.
-	(elf64_alpha_relocate_section): Unify local and global handling.
-	Assert that gotent->use_count > 0.
-
-Sat Nov 14 15:16:01 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in (vms_alpha_vec): Rename from evax_alpha_vec, and
-	update for file name changes of July 2, 1998.
-	(vms_vax_vec): New.
-	* configure: Rebuild.
-
-Thu Nov 12 19:19:54 1998  Dave Brolley  <brolley@cygnus.com>
-
-	* po/bfd.pot: Regenerated.
-
-Tue Nov 10 16:17:06 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* acinclude.m4, config.bfd: detect cygwin* instead of cygwin32*.
-	* aclocal.m4, configure: regenerate
-
-Tue Nov 10 15:13:59 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf.c (prep_headers): Add support for bfd_arch_fr30.
-
-Tue Nov 10 13:37:36 1998  Felix Lee  <flee@cygnus.com>
-
-	* acinclude.m4 (BFD_HAVE_SYS_PROCFS_TYPE,
- 	BFD_HAVE_SYS_PROCFS_TYPE_MEMBER): didn't define macro when value
- 	was cached.
-	* aclocal.m4, configure: regenerated.
-
-Tue Nov 10 14:31:01 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-d10v.c (reloc_type):  Add R_D10V_GNU_VTINHERIT and
-        R_D10V_GNU_VTENTRY relocs.
-        (elf_d10v_howto_table):  Likewise.
-        (d10v_reloc_map d10v_reloc_map):  Likewise.
-        (elf32_d10v_gc_mark_hook):  New.
-        (elf32_d10v_gc_sweep_hook):  New.
-        (elf32_d10v_check_relocs):  New.
-        (elf32_d10v_relocate_section):  New.
-        (elf_backend_relocate_section):  Define.
-        (elf_backend_can_gc_sections):  Define.
-
-Sat Nov  7 18:07:51 1998  Peter Schauer  <peter.schauer@regent.e-technik.tu-muenchen.de>
-
-	* Makefile.am (BFD32_BACKENDS): Move vms files here...
-	(BFD64_BACKENDS): ...from here.
-	(BFD32_BACKENDS_CFILES): Move vms files here...
-	(BFD64_BACKENDS_CFILES): ...from here.
-	* Makefile.in: Rebuild.
-
-Wed Nov  4 15:58:48 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* Makefile.am: Add FR30 target.
-	* Makefile.in: Add FR30 target.
-	* archures.c: Add support for FR30.
-	* config.bfd: Add support for FR30.
-	* configure.in: Add support for FR30.
-	* reloc.c: Add support for FR30 relocations.
-	* targets.c: Add support for FR30 relocations.
-	* bfd-in2.h: Regenerate.
-	* configure: Regenerate.
-	* libbfd.h:  Regenerate.
-	* cpu-fr30.c: New file.
-	* elf32-fr30.c: New file.
-
-Mon Nov  2 14:59:33 1998  Geoffrey Noer  <noer@cygnus.com>
-
-	* configure.in: detect cygwin* instead of cygwin32*
-	* configure: regenerate
-
-Sun Nov  1 19:32:28 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* elf-m10300.c (mn10300_elf_relax_section): Do not use alloca,
-	use bfd_malloc and free instead and check return value from bfd_malloc.
-
-Sun Nov  1 16:20:35 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd-in.h (_bfd_dwarf1_find_nearest_line): Declare.
-	* libbfd.h: Rebuild.
-
-	* elf32-mips.c (mips_elf_dynsym_sec_names): Comment out.
-	(SIZEOF_MIPS_DYNSYM_SECNAMES): Likewise.
-	(MIPS_TEXT_DYNSYM_SECN): Likewise.
-	(_bfd_mips_elf_fake_sections): Don't set sh_info field of a .hash
-	section.
-	(struct mips_elf_link_hash_table): Remove dynsym_sec_strindex
-	field.
-	(mips_elf_link_hash_table_create): Don't initialize
-	dynsym_sec_strindex.
-	(mips_elf_gc_mark_hook): Add default case to avoid warning.
-	(mips_elf_size_dynamic_sections): Generate a section symbol for
-	every output section.
-	(mips_elf_finish_dynamic_sections): Count all sections for
-	DT_MIPS_UNREFEXTNO.
-	(mips_elf_finish_dynamic_sections): Use dynamic symbols for all
-	output sections.
-
-Sun Nov  1 12:46:53 1998  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Allocate two slots
-	for later PLT entries in large PLTs.
-	(ppc_elf_finish_dynamic_symbol): Allow for the extra slots.
-
-Sat Oct 31 20:10:09 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-ppc.c (ppc_elf_reload_section): Fix typo.
-
-1998-10-26 15:58  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf-bfd.h (struct elf_link_hash_entry): Add new field elf_hash_value.
-	* elflink.h (elf_collect_hash_codes): New function.  This function is
-	called for each exported symbol and we compute the ELF hash value for
-	it.
-	(compute_bucket_value): New function.  It is called from
-	size_dynamic_sections to determine the hash table size.  When we are
-	optimizing a better, but slower, algorithm is used.
-	(size_dynamic_sections): Call compute_bucket_value.
-
-	* elf.c (bfd_elf_hash): Optimize the hash function a bit.
-
-Mon Oct 19 20:03:21 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-sh.c:  Add HOWTO entries for R_SH_GNU_VTINHERIT and
-        R_SH_GNU_VTENTRY.
-        (sh_elf_gc_mark_hook):  New.
-        (sh_elf_gc_sweep_hook):  New.
-        (sh_elf_check_relocs):  New.
-        (elf_backend_can_gc_sections):  Define.
-
-Mon Oct 19 16:57:05 1998  Felix Lee  <flee@cygnus.com>
-
-	* acinclude.m4: undo previous gettext change
-	* aclocal.m4: rebuild with right version of aclocal.
-
-Mon Oct 19 01:47:21 1998  Felix Lee  <flee@cygnus.com>
-
-	* acinclude.m4, aclocal.m4: move gettext-related fragments from
- 	aclocal.m4 to acinclude.m4, so they don't get lost.
-
-	* elfcore.h: rewrite for better corefile support.
-	* elf.c (elfcore_*): new functions.
-	* elf-bfd.h (elf_obj_tdata): new structure members.
-	* acconfig.h, acinclude.m4, configure.in: add feature-tests for
- 	flavor of procfs.
-	* aclocal.m4, config.in, configure, Makefile.in: regenerated.
-
-Fri Oct 16 14:07:45 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-m32r.c:  Add HOWTO entries for R_M32R_GNU_VTINHERIT
-        and R_M32R_GNU_VTENTRY.
-        (elf_backend_can_gc_sections):  Define.
-        (m32r_elf_check_relocs):  New.
-        (m32r_elf_gc_mark_hook):  New.
-        (m32r_elf_gc_sweep_hook):  New.
-        (m32r_elf_relocate_section):  Handle VT relocs.
-
-Mon Oct 12 14:18:40 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (arm_relocate_section): Remove redundant test.
-
-	* bfd-in2.h (struct reloc_howto_struct): Improve comment to make
-	cleat that the 'bitsize' field is the size of the bitfield AFTER
-	relocation not before.
-
-	* elf32-m32r.c (R_M32R_18_PCREL): Fix size of bitfield.
-
-	* coff-mips.c (mips_relocate_hi): Cope with missing refhi or reflo
-	relocs.
-
-Tue Oct  6 09:20:44 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-sparc.c:  Add HOWTO entries for R_SPARC_GNU_VTINHERIT and
-        R_SPARC_GNU_VTENTRY.
-        (elf32_sparc_check_relocs):  Handle them.
-        (elf32_sparc_reloc_type_lookup):  Likewise.
-        (elf32_sparc_relocate_section):  Likewise.
-        (elf32_sparc_gc_mark_hook):  New.
-        (elf32_sparc_gc_sweep_hook):  New.
-
-Mon Oct  5 14:55:30 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (som_finish_writing): Perform some sanity checks when
-	writing an executable or shared library.
-
-Mon Oct  5 12:02:31 1998  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* dwarf1.c : New file.  Adds _bfd_dwarf1_find_nearest_line.
-	* configure.in (elf): Add dwarf1.lo.
-	* elf_bfd.h (elf_ob_tdata): Add dwarf1_find_line_info.
-	* elf.c (_bfd_elf_find_nearest_line): Add call to
-	_bfd_dwarf1_find_nearest_line.
-	* elf32-mips.c (_bfd_mips_elf_find_nearest_line):
-	Add call to _bfd_dwarf1_find_nearest_line.
-	* configure: Rebuilt.
-
-Mon Oct  5 10:06:22 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elflink.h (elf_gc_sections):  Do not allow garbage
-        collection if dynamic sections have been created.
-
-Mon Oct  5 09:07:37 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-v850.c: Add HOWTO entries for R_V850_GNU_VTINHERIT and
-        R_V850_GNU_VTENTRY.
-        (v850_elf_check_relocs):  Handle VTINHERIT and VTENTRY relocs.
-        (v850_elf_perform_relocation):  Likewise.
-        (v850_elf_final_link_relocate):  Likewise.
-        (v850_elf_relocate_section):  Likewise.
-        (v850_elf_gc_sweep_hook):  New routine.
-        (v850_elf_gc_mark_hook):  New routine.
-        (elf_backend_can_gc_sections):  Define.
-
-Mon Oct  5 09:04:25 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-m68k.c (elf_m68k_gc_sweep_hook):  Don't assume
-        that dynobj exists.
-
-Sun Oct  4 23:29:34 1998  David Edelsohn  <edelsohn@mhpcc.edu>
-
-	* rs6000-core.c (rs6000coff_core_file_matches_executable_p):
-	Declare size as bfd_size_type.
-	(rs6000coff_get_section_contents): Declare count as bfd_size_type.
-
-Sun Oct  4 20:38:29 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* cpu-hppa.c (bfd_hppa20_arch): Define.  Link it into the bfd_hppa_arch
-	structure.
-	* som.c (CPU_PA_RISC2_0): Define.
-	(_PA_RISC2_0_ID): Likewise.
-	(som_finish_writing): Use CPU_PA_RISC2_0 for the system_id as needed.
-
-Sun Oct  4 21:19:09 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): When a versioned symbol
-	has a base which is already defined, only add the referenced
-	symbol to the dynamic symbol table if it is defined or referenced
-	by a regular file.
-
-	* elf32-i386.c (elf_i386_info_to_howto_rel): Handle vtable relocs
-	correctly.
-
-1998-09-27  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-        * elflink.h (elf_link_add_object_symbols): Undo last change.
-
-Wed Sep 23 16:09:31 1998  Richard Henderson  <rth@cygnus.com>
-
-        * elflink.h (elf_link_add_object_symbols): Don't record a dynamic
-        symbol for the indirect alias to a versioned symbol.
-
-Mon Sep 21 12:15:22 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-i386.c (elf32_i386_vtinherit_howto): New.
-        (elf32_i386_vtentry_howto): New.
-        (elf_i386_reloc_type_lookup):  Return elf32_i386_vtentry_howto
-        or elf32_i386_vtinherit_howto  on lookup.
-
-Sun Sep 20 00:48:07 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf32-m68k.c: Include "elf/m68k.h".  Remove definition of enum
-	reloc_type.  Rename R_68K__max to R_68K_max.
-	(howto_table): Use _bfd_elf_rel_vtable_reloc_fn for a VTENTRY
-	reloc.
-
-Sun Sep 20 00:09:25 1998  Chris Torek  <torek@bsdi.com>
-
-	* libbfd.c (bfd_getb32): Rewrite expression to get better code.
-	(bfd_getl32, bfd_getb_signed_32, bfd_getl_signed_32): Likewise.
-
-	* libbfd.c (bfd_log2): Cast to bfd_vma before shifting, not
-	after.
-
-Sat Sep 19 22:42:23 1998  Doug Rabson  <dfr@nlsystems.com>
-
-	* elflink.h (elf_link_add_object_symbols): Ensure that the warning
-	message has a null byte terminator.
-
-Fri Sep 18 14:35:29 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_perform_relocation): Ignore contents of
-	word subject to R_V850_32 relocation.
-
-Thu Sep 17 17:20:36 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* dwarf2.c: Add comment describing problem computing line numbers
-	for undefined symbols at link time.
-
-Thu Sep 17 16:03:28 1998  Richard Henderson  <rth@cygnus.com>
-
-        * elf64-alpha.c (elf64_alpha_adjust_dynamic_symbol): Don't
-        transform a defweak into a plt entry.
-        (elf64_alpha_calc_dynrel_sizes): Allow room for secondary
-        plt entry references to receive a RELATIVE reloc.
-        (elf64_alpha_finish_dynamic_symbol): Fill them in.
-        (elf64_alpha_relocate_section): Assert we don't overrun
-        the allocated relocation space.
-
-Wed Sep 16 18:03:13 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf.c (swap_out_syms): Always treat section symbols as
-	special, even if they are attached to a common section.
-
-Wed Sep 16 10:34:13 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_symbol_processing): Move symbols in
-	sections with v850 common section attributes into named v850
-	common sections.
-	(v850_elf_add_symbol_hook): Move symbols in sections with v850
-	common section attributes into named v850 common sections.
-
-Wed Sep 16 11:26:49 CDT 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-arm.c (elf32_arm_gc_mark_hook):  Remove print
-        statement.
-
-1998-09-15  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Reverse output_offset
-	part of Vladimir's change of 1998-08-19.  Make a R_PPC_SDAREL16
-	reloc to the wrong section a warning, not an error.  .dynsbss
-	is not an output section, so there is no need to check for it.
-
-Tue Sep 15 12:40:05 1998  Catherine Moore  <clm@cygnus.com>
-
-       * elf-bfd.h:  Add argument to elf_backend_get_symbol_type.
-
-Tue Sep 15 08:34:40 1998  Catherine Moore  <clm@cygnus.com>
-
-       * elf.c (swap_out_syms):  Pass type to elf_backend_get_symbol_type.
-       * elf32-arm.c:  Add HOWTO entries for R_ARM_GNU_VTINHERIT and
-       R_ARM_GNU_VTENTRY.
-       (elf32_arm_gc_mark_hook): New.
-       (elf32_arm_gc_sweep_hook): New.
-       (elf32_arm_check_relocs): New.
-       (elf32_arm_final_link_relocate):  Handle VTINHERIT and VTENTRY
-       relocations.
-       (elf32_arm_relocate_section): Handle VTINHERIT and VTENTRY
-       relocations.
-
-1998-09-10  Geoff Keating  <geoffk@ozemail.com.au>
-
-        * elf32-ppc.c (ppc_elf_relocate_section): If dynobj is NULL,
-        assume there is no PLT or GOT.
-
-Wed Sep  9 14:24:12 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-arm.c (elf32_arm_find_nearest_line): New function:  just
-	like _elf_bfd_find_nearest_line() except that STT_ARM_TFUNC is
-	also accepted as a function symbol type.
-
-Mon Sep  7 13:24:03 1998  Peter Schauer  <pes@regent.e-technik.tu-muenchen.de>
-
-	* rs6000-core.c (_LONG_LONG):  Define for AIX 4.x only.
-
-Sat Sep  5 20:40:18 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd-in.h (_bfd_nolink_bfd_gc_sections): Correct definition to
-	match definition of _bfd_gc_sections field.
-	* libbfd.h: Rebuild.
-
-Fri Sep  4 13:54:23 1998  David Miller  <davem@dm.cobaltmicro.com>
-
-	* elf32-sparc.c (elf32_sparc_relocate_section): Properly adjust
-	the addend of a dynamic relocation referencing a section.
-	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
-	(sparc64_elf_finish_dynamic_symbol): Fix the PLT relocation offset.
-
-Thu Sep  3 17:28:50 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elflink.h (bfd_elfNN_size_dynamic_sections): Verify that the
-	bed has a size_dynamic_sections routine before trying to use it.
-
-Mon Aug 31 14:49:22 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-mips.c (elf_mips_gnu_vtentry_howto): Use
-	_bfd_elf_rel_vtable_reloc_fn.
-
-Mon Aug 31 10:23:40 1998  Catherine Moore  <clm@cygnus.com>
-
-        * Makefile.am:  Add elf32-arm.c.
-        * Makefile.in:  Rebuild.
-        * elf-bfd.h:  Add elf_backend_get_symbol_type.
-        * elf.c (swap_out_syms):  If defined, call
-        elf_backend_get_symbol_type.
-        * elf32-arm.c: Define elf_backend_get_symbol_type.
-        (elf32_arm_get_symbol-type):  New routine.
-        (record_thumb_to_arm_glue):  Change to use STT_ARM_TFUNC.
-        (bfd_elf32_arm_process_before_allocation):  Change to
-        check for STT_ARM_TFUNC.
-        (elf32_arm_final_link_relocate):  Likewise.
-        * elfxx-target.h:  Add elf_backend_get_symbol_type.
-
-Fri Aug 28 19:44:07 1998  Richard Henderson  <rth@cygnus.com>
-
-	* archures.c (bfd_mach_alpha_ev[456]): New.
-	* cpu-alpha.c: Rework to match these types.
-	* bfd-in2.h: Rebuild.
-
-Fri Aug 28 19:38:53 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf-bfd.h (_bfd_elf_rel_vtable_reloc_fn): Declare.
-	* elf.c (_bfd_elf_rel_vtable_reloc_fn): New.
-
-	* elf32-i386.c (elf_howto_table): Add vtable relocs.
-	(elf_i386_reloc_type_lookup): Recognize them.
-	(elf_i386_check_relocs): Pass them off to generic code.
-	(elf_i386_relocate_section): Ignore them.
-	(elf_i386_gc_mark_hook, elf_i386_gc_sweep_hook): New.
-	(elf_backend_can_gc_sections): True.
-
-Thu Aug 20 15:03:45 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-arm.c (elf32_thumb_to_arm_stub): Check sym_sec is not NULL
-	before looking at owner field.
-	(elf32_arm_to_thumb_stub): Ditto.
-	(elf32_arm_relocate_section): Compute name before calling
-	elf32_arm_final_link_relocate().
-
-Thu Aug 20 11:30:17 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
-
-	* elf.c: comment and formatting cleanups.
-	* elfcore.h: ditto.
-
-Wed Aug 19 15:43:26 1998  Michael Snyder  <msnyder@cleaver.cygnus.com>
-
-	* elfcode.h (elf_object_p): Reject files of header type ET_CORE
-	(core files are treated differently than object files).
-	* elf-bfd.h (_bfd_elf_write_corefile_contents,
-	bfd_elf_mkcorefile): declare.
-	* elfxx-target.h (_bfd_elf_write_corefile_contents,
-	bfd_elf_mkcorefile): add to bfd_target vector.
-	* elfcore.h (elf_core_file_p): save the program header table,
-	and set the bfd architecture from the elf file header.
-	* elf.c (bfd_elf_mkcorefile): new function.
-	(_bfd_elf_write_corefile_contents): new function.
-	(assign_file_positions_for_segments): add cases for handling
-	PT_NOTE segments.  (assign_file_positions_except_relocs):
-	core files should be handled the same as exec files.
-	(prep_headers): identify core files as type ET_CORE.
-	(copy_private_bfd_data): identify the sections belonging to
-	the PT_NOTE segment.
-
-	* elf32-sparc.c (elf32_sparc_final_write_processing):
-	add break statement to default case.
-
-1998-08-19  Vladimir N. Makarov  <vmakarov@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Check that output
-	section (not input) will be in sections ".sbss", ".sbss2",
-	".sdata", and ".sdata" for R_PPC_SDAREL16, R_PPC_EMB_SDA2REL,
-	R_PPC_EMB_SDA21, R_PPC_EMB_RELSDA.  In all these cases also ignore
-	output_offset for correct evaluation of addend.
-
-Tue Aug 18 11:48:12 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-arm.c: Add prefix bfd_ to elf32_arm_get_bfd_for_interworking,
-        elf32_arm_allocate_interworking_sections and
-        elf32_arm_process_before_allocation.
-
-Tue Aug 18 11:46:00 1998  Nick Clifton  <nickc@cygnus.com>
-
-        * bfd-in.h: Ammend prototype for
-        elf32_arm_process_before_allocation to remove surplus third
-        argument.
-
-        * bfd-in2.h: Regenerate.
-
-Sat Aug 15 20:55:08 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_section): Handle indirect symbols.
-
-Fri Aug 14 09:12:28 1998  Stan Cox  <scox@cygnus.com>
-
-	* aoutx.h (aout_link_input_section_ext): Use the relocation already
-	calculated for RELOC_SPARC_REV32 case.
-
-Thu Aug 13 14:02:02 1998  Catherine Moore  <clm@cygnus.com>
-
-       * bfd-in.h:  Add prototypes for elf32_arm_get_bfd_for_interworking,
-       elf32_arm_allocate_interworking_sections and
-       elf32_arm_process_before_allocation.
-       * bfd-in2.h:  Regenerated.
-       * elf32-arm.c Define elf32_arm_link_hash_table.
-       (insert_thumb_branch): New routine.
-       (find_thumb_glue): New routine.
-       (find_arm_glue): New routine.
-       (record_arm_to_thumb_glue): New routine.
-       (record_thumb_to_arm_glue): New routine.
-       (elf32_arm_link_hash_table_create): New routine.
-       (elf32_arm_get_bfd_for_interworking): New routine.
-       (elf32_arm_allocate_interworking_sections) New routine.
-       (elf32_arm_process_before_allocation) New routine.
-       (elf32_thumb_to_arm_stub): New routine.
-       (elf32_arm_to_thumb_stub): New routine.
-       (elf32_print_private_bfd_data): Fix typo.
-       (elf32_arm_final_link_relocate):  Add argument sym_sec.
-       Check for branches to thumb symbols in case R_ARM_PC24.
-       Check for branches to arm symbols in case R_ARM_THM_PC22.
-       (elf32_arm_relocate_section):  Pass symbol section to
-       elf32_arm_final_link_relocate.
-
-Wed Aug 12 19:00:39 1998  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Generate PLT
-	entries unless the symbol is defined in the executable; in
-	particular, undefined weak symbols get a PLT entry.
-
-Wed Aug 12 14:48:33 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libaout.h: Remove nested comment to avoid warning.
-
-Wed Aug 12 08:10:11 1998 Catherine Moore  <clm@cygnus.com>
-
-       * elf32-arm.c (elf32_arm_final_link_relocate):  Rework
-       R_ARM_PC24 relocation.
-
-Tue Aug 11 14:42:26 1998  Catherine Moore  <clm@cygnus.com>
-
-       * elf32-arm.c (elf32_arm_final_link_relocate):  Remove unused
-       argument is_local.  Add argument sym_flags.  Check sym_flags
-       in R_ARM_ABS32 case.  Include addend for R_ARM_THM_PC22 case.
-       (elf32_arm_relocate_section):  Don't pass local sym and pass
-       sym_flags to elf32_arm_final_link_relocate.
-
-Mon Aug 10 20:38:39 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_calc_dynrel_sizes): Correct last change
-	to not count too few relocs for dynamicly linked executables.
-
-Mon Aug 10 15:35:34 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Never consider
-	symbols without a dynamic index dynamic.  Consider all weak
-	symbols dynamic.
-	(elf64_alpha_strip_section_from_output): Don't assume 1-1
-	correspondance between input and output sections.
-
-Mon Aug 10 15:31:39 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elflink.h (elf_gc_common_finalize_got_offsets): For backends
-	that use a .got.plt section start the got offset at zero.
-
-Mon Aug 10 17:31:21 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_write_processor): Correct the processor ID written
-	out for bfd_arch_m68k, accommodating change of March 25.
-
-Sun Aug  9 20:55:44 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf32-arm.c (elf32_arm_final_link_relocate):  Rework
-        R_ARM_THM_RPC22 relocations.
-
-Sat Aug  8 15:15:30 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Undef weak symbols
-	are always dynamic.
-	(elf64_alpha_calc_dynrel_sizes): Allow enough room for RELATIVE
-	.got relocs in -Bsymbolic shared objects.
-
-Wed Aug  5 15:48:08 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-arm.c: Add private flags to ELF header.
-	(elf32_arm_print_private_bfd_data): New Function.
-	(elf32_arm_set_private_flags): New Function.
-	(elf32_arm_copy_private_flags): New Function.
-	(elf32_arm_merge_private_bfd_data): New Function.
-
-Mon Aug  3 17:10:15 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_check_relocs): Permit WPLT30 against
-	a local symbol.
-	(elf32_sparc_relocate_section): Likewise.
-
-Sun Aug  2 03:19:23 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Init sgot to NULL.  Create the
-	.got if any relocation referrs to _GLOBAL_OFFSET_TABLE_.
-	(ppc_elf_relocate_section): Pull sgot and splt search to the start
-	of the function.  Recognize no .plt as static linking.
-
-1998-08-01  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf32-mips.c (_bfd_mips_elf_section_from_shdr): Don't pass
-	".liblist" string through gettext.
-
-Fri Jul 31 16:38:14 1998  Catherine Moore  <clm@cygnus.com>
-
-        * Makefile.am: Add support for elf32-arm.lo.
-        * Makefile.in: Rebuild.
-        * config.bfd (arm-*-elf):  Define targ_defvec and targ_selvecs.
-        (thumb-*-elf): Define targ_defvec and targ_selvecs.
-        * configure.in:  Handle bfd_elf32_littlearm_vec and bfd_elf32_bigarm_vec.
-        * configure: Regenerate.
-        * elf.c: (prep_headers):  Support arch_type of EM_ARM.
-        * targets.c:  Support new targets bfd_elf32_bigarm_vec and
-        bfd_target bfd_elf32_littlearm_vec.
-        * elf32-arm.c:  New file.
-
-Tue Jun 28 19:05:28 1998  Stan Cox  <scox@cygnus.com>
-
-	* libaout.h (M_SPARCLITE_LE): New machine.
-	* sunos.c (MACHTYPE_OK): Add machine M_SPARCLITE_LE.
-	* aoutf1.h (sunos_set_arch_mach): Add machine M_SPARCLITE_LE.
-	(sunos_write_object_contents): Add machine bfd_mach_sparc_sparclite_le
-	* aoutx.h (howto_table_ext): Add relocation R_SPARC_REV32.
-	(NAME(aout,machine_type)) Add machine bfd_mach_sparc_sparclite_le
-	(aout_link_input_section_ext): Add RELOC_SPARC_REV32 support.
-	* elf32-sparc.c (_bfd_sparc_elf_howto_table, sparc_reloc_map,
-	elf32_sparc_relocate_section): Rename R_SPARC_32LE to be R_SPARC_REV32
-	* libbfd.h (bfd_reloc_code_real_names): Rename BFD_RELOC_SPARC_32LE to
-	be BFD_RELOC_SPARC_REV32.
-	* reloc.c: Ditto.
-	* config.bfd (sparc86x-*-aout): New
-
-Fri Jul 24 13:54:19 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* linker.c (_bfd_generic_final_link): Allocate NULL symbol before
-	actually mapping the output sections.
-
-Fri Jul 24 11:24:29 1998  Jeffrey A Law  (law@cygnus.com)
-
-
-	* elf-m10300.c (mn10300_elf_howto): Add R_MN10300_24 entry.
-	(mn10300_elf_reloc_map): Similarly.
-	(mn10300_elf_final_link_relocate): Handle R_MN10300_24.
-
-Fri Jul 24 12:36:04 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (elf_mips_howto_table): Add reloc types used on
-	Irix 6.
-	(bfd_elf32_bfd_reloc_type_lookup): Add default case.
-	* elf64-mips.c: Replace all uses of mips_elf64_reloc_type with
-	elf_mips_reloc_type defined in elf/mips.h.
-
-1998-07-24  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf64-mips.c: Remove reloc_type definition completely.  It's now
-	in elf/mips.h.
-
-Thu Jul 23 13:33:19 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* elf64-mips.c (mips_elf64_reloc_type): #if 0 out more relocations
-	as they are defined in elf/mips.h now.
-
-Thu Jul 23 11:29:43 1998  Jeffrey A Law  (law@cygnus.com)
-
-
-	* Re-add lost change:
-        * elf-m10300.c (elf32_mn10300_link_hash_entry): Add new field
-        "movm_stack_size".
-        (mn10300_elf_relax_section): Include stack space for register saves
-        in the imm8 field of a "call" instruction.
-        (compute_function_info): Determine how much stack is allocated by
-        the movm instruction.  Fix typo.
-        (elf32_mn10300_link_hash_newfunc): Initialize movm_stack_size.
-
-Thu Jul 23 11:38:05 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-sparc.c (elf_backend_got_header_size): Define as 4.
-	* elf64-sparc.c (elf_backend_got_header_size): Define as 8.
-
-1998-07-22  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf32-ppc.c: Change use of pp_reloc_type to elf_ppc_reloc_type.
-
-Wed Jul 22 16:27:18 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-hppa.h: Let ELF header define the enum containing the
-	external reloc numbers.
-	* elf32-i386.h: Likewise.
-
-1998-07-22 14:57  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf-m10300.c: Let ELF header now define the macros to get the enum.
-	* elf32-mips.c: Likewise.
-	* elf32-ppc.c: Likewise.
-
-Wed Jul 22 13:53:52 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* bfd-in2.h: Change type of 'class' parameter to 'unsigned int' in
-	bfd_coff_set_symbol_class(), in order to avoid K&R compatability
-	prblems.
-	* bfd-in.h: Regenerate.
-	* coffgen.c (bfd_coff_set_symbol_class): Change type of 'class'
-	parameter to 'unsigned int' to avoid K&R compatability problems.
-
-Wed Jul 22 16:43:24 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_find_nearest_line): Change filename_ptr and
-	functionname_ptr to be const.  Change line_ptr to be unsigned.
-
-	* coffcode.h (coff_link_output_has_begun): Simplify handling when
-	macro is not defined.  Change second parameter from bfd_link_info
-	to coff_final_link_info.  Add prototype.
-	(coff_final_link_postscript): Simplify handling when macro is not
-	defined.  Add prototype.
-
-1998-07-22 13:08  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf-mn10300.c: Before include system specific ELF header define
-	START_RELOC_NUMBERS, RELOC_NUMBER, and END_RELOC_NUMBERS.
-	* elf32-mips.c: Likewise.
-	* elf32-ppc.c: Likewise.
-
-Wed Jul 22 13:46:51 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf64-mips.c (mips_elf64_reloc_type): Copy Ulrich's elf32-mips.c
-	temporary patch over to elf64-mips.c as well.
-
-1998-07-21  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elf32-mips.c (reloc_type): Temporarily disable definition of
-	standard relocation since they are now defined in elf/mips.h.
-
-Tue Jul 21 09:47:00 1998  Catherine Moore  <clm@cygnus.com>
-
-        * elf-m10200.c (mn10200_elf_final_link_relocate):
-        Modify range test for case R_MN10200_8.
-
-        * elf-m10300.c (mn10300_elf_final_link_relocate):
-        Modify range test for case R_MN10300_8.
-
-Mon Jul 20 18:50:54 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf-bfd.h (struct elf_backend_data): Add got_ & plt_header_size.
-	* elf32-i386.c (elf_backend_got_header_size): Define.
-	(elf_backend_plt_header_size): Define.
-	* elf32-m68k.c, elf32-mips.c, elf32-ppc.c: Likewise.
-	* elf32-sparc.c, elf64-alpha.c, elf64-sparc.c: Likewise.
-	* elfxx-target.h: Provide a default of zero.
-	* elflink.c (_bfd_elf_create_got_section): Use got_header_size.
-	* elflink.h (elf_gc_common_finalize_got_offsets): Likewise.
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Don't remove a PLT
-	entry from an executable, even if the plt refcount goes to 0.
-
-Mon Jul 20 12:47:26 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* aoutx.h (NAME(aout,find_nearest_line)): Also remember the
-	directory name at the line number.
-
-	* elf.c (_bfd_elf_find_nearest_line): Also consider symbols
-	with an unspecified type.
-
-Wed Jul 15 11:20:01 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c: Add undef of valid to avoid problem on SunOS.
-
-Tue Jul 14 15:30:59 1998  Richard Henderson  <rth@cygnus.com>
-
-	* config.bfd (i?86-pc-beos{pe,elf,}*): Recognize.
-
-Tue Jul 14 11:22:21 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf32-m68k.c (elf_m68k_check_relocs): Also reference count
-	R_68K_PCxx and R_68K_xx relocations.  Make sure that
-	ELF_LINK_HASH_NEEDS_PLT is always set for a PLT reloc reference.
-	(elf_m68k_gc_sweep_hook): Also reference count R_68K_PCxx and
-	R_68K_xx relocations.
-	(elf_m68k_adjust_dynamic_symbol): Reset the plt offset of a symbol
-	that has no plt entry.
-	(elf_m68k_relocate_section): Ignore the plt offset in a static
-	link.
-	* elflink.h (elf_adjust_dynamic_symbol): Reset the plt offset for
-	an ignored symbol.
-	(elf_gc_common_finalize_got_offsets): Set the got offsets also in
-	a static link.
-
-	* elf32-m68k.c (R_68K_GNU_VTINHERIT, R_68K_GNU_VTENTRY): New reloc
-	types.
-	(howto_table, reloc_map): Add entries for them.
-	(elf_m68k_check_relocs): Handle them.  Implement reference
-	counting for got and plt entries.
-	(elf_m68k_gc_mark_hook, elf_m68k_gc_sweep_hook): New functions.
-	(elf_m68k_adjust_dynamic_symbol): Handle unreferenced plt
-	symbols.
-	(rtype_to_howto_rel, elf_info_to_howto_rel): Delete.
-	(elf_m68k_relocate_section): Handle the new reloc types.
-	(bfd_elf32_bfd_final_link, elf_backend_gc_mark_hook,
-	elf_backend_gc_sweep_hook, elf_backend_can_gc_sections): Define.
-	* elflink.h (elf_link_add_object_symbols): When creating an
-	indirect reference for symbol versioning also copy the plt
-	offset.
-	(elf_fix_symbol_flags): When clearing the ELF_LINK_HASH_NEEDS_PLT
-	flag also reset the plt offset.
-	(elf_link_assign_sym_version): Likewise.
-	(elf_gc_common_finalize_got_offsets): Increment the got offset by
-	the size of the entry in bytes.
-	(elf_gc_allocate_got_offsets): Likewise.
-
-Tue Jul 14 11:18:14 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_gc_sections): Return true rather than falling off
-	the bottom.
-
-	* coffgen.c (bfd_coff_set_symbol_class): Call bfd_alloc, not
-	xmalloc.
-
-Mon Jul 13 11:06:31 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c: Supress definition of TARGET_UNDERSCORE and add a
-	comment describing when it should be enabled.
-	Changed definition of USER_LABEL_PREFIX to "", to fall into line
-	with GCC sources.
-
-Mon Jul 13 13:06:54 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_slurp_external_symbols): Handle call optimization
-	information ATN records.
-
-Fri Jul 10 16:31:06 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_slurp_external_symbols): Select an appropriate
-	section for an absolute symbol in a fully linked file.  Based on
-	patch from Christian Holland <CHolland@de.lucent.com>.
-
-Wed Jul  8 11:29:56 1998  Manfred Hollstein  <manfred@s-direktnet.de>
-
-	* coff-m88k.c (m88k_special_reloc): Don't lose the information
-	that a symbol is undefined.
-
-Tue Jul  7 21:47:02 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (som_bfd_gc_sections): Define.
-
-Mon Jul  6 11:35:50 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (aoutarm_std_reloc_howto): Do not complain about
-	overflows in ARM_26D patches, since they have already been
-	implmented.  Patch submitted by Dr. R.J. Black <rjb@dcs.gla.ac.uk>
-
-Sat Jul  4 12:25:36 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_write_object_contents): If we have any long
-	section names, call coff_write_symbols even if there are no
-	symbols.
-
-Fri Jul  3 13:11:35 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (copy_private_bfd_data): Only set phdr_included once for a
-	PT_LOAD segment, rather than only setting it once for the entire
-	file.
-
-	* elf.c (_bfd_elf_make_section_from_shdr): When setting the LMA,
-	rather than ignoring every phdr with a p_paddr of 0, ignore all
-	the phdrs if they all have a p_paddr of 0.
-
-	* stabs.c (_bfd_write_stab_strings): Check whether the .stabstr
-	section was discarded from the link.
-
-Fri Jul  3 14:39:05 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
-
-	* coff-sh.c (sh_insn_uses_freg): Ignore lowest bit of register number.
-
-Fri Jul  3 14:35:48 1998  J"orn Rennecke <amylaar@cygnus.co.uk>
-
-	* coff-sh.c (sh_insns_conflict): Load of fpscr conflicts with
-	floating point operations.
-
-Thu Jul  2 18:37:25 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_link_input_bfd): Skip undefined global
-	function symbols.
-
-Thu Jul  2 14:59:42 1998  Klaus Kaempf  <kkaempf@rmi.de>
-
-	Merge of vax/vms (read-only) support
-	* configure.com: Support Vax target.
-	* makefile.vms: Support Vax target.
-        * vms.h: Renamed from evax.h, merged vax/vms (read-only) support.
-	* vms.c: Renamed from evax-alpha.c, merged vax/vms (read-only)
-	support.
-	* vms-hdr.c: Renamed from evax-emh.c, merged vax/vms (read-only)
-	support.
-	* vms-gsd.c: Renamed from evax-egsd.c, merged vax/vms (read-only)
-	support.
-	* vms-tir.c: Renamed from evax-etir.c, merged vax/vms (read-only)
-	support.
-	* vms-misc.c: Renamed from evax-misc.c, merged vax/vms (read-only)
-	support.
-	* libbfd.c (real_read): Use unbuffered read on VMS/Vax.
-	* targets.c (bfd_target_ovax_flavour): New flavour.
-	(vms_alpha_vec): Renamed from evax_alpha_vec.
-	(vms_vax_vec): New.
-	(target_vector): Update accordingly.
-	* config.bfd (alpha*-*-*vms*): Use vms_alpha_vec, not
-	evax_alpha_vec.
-	(vax*-*-*vms*): New target.
-	* Makefile.am: Update for renamed files.  Rebuild dependencies.
-	* bfd-in2.h: Rebuild.
-	* configure.in, Makefile.in, aclocal.m4: Rebuild.
-
-Thu Jul  2 13:31:55 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	Based on patch from Matt Semersky <matts@scd.hp.com>:
-	* linker.c (_bfd_generic_final_link): Force a trailing NULL
-	pointer on abfd->outsymbols.
-	(generic_add_output_symbol): Handle NULL sym parameter.
-
-Wed Jul  1 17:05:53 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf.c (copy_private_bfd_data): Add support for changing VMA or
-	LMA of sections.
-
-Wed Jul  1 16:58:50 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (sh_relax_delete_bytes): Correct address comparisons
- 	when handling 32 bit immediate relocs.
-	* elf32-sh.c (sh_elf_relax_delete_bytes): Likewise.
-
-Tue Jun 30 09:55:03 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* section.c (STD_SECTION): Account for recently added gc_mark
-	field in struct asection.
-
-	* elf-m10300.c (bfd_mn10300_elf_merge_private_bfd_data): New function.
-	(bfd_elf32_bfd_merge_private_bfd_data): Define.
-
-Thu Jun 25 18:31:41 1998  Richard Henderson  <rth@cygnus.com>
-
-	ELF Section-level Garbage Collection:
-	* bfd.c (bfd_gc_sections): New.
-	* aout-adobe.c: Hook to default implementation.
-	* aout-target.h, aout-tic30.c, binary.c, bout.c: Likewise.
-	* coff-alpha.c, coff-mips.c, coff-rs6000.c, coffcode.h: Likewise.
-	* evax-alpha.c, i386msdos.c, i386os9k.c, ieee.c: Likewise.
-	* ihex.c, nlm-target.h, oasys.c, ppcboot.c, srec.c: Likewise.
-	* tekhex.c, versados.c: Likewise.
-	* libbfd-in.h (_bfd_nolink_bfd_gc_sections): New.
-	* targets.c (BFD_JUMP_TABLE_LINK): Add _bfd_gc_sections.
-
-	* reloc.c (BFD_RELOC_VTABLE_INHERIT, BFD_RELOC_VTABLE_ENTRY): New.
-	(bfd_generic_gc_sections): New.
-	* section.c (SEC_KEEP): New.
-	(asection): Add gc_mark member.
-
-	* elfcode.h (elf_gc*): New name remappings.
-	* elflink.h (elf_link_input_bfd): Don't set contents on stabs
-	sections to be excluded.
-	(elf_gc_mark, elf_gc_sweep, elf_gc_sweep_symbol): New.
-	(elf_gc_propogate_vtable_entries_used): New.
-	(elf_gc_smash_unused_vtentry_relocs): New.
-	(elf_gc_sections, elf_gc_record_vtinherit, elf_gc_record_vtentry): New.
-	(elf_gc_common_finalize_got_offsets): New.
-	(elf_gc_allocate_got_offsets, elf_gc_common_final_link): New.
-	* elfxx-target.h: Add and default gc hooks.
-
-	* elf-bfd.h (struct elf_link_hash_entry): Swap got_offset/plt_offset
-	for unions.
-	(struct elf_obj_tdata): Likewise for local_got_offsets.
-	* elf.c, elf-i386.c, elf32-m68k.c, elf32-mips.c: Update all uses.
-	* elf32-ppc.c, elf32-sparc.c, elf64-alpha.c: Likewise.
-	* elf64-sparc.c, elflink.h: Likewise.
-
-	* elf-bfd.h (struct elf_link_hash_entry): Add vtable members.
-	(ELF_LINK_HASH_MARK): Define.
-	(struct elf_backend_data): Add GC hooks.
-	* elf.c (_bfd_elf_link_hash_newfunc): Zero vtable members.
-
-	* elf-m10300.c (mn10300_elf_check_relocs): New.
-	(mn10300_elf_gc_mark_hook): New.
-	(R_MN10300_GNU_VTINHERIT, R_MN10300_GNU_VTENTRY): New.
-	(elf_mn10300_howto, mn10300_reloc_map): Handle them.
-	(mn10300_elf_final_link_relocate): Likewise.
-	(mn10300_elf_relocate_section): Likewise.
-	(elf_backend_can_gc_sections): Define.
-	* elf32-mips.c (R_MIPS_GNU_VTINHERIT, R_MIPS_GNU_VTENTRY): New.
-	(elf_mips_gnu_vtinherit_howto, elf_mips_gnu_vtentry_howto): New.
-	(bfd_elf32_bfd_reloc_type_lookup): Handle them.
-	(mips_info_to_howto_rel): Likewise.
-	(mips_elf_relocate_section): Likewise.
-	(mips_elf_check_relocs): Likewise.
-	(mips_elf_gc_mark_hook, mips_elf_gc_sweep_hook): New.
-	(elf_backend_can_gc_sections): Define.
-	* elf32-ppc.c (R_PPC_GNU_VTINHERIT, R_PPC_GNU_VTENTRY): New.
-	(ppc_elf_howto_raw): Handle them.
-	(ppc_elf_reloc_type_lookup): Likewise.
-	(ppc_elf_relocate_section): Likewise.
-	(ppc_elf_check_relocs): Reference count .got and .plt entires.
-	Handle new vtable relocs.
-	(ppc_elf_adjust_dynamic_symbol): Recognize unused .plt entries.
-	(ppc_elf_gc_mark_hook, ppc_elf_gc_sweep_hook): New.
-	(elf_backend_can_gc_sections): Define.
-
-Fri Jun 26 10:48:23 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* archures.c (bfd_mach_mn10300): Define.
-	* elf-m10300.c: Include elf/mn10300.h
-	(elf_mn10300_mach): New function.
-	(_bfd_mn10300_elf_final_write_processing): Likewise.
-	(_bfd_mn10300_elf_object_p): Likewise.
-	(elf_backendfinal_write_processing): Define.
-	(elf_backend_object_p): Likewise.
-
-Thu Jun 25 18:31:08 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_perform_relocation): Fix HI16_S
-	relocation.
-
-Wed Jun 24 17:17:57 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_bfd_final_link): Loop over input_bfds using the
-	link_next field, not the next field.
-
-Sun Jun 21 19:38:39 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (map_sections_to_segments): Check the section address
-	against the phdr size both with and without a modulo of
-	maxpagesize.
-
-Fri Jun 19 17:08:18 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_size_dynamic_sections): Only strip a
-	linker created empty input section if the output section has the
-	same name.
-
-	* elflink.h (elf_link_output_extsym): Print an error message if
-	_bfd_elf_section_from_bfd_section fails.
-
-	* elf.c (_bfd_elf_section_from_bfd_section): Call bfd_set_error on
-	failure.
-
-Tue Jun 16 11:55:55 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (copy_private_bfd_data): Improve handling of Solaris
- 	native linker output.  Avoid putting an empty section in more than
- 	one segment.
-
-Fri Jun 12 13:30:17 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* po/Make-in (all-yes): If maintainer mode, depend on .pot file.
-	($(PACKAGE).pot): Unconditionally depend on POTFILES.
-
-Fri Jun 12 13:34:02 1998  Doug Evans  <devans@canuck.cygnus.com>
-
-	* elf.c (swap_out_syms): New arg relocatable_p.
-	Don't add section VMA to symbols for relocatable output.
-	(_bfd_elf_compute_section_file_positions): Update call to
-	swap_out_syms.
-
-Mon Jun  8 15:20:57 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_perform_relocation): Make comparisons
-	against 'addend' be signed rather than unsigned.
-
-Sat Jun  6 00:31:21 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-m32r.c: Add prototyps for static functions.
-
-	* coff-arm.c: Add prototypes for static functions.
-
-Fri Jun  5 17:21:51 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf.c (elf_sort_sections): Sort by LMA first then VMA, since the
-	LMA is used to order sections in a segment.
-
-	* elf32-v850.c: Add prototypes for static functions.
-	Change type of addend parameter to bfd_vma in various functions.
-
-Fri Jun  5 18:09:58 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (howto_table_ext): Change RELOC_BASE13 to use
-	complain_overflow_signed instead of complain_overflow_bitfield.
-
-Fri Jun  5 15:11:11 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf.c (elf_map_symbols): Don't add section VMA to symbol value
-	when comparing against 0.
-
-Wed Jun  3 17:52:49 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (config.status): New target.
-	* Makefile.in: Rebuild.
-
-Wed Jun  3 12:18:24 1998  Stan Cox  <scox@equinox.cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Give an
-	error if previous object endianness doesn't match current object.
-
-Tue Jun  2 17:50:59 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_print_private_bfd_data): Call
-	_bfd_elf_print_private)bfd_data ().
-
-Tue Jun  2 15:29:35 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_merge_symbol): Don't always set type_change_ok
-	and size_change_ok.
- 	(elf_link_add_object_symbols): Set type_change_ok and
-	size_change_ok before calling elf_merge_symbol.
-
-	* elf32-mips.c (mips_elf_relocate_section): If we issue an
-	undefined symbol error, don't also issue an overflow error.
-
-Tue Jun  2 13:51:00 1998  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): The target of an
-	R_PPC_LOCAL24PC relocation should be local; if not, print an error
-	message instead of crashing.
-
-Mon Jun  1 18:23:12 1998  Yuli Barcohen  <yuli.barcohen@telrad.co.il>
-
-	* archures.c (bfd_mach_cpu32): Define.
-	(bfd_default_scan): Add case for 68060.  Fix 68332 case to use
-	bfd_mach_cpu32.
-	* cpu-m68k.c (arch_info_struct): Add m68k:cpu32.
-	* ieee.c: Include <ctype.h>.
-	(ieee_object_p): Parse out process ID string to make it more
-	likely to be acceptable for bfd_scan_arch.
-	* bfd-in2.h: Rebuild.
-
-Mon Jun  1 11:12:02 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-m32r.c (m32r_elf_print_private_bfd_data): Also call
-	_bfd_elf_print_private_bfd_data() so that the program header will
-	be displayed.
-
-Mon Jun  1 12:14:28 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (coff_swap_sym_in): Check for C_SECTION rather than
-	0x68.  Reindent.  Add some comments.
-
-Fri May 29 09:58:08 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf.c (copy_private_bfd_data): Adjust physical address of
-	segment in output BFD to contain LMAs of its sections.
-
-Tue May 26 19:37:47 1998  Stan Cox  <scox@equinox.cygnus.com>
-
-	* elf32-sparc.c (_bfd_sparc_elf_howto_table, sparc_reloc_map,
-	elf32_sparc_relocate_section): Added R_SPARC_32LE for little
-	endian data 32 bit relocations.
-	(elf32_sparc_merge_private_bfd_data): Check if linking little
-	endian objects with big endian objects.
-	(elf32_sparc_object_p): Set bfd_mach_sparc_sparclite_le.
-	(elf32_sparc_final_write_processing): Set EF_SPARC_LEDATA in e_flags.
-	* libbfd.h (bfd_reloc_code_real_names): Added BFD_RELOC_SPARC_32LE.
-	* reloc.c: Same.
-	* cpu-sparc.c (arch_info_struct): Added sparc:sparclite_le
-	* archures.c (bfd_mach_sparc_sparclite_le): New.
-	* bfd-in2.h (BFD_RELOC_SPARC_32LE, bfd_mach_sparc_sparclite_le): New.
-
-Thu May 21 16:59:28 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* peicode.h (add_data_entry): Fix precedence of operators in if ()
-	statement.
-
-Tue May 19 18:41:19 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd-in.h: Move over patch to bfd-in2.h.
-
-	* reloc.c (bfd_check_overflow): Add casts before shifts which may
- 	not fit in 32 bits.
-	(_bfd_relocate_contents): Likewise.
-
-Mon May 18 14:44:15 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* peicode.h (add_data_entry): If the section has no private data
-	then do not create a Data Dictionary entry for it.
-
-Mon May 18 00:09:28 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_section): Set again on changes.
-	(elf64_alpha_can_merge_gots, elf64_alpha_merge_gots,
-	elf64_alpha_size_got_sections): Rewrite, handling multiple got
-	subsections during relaxation more correctly.
-
-Thu May 14 14:22:58 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* bfd-in2.h: Add new prototype: bfd_coff_set_symbol_class ().
-	Add extra argument to bfd_arm_process_before_allocation ().
-	* bfd-in.h: Reflect changes made in bfd-in2.h.
-	* coffgen.c (bfd_coff_set_symbol_class): New function.  Set the
-	coff class of a BFD symbol.
-	* coff-arm.c: Add support for interworking between Thumb code and
-	non-interworking aware ARM code.
-
-Sun May 10 22:33:59 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* po/Make-in (install-info): New target.
-
-Thu May  7 17:40:56 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* filemode.c: Remove; not used.
-
-	If sysdep.h includes a header file, don't include it again:
-	* aix386-core.c: Don't include <stdio.h>, <stddef.h>, or
-	<errno.h>.
-	* aoutx.h: Don't include <string.h>.  Use "sysdep.h" rather than
-	<sysdep.h>.
-	* archive.c: Don't include <string.h> or <errno.h>.
-	* evax-alpha.c; Don't include <stdio.h>.
-	* evax-egsd.c: Likewise.
-	* evax-etir.c: Likewise.
-	* evax-misc.c: Likewise.
-	* evax-emh.c: Likewise.  Also, don't include <sys/types.h>.
-	* hppabsd-core.c: Don't include <stdio.h>, <sys/types.h>, or
-	<errno.h>.
-	* hpux-core.c: Likewise.
-	* netbsd-core.c: Likewise.
-	* som.c: Likewise.
-	* libbfd.c: Don't include <sys/types.h>.
-	* nlmcode.h: Don't include <string.h>.
-	* osf-core.c: Don't include <string.h> or <stdio.h>.
-	* ptrace-core.c: Don't include <stdio.h>, <sys/types.h>,
-	<errno.h>, or <unistd.h>.
-	* trad-core.c: Don't include <stdio.h> or <sys/types.h>.
-
-Thu May  7 13:12:50 1998  Klaus Kaempf  <kkaempf@progis.de>
-
-	* configure.com: If the version number can not be found in
-	configure.in, set it to "unknown" rather than "2.8.1".
-
-Wed May  6 09:46:05 1998  Gavin Koch  <gavin@cygnus.com>
-
-	* elf32-mips.c (elf_mips_mach): New.
-	(_bfd_mips_elf_object_p): Use elf_mips_mach.
-	(_bfd_mips_elf_final_write_processing): Use the names
-	of machines, rather than the numbers.  Set both the ARCH
-	and MACH in e_flags.  Handle a few more specific machines.
-	(_bfd_mips_elf_merge_private_bfd_data): Merge both
-	EF_MIPS_ARCH and EF_MIPS_MACH.
-
-Tue May  5 21:01:53 1998  Richard Henderson  <rth@cygnus.com>
-
-	* syms.c (bfd_is_local_label): Revert last change.
-	* srec.c (srec_write_symbols): Discard debugging symbols.
-
-Tue May  5 23:36:06 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* som.c: Include <ctype.h>.
-	* som.h: Don't include sysdep.h.
-
-Tue May  5 18:29:24 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* libbfd.h: Rebuilt.
-	* libbfd-in.h: Removed gettext includes and defines.
-	* sysdep.h: Moved gettext-related includes and defines here.
-
-Tue May  5 16:47:54 1998  Richard Henderson  <rth@cygnus.com>
-
-	* srec.c (srec_write_symbols): Use bfd_is_local_label rather than
-	an ad-hoc test.  Kill bogus #if 0 code.
-	* syms.c (bfd_is_local_label): Consider BSF_DEBUGGING symbols local.
-
-Mon May  4 16:10:33 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_check_dynamic_reloc): Don't use the PLT address
-	when generating a normal executable for a symbol defined in a
-	regular file.  When copying a reloc into the output file, adjust
-	the addend for a PC relative reloc against a global symbol.
-
-Mon May  4 10:08:18 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* libbfd.h: Rebuilt.
-	* libbfd-in.h (_): Define as dgettext.
-
-Mon May  4 11:02:23 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-arm.c (coff_arm_relocate_section): Cast to bfd_signed_vma,
-	not signed.
-	* peicode.h (pe_saved_coff_bfd_print_private_bfd_data): Use PARAMS
-	when declaring parameter types.
-	(pe_saved_coff_bfd_copy_private_bfd_data): Likewise.
-
-Wed Apr 29 15:35:03 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* config.bfd: If we include any ELF targets in targ_defvec and/or
-	targ_selvecs, then add the generic ELF targets to targ_selvecs.
-	* elf32-gen.c (dummy): New static const variable.
-	(elf_generic_info_to_howto): New static function.
-	(elf_generic_info_to_howto_rel): New static function.
-	(elf_info_to_howto): Define as elf_generic_info_to_howto.
-	(elf_info_to_howto_rel): Define as elf_generic_info_to_howto_rel.
-	* elf64-gen.c: Same changes as elf32-gen.c.
-	* elfcode.h (elf_object_p): For the generic target, ignore a
-	failure of bfd_default_set_arch_mach.  Fix indentation a bit.
-
-Tue Apr 28 20:05:52 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in (WIN32LIBADD): Add -lintl on cygwin32.
-	* configure: Rebuild.
-
-Tue Apr 28 12:16:57 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-	* config.bfd:  Update OSR5/Unixware patterns.
-
-Mon Apr 27 18:02:24 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): Allow for holes
-	between sections added by a link script.
-
-Mon Apr 27 11:49:55 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Change version number to 2.9.4
-	* configure: Rebuild.
-
-	Based on patch from H.J. Lu <hjl@gnu.org>:
-	* elf.c (bfd_elf_get_bfd_needed_list): New function.
-	* bfd-in.h (bfd_elf_get_bfd_needed_list): Declare.
-	* bfd-in2.h: Rebuild.
-
-Sat Apr 25 20:07:53 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (struct alpha_relax_info): Replace elfsym with other.
-	Change all users.
-
-Sat Apr 25 18:29:07 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (struct alpha_relax_info): Add tsec & elfsym members.
-	(elf64_alpha_relax_section): Fill them in.
-	(elf64_alpha_relax_opt_call): Implement more than a stub.
-	(elf64_alpha_add_symbol_hook): Don't set SEC_LOAD or default
-	alignment on .scommon.
-	(elf64_alpha_merge_gots): Merge use counts as well.
-
-Sat Apr 25 14:07:29 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_relax_section): Use the proper section
-	for calculating a local symbol's address.
-	(elf64_alpha_calc_got_offsets): Skip entries with 0 use count.
-	Set the .got's cooked size as well as the raw size.
-
-Fri Apr 24 09:16:00 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_print_private_bfd_data): Add
-	internationalisation of printed information.
-
-	* coff-arm.c (coff_arm_print_private_bfd_data): Add
-	internationalisation of printed information.
-
-Fri Apr 24 12:09:18 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* syms.c (struct indexentry): Change directory_name, file_name,
-	and function_name fields to char *.
-	(struct stab_find_info): Change cached_file_name field to char *.
-
-Thu Apr 23 08:13:04 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* peicode.h (dir_names): Add missing N_() macros to dir_names array.
-
-Wed Apr 22 13:06:15 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* po/Make-in (MKINSTALLDIRS): Don't look in $(top_srcdir).
-
-Wed Apr 22 17:48:48 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (install-data-local): Make $(includedir).
-	* Makefile.in: Rebuild.
-
-Wed Apr 22 13:06:15 1998  Tom Tromey  <tromey@cygnus.com>
-
-	* libbfd-in.h: Use `gettext' and not `dgettext' for now.
-
-Wed Apr 22 12:53:40 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (INCLUDES): Add -I$(srcdir)/../intl -I../intl.
-	* Makefile.in: Rebuild.
-
-	* bfd-in2.h: Rebuild for Nick's changes.
-
-Tue Apr 21 23:11:51 1998  Richard Henderson  <rth@cygnus.com>
-
-	* archive.c (_bfd_generic_read_ar_hdr_mag): Fix lossage in last
-	change wrt length == max_namelen.
-
-Tue Apr 21 21:19:36 1998  Tom Tromey  <tromey@scribbles.cygnus.com>
-
-	* Many files: Added gettext invocations around user-visible
-	strings.
-	* libbfd-in.h: Added gettext includes and defines.
-	* acconfig.h (ENABLE_NLS, HAVE_CATGETS, HAVE_GETTEXT, HAVE_STPCPY,
-	HAVE_LC_MESSAGES): Define.
-	* configure.in: Call CY_GNU_GETTEXT.  Create po/Makefile.in and
-	po/Makefile.
-	* Makefile.am (SUBDIRS): Added po.
-	(POTFILES): New macro.
-	(po/POTFILES.in): New target.
-	(SOURCE_HFILES): New macro.
-	(HFILES): Use it.
-	* po/Make-in, po/POTFILES.in, po/bfd.pot: New files.
-
-Tue Apr 21 13:38:18 1998 Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* elfcore.h (bfd_prstatus):  Copy core_prstatus from the first
-	NT_PRSTATUS note section encountered, it contains the status of
-	the currently executing thread when the core file was written.
-
-Tue Apr 21 10:00:12 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* libcoff.h: Add extra parameter to
-	bfd_coff_link_output_has_begun overrideable function.
-	* cofflink.c: Pass extra parameter to
-	bfd_coff_link_output_has_begun function.
-	* bfd-in.h: Add prototypes for exported ARM interworking
-	functions.
-	* peicode.h: ARM specific code reorganised to conform to BFD
-	coding conventions.
-	* coffcode.h: ARM specific code reorganised to conform to BFD
-	coding conventions.
-	* coff-arm.c: Code reorganised to conform to the BFD coding
-	conventions.  Global variables have been moved into an ARM
-	specific hash table structure and a new function:
-	bfd_arm_get_bfd_for_interworking() has been created which is
-	called from the linker scripts.
-
-Tue Apr 21 00:11:51 1998  Richard Henderson  <rth@cygnus.com>
-
-	* archive.c (_bfd_generic_read_ar_hdr_mag): Simplify end-of-name test.
-
-	* elf64-alpha.c (elf64_alpha_find_reloc_at_ofs): Renamed from
-	elf64_alpha_relax_find_reloc_ofs.  Changed all callers.
-	(elf64_alpha_add_symbol_hook): Put small commons in .scommon not .sbss.
-	(elf64_alpha_size_got_sections): Don't merge .got sections twice.
-
-Sat Apr 18 01:21:04 1998  Stan Cox  <scox@cygnus.com>
-
-	* config.bfd: Added sparc86x support.
-
-Fri Apr 17 22:29:04 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_relocate_section): Do not complain about
-	an out of range pc-relative jump/call to an undefined weak symbol.
-
-Thu Apr 16 13:49:00 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_do_reloc_gpdisp): Do all gpdisp
-	comparisons signed.
-
-Thu Apr 16 11:43:33 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* archive.c (bfd_generic_archive_p): If a slurp subroutine returns
- 	an error other than bfd_error_system_call, set the error to
- 	bfd_error_wrong_format.
-
-	* targets.c (bfd_target_vector) [SELECT_VECS not defined]: Add
-	bfd_elf32_powerpcle_vec.
-
-	* elf.c (copy_private_bfd_data): If all the p_paddr fields in the
-	program segments are zero, don't set p_paddr_valid.
-
-Wed Apr 15 22:15:16 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c: Initial implementation of relaxation --
-	(struct alpha_elf_link_hash_entry): Add use_count member.
-	(elf64_alpha_check_relocs): Initialize and increment it.
-	(elf64_alpha_can_merge_gots): Check it when considering merging.
-	(elf64_alpha_merge_gots): Drop entries with zero use.
-	(elf64_alpha_calc_got_offsets_for_symbol): Likewise.
-	(elf64_alpha_always_size_sections): Split out got sizing ...
-	(elf64_alpha_size_got_sections): ... here.  New function.
-	(elf64_alpha_relax_find_reloc_ofs): New function.
-	(elf64_alpha_relax_with_lituse): Likewise.
-	(elf64_alpha_relax_without_lituse): Likewise.
-	(elf64_alpha_relax_opt_call): Likewise.
-	(elf64_alpha_relax_section): Likewise.
-	(elf64_alpha_add_symbol_hook): Likewise.
-	(elf64_alpha_howto_table): Implement GPRELHIGH/LOW & IMMED_GP_16.
-	(elf64_alpha_relocate_section): Likewise.
-	(bfd_elf64_bfd_relax_section): Define.
-	(elf_backend_add_symbol_hook): Likewise.
-
-Wed Apr 15 16:08:46 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf.c (prep_headers): Use new EM_SPARCV9 symbol.
-	* elf64-sparc.c (ELF_MACHINE_CODE): Likewise.
-	(ELF_MACHINE_ALT1): New.  Set to EM_OLD_SPARC64.
-
-Wed Apr 15 11:34:33 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Add -lkernel32 to WIN32LIBADD on cygwin32.
-	* configure: Rebuild.
-
-Mon Apr 13 16:46:27 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (libbfd_la_LIBADD): Add @WIN32LIBADD@.
-	(libbfd_la_LDFLAGS): Add @WIN32LDFLAGS@.
-	* configure.in: Define and substitute WIN32LDFLAGS and
-	WIN32LIBADD.
-	* aclocal.m4: Rebuild with new libtool.
-	* configure, Makefile.in: Rebuild.
-
-Fri Apr 10 13:44:27 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_write_object_contents): Move a PE COMDAT symbol
-	before any other symbols in the same section.
-
-Wed Apr  8 14:50:23 1998  Michael Meissner  <meissner@cygnus.com>
-
-	* config.bfd (powerpc*-*-*): Remove PowerPC NT support from ELF
-	systems.
-
-Tue Apr  7 16:25:31 1998  Gavin Romig-Koch  <gavin@cygnus.com>
-
-	* dwarf2.c (comp_unit): Move it earlier in the source. Add
-	addr_size.
-	(read_address): Replace 'bdf*' argument with 'comp_unit*' argument.
-        Use addr_size for address size, rather than sizeof(bfd_vma).
-	(read_attribute): Replace bdf* argument with 'comp_unit*' argument.
-	Fix call to read_address.
-	(decode_line_info): Replace bdf* argument with 'comp_unit*' argument.
-	Scrap other unneeded arguments.  Fix call to read_address.
-	(scan_unit_for_functions): Fix call to read_attribute.
-	(parse_comp_unit): We now handle more values for addr_size.
-	Set addr_size in unit.  Fix call to read_attribute and
-	decode_line_info.
-
-Tue Apr  7 15:44:47 1998  Gavin Romig-Koch <gavin@cygnus.com>
-
-	* dwarf2.c (parse_comp_unit): Drop use of unit->name when it is null.
-
-Tue Apr  7 12:35:18 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* archures.c (bfd_default_scan): Add m68k cases back to default
-	switch, reverting patch of March 25, since IEEE support depends
-	upon them.
-
-Mon Apr  6 14:06:40 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (diststuff): New target.
-	* Makefile.in: Rebuild.
-
-Sun Apr  5 16:21:44 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (som_bfd_ar_write_symbol_stuff): Fix computation of
-	som_offset when we have an extended name table.
-
-Sun Apr  5 16:04:39 1998  H.J. Lu  <hjl@gnu.org>
-
-	* Makefile.am (stamp-lib): Check that .libs/libbfd.a exists before
-	trying to copy it.
-	* Makefile.in: Rebuild.
-
-Fri Apr  3 11:09:42 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Generate section
-	symbols when creating a shared library.
-	(elf_m68k_adjust_dynindx): New function, used by above code.
-	(elf_m68k_finish_dynamic_sections): Initialize the section
-	symbols.
-	(elf_m68k_relocate_section): Change abort to BFD_ASSERT.
-
-Wed Apr  1 16:04:02 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (in_reloc_p): Use ARM_RVA32 in place of constant
-	value 11.
-
-Wed Apr  1 13:36:58 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf32-m68k.c (elf_m68k_relocate_section, case R_68K_PLT*O): Fix
-	assertion.
-
-Tue Mar 31 00:12:12 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* elf-m10300.c (mn10300_elf_relax_section): Correctly handle
-	absolute symbols.
-
-Mon Mar 30 12:46:15 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Set version to 2.9.1.
-	* configure: Rebuild.
-
-	* Branched binutils 2.9.
-
-Mon Mar 30 12:20:50 1998  Brent Baccala  <baccala@freesoft.org>
-
-	* syms.c (ENABLE_CACHING): Define.
-	(struct indexentry): Define.
-	(struct stab_cache): Remove.
-	(cmpindexentry): New static function.
-	(struct stab_find_info): Add new fields: indextable,
-	indextablesize, cached_indexentry, cached_offset, cached_stab, and
-	cached_file_name.  Remove fields: file_cache, function_cache, and
-	line_cache.
-	(_bfd_stab_section_find_nearest_line): Rewrite to build a sorted
-	index table and search it.
-
-Mon Mar 30 10:39:34 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (_bfd_elf_copy_private_section_data): Call
-	copy_private_bfd_data once we've seen the last SEC_ALLOC section.
-
-	* cpu-mips.c: Remove trailing comma at end of enumeration list.
-
-Sat Mar 28 16:33:02 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-arm.c: Define all globally visible variables and functions
-	only when COFF_WITH_PE is not defined.
-	* configure.in (armpe_little_vec, armpe_big_vec): Add
-	coff-arm.lo.
-	* configure: Rebuild.
-
-Fri Mar 27 16:06:02 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	Fix some gcc -Wall warnings:
-	* aout-arm.c (MY(fix_pcrel_26)): Add casts to avoid warnings.
-	* archive.c (_bfd_generic_read_ar_hdr_mag): Likewise.
-	* archures.c (bfd_default_scan): Likewise.
-	* bfd.c (bfd_scan_vma): Likewise.
-	* binary.c (mangle_name): Likewise
-	* coff-arm.c (aoutarm_fix_pcrel_26): Likewise.
-	* coff-sh.c (sh_relocate_section): Likewise.
-	* coff-stgo32.c (create_go32_stub): Likewise.
-	* coffcode.h (coff_slurp_line_table): Likewise.
-	* ecoff.c (_bfd_ecoff_write_armap): Likewise.
-	* elf.c (_bfd_elf_make_section_from_shdr): Likewise.
-	(assign_file_positions_for_segments): Likewise.
-	* elf32-mips.c (mips_elf_relocate_section): Likewise.
-	* elf32-ppc.c (ppc_elf_add_symbol_hook): Likewise.
-	* oasys.c (oasys_write_sections): Likewise.
-	* ppcboot.c (ppcboot_object_p): Likewise.
-	(mangle_name): Likewise.
-	* riscix.c (riscix_fix_pcrel_26): Likewise.
-	* srec.c (srec_scan): Likewise.
-	* stabs.c (_bfd_write_section_stabs): Likewise.
-	* sunos.c (sunos_add_dynamic_symbols): Likewise.
-	* aout-ns32k.c (_bfd_ns32k_relocate_contents): Add default case to
-	switch.  Declare parameters for function pointers.
-	* archures.c (bfd_default_scan): Add braces to avoid ambiguous if
-	warning.
-	* elf.c (elf_sort_sections): Likewise.
-	* coff-arm.c (coff_thumb_pcrel_common): Initialize relocation.
-	Add default cases to switches.
-	(coff_arm_relocate_section): Remove unused local variables.
-	Always set rstat.
-	(coff_arm_bfd_set_private_flags): Change flag variable to type
-	flagword.
-	* coff-mips.c (mips_relocate_section): Initialize use_lo.
-	* coff-ppc.c (ppc_record_toc_entry): Change i to unsigned int.
-	(dump_toc): Change cat to const, and initialize it.
-	* coff-sh.c (sh_relax_delete_bytes): Initialize start and voff.
-	* elf32-sh.c (sh_elf_relax_delete_bytes): Likewise.
-	(sh_elf_relocate_section): Initialize r_symndx.
-	* coffcode.h (coff_compute_section_file_positions): Only declare
-	old_sofar if ALIGN_SECTIONS_IN_FILE.
-	(coff_write_object_contents): Initialize csym.
-	* coffgen.c (coff_pointerize_aux): Make type and class unsigned.
-	* cpu-ns32k.c (_bfd_ns32k_get_displacement): Add default case to
-	switch.
-	* dwarf2.c: Include libiberty.h.
-	(read_2_signed_bytes, read_4_signed_bytes): Comment out.
-	(decode_line_info): Remove unused local variables.
-	* elf32-m32r.c (m32r_elf_sda16_reloc): Likewise.
-	(m32r_elf_relocate_section): Likewise.
-	* elf32-v850.c (v850_elf_store_addend_in_insn): Likewise.
-	(v850_elf_reloc): Likewise.
-	* elf-bfd.h (elf_linker_section_t): Make alignment unsigned.
-	(struct elf_obj_tdata): Make cverdefs and cverrefs unsigned.
-	* elf.c (assign_file_positions_for_segments): Always set adjust.
-	* elf32-d30v.c (bfd_elf_d30v_reloc): Initialize tmp_addr.  Fully
-	parenthesize expression.
-	* elf32-m32r.c (m32r_elf_relocate_section): Always initialize h.
-	(m32r_elf_object_p): Return a value.
-	(m32r_elf_print_private_bfd_data): Change fprintf format string.
-	* elf32-mips.c (mips_elf_final_link): Initialize last.
-	(mips_elf_finish_dynamic_sections): Initialize last and dindx.
-	* elf32-v850.c (v850_elf_object_p): Return a value.
-	(v850_elf_print_private_bfd_data): Change fprintf format string.
-	* elfcode.h (elf_slurp_symbol_table): Change symcount and i to
-	unsigned long.
-	* elflink.h (elf_link_add_object_symbols): Change vernum to
-	unsigned int, and initialize it.  Change fprintf format string.
-	(NAME(bfd_elf,size_dynamic_sections)): Cast -1 to bfd_size_type
-	when setting or comparing to soname_indx.
-	(elf_create_pointer_linker_section): Change num_symbols to
-	unsigned int.
-	* libcoff-in.h (coff_data_type): Change flags to flagword.
-	* peicode.h (pe_print_idata): Initialize idx.  Change j to
-	bfd_size_type.  Initialize hint_member.  Remove useless test to
-	time_stamp.
-	(pe_print_edata): Change num_functions and num_names in struct
-	EDT_type to unsigned long.  Remove cast.  Change fprintf format
-	string.
-	* ppcboot.c (ppcboot_object_p): Change i to size_t.
-	* reloc.c (bfd_get_reloc_size): Change return type to unsigned
-	int.
-	* reloc16.c (bfd_coff_reloc16_relax_section): Change shrinks to
-	int *.  Update uses.  Change j to long.
-	* bfd-in2.h, libcoff.h: Rebuild.
-
-Fri Mar 27 10:10:46 1998  Catherine Moore <clm@cygnus.com>
-
-	* elf32-v850.c Remove definition of USE_REL.
-	(v850_elf_info_to_howto_rela): New function.
-	(v850_elf_perform_relocation):  Renamed from
-	v850_elf_store_addend_in_insn.  Removed replace argument.
-	(v850_elf_reloc): store the relocation in the addend field instead
-	of the insn.
-	(v850_elf_final_link_relocate):  Now calls
-	v850_elf_perform_relocation.
-	(v850_elf_relocate_section):  Remove code to generate REL
-	relocations.
-
-Thu Mar 26 13:32:17 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_new_section_hook): Set the type and storage
-	class in the native symbol information allocated for a new section
-	symbol.
-
-Thu Mar 26 10:13:41 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* peicode.h: Chain together calls to
-	coff_bfd_copy_private_bfd_data and
-	coff_bfd_print_private_bfd_data.
-
-	* coff-arm.c: Add prototypes for
-	coff_arm_bfd_print_private_bfd_data and
-	coff_arm_bfd_copy_private_bfd_data.
-
-Wed Mar 25 15:45:55 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coffcode.h (coff_mkobject_hook): Set private falgs even for a PE
-	build.
-
-	* peicode.h: Call arm-coff private data functions after handling
-	pe private data.
-
-	* coff-arm.c: Turn statics into globals so that they can be shared
-	both pe and pei backends.
-
-Wed Mar 25 15:19:38 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutf1.h (sunos_set_arch_mach): Use bfd_mach_m68* rather than
-	plain numbers.
-	(sunos_write_object_contents): Likewise.
-	* aoutx.h (NAME(aout,machine_type)): Likewise.
-	* coffcode.h (coff_set_arch_mach_hook): Likewise.
-
-Wed Mar 25 13:59:24 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* archures.c (bfd_mach_m68*): Add definitions for various m68k
-	variants.
-	(bfd_default_scan): Remove m68k special cases.
-	* bfd-in2.h: Rebuild.
-	* mipsbsd.c (MY(write_object_contents)): Use bfd_mach_m68* rather
-	than plain numbers.
-	* sparclynx.c (NAME(lynx,set_arch_mach)): Likewise.
-	* cpu-m68k.c (arch_info_struct): Likewise.  Add entry for
-	m68k:68000.
-	(bfd_m68k_arch): Set mach field to zero to signal no explicit
-	selection, change printable_name to just "m68k" and make that the
-	default instead of m68k:68020.
-
-	* aout-tic30.c (NAME): Define this to avoid multiple definitions
-	from aoutx.h.
-	(MY_get_section_contents): Define as aout_32_get_section_contents
-	rather than NAME(aout,get_section_contents).
-
-	* elf-m10300.c (elf32_mn10300_link_hash_table_create): Fix cast.
-
-	* evax-alpha.c (evax_set_arch_mach): Only accept bfd_arch_alpha
-	and call bfd_default_set_arch_mach to do the real work.
-
-Wed Mar 25 10:41:35 1998  Richard Henderson  <rth@cygnus.com>
-
-	* bout.c (BALX): Include return register g14 as part of the insn.
-	(BALX_MASK): New.
-	(calljx_callback): Use it.
-
-Wed Mar 25 11:19:28 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd-in.h (BFD_ALIGN): Cast this parameter to bfd_vma.
-	* libbfd.h: Rebuild.
-
-	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Change
-	byte_count to unsigned int.
-	(mn10300_elf_relax_section): Initialize internal_relocs.  Remove
-	unused local variables.
-
-	* evax-alpha.c (evax_close_and_cleanup): Remove unused local
-	variables er and er1.
-
-	* cpu-v850.c: Include <ctype.h>.
-	(scan): Case isdigit argument to unsigned char.
-
-	From Yan Meroth <YAN.MEROTH@st.com>:
-	* ihex.c (ihex_scan): Add extbase variable so that getting an
- 	extended linear address record does not ignore any previous
- 	extended address.
-	(ihex_write_object_contents): When writing out an extended linear
- 	address record, zero out any previous extended address.
-
-Tue Mar 24 16:09:43 1998  Manfred Hollstein  <manfred@s-direktnet.de>
-
-	* ieee.c (do_one): Check section before dereferencing it.
-	(ieee_canonicalize_reloc): Likewise with src->relent.sym_ptr_ptr.
-	(ieee_generic_stat_arch_elt): Likewise with abfd->my_archive.
-
-Mon Mar 23 18:51:47 1998  Joel Sherrill  <joel@OARcorp.com>
-
-	* config.bfd: (sh*-*-rtems*): Switched from ELF to COFF.
-
-Mon Mar 23 14:23:36 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c: Add interworking functions to pe backends.
-
-Fri Mar 20 18:47:20 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Use AM_DISABLE_SHARED.
-	* aclocal.m4, configure: Rebuild with libtool 1.2.
-
-Fri Mar 20 11:25:41 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (coff_arm_relocate_section): Better error messages
-	when interowrking conflucts occur.  Courtesy of Jonathan Walton
-	and Tony Thompson.
-	(aoutarm_std_reloc_howto): Fixed bitsize fields of rightshifted
-	relocations.  Patch courtesy of Jonathan Walton and Tony
-	Thompson.
-
-Fri Mar 20 02:26:43 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Revert
-	part of Feb 22 change controling when to override the existing
-	symbol with the .plt entry.
-
-Wed Mar 18 09:26:25 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* config.bfd (targ_cpu): Add thumb-pe target.
-
-	* coffcode.h (OTHER_GLOBAL_CLASS): Support thumb external
-	functions in PE build.
-
-Sun Mar  8 23:37:26 1998  Stan Cox  <scox@equinox.cygnus.com>
-
-	* config.bfd (sparclite-*-elf*): Added.
-
-Mon Feb 23 19:31:19 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Add elf.lo to elf shell variable.
-	* Makefile.am (BFD_LIBS): Remove elf.lo.
-	(BFD_LIBS_CFILES): Remove elf.c.
-	(BFD32_BACKENDS): Add elf.lo.
-	(BFD32_BACKENDS_CFILES): Add elf.c.
-	* configure, Makefile.in: Rebuild.
-
-1998-02-23 15:53  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-i386.c (elf_i386_relocate_section): A pc-relative
-	relocation against a now-local symbol should not have a dynamic
-	relocation.
-
-Mon Feb 23 16:17:08 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (coff_swap_filehdr_in): Don't set BFD flag HAS_SYMS in
-	COFF filehdr flags.
-	(pe_print_private_bfd_data): Print PE flags.  From Mikey
-	<jeffdb@netzone.com>.
-
-Sun Feb 22 20:39:00 1998  Richard Henderson  <rth@cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Don't create
- 	a plt entry when we can determine that we authoritatively define
- 	the symbol.
-
-Sun Feb 22 20:33:05 1998  Richard Henderson  <rth@cygnus.com>
-
-	* configure.in (COREFILE selection): Remove sparc-*-linux*.  They
-	don't actually use trad-core, but a SunOS-style core file handled
-	by gdb directly.
-	* hosts/sparclinux.h: Remove.
-
-Wed Feb 18 15:31:06 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (pe_print_idata): If there is no .idata section, look
-	for the import tables in some other section.  Make the initial
-	label line up better with the data.  Print the import address
-	table even if there is no import name table.  If the import
-	address table holds actual addresses, print them.
-
-Tue Feb 17 12:58:34 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd.c (bfd_seek): If fseek fails, save errno around call to
-	bfd_tell.  If errno is EINVAL, set bfd_error_file_truncated, not
-	bfd_error_system_call.
-
-Fri Feb 13 13:11:33 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Define.
-	* configure, Makefile.in, aclocal.m4: Rebuild with automake 1.2e.
-
-	From H.J. Lu <hjl@gnu.org>:
-	* Makefile.am (libbfd_la_LDFLAGS): Define.
-	* Makefile.in: Rebuild.
-
-Thu Feb 12 17:31:11 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	NetBSD patches from Gordon W. Ross <gwr@mc.com>:
-	* netbsd.h (MACHTYPE_OK): Define.
-	(MY(write_object_contents)): Use DEFAULT_ARCH and DEFAULT_MID when
-	calling N_SET_MACHTYPE, rather than having a switch.
-	* libaout.h (enum machine_type): Add M_PMAX_NETBSD, M_VAX_NETBSD,
-	and M_ALPHA_NETBSD.
-	* i386netbsd.c (MACHTYPE_OK): Don't define.
-	(DEFAULT_MID): Define.
-	* m68k4knetbsd.c (SEGMENT_SIZE): Don't define.
-	(MACHTYPE_OK): Don't define.
-	(DEFAULT_MID): Define.
-	* m68knetbsd.c: (MACHTYPE_OK): Don't define.
-	(DEFAULT_MID): Define.
-	* ns32knetbsd.c (MACHTYPE_OK): Don't define.
-	(DEFAULT_MID): Define.
-	* sparcnetbsd.c (MACHTYPE_OK): Don't define.
-	(DEFAULT_MID): Define.
-
-	NetBSD patches from Gordon W. Ross <gwr@mc.com>:
-	* vaxnetbsd.c: New file.
-	* netbsd-core.c: Clean up.  Remove unused macros.  Use netbsd
-	rather than netbsd_core.
-	* targets.c (vaxnetbsd_vec): Declare.
-	(bfd_target_vector): Add vaxnetbsd_vec.  If NETBSD_CORE is
-	defined, add netbsd_core_vec.
-	* configure.in: Set COREFILE for alpha*-*-netbsd* and
-	powerpc-*-netbsd* to netbsd-core.lo.  If COREFILE is
-	netbsd-core.lo, set COREFLAG to -DNETBSD_CORE.
-	* config.bfd (alpha*-*-netbsd*): New target.
-	* Makefile.am: Rebuild dependencies.
- 	(BFD32_BACKENDS): Add vaxnetbsd.lo.
-	(BFD32_BACKENDS_CFILES): Add vaxnetbsd.c.
-	* configure, Makefile.in: Rebuild.
-
-	* configure.host: Remove the old shared library build stuff.  We
-	now use libtool instead.
-
-Wed Feb 11 17:13:09 1998  Richard Henderson  <rth@cygnus.com>
-
-	* tekhex.c (tekhex_write_object_contents): Call tekhex_init.
-
-Tue Feb 10 19:23:28 1998  H.J. Lu  <hjl@gnu.org>
-
-	* configure.in: Take stab-syms.lo out of sparclinux_vec list.
-	* configure: Rebuild.
-
-Tue Feb 10 15:16:38 1998  Nick Clifton  <nickc@cygnus.com>
-	* elf32-v850.c (remember_hi16s_reloc): New function.
-	(find_remembered_hi16s_reloc): New function.
-	(v850_elf_store_addend_in_insn): Use the above new functions to
-	match up HI6S relocs with LO16 relocs.
-
-Tue Feb 10 15:01:39 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Change -linux* to -linux-gnu*.
-	* config.bfd, configure.host: Likewise.
-	* configure: Rebuild.
-
-Mon Feb  9 19:40:59 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_store_addend_in_insn): Fix another
-	LO16/HI16S bug and improve comments about what is going on.
-
-Sat Feb  7 15:27:03 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure, aclocal.m4: Rebuild with new libtool.
-
-Fri Feb  6 14:48:20 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_merge_private_bfd_data): Do not complain
-	when merging v850 code into v850e/v850ea code.  Do not initialise
-	output flags if the input is the default architecture.
-	
-Fri Feb  6 11:50:22 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mips.c (bfd_elf32_bfd_reloc_type_lookup): For BFD_RELOC_CTOR
-	get the size from bfd_arch_bits_per_address instead of directly
-	from the isa.
-
-Thu Feb  5 14:21:34 1998  Michael Meissner  <meissner@cygnus.com>
-
-	* libbfd-in.h (BFD_ALIGN): If rounding up would cause the address
-	to wrap, just return all 1's bits instead.
-	* libbfd.h: Regenerate.
-
-Thu Feb  5 11:51:05 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i386.c (coff_pe_i386_relocate_section): New static function
-	if COFF_WITH_PE.
-	(coff_relocate_section): If COFF_WITH_PE, define as
-	coff_pe_i386_relocate_section.
-	* coffcode.h (coff_write_object_contents): If COFF_IMAGE_WITH_PE,
-	skip empty sections, to match coff_write_object_contents.
-
-	* elf64-mips.c (mips_elf64_swap_reloca_out): Swap out r_addend,
- 	rather than swapping out r_offset twice.  From Luke Deller
- 	<luked@cse.unsw.edu.au>.
-
-Wed Feb  4 19:11:28 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Set libtool_enable_shared rather than
-	libtool_shared.  Remove diversion hack.
-	* configure, Makefile.in, doc/Makefile.in, aclocal.m4: Rebuild
-	with new libtool.
-
-Wed Feb  4 16:10:21 1998  Brent Baccala  <baccala@freesoft.org>
-
-	* syms.c (struct stab_cache): Define.
-	(struct stab_find_info): Remove cached_offset, cached_stab,
-	cached_str, and cached_stroff fields.  Add file_cache,
-	function_cache, and line_cache fields.
-	(_bfd_stab_section_find_nearest_line): Use extensive caching to
-	speed up searches.
-
-Wed Feb  4 13:34:22 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (pe_print_idata): Check for import of ordinal rather
-	than name.
-	(pe_print_edata): If there is no .edata section, look for the
-	export data in some other section.
-
-Mon Feb  2 20:05:42 1998  Jason Molenda  (crash@bugshack.cygnus.com)
-
-	* configure.in: Change version to 2.8.4.
-	* configure: Regenerated.
-
-Mon Feb  2 17:39:39 1998  Steve Haworth  <steve@pm.cse.rmit.EDU.AU>
-
-	Add tms320c30 support:
-	* cpu-tic30.c: New file.
-	* aout-tic30.c: New file.
-	* coff-tic30.c: New file.
-	* archures.c (bfd_arch_tic30): Define.
-	(bfd_tic30_arch): Declare.
-	(bfd_archures_list): Add bfd_tic30_arch.
-	* targets.c (bfd_target_vector): Add tic30_aout_vec and
-	tic30_coff_vec.
-	* reloc.c (BFD_RELOC_TIC30_LDP): Define.
-	* coffcode.h (coff_set_arch_mach_hook): Add tic30 case.
-	(coff_set_flags): Likewise.
-	* config.bfd (tic30-*-*aout*, tic30-*-*coff*): New targets.
-	* configure.in (tic30_aout_vec, tic30_coff_vec): New vectors.
-	* Makefile.am: Rebuild dependencies.
-	(ALL_MACHINES): Add cpu-tic30.lo.
-	(ALL_MACHINES_CFILES): Add cpu-tic30.c.
-	(BFD32_BACKENDS): Add aout-tic30.lo and coff-tic30.lo.
-	(BFD32_BACKENDS_CFILES): Add aout-tic30.c and coff-tic30.c.
-	* configure, Makefile.in, bfd-in2.h, libbfd.h: Rebuild.
-
-Mon Feb  2 12:25:12 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_store_addend_in_insn): Allow HI16_S reloc
-	to lag behind LO16 reloc by a couple of instructions.
-
-Mon Feb  2 14:09:46 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am ($(srcdir)/bfd-in2.h): Add dummy command to force
-	make to reexamine the file timestamp.
-	($(srcdir)/libbfd.h, $(srcddir)/libcoff.h): Likewise.
-
-	* elf64-alpha.c (ELF_MAXPAGESIZE): Change to 0x10000 from
-	0x100000.
-
-Fri Jan 30 19:07:07 1998  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elf32-ppc.c (ppc_elf_create_dynamic_sections): New procedure
-	to create .dynsbss and .rela.sbss sections.
-	(ppc_elf_adjust_dynamic_symbol): Put space for small data to be
-	copied from dynamic objects into .sbss.
-	(ppc_elf_size_dynamic_sections): Strip .rela.sbss if we don't
-	use it.  Correct typo of .rela.sdata2.
-	(ppc_elf_finish_dynamic_symbol): Generate reloc to where we
-	put the data, which may now be in .sbss.
-	(ppc_elf_relocate_section): A SDAREL16 reloc can be in dynsbss.
-	(elf_backend_create_dynamic_sections): Define as
-	ppc_elf_create_dynamic_sections.
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Don't emit R_PPC_REL* relocs
-	against _GLOBAL_OFFSET_TABLE_.
- 	(ppc_elf_relocate_section): Don't emit R_PPC_REL32 relocs in
-	shared libraries which refer to local symbols.  Make sure that the
-	test for allocating space for a reloc in a shared object is the
-	same as the test for emitting a reloc.
-
-Thu Jan 29 15:55:35 1998  J.J. van der Heijden  <J.J.vanderHeijden@student.utwente.nl>
-
-	* config.bfd (i[3456]-*-mingw32*): New target.
-	* acinclude.m4 (BFD_BINARY_OPEN): Check for mingw32.
-	* aclocal.m4, configure: Rebuild.
-
-Wed Jan 28 13:41:26 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (_bfd_elf_close_and_cleanup): Only check the strtab if we
-	have a bfd_object.
-
-Tue Jan 27 21:43:55 1998  Richard Henderson  <rth@cygnus.com>
-
-	Sparc v9 ABI compliant PLT:
-	* elf64-sparc.c (PLT_HEADER_SIZE): V9 ABI uses 4 entries.
-	(plt_templates, sparc64_elf_build_plt_entry): Delete.
-	(LARGE_PLT_THRESHOLD): New define.
-	(GOT_RESERVED_ENTRIES): V9 ABI only uses 1.
-	(sparc64_elf_build_plt): New function.
-	(sparc64_elf_plt_entry_offset): Likewise.
-	(sparc64_elf_plt_ptr_offset): Likewise.
-	(sparc64_elf_adjust_dynamic_symbol): Change h->plt_offset to
-	contain the index for convenience.  Skip the initial entries
-	in .rela.plt.
-	(sparc64_elf_size_dynamic_sections): Zero the allocated contents
-	memory for the benefit of .rela.plt.
-	(sparc64_elf_relocate_section): Call sparc64_elf_plt_entry_offset.
-	(sparc64_elf_finish_dynamic_symbol): Kill template stuff.  Use
-	sparc64_elf_plt_entry_offset & sparc64_elf_plt_ptr_offset for reloc.
-	(sparc64_elf_finish_dynamic_sections): DT_PLTGOT points to .plt.
-	Call sparc64_elf_build_plt.
-	(elf_backend_want_got_plt): No.
-	(elf_backend_plt_readonly): No.
-	(elf_backend_plt_alignment): 8.
-
-	* elf.c (_bfd_elf_close_and_cleanup): New function; free the shstrtab.
-	* elf-bfd.h (_bfd_elf_close_and_cleanup): Declare it.
-	* elfxx-target.h (bfd_elfNN_close_and_cleanup): Arrange for it
-	to be called.
-
-Tue Jan 27 21:45:15 1998  Jeffrey A Law  (law@cygnus.com)
-
-	* archures.c (bfd_mach_mips*): Add definitions for various MIPS
-	processors.
-	* cpu-mips.c (arch_info_struct): Add mips variants.
-	* bfd-in2.h: Rebuilt.
-
-Tue Jan 27 15:06:04 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (coff_arm_relocate_section): Preserve the contents of
-	t2a3_b_insn.
-
-Tue Jan 27 12:47:27 1998  Robert Lipe  <robertl@dgii.com>
-
-	* config.bfd (i[3456]86-sco3.2v5*): ELF now the default.
-	(i[3456]86sco3.2v5*coff): New target.
-
-Mon Jan 26 15:41:30 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd-in2.h: Rebuild with changes to chew--tab expansion.
-
-Thu Jan 22 21:26:48 1998  Richard Henderson  <rth@cygnus.com>
-
-	* bfd.c (bfd_get_error_handler): Add orthogonal function.
-	* bfd-in2.h: Regenerate.
-
-Thu Jan 22 21:13:39 1998  Richard Henderson  <rth@cygnus.com>
-
-	* tekhex.c (tekhex_write_object_contents): Check for no symbols.
-
-Wed Jan 21 21:19:03 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i386.c (coff_i386_rtype_to_howto): If COFF_WITH_PE, don't
- 	adjust addend for an output common symbol (from Jimmy Blair
- 	<jimmyb@wrs.com>).  If COFF_WITH_PE, adjust addend for PC relative
- 	defined symbol to counteract adjustment made in generic relocation
- 	code.
-
-	* dwarf2.c: Include sysdep.h, not stdio.h and stdlib.h.
-
-Wed Jan 21 21:16:06 1998  Manfred Hollstein  <manfred@s-direktnet.de>
-
-	* coff-m88k.c (GET_SCNDHR_NRELOC): Fix typo in macro name.
-	(GET_SCNDHR_NLNNO): Likewise.
-
-Mon Jan 19 12:49:52 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cpu-sh.c (arch_info_struct): Correct next field of sh3e.
-
-Wed Jan 14 17:23:27 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-m32r.c: Add macros to handle NOP insertion.
-
-Wed Jan 14 16:15:22 1998  Richard Henderson  <rth@cygnus.com>
-
-	* xcofflink.c (xcoff_mark_symbol): Don't mark the absolute section.
-	(xcoff_mark): Likewise.
-	(xcoff_build_ldsyms): Mark absolute symbols.
-
-Wed Jan 14 16:03:11 1998  Richard Henderson  <rth@cygnus.com>
-
-	* bout.c (b_out_write_object_contents): Sort symbols before output
-	to keep {CALL,BAL}NAME symbols adjacent.
-	(b_out_symbol_cmp): New function.
-
-For older changes see ChangeLog-9697
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/bfd/ChangeLog-9193 b/bfd/ChangeLog-9193
deleted file mode 100644
index 15af9319596..00000000000
--- a/bfd/ChangeLog-9193
+++ /dev/null
@@ -1,7851 +0,0 @@
-Fri Dec 31 16:23:43 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Minor cleanups suggested by CodeCenter.
-	* aoutx.h, coffgen.c, ecoff.c, ecofflink.c, elf.c, libbfd.c,
-	linker.c, reloc.c, section.c, srec.c: Added /*ARGSUSED*/ as
-	appropriate.
-	* aoutx.h (struct external_exec): Removed unnecessary declaration.
-	(NAME(aout,some_aout_object_p)): Set some tdata pointers to NULL.
-	(adjust_z_magic): Removed useless variable data_vma.
-	(stringtab_init): Initialize hash_zero.
-	(add_to_stringtab): Removed unused fourth argument.
-	(NAME(aout,swap_std_reloc_out)): Removed useless variable
-	r_addend.
-	(aout_link_input_section): Added some casts.
-	* archive.c (get_extended_arelt_filename, do_slurp_coff_armap,
-	bfd_ar_hdr_from_filesystem, bsd_write_armap, coff_write_armap):
-	Minor code rewriting to make it more C like.
-	(do_slurp_bsd_armap): Added some casts.
-	* ecoff.c (ecoff_write_object_contents): Removed useless variable
-	scn_base.
-	(ecoff_write_armap): Added some casts.  Use "" rather than "\0".
-	* ecofflink.c (bfd_ecoff_write_debug): Added a cast.
-	* libaout.h (struct internal_exec): Removed unnecessary
-	declaration.
-	* linker.c (_bfd_generic_indirect_link_order): Added a cast.
-	* opncls.c (new_bfd): Removed a cast.
-	* reloc.c (bfd_generic_get_relocated_section_contents): Added
-	some casts.
-	* srec.c (internal_srec_write_object_contents): Removed useless
-	variable bytes_written.
-
-Fri Dec 31 11:46:13 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* i386mach3.c (N_TXTADDR): Don't define after all.
-	(TEXT_START_ADDR): Don't include exec header size in value.
-
-Thu Dec 30 15:47:54 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* i386mach3.c (N_TXTADDR): Define.
-
-Thu Dec 30 13:37:24 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Extensive changes to move the bulk of the linker into BFD so that
-	more efficient backend code can be written for specific object
-	files.  Only existing efficient backend is a.out.
-	* seclet.c, seclet.h: Removed.
-	* hash.c, linker.c, genlink.h: New files.
-	* bfd-in.h: Removed bfd_error_vector.  Declared hash table
-	structures and functions.
-	(JUMP_TABLE): Removed bfd_seclet_link, added
-	bfd_link_hash_table_create, bfd_link_add_symbols and
-	bfd_final_link.
-	* All backends: Changed accordingly.
-	* bfd-in2.h: Rebuilt.
-	* bfd.c (struct _bfd): Added link_next and archive_pass fields.
-	Removed ld_symbols field.
-	(bfd_nonrepresentable_section, bfd_undefined_symbol,
-	bfd_reloc_value_truncated, bfd_reloc_is_dangerous,
-	bfd_error_vector): Removed.
-	(bfd_default_error_trap, bfd_error_trap,
-	bfd_error_nonrepresentabltrap): Removed.
-	(bfd_get_relocated_section_contents): Pass link_info.  Pass
-	link_order instead of seclet.  Pass symbols.
-	(bfd_relax_section): Pass link_info.
-	(bfd_seclet_link): Removed.
-	(bfd_link_hash_table_create, bfd_link_add_symbols,
-	bfd_final_link): New macros.
-	* libbfd-in.h: If __GNUC__ is defined and alloca is not, define
-	alloca as __builtin_alloca.  Declare internal linking functions.
-	* libbfd.h: Rebuilt.
-	* libbfd.c (bfd_seek): Comment out fseek assertion.  It's worked
-	for months.
-	* reloc.c (reloc_howto_type): Added error_message argument to
-	special_function field.  Changed all callers and all definitions.
-	(bfd_get_reloc_size): Make argument a const pointer.
-	(bfd_perform_relocation): Add error_message argument to hold
-	string set if return value if bfd_reloc_dangerous.  Changed all
-	callers.
-	(_bfd_final_link_relocate, _bfd_relocate_contents): New functions.
-	* section.c (asection): Renamed seclets_head and seclets_tail to
-	link_order_head and link_order_tail.
-	* targets.c (bfd_target): Replaced seclet argument with link_info
-	and link_order and symbols arguments in
-	bfd_get_relocated_section_contents.  Added symbols argument to
-	bfd_relax_section.  Removed bfd_seclet_link.  Added
-	bfd_link_hash_table_create, bfd_link_add_symbols and
-	bfd_final_link.
-	* libaout.h (struct aoutdata): Added external_syms,
-	external_sym_count, external_strings, sym_hashes fields.
-	(obj_aout_external_syms, obj_aout_external_sym_count,
-	obj_aout_external_strings, obj_aout_sym_hashes): New accessor
-	macros.
-	(WRITE_HEADERS): Only output symbols if outsymbols is not NULL.
-	* aoutx.h: Wrote new back end linker routines.
-	(translate_to_native_sym_flags): Return boolean value.  Don't use
-	bfd_error_vector.
-	(NAME(aout,write_syms)): Return boolean value.  Check return value
-	of translate_to_native_sym_flags and bfd_write.
-	* aout-target.h (final_link_callback): New function.
-	(MY_bfd_final_link): New function.
-	* aout-adobe.c (aout_adobe_write_object_contents): Check return
-	value of aout_32_write_syms.
-	* hp300hpux.c (MY(write_object_contents)): Likewise.
-	* i386lynx.c (WRITE_HEADERS): Likewise.
-	* libaout.h (WRITE_HEADERS): Likewise.
-	* bout.c: Changed functions to use link_info->callbacks rather
-	than bfd_error_vector, and link_orders rather than seclets.
-	* coff-alpha.c: Likewise.
-	* coff-h8300.c: Likewise.
-	* coff-h8500.c: Likewise.
-	* coff-sh.c: Likewise.
-	* coff-z8k.c: Likewise.
-	* elf32-hppa.c: Likewise.
-	* reloc16.c: Likewise.
-	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Look
-	up _gp in the hash table rather than in outsymbols.
-	* coff-a29k.c (a29k_reloc): Pass errors back in new error_message
-	argument rather than printing them.
-	* coffcode.h (bfd_coff_reloc16_extra_cases): Take link_info and
-	link_order arguments rather than seclet.  Changed all uses and
-	definitions.
-	(bfd_coff_reloc16_estimate): Pass link_info arguments.  Changed
-	all uses and definitions.
-	* libcoff.h: Rebuilt.
-	* ecoff.c (ecoff_get_extr): If symbol is defined by linker, but
-	not by ECOFF, make it scAbs.
-	(ecoff_bfd_final_link): Renamed from ecoff_bfd_seclet_link and
-	rewritten.
-	* elf32-mips.c (mips_elf_final_link): Renamed from
-	mips_elf_seclet_link and rewritten.
-	* elf32-hppa.c (elf32_hppa_stub_description): Added link_info
-	field.
-	(new_stub, add_stub_by_name, hppa_elf_build_arg_reloc_stub,
-	hppa_elf_build_long_branch_stub, hppa_look_for_stubs_in_section):
-	Added link_info arguments.  Changed all callers.
-	* elfcode.h (elf_slurp_symbol_table): Don't quit if outsymbols is
-	not NULL.
-	* oasys.c (oasys_write_sections): Return boolean value rather than
-	using bfd_error_vector.
-	(oasys_write_object_contents): Check return value of
-	oasys_write_sections.
-	* hosts/std-host.h: Don't declare qsort or strtol.
-	* Makefile.in: Rebuild dependencies.
-	(BFD_LIBS): Removed seclet.o.  Added hash.o and linker.o.
-	(CFILES): Removed seclet.c.  Added hash.c and linker.c.
-	(HFILES): Removed seclet.h.  Added genlink.h.
-
-Thu Dec 30 07:41:36 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* section.c (bfd_get_section_contents):  Return zero filled buffer
-	if section has no contents.
-
-Tue Dec 28 12:43:54 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf.c (bfd_elf_generic_reloc): If this is not an inplace reloc,
-	then skip bfd_perform_relocation even if the addend is non-zero.
-
-Tue Dec 21 09:22:19 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
-
-	* coffcode.h (coff_write_relocs) [SWAP_OUT_RELOC_OFFSET]: Copy
-	addend to r_offset field.
-
-	* Makefile.in (CFILES): Added coff-sparc.c.  Rebuild dependencies.
-
-	* coff-sparc.c (SWAP_IN_RELOC_OFFSET, SWAP_OUT_RELOC_OFFSET,
-	CALC_ADDEND): Define.
-
-	* aix386-core.c (aix386_core_file_p): Use cd_regs[0] for computing
-	the offsetof because AIX /bin/cc does not like to take the address
-	of an array.  (From Minh Tran-Le.)
-
-Thu Dec 16 13:06:32 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* Thu Dec 16 15:41:06 1993  Peter Hoogenboom  (hoogen@cs.utah.edu)
-
-	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub): Make sure to copy
-	the return pointer into %r2 if no jump-in-call-delay-slot
-	optimization was done.
-
-	* hosts/hp300bsd.h: Correctly identify 4.3BSD vs 4.4BSD.
-
-Wed Dec 15 08:04:16 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* hosts/std-host.h: (time): Don't declare; conflicts on Mach3.
-
-	* hosts/i386mach3.h (HOST_PAGE_SIZE): Set to 1 to avoid padding.
-	(HOST_SEGMENT_SIZE): Set to 0 for same reason.
-
-	* i386mach3.c (PAGE_SIZE, SEGMENT_SIZE): Same changes as above.
-	(TEXT_START_ADDR): Correct.
-	(MY_backend_data): Define.
-
-	* aoutx.h (adjust_o_magic, adjust_z_magic, adjust_n_magic):
-	New functions; code moved from aout_<size>_adjust_sizes_and_vmas.
-
-Tue Dec 14 21:48:33 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-        * som.c (som_begin_writing): Fix thinkos in auxiliary header
-	support.
-	(bfd_som_attach_aux_hdr): Likewise.
-
-Mon Dec 13 23:34:48 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (hppa_elf_gen_reloc_type): Handle 'T' field
-	selectors for PIC code.
-
-	* som.c (hppa_som_gen_reloc_type): Handle 'T' field selectors.
-	(som_write_fixups): Handle R_DLT_REL, R_FSEL, R_RSEL, R_LSEL
-	relocations needed by PIC.
-
-Tue Dec  7 15:47:51 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* nlmcode.h:  Fixes to avoid compiler warnings...
-
-Tue Dec  7 15:10:54 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* libnlm.h (nlm_backend_data): Removed macro definition.
-	(nlm_alpha_backend_data): Adjusted accordingly.
-
-Sun Dec  5 19:32:08 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_begin_writing): Flesh out code for handling simple
-	auxiliary headers.
-	(bfd_som_attach_aux_hdr): New function.
-
-	* som.h (struct somdata): Add fields for attaching version and
-	copyright headers.  Add accessor macros.
-
-	* som.c (R_DLT_REL, R_AUX_UNWIND, R_SEC_STMT): Add protected
-	definitions for old versions of HPUX which fail to define them.
-	(som_hppa_howto_talbe): Add R_DLT_REL, R_AUX_UNWIND, and R_SEC_STMT
-	now that they're safe.  Delete bogus R_STATEMENT relocations.
-
-	* som.c (som_hppa_howto_table): Add missing R_END_TRY.  Delete 
-	extra R_DATA_OVERRIDE.
-	(hppa_som_gen_reloc_type): Generate a relocation for the rounding
-	mode selector if needed.
-	(som_write_fixups): Handle requests for a change in the default
-	rounding mode.  Rounding modes do not consume input bytes, but
-	are just markers much like R_ENTRY and R_EXIT.
-
-Sat Dec  4 19:40:32 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	Fri Dec  3 09:55:17 1993  Pete Hoogenboom  (hoogen@cs.utah.edu)
-
-	* elf32-hppa.c: (hppa_elf_reloc):  Do not do code reordering when
-	the branch instruction as originally been nullified.
-	hppa_elf_reloc):  Avoid useless call to bfd_put_32 () in the
-	case of no code reordering due to an LDO instruction in the
-	delay slot of the branch.  Make sure to relocate the correct
-	instruction.  Do not perform instruction reordering for millicode
-	calls.
-	(hppa_elf_build_arg_reloc_stub):  Change the relocation type
-	to R_HPPA_STUB_CALL_17 when special processing might be needed.
-	(hppa_elf_build_long_branch_stub): Prevent code reordering on
-	a call from a linker stub to another linker stub and for millicode
-	calls.  Do not trash the return register for calls from one linker
-	stub to a second linker stub.
-
-	* elf32-hppa.c: (elf_hppa_howto_table):  PLABEL and DLT
-	relocations are not pc-relative.
-
-	* hppa_stubs.h: (BLE_N_XXX_0_31):  New instruction used in
-	linker stub code. 
-	(COPY_2_31):  Likewise.
-
-Fri Dec  3 18:40:58 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* config/solaris2.mh (HDEFINES): Remove -Dconst=
-	* hosts/solaris.h: If not __GNUC__, define const as empty.
-
-Thu Dec  2 15:43:32 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c: Added various casts for 32/64 bit cross targeting.
-	(ecoff_mkobject_hook): Set SEC_SHARED_LIBRARY for the .reginfo
-	section so that the linker ignores it.
-	* ecofflink.c: Added various casts for 32/64 bit cross targeting.
-	(ecoff_add_bytes): Changed need argument to size_t.
-	(bfd_ecoff_debug_link_other): Check return value of
-	ecoff_add_string.
-
-	* libbfd-in.h (new_bfd): Use void rather than an empty parameter
-	list.
-	* libbfd.h: Rebuilt.
-
-	* libnlm.h (struct nlm_obj_tdata): New field backend_data.
-	(nlm_backend_data, nlm_alpha_backend_data): New accessor macros.
-	(struct nlm_backend_data): New field no_uninitialized_data.
-	(nlm_no_uninitialized_data): New accessor macro.
-	* nlmcode.h (nlm_compute_section_file_positions): Handle
-	no_uninitialized_data.
-	(nlm_external_reloc_compare): Sort relocs by address for a
-	particular symbol, to make the sort more stable.
-	(nlm_write_object_contents): Cast the arguments to qsort.  Get the
-	value of a debugging symbol the same way we get the value of a
-	normal symbol.
-	* nlm32-alpha.c: Various changes.  Write out GP and .lita relocs.
-	Set no_uninitialized_data to true.
-	* nlm32-i386.c (nlm32_i386_backend), nlm32-sparc.c
-	(nlm32_sparc_backend): Set no_uninitialized_data field false.
-	* nlmswap.h (nlm_swap_fixed_header_out): Zero out destination
-	before filling it in.
-
-Wed Dec  1 21:47:58 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_section_type, som_decode_symcalss): New functions.
-	(som_get_symbol_info): Use them.
-	(som_slurp_symbol_table): Set the section of common and undefined
-	symbols correctly.
-
-Wed Dec  1 14:15:10 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* elfcode.h (write_relocs): Initialize local var LAST_SYM_IDX, to
-	make gcc happy.
-
-	* mipsbsd.c: Changes from Ralph Campbell:
-	(mips_howto_table_ext): MIPS_RELOC_LO16 should use
-	complain_overflow_dont.
-	(aout_mips_*_vec): Make name use "a.out" instead of "aout", to
-	make gdb happy.
-
-	* bfd.c (bfd_errmsgs): Reword invalid-target message.
-
-	* config.bfd: For sparc*-*-coff, use sparc-coff.
-	* configure.in: Handle sparccoff_vec.
-	* targets.c (sparccoff_vec): Declare.
-
-	* reloc.c (bfd_get_reloc_size): New function.
-	(struct reloc_howto_type): Update documentation of size field.
-
-Wed Dec  1 14:39:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* nlm32-alpha.c: New file; preliminary Alpha NetWare support.
-	* config.bfd (alpha-*-netware*): New target; use alpha-nlm.
-	* config/alpha-nlm.mt: New file.
-	* configure.in (nlm32_alpha_vec): New vector; use nlm32-alpha.o,
-	nlm32.o, and nlm.o.
-	* Makefile.in (BFD32_BACKENDS): Added nlm32-alpha.o.
-	(CFILES): Added nlm32-alpha.c.
-	Rebuilt dependencies.
-	* targets.c (nlm32_alpha_vec): Declare.
-
-	* libnlm.h (struct nlm_backend_data): New fields
-	optional_prefix_size, nlm_backend_object_p, nlm_write_prefix,
-	nlm_set_public_section, nlm_get_public_offset.  Removed unused
-	nlm_write_reloc field.  Changed nlm_write_import to remove
-	unnecessary symbol argument.  Renamed nlm_write_externals to
-	nlm_write_external, and changed cound argument from bfd_vma to
-	bfd_size_type.
-	(nlm_optional_prefix_size, nlm_backend_object_p_func,
-	nlm_write_prefix_func, nlm_set_public_section_func,
-	nlm_get_public_offset_func): New accessor macros.
-	(nlm_write_reloc_func): Removed.
-	(nlm_write_external_func): Adjusted for field renaming.
-	* nlm32-i386.c (nlm_i386_write_import): Renamed from
-	nlm_i386_write_reloc.  Removed old nlm_i386_write_import which
-	just called old nlm_i386_write_reloc.
-	(nlm_i386_write_external): Renamed from nlm_i386_write_externals.
-	Declared.  Changed second argument from bfd_vma to bfd_size_type.
-	(nlm32_i386_backend): Adjusted for changes to fields and names.
-	* nlm32-sparc.c (nlm_sparc_mangle_relocs): Removed unused,
-	ifdeffed out code.
-	(nlm_sparc_write_import): Removed second argument.
-	(nlm_sparc_write_external): Renamed from
-	nlm_sparc_write_externals.  Changed second argument from bfd_vma
-	to bfd_size_type.
-	(nlm32_sparc_backend): Adjusted for changes to fields and names.
-	* nlmcode.h: Removed some unused code.
-	(nlm_object_p): Don't destroy tdata pointer.  Call
-	backend_object_p function if it exists.
-	(nlm_slurp_symbol_table): Removed unused variable rcount.  Call
-	set_public_section_func if it exists instead of checking
-	NLM_HIBIT.
-	(nlm_compute_section_file_positions): Account for
-	optional_prefix_size.
-	(nlm_write_object_contents): Account for optional_prefix_size.
-	Removed useless variable write_reloc_func.  Changed declaration
-	and call of write_import_func.  Call write_prefix_func if it
-	exists.  Removed unused variables len and temp.  Call
-	get_public_offset_func if it exists rather than setting NLM_HIBIT.
-	* nlmswap.h: Declare functions.
-
-	* bfd-in.h (uint64_typeLOW, uint64_typeHIGH): Fully parenthesize
-	for clarity.
-	(fprintf_vma, sprintf_vma): Use %lx, not %x.
-	* bfd-in2.h: Rebuilt.
-	* hosts/alphaosf.h (uint64_typeLOW, uint64_typeHIGH): Cast results
-	to unsigned long.
-
-	* config.bfd: Don't set target64 here, as the setting is ignored.
-	* configure.in (ecoffalpha_little_vec): Set target64.
-
-	* config/alphaosf.mt (TDEFINES): Removed; setting host parameters
-	in TDEFINES is wrong.
-
-	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
-	Remove unused variable output_section.
-
-Tue Nov 30 16:45:23 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* irix-core.c: New file for Irix 4 and Irix 5 core support.
-	Functions taken out of coff-mips.c.  Handle vmap type VMAPFILE.
-	* coff-mips.c: Irix 4 core file support moved to irix-core.c.
-	* targets.c: If IRIX_CORE defined, include irix_core_vec in
-	target_vector.
-	* config/irix4.mh (HDEFINES): Add -DIRIX_CORE.
-	(HDEPFILES): Define to be irix-core.o.
-	* config/irix5.mh (HDEFINES): Define to be -DIRIX_CORE.
-	(HDEPFILES): Define to be irix-core.o.
-	* Makefile.in (OPTIONAL_BACKENDS): Added irix-core.o.  Removed
-	sco-core.o, which no longer exists.
-	(CFILES): Added all *-core.c files.
-	Rebuilt dependencies.
-
-Wed Nov 24 02:02:41 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (map_program_segments): Restore check of file_size !=
-	mem_size, but only if SHT_PROGBITS.
-
-	* ecofflink.c: New file to hold ECOFF debug information linking
-	routines.
-	* ecoff.c (ecoff_clear_output_flags, ecoff_rel, ecoff_dump_seclet,
-	ecoff_add_string, ecoff_get_debug): Removed.  Functionality now in
-	ecofflink.c.
-	(ecoff_get_extr, ecoff_set_index): New functions.
-	(ecoff_slurp_symbolic_info): Don't save raw_size.
-	(ecoff_bfd_seclet_link): Rewrote to use ecofflink.c functions.
-	(ecoff_compute_section_file_positions): Don't set EXEC_P just
-	because there is a start address.
-	(ecoff_write_object_contents): Handle external symbols here.  Use
-	ecofflink.c functions to write out debugging information.
-	* elf32-mips.c (mips_elf_read_ecoff_info, mips_elf_get_extr,
-	mips_elf_set_index): New functions.
-	(mips_elf_seclet_link): Discard empty sections, the .options
-	section and .gptab sections.  Handle linking .mdebug section.
-	* libecoff.h (ecoff_data_type): Removed raw_size and ifdbase.
-	* libelf.h (elf_symbol_type): Added mips_extr to tc_data union.
-	* bfd-in.h: Added prototypes for routines in ecofflink.c (some are
-	called by gas, so they are public).
-	* bfd-in2.h: Rebuilt.
-	* Makefile.in (BFD_LIBS): Added ecofflink.o.
-	(CFILES): Added ecofflink.c.
-	(ecofflink.o): New target.  Rebuilt dependencies.
-
-Mon Nov 22 22:26:42 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (hppa_object_p): Also recognize SHARED_MAGIC_CNX as
-	a valid magic number if it's been defined.
-
-Mon Nov 22 14:17:36 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_mkobject): Don't create .scommon section; linker
-	no longer requires it.
-	(ecoff_bfd_seclet_link, ecoff_sizeof_headers,
-	ecoff_write_object_contents): Don't treat .scommon section
-	specially.
-
-Mon Nov 22 10:54:27 1993  Fred Fish  (fnf@cygnus.com)
-
-	Merged changes from kev@spuds.geg.mot.com (Kevin A. Buettner):
-	* bfd/config/delta88.mh (HDEFINES): Define this to be -DPTRACE_CORE.
-	* bfd/config/delta88.mh (HDEPFILES): Defined to be ptrace-core.o.
-	* bfd/ptrace-core.c:  New file for dealing with core files with
-	start with the ptrace_user structure found on BCS compliant systems.
-	* bfd/targets.c (ptrace_core_vec):  New vector.
-
-Mon Nov 22 02:33:12 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* Minimal support for reading SOM fixup streams.  Allows
-	objdump -r to do something reasonable.
-	* som.c (som_get_reloc_upper_bound): Implement.
-	(som_canonicalize_reloc): Implement.
-	(som_set_reloc_info, som_slurp_reloc_table): New functions.
-
-Sun Nov 21 13:46:55 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* hosts/lynx.h (FPRINTF_ALREADY_DECLARED): Define.
-	* hosts/sparclynx.h: Include lynx.h instead of duplicating it.
-
-Fri Nov 19 14:34:04 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-a29k.c (a29k_reloc): For R_IREL, don't left shift
-	signed_value before sign extending it.  Don't subtract out
-	reloc_entry->address.  This makes it compatible with what gas is
-	generating.
-
-	* elfcode.h (elf_fake_sections): Accept .sbss as the name for a
-	SHT_NOBITS sections.
-	(map_program_segments): Don't leave the loop after the first
-	SHT_NOBITS section.
-	(assign_file_positions_except_relocs): Only force sh_offset and
-	sh_addr to match modulo maxpagesize for a section which is not
-	SHT_NOBITS.  Changed the method used to force page alignment after
-	a SHT_NOBITS section to only do it for the last such consecutive
-	section, and to really force page alignment.
-
-Fri Nov 19 04:02:01 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* coffcode.h (coff_slurp_symbol_table): Print more verbose message
-	in the case of an unknown (or unhandled) storage class.
-
-	* config/i386-lynx.mt (TDEFINES): FPRINTF_ALREADY_DECLARED should
-	not be defined here, since it is a host attribute, not a target
-	one.
-	* config/m68k-lynx.mt, config/sparc-lynx.mt: Ditto.
-
-	* coffcode.h (coff_bfd_reloc_type_lookup): Don't define if already
-	defined.
-
-	* coff-sparc.c: Define some relocations, based on ELF relocations.
-	(enum reloc_type, bfd_coff_generic_reloc, coff_sparc_howto_table,
-	struct coff_reloc_map, sparc_reloc_map,
-	coff_sparc_reloc_type_lookup): Borrowed from elf32-sparc.c and
-	elf.c, renamed.
-	(coff_bfd_reloc_type_lookup): Define to be coff_sparc_reloc_....
-	(rtype2howto): Index into coff_sparc_howto_table using
-	dst->r_type.
-
-Thu Nov 18 11:45:39 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* config.bfd (mips*-*-irix5*): New target; use mipsbelf.
-	* configure.host (mips-sgi-irix5*) New host; use irix5 (no
-	hosts/irix5.h created; just use std-host.h).
-	* config/irix5.mh: New file; like irix4.mh, but don't use -G or
-	-lmalloc.
-	* Makefile.in: Rebuilt dependencies.
-
-	* ecoffswap.h: Changed type of internal pointers for swap out
-	functions to const *.
-
-	* elf32-mips.c (mips_elf_got16_reloc): New function.  Handle GOT16
-	correctly for assembler, but linker support not implemented.
-	(elf_mips_howto_table): Use mips_elf_got16_reloc for GOT16.
-	(mips_elf_sym_is_global): New function; at least on Irix 5, all
-	non section symbols are considered global.
-	(elf_backend_sym_is_global): Define.
-	(mips_elf_final_write_processing): New function.  Set the MIPS
-	architecture level correctly.
-	(elf_backend_final_write_processing): Define.
-	(mips_elf_section_from_shdr): Handle SHT_MIPS_OPTIONS.
-	(mips_elf_fake_sections): Set entsize of .mdebug or .reginfo
-	section to 1.  Handle .options section.
-	(mips_elf_acom_section, mips_elf_acom_symbol,
-	mips_elf_acom_symbol_ptr): New static variables, used to build a
-	generic .acommon section to hold SHN_MIPS_ACOMMON symbols.
-	(mips_elf_symbol_processing): Handle SHN_MIPS_ACOMMON symbols by
-	putting them all in a global .acommon section.
-
-	* elfcode.h (bfd_section_from_shdr): Don't dump core if target
-	section has no ELF section data.
-	(elf_make_sections): Set addralign of reloc section to 4.
-	(elf_fake_sections): Likewise.
-	(map_program_segments):	Don't consider section 0.
-	(assign_file_positions_except_relocs): Don't consider section 0.
-	In the main loop, skip the symtab and strtab sections, since their
-	positions are set elsewhere.
-	(swap_out_syms): Set addralign of symtab section to 4.  Set
-	addralign of strtab sections to 1.
-	(assign_file_positions_for_relocs): Don't consider section 0.
-	(write_object_contents): Don't write out section 0.
-
-	* libelf.h (struct elf_backend_data): Added fields
-	elf_backend_sym_is_global and elf_backend_final_write_processing.
-	* elf32-target.h (elf32_bed): Added corresponding initializers.
-	* elf64-target.h (elf64_bed): Likewise.
-	* elfcode.h (sym_is_global): Take abfd argument.  Call
-	elf_backend_sym_is_global if it is not NULL.
-	(elf_map_symbols): Pass abfd to sym_is_global.
-	(write_object_contents): Call elf_backend_final_write_processing
-	if it is defined.
-
-Wed Nov 17 18:43:28 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libecoff.h: Include coff/ecoff.h.
-	(struct ecoff_backend_data): Move external debugging information
-	fields into a single field pointing to an ecoff_debug_swap
-	structure.
-	(ecoff_data_type): Move debugging information fields into a single
-	field pointing to an ecoff_debug_info structure.
-	* coff-alpha.c, coff-mips.c, ecoff.c: Corresponding changes.
-
-Wed Nov 17 17:38:58 1993  Sean Eric Fagan  (sef@cygnus.com)
-
-	* nlmswap.h: New file to swap fixed header.  Included by NLM
-	backends.
-	* libnlm.h (struct reloc_and_sec): Define.
-	(struct nlm_backend_data): Add fields fixed_header_size,
-	nlm_read_import, nlm_write_import, nlm_swap_fhdr_in,
-	nlm_swap_fhdr_out.
-	(nlm_fixed_header_size, nlm_read_import_func,
-	nlm_write_import_func, nlm_swap_fixed_header_in_func,
-	nlm_swap_fixed_header_out_func, nlm_write_external_func): New
-	accessor macros.
-	* nlmcode.h: Use new functions.
-	* nlm32-i386.c: Provide new functions.
-	* nlm32-sparc.c: New file; SPARC NLM backend.
-
-Wed Nov 17 13:56:10 1993  Stan Shebs  (shebs@rtl.cygnus.com)
-
-	* i386lynx.c (swap_std_reloc_in, swap_ext_reloc_in): Ignore
-	garbage bits appearing in the upper end of symbolnums.
-
-	* config/sparc-lynx.mt (TDEFINES): Add -DFPRINTF_ALREADY_DECLARED.
-
-Tue Nov 16 17:03:41 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* lynx-core.c (lynx_core_file_p):  Change bfd_zalloc to bfd_alloc.
-	* m68klynx.c:  Define core file macros.
-	* hosts/i386lynx.h, hosts/m68klynx.h, hosts/lynx.h:  Move all
-	non-architecture specific stuff into lynx.h.
-
-Tue Nov 16 15:45:54 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* i386linux.c: Define new macro ZMAGIC_DISK_BLOCK_SIZE to 1024, and
-	change PAGE_SIZE to 4096.
-
-Mon Nov 15 11:48:08 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
-
-	* Makefile.in (diststuff): New target.
-
-	* VERSION: Updated.
-
-Sun Nov 14 23:33:01 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_object_setup): Do not create dummy ".text", ".data",
-	and ".bss" sections.
-	(setup_sections): Do not set SEC_HAS_CONTENTS if a section's size
-	is zero.  Recognize BSS type sections and turn off SEC_LOAD and
-	SEC_DATA (so binutils/size works).  Set the correct value for
-	a section's _raw_size.
-	(som_slurp_symbol_table): Program entry points, and millicode are
-	also functions.  Mark them as such.  Also mark L$* symbols as
-	debugging symbols.
-
-	* bfd-in2.h: Rebuilt.
-
-Sat Nov 13 15:27:15 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_reloc_type_lookup): Add missing prototype.  Returns
-	a pointer to constant data.  Delete bogus #define which made the 
-	function useless.
-
-	* som.c (som_prep_for_fixups): New function.
-	(som_write_fixups): New function.
-	(som_write_space_strings): New function.
-	(som_write_symbol_strings): New function.
-	(som_begin_writing): New function.
-
-Fri Nov 12 15:29:36 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_write_object_contents): Do not abort.  Flesh out.
-	(som_set_section_contents): Do not abort.  Flesh out.
-
-	* som.c (som_write_headers): New function.
-	(som_prep_headers): New function.
-	(som_build_and_write_symbol_table): New function.
-
-	* som.c (som_sizeof_headers): Add missing prototype.
-	(som_set_arch_mach): Do not abort.
-
-	* som.c (som_count_spaces): New function.
-	(som_count_subspaces): New function.
-	(compare_syms): New function.
-	(som_compute_checksum): New function.
-
-	* som.c (hppa_som_gen_reloc_type): New function.
-	(som_bfd_reloc_type_lookup): New function.
-
-	* som.c (try_prev_fixup): New function.
-	(som_reloc_skip): New function.
-	(som_reloc_addend): New function.
-	(som_reloc_call): New function.
-
-	* som.c (som_initialize_reloc_queue): New function.
-	(som_reloc_queue_insert): Likewise.
-	(som_reloc_queue_fix): Likewise.
-	(som_reloc_queue_find): Likewise.
-
-	* som.c (som_hppa_howto_table): SOM howto relocation table.
-	(hppa_som_reloc): New function.
-
-	* som.c (struct reloc_queue): New structure to keep track of
-	the last four multibyte relocations emitted.
-	(enum pa_symbol_type): Type to fully describe the symbol types
-	associated with .import/.export assembler directives.
-
-	* som.c: Include libhppa.h
-
-	* som.c (bfd_som_set_section_attributes): New function.
-	(bfd_som_set_subsection_attributes): Likewise.
-	(bfd_som_set_symboL_type): Likewise.
-	(bfd_som_attach_unwind_info): Likewise.
-	* som.h: Declare new exported functions.
-
-	* som.h (struct som_symbol): Add new fields to hold additional
-	information needed to build/write symbol tables and fixup streams.
-	(struct som_section_data_struct): Add new fields to hold additional
-	information needed to build/write space and subspace headers.
-	(som_symbol_data): New accessor macro for SOM symbol information.
-	(R_HPPA_*): Basic relocation types to be used by the assembler.
-
-Fri Nov 12 11:00:28 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* trad-core.c (trad_unix_core_file_p): If new hook
-	TRAD_CORE_ALLOW_ANY_EXTRA_SIZE defined, then skip the check for the
-	corefile being too big.
-	* hosts/i386sco.h: Define it.
-
-Thu Nov 11 15:16:28 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* bfd.c (struct _bfd): Add hppabsd_core_data.
-	* targets.c (target_vector): Add hppabsd_core_vec.
-	* hpux-core.c (hpux_core_core_file_p): Fail if an unknown core
-	section is encountered during core section scanning.
-	* hppabsd-core.c: New file.
-	* config/hppabsd.mh: Enable HPPA BSD core files.
-
-	* elf32-hppa.c (hppa_elf_reloc): Remove DEFUN crud.  Remove code
-	which is either commented out or ifdef'd out.  Add, update and
-	clean comments.  Fix various indention and spacing problems.  Handle
-	problems related to using "ble" to jump to a stub rather than "bl"
-	(%r31 is trashed by "ble", but not by "bl").
-	(NEW_INSTRUCTION): Put inside curly braces.
-	(CURRENT_STUB_OFFSET): Fix indention problems.
-	(hppa_elf_build_arg_reloc_stub): Fix indention and spacing problems.
-	Add, update and clean comments.  Handle "ble" %r31 lossage problems.
-	(hppa_elf_build_long_branch_stub): Likewise.
-	(hppa_look_for_stubs_in_section): Likewise.
-	(hppa_elf_stub_check): Remove obsolete function.
-
-	* hppa_stubs.h: Add new instructions to deal with %r31 lossage
-	problems.  Delete unused instructions.
-	
-Tue Nov  9 11:40:27 1993  Stan Shebs  (shebs@rtl.cygnus.com)
-
-	* m68klynx.c (TARGET_IS_BIG_ENDIAN_P): Define.
-
-Tue Nov  9 11:26:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (elf_object_p): Rather than looking through an array
-	of architectures, get the ELF EM_xxx code from the backend
-	information.  Let the generic ELF target match any EM_xxx code not
-	matched by another ELF target.  Call elf_backend_object_p to let
-	the backend do more checks and set global information.
-	* libelf.h (struct elf_backend_data): Added elf_machine_code and
-	elf_backend_object_p fields.
-	(struct bfd_elf_arch_map): Removed.
-	(bfd_elf_arch_map, bfd_elf_arch_map_size): Don't declare.
-	* elf32-target.h, elf64-target.h: Initialize elf_machine_code
-	field with ELF_MACHINE_CODE.  Initialize elf_backend_object_p
-	field with elf_backend_object_p (if it is defined).
-	* elf32-gen.c, elf32-hppa.c, elf32-i386.c, elf32-i860.c,
-	elf32-m68k.c, elf32-m88k.c, elf32-mips.c, elf32-sparc.c,
-	elf64-gen.c (ELF_MACHINE_CODE): Defined.
-	* elf32-mips.c: Include ecoffswap.h to get ECOFF swapping
-	routines.
-	(mips_elf_object_p): Set the right machine number.
-	(mips_elf_ecoff_debug_swap): Defined.
-	(elf_backend_object_p): Defined to be mips_elf_object_p.
-	(elf_backend_ecoff_debug_swap): Defined to be
-	mips_elf_ecoff_debug_swap.
-	* elf.c (bfd_elf_arch_map, bfd_elf_arch_map_size): Removed.
-
-	* libbfd-in.h (target_vector, default_vector): Declare.
-	* libbfd.h: Rebuilt.
-	* format.c (target_vector, default_vector): Don't declare.
-
-	* elf32-mips.c (elf_mips_howto_table): Don't complain on overflow
-	for R_MIPS_26.  Correct overflow detection requires matching the
-	upper four bits of the destination against the PC.  From Ted Lemon
-	<mellon@pepper.ncd.com>.
-
-	* bout.c (b_out_reloc_type_lookup): Return type should point to
-	const data.
-	* coff-i960.c (coff_i960_reloc_type_lookup): Likewise.
-	* elf32-hppa.c (elf_hppa_reloc_type_lookup): Likewise.
-	* mipsbsd.c (MY(reloc_howto_type_lookup)): Likewise.
-	* coff-i386.c (coff_i386_reloc): Made howto const.
-	* oasys.c (oasys_write_data): Made how const.
-
-	* libelf.h: Added some comments.
-	(struct elf_backend_data): Added elf_backend_ecoff_debug_swap
-	field.  Removed unused write_relocs field.
-	* elf32-target.h: Adjusted elf_backend_data initialization
-	accordingly.
-	* elf64-target.h: Corrected elf_backend_data initialization to
-	fill in all fields and to set elf_64_p to 1.
-
-Mon Nov  8 18:13:14 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (bfd_section_from_shdr): Remove duplicate assignment
-	to filepos in SHT_STRTAB case.
-	(assign_file_position_for_section): Set BFD section filepos as
-	well as ELF section sh_offset.
-
-	* reloc.c: Use const instead of CONST.
-	(bfd_perform_relocation): Make variable howto a const pointer.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-
-Mon Nov  8 12:19:15 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in (realclean): Don't remove generated headers.  Reverts
-	change of 2 Jul 1993.
-
-Mon Nov  8 06:08:31 1993  D. V. Henkel-Wallace  (gumby@cirdan.cygnus.com)
-
-	* configure.bfd: make unixware equivalent to sysv4.
-
-	* config/i386-nlm.mt: bring in elf config; make it the default.
-
-Sun Nov  7 20:21:38 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* libbfd.c (bfd_put_8): Add parens around reference to "val"
-	argument.
-
-Fri Nov  5 21:45:09 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* hosts/i386mach3.h (HOST_SEGMENT_SIZE),
-	i386mach3.c (SEGMENT_SIZE, TEXT_START_ADDR): Correct values (?).
-
-Fri Nov  5 15:17:57 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coffcode.h (coff_write_object_contents): Zero out internal_a.
-
-Fri Nov  5 10:41:07 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h, archive.c, archures.c, bfd.c, cache.c, coffcode.h,
-	core.c, ctor.c, format.c, init.c, libbfd.c, opncls.c, reloc.c,
-	section.c, syms.c, targets.c:
-	Doc cleanup (spelling, punctuation, grammar, formatting).
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-Thu Nov  4 14:46:14 1993  John Gilmore  (gnu@rtl.cygnus.com)
-
-	* bfd-in.h (bfd_get_cacheable, bfd_set_cacheable):  New accessors.
-	* bfd.c, opncls.c:  Improve comments on file descriptor cacheing.
-
-Thu Nov  4 08:54:30 1993  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* From Pete Hoogenboom (hoogen@cs.utah.edu)
-	* elf32-hppa.c (hppa_elf_get_section_contents): Fix logic error
-	in last change.  Always rebuild symbol extension section the first
-	time though if output sections exist (fixes ld -r problems).
-
-Thu Nov 04 08:08:46 1993  Jeffrey Wheat  (cassidy@cygnus.com)
-
-	* Makefile.in: Add .PHONY for check and installcheck rules.
-
-Tue Nov  2 14:42:27 1993  Bill Cox (bill@tarkas.cygnus.com)
-
-	* libbfd-in.h (artdata): Use long, not time_t for portability, at
-	  least to HPUX.  File below is a derived file.
-
-Tue Nov  2 14:42:27 1993  Bill Cox (bill@tarkas.cygnus.com)
-
-	* libbfd.h (artdata): Use long, not time_t for portability, at
-	  least to HPUX.
-
-Tue Nov  2 09:32:25 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config.bfd: Use bigmips for mips*-*-bsd*.
-
-Mon Nov  1 14:30:09 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (elf_slurp_reloca_table, elf_slurp_reloc_table):
-	Handle symbol number of zero.
-
-	* reloc.c (enum bfd_reloc_code_real): Added
-	BFD_RELOC_MIPS_LITERAL, BFD_RELOC_MIPS_GOT16,
-	BFD_RELOC_MIPS_CALL16, BFD_RELOC_MIPS_GPREL32.
-	* bfd-in2.h: Rebuilt.
-	* coff-mips.c (mips_bfd_reloc_type_lookup): Handle
-	BFD_RELOC_MIPS_LITERAL.
-	* elf32-mips.c (mips_reloc_map): Handle new relocs.
-	(mips_elf_hi16_reloc, mips_elf_lo16_reloc): Rearrange _gp_disp
-	checks slightly.
-
-	* aout-target.h (MY_bfd_debug_info_start, MY_bfd_debug_info_end,
-	MY_bfd_debug_info_accumulat [sic]): Remove unused definitions.
-	(MY_bfd_get_relocated_section_contents, MY_bfd_relax_section,
-	MY_bfd_seclet_link): Define.
-	(MY_bfd_reloc_type_lookup): Rename from
-	MY_reloc_howto_type_lookup.
-	(MY_bfd_make_debug_symbol): Rename from MY_make_debug_symbol.
-	(MY(vec)): Use JUMP_TABLE rather than listing functions.
-	* hp300hpux.c (MY_get_symtab, MY_get_symtab_upper_bound,
-	MY_canonicalize_reloc, MY_write_object_contents): Don't define in
-	terms of MY, because that causes a recusive invocation of CAT when
-	expanded within JUMP_TABLE, and ANSI compilers don't expand
-	recursive macros.
-	* mipsbsd.c (MY_bfd_reloc_type_lookup): Rename from
-	MY_reloc_howto_type_lookup, and don't define in terms of MY.
-	(MY_canonicalize_reloc): Don't define in terms of MY.
-	(aout_mips_little_vec, aout_mips_big_vec): Use JUMP_TABLE rather
-	than listing functions.
-
-Mon Nov  1 09:12:25 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config.bfd: Use m68k-elf for m68*-*-sysv4*.
-
-Sun Oct 31 09:35:49 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* targets.c: Move enum target_flavour outside of struct and change
-	the name to enum bfd_flavour.  This means bfd clients can use it.
-	* bfd-in.h: Add macro bfd_get_flavour.
-	* bfd-in2.h: Rebuilt.
-
-	* som.c: Add comment about how abort() on corrupt executable is evil.
-
-Sat Oct 30 12:27:09 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h (aout,slurp_reloc_table): Avoid a goto.
-
-Fri Oct 29 16:04:33 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* gen-aout.c, libbfd.c: exit(1) instead of exit(-1).
-
-Fri Oct 29 13:17:21 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* bfd-in.h: Added commands for object file flag values.
-	* bfd-in2.h: Rebuilt.
-	* elfcode.h (elf_object_p): If type is ET_DYN, set DYNAMIC flag,
-	not EXEC_P.
-	* bout.c, coff-h8300.c, coff-sh.c: Add BFD_IS_RELAXABLE to
-	object_flags field for target vector.
-	* aix386-core.c, aout-adobe.c, aout-target.h, bout.c, coff-a29k.c,
-	coff-alpha.c, coff-apollo.c, coff-h8300.c, coff-h8500.c,
-	coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c, coff-mips.c,
-	coff-rs6000.c, coff-sh.c, coff-we32k.c, coff-z8k.c, hpux-core.c,
-	ieee.c, mipsbsd.c, nlm-target.h, oasys.c, osf-core.c, som.c,
-	srec.c, tekhex.c, trad-core.c:	Remove DYNAMIC from object_flags
-	field for target vector.
-
-Thu Oct 28 20:02:31 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* hosts/std-host.h: Don't declare time; causes error on mach3.
-	* configure.in (i386mach3_vec): Require aout32.o stab-syms.o.
-
-Thu Oct 28 16:33:26 1993  Stan Shebs  (shebs@rtl.cygnus.com)
-
-	LynxOS and Sparc LynxOS changes:
-	* config.bfd: Recognize sparc-*-lynxos*.
-	* configure.host: Recognize sparc-*-lynxos*.
-	* configure.in: Recognize Sparc Lynx vectors.
-	* targets.c (sparclynx_aout_vec): Declare.
-	(sparclynx_coff_vec): Declare.
-	(target_vector): Add them.
-	* cf-i386lynx.c: New file, renamed from i386lynx-cf.c.
-	* cf-m68klynx.c: New file, renamed from m68klynx-cf.c.
-	* cf-sparclynx.c: New file, support for coff in Sparc LynxOS.
-	* coff-sparc.c: New file, basic Sparc coff support.
-	* sparclynx.c: New file, support for a.out in Sparc LynxOS.
-	* Makefile.in: Change filenames appropriately, add Sparc rules.
-	* coffcode.h (coff_set_arch_mach_hook): Recognize Sparc magic
-	number.
-	(coff_set_flags): Use LynxOS magic number for i386, m68k, and
-	Sparc LynxOS, set Sparc magic number for Sparcs.
-	* config/m68k-lynx.mt (SELECT_VECS): Remove redundant vector.
-	* config/sparc-lynx.mt: New file.
-	* hosts/i386lynx.h: Cosmetic improvements.
-	* hosts/m68klynx.h: Add ifdefs, #define of cfree.
-	* hosts/sparclynx.h: New file.
-
-Thu Oct 28 16:23:40 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	gcc -Wall lint:
-	* coff-h8300.c (h8300_reloc16_estimate): Declare return type.
-	Remove useless statement probably left by code copy.
-	* cpu-i960.c (compatible): Fully bracket matrix initializer.
-	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub): Use bfd_xmalloc
-	rather than xmalloc.  Use realloc and check the return value
-	rather than xrealloc.
-	(hppa_elf_get_section_contents): Add some casts.
-	* elf32-i386.c (elf_i386_reloc_type_lookup): Remove unused
-	variable.  Add default case to switch.
-	* hp300hpux.c: Declare aout_32_write_syms.
-	* i386bsd.c, i386linux.c, netbsd386.c (N_SHARED_LIB): Define as 0
-	(definition from aout/aout64.h is always 0 anyhow).
-	* i386lynx.c (swap_std_reloc_in): Remove unused variable.
-	* ieee.c (ieee_write_id): length can never be negative.
-	(read_id): Likewise.
-	(ieee_archive_p): Remove unused variable.
-	* libcoff-in.h (bfd_perform_slip): Declare.
-	* libcoff.h: Rebuilt.
-	* oasys.c (oasys_write_sections): Remove zero initialization of
-	static structure.
-	* reloc16.c: Indentation change.
-
-Wed Oct 27 16:51:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* configure.in, config/i386-mach3.mt: Update for new configuration
-	(--with-targets	and so on).
-	* hosts/i386mach3.h: Declare errno.
-	* targets.c: Declare i386mach3_vec.
-
-Wed Oct 27 12:18:07 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* nlmcode.h (nlm_swap_auxiliary_headers_in,
-	nlm_swap_auxiliary_headers_out): Handle sharedDebugRecordOffset
-	and sharedDebugRecordCount fields.
-
-Tue Oct 26 16:21:12 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* targets.c (target_vector): Remove SCO_CORE.  On Sep 11 1993,
-	we started using trad-core.c for SCO instead.
-
-	* targets.c (target_vector): Re-enable generic ELF and NLM targets.
-
-Tue Oct 26 16:53:12 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (assign_file_position_for_section): Align sh_offset to
-	sh_addralign (this is what UnixWare does, and it shouldn't hurt).
-
-Tue Oct 26 10:16:54 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	From Jeff Law and Pete Hoogenboom at Utah:
-
-	* elf32-hppa.h (hppa_elf_stub_finish): Add prototype.
-	(ELF32_HPPA_R_ARG_RELOC): Renamed without the ELF32 prefix
-	and moved into libhppa.h.  All references changed.
-	(ELF32_HPPA_R_CONSTANT, ELF32_HPPA_R_ADDEND): Likewise.
-	(get_opcode and opcode defines): Move into libhppa.h
-	* elf32-hppa.c (hppa_elf_insn2fmt): Rename and move info
-	libhppa.h.
-	* libhppa.h (HPPA_R_*): Moved here.  Reformatted slightly to make
-	for easier reading.
-	(get_opcode): Moved here.  FIXME! this really should be a C function
-	inside the opcode library!
-	(bfd_hppa_insn2fmt): Likewise.
-
-	* targets.c (target_vector): Enable elf32-hppa vector.
-
-	* elf32-hppa.c (hppa_elf_get_section_contents): Add new comments
-	and clarify existing comments.  Do not use DEFUN to declare this
-	function.  Fix numerous indention problems.  Correctly handle cases
-	where symbol extension section may need to be read from disk, 
-	read from memory, or built then read from memory.
-
-	* elf32-hppa.h: Reformat with gnu-indent and hand fix numerous
-	formatting and indention problems gnu-indent can not handle.
-	Clarify some comments about relocation types.  Comment basic
-	relocation "classes".  Group PARAM declarations together.
-	(HPPA_SXT_{NULL, SYMNDX, RG_RELOC}): Make members of a new 
-	enumerated type rather than #defines.
-
-Tue Oct 26 02:40:46 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* som.c (hppa_object_setup):  Set SEC_CODE for .text section so
-	that GDB can figure out text_start and text_end.
-
-Mon Oct 25 16:05:23 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Fix up warnings from gcc -Wall:
-	* coffgen.c (coff_print_symbol): Use %lx and cast n_value to
-	unsigned long.  Use %ld for tagndx.  Use %lx for offset + vma and
-	cast it to unsigned long.
-	* ecoff.c (ecoff_emit_aggregate): Use %ld.	
-	(ecoff_print_symbol): Use %ld, and cast indx and sym_base to long.
-	* coffcode.h (dummy_reloc16_estimate): Specify return type.
-
-	* libbfd.c (bfd_write): If not everything is written out, set
-	bfd_error to system_call_error.  If the return value is
-	non-negative, set errno to ENOSPC (if ENOSPC is defined).
-	(bfd_seek): If the seek fails, set bfd_error to system_call_error.
-	(bfd_generic_set_section_contents): For a bad offset + count, set
-	bfd_error to bad_value.
-	* seclet.c (rel): Don't abort.  Instead, return false.
-
-Mon Oct 25 09:59:37 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* aoutx.h (reloc_type_lookup): Handle BFD_RELOC_SPARC_WDISP22.
-
-Fri Oct 22 20:35:54 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
-
-	* config.bfd: handle mips*-* instead of mips-*, use mips*el
-	  instead of mips-*-*l
-
-Fri Oct 22 14:03:33 1993  Mark Eichin  (eichin@cygnus.com)
-
-	* m68k-lynx.mt, i386-lynx.mt (TDEFINES): set
-	FPRINTF_ALREADY_DECLARED because the objdump.c declaration of
-	fprintf collides with the native one.
-
-Fri Oct 22 11:50:25 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* targets.c (target_vector): Enable MIPS ELF vectors.
-
-Fri Oct 22 07:51:51 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config.bfd: Use bigmips for mips-sony-bsd*.
-
-	* configure.host, config.bfd: Add * to end of all OS names.
-
-Thu Oct 21 12:16:26 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* elfcode.h (FILE_ALIGN): Renamed from EALIGN, to avoid conflict
-	with Ultrix header files.
-
-	* som.h (struct som_section_data_struct): Renamed from
-	som_section_data to avoid conflict with macro by that name.
-
-	Changes from Jeff Law and Peter Hoogenboom at Utah:
-
-	* elf32-hppa.c (hppa_elf_reloc):  Target register for a 'jump
-	in delay slot' optimization in combination with a long call
-	stub should always be r31.
-
-	* elf32-hppa.c: (hppa_elf_relocate_insn): To be consistent
-	across all relocation types, retrieve instruction addends from
-	the relocation entry rather than from the instruction itself.
-
-	* elf32-hppa.c: (hppa_elf_relocate_insn): Fix a relocation
-	error that only occurred when the addend of an 'addil' or
-	'ldil' was larger than 21 bits and very close to a 2K byte
-	boundary.
-
-	* elf32-hppa.c: (hppa_elf_reloc):  Handle the optimization in
-	which a jump is placed in the delay slot of a function call.
-	The jump was being accomplished via an adjustment to the
-	return pointer.  This optimization would break the long call
-	stub code, if there was any.
-
-	* elf32-hppa.c: (hppa_elf_build_long_branch_stub): Corrections
-	to long branch stubs to avoid use of general register 2.
-
-	* hppa_stubs.h: New stub instructions.
-
-	* elfcode.h: Declare bfd_elf_find_section.
-
-	* som.h (som_section_data): Add new "subspace_index" field.
-
-	* som.c (setup_sections): Save the original SOM subspace index
-	in the BFD section associated with that subspace.  
-	(som_get_symtab_upper_bound): Implement.
-	(som_get_symtab): Implement.
-	(som_print_symbol): Implement.
-	(som_slurp_string_table): New function to read a string table
-	from a SOM object file.
-	(som_section_from_subspace_index): New function to return the
-	section which corresponds to a SOM subspace index.
-	(som_slurp_symbol_table): New function to read the symbol
-	table from a SOM object file.
-	(som_make_empty_symbol): Check for errors from bfd_zalloc.
-	(som_new_section_hook): Initialize subspace_index field to
-	-1 instead of 0.
-
-	* som.c (som_object_setup): Fix polarity of test to set HAS_RELOC.
-	Set EXEC_P for executables.
-	(setup_sections): Correctly identify when a section has
-	relocations.
-	(log2): New function.
-	(setup_sections): Correctly convert between SOM alignments and BFD
-	alignments.
-
-	* som.c (setup_sections): Do not set SEC_ALLOC or SEC_LOAD
-	for sections which correspond to SOM spaces, doing so confuses
-	many utilities.  Set assorted SEC_* flags for SOM subspaces
-	which correspond to BFD sections.
-
-	* elf32-hppa.c: (elf32_hppa_backend_fake_sections): The stab
-	string table should have sh_type == SHT_STRTAB.  Add
-	processing to make it so.
-
-	* elfcode.h: (bfd_section_from_shdr): String tables (other
-	than .strtab) were not getting the file offsets recorded, so
-	they could not be read from disk.
-
-	* elfcode.h: (elf_make_sections):  Leave the sh_addr field of
-	the section header and the vma field of a section at 0 if the
-	section is not part of the program execution image. (e.g.,
-	.stab)
-
-	* som.[hc]: Change target vector prefix from "hppa" to "som".
-	Consistently use obj_som prefix to access fields in backend data
-	structures.  Fix all callers/references.
-
-	* som.h: Do not include files only needed for core file reading here.
-	Include a.out for both HOST_HPPAHPUX and HOST_HPPABSD.  Delete
-	forward structure declarations, they are unnecessary.
-	(struct somdata): Delete aux_hdr, and hp_symbol_entry_size fields.
-	Change "symbols" to "symtab".  Add "stringtab" and "reloc_filepos"
-	fields for future use.  Change obj_som_* macros as appropriate.
-	(som_section_data): New structure to keep SOM specific information
-	about BFD sections (for future use).
-
-	* som.c: Provide PARAMS declarations for all functions currently
-	in this file.
-	(struct container): Delete unwanted structure definition.
-	(som_object_setup): Add comments.  Use som_mkobject to allocate
-	SOM specific information in the BFD; use information from the
-	file and (possibly empty) auxiliary headers to initialize this
-	information.  Delete redundant bfd_get_symcount (abfd) "calls".
-	(setup_sections): Return type is now boolean, fix return statements.
-	"Fix" handling of BSS like subspaces in the computation of the
-	containing space's size.  If the subspace has relocations, set the
-	appropriate BFD section flags and record the index into and the
-	size of the fixup stream.  Always return a value.
-	(som_object_p): Set bfd_error appropriately if errors are detected
-	from bfd_{read,seek} functions.  Handle EXECLIBMAGIC type files.
-	Do not try to read a non-existant auxiliary header.
-	(som_mkobject): Flesh out.
-	(som_section_hook): Allocate space to hold SOM specific information
-	about sections.
-
-Thu Oct 21 12:41:34 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	gcc -Wall lint:
-	* coff-h8300.c, coffcode.h: Change shrink parameter
-	in *_reloc16_estimate to unsigned to match prototype.
-	* archive.c: Avoid "/*" in comment.
-
-Thu Oct 21 13:05:16 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* dep-in.sed: Create our own line breaks for a more aesthetic
-	Makefile.
-	* Makefile.in: Rebuilt dependencies.
-
-	* elf32-mips.c: Include "seclet.h".
-	(mips_elf_fake_sections): Force size of .reginfo section to sizeof
-	Elf32_External_RegInfo.
-	(mips_elf_seclet_link): New function.  Link the .reginfo section
-	specially, and pass everything else to the generic routine.
-	(bfd_elf32_bfd_seclet_link): Define macro.
-	* elf32-target.h: If bfd_elf32_bfd_seclet_link is already defined,
-	don't override it.
-
-Wed Oct 20 12:22:37 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libnlm.h (nlm_backend_data): Added signature field.
-	(nlm_signature): New macro.
-	* nlmcode.h (nlm_object_p, nlm_write_object_contents): Use the NLM
-	signature from the backend rather than the constant NLM_SIGNATURE.
-	* nlm32-i386.c (nlm32_i386_backend): Initialize signature field.
-
-	* aoutf1.h (MACHTYPE_OK): Accept M_UNKNOWN.
-	(NAME(sunos,set_arch_mach)): Treat M_UNKNOWN as 68000, not 68020.
-
-Wed Oct 20 10:28:27 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/i386bsd.h [__bsdi__]: Define HOST_DATA_START_ADDR.
-
-Wed Oct 20 10:10:07 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* Makefile.in (HFILES): New variable, for use in "make dep".
-	(.dep): Depend on $(CFILES) and $(HFILES).  Delete .dep1 and
-	remake it, so that "$?" is complete.
-	(.dep1): Don't need to remove .dep1 first.
-	(dep.sed): Depend on config.status, not Makefile.
-	(CFILES): Add nlm.c.
-
-Tue Oct 19 15:26:26 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-alpha.c: Implemented reloc handling for the linker, made
-	various other related changes.
-	* libecoff.h (ecoff_backend_data): Added rdata_in_text field.
-	Renamed finish_reloc to adjust_reloc_in.  Added adjust_reloc_out
-	field.
-	(ecoff_bfd_get_relocated_section_contents): Don't define.
-	* ecoff.c (ecoff_sec_to_styp_flags, ecoff_styp_to_sec_flags):
-	Handle .lita section.
-	(ecoff_slurp_reloc_table): Handle RELOC_SECTION_FINI.
-	finish_reloc backend field renamed to adjust_reloc_in.
-	(ecoff_bfd_seclet_link): Adjust number of aux entries to
-	debug_align boundary.
-	(ecoff_compute_section_file_positions): If rdata_in_text put
-	.rdata section in text segment, not data segment.  Put .pdata
-	section in text segment.
-	(ecoff_write_object_contents): Likewise.  Also, call
-	adjust_reloc_out, and handle .lita, .xdata, .pdata, .fini and
-	absolute sections when writing out relocs.
-	* coffswap.h (coff_swap_aouthdr_out): For ALPHAECOFF, output 2 for
-	bldrev field, as on Alpha OSF/1.  Padding field is now 2 bytes.
-	* coff-mips.c (mips_ecoff_swap_reloc_out): Added assertion.
-	(mips_adjust_reloc_in): Renamed from mips_finish_reloc.
-	(mips_adjust_reloc_out): New function (does nothing).
-	(mips_ecoff_backend_data): Initialize new fields.
-	(ecoff_bfd_get_relocation_section_contents): Define to be
-	bfd_generic_get_relocated_section_contents.
-
-	* reloc.c (bfd_perform_relocation): Added casts to avoid Alpha
-	OSF/1 cc bug.
-
-Thu Oct 14 01:10:35 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* reloc.c (bfd_perform_relocation): Add comments attempting to
-	explain PC relative relocations.
-
-	* coffcode.h (styp_to_sec_flags): Don't set SEC_DEBUGGING until it
-	is made to work.
-	(coff_compute_section_file_positions): Remove check for
-	USE_DISCARDED_SECTIONS_COUNT.
-	* coff-i386.c: Don't define USE_DISCARDED_SECTIONS_COUNT.  Basing
-	it on host defines is wrong.
-
-	* ecoff.c (ecoff_bfd_seclet_link): Don't link a .reginfo section.
-	(ecoff_write_object_contents): Don't require the .reginfo section
-	to be a particular size.
-
-Wed Oct 13 18:39:03 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* Makefile.in (dep-in): New rule, for editing dependencies into
-	Makefile.in in $(srcdir).  Use move-if-change.
-	(.dep1, dep): Use move-if-change.
-	(CFILES): Add coff-apollo.c.
-
-	Sun Oct 10 18:02:56 1993  Troy Rollo (troy@cbme.unsw.EDU.AU)
-
-	* Makefile.in: Recognise new file, coff-apollo.o
-
-	* coff-apollo.c: New file
-
-	* coffcode.h: Recognise apollo magic numbers and writable text
-
-	* coffswap.h: Swap Apollo optional header entries
-
-	* config.bfd: Add line for Apollo
-
-	* configure.host: Replace apollo68b and apollo68v with Apollo
-
-	* configure.in: Recognise apollocoff_vec
-
-	* targets.c: Likewise
-
-	* config/apollo.mh, config/apollo.mt: New files
-
-	* hosts/apollo68.h: Remove inclusion of strings.h
-
-Wed Oct 13 14:28:17 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* coff-i386.c (i3coff_object_p): Now static.
-
-	* Makefile.in: Updated dependencies.
-	(.dep, .dep1, dep.sed): New targets, to make "make dep" work
-	better.
-	* dep-in.sed: New file.
-
-	* m68klynx-cf.c (ONLY_DECLARE_RELOCS): Define, to avoid name
-	conflicts when "--with-targets=all".
-	* coff-m68k.c (m68kcoff_howto_table, m68k_rtype2howto,
-	m68k_howto2rtype): Rename via macros to keep namespace clean.
-	* configure.in: For m68klynx_coff_vec, include coff-m68k.o for
-	now.
-
-Tue Oct 12 17:03:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf32-mips.c: Extensive additions to do relocations and to
-	handle MIPS specific sections.
-	* libelf.h (elf_backend_data): Pass fourth argument to
-	elf_backend_section_from_bfd_section to permit it to control the
-	section index to use.
-	(elf_obj_tdata): Add gp and gp_size fields.
-	(elf_gp, elf_gp_size): New accessor macros.
-	* elfcode.h: Removed a number of unused local variables.
-	(elf_fake_sections): Clear section header before calling
-	elf_backend_fake_sections, not after.
-	(prep_headers): Return true at end.
-	(elf_section_from_bfd_section): Pass retval argument to
-	elf_backend_section_from_bfd_section.
-	* elf32-hppa.c (elf32_hppa_backend_section_from_bfd_section):
-	Accept and ignore new retval argument.
-	* bfd.c: Include libelf.h.
-	(bfd_set_gp_size): Handle ELF targets.
-	* Makefile.in (bfd.o): Depends upon libelf.h.
-	(elf32-mips.o): Depends upon $(INCDIR)/elf/mips.h.
-
-Mon Oct 11 17:25:18 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_mkobject): Check bfd_make_section return value.
-	(ecoff_mkobject_hook): New function.
-	(ecoff_new_section_hook, ecoff_sizeof_headers,
-	ecoff_compute_section_file_positions, ecoff_set_section_contents,
-	ecoff_write_object_contents): Handle dummy REGINFO section.
-	(ecoff_get_section_contents): New function to handle reading
-	REGINFO section.
-	* libecoff.h (ecoff_get_section_contents): Change from macro
-	definition to function prototype.
-	(ecoff_mkobject_hook): New prototype.
-	* coff-alpha.c (alpha_ecoff_mkobject_hook): Removed.
-	(alpha_ecoff_backend_data): Use ecoff_mkobject_hook.
-	* coff-mips.c (mips_ecoff_mkobject_hook): Removed.
-	(mips_ecoff_backend_data): Use ecoff_mkobject_hook.
-
-Fri Oct  8 15:25:33 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* libbfd.c (bfd_get*32, bfd_get*64):  Prevent ANSI sign extension
-	by casting the most significant byte to bfd_vma.
-
-Fri Oct  8 02:34:21 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* configure.in:  Do not define SELECT_VECS, SELECT_ARCHITECTURES
-	if configuring --with-targets=all.
-
-Thu Oct  7 17:34:07 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* aoutx.h (howto_table_std): Correct the "size" field in some
-	entries.
-
-	* reloc.c (reloc_howto_type): Change documentation to dispel any
-	notion that the "size" field is a power-of-two indicator.
-
-Thu Oct  7 10:50:38 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-       * coffswap.h: (bfd_swap_reloc_in): a symndx is signed.
-
-	Make support for relaxing more generic.
-	* reloc16.c: Add new target entry - bfd_coff_reloc16_estimate,
-	fix bit rot.
-	* libcoff.h, libcoff-in.h: declarations. Prototypes
-	* coffcode.h (bfd_coff_std_swap_table): Add calls to
-	coff_reloc_16_extra_cases and coff_reloc16_estimate.
-	(dummy_reloc16_estimate): New function.
-	* coff-h8300.c (h8300_reloc16_estimate): New function
-
-Thu Oct  7 14:24:13 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elfcode.h (EALIGN): Define, dependent on ARCH_SIZE.
-	(align_file_position): New function.
-	(elf_locate_sh): Disabled function deleted.
-	(assign_file_positions_for_symtab_and_strtabs): Align position,
-	then place symtab, then do other sections.
-	(map_program_segments): Align program header.
-	(assign_file_positions_except_relocs): Align section headers.
-	(assign_file_positions_for_relocs): Align relocation sections.
-
-Tue Oct  5 10:44:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* configure.host: Recognize hppa*-*-hiux* (currently synonym for hpux).
-	Change other hppa entries to use -*- not -hp-.
-	* config.bfd: Recognize hppa*-*-hiux* (currently synonym for hpux).
-
-	* coff-rs6000.c, cpu-rs6000.c, rs6000-core.c: Change non-ASCII
-	characters in comment to octal escapes.
-
-Sun Oct  3 12:35:15 1993  Stan Shebs  (shebs@rtl.cygnus.com)
-
-	* coff-i386lynx.c: Removed, name too long.
-	* i386lynx-cf.c: New file, was coff-i386lynx.c.
-	* configure.in: Reflect file name changes.
-	* Makefile.in: Mention Lynx-related files.
-
-	* i386lynx.c (lynx_32_swap_ext_reloc_in): get reloc bits in i386
-	Lynx-specific way.
-
-	* m68klynx-cf.c: New file, defines coff format for M68K LynxOS.
-	* m68klynx.c: Remove coff vector definition, now in m68klynx-cf.c.
-
-	* coffcode.h (sec_to_styp_flags): Set section flag to STYP_INFO
-	for .stab, .stabstr and .debug sections, and set SEC_DEBUGGING for
-	sections of type STYP_INFO.  (from Minh Tran-Le)
-	(coff_compute_section_file_positions): Add discarded_sections_count
-	to abfd->section_count, which helps `strip' keep the size
-	of the executable header constant.
-	* coff-i386.c (discarded_sections_count): New variable, initialized
-	to zero.  For use by `strip'.  Currently being used only in aix386
-	coff, but may be useful for other coff systems.  (from Minh Tran-Le)
-
-	* coffswap.h (coff_swap_filehdr_out): Added a missing cast.
-
-	* archive.c: Cosmetic improvements.
-	* opncls.c: Cosmetic improvements.
-	(new_bfd): Removed redundant structure slot init.
-
-Sat Oct  2 18:48:17 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/news-mips.mh, hosts/news-mips.h: New files.
-	* configure.host: Use news-mips for mips-sony-bsd*.
-
-Fri Oct  1 13:14:17 1993  Stan Shebs  (shebs@rtl.cygnus.com)
-
-	* configure.in: i386lynx_coff_vec requires coff-i386lynx.o.
-	* coff-i386lynx.c: New file, defines Lynx target vector and name,
-	includes coff-i386.c.
-	* coff-i386.c (i386coff_vec): Allow redefinition of target vector
-	symbol and name, if TARGET_SYM and/or TARGET_NAME are defined.
-	* i386lynx.c: Remove coff vector definition entirely.
-	(lynx_32_swap_ext_reloc_in): Define.
-	(lynx_32_swap_std_reloc_in): Define, get reloc bits in i386
-	Lynx-specific way.
-	(lynx_32_swap_ext_reloc_out): Define.
-	(lynx_32_swap_std_reloc_out): Define.
-	(lynx_32_slurp_reloc_table): Define, call Lynx swapping fns.
-	(lynx_32_squirt_out_relocs): Define, call Lynx swapping fns.
-	(lynx_32_canonicalize_reloc): Define, call Lynx swapping fns.
-	(WRITE_HEADERS): Define, call Lynx swapping fns.
-
-	* config/i386-lynx.mt (SELECT_VECS): Remove redundant vector.
-
-Thu Sep 30 17:50:52 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* reloc.c (bfd_reloc_code_type): Add linkage-table relative
-	relocations of size 8, 16, 32.  Sort generic relocs by type rather
-	than size.  Added a little documentation too.
-
-	* aoutx.h (howto_table_std): Add BASE16 and BASE32 relocs.
-	(TABLE_SIZE): New macro.
-	(reloc_type_lookup): Handle BFD_RELOC_{16,32}_BASEREL for std
-	relocs.
-	(swap_std_reloc_out): Write baserel relocs correctly.
-	(swap_std_reloc_in): Handle r_baserel field.  Assert that
-	r_jmptable and r_relative fields are clear, and that the computed
-	index does refer to a defined entry of the howto table.
-
-Tue Sep 28 14:47:46 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* section.c (bfd_make_section_anyway): New function.
-	* section.c: Change comments to say several sections can have
-	the same name.
-	* bfd-in2.h: Re-generate to reflect above change.
-	* coffgen.c (make_a_section_from_file): Call bfd_make_section_anyway
-	if still no section after the bfd_coff_make_section_hook.
-	* coffcode.h: Add comment about TWO_DATA_SECS.
-
-Tue Sep 28 03:22:24 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* ecoff.c (ecoff_slurp_symbolic_info):  Always determine raw_size
-	explicitly.
-	* ecoff.c (ecoff_sec_to_styp_flags, ecoff_styp_to_sec_flags):  Handle
-	.fini section.
-
-Mon Sep 27 18:29:18 1993  Stan Shebs  (shebs@rtl.cygnus.com)
-
-	* config.bfd configure.host: Match on *-lynxos* for LynxOS,
-	add m68*-*-lynxos*.
-	* configure.in : Replaced i386lynx_vec with i386lynx_aout_vec
-	and i386lynx_coff_vec.
-	Added m68klynx_aout_vec and m68klynx_coff_vec.
-	* targets.c (target_vector): Removed i386lynx_vec, added
-	{i386,m68k}lynx_{aout,coff}_vec.
-	* i386lynx.c: Added copy of i386coff.c, renamed bfd target to
-	i386lynx_coff_vec.
-	* m68klynx.c: New file.
-	* config/i386-lynx.mt: Replaced i386lynx_vec with i386lynx_aout_vec
-	and i386lynx_coff_vec.
-	* config/m68k-lynx.mt: New file.
-	* hosts/i386lynx.h: Added definition of cfree as free (from Eichin).
-	* hosts/m68klynx.h: New file.
-
-Mon Sep 27 18:00:41 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* archive.c: Define offsetof here.
-	* hosts/*.h: Don't define it here.
-
-Mon Sep 27 19:09:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (bfd_section_from_shdr): Set filepos for SHT_STRTAB
-	section.
-
-Fri Sep 24 15:47:40 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hpux-core.c: Add comment about hpux version 7.
-
-Fri Sep 24 16:50:26 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* lynx-core.c (lynx_core_file_p):  Change per-thread register
-	section names from .regXXX to .reg/XXX to avoid parsing ambiguity
-	in gdb/corelow.c.  Create alias .reg section for the currently
-	running thread.
-
-Fri Sep 24 13:22:32 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libecoff.h (ecoff_backend_data): Removed big_magic and
-	little_magic fields.
-	* coff-alpha.c (alpha_ecoff_backend_data): Removed initialization
-	of big_magic and little_magic.
-	* coff-mips.c (mips_ecoff_bad_format_hook): Make sure magic number
-	matches endianess of bfd.
-	(mips_ecoff_backend_data): Removed initialization of big_magic and
-	little_magic.
-	* ecoff.c (ecoff_set_arch_mach_hook): Set MIPS machine number
-	based on magic number.  Support r4000 magic numbers.
-	(ecoff_get_magic): New function.
-	(ecoff_write_object_contents): Use ecoff_get_magic, not fields in
-	the backend structure.
-	* cpu-mips.c (arch_info_struct): Added case for r6000.
-
-	For MIPS configurations put both big and little endian versions in
-	the list of targets; the code is getting compiled in anyhow.
-	* bigmips.mt (SELECT_VECS): Define to be ecoff_little_vec.
-	* decstation.mt (SELECT_VECS): Define to be ecoff_big_vec.
-	* mipsbelf.mt (SELECT_VECS): Define to be bfd_elf32_littlemips_vec.
-	* mipslelf.mt (SELECT_VECS): Define to be bfd_elf32_bitmips_vec.
-	* riscos.mt (SELECT_VECS): Define to be ecoff_little_vec.
-
-Fri Sep 24 00:42:23 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* osf-core.c:  New file for OSF/1 core file support.
-	* config/alphaosf.mh (HDEFINES):  Add -DOSF_CORE.
-	(HDEPFILES):  Set to osf-core.o.
-	* bfd-in2.h (union tdata):  Add osf_core_data member.
-	* targets.c:  If OSF_CORE is defined, add osf_core_vec to target list.
-	* Makefile.in (OPTIONAL_BACKENDS):  Add osf-core.o.
-	(osf-core.o):  New dependency.
-
-Thu Sep 23 21:04:53 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* TODO: Remove note about making --with-bfd-targets use canonical
-	target configuration name (already done); reword item about
-	separating reading and writing stuff to not refer to a
-	non-existent item.
-
-	* ecoff.h (ecoff_set_arch_mach_hook): Accept MIPS_MAGIC_LITTLE2
-	and MIPS_MAGIC_BIG2.
-
-Thu Sep 23 11:06:34 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* gen-aout.c (main): Output newline after end of comment, not
-	before.  (Reported by Jonathan Stone,
-	jonathan@oscar.stanford.edu).
-
-Thu Sep 23 10:48:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* archive.c (compute_and_write_armap): Put weak symbols in the
-	armap.
-
-	* elfcode.h (fix_up_strtabs): Set sh_entsize for the .stab
-	section, not the .stabstr section.  Set the type of the .stabstr
-	section to SHT_STRTAB.
-	(elf_section_from_bfd_section): Handle SHT_STRTAB sections.
-
-	* section.c (SEC_DEBUGGING): New section flag.
-	* elfcode.h (bfd_section_from_shdr): If section is SHT_PROGBITS,
-	and the name starts with .debug, .line or .stab, set
-	SEC_DEBUGGING.  If SHT_STRTAB, check for .debug and .stab.
-	* elf32-target.h (TARGET_BIG_SYM, TARGET_LITTLE_SYM): Added
-	SEC_DEBUGGING to section_flags.
-	* elf64-target.h (TARGET_BIG_SYM, TARGET_LITTLE_SYM): Added
-	SEC_DEBUGGING and SEC_CODE to section_flags.
-	* bfd-in2.h: Updated.
-
-Wed Sep 22 16:34:14 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* bfd.c (tdata): Add lynx_core_data.
-
-	* ecoff.c (ecoff_compute_section_file_positions): Set filepos for
-	sections with SEC_LOAD set, even if SEC_HAS_CONTENTS is clear.
-	(ecoff_write_object_contents): Don't set scnptr to zero just
-	because size of section is zero.  Needed for Irix 4.0.5F.
-
-Wed Sep 22 09:49:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config.bfd: Use i960-bout, not i960-coff for i960-*-nindy*.
-
-Wed Sep 22 07:34:09 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* Makefile.in (OPTIONAL_BACKENDS):  Add lynx-core.o.
-	* bfd-in2.h (tdata):  Add lynx_core_data;
-	* config.bfd configure.host:  Get rid of superfluous netbsd and
-	lynxos entries.
-	* configure.in:  Add lynx-core.o to Lynx config.
-	* i386lynx.c:  Add defs for core file support.
-	* lynx-core.c:  New file with Lynx core file support.
-	* hosts/i386lynx.h:  Move lots of host specific includes to here.
-	Add def of HOST_LYNX.  Remove unnecessary defs.
-
-Mon Sep 20 19:18:10 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (bfd_section_from_shdr): Only set SEC_DATA for a
-	SHF_PROGBITS or SHT_STRTAB section if SEC_ALLOC is set.  Never set
-	SEC_DATA for a SHF_NOBITS section.
-
-	* nlm32-i386.c (nlm_i386_mangle_relocs): Check SEC_LOAD rather
-	than SEC_CODE | SEC_DATA.  Add some casts to avoid warnings.
-	* nlmcode.h: Add some casts to avoid warnings.
-	(nlm_write_object_contents): Ignore relocs for sections that are
-	neither code nor data.  Just use the symbol value for debugging
-	symbols; don't offset by the section vma.
-
-Fri Sep 17 18:08:55 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* reloc.c (bfd_perform_relocation): Don't return an error when
-	performing a reloc against an undefined weak symbol.
-	* syms.c (bfd_print_symbol_vandf): Show value of BSF_WEAK rather
-	than obsolete BSF_EXPORT.
-
-Fri Sep 17 02:04:31 1993  John Gilmore  (gnu@cygnus.com)
-
-	* hosts/{alphaosf.h, amix.h, apollo68.h, apollov68.h,
-	decstation.h, delta88.h, dgux.h, dose.h, go32.h, harris.h,
-	hp300.h, hp300bsd.h, hppabsd.h, hppahpux.h, i386aix.h, i386bsd.h,
-	i386linux.h, i386lynx.h, i386v.h, i386v4.h, irix3.h, irix4.h,
-	mipsbsd.h, ncr3000.h, rs6000.h, rtbsd.h, solaris2.h, sparc-ll.h,
-	std-host.h, stratus.h, sun3.h, sysv4.h, tahoe.h, ultra3.h,
-	vaxult.h, vaxult2.h, we32k.h}:  Make sure that "offsetof" is
-	defined on all hosts, now that archive.c uses it.
-
-Thu Sep 16 18:20:30 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (elf_map_symbols): Create section symbols for all
-	sections, not just allocated sections; debugging sections can have
-	relocs.
-	(elf_symbol_from_bfd_symbol): If there is an output section, use
-	the section index from that rather than the input section.
-
-Thu Sep 16 12:20:50 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* libbfd-in.h (bfd_flush, bfd_stat): Reflect John's changes to
-	libbfd.h, which is regenerated from this file.
-
-	* bfd-in.h (symtype): Deleted typedef.
-
-Wed Sep 15 11:48:37 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libbfd.c (COERCExx): Cast x to bfd_signed_vma before doing the
-	xor and subtract.  Otherwise it will not sign extend if the type
-	of bfd_vma is larger than int.
-
-	* ecoffswap.h (ecoff_swap_pdr_in): Get regoffset, iopt, fregoffset
-	and frameoffset as signed numbers.  From Peter Schauer.
-
-Tue Sep 14 18:20:36 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf32-i386.c (elf_howto_table): Add bfd_elf_generic_reloc
-	special function for all reloc entries.
-	* elf32-target.h (TARGET_LITTLE_SYM): Add SEC_CODE to
-	section_flags.
-	* libelf.h (elf_symbol_type): Remove desc, type and other fields.
-	* Makefile.in (elf32-*.o): These depend upon elf32-target.h.
-
-Tue Sep 14 14:34:45 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* libbfd-in.h (struct artdata):  Add armap_timestamp and
-	armap_datepos here too.
-
-Mon Sep 13 21:03:18 1993  John Gilmore  (gnu@cacophony.cygnus.com)
-
-	Improve timestamp support in BSD archive files to avoid linker
-	warnings.
-
-	* libbfd.h (struct artdata):  Add armap_timestamp and armap_datepos.
-	(bfd_flush, bfd_stat):  Add prototypes.
-	* libbfd.c (bfd_flush):  Add, does fflush on a BFD.
-	(bfd_stat):  Add, does fstat on a BFD.
-
-	* archive.c (_bfd_write_archive_contents): At end of file writing,
-	verify and possibly update the timestamp in the armap, if a BSD
-	archive.  FIXME!  Kludge recognizes BSD archive, rather than
-	vectoring properly.  Should add to xvec.
-	(compute_and_write_armap):  Move prototype to top, avoid PROTO.
-	(bsd_write_armap): Save timestamp and file location thereof, when
-	writing the armap in a BSD file.
-	(bsd_update_armap_timestamp):  New function to check and
-	rewrite the timestamp.
-
-	* hosts/std-host.h (offsetof):  Define, if not already, for archive.c.
-
-Sat Sep 11 18:13:42 1993  Jim Kingdon  (kingdon@poseidon.cygnus.com)
-
-	* hosts/i386sco.h: Define a bunch of stuff for core files.
-	* sco-core.c: Remove, replace by trad-core.c.
-	* trad-core.c: If HOST_STACK_START_ADDR is defined, use it.
-	* config/i386sco.mh: Use trad-core not sco-core.
-	* hosts/i386isc.h, config/i386isc.mh: Remove.
-	* configure.host: Use i386sco for isc.
-	* config/i386-sco.mt: Remove, identical to i386-coff.mt.
-	* config.bfd: Use i386-coff not i386-sco.
-
-	* config.bfd: Recognize i[34]86-*-solaris2* specifically rather
-	than using *-*-solaris2* (i486-unknown-solaris2 is i386-elf, not
-	i486-elf which doesn't exist).
-
-Fri Sep 10 12:56:36 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coffswap.h (coff_swap_aouthdr_out): For ALPHAECOFF, force
-	padding field to zero.
-
-	* config.bfd (i[34]86-*-netbsd*): New target; use i386-netbsd.
-	* configure.in: Remove bogus netbsd386 handling.
-
-	* coff-mips.c: Don't warn about overflow for MIPS_R_JMPADDR reloc.
-	Correct overflow detection requires matching the upper four bits
-	of the destination against the PC.
-
-Thu Sep  9 16:57:46 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* configure.in: Make 64-bit stuff work with "--with-targets=all".
-
-Tue Sep  7 14:17:02 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libbfd-in.h: Removed swapping routines declarations.
-	* bfd-in.h: Added swapping routine declarations, and renamed them
-	from _do_* to bfd_*.
-	* libbfd.c: Renamed swapping routines from _do_* to _bfd_*.
-	* Changed all callers.
-	* libbfd.h, bfd-in2.h: Rebuilt.
-
-Mon Sep  6 15:28:07 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf32-i386.c (elf_howto_table): Set pcrel_offset to true for
-	R_386_PC32.
-
-Fri Sep  3 13:06:12 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* configure.in: Reorganized setting of makefile variables so
-	64-bit stuff works again.
-
-	* libbfd-in.h (_do_get*, _do_put*): Renamed via macros to clean up
-	namespace.
-
-	* libelf.h (elf32_symbol_type, elf64_symbol_type): Deleted
-	"native_elf_sym" field, merged to make new type "elf_symbol_type".
-	(struct elf_obj_tdata): Field symbols is now elf_symbol_type*.
-	Deleted field raw_syms.
-	(obj_symbols): Remove cast.
-	(obj_raw_syms): Deleted.
-	* elfcode.h (elf_slurp_symbol_table): Don't set raw_syms or
-	native_elf_sym fields.
-	* elf32-hppa.c: Changed uses of elf32_symbol_type to
-	elf_symbol_type.
-
-	From Pete Hoogenboom and Jeff Law:
-
-	* elf32-hppa.c (ELF_MAXPAGESIZE): Define.
-
-	* elf32-hppa.c (elf_hppa_tc_symbol): If the argument relocation
-	bits are zero (e.g., they specify no relocations), then do not
-	even bother adding their entries to the symextn section.
-
-	* elf32-hppa.c (elf_hppa_tc_symbol): Any function, regardless
-	of scope can have an argument relocation stub.
-
-	* elf32-hppa.c: (Elf32_hppa_Stub_description):  Rename this
-	structure and type to elf32_hppa_stub_description.  This makes
-	it consistent with the GNU coding conventions.
-	(elf32_hppa_stub_description): Added a 'next' field to allow
-	linking of stub description structures.
-	(elf32_hppa_stub_description): Added a 'stub_listP' field to
-	keep track of individual stubs.
-	(Elf32_hppa_Stub_list, Elf32_hppa_Stub_list_struct):  Removed.
-	Combined with the elf32_hppa_stub_description structure.
-	(elf32_hppa_stub_name_list):  New type to keep track of
-	individual stubs.
-	(add_stub):  Removed.
-	(add_stub_by_name): New function.
-	(find_stub_by_name): New function.
-	(hppa_elf_build_arg_reloc_stub): Allow reusing stubs that
-	already exist.
-	(hppa_elf_build_long_branch_stub): Allow reusing stubs that
-	already exist.
-
-	* elf32-hppa.c: (retval_mismatches):  The direction of argument
-	relocation was reversed.
-	(hppa_elf_build_arg_reloc_stub): Return address was not being
-	restored.
-	(hppa_elf_arg_reloc_needed_p): Add argument containing caller
-	argument relocation bits so this function can be used in the check
-	for plabel stubs.
-	(hppa_elf_stub_check): Pass caller argument relocation bits into
-	hppa_elf_arg_reloc_needed_p().
-	(hppa_look_for_stubs_in_section): Add check for plabel stubs and
-	pass caller argument relocation bits into
-	hppa_elf_arg_reloc_needed_p().
-
-Thu Sep  2 00:59:55 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* libhppa.h (hppa_field_adjust): Remove unused `init_value' variable.
-
-	* hosts/delta88v4.h: New for SVR4.
-	* configure.hosts: Use it.
-
-Wed Sep  1 14:23:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* libaout.h, netbsd386.c: Change M_I386 to M_386_NETBSD.  M_I386
-	is an SCO pre-define.
-
-Tue Aug 31 12:50:19 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* nlmcode.h (nlm_object_p): Set HAS_SYMS if there are external
-	references.
-	(nlm_swap_auxiliary_headers_{in,out}): The copyright length is
-	only one byte.
-	(nlm_get_symtab_upper_bound): Include debugging symbols in symbol
-	count.
-	(nlm_slurp_symbol_table): Make symlength unsigned.  Read debugging
-	symbols as BFD local symbols.
-	(nlm_write_object_contents): Don't bother writing out exported
-	symbols more than once; they now appear in the symbol table more
-	than once (with and without a prefix) if necessary.  Set offset
-	values to be non-zero as NLMLINK does.
-
-Tue Aug 31 12:07:43 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* libhppa.h: Restore #undefs of e_fsel and other e_* symbols.
-
-Fri Aug 27 16:43:35 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* section.c (struct sec): Move position of user_set_vma, and
-	document it.
-	(SEC_BALIGN): Disable for now.  I don't think it's currently used.
-
-	* elf32-hppa.c (elf_hppa_howto_table): Now static.
-	(symext_rootP, symext_lastP, global_value, GOT_value,
-	global_symbol, global_sym_defined, symextn_contents,
-	symextn_contents_real_size, elf_hppa_stub_rootP,
-	elf32_hppa_symextn_map, elf32_hppa_symextn_map_size): Rely on
-	default initialization.
-	(hppa_elf_gen_reloc_type): Macro "UNDEFINED" doesn't need a
-	trailing semicolon.
-	(hppa_look_for_stubs_in_section): Introduce temporaries to make
-	code more readable in 80 columns.
-
-	* libhppa.h (all functions): Now inline under GNU C.
-
-	More patches from Jeff Law:
-
-	* elf32-hppa.c (AR_WARN): Give argument which caused the
-	invalid argument relocation.
-	(AR_UNIMP): Delete unused macro.
-	(hppa_elf_set_section_contents): Always return a value.
-	(elf32_hppa_backend_table_processing): Likewise.
-	(elf32_hppa_backend_section_processing: Likewise.
-
-	* som.c: New file containing SOM specific code extracted
-	from hppa.c
-
-	* som.h: New file containing SOM specific code extracted
-	from libhppa.h
-
-	* hppa.c: Deleted.
-
-	* libhppa.h: Delete SOM specific code.  Add generic PA
-	code which can be shared by both SOM and ELF backends.
-
-	* Makefile.in: Replace hppa.c with som.c.  elf32-hppa.o
-	depends on libhppa.h now.
-
-	* configure.in (hppa_vec): Needs som.o module instead of
-	hppa.o.
-
-	* elf32-hppa.c: Include libhppa.h.  Do not define
-	BYTES_IN_WORD.
-
-	* elf32-hppa.h (hppa_reloc_field_selector_type): Delete
-	now lives in libhppa.h.
-	(hppa_reloc_field_selector_type_alt): Likewise.
-
-	* hosts/hppabsd.h: Include <stdlib.h> and <unistd.h>.  Do not
-	define malloc or free.
-
-	* config/hppa-elf.mt (SELECT_ARCHITECTURES): Don't define
-	SELECT_VECS.
-
-	* elf32-hppa.c (hppa_elf_relocate_unwind_table): Delete unused
-	variables.
-	(elf_hppa_reloc_type_lookup): Likewise.
-	(elf_hppa_tc_make_sections): Likewise.
-	(hppa_elf_arg_reloc_needed_p): Likewise.
-	(hppa_elf_build_long_branch_stub): Likewise.
-	(elf_reloc_map): Delete, no longer used.
-	(elf_hppa_reloc_map): Likewise.
-	(elf32_hppa_symextn_map_max_size): Likewise.
-	(elf32_hppa_get_sym_extn): Abort if type is bogus.
-
-	* elf32-hppa.c (elf32_hppa_backend_fake_sections): Add processing
-	of the .hppa_unwind section.
-
-Wed Aug 25 16:13:49 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
-
-	* config.bfd: recognize m88110.
-
-Tue Aug 24 16:32:35 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	Merged changes from Jeff Law and Pete Hoogenboom at Utah:
-
-	* elfcode.h (elf_section_from_bfd_section): Add detection of
-	SHT_NOTE sections.
-
-	* elf32-hppa.c:
-	(hppa_elf_build_long_branch_stub,hppa_elf_long_branch_needed_p):
-	New functions for support of long branch stubs.
-	(hppa_elf_stub_check,hppa_look_for_stubs_in_section):  Add
-	check for long branch stubs.
-	(hppa_look_for_stubs):  Unused function.  Removed.
-	(hppa_elf_set_section_contents): Implement a PA/ELF-specific
-	version of bfd_set_section_contents.
-	(hppa_elf_long_branch_needed_p): Only output debugging diagnostics
-	when BFD is configured for debugging.
-
-	* elf32-hppa.c: (elf32_hppa_get_symextn_chain):  New function
-	to return a list of symbols that have non-zero argument
-	relocation bits.
-	(hppa_elf_stub_finish): Make sure stub generation is done only
-	once.
-
-	* elf32-hppa.c: (hppa_elf_stub_reloc):  New function for
-	generation relocation entries within a stub.
-	(hppa_elf_build_arg_reloc_stub): Corrections to argument
-	relocation stubs.
-
-	* elf32-hppa.c: New #define's for argument relocation types.
-	(mismatches, retval_mismatches): Updated to reflect new
-	argument relocation types.
-	(CURRENT_STUB_OFFSET): New macro.
-
-	* elfcode.h (map_program_segments): Set the PF_X bit for data
-	segments.
-
-	* elf32-hppa.c: (elf_hppa_howto_table): Add
-	R_HPPA_STUB_CALL_17 for support of linker stub generation.
-	(hppa_elf_reloc): Add support of R_HPPA_STUB_CALL_17
-	relocation type.
-
-	* elf32-hppa.h: (elf32_hppa_reloc_type): Add
-	R_HPPA_STUB_CALL_17 for support of linker stub generation.
-
-	* hppa_stubs.h: Add new instructions that are used in linker
-	stub generation.
-
-	* elf32-hppa.c (hppa_elf_relocate_unwind_table): The offsets in an
-	unwind descriptor were incorrect.
-
-	* libelf.h (bfd_elf_find_section): Declare.
-
-	* elf32-hppa.c: (elf32_hppa_backend_symbol_processing):  New
-	function in place of global_sym field in elf_backend_data
-	structure.
-	(elf32_hppa_backend_symbol_table_processing,
-	elf32_hppa_backend_section_processing,
-	elf32_hppa_backend_fake_sections,
-	elf32_hppa_backend_section_from_shdr,
-	elf32_hppa_backend_section_from_bfd_section):  New functions to
-	provide support of symbol extension sections and argument
-	relocation stubs.
-	(elf_info_to_howto):  Remove call to abort().
-
-	* elf32-target.h:  Support for special processing by the backend.
-	(struct elf_backend_data):  Added elf_backend_symbol_processing,
-	elf_backend_symbol_table_processing,
-	elf_backend_section_processing, elf_backend_section_from_shdr,
-	elf_backend_fake_sections, and
-	elf_backend_section_from_bfd_section fields.
-	* elfcode.h: (bfd_section_from_shdr): Add a check for
-	processor-specific section types.
-	(elf_fake_sections):  Add a check for processor-specific
-	section types.
-	(bfd_elf32_write_object_contents):  Add a check to see if
-	there is any final section processing to be done by the
-	backend.
-	(elf_section_from_bfd_section):  Add a check for
-	processor-specific section types.
-	(elf_slurp_symbol_table):  Remove reference to global_sym in the
-	elf_backend_data structure.  Replace it with a call to
-	elf_backend_symbol_processing.
-	* libelf.h: Remove global_sym field in the elf_backend_data
-	structure.  Replace it with a series of backend-specific
-	functions.
-
-	* elf32-hppa.c (hppa_elf_stub_branch_reloc): The formal argument
-	stub_sym should be called target_sym.
-	(hppa_elf_build_arg_reloc_stub): Refer to the stub bfd (abfd)
-	rather than the output bfd (output_bfd).
-	(hppa_elf_reloc): Get rid of references to the global_sym field in
-	the elf_backend_data structure.
-
-	* elfcode.h (elf_fake_sections): Check the correct condition for
-	.bss.  Also, detect the existence of a .note section.
-
-	* elf32-hppa.c (hppa_elf_relocate_insn): r_format argument should
-	have been r_field.
-
-	* hosts/hppabsd.h (HOST_MACHINE_ARCH): Reference to bfd_arch_m68k
-	should be a reference to bfd_arch_hppa.
-
-	* hppa.c (hppa_vec): Replace bfd_false with _bfd_dummy_target in
-	the bfd_check_format structure to avoid a type mismatch.
-
-Mon Aug 23 1993  Sean Fagan  (sef@cygnus.com)
-		 and Jim Kingdon  (kingdon@cygnus.com)
-
-	Add NetBSD support:
-	* netbsd386.c: New file.
-	* aoutx.h: Make sym_is_debugger_info true for N_FN.
-	* Makefile.in, aout-target.h, config.bfd, configure.host, configure.in,
-	libaout.h, targets.c: Other changes.
-
-Fri Aug 20 17:04:59 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/m88k-elf.mt: New file.
-	* config.bfd: Use it for m88*-*-sysv4*.
-
-Fri Aug 20 15:16:58 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elfcode.h (elf_build_phdrs): Unused function deleted.
-	(bfd_shdr_from_section): Ditto.
-	(write_relocs): Don't change section contents for addend.
-	(elf_locate_sh): Return type is now always elf_internal_shdr,
-	since the other types were really aliases for this type anyways.
-	Don't compile this function, since it is static and doesn't appear
-	to be used in this file.
-	(sym_is_global): Return non-zero for weak symbols.  Abort if
-	section pointer is null.
-	(swap_out_syms): Reorder tests so function symbols can be weak.
-	(elf_slurp_symbol_table): Don't use BSF_EXPORT.
-	(elf_slurp_reloca_table): Make RELOC_PROCESSING section smaller by
-	extracting out some common code.  Abort if BFD section symbol has
-	null name.
-	(elf_slurp_reloc_table): Translate ELF section symbols into BFD
-	section symbols.  Don't read section contents to fill in addend
-	field.
-
-	* elf32-i386.c (elf_howto_table): All partial_inplace fields
-	should be "true".
-
-	* Merged from OSF:
-
-	Tue Jun 15 14:38:32 1993  Michael Meissner  (meissner@osf.org)
-
-	* libelf.h (struct Elf_Sym_Extra): New structure to contain ELF
-	specific information for a symbol.  Put in elf_sym_num, which
-	gives the external symbol number in the elf object file, since
-	local symbols must come before global symbols.
-	(elf_sym_extra): New macro.
-	(elf_symtab_map): Delete, in favor of using Elf_Sym_Extra.
-	* elfcode.h (elf_map_symbols): Use Elf_Sym_Extra to map internal
-	symbol number to external number.  Store the address of the
-	Elf_Sym_Extra field for the symbol in the udata field.
-	(elf_write_object_contents): Use Elf_Sym_Extra to map out symbols.
-
-	Sun Jun 20 16:30:11 1993  Michael Meissner  (meissner@osf.org)
-
-	* elfcode.h (elf_obj_tdata): Add field to count the size of the
-	array of pointers to section symbols.
-	(elf_map_symbols): Bump the max index of the section symbols so
-	that we don't overwrite memory.  Store the max index into the
-	elf_obj_tdata field.
-
-	Sat Jun 19 10:12:27 1993  Michael Meissner  (meissner@osf.org)
-
-	* elfcode.h (elf_obj_tdata): Add pointer to an array of pointers
-	to the section symbols we created.  Remove unused field
-	internal_syms.
-	(elf_map_symbols): Fill in array of pointers to section symbols.
-	Only create section symbols for sections that have SEC_ALLOC set,
-	and have non-zero size.
-	(elf_symbol_from_bfd_symbol): If udata is NULL, and this is a
-	section symbol, look up the section in the list of section
-	symbols, and set the udata pointer appropriately.  Otherwise, if
-	udata is still NULL, fail an assertion, and use 0, instead of
-	dropping core.
-
-Fri Aug 20 12:18:05 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* config.bfd (mips-*-elfl*, mips-*-elf*): New targets, using
-	mipslelf and mipsbelf respectively.
-	* config/mipslelf.mt, config/mipsbelf.mt: New files.
-	* elf32-mips.c: Added some reloc information.
-	* configure.in: Fixed error message.
-
-	* ecoff.c (ECOFF_LONG_SIZE): Removed.  Just use constants.
-
-Thu Aug 19 09:45:51 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* Makefile.in (BFD_LIBS, ALL_MACHINES, BFD32_BACKENDS, BFD64_BACKENDS,
-	OPTIONAL_BACKENDS): Alphabetize entries and add a few missing ones.
-	* archures.c: Alphabetize decls.
-
-	* configure.in, targets.c: Add missing vectors to the tables.
-	* targets.c (target_vector) [!SELECT_VECS]: Add DEFAULT_VECTOR.
-	Remove hp300bsd_vec due to clash with sunos_big_vec.
-
-Tue Aug 17 18:12:32 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/i386{mach3,osf1mk}.h: New files, for Mach hosting.
-	* hosts/i386mach.h: removed, replaced by i386osf1mk.h.
-	* config/i386mach3.mt, i386mach3.c: New files, for Mach a.out format.
-	* Makefile.in, configure.host, config.bfd: Corresponding changes.
-	* hosts/decstation.h: Include <sys/param.h> not <machine/param.h>.
-
-Tue Aug 17 15:19:41 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coffgen.c (coff_section_symbol): If section's output_section is
-	not yet set, point to itself.  This is needed because this is
-	called on the output file, not the input file.
-
-	* coff-rs6000.c (dummy_reloc, RTYPE2HOWTO): Set howto field to a
-	dummy value, rather than leaving it NULL.
-
-	* archures.c (bfd_default_set_arch_mach): Set bfd_error on
-	failure.
-	* aoutx.h (NAME(aout,set_arch_mach)): Check return value of
-	bfd_default_set_arch_mach.
-
-Tue Aug 17 09:42:16 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* config.bfd (cpu): Extract from canonical name with sed.
-	* configure.in: Don't pass it.
-
-Sun Aug 15 20:45:45 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* bfd-in.h: Remove {BYTE,WORD,LONG}_SIZE; they are pointless and
-	BYTE_SIZE conflicts with a Mach header.
-	* ecoff.c: Change LONG_SIZE to ECOFF_LONG_SIZE and define it.
-
-	* configure.host: Make sure all OS fields end in *.
-
-Fri Aug 13 16:33:33 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_slurp_reloc_table): Use bfd_abs_section for
-	RELOC_SECTION_NONE and RELOC_SECTION_ABS.  If a reloc section
-	doesn't exist, don't try to create it.
-
-	* nlmcode.h (nlm_write_object_contents): procedure offsets are
-	from start of code segment, not start of file.
-	* config/i386-nlm.mt (DEFAULT_VECTOR): It's nlm32_i386_vec, not
-	bfd_nlm32_i386_vec.
-	* configure.in (SELECT_VECS switch): Likewise.
-
-Thu Aug 12 10:32:47 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* format.c (bfd_check_format): If the target matches the default
-	target, set match_count to 1, to ignore any previous matches.
-
-	* Makefile.in (BFD32_BACKENDS): Remove srec.o, add reloc16.o.
-
-	* configure.in: Add reloc16.o when we add
-	coff-h8300.o, coff-h8500.o, coff-sh.o, coff-z8k.o.
-	Makefile.in (BFD_LIBS): Remove reloc16.o.
-
-	* config/u68k-coff.mt: Fix typo, DEFAULT_TARGET for
-	DEFAULT_VECTOR.
-
-	* config/h8300-coff.mt, h8500-coff.mt, sh-coff.mt, st2000.mt,
-	z8k-coff.mt (DEFAULT_VECTOR): Define.  Don't explicitly add
-	S-records via SELECT_VECS.
-
-	* targets.c (target_vector), Makefile.in (BFD_LIBS): Always
-	support S-records, for convenience.
-
-Thu Aug 12 08:30:05 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-alpha.c (alpha_howto_table, alpha_finish_reloc,
-	alpha_ecoff_swap_reloc_{in,out}, alpha_bfd_reloc_type_lookup):
-	Read and write Alpha relocs.  Can't process them yet.
-	* ecoff.c (ecoff_slurp_reloc_table): Recognize new reloc sections.
-	If the section does not already exist, create it.
-
-	* ecoffswap.h (ecoff_swap_pdr_{in,out}): Handle new fields defined
-	on the Alpha.
-
-	* libecoff.h (ecoff_backend_data): Added constructor_reloc and
-	finish_reloc fields.
-	* ecoff.c: Move MIPS reloc support from here...
-	* coff-mips.c: to here.
-	* ecoff.c (ecoff_set_symbol_info): Get constructor reloc howto
-	from backend.
-	(ecoff_slurp_reloc_table): Removed MIPS specific stuff.  Call
-	finish_reloc backend function.
-	(ecoff_write_object_contents): Removed MIPS specific assertions.
-	* coff-mips.c (mips_finish_reloc): New function.
-	(mips_ecoff_backend_data): Fill in new fields.
-	* coff-alpha.c (alpha_ecoff_backend_data): Use NULL for new
-	fields.
-	* targets.c: Added extern for ecoffalpha_little_vec.
-
-	* bfd.c (_bfd_host_big_endian): Removed.
-	* bfd-in.h (HOST_BYTE_ORDER_BIG_P, bfd_header_twiddle_required):
-	Removed.
-	* bfd-in2.h: Regenerated.
-
-Wed Aug 11 12:11:23 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* config.bfd: New file, broken out of configure.in.
-	* configure.in: Use it, and use standard target names for
-	--with-targets, replacing --with-bfd-targets.
-
-	* archures.c (archures_init_table): Add bfd_sh_arch.
-
-	* configure.in: Include coff-m68k.o for m68kcoffun_vec.
-	Include nlm32.o and nlm.o for bfd_nlm32_i386_vec.
-	Fix error in error message.
-
-	* oasys.c: Make bfd_error_vector extern.
-
-	* configure.in: Include stab-syms.o for a.out/b.out targets
-	and hp300{bsd,hpux}.
-
-Wed Aug 11 06:40:51 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* nlmcode.h (nlm_compute_section_file_positions): Add the .bss
-	section before setting output_has_begun.
-	(nlm_set_section_contents): Remove argument names from
-	mangle_relocs_func prototype.
-	(nlm_write_object_contents): Remove shadowing local variable.
-	Don't write out debugging symbols if debugInfoOffset is -1.  Add
-	the codeImageOffset to the start, exit, and check procedure
-	offsets.
-	* nlm32-i386.c (nlm_i386_write_reloc, nlm_i386_mangle_relocs):
-	Don't check partial_inplace field; its value is irrelevant.
-
-	* Base use of sco-core on host, not target.
-	* configure.host (i[34]86-*-sco*): Use i386sco rather than i386v.
-	* config/i386-sco.mt (TDEFINES): Removed.
-	* config/i386sco.mh: New file to use sco-core.
-	* hosts/i386sco.h: New file; just includes hosts/i386v.h.
-
-	* ecoffswap.h (ecoff_swap_{hdr,ext}_{in,out}): Use signed
-	conversions for some fields.
-
-Tue Aug 10 13:32:23 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_gprel_reloc): If _gp is not defined, give an
-	error rather than aborting.
-
-	* libnlm.h (struct nlm_backend_data): Added mach field.
-	(nlm_machine): New accessor macro.
-	* nlm.c (nlm_mkobject): Set architecture and machine from backend
-	information.
-	* nlm32-i386.c (nlm32_i386_backend): Initialize new mach field.
-
-Tue Aug 10 09:31:18 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* configure.in: Replace calls to sort with shell code
-	to uniq the lists.
-
-Tue Aug 10 06:23:16 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* configure.in: Include aout32.o for any a.out/b.out formats.
-
-Mon Aug  9 09:37:18 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* config/i386-linux.mt (SELECT_VECS): Support bfd_elf32_i386_vec.
-	* config/m68k-elf.mt (SELECT_VECS): Support m68kcoff_vec.
-	* config/i386-elf.mt (SELECT_VECS): Support i386coff_vec.
-	* config/hppa-elf.mt (SELECT_VECS): Support hppa_vec.
-	* config/sparc-elf.mt (SELECT_VECS): Support sunos_big_vec.
-	* config/i386-sco.mt (SELECT_VECS): Don't define; Ian says it was
-	just a hack.
-
-Mon Aug  9 13:15:00 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
-
-	* config/m88k-coff.mt (DEFAULT_VEC -> DEFAULT_VECTOR): renamed.
-
-Mon Aug  9 14:26:45 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* syms.c (BSF_EXPORT): Now same as BSF_GLOBAL.
-
-	* bfd.c (bfd_scan_vma): New function.
-
-Mon Aug  9 11:29:53 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* bfd-in.h (bfd_get_architecture, bfd_get_machine): Removed
-	obsolete macros.
-	* bfd-in2.h: Updated.
-
-	* ecoff.c (ecoff_slurp_armap): Correct bug in initialization of
-	stringbase.
-
-Sun Aug  8 12:21:13 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* configure.in: Remove unneeded test.
-
-Sun Aug  8 12:41:22 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in ({dist,real}clean): Use $(MAKE), not make.
-
-Sat Aug  7 09:14:21 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* config/st2000.mt (TDEFINES): Don't define MRI; not used.
-
-	* PORTING, TODO, config/README: Update to reflect below changes.
-
-	* configure.in: Replace MINIMIZE and --with-minimal-bfd with
-	--with-bfd-targets="target1,target2,..." and the special target
-	"all" to get the previous default behavior.
-	Figure out which architecture and backend .o files are needed from
-	DEFAULT_VECTOR, SELECT_VECS, and SELECT_ARCHITECTURES as set in
-	the .mt files.  Define TDEFAULTS based on them, also.
-
-	* Makefile.in: Remove references to MINIMIZE.
-	* archures.c, targets.c: Ditto.
-
-	* config/*.mt: Define DEFAULT_VECTOR, SELECT_VECS, and
-	SELECT_ARCHITECTURES as variables rather than as -D arguments to
-	TDEFAULTS.
-
-	* config/a29k-coff.mt,alphaosf.mt, i386-sco.mt, i960-bout.mt,
-	i960-coff.mt (TDEFAULTS): Don't put the default vector in
-	SELECT_VECS manually; it's automatic now.
-
-	* config/i386-sco.mt (TDEFAULTS): Don't put &sco_core_vec in
-	SELECT_VECS manually; -DSCO_CORE does it automatically now.
-
-	* config/h8300-coff.mt,h8500-coff.mt,sh-coff.mt,st2000.mt,z8k-coff.mt
-	(TDEFAULTS): Don't define BFD; not used.
-
-	* config/hppaosf.mh (HDEFINES): Don't define SELECT_ARCHITECTURES;
-	this is a host, not a target.
-
-Sat Aug  7 05:28:03 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* elfcode.h (elf_object_p):  Add comment about what this function
-	does and to watch out for side effects.  Add FIXME for memory leaks.
-	Fix comment about checking for matching byte order.  Preserve
-	pointer to old tdata (if any), and restore it if we don't match
-	file with target vector.  If we are going to use goto's, use them
-	consistently and maintainably.
-	* nlmcode.h (nlm_object_p):  Expand comments about leaked memory
-	to note that the problem is even more serious than just leaked
-	memory.  Replace goto with more traditional return.
-
-Fri Aug  6 12:00:03 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	Fix incorrect or useless makefile variable definitions:
-	* config/news.mt, config/u68k-coff.mt (TDEFAULTS): Use this to
-	define DEFAULT_VECTOR, instead of TDEFINES.
-	* config/i386aix.mh (MINIMIZE): Don't define.
-	* config/hppaosf.mh (MINIMIZE): Don't conditionalize.
-	* config/rs6000.mh (ALLOCA),
-	* config/i386v.mh (ALLOCA),
-	* config/i386linux.mh (ALLOCA),
-	* config/i386isc.mh (ALLOCA),
-	* config/go32.mh (EXTRALIBS): Don't define; not used.
-	* config/solaris2.mh (HDEFINES): Renamed from H_DEFINES.
-	* config/alphaosf.mt (TDEFINES): Set it, not HDEFINES.
-	* config/z8k-coff.mt (CC): Don't define.  It's a target, not a host.
-
-	* config/README: New file, explaining the variables.
-
-	* targets.c (target_vector): Add hp300_bsd_vec.
-	* Makefile.in (BFD32_BACKENDS, CFILES): Add hp300bsd.
-	(hp300bsd.o): New rule.
-
-Fri Aug  6 15:13:22 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* libelf.h (NAME): Provide a default definition, that's neither
-	for 32 bits nor for 64.
-
-	Tue Jun 15 14:38:32 1993  Michael Meissner  (meissner@osf.org)
-
-	* libelf.h (elf_hash): Change declaration to bfd_elf_hash, since
-	that is what is in elf.c.
-
-Fri Aug  6 12:28:38 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_set_symbol_info): Removed special handling for
-	scBss and scSBss symbols, since it was wrong.
-
-	* Makefile.in (coff-mips.o, coff-alpha.o): Don't depend on
-	coffcode.h.
-
-	* coffcode.h (sec_to_styp_flags): Inspired by mb@tti.COM (Michael
-	Bloom): Only set STYP_BSS for SEC_ALLOC sections.
-
-	* ecoff.c (ecoff_slurp_armap): From Arne Henrik Juul
-	<arnej@kari.fm.unit.no>: Handle a COFF style armap.
-
-Fri Aug  6 09:59:45 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hpux-core.c: Cast return value from bfd_zalloc.
-
-Thu Aug  5 13:22:44 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* aoutx.h (log2): Delete i387-specific code.
-
-	* Makefile.in (BFD_LIBS): Always include elf.o.
-	(BFD32_BACKENDS): Don't include elf.o here.
-	(ofiles): Delete references to ofiles2 and ofiles3.
-	(do_clean): Delete ofiles.
-	(BFDIN_H): Changed references to $(srcdir)/bfd-in2.h.
-	(stmp-bfd.h): Use bfd.h-new as temporary name, not bfd.h2.
-	(headers): Use bfd-in2.h-new as temporary name, not bfd.h-new.
-
-	* bfd-in.h: Reworded comment to make it clear that bfd-in2.h is a
-	generated file.
-
-	* reloc.c (enum bfd_reloc_code_real): Added i386-elf reloc types
-	(from Meissner's additions to bfd-in2.h).
-
-	* elf32-i386.c (ELF_MAXPAGESIZE): Define.
-
-	Merged:
-
-	Wed Jun 23 06:05:58 1993  Michael Meissner  (meissner@osf.org)
-
-	* elfcode.h (elf_write_object_contents): Don't drop core if
-	elf_symbol_from returns a NULL pointer when processing a non-elf
-	symbol, use a 0 size instead.
-
-	Tue Jun 15 14:38:32 1993  Michael Meissner  (meissner@osf.org)
-
-	* elfcode.h (elf_hash): Delete macro mapping elf_hash to
-	bfd_elf32_hash, since the hash table is independent of the 32/64
-	bit system.
-
-	* libelf.h (elf_hash): Change declaration to bfd_elf_hash, since
-	that is what is in elf.c.
-
-	Sat Jun 19 10:12:27 1993  Michael Meissner  (meissner@osf.org)
-
-	* elf32-i386.h (reloc_type): Reformat spacing.
-	(elf_howto_table): Add the rest of the 386/ELF relocations.
-	(elf_i386_reloc_type_lookup): Ditto.
-	(elf_i386_info_to_howto): Ditto.
-	(elf_i386_info_to_howto_rel): Ditto.
-
-Thu Aug  5 10:07:43 1993  Fred Fish  (fnf@cygnus.com)
-
-	* nlmcode.h (nlm_get_reloc_upper_bound):  Test return value
-	of nlm_slurp_symbol_table as boolean, not pointer.
-	* nlmcode.h (nlm_canonicalize_reloc):  Test return value
-	of nlm_slurp_reloc_fixups as boolean, not pointer.
-
-Wed Aug  4 16:22:55 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
-
-	* config/go32.mh: remove HDEFINES; since __MSDOS__ and __GO32__
-	are now predefined by GCC
-
-Wed Aug  4 16:06:29 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* coffgen.c (coff_print_symbol): Add the section offset to the
-	line number address, so it's printed the same way as the function
-	address.  Only showed up for line numbers that aren't in the first
-	section (.text).
-
-Wed Aug  4 08:33:55 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* libnlm.h (nlm_backend_data): Added nlm_mangle_relocs.
-	(nlm_mangle_relocs_func): New macro.
-	* nlm32-i386.c (nlm_i386_write_reloc): Rewrote correctly.
-	(nlm_i386_mangle_relocs): New function.
-	* nlmcode.h (nlm_compute_section_file_positions): Move all common
-	symbols into the .bss section.
-	(nlm_set_section_contents): Call the mangle_relocs function.
-	(nlm_write_object_contents): Treat a reloc against any defined
-	symbol as an internal reloc.  Fix bug in external reloc counting.
-	Get the offset and debugging type right for .bss symbols.  Only
-	output debugging symbols for defined symbols.
-
-	* coff-h8500.c (rtype2howto): Do an fprintf to stderr rather than
-	using printf.
-	* coff-z8k.c (rtype2howto): Likewise.
-	* coffcode.h (dummy_reloc16_extra_cases): Likewise.
-	* elf32-i386.c (TRACE): Likewise.
-	* hp300hpux.c (convert_sym_type, swap_std_reloc_in): Likewise.
-	* rs6000-core.c (rs6000coff_get_section_contents): Likewise.
-	* coffgen.c (coff_print_symbol): Do an fprintf to the file
-	argument rather than using printf.
-
-Tue Aug  3 18:17:25 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffswap.h: Added macros used when accessing several fields;
-	default is the same as before.
-	(coff_swap_aouthdr_{in,out}): Handle the Alpha ECOFF fields.
-	* coff-alpha.c: Defined macros to use the right sizes in
-	coffswap.h.
-	* libecoff.h: Backend information is now in target vector, not
-	BFD.  Start of backend information is COFF backend information.
-	* coff-alpha.c, coff-mips.c: Changed accordingly.
-	* ecoff.c (ecoff_mkobject): New function.
-	(ARMAP_START): Changed into backend information, since Alpha uses
-	a different name.
-	(ecoff_slurp_armap): Don't overlay archive header.
-	* bfd.c: Include libcoff.h.
-
-Tue Aug  3 16:33:11 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* Makefile.in (install): Fix sh syntax error.
-
-	* aoutf1.h: Make bfd_error_trap extern; it's defined in bfd.c.
-
-Tue Aug  3 15:19:09 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* nlm_slurp_symbol_table: Don't use '&' on arrays.
-
-Tue Aug  3 11:06:28 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* ecoff.c: New file for generic ECOFF functions.
-	* ecoffswap.h: New file for ECOFF swapping functions which differ
-	only slightly for different targets.
-	* libecoff.h: Added prototypes for ecoff.c functions.
-	(ecoff_backend_data): New structure.
-	(ecoff_tdata): Added backend_data field.  Changed external data
-	pointers to be PTR rather than to a particular struct.
-	(ecoff_symbol_struct): Moved in from coff-mips.c.
-	* coff-alpha.c, coff-mips.c: Moved common functions into ecoff.c.
-	Added ECOFF backend structures.  Include ecoffswap.h.
-	* coff-msym.c: Removed; superseded by ecoffswap.h.
-	* bfd.c: Include coff/internal.h.
-	* Makefile.in (BFD_LIBS): Removed coff-mips.o and coff-msym.o.
-	Added ecoff.o.
-	(BFD64_BACKENDS): Added coff-alpha.o.
-	(CFILES): Removed coff-msym.c.  Added ecoff.c.
-	(bfd.o): Added dependency on $(INCDIR)/coff/sym.h.
-	(coff-mips.o): Added dependency on ecoffswap.h and coff/ecoff.h.
-	(ecoff.o, coff-alpha.o): New targets.
-	(coff-msym.o): Removed target.
-
-Mon Aug  2 23:33:38 1993  John Gilmore  (gnu@cygnus.com)
-
-	* elf32-hppa.h, hosts/*:  Remove (one more time) all occurrances
-	of EXFUN in the BFD sources.  Heave ho!
-
-Mon Aug  2 16:45:57 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* coffcode.h (coff_set_arch_mach_hook):  Add check for I386LYNXMAGIC.
-
-Mon Aug  2 12:18:03 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
-
-	* hosts/sun3.h: remove some more conflicting decls
-
-Mon Aug  2 11:48:23 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* i386lynx.c:  Remove unnecessary def of N_HEADER_IN_TEXT,
-	redefine TEXT_START_ADDR to be 0.
-
-Sun Aug  1 22:54:08 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* configure.host, configure.in, hosts/i386lynx.h:  Lynx/386
-	host and target info.
-
-Fri Jul 30 18:08:27 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* nlm32-i386.c: New file.  First cut at i386 NLM code.
-	* libnlm.h: Added some more prototypes.
-	(struct nlm_relent): New structure.
-	(nlmNAME(symbol_type)): Added rcnt and relocs fields.
-	(struct nlm_obj_tdata): Added new fields: nlm_symbols,
-	nlm_text_low, nlm_data_low, nlm_reloc_fixups,
-	nlm_reloc_fixup_secs.
-	(struct nlm_backend_data): New structure, with accessor macros.
-	* nlmcode.h: Use NLM_HIBIT rather than MSB.
-	(nlm_object_p): Set SEC_RELOC for .text and .data.  Don't set
-	SEC_DATA for .bss.  Set HAS_RELOC and HAS_SYMS for abfd.  Set the
-	architecture.
-	(nlm_swap_fixed_header_out, nlm_swap_variable_header_out,
-	find_nonzero, nlm_swap_auxiliary_headers_out): New outbound
-	swapping functions.
-	(nlm_get_symtab_upper_bound, nlm_slurp_symbol_table): Include
-	external references in symbol table as undefined symbols.
-	(nlm_get_symtab, nlm_slurp_symbol_table): Fill in alocation
-	argument in get_symtab rather than in slurp_symbol_table.
-	(nlm_slurp_symbol_table): Save symbol information in tdata.
-	(nlm_print_symbol): New function.
-	(nlm_slurp_reloc_fixups, nlm_get_reloc_upper_bound,
-	nlm_canonicalize_reloc): New functions to read relocs.
-	(nlm_compute_section_file_positions, nlm_set_section_contents,
-	nlm_external_reloc_compare, nlm_write_object_contents): New
-	functions to create NLM files.
-	* nlm-target.h: Define all the nlm functions here either as
-	default values or in terms of nlmNAME.  Use JUMP_TABLE(nlm).  Set
-	the backend_data field to TARGET_BACKEND_DATA.
-	* nlm32-gen.c, nlm64-gen.c: Don't define function macros here;
-	they are now in nlm-target.h.
-	(TARGET_BACKEND_DATA): Define as NULL.
-	* nlm.c (nlm_mkobject): Do allocate the tdata field.
-	(nlm_set_arch_mach): New function.
-	* targets.c: Added nlm32_i386_vec.
-	* Makefile.in (BFD32_BACKENDS): Added nlm32-i386.o.
-	(CFILES): Added nlm32-i386.c.
-	(nlm32-gen.o, nlm64-gen.o): Depend on nlm-target.h.
-	(nlm32-i386.o): New target.
-
-Thu Jul 29 20:20:39 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
-
-	* hosts/sun3.h: remove some function decls that conflict w/ ANSI
-	C, and aren't needed anyway (return int)
-
-Wed Jul 28 15:46:38 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elfcode.h: Use casts with bfd_alloc and alloca.
-
-Tue Jul 27 12:51:43 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* nlm{32,64}-gen.c (JUMP_TABLE_PREFIX):  Delete.
-	* nlm{32,64}-gen.c (JUMP_TABLE_INIT):  New macro that works with
-	older cpp's, that don't do additional replacement on the JUMP_TABLE
-	macro's argument.
-	* nlm-target.h (JUMP_TABLE_INIT):  Use new macro in place of
-	JUMP_TABLE macro.
-
-Mon Jul 26 17:39:01 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	Yet another trad-core variant:
-	* config/esix.mh, hosts/esix.h: New files.
-	* configure.hosts: Use them.
-
-Mon Jul 26 13:22:15 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* reloc.c (bfd_perform_relocation): Handle the case of
-	complain_overflow_bitfield, rightshift > bitpos, and a negative
-	number.
-
-Mon Jul 26 14:40:10 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elfcode.h: Reimplement segment writing.
-	(elf_write_phdrs): Use precomputed e_phoff rather than making
-	assumptions.
-	(elf_build_phdrs): Disabled, for now.
-	(assign_file_position_for_section): Don't change file offset for
-	SHT_NOBITS.
-	(assign_file_positions_for_symtab_and_strtabs): New function.
-	(struct seg_info): New type.
-	(map_program_segments): New function.
-	(assign_file_positions_except_relocs): For executables, leave
-	section headers &c for last, and properly align all sections with
-	flag SHF_ALLOC set.
-	(prep_headers): No longer abort when EXEC_P is set.
-	(write_shdrs_and_ehdr): Deleted all code relating to program
-	segments.
-
-	* elfcode.h (various): Deleted some unused code, and debugging
-	"malloc(0)" calls.
-	(write_relocs): Cache value of last symbol looked up, to save
-	time if the symbol is referred to repeatedly.
-	(elf_fake_sections): Check only SEC_RELOC flag, not number of
-	relocs.
-	(assign_section_numbers): Likewise.
-
-	* Makefile.in (ofiles): Stars in wildcards belong outside quotes.
-
-	* libelf.h (struct elf_backend_data): New field, maxpagesize.
-	(struct elf_obj_tdata): New field, phdr.
-	* elf32-target.h (elf32_bed): Initialize maxpagesize from
-	ELF_MAXPAGESIZE.
-	(ELF_MAXPAGESIZE): Default to 1.
-	* elf64-target.h (elf64_bed, ELF_MAXPAGESIZE): Likewise.
-	* elf32-sparc.c (ELF_MAXPAGESIZE): Define.
-	(elf_sparc_howto_table): All relocs should have pcrel_offset=true.
-	Most should have length field of `2'.
-
-	* reloc.c (bfd_perform_relocation): Handle 64-bit relocs.
-
-	* config/sparc-aout.mt (TARGET_BACKENDS): Define.
-
-Mon Jul 26 08:56:16 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* configure.in: Don't look in ${srcdir} for ${target_makefile_frag};
-	the top level script has already adjusted for it.
-
-Mon Jul 26 08:09:19 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* srec.c (srec_write_symbols):  Get CR LF in the right order.
-
-Mon Jul 26 02:08:41 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/vaxbsd.h: Include std-host.h.  Don't include <machine/param.h>.
-
-Sat Jul 24 16:13:01 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* reloc.c (bfd_perform_relocation): Handle case of rightshift !=
-	bitpos when overflow checking.
-
-Fri Jul 23 10:20:27 1993  Doug Evans  (dje@canuck.cygnus.com)
-
-	* bfd.c (bfd_nonrepresentable_section, bfd_undefined_symbol,
-	bfd_reloc_value_truncated, bfd_reloc_is_dangerous, bfd_assert):
-	Send error messages to stderr.
-
-Thu Jul 22 15:57:29 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* nlm{32,64}-target.h:  Remove.
-	* nlm-target.h:  New file, merged from nlm{32,64}-target.h
-	* libnlm.h (NLM_ARCH_SIZE):  Define to ARCH_SIZE.
-	* nlm.c (ARCH_SIZE):  Remove define to zero.
-	* nlm32-gen.c (ARCH_SIZE):  Define to 32.
-	* nlm32-gen.c (JUMP_TABLE_PREFIX):  Define to nlm32.
-	* nlm{32,64}-gen.c (nlm-target.h):  Include.
-	* targets.c, libnlm.h, nlm.c, nlm{32,64}-gen.c, nlm{32,64}.c,
-	nlmcode.h:  Convert prefixes from bfd_nlm<size> to just
-	nlm<size>, and use macros select size.
-
-Thu Jul 22 15:40:14 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
-
-	* Makefile.in (Makefile): add configure.in, drop redundant
-	  $(srcdir), drop redundant ./
-
-Thu Jul 22 13:34:57 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* hpux-core.c: New file; backend for HP/UX style core files.
-	* bfd.c (struct _bfd): Renamed hppa_core_data field to
-	hpux_core_data.
-	* bfd-in2.h: Updated.
-	* hppa.c (make_bfd_asection, hppa_core_file_p,
-	hppa_core_file_failing_command, hppa_core_file_failing_signal,
-	hppa_core_file_matches_executable_p): Moved into hpux-core.c.
-	Removed from target vector.
-	* libhppa.h (struct hppa_core_struct and accessor macros): Moved
-	into hpux-core.c.
-	* targets.c: If HPUX_CORE is defined, add hpux_core_vec to
-	target list.
-	* config/hp300.mh (HDEFINES): Set to -DHPUX_CORE.
-	(HDEPFILES): Set to hpux-core.o.
-	* config/hppabsd.mh, config/hppahpux.mh: Likewise.
-	* hosts/hp300.h (HOST_HP300HPUX): Define.
-	* Makefile.in (OPTIONAL_BACKENDS): Added sco-core.o,
-	aix386-core.o, hpux-core.o.
-	(sco-core.o, aix386-core.o, hpux-core.o): New dependencies.
-
-	* reloc.c (enum complain_overflow): New enumeration with the
-	various flavours of overflow checking.
-	(srtuct reloc_howto_struct): Changed complain_on_overflow field
-	from boolean to emum complain_overflow.  Removed obsolete absolute
-	field.
-	(HOWTO): Removed absolute argument.
-	(bfd_perform_relocation): Do overflow checking on all types of
-	fields.
-	* bfd-in2.h: Updated accordingly.
-	* all targets: Updated initialization of reloc howto tables.
-
-Wed Jul 21 20:34:34 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* opncls.c (bfd_create): Don't use C++ keyword "template" as a C
-	variable name.
-
-Tue Jul 20 15:02:23 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* coff-m68k.c (m68k_howto2rtype):  Make arg CONST to match callers.
-
-	* elfcode.h:  Fix several illegal pointer combination warnings for
-	usages of bfd_alloc and alloca.
-
-	* libnlm.h (nlm_obj_tdata):  Rename hidden struct members to avoid
-	apparent Sun C preprocessor recursion.  Fix access macros.
-	* nlmcode.h:  Remove spurious '&' before several array references.
-
-Tue Jul 20 14:36:27 1993  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* Rename for DOS uniqueness: coff-m68k-un.c -> coff-u68k.c
-	config/m68k-coffun.mt -> u68k-coff.mt.
-	* Makefile.in, configure.in: Corresponding changes.
-
-Tue Jul 20 16:21:52 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elf32-sparc.c (elf_sparc_howto_table): Don't use "&" before
-	function name; it's valid without, and some compilers give
-	warnings with it there.
-
-Tue Jul 20 08:21:15 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* bfd-in.h:  Apply some of the changes that were made to bfd-in2.h.
-	* bfd.c (union tdata):  Add nlm_obj_data;
-	* targets.c (enum target_flavour):  Add bfd_target_nlm_flavour.
-
-Mon Jul 19 20:46:18 1993  Fred Fish  (fnf@deneb.cygnus.com)
-
-	* configure.in (*-*-netware, i[34]86-*-netware):  New configs.
-	* Makefile.in (BFD32_BACKENDS):  Add nlm.o, nlm32.o, nlm32-gen.o.
-	* Makefile.in (BFD64_BACKENDS):  Add nlm64.o, nlm64-gen.o.
-	* Makefile.in (CFILES):  Add nlm{32,64}.c, nlm{32,64}-gen.c.
-	* Makefile.in (nlm.o, nlm{32,64}.o, nlm{32,64}-gen.o:  New targets.
-	* bfd-in2.h (INLINE):  Defines moved here.
-	* {aoutx.h, elf.c, elfcode.h}:  Move INLINE defines to bfd-in2.h.
-	* libelf.h (CAT4):  Move define to bfd-in2.h.
-	* bfd-in2.h (CAT4):  Merge CAT4 macro with other CAT macros.
-	* bfd-in2.h (union tdata):  Add nlm_obj_data.
-	* bfd-in2.h (enum target_flavour):  Add bfd_target_nlm_flavour.
-	* targets.c (bfd_nlm{32,64}_{big,little}_vec):  Add prototypes.
-	* targets.c (target_vector):  Add bfd_nlm{32,64}_{big,little}_vec.
-	* (libnlm.h, nlm.c, nlmcode.h, nlm{32,64}-gen.c,
-	nlm{32,64}-target.h, nlm{32,64}.c, config/i386-nlm.mt):  New files
-	for NLM support.
-
-Mon Jul 19 15:09:01 1993  david d `zoo' zuhn  (zoo@rtl.cygnus.com)
-
-	* configure.{hosts,in}: add i[34]86-*-lynxos* support
-
-Mon Jul 19 14:53:30 1993  Ken Raeburn  (raeburn@rtl.cygnus.com)
-
-	* elf.c, elfcode.h, libelf.h: Serious reorganization.
-	Deleted `thunk' structure, merged into tdata, duplicate data
-	eliminated.
-	Rearranged functions, grouping by functionality.
-	Broke up many functions in elfcode.h, re-ordered many parts of
-	file writing to handle unpredictable state of section relocation
-	table as provided by various applications.
-	Still needs cleanup: Merge functions back together, split out
-	data structure with only data that is used only when writing out
-	object file.
-
-	* elf.c (bfd_elf_generic_reloc): New function, taken from
-	coff-mips.c.
-	* elf32-sparc.c (elf_sparc_howto_table): Use it, to work around
-	bfd_perform_relocation lossage.
-
-	* Makefile.in (BFD_LIBS): Include coff-mips.o and coff-msym.o, so
-	that gdb will link.
-	(ofiles): Don't use sort or uniq; do it with sh constructs.
-
-Sun Jul 18 19:42:14 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
-
-	* coffcode.h: Recognize I386PTXMAGIC.
-	* aoutf1.h, libaout.h: Add M_386_DYNIX.
-	* trad-core.c (TRAD_CORE_USER_OFFSET, TRAD_CORE_STACK_FILEPOS):
-	New macros; use it if defined.
-	* config/symmetry.mh, hosts/symmetry.h: New files.
-
-Fri Jul 16 14:56:31 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
-
-	* Rename elf{32,64}-generic.c to *-gen.c for 14 char filenames.
-	* Makefile.in: Change accordingly.
-	(CFILES): Add elf64-gen.c.
-
-Fri Jul 16 09:53:23 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c: Use MIPS_AOUT_{OZ}MAGIC rather than {OZ}MAGIC.
-
-Thu Jul 15 16:02:07 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-m88k.c (howto_table): Corrected bitsize for R_PCR26L from
-	16 to 26.
-
-Wed Jul 14 15:29:56 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hppa.c [HOST_HPPABSD]: Use hpux-style core files.
-	* libhppa.h [HOST_HPPABSD]: Include hpux version of core.h
-
-Wed Jul 14 09:30:48 1993  Doug Evans  (dje@canuck.cygnus.com)
-
-	* configure.in: Recognize h8300h-*-*.
-
-Tue Jul 13 12:03:00 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* coff-h8500.c (reloc_processing, rtype2howto): New relocation
-	type R_H8500_HIGH_16.
-	* coff-sh.c (r_imm32): Get the width of the reloc right.
-
-Tue Jul 13 16:48:56 1993  Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr)
-
-	* configure.in: Add new target m68k-coffun to the dpx/2.
-	* config/m68k-coffun.mt: New file, renamed from config/dpx2.mt.
-
-Mon Jul 12 10:42:49 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
-
-	* reloc.c (enum bfd_reloc_code_real): Move SPARC_BASE13 reloc into
-	sparc-aout-specific list.
-
-	* libelf.h (struct elf_obj_tdata): Add field `thunk'.
-
-	* config/sparc-elf.mt (TARGET_BACKENDS): New make variable.
-
-Thu Jul  1 14:52:47 1993  Frederic Pierresteguy (F.Pierresteguy@frcl.bull.fr)
-			  and Jim Kingdon (kingdon@cygnus.com)
-
-	* elfcode.h: Use memset not bzero.
-	* trad-core.c: Don't include <sys/file.h>.
-	* i386linux.h: Include <sys/file.h>.
-	* coff-m68k-un.c: new file to handle names with underscores on
-	svr3 machines.
-	* coff-m68k.c (m68k_rtype2howto): added #ifdef ONLY_DECLARE_RELOCS
-	to not duplicate the function in the executable.
-	(TARGET_SYM, TARGET_NAME, NAMES_HAVE_UNDERSCORE): new macros needed
-	by coff-m68k-un.c.
-	* coffcode.h (MC68KBCSMAGIC): case added.
-	* targets.c: Add m68kcoffun_vec.
-	* configure.host: added support for Bull dpx/2.
-	* config/dpx2.mh, hosts/dpx2.h: new files.
-	* Makefile.in: added target coff-m68k-un.
-
-Fri Jul  9 00:43:06 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* aoutf1.h: Add definition of MACHTYPE_OK.
-
-Thu Jul  8 14:37:44 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* reloc.c (bfd_perform_relocation): Don't subtract the addend
-	again for coff.
-
-	* syms.c, bfd-in2.h: Doc fix.
-
-	* coffcode.h (CALC_ADDEND): Check for common section using the
-	section flag as well as the symbol flag.
-
-Thu Jul  8 13:43:52 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/i386bsd.h: Conditionalize HOST_STACK_END_ADDR on __bsdi__.
-	i386bsd.c: Remove defines of N_TXT*; the versions in aout64.h should
-	be sufficient.  Define TEXT_START_ADDR.
-
-Wed Jul  7 10:56:21 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* aoutx.h (translate_from_native_sym_flags): Removed statep
-	argument.  Just let an indirect symbol point to the next symbol
-	without forcing the next symbol to be undefined.  Changed all
-	callers.
-	* hp300hpux.c (slurp_symbol_table): Changed call to
-	translate_from_native_sym_flags.
-	* targets.c: Added hp300hpux_vec.
-	* Makefile.in (hp300hpux.o): Added dependencies.
-
-Tue Jul  6 13:24:55 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* reloc.c (enum bfd_reloc_code_real): Put simple power-of-two
-	relocs together, and add 64-bit versions.
-	(bfd_generic_get_relocated_section_contents): Argument to alloca
-	is size_t.
-
-	* libbfd.c (bfd_xmalloc_by_size_t): New function.
-	* opncls.c (bfd_cache_init, bfd_open_file): Add prototypes to
-	declarations.
-	(obstack_chunk_alloc): Use bfd_xmalloc_by_size_t.
-	(new_bfd): Prototype-style definition, using DEFUN.
-	(bfd_alloc_grow, bfd_alloc, bfd_zalloc, bfd_realloc): Size
-	argument is type size_t, not bfd_size_type.
-	* ieee.c (obstack_chunk_alloc): Use bfd_xmalloc_by_size_t.
-	* bfd.c (bfd_default_error_trap, bfd_error_trap,
-	bfd_error_nonrepresentabltrap): Prototypes.
-	* libbfd-in.h (bfd_alloc, bfd_zalloc, bfd_realloc,
-	bfd_alloc_grow): Adjusted prototypes for arg type change.
-	* archive.c (get_elt_at_filepos, do_slurp_bsd_armap, normalize,
-	do_slurp_coff_armap, bfd_construct_extended_name_table):
-	Prototypes.
-	* elfcode.h (elf_string_from_elf_strtab): Prototypes.
-	* libelf.h (elf_string_from_elf_section, elf_get_str_section):
-	Prototypes.
-
-	* Makefile.in (ALL_MACHINES): Renamed from BFD_MACHINES.
-	(ofiles): New target.  Build a list of unique file names, in case
-	any got duplicated.
-	(TARGETLIB): Use list of files from ofiles.
-	* configure.in: Set BFD_MACHINES and BFD_BACKENDS depending on
-	minimal-bfd flag and target makefile frag contents.
-
-	* elfcode.h (elf_read): Delete static declaration, since function
-	has moved.
-	(elf_map_symbols): Write out section symbols for all sections, for
-	now.
-	(elf_symbol_from_bfd_symbol): Allow match if both symbols are
-	section symbols for the same section.
-	(elf_find_nearest_line): Don't print message, just return false.
-
-	* libelf.h (bfd_elf_locate_sh): Declaration deleted.
-
-Mon Jul  5 16:48:11 1993  Doug Evans  (dje@canuck.cygnus.com)
-
-	* cpu-h8300.c (h8300_scan): Fix parsing of architecture string.
-
-Fri Jul  2 18:27:00 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in (clean): Remove bfd.h and stmp-bfd.h.
-	(realclean): Remove generated headers.
-
-Fri Jul  2 14:51:51 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* section.c (bfd_set_section_content):  Deny if file is not opened with
-	the proper mode, set output_has_begun if file is openened for update.
-	* aoutx.h (aout_*_set_section_content):  Remove checks that are now
-	done in bfd_set_section_content.
-
-Fri Jul  2 09:25:20 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* hosts/std-host.h: Removed declarations of printf, fprintf,
-	fcntl, fread and fwrite.  They are all error prone for one reason
-	or another.  Changed declaration of memchr from char * to PTR.
-
-	* configure.in (mips-*-riscos*): New target; use riscos.
-	* configure.host (mips-*-riscos*): New host; use riscos.
-	* config/riscos.mh (HDEFINES): Add -G 4.
-
-	* libaout.h (GET_SWORD): Use the bfd_h_get_signed entry points
-	rather than casting the result of bfd_h_get.
-
-Fri Jul  2 10:13:48 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* configure.in, hosts/delta68.h, config/delta68.mh: Add stuff for
-	Motorola Delta 68.
-
-Wed Jun 30 06:02:43 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* targets.c (bfd_elf64_{big,little}_generic_vec): Declare, and
-	include in search list if BFD64 is defined.
-
-	* libelf.h (CAT4): Added a version for Saber-C, ANSI mode.
-	(bfd_elf64_*): Declarations for 64-bit versions of many routines.
-
-Tue Jun 29 22:50:59 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elf64-target.h, elf64-generic.c: New files.
-	* Makefile.in (BFD64_BACKENDS): Include elf64-generic.o.
-	(elf64-generic.o): List dependencies.
-
-	* Makefile.in: List target `all' explicitly before host/target
-	makefile fragments are included, in case they define any new
-	targets.
-
-	* elfcode.h (ELF_R_INFO, ELF_R_SYM): Define as 32- or 64-bit
-	versions as appropriate.  Uses updated.
-	(elf_debug_section): Declare before use.
-	(elf_debug_file): New function.
-	(bfd_section_from_shdr, bfd_shdr_from_section, elf_fake_sections):
-	Alignment value in section header is n_bytes, not log2.
-	(new_section_hook): Do nothing for now.
-	(bfd_section_from_shdr): Use Elf_External_Rel[a], not 32-bit
-	version explicitly.
-	(elf_core_file_p): Simplify check for correct class (word size).
-	(elf_make_sections, elf_fake_sections, elf_write_object_contents):
-	Initialize all fields when creating data structures.
-	(elf_locate_sh): Renamed from bfd_elfXX_locate_sh, made static.
-	(elf_compute_section_file_positions): Set correct class in output
-	file.
-	(elf_write_object_contents): Section symbols have empty names in
-	output file.
-
-	* libbfd.c (bfd_xmalloc, zalloc): Be sure to cast malloc, memset
-	args to size_t before call.
-	(bfd_add_to_string_table): Cast zalloc arg to bfd_size_type.
-
-Tue Jun 29 10:49:42 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_find_nearest_line): If procedure has no line
-	number information, return 0 for line number.
-
-Mon Jun 28 10:45:02 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* aoutx.h (some_aout_object_p): If *oldrawptr is non-NULL, copy it
-	into *rawptr.
-
-Sun Jun 27 09:05:19 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/riscos.h: Define NBPG and UPAGES.
-
-Sun Jun 27 16:28:26 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* elfcode.h (elf_slurp_symbol_table): Don't use obj_raw_syms as
-	lvalue; it contains a cast.
-
-Fri Jun 25 17:09:55 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h (hash, compare, struct stringtab_entry, add_to_stringtab):
-	Use unsigned hash values for better hashing.
-	(hash): Hash in the string length for long strings.
-
-Thu Jun 24 15:47:51 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h (compare): Replace 3 if's with a subtraction.
-	(translate_to_native_sym_flags, add_to_stringtab): Reorder tests
-	in decreasing order of success, as an optimization.
-	(hash): Take a length arg; ignore chars after #25, for speed.
-	(add_to_stringtab): Pass length to hash.
-
-Thu Jun 24 17:25:51 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
-
-	* elf32-sparc.c (sparc_reloc_map): Add SPARC_WDISP22 reloc.
-
-	* elfcode.h (elf_new_section_hook): Do nothing for now.
-	(elf_write_object_contents): Output common symbols the way ELF
-	wants them.
-
-Wed Jun 23 16:20:07 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
-
-	* libelf.h (struct elf_obj_tdata and associated macros): Moved
-	here from elfcode.h.  A couple of size-specific structure pointers
-	were changed to PTR; uses fixed appropriately.
-	(elf32_symbol_type, elf64_symbol_type): Separated definitions.
-	(bfd_elf_mkobject): Renamed from bfd_elf32_mkobject.
-	(bfd_elf32_mkobject, bfd_elf64_mkobject, elf_mkobject): New
-	temporary macros to ease name change.
-	* elf.c (elf_read, elf_mkobject, elf_get_str_section,
-	elf_string_from_elf_section, bfd_elf_find_section): Moved here
-	from elfcode.h.
-	* doc/Makefile.in (libbfd.h): Process elf.c too.
-	* Makefile.in (elf.o): Note new dependencies.
-
-	* elfcode.h: Lots of stuff moved elsewhere.  Deleted some unused
-	code, tweaked some debug hooks.
-	(elf_slurp_reloca_table): Translate ELF section symbols into BFD
-	section symbols.
-
-Wed Jun 23 11:34:21 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* hosts/riscos.h: New file.
-
-Tue Jun 22 14:35:20 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
-
-	* elfcode.h (bfd_section_from_shdr, case SHT_PROGBITS): Even if
-	section already exists, use its pointer to fill in rawdata slot.
-
-Tue Jun 22 16:36:51 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/std-host.h: Return value of puts and fputs is int not void.
-
-Tue Jun 22 14:25:58 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h (howto_table_ext): Comment the field names.
-	* reloc.c (bfd_perform_relocation): Fix max and min values.
-
-Mon Jun 21 18:19:14 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
-
-	* elf32-target.h, elf32-hppa.c, elfcode.h: Use new
-	size-independent elf internal data structures.
-	* elfcode.h (put_word, get_word): Define as appropriate for
-	architecture word size.  Structure swapping functions changed to
-	use them as appropriate.
-
-	* configure.in: If compiling 64-bit back ends, do them before
-	32-bit ones.
-
-	* libelf.h: Use new size-independent versions of elf internal data
-	structures.
-	(symbol_type): Reordered to put any fields dependent on target
-	size at the end.
-	(elf_backend_data): Renamed from elf##_backend_data and made
-	size-independent.
-	(elf_sect_thunk): Now size-independent.
-
-	* libbfd.c (bfd_log2): Now returns unsigned int.
-
-Mon Jun 21 12:30:47 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* Rename config/m88k-aout.mt to config/noop.mt.
-	configure.in: Use it for mips-*-bsd*.
-
-Sun Jun 20 20:32:19 1993  Ken Raeburn  (raeburn@poseidon.cygnus.com)
-
-	* cpu-m68k.c (arch_info_struct): Eliminate "partially bracketed
-	initializer" warning from gcc.
-	* cpu-h8500.c (arch_info_struct): Likewise.
-	* cpu-sh.c (arch_info_struct): Likewise.
-
-	* cpu-h8300.c (local_bfd_reloc_type_lookup, howto*_callback,
-	howto_*): Unused functions and variables commented out.
-	* cpu-z8k.c (local_bfd_reloc_type_lookup, howto*_callback,
-	howto_*): Likewise.
-	* cpu-h8500.c (compatible): Likewise.
-	* cpu-sh.c (compatible): Likewise.
-
-	* hp300hpux.c (swap_std_reloc_in): Delete unused variables.
-	Always set a valid length value, even for invalid input.
-
-	* srec.c (srec_write_symbols): Use sprintf_vma.
-
-	* bfd-in.h (uint64_typeLOW, uint64_typeHIGH, int64_type,
-	uint64_type): Provide default definitions.
-	* hosts/std-host.h (int64 stuff): Remove them from here.
-
-	* bfd-in.h (sprintf_vma): Define parallel to fprintf_vma.
-
-	* elf32-i386.c (elf_i386_reloc_type_lookup): Delete unused
-	variable.  Added default case to switch.
-
-	* aoutx.h (translate_from_native_sym_flags): Before casting
-	pointers to integers, make sure the integer type is wide enough.
-	* coff-mips.c (ecoff_set_symbol_info): Ditto.
-
-	* section.c (bfd_get_section_contents): Since `count' is unsigned,
-	don't bother comparing for less-than-zero.
-	(bfd_set_section_contents): Ditto.
-
-	* elfcode.h (bfd_add_to_strtab): Now static.
-	(sym_is_global): New function.
-	(elf_map_symbols): Call it.  Now returns void.  Removed unused
-	local variable.
-	(bfd_section_from_shdr): Mark string tables other than for section
-	and symbol names as normal sections having contents.
-	(fix_up_strtabs): New function; fixes up ELF header fields for
-	stab sections with string tables associated.
-	(elf_write_object_contents): Map fix_up_strtabs over all BFD
-	sections.  Reordered condition tests for symbol flags; default to
-	local-object value instead of global-object.
-	(elf_symbol_from_bfd_symbol): Hid conditionally-used variable
-	inside condition test.
-	(elf_print_symbol): Use fprintf_vma.
-	(elf_idx_of_sym, bfd_shdr_from_section): Unused functions
-	commented out.
-
-	* bfd-in.h (int64_type, uint64_type): Define these if we fall
-	back to "long long" for HOST_64_BIT.
-
-	* libelf.h (elfNAME, ElfNAME): New versions to get desired results
-	without using invalid ANSI C preprocessing tokens.
-
-	* elf32-target.h (bfd_elf32_new_section_hook): Delete macro.
-	* libelf.h (bfd_elf32_new_section_hook): Declare.
-	* elfcode.h (new_section_hook): Define here.
-
-	* hosts/sparc.h, hosts/std-host.h, hosts/i386bsd.h: Protect
-	against multiple inclusions.
-
-	* hosts/news.h: Include hosts/std-host.h, not plain std-host.h.
-
-	* Makefile.in (bfd.h): Generate into current directory by grabbing
-	64-bit definition (if any) from sysdep.h.
-	* bfd-in.h: Put in marker for sysdep.h inclusion.
-
-Fri Jun 18 19:57:23 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* reloc.c (bfd_perform_relocation): Check for overflow on
-	pc-relative relocations if the howto asked for it.
-
-Fri Jun 18 16:00:20 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* Makefile.in (stmp-bfd.h): Ignore nonzero exit status from grep.
-
-Fri Jun 18 16:54:29 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/riscos.m{h,t}: New files.
-	* configure.{host,in}: Use them.
-
-Fri Jun 18 12:55:10 1993  K. Richard Pixley  (rich@cygnus.com)
-
-	* elf32-mips.c: comment change.  This is a mips file, not 88k.
-
-Mon Jun 14 14:02:41 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* cache.c (bfd_cache_init): Increment open_files and call close_one
-	if necessary.
-	(bfd_open_file): Don't increment open_files here.
-
-Fri Jun 18 10:00:14 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config/delta88.mh: Don't set CC.
-
-	* Makefile.in: Add elf32-{mips,m88k,generic}.
-	elf32-{mips,m88k,generic}.c: New files.
-	targets.c (target_vector): Include bfd_elf32_{mips,m88k,generic}_vec.
-	elfcode.h (elf_object_p): Match elf32-generic for all machines which
-	don't match a different target.
-
-Fri Jun 18 03:12:12 1993  John Gilmore  (gnu@cygnus.com)
-
-	Eliminate "int8_type", "int16_type", "int32_type", and their
-	variants from the BFD universe.  Leave the 64-bit types for now,
-	since they are in flux.
-
-	* aoutx.h, hp300hpux.c:  Eliminate needless (int32_type) casts.
-	* libaout.h (GET_SWORD):  Convert (int32_type) to (int).
-	* ieee.c:  Convert uint8e_type => unsigned char.
-	* oasys.c:  Extensive changes to eliminate obsolete types.
-	These depend on changes in ../include/oasys.h as well.
-	* hosts/*.h:  Remove declarations of all these types.
-
-Mon Jun 14 14:02:41 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* hosts/delta88.h: #if 0 out some declarations which conflict with
-	system headers.
-
-Mon Jun 14 17:08:18 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
-
-	* Makefile.in (install): remove parentdir cruft
-
-Mon Jun 14 19:04:09 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* hppa.c (hppa_get_symbol_info):  Remove redundant copy.
-	* Expurgate random DEFUNs that have crept in.
-
-Mon Jun 14 10:23:53 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_set_symbol_info): Constructor sections should
-	only be aligned to a 4 byte boundary.
-
-Sat Jun 12 16:13:17 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* hosts/std-host.h (struct int64e_struct): Remove needless typedef
-	keyword.
-
-Fri Jun 11 14:25:34 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* aoutf1.h (sunos4_write_object_contents): set flags to 1, breaking
-	1927 but fixing some other important things.
-
-Thu Jun 10 20:36:22 1993  Doug Evans  (dje@canuck.cygnus.com)
-
-	* hosts/std-host.h (int64e_type): Fix definition.
-
-Thu Jun 10 11:48:28 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_sec_to_styp_flags): Use STYP_MIPS_INIT for
-	section named _INIT.  Don't set STYP_TEXT unless SEC_CODE is set.
-	(ecoff_styp_to_sec_flags): Treat a STYP_MIPS_INIT section like
-	a STYP_TEXT section.
-
-Wed Jun  9 16:48:13 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* Makefile.in (install, headers): don't put comments after a tab
-	in the actions section of a rule
-
-Wed Jun  9 15:00:01 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_mkobject_hook): Mark ZMAGIC files as D_PAGED.
-	(ecoff_write_object_contents): If not D_PAGED, don't add the
-	section headers to text_size.  If not D_PAGED, set the magic
-	number to OMAGIC rather than ZMAGIC.  If creating a D_PAGED
-	executable, the executable must fully occupy an even number of
-	pages.
-	(ecoff_set_symbol_info, make_bfd_asection, ecoff_little_vec,
-	ecoff_big_vec): Consistently set section alignment power to 4,
-	since ECOFF sections should be multiples of 16 bytes.
-	(ecoff_little_vec, ecoff_big_vec): Added D_PAGED to object_flags.
-	Made ar_pad_char and ar_max_namelen agree for both.
-
-Tue Jun  8 20:28:02 1993  Mark Eichin  (eichin at tweedledumber)
-
-	* elfcode.h (elf_slurp_symbol_table): subtract section vma from
-	symbol value, since bfd symbols are section relative, but ELF
-	symbols aren't.
-
-Tue Jun  8 12:08:27 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* cpu-i960.c, cpu-h8300.c (compatible): Make static.
-
-Tue Jun  8 14:27:56 1993  Jim Kingdon  (kingdon@rtl.cygnus.com)
-
-	* hosts/news.h, config/news.mh: New files.
-
-Tue Jun  8 12:08:27 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* bfd-in2.h, archures.c (bfd_mach_h8300[h]): new defines.
-	* coff-h8300.c: More addressing modes.
-	* coffcode.h (coff_set_arch_mach_hook): Cope with H8300 magic
-	number.
-	* cpu-h8300.c: Removed disassemble stuff. (h8300_scan): Recognise
-	H8/300H name. (compatible): New function.
-	* reloc16.c (bfd_coff_reloc16_get_relocated_sec): Cope with more
-	addressing modes.
-
-Tue Jun  8 10:30:13 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_compute_section_file_positions,
-	ecoff_write_object_contents): Only round to page boundaries if
-	D_PAGED flag is set for the output BFD.
-
-Fri Jun  4 15:47:52 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* coffcode.h (get_index, coff_slurp_symbol_table): Fix pointer
-	casts to work on machine where sizeof(long) != sizeof(int) !=
-	sizeof(char *).
-        * coffgen.c (coff_get_normalized_symtab): Ditto.
-	* cpu-h8300.c coff-h8300.c: Support for H8/300-H.
-
-Fri Jun  4 15:24:27 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* coffgen.c (coff_write_symbols): For empty string table, write
-	out 4 in correct byte order.  (from minyard@bnr.ca)
-
-	* elf32-hppa.c: Don't include libhppa.h for now; define
-	BYTES_IN_WORD instead, until Utah sends a better fix.
-	(hppa_elf_build_arg_reloc_stub): Use xmalloc and xrealloc instead
-	of malloc and realloc.
-
-Fri Jun  4 07:49:01 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* configure.in (mips-*-ecoffl*): New target; use decstation.
-	(mips-*-ecoff*): Added trailing '*'.
-
-	* coff-mips.c (ecoff_get_debug): Get the offset from the first PDR
-	for the FDR, not from the first PDR in the file.
-
-Thu Jun  3 16:41:10 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* hppa.c (hppa_get_symbol_info):  New func needed for JUMP_TABLE.
-
-Thu Jun  3 15:33:57 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
-
-	* hppa.c (hppa_get_symbol_info): New function.
-
-Thu Jun  3 13:07:42 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elfcode.h (elf_map_symbols): Don't crash if no symbols have been
-	allocated yet.
-
-	From Peter Hoogenboom (hoogen@schafer.cs.utah.edu):
-	* libhppa.h (MAXCOMLEN): Define unconditionally.
-	(_PA_RISC_ID): Only define if not already defined.
-	* elf32-hppa.c: Include libhppa.h.
-
-	From Ralph Campbell:
-	* hosts/mipsbsd.h (HOST_DATA_START_ADDR): Delete definition.
-
-	* elf32-hppa.h (symext_rootP, symext_lastP): Delete decls.
-
-Thu Jun  3 00:23:53 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* config/go32.mh: define EXTRALIBES to -lm (for binutils), also
-	remove defines of __MSDOS__ and __GO32__ (these are in the
-	compiler now).
-
-Wed Jun  2 17:57:13 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	From Utah:
-	* hosts/hppabsd.h: Eliminate use of obsolete EXFUN.
-	* config/hppabsd.mh: Don't use ranlib.
-
-Tue Jun  1 04:15:57 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* elf.c: New file, for word-size independent code.
-	* elfcode.h (elf_hash): Moved to there, renamed bfd_elf_hash.
-	* Makefile.in: Include elf.o in standard objects.
-
-	* bfd-in.h (CAT3): Define here.
-	* libaout.h, libelf.h: Not here.
-
-	* libelf.h (struct strtab): Define here.
-	(bfd_elf_locate_sh): Declare here.
-	* elfcode.h (struct strtab): Definition deleted.
-
-	* reloc.c (enum bfd_reloc_code_real): Added HPPA_PCREL_CALL_12.
-
-	* Makefile.in: Make "all", not "bfd.h", be the default target.
-	(stmp-bfd.h): New target; prevents rebuilding world if bfd.h
-	hasn't really changed.
-
-	Tue May 25 12:15:15 1993  Michael Meissner  (meissner@osf.org)
-
-	* elfcode.h (elf_hash): Provide elf standard hash function.
-	(various): Key off of the machines use_rela_p field to determine
-	whether to use REL or RELA relocations.
-	(elf_swap_reloc_out, elf_swap_reloc_in): New functions.
-	(elf_make_sections): Allocate a pointer to hold all data for a
-	given section, and copy each fragment into the data region.
-	Update the section's pointer with the REL implicit addends if the
-	machine uses REL relocation.
-
-	* elf32-i386.c (elf_bfd_reloc_type_lookup): Rename to
-	elf_i386_bfd_reloc_type_lookup, and use cpp to map the name back
-	into was elf32-target.h expects.
-	(elf_info_to_howto): Rename to elf_i386_info_to_howto.
-	(elf_i386_bfd_reloc_type_lookup): Add relocation support.
-	(elf_i386_info_to_howto): Add minimal relocation support.
-
-	* libelf.h (elf_backend_data): Add use_rela_p, elf_64_p,
-	elf_info_to_howto_rel fields.
-
-	* elf32-target.h (elf_bed): Add support for new fields in
-	elf_backend_data.
-
-	Sun May 30 16:38:24 1993  Peter Hoogenboom  (hoogen@fast.cs.utah.edu)
-
-	* elf32-hppa.c: Add symbol extension section support, fix
-	relocation howto table, add stub generation support.
-
-	* elf32-hppa.h: Add symbol extension section support, fix
-	relocation howto table, add stub generation support.
-
-	* elfcode.h (bfd_elf_locate_sh): New function to locate ELF
-	section header.
-
-	* elfcode.h (bfd_add_to_strtab): Made non-static due to a call
-	from elf32-hppa.c.
-
-	* elfcode.h (elf_idx_of_sym): Return STN_UNDEF instead of 0 when
-	the symbol is not found.
-
-	* elfcode.h (elf_compute_section_file_positions): Not all section
-	file positions were computed.
-
-	* elfcode.h (elf_get_sect_thunk): New function.
-
-	* hppa.c (sign_ext): Reimplement.
-
-	* hppa.c (round_down,round,round_up,L,R,LS,RS,LD,RD,LR,RR): Make
-	these functions static.
-
-Tue Jun  1 14:40:41 1993  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* Makefile.in (bfd.h):  Move closer to headers - and after 'all'!
-
-	* aoutx.h (translate_from_native_sym_flags):  Don't set
-	BSF_DEBUGGING for constructor symbols, only BSF_CONSTRUCTOR.
-	* aoutx.h (translate_to_native_sym_flags):  Translate
-	constructor symbols properly.
-
-Thu May 27 16:09:04 1993  Steve Chamberlain  (sac@phydeaux.cygnus.com)
-
-	* archures.c (bfd_default_arch_struct): use 4 byte alignment as a
-	minimum.
-	* aout-target.h (minimum_alignment): 8 byte alignment is right.
-	(fix ld/2680)
-
-Thu May 27 13:38:47 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* configure.in, Makefile.in: Build bfd-in2.h in source directory,
-	from bfd-in.h and .c files.  Build bfd.h in build directory,
-	substituting in requested target word size.  Insert word size into
-	makefile, and maybe enable 64-bit targets.
-
-	* bfd-in.h, libbfd.c, demo64.c, targets.c: Define BFD64 if 64 bits
-	are available.  Conditionalize on this.  Assume HOST_64_BIT
-	will be defined if needed, so 64-bit targets are conditionalized
-	only in the Makefile.
-
-Tue May 25 14:03:56 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* libbfd.c (COERCE64): Rewrite to avoid out-of-range values.
-
-	* coff-sh.c (rtype2howto): Put error message on stderr.
-	(extra_case): Delete unused variable.
-
-	* coff-mips.c (ecoff_print_symbol): Cast bfd_vma values to long
-	before calling printf.
-
-	* elfcode.h: New file, almost completely derived from old elf32.c.
-	* elf32.c: Now just define ARCH_SIZE and include elfcode.h.
-	* Makefile.in (elf64.o): List dependencies, don't build by
-	default.
-	(elf64.c): Add to list of sources.
-	(elf32.o): Update dependencies.
-	* elf32-*.c: Updated type/macro/structure names.  Cleaned up
-	namespace pollution; rename vectors.
-	* targets.c, config/*-elf.mt: Updated.
-	* All uses of 32-bit versions of structures, routines, and macros
-	renamed.
-
-	* Makefile.in (archures.o, targets.o): Depend on Makefile.
-
-Mon May 24 15:53:13 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* elf32-i386.c (enum reloc_type): No comma after last enumerator.
-
-	* elf32.c (elf_string_from_elf_section): Handle index of zero
-	specially.
-	(bfd_section_from_shdr, elf_slurp_symbol_table): Don't need to do
-	so here.
-	(elf_write_object_contents): Deleted one unused variable and
-	initialized another to avoid gcc warnings.
-	(elf_set_section_contents): Delete unused variable.
-
-Fri May 21 19:04:21 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* i386lynx.c:  New module for Lynx variant of a.out.
-	* Makefile.in (BFD_BACKENDS CFILES depends):  Add i386lynx.c.
-	* gen-aout.c:  Get rid of defunct endian stuff, print out true
-	pagesize.
-	* targets.c (target_vector):  Add i386lynx_vec.
-
-Fri May 21 17:02:22 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* configure.in: Use i386-sco.mt for i[36]86-*-isc*.
-
-Fri May 21 13:44:18 1993  David J. Mackenzie  (djm@rtl.cygnus.com)
-
-	* aix386-core.c, aout-target.h, aoutx.h, coff-alpha.c,
-	coff-mips.c, coffgen.c, elf32.c, ieee.c, libaout.h, libcoff-in.h,
-	libelf.h, mipsbsd.c, oasys.c, sco-core.c, srec.c, tekhex.c,
-	trad-core.c: Define a TARGET_get_symbol_info function or macro.
-	Remove the bfd_print_symbol_nm case from TARGET_print_symbol.
-
-	* bfd-in.h: Don't define bfd_print_symbol_nm.
-	Define symbol_info type.
-	(JUMP_TABLE): Set _get_symbol_info element.
-
-	* syms.c (coff_section_type, bfd_symbol_info): New functions.
-	(bfd_decode_symclass): Use coff_section_type.
-
-	* targets.c: Add bfd_get_symbol_info call.
-
-Wed May 19 15:30:52 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* coff-i386.c (coff_i386_reloc):  Use unsigned char to avoid
-	complaints from ancient gcc's.
-
-Wed May 19 15:51:19 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* trad-core.c:  Check macro TRAD_CORE_EXTRA_SIZE_ALLOWED.
-	hosts/i386linux.h:  Define it.
-
-Mon May 17 15:00:33 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
-
-	* VERSION, bfd-in.h: Bump version number to 2.2.
-
-	* hppa.c (assemble_3, dis_assemble_3, assemble_12,
-	dis_assemble_12, assemble_17, dis_assemble_17, assemble_21,
-	dis_assemble_21, sign_ext, ones, sign_unext, low_sign_ext,
-	low_sign_unext, round_down, round, round_up, L, R, LS, RS, LD, RD,
-	LR, RR, hppa_field_adjust): New functions.
-
-Mon May 17 10:04:16 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_set_symbol_info): Added support for indirect
-	stabs symbols, including new indirect_ptr_ptr argument.
-	(ecoff_slurp_symbol_table): Pass new argument in calls to
-	ecoff_set_symbol_info.
-
-Fri May 14 00:05:06 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* configure.in: For m68k sysv systems, use m68k-coff.
-
-	* config/hppa-elf.mt (TDEFINES): Don't define DEFAULT_VECTOR here.
-	(TDEFAULTS): Define it here.  Use the new name.
-
-	* elf32-hppa.c (elf_hppa_backend_data): Delete; rely on default
-	values instead.
-
-	* reloc.c (bfd_reloc_code_real_type): Add some HPPA reloc types.
-
-	* aix386-core.c (NO_GETS): Fix PROTO invocation to have correct
-	number of arguments.
-	(aix386_core_file_p): Initialize core_size to correct value.
-
-Wed May 12 14:39:59 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* Makefile.in (CC_FOR_BUILD): New variable, set to $(CC).
-	(FLAGS_TO_PASS): Pass down CC_FOR_BUILD.
-
-	* bout.c (aout32_slurp_extended_name_table): Define to be
-	_bfd_slurp_extended_name_table rather than bfd_true.
-
-	* coff-mips.c: Include libaout.h and aout/aout64.h to get
-	definitions for N_SET[ATDB].
-	(ecoff_howto_table): Moved near top of file.
-	(ecoff_set_symbol_info): If a STABS symbol of type N_SET[ATDB] is
-	seen, cook up a constructor section of the same name and put in a
-	reloc pointing to the symbol.  This lets the GNU linker build
-	global constructors and destructors without using collect.
-
-Tue May 11 00:33:31 1993  John Gilmore  (gnu@cygnus.com)
-
-	* coff-m88k.c (m88kbcs_vec):  Symbols have underbars.
-
-Mon May 10 05:55:45 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* hosts/miniframe.h: New file.
-	* configure.host: Use it.
-
-Sun May  9 16:36:59 1993  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in (hppa*-*-bsd):  Change to hppa*-*-bsd*
-	* configure.in (hppa*-*-hpux):  Change to hppa*-*-hpux*
-	* configure.in (m68*-hp-bsd):  Change to m68*-hp-bsd*
-	* configure.in (m68*-*-hpux):  Change to m68*-*-hpux*
-	* configure.in (*-*-bsd):  Change to *-*-bsd*
-
-Wed May  5 16:08:32 1993  Per Bothner  (bothner@cygnus.com)
-
-	* elf32-hppa.c (elf_hppa_reloc_type_lookup):  Cast enums to
-	int, for the sake of the old Portable C Compiler.
-
-Mon May  3 14:37:01 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* Makefile.in (CFILES):  Add cpu-sh.c and coff-sh.c.
-
-Mon May  3 14:03:21 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
-
-	* configure.in: Get target name right for m68*-*-hpux.
-
-Sun May  2 11:39:44 1993  Fred Fish  (fnf@cygnus.com)
-
-	* trad-core.c (NO_SIGNED_GET):  New macro.
-	* trad-core.c (trad_core_vec):  Use new NO_SIGNED_GET instead of
-	signed NO_GET, where appropriate.
-
-	* configure.in (i[34]86-*-linux*):  Add; bfd_target = i386-linux.
-	* configure.in (*-*-linux*):  Remove until linux port for a
-	non-i386/i486 system is actually available.
-
-Fri Apr 30 20:04:10 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* libhppa.h:  #undef e_* symbols which come from <machine/som.h>
-	when compiling under HPUX.
-
-Fri Apr 30 17:25:23 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* The following patches are from Jeffrey Law <law@cs.utah.edu>.
-	* hppa.c (hppa_core_file_p): Provide a temporary dummy routine
-	for HOST_HPPABSD.
-	* bfd/hosts/hppabsd.h: Fix declarations of malloc and free.
-	* bfd/libhppa.h: Include sysdep here.  Conditionalize
-	includes based on HOST_HPPAHPUX or HOST_HPPABSD.
-	Provide definitions for MAXCOMLEN and _PA_RISC_ID suitable
-	for BSD.
-
-Fri Apr 30 17:34:11 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elf32-hppa.c: Don't include a.out.h.  Apparently not even the
-	GNU version is needed.
-
-Fri Apr 30 09:38:59 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* coffcode.h: use dummy_reloc16_extra_cases rather than casting abort.
-
-Thu Apr 29 11:30:32 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
-
-	* Makefile.in: Build elf32-hppa.o.
-
-	* syms.c (BSF_FUNCTION): New symbol flag.
-
-	* elf32-hppa.c: Fixed to work with elf32-target.h.
-
-	* hp300hpux.c (NAME, NAME_swap_exec_header_in): Fix for
-	traditional C.
-	* libaout.h (NAME): Don't define if already defined.
-
-	* libelf.h: Protect against multiple inclusions.
-	(elf_symbol_type): Moved here, added new fields.
-	(struct elf_backend_data): New field `global_sym'; I suspect this
-	may be misplaced.
-	* elf32.c (elf_symbol_type): Deleted from here.
-	(struct elf_obj_tdata): New fields raw_syms and internal_syms, to
-	point to backend versions of symbols.
-	(obj_symbols, obj_raw_syms, obj_internal_syms): New macros.
-	(elf_swap_phdr_out, elf_build_phdrs, elf_write_phdrs): New
-	functions.
-	(elf_write_object_contents): Write program headers if appropriate.
-	(bfd_section_from_shdr): Unnamed sections get empty string for
-	name, not "unnamed".  Handle SHT_NOBITS separately from
-	SHT_PROGBITS, and set some different flags.
-	(elf_file_p): New routine.
-	(elf_object_p, elf_core_file_p): Call it.
-	(elf_object_p): Handle EM_HPPA.
-	(elf_symbol_from, elf_idx_of_sym): New functions.
-	(elf_make_sections): Get symbol number right for relocations.  Set
-	SHF_ALLOC, SHF_WRITE, SHF_EXECINSTR when appropriate.
-	(elf_fake_sections): BSS section should be SHT_NOBITS, not
-	SHT_PROGBITS.  Always generate symtab and strtab, not only if
-	relocations are needed.  Set SHF_* flags as appropriate.
-	(elf_compute_section_file_positions): Handle bfd_arch_hppa.
-	(elf_write_object_contents): Fix off-by-one error in symbol count.
-	Store a correct value for the symbol; write the size field
-	properly; make some guesses about the type field.  Set section
-	type correctly for string tables.
-	(section_from_elf_index): Check for absolute and common sections
-	first.
-	(elf_section_from_bfd_section): Ditto.
-	(elf_slurp_symbol_table): Use elf_symbol_type instead of asymbol.
-	Use empty string instead of "unnamed" for nameless symbols.
-	Handle STTY_FUNC type, and weirdness with "$global$" symbol for
-	HPPA (only?).  Don't free raw symbols; keep the pointer around for
-	later.
-	(elf_set_arch_mach): Handle bfd_arch_hppa.
-	(elf_find_nearest_line): Just return false.
-	(elf_write_object_contents, elf_set_section_contents): Set
-	output_has_begun field after computing file positions.
-	(elf_set_section_contents): Write section contents immediately,
-	rather than caching the whole file and writing it at close time.
-
-	* libhppa.h (enum hppa_reloc_field_selector_type, enum
-	hppa_reloc_field_selector_typ_alt, enum hppa_reloc_expr_type, enum
-	hppa_reloc_expr_type_alt): New enumerator types.
-
-	* config/hppa-elf.mt,. config/hppaosf.mh: HP PA/OSF support.
-	* configure.in, configure.host: Use them.
-
-Wed Apr 28 23:21:01 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elf32-target.h: Allow overrides of armap defaults.
-
-	* elf32-hppa.c, elf32-hppa.h: New files.
-
-	* config/hp300hpux.mt: New file.
-
-Tue Apr 27 05:39:40 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* aix386-core.c (NO_GETS): New macro; NO_GET for signed values.
-	(aix386_core_vec): Update for new fields.
-
-	* archive.c (bfd_generic_archive_p): Call target-specific
-	slurp_armap code, instead of bfd_slurp_armap.
-	(bfd_slurp_bsd_armap_f2): New function.
-	* libbfd-in.h (bfd_slurp_bsd_armap_f2): Declare it.
-	* aout-target.h (AR_PAD_CHAR): Define it if not already defined.
-	(vec): Use it.
-	* libaout.h (struct aoutdata): New field for subformat, for
-	differentiating between highly similar a.out formats.
-	* aoutx.h (NAME_swap_exec_header_in): New macro, defaults to local
-	version of function.
-	(swap_exec_header_in): Don't define if NAME_swap_exec_header_in is
-	already defined.
-	* hp300hpux.c: New file.
-	* Makefile.in: Include it.
-
-Mon Apr 26 13:24:43 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* Makefile.in, archures.c, coffcode.h, targets.c: Support for
-	Hitachi SH.
-
-Mon Apr 26 13:55:42 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* trad-core.c (trad_unix_core_file_p): Check the file size.
-
-Mon Apr 26 13:24:43 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-alpha.c: Remove duplicate function and add warnings.
-
-Mon Apr 26 11:25:58 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* sco-core.c (sco_core_vec): Add initializers for new target
-	fields.
-
-Sat Apr 24 21:33:45 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* coffcode.h [_LIT]: Recognize .lit section.
-
-Fri Apr 23 19:00:36 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-alpha.c, cpu-alpha.c, config/alphaosf.mt,
-	config/alphaosf.mt, hosts/alphaosf.h:  New files.
-
-Fri Apr 23 16:48:46 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* Merge in HPPA/BSD changes from Utah.
-	* hppa.c:  Use this for both HPUX & BSD.
-	* targets.c:  Enable hppa_vec for both HPUX & BSD.
-	* config/hppabsd.mt:  TDEFINES => TDEFAULTS.
-	* hosts/hppabsd.h:  #define HOST_HPPABSD.
-
-Wed Apr 21 01:50:10 1993  John Gilmore  (gnu@cygnus.com)
-
-	* libbfd.c:  Whitespace changes around byteswap macros.
-	* libbfd-in.h:  Whitespace changes around byteswap declarations.
-
-Tue Apr 20 15:59:07 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* aoutf1.h (sunos4_core_file_p):  Don't default bfd_error to
-	system_error anymore.  It confuses bfd_check_format().
-
-Mon Apr 19 23:03:08 1993  Stu Grossman  (grossman@cygnus.com)
-
-	* bfd.c:  Add sgi_core_data to tdata union.
-	* coff-mips.c:  Add Irix 4.x core file support.
-	* hosts/irix4.h:  #define HOST_IRIX4.
-
-Mon Apr 19 18:52:52 1993  Ken Raeburn  (raeburn@deneb.cygnus.com)
-
-	* aoutx.h (translate_from_native_sym_flags): Check that the
-	symbol's section does get set.
-	(slurp_symbol_table): Zero index means null-string name.
-
-	* aoutx.h (struct stringtab_entry, struct stringtab_data): New
-	data structures.
-	(hash, stringtab_init, add_to_stringtab, emit_strtab, compare):
-	New functions.
-	(write_syms): Use them, to reduce string table size.
-
-Mon Apr 19 16:45:12 1993  Fred Fish  (fnf@cygnus.com)
-
-	* trad-core.c (trad_core_vec):  Add 6 new initializers to match
-	  new signed get/put fields.  Minor reformatting to label
-	  some fields.
-
-Mon Apr 19 06:09:41 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* bfd-in.h: Insert comment about SVR3 compiler warnings.
-
-	* hosts/{hp300,i386isc,i386v}.h: Remove unused #defines of {r,}index
-	(bfd uses strchr and the broken SVR3.2 cpp loses with the defines).
-
-	* libbfd.c: bfd_put*: Remove casts to bfd_vma.
-
-Fri Apr 16 17:49:27 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* aoutf1.h (internal_sunos_core): Make c_stacktop a bfd_vma.
-	(swapcore_sparc): Make sp a bfd_vma.
-
-Thu Apr 15 09:09:18 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* libbfd.c: Add signed versions of bfd_{h_,}{get,put}_signed_<size>.
-	libbfd.c, libbfd-in.h: Add _do*signed*.
-	targets.c, all targets: Add bfd*signed*.
-	bfd-in.h: Add bfd_signed_vma.  Add comments.
-
-	* bfd-in.h (bfd_error), bfd.c (bfd_errmsgs): Add file_truncated.
-
-	* format.c (bfd_check_error): Check error return from
-	_bfd_check_format routines.
-
-Wed Apr 14 23:48:25 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* rs6000-core.c (rs6000coff_core_p): Improve error checking and
-	recognize .data section if present.
-
-Thu Apr 15 01:00:29 1993  John Gilmore  (gnu@cygnus.com)
-
-	* aoutx.h (aout_*_adjust_sizes_and_vmas):  Avoid `sanity'
-	check for the case where the user sets the address of the BSS
-	section (and the file header can't specify this).  Let the user
-	set it wherever they want, regardless of what goes in the header.
-
-	* ieee.c (ieee_slurp_sections):  Pass all ieee section names
-	straight through into BFD sections.  Add comments.
-
-Wed Apr 14 20:34:54 1993  John Gilmore  (gnu@cygnus.com)
-
-	Cleanup in preparation for better 64-bit host support.
-
-	* bfd-in.h (bfd_64_type):  Remove.
-	* libbfd.c (_do_getb64, _do_putb64):  Use bfd_vma, not bfd_64_type.
-
-	* bfd-in.h (bfd_size):  Remove.
-
-	* bfd-in.h (bfd_offset):  Remove, after fixing ld/ldlang.[ch].
-
-	* bfd-in.h (bfd_word):  Remove.
-	* reloc.c (reloc_howto_type):  Replace bfd_word with bfd_vma.
-
-	* bfd-in.h (rawdata_offset):  Remove.
-	* reloc.c (arelent):  Replace rawdata_offset with bfd_size_type.
-	(bfd_perform_relocation):  Lint.
-	(enum bfd_reloc_status):  Comment cleanup.
-
-	* aout-adobe.c, cpu-h8300.c, mipsbsd.c, srec.c: lint -Wall.
-
-Tue Apr 13 11:19:52 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* aoutf1.h (swapcore_sparc): Guess the right value of USRSTACK.
-
-Mon Apr 12 14:18:00 1993  John Gilmore  (gnu@cygnus.com)
-
-	* elf32.c:  Clean up old comments.
-
-Fri Apr  9 10:43:20 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* config/sun3.h: String argument to fprintf is const.
-
-	* coff-mips.c: Renamed PAGE_SIZE to ROUND_SIZE, to avoid confusion
-	on systems which define PAGE_SIZE in <limits.h>.
-
-Thu Apr  8 10:28:00 1993  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* trad-core.c (trad_unix_core_file_failing_signal): Use new macro
-	TRAD_UNIX_CORE_FILE_FAILING_SIGNAL to allow host files to specify
-	the core file failing signal.
-	* hosts/decstation.h (TRAD_UNIX_CORE_FILE_FAILING_SIGNAL): Define
-	to supply the core file failing signal.
-
-Thu Apr  8 09:17:35 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffcode.h (styp_to_sec_flags): Only set SEC_SHARED_LIBRARY for
-	a STYP_NOLOAD | STYP_BSS section if BSS_NOLOAD_IS_SHARED_LIBRARY
-	is defined.  On many COFF targets STYP_BSS is always STYP_NOLOAD.
-	* coff-i386.h (BSS_NOLOAD_IS_SHARED_LIBRARY): Define.
-
-Wed Apr  7 11:33:06 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (PAGESIZE): Correct value.
-
-Tue Apr  6 12:05:44 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_find_nearest_line): Address of first PDR is
-	an offset (patch from Jean-Daniel Fekete <jdf@lri.lri.fr>).
-
-Mon Apr  5 12:07:12 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffcode.h (styp_to_sec_flags): Set SEC_SHARED_LIBRARY for a
-	STYP_NOLOAD | STYP_BSS section.  Don't set SEC_NEVER_LOAD for a
-	STYP_INFO section.
-	(coff_compute_section_file_positions): Force vma and lma of _LIB
-	section to be zero.
-	(coff_set_section_contents): Count number of entries in new lma
-	field, not in vma.
-	* coffgen.c (make_a_section_from_file): Force lineno_count of
-	SEC_SHARED_LIBRARY section to be zero, since it is non-zero on the
-	SCO 3.2v4 shared library.
-	* seclet.c (rel): Copy over any section with contents, not just
-	loadable sections.
-
-	* coff-mips.c (ecoff_make_empty_symbol): Zero out newly allocated
-	symbol.
-
-	* coff-i386.c (coff_i386_reloc): New function, to generate
-	relocateable output correctly.
-	(howto_table): Use coff_i386_reloc for all reloc types.
-	(CALC_ADDEND): Use a more efficient hack to get the correct addend
-	for a common symbol.
-	(i386comm_value): Removed; no longer needed.
-
-Sun Apr  4 15:08:48 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coffcode.h (coff_set_section_contents): Don't write out
-	sections without a filepos.
-
-Fri Apr  2 14:35:05 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* seclet.c (seclet_dump_seclet): Correct SEC_HAS_CONTENTS test.
-
-Wed Mar 31 17:41:05 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* reloc.c (bfd_reloc_code_real_type): Added BFD_RELOC_MIPS_GPREL.
-	* libecoff.h (ecoff_data_type): Added gp_size field.
-	* coff-mips.c (ecoff_mkobject_hook): Initialize gp_size to 8.
-	(ecoff_set_symbol_info): Compare against gp_size, not hardcoded 8.
-	Set flags to 0 for large common symbols.
-	(ecoff_gprel_reloc): Handle non-zero addend for external symbols,
-	which can occur for gas-generated relocs.
-	(ecoff_bfd_reloc_type_lookup): Added BFD_RELOC_MIPS_GPREL case.
-	* bfd.c (bfd_get_gp_size, bfd_set_gp_size): New functions.
-	* Makefile.in (bfd.o): Now depends on coff/sym.h and libecoff.h.
-
-Tue Mar 30 09:33:16 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* srec.c (srec_set_section_contents): Use lma field for load
-	address.
-	* section.c: Add declaration of lma field to section structure.
-	* coffcode.h (coff_write_object_contents): Use lma field for load
-	address.
-	* bfd-in.h (bfd_set_section_vma): Set lma along with vma.
-
-	* aoutx.h (translate_from_native_sym_flags): Now handles indirect
-	symbols in a better way. (translate_to_native_sym_flag): Set the
-	N_INDR bit when necessary. (aout<>slurp_symbol_table): Maintain
-	indirect state.
-	* section.c: Added BFD_IND_SECTION_NAME and bfd_ind_section.
-	(bfd_make_section): Cope with new builtin section.
-	* syms.c (bfd_decode_symclass): Can now print indirect section
-	info.
-
-Wed Mar 24 13:36:33 1993  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* aout-target.h (MY(object_p)):  Fail if MACHTYPE_OK is
-	defined, and yields false.
-	* aout-mipsbsd.c, i386bsd.c:  Define MACHTYPE_OK appropriately.
-
-	* archive.c (snarf_ar_hdr):  Add support for reading (only,
-	so far) BSD-4.4-style extended headers.
-	* archive.c:  Some more comments.
-
-Wed Mar 24 02:05:10 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
-
-	* Makefile.in: fix rule for dvi and info, so that the recursive
-	makes does the right thing, instead of always info
-
-Wed Mar 24 02:56:44 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* libbfd.c (bfd_seek): Disable optimized handling for archives and
-	archive members; they need more special reatment.  For now, verify
-	that computed and actual file positions correspond.
-
-Tue Mar 23 08:45:33 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* mipsbsd.c: Renamed from aout-mipsbsd.c.
-	(set_arch_mach): Delete non-MIPS code.
-	(reloc_howto_type_lookup): Ditto.
-	* Makefile.in: Adjusted.
-
-	* libbfd.c (bfd_tell): Update `where' field.
-	(bfd_seek): Don't do anything if we're not changing the file
-	position.  If FILE_OFFSET_IS_CHAR_INDEX is defined, check `where'
-	field against a SEEK_SET request.  Call bfd_tell to re-update
-	`where' field when done.
-	(bfd_read, bfd_write) [FILE_OFFSET_IS_CHAR_INDEX]: Maintain
-	`where' field.
-	* hosts/sparc.h: Define FILE_OFFSET_IS_CHAR_INDEX.
-
-Mon Mar 22 23:18:10 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* Makefile.in: added installcheck target
-
-Mon Mar 22 14:57:18 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_set_symbol_info): Relocate encapsulated stabs
-	if the type is not stNil.
-
-Tue Mar 16 10:35:27 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* elf32.c (elf_little_vec, elf_big_vec): Delete now-invalid
-	forward declarations.
-
-	* elf32-sparc.c (elf_sparc_howto_table): Don't use CONST here,
-	it's implied by the type.
-
-Fri Mar 12 18:58:08 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* configure.host: recognize sparc-sun-solaris2* instead of sparc-sun-solaris*
-
-Tue Mar  9 09:23:12 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* rs6000-core.c: Add .ldinfo section.
-
-Fri Mar 12 11:57:52 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* Makefile.in (MAKEOVERRIDES): Define to be empty.
-
-Fri Mar 12 08:32:11 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* section.c (bfd_set_section_contents): whitespace
-	* seclet.c (seclet_dump_seclet): Don't try and fill sections with
-	no contents.
-
-Thu Mar 11 19:26:15 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* hosts/go32.h: don't define POSIX_UTIME
-
-Tue Mar  9 10:52:01 1993  Fred Fish  (fnf@cygnus.com)
-
-	* elf32.c (elf_object_p):  Use ELF_ARCH stored in xvec to match
-	against machine architecture stored in the ELF header, to resolve
-	ambiguities.
-	* elf32.c (bfd_section_from_shdr):  Bfd_make_section can return
-	NULL, so only use results when non-NULL.
-	* targets.c (elf32_m68k_vec, elf32_i860_vec):  Add extern decls
-	and add to vector of targets.
-
-Mon Mar  8 15:13:44 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_set_symbol_info): Encapsulated STABS symbols
-	are always just debugging symbols.
-
-	* coff-mips.c (ecoff_[gs]et_sym_index): Moved macros from here...
-	libecoff.h (ecoff_[gs]et_sym_index): ...to here.
-
-Mon Mar  8 14:55:13 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* hppa.c (_PA_RISC_ID): Defined if not already defined (e.g., for
-	hpux 7).  Patch from friedman@gnu.ai.mit.edu.
-	(hppa_object_p): Only check for DL_MAGIC and SHL_MAGIC if they're
-	defined, which they aren't in hpux 7.0.
-
-	* aix386-core.c: Include uinfo.h and coredump.h.  Patch from Minh
-	Tran-Le, tranle@intellicorp.com.
-
-Fri Mar  5 14:54:21 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_generic_reloc): If the addend is non-zero, go
-	ahead and do the relocation.
-	(ecoff_refhi_reloc): Don't to the relocation here, just remember
-	what needs to be done.
-	(ecoff_reflo_reloc): Do the REFHI relocation here.
-
-Thu Mar  4 14:44:01 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_bfd_reloc_type_lookup): New function.
-	(ecoff_write_object_contents): Added BFD_ASSERT calls to ensure
-	relocs are reasonable.
-	* coff-msym.c: Eliminated uses of DEFUN.
-	(ecoff_swap_tir_out): New function.
-
-Tue Mar  2 17:52:58 1993  Fred Fish  (fnf@cygnus.com)
-
-	(Ultrix 2.2 support from Michael Rendell <michael@mercury.cs.mun.ca>)
-	* configure.host (vax-*-ultrix2*):  Add triplet.
-	* hosts/vaxult2.h:  New file.
-	* config/vaxult2.mh:  New file.
-
-	* aoutx.h (string.h):  Include for strchr and friends.
-	* archive.c (string.h):  Include for memchr and friends.
-	* elf32.c (string.h):  Include for strrchr and friends.
-
-Sat Feb 27 00:44:24 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* aoutf1.c (sunos4_reloc_type_lookup): Unused; deleted.
-	(MY_set_sizes): Use sunos4_set_sizes.
-
-	* elf32.c: Renamed from elf.c.  Several CPU-specific functions
-	deleted, as well as elf-big and elf-little targets.
-	* libelf.h: New file.
-	* elf32-sparc.c, elf32-i386.c, elf32-i860.c, elf32-m68k.c: New
-	files, new targets.
-	* Makefile.in, config/*-elf.mt, targets.c: Adjusted.
-
-	* i386linux.c (TARGETNAME): Use hyphens instead of parentheses.
-
-	* coffcode.h (coff_compute_section_file_positions): Don't need
-	variable "old_sofar" if compiling for i960.
-
-	* reloc.c (bfd_default_reloc_type_lookup): First argument is now a
-	bfd pointer.
-	* libbfd.h: Updated.
-
-	* ieee.c (exten, envi): "static" belongs first in declaration.
-
-Fri Feb 26 17:37:34 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* srec.c: add support for symbolsrec, srecords with symbols in
-	them.
-
-Thu Feb 25 11:43:30 1993  John Gilmore  (gnu@cacophony.cygnus.com)
-
-	* ieee.c:  cast all arguments of ieee_write_byte to bfd_byte
-	to avoid lint complaints.
-
-Thu Feb 25 02:15:52 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elf.c (elf_write_object_contents): Section ".shstrtab" should be
-	type SHT_STRTAB.  Don't alter file offset for section 0.
-	(reloc_type_names): Now an array instead of a macro.  Still inside
-	"#if 0", since it's used only in debugging code also in "#if 0".
-	(struct elf_reloc_map_elt, struct elf_reloc_map): New types.
-	(sort_reloc_map): New function.
-	(sparc_reloc_map): New variable.
-	(elf_bfd_reloc_type_lookup): New function.
-
-Tue Feb 23 12:17:16 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* bfd-in.h (JUMP_TABLE): Added bfd_reloc_type_lookup and
-	bfd_make_debug_symbol; they were already in the target structure.
-	* Adjusted all uses of JUMP_TABLE.
-	* coffgen.c, libcoff-in.h (coff_bfd_make_debug_symbol): Renamed
-	from coff_make_debug_symbol.
-	* libcoff.h: Updated accordingly.
-
-	* Minor cleanups provoked by gcc warnings:
-	* aoutx.h (NAME(aout, reloc_type_lookup)),
-	cpu-h8300.c (local_bfd_reloc_type_lookup),
-	cpu-z8k.c (local_bfd_reloc_type_lookup): Added default case to
-	switches.
-	* archive.c (do_slurp_bsd_armap, do_slurp_coff_armap),
-	ieee.c (ieee_slurp_section_data),
-	elf.c (elf_make_sections, elf_fake_sections,
-	elf_compute_section_file_positions, elf_write_object_contents):
-	Removed unused variables.
-	* archures.c: Removed /* from within comment.
-	* bout.c (b_out_squirt_out_relocs): Initialize r_extern.
-	* oasys.c (oasys_write_data): Initialize i.
-
-Mon Feb 22 18:40:06 1993  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* libcoff.h (obj_raw_syment_coun):  New macro.
-	* coffgen.c (coff_get_normalized_symtab):  Initialize
-	raw_syment_count.
-	* coffgen.c (coff_find_nearest_line):  Numerous little fixes.
-
-Mon Feb 22 15:03:07 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (ecoff_set_symbol_info): stBlock symbols are always
-	debugging symbols.
-	(ecoff_get_debug): Offset the fdr adr by the adr of the first pdr,
-	for compatibility with tools from MIPS.
-
-	* config/bigmips.mt: New file; default vector is ecoff_big_vec.
-	* config/irix3.mt, config/irix4.mt: Removed.
-	* configure.in (mips-*-ecoff): New target; uses bigmips.mt.
-	(mips-sgi-*, mips-big-*): Use bigmips rather than irix3.
-
-Wed Feb 17 23:40:41 1993  John Gilmore  (gnu@cygnus.com)
-
-	* hosts/hp300bsd.h:  Add gross hack to determine whether we
-	are running on BSD 4.3 or BSD 4.4, and use appropriate include
-	files (and set other parameters) to match.
-
-Wed Feb 17 12:28:13 1993  K. Richard Pixley  (rich@cygnus.com)
-
-	* trad-core.c (trad_unix_make_empty_symbol): wrap PARAMS around an
-	  ansi definition which otherwise confuses non-ansi compilers.
-
-	* aout-adobe.c (aout_adobe_object_p): eliminate a warning from vax
-	  ultrix cc by forward declaring getenv as is done in
-	  bfd_find_target.
-
-Tue Feb 16 17:56:58 1993  K. Richard Pixley  (rich@cygnus.com)
-
-	* elf.c (elf_info_to_howto): cast an enum into unsigned char
-	  avoiding a fatal error in vax ultrix 4.2 cc.
-
-Tue Feb 16 00:44:54 1993  John Gilmore  (gnu@cygnus.com)
-
-	* bfd-in.h, VERSION:  Roll to version 2.1.
-
-Mon Feb 15 20:43:51 1993  John Gilmore  (gnu@cygnus.com)
-
-	* oasys.c (oasys_write_object_contents):  Lint.
-	* srec.c:  Whitespace cleanup.
-
-Fri Feb 12 14:23:07 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffgen.c (coff_print_symbol): Print correct tagndx value;
-	cleaned up output formatting a bit.
-
-Fri Feb 12 08:28:56 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coffcode.h (coff_set_arch_mach_hook): *FIXME* the H8/300 is always
-	relaxable.  Should be moved somewhere else.
-
-Thu Feb 11 14:09:42 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* aout-mipsbsd.c: Eliminated uses of DEFUN.
-	(aout_mips_*_vec): Added seclet_link element.
-
-	* Makefile.in (BFD_BACKENDS, CFILES, aout-mipsbsd.o): Added
-	support for aout-mipsbsd target.
-
-	* bout.c (get_value): Don't truncate 32-bit addend to 16 bits.
-
-Fri Feb  5 08:08:43 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* cpu-h8500.c (scan_mach): return false if it's not an H8/500
-
-Thu Feb  4 12:52:40 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	Add support for the H8/500
-
-	* coff-h8500.c, cpu-h8500.c, archures.c, coffcode.h, targets.c
-
-Thu Feb  4 12:35:02 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* libecoff.h: New file.  Defines ECOFF backend data for gdb.
-	* coff-mips.c: Now includes libecoff.h.
-	(ecoff_data_type): Moved to libecoff.h.
-	(ecoff_slurp_symbolic_info): Made globally visible so that gdb can
-	call it.  If there is ever another ECOFF target, this and the
-	swapping functions should be accessed via an ECOFF specific target
-	vector.
-	* Makefile.in (coff-mips.o): Depends on libecoff.h.
-
-Wed Feb  3 09:14:36 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffcode.h: Removed MIPS specific information, since coff-mips.c
-	no longer includes this file.
-
-	* coff-msym.c (ecoff_swap_fdr_in, ecoff_swap_ext_in): Set reserved
-	bits to 0 to make comparison test useful.
-
-	* config/irix3.mh, config/irix4.mh (HDEFINES): Set to -G 4 to
-	avoid overflowing GP accessible sections in binutils/objdump.
-
-Tue Feb  2 15:36:55 1993  Per Bothner  (bothner@cygnus.com)
-
-	* aoutx.h (NAME(aout,slurp_symbol_table)):  Made symbol
-	reading more robust:  Fail if string index is out of string
-	table range.
-
-Tue Feb  2 11:43:25 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* bout.c (b_out_get_relocated_section_contents, cases PCREL24 and
-	PCREL13): Don't take dst_address into account; the input file has
-	already taken care of that.
-
-Tue Feb  2 11:41:06 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c: Completed support for linker and binutils.
-
-Mon Feb  1 14:45:38 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* bout.c (b_out_get_relocated_section_contents, case ABS32): Keep
-	original addend from section contents.
-
-Thu Jan 28 21:01:37 1993  John Gilmore  (gnu@cygnus.com)
-
-	Fix minor bugs reported by Carl Greco, <cgreco@parrot.creighton.edu>:
-	* hosts/delta88.h (strtol):  Fix prototype.
-	* config/m88k-coff.mt (SELECT_ARCHITECTURES):  Fix name.
-
-Wed Jan 27 17:16:51 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elf.c: Get rid of "#ifdef sparc".
-	(RELOC_TYPE_NAMES): Never used (currently), so don't include it.
-	(elf_sparc_howto_table): Renamed from elf_howto_table, and always
-	used.
-	(elf_info_to_howto): Use runtime conditionals on CPU type, not
-	compile type conditionals on host CPU.
-	(elf_little_vec, elf_big_vec): Use bfd_default_reloc_type_lookup,
-	not null pointer.
-	(reloc_type, RELOC_TYPE_NAMES): Include i386 values.
-
-Tue Jan 26 11:43:14 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* section.c (SEC_IS_COMMON): New section flag, needed for MIPS
-	ECOFF which has two common sections.
-	(bfd_com_section): Set SEC_IS_COMMON flag.
-	* bfd-in.h (bfd_is_com_section): New macro to test SEC_IS_COMMON.
-	* aoutx.h, archive.c, bout.c, coff-a29k.c, coff-m88k.c,
-	coff-mips.c, coffgen.c, ieee.c, oasys.c, reloc.c, syms.: Use
-	bfd_is_com_section macro rather than checking for equality to
-	bfd_com_section.
-
-Mon Jan 25 15:27:36 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffcode.h (_bfd_coff_mkobject_hook): Pass aouthdr argument.
-	(coff_mkobject_hook): Accept aouthdr argument.
-	* coffgen.c (coff_real_object_p): Pass aouthdr to mkobject_hook.
-	Handle NULL aouthdr argument.
-	(coff_object_p): If there is no aouthdr, pass it as NULL to
-	coff_real_object_p.
-	* libcoff.h: Rebuilt for mkobject_hook changes.
-
-	* coffswap.h (coff_swap_aouthdr_in, coff_swap_aouthdr_in): Swap
-	additional MIPS ECOFF fields.
-
-Sat Jan 23 18:36:20 PST 1993  Ralph Campbell  (ralphc@pyramid.com)
-
-	* configure.host: added mips-dec-bsd*
-	* configure.in: added mips-dec-bsd*
-	* aout-mipsbsd.c: new file for mips-dec-bsd*
-	* aout-target.h: don't define '' if 'MY_BFD_TARGET' is defined.
-	* aoutx.h: added mips support.
-	* archures.c: added mips support to bfd_default_scan().
-	* cpu-mips.c: added support for R4000 (untested).
-	* libaout.h: added MIPS1 & MIPS2 magic numbers.
-	* reloc.c: fix typo's in comments. Added BFD_RELOC entries which I
-		hope will make it into include/bfd.h.
-	* targets.c: added aout_mips_*_vec.
-
-Wed Jan 20 17:15:52 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* config/decstation.mt: Set DEFAULT_VECTOR to ecoff_little_vec.
-
-Tue Jan 19 09:06:14 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* bfd-in.h (bfd_asymbol_value): Add needed parentheses.
-
-	* libcoff-in.h: Update prototype for coff_count_linenumbers.
-
-Fri Jan 15 18:13:17 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-msym.c (ecoff_swap_hdr_out, ecoff_swap_fdr_out,
-	ecoff_swap_pdr_out, ecoff_swap_sym_out, ecoff_swap_ext_out,
-	ecoff_swap_rndx_out, ecoff_swap_rfd_out, ecoff_swap_opt_in,
-	ecoff_swap_opt_out, ecoff_swap_dnr_in, ecoff_swap_dnr_out): New
-	functions.
-	* coffswap.h: If NO_COFF_RELOCS is defined, don't define
-	bfd_swap_reloc_in or coff_swap_reloc_out.
-	* coff-mips.c: Added code to link and write out symbolic debugging
-	information, and to swap relocs in and out.
-
-Thu Jan 14 15:51:58 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* libcoff.h, coffgen.c (coff_count_linenumbers), coffcode.h
-	(coff_write_object_contents): coff_count_linenumbers returns the
-	number of line number records it found.
-
-	* coffgen.c (coff_write_linenumbers): only write out line numbers
-	in the section they belong to.
-
-Mon Jan 11 18:32:22 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* targets.c (bfd_target): Added relocateable argument to
-	_bfd_get_relocated_section_contents.  Added _bfd_seclet_link
-	target vector for linker use.
-	* bfd.c (bfd_seclet_link): New macro.
-	* bfd-in.h (JUMP_TABLE): Added _bfd_seclet_link.
-	* seclet.c (rel, seclet_dump_seclet): Added relocateable argument
-	and boolean return value.  Made static.
-	(bfd_generic_seclet_link): Renamed from seclet_dump.  Added
-	relocateable argument.
-	* reloc.c (bfd_generic_get_relocated_section_contents): Added
-	relocateable argument (if relocateable, saves relocs).
-	* bout.c (b_out_get_relocated_section_contents),
-	reloc16.c (bfd_coff_reloc16_get_relocated_section_contents): Added
-	relocateable argument (if relocateable, just calls
-	bfd_generic_get_relocated_section_contents).
-	* libcoff-in.h (bfd_coff_reloc16_get_value): Added relocateable
-	argument to prototype.
-	* All targets: Set new _bfd_seclet_link vector to
-	bfd_generic_seclet_link.
-
-Sat Jan  9 21:29:32 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* coffgen.c:  #include seclet.h.
-
-Sat Jan  9 19:48:14 1993  Stu Grossman  (grossman at cygnus.com)
-
-	* hppa.c (hppa_object_setup):  Get rid of all knowledge of stabs
-	debug info.  Setup info about linker symbols only, and use
-	standard bfd fields to hold the info.
-	* (hppa_object_p):  Remove unneeded decls.
-	* (hppa_new_section_hook):  Get rid of most of this.
-	* libhppa.h (struct hppadata):  Remove ten pounds of useless ugly
-	fat.  Remove all knowledge of stabs, remove redundant knowledge of
-	linker symbols.
-	* Remove macros for accessing fields which are now gone.
-
-Fri Jan  8 15:20:00 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coffcode.h (sec_to_styp_flags): allow SEC_NEVER_LOAD to turn on
-	STYP_NOLOAD bit.
-	* coff-z8k.c: delete unused reloc functions
-
-Fri Jan  8 15:47:53 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* bfd.c (struct _bfd): Added ecoff_tdata to tdata union.
-	* targets.c (enum target_flavour): Added bfd_target_ecoff_flavour.
-	* coff-msym.c: Use DEFUN for function definitons.
-	* coff-mips.c: Added code to read and print symbols, and to find
-	line numbers.
-
-	* coffcode.h: Moved many generic functions into coffgen.c.  Moved
-	swapping functions into coffswap.h for ECOFF use.  Moved
-	relocation functions, only used by h8300 and z8k, into reloc16.c.
-	Added hooks for coffgen.c functions to backend data structure, and
-	added hook functions.  Still more could be done.
-	* coffswap.h: New file to hold COFF swapping routines.
-	* coffgen.c: New file to hold generic COFF functions.
-	* reloc16.c: New file to hold h8300 and z8k specific relocation
-	functions.
-	* libcoff-in.h: Added declarations for functions in coffgen.c.
-	* libcoff.h: Rebuilt to incorporate changes.
-	* coff-h8300.c: Function name changes.
-	* coff-z8k.c: Function name changes.  Use coff_reloc16_extra_cases
-	hook rather than defining EXTRA_CASES.
-	* Makefile.in: Build new files coffgen and reloc16.  Added
-	dependencies of coff-*.o on coffswap.h and seclet.h.
-
-Thu Jan  7 16:16:26 1993  Per Bothner  (bothner@cygnus.com)
-
-	* ieee.c (ieee_slurp_sections):  Add cast to avoid warning
-	about discarding const.
-
-Wed Jan  6 00:16:49 1993  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* archive.c, seclet.c, elf.c use bfd_xmalloc instead of malloc
-
-Tue Jan  5 09:35:57 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* configure.in (post-target): If --with-minimal-bfd is specified,
-	set MINIMIZE=1.
-
-Mon Jan  4 07:20:01 1993  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* srec.c (srec_write_records): one of my boards wants a CR between
-	records.
-
-Wed Dec 30 12:46:30 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* archive.c (do_slurp_coff_armap): set symdef_count correctly
-	(it broke a couple of weeks ago).
-
-Tue Dec 29 21:41:05 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* elf.c (bfd_elf_find_section): Switch back to "struct ..." for
-	return type, so libbfd.h doesn't reference undefined typedefnames.
-
-Tue Dec 29 13:54:35 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffcode.h (coff_real_object_p): use name I386AIXMAGIC rather
-	than I386SVMAGIC.
-	(coff_pointerize_aux): don't pointerize a negative tagndx
-	(sometimes generated by SCO 3.2v4 cc).
-
-	* bout.c (calljx_callback, callj_callback,
-	b_out_get_relocated_section_contents): warn if relocating against
-	an undefined symbol.
-
-Mon Dec 28 14:30:55 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* hppa.c:  Get rid of DEFUN, use more conventional prolog stuff.
-	Make a bunch more routines be static.
-	* hppa.c (fill_spaces):  Get rid of this, replace with much better
-	written setup_sections().
-	* (setup_sections):  New routine to create BFD sections for each
-	space and subspace in SOM files.
-	* (hppa_object_setup):  Use BFD sections created by
-	setup_sections() to locate GDB symbol table info.
-	* (make_unique_section):  New routine to create a BFD section.  It
-	ensures that the given name is unique, and will generate a unique
-	one if necessary.
-	* (hppa_object_p):  Become much more paranoid about file header.
-	* (make_bfd_asection):  Call bfd_make_section to do the dirty
-	work.  Simplify code somewhat.
-	* (hppa_core_file_p):  Use proper name for stack section.
-	* libhppa.h:  Remove millicode_start, millicode_end decls.
-
-Mon Dec 28 11:03:22 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* Makefile.in (coff-we32k.o, coff-z8k.o): Note dependencies.
-
-	* reloc.c (bfd_perform_relocation): For normal 2- or 4-byte
-	relocs, don't bother doing the adjustment if the value to add is
-	zero.
-
-Sun Dec 27 17:45:05 1992  Fred Fish  (fnf@cygnus.com)
-
-	* bfd.c (bfd_get_size):  New function that gets an upper bound
-	on the possible size of any object in a bfd.
-	* elf.c (bfd_elf_find_section, elf_get_str_section,
-	elf_get_symtab_upper_bound):  Rewrite to avoid NULL pointer
-	dereferences.
-	* elf.c (elf_big_vec, elf_little_vec):  Document last three
-	members initialized to NULL.
-
-Thu Dec 24 17:49:09 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* hppa.c: change a 'const' to 'CONST', or else HP C compiler dies
-
-Mon Dec 21 16:33:34 1992  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* hosts/std-host.h:  New file.  Attempt at a generic/default
-	set of definitions, to discourage porting to new hosts by copying.
-	* hosts/news.h:  Removed.
-	* hosts/sparc.h:  Use std-host.h.
-	* bfd-in.h:  New macros bfd_asymbol_bfd and bfd_asymbol_flavour;
-	perhaps we can later remove the the_bfd field from each symbol.
-	* syms.c (struct symbol_cache_entry):  Remove unused field
-	app_data.  Add comment noting that the_bfd is almost redundant,
-	but not quite.
-	* aoutx.h, coff-a29k.c, coff-i386.c, coff-i960.c, coffcode.h:
-	Use new macros bfd_asymbol_bfd and bfd_asymbol_flavour.
-	* hppa.c (fill_spaces):  Make slightly more rebust.
-	* configure.in:  Allow std-host as the "default" host.
-
-Mon Dec 21 17:24:13 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* bfd.c:  Add struct hppa_core_data to tdata union.
-	* hppa.c:  Conditionalize on HOST_HPPAHPUX instead of hp9000s800.
-	Get rid of HPPA/BSD specific code.  That will go somewhere else
-	someday.
-	* (fill_spaces):  Don't spin forever and die if you don't find
-	$MILLICODE$ subspace.
-	* (hppa_object_p):  Make sure that we have a real honest-to-cthulu
-	exec file!
-	* (hppa_core_file_failing_signal, hppa_core_file_failing_command):
-	Make these work for HPUX.
-	* (make_bfd_asection):  New routine to make section creation a
-	little easier.
-	* (hppa_core_file_p):  Completely rewrite, leave out bugs.
-	* libhppa.h:  #include the right system files.  Redefine all of
-	the structs/macros for hacking core files to use more sensible
-	HPUX core file structures.
-	* targets.c (target_vector):  Conditionalize hppa_vec on
-	HOST_HPPAHPUX, not hp9000s800.
-	* hosts/hppahpux.h:  #include stdlib.h to get correct decls for
-	malloc and realloc.  #define HOST_HPPAHPUX.
-
-Mon Dec 21 12:40:10 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* Patches from Minh Tran-le <mtranle@paris.intellicorp.com>.
-	* configure.in (i386-*-isc*, i386-*-aix*): New targets.
-	* configure.host (i386-*-isc*, i386-*-aix*): New hosts.
-	* hosts/i386isc.h, config/i386isc.mh: New files for Interactive
-	Unix.
-	* hosts/i386aix.h, config/i386aix.mh: New files for AIX on PS/2.
-	* aix386-core.c: New file for handling core files on AIX on PS/2.
-	* targets.c: if AIX386_CORE, use aix386_core_vec.
-	* coffcode.h (coff_real_object_p): check for I386SVMAGIC as well
-	as I386MAGIC.
-
-Fri Dec 18 10:20:27 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* aoutf1.h (sunos4_write_object_contents): set flags to 0, fixing
-	1927.
-
-Thu Dec 17 19:35:32 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* Makefile.in: added dvi target
-
-Thu Dec 17 00:36:24 1992  John Gilmore  (gnu@cygnus.com)
-
-	* bfd.c:  Use right name for tekhex tdata struct.
-	* tekhex.c:  Insert leading_char (0) into bfd_target struct.  Style.
-	* libcoff.h:  Updated to get spacing change from coffcode.h.
-	* trad-core.c:  leading_char is 0 (no symbols!), not '_'.
-
-Tue Dec 15 15:40:30 1992  Per Bothner  (bothner@cygnus.com)
-
-	* archive.c (do_slurp_bsd_armap, do_slurp_coff_armap):  New
-	functions, with the "guts" of the old bfd_slurp_bsd_armap
-	and bfd_slurp_coff_armap, but assuming we've already checked
-	if the armap is present or not.
-	Also, rewrite a bit to avoid keeping around obstack data
-	that we don't need.
-	* archive.c (snarf_ar_header, _bfd_slurp_extended_name_table):
-	Various fixes to correctly handle COFF_style archives names.
-	(Note that because these have a trailing '/', the names can
-	have embedded spaces.)
-	* archive.c (bfd_slurp_armap):  New function, replaces old
-	bfd_slurp_bsd_armap and bfd_slurp_coff_armap.  Recognizes
-	_either_ format, and calls do_slurp_bsd_armap or
-	do_slurp_coff_armap if either form of map is seen.
-	* libbfd-in.h:  Changed bfd_slurp_bsd_armap and
-	bfd_slurp_coff_armap into macro synonyms for bfd_slurp_armap.
-	* elf.c (elf_slurp_armap, elf_write_armap):  Fix.
-	* Makefile.in (AR_FLAGS):  Use rc instead of non-standard qc.
-
-Mon Dec 14 17:08:08 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* hppa.c:  #include "sysdep.h", not <sysdep.h>.
-	* libhppa.h:  Make millicode_start and millicode_end be unsigned
-	int to be same type as CORE_ADDR in GDB.  Why are these here?
-
-Sat Dec 12 15:54:36 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-i386.c (CALC_ADDEND): if reloc is PC relative, add the
-	vaddr of the section to the addend.
-	* targets.c: if MINIMIZE is 1, and SCO_CORE is defined, add
-	SCO_CORE to SELECT_VECS.
-	(target_vector): add sco_core_vec.
-	* sco-core.c (sco_core_vec): add leading underscore initializer.
-	* configure.in (i[34]86-*-sco*): use target i386-sco.
-	* config/i386-sco.mt: new file; define SCO_CORE.
-
-Thu Dec 10 02:13:15 1992  John Gilmore  (gnu@cygnus.com)
-
-	* aout-adobe.c (aout_adobe_object_p):  Fix !strcmp thinko.
-
-Fri Dec  4 14:02:49 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* coffcode.h (bfd_coff_std_swap_table): Now static and const.
-
-Thu Dec  3 16:54:58 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* hosts/i386linux.h: Include unistd.h.
-
-	* aoutx.h (print_symbol): aout_stab_name returns a constant
-	string.
-	* libaout.h (aout_stab_name): Fix prototype.
-	* stab-syms.c (aout_stab_names): Array is now const.
-	(aout_stab_name): Return value is now pointer to const.
-
-	* aoutx.h, archive.c, archures.c, coffcode.h, ctor.c, reloc.c,
-	syms.c: Doc fixes.
-
-	* syms.c (asymbol): Added new field "app_data", for data
-	particular to the application.  Some of the linker flags ought to
-	get moved to this field someday.
-
-	* archures.c (bfd_default_scan): Recognize a few more numbers:
-	80486, 80960, and 960.
-
-	* bfd-in.h (COFF_SWAP_TABLE): New is just address of
-	bfd_coff_std_swap_table, cast to PTR.
-	* bfd.c (bfd_coff_swap_*): Deleted macros.
-	* targets.c (struct bfd_target): Deleted COFF-specific swapping
-	routine pointers.
-	* coffcode.h (type bfd_coff_backend_data): New structure type,
-	contains pointers to the COFF-specific swapping routines.
-	(bfd_coff_std_swap_table): New data structure, to be used when
-	NO_COFF_SYMBOLS and NO_COFF_LINENOS are not defined.
-	(bfd_coff_swap_*): New macros.
-	* coff-mips.c (mips_coff_swap_table): New data structure.
-	(ecoff_big_vec): Use it.
-	* All COFF targets: Moved COFF_SWAP_TABLE to target-specific data.
-	* All other targets: Deleted coff-specific vector entries.
-
-	* trad-core.c: Fixed some `PARAMS' uses that were missing
-	parentheses.
-
-Sun Nov 29 08:37:13 1992  Fred Fish  (fnf@cygnus.com)
-
-	* aoutx.h (some_aout_object_p):  Protect arg prototype in
-	callback_to_real_object_p with PARAMS macro for non-ANSI compilers.
-
-Sat Nov 28 04:01:21 1992  John Gilmore  (gnu@cygnus.com)
-
-	* aout-target.h, aoutf1.h, trad-core.c, coffcode.h, libaout.h,
-	libbfd-in.h, bfd-in.h: Eliminate all PROTO calls, replace with
-	PARAMS for readability.
-
-	* aoutx.h:  Add type to callback parameter.
-	* coff-mips.c:  Don't call trad-core.h, not needed.
-	* trad-core.c:  Incorporate trad-core.h declarations.  Fix comments.
-	* trad-core.h:  Eliminate, unused.
-
-Wed Nov 18 13:16:17 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* format.c (bfd_check_format): if default target isn't found
-	then look through the entire list rather than return early.
-
-Mon Nov 16 14:33:03 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* config/i960-coff.mt: reorder vec to match bfd_check_format (from Per)
-
-Thu Nov 12 17:01:41 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* Makefile.in: pass down prefix and exec_prefix in FLAGS_TO_PASS
-
-Thu Nov 12 09:46:47 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-z8k.c: checkpoint, more addressing modes handled
-	* coffcode.h (get_value): don't truncate reloc->addend field, it's
-	a long now.
-
-Wed Nov 11 23:57:55 1992  Brendan Kehoe  (brendan@cygnus.com)
-
-	* we32k.mt (TDEFAULTS): Use we32kcoff_vec, not i386coff_vec.
-
-Tue Nov 10 14:04:38 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* Makefile.in: minor tweaks to make $(CC) command lines more consistent
-
-Mon Nov  9 23:58:17 1992  John Gilmore  (gnu@cygnus.com)
-
-	* opncls.c (bfd_fdopenr, bfd_close):  Add doc about cacheing
-	and about when file descriptors are closed.
-
-Sat Nov  7 00:42:20 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* bout.c (b_out_squirt_out_relocs): Make sure alignment relocs get
-	written out correctly.
-
-Thu Nov  5 15:34:19 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* section.c: New section bit SEC_SHARED_LIBRARY.
-	coffcode.h (styp_to_sec_flags): if STYP_NOLOAD && (STYP_TEXT ||
-	STYP_DATA), set SEC_SHARED_LIBRARY.  This seems to be correct for
-	i386-sysv.
-
-Thu Nov  5 04:43:09 1992  John Gilmore  (gnu@cygnus.com)
-
-	* target.c (struct bfd_target):  Eliminate the SDEF and SDEF_FMT
-	macros; use PARAMS to declare the function pointers involved.
-
-	* bfd-in.h, bfd.c, libbfd.h, reloc.c, seclet.h, section.c,
-	targets.c: Rename struct bfd_seclet_struct to struct bfd_seclet.
-
-Thu Nov  5 02:59:09 1992  John Gilmore  (gnu@cygnus.com)
-
-	Cleanup:  Replace all uses of EXFUN in the BFD sources, with PARAMS.
-
-	* archures.c, reloc.c, section.c, tekhex.c:  Use PARAMS in
-	declaring pointers to functions.
-	* cache.c, elf.c:  Move static function decls to top, use PARAMS.
-	* seclet.h:  Declare external function with PARAMS.
-
-	* doc/chew.c (exfunstuff):  Eliminate.
-	(paramstuff):  Replace exfunstuff with function to generate PARAMS.
-	* doc/proto.str:  Use paramstuff rather than exfunstuff.
-
-	* libbfd.h:  Update, based on changes in source code and chew.
-
-Wed Nov  4 22:47:29 1992  John Gilmore  (gnu@cygnus.com)
-
-	* libieee.h:  Add FIXME about removing limit on number of sections.
-	* bfd-in.h:  Improve comments to make it clear that bfd.h is
-	the wrong place to edit this file.
-	* Makefile.in (install):  Install ansidecl.h and obstack.h in the
-	same places where we install bfd.h.
-
-Wed Nov  4 13:40:23 1992  Sean Eric Fagan  (sef@cygnus.com)
-
-	* coffcode.h (coff_swap_aux_out, coff_swap_aux_in):  check for
-	symbol type before blindly modifying the auxent.  Specifically,
-	only modify the endndx fields for types that need it, and don't
-	set the array information for non-arrays.
-
-Wed Nov  4 09:30:50 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* aoutx.h (some_aout_object_p): Section list should be set up
-	correctly anyways; don't have to set up "next" pointers manually.
-
-Mon Nov  2 12:36:14 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* config/delta88.mh, config/hp300.mh, config/hppahpux.mh,
-	config/i386v.mh: removed -DUSG from HDEFINES.
-	hosts/delta88.h, hosts/hp300.h, hosts/hppahpux.h, hosts/i386v.h:
-	defined USE_UTIME.
-	hosts/i386v.h: don't define POSIX_UTIME.
-
-Fri Oct 30 16:13:52 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* ieee.c (ieee_slurp_sections): make a private copy of the
-	section's name before truncating it.
-
-Thu Oct 29 08:30:50 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* hppa.c: add symbol_leading_char entry in transfer vec
-
-,Wed Oct 28 16:11:57 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* ieee.c (get_symbol): can now cope when two symbols of a
-	different class, but the same index number occur consecutively.
-	(get_section_entry): nicer name for sections being forward
-	referenced. (ieee_archive_p): don't free the filename string,
-	since it was never malloced.
-
-Wed Oct 28 13:42:09 1992  John Gilmore  (gnu@cygnus.com)
-
-	* coffcode.h (coff_write_object_contents):  Zero timestamp field.
-
-Tue Oct 27 12:24:34 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffcode.h (coff_swap_aux_out): set the fcnary info before
-	optionally setting the dimen info, since they are in the same
-	memory locations.  Also zero out external auxent.
-	(coff_write_symbol): don't zero external auxent; now done in
-	coff_swap_aux_out.
-
-Fri Oct 23 13:55:35 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* Check fclose return value for errors.
-	libbfd.h: bfd_cache_close now returns a boolean.
-	cache.c (bfd_cache_delete): return fclose success value.
-	(bfd_cache_close): return bfd_cache_delete return value.
-	opncls.c (bfd_close, bfd_close_all_done): return result of
-	bfd_cache_close.
-
-Fri Oct 23 10:32:36 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* seclet.c (rel): don't load sections without the SEC_LOAD bit.
-
-Thu Oct 15 10:16:35 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-m68k.c (m68k_howto2type, SELECT_RELOC): new function to
-	work out a coff relocation type from a howto's attributes rather
-	than using the input r_type field. This fixes PR1677 and allows
-	conversion of a.out relocs to coff relocs.
-
-	* coffcode.h (coff_write_relocs): if supplied a relocation
-	relative to an absolute symbol, use the right symbol index.
-
-	* reloc.c (bfd_perform_relocation): do a partial link for coff
-	relocs right.
-
-Fri Oct 23 08:15:56 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* changes to support i386-sysv with shared libraries:
-	* coffcode.h (sec_to_styp_flags): if TWO_DATA_SECS is defined,
-	check for .data2; if _LIB is defined, check for it; map
-	SEC_NEVER_LOAD to STYP_NOLOAD.
-	(styp_to_sec_flags): map STYP_NOLOAD to SEC_NEVER_LOAD.
-	(make_a_section_from_file): if TWO_DATA_SECS, accept .data2.
-	(coff_write_object_contents): force vaddr of .lib to 0; set scnptr
-	if section has contents, not just if it is loadable; if
-	TWO_DATA_SECS, check for .data2
-	(coff_set_section_contents): set vma of .lib section to number of
-	.lib sections.
-	* coff-i386.c: define TWO_DATA_SECS; use a special CALC_ADDEND;
-	don't define coff_write_armap to bsd_write_armap.
-	* hosts/i386v.h: don't include <utime.h>, since it is not provided
-	by SVR3.2.
-
-Thu Oct 22 22:40:20 1992  Brendan Kehoe  (brendan@lisa.cygnus.com)
-
-	* solaris2.h: Get the definition of alloca from alloca.h if we
-	aren't using gcc.
-
-Thu Oct 22 03:07:28 1992  John Gilmore  (gnu@cygnus.com)
-
-	* configure.in (i960-*-{aout,bout}):  Support these.
-
-Wed Oct 21 03:46:34 1992  John Gilmore  (gnu@cygnus.com)
-
-	* config/a29k-aout.mt (DEFAULT_TARGET):  Set to one that exists.
-
-Thu Oct 15 15:05:39 1992  Per Bothner  (bothner@cygnus.com)
-
-	* apollo68.h, apollov68.h, hp300.h, i386v.h, irix3.h: Remove
-	no-longer-used definitions of L_SET and L_INCR.
-	* i386linux.h:  Tweaks to smooth Linux build.
-
-Thu Oct 15 01:32:22 1992  John Gilmore  (gnu@cygnus.com)
-
-	* seclet.h:  Add enum tag to bfd_seclet_enum_type.
-
-	* bfd-in.h (file_ptr):  Update comments, make FIXME re off_t.
-
-	* aout-adobe.c, aoutf1.h, archive.c, bout.c, coff-rs6000.c,
-	coffcode.h, elf.c, ieee.c, libaout.h, libbfd.c, oasys.c,
-	sco-core.c:  Lint:  Second argument of bfd_seek is always file_ptr.
-	Third argument is SEEK_SET or SEEK_CUR.  Result is always 0 or -1.
-
-	* aout-adobe.c, aoutf1.h, aoutx.h, bout.c coff-m68k.c, coff-z8k.c,
-	coffcode.h, elf.c, libaout.h, libbfd-in.h, srec.c:  Lint.
-
-Fri Oct  9 03:46:37 1992  John Gilmore  (gnu@cygnus.com)
-
-	* configure.host:  New file, contains mapping of host configs
-	to host support file names for bfd, binutils, opcodes.
-	* configure.in:  Use it.
-	* i386aout.c:  Cleanup, dump TARGET_IS_LITTLE_ENDIAN_P.
-	* i386bsd.c:  Cleanup, reformat.
-	* config/i386-bsd.mt:  Comment changes.
-	* config/i386bsd.mh:  New file for core file support.
-	* hosts/i386bsd.h:  Merge changes from Peter Schauer.
-	* bout.c (ALIGN):  Rename to ALIGNER, since system header files
-	on BSD 4.4 define ALIGN (sigh!).
-
-Thu Oct  8 22:18:10 1992  Mark Eichin  (eichin at tweedledumber.cygnus.com)
-
-	* libaout.h (aout_backend_data): added exec_header_not_counted
-	field. For ZMAGIC files only, when text_includes_header is set, by
-	default the length of the exec header is counted in the text
-	section size. For go32, exec header is mapped in but does *not*
-	contribute to the size of section.
-	* aoutx.h (aout_adjust_sizes_and_vmas): if exec_header_not_counted
-	is not set, but ztih is, add the size of the exec header to the
-	recorded size of the text section.
-	* aoutf1.h (sunos4_aout_backend): clear exec_header_not_counted.
-	* i386aout.c (i386aout_backend_data): set exec_header_not_counted.
-	Also set text_includes_header.
-	* aout-target.h (*_backend_data): cleare exec_header_not_counted
-	by default in MY(backend_data).
-
-Thu Oct  8 18:12:49 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* aout-target.h (callback): Don't define this function if it won't be
-	used.
-
-	* aoutx.h (some_aout_object_p): Restore old aout_data value if this
-	type doesn't match.  Don't lose if file sections have already been
-	created.
-	(set_arch_mach): Set reloc_entry_size.
-	(slurp_symbol_table): Use bfd_h_get_{16,8} for reaeding symbol data.
-
-	* hosts/i386bsd.h: New file.
-	* configure.in: Recognize i[34]86-*-bsd host.
-
-	* aout-target.h (callback, write_object_contents): Delete unused
-	variables.
-
-	* aoutx.h (reloc_type_lookup): New function.
-	* aout-target.h (MY_reloc_howto_type_lookup): Use it as default.
-	* aoutf1.h (sunos4_reloc_type_lookup): Deleted.
-	(MY_reloc_howto_type_lookup): Don't define it.
-
-	* aoutx.h (adjust_sizes_and_vmas): Don't bother with padding for
-	OMAGIC files.
-	(slurp_symbol_table): Use header byte order, not target byte
-	order, for reading symbol data.
-
-Thu Oct  8 17:33:39 1992  John Gilmore  (gnu@cygnus.com)
-
-	* configure.in:  Undo some brain damage in the host section.
-	* configure.in:  Reformat the target section, test many configs.
-	* Makefile.in (make):  Remove obsolete `make make'.
-	* aoutx.h (some_aout_object_p):  Make defines line up.
-
-Thu Oct  8 08:52:48 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	Now a bfd knows whether underscores are normally prepended
-	to symbols in its file format.
-
-	* aout-adobe.c, aout-target.h, bout.c, coff-a29k.c, coff-h8300.c,
-	coff-z8k.c: targets set so they have leading underscore
-	* coff-i386.c, coff-i960.c, coff-m68k.c, coff-mips.c, coff-m88k.c,
-	coff-rs6000.c, coff-we32k.c, elf.c, ieee.c, srec.c: targets set
-	without leading underscore flag
-	* targets.c: add symbol leading char to xvec description
-	* bfd-in.h (bfd_get_symbol_leading_char): new macro.
-
-Mon Oct  5 14:32:55 1992  Per Bothner  (bothner@cygnus.com)
-
-	* archive.c:  Make errno global.
-	* archive.c (_bfd_write_archive_contents):  If read fails (and
-	errno!=0) set bfd_error to malformed_archive (since this probably
-	indicates a truncated archive), rather than system_call_error.
-
-Mon Oct  5 03:33:39 1992  Mark Eichin  (eichin at tweedledumber.cygnus.com)
-
-	* Makefile.in: added rules for i386bsd.c
-	* i386bsd.c: new file, supporting 386bsd.
-	* configure.in: recognize i386-*-bsd target.
-	* config/i386-bsd.mt: new file - 386bsd target configuration.
-
-Thu Oct  1 17:51:07 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* configure.in: re-arrange host section to use *-*-* notation,
-	clean up some of the target section as well
-
-	* seclet.c: cast result of bfd_get_relocated_section_contents to
-	avoid compiler warnings
-
-Tue Sep 29 13:24:09 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* coffcode.h (coff_section_symbol): Create section if it doesn't
-	already exist.
-
-	* bout.c: Removed some unused variables.
-
-Tue Sep 29 08:30:21 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* Portability fixes from p3:
-	coffcode.h (coff_write_relocs): removed sanity check until it
-	works on all targets (per advice from sac).
-	config/hp9000.mh: new file to define USG.
-	hppa.c: #undef hppa before the JUMP_TABLE.
-	hosts/hppahpux.h: #define NATIVE_HPPAHPUX_COMPILER if not
-	__STDC__.
-	targets.c (bfd_target_list): if NATIVE_HPPAHPUX_COMPILER, make
-	local variable target volatile to avoid mysterious bug in
-	HP9000/700 cc.
-
-Sat Sep 26 03:58:49 1992  John Gilmore  (gnu@cygnus.com)
-
-	* config/hppabsd.mh, config.hppahpux.mh:  Remove various bogosity.
-	* hosts/hppahpux.h:  Remove bcopy and index circumventions.
-
-Fri Sep 25 22:36:52 1992  John Gilmore  (gnu@cygnus.com)
-
-	* coff-z8k.c (func_da, func_jr):  Lint.
-	* coffcode.h:  Use memset rather than bzero.
-	* elf.c:  Use memcpy rather than bcopy.
-	* tekhex.c:  Use memset rather than bzero.
-
-Fri Sep 25 19:14:48 1992  John Gilmore  (gnu@cygnus.com)
-
-	Add Adobe a.out support.
-
-	* aout-adobe.c:  New file.  So far, only reads a.out.adobe.  FIXME.
-	* config/adobe.mt:  Add.
-	* configure.in (*-adobe-* target):  Add.
-	* targets.c (a_out_adobe_vec):  Add.
-	* Makefile.in:  add aout-adobe.c.
-
-	* configure.in:  Put two dashes in all entries to be matched.
-	Add comments to remind people to do this.
-	Reorder all entries that match manufacturer names, to occur
-	last, so they will only be matched if no more specific match
-	occurs.  Remove manufacturers `aout', `bout', `coff', and `elf'.
-
-Fri Sep 25 15:03:22 1992  Brendan Kehoe  (brendan@rtl.cygnus.com)
-
-	* elf.c (section_from_elf_index): Return bfd_abs_section, not 0,
-	since we should never have a NULL section.
-	(elf_slurp_symbol_table): If st_shndx doesn't match any of our
-	tests, set the section to bfd_abs_section.
-
-Fri Sep 25 11:11:57 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-z8k.c: getting closer
-	* coffcode.h (coff_get_relocated_section_contents): allow
-	EXTRA_CASES hooks for different arches to provide different reloc
-	types.
-	* seclet.h: #ifndef around it to allow multiple inclusion
-	* srec.c: minor doc fix
-
-Mon Sep 21 14:33:58 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* hosts/hp9000.h, hosts/irix3.h: changes from WRS.
-
-Sun Sep 20 08:48:25 1992  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in:  Use i386-elf for all i386/i486 sysv4 hosts, not
-	just ncr.
-
-Thu Sep 17 06:40:46 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* bout.c (b_out_slurp_reloc_table): Clear howto field before
-	filling in reloc, in case immediately following code doesn't set
-	it.
-
-Fri Sep 11 15:37:06 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coffcode.h (coff_renumber_symbols): set the last renumbered
-	symbol pointer to NULL, as expected by coff_write_linenumbers.
-	(coff_write_relocs): apparently a non-zero addend is OK for reloc
-	type R_IHCONST used on the 29k.
-
-Thu Sep 10 13:28:24 1992  John Gilmore  (gnu@cygnus.com)
-
-	* opncls.c (bfd_fdopenr):  Determine whether to fdopen for
-	update, based on how the underlying file was opened.  Obsoletes
-	FASCIST_FDOPEN.
-	* hosts/rs6000.h, hosts/tahoe.h, hosts/vaxbsd.h:  Remove
-	all FASCIST_FDOPEN config defines.
-
-Tue Sep  8 21:37:58 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* sparc-opc.c: Moved to opcodes library, now that we have one.
-	* Makefile: Don't compile it.
-
-Tue Sep  8 10:10:34 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* aoutx.h: adjust_sizes_and_vmas did not return anything.
-
-Thu Sep  3 19:29:04 1992  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* section.c (bfd_set_section_flags):  Remove a sanity check.
-	It is unfortunately broken, and prevents strip from working.
-
-Thu Sep  3 16:14:40 1992  Jim Wilson  (wilson@sphagnum.cygnus.com)
-
-	* sparc-opc.c (condr): Remove extraneous, but harmless, backlash
-	created by last change.
-
-Thu Sep  3 13:52:38 1992  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* reloc.c (reloc_howto_struct):  Make size field be unsigned.
-	* bfd-in.h:  Bump to version 2.0.
-
-Thu Sep  3 09:05:37 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* bout.c, cpu-z8k.c:  Use enums when initializing structs to keep
-	braindamaged HP/Apollo compiler happy.
-
-Wed Sep  2 02:53:29 1992  John Gilmore  (gnu@cygnus.com)
-
-	* format.c:  Fix description of search for matching target.
-	* aoutx.h (some_aout_object_p):  Set SEC_CODE and SEC_DATA.
-	* targets.c:  Update description of search for matching target.
-	* Makefile.in (do_clean, clean):  Fix infant mortality typo.
-	(docdir):  Set to ./doc, not ${srcdir}/doc, which has no makefile.
-	(z8k and we32k files):  `*.o: *.c': avoid Sun Make bug.
-
-Wed Sep  2 00:26:32 1992  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* Makefile.in:  Added mostlyclean/clean/distclean rules.
-
-Tue Sep  1 13:38:40 1992  Per Bothner  (bothner@cygnus.com)
-
-	* targets.c (target_vector):  Take out oasys (unless that is
-	the default):  Because there is no magic number in archives,
-	there can be annoying target mis-matches.
-
-Mon Aug 31 10:11:37 1992  Jim Wilson  (wilson@sphagnum.cygnus.com)
-
-	* sparc-opc.c: Rigorously updated to match architecture manual.
-
-Mon Aug 31 08:07:58 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* aoutx.h (aout<n>swap_ext_reloc_out), bout.c
-	(b_out_squirt_out_relocs): fix bug 1506 where abs symbols attached
-	to the built-in abs_section were not written out correctly.
-
-Fri Aug 28 16:29:15 1992  Ian Lance Taylor  (ian@cygnus.com)
-
-	* archive.c (bfd_slurp_bsd_armap): if the symdef_count is too
-	large, assume we're using a swapped byte order and fail with
-	wrong_format rather than dumping core.
-
-Fri Aug 28 15:38:03 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* Renamed opc-sparc.c to sparc-opc.c for systems with short
-	filename constraints.
-	* Makefile.in: Updated to reflect change.
-
-Thu Aug 27 13:05:28 1992  Brendan Kehoe  (brendan@cygnus.com)
-
-	Add preliminary support for the we32k:
-
-	* Makefile.in, archures.c, coffocode.h, configure.in, targets.c:
-	Minor edits.
-	* coff-we32k.c, cpu-we32k.c, config/we32k.mt, hosts/we32k.h: New files.
-
-Wed Aug 26 14:20:16 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* bout.c: added support for relaxable alignment relocs.
-
-	* seclet.c (rel, seclet_dump_seclet, seclet_dump): get the app to
-	pass down pointer to play area rather than use alloca
-
-	* cpu-z8k.c (compatible): made static to reduce name space
-	polution.
-
-Tue Aug 25 08:39:10 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-        Add basic support for the z8k:
-
-	* Makefile.in, archures.c, coffcode.h, configure.in, reloc.c,
-	section.c, targets.c,
-
-	* syms.c: move mis-inserted patch.
-
-Fri Aug 14 15:39:29 PDT 1992  Howard Chu  (hyc@hanauma.jpl.nasa.gov)
-
-	Documentation fixes:
-	* ctors.c, format.c, section.c, reloc.c: append " -" to item tags.
-	* reloc.c, section.c, syms.c, targets.c: add DOCDD before @node
-		comments.
-	* reloc.c: break out addend item from surrounding text.
-
-	* doc.str (DOCDD): Defined. Adds text to output.
-	(bodytext): Put bulletize before kill_bogus_lines.
-	* chew.c (bulletize): End itemization after a blank line, to
-	prevent following text from being swallowed up in an item.
-
-Mon Aug 24 20:50:22 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* configure.in:  Add sparclite as a target.
-
-Mon Aug 24 12:06:31 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* ieee.c (ieee_get_symtab): always null terminate the symbol list,
-	lint.
-
-	* coffcode.h (coff_add_missing_symbols): if symbols don't come
-	from a coff file (csym is null), dont deref them
-
-	* ieee.c (parse_expression): get the answer right when adding an
-	abs+(sec+off), (ieee_generic_stat_arch_elt): call ieee_object_p
-	on elts so that filename is filled in.
-
-Thu Aug 20 19:05:48 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* bout.c (howto_align_table): New set of relocs, with enough
-	data for "objdump -r" to work.
-	(b_out_reloc_type_lookup): Recognize alignment relocs.
-
-Tue Aug 18 12:57:45 1992  Ian Lance Taylor  (ian@cygnus.com)
-
- 	* Makefile.in: added FLAGS_TO_PASS, and used it for all recursive
-	invocations of make.  Also, always create installation
-	directories.
-
-	* config/apollov68.mh: removed -g from CC definition.
-
-Mon Aug 17 13:40:08 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* config/decstation.mh (HDEFINES): Specify "-G 4" to avoid
-	overflowing gp-offset range.
-
-Mon Aug 17 11:44:28 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* srec.c (srec_set_section_contents): don't write out sections
-	without the LOAD and ALLOC attributes
-
-Mon Aug 17 11:55:07 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* archures.c, cpu-m68k.c, cpu-sparc.c: Undo 16 June changes.
-	* libaout.h (struct aout_backend_data): New callback "set_sizes".
-	* aout-target.h (callback): Don't set page/seg sizes.
-	(mkobject): Ditto.
-	(set_sizes): New routine.
-	(backend_data): Point to it.
-	* aoutf1.h (sunos4_set_sizes): Heed architecture when setting sizes.
-	(sunos4_aout_backend): Point to it.
-	* aoutx.h (set_arch_mach): Call set_sizes callback.
-
-Fri Aug 14 19:22:18 1992  Per Bothner  (bothner@cygnus.com)
-
-	* aout-target.h:  Make _bfd_slurp_extended_name_table be
-	the default.  Given that we *write* the suckers (for long
-	archive member names), we really ought to be able to read them!
-	* trad-core.c:  Don't include <machine/reg.h>.  It doesn't
-	seem to be needed, and many machines don't have it.
-
-Thu Aug 13 09:53:39 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-m68k.c (vector): read and write archives in coff format.
-
-Tue Aug 11 12:19:42 1992  Ken Raeburn  (raeburn@cygnus.com)
-
-	* opc-sparc.c: New file.
-
-Sat Aug  8 23:15:35 1992  Fred Fish  (fnf@cygnus.com)
-
-	* bout.c (bfd_reloc_status_type, callj_callback):  Cast void*
-	pointers to bfd_byte* before performing arithmetic on them.  Such
-	use with bare void* pointers is a gcc extension.
-	* cache.c (bfd_cache_delete):  Forward decl with prototype form.
-	* archive (normalize):  Add to CONST to match actual usages with
-	CONST.
-
-Mon Aug  3 00:35:29 1992  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in:  Recognize i486 host cpu, and use i386-elf
-	for i486-ncr-sysv4.
-
-Sat Aug  1 13:49:59 1992  Fred Fish  (fnf@cygnus.com)
-
-	* config/stratus.mt (CC):  Remove definition.
-	* elf.c (bfd_section_from_shdr):  Test for the possibility that
-	section_from_elf_index returns NULL and don't dereference it.
-
-Mon Jul 20 02:46:09 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
-
-	* add hppa_data to bfd tdata (indirectly via sef).
-
-	* config/hppahpux.mh: hpux is -DUSG (patch by sef)
-
-Sat Jul 18 15:50:11 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* configure.in: error messages to stderr, not stdout
-
-Fri Jul 17 18:32:46 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* bfd.c, cache.c, coff-a29k.c, coff-i386.c, coff-i960.c,
-	  coff-m68k.c, coff-m88k.c, demo64.c, libaout.h, libbfd.c,
-	  oasys.c, opncls.c, sunos.c, targets.c: removed rcsid's.
-
-Fri Jul 17 17:06:56 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* configure.in: recognize hppa* instead of hppa
-
-Thu Jul 16 16:39:25 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-m68k.c: added R_RELLONG_NEG reloc type, and changed
-	RTYPE2HOWTO to cope with same.
-	* reloc.c (bfd_perform_relocation): added support for size of -2
-	(subtract a word reloc type). Updated doc.
-
-Thu Jul 16 16:28:09 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* Makefile.in: merged changes from progressive, removed rcsid.
-
-	* archures.c, archive.c, Makefile.dos: removed rcsid.
-
-Thu Jul 16 08:08:25 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* bfd-in.h : add BFD_IS_RELAXABLE flag
-	* bout.c (bout_swap_exec_header_[in_out]): new field in exec
-	header e_relaxable, major hackery in callbacks
-	* libaout.h : add space for a_relaxable.
-	* seclet.c (rel): don't relax empty sections
-
-
-Wed Jul 15 07:57:46 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* section.c (STD_SECTION): add some casts to the initializers for
-	dumb compilers
-
-Tue Jul 14 14:06:28 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* rs6000-core.c (rs6000coff_core_p):  Greatly simplify expression,
-	and add appropriate casts to keep (picayune) aix-cc happy.
-
-Mon Jul 13 05:06:51 1992  John Gilmore  (gnu at cygnus.com)
-
-	* elf.c (elf_slurp_symbol_table):  Now 2nd arg is where to write
-	symbol pointers.  Punt expensive & useless bfd_realloc.  Use
-	malloc for raw symbols, and free it before returning.
-	(bfd_section_from_shdr):  Do not slurp symbol table until politely
-	asked. 	Do not even slurp string tables.
-	(elf_get_symtab_upper_bound):  Count 'em without reading them.
-	(elf_get_symtab):  This is how to politely ask.  Schlurp!
-	This should probably just *become* elf_slurp_symbol_table, FIXME.
-
-Wed Jul  8 16:24:33 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* archive.c (bsd_write_armap): write the timestamp of the
-	archive header to be just a little bit later than the timestamp of
-	the file, otherwise the linker will complain that the index is
-	out of date.
-
-Tue Jul  7 00:23:23 1992  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in: Add m68k-ericsson-*.
-
-Sat Jul  4 03:29:41 1992  John Gilmore  (gnu at cygnus.com)
-
-	* syms.h:  Define BSF_FILE, update BSF_SECTION_SYM desc.
-	* elf.c:  Remove unconditional debug printf's.
-	(elf_write_object_contents, elf_slurp_symbol_table):  Handle
-	BSF_SECTION_SYM <=> STT_SECTION, BSF_FILE <=> STT_FILE.
-	(elf_slurp_symbol_table):  Hand out symbols in forward, not
-	reverse order.  Simplify duplicate code.
-
-Fri Jul  3 20:23:34 1992  Fred Fish  (fnf@cygnus.com)
-
-	* elf.c:  Remove "(void)" casts from function calls where the
-	return value is ignored, in accordance with GNU coding standards.
-
-Tue Jun 30 16:49:12 1992  Fred Fish  (fnf@cygnus.com)
-
-	* hppa.c:  Apply John's standard fix to avoid "empty translation
-	unit" warnings from some ANSI-C compilers.
-
-Thu Jun 25 04:39:25 1992  John Gilmore  (gnu at cygnus.com)
-
-	* hosts/solaris2.h:  Configure same as sysv4.
-
-Tue Jun 23 21:54:44 1992  Fred Fish  (fnf@cygnus.com)
-
-	* libbfd.h, libbfd-in.h (bfd_seek):  Make prototype match definition.
-	* reloc.c (bfd_default_reloc_type_lookup):  Make cast on return
-	type match actual return type.
-	* elf_print_symbol (section_name):  Make CONST.
-
-Mon Jun 22 17:35:24 1992  Per Bothner  (bothner@cygnus.com)
-
-	* i386linux.c, hosts/i386linux.h, config/i386-linux.mt:
-	New files, for Linux (a free Unix clone for 386 machines).
-	* Makefile.in, configure.in, targets.c:  Update accordingly.
-
-Fri Jun 19 20:23:21 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-	Lints for bfd_reloc_code_type->bfd_reloc_code_real_type, and
-	correct calling of howto special functions and fixes from Raeburn
-	for gas<>bfdness
-	* archures.c: nuke bfd_reloc_code_type
-	* bout.c, cpu-h8300.c, coff-i960.c, coff-m88k.c: special function lint
-	* coffcode.h (styp_to_sec_flags): STYP_INFO is marked as
-	SEC_NEVER_LOAD, various other bfdgas newness
-	* reloc.c->libbfd.h: change protype of bfd_default_reloc_type_lookup
-	* targets.c: change jump table vector to above
-
-
-Fri Jun 19 19:00:45 1992  John Gilmore  (gnu at cygnus.com)
-
-	* elf.c (bfd_elf_find_section):  Mark as INTERNAL_FUNCTION so
-	its prototype will be included in libbfd.h.  Change result type
-	to struct * (rather than equivalent typedef) so it can be used in
-	the prototype, where they typedef won't be known.
-	* libbfd.h:  Updated version.
-
-Fri Jun 19 15:21:56 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* Makefile.in, archures.c, configure.in, cpu-hppa.c, hppa.c, libhppa.h,
-	targets.c:  HPPA merge.
-
-Fri Jun 19 12:21:38 1992  John Gilmore  (gnu at cygnus.com)
-
-	* configure.in:  Separate Solaris2 from SYSV4 on SPARC.
-	* config/solaris2.mh:  Kludge around Sun compiler bug.
-
-Wed Jun 17 14:02:46 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* libaout.h (aout_backend_data):  Change defs of two bitfields to
-	be unsigned chars instead to get around rs6000 compiler problem.
-
-Wed Jun 17 13:55:31 1992  Fred Fish  (fnf@cygnus.com)
-
-	* elf.c (bfd_section_from_shdr, elf_slurp_symbol_table):
-	Correct misconception that there can be only one symbol table.
-	Only call elf_slurp_symbol_table on the full symbol table, not
-	the dynamic one which is only a subset of the full one.
-
-Wed Jun 17 15:54:57 1992  Ken Raeburn  (Raeburn@Cygnus.COM)
-
-	* coffcode.h (coff_compute_section_file_positions): For I960,
-	don't align sections in file.
-
-Tue Jun 16 06:28:21 1992  Ken Raeburn  (Raeburn@Cygnus.COM)
-
-	* targets.c (struct bfd_target): Added field for target-specific
-	(but not file-specific) data, for distinguishing minor
-	characteristics between (e.g.) a.out formats.
-
-	* section.c (struct sec): New field user_set_vma indicates vma
-	field should be heeded, not assumed to be unset.
-	(STD_SECTION): Initialize that field of standard sections to zero.
-	* bfd-in.h (bfd_set_section_vma): Set user_set_vma to true.
-
-	* coffcode.h (coff_write_relocs): Write out swapped reloc, not
-	pre-swapped version.
-
-	* archures.c (struct bfd_arch_info): Fixed order of comment and
-	field decl.  New fields indicate size of page and segment for
-	architecture.
-	* cpu-m68k.c (N): Fill in values.
-	* cpu-sparc.c (arch_info_struct): Ditto.
-
-	* libaout.h (struct aout_backend_data): Various bits of data (not
-	all used currently) with characteristics of a.out implementation.
-	Important field for now is text_includes_header, indicating that
-	the text section starts immediately after the file header, which
-	gets mapped in with it.
-	(struct aout_data): New fields indicate whether vma has been
-	adjusted yet (not yet used), and what magic number will be used in
-	the output file (should go away in favor of vma_adjusted).
-	(WRITE_HEADERS): Code for dealing with section sizes and related
-	header fields replaced with call to adjust_sizes_and_vmas.
-	* aoutx.h (some_aout_object_p): Fill in magic number field.
-	Set WP_TEXT flag for ZMAGIC as well as NMAGIC files.
-	(set_arch_mach): Set page size and segment size once CPU
-	type is known.
-	(adjust_sizes_and_vmas): New function; has much code moved
-	from set_section_contents and WRITE_HEADERS.  Sets or adjusts vma
-	and size parameters, as well as many header fields, after deciding
-	on magic number for output file.  Checks to ensure that this
-	adjustment has only been done once.
-	(set_section_contents): Call adjust_sizes_and_vmas instead of
-	doing much of the work here.
-
-	* aout-target.h (MY_make_debug_symbol, MY_backend_data): Provide
-	default (null) values of these fields.
-	* aoutf1.h (sunos4_write_object_contents): Don't override a_text
-	value in exec header.
-	(sunos4_aout_backend, MY_backend_data): Define backend data
-	indicating file header is included in text section.
-
-	* aoutf1.h (MY_reloc_howto_type_lookup): Fix typo.
-
-	* hosts/sparc.h (abort, exit): Hide these names if compiling with
-	gcc version 2, to avoid warnings.
-
-Mon Jun 15 12:26:56 1992  Fred Fish  (fnf@cygnus.com)
-
-	* config/ncr3000.mh (INSTALL, RANLIB):  Don't use /usr/ucb/install,
-	it's broken on ncr 3000's.  Use simple "true" for RANLIB.
-
-Sat Jun 13 09:16:43 1992  Michael Tiemann  (tiemann@rtl.cygnus.com)
-
-	* configure.in (m680[01234]0-wrs-*): Fix typo in match pattern.
-
-Fri Jun 12 19:48:34 1992  John Gilmore  (gnu at cygnus.com)
-
-	* section.c (STD_SECTION):  Remove extra semicolon in declarations.
-	* configure.in:  Rewrite target parsing to use simple format.
-	Handle sparc-sun-solaris2 configuration.
-	* aout64.h:  Avoid ANSI C brain death warning.
-	* elf.c:  Avoid trigraph (???) or /* in comments.
-
-Fri Jun 12 14:51:14 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* config/sysv4.mh: new file, RANLIB=echo
-
-	* configure.in: handle Solaris2 as -sysv4 or -solaris2
-
-Thu Jun 11 00:52:03 1992  John Gilmore  (gnu at cygnus.com)
-
-	* elf.c (elf_obj_tdata):  Merge elf_obj_tdata_struct and
-	elf_core_tdata_struct into a single common struct.  Core files
-	wouldn't have worked at all without this.
-	(bfd_elf_find_section):  New function for GDB's undercover use
-	to find string sections that BFD hides from it.
-	(elf_get_str_section):  Avoid multiple alloc&reads for same data;
-	lint.
-	(elf_object_p, elf_core_file_p):  Allocate internal file header
-	storage dynamically.
-	* bfd.c (union {...} tdata):  Remove elf_core_tdata_struct.
-	* demo64.c:  Prevent "empty translation unit" warnings from idiots.
-
-Tue Jun  9 17:15:26 1992  Fred Fish  (fnf at cygnus.com)
-
-	* config/{i386v4.mh, ncr3000.mh}:  Update RANLIB, add INSTALL.
-
-Sat Jun  6 17:02:51 1992  John Gilmore  (gnu at cygnus.com)
-
-	* configure.in:  Handle Solaris2 as *-sun-sysv4 or as *-sun-sunos5.
-
-Sun May 31 05:45:00 1992  david d `zoo' zuhn (zoo@cygnus.com)
-
-	* configure.in: handle m680[01234]0 as aliases for m68k
-
-Tue May 26 16:50:59 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-a29k.c: do byte relocs correctly
-	* coffcode.h (styp_to_sec_flags): never load INFO sections
-	* seclet.c (rel): don't relocate INFO sections
-
-Wed May 20 08:18:18 1992  Ken Raeburn  (Raeburn@Cygnus.COM)
-
-	* section.c (bfd_*_symbol, bfd_*_section): Initialize statically.
-	Make the symbols unmodifiable.
-	(bfd_section_init): Deleted.
-	* init.c (bfd_init): Don't call bfd_section_init.
-
-	* section.c (bfd_set_section_contents): Ensure that range to be
-	written is within section boundaries.
-	(bfd_get_section_contents): Likewise.  Don't bother dispatching if
-	size is zero.
-
-	* libbfd.c (bfd_xmalloc): Text of error message should be const.
-
-	* coff-i960.c (howto_table): Deleted.
-	(howto_rellong, howto_iprmed, howto_optcall): New vars;
-	interesting entries from old howto_table.
-	(RTYPE2HOWTO): Adjusted to use switch.
-	(coff_i960_reloc_type_lookup): New function.
-
-	* coffcode.h (coff_new_section_hook): Allocate storage for aux
-	records for section symbol.
-	(make_abs_section): Unused; deleted.
-	(renumber_symbols): Re-order symbols so undefined symbols come
-	last, as COFF format desires.
-	(coff_write_symbol): Put C_FILE symbols in debug section always.
-	(coff_section_symbol): New function; creates a symbol with the
-	same name as a section, and sets up aux records for it.
-	(coff_add_missing_symbols): New function; adds section symbols to
-	symbol table if they aren't there already.  Should someday also
-	add a dummy C_FILE symbol if none is present.
-	(coff_write_object_contents): Add missing symbols before preparing
-	symbol table to be written.
-	(coff_slurp_reloc_table): Verify that symbol indices read in are
-	in a reasonable range.
-	* libcoff-in.h (struct coff_tdata): New field conv_table_size.
-	(obj_conv_table_size): Accessor macro.
-
-	* bout.c (b_out_reloc_type_lookup): New function.  Handles three
-	reloc types on i960.
-
-	* bfd-in.h (bfd_get_section_name): New macro.  Like
-	bfd_section_name, but returns rvalue, not lvalue.
-	(bfd_get_section_vma, bfd_get_section_alignment): Similar.
-	(bfd_get_section_flags): Now returns rvalue.
-
-	* reloc.c (enum bfd_reloc_code_real): Add several new values, some
-	general, some specific to sparc or i960.
-
-	* aoutx.h (set_section_contents): Set VMA for each section based
-	on previous section.  If text section VMA doesn't appear to have
-	been set, make a best guess from the type of file.
-
-	* aout-target.h (MY_reloc_howto_type_lookup): Define as zero if
-	not defined.
-	(MY(vec)): Initialize reloc_type_lookup field.
-
-	* aoutx.h (howto_table_*): Export as aout_#_*_howto_table.
-	(bfd_error_trap, bfd_error_vector): Extern, not common.
-
-	* aoutf1.h (sunos4_reloc_type_lookup): New function.  Handles a
-	few types of relocs for sparc; will need enhancement.
-
-	* bout.c (callj_callback): Use DEFUN macro in definition.
-	* coff-i960.c (optcall_callback): Likewise.
-
-	* targets.c (bfd_target): Added fields reloc_type_lookup and
-	_bfd_make_debug_symbol.  Also minor comment changes.
-	* syms.c (bfd_make_debug_symbol): New dispatching macro.
-	* reloc.c (bfd_reloc_type_lookup): Take a BFD ptr as arg rather
-	than arch info, and dispatch with BFD_SEND.  Callers changed.
-	* archures.c (struct bfd_arch_info): Deleted field
-	reloc_type_lookup.
-	* cpu-*.c: Don't initialize that field.
-
-	* bfd-in.h (enum bfd_error): Add new value "bad_value".
-	* bfd.c (bfd_errmsgs): Now const; added entry for bad_value.
-	(bfd_errmsg): Now returns ptr to const.
-	* bfd-in.h (bfd_errmsg): Fix prototype.
-
-	* cache.c (BFD_CACHE_MAX_OPEN): Fix typo in doc.
-	* reloc.c (bfd_generic_relax_section): Ditto.
-
-	* section.c (Section Output doc): Improve description of use of
-	output_section and output_offset.
-
-Tue May 19 23:42:10 1992  D. V. Henkel-Wallace  (gumby@cygnus.com)
-
-	* sco-core.c: new file from net.
-	* aoutx.h (translate_to_native_sym_flags): bugfix from net:
-	  Now we have the hairy linker, it's possible to move symbols from
-	  one section into another.  Actually make that work!
-
-Sat May 16 17:57:59 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* hosts/sun3.h: fix declaration of free.
-
-Tue May 12 14:08:59 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-a29k.c (perform_reloc): fix bug in jmp/call evaluation
-	* coff-h8300.c (reloc_processing): all relocs are relative to
-	section start.
-	* opncls.c: don't use fdopen on DOS systems
-
-	short patches from Glenn Kasten (glenn@ready.com)
-	* target.c: enabled oasys support
-	* oasys.c:  Insert . when UNDERSCORE_HACK is enabled,
-	fix problem where a relocation which crossed a modification byte
-	boundary did not work. Fix problem where a relocation near the end
-	of a data record did not work.
-
-
-Tue May  5 18:11:25 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* archive.c (bfd_slurp_coff_armap): old versions of BFD wrote
-	archvie header string counts the endian way, this heuristic sees
-	how big an archive string to read by trying it one way and if the
-	string table is unreasonably big, trying it the other. *FIXME*.
-	* opncls.c (bfd_fdopenr): can't do fdopens on VMS
-
-Tue May  5 14:18:24 1992  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* bfd-in.h:  Increase version number to 1.97, for consistency
-	with ../binutils.
-	* Makefile.in:  docdir is ./doc, not ${srcdir}/doc.
-
-Mon May  4 11:49:15 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-        * bfd-in.h: bump version to 1.96
-         Major change; changed calling convention for
-	 bfd_get_relocated_section_contents so that caller allocates
-	 memory for section data.
-	* coffcode.h (bfd_coff_get_relocated_section_contents), reloc.c,
-	seclet.c, targets.c, bfd.c: reflect new convention.
-	* coffcode.h (styp_to_sec_flags): if styp_flags is not a special
-	case, then use reasonable default values for SEC_* flags.
-
-Fri May  1 12:58:34 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coffcode.h (coff_write_object_contents): use RELSZ to work out
-	size of output reloc struct.
-	* targets.c, Makefile.in: comment out tekhex for the moment.
-	* ieee.c: if some places where null pointers were used instead of &bfd_abs_section.
-	* configure.in: tandem target is st2000
-	* coff-m68k.c: rename static howto_table to global
-	m68kcoff_howto_table.
-	* bout.c: remove unnecessary abort
-	* coff-a29k.c: various changes to the way relocations work to cope
-	with the "new order" and latent bugs.
-	* coffcode.h: lint
-
-Wed Apr 29 12:37:07 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* aoutx.h (aout_swap_ext_reloc_out, aout_swap_std_reloc_out)
-	bout.c (b_out_squirt_out_relocs): treat abs sumbols the right way.
-	* reloc.c (bfd_perform-relocation): don't relocate refs to
-	absolute symbols if doing a partial link.
-
-Fri Apr 24 07:35:26 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* configure.in:  Add a29k-amd-udi.
-
-Thu Apr 23 18:37:55 1992  Fred Fish  (fnf@cygnus.com)
-
-	* aoutx.h (aout_<bits>_swap_exec_header_in):  Zero out the
-	internal_exec structure before initializing the fields that
-	are used, so that the unused fields are in a known state.
-
-Wed Apr 22 09:36:08 1992  Fred Fish  (fnf@cygnus.com)
-
-	* tekhex.c (struct data_struct):  Convert from typedef that
-	typedefs nothing to a normal structure declaration.
-	* tekhex.c (pass_over):  Prototype args for function that
-	second arg points to.
-
-Mon Apr 20 22:22:51 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* Makefile.in: remove old style staging.  Do not print recursion
-	  lines.
-
-	* Makefile.in: rework CFLAGS so that CFLAGS can be passed from the
-	  Makefile command line.  Remove MINUS_G.  Default CFLAGS to -g.
-	  Pass CFLAGS.
-
-Fri Apr 17 09:15:31 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* bfd.c, Makefile.in: added tekhex
-	* aoutx.h (set_section_contents): pages should be padded to the
-	size of a page, not the size of a segment.
-	* configure.in: added go32 host and i386-aout target.
-	* i386aout.c, libaout.h: now works for go32 target
-	* ieee.c: fix bit rot.
-	* seclet.c: support for padding seclet type.
-
-Wed Apr 15 18:11:58 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* Makefile.in: added .NOEXPORT:
-
-Tue Apr 14 14:34:42 1992  Fred Fish  (fnf@cygnus.com)
-
-	* elf.c (bfd_add_strtab, bfd_add_2_to_strtab):  CONST spreads
-	like ooze.
-	* elf.c (elf_compute_section_file_positions,
-	elf_write_object_contents):  Return boolean, not NULL (which
-	can be void *).
-	* elf.c (bfd_section_from_shdr):  Ifdef-out debugging code.
-	Also ifdef-out code that aborts on unhandled section types.
-
-Fri Apr 10 22:29:18 1992  Fred Fish  (fnf@cygnus.com)
-
-	* configure.in:  Recognize ncr3000 config
-	* Makefile.in (MINUS_G):  Pass on to recursive makes.
-	* hosts/ncr3000.h, config/ncr3000.mh:  Add host config files.
-
-Thu Apr  2 17:42:45 1992  John Gilmore  (gnu at cygnus.com)
-
-	* Makefile.in:  Now that we have sym.h and symconst.h, compile
-	coff-msym.c on all systems.
-	* config/{decstation.mh, irix3.mh, irix4.mh}:  Remove coff-msym.o dep.
-	* coff-msym.c:  Update include files and comments; add weakext bit.
-
-Wed Apr  1 23:16:38 1992  John Gilmore  (gnu at cygnus.com)
-
-	* archive.c, bfd.c, bout.c, coffcode.h, init.c, reloc.c,
-	section.c, srec.c, syms.c, coff-h8300.c:  Lint.
-
-Sun Mar 29 09:37:59 1992  John Gilmore  (gnu at cygnus.com)
-
-	* bout.c, coff-a29k.c, coff-i960.c:  Lint.
-	* configure.in:  Add new host and target configs.
-	* elf.c (bfd_prstatus, bfd_fpregset):  Avoid typename of register
-	structs, which vary; just use member name.
-	(elf_object_p, elf_core_file_p):  Lint, fix comments.
-	* config/sparc-elf.mt, hosts/sysv4.h:  New config files.
-
-Sat Mar 28 13:07:02 1992  Fred Fish  (fnf@cygnus.com)
-
-	* elf.c (elf_object_p, elf_core_file_p):  Fix to use only a single
-	local, disposable, copy of the external form of section header
-	table and program header table entries.
-
-Thu Mar 26 16:59:58 1992  John Gilmore  (gnu at cygnus.com)
-
-	* Makefile.in:  Set MINIMIZE back to 0 for a real release.
-
-Tue Mar 24 15:57:03 1992  K. Richard Pixley  (rich@cygnus.com)
-
-	* configure.in: config/irix4.m[ht], hosts/irix4.h: add support for
-	  irix4.
-
-Mon Mar 23 22:37:34 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* coff-msym.c (ecoff_swap_rfd_in):  remove & for array ref.
-
-Tue Mar 17 14:12:25 1992  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* bout.c (b_out_slurp_reloc_table):  Use BFD_ASSERT macro,
-	not internal bfd_assert function (twice).
-
-Tue Mar 17 10:45:12 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* aout-target.h: change ar_max_namelen to 15 (the right value)
-	* coff-a29k, coffcode.h: more hangovers from the bfd_abs_section
-	change
-
-Mon Mar 16 14:57:22 1992  Steve Chamberlain  (sac@rtl.cygnus.com)
-
-	* archive.c (bfd_generic_archive_p): check for bout archives too.
-	* bout.c: make it work again.
-
-Sat Mar 14 17:30:40 1992  Fred Fish  (fnf@cygnus.com)
-
-	* elf.c (elf_corefile_note):  Call bfd_xmalloc() instead of bare
-	malloc().
-	* reloc.c (bfd_generic_get_relocated_section_contents):  Call
-	bfd_xmalloc() instead of bare malloc().
-
-Fri Mar 13 15:44:37 1992  K. Richard Pixley  (rich@cygnus.com)
-
-	* Makefile.in: pass down MAKEINFO on info.
-
-Fri Mar 13 07:41:13 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* config/mt-<foo> now <foo>.mt, config/mh-<foo> now <foo>.mh.
-	host/h-<foo> now just <foo>.
-	* configure.in: reflect changes
-
-Thu Mar 12 11:15:02 1992  Per Bothner  (bothner@cygnus.com)
-
-	* libbfd-in.h (set_tdata):  Make change of Feb 27 in the
-	actual source file, not just the generated libbfd.h.
-
-Sat Mar  7 10:33:41 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* coff-i960.c (icoff_little_vec): add COFF_SWAP_TABLE so we can run
-	gdb on little-endian 960 code.
-	* archive.c (compute_and_write_armap): indirect symbols should go
-	into the archive header too.
-
-Fri Mar  6 21:55:16 1992  K. Richard Pixley  (rich@cygnus.com)
-
-	* Makefile.in: added check target.
-
-Thu Mar  5 23:51:42 1992  John Gilmore  (gnu at cygnus.com)
-
-	* coff-msym.c:  Move this file from gdb/ecoff.c.  It
-	handles byte-swapping for ECOFF (MIPS symbol) files.
-	* config/mh-decstation, config/mh-irix3:  Add coff-msym.o
-	to the files built on MIPS-based hosts.
-	* Makefile.in:  Add rule for coff-msym.
-
-Thu Mar  5 21:36:05 1992  K. Richard Pixley  (rich@cygnus.com)
-
-	* Makefile.in: added clean-info target.  MINIMIZE=1.
-
-Sun Mar  1 22:32:58 1992  Per Bothner  (bothner@cygnus.com)
-
-	* coff-rs6000.c:  Move core file functions into separate
-	new file rs6000-core.c.  This is needed because reading
-	core files depends on native include files that conflict
-	with ../include/coff/rs6000.h.
-	* config/mh-rs6000:  Add rs6000-core.o to HDEPFILES.
-
-Thu Feb 27 22:19:55 1992  Per Bothner  (bothner@cygnus.com)
-
-	* aoutx.h (NAME(aout,print_symbol)): Don't print
-	symbol addresss for undefined symbols.
-	* coff-rs6000.c:  Various updates (due to target-
-	independent changes).
-	* libbfd.h:  Ditto (tdata field is now a union).
-	* hosts/h-sparc.h:  Removed prototype for bogus function
-	'emset' (presumably should have been 'memset' - which is there).
-
-Thu Feb 27 11:46:33 1992  John Gilmore  (gnu at cygnus.com)
-
-	* configure.in (mips-big-* target):  Same is Iris.
-
-Thu Feb 27 09:24:56 1992  Steve Chamberlain  (sac at thepub.cygnus.com)
-
-	* aoutx.h (translate_from_native_sym_flags): when creating an
-	alias symbol, fill in the section as undefined, rather than
-	leaving it blank. If an output section can't be found for a
-	symbol, then don't core dump.
-
-Wed Feb 26 18:04:40 1992  K. Richard Pixley  (rich@cygnus.com)
-
-	* Makefile.in, configure.in: removed traces of namesubdir,
-	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
-	  copyrights to '92, changed some from Cygnus to FSF.
-
-Wed Feb 26 19:40:59 1992  Steve Chamberlain  (sac at thepub.cygnus.com)
-
-	* bfd.c: lint
-	* coff-h8300.c: fix stupid reloc subtraction bug
-	* coffcode.h (coff_swap_aux_out): only swap a tvndx by 2 bytes,
-	since that's how wide it is. (coff_slurp_symbol_table): always zero out
-	the symbol.flags and done_lineno fields.
-
-Tue Feb 25 14:29:24 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* coffcode.h (coff_write_symbol): write out the correct number of
-	auxents.
-	* cpu-h8300.c: fix disassembly bug
-
-Fri Feb 21 21:39:56 1992  John Gilmore  (gnu at cygnus.com)
-
-	* bfd-in.h (bfd_errmsg), coffcode.h (coff_swap_aux_in,
-	section_from_bfd_index), cpu-h8300.c (howto*_callback),
-	reloc.c, section.c (bfd_map_over_sections), targets.c
-	(bfd_target_list):  Protolint.
-	* libbfd.h:  Update to match a libbfd-in.h from a month ago.
-
-Fri Feb 21 10:57:54 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* coffcode.h (coff_swap_aux_in): lint, (coff_print_symbol): prints
-	out tagndx too.
-	* aoutx.h (swap_std_reloc_out, swap_ext_reloc_out): use the output
-	section of a symbol rather than the section of a reffed symbol to
-	determine the r_index of an emmitted reloc.
-
-Thu Feb 20 18:10:34 1992  Per Bothner  (bothner at cygnus.com)
-
-	* PORTING: New (preliminary) porting guide.
-
-Wed Feb 19 21:39:37 1992  John Gilmore  (gnu at cygnus.com)
-
-	* bout.c (callj_callback), coff-a29k.c (a29k_reloc), coff-m88k.c
-	(howto_hvrt16):  lint.
-
-Mon Feb 17 12:02:17 1992  Per Bothner  (bothner at cygnus.com)
-
-	* hp300bsd.c (new), config/mt-hp300bsd:  Make hp300bsd
-	a full configuration (with possible cross-development),
-	instead of using host-aout.c.
-
-Sun Feb 16 13:01:49 1992  Per Bothner  (bothner at cygnus.com)
-
-	* aout-target.h (MY(write_object_contents):
-	Set obj_reloc_entry_size (abfd).
-	* gen-aout.c:  Change to emit a .c files, not a .h file.
-
-Thu Feb 13 20:11:47 1992  Fred Fish  (fnf at cygnus.com)
-
-	* elf.c (elf_slurp_symbol_table):  Remove obsolete use of
-	BSF_ABSOLUTE and replace with bfd_abs_section reference.
-
-Thu Feb 13 17:22:44 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* coffcode.h (get_normalized_symtab): fixed bug where symbols
-	with more than one auxent can cause nasty core dumps.
-
-	* coffcode.h, libcoff.c: added new fielded to coff_symbol_struct
-	"done_lineno" so that a symbol which appears twice in the symbol
-	table only gets it's linenumbers relocated once. Modifed
-	(coff_write_native_symbol) and (coff_make_empty_symbol) to make
-	use of it.
-
-Tue Feb  4 15:39:55 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* aoutx.h: (translate_from_native_sym_flags): fix constructor
-	stuff to use the New Order.
-
-Fri Jan 31 01:34:45 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* ieee.c:  Change type of envi[] to unsigned char.
-
-	* configure.in:  fix vax ultrix configuration.
-
-	* elf.c (bfd_section_from_shdr):  Deal with null return from
-	bfd_make_section().  (elf_object_p):  Select endianess properly.
-
-Fri Jan 31 01:19:55 1992  John Gilmore  (gnu at cygnus.com)
-
-	* hosts/h-tahoe.h, h-vaxbsd.h:  Fix stack in core files.
-
-Thu Jan 30 23:51:07 1992  John Gilmore  (gnu at cygnus.com)
-
-	* Makefile.in:  host-aout.c doesn't depend on aout-params.h.
-	* aout-target.h:  Use TARGET_BIG_ENDIAN_P to set up vector.
-	* host-aout.c:  Don't use aout-params.h; configure these systems
-	in their xm files, not in a randomly generated file.
-	* hosts/h-hp300bsd.h, h-tahoe.h, h-vaxbsd.h, h-vaxult.h:
-	Specify byte order.
-	* hosts/h-vaxbsd.h:  Define the form of exec and core files.
-
-Thu Jan 30 13:02:41 1992  Per Bothner  (bothner at cygnus.com)
-
-	* config/mt-tahoe, config/mt-vax:  Change DEFAULT_VECTOR to
-	host_aout_vec here as well.
-
-Thu Jan 30 11:41:45 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* host-aout.c:  Change TARGETNAME to "a.out" to be compatible with
-	gdb.  config/mt-hp300bsd:  Change DEFAULT_VECTOR to host_aout_vec
-	to prevent undefined symbol.
-
-Thu Jan 30 07:26:53 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	Various lints found on PersSony
-	* aoutx.h: cast an enum
-	* coff-a29k.c: many ints in reloc structure turned to enum
-	* coffcode.h: more enums
-	* cpu-h8300.c: more enums
-	* opncls.c: more enums
-
-Thu Jan 30 01:19:56 1992  John Gilmore  (gnu at cygnus.com)
-
-	* configure.in:  Make Tahoe configuration work again.
-	* bfd-in.h:  Remove trailing comma from enum declaration.
-	* ieee.c:  Can't put byte values >0x7F into a signed char.
-
-Tue Jan 28 21:10:51 1992  Fred Fish  (fnf at cygnus.com)
-
-	* Makefile.in:  Add dependencies for various coff-*.o files.
-
-	* elf.c:  Remove extraneous paren from core_prpsinfo and
-	core_prpstatus macros, rename core_prpstatus to core_prstatus.
-	Replace references to old section "size" member with new
-	"_raw_size" member.  Implement elf_make_empty_symbol, which
-	is now used.
-
-Tue Jan 28 14:51:40 1992  Stu Grossman  (grossman at cygnus.com)
-
-	* trad-core.c, bfd.c, ../include/bfd.h:  Various fixes for PMAX
-	core reading.
-
-Tue Jan 28 10:46:32 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* coffcode.h (bfd_coff_relax_section): now static.
-	(bfd_coff_get_relocated_section_contents): various type lints.
-
-Mon Jan 27 19:44:08 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	New entry point in the transfer vector - bfd_relax_section.
-
-	* aout-target.h: add to vector, call generic_relax
-	* bfd-in.h: add to vector
-	* bfd.c: add #define for vector
-	* bout.c: add to vector, call generic_relax
-	* coffcode.h: add to vector, also now has coff specific relax code
-	for the relaxable H8/300 relocs. Also clean up abs section cruft.
-	* elf.c: call generic_relax
-	* ieee.c: call new vector, clean up some bugs due to the creation
-	of bfd_abs_section
-	* libbfd.h: add bfd_generic_relax_section EXFUN
-	* oasys.c: call generic_relax
-	* reloc.c: implement generic_relax
-	* seclet.c: moved much of this into coffcode.h
-	* srec.c: call generic_relax
-	* targets.c: define new transfer vector
-
-Fri Jan 24 14:40:17 1992  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* everything: now modified to use smaller reloc type. Self hosts
-	on sun3 & sun4.
-
-Sat Jan 18 17:00:16 1992  Fred Fish  (fnf at cygnus.com)
-
-	* config/mh-stratus, config/mt-i860-elf, hosts/h-stratus:
-	New files for stratus.
-
-	* configure.in:  Add configuration fragments for stratus.
-
-Wed Jan 15 10:02:43 1992  Fred Fish  (fnf at cygnus.com)
-
-	* aoutx.h (NAME(aout,find_nearest_line)): Declare various filename
-	variables as CONST since they are set to point to a const char
-	string.  Fixes compiler complaints.
-
-Fri Jan 10 17:44:53 1992  Fred Fish  (fnf at cygnus.com)
-
-	* hosts/h-amix.h hosts/h-i386v4.h:  Change abort() to a function
-	returning void.
-
-Fri Jan 10 14:33:32 1992  Per Bothner  (bothner at cygnus.com)
-
-	* aoutx.h (NAME(aout,find_nearest_line)):  Recognize N_SOL
-	symbols, so that we can emit the correct file name even
-	if it's an include file.
-
-Thu Jan  2 16:43:34 1992  John Gilmore  (gnu at cygnus.com)
-
-	* coff-i960.c:  Add COFF_SWAP_TABLE to little_vec as well as big_vec.
-	(Reported by john@labtam.labtam.oz.au (John Carey)).
-
-Wed Jan  1 04:23:06 1992  Fred Fish  (fnf at cygnus.com)
-
-	* elf.c:  Change all '#if HAVE_PROCFS' to '#ifdef HAVE_PROCFS'.
-
-	* config/mh-amix, config/mh-i386v4:  Remove HDEFINES that was
-	being used to -DHAVE_PROCFS.
-
-	* hosts/h-amix, hosts/h-i386v4:  Add '#define HAVE_PROCFS'.  Move
-	'#include "fopen-same.h"' to end of file to match other h-* files.
-
-Fri Dec 20 12:06:17 1991  Fred Fish  (fnf at cygnus.com)
-
-	* configure.in:  Change svr4 references to sysv4.  Add case
-	"unknown" for target vendor and infer some targets based
-	on the specified operating system.
-
-Wed Dec 18 17:17:59 1991  Stu Grossman  (grossman at cygnus.com)
-
-	* bfd-in.h, libaout.h:  ANSIfy enums.
-
-Wed Dec 18 16:12:25 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* archive.c (normalize): created version for VMS which removes the
-	VMS directory crap from the front and end of a filename, eg turn
-	[-.foo]bar.obj;123 into bar.obj
-	(bfd_construct_extended_name_table): now writes index into an
-	extended name table in decimal - the same base used to read an
-	extended name table.
-
-Wed Dec 18 14:40:39 1991  Per Bothner  (bothner at cygnus.com)
-
-	* aout-encap.c:  Fix to use aout-target.h.
-	* aoutf1.h:  Use standard MY_object_p and MY_callback
-	in aout-target.h.  Remove target-specific versions.
-	* host-aout.c:  Re-write to use aout-target.h.
-	* gen-aout.c:  New files use with host-aout.c to generate
-	host-specific a.out-related parameters.
-	* Makefile.in:  host-aout.o depends on aout-params.h, which is
-	generated by gen-aout.
-	* aout-target.h:  Make a little more flexible.
-	* libaout.h, aout-target.h:  Removed WORK_OUT_FILE_POSTIONS
-	macro.  Instead, inline it in aout-target.h.
-	* newsos3.c:  Define N_SHARED_LIB(x) as 0 to avoid
-	a gcc -Wall warning.
-	* archive.c:  Add missing commas in DEFUN macro (2 places).
-	* elf.c, coffcode.h, aoutf1.h:  Use ANSI functions instead of
-	Berkeley ones, now that libiberty has them:
-	bcopy->memcpy, bzero->memset, bcmp->memcmp.
-	* aoutx.h:  Various touch-ups:  Re-formatting, fix a cast,
-	remove unused variable.
-
-Tue Dec 17 19:48:59 1991  Fred Fish  (fnf at cygnus.com)
-
-	* elf.c (elf_core_file_matches_executable_p):  Enclose corename
-	and execname inside HAVE_PROCFS ifdef since they are unused
-	when it is not defined.
-
-Mon Dec 16 12:00:10 1991  Fred Fish  (fnf at cygnus.com)
-
-	* elf.c:  Flag all sections as either code or data.  We can't
-	be sure what they are anyway, since ELF doesn't fit the
-	traditional model of text+data+bss very well.  Add new local
-	function elf_read() to simplify code.  Record entry point in
-	the bfd structure.
-
-Thu Dec 12 21:01:22 1991  John Gilmore  (gnu at cygnus.com)
-
-	* hosts/h-*.h:  Configure fopen using ../include/fopen-*.h
-	rather than N copies of the same lines.
-
-Wed Dec 11 16:39:45 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* cpu-h8300.c: disassemble branch displacements correctly
-	* coff-h8300.c: put reloc offsets out in 32bits
-
-	* makefile.dos, configdj.bat: New files from DJ
-	* cache.c: fopen with new macros is needed for DOS.
-	* ieee.c: environ renamed to envi to stop an include file
-	conflict.
-	* opncls.c, coff-rs6000.c: more fopens with macros.
-
-Tue Dec 10 04:07:24 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
-
-	* Makefile.in: infodir belongs in datadir.
-
-Sat Dec  7 16:39:23 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	 * Makefile.in: fix where docdir lives
-
-	 * aoutx.h, archive.c, archures.c, bfd.c, cache.c, coff-m88k.c,
-	 coffcode.h, core.c, ctor.c, elf.c, format.c, ieee.c, init.c,
-	 libbfd.c, libbfd.h, libcoff.h, opncls.c, reloc.c, section.c,
-	 srec.c, syms.c, targets.c : all new documentation and lint
-	 removal.
-
-
-Sat Dec  7 07:22:09 1991  John Gilmore  (gnu at cygnus.com)
-
-	* coffcode.h, srec.c:  Lint.
-
-Fri Dec  6 22:58:48 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
-
-	* Makefile.in: install using INSTALL_DATA, added standards.text
-	  support.
-
-	* configure.in: mark directory as target dependent.  configure
-	  nows works in objdir always so make file existence checks
-	  against ${srcdir}.
-
-Thu Dec  5 22:46:19 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
-
-	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
-	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
-	  and mandir now keyed off datadir by default.
-
-Wed Dec  4 10:14:17 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* aoutf1.h (sunos_<size>_object_p, sunos4_callback): moved the
-	computation of arch and machine type so it's worked out before
-	some_aout_object_p is called.
-	* aoutx.h: (some_aout_object_p): don't set arch and mach to
-	unknown.
-	* archures.c: add extra field 'section_align_power' to hold
-	default section alignment in object files.
-	* cpu-a29k.c, cpu-h8300.c, cpu-i386.c, cpu-i960.c, cpu-m68k.c,
-	cpu-m88k.c, cpu-mips.c, cpu-rs6000.c, cpu-sparc.c, cpu-vax.c:
-	initialize the new field.
-	* bout.c (b_out_callback): replace the text size, since aout
-	fries them.
-	* aoutx.h: Documentation in the new style
-
-Wed Dec  4 02:00:30 1991  John Gilmore  (gnu at cygnus.com)
-
-	* bfd.c (bfd_get_mtime):  Don't cache mtime any more; only
-	use the saved value if mtime_set is already set (intended
-	for archive files, though apparently not used yet).
-
-Tue Dec  3 22:54:50 1991  John Gilmore  (gnu at cygnus.com)
-
-	* targets.c:  Revise comments about how to configure the target
-	vector, to match reality.  Remove mention of obsolete methods.
-	Remove long lists of capitalized macros that turn into the same
-	thing in lowercase.  Normal vector simply lists all known
-	lowercase xvec names; all other cases are handled by SELECT_VECS.
-
-	* config/mt-i386-coff:  Set DEFAULT_VECTOR to real identifier,
-	not macro name.
-
-	* config/mt-i960-{coff,bout}:  Use SELECT_VECS to make a short
-	list of supported targets.
-
-Tue Dec  3 14:06:15 1991  Per Bothner  (bothner at cygnus.com)
-
-	* archive.c (bsd_write_armap):  The pad byte sometimes added to
-	the string table in a __.SYMDEF member is now
-	counted as part of the size of the string table.
-	This is compatible with the old ranlib, as well as Sun's.
-
-Tue Dec  3 10:53:30 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* srec.c: Rewrote to fix many bugs; now gets the record type
-	right, doesn't choke on input, sets the start address in an S9 and
-	fills in the filename on an S0.
-
-Sat Nov 30 21:19:15 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* cpu-h8300.c: Add support for MEMIND addressing mode
-
-	* coff-a29k.c: defined RELOC_PROCESSING to take the #ifdef out of
-	coffcode.h
-	* coffcode.h: use the new macro if available
-
-	* elf.c (elf_corefile_note): cast malloc to avoid warning.
-	* Makefile.in: Fixed dependencies due to file rename
-
-	* aout-encap.c, aoutf1.h, aoutx.h, archive.c, bout.c, coff-a29k.c,
-	coff-h8300.c, coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c,
-	coff-mips.c, coff-rs6000.c, cpu-h300.c, elf.c, i386aout.c,
-	newos3.c, stab-syms.c, syms.c: All these files have had their
-	#includes altered to point to the new places.
-
-Fri Nov 29 20:04:49 1991  Fred Fish  (fnf at cygnus.com)
-
-	* config/mh-i386v4, config/mh-i386-elf, hosts/h-i386v4.h:  New files.
-
-	* configure.in:  Add vendor "ncr" as supported per-target vendor.
-	Add svr4 case for i386 per-host case.
-
-	* elf.c (elf_object_p, elf_core_file_p):  Add missing "break" to
-	ELFDATA2LSB cases.
-
-Fri Nov 29 12:16:51 1991  Per Bothner  (bothner at cygnus.com)
-
-	* syms.c (bfd_decode_symclass):  Return 'A'
-	for symbols that are both absolute and global.
-	* archive.c (bfd_special_undocumented_glue):  Return NULL
-	if bfd_ar_hdr_from_filesystem returns NULL.
-
-Tue Nov 26 09:10:55 1991  Steve Chamberlain  (sac at cygnus.com)
-
-	* Makefile.in: added coff-h8300
-	* configure.in: now h8 is a coff target
-	* cpu-h8300.c: fix various disassembly problems
-	* libcoff.h: took out some code which has been #0ed for a long
-	time.
-	* targets.c: added h8 coff
-	* coff-a29k.c, coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c
-	added new macro RTYPE2HOWTO to take a load of #ifdefs out of
-	coffcode.h
-	* coffcode.h: Started to change the way machine dependencies are
-	handled, from the nest of #ifdefs to macros defined in the
-	including coff-<foo>.c
-
-Fri Nov 22 08:11:42 1991  John Gilmore  (gnu at cygnus.com)
-
-	* aoutx.h (some_aout_object_p):  Set the `executable' bit
-	if the entry point is contained in the text segment, even if the
-	text segment is at location 0.
-
-	* coff-mips.c, coffcode.h:  Peter Schauer's patch to kludge in
-	nonstandard MIPS sections (.rdata, .sdata, etc).
-
-	* aoutx.h, bfd.c, coffcode.h, ieee.c, oasys.c, targets.c: CONST lint.
-	* libbfd-in.h, libbfd.h, aoutx.h, coffcode.h, elf.c, libaout.h:
-	Rename ALIGN to BFD_ALIGN to avoid conflict with BSD <sys/param.h>.
-	* libbfd.c:  Lint.
-	* host-aout.c, trad-core.c:  Fix write_armap prototypes.  Lint.
-
-Thu Nov 21 19:56:40 1991  Per Bothner  (bothner at cygnus.com)
-
-	* stab-syms.c, syms.c:  Moved bfd_stab_name() and bfd_stab_names[]
-	from syms.c to new file stab-syms.c.  Also, since GNU extended
-	type codes such as N_SETT are no longer in ../include/stab.def,
-	include them manually.
-	* stab-syms.c, aoutx.h: Renamed bfd_stab_name() and
-	bfd_stab_names[] to aout_stab_name() and aout_stab_names[].
-	* libaout.h: Added prototype for aout_stab_name().
-	* Makefile.in:  Update Makefile for new stab-syms.[co].
-
-Thu Nov 21 11:50:49 1991  John Gilmore  (gnu at cygnus.com)
-
-	* libaout.h (WORK_OUT_FILE_POSITIONS):  One more try at this
-	rather complicated seeming problem.  Eliminate LOGICAL_ versions,
-	just make N_XXX work by excluding the header from the text segment.
-	* aoutx.h:  Fix comments to match.
-
-Tue Nov 19 18:49:01 1991  Per Bothner  (bothner at cygnus.com)
-
-	* libaout.h (WORK_OUT_FILE_POSITIONS):  Use new LOGICAL_TXTADDR,
-	LOGICAL_TXTOFF, LOGICAL_TXTSIZE macros to figure out numbers
-	for the "logical" text segment (i.e. never consider the exec
-	header to be part of the text segment).  This change is
-	needed for consistency with various other parts of bfd and ld.
-	* aoutx.h (NAME(aout,soe_aout_object_p)):  Fix comment,
-	and move calculation of obj_textsec(abfd)->size to libaout.h.
-	* bfd-in.h:  Removed bogus ';'.
-
-	* Makefile.in:  Add MINIMIZE flag to select lean
-	or bloated target_vector.
-	* targets.c:  Use new MINIMIZE macro, and add trad_core if needed.
-	* newsos3.c:  Fixes to ../include/aout64.h remove need
-	for special N_TXTOFF macro, but require N_HEADER_IN_TEXT.
-
-Mon Nov 18 12:00:59 1991  Per Bothner  (bothner at cygnus.com)
-
-	* aout-target.h, aoutf1.h, newsos3.c:  Make aout-target.h
-	handle both little and big-endian targets, with little
-	the default unless TARGET_IS_BIG_ENDIAN_P is defined.
-	* host-aout.c:  Add FIXME note.
-
-Sun Nov 17 13:29:39 1991  Per Bothner  (bothner at cygnus.com)
-
-	* targets.c:  Make the default target_vector contain
-	just &DEFAULT_VECTOR.  This makes executables a lot smaller.
-	Old behavior can be gotten by defining ALL_TARGETS.
-	* aoutf1.h, demo64.c, i386aout.c, newsos3.c, sunos.c:
-	Factored out common code into new file aout-target.h.
-	Saves a lot of duplicate code for a.out variants.
-
-Fri Nov 15 13:00:43 1991  Per Bothner  (bothner at cygnus.com)
-
-	Get 'make headers' to work when configured with +subdirs.
-	* Makefile.in: Add $(subdir) to docdir path.
-	* doc/Makefile.in (protos): Add $(srcdir) prefix
-	to name of sed scripts.
-
-Thu Nov 14 19:49:10 1991  Per Bothner  (bothner at cygnus.com)
-
-	* aoutx.h (NAME(aout,print_symbol)):  Fix thinko.
-	* syms.c (bfd_stab_names):  Turn on new GNU_EXTRA_STABS macro
-	to include names of N_SETT etc.
-
-Thu Nov 14 19:11:13 1991  Fred Fish  (fnf at cygnus.com)
-
-    	* elf.c:  Add minimal support for ELF symbol tables.  Generates
-	canonical bfd symbol tables from ELF symbol tables.  Change the
-	name of some functions from bfd_<name> to elf_<name>.
-
-	* syms.c:  Trivial fix to comment to remove a redundant "to".
-
-Wed Nov 13 17:02:01 1991  John Gilmore  (gnu at cygnus.com)
-
-	* coff-{i386,m68k,m88k}.c:  Change name of file format to standard
-	form that GDB recognizes as COFF.
-
-Wed Nov 13 09:09:41 1991  Steve Chamberlain  (sac at cygnus.com)
-
-	* ieee.c (ieee_object_p):  cast NULL correctly.
-	* configure.in: added harris host
-
-	* coff-a29k.c: Lots of changes, most from David Wood.
-
-Tue Nov 12 07:21:41 1991  John Gilmore  (gnu at cygnus.com)
-
-	* coff-m88k.c (coff_write_armap):  Just #undef it.
-
-Mon Nov 11 20:30:18 1991  Steve Chamberlain  (sac at cygnus.com)
-
-	* Makefile.in: standardize on MINUS_G to disable debugging
-	* coff-m88k.c: create coff armaps instead of bsd ones.
-	* opncls.c (bfd_close_all_done), (bfd_close): Mask out random bits
-	when calling chmod.
-
-Mon Nov 11 19:07:32 1991  Fred Fish  (fnf at cygnus.com)
-
-	* elf.c:  Additions to support ELF format core files.
-	* config/mh-amix:  Add -DHAVE_PROCFS to HDEFINES, since host
-	has support for /proc (all the include files in particular).
-
-Mon Nov 11 18:36:47 1991  Per Bothner  (bothner at cygnus.com)
-
-	* aoutx.h (NAME(aout,find_nearest_line)):  Handle the case
-	of two N_SO stabs, one for directory, and one for filename.
-
-	* bfd-in.h (print_vma):  Factor out duplicate definition.
-
-	Exit a little more gracefully when malloc returns NULL.
-	* libbfd.c: New function bfd_xmalloc (malloc wrapper).
-	* opncls.c, syms.c, bout.c, aoutx.h:  Replace malloc by bfd_xmalloc.
-	* libbfd.h: Rre-generated due to libbfd.c update.
-
-Sat Nov  9 13:45:01 1991  Fred Fish  (fnf at cygnus.com)
-
-	* config/mt-m68k-elf:  Define DEFAULT_VECTOR as elf_big_vec.
-
-	* elf.c (elf_object_p):  Don't try to create a bfd section for
-	the first ELF section header.  It is just a placeholder.
-
-Sat Nov  9 03:04:26 1991  John Gilmore  (gnu at cygnus.com)
-
-	* coff-rs6000.c, config/mh-rs6000:  Make it work on archive and
-	core files, when compiling native.
-	* hosts/h-rs6000.h:  Define FASCIST_FDOPEN for bfd_fdopenr.
-
-	FIXME:  The aoutf1.h change below needs to be reversed back
-	to the way it was.
-
-Thu Nov  7 11:03:55 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* coffcode.h: Defined new macros [PUT|GET]LINENO_LNNO for
-	manipulation of lnno fields in lineno structs in a coff-<f>.h
-	independent way. Override it in coff-<f>.h to your favourite
-	number if you don't have a 16bit lnno field. (coff_swap_lineno_in)
-	(coff_swap_lineno_out): modified to use the new macros.
-
-Mon Nov  4 11:38:33 1991  Steve Chamberlain  (sac at cygnus.com)
-
-	* aoutf1.h (sunos4_callback): Now defaults to 68020 rather than
-	unknown arch when the magic number doesn't specify the
-	architecture, since some OSs (eg old sun3s) don't set the number, and
-	020 is probably the right answer anyway.
-
-Sun Nov  3 12:07:08 1991  Per Bothner  (bothner at cygnus.com)
-
-	* hosts/h-news.h, hosts/h-rtbsd.h:
-	Get rid of MISSING_VFPRINTF, since libiberty provides one.
-	* bfd-in.h (bfd_print_symbol_type_hopw enum):   Add new option
-	bfd_print_symbol_nm, for use by nm.
-	* aoutx.h (NAME(aout,print_symbol)):  Add code for new
-	bfd_print_symbol_nm option, to print in nm format.
-	* coffcode.h (coff_print_symbol), ieee.c (ieee_print_symbol)
-	oasys.c (oasys_print_symbol):  Provide stub implementations
-	for bfd_print_symbol_nm.
-	* syms.c:  New function bfd_decode_symclass, used by nm printer.
-	New function bfd_stab_name to look up string name of stab code.
-
-Sat Nov  2 14:26:03 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* Makefile.in: Added ctor.c
-	* archures.c (bfd_default_arch_struct) added
-	bfd_default_reloc_type_lookup.
-	* coffcode.h: removed a load of #if 0ed code.
-	(coff_compute_file_section_positions): now works out the section
-	alignment and size correctly in all cases.
-	(coff_get_symtab): looks for constructor symbols and calls the
-	right function when they're found. (coff_canonicalize_reloc):
-	knows when a section is full of constructors and does the right
-	thing.
-	* cpu-m88k.c: Added default_reloc_type lookup to the architecture
-	description.
-	* libbfd-in.h: (bfd_default_reloc_type_lookup) defun  added.
-	* libcoff.h: removed #if 0ed code
-	* reloc.c: (bfd_reloc_code_real_type) added BFD_RELOC_CTOR for
-	arch independent constructor relocation type.
-	(bfd_reloc_type_lookup): removed the comment "this will go away"
-	since it won't. (bfd_howto_32): stolen from 88k, this is a 32bit
-	reloc which is used when BFD_RELOC_CTOR falls through to give a
-	default 32bit reloc for constructors.
-	(bfd_default_reloc_type_lookup): added.
-	* aoutf1.h: fixed SEGMENT_SIZE typo.
-
-Thu Oct 31 18:23:06 1991  John Gilmore  (gnu at cygnus.com)
-
-	* coff-rs6000.c:  Change name to "aixcoff-rs6000", to avoid
-	matching prefix "coff".
-	* coffcode.h (coff_swap_aux_in, coff_swap_aux_out):  Handle
-	rs/6000 csect records.
-
-Sun Oct 27 16:56:58 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* coff-m88k.c, targets.c: change name of m88k_bcs to m88kbcs
-	* configure.in: add motorola delta88 cases
-	* libbfd.h, libbfd-in.h, archive.c, ieee.c, elf.c, srec.c: fix
-	write_armap prototype
-	* libbfd.c: add doc on bfd_write_bigendian_4byte_int
-
-Fri Oct 25 02:48:19 1991  John Gilmore  (gnu at cygnus.com)
-
-	* Rename COFF-related files in `coff-ARCH.c' form.
-	coff-a29k.c, coff-i386.c, coff-i960.c, coff-m68k.c, coff-m88k.c,
-	coff-mips.c, coff-rs6000.c to be exact.
-
-	* Makefile.in:  Only supply TARGET_DEFAULTS to targets.c, reducing
-	make output clutter.
-	* config/mt-*:  Ditto.
-
-Thu Oct 24 22:40:07 1991  John Gilmore  (gnu at cygnus.com)
-
-	RS/6000 support, by Metin G. Ozisik, Mimi Phûông-Thåo Võ, and
-	John Gilmore.  Archive support from Damon A. Permezel.
-
-	* Makefile.in:  Add cpu-rs6000.c and rs6000coff.c.
-	* configure.in:  Add rs6000 case.
-	* targets.c:  Add rs6000 vector.
-	* archures.c:  Add rs6000, fix comment on romp.
-	* bfd-in.h (enum bfd_error):  Add no_debug_section error.
-	* libcoff-in.h (struct coff_tdata):  Remove unused string_table.
-	* bfd.c (bfd_errmsgs):  Add no_debug_section error message.
-	* section.c (bfd_make_section):  Return NULL on attempt to create
-	a section twice.
-	* coffcode.h (bfd_swap_reloc_in):  Handle r_type and r_size.
-	(bfd_swap_aouthdr_in):  Handle lots more members.
-	(make_a_section_from_file):  If section has already been seen,
-	just return false rather than overwriting it.
-	(coff_real_object_p):  Understand incoming magic numbers.
-	(coff_set_flags):  Understand outgoing magic numbers.
-	(coff_compute_section_file_positions):  outgoing aouthdr magic #.
-	(build_debug_section):  Add fn for reading debug string section.
-	(get_normalized_symtab):  Handle symbol names in debug string section.
-	Remove unused obj_string_table.
-	(coff_slurp_symbol_table):  Handle rs6000-specific storage classes.
-	* aoutx.h (translate_from_native_sym_flags, N_SET*):  Check for
-	existing section before making one.
-	* cpu-rs6000.c:  New file.
-	* rs6000coff.c:  New file.
-
-Thu Oct 24 02:03:24 1991  Fred Fish  (fnf at cygnus.com)
-
-	* elf.c: Add partial support for ELF format corefiles. Still needs
-	support for extracting registers from corefiles.
-
-	* config/t-m68k-elf:  Set DEFAULT_VECTOR to elf_big_vec.
-
-	* config/{h-amix,h-dgux,h-irix3,h-ultra3}: For systems where
-	RANLIB is defined as echo, send the output to /dev/null to help
-	reduce clutter in the output from doing a make.
-
-Mon Oct 21 17:48:48 1991  John Gilmore  (gnu at cygnus.com)
-
-	* hosts/h-vaxult.h:  Remove malloc/free decls covered in stdlib.h.
-	Fix HOST_PAGE_SIZE and HOST_SEGMENT_SIZE.  From David Taylor.
-
-Mon Oct 21 09:34:11 1991  Steve Chamberlain  (steve at rtl.cygnus.com)
-
-	* coffcode.h (coff_compute_section_file_positions): make it pad
-	section size out if there are alignment restrictions so that the
-	image will be ok on a system where section positions are worked
-	out by accumulating sizes rather than from the section headers.
-	* targets.c (proto write_armap). Changed orl_count to unsigned.
-	* opncls.c (bfd_close_all_done). Added so that generative
-	programs like gas can close a bfd without causing bfd confusion.
-	* libbfd.h (changed becuase of protos)
-	* amdcoff.c: messed with the way that jmp displacements are
-	calcualated. This may not yet be totally correct.
-	* archive.c (coff_write_armap): rewrote the way that ranlibs are
-	written out.
-	* coffcode.h (fixup_symbol_value): now doesn't core dump if a non
-	abs symbol has no section (like a register symbol).
-	(coff_write_symbol) now zeros auxent before filling it up to help
-	with sensitive applications.
-	* libbfd.c (bfd_write_bigendian_4byte_int): added.
-
-Wed Oct 16 22:58:45 1991  John Gilmore  (gnu at cygnus.com)
-
-	* bfd.c:  Make sure we don't get a macro strerror().
-	* opncls.c (bfd_fdopenr):  If FASCIST_FDOPEN, use "r", not "r+".
-	* trad-core.c (trad_unix_core_file_failing_command):  Suppress
-	attempt to recover command, ifdef NO_CORE_COMMAND.
-	* hosts/h-tahoe.h:  Add FASCIST_FDOPEN and NO_CORE_COMMAND;
-	revamp HOST_*, etc.
-	* hosts/h-i386v.h:  Use <utime.h>, not <sys/utime.h>, unlike POSIX.
-
-Wed Oct 16 12:43:49 1991  Per Bothner  (bothner at cygnus.com)
-
-	* archive.c (bsd_write_argmap): The size of the ranlib structures
-	should not include the size field itself.
-	* aoutx.h, libaout.h (NAME(aout, sizeof_headers)):  Use
-	adata(abfd)->exec_bytes_size field instead of constant macro,
-	because aoutx.h compiles to a simple .o file shared by
-	all 32-bits a.out targets.
-
-Wed Oct 16 11:11:05 1991  John Gilmore  (gnu at cygnus.com)
-
-	* configure.in:  Allow i386-sco-sysv.
-	* bout.c:  Remove unused i960_align; lint dummy core file handlers.
-	* cpu-h8300.c:  lint.
-
-	* host-aout.c:  New strategy.  We use common code, include files,
-	and data structures to handle the file, but set a few parameters
-	from the host's config file (page size, text start addr, etc).
-	* libaout.h:  Define HP BSD machine types.
-	* aoutf1.h:  Handle reading a.outs with these types.
-
-	* trad-core.c:  Pass the u.u_ar0 value as the negative of the
-	virtual-memory-address of the .reg section.  We can't just make a
-	section for "all the regs and nothing else" because only GDB knows
-	exactly where the regs are (scattered around the upage and stack).
-	Clean up memory allocation.  Remove big- and little-endian
-	vectors, replace with single vector; this only runs on the host,
-	in host byte order.  Replace byteswap routines with aborts in case
-	anyone calls them.
-	* targets.c:  There's only one trad_core_vec now.
-	* aoutf1.h (sunos_core_file_p):  VMA of .reg* now needs to be 0.
-
-Tue Oct 15 08:29:03 1991  John Gilmore  (gnu at cygnus.com)
-
-	* hosts/h-amix.h (free):  Fix prototype.
-
-	* aoutx.h:  Don't use NULL as an integer, for braindead systems
-	that declare it as (void *)0.  (From Peter Schauer.)
-
-Mon Oct 14 17:20:47 1991  Per Bothner  (bothner at cygnus.com)
-
-	* opncls.c (bfd_fdopenr):  Add parentheses to avoid reported
-	problem with bad Ultrix system headers.
-	* aoutx.h (NAME(aout,set_section_contents)):  Try to handle the
-	various kinds of alignments for the various kinds of
-	magic numbers.
-
-Mon Oct 14 14:23:10 1991  John Gilmore  (gnu at cygnus.com)
-
-	* doc/Makefile:  Don't assume . is on the path (from James Clark).
-
-Fri Oct 11 22:45:14 1991  John Gilmore  (gnu at cygnus.com)
-
-	* Makefile.in:  Avoid Sun Make VPATH bugs.
-	* targets.c:  Declare trad_core vectors extern.
-
-Fri Oct 11 13:03:02 1991  Per Bothner  (bothner at cygnus.com)
-
-	* coffcode.h: Moved ALIGN macro to libbfd.h. Removed i960_align.
-	* libbfd.h: Moved ALIGN macro here.
-	* bout.c (b_out_callback): Replace i960_align by align_power.
-
-	* libaout.h (struct aoutdata):  Added fields page_size,
-	segment_size and exec_bytes_size.  These help generic code
-	(in aoutx.h and libaout.h) to figure out where to align
-	the various segments in a demand paged file.
-	* libaout.h (WRITE_HEADER):  Use new (struct aoutdata) fields
-	to decide if the exec header counts in a_text (text segment size).
-	Also, assume D_PAGED flag is set; don't set it here.
-	* bout.c (b_out_callback): Add initialization of
-	adata fields page_size, segment_size, and exec_bytes_size.
-	* host-aout.c (NAME(host_aout, callback) and
-	NAME(host_aout,mkobject): Ditto.
-	* i386aout.c (aout386_callback) and new aout386_mkobject): Ditto.
-	* newos3.c (newsos3_callback) and new newsos_mkobject): Ditto.
-	* aoutf1.c (sunos4_callback) and new sunos_mkobject): Ditto.
-	* aoutx.h (NAME(aout,some_aout_object_p)): Don't subtract
-	EXEC_BYTES_SIZE from the a_test size; this is only appropriate
-	for some systems (mainly sunos), so do it in the callback instead.
-	Same routine: Add stuff to the THIS_IS_ONLY_DOCUMENTATION comment.
-	* aoutx.h (NAME(aout,set_section_contents): Change the way
-	filepos and size of sections are carried out to support
-	older styles of demand paged executables.
-
-
-Fri Oct 11 12:33:36 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* bfd-in.h: Added more macros to COFF_SWAP_TABLE.
-	* bfd.c: Added macros to enable gas to swap coff records.
-	* coffcode.h: Make the coff_swap_*_out routines return the number
-	of bytes swapped, and cleaned up their prototypes.
-	* configure.in: Added ebmon/coff support
-	* ecoff.c: Changed null definitions of coff_swap_*_out to conform
-	to new prototypes
-	* targets.c: Added new entry points for coff swapping
-
-Fri Oct 11 03:01:52 1991  John Gilmore  (gnu at cygnus.com)
-
-	Restructure configuration scheme for bfd, binutils, ld.
-
-	* include/sys/h-*.h:  Move to bfd/hosts/h-*.h.
-	* configure.in:  Revise to symlink sysdep.h to hosts/h-xxx.h.
-	Change some config names to match other dirs.
-	* *.c:  Include bfd.h before sysdep.h, so ansidecl and PROTO()
-	get defined first.
-	* Makefile.in:  Use -I. to get sysdep.h.  Remove refs to
-	../include/sysdep.h.
-	* cpu-i960.c:  Strncmp needed a length arg.
-	* ecoff.c:  Don't ever call trad_unix_core_file_p from here.
-	* i386aout.c:  Remove dead N_TXTOFF override.
-	* trad-core.c:  Don't disable the whole file if SUN4_SYS.
-	* config/:  Rename some config files to match up h-*.h names.
-	Remove all the HOST_SYS definitions from the config files.
-	* hosts/h-amix.h, h-i386v.h:  Define POSIX_UTIME, not USG.
-	* hosts/h-hp9000.h:  Remove USG comment.
-	* hosts/h-rs6000.h:  Include <stdlib.h> for malloc.
-	* hosts/h-news.h, h-sparc-64.h:  New config files that had
-	previously been kludged in the <sysdep.h> file.
-
-Thu Oct 10 17:54:08 1991  John Gilmore  (gnu at cygnus.com)
-
-	* config/*:  trad-core support is HOST dependent, not target
-	dependent.  Target config files only set DEFAULT_VECTOR and/or
-	other vector elements.  Exception:  when host-aout.c is in use,
-	in which case we're forced to assume we're native (hp, vax,
-	tahoe).  Rename XDEPFILES to HDEPFILES.
-	* Makefile.in:  Rename XDEPFILES.
-	* config/h-sun*:  Don't force static linking.
-	* trad-core.c:  Document how to use it nowadays.
-	* i386aout.c, newsos3.c:  Clean up.
-	* i386coff.c:  Allow 386 coff files to be used as core files too
-	(for reading core files from embedded systems).
-
-Tue Oct  8 15:30:39 1991  John Gilmore  (gnu at cygnus.com)
-
-	* Add i386aout.c for a.out support on the i386.
-
-Tue Oct  8 12:18:54 1991  Roland H. Pesch  (pesch at cygnus.com)
-
-	* reloc.c, section.c, syms.c, targets.c: correct info-node
-	structure in *doc* comments.
-	doc/Makefile: stop hiding complaints from makeinfo.
-
-Sun Oct  6 19:10:06 1991  John Gilmore  (gnu at cygnus.com)
-
-	* aoutx.h (...some_aout_object_p):  Take a third parameter,
-	the internal_exec struct, and avoid ever looking at an
-	external_exec.  All callers changed to read the entire
-	external_exec struct, swap and check its magic number,
-	swap in the whole structure, and pass the swapped-in version to
-	some_aout_object_p.
-	* bout.c:  Bring into modern era.  Use single _object_p routine
-	for big- aand little-endian.  Provide internal and external
-	exec header structs.  Use separate swap-in and swap-out routines.
-
-	* libaout.h:  Move struct internal_exec from ../include/aout64.h
-	to here.  Add obj_symbol_entry_size to struct aoutdata.
-	* aoutx.h (...some_aout_object_p):  Set obj_symbol_entry_size.
-
-	* ../include/aout64.h:  Change EXTERNAL_LIST_SIZE to
-	EXTERNAL_NLIST_SIZE.  Callers changed.
-
-Fri Oct  4 18:18:46 1991  John Gilmore  (gnu at cygnus.com)
-
-	* bfd.c:  Remove strerror() to libiberty.
-
-	* elf.c:  Remove elf_set_section_contents, use generic one.  Lint.
-	* libbfd-in.h, libbfd.c:  Add bfd_generic_set_section_contents.
-	* libbfd.c (bfd_generic_{get,set}_section_contents):  Check that
-	last byte of transfer, not first byte, is within the section.
-
-	* host-aout.c:  Remove `BSD' archive support.  Lint.
-
-	* archures.c: Rename `struct bfd_arch_info_struct' to `struct
-	bfd_arch_info'.  Rename `typedef bfd_arch_info_struct_type' to
-	`bfd_arch_info_type'.  All uses changed.
-	* reloc.c:  Rename `bfd_reloc_status_enum_type' to
-	`bfd_reloc_status_type'.  Rename `bfd_reloc_code_enum_real_type'
-	to `bfd_reloc_code_real_type'.  (This seems to be a misnomer,
-	it needs a better name.)  All uses changed.
-	* targets.c:  Rename `enum target_flavour_enum' to `enum
-	target_flavour', and remove the `_enum' from all of the enum
-	values themselves.  All uses changed.
-
-	* configure.in, config/h-i386mach:  i386 mach host.
-	* config/t-i386-aout:  Use host-aout.c.
-
-	* trad-core.c:  Give it its own xvec's to make it independent
-	of other file formats.
-	* ecoff.c, host-aout.c:  Remove refs to trad-core.
-	* config/t-dec3100, t-hp300bsd, t-tahoe, t-vax:  Define TRAD_CORE.
-	* targets.c:  #ifdef TRAD_CORE, include it in the vector.
-
-Fri Oct  4 17:38:03 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* reloc.c: Extended NEWHOWTO macro
-	* ieee.c: Changed the way 8bit pcrel is done
-	* cpu-h8300.c: got the registers in the right order
-
-Thu Oct  3 19:39:55 1991  John Gilmore  (gnu at cygnus.com)
-
-	* bfd-in.h:  enum boolean => enum bfd_boolean for SVR4.  Gumby's
-	prediction is vindicated!
-
-	* bfd-in.h, libbfd-in.h, doc/Makefile, doc/tolibbfd, doc/intobfd:
-	Remove refs to howto.c, since Steve forgot.
-
-Thu Oct  3 07:49:21 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* elf.c: took the abort out of set_arch_mach so that objdump -i will
-	still work. Now allows any architecture/machine to be set.
-
-Wed Oct  2 13:50:35 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* howto.c deleted and moved code to reloc.c
-
-	* libbfd.h, libbfd-in.h removed $id stuff for real
-
-	* cpu-h8300.c Made it match various different spellings of h8300.
-
-	* archures.c: Took out the first char filter which made it only
-	look for a cpu/arch match when the first chars of supplied and
-	tested names were the same.
-
-	* targets.c removed oasys stuff, pending someone to fix the bugs
-	in it.
-
-
-Tue Oct  1 12:29:44 1991  John Gilmore  (gnu at cygnus.com)
-
-	* Makefile.in, configure.in, targets.c, elf.c:  Add preliminary
-	ELF support good enough for GDB.
-	* configure.in, config/h-amix, config/t-m68k-elf:  Handle
-	m68k-cbm-svr4 host and target.
-	* config/t-m68k-coff, t-m88k-coff, t-m88k-aout:  Make files nonempty
-	so `diff' and `patch' can cope.
-
-Tue Oct  1 11:24:31 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* archures.c: removed texinfo error
-
-	* init.c: added texinfo hooks, and removed initialization error
-	message.
-
-	* libcoff-in.h, libbfd-in.h removed $id field so cvs can merge
-	without complaints.
-
-Tue Oct  1 05:02:53 1991  John Gilmore  (gnu at cygnus.com)
-
-	* cpu-i960.c:  Avoid numerical count of initializers.
-
-	Vax Ultrix changes from David Taylor <taylor@think.com>:
-	* host-aout.c:  Make little-endian vector really little-endian.
-	* configure.in:  Separate vax and tahoe cases, handle ultrix.
-	* config/t-vax:  Add trad-core.o.
-	* config/h-vaxult:  New host system.
-
-Mon Sep 30 15:13:46 1991  Steve Chamberlain  (steve at cygnus.com)
-
-	* bfd-in.h VERSION, change version number to 0.18, this makes a
-	gap, but now is the same as the linker version number.
-
-	* cpu-a29k.c, cpu-i386.c, cpu-m68k.c, cpu-mips.c, cpu-vax.c,
-	cpu-h8300.c, cpu-i960.c, cpu-m88k.c, cpu-sparc.c: added. These
-	files will eventually contain processor specific bits for bfd,
-	like strange relocation information and dis/assembly.  So far only
-	the H8 has been even partially done.  This work also ties in with
-	the change in handling architectures.
-
-	* amdcoff.c: (a29k_reloc) fix error message.
-
-	* aout-f1.h: (choose_reloc_size) now calls bfd_get_arch to
-	discover the architecture of the bfd. (sunos4_callback) calls the
-	function bfd_set_arch_mach rather than stuffing stuff directly
-	into the bfd. (sunos4_write_object_contents), changed names of
-	accessor functions.
-
-	* aoutx.h: (set_arch_mach) now calls bfd_default_set_arch_mach to
-	setup the environment.
-
-	* archive.c: (bfd_slurp_coff_armap) coff archives always have the
-	headers in big endian format, regardless of the endianess of the
-	host or target.
-
-	* archures.c: totally changed. Now an architecture is represented
-	with a pointer to an info structure rather than an enumerated type
-	and a long. The old info is available as two elements in the
-	structure.  Future enhancements to architecure support will
-	involve pointers to methods being placed into the info structure.
-
-	* bfd.c: changed the definition of the bfd structure for the new
-	architecture stuff.
-
-	* bout.c: (b_out_set_arch_mach) changed to use the new
-	architecture mechanism.
-
-	* coffcode.h: (coff_set_arch_mach, coff_set_flags) changed to use
-	the new architecture mechanism.
-
-	* configure.in: added h8 stuff.
-
-	* ieee.c: too many changes to note.  Now ieee files written with
-	bfd gas and ld can be read by gld and ieee only linkers and
-	simulators.
-
-	* libbfd.c, libbfd.h: changed prototype of bfd_write.
-
-	* newsos3.c: (newos3_callback) now calls bfd_set_arch_mach rather
-	than fixing the structure directly.
-
-	* oasys.c: (oasys_object_p) now calls bfd_default_set_arch_mach rather
-	than fixing the structure directly.
-
-	* opncls.c: (new_bfd) makes sure that bfd_init has been called
-	before opening a bfd.
-
-	* srec.c: (srec_set_arch_mach) now calls bfd_default_set_arch_mach
-	rather than fixing the structure directly.
-
-	* targets.c: (target_vector) now by defining SELECT_VECS (perhaps
-	in the t/hmake file) a user can select which backends they want
-	linked with bfd without changing the source.
-
-	* init.c: new, looks after initializing modules.
-
-	* howto.c: for future use, will allow an application to work out
-	what cookie to use as a handle on a relcoatio howto.
-
-Mon Sep 30 13:31:15 1991  John Gilmore  (gnu at cygnus.com)
-
-	* srec.c:  Better error checking, partly from Peter Schauer.
-	(srec_object_p):  Avoid assuming any file that starts with 'S' is
-	an S-record file!  (Check for 3 uppercase-hex digits after it.)
-	(ISHEX):  Define new macro for checking supposedly hex characters.
-	(pass_over):  Treat as EOF any S-record line that:
-	    *  doesn't have hex in either size character
-	    *  produces a size larger than 0x7F
-	    *  has an unrecognized type number
-
-Thu Sep 26 15:27:29 1991  John Gilmore  (gnu at cygnus.com)
-
-	* aoutf1.h, aoutx.h, bout.c, coffcode.h, host-aout.c, oasys.c,
-	opncls.c:  Lint (saber actually).
-
-Thu Sep 26 11:24:24 1991  Per Bothner  (bothner at cygnus.com)
-
-	* libaout.h (WRITE_HEADERS): Set header's a_text field always.
-	* newsos3.c: Fixed two types: newos3 -> newsos3.
-	* reloc.c (bfd_perform_relocation): Fix pc-relative relocation
-	to use correct segment.
-
-Mon Sep 23 18:24:34 1991  Per Bothner  (bothner at cygnus.com)
-
-	* aoutx.h (print_symbol):  Handle missing symbol->name.
-
-Fri Sep 20 12:26:01 1991  Stu Grossman  (grossman at cygnus.com)
-
-	* aoutf1.h (swapcore_sparc):  Change name of USRSTACK, fix comment
-	at top of routine.
-
-Tue Sep 17 17:23:49 1991  Stu Grossman  (grossman at cygnus.com)
-
-	* oasys.c, configure.in, config/h-irix3, config/t-irix3:
-	add sgi/irix support.
-
-Thu Sep 12 14:29:09 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	Changes for the AMD 29000 Ultracomputer port from David Wood.
-	(wood@nyu.edu).
-
-	* opncls.c (bfd_fdopenr):  Handle NO_FCNTL.
-
-	* Makefile.in:  Make subdirs work by using $(INCDIR) in the
-	crude dependencies.
-
-	* coffcode.h (coff_real_object_p):  Pass information about the
-	current file's coff symbol format to BFD via the coff_data struct.
-	(coff_find_nearest_line):  obj_icof => coff_data.
-	(coff_swap_sym_{in,out}):  Check that SYMNMLEN == E_SYMNMLEN.
-	(coff_swap_aux_{in,out}):  Check that FILNMLEN == E_FILNMLEN
-	and DIMNUM == E_DIMNUM.
-	* configure.in:  Handle a29k-*-* hosts, and targets
-	a29k-*-coff, a29k-*-aout, and a29k-*-sym1.
-	* libcoff-in.h:  Add local_n_btmask, local_n_btshft,
-	local_n_tmask, local_n_tshift, local_symesz, local_auxesz,
-	local_linesz to `coff_data' (tdata) struct.
-	(coff_data, coff_data_type, coff_tdata):  Rename struct icofdata.
-	* config/h-ultra3:  Handle a29k-*-* hosts as Ultracomputers.
-
-Thu Sep 12 14:07:22 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
-
-	* Makefile.in: $(MAKE) for make, $(docdir) for doc
-	* doc/Makefile: redundant dependencies for Sun-make VPATH bug
-
-Tue Sep 10 20:34:12 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* aoutf1.h (sunos4_core_file_p):  Release the right storage in
-	error case.
-	(sunos4_core_file_matches_executable_p):  Fix header comparison.
-	* aoutx.h:  Avoid shifts of 32 bits, undefined in C.  Lint.
-	* bout.c, icoff.c, ieee.c, libbfd.c, oasys.c:  gcc -O -W lint.
-
-Wed Sep  4 00:44:52 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	Allow GDB to patch object files.
-
-	* aoutf1.h (sunos_core_file_p):  Set SEC_HAS_CONTENTS on all sections.
-	* trad-core.h (trad_unix_core_file_p):  Ditto.
-	* aoutx.h (aout_set_section_contents):  On first output, check
-	abfd->direction and complain if erroneous.
-
-	* Makefile.in:  Add crude dependencies.
-
-Tue Sep  3 13:46:19 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* config/* aoutx.h configure* shortened all the h/tmake-xxxx
-	to h/t-xxxx files so that everything will work on System V.
-
-Fri Aug 23 13:51:06 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* aoutx.h:  Add information on host-aout.c and how to configure
-	to use it, to the manual.
-	* configure.in:  Tix typo.
-	* ecoff.c:  If compiling for DEC3100, use trad_unix core files,
-	else dummy out the core file support.
-	* trad-core.c (trad_unix_core_file_p):  If HOST_DATA_START_ADDR is
-	specified, use it to locate the data section.
-	* coffcode.h (coff_write_symbols):  Declare buffer as bfd_bytes
-	rather than as chars (lint).
-
-Thu Aug 22 22:20:19 1991  Stu Grossman  (grossman at cygint.cygnus.com)
-
-	* aoutx.h, coffcode.h:  saberized.
-
-Thu Aug 22 11:27:06 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
-
-	* bfd.texinfo: some cleanup, reincorporated more intro matter from
-	bfd.doc
-	bfd.c, targets.c: minor rewording of doc segments
-
-
-Wed Aug 21 19:13:22 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* trad-core.c (trad_unix_core_file_p):  Use HOST_TEXT_START_ADDR,
-	etc, rather than TEXT_START_ADDR.
-	* host-aout.c:  Remove #if 0 around whole thing.
-	Update to modern (32/64-bit) a.out naming conventions.
-	Include a large chunk of ../include/a.out.gnu.h to get macros that
-	are not defined by the system include files.
-	(host_aout_{32,64}_write_object_contents):  Use the WRITE_HEADERS
-	macro used by the other a.out implementations.
-	* Makefile.in:  Give dependencies to OPTIONAL_BACKENDS.
-
-Wed Aug 21 14:33:06 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
-
-	* Makefile.in: use targets "bfd.dvi" and "bfd.ps" instead of
-	texdoc and psdoc; make these depend on generated .texi's
-
-	* scanit, (new) unPROTO: turn PROTO macros into ANSI declarations in
-	doc
-
-	* bfd.c, reloc.c, syms.c: minor spelling/wording fixes in doc
-	portions
-
-	* Makefile.in, awkscan-ip, awkscan-p, intobfd,
-	libbfd.h, libcoff.h, tolibcoff; new bfd-in.h, libbfd-in.h,
-	libcoff-in.h: (a) use separate files for invariant parts of bfd.h,
-	libbfd.h, and libcoff.h; (b) in generated parts of same, use less
-	obtrusive marks indicating .c origins.
-
-	* bfd.texinfo: generalize most references to linker
-
-Tue Aug 20 15:18:02 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
-
-	* Makefile.in: include core.p in PROTOS (building better bfd.h)
-	* archures.c: remove empty foo() definition (crept in at vn1.9)
-
-Mon Aug 19 13:48:22 1991  Roland H. Pesch  (pesch at cygint.cygnus.com)
-
-	* bfd.texinfo: use @setchapternewpage on instead of lots of
-	@page's; minor rephrasing in Introduction.
-
-	* aoutx.h, archive.c, archures.c, bfd.c, bfd.texinfo, cache.c,
-	coffcode.h, core.c, format.c, ieee.c, libbfd.c, libbfd.h, libcoff.h,
-	oasys.c, opncls.c, reloc.c, section.c, syms.c, targets.c (documentation
-	segments): used BFD (caps) more consistently as a name in
-	discourse, fixed a few other minor typos and uses of fonts
-
-
-Thu Aug  8 16:47:43 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* coffcode.h: fixed bug where string table size wasn't being swapped.
-
-Thu Aug  1 16:35:28 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* section.c: added SEC_CONSTRUCTOR_TEXT|DATA|BSS flags
-
-	* syms.c: added BSF_CONSTRUCTOR, BSF_WARNING and BSF_INDIRECT
-	flags. (bfd_print_symbol_vandf) now knows what to do with the
-	above flags.
-
-	* aoutx.h: made translate_from_native_sym_flags and
-	translate_to_native_sym_flags produce the above flags.
-
-
-Wed Jul 31 09:53:52 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* all files:  update copyright notices for GPL version 2.
-	Install header comments and attribute most modules to their
-	authors.  BFD's name is now officially "Binary File Descriptor",
-	so remove any conflicting pejoratives.
-	archures.h:  Consists solely of comments; remove it.
-
-Fri Jul 26 18:11:34 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* Makefile.in, bfd.c: Made it compile again.
-
-Fri Jul 19 08:17:09 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* newsos3.c, targets.c, coffcode.h: new patches from David Wood
-
-
-Mon Jul 15 16:27:42 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* aoutf1.h archive.c bfd.c coffcode.h core.c ecoff.c ieee.c
-	bfd.texinfo oasys.c opncls.c reloc.c srec.c: More documentation on
-	lint fixes.
-
-	* amdcoff.c bfd.texinfo Makefile.in : Folded in changes for amd
-	29k coff by David Wood (wood@lab.ultra.nyu.edu).
-
-Thu Jul  4 09:53:16 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* Everything: created some new files, core.c format.c, reloc.c,
-	section.c and syms.c to split the functionality a bit better.
-	Cleaned up the rest of the files a bit, and added some
-	documentation.
-
-
-Mon Jul  1 13:29:47 1991  David Wood (wood at david.ultra.nya.edu)
-
-	* opncls.c, ../include/sys/h-sun3.h ../include/sys/h-sun4.h: fcntl
-	really takes 3 arguments, patched code and ammended prototypes.
-
-Fri Jun 14 13:19:40 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* ../include/bfd.h (struct bfd_target): Added new field
-	"align_power_min" which contains the minimum alignment for a
-	section. This is used in coff_new_section_hook. The field
-	insertion necessitates an update of all backends..
-
-	* aoutf1.h jump table field inserted
-
-	* archive.c(snarf_ar_hdr)(bfd_slurp_coff_armap) can now parse dgux style extended
-	filenames too.
-
-	* bout.c(b_out_squirt_out_relocs) fix to assertion tests. Jump
-	table field inserted.
-
-	* coffcode.h(just about everything) Now patches up symbol tables
-	using a different mechanism. The Intel major bug has been fixed,
-	and the linker can self host on the Aviion and be debugged with
-	gdb.
-
-	* ecoff.c: new include and jump table patch, i386coff.c: new
-	include and jump table patch,  icoff.c: new include and jump table
-	patch, ieee.c: can now read archives containing ieee modules.,
-	libcoff.h: added (combined_entry_type), libieee.h: uped max
-	sections to 20, m68kcoff.c: new include and jump table patch,
-	m88kbcs.c: new include and jump table patch, oasys.c: various bugs
-	fixed. opncls.c: added bfd_alloc_grow and bfd_alloc_finish.
-	srec.c: jump table patch. trad-code.c fixed #IF typeo
-
-Fri Jun  7 12:35:46 1991  Sean Fagan  (sef at cygint.cygnus.com)
-
- 	* coffcode.h (coff_swap_aux_in): added else case to deal with
- 	filenames less than 9 characters.
-
-
-Thu Jun  6 18:27:38 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* ../include/oasys.h oasys.c (oasys_archive_p): fixed so it works
-
-	* srec.c: now allows any number of sections to be created in a
-	file. Outputs addresses of the right length.
-
-Thu May 30 15:30:10 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* bfd.c (bfd_check_format): Fixed problem where when a defaulted
-	target didn't match, the format got set to the attempted match,
-	breaking a future test.
-
-        *../include/i386coff.h : fixed typo in type field with size
-
-	* i386coff.c icoff.c m88k-bcs.c ecoff.c ../include/bfd.h : Added
-	support in the jump table for the swapping routines exported to
-	gdb. Now gdb works with the 386.
-
-Tue May 28 17:21:43 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* Merge in changes from gdb-3.95 release.
-	Makefile.in:  Allow hmake and tmake files to add OFILES.
-	aoutf1.h:
-	bfd.c:  support specific targets as well as searching.  When
-	searching, take default target in preference to others.
-	bfd.doc:  typos
-	ieee.c, oasys.c:  Avoid using the "tdata" macros left of assignment.
-	liba.out.h:  Don't hard-code file offsets; use N_ macros for them.
-	libbfd.h:  Support specific targets as well as searching.
-	opncls.c:  Support specific targets as well as searching.
-	targets.c:  Search is short-circuited if default target matches.
-	liboasys.c, libieee.c:  Undo bothner changes that make macros
-	work to the left of assignment, but which depend on the
-	representations of different pointer types being the same.
-
-Fri May 24 18:56:52 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* i386coff.c: created.
-	* coffcode.h: added support for 386.
-	* Makefile.in: added support for 386.
-	* ../include/i386coff.h: created
-
-Wed May 22 07:26:38 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* coffcode.h: removed all put_x_<sizes>
-	* libbfd.c: Changed #ifdef __GNUC__ to #ifdef HOST_64_BIT, Added
-	DEFUNS
-
-
-Tue May 21 08:58:58 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-	(bothner)
-	* opncls.c: Changed obstack_chunk_alloc use xmalloc
-
-Mon May 20 17:12:17 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* everything: Removed sysdep.h from bfd.h and put back into files
-	from which it was split out. Now 64 bit version is built with a
-	-DHOST_64_BIT="long long" on the compile line.
-
-Fri May 17 19:35:26 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	Changed all the [get|put][name] routines to use  [get|put]_[size
-	in bytes].
-
-	Put in support for 64 bit work. Now two versions of bfd may be
-	generated, according to the state of TARGET_64_BIT, one which is
-	32 bit only, and one which is 64/32 bits.
-	Created new back end 'demo64' to test 64 bit functionality.
-
-	Renamed some files to work on DOS.
-
-	* archive.c: lint * bfd.c: prototypes and lint. * ecoff.c: added
-	64bit transfer 	* icoff.c: added 64bit transfer * ieee.c: name
-	chage, 64 bit transfer. * liba.out.h: Split out common code from
-	sunos and newsos into liba.out. Name changes and prototype mods. *
-	libbfd.c: lint and prototypes, extra 64bit swaps. * libbfd.h:
-	prototypes for new functions. * libcoff.h: lint * libieee.h: make
-	work on DOS * liboasys.h: make work on DOS * m88k-bcs.c: Name
-	change and 64bit stuff.* newsos3.c: common code removed, new jump
-	table. * oasys.c: Name change * opncls.c: Portability fixes *
-	srec.c: Name changes * sunos.c: Removed comon code. * targets.c:
-	Added demo * aout32, aout64.c include  aoutx.h * bout.c: used to
-	be called b.out.c * coffcode.h: used to be called coff-code.h, now
-	64bit ized. * demo64.c: 64 bit a.out back end
-
-Thu May 16 16:02:07 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-	from bothner
- 	* libieee.h: Make ieee_data and ieee_ar_data macros usable
-	on LHS of assignment, even when using old compilers.
-	* liboasys.h: Ditto for oasys_data and oasys_ar_data.
-	* m68kcoff.c: Add enum-to-int casts to accomodate old compilers.
-	* newsos3.c: Fix definitions of SEGMENT_SIZE and TEXT_START_ADDR.
-	* opncls.c: Define S_IXUSR, S_IXGRP, S_IXOTH if undefined.
-	* targets.c: Add declaration of newsos3_vec.
-
-Mon May 13 10:03:29 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* aout.c: fixxed some of the problems with filepos calculation.
-	(swap_ext_reloc): fixed problem with creation of relocs.
-	(aout_set_section_contents): fixed filepos problem
-
-	* coff-code.h: (swap_filehdr_in, swap_filehdr_out) add.
-	(swap_filehdr) delete. Changed all the usage of bfd_h_put_x.
-	(swap_aouthdr_in, swap_aouthdr_out) add. (swap_aouthdr) delete.
-	(coff_real_object_p) cleaned up, added MIPS. (coff_object_p)
-	cleaned up. (coff_write_object_contents) cleaned up.
-
-	* ecoff.c: Totally different. Now supports ecoff fully.
-
-	* icoff.c: fixed problems in relocation callout.
-
-	* libcoff.h: (struct icofdata) removed hdr structure from tdata.
-
-	* m68kcoff.c: updated target vector.
-
-	* sunos.c: (choose_reloc_size) added: (sunos4_callback) calls
-	choose_reloc_size. (sunos4_write_object_contents) now calls
-	choose_reloc_size so outputs relocs correctly, also calculates the
-	size of the sections correctly.
-
-
-
-Fri May 10 16:58:53 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	Merge Per Bothner's changes to modularize BFD a.out a bit.
-
-	* libbfd.h, libbfd.c (bfd_generic_get_section_contents):  Add.
-	* ieee.c:  Cast enums to int before comparing them, for brain-
-	dead compilers.
-	* coff-code.h:  Remove coff_get_section_contents, and use the
-	generic one instead.
-
-	* aout.c:  Derive new module from sunos.c, containing generic
-	support code for all kinds of a.out files.
-
-	* sunos.c: Remove all code that goes in aout.c.  Split out
-	machine dependent followup in sunos4_object_p into
-	sunos4_callback.  Use JUMP_TABLE(aout) for the transver vector,
-	and redefine only the names we CHANGE, not all the names.  Drop
-	the little-endian vector, and rename the vector as sunos4 rather
-	than generic.
-
-	* b.out.c:  Use aout.c routines for most of the work.  Slight
-	changes for the new regime.  Remove close_and_cleanup and
-	get_section_contents in favor of generics.  New transfer vector
-	regime.
-
-	* newsos.c:  New support for Sony NEWS, another a.out format.
-
-	* ecoff.c:  Remove close_and_cleanup.  New tvec regime.
-	* icoff.c, m88k-bcs.c:  Add write_contents to tvec.
-	* ieee.c, oasys.c:  Remove close_and_cleanup, add write_contents
-	to tvec.
-	* opncls.c (bfd_close):  Call format-dependent write_contents
-	routine, if writing, before calling target-dependent
-	close_and_cleanup routine (which is now always generic, I think).
-	* srec.c:  Use bfd_alloc instead of malloc.  Remove
-	close_and_cleanup and move code from it to
-	srec_write_object_contents.  Add write_contents to tvec.
-	* targets.c:  Remove a.out little vector, replace a.out big
-	vector with SunOS vector.  FIXME:  Need Vax support again now.
-
-	* libbfd.h:  Add write_contents format-dependent-vector to the
-	bfd_target vector.  Supply a generic close_and_cleanup routine.
-	* liba.out.h:  Handle the new aout.c split.  Add prototypes for
-	all routines defined in aout.c.  Rename "sunos" things to "aout"
-	things.  Add a few fields where needed for various formats.
-	* Makefile.in:  Add aout.c and newsos.c.
-
-	* archive.c, ieee.c, oasys.c:  Lint.
-
-Fri May 10 12:34:48 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* ../include/bfd.h
-	changed forward declaration struct stat; to reduce warnings. Changed
-	comment on bfd_h_<x>_x.
-
-	* ../include/m68kcoff.h, ../include/intel-coff.h,
-	../include/m88k-bcs.h
-	Now there are two incarnations of relocs, linenos and syments. One for
-	internal digestion, and one full of char arrays for I/O. The original
-	names have gone to detect errors.
-
-	* Makefile.in, m68kcoff.c, targets.c
-	Test new structure code with a 68k coff implementaion
-
-	* coff-code.h, icoff.c, coffswap.c, libcoff.h
-	Fixed all the places where there were problems with the size and
-	alignments of structures on disk and structures in memory. #ifed out
-	all the code in coffswap.c, since it should be done using the target
-	swap routines now.
-
-Thu May  9 11:00:45 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* ieee.c (do_one, ieee_slurp_section_data): now supports the load
-	multiple reloc command.
-
-	* sunos.c (sunos4_set_section_contents): Made it so that sections
-	are always padded to their alignment size.
-
-Sat May  4 15:49:43 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* archive.c, bfd.c, coff-code.h, opncls.c, sunos.c, trad-core.c:
-	Clean up types and such (saber C problems).
-	* ecoff.c:  Clean up types and such.  Remove routines that are
-	not used.  Fix up reading and swapping of shorts from files.
-
-   Notes on bfd-0.5.2-patch1a, from Per Bothner:
-
-	* a.out.vax.c: Remove two bogus "static" from prototypes.
-
-	* ecoff.c: Got rid of lots of non-working junk (that had
-	been copied directly from coff-code.h).
-	Updated to be consistent with updates to icoff.c and coff-code.h.
-
-	* libbfd.h: Added definitions for S_IXUSR, S_IXGRP, and S_IXOTH
-	if they're missing (as they are in (BDS-4.3-based) NewsOS-3).
-
-	* sunos.c (n_txtoff): (Re-)Add support for sony. This is a kludge,
-	but until the target_vector is automatically generated,
-	it's as good as any. Note that the text offset is the only
-	difference between NewsOS and SunOs (including magic numbers).
-	(Most of the sunos_* routines should to renamed bsd_*
-	and move to a bsd.c file. Then (and when the target_vector
-	is automatically generated) it might make sense to create
-	a separate Sony target.)
-
-	* sysdep.h: Don't declare fread and fwrite. Causes trouble
-	on some systems, and doesn't help on others.
-	Similarly, only define X_OK if not already defined.
-
-	* trad-core.c: Don't include sys/stat.h - at least
-	on NewsOS 3, it has already been included.
-
-Tue Mar  5 01:47:57 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* coff-code.h (bfd_coff_swap_sym, bfd_coff_swap_aux,
-	bfd_coff_swap_lineno):  Export the routines that byte-swap COFF
-	symbol tables if necessary when reading them in, so gdb can use
-	them.  Add "bfd_coff_" to the names so they won't conflict with
-	names in calling programs.  FIXME-soon:  if coff-code.h is
-	included in two BFD modules, this will cause duplicate
-	definitions; the routines should be exported to a separate,
-	common, module (probably along with a mess of other ones).
-
-Sat Mar  2 12:11:26 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	Improve modtime support.
-
-	* bfd.h:  Add boolean mtime_set, and declare bfd_get_mtime.
-	Remove #define for bfd_get_mtime.  Remove gratuitous comment.
-	* bfd.c (bfd_get_mtime):  New fn, caches mtime, gets if not cached.
-	BUG:  archive members still do not get correct mod times.
-
-	Improve floating point support for core files.
-
-	* sunos.c (struct core):  Change void *fpa_dummy to double fp_stuff.
-	(sunos4_core_file_p):  Create a second registers section in the
-	core file, called ".reg2", for the float registers.
-
-Thu Feb 14 15:49:06 1991  Gumby Vinayak Wallace  (gumby at cygint.cygnus.com)
-
-	* many changes to improve archive handling; found a logic flaw in
-	  bfd_check_format which only just happened to work by cooncidence.
-
-Thu Feb 14 07:53:16 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* bfd.c (bfd_perform_relocation): fixed to use output_offsets
-	correctly.
-
-	* bfd.h: changed type of udata in asymbol to void *, like it
-	should be. Added bfd_reloc_dangerous enum member.
-
-	* coff-code.h: Fixed it so that internally generated symbols get
-	their values relocated correctly in all cases. Removed calls to
-	xmalloc.
-
-	* icoff.c: Not understanding the destination symbol of a reloc is
-	not a failure any more, just 'dangerous'. This allows linking of
-	b.out and coff images.
-
-	* sunos.c: Cleaned up the way that ZMAGIC section sizes are
-	calculated.
-
-
-Tue Feb 12 13:25:46 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* sunos.c (translate_to_native_sym_flags): fixed
-	sym_pointer->n_value so that symbols on the way out get their
-	section relative values calculated correctly.
-
-	* coff-code.h (mangle_symbols): fixed problem where tags were not
-	being relocated for structs, enums, unions. Also various lints.
-
-Mon Feb 11 19:52:26 1991  Gumby Vinayak Wallace  (gumby at cygint.cygnus.com)
-
-	* archive.c (get_elt_at_filepos): system_call_error returned
-	  incorrectly.
-
-Sun Feb 10 23:18:40 1991  Gumby Vinayak Wallace  (gumby at cygint.cygnus.com)
-
-	* Resolve the use of no_error and system_call_error.
-	  The bfd library itself now will never set bfd_error to
-	  no_error.
-
-	  The code still needs to be combed to make sure all the error
-	  codes are correct.  I suspect they are not always set correctly.
-
-	* The names of all the messages have _ prepended because the sun
-	  bundled compiler can't distinguish from a macro which takes an
-	  argument and the same identifier in a non-macro context.
-
-	* The reason for the above being that entry points which used to
-	  be trampoline functions are now just macros which expand to a
-	  direct call through the bfd's xfer vector.
-
-	* (../include/intel-coff.h) F_AR32WR: fix this constant.  Why
-	  must gas have its own version of everything (the gas version
-	  had the correct value)
-
-Tue Feb  5 11:46:53 1991  Steve Chamberlain  (steve at cygint.cygnus.com)
-
-	* b.out.c: Added patches supplied by chrisb@mipon2.intel.com to
-	properly support i960 architecture and output correct reloc stuff.
-
-	* bfd.h: added prototype for bfd_printable_arch_mach, added
-	BFD_FAIL
-
-	* coff-code.h: Applied patches from chrisb to support i960
-	architecture, zero relocs and swap them correcly and conditionally
-	compiled the timestamp.
-
-	* sunos.c: Made the default section alignment 2^3 so that doubles
-	are done properly. Fixed the same reloc bug that was in b.out.c
-
-	* sysdep.h: Now compiles on a Posix box
-
-Wed Jan 30 21:36:26 1991  John Gilmore  (gnu at cygint.cygnus.com)
-
-	* icoff.c:  Fix comment on big-endian version.
-	* coff-code.h:  Make HAS_RELOC really work (it's backwards from
-	F_RELFLG).  Set F_AR32WR in output files if little endian
-	architecture.
-
-Tue Jan 29 20:56:10 PST 1991 steve@cygnus.com
-
-	* archures.c fixed =/== typo
-
-	* sunos.c added architecture stuff for output. Fixed
-	bug where files where vma(data) != size(text)
-	were processed wrong.
-
-	* coff-code.h added a lint cast
-
-	* (../include/a.out.sun4.h) fixed it so zmagic
-	worked
-
-Mon Jan 28 19:15:29 PST 1991 steve@cygnus.com
-
-	* archive.c removed loads of includes, and fixed bug where string
-	table didn't have a null at the end.
-
-	* bfd.c fixed includes, added symbols argument to
-	canonicalize_reloc entry point.
-
-	* libbfd.c fixed includes and added some lint patches.
-
-	* targets.c added both sorts of intel coff.
-
-	* b.out.c fixed included, changed was the canonical
-	relocs were done.
-
-	* icoff.c added support for callj and big and little
-	enidian tables.
-
-	* opncls.c added chmod+xing for files with EXEC_P set.
-
-	* sunos.c fixed includes. Changed default section
-	alignement to words. Fixed relocation stuff to work with
-	new scheme
-
-	* bfd.h various new types added, prototype for new
-	reloc calls, changed bfd->iostream to a void *
-	to including files don't need stdio.h.
-
-	* libcoff.h added conversion table to tie relocs to
-	canonical symbols
-
-	* sysdep.h created
-
-	* coff-code.h fixed includes. Added code to support
-	big and little endian formats. Various lints. Better
-	processing of symbols. Changed reloc stuff to new
-	order
-
-	* libbfd.h fixed includes
-
-
-Mon Jan 21 11:53:51 PST 1991 steve@cygnus.com
-
-	* bfd.h	changed name of alignment entry in sec_struct to
-	alignment_power, because of conflicting uses within bfd.
-	Now it should be obvious that it's a 2**n alignment
-	specifier. Removed start_pad, end_alignment, block, minsize,
-	output_file_alignment, subsection_alignment and original_vma fields.
-	Added align_power() macro. Fixed bfd_section_alignment
-	acessor macros. Added bfd_symbol_same_target macro.
-
-	* b.out.c (b_out_write_object_contents) fixed to use
-	new alignment member. Fixed (callj_callback) to use section
-	relative symbols properly.
-
-	* sunos.c (sunos4_object_p) fixed to use new alignment_power.
-	Fixed (translate_from_native_sym_flags) to correctly make
-	symbols section relative.
-
-	* bfd.c (bfd_errmsg) fixed various enum cast problems.
-	(bfd_make_section) took out initialization of obsolete members.
-	(bfd_print_symbol_vandf) added
-
-	* opncls.c (bfd_create) created.
-
-	* coff-code.h (coff_new_section_hook) took away refs
-	to obsolete members. (make_a_section_from_file) added
-	conversion between alignment types. (coff_symbol_from)
-	added. (coff_count_linenumbers) only counts linenumbers
-	if symbol is of coff-type. (coff_mangle_symbols) only
-	heavily mangles symbols if symbol is coff-type.
-	(coff_write_symbols) various lints. (coff_write_object_contents)
-	various lints and modification for alignment conversion.
-	(coff_slurp_relocs) fixed for use with new asection shape.
-
-Sat Jan 19 16:10:42 PST 1991 steve@cygnus.com
-
-	* archive.c lots of lint
-
-	* b.out.c added callj relocation support, upgrated reloc howto.
-	Fixed so that asymbol and reloc records are output
-	correctly.
-
-	* bfd.c lots of lint, support for new bfd entry point
-	bfd_print_symbol.
-
-	* bfd.h changed definition of asymbol to contain pointer to
-	owning bfd, removed target dependencies.
-
-	* cache.c took out print statements, put in BFD_ASSERT calls.
-
-	* coff-code.h various lints, corrected linenumber output
-	functionality. Added support for new style asymbols and
-	bfd_print_symbol. Fixed so that asymbol and
-	reloc records are handled correctly. Added timestamp.
-
-	* icoff.c Added support for new howto shape.
-
-	* liba.out.h Added support for new asymbol shape
-
-	* libbfd.c various lints
-
-	* libbfd.h various lints
-
-	* libcoff.h added support for new asymbol shape.
-
-	* sunos.c  various lints. Added support for new asymbol shape
-	and bfd_print_symbol.
-
-Wed Jan 16 21:38:09 PST 1991 steve@cygnus.com
-
-	* b.out.c removed prototype of sunos4_ennativate_symtab, lots of
-	pointer lint. Added support for callj relocation. Fixed bug where
-	the last 32 bytes of the text section were overwritten by data. Fixed bug
-	where archives of b.out didn't work due bfd_slurp_extended_name_table
-	returning false.
-
-	* sunos.c added support for n_other field. Braced the howto table so
-	that it won't be affected by any lengthing of the howto struct typedef.
-	Various lints
-
-	* bfd.h added support for n_other field, added special_function
-	reloc type, modified bfd_perform_relocation prototype. Added bfd_h_get_x
-	macros.
-
-	* bfd.c upgraded bfd_perform_relocation, various lints.
-
-Wed Jan 16 01:55:53 1991  John Gilmore  (gnu at rtl)
-
-	* ChangeLog:  Started ChangeLog for BFD.
-	* ToDo:  Create file for suggestions.
-
-	* Makefile:  Support easy loading into Saber C.
-	Add dependencies for icoff.o and bcs88kcoff.o.
-	Rename coff.c to coff-code.h.  Change callers.
-
-	* bfd.c (bfd_check_format):  Allow the check_format routines
-	to return the desired target vector, rather than just a Boolean.
-	bfd.h (bfd_check_format):  Change function pointer return type.
-	archive.c (bfd_generic_archive_p):  change callee.
-	b.out.c (b_out_little_object_p, b_out_big_object_p,
-	b_out_real_object_p):  change callee.
-	libbfd.c (_bfd_dummy_target):  Dummy routine replacing bfd_false
-	in check_format transfer vectors that need a filler.
-	libbfd.h (bfd_generic_archive_p, _bfd_dummy_target):  Fix decls.
-	bcs88kcoff.c:  change callee.
-	coff-code.h (coff_real_object_p, coff_big_object_p):  change callee.
-	icoff.c:  change callee.
-	sunos.c (sunos4_object_p, sunos4_core_file_p):  change callee.
-
-	* libbfd.c (zalloc):  It should actually zero the storage!
-	This was commented out for some reason.
-
-	* libbfd.h:  Add malloc, xmalloc, memcpy, and fatal decls.
-	This is so callers can avoid <stdlib.h> which doesn't exist
-	on older systems.
-
-	* bfd.c (map_over_sections):  Add debugging code, since I
-	noticed the section count for sunos core files was bad, but only
-	GDB had detected the problem.
-	(bfd_set_section_lineno_size, bfd_set_section_linenos,
-	bfd_get_section_linenos):  Remove obsolete functions.
-	(bfd_apply_relocations):  Use longs, not ints, for the math.
-
-	* bfd.h:  Declare enum boolean and struct bfd_target as well
-	as typedefs for them.  Remove obsolete
-	bfd_get_section_lineno_size.
-
-	* cache.c:  Make the "fdopen" support work.  Keep better track
-	of how many files are open.  Centralize the opening of files
-	and be sure bfd_open[rw] actually try to open the file.  Evade
-	linked list initialization problems.
-
-	* b.out.c, coff-code.h, opncls.c, sunos.c:  lint.
-
-	* coff-code.h (coff_slurp_symbol_table):  Null-terminate symtab names.
-
-	* cplus-dem.c:  Delete file, since it is not part of BFD.
-
-	* opncls.c (bfd_openr):  Eliminate misplaced #if 0 code.
-	(bfd_openr, bfd_openw):  Actually open the file, give error now.
-
-	* sunos.c (sunos4_core_file_p):  Set section count.
-	(sunos4_set_section_linenos, stab_names, fprint_name):  Eliminiate
-	obsolete definitions.
-	(_write_symbol_table):  Initialize <idx> counter.
-	(foop):  Eliminate debugging code.
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/bfd/ChangeLog-9495 b/bfd/ChangeLog-9495
deleted file mode 100644
index 9868583cb4b..00000000000
--- a/bfd/ChangeLog-9495
+++ /dev/null
@@ -1,10043 +0,0 @@
-Thu Dec 21 12:43:49 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_howto_raw): Add a phony reloc to handle the
-	old style TOC16 references without using R_PPC_GOT.
-	(ppc_reloc_type): Ditto.
-	(ppc_elf_reloc_type_lookup): Add support for TOC16.
-	(ppc_elf_toc16_inner): Renamed from ppc_elf_got16_inner.
-	(ppc_elf_toc16_reloc): Renamed from ppc_elf_toc16_reloc.
-	(ppc_elf_got16_{inner,reloc}): Stubs for real GOT support.
-	(ppc_elf_check_relocs): New function for GOT/PLT support that is
-	work in progress.
-	(ppc_elf_adjust_dynamic_symbol): Ditto.
-	(ppc_elf_adjust_dynindx): Ditto.
-	(ppc_elf_size_dynamic_sections): Ditto.
-	(ppc_elf_finish_dynamic_symbol): Ditto.
-	(ppc_elf_finish_dynamic_sections): Ditto.
-	(ELF_DYNAMIC_INTERPRETER): Define.
-
-Wed Dec 20 19:14:18 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* elf.c (copy_private_bfd_data): When attaching sections to
-	segments ignore sections that won't be allocated.  Patch from
-	Andreas Schwab.
-
-Tue Dec 19 20:01:43 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* config.bfd: Match on m68k-cbm-* only if OS doesn't match
-	anything else.
-
-Tue Dec 19 16:38:59 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i960.c (CALC_ADDEND): Define.
-	(coff_i960_relocate_section): Add the input section VMA to the
-	addend for PC relative relocs.
-
-Sun Dec 17 20:11:55 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* peicode.h (pe_print_pdata): Must test the entire entry for zero
-	to correctly terminate.
-
-Fri Dec 15 12:05:57 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* targets.c (enum bfd_endian): Define.
-	(bfd_target): Rename byteorder_big_p to byteorder, and change it
-	from boolean to enum bfd_endian.  Change header_byteorder_big_p
-	correspondingly.
-	* bfd-in.h (bfd_big_endian, bfd_little_endian): New macros.
-	(bfd_header_big_endian, bfd_header_little_endian): New macros.
-	* bfd-in2.h: Rebuild.
-	* All targets: Change initialization of byteorder and
-	header_byteorder to use enum bfd_endian values rather than
-	booleans.
-	* All files: Change all references to byteorder_big_p and
-	header_byteorder_big_p to use new bfd_*_endian macros.
-
-	* coffgen.c (make_a_section_from_file): Set lma to s_paddr, not
-	s_vaddr.
-	* coffcode.h (coff_write_object_contents): Set s_paddr to lma, not
-	vma.
-	* ecoff.c (_bfd_ecoff_write_object_contents): Likewise.
-
-Fri Dec 15 07:32:09 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* pe[i]-i386.c (TARGET_UNDERSCORE): Define to '_'.
-
-Thu Dec 14 13:45:37 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c: Lots of minor cleanups.  Make many functions return
-	errors rather than calling abort.  Also:
-	(ieee_write_twobyte): Remove; change callers to call existing
-	ieee_write_2bytes function.
-	(ieee_write_expression): Don't output the section twice when
-	outputting a local symbol.  Don't emit an extraneous zero if there
-	is only one term.
-	(ieee_slurp_sections): Set the lma as well as the vma.
-	(ieee_archive_p): Use bfd_alloc_grow rather than an obstack.
-
-	* ihex.c (ihex_set_arch_mach): Don't accept any architecture, just
-	a recognized one or bfd_arch_unknown.
-	(ihex_get_symtab_upper_bound): Define as bfd_0l, to permit objcopy
-	to succeed.
-	(ihex_get_symtab): Likewise.
-
-Wed Dec 13 15:44:06 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h: Include <ctype.h>.
-	(struct aout_link_includes_table): Define.
-	(struct aout_link_includes_totals): Define.
-	(struct aout_link_includes_entry): Define.
-	(aout_link_includes_lookup): Define macro.
-	(struct aout_final_link_info): Add includes field.
-	(aout_link_includes_newfunc): New static function.
-	(NAME(aout,final_link)): Initialize includes hash table.
-	(aout_link_write_symbols): Eliminate duplicate N_BINCL entries.
-
-Wed Dec 13 10:52:14 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* mpw-config.in: Match on mips-*-* instead of mips-idt-ecoff.
-
-Wed Dec 13 11:07:45 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (coff_ppc_relocate_section): removed debugging code.
-
-Tue Dec 12 17:42:06 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* peicode.h (pe_print_reloc): New function to dump the .reloc section.
-	(pe_print_private_bfd_data): call pe_print_reloc.
-	* coffcode.h (coff_set_alignment_hook): .reloc section alignment.
-	* coff-ppc.c (in_reloc_p): Added missing non-eligible relocs. Spiffed
-	up some debugging as well.
-
-Tue Dec 12 11:34:23 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* config.bfd: Handle sparc-*-elf*.  From Ronald F. Guilmette
-	<rfg@monkeys.com>.
-
-Fri Dec  8 17:47:07 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Set section_count to 0
-	when setting sections to NULL.
-
-Wed Dec  6 17:05:37 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (struct xcoff_loader_info): Add export_defineds
-	field.
-	(bfd_xcoff_size_dynamic_sections): Add export_defineds parameter.
-	(xcoff_build_ldsyms): If export_defineds is set, set XCOFF_EXPORT
-	for all symbols.
-	* bfd-in.h (bfd_xcoff_size_dynamic_sections): Update declaration.
-	* bfd-in2.h: Rebuild.
-
-Mon Dec  4 16:40:47 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coffcode.h (coff_set_alignment_hook): Removed some debugging printf's
-
-Mon Dec  4 11:25:39 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ihex.c (ihex_scan): Handle record types 4 and 5.
-	(ihex_object_p): Permit types 4 and 5.
-	(ihex_set_section_contents): Remove check for out of range
-	addresses.
-	(ihex_write_object_contents): Generate types 4 and 5.
-
-	* elflink.h (elf_link_output_extsym): Just ignore warning and
-	indirect references to symbols which don't really exist.
-
-Sun Dec  3 19:00:27 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* peicode.h (pe_print_idata): Minor format fixes
-	(pe_print_edata): New function. Under private printing, this formats
-	the edata section of a PE file.
-	(pe_print_private_bfd_data): Added call to pe_print_edata.
-
-Sun Dec  3 16:46:54 1995  Richard Earnshaw (rearnsha@armltd.co.uk)
-
-	* aout-arm.c (MY_swap_std_reloc_out): Use KEEPIT to get the symbol
-	index, don't call stoi.
-
-Fri Dec  1 14:46:51 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* srec.c (srec_scan): Set lma as well as vma.
-
-	* ihex.c: New file; support for Intel Hex format.
-	* targets.c (enum bfd_flavour): Add bfd_target_ihex_flavour.
-	(ihex_vec): Declare.
-	(bfd_target_vector): Always include ihex_vec.
-	* bfd.c (struct _bfd): Add ihex_data field to tdata union.
-	* Makefile.in: Rebuild dependencies.
-	(BFD_LIBS): Add ihex.o
-	(BFD_LIBS_CFILES): Add ihex.c.
-	* bfd-in2.h: Rebuild.
-
-	* elf.c (assign_file_positions_for_segments): Sort the sections in
-	each segment.
-	(get_program_header_size): Return the right size if segment_map is
-	not NULL.
-	(copy_private_bfd_data): Don't bother to sort the sections.
-
-	* bfd.c (bfd_record_phdr): New function.
-	* bfd-in.h (bfd_record_phdr): Declare.
-	* bfd_in2.h: Rebuild.
-
-	* elf32-sparc.c (elf32_sparc_relocate_section): Remove bogus
-	BFD_ASSERT.
-
-	* libbfd.c (bfd_malloc, bfd_realloc): New functions.
-	(bfd_zmalloc): Return PTR, not char *.  Take size_t, not
-	bfd_size_type.
-	* libbfd-in.h (bfd_malloc, bfd_realloc): Declare.
-	(bfd_zmalloc): Change declaration.
-	* libbfd.h: Rebuild.
-	* Many files: Use bfd_malloc and bfd_realloc rather than malloc
-	and realloc.  Don't set bfd_error_no_memory if they fail.
-
-Thu Nov 30 19:32:26 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c: Added macros to tidy up toc cell treatment. Numerous
-	uses as well. Added a new howto to deal with TOCREL16 relocs that
-	are TOCDEFN as well.
-	(coff_ppc_relocate_section): Expanded treatment of ADDR32NB relocs
-	to handle RVA relocs from dlltool.
-	(ppc_coff_rtype2howto): TOCDEFN reloc addition.
-	(coff_ppc_rtype_to_howto): TOCDEFN reloc addition.
-	(ppc_coff_reloc_type_lookup): TOCDEFN reloc addition.
-
-	* coffcode.h (coff_set_alignment_hook): check idata$X sections
-	to get the right section alignment.
-
-Thu Nov 30 16:48:18 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (_bfd_elf_make_section_from_shdr): Don't set lma based on
-	p_paddr if p_paddr is zero.
-	(make_mapping): Set includes_filehdr and includes_phdrs for first
-	PT_LOAD segment.
-	(map_sections_to_segments): Set includes_phdrs for PT_PHDR
-	segment.
-	(assign_file_positions_for_segments): Handle includes_filehdr and
-	includes_phdrs.  Remove special handling of PT_PHDR and first
-	PT_LOAD segments.
-	(copy_private_bfd_data): Set includes_filehdr and includes_phdr
-	when appropriate.  Remove special handling of PT_PHDR segment.
-	Use a more complex condition for when a section is included in a
-	segment to handle Solaris linker oddities.
-
-Thu Nov 30 11:17:33 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
-
-	* coff-m88k.c (howto_table): Reformatted for easier reading;
-	special_function now points to new function m88k_special_reloc.
-	(howto_hvrt16): Function previously used for handling HVRT16 relocs
-	removed.
-	(rtype2howto): Do not add reloc's r_offset to the addend, this will
-	be done correctly by m88k_special_reloc.
-	(reloc_processing): New function to be used by RELOC_PROCESSING.
-	(RELOC_PROCESSING): Define to call reloc_processing.
-
-Wed Nov 29 12:42:36 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (pe_print_idata): Call malloc rather than xmalloc.
-	(pe_print_pdata): Likewise.
-
-	* opncls.c (bfd_alloc_by_size_t): Set bfd_error_no_memory if
-	obstack_alloc fails.
-	(bfd_alloc_finish): Set bfd_error_no_memory if obstack_finish
-	fails.
-	* libbfd.c (bfd_zmalloc): Set bfd_error_no_memory if malloc fails.
-	* Many files: don't set bfd_error_no_memory if one of the above
-	routines fails.
-
-	* elf.c (assign_file_positions_for_segments): Don't adjust p_paddr
-	if p_paddr_valid is set.
-	(copy_private_bfd_data): New static function.
-	(_bfd_elf_copy_private_section_data): Call copy_private_bfd_data.
-
-	* elf.c (assign_file_positions_for_segments): Fix case where extra
-	program headers were allocated.
-
-	* elf.c (_bfd_elf_print_private_bfd_data): New function.
-	* elf-bfd.h (_bfd_elf_print_private_bfd_data): Declare.
-	* elfxx-target.h (bfd_elfNN_bfd_print_private_bfd_data): Define to
-	_bfd_elf_print_private_bfd_data.
-
-	* coff-alpha.c (alpha_ecoff_swap_reloc_in): Don't abort if
-	r_symndx is RELOC_SECTION_NONE for an ALPHA_R_IGNORE reloc.
-	Change a RELOC_SECTION_LITA symndx to RELOC_SECTION_ABS.
-	(alpha_ecoff_swap_reloc_out): Change RELOC_SECTION_ABS to
-	RELOC_SECTION_LITA for ALPHA_R_IGNORE.
-	(alpha_adjust_reloc_out): For ALPHA_R_IGNORE, don't change
-	RELOC_SECTION_ABS to RELOC_SECTION_NONE.
-
-Tue Nov 28 16:59:50 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf-bfd.h (struct elf_obj_tdata): Add segment_map field.
-	* elf.c (make_mapping): New static function.
-	(map_sections_to_segments): New static function.
-	(elf_sort_sections): New static function.
-	(assign_file_positions_for_segments): New static function.
-	(map_program_segments): Remove.
-	(get_program_header_size): Remove sorted_hdrs, count, and
-	maxpagesize parameters.  Simplify.
-	(assign_file_positions_except_relocs): When generating an
-	executable, use assign_file_positions_for_segments.
-	(elf_sort_hdrs): Remove.
-	(_bfd_elf_sizeof_headers): Remove eliminated parameters from call
-	to get_program_header_size.
-
-Mon Nov 27 12:27:46 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* hp300hpux.c (MY(callback)): Set lma as well as vma.
-
-	* configure, config.in: Regenerate with autoconf 2.7.
-
-	* elf32-i386.c (elf_backend_plt_readonly): Set correctly, to 1.
-	* elf32-sparc.c (elf_backend_plt_readonly): Set correctly, to 0.
-
-Wed Nov 22 12:02:09 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_new_section_hook): Handle .rconst section.
-	(ecoff_sec_to_styp_flags): Likewise.
-	(_bfd_ecoff_styp_to_sec_flags): Handle STYP_RCONST.
-	(ecoff_set_symbol_info): Handle scRConst.
-	(ecoff_slurp_reloc_table): Handle RELOC_SECTION_RCONST.
-	(ecoff_compute_section_file_positions): Handle .rconst section.
-	(_bfd_ecoff_write_object_contents): Likewise.
-	(ecoff_link_check_archive_element): Handle scRConst.
-	(ecoff_link_add_externals): Likewise.
-	(ecoff_link_write_external): Handle .rconst section.
-	(ecoff_reloc_link_order): Likewise.
-	* ecofflink.c (bfd_ecoff_debug_accumulate): Handle scRConst.
-	* coff-alpha.c (alpha_convert_external_reloc): Handle .rconst
-	section.
-	(alpha_relocate_section): Handle RELOC_SECTION_RCONST.
-
-	* sunos.c (sunos_scan_dynamic_symbol): Only set written if the
-	DEF_DYNAMIC flag is set.
-
-Tue Nov 21 13:25:29 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* host-aout.c: If TRAD_HEADER is defined, include it.
-
-Tue Nov 21 13:03:57 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aclocal.m4 (AC_PROG_CC): Remove local definition.
-	(BFD_BINARY_FOPEN): Require AC_CANONICAL_SYSTEM.
-	(BFD_NEED_DECLARATION): New function.
-	* configure.in: Use BFD_NEED_DECLARATION.
-	* acconfig.h: Put NEED_DECLARATION_* in @TOP@ section.
-	* configure, config.in: Rebuild with autoconf 2.6.
-
-	* xcofflink.c (bfd_xcoff_size_dynamic_sections): Clear
-	special_sections before returning when called with a non XCOFF
-	BFD.
-
-	* coffgen.c (coff_renumber_symbols): Sort common symbols with
-	global symbols.
-
-	* coffcode.h (coff_compute_section_file_positions): Only pad the
-	previous section to force file alignment when creating an
-	executable.
-
-Mon Nov 20 14:54:09 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_compute_section_file_positions): If
-	RS6000COFF_C, set up the .debug section.
-
-	* xcofflink.c (xcoff_link_input_bfd): Adjust the TOC anchor value
-	if it is not large enough to accomodate the entire TOC area with
-	signed 16 bit offsets.
-	(xcoff_write_global_symbol): Handle negative TOC offsets in global
-	linkage code.
-	(_bfd_ppc_xcoff_relocate_section): Adjust relocations against a
-	TOC anchor to use the TOC value used in the output file.
-
-Sat Nov 18 18:01:41 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffgen.c (_bfd_coff_get_external_symbols): Cast malloc return.
-	(_bfd_coff_read_string_table): Likewise.
-
-Sat Nov 18 19:43:04 1995  Richard Earnshaw (rearnsha@armltd.co.uk)
-
-	* pe-arm.c: Fix typos.
-	* coff-arm.c: Likewise.
-
-Fri Nov 17 16:22:04 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (list_ele): Added "cat"egory member.
-	(record_toc): New category parameter (priv or pub).
-	(ppc_record_toc_entry): Check to see if toc bounds exceeded.
-	(ppc_process_before_allocation): Removed embrionic data-in-toc from
-	the mainline. It addes extra toc cells in error.
-	(ppc_coff_swap_sym_in_hook): Added some documentation.
-	(dump_toc): Can now diagnose "virtual toc" chicanery.
-
-Fri Nov 17 10:41:25 1995  Philippe De Muyter  <phdm@info.ucl.ac.be>
-
-	* elf-bfd.h (struct elf_link_hash_table): Change type of
-	dynsymcount and bucketcount fields from size_t to bfd_size_type.
-
-Fri Nov 17 10:02:58 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_pointerize_aux_hook): I960 version: don't
-	pointerize C_LEAFSTAT or C_LEAFEXT entries.
-
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Only create
-	DT_INIT and DT_FINI entries if the _init or _fini symbol is
-	defined or mentioned in a regular file.
-
-Thu Nov 16 15:16:42 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (ppc_record_data_in_toc_entry): new function
-	(coff_ppc_relocate_section): Handle TOCDEFN attribute
-	(coff_ppc_relocate_section): Correct REL24 handling
-	(ppc_process_before_allocation): Correct TOCDEFN handling
-
-	* peicode.h (dir_names): Added name descriptions
-
-Thu Nov 16 03:38:03 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* VERSION: Updated to cygnus-2.6.
-
-Wed Nov 15 19:30:07 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* targets.c (m68k4knetbsd_vec): Declare.
-
-Wed Nov 15 18:05:52 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* targets.c (bfd_target): Change type of second argument to
-	_bfd_print_private_bfd_data from void * to PTR.
-	* libbfd-in.h (_bfd_generic_bfd_print_private_bfd_data): Cast
-	using PTR rather than void *.
-	* bfd-in2, libbfd.h: Rebuild.
-	* peicode.h (pe_print_private_bfd_data): Change vfile from void *
-	to PTR.
-	* elfxx-target.h (bfd_elfNN_bfd_print_private_bfd_data): Define as
-	_bfd_generic_bfd_print_private_bfd_data rather than casting
-	bfd_true.
-
-Wed Nov 15 04:09:14 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* Makefile.in (.dep1): Fix stupid typo in last change.  Remove any
-	"DO NOT DELETE" lines or blank lines that mkdep writes on some
-	systems.
-	(BFD_LIBS_CFILES, ALL_MACHINES_CFILES, BFD32_BACKENDS_CFILES,
-	BFD64_BACKENDS_CFILES): New variables.
-	(CFILES): Use them.
-
-Tue Nov 14 11:52:23 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (coff_swap_aouthdr_out): For PPC PE, start isize at 0,
-	not at the file position of the first section.
-	* coffcode.h (coff_compute_section_file_positions): Avoid using
-	unportable #elif.
-	(coff_write_object_contents): When generating a PPC PE executable
-	with no symbols, round up the file size to a COFF_PAGE_SIZE
-	boundary.
-	* cofflink.c (_bfd_coff_final_link): If there are no symbols,
-	don't write out a string table.
-
-	* elf.c (bfd_section_from_shdr): When using a different section
-	header, pass the new one to _bfd_elf_make_section_from_shdr.
-	(elf_fake_sections): Don't set sh_info and sh_entsize fields.
-	(elf_map_symbols): Add section VMA to symbol value when comparing
-	against 0.
-	(_bfd_elf_compute_section_file_positions): Only build symbol table
-	if there are some symbols.  Set file offset of symtab and strtab
-	sections.
-	(assign_file_positions_except_relocs): Remove dosyms parameter.
-	Change all callers.  Never set file offset of symtab and strtab
-	sections.
-	(_bfd_elf_copy_private_section_data): New function.
-	(MAP_ONESYMTAB, MAP_DYNSYMTAB, MAP_STRTAB, MAP_SHSTRTAB): Define.
-	(_bfd_elf_copy_private_symbol_data): New function.
-	(swap_out_syms): Check for special mapping of st_shndx created by
-	copy_private_symbol_data.
-	* elfxx-target.h: Use new copy routines.
-	* elf-bfd.h (_bfd_elf_copy_private_symbol_data): Declare.
-	(_bfd_elf_copy_private_section_data): Declare.
-
-	* config.bfd (sh-*-*): Set targ_defvec to shcoff_vec.
-
-	* coffcode.h (coff_slurp_symbol_table): If COFF_WITH_PE, handle
-	C_NT_WEAK.
-
-	* coff-sh.c (shlcoff_vec): Use _bfd_generic_archive_p, not
-	_bfd_dummy_target, matching the recent change to archive
-	recognition.
-
-Mon Nov 13 13:24:38 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd.c (bfd_get_file_window): Use casts to avoid doing
-	arithmetic on PTR types.
-
-	* aout-target.h (MY(callback)): Set the lma of the sections.
-
-	* ecoff.c (ecoff_reloc_link_order): Turn a reloc against a defined
-	symbol into a reloc against the section.
-
-Mon Nov 13 07:31:35 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (ppc_coff_link_hash_entry): added support for inline
-	glue for the relocs: IMGLUE and IFGLUE.
-	(record_toc): new function - tracks toc contents
-	(ppc_mark_symbol_as_glue): new function - supports the IMGLUE reloc
-	(coff_ppc_relocate_section): Added support and fixes for IMGLUE/IFGLUE
-	(ppc_coff_rtype2howto): removed invalid IMGLUE hack
-	(coff_ppc_rtype_to_howto): removed invalid IMGLUE hack
-	(ppc_record_toc_entry): Removed a debug define (duh)
-
-	* peicode.h (coff_swap_scnhdr_out): Fixed invalid strcmp for ".reldata"
-	(pe_print_idata): New function - formats the idata section data
-	(pe_print_pdata): New function - formats the pdata section data
-	(pe_print_private_bfd_data): calls to above
-
-Sun Nov 12 12:23:24 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* Makefile.in (bfd_libs_here, etc): Provide empty definitions.
-	* coff-rs6000.c (rs6000coff_vec): Add conditional defines
-	TARGET_SYM and TARGET_NAME for vector and BFD name.
-	* coff-pmac.c (pmac_xcoff_vec): Remove.
-	(TARGET_SYM, TARGET_NAME): Define.
-	* coffcode.h (coff_set_arch_mach_hook) [POWERMAC]: Set the
-	machine to 0, not all PowerMacs are 601s.
-
-Fri Nov 10 12:10:14 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_object_p): Read in any program headers.
-	* elf.c (_bfd_elf_make_section_from_shdr): Adjust section lma
-	based on the program headers, if any.
-	(elf_fake_sections): Set sh_addr from the vma, not the lma.
-	(map_program_segments): Set p_paddr of program headers based on
-	the lma.
-
-Thu Nov  9 13:01:31 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* archive.c (bfd_generic_archive_p): Preserve tdata in case of
-	failure.
-
-	* aoutx.h (NAME(aout,final_link)): Report a reasonable error when
-	trying to do a relocateable link with a non-a.out object file.
-
-	* archive.c (bfd_generic_archive_p): Check the first object file
-	in an archive even if target_defaulted is set.  If the object file
-	has the wrong xvec, reject it.
-
-	* aoutx.h (NAME(aout,set_section_contents)): If a section can not
-	be represented, report the name via _bfd_error_handler.
-	(translate_to_native_sym_flags): Likewise.
-	* elf32-mips.c (mips_elf_final_link): Likewise.
-	* oasys.c (oasys_write_sections): Likewise.
-
-	* coffcode.h (coff_set_alignment_hook): Write RS6000COFF_C version
-	which checks for STYP_OVRFLO sections.
-	(coff_compute_section_file_positions): If RS6000COFF_C, handle
-	reloc and lineno count overflows.
-	(coff_write_object_contents): Call coff_count_linenumbers before
-	coff_compute_section_file_positions.  If RS6000COFF_C, handle
-	reloc and lineno count overflows.
-	* xcofflink.c (_bfd_xcoff_bfd_final_link): Count line numbers and
-	relocs before dealing with .pad sections.  Count overflow section
-	headers when handling .pad sections.
-
-	* coffcode.h (coff_write_object_contents): Set a.out vstamp to 1
-	if RS6000COFF_C.
-
-	* xcofflink.c (XCOFF_DESCRIPTOR): Define.
-	(struct xcoff_link_hash_table): Add descriptor_section and
-	special_sections fields.
-	(_bfd_xcoff_bfd_link_hash_table_create): Initialize new fields.
-	(xcoff_link_add_symbols): Set linkage section alignment.  Create
-	descriptor section.  Check for magic symbol names (_text, etc.),
-	and record them in special_sections if found.  Set
-	XCOFF_DESCRIPTOR flag for a function descriptor, and set its
-	descriptor field to point back to the function code symbol.
-	(xcoff_sweep): Always mark the special descriptor_section.
-	(bfd_xcoff_export_symbol): Check whether the symbol might be a
-	function descriptor, and mark it if it is.
-	(bfd_xcoff_size_dynamic_sections): Add new special_sections
-	parameter, and fill it in.  Allocate space for the descriptor
-	section.
-	(xcoff_build_ldsyms): Set XCOFF_DEF_REGULAR flag when defining
-	global linkage code.  If an undefined function descriptor is
-	exported, arrange to define it.  Warn about any other undefined
-	exported symbol.
-	(_bfd_xcoff_bfd_final_link): Write out the descriptor section.
-	(xcoff_write_global_symbol): Create a function descriptor when
-	necessary.
-	* bfd-in.h (bfd_xcoff_size_dynamic_sections): Update declaration.
-	* bfd-in2.h: Rebuild.
-
-Thu Nov  9 08:40:23 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (ppc_coff_link_hash_entry): new types for hashing
-	(ppc_coff_link_hash_table): new types for hashing
-	(ppc_coff_link_hash_newfunc): hash entry constructor
-	(ppc_coff_link_hash_table_init): hash table initializer
-	(ppc_coff_link_hash_table_create): hash table constructor
-	(ppc_record_toc_entry): changed references to hash table
-	(coff_ppc_relocate_section): changed references to hash table
-
-	* libcoff-in.h (coff_link_hash_entry): removed toc_offset
-	* libcoff.h: Rebuild
-
-	* cofflink.c (_bfd_coff_link_hash_newfunc): removed toc_offset init
-	(coff_link_add_symbols): removed toc_offset init
-
-Thu Nov  9 04:00:38 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* Makefile.in (.dep1): Make sure the file mkdep is to write exists
-	first.
-
-	* configure.in: Added new option --with[out]-mmap.  Set USE_MMAP
-	if it is given and mmep is available.
-	* acconfig.h: Undef USE_MMAP.
-	* configure, config.in: Regenerated.
-	* aoutx.h: If USE_MMAP is not defined, do all symbol and string
-	table handling the old way.
-	(aout_get_external_symbols): Don't complain if last byte of string
-	table is nonzero.
-	* libbfd.c [HAVE_MADVISE]: Include sys/types.h and sys/mman.h.
-	(bfd_free_window) [! USE_MMAP]: Don't define.
-	(bfd_get_file_window,
-	_bfd_generic_get_section_contents_in_window) [! USE_MMAP]: Abort.
-
-Wed Nov  8 20:03:44 1995  Eric Freudenthal <freudenthal@nyu.edu>
-
-	* coff-a29k.c (SIGN_EXTEND_HWORD): Use ~0xffff rather than
-	0xffff0000.
-
-Wed Nov  8 11:31:11 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-a29k.c (a29k_reloc): Change handling of R_IREL reloc to be
-	compatible with AMD generated COFF files.  Try to support both AMD
-	and GNU formats simultaneously.
-	(coff_a29k_relocate_section): Likewise.
-
-	* libbfd.c (bfd_get_file_window): Change writable parameter from
-	int to boolean; update all callers.  Pass MAP_SHARED if not
-	writable--it's required on Solaris.  Cast fprintf argument to
-	avoid warning.
-	* bfd-in.h (bfd_get_file_window): Update declaration.
-	* bfd-in2.h: Rebuild.
-	* aoutx.h: Update calls to bfd_get_file_window.
-
-	* xcofflink.c (XCOFF_DEF_DYNAMIC): Rename from XCOFF_REF_DYNAMIC.
-	Change all uses.
-	(xcoff_swap_ldhdr_in): New static function.
-	(xcoff_swap_ldsym_in): New static function.
-	(xcoff_find_reloc): Handle the case of a single reloc correctly.
-	(xcoff_link_add_symbols): If we just created a descriptor, pass it
-	to _bfd_generic_link_add_one_symbol, to save a hash lookup.
-	Handle XTY_ER/XMC_XO symbols correctly.
-	(xcoff_link_add_dynamic_symbols): Rewrite to read .loader symbols
-	rather than normal symbol table.
-	(bfd_xcoff_import_symbol): It's not an error if the symbol is
-	already defined with the same absolute value.
-	(xcoff_mark): When considering called symbols, check whether the
-	descriptor is from a dynamic object, rather than the symbol
-	itself.
-	(xcoff_build_ldsyms): Likewise.
-
-	* libbfd.c (bfd_get_file_window): Change return type to boolean.
-	Cast realloc and malloc return values.  If malloc or realloc fail,
-	set bfd_error_no_memory.
-	* bfd-in.h (bfd_get_file_window): Change type to boolean.
-	* bfd-in2.h: Rebuild.
-
-Tue Nov  7 11:53:48 1995  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (ppc_record_toc_entry): new function.
-	(in_reloc_p): changed return value.
-	(coff_ppc_relocate_section): much rework.
-	(ppc_allocate_toc_section): new function.
-	(ppc_process_before_allocation): new function.
-	(ppc_coff_swap_sym_in_hook): new function.
-
-	* cofflink.c (_bfd_coff_link_hash_newfunc): initialize toc_offset.
-	(coff_link_add_symbols): initialize toc_offset.
-
-	* peicode.h (coff_swap_sym_in): Added coff_swap_sym_in_hook
-	(coff_swap_aouthdr_out): Added more sections to the data
-	dictionary for the pe file header. Also changed linker version
-	number on the ppc side.
-	(dir_names): small improvements to the dictionary printing.
-	(pe_mkobject_hook): save the file level flags.
-
-	* libcoff-in.h (coff_link_hash_entry): added toc_offset field
-	(pe_tdata): added real_flags field
-	(coff_tdata): added local_toc_sym_map and access macro
-
-	* libcoff.h (coff_link_hash_entry): added toc_offset field
-	(pe_tdata): added real_flags field
-	(coff_tdata): added local_toc_sym_map and access macro
-
-	* coffcode.h (coff_set_alignment_hook): added hook for PE.
-	(coff_mkobject): init for local_toc_sym_map
-	(coff_write_object_contents): set the internal_a.magic to
-        IMAGE_NT_OPTIONAL_HDR_MAGIC which appears to be what other
-	ppc compilers use.
-
-Tue Nov  7 13:48:58 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecofflink.c (_bfd_ecoff_locate_line): Keep looking through stabs
-	entries until both the line number address and the function name
-	address are too large.
-
-	* configure.in: Call AC_CHECK_PROG to find and cache AR.
-	* configure: Rebuilt.
-
-	* aclocal.m4 (BFD_CC_FOR_BUILD): Don't define CC_FOR_BUILD if it
-	is defined in the environment.
-
-Tue Nov  7 10:57:24 1995  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (som_get_section_contents_in_window): Define to use
-	generic version.
-
-Mon Nov  6 17:13:15 1995  Harry Dolan  <dolan@ssd.intel.com>
-
-	* coff-i860.c: New file, based on coff-i386.c.
-	* cpu-i860.c: New file, based on cpu-i386.c.
-	* hosts/i860mach3.h: New file, based on hosts/i386mach3.h.
-	* config.bfd (i860-*-mach3*, i860-*-osf1*, i860-*-coff*): New
-	targets, using i860coff_vec.
-	* configure.in (i860-*-mach3*, i860-*-osf1*): New hosts, using
-	trad-core.o and hosts/i860mach3.h.
-	(i860coff_vec): Use coff-i860.o and cofflink.o.
-	* configure: Rebuild.
-	* Makefile.in: Rebuild dependencies.
-	(ALL_MACHINES): Add cpu-i860.o.
-	(BFD32_BACKENDS): Add coff-i860.o.
-	(CFILES): Add cpu-i860.c and coff-i860.c.
-	* targets.c (i860coff_vec): Declare.
-	(bfd_target_vector): Add &i860coff_vec.
-	* archures.c (bfd_i860_arch): Declare.
-	(bfd_archures_list): Add &bfd_i860_arch.
-	* coffcode.h (coff_set_arch_mach_hook): Handle I860 magic number.
-	(coff_set_flags): Handle bfd_arch_i860.
-	(coff_write_object_contents): Handle I860 a.out magic number.
-
-Mon Nov  6 14:34:07 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_symbols): Set the alignment power of
-	the created .tc section to 2.
-	(xcoff_mark): Don't keep a .loader reloc for a call to an
-	undefined symbol when creating a shared library.
-	(xcoff_build_ldsyms): When creating a shared library, generate
-	global linkage code for a call to an undefined symbol.
-
-Sun Nov  5 21:44:13 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* Makefile.in (CFILES): Rebuild list from BFD_LIBS, ALL_MACHINES,
-	BFD32_BACKENDS, BFD64_BACKENDS.
-	(.dep1): Put mkdep output in a separate file.
-	Rebuilt dependencies.
-
-	* ecoff.c (_bfd_ecoff_slurp_armap): Cast _bfd_read_ar_hdr return
-	value.
-
-	Permit use of mmap when available:
-
-	* configure.in: Check for mmap, madvise, mprotect.
-	* config.in, configure: Regenerated.
-
-	* libbfd.c (struct _bfd_window_internal): Define type.
-	(bfd_init_window, bfd_free_window, bfd_get_file_window): New
-	functions.
-	(ok_to_map): New static variable for debugging.
-	(_bfd_generic_get_section_contents_in_window): New function.
-	* bfd-in.h (bfd_window_internal): Declare type.
-	(bfd_window): Define type.
-	(bfd_init_window, bfd_free_window, bfd_get_file_window): Declare.
-	* libbfd-in.h (_bfd_generic_get_section_contents_in_window):
-	Declare.
-
-	* libaout.h (struct aoutdata): Add two window fields.
-	(obj_aout_sym_window, obj_aout_string_window): New macros.
-	* aoutx.h (some_aout_object_p): Initialize windows.
-	(aout_get_external_symbols): Get symbol data and strings in
-	windows instead of explicitly allocated buffers.
-	(slurp_symbol_table): Free window instead of memory.
-	(bfd_free_cached_info): Release windows instead of freeing storage
-	directly.
-	(aout_link_free_symbols): Ditto.
-
-	* targets.c (bfd_target): Add new field for
-	get_section_contents_in_window.
-	(BFD_JUMP_TABLE_GENERIC): Updated.
-	* aout-adobe.c, aout-target.h, binary.c, bout.c, coff-alpha.c,
-	coff-mips.c, elfxx-target.h, i386msdos.c, i386os9k.c, ieee.c,
-	libcoff-in.h, oasys.c, srec.c, tekhex.c, versados.c: Added new
-	macros for get_section_contents_in_window field.
-
-Sat Nov  4 12:23:26 1995  Fred Fish  <fnf@cygnus.com>
-
-	* core.c: Renamed to corefile.c
-	* makefile.dos (OBJS): Change core.o to corefile.o
-	* Makefile.in (CFILES, BFD_LIBS): Use corefile.c instead of core.c
-
-Fri Nov  3 15:54:59 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_symbols): Rename local variable sub
-	to o.  Clobber and restore the list of new csects around the call
-	to _bfd_generic_link_add_one_symbol, in case it wants to report a
-	linker error and the linker wants to read the symbol table.  Reset
-	the line number count of a real section even if it has no relocs.
-	(_bfd_xcoff_bfd_final_link): If shared, set the DYNAMIC flag.
-
-	* coffgen.c (_bfd_coff_read_string_table): Warn if the string size
-	is too small.
-
-Thu Nov  2 23:16:39 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (_bfd_ppc_xcoff_relocate_section): Don't warn about
-	an undefined symbol in a shared link.
-
-	* linker.c (_bfd_generic_link_add_one_symbol): Correct type of
-	oldtype from bfd_link_order_type to bfd_link_hash_type.  From
-	phdm@info.ucl.ac.be (Philippe De Muyter).
-
-Wed Nov  1 14:26:02 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
-
-	* coff-m88k.c (rtype2howto): New static function.
-	(RTYPE2HOWTO): Use it rather than a macro definition.
-
-	* coffcode.h (coff_write_object_contents): set internal_a.magic
-	to PAGEMAGICPEXECPAGED #if defined (M68) && !defined (LYNXOS).
-
-	* configure.in: m68*-motorola-sysv* does not use ptrace-core.o;
-	define TRAD_HEADER to new file hosts/delta68.h.
-	m88*-motorola-sysv*, however, does use ptrace-core.o.
-	* hosts/delta68.h: New file.
-
-	* ptrace-core.c (ptrace_unix_core_file_p): change bfd_zmalloc to
-	bfd_zalloc; provide proper parm abfd to calls to bfd_zalloc.
-
-Wed Nov  1 13:51:54 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* i386linux.c (MY(vec)): Declare before use.
-
-Wed Nov  1 11:45:07 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* reloc16.c (bfd_coff_reloc16_get_relocated_section_contents):
-	Pass input_bfd, not in_bfd, to bfd_coff_reloc16_extra_cases.
-
-	* elf.c (bfd_elf_set_dt_needed_name): Don't do anything if the
-	BFD is not of the right type.
-	(bfd_elf_get_needed_list): Likewise.
-	* i386linux.c (bfd_linux_size_dynamic_sections): Likewise.
-	* sunos.c (bfd_sunos_get_needed_list): Likewise.
-	* xcofflink.c (XCOFF_XVECP): Define.
-	(bfd_xcoff_link_record_set): Don't do anything if the BFD is not
-	of the right type.
-	(bfd_xcoff_import_symbol): Likewise.
-	(bfd_xcoff_export_symbol): Likewise.
-	(bfd_xcoff_link_count_reloc): Likewise.
-	(bfd_xcoff_record_link_assignment): Likewise.
-	(bfd_xcoff_size_dynamic_sections): Likewise.
-
-	* sunos.c (sunos_scan_ext_relocs): Only check the reloc symbol
-	table index against the number of symbols for a base relative
-	reloc.
-
-	* coff-rs6000.c (_bfd_xcoff_sizeof_headers): Change from macro to
-	static function.
-	* xcofflink.c (_bfd_xcoff_bfd_link_hash_table_create): Set
-	full_aouthdr flag here...
-	(_bfd_xcoff_bfd_final_link): ...not here.
-
-Tue Oct 31 12:52:02 1995  Fred Fish  <fnf@cygnus.com>
-
-	* libelf.h:  Rename to elf-bfd.h to avoid conflict with
-	systems that have a system <libelf.h>.
-	* Makefile.in: Globally replace libelf.h with elf-bfd.h.
-	* bfd.c, elf.c, elf32-arc.c, elf32-gen.c, elf32-hppa.c,
-	elf32-hppa.h, elf32-i386.c, elf32-i860.c, elf32-m68k.c,
-	elf32-m88k.c, elf32-mips.c, elf32-ppc.c, elf32-sparc.c,
-	elf64-gen.c, elf64-sparc.c, elfcode.h, elflink.c,
-	elfxx-target.h: Include elf-bfd.h rather than libelf.h.
-	* elfxx-target.h: Change libelf.h reference to elf-bfd.h.
-
-Tue Oct 31 15:30:07 1995  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* ecoff.c (ecoff_set_symbol_info): Add new parameter weak.  If
-	set, set BSF_WEAK in symbol.  Change all callers.
-	(ecoff_get_extr): Set weakext based on BSF_WEAK.
-	(ecoff_link_add_externals): If weakext is set, pass BSF_WEAK to
-	_bfd_generic_link_add_one_symbol.
-	(ecoff_indirect_link_order): Check that the section tdata relocs
-	are not NULL before using them.
-
-	* configure.in (alpha*-*-linux*): Set COREFILE to trad-core.o and
-	define TRAD_HEADER as hosts/alphalinux.h.
-	* configure: Rebuild.
-	* hosts/alphalinux.h: New file.
-	* trad-core.c (trad_unix_core_file_p): Cast u.u_ar0 to bfd_vma,
-	not int.
-
-Tue Oct 31 12:34:11 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_slurp_symbol_table): Accept C_BCOMM and
-	C_ECOMM storage classes.
-
-	* xcofflink.c (xcoff_mark_symbol): New static function, broken out
-	of xcoff_mark.
-	(xcoff_mark): Call xcoff_mark_symbol.
-	(bfd_xcoff_export_symbol): Call xcoff_mark_symbol.
-	(bfd_xcoff_link_count_reloc): Call xcoff_mark_symbol rather than
-	doing it by hand.
-	(xcoff_build_ldsyms): Build a .loader symbol for an export symbol.
-
-Mon Oct 30 14:53:48 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (struct xcoff_final_link_info): Add new line_filepos
-	field.
-	(xcoff_find_reloc): New static function.
-	(xcoff_link_add_symbols): Use it.
-	(_bfd_xcoff_bfd_final_link): Set finfo.line_filepos.
-	(xcoff_link_input_bfd): Handle C_BINCL and C_EINCL.  Don't
-	relocate the value of C_DECL.
-
-	* elf.c (elf_fake_sections): Remove bogus BFD_ASSERT.
-
-Sat Oct 28 01:25:34 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Make
-	callback decide what goes in .relocs.
-	* pe[i]-i386.c (TARGET_UNDERSCORE): Define.
-	* peicode.h (pe_mkobject_hook): Only copy aouthdr if
-	there is one.
-
-Sat Oct 28 01:51:02 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_symbols): Handle csects in the
-	absolute section.
-
-Fri Oct 27 18:14:39 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c: More improvements, mostly to fix handling of
-	constructors and a few other special cases.
-	* coff-rs6000.c (rs6000coff_vec): Set symbol_leading_char back to
-	zero, reverting yesterday's change.
-	* bfd-in.h (bfd_xcoff_link_record_set): Declare.
-	(bfd_xcoff_link_count_reloc): Declare.
-	(bfd_xcoff_record_link_assignment): Declare.
-	* bfd-in2.h: Rebuild.
-
-Fri Oct 27 14:42:15 1995  Niklas Hallqvist  <niklas@appli.se>
-
-	* PORTING, aout-arm.c, aout-encap.c, aout-target.h,
-	aoutx.h, gen-aout.c, host-aout.c, hp300bsd.c, i386aout.c
-	i386bsd.c, i386dynix.c, i386linux.c, i386lynx.c, i386mach3.c,
-	i386netbsd.c, m68klynx.c, m88kmach3.c, mipsbsd.c, newsos3.c,
-	ns32knetbsd.c, pc532-mach.c, riscix.c, sparclynx.c, sparcnetbsd.c:
-	Change PAGE_SIZE to TARGET_PAGE_SIZE.
-
-	* m68knetbsd.c: Ditto as well as add support for the m68k4k object
-	format.
-
-	* netbsd.h: Double ditto (incl. m68k4k support).  NetBSD's text
-	segments includes the a.out header.  See to that the magic number
-	*always* is big-endian.
-
-	* config.bfd: Add m68*-hp*-netbsd* case.  Cross-pollinate m68k and
-	m68k4k NetBSD configurations.
-
-	* configure.in, configure: Separate i386 & mips NetBSD
-	configurations from other BSD ones.  Don't assume DEC is the only
-	thing NetBSD/mips run on.  Add {m68k,ns32k,sparc}-*-netbsd*
-	configurations.  Add support for m68k4k NetBSD object format.
-
-	* libaout.h: Added M_68K4K_NETBSD magic.
-
-	* m68k4knetbsd.c: New file.
-
-	* hosts/{m68k,sparc}nbsd.h: Don't define HOST_BIG_ENDIAN_P.
-
-	* hosts/nbsd.h: Define HOST_BIG_ENDIAN_P according to
-	<machine/endian.h>.
-
-	* hosts/mipsnbsd.h: New file.
-
-Thu Oct 26 14:16:47 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c: Numerous changes to get closer to a working XCOFF
-	linker.
-	* libcoff-in.h (struct xcoff_tdata): Add full_aouthdr,
-	toc_section, and entry_section fields.
-	(struct xcoff_section_tdata): Remove ldrel_count field.
-	* libcoff.h: Rebuild.
-	* coffcode.h (coff_mkobject_hook): Initialize new xcoff_data
-	fields.
-	(coff_compute_section_file_positions): If RS6000COFF_C, generate
-	full a.out header if full_aouthdr is set in xcoff_data.
-	(coff_write_object_contents): Likewise.  Set o_snentry and o_sntoc
-	based on sections stored in xcoff_data.
-	* coff-rs6000.c (xcoff_copy_private_bfd_data): Copy new xcoff_data
-	fields.
-	(xcoff_reloc_type_lookup): Handle BFD_RELOC_CTOR.
-	(rs6000coff_vec): Set symbol_leading_char to '.'.
-	* coffgen.c (coff_get_symbol_info): If fix_value is set, fix the
-	value stored in ret rather than returning a pointer value.
-
-Wed Oct 25 23:10:39 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* config.bfd (powerpc{,le}-{elf,sysv4,eabi,solaris2}): Remove MAC
-	format for now.
-
-Wed Oct 25 16:19:27 1995  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (som_slurp_string_table): Allocate the strings with malloc
-	since they're free'd by free_cached_info.
-	(som_slurp_symbol_table): Similarly for the symbol table.
-
-Wed Oct 25 14:59:22 1995  Per Bothner  <bothner@kalessin.cygnus.com>
-
-	* Makefile.in (diststuff):  Don't make headers.
-
-Wed Oct 25 11:32:54 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in: Rebuild dependencies.
-
-	* sunos.c (bfd_sunos_record_link_assignment): Don't do anything if
-	output_bfd is not SunOS.
-	(bfd_sunos_size_dynamic_sections): Likewise.  Don't scan relocs of
-	non-SunOS input files.
-
-	* xcofflink.c: Extensive changes to support linking shared objects
-	and generating a .loader section.
-	* libcoff-in.h (struct xcoff_tdata): Add import_file_id field.
-	(struct xcoff_section_tdata): Add lineno_count, first_symndx,
-	last_symndx, and ldrel_count fields.
-	* libcoff.h: Rebuild.
-	* coff-rs6000.c (xcoff_howto_table): Correct reloc names.
-	* coffcode.h (styp_to_sec_flags): Don't set any flags if STYP_PAD
-	is set.
-	* bfd-in.h (bfd_xcoff_import_symbol): Declare.
-	(bfd_xcoff_export_symbol): Declare.
-	(bfd_xcoff_size_dynamic_sections): Declare.
-	* bfd-in2.h: Rebuild.
-
-Tue Oct 24 17:44:20 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* configure.in: Add xcofflink.o to pmac_xcoff_vec.
-	* configure: Rebuild.
-	* mpw-config.in: Add xcofflink.c.o to powerpc-apple-macos.
-	* coff-pmac.c: Include coff-rs6000.c instead of duplicating its
-	contents.
-	(pmac_xcoff_vec): Update to use new xcoff support.
-	* coff-rs6000.c (xcoff_generic_stat_arch_elt): Make static.
-	(xcoff_write_armap): Declare buf as unsigned char.
-	* xcofflink.c (xcoff_link_add_symbols): Declare a local as PTR.
-
-	* mpw-make.sed: Generalize subdir_do edit.
-
-Tue Oct 24 10:25:01 1995  Jeffrey A Law  (law@cygnus.com)
-
-	* hppabsd-core.c (make_bfd_asection): Initialize asect->filepos
-	correctly.  Don't initialize asect->vma.
-
-Fri Oct 20 13:23:48 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* opncls.c (_bfd_new_bfd): If _bfd_chunksize wasn't preset, use
-	something a little less than the page size.
-
-Thu Oct 19 13:06:09 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i960.c (coff_i960_adjust_symndx): Clear *adjustedp.
-
-Wed Oct 18 16:20:08 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* coff-i386.c (coff_i386_reloc_type_lookup): New.
-	* coffcode.h (coff_write_object_contents): If .bss is before
-	.data us that as data_start.
-	* cofflink.c (_bfd_coff_generic_relocate_section): Get reloc
-	calc correct.
-	* peicode.h (add_data_entry): Use _cooked_size of data directory.
-	(coff_swap_outhdr_out): Hardwire in version number.
-
-Wed Oct 18 16:50:54 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* sunos.c (sunos_add_dynamic_symbols): Rename local variables
-	major and minor to *_vno, since the former are also macros in
-	SunOS header files.  Cast result of bfd_alloc to appropriate
-	type.
-
-	* coffgen.c (coff_find_nearest_line): Cast used_by_bfd value
-	before assigning to sec_data.
-
-Wed Oct 18 13:25:17 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_find_nearest_line): The offset argument is
-	now relative to the section, not absolute.
-	* ecofflink.c (_bfd_ecoff_locate_line): Use the right symbol to
-	get the file name when there is a N_SO directory name.  When
-	handling stabs, remember that section->vma was added to the
-	offset.
-
-Tue Oct 17 18:24:54 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (struct sunos_link_hash_table): Add needed field.
-	(sunos_link_hash_table_create): Call bfd_release, not free.
-	(sunos_link_hash_table_create): Initialize needed field.
-	(sunos_add_dynamic_symbols): Record needed objects.
-	(bfd_sunos_get_needed_list): New function.
-	* bfd-in.h (bfd_sunos_get_needed_list): Declare.
-	* bfd-in2.h: Rebuild.
-
-Mon Oct 16 14:43:59 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* libcoff-in.h (pe_data_type.in_reloc_p): New.
-
-Mon Oct 16 10:52:50 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd-in.h (struct bfd_link_needed_list): Rename from
-	bfd_elf_link_needed_list.
-	* bfd-in2.h: Rebuild.
-	* elf.c, elflink.h, libelf.h: Corresponding changes.
-
-	Add start at AIX linker support; no shared libraries yet.
-	* xcofflink.c: New file.
-	* configure.in (rs600coff_vec): Use xcofflink.o.
-	* configure: Rebuild.
-	* libcoff-in.h (struct xcoff_tdata): Add csects and debug_indices
-	fields.
-	(struct xcoff_section_tdata): Define.
-	(xcoff_section_data): Define macro.
-	(_bfd_xcoff_bfd_link_hash_table_create): Declare.
-	(_bfd_xcoff_bfd_link_add_symbols): Declare.
-	(_bfd_xcoff_bfd_final_link): Declare.
-	(_bfd_ppc_xcoff_relocate_section): Declare.
-	* libcoff.h: Rebuild.
-	* coff-rs6000.c: Clean up a bit.
-	(xcoff_mkobject): Default modtype to 1L, not RE.  Initialize
-	cputype, csects, and debug_indices.
-	(xcoff_copy_private_bfd_data): Copy cputype.
-	(xcoff_howto_table): Rename from rs6000coff_howto_table.
-	(xcoff_rtype2howto): Rename from rs6000coff_rtype2howto.
-	(xcoff_reloc_type_lookup): Rename from
-	rs6000coff_reloc_type_lookup.
-	(coff_relocate_section): Define.
-	(_bfd_xcoff_sizeof_headers): Define.
-	(_bfd_xcoff_bfd_get_relocated_section_contents): Define.
-	(_bfd_xcoff_bfd_relax_section): Define.
-	(_bfd_xcoff_bfd_link_split_section): Define.
-	(rs6000coff_vec): For BFD_JUMP_TABLE_LINK, use _bfd_xcoff, not
-	coff.
-	* coffcode.h (coff_compute_section_file_positions): If AIX,
-	increment sofar by SMALL_AOUTSZ if not executable.
-	(coff_write_object_contents): If AIX, always output an a.out
-	header; if not executable, header size of SMALL_AOUTSZ.
-	* hash.c (struct bfd_strtab_hash): Add xcoff field.
-	(_bfd_stringtab_init): Initialize xcoff field.
-	(_bfd_xcoff_stringtab_init): New function.
-	(_bfd_stringtab_add): In XCOFF mode, leave two bytes for length.
-	(_bfd_stringtab_emit): In XCOFF mode, write out length.
-	* libbfd-in.h (_bfd_xcoff_stringtab_init): Declare.
-	* libbfd.h: Rebuild.
-	* Makefile.in: Rebuild dependencies.
-	(BFD32_BACKENDS): Add xcofflink.o.
-	(CFILES): Add xcofflink.c.
-
-	* elf32-mips.c (mips_elf_symbol_processing): Set SEC_ALLOC, not
-	SEC_NO_FLAGS, for .acommon section.  From Peter Schauer
-	<Peter.Schauer@Regent.E-Technik.TU-Muenchen.DE>.
-
-Sat Oct 14 21:36:02 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* coff-ppc.c (in_reloc_p): Add, clone from coff-i386.c.
-
-Fri Oct 13 17:48:43 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* acconfig.h (HAVE_SYS_PROCFS_H): Undef, with comment.
-	* config.in: Regenerated.
-
-	* opncls.c (getpagesize) [!HAVE_GETPAGESIZE]: Define as 2048.
-	(_bfd_chunksize): New variable.
-	(_bfd_new_bfd): Set it to getpagesize() if negative, and use it
-	for obstack chunk size.
-	* configure.in: Check for getpagesize.
-	* configure: Regenerated.
-
-	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* trad-core.c (rawptr): Make it a local variable of
- 	ptrace_unix_core_file_p.
-
-Fri Oct 13 11:22:01 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* coff-arm.c (in_reloc_p): New.
-	* coff-i386.c (in_reloc_p): New.
-	* coffcode.h: Allways include peicode.h if COFF_WITH_PE.
-	(coff_write_object_contents): Only set has_reloc_section
-	if PE_IMAGE.
-	* cofflink.c (_bfd_coff_generic_relocate_section): Call
-	in_reloc_p to decide if reloc should be emitted.
-	* libcoff.h (pe_data_type.in_reloc_p): New.
-	* peicode.h (pe_mkobject): Initialize in_reloc_p.
-
-Wed Oct 11 00:49:29 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_internal_syment_name): Move to coffgen.c.
-	(_bfd_coff_read_internal_relocs): Likewise.
-	* coffgen.c (_bfd_coff_internal_syment_name): Copy from coffgen.c.
-	(_bfd_coff_read_internal_relocs): Likewise.
-
-	* elflink.h (elf_link_add_object_symbols): Correct conditions
-	under which type and size change warnings are issued.
-
-Tue Oct 10 18:32:46 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffgen.c (coff_count_linenumbers): Don't count line numbers for
-	a symbol which is not in a real section.
-	(coff_write_native_symbol): Corresponding change.
-
-	* cofflink.c (_bfd_coff_link_hash_newfunc): Rename from
-	coff_link_hash_newfunc and make non-static.
-	(_bfd_coff_link_hash_table_init): New function, broken out of
-	_bfd_coff_link_hash_table_create.
-	(_bfd_coff_link_hash_table_create): Use it.
-	(process_embedded_commands): Make static.
-	* libcoff-in.h ((_bfd_coff_link_hash_newfunc): Declare.
-	(_bfd_coff_link_hash_table_init): Declare.
-	* libcoff.h: Rebuild.
-
-	* coffcode.h (coff_mkobject_hook): If RS6000COFF_C, set cputype
-	field in XCOFF tdata.
-	(coff_set_arch_mach_hook): Check ifdef RS6000COFF_C, not ifdef
-	U802ROMAGIC, for clarity.  Try to set arch and machine correctly
-	based on cputype stored in a.out header, or in n_type of initial
-	.file symbol.
-	(coff_write_object_contents): Set cputype correctly in a.out
-	header.
-	(coff_slurp_symbol_table): Add casts to file_ptr to avoid
-	warnings.
-	* coffswap.h (coff_swap_aouthdr_in): Swap in cputype field.
-	(coff_swap_aouthdr_out): Swap out cputype field.  Don't clear
-	old resv1 field.
-	* libcoff-in.h (struct xcoff_tdata): Add cputype field.
-	* libcoff.h: Rebuild.
-
-	* cpu-rs6000.c (rs6000_compatible): New static function.
-	(bfd_rs6000_arch): Use it.
-	* cpu-powerpc.c (powerpc_compatible): New static function.
-	(arch_info_struct): Define various flavours of PowerPC.
-	(bfd_powerpc_arch): Use powerpc_compatible.  Point at
-	arch_info_struct.
-
-Tue Oct 10 10:50:46 1995  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (FLAGS_TO_PASS):  Remove BISON.
-
-Tue Oct 10 01:28:29 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Don't warn about
-	changing the size or type if the old definition was weak.
-
-Mon Oct  9 11:24:08 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (combined_entry_type): Add fix_line field.
-	(coff_slurp_line_table): Warn if we try to set the lineno field of
-	a symbol twice.
-	(coff_slurp_symbol_table): If RS6000COFF_C, handle C_BINCL and
-	C_EINCL by setting fix_line.  Fix C_BSTAT symbol value.
-	* coffgen.c (coff_mangle_symbols): Handle fix_line.
-	(coff_write_symbol): Only use N_DEBUG if the symbol is in the
-	absolute section.
-	(coff_print_symbol): Print fix_value symbols in a useful fashion.
-	* libcoff.h: Rebuild.
-
-	* libcoff-in.h (struct xcoff_tdata): Define.
-	(xcoff_data): Define.
-	* bfd.c (struct _bfd): Add xcoff_obj_data field to tdata union.
-	* bfd-in2.h, libcoff.h: Rebuild.
-	* coff-rs6000.c (xcoff_mkobject): New static function.
-	(coff_mkobject): Define.
-	(xcoff_copy_private_bfd_data): New static function.
-	(coff_bfd_copy_private_bfd_data): Define.
-	(rs6000coff_howto_table): Change R_TOC complain_on_overflow from
-	signed to bitfield.
-	(rs6000coff_vec): Add DYNAMIC to object_flags.
-	* coffcode.h (sec_to_styp_flags): If RS6000COFF_C, handle .pad and
-	.loader sections specially.
-	(coff_new_section_hook): If RS6000COFF_C, get the .text and .data
-	section alignment from the XCOFF tdata information.
-	(coff_mkobject_hook): If RS6000COFF_C, set DYNAMIC based on
-	F_SHROBJ, and copy the extra a.out header information into the
-	XCOFF tdata structure.
-	(coff_write_object_contents): If RS6000COFF_C, set F_SHROBJ,
-	F_DYNLOAD and the extra a.out header information.
-	(coff_slurp_symbol_table): Set BSF_NOT_AT_END for a C_EXT or
-	C_HIDEXT symbol with attached csect information.
-	* coffswap.h (coff_swap_aouthdr_in): If RS6000COFF_C, swap
-	in the o_maxdata field.
-	(coff_swap_aouthdr_out): If RS6000COFF_C, swap extra XCOFF fields.
-	* coffgen.c (coff_renumber_symbols): Don't move any symbol to the
-	end if BSF_NOT_AT_END is set.
-
-	* targets.c (bfd_target): Rename _bfd_read_ar_hdr field to
-	_bfd_read_ar_hdr_fn.
-	* libbfd-in.h (_bfd_read_ar_hdr): Update accordingly.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* archive.c (_bfd_get_elt_at_filepos): Cast _bfd_read_ar_hdr
-	return value.
-	(do_slurp_bsd_armap, do_slurp_coff_armap): Likewise.
-	(bfd_slurp_bsd_armap_f2): Likewise.
-	(_bfd_slurp_extended_name_table): Likewise.
-
-Fri Oct  6 16:18:35 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* archive.c (bfd_get_next_mapent): Return BFD_NO_MORE_SYMBOLS
-	when the symbol table is empty.
-
-	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Don't reserve
-	space for section symbols, since we don't output them either.
-	(elf_m68k_adjust_dynindx): Removed.
-
-	* ptrace-core.c (rawptr): Make it a local variable of
- 	ptrace_unix_core_file_p.
-
-Fri Oct  6 12:24:47 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* coff-rs6000.c (xcoff_write_archive_contents): Return false, not
-	NULL.
-
-	* config.bfd (powerpc{,le}-{elf,sysv4,eabi,solaris2}): Add NT, and
-	Mac object file formats.
-
-Fri Oct  6 12:04:02 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffgen.c (coff_fix_symbol_name): Don't try to set up file
-	auxent if there isn't one.
-	(coff_write_symbols): If there is no file auxent, use SYMNMLEN
-	rather than FILNMLEN as the maximum name length.
-
-	* coffcode.h (bfd_coff_backend_data): Add new field
-	_bfd_coff_print_aux.
-	(bfd_coff_print_aux): New static function.
-	(coff_pointerize_aux_hook (RS6000COFF_C version)): Pointerize the
-	scnlen field of an XTY_LD csect aux entry.
-	(coff_print_aux): New static function.
-	(coff_slurp_symbol_table): Don't pointerize scnlen field; now done
-	in coff_pointerize_aux_hook.
-	(bfd_coff_std_swap_table): Initialize new field.
-	* coffgen.c (coff_print_symbol): Call bfd_coff_print_aux.
-	* libcoff.h: Rebuild.
-	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-
-	* coffcode.h (coff_write_object_contents): On AIX, clear F_RELFLG
-	if there are symbols, for native AIX ld compatibility.
-
-	* coffcode.h (bfd_coff_backend_data): Add new field
-	_bfd_coff_pointerize_aux_hook.
-	(coff_pointerize_aux_hook): Define as a function if RS6000COFF_C
-	or I960, and as 0 otherwise.
-	(bfd_coff_std_swap_table): Initialize new field.
-	* libcoff.h: Rebuild.
-	* coffgen.c (coff_pointerize_aux): Change parameters  to take
-	symbol pointer instead of type and class, and to take aux index.
-	Call _bfd_coff_pointerize_aux_hook if it is defined.
-	(coff_get_normalized_symtab): Always call coff_pointerize_aux.
-	* coff-alpha.c (alpha_ecoff_backend_data): Initialize all fields.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-
-	* coff-rs6000.c: Add full support for AIX archives.  Rewrite old
-	read-only/host-only support.
-
-	* coffcode.h (coff_slurp_symbol_table): Set C_HIDEXT symbols to be
-	BSF_LOCAL.
-	(OTHER_GLOBAL_CLASS): Do not define to be C_HIDEXT if
-	RS6000COFF_C.
-
-	* targets.c (bfd_target): Add _bfd_read_ar_hdr field.  Modify
-	BFD_JUMP_TABLE_ARCHIVE accordingly.
-	* libbfd-in.h (_bfd_snarf_ar_hdr): Don't declare.
-	(_bfd_compute_and_write_armap): Declare.
-	(_bfd_generic_read_ar_hdr): Declare.
-	(_bfd_read_ar_hdr): Define.
-	(_bfd_noarchive_read_ar_hdr): Define.
-	(_bfd_archive_bsd_read_ar_hdr): Define.
-	(_bfd_archive_coff_read_ar_hdr): Define.
-	* archive.c: Change all callers of _bfd_snarf_ar_hdr to call
-	_bfd_read_ar_hdr instead.
-	(_bfd_generic_read_ar_hdr): Rename from _bfd_snarf_ar_hdr.
-	(_bfd_compute_and_write_armap): Rename from
-	compute_and_write_armap.  Make non-static.  Change all callers.
-	* ecoff.c (_bfd_ecoff_slurp_armap): Call _bfd_read_ar_hdr rather
-	than _bfd_snarf_ar_hdr.
-	* aout-target.h (MY_read_ar_hdr): Define if not defined.
-	* ieee.c (ieee_read_ar_hdr): Define.
-	* libecoff.h (_bfd_ecoff_read_ar_hdr): Define.
-	* oasys.c (oasys_read_ar_hdr): Define.
-	* som.c (som_read_ar_hdr): Define.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-Thu Oct  5 14:04:07 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* peicode.c (coff_swap_filehdr_in): If symptr is
-	zero, there aren't any symbols, even if nsyms is set.
-
-Thu Oct  5 11:45:02 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libecoff.h (struct ecoff_backend_data): Add adjust_headers
-	field.
-	* ecoff.c (ecoff_sec_to_styp_flags): Check for various Alpha
-	sections, and set styp correctly for them: .got, .hash, .dynamic,
-	.liblist, .rel.dyn, .conflic, .dynstr, .dynsym, .comment.
-	(_bfd_ecoff_styp_to_sec_flags): Check for various Alpha section
-	types.
-	(ecoff_sort_hdrs): New static function.
-	(ecoff_compute_section_file_positions): Return boolean, not void.
-	Sort the sections by VMA before looking through them.  Put the
-	first non SEC_ALLOC section on a new page.  Put every SEC_ALLOC
-	section on an appropriate boundary within the page.
-	(ecoff_compute_reloc_file_positions): Check return value of
-	ecoff_compute_section_file_positions.
-	(_bfd_ecoff_set_section_contents): Likewise.
-	(_bfd_ecoff_write_object_contents): Check for various Alpha
-	section types when incrementing text_size and data_size.  Call
-	adjust_headers backend function if it exists.
-	* coff-alpha.c (alpha_adjust_headers): New static function.
-	(alpha_ecoff_backend_data): Initialize adjust_headers field.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-
-	* hosts/i386bsd.h: Restore file incorrectly deleted on Sep 6.
-
-Wed Oct  4 18:15:02 1995  Jeff Law  (law@hurl.cygnus.com)
-
-	* rs6000-core.c (CORE_VERSION_1): Use CORE_VERSION_1 instead
-	of ALTERNATE_AIX_CORE_FORMAT.
-	* configure.in (aix4): No longer need CORE_FLAGS.
-	* configure: Updated.
-
-Wed Oct  4 15:36:36 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	NS32k changes from Ian Dall:
-	* aoutx.h (MY_final_link_relocate, MY_relocate_contents): New
-	macros.
-	(aout_link_input_section_std, aout_link_input_section_ext,
-	aout_link_reloc_link_order): Call them instead of _bfd_*
-	versions.
-	* aout-target.h (MY_exec_header_not_counted): New macro, defaults
-	to zero.
-	(backend_data): Use it instead of hardcoded zero.
-
-	* aout-ns32k.c (CTOR_TABLE_RELOC_HOWTO): New macro.
-	(MY_swap_std_reloc_out): Use udata.i for KEEPIT, don't call stoi.
-
-	* ns32knetbsd.c: Include bfd.h.
-	(MY_text_includes_header, MY_bfd_reloc_type_lookup): New macros.
-	(MY_bfd_reloc_type_lookup): Declare function too.
-	* pc532-mach.c (set_sizes): Don't declare.
-	(MY_text_includes_header, MY_exec_header_not_counted): Define.
-	(backend_data, MY_backend_data): Don't define.
-
-	* config.bfd: Treat ns32k-pc532-ux* like ns32k-pc532-mach*, and
-	ns32k-*-lites* like ns32k-*-netbsd*.
-
-	* hosts/nbsd.h: Swap order of sys/vmparam.h and sys/param.h, to
-	compile on lites.
-
-Wed Oct  4 14:15:52 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_write_object_contents): Restore setting
-	f_timdat to 0, deleted on August 22.
-
-Tue Oct  3 16:28:32 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* coffcode.h (coff_bfd_copy_private_symbol_data,
-	coff_bfd_copy_private_section_data,
-	coff_bfd_copy_private_bfd_data): ifdef to allow overrides.
-	* peicode.h (coff_bfd_copy_private_bfd_data): New
-	(pe_bfd_copy_private_bfd_data): New.
-	(coff_swap_scnhdr_in): Swap bss size into the right place.
-	(pe_print_private_bfd_data): Add some newlines.
-
-Tue Oct  3 11:53:04 1995  Jeff Law  (law@hurl.cygnus.com)
-
-	* som.c (setup_sections): Don't die if a space has no subspaces.
-
-Mon Oct  2 14:08:55 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Don't let a weak
-	dynamic symbol override a common symbol.  Don't change the size or
-	type if they have been set and the new symbol is not a definition.
-	Warn if the size or type changes.
-
-Sun Oct  1 01:34:41 1995  Jeff Law  (law@hurl.cygnus.com)
-
-        * som.c (som_begin_writing): Don't write the symbol table or
-	symbol	strings.
-	(som_finish_writing): Write them here.  Place them after the
-	subspace data, but before the relocs.
-
-Fri Sep 29 11:01:55 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_add_one_symbol): Just pass false, not
-	info->shared_library, to sunos_create_dynamic_sections.
-	(sunos_scan_ext_relocs): Don't warn about a reloc in the .text
-	section.
-	(sunos_check_dynamic_reloc): Remove .text section assertion.
-
-Thu Sep 28 18:48:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* config.bfd: Add powerpc-*-macos*, powerpc-*-mpw*.
-	* configure, configure.in: Add pmac_xcoff_vec case.
-	* Makefile.in (BFD32_BACKENDS): Add coff-pmac.o.
-	* coff-pmac.c: New file, PowerMac XCOFF support.
-	* coffcode.h (coff_set_arch_mach_hook): Add PowerMac case.
-	* targets.c (pmac_xcoff_vec): Declare.
-
-	* mpw-config.in: Various changes to be compatible with the
-	autoconf-based configury.
-	* mpw-make.sed: New file, sed commands to translate Unix
-	makefile into MPW syntax.
-	* mpw-make.in: Remove.
-	* hosts/mpw.h: Remove.
-	* bfd-in.h, bfd-in2.h: If MPW, include the file that defines
-	true and false as enums, then define TRUE_FALSE_ALREADY_DEFINED.
-
-Thu Sep 28 17:06:23 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* binary.c (binary_get_symtab): Return an empty string on error.
-	* opncls.c (bfd_fdpenr): Change WIN32 restriction to WINGDB.
-
-Thu Sep 28 15:30:44 1995  Kim Knuttila  <krk@nellie>
-
-	* coff-ppc.c: Reformatted according to gnu conventions
-	              Removed irrelevant "if 0" code
-
-Thu Sep 28 11:19:53 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* hp300hpux.c (convert_sym_type): Treat secondary symbols as weak
-	symbols rather than as indirect symbols.
-	(MY(slurp_symbol_table)): Don't do anything special about
-	secondary symbols.
-
-	* coffcode.h (coff_new_section_hook): Make sure that the alignment
-	of .ctors and .dtors sections is no larger than 2.
-
-	* sunos.c (sunos_add_one_symbol): Don't change
-	bfd_link_hash_common to bfd_link_hash_new, since it may be on the
-	undef list.
-	(bfd_sunos_record_link_assignment): Don't put __DYNAMIC in the
-	dynamic symbols when creating a shared library.
-	(sunos_scan_ext_relocs): Handle relocs correctly when creating a
-	shared library.
-	(sunos_scan_dynamic_symbol): Don't mark the __DYNAMIC symbol as
-	written even if it is not defined in a regular object.
-	(sunos_write_dynamic_symbol): Use plt_offset for the address of
-	the jump table reloc.  Add an assertion.  Use RELOC_JMP_SLOT
-	rather than the constant 22.
-	(sunos_check_dynamic_reloc): Handle creating a shared library.
-	(sunos_finish_dynamic_link): Set the first entry in the GOT to
-	zero when creating a shared library.
-	* aoutx.h (NAME(aout,final_link)): If there is a symbol __DYNAMIC,
-	write it out at the start of the symbol table.
-
-	* Makefile.in (BFD32_BACKENDS): Add coff-arm.o.
-
-Thu Sep 28 00:58:05 1995  Doug Evans  <dje@deneb.cygnus.com>
-
-	* config.bfd: Add arm-*-coff.
-	* configure.in, configure: Add armcoff_{little,big}_vec.
-	* targets.c (armcoff_{little,big}_vec): Declare.
-	(bfd_target_vector): Add armcoff_{little,big}_vec.
-	* coff-arm.c (armcoff_{little,big}_vec): Always define.
-
-Wed Sep 27 10:37:14 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* targets.c (bfd_find_target): Remove debugging code.
-
-Wed Sep 27 07:23:39 1995  Kim Knuttila  <krk@nellie>
-
-	* coff-ppc.c, pe-ppc.c, pei-ppc.c: Initial bfd for coff/PE
-        support on powerpc.
-	* Makefile.in: added *-ppc files
-	* coffcode.h: ppc MAGIC, and use peicode.h rather than coffswap.h to
-        allow pe based .o's to be shared with other tools on ppc/NT
-	* config.bfd: added powerpc[le]-[pe|winnt] config support
-	* configure, configure.in: added bfd_powerpc[le]_pe[i]_vec
-	* peicode.h: Added more section flags for PE on ppc
-	             Added coff_swap_filehdr_out to allow peicode.h to be
-		     used for non-image PE files on ppc.
-		     Check for image, or not, before copying pe_opthdr
-	* targets.c: Added new bfd's
-	* targets.c: Removed two inactive bfds that shouldn't have made it this
-                     far.
-
-Tue Sep 26 14:06:41 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_reloc_type): Rename from reloc_type, and use
-	explicit values to initialize all relocs.  Change all users.
-	(ppc_elf_brtaken_inner): New function to handle branch predicition
-	relocs.
-	(ppc_elf_brtaken_reloc): Ditto.
-	(ppc_elf_howto_raw): Use new functions.  Make sure all unsupported
-	relocs use ppc_elf_unsupported_reloc.
-	(ppc_elf_merge_private_bfd_data): Keep track of whether an error
-	needs to be reported.
-	(ppc_elf_relocate_section): Support branch prediction relocs.
-
-Tue Sep 26 12:48:05 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd.c (bfd_assert): Remove \n from string passed to
-        _bfd_error_handler.
-
-	* coff-i386.c: (TWO_DATA_SECS): Don't define.
-	* coffcode.h (bfd_coff_backend_data): Remove _bfd_make_section_hook.
-	(bfd_coff_make_section_hook): Don't define.
-	(coff_make_section_hook): Remove.
-	(sec_to_styp_flags): Remove TWO_DATA_SECS case.
-	(styp_to_sec_flags): Likewise.
-	(coff_write_object_contents): Likewise.
-	(bfd_coff_std_swap_table): Don't initialize make_section_hook
-	field.
-	* libcoff.h: Rebuild.
-	* coffgen.c (make_a_section_from_file): Just call
-	bfd_make_section_anyway, not bfd_make_section or
-	bfd_coff_make_section_hook.
-	* ecoff.c (_bfd_ecoff_make_section_hook): Remove.
-	* libecoff.h (_bfd_ecoff_make_section_hook): Don't declare.
-	* coff-alpha.c (alpha_ecoff_backend_data): Don't initialize
-	make_section_hook field.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-
-	* aoutx.h (translate_from_native_sym_flags): Don't try to stuff
-	pointers into value field for warning and indirect symbols; just
-	leave the value field alone.
-	* linker.c (generic_link_add_symbol_list): Use next symbol for
-	warning and indirect symbols, rather than looking in symbol value.
-	* ecoff.c (ecoff_set_symbol_info): Remove indirect_ptr_ptr
-	parameter.  Change all callers.  Remove support for indirect
-	symbols; it didn't work anyhow.
-	(_bfd_ecoff_slurp_symbol_table): Remove indirect_ptr variable.
-	* syms.c: Change comments about BSF_WARNING and BSF_INDIRECT.
-	* bfd-in2.h: Rebuild.
-
-Mon Sep 25 16:04:09 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_howto_raw): For all 14-bit branch relocs,
-	go back to telling the tools this reloc operates on 32 bits.
-
-Mon Sep 25 11:48:02 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aout-adobe.c (aout_adobe_callback): Use _bfd_error_handler
-	rather than a direct fprintf.
-	* archive.c (_bfd_write_archive_contents): Likewise.
-	* coffcode.h (coff_slurp_symbol_table): Likewise.
-	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Likewise.
-	(ppc_elf_unsupported_reloc): Likewise.
-	(ppc_elf_relocate_section): Likewise.
-	* i386linux.c (linux_tally_symbols): Likewise.
-	(linux_finish_dynamic_link): Likewise.
-	* osf-core.c (osf_core_core_file_p): Likewise.
-	* rs6000-core.c (rs6000coff_get_section_contents): Likewise.
-	* som.c (som_sizeof_headers): Likewise.
-	* srec.c (srec_bad_byte): Likewise.
-	* bfd.c (bfd_assert): Likewise.  Also change file to be const.
-	* libbfd-in.h (bfd_assert): Declare first parameter const.
-	* libbfd.h: Rebuild.
-	* coff-a29k.c (a29k_reloc): Don't bother to fprintf; returning
-	bfd_reloc_overflow is enough.
-	* coff-h8300.c (rtype2howto): Don't bother to fprintf; just abort.
-	* coff-h8500.c (rtype2howto): Likewise.
-	* coff-z8k.c (rtype2howto): Likewise.
-	* coffcode.h (dummy_reloc16_extra_cases): Likewise.
-	* elf.c (_bfd_elf_get_lineno): Likewise.
-	(_bfd_elf_no_info_to_howto): Likewise.
-	(_bfd_elf_no_info_to_howto_rel): Likewise.
-	* hp300hpux.c (convert_sym_type): Likewise.
-	(MY(swap_std_reloc_in)): Likewise.
-	* elf.c (bfd_section_from_shdr): Remove #if 0 sections.
-
-	* libaout.h (struct aoutdata): Add line_buf field.
-	* aoutx.h (NAME(aout,find_nearest_line)): Remove statics buffer
-	and filename_buffer.  Instead, use a malloc buffer stored in the
-	new line_buf field.  Remove length restrictions.
-
-	* coffgen.c (string_size): Remove static variable.
-	(debug_string_size, debug_string_section): Likewise.
-	(coff_fix_symbol_name): Add string_size_p, debug_string_section_p,
-	and debug_string_size_p parameters.  Use them instead of the
-	global variables.  Change all callers.
-	(coff_write_symbol): Likewise.
-	(coff_write_alien_symbol, coff_write_native_symbol): Likewise.
-	(coff_write_symbols): Add local variables to replace removed
-	global variables.
-
-	* libcoff-in.h (struct coff_section_tdata): Add offset, i,
-	function, and line_base fields.
-	* libcoff.h: Rebuild.
-	* coffgen.c (coff_find_nearest_line): Use section tdata to cache
-	information, rather than using static variables.
-
-	* sunos.c (sunos_read_dynamic_info): Adjust offsets in an NMAGIC
-	file.  From Peter DeWolf <pld@amt.tay1.dec.com>.
-
-	* init.c (initialized): Remove static variable.
-	(bfd_init): Don't bother setting initialized.
-	(bfd_check_init): Remove.
-	* opncls.c (_bfd_new_bfd): Don't call bfd_check_init.
-	* libbfd.h: Rebuild.
-
-Sat Sep 23 01:22:23 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* rs6000-core.c (rs6000coff_core_p):  Don't check the core file
-	size for full core dumps. Copy core file header to private data.
-	(rs6000coff_core_file_failing_command,
-	rs6000coff_core_file_failing_signal):  New functions to extract
-	the file name and terminating signal from the core file.
-	* coff-rs6000.c:  Use them.
-
-Fri Sep 22 17:44:47 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	Change arch info to be const, initialized at compile time.
-	* archures.c: Reindent many functions.  Change CONST to const.
-	(bfd_arch_info_type): Make arch_name const.  Remove disassemble;
-	nothing set it anyhow.  Make next const.
-	(bfd_arch_info_list): Remove.
-	(bfd_archures_list): Rename from archures_init_table.  Change from
-	a table of function pointers to a table of bfd_arch_info_type
-	structure addresses.
-	(bfd_scan_arch): Rewrite accordingly.  Return a const pointer.
-	(bfd_lookup_arch): Likewise.
-	(bfd_set_arch_info): Rewrite accordingly.  Change argument to be a
-	const pointer.
-	(bfd_default_arch_struct): Make const.
-	(bfd_arch_init, bfd_arch_linkin): Remove.
-	(bfd_get_arch_info): Return a const pointer.
-	* init.c (bfd_init): Don't call bfd_arch_init.
-	* bfd.c (struct _bfd): Make arch_info const.
-	* bfd-in2.h: Rebuild.
-	* libbfd.h: Rebuild.
-	* configure.in: Put & before everything in $selarchs.
-	* configure: Rebuild.
-	* cpu-*.c: Change bfd_*_arch from a function which calls
-	bfd_arch_linkin to a const structure.
-	* ieee.c (ieee_object_p): Make arch const.
-
-Fri Sep 22 16:23:18 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* reloc.c (bfd_reloc_code_type): Add relocations to support all of
-	PowerPC V.4.
-	* bfd-in2.h: Regenerate.
-	* libbfd.h: Regenerate.
-
-	* elf32-ppc.c (reloc_type): Update names to match current draft.
-	(ppc_elf_howto_raw): Mark 14 bit relocs as short sized and PC
-	relative.  Update names to current V.4 draft.
-	(ppc_elf_reloc_type_lookup): Add support for more relocations.
-	(ppc_elf_relocate_section): Rename relocations to match draft.
-
-Thu Sep 21 21:53:18 1995  Michael Meissner  <meissner@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Allow modules
-	compiled with -mrelocatable-lib to be linked with either normal
-	modules or -mrelocatable modules.
-
-Wed Sep 20 12:03:26 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_write_object_contents): Clear the vstamp field
-	in the a.out header.
-
-	* aoutx.h (NAME(aout,swap_ext_reloc_out)): Don't set r_extern for
-	a reloc against a local symbol, even if it's not a section.
-
-Tue Sep 19 17:02:26 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* targets.c (bfd_target): Remove unused align_power_min field.
-	* bfd-in2.h: Rebuild.
-	* All backends: Remove initialization of align_power_min.
-
-Tue Sep 19 14:02:21 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* peicode.h (coff_swap_scnhdr_out): Get sizes for BSS right.
-
-Mon Sep 18 14:35:01 1995  Arne H. Juul  <arnej@pvv.unit.no>
-
-	* config.bfd (mips-dec-netbsd*): New target.
-	* configure.host (mips-dec-netbsd*): New host.
-	* configure.in (mips-dec-netbsd*): New native.
-	* configure: Rebuild.
-
-Fri Sep 15 10:24:36 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	Make the COFF backend linker merge common types:
-	* cofflink.c (struct coff_debug_merge_element): Define.
-	(struct coff_debug_merge_type): Define.
-	(struct coff_debug_merge_hash_entry): Define.
-	(struct coff_debug_merge_hash_table): Define.
-	(coff_debug_merge_hash_table_init): Define.
-	(coff_debug_merge_hash_table_free): Define.
-	(coff_debug_merge_hash_lookup): Define.
-	(struct coff_final_link_info): Add debug_merge field.
-	(coff_debug_merge_hash_newfunc): New static function.
-	(_bfd_coff_final_link): Allocate and free debug_merge table.
-	(coff_link_input_bfd): Merge identical enum, struct and union
-	types.
-
-Thu Sep 14 14:53:58 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	Convert i960 COFF to use COFF backend linker.
-	* coff-i960.c (coff_i960_relocate): Use a coff_section_data
-	structure to store the symbol being used.
-	(coff_i960_start_final_link): New static function.
-	(coff_i960_relocate_section): New static function.
-	(coff_i960_adjust_symndx): New static function.
-	(coff_start_final_link): Define.
-	(coff_relocate_section): Define.
-	(coff_adjust_symndx): Define.
-	* coffcode.h (bfd_coff_backend_data): Add new callback function
-	_bfd_coff_start_final_link.
-	(bfd_coff_start_final_link): Define.
-	(coff_start_final_link): Define if not defined.
-	(bfd_coff_std_swap_table): Add coff_start_final_link.
-	* cofflink.c (_bfd_coff_internal_syment_name): Make globally
-	visible.
-	(_bfd_coff_final_link): Call bfd_coff_start_final_link if the
-	function callback is not NULL.
-	* libcoff-in.h (struct coff_section_tdata): Add tdata field.
-	(_bfd_coff_internal_syment_name): Declare.
-	* libcoff.h: Rebuild.
-	* configure.in (icoff_big_vec): Add cofflink.o.
-	(icoff_little_vec): Likewise.
-	* configure: Rebuild.
-
-Wed Sep 13 17:38:23 1995  Fred Fish  <fnf@rtl.cygnus.com>
-
-	* Makefile.in (clean-info): Remove extraneous tab from line
-	following action.
-
-Wed Sep 13 13:27:53 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (coff_link_input_bfd): Fail if a section with no
-	contents has relocs.
-
-Thu Sep 12 12:45:34 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* coffcode.h (coff_compute_section_file_positions): Keep the
-	raw size safe.
-	(coff_write_object_contents): Remember if it's a relocatable
-	file.
-	* libcoff-in.h (pe_data_type): New member 'has_reloc_section'
-	* peicode.h (coff_swap_filehdr_out): Clear not-reloc flag
-	if relocatable file. Swap out saved raw size.
-
-Tue Sep 12 12:14:33 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (do_maintainer_clean): Rename from do_realclean.
-	(maintainer-clean): Rename from realclean, passing
-	maintainer-clean down to subdirectories, but leave realclean as a
-	synonym.
-
-	* linker.c (_bfd_generic_link_add_one_symbol): Pass symbol name to
-	warning callback.
-
-	* dep-in.sed: Remove config.h from generated dependencies.
-
-	* sunos.c (sunos_slurp_dynamic_symtab): New static function,
-	broken out of sunos_canonicalize_dynamic_symtab.
-	(sunos_canonicalize_dynamic_symtab): Call new function
-	sunos_slurp_dynamic_symtab.
-	(sunos_add_dynamic_symbols): Add three new parameters.  Return the
-	dynamic symbol table to the caller.
-	* aoutx.h (aout_link_add_symbols): Permit add_dynamic_symbols
-	callback to override the symbols being read.
-	* libaout.h (struct aout_backend_data): Add three new parameters
-	to add_dynamic_symbols callback.
-
-	Extensive minor changes to avoid various gcc warnings.  Also:
-	* Makefile.in (BFD32_BACKENDS): Remove coff-arm.o.
-	* archures.c (bfd_arch_info_type): Change mach field from long to
-	unsigned long.
-	(bfd_lookup_arch): Change machine parameter from long to unsigned
-	long.
-
-Mon Sep 11 10:55:47 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_scan_std_relocs): Fix BFD_ASSERT: it's OK to find
-	a symbol with a non-zero plt_offset.
-
-Fri Sep  8 11:47:24 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (align_file_position): Remove; not used.
-
-	* configure.in: Only check for <sys/procfs.h> on a native system,
-	and make sure it defines prstatus_t.
-	* configure: Rebuild.
-
-Thu Sep  7 12:48:01 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_write_dynamic_symbol): Correct m68k abort test.
-
-	* config.in: Rename from config.h.in.
-	* configure.in: Call AC_CONFIG_HEADER with config.h:config.in.
-	Check for config.h:config.in when creating stamp-h.
-	* configure: Rebuild.
-	* Makefile.in (stamp-h): Depend upon config.in rather than
-	config.h.in.  Set CONFIG_HEADERS to config.h:config.in when
-	calling config.status.
-
-	* Makefile.in (do_distclean): Remove config.h and stamp-h.
-	(Makefile): Just rebuild Makefile.
-	(config.h, stamp-h): New targets.
-	* configure.in: Create stamp-h when rebuilding config.h.
-	* configure: Rebuild.
-
-Wed Sep  6 15:00:33 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Call AC_CONFIG_HEADER.  Substitute
-	HOST_64BIT_LONG.  Check that various header files exist.  Check
-	that fcntl exists.  Call BFD_BINARY_FOPEN.  Check whether malloc
-	and/or free need to be declared.  Don't make a link to sysdep.h.
-	Define TRAD_HEADER for various hosts.
-	* configure: Rebuild.
-	* configure.host: Don't set my_host.  Add definitions taken from
-	host header files for various entries.  Remove entries which now
-	do nothing.
-	* acconfig.h: New file.
-	* config.h.in: New file, built by autoheader.
-	* sysdep.h: New file.
-	* Makefile.in (do_distclean): Don't remove sysdep.h.
-	(RECONFIG): Remove.
-	(LOCAL_H_DEPS): New variable.
-	($(BFD_LIBS)): Use $(LOCAL_H_DEPS) rather than libbfd.h and
-	$(RECONFIG).
-	($(BFD_MACHINES), $(BFD_BACKENDS)): Likewise.
-	($(OPTIONAL_BACKENDS)): Likewise.
-	(stmp-bfd.h): Just substitute for BFD_HOST_64BIT_LONG, rather than
-	looking through sysdep.h.
-	* bfd-in.h (BFD_HOST_64BIT_LONG): Define; set by Makefile.
-	(BFD_HOST_64_BIT): Define based on BFD_HOST_64BIT_LONG.
-	(fprintf_vma, sprintf_vma): Likewise.
-	(int64_type, uint64_type): Don't define.
-	* bfd-in2.h: Rebuild.
-	* archures.c, bfd.c, srec.c: Include <ctype.h>.
-	* elfcore.h: Check HAVE_SYS_PROCFS_H rather than HAVE_PROCFS.
-	* lynx-core.c: Include stuff from old hosts/lynx.h.
-	* opncls.c (bfd_fdopenr): Check HAVE_FNCTL and defined (F_GETFL),
-	rather than NO_FCNTL.
-	* targets.c (bfd_target_list): Check HOST_HPPAHPUX and ! __STDC__
-	rather than NATIVE_HPPAHPUX_COMPILER.
-	* trad-core.c: Don't include <errno.h>.  Include TRAD_HEADER if it
-	is defined.
-	* hosts/*.h: Remove all header files which merely include,
-	declare, and define things.  Leave header files which define
-	information needed by trad-core.c.
-
-	* aclocal.m4 (BFD_BINARY_FOPEN): Define.
-	(BFD_CC_FOR_BUILD): Define.
-	* configure.in: Use BFD_CC_FOR_BUILD.
-	* configure: Rebuild.
-
-Tue Sep  5 19:35:28 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aclocal.m4: Don't try to grep ../Makefile if it doesn't exist.
-	* configure: Rebuild.
-
-	* coff-sparc.c (CALC_ADDEND): Don't set the addend to the value of
-	a global symbol.
-
-Tue Sep  5 12:48:26 1995  Jason Molenda   (crash@phydeaux.cygnus.com)
-
-	* config.bfd: i386pe_ve -> i386pe_vec.
-
-Mon Sep  4 14:02:43 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Incorporate host Makefile fragments by setting
-	shell variables.
-	* configure.in: Call AC_PROG_CC.  Substitute CFLAGS, HDEFINES and
-	AR.  Call AC_PROG_INSTALL.  Substitute CC_FOR_BUILD, choosing a
-	value based on whether the code is being compiled by a cross
-	compiler.  Don't substitute host_makefile_frag or frags.
-	* aclocal.m4: New file to define local AC_PROG_CC.
-	* configure: Rebuild.
-	* Makefile.in (INSTALL): Set to @INSTALL@.
-	(INSTALL_PROGRAM): Set to @INSTALL_PROGRAM@.
-	(INSTALL_DATA): Set to @INSTALL_DATA@.
-	(AR): Set to @AR@.
-	(CC): Define as @CC@.
-	(CFLAGS): Set to @CFLAGS@.
-	(CC_FOR_BUILD): Set to @CC_FOR_BUILD@.
-	(@host_makefile_frag@): Remove.
-	(ALL_CFLAGS): Change $(HDEFINES) to @HDEFINES@.  Move $(CFLAGS)
-	after other options.
-	(config.status): Remove dependency upon @frags@.
-	* config/*.mh, config/README: Remove.
-
-	* config.bfd: Rewrite to incorporate the contents of the Makefile
-	fragments by setting shell variables, rather than merely returning
-	the name of a Makefile fragment.
-	* configure.in: Use shell variables set by config.bfd rather than
-	looking at the target Makefile fragment files.  Don't substitute
-	target_makefile_frag.  Do substitute TDEFINES.
-	* configure: Rebuild.
-	* Makefile.in (@target_makefile_frag@): Remove.
-	(ALL_CFLAGS): Change $(TDEFINES) to @TDEFINES@.
-	* config/*.mt: Remove.
-
-Mon Sep  4 03:13:28 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* configure.in: Put changequote lines around "i[345]86" patterns
-	section of core file support.
-
-Sun Sep  3 11:31:58 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_print_private_bfd_data): Define to use the
-	generic version.
-
-Fri Sep  1 17:08:40 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* peicode.h (coff_swap_aouthdr_in): Add ImageBase to
-	entry, text_start and data_start.
-
-Fri Sep  1 18:06:28 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (OFILES): Remove $(TDEPFILES).
-	* config/apollo.mt (TDEPFILES): Remove.
-	* config/README: Update.
-
-	* configure.in: For a native configuration, set COREFILE and
-	COREFLAG based on the canonical host name.
-	* configure: Rebuild.
-	* Makefile.in: Rebuild dependencies.
-	(ALL_CFLAGS): Add @COREFLAG@.
-	(OFILES): Replace $(HDEPFILES) with @COREFILE@.
-	* coff-rs6000.c: Check AIX_CORE rather than HOST_AIX for core file
-	support routines.  Check LYNX_CORE rather than HOST_LYNX.
-	* lynx-core.c: Check LYNX_CORE rather than HOST_LYNX.
-	* i386lynx.c: Likewise.
-	* m68klynx.c: Likewise.
-	* sparclynx.c: Likewise.
-	* rs6000-core.c: Check AIX_CORE rather than HOST_AIX.
-	* *-core.c: Comment changes.
-	* config/decstation.mh (HDEPFILES): Remove.
-	(HDEFINES): Remove -DTRAD_CORE.
-	* config/irix3.mh (RANLIB): Remove.
-	* config/irix4.mh (HDEPFILES, RANLIB): Remove.
-	(HDEFINES): Remove -DIRIX_CORE.
-	* config/riscos.mh (RANLIB, HDEPFILES): Remove.
-	(HDEFINES): Remove -DTRAD_CORE.
-	* config/ncr3000.mh (AR_FLAGS, RANLIB): Remove.
-	* config/ultra3.mh (RANLIB): Remove.
-	* config/aix4.mh, config/alphaosf.mh, config/amix.mh: Remove.
-	* config/apollo.mh, config/delta68.mh, config/delta88.mh: Remove.
-	* config/dpx2.mh, config/esix.mh, config/harris.mh: Remove.
-	* config/hp300.mh, config/hp300bsd.mh, config/hppabsd.mh: Remove.
-	* config/hppahpux.mh, config/hppaosf.mh: Remove.
-	* config/i386aix.mh, config/i386bsd.mh: Remove.
-	* config/i386linux.mh, config/i386mach3.mh: Remove.
-	* config/i386sco.mh, config/i386v.mh, config/i386v4.mh: Remove.
-	* config/irix5.mh, config/m88kmach3.mh, config/mipsbsd.mh: Remove.
-	* config/mipsmach3.mh, config/news-mips.mh: Remove.
-	* config/news.mh, config/pc532mach.mh, config/riscix.mh: Remove.
-	* config/rs600.mh, config/rs6000lynx.mh: Remove.
-	* config/solaris2.mh, config/stratus.mh: Remove.
-	* config/symmetry.mh, config/sysv4.mh, config/tahoe.mh: Remove.
-	* config/vaxbsd.mh, config/vaxult.mh, config/vaxult2.mh: Remove.
-
-Fri Sep  1 15:18:50 1995  Kazumoto Kojima  <kkojima@info.kanagawa-u.ac.jp>
-
-	* elflink.h (elf_bfd_final_link): Don't change a DT_INIT or
-	DT_FINI entry if the appropriate symbol is not in the hash table.
-
-	* libelf.h (struct elf_backend_data): Add create_program_headers
-	and want_hdr_in_seg fields.
-	* elfxx-target.h (elf_backend_want_hdr_in_seg): Define if not
-	defined.
-	(elf_backend_create_program_headers): Likewise.
-	(elfNN_bed): Initialize create_program_headers and
-	want_hdr_in_seg.
-	* elf.c (get_program_header_size): Call create_program_headers
-	backend routine.
-	(map_program_segments): Check want_hdr_in_seg backend field.  Call
-	create_program_headers backend routine.
-
-	* elf.c (assign_file_positions_except_relocs): Align non allocated
-	sections when creating an executable.
-
-	* elfcode.h (elf_swap_phdr_in): Make non static.
-	(elf_swap_phdr_out): Make non static.
-	* libelf.h (bfd_elf32_swap_phdr_in): Declare.
-	(bfd_elf32_swap_phdr_out): Declare.
-	(bfd_elf64_swap_phdr_in): Declare.
-	(bfd_elf64_swap_phdr_out): Declare.
-
-	* ecofflink.c (ecoff_collect_shuffle): New static function.
-	(_bfd_ecoff_get_accumulated_pdr): New function.
-	(_bfd_ecoff_get_accumulated_sym): New function.
-	(_bfd_ecoff_get_accumulated_ss): New function.
-	* libbfd-in.h (_bfd_ecoff_get_accumulated_pdr): Declare.
-	(_bfd_ecoff_get_accumulated_sym): Declare.
-	(_bfd_ecoff_get_accumulated_ss): Declare.
-	* libbfd.h: Rebuild.
-
-Fri Sep  1 13:20:25 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libecoff.h (_bfd_ecoff_bfd_print_private_bfd_data): Fix typo.
-
-	* elflink.h (elf_link_add_object_symbols): Handle indirect and
-	warning symbols.  If any section is named .gnu.warning.XXX, treat
-	the contents as a warning to be issued if the symbol XXX is
-	referenced.
-	(elf_link_output_extsym): For an indirect or warning symbol, just
-	output the symbol it points to.
-
-	* linker.c (_bfd_link_hash_newfunc): Don't bother to set bfd_error
-	if bfd_hash_allocate fails, since it will already be set.
-	(generic_link_hash_newfunc): Likewise.
-	(archive_hash_newfunc): Likewise.
-	(hash_entry_bfd): New static function.
-	(_bfd_generic_link_add_one_symbol): Pass new arguments to warning
-	callback.  Allocate a new warning using the hash table newfunc.
-	Use bfd_hash_replace to update the entry in the hash table, rather
-	than assuming we can copy the fields with structure assignment.
-
-	* hash.c (bfd_hash_replace): New function.
-	* bfd-in.h (bfd_hash_replace): Declare.
-	* bfd-in2.h: Rebuild.
-
-Fri Sep  1 08:12:50 1995  James G. Smith  <jsmith@beauty.cygnus.com>
-
-	* config.bfd: Add mips*vr4300-*-elf* target.
-	* config/mipsbvr4300.mt: Added.
-
-Thu Aug 31 16:00:53 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* Makefile.in: Update dependencies.
-	* aout-target.h (MY_bfd_print_private_bfd_data): New.
-	* bfd-in.h (PE STUFF): Deleted.
-	* bfd.c (tdata->pe_obj_data): New.
-	(bfd_print_private_bfd_data): New.
-	* coff-i386.c, coff-arm.c (coff_*-rtype_to_howto): Get image base from
-	new place.
-	* libcoff.h, libbfd.h, bfd-in2.h: Rebuilt.
-	* coffcode.h (pe_value): Delete
-	(coff_mkobject, coff_mkobject_hook): Conditionally build.
-	(coff_compute_section_file_positions): Look in new place.
-	(add_data_entry, fill_pe_header_info): Deleted.
-	(coff_write_object_contents): Remove PE stuff.
-	(coff_bfd_print_private_bfd_data): New.
-	* coffswap.h: Remove PE stuff.
-	* elfxx-target.h (bfd_elfNN_bfd_print_private_bfd_data): New.
-	* libbfd-in.h (_bfd_generic_bfd_print_private_bfd_data): New.
-	* libcoff-in.h (pe_data_type): New.
-	* libecoff.h (_bfd_ecoff_bfd_print_private_bfd_data): New.
-	* targets.c (_bfd_print_private_bfd_data): New.
-	* peicode.h: New file.
-
-Thu Aug 31 11:49:21 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd-in.h: Add extern "C" if __cplusplus.
-	* bfd-in2.h: Rebuild.
-
-	* coff-mips.c (mips_relocate_section): Don't convert a reloc
-	against an absolute symbol into a reloc against a section.
-
-Thu Aug 31 08:00:14 1995  steve chamberlain  <sac@slash.cygnus.com>
-	
-	* coff-arm.c (coff_arm_reloc): Fix common size problem.
-	(i3coff_object_p): Delete.
-
-Wed Aug 30 20:41:27 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* coff-arm.c (deletemeacoff_arm_reloc): Deleted.
-	(arm26): Not partial inplace.
-	* coffcode.h (coff_compute_section_file_positions): Don't
-	do page aligning if COFF_PAGE_SIZE isn't defined.
-	* coffswap.h (coff_swap_scnhdr_in): Update image base correctly.
-
-Tue Aug 29 13:50:21 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* coffcode.h (coff_compute_section_file_positions):
-	Compile even if COFF_PAGE_SIZE isn't defined.
-	* cofflink.c (_bfd_coff_generate_reloc_section): Write
-	base file info as rvas.
-	* coff-arm.c (coff_rtype_to_howto): Deal with reloc 11.
-	* coffcode.h (coff_write_object_contents): Remove #if0ed code
-	Only remove empty sections in PE inmage files.
-	* libbfd.h, bfd-in2.h: regenerated.
-	* coff-arm.c (aoutarm_std_relo): New entry at 11.
-	(arm_reloc_type_lookup) : Understand type 11.
-	* coff-i386.c (howto_table): fix name of rva type.
-	(coff-i386_rtype_to_howto): Understand R_IMAGEBASE type.
-	* coffcode.h (sec_to_styp_flags): .edata is data.
-	(coff_compute_section_file_positions): Get page size right for PE.
-	Pagesize info is only valid in PE image files.
-	(fill_pe_header_info): Fix fields.
-	(coff_write_object_contents): Remove end_of_image calc.
-	(_bfd_coff_generate_reloc_section): Remove orphaned comment.
-	* coffswap.h (coff_swap_scnhdr_in): Don't always add IMAGE_BASE.
-	Swap in PE header.
-	(coff_swap_scnhdr_out): Setup PE flags correctly.
-	* reloc.c (BFD_RELOC_RVA): New field.
-
-Thu Aug 24 17:49:59 1995  Ian Lance Taylor  (ian@cygnus.com)
-
-	* cofflink.c (coff_link_input_bfd): Don't include line numbers for
-	a section if its output section has no contents.
-
-Wed Aug 23 16:48:52 1995  Ian Lance Taylor  (ian@cygnus.com)
-
-	* ecoff.c (_bfd_ecoff_slurp_symbolic_info): Add parentheses to FIX
-	expression to avoid compiler bug on HP-UX 9.01.
-
-Wed Aug 23 09:49:39 1995  Steve Chamberlain  <sac@rtl.cygnus.com>
-
-	* coffcode.h (pe_value): Unansify.
-
-Mon Aug 21 17:49:28 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* bfd-in.h (bfd_link_subsystem): Turn enum into #defines.
-	(bfd_link_pe_info_dval): New
-	(bfd_link_stack_heap): Renamed and massaged into bfd_link_pe_info.
-	* bfd-in2.h: rebuilt.
-	* bfd.c (NT_subsystem, NT_stack_heap): Deleted.
-	* coffcode.h (pe_value): New function.
-	(fill_pe_header_info): New function.
-	(coff_write_object_contents): Use new function.
-	(coff_write_object_contents): Initialze link_data if not set.
-	* cofflink.c (coff_final_link_info): Remove pe randomness.
-	(dores_com): Update info in bfd_link_pe_info_dval.
-	(process_embedded_commands): Use the bfd_link_pe_info_dval.
-	(_bfd_coff_final_link): Remove PE stuff, initialize
-	coff_data->link_info.
-	* coffswap.h (coff_swap_[aout|filehdr]_out): Use indirect PE pointer.
-	(coff_swap_scnhdr_out): Use real imagebase.
-	* libcoff-in.h (coff_data_type.link_info): New field.
-
-Mon Aug 21 11:10:32 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* linker.c (link_action): If an undefined reference follows an
-	undefined weak reference, change the type to undefined.
-	* elflink.h (elf_link_add_archive_symbols): Don't record an
-	undefined weak reference as defined, in case it turns into a real
-	undefined reference later in the same archive.
-
-Thu Aug 17 16:29:09 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
-
-	* coff-sh.c (sh_relax_section): Cast value for used_by_bfd field
-	to PTR, not coff_section_tdata pointer, since PTR is the real type
-	of the field.
-	* cofflink.c (_bfd_coff_read_internal_relocs): Ditto.
-
-Thu Aug 17 14:44:26 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	Add support for linking SPARC SunOS PIC compiled code.
-	* sunos.c (SPARC_PLT_PIC_WORD0): Define.
-	(SPARC_PLT_PIC_WORD1, SPARC_PLT_PIC_WORD2): Define.
-	(struct sunos_link_hash_entry): Add got_offset and plt_offset
-	fields.
-	(struct sunos_link_hash_table): Add dynamic_sections_created and
-	dynamic_sections_needed fields.
-	(sunos_link_hash_newfunc): Initialize new fields.
-	(sunos_link_hash_table_create): Initialize new fields.
-	(sunos_create_dynamic_sections): New static function, broken out
-	of sunos_add_dynamic_symbols.
-	(sunos_add_dynamic_symbols): Call sunos_create_dynamic_sections.
-	(sunos_add_one_symbol): Call sunos_create_dynamic_sections.
-	(bfd_sunos_size_dynamic_sections): Call sunos_scan_relocs before
-	checking whether we need to set up the dynamic link information.
-	Define __GLOBAL_OFFSET_TABLE if anything referred to it.
-	(sunos_scan_std_relocs): Call sunos_create_dynamic_sections.  Use
-	plt_offset field; only put symbol in .plt if it is not defined by
-	a regular object.
-	(sunos_scan_ext_relocs): Likewise.  Handle base relative relocs.
-	(sunos_scan_dynamic_symbol): Store dynobj in local variable.
-	(sunos_write_dynamic_symbol): Check plt_offset rather than
-	checking whether symbol is in .plt section.  If symbol is defined
-	in a regular object file, use SPARC_PLT_PIC_WORD[012], and don't
-	add a JMP_TBL reloc.
-	(sunos_check_dynamic_reloc): Add contents and relocationp fields.
-	If plt_offset is set, redirect relocation to PLT.  If this is a
-	base relative reloc, redirect relocation to GOT.  Check
-	dynamic_sections_needed field rather than whether dynobj is set.
-	(sunos_finish_dynamic_link): Check dynamic_sections_needed field
-	rather than whether dynobj is set.  Don't die if .need and .rules
-	sections were not created.
-	* aoutx.h (howto_table_ext): Mark PC10, PC22, and JMP_TBL entries
-	PC relative.  Mark PC10 complain_overflow_dont.  Mark PC22 and
-	JMP_TBL complain_overflow_signed.
-	(NAME(aout,final_link)): If info->shared is set, set DYNAMIC.
-	(aout_link_input_section_std): Call check_dynamic_reloc for all
-	relocs.  Pass contents and &relocation.  Don't warn about an
-	undefined symbol until check_dynamic_reloc has been called.  Don't
-	warn about an undefined symbol for a base relative reloc.
-	(aout_link_input_section_ext): Likewise.  For a base relative
-	reloc, always treat r_index as an index into the symbol table.
-	* libaout.h (struct aout_backend_data): Add contents and
-	relocation argument to check_dynamic_reloc entry point.
-	(struct aoutdata): Add local_got_offsets field.
-
-Wed Aug 16 01:03:07 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-i386.c (elf_i386_check_relocs): Fix bug in last change.
-
-Mon Aug 14 11:39:24 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,machine_type)): Handle a machine of
-	bfd_mach_sparc or bfd_mach_sparc64.
-
-	* elflink.h (elf_link_add_object_symbols): If a symbol is a weak
-	definition, add it to the dynamic symbol table if any dynamic
-	object mentions it.  If we do add it, make sure we add the
-	corresponding real symbol.
-	(elf_adjust_dynamic_symbol): Adjust a weak defined symbol which we
-	put in the dynamic symbol table, even if no regular object refers
-	to it.
-	* elf32-i386.c (elf_i386_check_relocs): When creating a shared
-	library, don't allocate space for a PC relative reloc against a
-	local symbol.
-	* elf32-m68k.c (elf_m68k_check_relocs): Likewise.
-	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Change assertion
-	to accept symbol with weakdef set.
-	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-	* elf32-m68k.c (elf_m68k_relocate_section): When creating a shared
-	libary, don't copy over a PC relative reloc against a local
-	symbol.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-
-Sun Aug 13 00:40:58 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.h (R_HPPA_BEGIN_BRTAB): Define.
-	(R_HPPA_END_BRTAB): Likewise.
-	* som.c (som_write_fixups): Handle R_BEGIN_BRTAB and R_END_BRTAB.
-
-Thu Aug 10 15:53:29 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffswap.h (coff_swap_aux_in): Swap the array dimensions
-	whenever x_fcnary is not being used for something else, rather
-	than only for an array.
-	(coff_swap_aux_out): Likewise.
-
-Tue Aug  8 16:34:57 1995  steve chamberlain  <sac@slash.cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Remove most
-	of special case stuff for PE.  Now handled by relocs.
-	* coff-i386.c (coff_i386_reloc): Special case of PE type 7s.
-	(howto_table): Type 7 is dir32-rva.
-
-Tue Aug  8 10:15:43 1995  Jeffrey A. Law  <law@rtl.cygnus.com>
-
-	* configure.host: Recognize aix4 explicitly.
-	* rs6000-core.c (CORE_DATA_SIZE_FIELD): New macro to get a the size
-	of a core dump's data section.  Provide alternate definition for aix4.
-	(SAVE_FIELD): Similarly for save state field (register info).
-	(STACK_END_ADDR): Provide definition suitable for aix4.
-	* config/{aix4.mh,aix4.mt}: New configuration files.
-	* hosts/aix4.h: Likewise.
-
-Mon Aug  7 23:03:21 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* som.c (som_bfd_copy_private_symbol_data): Cast initializations
-	to avoid warnings.
-
-Mon Aug  7 14:51:08 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_decode_symclass): Handle absolute symbols by checking
-	the SOM type (since they will rarely if ever be in the absolute
-	section).
-
-Wed Aug  6 09:12:50 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* archures.c (bfd_mach_sparc, bfd_mach_sparc64): Define.
-	* bfd-in2.h: Regenerated.
-	* cpu-sparc.c (sparc_arch_info): Renamed from arch_info_struct.
-	(sparc64_arch_info): New static variable.
-	(bfd_sparc_arch): Link in sparc64_arch_info.
-	* elf64-sparc.c (sparc64_elf_xxx): Renamed from elf64_xxx.
-	(sparc64_elf_object_p): New static function.
-	(elf_backend_object_p): Define.
-	* config/sparc64-elf.mt (SELECT_VECS): Add bfd_elf32_sparc_vec.
-
-Sat Aug  5 00:04:08 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som (som_get_reloc_upper_bound): Return -1 on error.  Compute
-	return value with sizeof (arelent *), not sizeof (arelent).
-
-Wed Aug  2 12:32:21 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (bfd_section_from_shdr): If the section pointed to by the
-	sh_link field of a reloc section is not a symbol table, and the
-	file contains a single symbol table, clobber the sh_link field of
-	the reloc section to point to the symbol table.
-
-Tue Aug  1 10:09:01 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* coff-arm.c (howto reloc ARM26): Change size from 3 to 2.
-	(howto reloc ARM26D): Likewise.
-
-Mon Jul 24 14:17:50 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,find_nearest_line)): Use the line just before
-	the offset, not the one just after.  Break out of the loop after
-	finding a function past the offset, not merely when finding a
-	function with a line defined.
-
-	* ecofflink.c (_bfd_ecoff_locate_line): When handling stabs:
-	correct setting of sym_ptr_end to consider symbols skipped when
-	setting sym_ptr; don't leave loop early unless an N_FUN is found
-	with a larger value.
-
-	* coff-sh.c (sh_coff_howtos): Mark R_SH_PCDISP8BY2 and R_SH_PCDISP
-	as PC relative.  Describe R_SH_IMM16.  Add entries for
-	R_SH_SWITCH16, R_SH_SWITCH32, R_SH_USES, R_SH_COUNT, and
-	R_SH_ALIGN.
-	(SWAP_IN_RELOC_OFFSET): Define.
-	(SWAP_OUT_RELOC_OFFSET): Define.
-	(CALC_ADDEND): Define.
-	(sh_reloc): Change sym_value and addr to type bfd_vma.  Skip reloc
-	types other than R_SH_IMM32 and R_SH_PCDISP on an external symbol.
-	(coff_bfd_relax_section): Define.
-	(coff_bfd_get_relocated_section_contents): Define.
-	(sh_relax_section): New static function.
-	(sh_relax_delete_bytes): New static function.
-	(sh_relocate_section): Handle R_SH_PCDISP on an external symbol.
-	(sh_coff_get_relocated_section_contents): New static function.
-
-	* cofflink.c (coff_link_add_object_symbols): Call
-	_bfd_coff_get_external_symbols, not coff_link_get_symbols.  Call
-	_bfd_coff_free_symbols, not coff_link_free_symbols.  Call
-	_bfd_coff_read_string_table, not coff_read_string_table.
-	(coff_link_check_archive_element): Likewise.
-	(coff_link_input_bfd): Likewise.
-	(coff_link_get_symbols): Move to coffgen.c.
-	(coff_read_string_table): Likewise.
-	(coff_link_free_symbols): Likewise.
-	(_bfd_coff_internal_syment_name): New static function.
-	(coff_link_check_ar_symbols): Use _bfd_coff_internal_syment_name.
-	(coff_link_add_symbols): Likewise.
-	(coff_link_input_bfd): Likewise.
-	(_bfd_coff_generic_relocate_section): Likewise.
-	(_bfd_coff_read_internal_relocs): New function.
-	(coff_link_input_bfd): Use cached section contents if available.
-	Use _bfd_coff_read_internal_relocs.
-	* coffcode.h (coff_slurp_symbol_table): Don't call bfd_seek.
-	(coff_bfd_get_relocated_section_contents): Only define if not
-	already defined.
-	(coff_bfd_relax_section): Likewise.
-	* coffgen.c (build_string_table): Remove.
-	(_bfd_coff_get_external_symbols): New function, moved in from old
-	coff_link_get_symbols in cofflink.c.
-	(_bfd_coff_read_string_table): New function, moved in from old
-	coff_read_string_table in cofflink.c.
-	(_bfd_coff_free_symbols): New function, moved in frmo old
-	coff_link_free_symbols in cofflink.c.
-	(coff_get_normalized_symtab): Use _bfd_coff_get_external_symbols
-	rather than reading the symbols directly.  To free them, call
-	_bfd_coff_free_symbols.  Use _bfd_coff_read_string_table rather
-	than build_string_table.
-	* libcoff-in.h (obj_coff_keep_syms): Define.
-	(obj_coff_keep_strings): Define.
-	(coff_data_type): Add fields keep_syms and keep_strings.
-	(coff_section_tdata): Define new structure.
-	(coff_section_data): Define.
-	(_bfd_coff_get_external_symbols): Declare.
-	(_bfd_coff_read_string_table): Declare.
-	(_bfd_coff_free_symbols): Declare.
-	(_bfd_coff_read_internal_relocs): Declare.
-	* libcoff.h: Rebuild.
-
-Fri Jul 21 22:32:54 1995  Michael Meissner  <meissner@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_howto_raw): Add support for R_PPC_SDAREL
-	relocation.
-	(ppc_elf_reloc_type_lookup): Ditto.
-	(ppc_elf_got16_inner): Ditto.
-	(ppc_elf_relocate_section): Ditto.
-
-Thu Jul 20 19:19:06 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (hppa_elf_gen_reloc_type): Add new (ignored)
-	argument.
-	* elf32-hppa.h: Corresponding change.
-
-Thu Jul 20 19:01:07 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* libaout.h (set_aout_section_data): New macro.
-	* sunos.c (sunos_scan_relocs): Use it.
-
-	* aout-ns32k.c (MY_swap_std_reloc_out): Undef KEEPIT before
-	defining it.
-
-Thu Jul 20 13:48:00 1995  Fred Fish  <fnf@cygnus.com>
-
-	* hosts/i386v4.h (getgid, getuid):  Change prototypes to be
-	compatible with Unixware 1.x and Unixware 2.x, and probably other
-	i386 svr4 versions as well.
-
-Thu Jul 20 13:41:21 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* targets.c (bfd_target_vector): Since armpe and armpei have been
-	split into big- and little-endian variants, list all of them,
-	instead of the now-nonexistant armpe[i]_vec.
-
-Thu Jul 20 00:06:39 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (bfd_section_from_phdr): Set lma based on p_paddr.
-	(elf_fake_sections): Set sh_addr based on lma, not vma.
-
-Wed Jul 19 15:52:01 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* coff-arm.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Replaces TARGET_SYM.
-	* configure.in (armpe_vec, armpei_vec): Add bi-endian support.
-	* configure: "regenerated".
-	* pe-arm.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Replaces TARGET_SYM.
-	(TARGET_LITTLE_NAME, TARGET_BIG_NAME): Replaces TARGET_NAME.
-	* pei-arm.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Replaces TARGET_SYM.
-	(TARGET_LITTLE_NAME, TARGET_BIG_NAME): Replaces TARGET_NAME.
-	* targets.c (armpe_vec, armpei_vec): Deleted.
-	(armpe_little_vec, armpe_big_vec, armpei_little_vec, armpei_big_vec):
-	Added.
-	* config/arm-pe.mt (DEFAULT_VECTOR): Default is armpe_little_vec.
-	(SELECT_VECS): Add bi-endian support.
-
-Wed Jul 19 10:47:25 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c: Clean up and comment.
-	(r_imm32): Remove.
-	(sh_coff_howtos): New static array.
-	(SH_COFF_HOWTO_COUNT): Define.
-	(get_symbol_value): Make relocation bfd_vma rather than long.
-	(RTYPE2HOWTO): Rewrite to use sh_coff_howtos.
-	(coff_relocate_section): Define to sh_relocate_section.
-	(sh_relocate_section): New static function.
-
-Sat Jul 15 01:02:53 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* configure.host:  Add support for generic m68k SVR4 host.
-
-Fri Jul 14 13:13:55 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (KEEPIT): Change definition to udata.i.
-	(KEEPITTYPE): Remove.
-	(NAME(aout,reloc_type_lookup)): Add cases to the
-	extended reloc type switch: SPARC_GOT10, SPARC_GOT13, SPARC_GOT22,
-	SPARC_PC10, SPARC_PC22, SPARC_WPLT30.
-	(NAME(aout,swap_std_reloc_out)): Don't bother to use stoi when
-	retrieving KEEPIT value.
-	(NAME(aout,swap_ext_reloc_out)): Likewise.  Also, only add in
-	output section VMA for section symbols, and check BSF_SECTION_SYM
-	to control whether to set r_extern to 1.
-
-	* syms.c: Fix comments so that `make info' works.
-
-	* elf32-mips.c (mips_elf_find_nearest_line): Set SEC_HAS_CONTENTS
-	in .mdebug section, in case backend linker has cleared it.
-
-Fri Jul 14 11:58:34 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_addr16_ha_inner): Rewrite to take just one
-	argument, the final relocated address.
-	(ppc_elf_addr16_ha_inner): Adjust ppc_elf_addr16_ha_inner caller.
-	(ppc_elf_relocate_section): Ditto.
-
-Thu Jul 13 17:22:03 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (hppa_som_gen_reloc_type): Choose a reasonable field
-	selector relocation for the difference of two symbols.
-
-Thu Jul 13 10:33:25 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,slurp_reloc_table)): Cast argument to size_t
-	for malloc.
-	* coff-mips.c (mips_relocate_section): Likewise, for memmove.
-	(mips_relax_section): Likewise, for malloc.
-	* cofflink.c (process_embedded_commands): Likewise.
-	(_bfd_coff_final_link): Likewise.
-	* ecoff.c (_bfd_ecoff_write_object_contents): Likewise.
-	(ecoff_final_link_debug_accumulate): Likewise.
-	(ecoff_indirect_link_order): Likewise, for memcpy and malloc.
-	(ecoff_reloc_link_order): Likewise, for malloc.
-	* ecofflink.c (ecoff_align_debug): Likewise, for memset.
-	(ecoff_write_symhdr): Likewise, for malloc.
-	* elf32-hppa.c (elf32_hppa_read_symext_info): Likewise.
-	* elf.c (assign_file_positions_except_relocs): Likewise, for
-	qsort.
-	* elf32-mips.c (mips_elf_read_ecoff_info): Likewise, for malloc.
-	* elfcode.h (elf_slurp_reloc_table): Likewise.
-	* elfcore.h (elf_corefile_note): Likewise.
-	* elflink.h (elf_link_add_object_symbols): Likewise.
-	(elf_link_read_relocs): Likewise.
-	(NAME(bfd_elf,size_dynamic_sections)): Likewise, for memset.
-	* i386linux.c (bfd_linux_size_dynamic_sections): Likewise.
-	* ieee.c (do_with_relocs): Likewise.
-	* linker.c (default_indirect_link_order): Likewise, for malloc.
-	* nlmcode.h (nlm_object_p): Likewise.
-	(nlm_write_object_contents): Likewise.
-	* oasys.c (oasys_set_section_contents): Likewise, for memcpy.
-	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise,
-	for malloc.
-	* section.c (bfd_get_section_contents): Likewise, for memcpy.
-	* srec.c (srec_get_section_contents): Likewise.
-	(srec_set_section_contents): Likewise.
-	* sunos.c (bfd_sunos_size_dynamic_sections): Likewise, for
-	realloc and memset.
-	(sunos_scan_relocs): Likewise, for malloc.
-	(sunos_scan_dynamic_symbol): Likewise, for realloc.
-	* syms.c (_bfd_generic_read_minisymbols): Likewise, for malloc.
-	* versados.c (versados_get_section_contents): Likewise, for
-	memcpy.
-
-	* libbfd.c (real_read): Add prototype.  Change argument types from
-	int to size_t.
-	(bfd_read): Cast real_read argument to size_t, not int.
-	(bfd_write): Cast fwrite argument to size_t, not int.
-
-	* elf64-gen.c (elf_info_to_howto): Fix definition for recent elf.c
-	changes.
-
-	* configure.in: Fix typo: change {$enableval} to ${enableval}.
-	* configure: Rebuild.
-
-	* Makefile.in (BFD32_BACKENDS): Add elflink.o.
-
-	* targets.c (bfd_target): Add fields _read_minisymbols and
-	_minisymbol_to_symbol.
-	(BFD_JUMP_TABLE_SYMBOLS): Add _read_minisymbols and
-	_minisymbol_to_symbol.
-	(bfd_read_minisymbols): Define.
-	(bfd_minisymbol_to_symbol): Define.
-	* syms.c (_bfd_generic_read_minisymbols): Define.
-	(_bfd_generic_minisymbol_to_symbol): Define.
-	* libbfd-in.h (_bfd_nosymbols_read_minisymbols): Define.
-	(_bfd_nosymbols_minisymbol_to_symbol): Define.
-	(_bfd_generic_read_minisymbols): Declare.
-	(_bfd_generic_minisymbol_to_symbol): Declare.
-	* bfd-in2.h: Rebuild.
-	* libbfd.h: Rebuild.
-	* aoutx.h (MINISYM_THRESHOLD): Define.
-	(NAME(aout,read_minisymbols)): New function.
-	(NAME(aout,minisymbol_to_symbol)): New function.
-	* libaout.h (NAME(aout,read_minisymbols)): Declare.
-	(NAME(aout,minisymbol_to_symbol)): Declare.
-	* aout-target.h (MY_read_minisymbols): Define.
-	(MY_minisymbol_to_symbol): Define.
-	* All targets: Define read_minisymbols and minisymbol_to_symbol.
-
-Wed Jul 12 17:55:55 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Cast return value from
-	bfd_alloc.
-
-	* elfcode.h (size_info): Don't use "&" before function names.
-
-Wed Jul 12 00:16:48 1995  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
-
-	* libelf.h (elf_backend_data): Use unsigned, not unsigned char,
-	for bitfields.
-
-Tue Jul 11 15:19:53 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (bfd_section_from_shdr): In case SHT_REL[A], only get the
-        BFD section for the sh_link section if it is a SYMTAB section.
-
-	* aoutx.h (NAME(aout,link_add_symbols)): Don't bother to check
-	that archives hold a.out objects.
-	* cf-i386lynx.c (coff_bfd_link_add_symbols): Don't define.
-	(lynx_link_add_symbols): Remove.
-	* cf-m68klynx.c (coff_bfd_link_add_symbols): Don't define.
-	(lynx_link_add_symbols): Remove.
-	* elflink.h (elf_bfd_link_add_symbols): Don't bother to check that
-	archives hold ELF objects.
-
-	* archive.c (bfd_generic_archive_p): If the archive has a map, and
-	the target was defaulted, but the first object in the archive can
-	not be matched with that target, then return a bad format error.
-
-	* elf64-sparc.c (elf_sparc_howto_table): Set howto for WDISP16 to
-	elf64_wdisp16_reloc.
-	(elf64_wdisp16_reloc): New static function.
-	(elf64_sparc_relocate_section): New static function.
-	(elf_backend_relocate_section): Define.
-
-	* libelf.h (struct elf_size_info): Change type of last argument to
-	swap_symbol_out from char * to PTR.
-	(bfd_elf32_swap_symbol_out): Update declaration.
-	(bfd_elf64_swap_symbol_out): Likewise.
-	* elfcode.h (elf_swap_symbol_out): Change type of cdst from char *
-	to PTR.
-	* elf.c (swap_out_syms): Cast to PTR, not char *, when calling
-	swap_symbol_out routine.
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Likewise.
-	(elf_link_output_sym): Likewise.
-	(elf_link_output_extsym): Likewise.
-	* elf32-sparc.c (elf32_sparc_finish_dynamic_sections): Likewise.
-
-Tue Jul 11 12:29:49 1995  Rick Sladkey  <jrs@world.std.com>
-
-	* elf.c (_bfd_elf_find_nearest_line): Handle the simple case where
-	there is no debugging information.
-
-Mon Jul 10 11:45:55 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* makefile.dos (OBJS): Add binary.o and tekhex.o.  From DJ
-	Delorie.
-
-Mon Jul 10 11:09:58 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* linker.c (set_symbol_from_hash): bfd_link_hash_new case: Don't
-	abort; it can happen for constructor symbols when not building
-	constructors.
-
-	* coff-i960.c (coff_i960_relocate): Correct typo: use ! on strcmp,
-	not on string.
-	* cofflink.c (_bfd_coff_generic_relocate_section): Remove unused
-	local i.
-	* coff-arm.c (coff_arm_rtype_to_howto): Don't declare.
-	(PCRELOFFSET): Define if not already defined.
-	* Makefile.in: Rebuild dependencies.
-	(BFD32_BACKENDS): Add coff-arm.o
-	(CFILES): Add coff-arm.c, pe-arm.c, pei-arm.c.
-
-	* aoutx.h (NAME(aout,link_hash_table_create)): Allocate hash table
-	using bfd_alloc, not malloc.
-	* cofflink.c (_bfd_coff_link_hash_table_create): Likewise.
-	* ecoff.c (_bfd_ecoff_bfd_link_hash_table_create): Likewise.
-	* i386linux.c (linux_link_hash_table_create): Likewise.
-	* linker.c (_bfd_generic_link_hash_table_create): Likewise.
-	* sunos.c (sunos_link_hash_table_create): Likewise.
-
-	Based on patches from Eric Youngdale <eric@aib.com>:
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): If -Bsymbolic,
-	output a DT_SYMBOLIC dynamic entry.
-	(elf_adjust_dynamic_symbol): If -Bsymbolic, don't require a PLT
-	entry for a locally defined symbol.
-	* elf32-i386.c (elf_i386_relocate_section): If -Bsymbolic, do warn
-	about undefined symbols, and fill in the GOT entry for a symbol
-	defined in a regular object file.
-	(elf_i386_finish_dynamic_symbol): If -Bsymbolic, output a RELATIVE
-	reloc rather than a GLOB_DAT reloc for a symbol defined in a
-	regular object file.
-	* elf32-m68k.c (elf_m68k_relocate_section): If -Bsymbolic, do warn
-	about undefined symbols, and fill in the GOT entry for a symbol
-	defined in a regular object file.
-	(elf_m68k_finish_dynamic_symbol): If -Bsymbolic, output a RELATIVE
-	reloc rather than a GLOB_DAT reloc for a symbol defined in a
-	regular object file.
-	* elf32-sparc.c (elf32_sparc_relocate_section): If -Bsymbolic, do
-	warn about undefined symbols, and fill in the GOT entry for a
-	symbol defined in a regular object file.
-	(elf32_sparc_finish_dynamic_symbol): If -Bsymbolic, output a
-	RELATIVE reloc rather than a GLOB_DAT reloc for a symbol defined
-	in a regular object file.
-
-	* config/m68k-coff.mt (SELECT_VECS): Rename from SELECT_VECTORS.
-	Correct elements to be actual BFD vector names.
-
-	* Makefile.in (Makefile): Don't depend upon @frags@.
-	(config.status): Depend upon @frags@.
-
-Fri Jul  7 17:36:44 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffgen.c (coff_renumber_symbols): Sort defined symbols that are
-	neither BSF_FUNCTION not BSF_NOT_AT_END just before undefined
-	symbols.
-	* coffcode.h (coff_slurp_symbol_table): Set BSF_FUNCTION as well
-	as BSF_NOT_AT_END.
-
-Fri Jul  7 17:16:15 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* Makefile.in (do_mostlyclean): Remove config.log.
-	(do_distclean): Remove config.cache.
-
-Thu Jul  6 14:37:43 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-i386.c (elf_i386_relocate_section): Revert May 24 patch.
-        Don't copy PC32 reloc against section into shared object.
-
-	* Makefile.in: Rebuild dependencies.
-	(CFILES): Added elflink.c.
-	(Makefile): Depend upon config.status, not configure.in.
-	(config.status): New target; depend upon configure configure.host
-	and config.bfd.
-
-Wed Jul  5 20:17:14 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* elfcore.h, elflink.h, elfcode.h, elf.c, elflink.c: Moved some
- 	primarily size-independent code from elfcode.h to elf.c and new
- 	file elflink.c; moved out other core- or linker-related routines
- 	into other new .h files for clarity.  Renamed many routines to
- 	start with bfd_elf or _bfd_elf.  Added a structure of
- 	size-dependent but target-independent info to elfcode.h.
-	* Makefile.in: Build elflink.o.  Update dependencies.
-	* libelf.h: Updated some declarations.  Added a definition for the
-	new structure in elfcode.h.  Added more fields to elf backend data
-	structure.
-	* elfxx-target.h: Refer to the appropriate size-dependent info.
-	* elf32-*.c: Changed some function names.  Moved common
-	create_dynamic_sections code from m68k, sparc, and i386 support
-	into elflink.c.  Define some new macros to fill in new fields of
-	back end data.  Also clean up some "gcc -Wall" warnings regarding
-	unused or uninitialized variables.
-
-	* Makefile.in (BFD_LIBS): No, don't put elflink.o here.
-	* configure.in: Include it here whenever elf.o is specified.
-
-Wed Jul  5 10:31:47 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_object_p): Unconditionally set
-	elf_bad_symtab, since sometimes the symbol table is messed up and
-	the last symbol is global.
-
-	* ecoff.c (_bfd_ecoff_bfd_is_local_label): New function.
-	* libecoff.h (_bfd_ecoff_bfd_is_local_label): Declare.
-	* elf32-mips.c (mips_elf_is_local_label): New static function.
-	(bfd_elf32_bfd_is_local_label): Define.
-
-	* configure.in: Use $ac_config_sub, not $configsub.
-	* configure: Likewise.
-
-	Permit --enable-targets=ieee:
-	* config.bfd (*-*-ieee*): New target.
-	* config/ieee.mt: New file.
-
-Wed Jul  5 04:16:35 1995  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
-
-	* config/i386aix.mh (HDEFINES): Remove -DFASCIST_FDOPEN.
-
-	Autoconfiscation:
-	* configure.in, Makefile.in, doc/Makefile.in: Switch from Cygnus
-	configure to autoconf ways of processing --enable arguments,
-	setting up symlinks, incorporating makefile fragments, printing
-	messages at configuration time, setting variables in Makefile.
-	Deleted some unused variables.  Check for ranlib via autoconf.
-	For now, configure script removes doc/config.status.
-	* configure: New file.
-	* dep-in.sed: Use @SRCDIR@ instead of @srcdir@, so Makefile.in
-	line doesn't get broken by configure.
-	* doc/configure.in: Removed.
-
-Tue Jul  4 12:22:21 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* archive.c (_bfd_construct_extended_name_table): If
-	BFD_TRADITIONAL_FORMAT is set, limit the length of all file names
-	to ar_max_namelen.
-	(bfd_dont_truncate_arname): If BFD_TRADITIONAL_FORMAT is set, call
-	bfd_bsd_truncate_arname.
-	(_bfd_write_archive_contents): Revert June 1 change.
-
-	* elfcode.h (NAME(bfd_elf,record_link_assignment)): Add provide
-	argument.
-	* bfd-in.h (bfd_elf32_record_link_assignment): Update prototype.
-	(bfd_elf64_record_link_assignment): Likewise.
-	* bfd-in2.h: Rebuild.
-
-	* libelf.h (struct elf_link_hash_table): Add needed field.  Remove
-	saw_needed field.
-	* elfcode.h (elf_link_add_object_symbols): If elf_dt_needed_name
-	is an empty string, don't make a DT_NEEDED entry in the output
-	file.  Record all DT_NEEDED entries found in input dynamic
-	objects.
-	(elf_link_output_extsym): Don't check saw_needed when issuing
-	warnings.
-	* elf.c (_bfd_elf_link_hash_table_init): Initialize needed, not
-	saw_needed.
-	(bfd_elf_get_needed_list): New function.
-	* bfd-in.h (struct bfd_elf_link_needed_list): Define.
-	(bfd_elf_get_needed_list): Define.
-	* bfd-in2.h: Rebuild.
-
-	* ecoff.c (_bfd_ecoff_find_nearest_line): Also initialize
-	find_buffer and fdrtab_len fields of newly allocated
-	find_line_info structure.
-
-Mon Jul  3 17:03:52 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (hppa_som_gen_reloc_type): New argument "sym_diff",
-	nonzero when we're generating relocations for an expression
-	using the difference of two symbols.  All callers changed.
-	Handle difference of symbols for both R_HPPA and R_COMPLEX
-	cases.
-	(som_write_fixups): Handle R_COMP1, R_COMP2 and R_CODE_EXPR
-	fixups.
-
-Mon Jul  3 13:55:18 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* config.bfd (win32): New configuration.
-	* configure.host (pe): Changed to i386win32.
-	* config/i386pe.mh: Deleted.
-	* config/i386win32.mh: New file.
-
-Mon Jul  3 11:30:45 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_find_nearest_line): If we allocate
-	find_line_info, clear the fdrtab field.
-
-	* targets.c (enum bfd_flavour): Add bfd_target_msdos_flavour here,
-	rather than in bfd-in2.h.
-
-	* bfd.c (enum bfd_error): Define bfd_error_no_armap.
-	(bfd_errmsgs): Add string for bfd_error_no_armap.
-	* bfd-in2.h: Rebuild.
-	* ecoff.c (ecoff_link_add_archive_symbols): If an archive has no
-	armap, set bfd_error_no_armap rather than bfd_error_no_symbols.
-	* elfcode.h (elf_link_add_archive_symbols): Likewise.
-	* linker.c (_bfd_generic_link_add_archive_symbols): Likewise.
-
-	* elfcode.h (elf_link_add_object_symbols): Permit common and
-	indirect symbols in weakdefs BFD_ASSERT.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Simplify
-	BFD_ASSERT to permit some legal, but odd, cases.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
-
-	* Makefile.in: Rebuild dependencies.
-	(BFD32_BACKENDS): Add versados.o.
-	(CFILES): Add pe-i386.c, pei-i386.c, and versados.c.
-
-Sun Jul  2 17:49:32 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Cast base_file
-	to FILE * before using it.
-	* stab-syms.c: Revert yesterday's patch.
-
-Sat Jul  1 12:10:42 1995  Fred Fish  <fnf@cygnus.com>
-
-	* stab-syms.c (stdio.h):  Include prior to libaout.h, which
-	includes bfdlink.h, which now uses FILE.
-
-Sat Jul  1 00:11:08 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* elfxx-target.h: New file.
-
-	* libelf.h (struct elf_backend_data): Remove elf_64_p field.
-	* elfxx-target.h (elfNN_bed): Don't set it.
-
-	* elf32-target.h, elf64-target.h: Deleted.
-	* Makefile.in (elf32-target.h, elf64-target.h): Build them from
-	elfxx-target.h.
-
-Fri Jun 30 16:07:18 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Compare
-	the full text of .reloc or .edata section names.
-
-Fri Jun 30 15:47:37 1995  Fred Fish  <fnf@cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section):
-	Remove extra '+'.
-
-Thu Jun 29 17:24:52 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* coff-h8300.c (COFF_LONG_FILENAMES): Define.
-
-Wed Jun 28 18:04:42 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* Makefile.in: versados.o is now conditionally built.
-	* coffcode.h (add_data_entry): New function.
-	(coff_write_object_contents): Clean up. Calculate
-	data entries.
-	* cofflink.c (_bfd_coff_generic_relocate_section):
-	.reloc and .edata sections are IMAGE_BASED too.
-	If there's a base_file then write out base information.
-	* configure.host (i386-*-pe): New.
-	* syms.c (coff_section_type): Only scan prefixes.
-	* targets.c (bfd_target_vector): Versados is now conditionally
-	built.
-	* config/m68k-coff.mt: Build versados.o
-	* hosts/i386pe.h: New file.
-
-Mon Jun 26 13:53:49 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hpa.c (elf32_hppa_relocate_section): Close comment before
-	R_PARISC_DPREL21L handling.
-
-Thu Jun 22 19:28:36 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	Sun May  7 11:53:41 MDT 1995  Bryan Ford  <baford@cs.utah.edu>
-
-	* config/i386-moss.mt: created.
-
-Thu Jun 22 08:56:10 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* reloc.c (bfd_perform_relocation): Add case for -ve words.
-
-Wed Jun 21 13:13:49 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (elf32_hppa_relocate_section): Don't try to apply a
-	relocation against an undefined symbols.
-
-Wed Jun 21 10:16:10 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* versados.c: Second pass/rewrite.
-
-Mon Jun 19 08:40:45 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* syms.c (coff_section_type): Compare only the front part
-	of a section name.
-
-Sat Jun 17 09:40:44 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (elf32_hppa_size_stubs): Set the size of the stub
-	section if we get an error.
-
-	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Don't mess
-	with the operands of an R_PARISC_DPREL21L relocation if the insn
-	is not "addil <symbol>,%r27".
-
-Fri Jun 16 15:04:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* bfd-in.h (NT_subsystem, NT_stack_heap): Declare but don't
-	define.
-	* bfd-in2.h: Rebuilt.
-	* bfd.c (NT_subsystem, NT_stack_heap): Define.
-
-Fri Jun 16 00:07:25 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (elf32_hppa_bfd_link_link_relocate): Use the right
-	type field (there are two!) when checking to see if $global$ is
-	defined.
-
-Thu Jun 15 14:03:47 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* bfd-in.h, bfd-in2.h (bfd_boolean): Rename bfd_true, bfd_false
-	to bfd_tttrue, bfd_fffalse so as not to conflict with functions.
-	* coffswap.h (coff_swap_scnhdr_out): Remove version that was
-	hacked for MPW C.
-	* mpw-config.in: Set shell vars instead of pasting to makefile
-	for each configuration, edit coffswap.h to make MPW C not choke.
-	(i386-unknown-coff, sh-hitachi-hms): Recognize.
-	* mpw-make.in (BFD_LIBS): Add versados.c.o.
-
-	* versados.c (versados_scan): Properly cast results from bfd_alloc.
-
-Wed Jun 14 15:27:32 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* cofflink.c (process_embedded_commands): New function
-	reads and handles .drectve sections for PE.
-	(coff_link_input_bfd): Call new function if PE.
-
-Mon Jun 12 12:09:39 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* bfd-in.h (bfd_set_section_vma): Case true to a boolean.
-	(bfd_set_cacheable): Likewise.
-	* bfd-in2.h: Rebuilt.
-
-Fri Jun  9 12:20:28 1995  Steve Chamberlain  <sac@rtl.cygnus.com>
-
-	* elfcode.h (elf_sort_hdrs): Rewrite to be symmetrical.
-
-Fri Jun  9 12:49:00 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* targets.c: Add copy_private_symbol_data and link_split_section
-	to the target vector.
-	* libbfd-in.h (_bfd_generic_bfd_copy_private_symbol_data): Define.
-	(_bfd_nolink_bfd_link_split_section): Likewise.
-	(bfd_generic_link_split_section): Declare.
-	* syms.c (bfd_copy_private_symbol_data): Define.
-	* linker.c (bf_link_split_section): Likewise.
-	* som.c (som_bfd_copy_private_symbol_data): New function
-	(som_bfd_link_split_section): Likewise.
-	* All other targets updated with default versions of new routines.
-
-	* Take out my braindamaged bfd_true/bfd_false changes from earlier
-	today.  Replace with just:
-	* bfd-in.h: (TRUE_FALSE_ALREADY_DEFINED): Define this if
-	compiling with g++-2.6 or later.
-	* bfd-in2.h: Rebuilt.
-
-Fri Jun  9 07:54:29 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* versados.c (struct esd, get_4): Lint; use unsigned chars.
-
-	* coff-i960.c (coff_i960_relocate):  Compare output section names
-	when converting for vxworks.
-
-Wed Jun  7 19:01:30 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* elfcode.h (elf_fake_sections): Permit .scommon or COMMON
-	sections as random SHT_NOBITS sections, in case a linker script is
-	strange.
-
-Tue Jun  6 17:29:32 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* bfd-in.h (NT_subsystem, NT_stack_heap): Moved from pe.h
-	* coff-i386.c (coff_i386_rtype_to_howto): Get PE relocs right.
-	* coffcode.h (coff_mkobject): Set pe tdata bit when using PE.
-	* cofflink.c (COFF_WITH_PE code): Test on obj_pe bit rather
-	than conditional compile.
-	* configure.in: Fix PE dependencies.
-	* libcoff-in.h (obj_pe): New.
-	(coff_tdata): Added pe entry.
-	* libcoff.h: Regenerated.
-
-Mon Jun  5 09:07:13 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* coff-a29k.c (coff_a29k_adjust_symndx): Completely parenthesize
-	macro.
-
-Mon Jun  5 02:15:20 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
-
-	Linker support for m68k-elf from Andreas Schwab
-	<schwab@issan.informatik.uni-dortmund.de>:
-	* elfcode.h (elf_link_add_object_symbols): Check for NULL when
-	looping through the symbol hashes.
-	(elf_bfd_final_link): When looking for _init and _fini don't use
-	the symbol if it is imported from another object.
-	* elf32-m68k.c: Relocation type changed from REL to RELA.  Regular
-	and dynamic linking support functions added, similar to other elf
-	targets.
-
-	* config.bfd (i[345]86-*-gnu*): Use ELF configuration.
-
-Fri Jun  2 18:54:59 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* versados.c: New file.
-	* bfd-in2.h (struct _bfd): New field.
-	* bfd.c (struct _bfd): New field.
-	* configure.in (versados_vec): New field.
-	* targets.c (bfd_flavor): Added versados.
-
-Thu Jun  1 13:51:49 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* coffcode.h (sec_to_styp_flags, styp_to_sec_flags, 
-	coff_new_section_hook):  Any section that starts ".stab"
-	is now marked as debugging.
-
-Thu Jun  1 16:15:16 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* archive.c (_bfd_write_archive_contents): Disable extended name
-	table until it can be made optional, so that native AR has half a
-	chance on SunOS and HP/UX.
-
-	* linker.c (_bfd_generic_link_output_symbols, case
-	bfd_link_hash_indirect): Add cast to correct pointer types.
-
-Sat May 27 21:37:31 1995  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* config.bfd (m68k-bull-sysv*): Added strip_underscore=yes.
-	  (m68k-est-coff): Removed.  target does not effect object format.
-
-Wed May 24 10:52:01 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* linker.c (_bfd_generic_link_output_symbols): Cope with
-	indirect symbols.
-
-	* elf32-i386.c (elf_i386_relocate_section): Give error
-	message when linking to a shared reloc which isn't there.
-
-Wed May 24 10:40:00 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	Support for ARM-PE.
-
-	* Makefile.in, coffcode.h, config.bfd, configure.in, pe-arm.c,
-	 pei-arm.c, coff-arm.c, reloc.c, targets.c, config/arm-pe.mt:
-	 Support for ARM COFF/PE.
-
-Tue May 23 19:24:58 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* bfd.c (bfd_get_relocated_section_contents): Now a function,
-	tries calling routine from input bfd target vector for
-	bfd_indirect_link_order.  Put a declaration into the header file.
-	* bfd-in2.h: Regenerated.
-	* elf32-mips.c (gprel16_with_gp): New function, split out from
-	mips_elf_gprel16_reloc.
-	(mips_elf_gprel16_reloc): Call it.  If output bfd target vector
-	isn't elf flavoured, abort, since it's assumed to be elf in some
-	of this code, including the code that looks up the gp value.
-	(elf32_mips_get_relocated_section_contents): New function,
-	modified from bfd_generic_get_relocated_section_contents to deal
-	with passing gp to gprel16_with_gp.
-	(bfd_elf32_bfd_get_relocated_section_contents): New macro.
-	* elf32-target.h (bfd_elf32_bfd_get_relocated_section_contents):
-	Don't define if already defined.
-
-Tue May 23 15:58:15 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* Makefile.in: Install bfdlink.h too.
-
-Sun May 21 22:25:09 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (elf32_hppa_relocate_section): Handle undefined and
-	notsupported return codes from final_link_relocate (used when
-	$global$ is undefined or nonexistant).
-	(elf32_hppa_bfd_link_link_relocate): If $global$ exists, but is
-	not defined,then return bfd_reloc_undefined.
-
-Fri May 19 10:00:14 1995  Steve Chamberlain  <sac@rtl.cygnus.com>
-
-	* coffswap.h: (IMAGE_BASE): Define to 0 if not.
-
-Thu May 18 04:24:01 1995  Ken Raeburn  <raeburn@kr-laptop.cygnus.com>
-
-	Wed May 10 14:28:16 1995 Richard Earnshaw (rearnsha@armltd.co.uk)
-
-	* aoutx.h (aout_link_input_section_standard): If defined, call
-	MY_relocatable_reloc before doing a partial relocation.
-
-	* aout-arm.c: (WRITE_HEADERS): Delete.
-	(NAME): Define version to override default in aoutx.h
-	(MY(howto_table)): Reformat.  Alter some entries slightly.
-	(RELOC_ARM_BITS_NEG_{BIG,LITTLE}): Define.
-	(MY(reloc_howto), MY(put_reloc), MY(relocatable_reloc)): New functions.
-	(MY_reloc_howto, MY_put_reloc, MY_relocatable_reloc): Define.
-	(MY(fix_pcrel_26)): Renamed from aoutarm_fix_pcrel_26, return
-	bfd_reloc_ok not bfd_reloc_continue.
-	(MY(fix_pcrel_26_done)): Likewise.
-	(MY(bfd_reloc_type_lookup)): Renamed from aoutarm_reloc_type_lookup.
-	(MY_bfd_link_hash_table_create, MY_bfd_link_add_symbols,
-	MY_bfd_final_link): Delete.
-	(MY_swap_std_reloc_in, MY_swap_std_reloc_out, MY_get_section_contents):
-	Define.
-	(aoutx.h): Include it.
-	(MY(swap_std_reloc_{in,out})): New functions.
-	Use RELOC_ARM_BITS_NEG_{BIG,LITTLE} to extract negative reloc bit.
-	(aoutarm_squirt_out_relocs): Delete.
- 
-	From: David Taylor (dtaylor@armltd.co.uk)
-	* config/arm[lb]-aout.mt: New files.
-	* aout-arm.c: New file.
-	* config.bfd: Handle arm{,e[lb]}-*-aout
-	* configure.in: Add vetor for aout_arm_{big,little}_vec.
-	* reloc.c: New relocation types for the ARM.
-	* targets.c (aout_arm_{big,little}_vec): declare.
-
-Tue May 16 10:29:51 1995  Jim Kingdon  <kingdon@deneb.cygnus.com>
-
-	* libbfd.c (bfd_stat): If bfd_cache_lookup returns an error,
-	return an error to the caller.  Call bfd_set_error on errors.
-
-Tue May 16 14:44:45 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* libcoff-in.h (coff_renumber_symbols): Modified prototypes in
-	accordance with 11 May libcoff.h change.
-
-Thu May 11 16:43:14 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	tekhex.c (first_phase): Understand type 0 symbols.
-	(tekhex_write_object_contents): Fix typo in final record.
-
-Thu May 11 16:43:14 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* coff-i960.c (optcall_callback): don't try and optimize
-	undefined refs. 
-	(coff_write_relocs): Search for broken relocs on the way
-	out and fix them up.
-	(coff_renumber_symbols): Calculate and return index of
-	first undefined symbol.
-	(coff_write_object_contents): Call coff_renumber_symbols 
-	and coff_write_relocs with the new args.
-	* libcoff.h: (coff_renumber_symbols, coff_renumber_symbols):
-	Modified prototypes.
-
-Thu May 11 16:43:14 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-			  Tom Griest <griest@cs.yale.edu>
-
-	Initial support for PE format. 
-	
-	* Makefile.in, targets.c, configure.in, config.bfd:
-	Add support for i386-*-winnt and i386-*-pe.
-	* archive.c (do_slurp_coff_armap):  Understand NTPE format
-	archives.
-	(_bfd_slurp_extended_name_table): Turn \ in a filename
-	into /.
-	* bfd-in.h (bfd_link_subsystem, _bfd_link_stack_heap): New.
-	* coff-i386.c  (howto_table): Conditionalize PCRELOFFSET.
-	* coffcode.h (IMAGE_BASE): New.
-	(coff_compute_section_file_positions): Throw away .junk
-	sections for PE, align symbols.
-	(coff_write_object_contents): Throw away .junk sections
-	for PE. Remember info on .idata and .rsrc sections.
-	Fill in the PE header.
-	(coff_slurp_symbol_table): PE uses C_SECTION class.
-	* cofflink.c (_bfd_coff_final_link): Keep PE info up to date.
-	(_bfd_coff_generic_relocate_section): Cope with PE relocs.
-	* coffswap.h (coff_swap_{aout/file/scn/sym}hdr_{in/out}): 
-	New code for PE headers.
-
-Tue May  9 17:01:38 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* config.bfd: Add little endian PowerPC support.
-	* configure.in: Ditto.
-	* targets.c: Ditto.
-	* config/ppcle-elf.mt: New file, for little endian PowerPC
-	support.
-	* config/ppc-elf.mt: Add little endian powerpc to the BFD
-	selection vectors.
-	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): Complain if
-	linking a different endian object than we expect.
-	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME): Define, to provide little
-	endian support.
-
-Tue May  2 16:32:24 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* config.bfd (hppa*-*-lites*): Treat just like hppa*-*-*elf*.
-
-Tue Apr 25 19:38:43 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* coffgen.c (make_a_section_from_file): Initialize lma same as
-	vma.
-
-Tue Apr 25 11:03:21 1995  Jason Molenda  (crash@phydeaux.cygnus.com)
-
-	* hosts/std-host.h: #include ansidecl.h 'cause PTR is used in
-	std-host.h.
-
-Mon Apr 24 23:56:44 1995  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* hosts/i386linux.h (HAVE_PROCFS): Don't define it.  Added lengthy
-	comment explaining why.
-
-Mon Apr 24 10:34:02 1995  Michael Meissner  <meissner@cygnus.com>
-
-	* hosts/i386linux.h (HAVE_PROCFS): If NO_PROCFS is defined, don't
-	define HAVE_PROCFS.
-
-Mon Apr 24 08:33:12 1995  Michael Meissner  <meissner@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Do not continue
-	processing unknown symbols to prevent a cascade of errors.
-
-Fri Apr 21 12:48:48 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	Patches from H.J. Lu for Linux ELF core file support.
-	* elfcode.h (elf_core_file_matches_executable_p) [HAVE_PROCFS]:
-	Use prpsinfo_t instead of struct prpsinfo, for consistency.
-	* hosts/i386linux.h (HAVE_PROCFS): Define.
-
-Thu Apr 20 09:07:39 1995  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* linker.c (link_action): Do the right thing when a undefined
-	strong symbol appears after an undefined weak symbol.
-
-Fri Apr 14 16:51:17 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): New function to relocate
-	a whole section for the linker, bypassing bfd_perform_relocation.
-	(ppc_elf_reloc_type_lookup): New function to map the BFD
-	enumeration code into a howto structure.
-	(ppc_elf_howto_raw): Rename from ppc_elf_howto_table.
-	(ppc_elf_howto_table): New array that maps PowerPC relocation
-	numbers to howto structures without a linear search.  Change from
-	using bfd_elf_generic_reloc to use ppc_elf_std_reloc.
-	(ppc_elf_howto_init): Initialize ppc_elf_howto_table from
-	ppc_elf_howto_raw.
-	(ppc_elf_reloc_type_lookup): Use a case statement instead of a
-	loop.
-	(ppc_elf_std_reloc): Replacement for bfd_elf_generic_reloc.
-	(ppc_elf_unsupported_reloc): Print a real error message, instead
-	of calling abort.
-	(ppc_elf_addr16_ha_inner): Abstract getting adjustment from
-	ppc_elf_addr16_ha_reloc, so ppc_elf_relocate_section can use it
-	too.
-	(ppc_elf_addr16_ha_reloc): Call it.
-	(ppc_elf_got16_inner): Abstract getting adjustment from
-	ppc_elf_got16_reloc, so ppc_elf_relocate_section can use it too.
-	(ppc_elf_got16_reloc): Call it.
-	(ppc_elf_info_to_howto): Rename from powerpc_info_to_howto.
-
-	* elfcode.h (elf_symbol_from_bfd_symbol): Omit space in debugging
-	output.
-	(elf_symbol_flags): Add debug function to decode flags so that
-	defining DEBUG to be 4 will compile again.
-	(elf_debug_section): Fix typo in debug output.
-
-Fri Apr 14 16:03:04 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* config.bfd: Add m68*-*-elf*.
-	* elf32-m68k.c: Filled out implementation, except for dynamic
-	linking support.
-	* reloc.c (enum bfd_reloc_code_real): Added *_GOT_PCREL, *_GOTOFF,
-	*_PLT_PCREL, *_PLTOFF, *_68K_* relocations for ELF.
-	* libbfd.h, bfd-in2.h: Regenerated.
-
-Thu Apr 13 14:28:04 1995  Torbjorn Granlund  <tege@adder.cygnus.com>
-
-	* coff-m68k.c (COFF_DEFAULT_SECTION_ALIGNMENT_POWER): Change from
-	1 to 2.
-	(bfd_target): Change minimum section alignment from 1 to 2.
-
-Wed Apr 12 12:40:04 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* aoutx.h (machine_type, case bfd_arch_mips): Treat R8000 like
-	R6000 and R4000 for now.
-
-Tue Apr  4 12:28:25 1995  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* mpw-config.in: New file, MPW version of configure.in.
-	* mpw-make.in: New file, MPW version of Makefile.in.
-	* hosts/mpw.h: New file, MPW host definitions.
-	* ecoffswap.h (ecoff_swap_pdr_in, ecoff_swap_pdr_in) [MPW_C]:
-	Alternate versions without ECOFF_64 that chokes MPW C.
-	* coffswap.h (coff_swap_scnhdr_out): Add alternative version with
-	partly-expanded macros.
-
-Thu Mar 30 14:56:21 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* reloc.c (bfd_perform_relocation): Don't bother to check for
-	overflow if the symbol is undefined.
-
-Thu Mar 30 14:32:26 1995  H.J. Lu (hjl@nynexst.com)
-
-	* config.bfd: Change linux to default to elf.  Using
-	i[345]86-*-linuxaout will build a library which defaults to a.out.
-	* config/i386-laout.mt: Rename from old config/i386-linux.mt.
-	* config/i386-linux.mt: Rename from old config/i386-lelf.mt.
-	Comment out EXTRALIBS.
-	* config/i386-lelf.mt: Remove.
-
-Wed Mar 29 12:01:30 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i960.c (coff_i960_relocate): Cache the section symbol in
-	the used_by_bfd field of the section, to avoid looping for each
-	reloc.
-
-	* cpu-h8500.c (arch_info_struct): Change name from "H8/300" to
-	"h8300" for consistency with other cpu-* files.
-
-Tue Mar 28 15:14:11 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bout.c (b_out_canonicalize_reloc): Handle SEC_CONSTRUCTOR
-	sections.
-	(b_out_get_reloc_upper_bound): Likewise.
-
-	* linker.c (generic_link_add_symbol_list): Skip constructor
-	symbols which the main linker code did not do anything with.
-	(_bfd_generic_link_output_symbols): Use udata.p if it is set,
-	rather than looking the symbol up in the hash table.  Just pass
-	through constructor symbols for which udata.p is not set.  If the
-	linker defined the symbol, clear the constructor flag.
-
-Tue Mar 21 10:50:32 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_set_reloc_info): Sign extend constants from
-	R_DATA_OVERRIDE fixups.
-	* libhppa.h (sign_extend): Renamed from sign_ext.  Fix.
-	(low_sign_extend): Likewise.
-
-Mon Mar 20 22:39:10 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_slurp_symbol_table): Tighten test to determine
-	what symbols are section symbols.
-
-Sat Mar 18 01:54:45 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_bfd_link_add_symbols): An empty archive is OK.
-
-Fri Mar 17 16:29:02 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_copy_private_section_data): Just return true when
-	either the input or output section isn't attached to a SOM BFD.
-	(som_bfd_copy_private_bfd_data): Similarly for BFD private data.
-
-Fri Mar 17 11:50:34 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_link_add_object_symbols): Check whether a dynamic
-	object has already been included, and ignore it the second time.
-
-Wed Mar 15 11:56:40 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-sparc.c (elf_sparc_howto_table): Change R_SPARC_GOT13 from
-	complain_overflow_bitfield to complain_overflow_signed.
-
-	* libelf.h (bfd_elf32__write_relocs): Don't declare.
-	(bfd_elf64__write_relocs): Don't declare.
-
-Tue Mar 14 05:54:33 1995  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* stab-syms.c (aout_stab_name): Moved aout_stab_names to be local
-	to this function.  Recoded function to stop using table, to
-	improve performance (on i486-netbsd host).  Left old version
-	intact under "#if 0" for further performance testing.
-
-Mon Mar 13 13:48:49 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (write_relocs): Make static.  Use PTR argument as a
-	pointer to a boolean variable set to true if something fails.
-	Cast to PTR rather than void *.
-	(sym_is_global): Rewrite for clarity.
-	(map_program_segments): If the program header size is too small,
-	call _bfd_error_handler and return failure rather than aborting.
-	(NAME(bfd_elf,write_object_contents)): Pass boolean variable when
-	calling write_relocs.
-	(elf_symbol_from_bfd_symbol): Use BFD_ASSERT rather than abort.
-	(struct elf_info_failed): Define.
-	(NAME(bfd_elf,size_dynamic_sections)): Declare variables in inner
-	blocks.  Pass elf_info_failed structure when calling
-	elf_export_symbol and elf_adjust_dynamic_symbol.
-	(elf_export_symbol): Treat data argument as elf_info_failed rather
-	than bfd_link_info.  Set failed field on error.
-	(elf_adjust_dynamic_symbol): Likewise.
-	(struct elf_finfo_failed): Define.
-	(elf_bfd_final_link): Pass elf_finfo_failed structure when calling
-	elf_link_output_extsym.  Use BFD_ASSERT rather than abort.
-	(elf_link_output_extsym): Treat data argument as elf_finfo_failed
-	rather than elf_final_link_info.  Set failed field on error.
-	(elf_link_input_bfd): Use BFD_ASSERT rather than abort.
-	(elf_reloc_link_order): Likewise.
-
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Only write
-	out PLTRELSZ, PLTREL and JMPREL relocs if there is a .rela.plt
-	section.  Solaris 2.4 apparently does not handle empty reloc
-	information correctly.
-
-	* archive.c (bsd_write_armap): Cast getuid and getgid results to
-	long, and print with %ld.
-
-Fri Mar 10 16:41:05 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (translate_to_native_sym_flags): Always use the output
-	section if it is not NULL.
-
-Thu Mar  9 15:06:25 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffswap.h (coff_swap_scnhdr_out): If the line number count or
-	the reloc count does not fit, print an error and return 0.
-	* coffcode.h (coff_write_object_contents): Check return value of
-	coff_swap_scnhdr_out.
-	* ecoff.c (_bfd_ecoff_write_object_contents): Check return value
-	of bfd_coff_swap_scnhdr_out.
-
-	* bfd.c: Include <stdarg.h> or <varargs.h>, depending upon
-	ANSI_PROTOTYPES.
-	(bfd_error_handler_type): New global type.
-	(_bfd_error_program_name): New static variable.
-	(_bfd_default_error_handler): New static function.
-	(_bfd_error_handler): New BFD private global variable.
-	(bfd_set_error_handler): New globally visible function.
-	(bfd_set_error_program_name): New globally visible function.
-	* libbfd-in.h (_bfd_error_handler): Declare.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-	* aoutx.h (NAME(aout,swap_ext_reloc_in)): Add symcount parameter,
-	and use it instead of bfd_get_symcount.  Check r_index after
-	setting r_extern based on whether this is a base relative reloc.
-	(NAME(aout,swap_std_reloc_IN)): Add symcount parameter, and use it
-	instead of bfd_get_symcount.
-	(NAME(aout,slurp_reloc_table)): Pass bfd_get_symcount to reloc
-	swap routines.
-	* libaout.h (NAME(aout,swap_ext_reloc_in)): Add symcount parameter
-	to declaration.
-	(NAME(aout,swap_std_reloc_in)): Likewise.
-	* sunos.c (sunos_canonicalize_dynamic_reloc): Pass
-	info->dynsym_count to reloc swap routines.
-	* aout-ns32k.c (MY_swap_std_reloc_in): Add symcount parameter.
-	* hp300hpux.c (MY(swap_std_reloc_in)): Likewise.
-	(MY(slurp_reloc_table)): Pass bfd_get_symcount to reloc swap
-	routine.
-	* i386lynx.c (NAME(lynx,swap_ext_reloc_in)): Add symcount
-	parameter.
-	(NAME(lynx,swap_std_reloc_in)): Likewise.
-	(NAME(lynx,slurp_reloc_table)): Pass bfd_get_symcount to reloc
-	swap routines.
-
-Thu Mar  9 12:04:05 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* bfd.c (bfd_merge_private_bfd_data): New function vector to be
-	called by the linker to merge any private bfd data of the input
-	files and the output file.  Used by the PowerPC ELF support to
-	check whether -mrelocatable is used for all modules.
-	(bfd_set_private_flags): New function vector to be called by the
-	assembler to set private flags.  Used by the PowerPC ELF support
-	to set that a particular object file was assembled with the
-	-mrelocatable option.
-
-	* targets.c (BFD_JUMP_TABLE_COPY): Add intiialization of the
-	bfd_merge_private_bfd_data and bfd_set_private_flags function
-	vectors.
-
-	* bfd-in2.h, libbfd-in.h: Rebuild with bfd.c and targets.c
-	changes.
-
-	* elf32-ppc.c (ppc_elf_set_private_flags): New function to set the
-	ELF e_flags field.
-	(ppc_elf_copy_private_bfd_data): Copy the e_flags field from the
-	input file to the output file.
-	(ppc_elf_merge_private_bfd_data): Check for a mismatch between the
-	e_flags field of all of the linker input files.
-
-	* libelf.h (elf_obj_tdata): Add ppc_flags_init field so that the
-	PowerPC support can check if compataible e_flags are present.
-
-	* aout-target.h: Add NOP for the bfd_merge_private_bfd_data
-	and bfd_set_private_flags function vectors.
-	* coffcode.h: Ditto.
-	* elf32-target.h: Ditto.
-	* elf64-target.h: Ditto.
-	* libbfd.h: Ditto.
-	* libecoff.h: Ditto.
-	* som.c: Ditto.
-
-Wed Mar  8 00:53:54 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cpu-mips.c (arch_info_struct): Add mips:8000 entry.
-
-	* elfcode.h (swap_out_syms): Mark an undefined BSF_WEAK symbol as
-	STB_WEAK rather than STB_GLOBAL.
-
-Tue Mar  7 12:23:47 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (bfd_coff_backend_data): Add new field
-	_bfd_coff_adjust_symndx.
-	(bfd_coff_adjust_symndx): Define.
-	(coff_adjust_symndx): Define as NULL if not already defined.
-	(bfd_coff_std_swap_table): Initialize new field to
-	coff_adjust_symndx.
-	* cofflink.c (coff_link_input_bfd): Call coff_adjust_symndx if it
-	is defined.
-	* coff-a29k.c (coff_a29k_adjust_symndx): New static function.
-	(coff_adjust_symndx): Define before including coffcode.h.
-	* libcoff.h: Rebuild.
-
-	* format.c (bfd_check_format_matches): Skip binary_vec when
-	searching through bfd_target_vector.
-
-	* elfcode.h (elf_sort_hdrs): Check SHT_NOBITS before checking
-	sh_size.
-
-Mon Mar  6 23:31:36 1995  Doug Evans  <dje@chestnut.cygnus.com>
-
-	* elfcode.h (elf_sort_hdrs): Keep SHT_NOBITS sections after
-	!SHT_NOBITS ones.
-
-Mon Mar  6 09:53:08 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* cpu-hppa.c (arch_info_struct): Support both PA1.0 and PA1.1
-	machine types.
-	(bfd_hppa_arch): Link in both PA1.0 and PA1.1 architecture info
-	structures.
-	* libhppa.h (enum pa_arch): New enumeration to describe the
-	different variants of the PA architecture.
-	* som.c (som_object_setup): Use new enumeration to set machine
-	type.
-	(som_finish_writing): If the machine type is PA1.1, then use the
-	PA1.1 machine identifier in the output file.
-
-Thu Mar  2 15:58:24 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,swap_ext_reloc_in)): Treat the index of a
-        base relative reloc as an index into the symbol table, regardless
-        of the setting of r_extern.
-	(NAME(aout,swap_std_reloc_in)): Likewise.
-
-	* aoutx.h (NAME(aout,set_section_contents)): Double check that the
-	caller is writing to a valid section.
-
-Thu Mar  2 14:37:57 1995  Bryan Ford  <baford@cs.utah.edu>
-
-	* binary.c: Add support for reading binary files.  Loads the raw
-	contents of the file into a data section and wraps some symbols
-	around it.  The symbols `_binary_<filename>_start' and
-	`_binary_<filename>_end' indicate the start and end of the data,
-	while `_binary_<filename>_size' is an absolute symbol whose value
-	is the size of the data.  <filename> is the name of the binary
-	input file, with all non-alphanumeric characters converted to
-	underscores.
-
-	* archures.c (bfd_arch_get_compatible): Assume users knows what
-	they're doing if one of the architectures is bfd_arch_unknown.
-
-Wed Mar  1 17:30:46 1995  Michael Meissner  <meissner@cygnus.com>
-
-	* elf32-ppc.c (elf_powerpc_howto_table): For relocation
-	R_PPC_GOT16, change complain_on_overflow to be
-	complain_overflow_signed.
-
-Wed Mar  1 11:52:55 1995  Jason Molenda  <crash@phydeaux.cygnus.com>
-
-	* configure.host: Recognize powerpc-*-aix*.
-
-Wed Mar  1 11:57:39 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i960.c (COFF_PAGE_SIZE): Define.
-
-	* configure.in: Rewrite output of TDEFAULTS to avoid relying on
-	semantics of single quotes in parameter substitution.
-
-Tue Feb 28 12:53:09 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_sort_hdrs): Sort empty sections before non-empty
-	sections, if they have the same VMA.
-
-	* config.bfd (i[345]86-*-linuxelf*): New target.  Use i386-lelf.
-	(i[345]86-*-gnuelf*): New target.  Use i386-gelf.
-	* config/i386-lelf.mt: New file.
-	* config/i386-gelf.mt: New file.
-
-Mon Feb 27 12:58:25 1995  Kung Hsu  <kung@mexican.cygnus.com>
-
-	* config.bfd: add a29k-*-vxworks configuration.
-
-Wed Feb 22 14:40:26 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libaout.h (NAME(aout,slurp_reloc_table)): Change declaration to
-	use reloc_howto_type rather than const struct reloc_howto_struct.
-
-Tue Feb 21 18:19:22 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bout.c (b_out_slurp_reloc_table): Don't return an error if asked
-	for relocations for the .bss section.
-
-Tue Feb 21 15:13:05 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_ar_write_symbol_stuff): Handle objects with odd
-	lengths.
-
-Fri Feb 17 12:34:36 1995  Michael Meissner  <meissner@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_got16_reloc): Make GOT style relocs add
-	32768, so the GOT pointer can point to 16384 pointers, instead of
-	8192.
-
-Fri Feb 17 11:45:38 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* hosts/sysv4.h: Include <unistd.h>, <stdlib.h>, and <time.h>.
-	Only define SEEK_SET and SEEK_CUR if they are not already defined.
-	Remove all external function declarations.
-
-	* syms.c (bfd_decode_symclass): Return 'W' for a weak symbol.
-
-	* coffgen.c (coff_real_object_p): Set start address and flags
-	before calling coff_mkobject_hook.  Restore them on failure.
-	* ecoff.c (_bfd_ecoff_mkobject_hook): If not ECOFF_AOUT_ZMAGIC,
-	clear D_PAGED.
-
-	* coffgen.c: Reindented.
-
-Thu Feb 16 14:37:23 1995  Doug Evans  <dje@cygnus.com>
-
-	* reloc.c (bfd_perform_relocation): Don't use bitpos in overflow
-	calculations.
-	(bfd_install_relocation): Likewise.
-
-Thu Feb 16 13:22:29 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* hosts/std-host.h: Remove all function declarations which return
-	int or void, except the one for free.
-
-Wed Feb 15 14:54:18 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (elf_powerpc_howto_table): Use a destination mask of
-	0xffffffff for R_PPC_REL32, not 0.
-	(powerpc_reloc_map): Add low 16 bit, high 16 bit, and high 16 bit
-	adjusted relocations.
-
-Tue Feb 14 17:47:17 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (struct mips_elf_find_line): Define.
-	(mips_elf_find_nearest_line): New static function.
-	(bfd_elf32_find_nearest_line): Define.
-	* libelf.h (struct elf_obj_tdata): Add find_line_info field.
-
-	* ecoff.c (_bfd_ecoff_swap_tir_in): Move to ecofflink.c.
-	(_bfd_ecoff_swap_tir_out): Likewise.
-	(_bfd_ecoff_swap_rndx_in): Likewise.
-	(_bfd_ecoff_swap_rndx_out): Likewise.
-	(cmp_fdrtab_entry): Likewise.
-	(mk_fdrtab): Likewise.
-	(lookup): Likewise.
-	(_bfd_ecoff_find_nearest_line): Just call _bfd_ecoff_locate_line
-	to do most of the work.  Allocate find_line_info if necessary.
-	* ecofflink.c: Include "aout/stab_gnu.h".
-	(_bfd_ecoff_swap_tir_in): Move in from ecoff.c.
-	(_bfd_ecoff_swap_tir_out): Likewise.
-	(_bfd_ecoff_swap_rndx_in): Likewise.
-	(_bfd_ecoff_swap_rndx_out): Likewise.
-	(cmp_fdrtab_entry): Likewise.  Use PTR instead of void *.
-	(mk_fdrtab): Move in from ecoff.c.  Add debug_info, debug_swap,
-	and line_info arguments, and use them instead of ecoff_data.
-	(fdrtab_lookup): Move in from lookup in ecoff.c.  Remove abfd
-	argument, add line_info argument.  Use it instead of ecoff_data.
-	(_bfd_ecoff_locate_line): New function, mostly from the old
-	_bfd_ecoff_find_nearest_line in ecoff.c.
-	* libecoff.h (ecoff_data_type): Remove find_buffer, fdrtab_len and
-	fdrtab fields, replacing them find_line_info field.
-	(_bfd_ecoff_swap_tir_in): Declare.
-	(_bfd_ecoff_swap_tir_out): Declare.
-	(_bfd_ecoff_swap_rndx_in): Declare.
-	(_bfd_ecoff_swap_rndx_out): Declare.
-	* libbfd-in.h (_bfd_ecoff_locate_line): Declare.
-	* libbfd.h: Rebuild.
-	* configure.in: Don't use ecoff.o for bfd_elf32_bigmips_vec or
-	bfd_elf32_littlemips_vec.
-	* Makefile.in: Rebuild dependencies.
-
-Tue Feb 14 14:04:22 1995  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* libelf.h (elf_backend_data): Add fields elf_machine_alt1 and
-	elf_machine_alt2 which provide alternate versions of the machine
-	code.
-
-	* elf32-ppc.c (ELF_MACHINE_ALT1, ELF_MACHINE_ALT2): Define to
-	recognize old versions of the PowerPC machine code.
-
-	* elf32-target.h (elf32_bed): Initialize alternate machine code
-	fields defined by ELF_MACHINE_ALT1 and ELF_MACHINE_ALT2.
-
-	* elf64-target.h (elf64_bed): Initialize alternate machine code
-	fields defined by ELF_MACHINE_ALT1 and ELF_MACHINE_ALT2.
-
-	* elfcode.h (elf_object_p, elf_core_file_p): In addition to the
-	main machine code field, check the two alternate machine code
-	fields.
-
-Tue Feb 14 12:46:48 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutf1.h (MACHTYPE_OK): Don't define if already defined.  Don't
-	accept M_SPARC if bfd_arch_sparc is not in the list of supported
-	architectures, and don't accept a 680x0 machine type if
-	bfd_arch_m68k is not in the list of supported architectures.
-	* aout0.c (MACHTYPE_OK): Define.
-
-Mon Feb 13 23:25:38 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,swap_ext_reloc_in)): Don't return a pointer
-	to garbage if the symbol index is out of range.
-	(NAME(aout,swap_std_reloc_in)): Likewise.
-
-Thu Feb  9 18:36:52 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* Makefile.in (BFD32_BACKENDS): Add i386msdos.o.
-
-Thu Feb  9 12:02:35 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* i386linux.c (NEEDS_SHRLIB): Define.
-	(linux_tally_symbols): Crash if a NEEDS_SHRLIB symbol is
-	undefined.  From hjl@nynexst.com (H.J. Lu).
-
-Wed Feb  8 17:26:00 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* linker.c (generic_link_check_archive_element): Allocate common
-	symbol information structure.  Don't bother to check for common
-	symbol size overflow.
-	(_bfd_generic_link_add_one_symbol): Likewise.
-	* aoutx.h (aout_link_check_ar_symbols): Likewise.
-	* linker.c (generic_link_check_archive_element): Adjust references
-	to common symbol information for new structure.
-	(_bfd_generic_link_add_one_symbol): Likewise.
-	* aoutx.h (aout_link_check_ar_symbols): Likewise.
-	(aout_link_add_symbols): Likewise.
-	* ecoff.c (ecoff_link_add_externals): Likewise.
-	* elfcode.h (elf_link_add_object_symbols): Likewise.
-	(elf_link_output_extsym): Likewise.
-	* sunos.c (sunos_add_one_symbol): Likewise.
-
-Wed Feb  8 09:53:42 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elfcode.h (elf_sort_hdrs): Put SHT_NOBITS sections after !SHT_NOBITS.
-
-Tue Feb  7 16:27:33 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_find_nearest_line): Just return false, don't
-	abort.
-
-Tue Feb  7 14:43:33 1995  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* ecoff.c: Reformatted some comments and brace constructs in
-	recent changes to GNU style.
-	(cmp_fdrtab_entry, mk_fdrtab, lookup): Use old-style function
-	definitions.
-
-Tue Feb  7 14:21:28 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoffswap.h (ecoff_swap_pdr_in): Zero out intern before setting
-	any of the fields.
-
-Mon Feb  6 20:01:24 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	Sat Feb  4 14:20:24 1995  David Mosberger-Tang  <davidm@piston.cs.arizona.edu>
-
-	* ecoffswap.h (ecoff_swap_pdr_in, ecoff_swap_pdr_out): added
-	internalizing/externalizing new "prof" field.
-
-	* libecoff.h (ecoff_tdata): added fdrtab.
-
-	* ecoff.c (_bfd_ecoff_find_nearest_line): Fixed.
-
-Mon Feb  6 14:25:24 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libelf.h (struct elf_link_hash_table): Add saw_needed field.
-	* elfcode.h (elf_link_add_object_symbols): Set saw_needed if
-	DT_NEEDED seen in .dynamic section.
-	(elf_link_output_extsym): Warn if an undefined symbol is
-	only referenced from a dynamic object, and not making a shared
-	object, and saw_needed is false.
-	* elf.c (_bfd_elf_link_hash_table_init): Initialize saw_needed.
-
-	* libelf.h (ELF_LINK_HASH_DEFINED_WEAK): Don't define.
-	* elfcode.h (elf_link_add_object_symbols): Don't clear or set
-	ELF_LINK_HASH_DEFINED_WEAK.
-	(elf_link_output_extsym): Don't check ELF_LINK_HASH_DEFINED_WEAK.
-
-	Distinguish a weak defined symbol from a regular defined symbol.
-	* linker.c (enum link_action): Add DEFW.
-	(link_action): Add bfd_link_hash_defweak column.
-	(_bfd_generic_link_add_one_symbol): Add DEFW case.  Handle
-	bfd_link_hash_defweak in a few other cases.
-	* Many files (bfd_link_hash_undefweak): Renamed from
-	bfd_link_hash_weak.
-	* aoutx.h (aout_link_write_symbols): Handle bfd_link_hash_defweak.
-	(aout_link_write_other_symbol): Likewise.
-	(aout_link_input_section_std): Likewise.
-	(aout_link_input_section_ext): Likewise.
-	* bout.c (get_value): Likewise.
-	* coff-a29k.c (coff_a29k_relocate_section): Likewise.
-	* coff-alpha.c (alpha_convert_external_reloc): Likewise.
-	(alpha_relocate_section): Likewise.
-	* coff-mips.c (mips_relocate_section): Likewise.
-	(mips_relax_section): Likewise.
-	(bfd_mips_ecoff_create_embedded_relocs): Likewise.
-	* cofflink.c (coff_write_global_sym): Likewise.
-	(_bfd_coff_generic_relocate_section): Likewise.
-	* ecoff.c (ecoff_link_add_externals): Likewise.
-	(ecoff_link_write_external): LIkewise.
-	* elf32-hppa.c (elf32_hppa_relocate_section): Likewise.
-	(elf32_hppa_size_stubs): Likewise.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Likewise.
-	(elf_i386_relocate_section): Likewise.
-	(elf_i386_finish_dynamic_symbol): Likewise.
-	* elf32-mips.c (mips_elf_output_extsym): Likewise.
-	(mips_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-	(elf32_sparc_relocate_section): Likewise.
-	* elfcode.h (elf_link_add_object_symbols): Likewise.
-	(elf_adjust_dynamic_symbol): Likewise.
-	(elf_bfd_final_link): Likewise.
-	(elf_link_output_extsym): Likewise.
-	* i386linux.c (linux_add_one_symbol): Likewise.
-	(linux_tally_symbols): Likewise.
-	(linux_finish_dynamic_link): Likewise.
-	* linker.c (_bfd_generic_link_output_symbols): Likewise.
-	(set_symbol_from_hash): Likewise.
-	* reloc16.c (bfd_coff_reloc16_get_value): Likewise.
-	(bfd_perform_slip): Likewise.
-	* sunos.c (sunos_add_one_symbol): Likewise.
-	(sunos_scan_std_relocs): Likewise.
-	(sunos_scan_ext_relocs): Likewise.
-	(sunos_scan_dynamic_symbol): Likewise.
-	(sunos_write_dynamic_symbol): Likewise.
-
-Mon Feb  6 03:20:17 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	Changes from Bryan Ford, baford@schirf.cs.utah.edu:
-	* config.bfd (i[345]86-*-msdos*): New target.
-	* configure.in (i386msdos_vec): Handle it.
-	* i386msdos.c: New file.
-	* config/i386-msdos.mt: New file.
-	* bfd.c (enum bfd_error): Added new value bfd_error_file_too_big.
-	(bfd_errmsgs): Added string to table.
-	* libaout.h (reloc_type-lookup): Declare it.
-	* targets.c (enum bfd_flavour): Added bfd_target_msdos_flavour.
-	(i386msdos_vec): Declare.
-	(bfd_target_vector): Add it to the list.
-	* bfd-in2.h: Regenerated.
-
-Wed Feb  1 01:32:14 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_set_reloc_info, case R_DATA_ONE_SYMBOL): If there's
-	nothing in R_DATA_OVERRIDE, then try to find the addend in the
-	section's contents.
-	(som_write_fixups): Ignore the addend in a R_DATA_ONE_SYMBOL fixup.
-
-	* som.c (som_object_setup): More heruistics to detect the
-	braindamaged HP OSF1 linker. 
-	(setup_sections): Don't forget to free subspace_sections if we get
-	an error.
-	(som_slurp_string_table): Allocate strings on this bfd's obstack
-	rather than directly out of the heap.
-	(som_slurp_symbol_table): Likewise for the saved copy of the
-	canonical symbols.
-	(som_slurp_reloc_table): Likewise for the saved copy of the
-	canonical relocations.  Free the native relocations when we're
-	done with them.
-
-Tue Jan 31 21:53:28 1995  Doug Evans  <dje@canuck.cygnus.com>
-
-	* libelf.h (struct elf_obj_tdata): New member program_header_size.
-	* elfcode.h (get_program_header_size): New parameters sorted_hdrs,
-	count, and maxpagesize.  All callers updated.
-	If sorted_hdrs is non-NULL, use it to compute the number of segments.
-	Save result in case called again.
-	(assign_file_positions_except_relocs): Sort headers before calling
-	get_program_header_size.
-
-Tue Jan 31 15:27:53 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (map_program_segments): Add sorted_hdrs parameter.
-	Search through it rather than through unsorted section headers.
-	(assign_file_positions_except_relocs): Pass sorted_hdrs to
-	map_program_segments.
-
-Mon Jan 30 22:04:53 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_find_nearest_line): Fix problems in range
-	checking.  Expect argument OFFSET to be section-relative.  From
-	David Mosberger-Tang, davidm@piston.cs.arizona.edu.
-
-Mon Jan 30 11:22:11 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (NAME(bfd_elf,record_link_assignment)): Don't do
-	anything if we are not linking an ELF file.
-	(NAME(bfd_elf,size_dynamic_sections)): Likewise.
-
-Sat Jan 28 12:48:57 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (compare_subspaces): New function to sort subspaces by
-	their location in the object file.
-	(setup_sections): When computing the index for each subspace,
-	handle case where setup_sections reads the subspaces in a
-	different order that they appear in the object file.
-	(som_is_space): Also examine the output section for the containing
-	section.
-	(som_is_subspace, som_is_container): Likewise.
-	(som_begin_writing): Don't prepare or write fixups here.  When
-	writing the symbol strings, use the unsorted symbol table.
-	(som_write_object_contents): Don't write the symbol table here.
-	(som_finish_writing): Prepare and write the fixups here.  Likewise
-	for the symbol table.
-	(som_bfd_derive_misc_symbol_info): Undefined symbols always have
-	type SS_UNSAT regardless of BSF_EXPORT.
-	(som_set_reloc_info): Unpack and attach argument location
-	information for R_PCREL_CALL and R_ABS_CALL relocations.
-
-	* som.c (som_object_setup): New heuristic to determine if the
-	entry and flags fields are switched in the exec header.
-
-Sat Jan 28 00:16:01 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_link_add_object_symbols): Use *sym_hash instead
-	of h if we might not be doing an ELF link.
-
-Fri Jan 27 16:13:42 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_final_link): If the size of an input
-	.reginfo section is zero, force it to the correct size, since the
-	linker emulation code may have clobbered it.
-
-	* elfcode.h (elf_sort_hdrs): Correct SHF_ALLOC test.
-	(assign_file_positions_except_relocs): Free sorted_hdrs.
-
-Thu Jan 26 09:00:12 1995  Steve Chamberlain  <sac@splat>
-
-	* srec.c (srec_set_section_contents): Fix off by
-	one end address calculation.
-
-	* config.bfd: (m68*-est-coff): New configuration.
-
-Thu Jan 26 11:39:21 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_link_add_object_symbols): Only examine weakdef if
-	we are using an ELF hash table.
-
-	* aoutx.h (NAME(aout,some_aout_object_p)): Always set EXEC_P if
-	the start address is in the .text section, even if STAT_FOR_EXEC
-	is set.  Just use STAT_FOR_EXEC as an additional test.
-
-Thu Jan 26 11:12:54 1995  Michael Meissner  <meissner@cygnus.com>
-
-	* elfcode.h (prep_headers): Use EM_PPC instead of
-	EM_CYGNUS_POWERPC.
-
-	* elf32-ppc.c (reloc_type): Add all System V.4 and eABI
-	relocations currently defined.
-	(powerpc_reloc_map): Adjust to new relocation names.
-	(elf_powerpc_howto_table): Add most of the new relocations.
-	(ELF_MACHINE_CODE): Use EM_PPC instead of EM_CYGNUS_POWERPC.
-
-	* config.bfd: Add support for powerpc-*-eabi.
-
-	* config/ppc-elf.mt: Add rs6000 architecture support to the
-	PowerPC.  Also add XCOFF support.
-
-Wed Jan 25 23:26:13 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (CALC_ADDEND): Don't define.
-	(coff_sh_relocate_section): Remove.
-	(coff_relocate_section): Use _bfd_coff_generic_relocate_section.
-
-Tue Jan 24 14:22:47 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elf32-mips.c (mips_elf_output_extsym): Set the value of the
-	ECOFF symbol from the hash table entry.
-
-Mon Jan 23 14:53:35 1995  Steve Chamberlain  <sac@splat>
-
-	* coff-sh.c (coff_sh_relocate_section):  Don't subtract
-	vma twice.
-
-Mon Jan 23 13:33:18 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* coff-sh.c (sh_reloc): Don't ignore the previous contents of an
-	R_SH_IMM32 reloc.
-
-	* config.bfd (i[345]86-*-gnu*): Set bfd_name to i386-gnu.
-	* config/i386-gnu.mt: New file.  Include ELF support.
-
-	* opncls.c (bfd_openstreamr): Call bfd_cache_init.
-
-Fri Jan 20 11:44:45 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* sunos.c (sunos_add_one_symbol): Only set the sunos specific
-	fields if we are doing a sunos link.
-
-Wed Jan 18 12:28:17 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* cpu-h8300.c (h8300_info_struct): Change name from "H8/300" to
-	"h8300" for consistency with other cpu-* files.
-	(h8300h_info_struct): Change name from "H8/300H" to "h8300h".
-	* coff-h8300.c (special): Remove unused variable diff.
-
-Tue Jan 17 10:52:32 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* bfd-in.h (bfd_byte, reloc_howto_type): Define here, not...
-	* reloc.c (bfd_byte, reloc_howto_type): here.
-	* Changed all occurrences of ``const struct reloc_howto_struct''
-	to be ``reloc_howto_type'' instead.
-	* bfd-in2.h, libbfd.h, libcoff.h: Rebuilt.
-
-	* opncls.c (bfd_openstreamr): New function.
-	* bfd-in2.h: Rebuilt.
-
-	* elf32-mips.c (enum reloc_type): Define new relocs used on Irix.
-	(elf_mips_howto_table): Add entries for new relocs.
-	(mips_elf_section_from_shdr): Handle SHT_MIPS_MSYM,
-	SHT_MIPS_DWARF, and SHT_MIPS_EVENTS.
-	(mips_elf_fake_sections): Handle sections named .msym, .debug_*
-	and .MIPS.events.*.
-
-	* srec.c (srec_init): Remove unused local variable i.
-
-Sat Jan 14 19:09:48 1995  Steve Chamberlain  <sac@jonny>
-
-	* archures.c, Makefile.in, targets.c, bfd-in2.h, coffcode.h,
-	config.bfd, configure.in, config/w65.mt: Initial support for the W65.
-
-Sun Jan 15 13:57:45 1995  Steve Chamberlain  <sac@splat>
-
-	* opncls.c (bfd_fdopenr): Configure for WIN32.
-
-Thu Jan 12 16:30:47 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* Makefile.in (diststuff): Include `headers'.
-
-	* sunos.c (m68k_plt_first_entry, sparc_plt_first_entry): Now
-	const.
-	* tekhex.c (digs): Ditto.
-	* elf32-i386.c (elf_i386_plt0_entry, elf_i386_plt_entry): Ditto.
-
-	* srec.c, tekhex.c: Include libiberty.h.  Delete static array
-	hex_value and replace references to it with references to
-	hex_init, hex_p, and hex_value.
-	* Makefile.in: Updated dependencies.
-
-	* archures.c (archures_init_table): Now const.
-	(bfd_arch_init): Adjusted type of local var `ptable'.
-
-Thu Jan 12 09:33:24 1995  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* hosts/symmetry.h:  Redefine `shared' to enable compilation
-	with the native Dynix cc compiler.
-	* i386dynix.c:  Include aoutx.h instead of using routines
-	from aout32.c.
-
-Wed Jan 11 21:31:41 1995  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* reloc.c (reloc_howto_type): Make typedef include `const'.
-	* aout-ns32k.c, aoutx.h, bout.c, cf-m68klynx.c, coff-i386.c,
-	coff-i960.c, coff-m68k.c, cofflink.c, cpu-ns32k.c, ecoff.c,
-	elf32-hppa.c, elf32-i386.c, elf32-mips.c, elf32-sparc.c,
-	elfcode.h, libbfd-in.h, linker.c, mipsbsd.c, nlm32-ppc.c, oasys.c,
-	reloc.c, som.c: Don't use `const' in combination with
-	`reloc_howto_type'.
-	* bfd-in2.h, libbfd.h: Regenerated.
-
-	* ecoff.c (ecoff_type_to_string): Local variable `buffer1' doesn't
-	need to be static.
-
-Wed Jan 11 14:36:41 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* sunos.c (sunos_add_one_symbol): Don't core dump if a multiple
-	definition of an absolute symbol is encountered.
-
-	* linker.c (_bfd_generic_link_add_one_symbol): Ignore
-	redefinitions of an absolute symbol to the same value.
-
-Mon Jan  9 15:51:32 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (elf_link_add_object_symbols): It's reasonable for no
-	flags to be set, so don't insist otherwise.
-
-Fri Jan  6 16:39:40 1995  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (elf_slurp_symbol_table): Don't set BSF_GLOBAL for an
-	undefined or common symbol.
-	(elf_link_add_object_symbols): Likewise.
-
-Wed Jan  4 14:14:05 1995  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (bfd_section_from_som_symbol): Only return sections which
-	correspond to subspaces.
-
-	* som.c (som_begin_writing): Don't forget to bump the
-	total_subspaces when writing the unloadable subspaces.
-
-Wed Dec 28 20:54:47 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_write_fixups): Use SEC_HAS_CONTENTS to identify
-	bss-like sections.
-	(som_get_section_contents): Likewise.
-	(som_set_section_contents): Likewise.
-
-Tue Dec 27 14:03:47 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (setup_sections): Turn off SEC_HAS_CONTENTS for bss-like
-	sections.
-
-Tue Dec 20 15:30:12 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* coffgen.c (bfd_debug_section): Deleted.
-	(coff_section_from_bfd_index): Return absolute section for debug
-	symbol.
-	(coff_write_symbol): Set BSF_DEBUGGING for C_FILE symbols.  If
-	BSF_DEBUGGING is set, set section to N_DEBUG.
-	(coff_bfd_make_debug_symbol): Use absolute section.
-
-	* elfcode.h (assign_file_positions_except_relocs): In assertion,
-	force all values to the same type.
-
-Tue Dec 20 11:11:58 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
-
-	* coff-h8300.c (howto_table): All relocs get a special function.
-	(special): Never do anything when linking -r.
-
-Tue Dec 20 13:58:01 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* i386linux.c (linux_add_one_symbol): Don't do anything Linux
-	specific if this is not a Linux hash table.  From Eric Youngdale
-	<eric@aib.com>.
-
-	Patches from kkojima@mix.or.jp (Kazumoto Kojima):
-	* mipsbsd.c (mips_howto_table_ext): Change sizes of memory relocs
-	apply to from two bytes to four bytes.
-	* MY(reloc_howto_type_lookup): Handle BFD_RELOC_CTOR.
-
-	* elf32-i386.c (elf_i386_relocate_section): Correct and expand the
-	list of cases for which relocation need not be computed.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-
-Mon Dec 19 23:09:16 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (elf32_hppa_read_symext_info): Delete do_locals and
-	do_globals arguments, always read symbol extension information for
-	globals and locals.  All callers changed.
-	(elf32_hppa_size_stubs): Rework to only read symbol extension
-	information once for each input bfd.  10% improvement in linker
-	performance.
-
-Fri Dec 16 12:28:46 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (elf_section_from_bfd_section): Check
-	bfd_is_abs_section, etc., only after checking for the section in
-	the BFD and after calling the backend routine.
-
-Wed Dec 14 20:21:58 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (elf_map_symbols): Only use section symbols whose
-	value is the start of the section, checking output_offset when
-	using output_section.  When creating a new symbol, set the value
-	to 0, since BFD symbol values are section relative.
-
-Tue Dec 13 13:31:06 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* cpu-z8k.c (arch_info_struct): Make z8002 the default
-	architecture.
-
-Fri Dec  9 12:43:05 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (elf_bfd_link_add_symbols): If the first object in the
-	archive is not an ELF object, pass the archive to the add_symbols
-	entry point appropriate for the first object.  From Eric Youngdale
-	<eric@aib.com>.
-	* aoutx.h (NAME(aout,link_add_symbols)): Similar change if the
-	first object is not an a.out object.
-
-	* elf32-i386.c (elf_i386_relocate_section): Don't compute
-	relocation in cases where we won't use it.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-
-Thu Dec  8 14:19:41 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* pc532-mach.c (NAME): Define to use ns32kaout prefix.
-	* ns32knetbsd.c (NAME): Ditto.
-	(ns32kaout_32_get_section_contents): Define to standard aout-32
-	version.
-
-Fri Dec  2 13:56:49 1994  Ian Lance Taylor  <ian@rtl.cygnus.com>
-
-	* coff-mips.c (mips_read_relocs): New static function, broken out
-	of mips_relax_section.
-	(mips_relax_section): Call mips_read_relocs.
-	(bfd_mips_ecoff_create_embedded_relocs): New function.
-	* bfd-in.h (bfd_mnips_ecoff_create_embedded_relocs): Declare.
-	* bfd-in2.h: Rebuild.
-
-Wed Nov 30 14:12:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-sh.c: Use _bfd_dummy_target instead of no_archive.
-
-Tue Nov 29 14:00:19 1994  J.T. Conklin  <jtc@.rtl.cygnus.com>
-
-	* config.bfd (i[345]86-*-freebsd*): Use i386-bsd as bfd_name.
-	* configure.host (i[345]86-*-freebsd*): Use i386bsd as my_host.
-
-Mon Nov 28 15:36:04 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* config/m68k-nbsd.mt (DEFAULT_VECTOR): set to m68knetbsd_vec.
-	* Makefile.in: Rebuilt dependancies.
-	  (CFILES): Added m68knetbsd.c.
-	  (HFILES): Added netbsd.h.
-
-Wed Nov 23 19:21:41 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
-
-	* coff-sh.c (shlcoff_vec): New target vector.
-	(no_archive): New function.
-	* coffcode.h (coff_set_arch_mach_hook, coff_set_flags): Handle
-	little endian SH.
-	* configure.in: Handle shl.
-	* targets.c (bfd_target_vector): Add shlcoff_vec.
-	* config/sh-coff.mt (SELECT_VECS): Handle shl_coff_vec.
-
-Wed Nov 23 10:50:13 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elfcode.h (write_relocs): Do not subtract the section's vma from
-	the reloc's offset when writing .o's.  Instead add the section's
-	vma to the reloc's offset when writing an executable or shared
-	library.
-
-Tue Nov 22 23:34:37 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (elf32_hppa_bfd_final_link_relocate): Do not add
-	input_section->vma to the relocation's offset.
-
-Mon Nov 21 12:37:25 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* srec.c (srec_get_reloc_upper_bound): Define.
-	(srec_canonicalize_reloc): Define.
-	(srec_bfd_reloc_type_lookup): Define.
-	(srec_vec, symbolsrec_vec): Use BFD_JUMP_TABLE_RELOCS (srec).
-
-Sat Nov 19 03:10:51 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* configure.host (i[345]86-*-solaris*):  Use solaris2 to
-	enable extraction of procfs info from core file for GDB.
-
-Thu Nov 17 17:37:39 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* reloc.c (bfd_reloc_code_type): Add new value BFD_RELOC_12_PCREL.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-
-Thu Nov 17 13:12:08 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* bfd/elf32-hppa.c (elf32_hppa_bfd_final_link_relocated): Use the
-	vma from the output_section containing $global$ when computing
-	global_vlaue.
-
-Thu Nov 17 14:29:13 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* archive.c (_bfd_write_archive_contents): Round up the archive
-	header size of the extended name table to an even number.
-
-Wed Nov 16 16:08:06 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* coff-sh.c: Deleted some code that was commented out or inside
-	"#if 0".
-	(COFF_LONG_FILENAMES): Define.
-
-	* cpu-sh.c (arch_info_struct): Convert name to lowercase, for
-	consistency with other architectures.
-
-Sat Nov 12 23:50:10 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (elf_export_symbol): Also export symbols which are
-	referenced by a regular file.
-
-Fri Nov 11 14:29:31 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add
-	export_dynamic argument, and handle it.
-	(elf_export_symbol): New function.
-	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
-	(bfd_elf64_size_dynamic_sections): Update declaration.
-	* bfd-in2.h: Rebuild.
-
-Fri Nov 11 10:35:33 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* hpux-core.c (hpux_core_struct): Delete handles for the
-	data, reg and stack sections.  They're never used.  Delete
-	accessor macros.
-	(make_bfd_asection): Use bfd_make_section_anyway since debugging
-	cores from dynamic executables may have several sections with the
-	same logical name.
-	(hpux_core_core_file_p): Don't save handles to data, reg and
-	stack sections.  Handle CORE_TEXT, CORE_MMF and CORE_SHM.
-
-Tue Nov  8 13:03:30 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* bout.c (callj_callback): Add new argument shrinking.  Change all
-	callers.  Handle relocs against section symbols correctly.  If not
-	shrinking, don't subtract out dstidx; the subtraction is already
-	in the object file.
-
-Sun Nov  6 12:52:00 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.h: Conditionally include <shl.h> and <dl.h>.
-
-Thu Nov  3 18:19:13 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* Makefile.in (ALL_MACHINES): Include m68knetbsd.o.
-
-	* config/i386linux.mh (EXTRALIBS): Include -lm.
-
-	Patches from DJ Delorie:
-	* coff-go32.c: Replacement file, uses coff-i386.c with minor
-	changes.
-	* coff-i386.c (TARGET_UNDERSCORE): allow other files to override
-	underscore also
-	* makefile.dos: del ctor.o, add cofflink.o and elf32.o
-
-	* aoutx.h (adjust_o_magic): If user set data section vma, use it
-	to determine the default bss vma.  Patch from Takada Hiroaki,
-	hiro@is.s.u-tokyo.ac.jp.
-	(machine_type, case bfd_arch_vax): Set *unknown to false.  Patch
-	from John David Anglin <dave@hiauly1.hia.nrc.ca>.
-
-	* configure.in (tb): Rename ns32knetbsd_vec to pc532netbsd_vec,
-	since that's what it's called.
-
-Wed Nov  2 15:24:51 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* archive.c (normalize): Change to take a BFD as an argument.
-	Change VMS version to use bfd_alloc rather than malloc, so that we
-	don't lose the memory forever.
-	(_bfd_construct_extended_name_table): Check the name of an archive
-	entry which is not being extended, and correct it if it is wrong.
-	This is necessary in case the archive was constructed by another
-	program which put an entry in the extended name table which we
-	don't plan to put in ourselves.  From jjc@jclark.com (James
-	Clark).
-	(bfd_dont_truncate_arname): Check return value of normalize.
-
-Mon Oct 31 14:19:08 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elf32-hppa.c (ELF32_PARISC_SX_SIZE): Define.
-	(ELF32_PARISC_SX_GET, ELF32_PARISC_SX_PUT): Define.
-	(symextn_entry): Don't define.
-	(symext_chain_size): Change type to bfd_size_type.
-	(symextn_contents): Change type to bfd_byte *.
-	(elf32_hppa_backend_begin_write_processing): Use
-	ELF32_PARISC_SX_SIZE instead of sizeof (symext_entryS).
-	(elf32_hppa_size_symext): Likewise.  Also, change type of sizep to
-	bfd_size_type *.
-	(elf_hppa_tc_make_sections): Cast symextn_contents assignment to
-	bfd_byte *.  Use ELF32_PARISC_SX_PUT instead of direct assignment.
-	(elf32_hppa_backend_symbol_table_processing): Use
-	ELF32_PARISC_SX_SIZE instead of sizeof (symext_entryS).  Use
-	ELF32_PARISC_SX_GET insetad of direct assignment.
-	(elf32_hppa_read_symext_info): Change type of contents, and its
-	assignment cast, to bfd_byte *.  Use ELF32_PARISC_SX_SIZE instead
-	of sizeof (symextn_entry).  Use symext_entryS instead of
-	symextn_entry.  Use ELF32_PARISC_SX_GET instead of direct
-	assignment.
-
-	* archive.c (bfd_dont_truncate_arname): Add the ar padding
-	character, if there is room for it, even if the name is the
-	maximum length.
-
-	* elfcode.h (assign_file_positions_except_relocs): Sort the ELF
-	headers by section address when assigning file positions.
-	(elf_sort_hdrs): New static function.
-
-Sun Oct 30 18:56:58 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Create DT_INIT
-	and DT_FINI dynamic entries based on the existence of _init and
-	_fini symbols, not on the .init and .fini sections.  This is
-	compatible with some SVR4 linkers.
-	(elf_bfd_final_link): Corresponding change.
-
-Sat Oct 29 12:18:10 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't move a
-	symbol with a PLT entry into the .plt section if it is defined in
-	a regular file.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-
-	* linker.c (_bfd_generic_link_add_archive_symbols): It's not an
-	error if an empty archive has no symbol table.
-	* ecoff.c (ecoff_link_add_archive_symbols): Likewise.
-	* elfcode.h (elf_link_add_archive_symbols): Likewise.
-
-Fri Oct 28 10:08:41 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
-
-        NetBSD/m68k support, based on work by mikeb@snow.datametrics.com: 
-	* config.bfd (m68*-*-netbsd*): Use m68k-nbsd as bfd_name.
-	* configure.in (m68knetbsd_vec): Added.
-	* targets.c (bfd_m68knetbsd_vec): Added.
-	* hosts/m68knbsd.h, config/m68k-nbsd.mt, m68knetbsd.c: New files.
-	* Makefile.in (BFD32_BACKENDS, CFILES): Add m68knetbsd.c.
-
-	miscellaneous cleanup required by all netbsd targets, based on work 
-	by Andrew Cagney <cagney@highland.com.au>:
-	* netbsd.h (N_MAGIC, N_SET_MAGIC, N_GETMAGIC, N_GETMAGIC2, N_TXTADDR,
-	  N_TXTOFF, N_ALIGN, N_DATADDR, N_DATOFF): Removed.  Generic a.out
-	  definitions work.
-	* i386nbsd.c, ns32knbsd.c, sparcnbsd.c (__LDPGSZ): Removed.
-	  (MY(write_object_contents)): Use NetBSD's magic numbers
-
-Thu Oct 27 16:59:52 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* libelf.h (struct bfd_elf_section_data): Add field dynindx.
-	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Don't finalize
-	the .dynsym, .dynstr or .hash sections until after the backend
-	size_dynamic_sections routine, so that it can add dynamic symbols
-	if it wants to.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Don't define the
-	symbol to be in the .plt section when generating a shared library
-	if it is a defined symbol.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-	(elf32_sparc_size_dynamic_sections): When generating a shared
-	library, allocate space for a dynamic symbol for each output
-	section, storing the index in the dynindx field of the ELF section
-	data.  Adjust the other dynindx fields to account for this.
-	(elf32_sparc_adjust_dynindx): New static function.
-	(elf32_sparc_relocate_section): When copying a reloc into a shared
-	library, use the original addend as appropriate.  Convert an
-	R_SPARC_32 reloc into an R_SPARC_RELATIVE reloc.  Use the dynamic
-	symbol index of the output section, not the normal symbol index.
-	(elf32_sparc_finish_dynamic_sections): Don't die if a section does
-	not exist when setting the value of the dynamic tags.  Write out
-	a dynamic symbol for each output section.
-
-Wed Oct 26 01:15:51 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (aout_link_input_section): Don't bother to read or write
-	the relocs if there aren't any.
-
-Tue Oct 25 11:44:38 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* Makefile.in (ALL_MACHINES): Add tekhex.o.
-	* targets.c (bfd_target_vector): If SELECT_VECS is not defined,
-	include tekhex_vec.
-	* tekhex.c (NIBBLE, ISHEX): Cast array arguments to unsigned char.
-	(getvalue, getsym, out): Likewise.
-	(find_chunk): Remove unused variable s.
-	(first_phase): Remove unused variable s.
-	(pass_over): Remove unused variable address.
-	(tekhex_object_p): Remove unused variable section.
-	(move_section_contents): Change return type from boolean to void.
-	(tekhex_write_object_contents): Remove unused variables tdata and
-	list.
-
-	* linker.c (enum link_action): Add CIND.
-	(link_action): Change COMMON_ROW\indr from MDEF to CREF.  Change
-	INDR_ROW\common from MDEF to CIND.
-	(_bfd_generic_link_add_one_symbol): In CREF case, handle an
-	existing symbol which is indirect rather than defined.  Add new
-	CIND case.
-
-Mon Oct 24 15:33:16 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	Change S-record backend to use multiple sections to handle gaps in
-	file.
-	* srec.c (srec_data_list_struct): Move field next from last place
-	to first.  Change type of data to bfd_byte *.
-	(struct srec_symbol): Define.
-	(tdata_type): Remove done_symbol_read, count, strings, symbol_idx,
-	string_size, string_idx.  Change type of symbols to struct
-	srec_symbol *.  Add symtail and csymbols.
-	(low, high): Remove.
-	(size_symbols, fillup_symbols, size_srec, fillup): Remove.
-	(white, skipwhite, pass_over, object_p): Remove.
-	(srec_mkobject): Call srec_init.  Adjust tdata initialization for
-	field changes.
-	(srec_get_byte, srec_bad_byte): New static functions.
-	(srec_new_symbol, srec_scan): New static functions.
-	(srec_object_p): Change type of b to bfd_byte.  Explicitly set
-	wrong_format error.  Call srec_mkobject and srec_scan instead of
-	object_p.
-	(symbolsrec_object_p): Likewise.  Also, change b to be only two
-	bytes.
-	(srec_read_section): New static function.
-	(srec_get_section_contents): Call srec_read_section rather than
-	pass_over.  Handle zero length section correctly.
-	(set_set_arch_mach): Change from function to macro.
-	(srec_set_section_contents): Change data to bfd_byte *.
-	(srec_write_record): Change data, end and src to bfd_byte *.
-	(srec_write_header): Change buffer and dst to bfd_byte *.
-	(srec_write_section): Change location to bfd_byte *.
-	(srec_write_terminator): Change buffer to bfd_byte *.
-	(srec_get_symtab_upper_bound): Don't call
-	srec_get_section_contents.
-	(srec_get_symtab): Rewrite.
-
-	* ecoff.c (ecoff_set_symbol_info): Set udata.i to 0, not NULL.
-
-Fri Oct 21 16:43:13 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* libaout.h (machine_type): added M_68K_NETBSD and M_SPARC_NETBSD.
-	* i386netbsd.c, ns32knetbsd.c, sparcnetbsd.c: removed RCS Id's.
-	  changed how PAGE_SIZE and SEGMENT_SIZE are defined so they are
-	  consistant with each other.
-	* netbsd.h (N_HEADER_IN_TEXT, TEXT_START_ADDR): NetBSD fits its
-	  header into the start of its text segment.
-
-Fri Oct 21 17:13:07 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* targets.c (BFD_JUMP_TABLE_ARCHIVE): Add case for
-	_construct_extended_name_table.
-	(bfd_target): Add _bfd_construct_extended_name_table.
-	* archive.c (_bfd_archive_bsd_construct_extended_name_table): New
-	function.
-	(_bfd_archive_coff_construct_extended_name_table): New function.
-	(_bfd_construct_extended_name_table): Renamed by adding a leading
-	underscore, and made externally visible.  Added trailing_slash
-	argument, and used it instead of elf_style.  Changed type of
-	tablen to bfd_size_type *.
-	(_bfd_write_archive_contents): Use BFD_SEND to call
-	construct_extended_name_table.  Use the returned name.
-	* libbfd-in.h (_bfd_construct_extended_name_table): Declare.
-	(_bfd_noarchive_construct_extended_name_table): Define.
-	(_bfd_archive_bsd_construct_extended_name_table): Declare.
-	(_bfd_archive_coff_construct_extended_name_table): Declare.
-	* bfd-in2.h: Rebuild.
-	* libbfd.h: Rebuild.
-	* som.c (som_construct_extended_name_table): New static function.
-	* aout-target.h (MY_construct_extended_name_table): Define.
-	* coff-rs6000.c (rs6000coff_construct_extended_name_table):
-	Define.
-	* ieee.c (ieee_construct_extended_name_table): Define.
-	* libecoff.h (_bfd_ecoff_construct_extended_name_table): Define.
-	* oasys.c (oasys_construct_extended_name_table): Define.
-
-	Fix the ELF linker to not require an interpreter if no dynamic
-	objects were seen, even when linking PIC code.
-	* libelf.h (ELF_LINK_HASH_NEEDS_PLT): Define.
-	(struct elf_link_hash_table): Add field dynamic_sections_created.
-	* elfcode.h (elf_link_record_dynamic_symbol): Create dynstr if it
-	doesn't already exist.
-	(elf_link_add_object_symbols): Create dynamic sections based on
-	dynamic_sections_created field, not dynobj field.  Don't bother to
-	set dynobj.
-	(elf_link_create_dynamic_sections): If dynamic sections were
-	already created, don't do anything.  If dynobj is already set, use
-	it; otherwise, set it to the bfd argument.  Don't initialize
-	dynsymcount.  Only create dynstr if it does not exist.  Set
-	dynamic_sections_created to true.
-	(NAME(bfd_elf,size_dynamic_sections)): Skip most of this function
-	if no dynamic objects were seen.
-	(elf_adjust_dynamic_symbol): If a symbol has the
-	ELF_LINK_HASH_NEEDS_PLT flag set, let the backend adjust it.
-	(elf_bfd_final_link): Change most decisions based on dynobj to
-	check dynamic_sections_created instead.
-	(elf_link_output_extsym): Only handle dynamic symbols if a dynamic
-	object was seen.
-	* elf.c (_bfd_elf_link_hash_table_init): Initialize new field
-	dynamic_sections_created.  Set dynsymcount to 1, not 0.
-	* elf32-i386.c (elf_i386_create_dynamic_sections): Call
-	elf_i386_create_got_section rather than creating the .got and
-	.got.plt sections.
-	(elf_i386_create_got_section): New static function.
-	(elf_i386_check_relocs): Just call elf_i386_create_got_section if
-	a GOT table is needed, not bfd_elf32_link_create_dynamic_sections.
-	Only create the .rel.got section, and only make space for a reloc,
-	for a global symbol or when generating a shared object.  For a
-	R_386_PLT32 reloc, just set the	ELF_LINK_HASH_NEEDS_PLT flag.
-	(elf_i386_adjust_dynamic_symbol): Rework initial assertion to
-	permit ELF_LINK_HASH_NEEDS_PLT non dynamic symbols.  Create a
-	procedure linkage table entry for such symbols.  But, if no
-	dynamic objects were seen, never create a PLT entry.
-	(elf_i386_size_dynamic_sections): If no dynamic objects were seen,
-	skip most of this function, and force the size of the .rel.got
-	section to zero.
-	(elf_i386_relocate_section): For a R_386_GOT32 reloc against a global
-	symbol when no dynamic object was seen, initialize the contents of
-	the .got section.  For a R_386_GOT32 against a local symbol, only
-	create a R_386_RELATIVE reloc when generating a shared object.
-	Treat a R_386_PLT32 reloc against a symbol for which we did not
-	create a PLT entry as a R_386_PC32 reloc.
-	(elf_i386_finish_dynamic_sections): Only fiddle with the dynamic
-	entries and the PLT if we saw a dynamic object.
-	* elf32-sparc.c (elf_sparc_howto_table): Fix R_SPARC_PC22 by
-	setting rightshift to 10.  Fix R_SPARC_WPLT20 by setting
-	rightshift to 2, size to 2, bitsize to 30, and dst_mask to
-	0x3fffffff.
-	(elf32_sparc_create_dynamic_sections): Don't set the size of the
-	.plt section.  Call elf32_sparc_create_got_section rather than
-	creating the .got section.
-	(elf32_sparc_check_relocs): Call elf32_sparc_create_got_section if
-	a GOT table is needed, not bfd_elf32_link_create_dynamic_sections.
-	Only create the .rela.got section, and only make space for a
-	reloc, for a global symbol or when generating a shared object.
-	Set the alignment of the .rela.got section to 2.  For a
-	R_SPARC_WPLT30 reloc, just set the ELF_LINK_HASH_NEEDS_PLT flag.
-	(elf32_sparc_adjust_dynamic_symbol): Rework initial assertion to
-	permit ELF_LINK_HASH_NEDS_PLT non dynamic symbols.  Create a
-	procedure linkage table for such symbols.  But, if no dynamic
-	objects were seen, never create a PLT entry.  Initialize the size
-	of the .plt section.
-	(elf32_sparc_size_dynamic_sections): If no dynamic objects were
-	seen, skip most of this function, and force the size of the
-	.rela.got section to zero.  Strip empty reloc sections, and strip
-	an empty .plt section.
-	(elf32_sparc_relocate_section): For a GOT reloc against a global
-	symbol when no dynamic object was seen, initialize the contents of
-	the .got section.  For a GOT reloc against a local symbol, only
-	create a R_SPARC_RELATIVE reloc when generating a shared object.
-	Treat a R_SPARC_WPLT30 reloc against a symbol for which we did not
-	create a PLT entry as a R_SPARC_WDISP30 reloc.
-	(elf32_sparc_finish_dynamic_sections): Only fiddle with the
-	dynamic entries and the PLT if we saw a dynamic object.
-
-Thu Oct 20 13:28:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (elf_map_symbols): Don't worry about section symbols
-	in a section not owned by any BFD.
-	(elf_section_from_bfd_section): Separate out loop which calls
-	backend routine.  Check bfd_section and call the backend routine
-	even for a section not owned by any BFD.
-	* elf32-mips.c (mips_elf_section_from_bfd_section): Handle
-	.acommon section.
-
-Wed Oct 19 13:28:29 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* coffgen.c (coff_print_symbol): Make names for section number and
-	storage class slightly more verbose.  It's not clear how many
-	characters I can justify using up, but before this change they
-	both were abbreviated "sc" which is (IMHO) clearly unacceptable.
-
-Wed Oct 19 01:26:39 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* binary.c (binary_set_section_contents): Set the base file
-	position from the lowest section VMA, not the start address.
-
-	* aoutx.h (NAME(aout,slurp_symbol_table)): Don't return an error
-	if there are no symbols.
-	* coffgen.c (coff_get_normalized_symtab): Likewise.
-	* hp300hpux.c (MY(slurp_symbol_table)): Likewise.
-
-Tue Oct 18 12:56:43 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* aout-target.h (MY_bfd_copy_private_section_data): Only copy
-	subformat to another bfd_target_aout_flavour file.
-
-	* binary.c: New file for raw binary output format.
-	* Makefile.in (BFD_LIBS): Add binary.o.
-	(CFILES): Add binary.c.
-	* targets.c (binary_vec): Declare.
-	(bfd_target_vector): Include binary_vec.
-
-	* srec.c (tdata_type): Add field tail.
-	(srec_mkobject): Initialize tail.
-	(srec_set_section_contents): Sort S record list by address.
-
-Mon Oct 17 11:38:16 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (elf_map_symbols): Sort the symbols into a new array,
-	rather than messing with Elf_Sym_Extra.  Store the symbol index in
-	the udata.i field.
-	(swap_out_syms): Use outbound_syms as a pointer rather than as an
-	array.  Don't worry about elf_sym_num.
-	* libelf.h (struct elf_sym_extra): Don't define.
-	(Elf_Sym_Extra): Don't define.
-	(struct elf_obj_tdata): Remove sym_extra field.
-	(elf_sym_extra): Don't define.
-	* elf32-hppa.c (elf32_hppa_backend_final_write_processing): Use
-	udata.i rather than elf_sym_extra array.
-
-	* syms.c (asymbol): Change udata field into a union.
-	* bfd-in2.h: Rebuild.
-	* aoutx.h (NAME(aout,translate_symbol_table)): Use udata.p rather
-	than just udata.
-	* bout.c (perform_slip): Likewise.
-	* hp300hpux.c (MY(slurp_symbol_table)): Likewise.
-	* ieee.c (ieee_slurp_external_symbols): Likewise.
-	* linker.c (generic_link_add_symbol_list): Likewise.
-	(default_indirect_link_order): Likewise.
-	* oasys.c (oasys_slurp_symbol_table): Likewise.
-	* reloc16.c (bfd_perform_slip): Likewise.
-	* srec.c (fillup_symbols): Likewise.
-	* coffcode.h (get_index): Use udata.i rather than just udata.
-	(coff_slurp_symbol_table): Likewise.
-	* coffgen.c (set_index): Likewise.
-	* ecoff.c (ecoff_set_symbol_info): Likewise.
-	* elfcode.h (elf_symbol_from_bfd_symbol): Likewise.
-	* libecoff.h (ecoff_get_sym_index, ecoff_set_sym_index): Likewise.
-	* som.c (compare_syms): Likewise.
-	(som_prep_for_fixups): Likewise.
-	(som_write_fixups): Likewise.
-
-	Use a hash table when writing out ELF symbol names.
-	* elfcode.h (elf_stringtab_init): New static function.
-	(bfd_new_strtab, bfd_add_to_strtab, bfd_add_2_to_strtab): Remove.
-	Change all callers to use elf_stringtab_init or
-	_bfd_stringtab_add, and get stringtab lengths using
-	_bfd_stringtab_size.
-	(elf_fake_sections): Change ignored argument to pointer to
-	boolean, and set the boolean to true if an error occurs.  If an
-	error has already occurred, don't do anything.
-	(assign_section_numbers): Just set sh_size, not contents.
-	(elf_compute_section_file_positions): Pass the address of a
-	boolean to elf_fake_sections.  Pass the address of a
-	bfd_strtab_hash to swap_out_syms.  Write out the .strtab section.
-	(prep_headers): Change shstrtab to bfd_strtab_hash.
-	(swap_out_syms): Take a pointer to a bfd_strtab_hash as an
-	argument.  Set it to the symbol names.
-	(NAME(bfd_elf,write_object_contents)): Write out the section
-	header names using _bfd_stringtab_emit.
-	(elf_debug_section): Remove first argument; get the section name
-	via the bfd_section pointer.  Change caller.
-	(elf_bfd_final_link): Write out the symbol names using
-	_bfd_stringtab_emit.  Likewise for the .dynstr section contents.
-	Free the symbol names at the end of the function.
-	(elf_link_input_bfd): Remove the last argument, output_names,
-	from relocate_section.  Save the old symbol contents before
-	calling elf_link_output_sym, and restore them afterward.
-	* libelf.h (struct elf_link_hash_table): Change dynstr field to
-	struct bfd_strtab_hash.
-	(struct elf_backend_data): Remove last argument, output_names,
-	from elf_backend_relocate_section field.
-	(struct strtab): Don't define.
-	(struct elf_obj_tdata): Change strtab_ptr field to struct
-	bfd_strtab_hash.
-	* elf32-hppa.c (elf32_hppa_relocate_section): Remove last
-	argument, output_names.
-	* elf32-i386.c (elf_i386_relocate_section): Likewise.
-	* elf32-mips.c (mips_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-
-	* libbfd-in.h (DEFAULT_STRING_SPACE_SIZE): Don't define.
-	(bfd_add_to_string_table): Don't declare.
-	* libbfd.h: Rebuild.
-	* libbfd.c (bfd_add_to_string_table): Remove.
-
-	* elfcode.h (elf_swap_shdr_in): Use bfd_section, not rawdata.
-	Clear contents field.
-	(bfd_section_from_shdr): In SHT_STRTAB case, check bfd_section,
-	not rawdata.  Don't set rawdata if e_shstrndx.  Use bfd_section
-	rather than rawdata in commented out code.  In SHT_REL[A] case,
-	don't bother to check elf_section_data of section returned by
-	section_from_elf_index.
-	(elf_fake_sections): Set bfd_section, not rawdata.  Don't set
-	size.
-	(elf_map_symbols): Don't set elf_num_section_syms.  Don't create
-	section symbols that already exist.
-	(assign_file_position_for_section): Use bfd_section, not rawdata.
-	(section_from_elf_index): Just check bfd_section field.
-	(elf_section_from_bfd_section): Likewise.
-	(elf_debug_section): Don't print rawdata, contents, or size.
-	(elf_link_add_object_symbols): Don't error out if
-	section_from_elf_index returns NULL.
-	(elf_bfd_final_link): Check return value from
-	section_from_elf_index against NULL, not bfd_is_abs_section.
-	(elf_link_input_bfd): Don't check section_from_elf_index return
-	value.
-	* libelf.h (struct elf_obj_tdata): Remove num_section_syms field.
-	(elf_num_section_syms): Don't define.
-	* elf.c (elf_get_str_section): Store section contents in contents
-	field rather than rawdata field.
-	(elf_string_from_elf_section): Likewise.
-	(_bfd_elf_make_section_from_shdr): Store BFD section pointer in
-	bfd_section field rather than rawdata field.
-	* elf32-hppa.c (elf32_hppa_read_symext_info): Use bfd_section
-	rather than rawdata.
-	(elf32_hppa_size_stubs): Likewise.
-	(elf32_hppa_backend_symbol_table_processing): Don't set
-	symextn_hdr->size; just use sh_size.
-	* elf32-mips.c (mips_elf_final_write_processing): Use bfd_section
-	rathern than rawdata.
-	(mips_elf_section_from_shdr): Likewise.
-	(mips_elf_section_processing): Likewise.
-	(mips_elf_section_from_bfd_section): Remove rawdata check.
-
-	* srec.c (pass_over): Set the start address for S7, S8 or S9.
-
-Fri Oct 14 19:15:46 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* VERSION: Updated to 2.5.
-
-Fri Oct 14 11:07:50 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* bfd.c (bfd_scan_vma): Cast end to be non const before passing it
-	to strtoul.
-
-Thu Oct 13 14:40:41 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* bfd.c (bfd_scan_vma): Pass end argument on to strtoul.
-
-Wed Oct 12 16:46:43 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* opncls.c (bfd_realloc): Deleted, since it's broken and fixing it
-	would make it slow.  Besides, it isn't used much.
-	* elfcode.h (elf_map_symbols): Always allocate new storage for the
-	symbol table.
-
-Wed Oct 12 11:54:37 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* ecoff.c (ecoff_set_symbol_info): Mark local stProc, stLabel or
-	stabs symbols as BSF_DEBUGGING.
-
-	* rs6000-core.c (rs6000coff_core_file_matches_executable_p): Make
-	str1 and str2 const pointers.
-
-	* Makefile.in (INSTALL): Use top level install.sh script.
-	* config/README (INSTALL): Remove.
-	* config/delta88.mh (INSTALL): Remove.
-	* config/i386v4.mh (INSTALL): Remove.
-	* config/irix4.mh (INSTALL): Remove.
-	* config/irix5.mh (INSTALL): Remove.
-	* config/ncrt3000.mh (INSTALL): Remove.
-
-Tue Oct 11 13:57:56 1994  Eric Youngdale  (eric@andante.aib.com)
-
-	* elf32-i386.c (elf_i386_check_relocs): Make sure that a symbol
-	with a global offset table entry or a procedure linkage table
-	entry is added to the dynamic symbol table.
-	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): If a symbol has
-	already gotten a procedure linkage table entry, change the
-	definition to the PLT entry.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-
-Tue Oct 11 17:12:00 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* lynx-core.c (lynx_core_file_p): SPARC Lynx appears to start
-	dumping the .data section in a core file at a page boundary.
-
-Mon Oct 10 16:24:44 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* cofflink.c (_bfd_coff_final_link): Cast argument to bfd_h_put_32
-	to correct type.
-	(coff_read_string_table): Cast argument to bfd_h_get_32 to correct
-	type.
-	* elfcode.h (elf_link_output_extsym): Cast argument to
-	bfd_elf_hash to correct type.
-
-	* elf32-sparc.c (elf_sparc_howto_table): The PC10, PC22, and
-	WPLT30 relocations are PC-relative.
-
-Thu Oct  6 12:57:26 1994  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-
-	* aoutx.h (adjust_o_magic): Correctly initialize vma if the vma of
-	the text section was user-defined.
-
-Wed Oct  5 14:42:12 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* archive.c (bfd_construct_extended_name_table): SVR4 uses slash
-	newline at the end of the file name, not just newline.
-
-Tue Oct  4 11:23:12 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_new_section_hook): Default section alignment
-	power to 4, rather than using align_power_min.
-
-	* coffcode.h (coff_new_section_hook): Don't use align_power_min;
-	use COFF_DEFAULT_SECTION_ALIGNMENT_POWER instead.  Force the .stab
-	and .stabstr sections to be aligned to no more than 2.  Remove
-	COFF_SPARC special cases.
-	* coff-a29k.c: Define COFF_DEFAULT_SECTION_ALIGNMENT_POWER.
-	* coff-apollo.c, coff-go32.c, coff-h8300.c: Likewise.
-	* coff-h8500.c, coff-i386.c, coff-i960.c, coff-m68k.c: Likewise.
-	* coff-m88k.c, coff-rs6000.c, coff-sh.c, coff-sparc.c: Likewise.
-	* coff-we32k.c, coff-z8k.c: Likewise.
-
-	* configure.in: Use ${config_shell} when running config.bfd.
-
-	* cofflink.c (coff_link_input_bfd): Don't try to convert a long
-	filename if the offset field is zero.
-
-	* elfcode.h (swap_out_syms): If the alignment of a common symbol
-	was not set, use a sensible default rather than zero.
-
-Mon Oct  3 16:04:29 1994  H.J. Lu (hjl@nynexst.com)
-
-	* opncls.c (bfd_close): Honor umask when setting execution bits.
-	(bfd_close_all_done): Likewise.
-
-Mon Oct  3 04:41:49 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* rs6000-core.c (rs6000coff_core_p):  Set SEC_HAS_CONTENTS flag
-	for .stack and .ldinfo sections. Cast coredata.c_tab to a
-	file_ptr to avoid warnings from gcc.
-
-Fri Sep 30 13:11:38 1994  Ian Lance Taylor  <ian@sanguine.cygnus.com>
-
-	* elfcode.h (elf_bfd_final_link): Remove assertion when a non
-        SEC_IN_MEMORY section is found in dynobj.  This can happen when
-	linking PIC compiled code.
-
-Thu Sep 29 15:21:44 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* reloc.c (bfd_install_relocation): Change type of "data" to
-	bfd_byte *, to go along with yesterday's change.
-
-	* elf.c (bfd_elf_print_symbol): Moved here from elf_print_symbol
-	in elfcode.h.  (case bfd_print_symbol_all): Print symbol's size
-	field, except for common symbols; print their alignment.
-	* elfcode.h (elf_print_symbol): Deleted.
-	* libelf.h (bfd_elf_print_symbol): Declare.
-	(bfd_elf{32,64}_print_symbol): Replace declarations with macros.
-
-	* syms.c (bfd_print_symbol_vandf): Show BSF_LOCAL and BSF_GLOBAL
-	in one column.  Use the column freed up to show BSF_FUNCTION and
-	BSF_FILE.
-
-Thu Sep 29 12:29:01 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* syms.c (stt): Add .rdata and .rodata.
-
-Wed Sep 28 13:35:05 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* reloc.c (bfd_install_relocation): Cast data_start to bfd_byte *
-	before trying to add values to it.
-
-Tue Sep 27 16:47:58 1994  Ken Raeburn  <raeburn@cujo.cygnus.com>
-
-	* elf32-hppa.c (elf32_hppa_backend_final_write_processing): Cast
-	return value from elf_sym_extra.
-	(elf32_hppa_build_stubs): Cast return value from bfd_zalloc.
-	(elf32_hppa_size_stubs): Cast return value from malloc.
-
-	* gen-aout.c (main): Declare and initialize "arch".
-
-	* cofflink.c (coff_link_add_symbols): Cast return value of
-	bfd_hash_allocate.
-
-	* riscix.c (riscix_callback): Use PARAMS macro in prototype.
-
-	* reloc.c (bfd_install_relocation): New function, mostly copied
-	from bfd_perform_relocation, adjusted for the assembler's needs.
-	* bfd-in2.h: Regenerated.
-
-Mon Sep 26 11:00:14 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elfcode.h (assign_file_positions_except_relocs): Align the
-	section VMA and the file position even if D_PAGED is not set.
-
-	* bfd-in.h (bfd_seek): Change declaration to not mark fp const.
-	* bfd-in2.h: Rebuild.
-	* libbfd.c (bfd_seek): Don't mark parameters const, to avoid
-	conflicts with declaration.
-
-Fri Sep 23 15:15:31 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elfcode.h (map_program_segments): Don't abort if we allocated
-	too much space for the program header, only if we allocated too
-	little.
-	(assign_file_positions_except_relocs): Similar change.
-
-Tue Sep 20 13:17:07 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
-
-	* libaout.h: Fix comment.
-	* ns32knbsd.h: Changed M_NS32K_NETBSD to M_532_NETBSD to match
-	  libaout.h.
-
-Tue Sep 20 15:23:21 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* Makefile.in: Rebuilt dependencies.
-	(BFD32_BACKENDS): Add sparcnetbsd.o.
-	(CFILES): Add ns32knetbsd.c and sparcnetbsd.c.
-	* targets.c: ns32knetbsd_vec was renamed to pc532netbsd_vec.
-
-	* coff-sh.c (rtype2howto): Remove; unused.
-	(coff_sh_relocate_section): Remove unused local variable rstat.
-	(reloc_processing): Comment out; unused.
-
-Fri Sep 16 12:12:27 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* aoutx.h (aout_link_write_other_symbol): If h->indx is -2, then
-	always write it out even if it would normally be stripped.
-	(aout_link_input_section_std): If we find a reloc against a
-	stripped global symbol, force it to be written out rather than
-	merely calling unattached_reloc.
-	(aout_link_input_section_ext): Likewise.
-	(aout_link_reloc_link_order): Likewise.
-
-Wed Sep 14 15:37:19 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.h (struct somdata): New field sorted_syms.
-	(obj_som_sorted_syms): Accessor macro.
-	* som.c (som_object_setup): Initialize sorted_syms to NULL.
-	(som_prep_for_fixups): Sort a copy of the BFD's symbol table;
-	store the sorted symbol table in sorted_syms.
-	(som_write_fixups): Initalize tmp_reloc to NULL to make GCC happy.
-	(som_begin_writing): Similarly for exec_header.  Pass the sorted
-	symbol table to som_write_symbol_strings.
-	(som_build_and_write_symbol_table): Use the sorted symbols rather
-	than the canonical symbol table.
-
-	* som.h (som_symbol_type): Add "stringtab_offset" field.
-	* som.c (som_write_symbol_strings): Use "stringtab_offset"
-	rather than destroying the "name" field in the BFD symbol.
-	(som_build_and_write_symbol_table): Likewise.
-
-Wed Sep 14 15:06:55 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* aoutx.h (aout_link_write_symbols): Rename skip_indirect to
-	skip_next.  If we find an N_WARNING symbol which has already been
-	written out, set skip_next.
-
-	* libecoff.h (struct ecoff_tdata): Add field find_buffer.
-	* ecoff.c: Include aout/stab_gnu.h.
-	(ecoff_find_nearest_line): Handle stabs debugging information.
-
-	* elfcode.h (elf_link_output_extsym): Keep a symbol marked as weak
-	even if it is referenced by another object.
-
-Tue Sep 13 17:57:00 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_fixup_formats): Case R_ENTRY (0xb3), set both
-	'T' and 'U' to grab all the unwind information.
-	(som_set_reloc_info): Make 'U' unwind bits persist across
-	multiple SOM relocations.  Set the addend field of an R_ENTRY
-	relocation to the value in 'T'; set the addend field on an
-	R_EXIT relocation to the value in 'U'.
-
-	* som.h (som_symbol_type): Delete unwind field.
-
-	* som.c (som_write_fixups): For R_ENTRY fixups, get 32bits of
-	unwind information from the addend field of the R_ENTRY, get the
-	other 32bits from the addend field of the R_EXIT.
-	(bfd_som_attach_unwind_info): Delete function and all references.
-
-	* som.h (som_symbol_type): Delete unused a.out-related fields.
-
-	* som.c (bfd_section_from_som_symbol): Use bfd_abs_section_ptr
-	instead of &bfd_abs_section.
-
-	* som.c (som_object_setup): Handle exec_entry and exec_flags being
-	switched in executables created by the OSF1 linker.
-	(som_write_fixups): Handle R_EXIT just like the R_{F,L,R}SEL
-	fixups.  Support R_ALT_ENTRY (handle just like R_EXIT).
-
-Tue Sep 13 16:04:07 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
-
-	* cofflink.c (coff_link_input_bfd): syment_base is unsigned
-	so can't compare -ve numbers with it.
-
-Mon Sep 12 20:31:17 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
-
-	* configure.in (shcoff_vec): Use cofflink.o now.
-	* coff-sh.c: Rewritten to use new fast coff backend.
-
-Tue Sep 13 16:23:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* aoutx.h (NAME(aout,final_link)): Don't assume that all the input
-        files are a.out.
-
-Tue Sep 13 11:09:39 1994  J.T. Conklin  (jtc@rtl.cygnus.com)
-
-	* configure.host (sparc-*-netbsd): use sparcnbsd.
-	  (ns32k-*-netbsd): use ns32knbsd.
-
-	* hosts/{nbsd,i386nbsd,ns32knbsd,sparcnbsd}.h: New files, NetBSD
-	  host support.
-
-	* sparcnetbsd.c: New file, adds support for NetBSD/sparc.
-	* config/sparc-nbsd.mt: Likewise.
-
-	* netbsd.h: New file, definitions common to all netbsd ports.
-	* i386netbsd.c: Use it.
-        * ns32knetbsd.c: Use it.
-
-	* Makefile.in, configure.in, targets.c, config/i386-nbsd.mt,
-	  config/ns32k-nbsd.mt: canonicalize netbsd targets to conform to
-	  file/variable naming conventions.
-	* i386netbsd.c: New file, renamed from netbsd386.c.
-	* ns32knetbsd.c: New file, renamed from netbsd532.c.
-	
-Mon Sep 12 21:56:20 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_reloc_skip): Correct off-by-one error for 4-byte
-	R_NO_RELOCATION fixups.
-	(bfd_section_from_som_symbol): Return the absolute section if the
-	symbol isn't contained in any section in the output file.
-	(som_slurp_symbol_table): ST_PRI_PROG and ST_SEC_PROG symbols are
-	not function symbols (they are magic code labels which *can* be the
-	targets of cross space branches).  $START$ is not a section symbol.
-
-Mon Sep 12 11:43:08 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coff-alpha.c (ecoffalpha_little_vec): Add SEC_CODE and SEC_DATA
-	to section_flags.
-	* coff-mips.c (ecoff_little_vec, ecoff_big_vec): Likewise.
-
-	* elfcode.h (swap_out_syms): Set the type of an undefined symbol
-	to STT_FUNC if the BSF_FUNCTION flag is set.
-
-	* cofflink.c (coff_link_input_bfd): If r_symndx is -1, don't
-	change it.
-	(_bfd_coff_generic_relocate_section): If r_symndx is -1, it is an
-	absolute reloc.  Don't dump core using r_symndx as an array index.
-	* cf-m68klynx.c (coff_bfd_link_add_symbols): Define.
-	(lynx_link_add_symbols): New static function (copy of function in
-	coff-i386.c).
-	(coff_m68k_lynxrtype_to_howto): sym argument may be NULL.
-	* coff-i386.c (coff_i386_rtype_to_howto): Likewise.
-	* coff-a29k.c (coff_a29k_relocate_section): Handle an r_symndx
-	value of -1, meaning an absolute reloc.
-
-	* ctor.c: Remove; obsolete.
-	* Makefile.in: Rebuild dependencies.
-	(BFD_LIBS): Remove ctor.o.
-	(CFILES): Remove ctor.c.
-	* libbfd.h: Rebuild.
-
-Mon Sep 12 01:58:47 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (elf32_hppa_relocate_section): If there was a link
-	error of some sort (for example, undefined symbols), then do not
-	apply any relocs, just notify the user of the errors.
-	(elf32_hppa_backend_begin_write_processing): Do not build a symbol
-	extension section for an executable (it's useless).
-	(elf32_hppa_link_output_symbol_hook): Do nothing if there was a
-	link error of some sort (for example, undefined symbols).
-	(elf32_hppa_read_symext_info): Kludge.  Turn off SEC_HAS_CONTENTS
-	for all the input symbol extension sections to keep the generic
-	BFD code happy.  Temporarily turn it on to read the contents of
-	the symbol extension section.
-
-Sun Sep 11 21:58:59 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* config/hppaosf.mh (RANLIB): Do not set.
-	* config/hppabsd.mh (RANLIB): Likewise.
-
-Sun Sep 11 22:50:49 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* cf-i386lynx.c: Remove #if 0 code.
-	(i386_lynxos_coff_object_p): Remove unused function.
-	(coff_bfd_link_add_symbols): Define.
-	(lynx_link_add_symbols): New static function.
-	* coffcode.h (coff_bfd_link_hash_table_create): If
-	coff_relocate_section is defined, only define this if not already
-	defined.
-	(coff_bfd_link_add_symbols, coff_bfd_final_link): Likewise.
-
-	* linker.c (_bfd_generic_final_link): Handle
-	bfd_indirect_link_order explicitly, rather than via
-	_bfd_default_link_order.
-	(set_symbol_from_hash): New static function, broken out of
-	_bfd_generic_link_write_global_symbol.
-	(_bfd_generic_link_write_global_symbol): Symbol setting code moved
-	to set_symbol_from_hash; call it.
-	(default_indirect_link_order): Add generic_linker argument.
-	Change all callers.  If false, set the generic symbols based on
-	the hash table entries.
-
-Fri Sep  9 11:51:49 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coffgen.c (coff_get_symtab): Reindented.  Removed commented out
-	call to bfd_constructor_entry.
-
-	Convert m68k COFF to use new COFF backend linker.
-	* coff-m68k.c (coff_relocate_section): Define.
-	* cf-m68klynx.c (coff_rtype_to_howto): Define.
-	(coff_m68k_lynx_rtype_to_howto): New static function.
-	* configure.in (m68kcoff_vec): Build cofflink.o.
-	(m68kcoffun_vec, m68klynx_coff_vec): Likewise.
-
-Thu Sep  8 16:20:38 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
-
-	* coff-h8300.c (h8300_reloc16_extra_cases, case RELBYTE): Flag
-	overflows correctly.
-
-Wed Sep  7 19:01:42 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* libelf.h (struct elf_backend_data): Change second argument of
-	elf_backend_final_write_processing hook to boolean.
-	(struct elf_obj_tdata): Add linker field.
-	* elfcode.h (NAME(bfd_elf,write_object_contents)): Pass value of
-	tdata linker field to final_write_processing, rather than NULL.
-	(elf_bfd_final_link): Don't call final_write_processing hook.  Set
-	tdata linker field to true.
-	* elf32-mips.c (mips_elf_final_write_processing): Change type of
-	second argument to boolean.
-	* elf32-hppa.c (elf32_hppa_backend_final_write_processing):
-	Likewise.
-
-	* coff-go32.c (RTYPE2HOWTO): Fully parenthesize arguments.
-	* coff-i960.c (RTYPE2HOWTO): Likewise.
-	* coff-m88k.c (RTYPE2HOWTO): Likewise.
-	* coff-we32k.c (RTYPE2HOWTO): Likewise.
-
-	Make i386 COFF use new COFF backend linker.
-	* coff-i386.c (RTYPE2HOWTO): Fully parenthesize arguments.
-	(coff_relocate_section): Define.
-	(coff_i386_rtype_to_howto): New function.
-	* configure.in (i386coff_vec): Use cofflink.o.
-	(i386lynx_coff_vec): Likewise.
-
-	* coffcode.h (bfd_coff_backend_data): Add new field
-	_bfd_coff_rtype_to_howto.
-	(bfd_coff_rtype_to_howto): Define.
-	(coff_rtype_to_howto): Define to use RTYPE2HOWTO, if not already
-	defined.
-	(bfd_coff_std_swap_table): Initialize new field.
-	* cofflink.c (_bfd_coff_final_link): Allocate section_count + 1
-	section_info structures, since the target_index is 1 based.
-	(coff_link_input_bfd): Set *secpp to bfd_com_section_ptr for a
-	common symbol.  Adjust rel_hash by the output reloc count.
-	(_bfd_coff_generic_relocate_section): New function.
-	* libcoff-in.h (_bfd_coff_generic_relocate_section): Declare.
-	* libcoff.h: Rebuild.
-	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-
-Tue Sep  6 23:28:52 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_derive_misc_symbol_info): Treat undefined code
-	symbols and undefined symbols which no type in the same manner
-	if the associated BFD symbol has BSF_FUNCTION set.  For a defined
-	symbol which no type, select a SOM type based on the flags of the
-	section containing the symbol.
-	(som_slurp_symbol_type): Set BSF_FUNCTION for undefined ST_STUB
-	or ST_CODE symbols (importing a non-function code symbol is
-	meaningless in SOM).
-	(som_set_reloc_info): Don't set "offset" to the section's vma; it
-	should always start at zero.
-
-Tue Sep  6 14:51:11 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	Add new style linker support to COFF backend.  a29k only for now.
-	* cofflink.c: New file.
-	* libcoff-in.h: Include bfdlink.h.
-	(obj_coff_external_syms, obj_coff_strings): Define accessor macro.
-	(obj_coff_sym_hashes): Define accessor macro.
-	(struct coff_tdata): Add fields external_syms, strings, and
-	sym_hashes.
-	(struct coff_link_hash_entry): Define.
-	(struct coff_link_hash_table): Define.
-	(coff_link_hash_lookup, coff_link_hash_traverse): Define.
-	(coff_hash_table): Define.
-	(_bfd_coff_link_hash_table_create): Declare.
-	(_bfd_coff_link_add_symbols, _bfd_coff_final_link): Declare.
-	* coffcode.h (bfd_coff_backend_data): Add fields _bfd_relsz,
-	_bfd_coff_swap_reloc_in, _bfd_coff_sym_is_global,
-	_bfd_coff_compute_section_file_positions,
-	_bfd_coff_relocate_section.
-	(bfd_coff_relsz, bfd_coff_swap_reloc_in): Define.
-	(bfd_coff_sym_is_global): Define.
-	(bfd_coff_compute_section_file_positions): Define.
-	(bfd_coff_relocate_section): Define.
-	(coff_mkobject_hook): Initialize obj_raw_syment_count and
-	obj_conv_table_size.
-	(coff_compute_section_file_positions): Set target_index of all
-	sections.  Set output_has_begun field.
-	(coff_write_object_contents): Don't set target_index; now done by
-	coff_compute_section_file_positions.  Remove obsolete handling of
-	scn_base and data_base.  Don't bother to check that target_index
-	is positive, since it always is.  Remove use of pad, which is
-	always zero.  Check obj_raw_syment_count, not bfd_get_symcount,
-	for the number of symbols, but only write them out if
-	bfd_get_symcount is non-zero.  Don't check obj_raw_syment_count
-	until after coff_write_symbols is called.
-	(coff_slurp_symbol_table): Use obj_raw_syment_count, not
-	bfd_get_symcount for the number of symbols.  Don't set
-	obj_conv_table_size.
-	(coff_sym_is_global): New static function or macro.
-	(coff_slurp_reloc_table): Call coff_swap_reloc_in, not
-	bfd_swap_reloc_in.
-	(coff_bfd_link_hash_table_create): If coff_relocate_section is
-	defined, define as _bfd_coff_link_hash_table_create.
-	(coff_bfd_link_add_symbols): Similar change.
-	(coff_bfd_final_link): Similar change.
-	(coff_relocate_section): Define as NULL if not defined.
-	(bfd_coff_std_swap_table): Initialize new fields.
-	* coffgen.c (coff_real_object_p): Don't set obj_raw_syment_count
-	and obj_conv_table_size here.
-	(coff_count_linenumbers): Reindent.  If bfd_get_symcount is zero,
-	add up the line numbers from the sections.
-	(coff_write_symbols): Set obj_raw_syment_count, not
-	bfd_get_symcount.
-	(coff_pointerize_aux): Don't pointerize a nonpositive x_endndx
-	field.
-	(coff_get_normalized_symtab): Use obj_raw_syment_count, not
-	bfd_get_symcount.
-	(coff_print_symbol): If auxp->fix_end, print x_endndx value.
-	* coffswap.h (coff_swap_reloc_in): Rename from bfd_swap_reloc_in.
-	Reindent.  Change argument type to  PTR.
-	* coff-a29k.c (coff_a29k_relocate_section): New static function.
-	(coff_relocate_section): Define.
-	* configure.in (a29kcoff_big_vec): Compile cofflink.o.
-	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new fields.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-	* libcoff.h: Rebuilt.
-	* Makefile.in: Rebuilt dependencies.
-	(BFD32_BACKENDS): Add cofflink.o.
-	(CFILES): Add cofflink.c.
-
-Tue Sep  6 14:00:45 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* coffgen.c (coff_print_symbol, case bfd_symbol_print_all): Check
-	for section symbol, and print its aux fields with appropriate
-	labels.
-
-	* Makefile.in (ALL_MACHINES): Added cpu-arm.o.
-
-Sun Sep 04 17:58:10 1994  Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-
-	* aoutx.h (NAME(aout,machine_type)): Recognize the ARM processor.
-	* archures.c, config.bfd, configure.host, libaout.h, reloc.c,
-	targets.c: Add support for the ARM.
-	* cpu-arm.c, riscix.c, config/riscix.mh, config/riscix.mt: New files.
-
-	* aoutx.h (add_to_stringtable): Check that str isn't a NULL pointer.
-
-Fri Sep  2 14:10:30 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* reloc.c (enum bfd_reloc_code_real): Rewrote definition to use
-	new "chew" commands for simultaneous definition of enumerator and
-	enumerator name table.
-	(bfd_get_reloc_code_name): New function, for retrieving a symbolic
-	name associated with an enumerator.
-	* libbfd.h, bfd-in2.h: Regenerated.
-
-Tue Aug 30 21:24:54 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_write_fixups, case R_ENTRY): Handle case where no
-	unwind descriptor information is available.
-
-Tue Aug 30 11:43:30 1994  Eric Youngdale  (ericy@cais.cais.com)
-
-	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add soname
-	argument, and use it to set DT_SONAME dynamic entry.
-	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update prototype.
-	(bfd_elf64_size_dynamic_sections): Update prototype.
-	* bfd-in2.h: Rebuilt.
-
-Fri Aug 26 15:47:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coffgen.c (coff_real_object_p): Set obj_raw_syment_count.
-	(coff_get_normalized_symtab): Verify obj_raw_syment_count, rather
-	than setting it.
-
-Thu Aug 25 10:44:53 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* archive.c (bsd_write_armap): Remove host dependencies.
-
-	* aoutx.h (add_to_stringtab): Check for _bfd_stringtab_add error
-	before adding BYTES_IN_WORD.
-
-	* coffgen.c (coff_find_nearest_line): Look for the best C_FILE,
-	not merely the first.
-
-	* coffgen.c (coff_write_alien_symbol): If we are not using the
-	symbol, clear the name so that it is not put in the string table.
-	From Antti.Miettinen@ntc.nokia.com.
-
-Wed Aug 24 11:49:19 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coffgen.c (coff_print_symbol): Cast pointer different to long
-	and use %ld to print it.
-	* osf-core.c (osf_core_core_file_p): Remove unused variable
-	dseccnt.
-	* ecoffswap.h (ecoff_swap_ext_out): If ECOFF_64, clear remaining
-	bytes in bits2.
-
-	* configure.host, config.bfd: Change i[34]86 to i[345]86.
-	* coffgen.c (coff_real_object_p): Set obj_conv_table_size here,
-	rather than waiting until coff_slurp_symbol_table.
-	(coff_write_alien_symbol): Just ignore BSF_DEBUGGING symbols.
-	From Antti.Miettinen@ntc.nokia.com.
-
-	* section.c (bfd_make_section_anyway): Fix failure check of
-	bfd_make_empty_symbol.  From Antti.Miettinen@ntc.nokia.com.
-
-	* aoutx.h (translate_to_native_sym_flags): Use the output_section
-	(and output_offset) if there is one.
-
-	* aoutx.h (aout_link_check_archive_element): Discard the symbols
-	if the archive element was not needed.
-
-	* aoutx.h (aout_get_external_symbols): Ensure that a zero string
-	index yields an empty string.
-	(aout_link_write_symbols): If info->keep_memory is false, use name
-	from original hash table entry, not from entry in *sym_hash.
-
-	* aoutx.h (struct aout_final_link_info): Add fields contents,
-	relocs, symbol_map and output_syms.
-	(NAME(aout,final_link)): Work out the largest section size, reloc
-	size, and number of symbols.  Use them to preallocate buffers that
-	are large enough for all cases.
-	(aout_link_input_bfd): Use preallocated symbol_map.
-	(aout_link_write_symbols): Remove symbol_map argument; use
-	preallocated symbol_map instead.  Change all callers.  Use
-	preallocated output_syms.
-	(aout_link_input_section): Remove symbol_map argument.  Change all
-	callers.  Use preallocated contents and relocs.
-	(aout_link_input_section_std): Remove symbol_map argument; use
-	preallocated symbol_map instead.  Change all callers.
-	(aout_link_input_section_ext): Likewise.
-
-Tue Aug 23 10:51:09 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* archive.c (_bfd_write_archive_contents): Don't update the
-	symbol map timestamp if there is no symbol map.  From
-	schwab@issan.informatik.uni-dortmund.de (Andreas Schwab).
-
-Mon Aug 22 12:26:42 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* targets.c (BFD_JUMP_TABLE_ARCHIVE): Add _update_armap_timestamp.
-	(bfd_target): Add field _bfd_update_armap_timestamp.
-	* bfd.c (bfd_update_armap_timestamp): Define.
-	* bfd-in2.h: Rebuilt.
-	* libbfd-in.h (_bfd_noarchive_update_armap_timestamp): Define.
-	(_bfd_archive_bsd_update_armap_timestamp): Declare.
-	(_bfd_archive_coff_update_armap_timestamp): Define.
-	* libbfd.h: Rebuilt.
-	* archive.c (_bfd_write_archive_contents): Call
-	bfd_update_armap_timestamp instead of checking for a BSD archive
-	and calling bsd_update_armap_timestamp.
-	(_bfd_archive_bsd_update_armap_timestamp): Rename from
-	_bsd_update_armap_timestamp.  Don't assume that armap_datepos is
-	already set.
-	* aout-target.h (MY_update_armap_timestamp): Define if not already
-	defined.
-	* coff-rs6000.c (rs6000coff_update_armap_timestamp): Define.
-	* ieee.c (ieee_update_armap_timestamp): Define.
-	* libecoff.h (_bfd_ecoff_update_armap_timestamp): Define.
-	* oasys.c (oasys_update_armap_timestamp): Define.
-	* som.c (som_update_armap_timestamp): Define.
-
-	* hash.c: Copy string hash functions from aoutx.h.
-	* aoutx.h: String hash functions moved to hash.c.  Retain
-	simplified versions of add_to_stringtab and emit_stringtab.
-	Change all callers to use new function and structure names.
-	* libbfd-in.h (_bfd_stringtab_init, _bfd_stringtab_free): Declare.
-	(_bfd_stringtab_size, _bfd_stringtab_add): Declare.
-	(_bfd_stringtab_emit): Declare.
-	* libbfd.h: Rebuilt.
-
-Mon Aug 22 10:49:37 1994  Eric Youngdale  (ericy@cais.cais.com)
-
-	* i386linux.c (linux_add_one_symbol): Create a fixup for any
-	defined absolute symbol, not just GOT or PLT symbols.
-	(linux_tally_symbols): Correct handling of references to defined
-	symbols.
-
-Thu Aug 18 16:29:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	Get ld -x -r to handle a.out set symbols correctly.
-	* aoutx.h (adjust_o_magic): If the .bss VMA was set outside of
-	BFD, pad the .data section up to the VMA of the .bss section.
-	(aout_link_add_symbols): If a set symbol does not get modified,
-	treat it as a local symbol.
-	(aout_link_write_symbols): Set the value of set symbols
-	correctly.  Don't discard set symbols even if discarding local
-	symbols.
-	(aout_link_write_other_symbol): Don't abort on bfd_link_hash_new,
-	since it can now happen for set symbols.
-
-	* elfcode.h (elf_fake_sections): Just check for ".rela" and
-	".rel", not ".rela." and ".rel."; make this work by checking
-	use_rela_p.
-	* elf32-i386.c (elf_i386_check_relocs): Just check for ".rel", not
-	".rel."
-	(elf_i386_size_dynamic_sections): Likewise.
-	(elf_i386_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_check_relocs): Just check for
-	".rela", not ".rela."
-	(elf32_sparc_size_dynamic_sections): Likewise.
-	(elf32_sparc_relocate_section): Likewise.
-
-Wed Aug 17 16:54:18 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* linker.c (_bfd_generic_link_add_archive_symbols): Initialize
-	PASS to the old value + 1.
-
-	* coffgen.c (coff_get_normalized_symtab): If a C_FILE symbol has
-	no aux entries, use the symbol name as the file name.
-	(coff_find_nearest_line): Look for the right C_FILE symbol, rather
-	than always using the first one.  If there is a debugging symbol
-	after a function symbol, skip it.  Add the section VMA to the line
-	offset, since it was subtracted out in coff_slurp_line_table.
-
-Tue Aug 16 16:53:00 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_prep_headers): If writing some form of an executable,
-	allocate and attach an exec header to the BFD private data.
-	(som_begin_writing): Don't fill fields of the exec header based
-	on BFD private data here (like the exec flags).  Do not write
-	the exec header here.
-	(som_write_headers): Instead do it here.
-	* som.h (struct somdata): New field "exec_hdr" for the executable
-	file header.
-	(obj_som_exec_hdr): New accessor macro.
-
-Tue Aug 16 00:12:31 1994  Eric Youngdale  (ericy@cais.cais.com)
-
-	* i386linux.c (linux_link_create_dynamic_sections): Create section
-	named .linux-dynamic, not .dynamic.
-	(linux_add_one_symbol): Use .linux-dynamic, not .dynamic.
-	(bfd_linux_size_dynamic_sections): Likewise.
-	(linux_finish_dynamic_link): Likewise.
-
-Mon Aug 15 12:16:56 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coffgen.c (STRING_SIZE_SIZE): Define.
-	(coff_fix_symbol_name): Use STRING_SIZE_SIZE, not 4.
-	(coff_write_symbols, build_string_table): Likewise.
-	(coff_get_normalized_symtab): Likewise.
-
-	* libcoff-in.h (obj_symbol_slew): Don't define.
-	(struct coff_tdata): Remove unused fields index_slew, raw_linenos,
-	and flags.
-	* libcoff.h: Rebuilt.
-	* coffcode.h (coff_mkobject): Don't initialize raw_linenos.
-	(coff_mkobject_hook): Don't initialize flags.
-
-	* aout-target.h (MY_zmagic_contiguous): Define as 0 if not already
-	defined.
-	(MY(backend_data)): Use MY_zmagic_contiguous, not hardcoded 0.
-	* i386linux.c (MY_zmagic_contiguous): Define.
-
-	* elfcode.h (bfd_section_from_shdr): If a SHT_SYMTAB section in a
-	shared object has SHF_ALLOC set, create a BFD section for it.
-	(elf_section_from_bfd_section): There may be a BFD section for a
-	SHT_SYMTAB section.
-
-	* coffcode.h (styp_to_sec_flags): Add name argument.  If no flags
-	are recognized, chose section flags based on the name.
-	(bfd_coff_backend_data): _bfd_styp_to_sec_flags_hook field: Add
-	name argument.
-	(bfd_coff_styp_to_sec_flags_hook): Add name argument.
-	(coff_compute_section_file_positions): Don't adjust the section
-	position by COFF_PAGE_SIZE unless SEC_ALLOC is set.
-	* libcoff.h: Rebuilt.
-	* coffgen.c (make_a_section_from_file): Pass section name to
-	bfd_coff_styp_to_sec_flags_hook.
-	* ecoff.c (_bfd_ecoff_styp_to_sec_flags): Add unused name
-	argument.
-	* libecoff.h (_bfd_ecoff_styp_to_sec_flags): Add name argument to
-	prototype.
-
-Fri Aug 12 11:22:40 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elfcode.h (section_from_elf_index): Correct check for invalid
-	section index.
-
-	* elfcode.h (elf_link_add_object_symbols): If there is no symbol
-	table, try using the dynamic symbol table.  From Eric Youngdale
-	<ericy@cais.cais.com>.
-
-	* configure.host (sparc-*-solaris2*): Use solaris2, not sysv4.
-	The linker depends upon configuring for solaris2.
-	* hosts/solaris2.h: New file; include hosts/sysv4.h.
-	* config/solaris2.mh: New file; copy of config/sysv4.mh.
-
-Wed Aug 10 13:09:38 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* aoutx.h (adjust_z_magic): Make sure data section is padded to
-	page boundary when the VMA is set by the calling program.  From
-	Eric Youngdale <ericy@cais.cais.com>.
-
-Mon Aug  8 17:18:49 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	Update to ns32k support, from Ian Dall (dall@hfrd.dsto.gov.au).
-	* aout-ns32k.c: Add declarations that were in aout-ns32k.h, change
-	declarations to traditional form.
-	(MY_reloc_howto, MY_put_reloc): Change from macro to function.
-	(ns32k_relocate_contents): New function.
-	* aout-ns32k.h: Remove.
-	* cpu-ns32k.c: Add declarations that were in aout-ns32k.h, change
-	declarations to traditional form.
-	(ns32k_final_link_relocate): Call ns32k_relocate_contents.
-	* netbsd532.c: Reformat to standards, add copyright notice.
-	(ARCH): Don't define.
-	(aout-ns32k.h): Don't include.
-	* pc532-mach.c: Ditto.
-
-Mon Aug  8 17:55:52 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coff-i960.c (coff_i960_relocate): Don't try to convert relocs
-	against common symbols.
-
-Sat Aug  6 22:27:30 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* irix-core.c (irix_core_core_file_p):  Ignore sections that
-	are not contained in the core file.
-
-Thu Aug  4 11:32:23 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coff-m68k.c (m68k_reloc_type_lookup): New function.
-	(coff_bfd_reloc_type_lookup): Define.
-	* cf-m68klynx.c (_bfd_m68kcoff_reloc_type_lookup): Define.
-
-	* elfcode.h (elf_bfd_final_link): Force the vma of sections which
-	do not have SEC_ALLOC set to be 0.  This is needed to handle
-	relocs against debugging sections.
-
-Wed Aug  3 16:45:41 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coff-i960.c (coff_i960_relocate): Rewrote to change relocs
-	against locally defined symbols into relocs against section
-	symbols, for VxWorks 5.1.
-
-Wed Aug  3 10:34:37 1994  Eric Youngdale  (ericy@cais.cais.com)
-
-	* i386linux.c (linux_add_one_symbol): Only handle
-	SHARABLE_CONFLICTS specially if BSF_CONSTRUCTOR is set.  Set hashp
-	for a GOT or PLT symbol.  Set jump field of fixup for a PLT symbol.
-	(linux_tally_symbols): Check section of real symbol.  When looking
-	for a builtin fixup, check builtin and jump flags.  Create no more
-	than one fixup, and always create one if the real symbol is in the
-	absolute section.  Only strip absolute symbols.
-
-Wed Aug  3 05:08:24 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
-
-	* coffcode.h (coff_write_object_contents): set internal_a.magic to
-	LYNXCOFFMAGIC whenever 68k, SPARC or i386 LynxOS
-	(yes, they have the same magic number!)
-
-Tue Aug  2 10:43:21 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* hp300hpux.c (BMAGIC): Define as HPUX_DOT_O_MAGIC, to make test
-	in aoutx.h work correctly.
-
-	* coff-i960.c (coff_i960_relocate): New function.
-	(howto_rellong, howto_iprmed): Use it as special_function.
-
-	* libbfd-in.h: Move declarations of bfd_read, bfd_write, bfd_seek,
-	bfd_tell, bfd_flush, and bfd_stat from here...
-	* bfd-in.h: ...to here, to make them visible to programs which
-	know more about the object file format than BFD does.
-	* libbfd.h, bfd-in2.h: Rebuilt.
-
-Mon Aug  1 17:55:53 1994  Fred Fish  (fnf@cygnus.com)
-
-	* ptrace-core.c (ptrace_unix_core_file_p):  Convert zalloc usage
-	to bfd_zalloc.
-
-Mon Aug  1 12:04:40 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elf64-sparc.c (ELF_MAXPAGESIZE): Define.
-
-	ELF linker patches from Eric Youngdale <ericy@cais.cais.com>.
-	* elfcode.h (elf_link_create_dynamic_sections): Set type of
-	_DYNAMIC to STT_OBJECT.
-	(NAME(bfd_elf,record_link_assignment)): Always create hash table
-	entry.  Set type to STT_OBJECT.
-	(elf_link_output_extsym): Don't set type of weak defined symbol to
-	STB_WEAK if symbol was referenced.
-	(map_program_segments): Check DYNAMIC as well as EXEC_P.
-	(assign_file_positions_except_relocs): Likewise.
-	* elf32-i386.c (elf_i386_create_dynamic_sections): Set type of
-	_GLOBAL_OFFSET_TABLE to STT_OBJECT.
-	(elf_i386_check_relocs): Ignore local PLT32 relocs.
-	(elf_i386_relocate_section): Treat local PLT32 relocs as PC32.
-
-	* elfcode.h (elf_adjust_dynamic_symbol): Correct weak symbol
-	handling again.
-
-	* elfcode.h (elf_slurp_reloc_table): Don't try to read the relocs
-	if there aren't any.
-
-	* configure.host (sparc-*-solaris2*): Use sysv4, not solaris2.
-	* hosts/solaris2.h: Remove.
-	* config/solaris2.mh: Remove.
-
-Sun Jul 31 14:27:04 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c, elf32-hppa.h: Update comment reflecting which
-	HPPA ELF spec the code implements.
-
-Tue Jul 26 17:38:01 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* cpu-i960.c (MAX_ARCH): New macro.
-	(compatible): Use it in computing array bounds.  Put comma after
-	last entry in array, for regularity.
-	(arch_info_struct): Adjust spacing for easier reading.
-
-	* coff-i960.c (howto_rellong, howto_iprmed, howto_optcall): Use
-	HOWTO macro.
-
-	* cpu-i960.c (JX): Define as bfd_mach_i960_jx.
-	(scan_960_mach): Recognize jx machine.
-	(MAX_ARCH): Define to be JX.
-	(compatible): Add JX row to array.
-	(arch_info_struct): Add JX entry.
-
-	* archures.c (bfd_mach_i960_jx): New macro.
-	* bfd-in2.h: Regenerated.
-
-	* coffcode.h (coff_set_arch_mach_hook): For F_I960JX, set machine
-	to bfd_mach_i960_jx.
-	(coff_set_flags): For bfd_mach_i960_jx, set F_I960JX.
-
-Tue Jul 26 11:04:00 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elfcode.h (elf_adjust_dynamic_symbol): When handling a weak
-	symbol, correct check to see whether the equivalent normal symbol
-	was referenced.
-
-	Add support for creating shared libraries under i386 ELF and SPARC
-	ELF.  Based on patches by Eric Youngdale <ericy@cais.cais.com>.
-	* libelf.h (struct elf_link_hash_entry): Remove copy_offset field.
-	Add got_offset and plt_offset fields.
-	(ELF_LINK_HASH_REF_DYNAMIC_MULTIPLE): Don't define.
-	(ELF_LINK_HASH_DEF_DYNAMIC_MULTIPLE): Don't define.
-	(ELF_LINK_HASH_NEEDS_COPY): Define.
-	(struct elf_backend_data): Add check_relocs field.
-	(struct bfd_elf_section_data): Change relocs from PTR to
-	Elf_Internal_Rela *.
-	(struct elf_obj_tdata): Add local_got_offsets field.
-	(elf_local_got_offsets): Define accessor macro.
-	(bfd_elf32_link_create_dynamic_sections): Declare.
-	(bfd_elf32_link_record_dynamic_symbol): Declare.
-	(bfd_elf64_link_create_dynamic_sections): Declare.
-	(bfd_elf64_link_record_dynamic_symbol): Declare.
-	* elfcode.h (elf_slurp_reloc_table): Don't use the section data
-	relocs field.
-	(elf_link_record_dynamic_symbol): Make globally visible.  Use
-	macro to rename to NAME(bfd_elf,link_record_dynamic_symbol).
-	(elf_link_add_object_symbols): If creating a shared library, put
-	make all local symbols dynamic.  Don't bother with the
-	DYNAMIC_MULTIPLE flags.  Call the check_relocs backend function if
-	it is defined.
-	(elf_link_create_dynamic_sections): Make globally visible.  Use
-	macro to rename to NAME(bfd_elf,link_create_dynamic_sections).  If
-	creating a shared library, make sure that _DYNAMIC is added as a
-	dynamic symbol.
-	(elf_link_read_relocs): New function.
-	(NAME(bfd_elf,record_link_assignment)): If creating a shared
-	library, always create symbols, and always make them dynamic.
-	(elf_bfd_final_link): Permit creation of shared libraries.
-	(elf_link_input_bfd): Use elf_link_read_relocs to get the relocs.
-	* elf.c (_bfd_elf_link_hash_newfunc): Don't initialize
-	copy_offset.  Initialize got_offset and plt_offset.
-	* elf32-target.h (elf_backend_check_relocs): Define as 0 if not
-	defined.
-	(elf32_bed): Initialize check_relocs field.
-	* elf64-target.h (elf_backend_check_relocs): Define as 0 if not
-	defined.
-	(elf64_bed): Initialize check_relocs field.
-	* elf32-i386.c (elf_howto_table): Change R_386_PLT32 and
-	R_386_GOTPC to be pc_relative and pcrel_offset.
-	(elf_i386_pic_plt0_entry): Define.
-	(elf_i386_pic_plt_entry): Define.
-	(elf_i386_create_dynamic_sections): Create a .got.plt section, and
-	define _GLOBAL_OFFSET_TABLE_ at the start of it.  If creating a
-	shared library, make sure that _GLOBAL_OFFSET_TABLE_ is added as a
-	dynamic symbol.  Don't create .rel.bss if creating a shared
-	library.
-	(elf_i386_check_relocs): New function.
-	(elf_i386_adjust_dynamic_symbol): Don't make a PLT entry if the
-	symbol already has one.  When making a PLT entry, set plt_offset.
-	Don't create a copy reloc when creating a shared library.  Don't
-	set copy_offset, just set ELF_LINK_HASH_NEEDS_COPY.
-	(elf_i386_allocate_dynamic_section): Remove.
-	(elf_i386_size_dynamic_sections): Look through all the sections
-	rather than assuming we know their names.  Remove any empty reloc
-	or plt sections.  Only add a DT_DEBUG entry if not creating a
-	shared library.  Only add a DT_PLTGOT entry if there is a PLT.
-	Add a DT_TEXTREL entry if required.
-	(elf_i386_relocate_section): Permit undefined symbols when
-	creating a shared library.  Handle the special relocation types
-	specially.
-	(elf_i386_finish_dynamic_symbol): Create a PLT entry if plt_offset
-	is set.  If creating a shared library, produce a PIC PLT entry.
-	Only mark a PLT symbol as undefined if it was not defined by a
-	regular object file.  Create a GOT entry if got_offset is set.
-	Create a copy reloc if ELF_LINK_HASH_NEEDS_COPY is set.
-	(elf_i386_finish_dynamic_sections): Change the handling of
-	DT_RELSZ to simply subtract out the size of .rel.plt.  If creating
-	a shared library, produce PIC PLT code.
-	(elf_backend_check_relocs): Define.
-	* elf32-sparc.c (elf_sparc_howto_table): Change R_SPARC_GOT10,
-	R_SPARC_GOT22, and R_SPARC_PC10 to not warn about reloc overflow.
-	(elf32_sparc_create_dynamic_sections): If creating a shared
-	library, make sure that _GLOBAL_OFFSET_TABLE_ is added as a
-        dynamic symbol, and set the type to STT_OBJECT.  Likewise for
-        _PROCEDURE_LINKAGE_TABLE_.  Don't create .rel.bss if creating a
-        shared library.
-	(elf32_sparc_check_relocs): New function.
-	(elf32_sparc_adjust_dynamic_symbol): Don't make a PLT entry if the
-	symbol already has one.  When making a PLT entry, set plt_offset.
-	Don't create a copy reloc when creating a shared library.  Don't
-	set copy_offset, just set ELF_LINK_HASH_NEEDS_COPY.
-	(elf32_sparc_allocate_dynamic_section): Remove.
-	(elf32_sparc_size_dynamic_sections): Look through all the sections
-	rather than assuming we know their names.  Only add a DT_DEBUG
-	entry if not creating a shared library.  Add a DT_TEXTREL entry if
-	required.
-	(elf32_sparc_relocate_section): Permit undefined symbols when
-	creating a shared library.  Handle the special relocation types
-	specially.
-	(elf32_sparc_finish_dynamic_symbol): Create a PLT entry if plt_offset
-	is set.  Only mark a PLT symbol as undefined if it was not defined
-	by a regular object file.  Create a GOT entry if got_offset is
-	set.  Create a copy reloc if ELF_LINK_HASH_NEEDS_COPY is set.
-	(elf32_sparc_finish_dynamic_sections): Store dynobj in a local
-	variable.
-	(elf_backend_check_relocs): Define.
-
-Mon Jul 25 12:21:07 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* configure.in (pc532mach_vec): Change to pc532machaout_vec.
-	* config.bfd (ns32k-*-netbsd*): Use ns32k-nbsd as bfd_name.
-	* Makefile.in (ALL_MACHINES): Add cpu-ns32k.o.
-	(BFD32_BACKENDS): Add aout-ns32k.o, netbsd532.o, m88kmach3.o,
-	pc532-mach.o.
-	* targets.c (pc532machaout_vec): Use instead of pc532mach_vec.
-	* config/pc532-mach.mt (DEFAULT_VECTOR): Ditto.
-	(SELECT_VECS): Remove.
-	* config/ns32k-nbsd.mt: New file, was ns32k-netbsd.mt.
-	* config/ns32k-netbsd.mt: Remove, name too long.
-
-Fri Jul 22 11:07:14 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* linker.c (generic_link_check_archive_element): When changing a
-	symbol to common, set the alignment.
-	(_bfd_generic_link_add_one_symbol): When creating a common symbol,
-	set the alignment.
-	* aoutx.h (aout_link_check_ar_symbols): When changing a symbol to
-	common, set the alignment.
-	(aout_link_add_symbols): Restrict the alignment of a common symbol
-	to the alignment power given by the architecture.
-	* libelf.h (struct elf_link_hash_entry): Remove align field.  Add
-	copy_offset field.
-	* elfcode.h (elf_link_add_object_symbols): Store alignment in
-	new bfd_link_hash_entry field, not in elf_link_hash_entry field.
-	(elf_link_output_extsym): Similar change when getting alignment.
-	* elf.c (_bfd_elf_link_hash_newfunc): Don't initialize align.  Do
-	initialize copy_offset.
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Use copy_offset
-	field rather than align field.  Get alignment using bfd_log2
-	rather than switch.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-	* elf32-i386.c (elf_i386_finish_dynamic_symbol): Use copy_offset,
-	not align.
-	* elf32-sparc.c (elf32_sparc_finish_dynamic_symbol): Likewise.
-
-	* aoutx.h (NAME(aout,some_aout_object_p)): Just check
-	STAT_FOR_EXEC, don't check MACH.
-	* m88kmach3.c (MACH): Don't define.
-	* config/i386-mach3.mt (TDEFINES): Define STAT_FOR_EXEC.
-	* config/m88k-mach3.mt (TDEFINES): Likewise.
-	* config/mips-mach3.mt (TDEFINES): Likewise.
-
-Thu Jul 21 17:24:31 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* i386mach3.c: Reverted to version from before Jul 5 1994 changes.
-
-Thu Jul 21 12:26:01 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* reloc.c (struct reloc_howto_struct): Remove special_function1.
-	It's the wrong way to do things.
-	(HOWTO): Change accordingly.
-	(HOWTO2): Remove.
-	(_bfd_final_link_relocate): Remove references to
-	special_function1.
-	* bfd-in2.h: Rebuilt.
-	* aoutx.h (aout_link_input_section_std): Remove references to
-	special_function1.
-	(aout_link_reloc_link_order): Likewise.
-
-Wed Jul 20 15:46:44 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add rpath
-	argument.  If it is not NULL, use it to set DT_RPATH.
-	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update prototype.
-	(bfd_elf64_size_dynamic_sections): Likewise.
-	* bfd-in2.h: Rebuilt.
-
-Sat Jul 16 21:10:39 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elfcode.h (elf_get_dynamic_symtab_upper_bound): If there is no
-	dynamic symtab, return error.
-
-	* libelf.h (ELF_LINK_HASH_DEFINED_WEAK): Define.
-	* elfcode.h (elf_link_add_object_symbols): If symbol is defined as
-	weak, set ELF_LINK_HASH_DEFINED_WEAK.
-	(elf_link_output_extsym): If symbol is defined as weak, mark it
-	STB_WEAK.
-
-	* libelf.h (struct bfd_elf_section_data): Add relocs field.
-	(shdr_name): Remove; unused.
-	* elfcode.h (elf_slurp_reloc_table): Rewrote to handle both REL
-	and RELA relocs.  Free up the unswapped relocs.  Permit the relocs
-	to be cached in the section_data.  Correct the reloc address.
-	(elf_slurp_reloca_table): Remove.
-	(elf_canonicalize_reloc): Rewrote.
-	(elf_link_input_bfd): Permit the relocs to be cached in the
-	section data.
-
-Sat Jul 16 13:55:38 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* config.bfd (m88*-harris-cxux*): Recognize.
-	* hosts/harris.h (POSIX_UTIME, HAVE_PROCFS): Define.
-
-	* configure.host (m68*-atari-sysv4*): New host.
-	(m68*-cbm-sysv4*): Use m68kv4 instead of amix.
-	* hosts/amix.h: Remove.
-	* hosts/m68kv4.h: New file, was amix.h.
-
-Thu Jul 14 15:12:24 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* reloc.c (enum bfd_reloc_code_real, bfd_type, struct
-	reloc_howto_struct, reloc_howto_type, HOWTO, HOWTO2): Copied
-	changes over from bfd-in2.h so they get generated properly next
-	time someone runs "make headers".
-	* bfd-in2.h: Rebuilt.
-
-	* targets.c (netbsd532_vec, pc532mach_vec): Declare const.
-	(m88kmach3_vec): Restore deleted declaration.
-
-	* configure.in: Alphabetize target vector names.
-
-	* config/pc532mach.mh: New file.
-	(HDEPFILES, HDEFINES): Define here.
-	* config/pc532-mach.mt (HDEPFILES, HDEFINES): Deleted.
-	* config/ns32k-netbsd.mt (HDEPFILES, HDEFINES): Deleted.
-
-	Sun Jul 10 00:04:20 1994  Ian Dall  (dall@hfrd.dsto.gov.au)
-
-	* pc532-mach.c: New File. pc532-mach a.out format.
-
-	* netbsd532.c: New file. pc532-netbsd532 a.out format.
-
-	* hosts/pc532mach.h: New file. pc532-mach host support.
-
-	* cpu-ns32k.c: New file. ns32k support cpu specific code rather
-	than format specific code.
-
-	* config/pc532-mach.mt: New file. Support for pc532-mach target.
-
-	* config/ns32k-netbsd.mt: New file. Support for netbsd532 target.
-
-	* aout-ns32k.c, aout-ns32k.h: New files supporting aout format for
-	ns32k series. 
-
-	* targets.c: Add netbsd532_vec and pc532machaout_vec into
-	bfd_target_vector array. Move netbsd386_vec to alphabetic order
-	location.
-
-	* reloc.c (_bfd_final_link_relocate) Add support for
-	special_function1 in howto.
-
-	* libaout.h: add M_NS32032, M_NS32532, M_532_NETBSD entries in
-	machine_type enum.
-
-	* configure.in: add pc532mach_vec and netbsd532_vec entries.
-
-	* config.bfd: add pc532mach host entries. Use for both
-	ns32k-pc532-mach and ns32k-pc532-netbsd.
-
-	* config.bfd: it doesn't work to use i386-mach3 for ns32k*-*-mach.
-	add ns32k-pc532-mach* and ns32k-*-netbsd* entries.
-
-	* bfd-in2.h: Add ns32k specific relocations to bfd_reloc_code_real
-	enum.
-
-	* bfd-in2.h: Add special_function1 to struct howto. Change HOWTO
-	and NEWHOWTO macros to make special_function1 NULL. Neww HOWTO2
-	macro.
-
-	* bfd-in2.h: Split definition of struct reloc_howto_struct
-	and corresponding typedef into two statements.
-
-	* bfd-in2.h: Add entry bfd_arch_ns32k to bfd_architecture enum.
-
-	* archures.c: Add bfd_ns32k_arch prototype, and entry in
-	archures_init_table. 
-
-	* aoutx.h (aout_link_reloc_link_order): Allow for target dependent
-	MY_put_reloc macro. Allow for target dependent special_function1
-	to apply the relocation. 
-
-	* aoutx.h (aout_link_input_section_std): Allow for target
-	dependent determination of reloc howto. Allow for target dependent
-	special_function1 to apply the relocation.
-
-	* aoutx.h (get_reloc_upper_bound): Detect bss and return 0.
-
-	* aoutx.h (slurp_reloc_table): Detect bss and succesfully read
-	zero reloc entries.
-
-	* aoutx.h (machine_type): Add bfd_arch_ns32k case.
-
-	* aoutx.h: Stat to determine executable status if STAT_FOR_EXEC
-	is defined (not just MACH). Use fstat instead of stat and check
-	for fstat error.
-
-	* aoutx.h: Allow target dependent swap_std_reloc_{in,out}.
-
-	* aoutx.h: Allow CTORS reloc info to be in target dependent reloc
-	table.
-
-	* aout-target.h: Apply SWAP_MAGIC (if defined) after
-	swap_exec_header_in, otherwise we have magic in the wrong order.
-
-Thu Jul 14 11:47:27 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* coff-sparc.c (sparccoff_vec): Have leading underscores.
-
-Tue Jul 12 12:08:10 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* aix386-core.c, aoutf1.h, cisco-core.c, elfcode.h, hppabsd-core.c,
-	hpux-core.c, irix-core.c, lynx-core.c, osf-core.c, ptrace-core.c,
-	rs6000-core.c, trad-core.c:  Remove SEC_ALLOC flag from .reg
-	sections, .reg sections are not allocated and contain debug
-	information only.
-	* osf-core.c (make_bfd_asection, osf_core_core_file_p):  Use
-	bfd_make_section_anyway instead of building unique section names.
-
-Tue Jul 12 11:41:22 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* libelf.h (bfd_elf32_swap_symbol_in): Declare.
-	(bfd_elf32_swap_symbol_out): Declare.
-	(bfd_elf64_swap_symbol_in, bfd_elf64_swap_symbol_out): Declare.
-	* elf32-hppa.c (elf32_hppa_args_hash_table_init): Correct cast.
-
-	* aout-encap.c (ARCH): Don't define.  Obsolete.
-	* aout0.c, aoutx.h, gen-aout.c, hp300bsd.c, hp300hpux.c: Likewise.
-	* i386aout.c, i386bsd.c, i386dynix.c, i386linux.c: Likewise.
-	* i386lynx.c, m68klynx.c, mipsbsd.c, netbsd386.c: Likewise.
-	* newsos3.c, sparclynx.c, sunos.c: Likewise.
-
-Mon Jul 11 20:08:23 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* section.c (STD_SECTION): Make the sixth argument boolean, not
-	the seventh.  From gary@tuva.pacsemi.oz.au (gary kopff).
-
-Sun Jul 10 09:12:02 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
-
-	* aoutx.h (bfd_free_cached_info): Change name of FREE to BFCI_FREE
-	in order not to collide with LynxOS's definition of FREE in
-	/usr/include/sys/proc.h
-
-Thu Jul  7 14:18:06 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* reloc.c (bfd_perform_relocation): Don't clobber the relocation
-	value for coff-Intel-little or coff-Intel-big.  Hack upon hack.
-
-Thu Jul  7 10:10:34 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* aoutx.h (howto_table_std):  Add entry for GOT relocations
-	which are present in sun3 shared libraries, to avoid assertions
-	when reading the dynamic relocations.
-
-Thu Jul  7 10:19:20 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.h (R_HPPA_COMPLEX): Fix dumb typo. 
-
-Wed Jul  6 19:21:57 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* hosts/sysv4.h (qsort, strtol): Don't declare.
-
-	* elfcode.h (elf_link_output_sym): Don't call output_symbol_hook
-	if it is NULL.
-
-	* elf32-mips.c (mips_elf_final_write_processing): Add ignored info
-	argument to correspond to recent libelf.h change.
-
-Wed Jul  6 00:48:57 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* coff-alpha.c (alpha_ecoff_mkobject_hook):  New hook to
-	additionally copy object type information from the alpha file
-	header to the BFD flags.
-	(alpha_ecoff_backend_data):  Use it.
-	(ecoffalpha_little_vec):  Add DYNAMIC to object_flags.
-	* aout64.c:  Fix typo in conditional QMAGIC definition.
-
-Wed Jul  6 00:13:17 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* hppabsd-core.c (hppabsd_core_core_file_p): Sanity check the
-	value of clicksz to help weed out non HPPA BSD core files.
-
-Tue Jul  5 13:26:02 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	Mach 3 support.
-	* config.bfd (m88*-*-mach3*, mips*-dec-mach3*, mips*-*-mach3*):
-	New targets.
-	* configure.host (i[34]86-*-mach3*, ns32k-*-mach3*): Recognize
-	"mach3" instead of "mach".
-	(m88*-*-mach3*, mips*-dec-mach3*, mips*-*-mach3*): New hosts.
-	* targets.c (m88kmach3_vec): New target vector.
-	(bfd_target_vector): Add i386mach3_vec and m88kmach3_vec, but
-	inside #if 0.
-	* aoutx.h (some_aout_object_p) [MACH]: Recognize executables by
-	checking for execute permission, instead of looking at entry
-	point.
-	* i386mach3.c: Update, define MACH, N_TXTOFF, N_TXTADDR,
-	N_SHARED_LIB, don't include aout/*.h files, etc.
-	* m88kmach3.c: New file, m88k Mach 3 target.
-	* config/m88k-mach3.mt,	config/mips-mach3.mt: New files, target
-	makefile fragments.
-	* config/i386mach3.mh, config/m88kmach3.mh, config/mipsmach3.mh:
-	New files, host	makefile fragments.
-	* hosts/m88kmach3.h, hosts/mipsmach3.h: New files, host definitions.
-
-Tue Jul  5 13:56:52 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* elfcode.h (swap_out_syms): Get alignment of common symbol from
-	st_value field of saved ELF symbol information, if there is any.
-
-Mon Jul  4 19:13:32 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.h (R_HPPA_COMPLEX): Define.
-	* elf32-hppa.h (R_HPPA_COMPLEX): Define.
-	(elf32_hppa_reloc_type): Delete R_PARISC_STUB_CALL_17.
-
-Fri Jul  1 12:07:41 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* Support code for enabling the new style linker for PA ELF.
-	* elfcode.h (swap_symbol_in, swap_symbol_out): Externalize.
-	(elf_compute_section_file_positions): Pass link_info to
-	the begin_write_processing hook.
-	(bfd_elf_write_object_contents): Pass NULL for new link_info
-	argument to final_write_processing hook.
-	(elf_link_output_sym): Accept new "input_section" argument for
-	the symbols's input section.  All callers changed.  Call the
-	link_output_symbol_hook if it's defined.
-	(elf_bfd_final_link): Call the final_write_processing hook if
-	it's defined.
-	* libelf.h (elf_backend_link_output_symbol_hook): Declare.
-	(elf_backend_begin_write_processing): Add new "info" argument.
-	(elf_backend_final_write_processing): Likewise.
-	* elf32-target.h (elf_backend_link_output_symbol_hook): Provide
-	a default definition.
-	(elf32_bed): Add elf_backend_link_output_symbol_hook.
-	* elf64-target.h: Likewise.
-	
-	* Major rework of the PA ELF code.  Uses the new style BFD
-	linker, major cleanups.
-	* hppa_stubs.h: Rewrite from scratch.  Much smaller and simpler.
-	* elf32-hppa.h: Delete all symbol extension related code.
-	(hppa_look_for_stubs_in_section): Delete decl.
-	(elf32_hppa_size_stubs, elf32_hppa_build_stubs): New decls.
-	* elf32-hppa.c: Symbol extension stuff moved form elf32-hppa.h
-	into elf32-hppa.c.  Do not include aout64.h.
-	(typdef hppa_stub_type): Delete.
-	(elf32_hppa_stub_name_list_struct): Delete.
-	(elf32_hppa_stub_description_struct): Delete.
-	(arg_reloc_type): Use simpler enumerations.  All references changed.
-	(arg_location, arg_reloc_relocation): Likewise.
-	(elf32_hppa_symextn_map_struct): Delete.
-	(get_symbol_value): Delete.
-	(elf32_hppa_get_sym_extn): Delete.
-	(find_stubs, new_stubs, type_of_mismatch): Delete.
-	(find_stub_by_name, add_stub_by_name): Delete.
-	(hppa_elf_stub_finish, hppa_elf_stub_reloc): Delete.
-	(hppa_elf_arg_reloc_needed): Renamed.  Simplify.
-	(hppa_elf_build_linker_stub, hppa_elf_create_stub_sec): Delete.
-	(hppa_elf_long_branch_needed_p): Delete.
-	(hppa_look_for_stubs_in_section): Delete.
-	(hppa_elf_get_section_contents): Delete.
-	(elf32_hppa_backend_symbol_processing): Delete.
-	(elf32_hppa_backend_section_processing): Delete.
-	(elf32_hppa_backend_section_from_shdr): Delete.
-	(elf32_hppa_backend_fake_sections): Delete.
-	(elf32_hppa_backend_section_from_bfd_section): Delete.
-	(NEW_INSTRUCTION): Delete.
-	(CURRENT_STUB_OFFSET): Delete.
-	(elf32_hppa_relocate_section): New function.
-	(elf32_hppa_bfd_final_link_relocate): New function.
-	(elf32_hppa_size_symext): New function.
-	(elf32_hppa_link_output_symbol_hook): New function.
-	(elf32_hppa_read_symext_info): New function.
-	(elf32_hppa_add_symbol_hook): New function.
-	(elf32_hppa_name_of_stub): New function.
-	(elf32_hppa_size_of_stub): New function.
-	(elf32_hppa_build_one_sub): New function.
-	(elf32_hppa_build_stubs): New function.
-	(elf32_hppa_size_stubs): New function.
-	(linker, stub and argument hash tables): Add appropriate
-	structures, definitions and functions to implement all three
-	hash tables.
-	(hppa_elf_relocate_insn): Don't need argument location information
-	in this function.
-	(add_entry_to_symext_chain): Accept a symbol's argument location
-	information rather than the symbol itself.  All callers changed.
-	(hppa_elf_gen_reloc_type): Simplify.
-	(hppa_elf_set_section_contents): Stub section is no longer special.
-	(hppa_elf_reloc): Greatly simplify.
-	(elf32_hppa_begin_write_processing): Accept link_info argument.
-	Handle being called from the BFD backend linker.
-	(elf32_hppa_final_write_processing): Likewise.
-	(elf_hppa_tc_make_sections): No longer call stub_finish.
-	
-Mon Jun 27 18:07:06 1994  Steve Chamberlain  (sac@cirdan.cygnus.com)
-
-	* section.c (bfd_get_section_contents): Put in parens to get
-	precedence right.
-
-Sun Jun 26 18:08:29 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* libelf.h (relocate_section): New argument "output_names" added
-	to prototype.
-	* elfcode.h (elf_link_input_bfd): New argument "output_names"
-	added to prototype of relocate_section.  Pass the output symbol
-	names to relocate_section.
-	* elf32-i386.c (elf_i386_relocate_section): Use "output_names" to
-	determine the name of a local symbol.
-	* elf32-mips.c (mips_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-
-Fri Jun 24 08:15:42 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	Add Solaris BCP (the part of Solaris which allows it to run
-	SunOS4 a.out files) core file handling.
-	* aoutf1.h (external_solaris_bcp_core, swapcore_solaris_bcp):
-	New structure and its swap in function.
-	(internal_sunos_core):  New member c_data_addr, to receive the
-	start address of the data section in the core file.
-	(swapcore_sun3, swapcore_sparc, sunos4_core_file_p):  Use it.
-	(sunos4_core_file_p):  Recognize Solaris BCP core file.
-	(sunos4_core_file_matches_executable_p):  Always indicate match
-	for Solaris BCP core files.
-
-Thu Jun 23 15:31:28 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	Preliminary support for generating shared libraries, from Eric
-	Youngdale <ericy@cais.cais.com>.
-	* elfcode.h (prep_headers): If DYNAMIC, set e_type to ET_DYN.
-	(elf_link_add_object_symbols): If generating a shared library,
-	create dynamic sections for first input BFD with the right format.
-	(elf_link_create_dynamic_sections): Don't create .interp section
-	if creating a shared library.
-	(elf_link_input_bfd): Skip dynamic sections in input file.
-	(elf_bfd_final_link): If creating a shared library, it's OK for
-	dynobj to have sections which are not SEC_IN_MEMORY.
-	* elf32-i386.c (elf_i386_size_dynamic_sections): Only set .interp
-	section if not creating a shared library.
-	* elf32-sparc.c (elf_sparc_size_dynamic_sections): Likewise.
-
-	* elfcode.h (elf_object_p): Don't set DYNAMIC just because there
-	is an SHT_DYNAMIC section.
-
-	* cf-i386lynx.c (i386coff_vec): Don't include DYNAMIC in
-	object_flags.
-	* coff-sparc.c (sparccoff_vec): Likewise.
-	* hppabsd-core.c (hppabsd_core_vec): Likewise.
-
-	* aoutx.h (NAME(aout,some_aout_object_p)): Don't set SEC_RELOC
-	just because DYNAMIC is set.
-
-Thu Jun 23 12:53:41 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
-
-	* configure.in: Change --with-targets to --enable-targets and
-	--with-64-bit-bfd to --enable-64-bit-bfd.
-	* Makefile.in, mpw-make.in, targets.c: Change comments.
-
-Wed Jun 22 17:59:59 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* config.bfd (powerpc-*-elf*): New target, just like
-	powerpc-*-sysv4*.
-
-	* linker.c (FAIL): Undefine macro before defining as enum.
-
-Wed Jun 22 10:52:47 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* linker.c (_bfd_generic_link_add_archive_symbols): Initialize
-	pass from abfd->archive_pass, and save it there as well.
-
-	* hash.c (bfd_hash_allocate): Don't call bfd_set_error if
-	obstack_alloc returns NULL unless the size is non-zero.
-
-	* linker.c (archive_hash_allocate): Define.
-	(_bfd_generic_link_add_archive_symbols): Use archive_hash_allocate
-	rather than obstack_alloc, for clarity.
-
-	* elfcode.h (elf_get_reloc_upper_bound): Correct.
-
-	* aout64.c (BMAGIC, QMAGIC): Define if not already defined.  From
-	Peter Schauer <pes@regent.e-technik.tu-muenchen.de>.
-
-	Linux ZMAGIC support from Eric Youngdale <ericy@cais.cais.com>.
-	* libaout.h (struct aoutdata): Add field zmagic_disk_block_size.
-	* aout-target.h (MY(callback)): Only set alignment according to
-	architecture if the section sizes are aligned to that alignment,
-	for backward compatibility.
-	(MY(set_sizes)): Initialize zmagic_disk_block_size field.
-	* aoutx.h (adjust_z_magic): Set ztih if using q_magic_format.  Set
-	text section filepos to zmagic_disk_block_size if not ztih.  Use a
-	different padding algorithm if not ztih.
-	* i386linux.c (MY_text_includes_header): Don't define.
-
-	* aoutx.h (aout_link_check_ar_symbols): Just skip N_STAB and N_FN
-        symbols; don't look them up in the hash table.  From
-        ralphc@pyramid.com (Ralph Campbell).
-
-Tue Jun 21 11:47:20 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* coff-go32.c (go32coff_archive_p): Remove unused function.
-
-	* section.c (bfd_abs_section): Make const.
-	(bfd_abs_section_ptr, bfd_is_abs_section): Define.
-	(bfd_und_section): Make const.
-	(bfd_und_section_ptr, bfd_is_und_section): Define.
-	(bfd_com_section): Make const.
-	(bfd_com_section_ptr): Define.
-	(bfd_ind_section): Make const.
-	(bfd_ind_section_ptr, bfd_is_ind_section): Define.
-	(bfd_abs_symbol, bfd_com_symbol): Make const.
-	(bfd_und_symbol, bfd_ind_symbol): Likewise.
-	(global_syms): Cast initialization of section field.
-	(STD_SECTION): Define as const, and cast initializations.
-	* bfd-in2.h: Rebuilt.
-	* Many files: Change uses of bfd_abs_section, etc., to use
-	bfd_abs_section_ptr or bfd_is_abs_section, etc.
-
-Mon Jun 20 11:06:27 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* Many files: change all bfd_target vectors to be const.  Change
-	all uses of bfd_target * to be const bfd_target *.  Change
-	bfd_target_vector and bfd_default_vector arrays to be const
-	bfd_target * const *.
-
-	* ecoff.c, libecoff.h, ecoffswap.h, coff-alpha.c, coff-mips.c,
-	elf32-mips.c: Renamed all externally visible ECOFF routines which
-	are local to BFD to start with _bfd_ecoff instead of just ecoff.
-
-	* ecoff.c (ecoff_swap_tir_in): Change input argument to const.
-	(ecoff_swap_tir_out): Likewise.
-	(ecoff_swap_rndx_in, ecoff_swap_rndx_out): Likewise.
-	(ecoff_slurp_symbolic_info): Add new arguments to correspond to
-	read_debug_info entry point in ecoff_debug_swap structure.
-	Change all calls.
-	* libecoff.h (ecoff_slurp_symbolic_info): Change declaration.
-	* ecoffswap.h (ecoff_swap_tir_in, ecoff_swap_tir_out): Declare.
-	(ecoff_swap_rndx_in, ecoff_swap_rndx_out): Declare.
-	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new
-	ecoff_debug_swap fields.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-	* elf32-mips.c (mips_elf_read_ecoff_info): Undefine READ.
-	(mips_elf_ecoff_debug_swap): Initialize new ecoff_debug_swap
-	fields.
-	* configure.in (bfd_elf32_bigmips_vec): Use ecoff.o and
-	ecofflink.o.
-	(bfd_elf32_littlemips_vec): Likewise.
-	(ecoff_big_vec, ecoff_little_vec): Likewise.
-	(ecoffalpha_little_vec): Likewise.
-	* Makefile.in (BFD_LIBS): Remove ecoff.o and ecofflink.o.
-	(BFD32_BACKENDS): Add ecoff.o and ecofflink.o.
-
-	* aoutx.h (NAME(aout,final_link)): Check flavour of sub, not abfd,
-	when computing reloc sizes.  From Eric Youngdale
-	<ericy@cais.cais.com>.
-	* elfcode.h (elf_bfd_final_link): Don't try to compute maximum
-	reloc count or size for a non-ELF file.
-
-	* mipsbsd.c (MY_final_link_callback): Define to avoid warning.
-
-	* hp300hpux.c (MY_final_link_callback): Define to avoid warning.
-	(BMAGIC, QMAGIC): Define; used by aoutx.h.
-	(MY(slurp_symbol_table)): Change translate_from_native_sym_flags
-	calls to use new parameters.
-
-Fri Jun 17 14:45:32 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aout-target.h (MY(callback)): Set the alignments of the text,
-	data and bss sections after determining the architecture.
-
-	* sunos.c (sunos_add_one_symbol): Treat a common symbol from a
-	dynamic object as being in the .bss section of the object, rather
-	than as being undefined.
-
-Fri Jun 17 11:16:50 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* libhppa.h (bfd_hppa_insn2fmt, hppa_rebuild_insn): Make INLINE.
-
-	* elf32-hppa.h (elf_hppa_final_processing): Delete decl.
-
-Thu Jun 16 23:36:23 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elfcode.h (elf_link_input_bfd): Don't try to read local symbols
-	if there aren't any in the input file.
-
-Thu Jun 16 14:25:22 1994  Eric Youngdale  (ericy@cais.cais.com)
-
-	* i386linux.c: Many new functions and definitions for linker
-	support for Linux shared libraries.
-	* bfd-in.h (bfd_linux_size_dynamic_sections): Declare.
-	* bfd-in2.h: Rebuild.
-
-Thu Jun 16 14:23:46 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* config.bfd: If second argument is ``_'', then, instead of
-	echoing config file name, echo whether target uses leading
-	underscores on symbol names.  Add appropriate settings to
-	different cases.  Used by binutils/configure.in to set default for
-	c++filt.
-
-	* elfcode.h (elf_bfd_final_link): If trying to generate a shared
-	object, warn and return false.
-
-	* aoutx.h (NAME(aout,some_aout_object_p)): Accept BMAGIC objects
-	and treat them as OMAGIC.
-
-Wed Jun 15 18:02:21 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	Enable sparc v9 support for release.  Note that this is still a
-	work in progress, pending release of an ABI specification.
-	* config.bfd, configure.in: Include sparc v9 elf config.
-	* elfcode.h (prep_headers): Handle sparc v9 (64 bit).
-	* reloc.c (bfd_reloc_code_real): New reloc types.
-	* elf64-sparc.c: Implement elf64-sparc target.
-	* Makefile.in, targets.c: Updated.
-
-Wed Jun 15 01:34:07 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libelf.h (struct elf_obj_tdata): New field dt_needed_name.
-	(elf_dt_needed_name): New accessor macro.
-	* elfcode.h (elf_link_add_object_symbols): If elf_dt_needed_name
-	is set, use that instead of the filename for the DT_NEEDED dynamic
-	entry.
-	* elf.c (bfd_elf_set_dt_needed_name): New function.
-	* bfd-in.h (bfd_elf_set_dt_needed_name): Declare.
-	* bfd-in2.h: Rebuilt.
-
-	* elfcode.h (NAME(bfd_elf,size_dynamic_sections)): Add sinterpptr
-	argument, and set it to the .interp section.
-	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update prototype.
-	(bfd_elf64_size_dynamic_sections): Likewise.
-	* bfd-in2.h: Rebuilt.
-
-	* coff-sparc.c (SWAP_OUT_RELOC_EXTRA): Define to clear the r_spare
-	field of the reloc rather than letting it be garbage.
-
-	* archive.c (bfd_slurp_armap): Recognize __.SYMDEF/ as well as
-	__.SYMDEF; the former was used in old Linux archives.  From
-	jrs@world.std.com (Rick Sladkey).
-
-	* i386linux.c (i386linux_write_object_contents): Define; like
-	MY(write_object_contents) in aout-target.h, but set MACHTYPE to
-	M_386.  From jrs@world.std.com (Rick Sladkey).
-	(MY_write_object_contents): Define.
-
-	* aoutx.h (translate_from_native_sym_flags): Treat N_SETV symbols
-	as N_DATA symbols.
-	(aout_link_add_symbols): Likewise.
-
-	* aoutx.h: Rewrite symbol duplicate elimination to use BFD hash
-	tables.
-	(struct stringtab_entry, struct stringtab_data): Remove.
-	(HASHMAXLEN, HASH_CHAR, hash, compare, log2, emit_strtab): Remove.
-	(struct strtab_hash_entry, struct strtab_hash): Define.
-	(strtab_hash_newfunc, strtab_hash_lookup): Define.
-	(stringtab_free, emit_stringtab): Define.
-	(stringtab_init, add_to_stringtab): Rewrite.
-	(NAME(aout,write_syms)): Use new stringtab code.
-	(struct aout_final_link_info, NAME(aout,final_link)): Likewise.
-	(aout_link_write_symbols, aout_link_write_other_symbol): Likewise.
-
-	* bfd-in.h (BFD_TRADITIONAL_FORMAT): Define new BFD flag to
-	request BFD to write object in the traditional format, whatever
-	that means for the particular backend.
-	* bfd-in2.h: Rebuilt.
-
-	* hash.c (bfd_hash_allocate): If obstack_alloc fails, set
-	bfd_error_no_memory.
-
-Tue Jun 14 13:00:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libaout.h (struct aoutdata): Add q_magic_format to subformat
-	enum.
-	* aout-target.h (MY_bfd_copy_private_bfd_data): Define as function
-	if not already defined.  Copy subformat information.
-	(MY_text_includes_header): Define as 0 if not already defined.
-	(MY(backend_data)): Use MY_text_includes_header rather than 0.
-	(MY_final_link_callback): Rename from final_link_callback, and
-	define only if MY_final_link_callback is not already defined.
-	(MY_bfd_final_link): Rename use of final_link_callback to
-	MY_final_link_callback.
-	* aoutx.h (NAME(aout,some_aout_object_p)): Handle QMAGIC like
-	ZMAGIC, but set the subformat to q_magic_format.  Abort if the
-	magic number if not recognized.
-	(adjust_z_magic): Use QMAGIC if q_magic_format.
-	* i386linux.c (MY_text_includes_header): Define as 1.
-	(i386linux_bfd_final_link): New static function.
-	(MY_bfd_final_link): Define as i386linux_bfd_final_link.
-
-	* aoutx.h (translate_to_native_sym_flags): Check both section and
-	output_section against sections of abfd.
-
-	* libecoff.h (struct ecoff_link_hash_entry): Change type of
-	written from boolean to char.  Add new field small.
-	* ecoff.c (ecoff_link_hash_newfunc): Initialize written to 0
-	rather than false.  Initialize small to 0.
-	(ecoff_link_add_externals): If ECOFF type is scSUndefined, set
-	small.  If small is set, and hash table type is common, force the
-	symbol into a section named SCOMMON and change the ECOFF type from
-	scCommon to scSCommon.
-	(ecoff_link_write_external): Set written to 1 rather than true.
-	* coff-mips.c (mips_relocate_section): Correct JMPADDR reloc
-	overflow check to consider section VMA of input file.
-
-Mon Jun 13 14:20:07 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutf1.h (aout_32_sunos4_write_object_contents): Handle a
-	machine type of 68000.
-	* aoutx.h (NAME(aout,machine_type)): Add new argument unknown.
-	Set *unknown to true if machine type is really unknown, as opposed
-	to M_UNKNOWN for the 68000.
-	(NAME(aout,set_arch_mach)): Change NAME(aout,machine_type) call
-	accordingly.
-	* libaout.h (NAME(aout,machine_type)): Add new argument to
-	prototype.
-
-Sun Jun 12 20:21:03 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (EXEC_AUX_ID): Define based on availablity of HPUX_AUX_ID
-	or HIUX_AUX_ID.
-	(som_begin_writing): Use EXEC_AUX_ID instead of HPUX_AUX_ID.
-	(som_write_armap): Use CPU_PA_RISC1_0 as the magic number.  Note
-	som.c is careful to always define CPU_PA_RISC1_0.
-
-Sat Jun 11 16:32:30 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Add weak symbols as an extension to a.out.
-	* aoutx.h (sym_in_text_section): Don't define.
-	(sym_in_data_section, sym_in_bss_section): Likewise.
-	(sym_is_undefined, sym_is_global_defn): Likewise.
-	(sym_is_debugger_info, sym_is_fortrancommon): Likewise.
-	(sym_is_absolute, sym_is_indirect): Likewise.
-	(translate_from_native_sym_flags): Rewrite for clarity.  Rearrange
-	arguments and change caller.  Handle weak symbols.
-	(translate_to_native_sym_flags): Likewise.
-	(aout_link_check_ar_symbols): Don't ignore weak symbols.  Pull
-	object in from archive if a weak defintion is found for an
-	existing undefined symbol.
-	(aout_link_add_symbols): Put all cases in switch.  Set flags of an
-	undefined symbol to 0.  Handle weak symbols.
-	(aout_link_write_symbols): Handle weak symbols.
-	(aout_link_write_other_symbol): Likewise.
-	(aout_link_input_section_std): Likewise.
-	(aout_link_input_section_ext): Likewise.
-	* sunos.c (sunos_write_dynamic_symbol): Likewise.
-
-Fri Jun 10 13:25:13 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (NAME(aout,canonicalize_reloc)): Handle .bss section.
-	(NAME(aout,get_reloc_upper_bound)): Likewise.
-
-	* coff-i960.c (coff_i960_reloc_type_lookup): Add BFD_RELOC_CTOR.
-	* linker.c (_bfd_generic_link_write_global_symbol): Don't assume
-	the section of a common symbol is not NULL.
-
-Wed Jun  8 23:15:53 1994  Stu Grossman  (grossman@cygnus.com)
-
-	* nlmcode.h (nlm_object_p):  Set EXEC_P and start address for GDB.
-
-Wed Jun  8 23:57:34 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (aout_get_external_symbols): Don't try to read the
-	strings if there are no symbols.
-	(aout_link_write_other_symbol): Use the output section when
-	working out the type.
-
-Tue Jun  7 13:25:08 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (assign_section_numbers): Put shstrtab, symtab and
-	strtab sections at end of file.  Avoids bug in some versions of
-	SVR4 strip.  From Eric Youngdale <eric@tantalus.nrl.navy.mil>.
-
-	* coffcode.h (styp_to_sec_flags): If COFF_PAGE_SIZE is defined,
-	set SEC_DEBUGGING for STYP_INFO sections.
-	(coff_compute_section_file_positions): If COFF_PAGE_SIZE is
-	defined, and D_PAGED is set, set the file position equal to the
-	section VMA modulo COFF_PAGE_SIZE.
-	* coffgen.c (coff_real_object_p): If F_EXEC is set, set D_PAGED.
-	* coff-i386.c: Set D_PAGED in BFD target.
-	(COFF_PAGE_SIZE): Define.
-	* coff-m68k.c, coff-sparc.c: Likewise.
-
-Mon Jun  6 10:57:28 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (bfd_section_from_shdr): Don't turn a reloc section
-	into a BFD section just because SHF_ALLOC is set; require that it
-	not use the normal symbol table.
-	(elf_section_from_bfd_section): Corresponding change.
-
-	Better indirect and warning symbol handling inspired by Stuart
-	Quick <stuck@cs.man.ac.uk>.
-	* linker.c (enum link_action): Add REF, MIND, CWARN, REFC.
-	(link_action): Change UNDEF_ROW/def and UNDEFW_ROW/def from NOACT
-	to REF.  Change UNDEF_ROW/indr and UNDEFW_ROW/indr from CYCLE to
-	REFC.  Change DEF_ROW/indr and COMMON_ROW/indr from CYCLE to MDEF.
-	Change DEFW_ROW/indr from CYCLE to NOACT.  Change INDR_ROW/indr
-	from MDEF to MIND.  Change INDR_ROW/warn from WARNC to CYCLE.
-	Change WARN_ROW/def and WARN_ROW/indr from MWARN to CWARN.  Change
-	WARN_ROW/com from MWARN to WARN.  Change WARN_ROW/warn from NOACT
-	to CYCLE.  Change SET_ROW/warn from WARNC to CYCLE>
-	(_bfd_generic_link_add_one_symbol): Handle REF, MIND, CWARN and
-	REFC.  If a new indirect symbol has been referenced, push the
-	reference down to the symbol it points to.  FIx handling of WARN.
-	* aoutx.h (translate_from_native_sym_flags): If N_WARNING, don't
-	clobber e_type of next symbol.
-	(translate_to_native_sym_flags): Likewise.
-	(aout_link_write_symbols): Loop on bfd_link_hash_warning as well
-	as bfd_link_hash_indirect.
-
-	* libaout.h (struct aout_link_hash_entry): New field written.
-	* aoutx.h (NAME(aout,link_hash_newfunc)): Initialize written.
-	(aout_link_write_symbols): Use written, not root.written.
-	(aout_link_write_other_symbol): Likewise.
-	* sunos.c (sunos_scan_dynamic_symbol): Likewise.
-	* libecoff.h (struct ecoff_link_hash_entry): New field written.
-	* ecoff.c (ecoff_link_hash_newfunc): Initialize written.
-	(ecoff_link_write_external): use written, not root.written.
-	* genlink.h (struct generic_link_hash_entry): New field written.
-	* linker.c (_bfd_link_hash_newfunc): Don't initialize written.
-	(generic_link_hash_newfunc): Initialize written.
-	(_bfd_generic_link_output_symbols): Use written, not root.written.
-	(_bfd_generic_link_write_global_symbol): Likewise.
-	(_bfd_generic_reloc_link_order): Likewise.
-
-	* libecoff.h (ecoff_data_type): Add linker field.
-	* ecoff.c (ecoff_write_object_contents): Check new tdata linker
-	field, rather than outsymbols being non-NULL, to decide whether to
-	output the symbols and relocs.
-	(ecoff_bfd_final_link): Set new tdata linker field to true.
-
-	* ecoff.c (ecoff_bfd_copy_private_bfd_data): Don't try to copy
-	data to a non-ECOFF file.
-
-	* libbfd-in.h: Add warning that libbfd.h is a generated file.
-	* libbfd.h: Rebuilt.
-
-Sun Jun  5 15:02:30 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Changes to support ELF strip and objcopy on dynamically linked
-	files.
-	* elfcode.h (elf_fake_sections): Add prototype.
-	(bfd_section_from_shdr): Make a BFD section from an SHT_HASH
-	section, and from an SHT_DYNSYM section, and from the dynamic
-	string table section.
-	(elf_object_p): Set D_PAGED if there is a program header.
-	(elf_make_sections): Remove.
-	(fix_up_strtabs): Remove.
-	(elf_fake_sections): Rewrite.  Now sets sh_entsize.
-	(assign_section_numbers): Rewrite.  Now sets sh_link and sh_info
-	for all sections.
-	(elf_compute_section_file_positions):  Don't call obsolete
-	functions elf_make_sections or fix_up_strtabs.
-	(swap_out_syms): Set sh_addralign to FILE_ALIGN rather than 4.
-	(NAME(bfd_elf,write_object_contents)): Permit writing DYNAMIC
-	objects.
-	(elf_section_from_bfd_section): Treat SHT_DYNSYM like other normal
-	sections.  If an SHT_REL or SHT_RELA section is allocated or uses
-	an unusual symbol table, permit a BFD section to map to it.
-	Permit most SHT_STRTAB sections to have a BFD section mapped to
-	them.
-	(elf_bfd_final_link): Don't set sh_link, sh_info or sh_entsize
-	fields of dynamic sections here; do it in assign_section_numbers.
-	* elf32-target.h, elf64-target.h: Add D_PAGED to permitted object
-	flags.
-
-	* elf.c (_bfd_elf_make_section_from_shdr): Only set SEC_DATA if
-	SEC_LOAD is set, rather than checking SEC_ALLOC.
-
-	* libbfd-in.h (bfd_realloc): Change last arg to "size_t size".
-
-Fri Jun  3 10:58:02 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_write_object_contents): Don't compute the file header's
-	checksum here.
-	(som_write_headers): Instead do it here.
-
-	* libbfd.h (bfd_realloc): Change last arg to "size_t size".
-
-Thu Jun  2 17:39:22 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* hosts/sun3.h: Include <stdlib.h>.  Don't declare free, exit or
-	getenv.
-
-	Add linker support for SunOS shared libraries.
-	* sunos.c: Include bfdlink.h.  Add many new functions and
-	definitions for SunOS shared library support.
-	* bfd-in.h (bfd_sunos_record_link_assignment): Declare.
-	(bfd_sunos_size_dynamic_sections): Declare.
-	* bfd-in2.h: Rebuilt.
-	* aoutx.h (struct aout_link_hash_entry): Move to libaout.h.
-	(struct aout_link_hash_table): Likewise.
-	(aout_link_hash_lookup, aout_link_hash_traverse): Likewise.
-	(aout_hash_table): Likewise.
-	(NAME(aout,link_hash_newfunc)): Rename from aout_link_hash_newfunc
-	and make externally visible.
-	(NAME(aout,link_hash_table_init)): New function.
-	(NAME(aout,link_hash_table_create)): Call
-	NAME(aout,link_hash_table_init), not _bfd_link_hash_table_init.
-	(aout_link_add_symbols): Don't fail if no symbols.  If it exists,
-	call add_dynamic_symbols backend entry point for dynamic objects.
-	Use add_one_symbol backend entry point if it exists.
-	(NAME(aout,final_link)): Call finish_dynamic_link backend entry
-	point, if it exists.
-	(aout_link_input_bfd): For a dynamic object, call
-	link_dynamic_object backend entry point, if it exists.
-	(aout_link_write_other_symbol): Call write_dynamic_symbol backend
-	entry point, if it exists.
-	(aout_link_input_section): Don't read the relocs if they have
-	already been read.
-	(aout_link_input_section_std): When doing a final link, for a
-	reloc against an external symbol, call check_dynamic_reloc backend
-	entry point, if it exists.
-	(aout_link_input_section_ext): Likewise.
-	* libaout.h: Protect against multiple inclusion.  Include
-	bfdlink.h.
-	(struct aout_link_hash_entry): Move in from aoutx.h.
-	(struct aout_link_hash_table): Likewise.
-	(aout_link_hash_lookup, aout_link_hash_traverse): Likewise.
-	(aout_hash_table): Likewise.
-	(struct aout_backend_data): Add fields add_dynamic_symbols,
-	add_one_symbol, link_dynamic_object, write_dynamic_symbol,
-	check_dynamic_reloc, and finish_dynamic_link.
-	(struct aout_section_data_struct): Define new structure.
-	(aout_section_data): Define new accessor macro.
-	(NAME(aout,link_hash_newfunc)): Declare.
-	(NAME(aout,link_hash_table_init)): Declare.
-	* aoutf1.h (sunos4_aout_backend): Initialize new aout_backend_data
-	fields.
-	* aout-target.h (MY(backend_data)): Likewise.
-	* i386aout.c (MY(backend_data)): Likewise.
-	* i386mach3.c (MY(backend_data)): Likewise.
-	* mipsbsd.c (MY(backend_data)): Likewise.
-	* sparclynx.c (sparclynx_aout_backend): Likewise.
-
-	* aoutx.h (NAME(aout,slurp_symbol_table)): Don't zero out cached
-	until we know it is non-NULL.
-	(aout_link_write_symbols): Don't skip a warning symbol even if it
-	has already been written out.  If skipping an indirect symbol,
-	skip the next symbol as well.
-
-Wed Jun  1 14:37:50 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* hosts/sun3.h: Don't declare qsort, malloc or realloc.
-
-Thu May 26 13:56:03 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* nlmcode.h (nlm_swap_auxiliary_headers_in): Cast bfd_byte pointer
-	to char pointer to avoid compiler warnings.
-
-	* dep-in.sed: Remove spaces before colons.
-
-	Merged changes back in from FSF gas release 2.3:
-
-	* Makefile.in (stmp-bfd.h): Wrap `if' block around grep
-	invocation, to avoid a bug in BSD 4.4 make.
-
-	From Ralph Campbell:
-	* mipsbsd.c (mips_fix_jmp_addr): If symbol is undefined, return an
-	error.
-	(mips_fix_hi16_s): Ditto.
-
-	Fri May 13 21:21:00 1994  DJ Delorie (dj@ctron.com)
-
-	* makefile.dos: define a default target, or archives won't work
-	  due to multiple matches.
-
-	Wed May 11 22:32:00 1994  DJ Delorie (dj@ctron.com)
-
-	* configure.bat: update for latest files
-	* makefile.dos: update for correct targets and sources
-	* coff-go32.c: [new] go32's COFF format (i386coff with underscores)
-	* targets.c: add go32coff target
-	* makefile.in: add coff-go32.c support
-
-Thu May 26 10:10:21 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_prep_headers): Do not set the system_id here, private
-	bfd data has not been copied yet.
-	(som_write_headers): Instead do it here.
-
-Tue May 24 16:17:18 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Make MIPS ELF use new ELF backend linker.  No shared library
-	support yet.
-	* elf32-mips.c (bfd_mips_elf32_swap_gptab_in): New function.
-	(bfd_mips_elf32_swap_gptab_out): New function.
-	(mips_elf_object_p): If last symbol is LOCAL, set elf_bad_symtab.
-	(mips_elf_final_write_processing): Set sh_info field for .gptab.*
-	sections.
-	(mips_elf_fake_sections): Set sh_entsize for .gptab.* sections.
-	(mips_elf_read_ecoff_info): Read and free external symbols last,
-	not first, for clarity.
-	(struct mips_elf_link_hash_entry): Define new structure.
-	(struct mips_elf_link_hash_table): Define new structure.
-	(mips_elf_link_hash_lookup): Define new macro.
-	(mips_elf_link_hash_traverse): Define new macro.
-	(mips_elf_hash_table): Define new macro.
-	(mips_elf_link_hash_newfunc): New static function.
-	(mips_elf_link_hash_table_create): New static function.
-	(mips_elf_add_symbol_hook): New static function.
-	(struct extsym_info): Define new structure.
-	(mips_elf_get_extr, mips_elf_set_index): Remove.
-	(mips_elf_output_extsym): New static function.
-	(gptab_compare): New static function.
-	(mips_elf_final_link): Rewrite to use ELF backend linker, and to
-	merge gptab information in input files.
-	(mips_elf_relocate_hi16): New static function.
-	(mips_elf_relocate_section): New static function.
-	(bfd_elf32_bfd_link_hash_table_create): Define as macro before
-	including elf32-target.h.
-	(elf_backend_relocate_section): Likewise.
-	(elf_backend_add_symbol_hook): Likewise.
-	* elf.c (_bfd_elf_link_hash_newfunc): Rename from
-	elf_link_hash_newfunc and make globally visible.  Change caller.
-	(_bfd_elf_link_hash_table_init): New function, broken out of
-	_bfd_elf_link_hash_table_create.
-	(_bfd_elf_link_hash_table_create): Use
-	_bfd_elf_link_hash_table_init.
-	* libelf.h (struct elf_obj_tdata): Add new field bad_symtab.
-	(elf_bad_symtab): Define new accessor macro.
-	(_bfd_elf_link_hash_newfunc): Declare.
-	(_bew_elf_link_hash_table_init): Declare.
-	* elfcode.h (elf_object_p): Call backend object_p hook after
-	swapping in all the section headers.
-	(map_program_segments): Correct typo: Internal for External.
-	(elf_link_add_object_symbols): If elf_bad_symtab is set, read all
-	the symbols.  Skip STB_LOCAL symbols rather than giving an error.
-	(elf_bfd_final_link): If elf_bad_symtab is set, allocate space for
-	all symbols, not just locals.
-	(elf_link_output_extsym): Only skip a symbol not mentioned by a
-	regular file if it is mentioned by a dynamic object.
-	(elf_link_input_bfd): If elf_bad_symtab is set, read all the
-	symbols.
-
-Fri May 20 13:38:23 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_set_reloc_info): Do not set any relocation info
-	for SOM fixups which are never passed to BFD.
-
-Fri May 20 11:57:05 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-mips.c (mips_relocate_section): Add MIPS_R_JMPADDR overflow
-	checking.
-
-	* elf32-i386.c (elf_i386_size_dynamic_sections): Add DT_DEBUG to
-	the dynamic linking information for the benefit of the debugger.
-	From Peter Schauer.
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
-
-	* elf.c (_bfd_elf_make_section_from_shdr): New function, based on
-	code repeated three times in bfd_section_from_shdr in elfcode.h.
-	* libelf.h (_bfd_elf_make_section_from_shdr): Declare.
-	* elfcode.h (bfd_section_from_shdr): Use new function
-	_bfd_elf_make_section_from_shdr to create BFD sections.  If a
-	reloc section does not use the main symbol table, or it is part of
-	the process image, treat it as a normal section, not relocs.
-	* elf32-mips.c (mips_elf_section_from_shdr): Use new function
-	_bfd_elf_make_section_from_shdr.
-
-Thu May 19 11:37:11 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf32-target.h, elf64-target.h: Change ar_max_namelen value from
-	15 to 14 to match SVR4 ar.
-
-	Add support for ELF shared libraries.  Loosely based on work by
-	Eric Youngdale <ericy@cais.com>.
-	* libelf.h (struct elf_backend_data): Add new fields for dynamic
-	linking: elf_backend_create_dynamic_sections,
-	elf_backend_adjust_dynamic_symbol,
-	elf_backend_size_dynamic_sections,
-	elf_backend_finish_dynamic_symbol,
-	elf_backend_finish_dynamic_sections.
-	(struct elf_link_hash_entry): Change type of align field to
-	bfd_size_type.  Add fields dynindx, dynstr_index, weakdef,
-	elf_link_hash_flags.
-	(struct elf_link_hash_table): Add fields dynobj, dynsymcount,
-	dynstr, bucketcount.
-	(bfd_elf32_swap_reloc_in, bfd_elf32_swap_reloc_out): Declare.
-	(bfd_elf32_swap_reloca_in, bfd_elf32_swap_reloca_out): Declare.
-	(bfd_elf32_swap_dyn_in, bfd_elf32_swap_dyn_out): Declare.
-	(bfd_elf32_add_dynamic_entry): Declare.
-	(bfd_elf64_swap_reloc_in, bfd_elf64_swap_reloc_out): Declare.
-	(bfd_elf64_swap_reloca_in, bfd_elf64_swap_reloca_out): Declare.
-	(bfd_elf64_swap_dyn_in, bfd_elf64_swap_dyn_out): Declare.
-	(bfd_elf64_add_dynamic_entry): Declare.
-	* elfcode.h (Elf_External_Dyn): Define.
-	(elf_swap_reloc_in): Define as macro using NAME.  Make externally
-	visible.
-	(elf_swap_reloc_out): Likewise.
-	(elf_swap_reloca_in, elf_swap_reloca_out): Likewise.
-	(elf_swap_dyn_in, elf_swap_dyn_out): Define as macro using NAME
-	and as new externally visible function.
-	(elf_fake_sections): Set section type of dynamic sections based on
-	section names.
-	(elf_write_phdrs): Remove.
-	(assign_file_position_for_section): Add new align argument.
-	Change all callers.
-	(get_program_header_size): New static function.
-	(struct seg_info): Remove.
-	(map_program_segments): Completely rewrite.
-	(assign_file_positions_except_relocs): Completely rewrite.
-	(assign_file_positions_for_relocs): Don't set a file position for
-	sections which already have one.  Don't bother to align the file
-	position here.
-	(section_from_elf_index): Handle SHT_HASH and SHT_DYNAMIC
-	section types.
-	(elf_section_from_bfd_section): Likewise.
-	(elf_slurp_symbol_table): If section_from_elf_index fails, just
-	use bfd_abs_section rather than returning an error.
-	(elf_sizeof_headers): Make useful.
-	(elf_link_record_dynamic_symbol): New static function.
-	(elf_link_add_object_symbols): Handle dynamic objects.
-	(elf_link_create_dynamic_sections): New static function.
-	(elf_add_dynamic_entry): Define as macro using NAME and as new
-	externally visible function.
-	(NAME(bfd_elf,record_link_assignment)): New function.
-	(elf_buckets): New static variable.
-	(NAME(bfd_elf,size_dynamic_sections)): New function.
-	(struct elf_final_link_info): Add dynsym_sec and hash_sec fields.
-	(elf_bfd_final_link): Handle dynamic linking.  Create a section
-	symbol for all ELF sections, not all BFD sections.  Store section
-	symbol index in target_index field, not index field.  Traverse
-	over global symbols even if stripping.
-	(elf_link_output_extsym): Output dynamic symbols.  Mark symbols
-	defined by dynamic objects as undefined.
-	(elf_link_input_bfd): Ignore dynamic objects.  Use target_index
-	field for section relocs, and make sure it is set.
-	(elf_reloc_link_order): Use target_index field for section relocs,
-	and make sure it is set.
-	* elf.c (elf_link_hash_newfunc): Initialize dynindx, dynstr_index,
-	weakdef and elf_link_hash_flags fields.
-	(_bfd_elf_link_hash_table_create): Initialize dynobj, dynsymcount,
-	dynstr and bucketcount fields.
-	* elf32-target.h: Initialize new dynamic linking fields.
-	* elf64-target.h: Likewise.  
-	* elf32-i386.c: New functions for dynamic linking support.
-	* elf32-sparc.c: Likewise.
-	* bfd-in.h (bfd_elf32_record_link_assignment): Declare.
-	(bfd_elf64_record_link_assignment): Declare.
-	(bfd_elf32_size_dynamic_sections): Declare.
-	(bfd_elf64_size_dynamic_sections): Declare.
-	* bfd-in2.h: Rebuilt.
-
-Wed May 18 08:29:04 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	* som.c: Don't include <sys/dir.h> or <sys/user.h>.
-	(som_reloc_queue_find): Call memcmp instead of bcmp.
-	(som_bfd_reloc_type_lookup): Change first argument to bfd *.
-	(compare_syms): Change types of arguments to const void *.
-	(bfd_section_from_som_symbol): Removed unused local found.
-	(som_write_armap): Add elength, map, orl_count and int arguments.
-	(som_write_armap): Use %ld and cast to long for getuid result.
-
-Wed May 18 09:09:32 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.h (R_HPPA_ABS_CALL): Define.
-	* elf32-hppa.c (hppa_elf_gen_reloc_type): Handle absolute calls.
-
-	* som.h (R_HPPA_ABS_CALL): Define.
-	* som.c (hppa_som_gen_reloc_type): Delete complex relocation types.
-
-Tue May 17 19:33:12 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* coff-i960.c (icoff_little_vec, icoff_big_vec): Indicate leading
-	underscore, for compatibility with Intel tool chain (gnu960v2).
-
-Mon May 16 10:09:22 1994  Jeff Law  (law@snake.cs.utah.edu)
-
-	* bfd-in2.h: Rebuilt.
-
-	* elf32-hppa.c: Change .hppa_linker_stubs to .PARISC.stubs,
-	likewise for other PA specific sections.
-	(hppa_elf_relocate_unwind_table): Delete unused
-	function.
-	(elf_hppa_howto_table): Completely new table based on 94-02-02
-	draft PA ELF spec.  Change relocation tags appropriately
-	throughout elf32-hppa.c
-	(hppa_elf_gen_reloc_type): Rewrite and simplify based on 94-02-02
-	spec.
-	(hppa_elf_reloc): Likewise.
-	(hppa_look_for_stubs_in_section): Likewise
-	(ELF_MACHINE_CODE): Change to EM_PARISC.
-	* elf32-hppa.h: Include "elf/hppa.h".  Change relocation tags 
-	appropriately throughout elf32-hppa.h.
-	(elf32_hppa_reloc_type): New table based on 94-02-02 draft PA ELF
-	spec.
-	(R_HPPA_ABS_CALL, R_HPPA_COMPLEX*, R_HPPA_UNWIND): Delete definitions.
-	* elfcode.h (prep_headers): Use EM_PARISC instead of EM_HPPA.
-	* reloc.c (bfd_reloc_code_real): Delete unused HPPA relocations.
-	* som.h (R_HPPA_ABS_CALL, R_HPPA_COMPLEX): Delete definitions.
-
-	* libhppa.h (hppa_field_adjust): Avoid adding constant_value into
-	the final value twice for LR and RR field selectors.
-
-Sat May 14 09:09:19 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* aoutx.h (add_to_stringtab): Use BFD_ASSERT not assert.  This
-	avoids __eprintf troubles.
-
-Fri May 13 10:51:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* bout.c (b_out_bfd_reloc_type_lookup): Handle BFD_RELOC_CTOR.
-
-	* config/mipsbelf.mt (SELECT_VECS): Add ecoff_big_vec and
-	ecoff_little_vec since Irix 5 supports ECOFF executables.
-
-Wed May 11 00:31:57 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_find_nearest_line): Handle fdr.adr != pdr.adr
-	correctly.
-
-	* Makefile.in (stmp-bfd.h): Use || instead of ; to force SunOS
-	make to invoke the shell.
-
-Tue May 10 14:23:43 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* section.c (SEC_COFF_SHARED_LIBRARY): Renamed from
-	SEC_SHARED_LIBRARY for clarity.  Changed all uses.
-	* bfd-in2.h: Rebuilt.
-	* coffcode.h (sec_to_styp_flags): If SEC_COFF_SHARED_LIBRARY is
-	set, set STYP_NOLOAD.
-	* coffgen.c (coff_section_from_bfd_index): Don't get an assertion
-	failure because of a bad shared library.
-
-Mon May  9 18:53:40 1994  Bill Cox  (bill@rtl.cygnus.com)
-
-	* linker.c: Add missing comment terminator.
-
-Mon May  9 11:53:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* linker.c (_bfd_generic_link_add_one_symbol): If hashp and *hashp
-	are not NULL, assume the caller has already looked up the symbol
-	in the hash table and has stored the entry in *hashp.
-	(generic_link_add_symbol_list): Set h to NULL before calling
-	_bfd_generic_link_add_one_symbol.
-	* ecoff.c (ecoff_link_add_externals): Likewise.
-
-	* elfcode.h (assign_file_positions_except_relocs): Don't require
-	page shared between .data and .bss segments to contain zeroes.
-
-	* elfcode.h: Include bfdlink.h.  Added several new functions to do
-	linking.
-	(ELF_R_TYPE): Define.
-	(bfd_add_to_strtab): Return unsigned long.  Change check for
-	realloc failure.
-	(elf_fake_sections): Check return value of bfd_add_to_strtab.
-	(elf_compute_section_file_positions): Add link_info argument.
-	Call elf_backend_begin_write_processing hook and prep_headers
-	here.  Only call swap_out_syms if link_info is NULL.  Set up
-	.shstrtab section here.  Pass dosyms argument to
-	assign_file_positions_except_relocs.  Set output_has_begun flag.
-	(assign_file_positions_for_symtab_and_strtabs): Add dosyms
-	argument, and use it to control setting .symtab and .strtab file
-	positions.
-	(assign_file_positions_except_relocs): Add dosyms argument, and
-	pass it on.
-	(prep_headers): Check return value of bfd_add_to_strtab.
-	(swap_out_syms): Likewise.  Also, don't set up .shstrtab here.
-	(NAME(bfd_elf,write_object_contents)): Some calls moved into
-	elf_compute_section_file_positions.
-	(elf_set_section_contents): Likewise.
-	(elf_slurp_symbol_table): SHN_LORESERV corrected to SHN_LORESERVE.
-	* libelf.h: Include bfdlink.h.
-	(struct elf_backend_data): Add fields collect,
-	elf_add_symbol_hook, elf_backend_relocate_section.
-	(struct bfd_elf_section_data): Add field rel_hashes.
-	(struct elf_obj_tdata): Remove fields internal_syms and symbols.
-	Add field sym_hashes.
-	(obj_symbols, obj_internal_syms): Remove definitions.
-	(elf_sym_hashes): Define.
-	(struct elf_link_hash_entry): Define.
-	(struct elf_link_hash_table): Define.
-	(elf_link_hash_lookup): Define.
-	(elf_link_hash_traverse): Define.
-	(elf_hash_table): Define.
-	(_bfd_elf_link_hash_table_create): Declare.
-	(bfd_elf32_bfd_link_add_symbols): Declare.
-	(bfd_elf32_bfd_final_link): Declare.
-	(bfd_elf64_bfd_link_add_symbols): Declare.
-	(bfd_elf64_bfd_final_link): Declare.
-	* elf.c: Include bfdlink.h.
-	(elf_link_hash_newfunc): New function.
-	(_bfd_elf_link_hash_table_create): New function.
-	* elf32-target.h (elf_backend_relocate_section): If not defined,
-	define as 0 and use generic linker.  Otherwise, use ELF backend
-	linker.
-	(elf_backend_collect): If not defined, define as false.
-	(elf_backend_add_symbol_hook): If not defined, define as 0.
-	(elf32_bed): Initialize new fields.
-	* elf64-target.h: Same changes as elf32-target.h.
-	* elf32-i386.c: Include bfdlink.h.
-	(elf_i386_relocate_section): New function.
-	(elf_backend_relocate_section): Define.
-	* elf32-sparc.c: Include bfdlink.h.
-	(elf_info_to_howto): Change type of dst from Elf32_Internal_Rela
-	to Elf_Internal_Rela (they're the same type anyhow).
-	(elf_sparc_relocate_section): New function.
-	(elf_backend_relocate_section): Define.
-	* elf32-mips.c (elf_backend_collect): Define.
-
-	* Makefile.in (stmp-bfd.h): Avoid useless make error message in a
-	different way; touch takes a numeric argument on some systems.
-
-Fri May  6 13:34:14 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* nlmcode.h (nlm_swap_auxiliary_headers_in): Rework custom header
-	handling for latest suggested format.
-	(nlm_swap_auxiliary_headers_out): Likewise.
-	(nlm_compute_section_file_positions): Likewise.
-
-Fri May  6 11:11:50 1994  D. V. Henkel-Wallace  (gumby@rtl.cygnus.com)
-
-	* config.bfd: handle erricsson config (for OSE).
-
-Thu May  5 15:40:47 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	Patches from Ralph Campbell:
-	* mipsbsd.c (mips_fix_jmp_addr): New function.
-	(mips_fix_hi16_s): Use bfd_is_com_section.
-	(mips_howto_table_ext): Call mips_fix_jmp_addr for MIPS_RELOC_JMP.
-
-Fri May  6 11:48:55 1994  Steve Chamberlain  (sac@cygnus.com)
-
-	* config/go32.mh: XX support.
-
-	From bill
-	* Makefile.in: Build sysdep.h without causing worrying but
-	harmless error message.
-
-Wed May  4 11:09:53 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	Changed m68k-aout to set flags to 0; m68k-sunos still uses 1.
-	* aout0.c: New file.
-	* targets.c (aout0_big_vec): Declare.
-	(bfd_target_vector): Add aout0_big_vec.
-	* config.bfd (m68*-*-aout*): Use m68k-0aout, not m68k-aout.
-	* config/m68k-aout.mt (SELECT_VECS): Removed.
-	* config/m68k-0aout.mt: New file.
-	* configure.in (aout0_big_vec): New target vector: use aout0.o,
-	aout32.o and stab-syms.o.
-	* Makefile.in: Rebuilt dependencies.
-	(BFD32_BACKENDS): Add aout0.o.
-	(CFILES): Add aout0.c.
-
-	* libaout.h (struct aout_backend_data): Add field exec_hdr_flags.
-	* aout-target.h (MY_exec_hdr_flags): If not defined, define as 0.
-	MY(backend_data): Initialize exec_hdr_flags field.
-	* aoutf1.h (sunos_32_set_arch_mach): Make static.
-	(aout32_sunos4_write_object_contents): Set flags from backend
-	info.
-	(MY_exec_hdr_flags): If not defined, define as 1.
-	(sunos4_aout_backend): Initialize exec_hdr_flags field.
-	* aout-encap.c (encap_write_object_contents): Set flags from
-	backend info.
-	(MY_exec_hdr_flags): Define as N_FLAGS_COFF_ENCAPSULATE.
-	* hp300hpux.c (MY_exec_hdr_flags): Define as 0x2.
-	(MY(write_object_contents)): Set flags from backend info.
-	* i386aout.c (MY(backend_data)): Initialize exec_hdr_flags field.
-	* i386mach3.c (MY(backend_data)): Likewise.
-	* mipsbsd.c (MY(backend_data)): Likewise.
-	* sparclynx.c (NAME(aout,sparclynx_write_object_contents)): Set
-	flags from backend info.
-	(sparclynx_aout_backend): Initialize exec_hdr_flags field.
-
-Wed May  4 02:56:00 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* config.bfd (i386-*-gnu*): Treat like i386-*-mach*.
-	(m68*-apollo-*): Treat all Apollo configs the same, don't handle
-	BSD specially.
-
-Tue May  3 19:43:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* cache.c: Rewrote to work correctly.
-	* libbfd.h: Rebuilt.
-	* opncls.c (bfd_cache_init, bfd_open_file): Don't declare.
-	(bfd_fdopenr): Check return value of bfd_cache_init.
-
-Fri Apr 29 15:08:23 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* cf-m68klynx.c (CALC_ADDEND): Check for PC relative relocs by
-	enumerating them, since the reloc type can not serve as an index
-	into the m68k COFF howto_table.
-
-Fri Apr 29 09:42:39 1994  Steve Chamberlain  (sac@cygnus.com)
-
-        * config.bfd (*-go32): Changed to coff.
-	* coff-h8300.c (JMPL1): Get HOWTO right for 24bit branches.
-	* srec.c (srec_write_symbols): Write out the correct number of
-	symbols and don't stick in extra nulls.
-
-Tue Apr 26 15:07:24 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* cf-sparclynx.c (LYNXOS, COFF_LONG_FILENAMES): Define.
-	* coff-sparc.c (BADMAG): Recognize LYNXCOFFMAGIC.
-	(COFF_SPARC): Define.
-	* coffcode.h (coff_new_section_hook): If COFF_SPARC, set alignment
-	power of data and bss sections to 3.
-	* hosts/lynx.h (__LYNXOS): Define.
-
-Tue Apr 26 15:04:26 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (hppa_elf_reloc): Adjust the addend of relocations
-	against section symbols to avoid losing during ld -r.
-
-Tue Apr 26 12:16:41 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (shstrtab_length_fixed): Remove useless static
-	variable.
-	(struct elf_sect_data): Remove unused structure.
-	(elf_object_p): Free memory if error occurs.  Check return value
-	of bfd_default_set_arch_mach.  If elf_get_str_section fails,
-	preserve error code rather than setting wrong_format.
-	(null_shdr): Remove static variable.
-	(assign_section_numbers): Remove shstrtab_length_fixed assignment.
-	Allocate first section header on BFD obstack rather than using
-	null_shdr.
-	(bfd_prpsinfo): Remove unused local variable newsect.
-
-Mon Apr 25 15:31:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (write_relocs): Undo patch of Apr 10; breaks Solaris.
-
-	* elfcode.h (bfd_section_from_shdr): Use bfd_make_section_anyway
-	to create sections.  Check return value of recursive calls.
-	(bfd_section_from_phdr): Check return value of bfd_make_section.
-	(elf_symbol_from_bfd_symbol): Likewise.
-	(elf_object_p): Check return value of bfd_section_from_shdr.
-	(section_from_elf_index): Likewise.
-	(elf_slurp_symbol_table): Check return value of
-	section_from_elf_index.
-	(bfd_prstatus): Return boolean value.  Check return value of
-	bfd_make_section.
-	(bfd_fpregset): Likewise.
-	(bfd_prpsinfo): Return boolean value.
-	(elf_corefile_note): Check return values of bfd_prstatus,
-	bfd_fpregset, and bfd_prpsinfo.
-	(elf_core_file_p): Check return value of elf_corefile_note.
-
-Fri Apr 22 11:08:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Get rid of the ECOFF .reginfo section hack.
-	* ecoff.c (ecoff_mkobject_hook): Don't create a .reginfo section.
-	(ecoff_new_section_hook): Don't handle the .reginfo section.
-	(ecoff_sizeof_headers): Likewise.
-	(ecoff_get_section_contents): Likewise.
-	(ecoff_compute_section_file_positions): Likewise.
-	(ecoff_compute_reloc_file_positions): Likewise.
-	(ecoff_set_section_contents): Likewise.
-	(ecoff_write_object_contents): Likewise.
-	(ecoff_bfd_final_link): Likewise.
-	(ecoff_bfd_copy_private_bfd_data): Copy the GP value and the
-	register masks.
-	(bfd_ecoff_get_gp_value): New function.
-	(bfd_ecoff_set_gp_value): New function.
-	(bfd_ecoff_set_regmasks): New function.
-	* bfd-in.h (bfd_ecoff_get_gp_value): Declare.
-	(bfd_ecoff_set_gp_value): Declare.
-	(bfd_ecoff_set_regmasks): Declare.
-	* bfd-in2.h: Rebuilt.
-
-	Fix ECOFF objcopy to actually copy debugging information.
-	* ecoff.c (ecoff_bfd_copy_private_bfd_data): New function.
-	(ecoff_get_extr): Assume that any ECOFF symbol with local clear is
-	an external symbol, rather than checking the symbol flags.  Only
-	check the flags for non-ECOFF symbols.
-	* ecofflink.c (bfd_ecoff_debug_externals): Don't crash if the
-	output_section field of the symbol section is NULL.
-	* libecoff.h (ecoff_bfd_copy_private_bfd_data): Declare as
-	function rather than defining as macro.
-
-	* ieee.c (ieee_object_p): Set bfd_error_got_wrong_format if
-	appropriate.
-
-	* targets.c (bfd_target_vector): Add bfd_elf32_powerpc_vec.
-
-	* aout-adobe.c (aout_adobe_set_arch_mach): Check return value of
-	bfd_default_set_arch_mach.  Accept bfd_arch_m68k as well as
-	bfd_arch_unknown.
-	* coffcode.h (coff_set_arch_mach): Check return value of
-	bfd_default_set_arch_mach.
-	* elfcode.h (elf_set_arch_mach): Don't check a list of ELF
-	architectures, just see if the desired architecture matches what
-	the ELF backend permits.
-
-	* coffcode.h (coff_set_arch_mach_hook): Rename SHMAGIC to
-	SH_ARCH_MAGIC to match change in coff/sh.h.
-	(coff_set_flags): Likewise.
-
-	Follow convention in which each NLM header has an 8 byte stamp
-	followed by a four byte length.
-	* libnlm.h (struct nlm_obj_tdata): Rename nlm_cygnus_section_hdr
-	to nlm_cygnus_ext_header, and change type to
-	Nlm_Internal_Cygnus_Ext_Header.
-	(nlm_cygnus_ext_header): Rename from nlm_cygnus_section_header.
-	* nlmcode.h (nlm_swap_auxiliary_headers_in): Use CyGnUsEx instead
-	of CyGnUsSeCs.  Rename from cygnus_section to cygnus_ext.  Require
-	length word to be 8.
-	(nlm_swap_auxiliary_headers_out): Rename from cygnus_section to
-	cygnus_ext.  Set length word to 8.
-	(nlm_compute_section_file_positions): Rename from cygnus_section
-	to cygnus_ext.
-
-Thu Apr 21 22:54:22 1994  Stu Grossman  (grossman at cygnus.com)
-
-	* nlmcode.h (nlm_swap_auxiliary_headers_in):  Keep section table
-	(from CyGnUsSeCs) in more permanent memory to keep section names
-	from getting trashed.
-
-Thu Apr 21 09:29:37 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* libelf.h (elf_obj_tdata):  Add members for dynamic symbol table
-	handling.
-	* elfcode.h (bfd_section_from_shdr):  Handle dynamic symbol table.
-	* elfcode.h (elf_slurp_symbol_table):  Take additional parameter
-	to select static or dynamic symbol table and return number of
-	symbols slurped or -1 on error.
-	* elfcode.h (elf_get_symtab):  Set bfd symcount from
-	elf_slurp_symbol_table result.
-	* elfcode.h (elf_get_dynamic_symtab_upper_bound,
-	elf_canonicalize_dynamic_symtab):  New functions to handle dynamic
-	symbol table.
-	* elf32-target.h, elf64-target.h (BFD_JUMP_TABLE_DYNAMIC):
-	Change to handle dynamic symbol table, provide default definitions
-	for dynamic relocs.
-	* aoutx.h (howto_table_std, NAME(aout,swap_std_reloc_out),
-	NAME(aout,swap_std_reloc_in), aout_link_input_section_std,
-	aout_link_reloc_link_order):  Handle r_jmptable and r_relative
-	relocations.
-
-Thu Apr 21 11:58:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Clean up uses of _bfd_dummy_target (from Peter Schauer).
-	* libbfd.c (_bfd_dummy_target): Set bfd_error_wrong_format.
-	* nlm-target.h (nlm_core_file_p): Define as _bfd_dummy_target, not
-	NULL.
-	* srec.c (srec_vec): Use _bfd_dummy_target, not NULL, in
-	_bfd_check_format.
-	(symbolsrec_vec): Likewise.
-	* tekhex.c (tekhex_vec): Likewise.
-
-	* libnlm.h (struct nlm_obj_tdata): Add nlm_cygnus_section_hdr
-	field.
-	(nlm_cygnus_section_header): New accessor macro.
-	* nlmcode.h (nlm_object_p): Free new tdata structure if failure.
-	Add fixed sections before swapping in auxiliary headers.  After
-	adding sections, treat errors as real, not as wrong format.
-	(nlm_swap_auxiliary_headers_in): Swap in the sections header; add
-	sections to the BFD for each section it describes.
-	(nlm_swap_auxiliary_headers_out): Swap out the sections header.
-	(nlm_compute_section_file_positions): Account for the size of the
-	sections header.
-
-Wed Apr 20 16:45:51 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* coff-sparc.c (sparccoff_vec): Change minimum alignment power to
-	2, so that stab sections can be multiples of 4 bytes only.
-
-	* hosts/i386aix.h: Changes to avoid prototypes conflicts with the
-	ones defined in stdlib.h.  (From Minh Tran-Le.)
-
-Wed Apr 20 14:15:21 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* nlm32-ppc.c: Complete rewrite for new version of PowerPC
-	NetWare.  Old code still present, but ifdeffed out.
-
-	* nlmcode.h (nlm_swap_auxiliary_headers_in): Don't assume a
-	particular format for the customer header.  Allocate a block of
-	memory and read it into that.
-	(nlm_swap_auxiliary_headers_out): Write out the block of memory.
-	(nlm_compute_section_file_positions): Include length of customer
-	header when computing its size.
-
-Mon Apr 18 14:27:17 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_prep_headers): Get the space's number from the
-	backend private section data rather than target_index.
-	(bfd_som_set_section_attributes): Store the space's number
-	in the backend private section data rather than target_index.
-
-	* som.h (som_copyable_section_data_struct): Add space_number.
-
-Fri Apr 15 12:22:07 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-a29k.c (reloc_processing): Always set the address of a
-	R_IHCONST reloc to that of the immediately preceding R_IHIHALF.
-	gas does this anyhow, but some other assemblers seem to leave
-	garbage in the R_IHCONST address field.
-
-	* bfd/archive.c: Consistently use ARFMAG; from
-	schwab@issan.informatik.uni-dortmund.de (Andreas Schwab).
-	(_bfd_write_archive_contents): Use ARFMAG rather than '`' and
-	'\012'.
-	(bsd_write_armap): Likewise.
-	(coff_write_armap): Likewise.
-
-	* coff-mips.c (mips_relocate_section): When relaxing, adjust local
-	relocs against the .text section as required.
-	* ecofflink.c (bfd_ecoff_debug_accumulate): When relaxing, adjust
-	PDR addresses as required.
-
-	* ecoff.c (ecoff_emit_aggregate): Take fdr argument.  Map fdr
-	index through rfd map if it exists.  Check for a couple of cases
-	which gdb handles specially.  Change all callers.
-	(ecoff_type_to_string): Take fdr argument rather than aux_ptr and
-	bigendian argument.  Change all callers.
-	(ecoff_print_symbol): Handle stStruct, stUnion and stEnum.
-
-Thu Apr 14 13:05:10 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-mips.c (mips_howto_table): Add dummy entries to account for
-	numbering changes in include/coff/mips.h.  Add entries for
-	MIPS_R_RELHI and MIPS_R_RELLO.
-	(mips_ecoff_swap_reloc_in): Handle an extra bit for the reloc type
-	when little endian.  Treat internal MIPS_R_RELLO or MIPS_R_RELHI
-	relocs like MIPS_R_SWITCH, and convert r_offset from 24 to 32
-	bits.
-	(mips_ecoff_swap_reloc_out): Likewise.
-	(mips_adjust_reloc_in): Handle internal MIPS_R_RELLO or
-	MIPS_R_RELHI relocs like MIPS_R_SWITCH.
-	(mips_adjust_reloc_out): Likewise.
-	(mips_relhi_addr, mips_relhi_addend): New static variables.
-	(mips_relhi_reloc, mips_rello_reloc): New functions.
-	(mips_bfd_reloc_type_lookup): Turn BFD_RELOC_PCREL_HI16_S into
-	MIPS_R_RELHI and turn BFD_RELOC_PCREL_LO16 into MIPS_R_RELLO.
-	(mips_relocate_hi): Rename from mips_relocate_refhi, and add pcrel
-	argument.  Changed all callers.
-	(mips_relocate_section): Rename got_reflo to got_lo and
-	reflo_int_rel to lo_int_rel.  Handle MIPS_R_RELLO and MIPS_R_RELHI
-	relocs.
-	(mips_relax_section): Adjust MIPS_R_RELHI/MIPS_R_RELLO pairs when
-	expanding a PC relative call.
-
-	* reloc.c (bfd_reloc_code_real_type): Add BFD_RELOC_PCREL_HI16_S
-	and BFD_RELOC_PCREL_LO16.
-	* bfd-in2.h: Rebuilt.
-
-Wed Apr 13 11:50:07 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* coff-sparc.c (sparccoff_vec): Set minimum alignment power to 3.
-
-Tue Apr 12 13:36:20 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_write_fixups): Always emit at least
-        one relocation for any non-bss section.
-
-Mon Apr 11 14:41:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (assign_file_positions_except_relocs): Don't require
-	the file alignment to correspond to the page size when linking
-	with -N.
-
-Sun Apr 10 01:02:24 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elfcode.h (write_relocs): For rela relocations, adjust the
-	addend for relocations involving section symbols to account
-	for the lossage of 1:1 mapping from input section symbols to
-	output section symbols.
-
-Fri Apr  8 12:22:02 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (NAME(aout,make_sections)): New function.
-	(NAME(aout,some_aout_object_p)): Call NAME(aout,make_sections)
-	rather than making sections inline.
-	(NAME(aout,mkobject)): Don't make any sections.
-	(NAME(aout,adjust_sizes_and_vmas)): Call NAME(aout,make_sections).
-	(NAME(aout,final_link)): Don't dereference obj_textsec (abfd) or
-	obj_datasec (abfd) if they are NULL.
-	* libaout.h (NAME(aout,make_sections)): Declare.
-	* bout.c (b_out_mkobject): Don't make any sections.
-	(b_out_write_object_contents): Call aout_32_make_sections.
-	(b_out_set_section_contents): Likewise.
-	* i386os9k.c (os9k_mkobject): Don't make any sections.
-	(os9k_write_object_contents): Call aout_32_make_sections.
-	(os9k_set_section_contents): Likewise.
-
-	* aoutx.h (NAME(aout,new_section_hook)): Don't set N_EXT in target
-	index.
-
-Wed Apr  6 20:44:56 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* config.bfd, configure.host:  Add mips-*-sysv4* support.
-
-Thu Apr  7 14:23:05 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-mips.c (mips_howto_table): Add entry for MIPS_R_SWITCH.
-	(mips_ecoff_swap_reloc_in): For MIPS_R_SWTICH, copy r_symndx into
-	r_offset and set r_symndx to RELOC_SECTION_TEXT.
-	(mips_ecoff_swap_reloc_out): For MIPS_R_SWITCH, get the r_symndx
-	value from the r_offset field.
-	(mips_adjust_reloc_in): Maximum r_type value is now MIPS_R_SWITCH.
-	For MIPS_R_SWITCH, copy the r_offset field into the addend field.
-	(mips_adjust_reloc_out): For MIPS_R_SWITCH, copy the addend field
-	into the r_offset field.
-	(mips_switch_reloc): New function.
-	(mips_bfd_reloc_type_lookup): Translate BFD_RELOC_GPREL32 into
-	MIPS_R_SWITCH.
-	(mips_relocate_section): Handle MIPS_R_SWITCH.
-	(mips_relax_section): Adjust MIPS_R_SWITCH offset if necessary.
-
-Thu Apr  7 11:10:51 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elfcode.h (elf_set_section_contents): Support calling the backend
-	function elf_backend_begin_write_processing when just beginning to
-	write an object file.
-
-	* libelf.h (elf_backend_begin_write_processing): Declare.
-
-	* elf{32,64}-target.h (elf_backend_begin_write_processing): Provide
-	a default definition.
-	(elf{32,64}_bed): Add elf_backend_begin_write_processing.
-	
-	* elf32-hppa.h (elf_hppa_tc_symbol): Delete extern declaration.
-	(elf_hppa_tc_make_sections): Likewise.
-
-	* elf32-hppa.c (symext_chain_built): Delete.
-	(symext_chain_size): Renamed from symextn_contents_real_size.
-	(elf32_hppa_backend_{begin,final}_write_processing): New functions.
-	(add_entry_to_symext_chain): New function.
-	(hppa_elf_set_section_contents): Ignore writes to the symbol extension
-	section until it's been rebuilt internally.
-	(hppa_elf_get_section_contents): Symbol extension section is no
-	longer special.
-	(elf_backend_{begin,final}_write_processing): Define.
-	(elf_hppa_tc_make_sections): Simplify now that much code has
-	migrated into elf32_hppa_backend_{being,final}_write_processing.
-
-Wed Apr  6 17:24:14 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Add new target vectors to read the dynamic symbols and dynamic
-	relocs.  Change a.out to use these rather than reading the dynamic
-	symbols and relocs along with the normal symbols and relocs.
-	* targets.c (bfd_target): Add fields
-	_bfd_get_dynamic_symtab_upper_bound,
-	_bfd_canonicalize_dynamic_symtab,
-	_bfd_get_dynamic_reloc_upper_bound,
-	_bfd_canonicalize_dynamic_reloc.
-	(BFD_JUMP_TABLE_DYNAMIC): Define.
-	* libbfd-in.h (_bfd_nodynamic_get_dynamic_symtab_upper_bound):
-	Define.
-	(_bfd_nodynamic_canonicalize_dynamic_symtab): Define.
-	(_bfd_nodynamic_get_dynamic_reloc_upper_bound): Define.
-	(_bfd_nodynamic_canonicalize_dynamic_reloc): Define.
-	* bfd.c (bfd_get_dynamic_symtab_upper_bound): Define.
-	(bfd_canonicalize_dynamic_symtab): Define.
-	(bfd_get_dynamic_reloc_upper_bound): Define.
-	(bfd_canonicalize_dynamic_reloc): Define.
-	* sunos.c (MY_read_dynamic_symbols): Don't define.
-	(MY_read_dynamic_relocs): Don't define.
-	(MY_get_dynamic_symtab_upper_bound): Define.
-	(MY_canonicalize_dynamic_symtab): Define.
-	(MY_get_dynamic_reloc_upper_bound): Define.
-	(MY_canonicalize_dynamic_reloc): Define.
-	(struct sunos_dynamic_info): Change type of dynsym_count and
-	dynrel_count to long.  Add fields canonical_dynsym and
-	canonical_dynrel.
-	(sunos_read_dynamic_info): Check that BFD had DYNAMIC flag set.
-	Clear info->canonical_dynsym and info->canonical_dynrel.
-	(MY(read_dynamic_symbols)): Removed.
-	(MY(read_dynamic_relocs)): Removed.
-	(sunos_get_dynamic_symtab_upper_bound): New function.
-	(sunos_canonicalize_dynamic_symtab): New function.
-	(sunos_get_dynamic_reloc_upper_bound): New function.
-	(sunos_canonicalize_dynamic_reloc): New function.
-	* libaout.h: Declare struct reloc_ext_external and
-	reloc_std_external to avoid prototype problems.
-	(struct aout_backend_data): Remove fields read_dynamic_symbols and
-	read_dynamic_relocs.
-	(NAME(aout,translate_symbol_table)): Declare.
-	(NAME(aout,swap_ext_reloc_in)): Declare.
-	(NAME(aout,swap_std_reloc_in)): Declare.
-	* aoutx.h (NAME(aout,translate_symbol_table)): Renamed from
-	translate_symbol_table and made non-static.  Changed all callers.
-	(NAME(aout,slurp_symbol_table)): Don't read dynamic symbols.
-	(NAME(aout,slurp_reloc_table)): Don't read dynamic relocs.
-	(NAME(aout,get_reloc_upper_bound)): Don't count dynamic relocs.
-	* aoutf1.h (aout_32_sunos4_write_object_contents): Don't bother to
-	remove dynamic symbols and relocs.  They will no longer be
-	present.
-	(MY_read_dynamic_symbols): Don't define.
-	(MY_read_dynamic_relocs): Don't define.
-	(sunos4_aout_backend): Don't initialize dynamic entry points.
-	* aout-target.h (MY_read_dynamic_symbols): Don't define.
-	(MY_read_dynamic_relocs): Don't define.
-	(MY(backend_data)): Don't initialize dynamic entry points.
-	(MY_get_dynamic_symtab_upper_bound): If not defined, define to
-	_bfd_nodynamic version.
-	(MY_canonicalize_dynamic_symtab): Likewise.
-	(MY_get_dynamic_reloc_upper_bound): Likewise.
-	(MY_canonicalize_dynamic_reloc): Likewise.
-	* All backends: Added BFD_JUMP_TABLE_DYNAMIC to target vector.
-	* bfd-in2.h: Rebuilt.
-	* libbfd.h: Rebuilt.
-
-	* cf-m68klynx.c: Include sysdep.h.
-
-	* hp300hpux.c: Removed some spaces in uses of NAME to avoid
-	problems with traditional C compilers.
-
-	* targets.c (bfd_target): Rearranged fields in target vector.
-	Removed _bfd_debug_info_start, _bfd_debug_info_end and
-	_bfd_debug_info_accumulate, which were never used.
-	(BFD_JUMP_TABLE_GENERIC, BFD_JUMP_TABLE_COPY): Defined.
-	(BFD_JUMP_TABLE_CORE, BFD_JUMP_TABLE_ARCHIVE): Defined.
-	(BFD_JUMP_TABLE_SYMBOLS, BFD_JUMP_TABLE_RELOCS): Defined.
-	(BFD_JUMP_TABLE_WRITE, BFD_JUMP_TABLE_LINK): Defined.
-	* All backends: Changed to use the new BFD_JUMP_TABLE_* macros
-	rather than the single JUMP_TABLE macro.  Removed many of the
-	weird macro definitions needed to support the monolithic
-	JUMP_TABLE.
-	* bfd-in.h (JUMP_TABLE): Removed.
-	* libbfd-in.h: Define a bunch of macros, and declare a few
-	functions, for use with the new BFD_JUMP_TABLE_* macros.
-	* libbfd.c (_bfd_dummy_new_section_hook): Removed.
-	(bfd_false): Set bfd_error_invalid_operation.
-	(bfd_nullvoidptr): Likewise.
-	(bfd_n1): New function.
-	(_bfd_nocore_core_file_matches_executable_p): Renamed from
-	_bfd_dummy_core_file_matches_executable_p.
-	(_bfd_nocore_core_file_failing_command): Similar rename.  Set
-	bfd_error_invalid_operation.
-	(_bfd_nocore_core_file_failing_signal): Likewise.
-	(_bfd_generic_get_section_contents): Renamed from
-	bfd_generic_get_section_contents.  Changed all callers.
-	(_bfd_generic_set_section_contents): Similar rename.
-	* ieee.c: #if 0 out ieee_bfd_debug_info_start,
-	ieee_bfd_debug_info_end, ieee_bfd_debug_info_accumulate.  They
-	were never called.
-	* bfd-in2.h: Rebuilt.
-	* libbfd.h: Rebuilt.
-
-Tue Apr  5 22:10:04 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* Crude support for examining dynamic libraries.
-	* som.c (som_object_setup): Set DYNAMIC flag for SHL_MAGIC and
-	DL_MAGIC objects.
-	(som_prep_headers): Preserve the system_id for DYNAMIC objects.
-	Use SHL_MAGIC as the magic number of the DYNAMIC flag is set.
-	Write exec headers for DYNAMIC objects.
-	(som_begin_writing): DYNAMIC objects have the same alignment
-	restrictions as D_PAGED objects.
-	(bfd_section_from_som_symbol): Treat DYNAMIC objects like EXEC_P
-	objects.
-	(object_flags): Add DYNAMIC.
-
-Tue Apr  5 17:48:52 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* i386lynx.c, sparclynx.c (NAME): Remove embedded whitespace in
-	macro uses, confuses some non-ANSI compilers.
-
-Tue Apr  5 15:50:01 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_free_cached_info): Add missing PARAMS decl.
-	Don't free anything if we don't have a bfd_object.
-	(som_close_and_cleanup): Call som_bfd_free_cached_info.
-
-Tue Apr  5 11:22:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf32-mips.c (mips_elf_final_link): Don't remove empty sections.
-	It turns out not to be required on Irix 5, and it causes problems
-	if the sections happen to contain symbols.
-
-	* elfcode.h (write_shdrs_and_ehdr): Correct bfd_write check.
-
-	* aoutx.h (NAME(aout,canonicalize_reloc)): Don't error out if
-	section->relocation is NULL; malloc might have returned NULL when
-	given a zero size if there were no relocations.
-	* bout.c (b_out_canonicalize_reloc): Likewise.
-	* coffcode.h (coff_canonicalize_reloc): Likewise.
-	* ecoff.c (ecoff_canonicalize_reloc): Likewise.
-	* elfcode.h (elf_canonicalize_reloc): Likewise.
-	* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
-	* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
-	* nlmcode.h (nlm_canonicalize_reloc): Likewise.
-	* som.c (som_canonicalize_reloc): Likewise.
-	* hp300hpux.c (MY(slurp_reloc_table)): Likewise.  Also, if malloc
-	returns NULL, don't report an error if we asked for zero bytes.
-	* i386lynx.c (NAME(lynx,slurp_reloc_table)): If malloc returns
-	NULL, don't report an error if we asked for zero bytes.
-	* nlmcode.h (nlm_slurp_reloc_fixups): Likewise.
-
-Mon Apr  4 15:30:49 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (NAME(aout,bfd_free_cached_info)): Don't free anything
-	if we don't have a bfd_object.
-
-	Made sure that every call to bfd_read, bfd_write, and bfd_seek
-	checks the return value and handled bfd_error correctly.  These
-	changes are not itemised.  Also:
-	* aoutx.h (emit_strtab): Change return type to boolean, and return
-	errors.
-	(NAME(aout,write_syms)): Check emit_strtab return value.
-	(NAME(aout,final_link)): Likewise.
-	* coffcode.h (coff_write_relocs): Change return type to boolean,
-	and return errors.
-	(coff_write_object_contents): Check coff_write_relocs return
-	value.
-	* i386os9k.c (os9k_swap_exec_header_in): Change return type to
-	boolean.
-	(os9k_object_p): Check os9k_swap_exec_header_in return value.
-	* oasys.c (oasys_read_record): Change return type to boolean.
-	(oasys_slurp_symbol_table: Check oasys_read_record return value.
-	(oasys_object_p, oasys_slurp_section_data): Likewise.
-	(oasys_write_record): Change return type to boolean.
-	(oasys_write_syms): Likewise.  Also, check oasys_write_record
-	return value.
-	(oasys_write_sections): Check oasys_write_record return value.
-	(oasys_write_header): Change return type to boolean.  Check
-	oasys_write_record return value.
-	(oasys_write_end, oasys_write_data): Likewise.
-	(oasys_write_object_contents): Check return values of
-	oasys_write_header, oasys_write_syms, oasys_write_data, and
-	oasys_write_end.
-	* srec.c (srec_write_record): Change return type to boolean.
-	(srec_write_header): Likewise.  Also, check srec_write_record
-	return value.
-	(srec_write_section, srec_write_terminator): Likewise.
-	(srec_write_symbols): Change return type to boolean.
-	(internal_srec_write_object_contents): Check return value of
-	srec_write_symbols, srec_write_header, srec_write_section, and
-	srec_write_terminator.
-
-	* Makefile.in: Rebuilt dependencies.
-
-Mon Apr  4 10:56:45 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* aix386-core.c (aix386_bfd_is_local_label):  Correct cast from
-	asection to asymbol.
-	* ptrace-core.c (ptrace_unix_bfd_is_local_label):  Correct cast from
-	bfd to asymbol.
-	* trad-core.c (trad_unix_bfd_is_local_label):  Correct cast from
-	asection to asymbol.
-
-Sun Apr  3 18:27:29 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_slurp_string_table): Use malloc to allocate space
-	for the cached copy of the native string table.
-	(som_slurp_symbol_table): Likewise for the native symbol table.
-	(som_slurp_reloc_table): Likewise for the native and generic
-	relocation tables.
-	(som_bfd_free_cached_info): Free the cached native strings,
-	symbols, and relocations.  Also free the canonical cached
-	relocations.
-
-Fri Apr  1 12:40:58 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (aout_link_write_symbols): If keep_memory is false, make
-	sure the symbol name is stored in permanent memory before adding
-	it to the string table.
-
-	* archive.c (_bfd_write_archive_contents): Once we've found an
-	object, don't bother to look for more when deciding whether to
-	build a map.
-	(compute_and_write_armap): After adding the symbols for a BFD,
-	call bfd_free_cached_info on it.
-
-	Add bfd_free_cached_info support to a.out backends.
-	* aoutx.h (aout_get_external_symbols): Renamed from
-	aout_link_get_symbols.  Read strings even if symbols have been
-	read.  Store string size in obj_aout_string_size.
-	(NAME(aout,slurp_symbol_table)): Call aout_get_external_symbols to
-	read the symbols.  Allocate the cached symbols with malloc, not
-	bfd_alloc.
-	(NAME(aout,slurp_reloc_table)): Allocate the cached relocs with
-	malloc, not bfd_alloc.
-	(NAME(aout,bfd_free_cached_info)): New function; free cached
-	symbols and relocs.
-	* libaout.h (struct aoutdata): Add external_string_size field.
-	(obj_aout_external_string_size): New accessor macro.
-	(NAME(aout,close_and_cleanup)): Don't declare.
-	(NAME(aout,bfd_free_cached_info)): Declare.
-	(aout_32_close_and_cleanup): Don't define.
-	(aout_64_close_and_cleanup): Don't define.
-	* aout-target.h (MY_bfd_free_cached_info): If not already defined,
-	define as NAME(aout,free_cached_info).
-	(MY_close_and_cleanup): If not already defined, define as
-	MY_bfd_free_cached_info.
-	* aout-adobe.c (aout_32_close_and_cleanup): Define.
-	(aout_32_bfd_free_cached_info): Don't define.
-	* bout.c (aout_32_close_and_cleanup): Define.
-	(aout_32_bfd_free_cached_info): Don't define.
-	* hp300hpux.c (MY_bfd_free_cached_info): Define as bfd_true.
-	(MY_close_and_cleanup): Don't define.
-	* i386lynx.c (NAME(lynx,slurp_reloc_table)): Allocate the cached
-	relocs with malloc, not bfd_alloc.
-	* i386os9k.c (aout_32_close_and_cleanup): Define.
-	(aout_32_bfd_free_cached_info): Don't define.
-
-	Add a new entry point to free memory cached by a BFD.
-	* targets.c (bfd_target): Add _bfd_free_cached_info field.
-	* bfd.c (bfd_free_cached_info): Define.
-	* bfd-in.h (JUMP_TABLE): Add _bfd_free_cached_info.
-	* bfd-in2.h: Rebuilt.
-	* All backends: Initialize bfd_free_cached_info entry point to
-	bfd_true.
-
-	* elf32-hppa.c (elf_hppa_reloc_type_lookup): Correct type of
-	first, unused, argument.
-	(hppa_elf_is_local_label): Declare instead of
-	som_bfd_is_local_label.
-
-	* coff-a29k.c (a29k_reloc): Add reloc_entry->address to value of
-	absolute R_IREL reloc.
-
-Thu Mar 31 11:52:15 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Added some support for Irix 4 shared libraries.
-	* ecoff.c (ecoff_new_section_hook): Set SEC_SHARED_LIBRARY for a
-	.lib section.
-	(ecoff_sec_to_styp_flags): Set SEC_SHARED_LIBRARY if
-	STYP_ECOFF_LIB bit is set.
-	(ecoff_compute_section_file_positions): Round the contents of a
-	.lib section up to the next page boundary.
-	(ecoff_set_section_contents): If we see a .lib section, increment
-	the vma by one to count the number of shared libraries we have.
-	(ecoff_write_object_contents): Don't crash if we see a
-	STYP_ECOFF_LIB section, and don't adjust text_start or data_start
-	or bss_size either.
-
-	* coffcode.h (CALC_ADDEND): Change to fetch original symbol value
-	from original BFD, rather than using value of current BFD symbol.
-	Needed for new linker.
-	* coff-sparc.c (CALC_ADDEND): Likewise.
-
-	* ecoff.c (ecoff_write_object_contents): Set the text_start and
-	data_start entries in the optional header correctly even if a text
-	or data section starts at location zero.
-
-	* reloc.c (bfd_reloc_code_real_type): Added BFD_RELOC_26 (from sef
-	and raeburn).
-	* bfd-in2.h: Rebuilt.
-
-	* nlm32-i386.c (nlm_i386_read_import): Null terminate the symbol
-	name.
-	* nlm32-alpha.c (nlm_alpha_read_import): Likewise.
-	* nlm32-sparc.c (nlm_sparc_read_import): Likewise.
-
-	* coffgen.c (coff_write_symbol): Reindented.  Changed to return
-	boolean, and changed written to unsigned int *.  Check error
-	returns from called functions.
-	(coff_write_alien_symbol): Likewise.
-	(coff_write_native_symbol): Likewise.
-	(coff_write_symbols): Likewise.  Reworked checks on whether to
-	write symbol name to string table for clarity and to avoid core
-	dumping when given a non COFF symbol.
-	* libcoff-in.h (coff_write_symbols): Declare as returning boolean.
-	* libcoff.h: Rebuilt.
-	* coffcode.h (coff_write_object_contents): Check return value of
-	coff_write_symbols.
-
-Wed Mar 30 16:25:41 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Changes to let BFD return an error indication from
-	get_symtab_upper_bound, bfd_canonicalize_symtab,
-	bfd_get_reloc_upper_bound, and bfd_canonicalize_reloc.  They now
-	return long instead of unsigned int, and use -1 to indicate an
-	error.  Along the way, rename get_symtab_upper_bound to
-	bfd_get_symtab_upper_bound.
-	* bfd.c (bfd_get_reloc_upper_bound): Return long, and -1 on
-	errors.
-	(bfd_canonicalize_reloc): Likewise.
-	* syms.c (bfd_get_symtab_upper_bound): Renamed from
-	get_symtab_upper_bound.
-	* targets.c (bfd_target): Renamed _get_symtab_upper_bound to
-	_bfd_get_symtab_upper_bound, and changed it and
-	_bfd_canonicalize_symtab and _get_reloc_upper_bound and
-	_bfd_canonicalize_reloc to all return long.
-	* aoutx.h (NAME(aout,get_symtab)): Return long, and -1 on errors.
-	(NAME(aout,canonicalize_reloc)): Likewise.
-	(NAME(aout,get_reloc_upper_bound)): Likewise.
-	(NAME(aout,get_symtab_upper_bound)): Likewise.
-	* bout.c (b_out_canonicalize_reloc): Likewise.
-	(b_out_get_reloc_upper_bound): Likewise.
-	* coffcode.h (coff_canonicalize_reloc): Likewise.
-	* coffgen.c (coff_get_symtab_upper_bound): Likewise.
-	(coff_get_symtab): Likewise.
-	(coff_get_reloc_upper_bound): Likewise.
-	* ecoff.c (ecoff_get_symtab_upper_bound): Likewise.
-	(ecoff_get_symtab): Likewise.
-	(ecoff_canonicalize_reloc): Likewise.
-	* elfcode.h (elf_get_symtab_upper_bound): Likewise.
-	(elf_get_reloc_upper_bound): Likewise.
-	(elf_canonicalize_reloc): Likewise.
-	(elf_get_symtab): Likewise.
-	* hp300hpux.c (MY(get_symtab)): Likewise.
-	(MY(get_symtab_upper_bound)): Likewise.
-	(MY(canonicalize_reloc)): Likewise.
-	* i386lynx.c (NAME(lynx,canonicalize_reloc)): Likewise.
-	* ieee.c (ieee_slurp_external_symbols): Change return type to
-	boolean.  Check for errors from get_symbol.
-	(ieee_slurp_symbol_table): Change return type to boolean.  Check
-	for errors from ieee_slurp_external_symbols.
-	(ieee_get_symtab_upper_bound): Return long, and -1 on errors.
-	(ieee_get_symtab): Likewise.
-	(ieee_get_reloc_upper_bound): Likewise.
-	(ieee_canonicalize_reloc): Likewise.
-	* mipsbsd.c (MY(canonicalize_reloc)): Likewise.
-	* nlmcode.h (nlm_get_symtab_upper_bound): Likewise.
-	(nlm_get_symtab): Likewise.
-	(nlm_get_reloc_upper_bound): Likewise.
-	(nlm_canonicalize_reloc): Likewise.
-	* oasys.c (oasys_get_symtab_upper_bound): Likewise.
-	(oasys_get_symtab): Likewise.
-	(oasys_get_reloc_upper_bound): Likewise.
-	(oasys_canonicalize_reloc): Likewise.
-	* som.c (som_get_symtab_upper_bound): Likewise.
-	(som_get_symtab): Likewise.
-	(som_get_reloc_upper_bound): Likewise.
-	(som_canonicalize_reloc): Likewise.
-	* srec.c (srec_get_symtab_upper_bound): Likewise.
-	(srec_get_symtab): Likewise.
-	(srec_get_reloc_upper_bound): Define as bfd_0l.
-	(srec_canonicalize_reloc): Likewise.
-	* tekhex.c (tekhex_get_symtab): Return long, and -1 on errors.
-	(tekhex_get_symtab_upper_bound): Likewise.
-	(tekhex_get_reloc_upper_bound): Define as bfd_0l.
-	(tekhex_canonicalize_reloc): Likewise.
-	* libaout.h (NAME(aout,get_symtab_upper_bound)): Change
-	declaration to return long.
-	(NAME(aout,get_symtab)): Likewise.
-	(NAME(aout,canonicalize_reloc)): Likewise.
-	(NAME(aout,get_reloc_upper_bound)): Likewise.
-	* libcoff-in.h (coff_get_symtab_upper_bound): Likewise.
-	(coff_get_symtab): Likewise.
-	(coff_get_reloc_upper_bound): Likewise.
-	* libecoff.h (ecoff_get_symtab_upper_bound): Likewise.
-	(ecoff_get_symtab): Likewise.
-	(ecoff_canonicalize_reloc): Likewise.
-	* libelf.h (bfd_elf32_get_symtab_upper_bound): Likewise.
-	(bfd_elf32_get_symtab): Likewise.
-	(bfd_elf32_get_reloc_upper_bound): Likewise.
-	(bfd_elf32_canonicalize_reloc): Likewise.
-	(bfd_elf64_get_symtab_upper_bound): Likewise.
-	(bfd_elf64_get_symtab): Likewise.
-	(bfd_elf64_get_reloc_upper_bound): Likewise.
-	(bfd_elf64_canonicalize_reloc): Likewise.
-	* libnlm.h (nlmNAME(get_symtab_upper_bound)): Likewise.
-	(nlmNAME(get_symtab)): Likewise.
-	(nlmNAME(get_reloc_upper_bound)): Likewise.
-	(nlmNAME(canonicalize_reloc)): Likewise.
-	* archive.c (compute_and_write_armap): Use error_return and
-	no_memory_return labels rather than freeing information in various
-	places.  Change storage, symcount and src_count to long.  Check
-	errors from bfd_get_symtab_upper_bound and
-	bfd_canonicalize_symtab.
-	* bout.c (b_out_relax_section): Change reloc_size to long.  Check
-	for errors from bfd_get_reloc_upper_bound and
-	bfd_canonicalize_reloc.
-	(b_out_get_relocated_section_contents): Likewise.
-	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
-	Likewise.
-	* elf32-mips.c: Likewise.
-	* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
-	(hppa_look_for_stubs_in_section): Check for errors from
-	bfd_get_symtab_upper_bound, bfd_canonicalize_symtab, and
-	bfd_canonicalize_reloc.
-	* ecofflink.c (bfd_ecoff_debug_accumulate_other): Check for errors
-	from bfd_get_symtab_upper_bound and bfd_canonicalize_symtab.
-	* linker.c (generic_link_read_symbols): Likewise.
-	(_bfd_generic_final_link): Check for errors from
-	bfd_get_reloc_upper_bound and bfd_canonicalize_reloc.
-	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
-	* reloc16.c (bfd_coff_reloc16_relax_section): Likewise.
-	(bfd_coff_reloc16_get_relocated_section_contents): Likewise.
-	* libbfd.c (bfd_0l): New function.
-	* libbfd-in.h (bfd_0l): Declare.
-	* aix386-core.c: Change get_symtab_upper_bound, get_symtab,
-	get_reloc_upper_bound, and canonicalize_reloc to use bfd_0l rather
-	than bfd_0u.
-	* cisco-core.c, hppabsd-core.c, hpux-core.c: Likewise.
-	* irix-core.c, osf-core.c, ptrace-core.c, trad-core.c: Likewise.
-	* bfd-in2.h: Rebuilt.
-	* libbfd.h: Rebuilt.
-	* libcoff.h: Rebuilt.
-
-	* nlm32-sparc.c (nlm_sparc_read_reloc): Remove unused variables
-	temp and name.
-
-Wed Mar 30 08:33:04 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/dpx2.h: Define POSIX_UTIME.
-
-Wed Mar 30 00:31:49 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* i386dynix.c, config/i386-dynix.mt:  New files, handling Dynix
-	variant of a.out.
-	* configure.in, config.bfd:  Use them for Dynix.
-	* Makefile.in:  Add dependencies for i386dynix.o. 
-	* targets.c:  Add definition for i386dynix_vec.
-	* hosts/symmetry.h:  Do not define TRAD_CORE_USER_OFFSET for Dynix.
-	Define HOST_DATA_START_ADDR and TRAD_UNIX_CORE_FILE_FAILING_SIGNAL
-	for Dynix. Remove inclusion of dynix3.h, Dynix bfd is now handled by
-	i386dynix.c
-
-Mon Mar 28 12:53:27 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* Makefile.in (BFD32_BACKENDS): Add coff-sparc.o.
-
-	* coffcode.h (coff_set_flags): Handle bfd_arch_powerpc like
-	bfd_arch_rs6000.
-
-	* config.bfd (powerpc-*-aix*): New target; use rs6000.mt.
-	* config/rs6000.mt (SELECT_ARCHITECTURES): Add bfd_powerpc_arch.
-
-	* aoutx.h (translate_from_native_sym_flags): Set SEC_RELOC flag
-	for generated constructor section.
-
-Sun Mar 27 16:25:22 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_begin_writing): New approach at dealing with holes
-	in executables left by the HP linker.  Does not rely on subspace
-	alignments as subspaces are *NOT* guaranteed to be properly
-	aligned in an executable (can you believe that!).
-
-Sat Mar 26 10:25:43 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_get_section_contents): New function.  Do not try
-	to actually read data from a section that doesn't have either
-	SEC_LOAD or SEC_DEBUGGING set (eg $BSS$) just return true.
-
-        * libbfd.c (bfd_read): Set bfd_error as appropriate for a short
-	read. (bfd_error_system_call or bfd_error_file_truncated).
-
-	* som.c: Do not blindly set bfd_error_system_call after a
-	failing bfd_read, bfd_write, or bfd_seek.  In a few places
-	(like som_object_p) override the error status set by bfd_read.
-
-	* aix386-core.c, aout-encap,c archive.c, bout.c: Likewise.
-	* coff-rs6000.c, coffgen.c ecoff.c, elf.c: Likewise.
-	* elf32-hppa.c, elfcode.h, hp300hpux.c, i386lynx.c: Likewise.
-	* nlm32-alpha.c, nlm32-i386.c, nlm32-sparc.c: Likewise.
-
-	* som.c: Check return values from several bfd_{seek,read,write}
-	calls that we just assumed were not failing.
-
-Fri Mar 25 11:44:06 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* hosts/sysv4.h (HAVE_PROCFS): Add comments about ptx4.
-	* config/sysv4.mh: Add comment.
-	* config/symmetry.mh: Change comment.
-	* configure.host: Use sysv4, not symmetry, for i[34]86-sequent-sysv4*.
-
-Fri Mar 25 17:10:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Changes to support linker relaxing of embedded MIPS PIC code to
-	use a five instruction sequence for function calls which are out of
-	range of the bal instruction.
-	* libecoff.h (struct ecoff_section_tdata): Define.
-	(ecoff_section_data): Define.
-	(ecoff_bfd_relax_section): Don't define.
-	* ecoff.c (ecoff_final_link_debug_accumulate): Don't read or free
-	the debugging information if it has already been read.
-	(ecoff_indirect_link_order): Handle _cooked_size being different
-	from _raw_size.  Don't reread the contents or the relocs if they
-	have already been read in.
-	* coff-mips.c (mips_howto_table): Change bitsize of PCREL16 from
-	18 to 16.
-	(PCREL16_EXPANSION_ADJUSTMENT): Define.
-	(mips_relocate_refhi): Take adjust argument.
-	(mips_relocate_section): Handle reloc offsets stored in section
-	used_by_bfd field.  Call mips_relax_pcrel16 to handle details of
-	expanding an out of range PCREL16.  Keep trace of adjustments
-	required by expansions.  Set s and unset h when converting a reloc
-	from undefined to section.  Change handling of PC relative relocs:
-	if against a section, they are correct in the object file, if
-	against an external symbol they are pcrel_offset.
-	(mips_relax_section): New function.
-	(mips_relax_pcrel16): New function.
-	(ecoff_bfd_relax_section): Define.
-	* coff-alpha.c (ecoff_bfd_relax_section): Define.
-	* ecofflink.c (bfd_ecoff_debug_accumulate): Handle adjustments
-	built by mips_relax_section when writing out addresses.
-	* elf32-mips.c (mips_elf_read_ecoff_info): Clear adjust field.
-
-	* aoutx.h (NAME(aout,find_nearest_line)): The caller expects
-	functionname_ptr to be set to a symbol name, so prepend
-	symbol_leading_char.
-
-Thu Mar 24 11:33:46 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
-
-	* coff-h8300.c (h8300_reloc16_extra_cases): Add relaxing info
-	for 16bit relative branches.
-	* coff-h8500.c (r_high8, r_low16, r_high16): Don't complain on
-	overflow.
-
-Thu Mar 24 09:21:13 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_prep_for_ar_write): Ignore non-SOM objects.
-	(som_bfd_ar_write_symbol_stuff, som_write_armap): Likewise.
-
-Wed Mar 23 14:29:31 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
-
-	* netbsd386.c (N_SET_FLAGS): Delete the old definition.
-
-Wed Mar 23 14:58:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Clean up the relaxing code for the new linker.
-	* targets.c (_bfd_relax_section): Take boolean *again argument
-	rather than asymbol list.
-	* bfd.c (bfd_relax_section): Change name of fourth argument from
-	symbols to again.
-	* reloc.c (bfd_generic_relax_section): Take boolean *again
-	argument rather than asymbol list.  Always return true.
-	* bout.c: Include genlink.h.
-	(aligncode, perform_slip): Declare.
-	(perform_slip): Take BFD argument rather than asymbol list.
-	Changed all callers.  Get the symbols from the BFD.  Change the
-	hash table entry value as well as the symbol value.
-	(abs32code): Take BFD argument rather than asymbol list.  Changed
-	all callers.
-	(aligncode): Likewise.
-	(b_out_relax_section): Take boolean *again argument rather than
-	asymbol list.  Only return false if an error occurred.  Set *again
-	to false.  Get symbols from BFD.
-	* reloc16.c: Include genlink.h.
-	(bfd_perform_slip): Take BFD argument rather than asymbol list.
-	Get the symbols from the BFD.  Change the hash table entry value
-	as well as the symbol value.
-	(bfd_coff_reloc16_relax_section): Take boolean *again argument
-	rather than asymbol list.  Only return false if an error occurred.
-	Set *again to false.  Get symbols from BFD.
-	* coffcode.h (bfd_coff_backend_data): Change
-	_bfd_coff_reloc16_estimate to take BFD argument rather than
-	asymbol list.
-	(bfd_coff_reloc16_estimate): Corresponding change.
-	(dummy_reloc16_estimate): Corresponding change.
-	* libcoff-in.h (bfd_coff_reloc16_relax_section): Change
-	declaration to take boolean * rather than asymbol list.
-	(bfd_perform_slip): Change declaration to take BFD rather than
-	asymbol list.
-	* coff-h8300.c (h300_reloc16_estimate): Take BFD argument rather
-	than asymbol list.  Changed calls to bfd_perform_slip.
-	* bfd-in2.h: Rebuilt.
-	* libbfd.h: Rebuilt.
-	* libcoff.h: Rebuilt.
-	* Makefile.in: Rebuilt dependencies.
-
-	* genlink.h (_bfd_generic_link_get_symbols): Define.
-	(_bfd_generic_link_get_symcount): Define.
-	* linker.c (generic_link_read_symbols): New function.
-	(generic_link_add_object_symbols): Use it.  Use
-	_bfd_generic_link_get_symbols and _bfd_generic_link_get_symcount
-	to get the symbols from the BFD.
-	(generic_link_check_archive_element): Likewise.
-	(_bfd_generic_final_link): Likewise.
-	(_bfd_generic_link_output_symbols): Likewise.
-	(default_indirect_link_order): Likewise.
-	(generic_link_add_symbol_list): Store pointer to hash table entry
-	in asymbol udata field.
-
-Tue Mar 22 13:09:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-mips.c (mips_howto_table): Add entry for new MIPS_R_PCREL16
-	reloc, used in embedded PIC code.
-	(mips_adjust_reloc_in): Change sanity check to permit new reloc.
-	(mips_bfd_reloc_type_lookup): Turn BFD_RELOC_16_PCREL_S2 into
-	MIPS_R_PCREL16.
-
-	* elf32-mips.c (mips_elf_final_link): Account for link_order
-	relocs when allocating space for relocations.  Set SEC_RELOC flag
-	for any section which has relocs.  Handle link_order relocs in
-	link_order loop.  Use _bfd_generic_link_add_symbols_collect for
-	add_symbls entry point.
-
-	* linker.c (_bfd_generic_final_link): Set reloc_count to 0 before
-	counting relocs.  Set SEC_RELOC flag for any section which has
-	relocs.
-
-	* linker.c (_bfd_default_link_order): Handle bfd_data_link_order.
-
-	* linker.c (_bfd_generic_link_add_symbols): Just call
-	generic_link_add_symbols.
-	(_bfd_generic_link_add_symbols_collect): New function, like
-	_bfd_generic_link_add_symbols but also collect constructors and
-	destructors by name as collect2 does.
-	(generic_link_add_symbols): New function, like old
-	_bfd_generic_link_add_symbols but with collect argument.
-	(generic_link_add_object_symbols): Take collect argument.
-	(generic_link_check_archive_element_no_collect): New function.
-	(generic_link_check_archive_element_collect): New function.
-	(generic_link_check_archive_element): Take collect argument.
-	(generic_link_add_symbol_list): Take collect argument.
-	(_bfd_generic_link_add_one_symbol): Rename constructor argument to
-	collect.
-	* libbfd-in.h (_bfd_generic_link_add_symbols_collect): Declare.
-	* libbfd.h: Rebuilt.
-
-Tue Mar 22 10:04:00 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* archive.c (bfd_construct_extended_name_table): Use ar_padchar
-	for first character in an extended name.
-	(_bfd_write_archive_contents): If ar_padchar == '/', then use
-	"//" as the name of the special archive member holding the
-	extended name table.
-
-Mon Mar 21 12:28:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Support for link_order types which generate relocs in order to
-	support -Ur in the linker.
-	* linker.c (generic_link_add_symbol_list): Remove bitsize argument
-	from call to _bfd_generic_link_add_one_symbol.
-	(_bfd_generic_link_add_one_symbol): Remove bitsize argument.
-	Don't pass bitsize to constructor call back.  Pass BFD_RELOC_CTOR
-	instead of bitsize to add_to_set call back.
-	(_bfd_generic_final_link): Account for link_order relocs when
-	allocating space for relocations.  Handle them in link_order loop.
-	(_bfd_generic_reloc_link_order): New function.
-	(_bfd_default_link_order): If a reloc_link_order is seen here,
-	abort.
-	(_bfd_count_link_order_relocs): New function.
-	* libbfd-in.h (_bfd_generic_link_add_one_symbol): Remove bitsize
-	argument from declaration.
-	(_bfd_generic_reloc_link_order): Declare.
-	(_bfd_count_link_order_relocs): Declare.
-	* libbfd.h: Rebuilt.
-	* aoutx.h (aout_link_add_symbols): Remove bitsize argument from
-	call to _bfd_generic_link_add_one_symbol.
-	(NAME(aout,final_link)): Account for link_order relocs when
-	allocating space for relocations.  Handle them after handling all
-	input BFDs.
-	(aout_link_reloc_link_order): New function.
-	* ecoff.c (ecoff_link_add_externals): Remove bitsize argument from
-	call to _bfd_generic_link_add_one_symbol.
-	(ecoff_bfd_final_link): Account for link_order relocs when
-	allocating space for relocations.  Handle them in link_order loop.
-	(ecoff_link_write_external): Set the storage class of a defined
-	linker created symbol based on the section it is in.  Correct
-	bfd_link_hash_weak case to use .sc rather than .st.
-	(ecoff_reloc_link_order): New function.
-	* coff-alpha.c (alpha_bfd_reloc_type_lookup): Handle
-	BFD_RELOC_CTOR.
-	* coff-mips.c (mips_bfd_reloc_type_lookup): Likewise.
-
-	* sunos.c (sunos_read_dynamic_info): Remove unused locals dynsym
-	and buf.
-
-	* cisco-core.c (cisco_core_file_p): Only pass one argument to
-	bfd_zmalloc.  Free a pointer, not a union.
-	(cisco_bfd_is_local_label): Correct cast from asection to asymbol.
-
-Sun Mar 20 09:24:36 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* bfd/som.c (som_begin_writing): Fix thinko (off by one error).
-
-	* som.c (bfd_section_from_som_symbol): Only to do the value
-	comparison for function symbols within executables.
-
-	* som.c (bfd_section_from_som_symbol): Renamed from
-	som_section_from_subspace_index.  Pass in a native SOM symbol.
-	For executables, iterate through the sections to find out
-	which contains the symbol's address rather than using the
-	symbol_info field.  (symbol_info has a different meaning for
-	dynamicly linked executables.)
-
-	* trad-core.c (trad_unix_core_file_p): Don't pass abfd to
-	bfd_zmalloc.
-
-	* som.c (som_begin_writing): Fix braino (one call to align
-	space/subspace data was done unconditionally rather than
-	just for executables.)
-
-	* som.c (som_begin_writing): Align text in all executables to
-	make HPUX kernel happy.  Fixes strip/objcopy for shared
-	executables.
-
-Sat Mar 19 07:06:59 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_begin_writing): Account for alignment needs of
-	subspaces too when writing executables.  Never request a negative
-	bss size.  Fixes some problems with demand paged executables,
-	still having problems with pure executables and shared executables.
-
-Fri Mar 18 19:12:47 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* trad-core.c (trad_unix_core_file_p): Call bfd_zmalloc not
-	bfd_zalloc for rawptr, because later on we may call free, not
-	bfd_release, on it.
-
-	* bfd.c (struct _bfd): Add cisco_core_struct to tdata union.
-	* libbfd.c (bfd_read, bfd_seek): Add comments regarding errors.
-	* cisco-core.c: New file.
-	* Makefile.in: Change accordingly.
-	* configure.in: Recognize cisco_core_vec.
-	* config/m68k-aout.mt (SELECT_VECS): Add cisco_core_vec.
-	* targets.c: Add cisco_core_vec.
-	* bfd-in2.h: Rebuilt.
-
-Fri Mar 18 18:13:49 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.h (som_copyable_section_data_struct): New structure
-	containing all the private section information which needs
-	to be copied from input section to output section during
-	objcopy or strip.
-	(som_section_data_struct): Remove several fields now in
-	som_copyable_section_data_struct.  Make the space and 
-	subspace dictionaries be pointers (to save space when
-	only reading objects).
-
-	* som.c (bfd_som_set_section_attributes): Now returns a boolean;
-	some references changed.  Allocate a copyable data stucture if
-	none exists.  Store info into the copyable data structure.
-	(bfd_som_set_subsection_attributes): Likewise.
-	(som_is_space, som_is_subspace, som_is_container): New functions.
-	Use these instead of directly accessing private data.
-	(som_prep_headers): Allocate space and subspace headers here.
-	Fill in some fields in the space/subspace headers from the
-	copyable data.
-	(som_bfd_copy_private_section_data): Only copy the stuff
-	that we really need to make objcopy and strip work.  Allocate
-	the copy_data structure for the output bfd before copying.
-
-	* som.h (struct som_exec_data): New structure to hold exec
-	info that must be preserved when running objcopy/strip.
-	(struct somdata): Add new "exec_data" field and accessor
-	macro.  Add some comments on how the various fields are used.
-	(som_section_data_struct): Make is_space and is_subspace bitfields.
-	Delete unused subspace_index.  All references now use the
-	target_index field within the section structure itself.
-
-	* som.c (make_unique_section): Delete unused declaration.
-	(som_bfd_copy_private_bfd_data): New function.
-	(som_object_setup): Allocate space for and save exec information
-	that needs to be copied during objcopy/strip.
-	(som_mkobject): Do not allocate space for a file header here.
-	It is not used when only reading SOM objects.
-	(som_prep_headers): Allocate space for and attach a file header
-	to the output bfd.  For executables, use the saved system_id
-	value rather than trying to guess the right value.  Do not abort
-	wwhen setting file_hdr->entry* for executables.
-	(som_begin_writing): For executables, set the exec_entry and
-	exec_flags fields.
-	(som_copy_private_backend_section_data): Always return a value.
-
-	* libhppa.h (PA_PAGESIZE): Define.
-
-	* som.c (SOM_ALIGN): Define.
-	(som_begin_writing): If writing an executable, initialize all
-	fields in the exec header to zero.  Update fields in the exec
-	header as sizes of loadable subspaces are computed.  Carefully
-	preserve alignments when building executables.  Actually write the
-	exec after all the fields are filled in.
-
-        * Better long-filename handling.  Reads SOM ABI compliant extended
-	names, but doesn't quite write compliant extended names yet.
-	* som.c (som_slurp_extended_name_table): Delete function.  The
-	generic code will handle things correctly.
-	(som_slurp_armap): Seek to the beginning of the next member.
-	(normalize): New function.
-	(som_bfd_ar_write_symbol_stuff): Take the size of the extended
-	name table into account when computing the file offsets in the
-	SOM dictionary.  Make sure to align to an even boundary.
-	(som_write_armap): Initialize the checksum to zero.
-	(ar_maxchars): Fix.  Opps.
-
-Fri Mar 18 20:35:24 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* aoutx.h (reloc_type_lookup): Handle BFD_RELOC_CTOR on a 64-bit
-	machine.  Handle BFD_RELOC_SPARC13 and BFD_RELOC_SPARC_BASE13.
-
-Thu Mar 17 18:26:46 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* bfd-in.h (BFD_VERSION): Use @VERSION@.
-	* Makefile.in (bfd.h): Replace it with contents of VERSION file.
-	* bfd-in2.h: Regenerated.
-
-	* trad-core.c (trad_unix_bfd_is_local_label): Fixed typo where
-	this was also named trad_unix_bfd_copy_private_bfd_data.
-
-Thu Mar 17 10:37:07 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* aoutx.h, elfcode.h, coff-alpha.c, bout.c, ecoff.c, ecofflink.c,
-	elf32-hppa.c, elf32-mips.c, linker.c, som.c, sunos.c: If malloc(0)
-	returns NULL, it is not an error.  It's possible that some of
-	these checks are not necessary (because the size can never be
-	zero), but putting in the checks is the conservative thing to do
-	in light of the fact that some of these malloc calls replaced
-	unchecked alloca calls, in which a zero argument would work fine.
-
-Thu Mar 17 11:44:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* osf-core.c (osf_core_bfd_copy_private_bfd_data): Remove
-	duplicate definition.
-	(osf_core_bfd_is_local_label): Define.
-
-	* reloc.c (bfd_generic_get_relocated_section_contents): Don't fail
-	if malloc (0) fails.  bfd_canonicalize_reloc returning 0 is not a
-	failure indication, it merely means there are no relocs.
-
-	* elfcode.h (NAME(bfd_elf,write_object_contents)): Don't use space
-	after NAME, since SunOS /bin/cc can't handle it.
-
-Wed Mar 16 16:43:33 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* netbsd386.c (N_SET_FLAGS): Don't nuke the machine id field.
-	From sukes@glue.umd.edu (Tasuki Hirata).
-
-Wed Mar 16 07:55:54 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* aoutf1.h (4 places): Use a simple #if on ARCH_SIZE, rather than
-	all that convoluted stuff with NAME, CAT3, etc.  The convoluted
-	stuff broke for SunOS4 /bin/cc (due to DEFUN elimination, I guess).
-
-Wed Mar 16 00:02:05 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_prep_for_fixups): Detect section symbols based
-	on either the lack of private data or the symbol flags.  Do not
-	munge section symbol names anymore -- they no longer confuse GDB.
-	(som_begin_writing): Leave space for an exec header if writing
-	an executable.
-	(som_slurp_symbol_table): Recognize both forms of section symbol
-	names "L$0\002" and "$<FOO>$".  Change the name of "L$0\002"
-	section symbols to be the name of the section they represent.
-	Debugging  symbols begin with "L$0\001", not just "L$".
-
-Tue Mar 15 22:58:28 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* bfd-in2.h, libbfd.h, libcoff.h: Rebuilt.
-
-	* bfd-in.h (JUMP_TABLE): Add new entries to the jump table
-	for bfd_copy_private_section_data, bfd_copy_private_bfd_data,
-	and bfd_is_local_label.
-
-	* targets.c: Add new entries to the bfd_target structure.
-	
-	* bfd.c (bfd_copy_private_bfd_data): New definition.
-
-	* section.c (bfd_copy_private_section_data): New definition.
-
-	* syms.c (bfd_is_local_label): New definition.
-
-	* libbfd-in.h (bfd_generic_is_local_label): Declare.
-
-	* libbfd.c (bfd_generic_is_local_label): New function.
-
-	* *-core.c: Provide default definitions for new functions in
-	the target vector which all point to bfd_false.
-
-	* aout-target.h, coffcode.h, elf32-target.h elf64-target.h, ieee.c
-	libaout.h, libecoff.h, nlm-target.h, oasys.c, srec.c, tekhex.c
-	Default new vectors for copying private backend data to bfd_true.
-	Default new vector for determining if a symbol is a local label
-	to bfd_generic_is_local_label.
-
-	* som.c (som_bfd_copy_private_section_data): New function.
-	(som_bfd_is_local_label): New function.
-	(som_bfd_copy_private_bfd_data): For now default to bfd_true.
-
-	* elf32-hppa.c (hppa_elf_is_local_label): New function.
-
-Tue Mar 15 23:55:47 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* cf-m68klynx.c (CALC_ADDEND): Use _bfd_m68klynx_howto_table.
-
-Tue Mar 15 04:41:13 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
-
-	* Most files:
-	Replace DEFUN and DEFUN_VOID with K&R-style function definition.
-	Indent some of them to GNU standards.
-
-	* aout32.c, archures.c, core.c, cpu-h8300.c, cpu-i960.c,
-	cpu-m68k.c, cpu-m88k.c, cpu-mips.c, cpu-vax.c, ctor.c, demo64.c,
-	elf32-hppa.h, gen-aout.c, host-aout.c, init.c, libhppa.h,
-	libieee.h, liboasys.h, newsos3.c, som.h, stab-syms.c, sunos.c:
-	Update copyright years.
-
-Mon Mar 14 11:41:23 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_prep_for_fixups): A relocation involving the section
-	symbol for the *ABS* section is really a relocation involving
-	no symbol.
-	(som_slurp_symbol_table): Do not set BSF_GLOBAL or BSF_EXPORT for
-	undefined symbols.  Correctly distinguish between debugger symbols
-	and section symbols.
-
-	* som (setup_sections): Set SEC_DEBUGGING and the section attributes
-	for spaces and subspaces.
-
-	* som.c (som_bfd_count_ar_symbols): Fix typo.
-
-	* som.c (som_object_setup): Set EXEC_P, D_PAGED, WP_TEXT, and
-	HAS_RELOC based on the object's magic number.
-	(make_unique_section): Delete function.  BFD and its users are
-	prepared to handle multiple sections with the same name.
-	(setup_sections): Allocate space on the BFD's obstack to hold
-	section names.  Use bfd_make_setion_anyway rather than the
-	obsolete make_unique_section.
-	(som_prep_headers): Choose the correct SOM magic number based
-	on the BFD's flags.
-	(som_bfd_fill_in_ar_symbols): Return false, not NULL on error.
-
-Sat Mar 12 09:46:09 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	* elf32-ppc.c: Renamed from elf32-powerpc.c.
-	* nlm32-ppc.c: Renamed from nlm32-powerpc.c.
-	* Makefile.in, configure.in: Corresponding changes.
-
-Fri Mar 11 22:27:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elf32-powerpc.c: Extensive changes to update to preliminary ABI.
-
-Fri Mar 11 00:34:59 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* sunos.c (sunos_read_dynamic_info):  Assume that dynamic info
-	is always located at the start of the data section to allow
-	recovery of the dynamic info from a stripped executable.
-	* ecoff.c (ecoff_styp_to_sec_flags):  Handle STYP_PDATA, STYP_XDATA
-	and STYP_COMMENT.
-
-Wed Mar  9 17:17:53 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* libbfd-in.h: Remove alloca cruft.  It was missing some necessary
-	cruft (like the #pragma alloca for AIX).
-	In addition to that problem, the C alloca calls xmalloc, which
-	means checking for being out of memory can't work right.  The
-	following changes remove all uses of alloca from BFD.
-	* hosts/solaris2.h: Remove alloca cruft.
-	* som.c: Replace alloca with a fixed size auto array.
-	* aoutx.h, elfcode.h, nlmcode.h, bout.c, coff-alpha.c, ecoff.c,
-	ecofflink.c, elf32-hppa.c, elf32-mips.c, linker.c, reloc.c, som.c,
-	sunos.c: Replace alloca with malloc and appropriate error checking and
-	freeing.
-	* linker.c: Replace alloca with obstack_alloc.
-	* libbfd.h: Rebuilt.
-
-Tue Mar  8 12:10:38 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	* coff-mips.c (mips_relocate_section): Handle MIPS_R_LITERAL like
-	MIPS_R_GPREL.
-
-Sat Mar  5 14:08:54 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* elf32-hppa.h, elfcode.h:  Replace uses of Elf*_Half, Elf*_Word,
-	Elf*_Off typedefs by their expansion, the typedefs have been
-	removed from include/elf/internal.h.
-	* elfcode.h (bfd_section_from_shdr):  Handle SHT_DYNAMIC section like
-	SHT_PROGBITS section.
-
-Thu Mar  3 20:03:39 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.h (_PA_RISC_ID): Treat HOST_HPPAOSF just like HOST_HPPABSD.
-
-Wed Mar  2 13:28:06 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* configure.host: Recognize i[34]86-sequent-*.
-
-	* trad-core.c (trad_unix_core_file_p): A non-zero, not zero,
-	return from bfd_seek indicates an error.
-	New macro TRAD_CORE_DSIZE_INCLUDES_TSIZE to replace
-	TRAD_CORE_STACK_OFFSET.
-	* hosts/symmetry.h: Define TRAD_CORE_DSIZE_INCLUDES_TSIZE and
-	TRAD_CORE_USER_OFFSET but not HOST_STACK_OFFSET.
-
-Wed Mar  2 11:57:03 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.[ch]: Do not include libhppa.h in som.c, instead include
-	it in som.h.
-
-	* elf32-hppa.[ch]: Do not include libhppa.h in elf32-hppa.c, instead
-	include it in elf32-hppa.h.
-
-	* som.c (log2): Return -1 on error rather than aborting.
-	(setup_sections): Bubble up an error from log2.
-
-	* Changes to make HP C compiler happy in both traditional
-	and ANSI mode.
-	* som.c (hppa_som_gen_reloc_type): Use correct enum type for
-	field parameter.
-	(bfd_som_set_section_attributes): Use unsigned int rather than
-	unsigned char to avoid GNU-C extensions.
-	(bfd_som_attach_aux_hdr): Return a boolean to indicate success
-	or failure rather than aborting on failure.
-
-	* som.h (bfd_som_set_section_attributes): Fix prototype to match
-	som.c changes.
-	(bfd_som_attach_aux_hdr): Add prototype.
-	(hppa_som-gen_reloc_type): Likewise.
-
-	* elf32-hppa.c: Add a couple casts to make HP compiler happy.
-	(hppa_look_for_stubs_in_section): Do not return false on failure
-	until rest of code is ready to handle it.  Abort for now.
-
-Tue Mar  1 18:33:59 1994  Jim Kingdon  (kingdon@deneb.cygnus.com)
-
-	* bfd-in2.h: Rebuilt.
-
-Tue Mar  1 13:06:53 1994  Kung Hsu  (kung@mexican.cygnus.com)
-
-	* i386os9k.c: use new functions bfd_set_error and bfd_get_error.
-	* Makefile.in: delete an extra blank.
-	* configure.in : Add i396os9k_vec.
-
-Mon Feb 28 15:41:01 1994  Kung Hsu  (kung@mexican.cygnus.com)
-
-	* config.bfd : Add i386-os9k.
-	* config/i386-os9k.mt : Newly add os9k target makefile.
-
-	* i386os9k.c : new file to handle os9k format bfd.
-	* Makefile.in : Handle new file i386os9k.c
-	* targets.c : Add bfd_target_os9k_flavour and i386os9k_vec.
-	* cache.c : Initialize cache_sentinel to 0.
-
-Sun Feb 27 16:30:55 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c (mismatches, retval_mismatches): Fix mismatch
-	action in case where caller specified no argument relocation.
-	(hppa_elf_build_linker_stub): Try again to get the sym_ptr_ptr
-	right in the original relocation and the stub's relocation.
-
-        * elf32-hppa.h (hppa_look_for_stub_in_section): Fix typo.  Delete
-	unused symbols argument.
-
-	* elf32-hppa.c (hppa_elf_stub_reloc): Accept asymbol ** rather
-	than asymbol * for original target symbol.  All callers changed.
-	Set reloc->sym_ptr_ptr appropriately.
-	(hppa_elf_build_linker_stub): Set reloc->sym_ptr_ptr correctly.
-	(hppa_elf_look_for_stubs_in_section): No longer need symbols
-	argument.  Use the output symbols when canonicalizing the relocs,
-	creating them if necessary.
-
-	* linker.c (_bfd_generic_link_output_symbols): Do not
-	rebuild/clobber the output symbols if they already exist.
-
-Sun Feb 27 15:22:36 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* targets.c (BFD_SEND, BFD_SEND_FMT): Add debugging versions that
-	check all the pointer dereferences.  Enabled via DEBUG_BFD_SEND.
-	* bfd-in2.h: Rebuilt.
-
-	* srec.c (hex_value): Always set to a size of 256 bytes.
-	(srec_init): Cosmetic changes.
-
-Sun Feb 27 11:18:47 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elf32-hppa.c: Second half of major cleanup.  More comments,
-	PARAMize and staticize rest of functions.  Delete unused
-	functions.  Delete unused/unnecessary arguments to some functions.
-	Group static vars together.  Abort for bad errors until we have
-	error code propogation working.  Work on spacing and indention.
-	Add FIXMEs for unresolved problems.  Use enums rather than
-	#defines for lots of things.  Merge two functions which build
-	linker stubs into a single function (so they can easily share a
-	ton of common code).
-
-Sat Feb 26 10:00:45 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	* reloc.c (_bfd_relocate_contents): Adjust handling of overflow to
-	avoid depending upon right shifts of signed numbers, and to
-	correct handling of src_mask with lower bits zero.
-
-	* aoutx.h, archive.c: Add casts to avoid warnings from SVR4 cc.
-	* ecoff.c, ecofflink.c, ecoffswap.h, srec.c: Likewise.
-	* elf32-i386.c: Likewise.
-	* elfcode.h (bfd_section_from_shdr): Make i unsigned; remove old
-	#if 0 code.
-	(elf_write_phdrs): Make i unsigned.
-	(map_program_segments): Make i and n_left unsigned.
-	(assign_file_positions_except_relocs): Make i unsigned.
-	(write_shdrs_and_ehdr): Make count unsigned.
-	(assign_file_positions_for_relocs): Make i unsigned.
-	(NAME(bfd,elf_write_object_contents)): Make count unsigned.
-	(section_from_elf_index): Make index argument unsigned.
-
-Fri Feb 25 21:34:58 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	* elfcode.h: Don't include assert.h.
-	(swap_out_syms): Use BFD_ASSERT rather than assert.
-
-	* linker.c (_bfd_generic_link_write_global_symbol): Add missing
-	break in switch.
-
-	* hosts/i386v4.h (qsort, strtol): Remove incorrect and useless
-	declarations.
-
-Fri Feb 25 16:35:57 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* libhppa.h (hppa_rebuild_insn): Moved here from elf32-hppa.c.
-
-	* elf32-hppa.h (elf_hppa_tc_symbol): Add new arguments.
-	(elf_hppa_tc_make_sections): Likewise.
-	(elf_hppa_final_processing): Add extern decl.
-
-	* elf32-hppa.c: First half of major cleanup.  Add/cleanup lots of
-	comments.  PARAMize some static functions.  Delete unused functions.
-	Delete unused/unnecessary arguments to many functions.  Group
-	static vars together.  Collapse common case statements together
-	in many places.  Use default case when possible instead of listing
-	each case separately.  Abort for bad errors until we get error
-	code propogation working.  Work on spacing and indention problems.
-	Add FIXMEs for some unresolved problems.  Delete hopelessly broken 
-	COMPLEX relocation support (it's never used anyway).
-	(hppa_elf_rebuild_insn): Delete.  Moved into libhppa.h.
-	(elf_hppa_tc_symbol): Accept and use new arguments (symext chains).
-	(elf_hppa_tc_make_sections): Likewise.
-
-	* format.c (bfd_check_format_matches): Initialize matching_vector
-	to keep gcc -Wall quiet.
-
-	* elfcode.h (elf_slurp_reloca_table): Fix typo.
-
-	* som.c (som_get_symtab_upper_bound): Use "sizeof (asymbol *)"
-	not "sizeof (som_symbol_type *)".
-
-	* elfcode.h (elf_get_symtab_upper_bound): Use "sizeof (asymbol *)"
-	not "sizeof (asymbol").  Opps.
-
-Fri Feb 25 13:19:04 1994  Ted Lemon  (mellon@pepper.ncd.com)
-
-	* bfd.c (bfd_get_gp_size): Can't return gp value on an archive.
-	(bfd_set_gp_size):  Can't set gp value on an archive.
-
-Fri Feb 25 12:57:00 1994  Steve Chamberlain  (sac@jonny.cygnus.com)
-
-	* srec.c (pass_over): Don't skip too many characters when
-	end of line seen.
-
-Fri Feb 25 11:41:57 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	* ecoff.c (ecoff_sizeof_headers): Align result to 16 byte
-	boundary.
-
-Thu Feb 24 07:13:22 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_derive_misc_symbol_info): Derive symbol_info
-	field for absolute symbols in the same manner as undefined
-	and common symbols.
-
-Thu Feb 24 04:29:19 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* elfcode.h (elf_core_file_p):  Check for core file e_machine match
-	like in elf_object_p.
-
-Wed Feb 23 18:28:37 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elfcode.h (alloca): Delete declaration.
-
-	* som.c (som_prep_headers): Use CPU_PA_RISC1_0 for magic
-	number rather than HP9000S800_ID.  Note som.c is careful
-	to make sure CPU_PA_RISC1_0 is always defined.
-
-Mon Feb 21 10:12:02 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* Makefile.in (targets.o, archures.o): Use ALL_CFLAGS to supply
-	flags to explicit compile actions.
-
-Mon Feb 21 09:50:06 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
-
-	* ecofflink.c (ecoff_write_symhdr): Set symhdr->magic here.
-	* ecoff.c (ecoff_write_object_contents): Make sure .bss section
-	ends on a page boundary if there is no symbol table.
-	(ecoff_bfd_final_link): Don't set symhdr->magic here.
-
-	* hosts/hp300.h: Include <stdlib.h>; don't declare free.
-
-	* som.c (som_bfd_count_ar_symbols): Use a pointer and alloca
-	rather than an array of variable size.
-	(som_bfd_fill_in_ar_symbols): Likewise.
-	(som_bfd_ar_write_symbol_stuff): Likewise.
-
-	* coff-alpha.c (alpha_relocate_section): Rewrite mask and shift
-	operation to avoid OSF 1.3 cc bug.
-	* ecoff.c (ecoff_write_object_contents): Make text_size, data_size
-	and bss_size bfd_size_type instead of unsigned long.  Make
-	text_start and data_start bfd_vma instead of unsigned long.
-	* ecofflink.c (ecoff_add_string): Remove incorrect cast of return
-	value.
-
-Sun Feb 20 16:06:54 1994  Ian Lance Taylor  (ian@lisa.cygnus.com)
-
-	* linker.c (_bfd_generic_link_add_archive_symbols): Consider
-	symbols in the order they appear in the archive map.
-
-Sat Feb 19 03:17:32 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* coff-alpha.c (reloc_nil):  Add forward declaration, add missing
-	error_message argument.
-	* coff-sparc.c (bfd_coff_generic_reloc):  Add forward declaration,
-	add missing error_message argument.
-	* mipsbsd.c (mips_fix_hi16_s):  Add forward declaration, add missing
-	error_message argument.
-
-Fri Feb 18 11:41:58 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Support for PowerPC NetWare.
-	* nlm32-powerpc.c: New file.
-	* config.bfd (powerpc-*-netware*): New target; use ppc-nlm.
-	* config/ppc-nlm.mt: New file.
-	* configure.in (nlm32_powerpc_vec): New target vector; use
-	nlm32-powerpc.o, nlm32.o, nlm.o.
-	* targets.c (nlm32_powerpc_vec): Declare.
-	* Makefile.in (BFD32_BACKENDS): Add nlm32-powerpc.o.
-	(CFILES): Add nlm32-powerpc.c.
-
-	Initial support for PowerPC ELF.  Done without an ABI, and
-	probably to be changed when I get an ABI.
-	* config.bfd (powerpc-*-sysv4*): New target; use ppc-elf.
-	* config/ppc-elf.mt: New file.
-	* configure.in (bfd_elf32_powerpc_vec): New target vector; use
-	elf32-powerpc.o, elf32.o, elf.o.
-	* elf32-powerpc.c: New file.
-	* elfcode.h (prep_headers): Add bfd_arch_powerpc case.
-	(elf_set_arch_mach): Likewise.
-	* targets.c (bfd_elf32_powerpc_vec): Declare.
-	* Makefile.in (BFD32_BACKENDS): Add elf32-powerpc.o.
-	(CFILES): Add elf32-powerpc.c.
-	Rebuilt dependencies.
-
-Thu Feb 17 15:29:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coffgen.c (coff_write_linenumbers): Always return a value.
-
-	* elfcode.h (elf_slurp_symbol_table): Handle zero symbols
-	reasonably.  Allocate x_symp using alloca.
-
-	* elfcode.h (map_program_segments): ELF program header entries
-	must be sorted by load address.  This used to generate the entries
-	in reverse order.
-
-	* section.c (SEC_IN_MEMORY): Define.
-	(asection): Rename unused field otheruserdata to contents, and
-	make it char *.
-	(bfd_make_section_anyway): Initialize contents field to NULL.
-	(bfd_get_section_contents): If SEC_IN_MEMORY is set, get section
-	contents from contents field rather than from file.
-	* bfd-in2.h: Rebuilt.
-
-Thu Feb 17 08:30:53 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* bfd.c (bfd_get_error, bfd_set_error): New functions.
-	(bfd_error): Make static.
-	(bfd_error_type): Renamed from bfd_ec.  Prepend "bfd_error_" to
-	all values.
-	* bfd-in2.h: Regenerated.
-	* aix386-core.c, aout-adobe.c, aout-encap.c, aout-target.h, 
-	aoutf1.h, aoutx.h, archive.c, archures.c, 
-	bfd.c, bout.c, cache.c, coff-alpha.c, coff-mips.c, 
-	coff-rs6000.c, coffcode.h, coffgen.c, core.c, ctor.c, 
-	ecoff.c, ecofflink.c, elf.c, elf32-hppa.c, elf32-mips.c, 
-	elfcode.h, format.c, hash.c, hp300hpux.c, hppabsd-core.c, 
-	i386lynx.c, ieee.c, libbfd.c, libelf.h, linker.c, 
-	lynx-core.c, nlm.c, nlm32-alpha.c, nlm32-i386.c, 
-	nlm32-sparc.c, nlmcode.h, oasys.c, opncls.c, osf-core.c, 
-	ptrace-core.c, reloc16.c, rs6000-core.c, section.c, som.c, 
-	srec.c, sunos.c, syms.c, targets.c, tekhex.c, 
-	trad-core.c: Change callers.
-
-Tue Feb 15 22:27:27 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c: Remove FIXMEs for things which have been dealt with.
-
-Tue Feb 15 19:39:24 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* section.c (bfd_get_section_contents): Since this function reads
-	unrelocated contents, the section's raw size is always the one to
-	use for bounds checking.
-
-	* linker.c (default_indirect_link_order): In assertion, compare
-	link_order size field against cooked size, not raw size, of input
-	section.
-
-	* bout.c (b_out_get_reloc_upper_bound): For BSS section, just
-	return 0.
-	(aligncode): When shrinking, the addend should be set to the
-	current offset in the section plus the number of bytes of padding
-	that will actually be retained.
-	(b_out_relax_section): If a section contains no relocations, don't
-	bother processing them.
-	(b_out_get_relocated_section_contents): Set reloc_done.  Assert
-	that bfd_get_section_contents returns true.  Check that relocs are
-	properly ordered.
-	(b_out_get_relocated_section_contents, case ALIGNDONE): Assert
-	that reloc->addend falls between the current source offset and the
-	raw size of the input section.
-
-	* config.bfd: Support i960 vxworks versions > 5.0 with coff, not
-	bout.  Default with no version number is still bout.  Support
-	explicit i960-coff target too.
-
-	* bout.c: Changed some indentation, deleted trailing whitespace,
-	fixed some comments, removed some "#if 1" lines.
-	(output_addr): New macro.
-	(calljx_callback, callj_callback, get_value, abs32code, aligncode,
-	b_out_get_relocated_section_contents): Use it for readability.
-
-Tue Feb 15 09:00:16 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_bfd_prep_for_ar_write): Iterate through the SOM
-	symbols, not the BFD symbols.
-	(som_bfd_ar_write_symbol_stuff): Likewise.
-
-Mon Feb 14 22:55:20 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_slurp_symbol_table): Do not die if a BFD doesn't
-	have any symbols.
-
-	* Finish basic read-write support for SOM archive libraries.  Bugs
-	surely remain as this hasn't been tested all that much.
-	* som.c (SOM_LST_HASH_SIZE, SOM_LST_MODULE_LIMIT): Define.
-	(struct som_misc_symbol_info): New structure to hold info necessary
-	to build both normal and library symbol tables.
-	(som_derive_misc_symbol_info): New function to derive info necessary
-	to build both normal and library symbol tables.
-	(som_build_and_write_symbol_table): Use new function to derive misc
-	symbol information.
-	(som_slurp_symbol_table): Update backend private data for symbols
-	appropriately.
-	(som_bfd_prep_for_ar_write): New function.
-	(som_bfd_ar_symbol_hash): New function.
-	(som_bfd_ar_write_symbol_stuff): New function.
-	(som_write_armap): Flesh out.
-	(som_vec): Fix ar padding character.
-
-	* som.c: Consistently use memset rather than bzero.
-
-Mon Feb 14 17:02:28 1994  Stu Grossman  (grossman at cygnus.com)
-
-	* coff-rs6000.c:  Add Lynx core file support, use HOST_AIX, where
-	appropriate.
-	* rs6000-core.c:  Use HOST_AIX instead of COREFILES_PLEASE.
-	* config/rs6000.mh:  Remove defs of ARCHIVES_PLEASE and
-	COREFILES_PLEASE.
-	* config/rs6000lynx.mh:  Turn on Lynx core file support.
-	* hosts/rs6000.h:  #define HOST_AIX.
-	* hosts/rs6000lynx.h:  Create this to enable Lynx host support.
-
-Sun Feb 13 14:30:00 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.h (som_symbol_data): Safely access backend private data
-	for BFD symbols.  All callers changed.
-
-	* Read-only SOM archive support.
-	* som.c (som_bfd_count_ar_symbols): New helper function.
-	(som_bfd_fill_in_ar_symbols): New helper function.
-	(som_slurp_armap): New function to read a SOM LST.
-
-	* som.h: Include <lst.h> and <ar.h>.
-
-Sat Feb 12 22:34:14 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* elfcode.h (elf_map_symbols): Fix typo.
-	(write_object_contents): Check return values from prep_headers and
-	elf_compute_section_file_positions.
-	(set_section_contents): Likewise.
-
-Fri Feb 11 16:56:50 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* archive.c (normalize) [VMS]: Call malloc, not bfd_xmalloc.
-	(bfd_construct_extended_name_table): Check result of normalize.
-
-Tue Feb  8 08:57:31 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	Make all callers of malloc or realloc (including via obstacks)
-	check the result for NULL.  Most set bfd_error to no_memory and
-	return in that case; a few are harder to fix, and are marked
-	with "FIXME <return type>".
-
-	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub
-	hppa_elf_build_long_branch_stub):  Check bfd_make_empty_symbol return.
-	* linker.c (_bfd_generic_link_output_symbols
-	_bfd_generic_link_write_global_symbol): Ditto
-	* section.c (bfd_make_section_anyway): Ditto.
-
-	* tekhex.c (find_chunk tekhex_mkobject): Check bfd_alloc.
-	(first_phase): Ditto.  FIXME void
-	(tekhex_make_empty_symbol): Check bfd_zalloc.
-
-	* sunos.c (sunos_read_dynamic_info): Check bfd_zalloc.
-	(MY(read_dynamic_symbols) MY(read_dynamic_relocs)): Check bfd_alloc.
-
-	* stringhash.c (_bfd_stringtab_hash_newfunc): Check bfd_hash_allocate.
-
-	* srec.c: Indent.
-	(fillup_symbols): Check bfd_alloc.  FIXME void
-	(srec_mkobject srec_get_section_contents
-	srec_set_section_contents): Check bfd_alloc. 
-	(srec_make_empty_symbol): Check bfd_zalloc.
-
-	* som.c (hppa_som_gen_reloc_type): Check bfd_alloc_by_size_t.
-	(make_unique_section): Check bfd_alloc.
-	(som_new_section_hook): Check bfd_zalloc.
-	(bfd_som_attach_aux_hdr): Ditto.  FIXME void
-
-	* rs6000-core.c (rs6000coff_core_p): Check bfd_zalloc.
-
-	* osf-core.c (osf_core_make_empty_symbol): Check bfd_zalloc.
-	(osf_core_core_file_p): Check bfd_alloc.
-
-	* oasys.c (oasys_slurp_symbol_table oasys_archive_p
-	oasys_mkobject oasys_object_p oasys_new_section_hook
-	oasys_set_section_contents): Check bfd_alloc.
-	(oasys_slurp_section_data): Check bfd_zalloc and bfd_alloc.
-	(oasys_make_empty_symbol): Check bfd_zalloc.
-
-	* nlmcode.h (nlm_make_empty_symbol): Check bfd_zalloc.
-	(nlm_slurp_symbol_table): Check bfd_zalloc and bfd_alloc.
-
-	* nlm32-sparc.c (nlm_sparc_read_import): Check bfd_alloc.
-
-	* nlm32-i386.c (nlm_i386_read_import): Check bfd_alloc.
-
-	* nlm32-alpha.c (nlm_alpha_read_import): Check bfd_alloc.
-
-	* linker.c (_bfd_link_hash_newfunc
-	(generic_link_hash_newfunc
-	(archive_hash_newfunc
-	(_bfd_generic_link_add_one_symbol): Check bfd_hash_allocate.
-	(_bfd_generic_final_link
-	(_bfd_generic_link_output_symbols
-	(default_indirect_link_order): Check bfd_alloc.
-	(bfd_new_link_order): Check bfd_alloc_by_size_t.
-
-	* irix-core.c (irix_core_make_empty_symbol): Check bfd_zalloc.
-
-	* ieee.c: Indent.
-	(read_id get_symbol get_section_entry ieee_archive_p ieee_object_p
-	ieee_slurp_section_data ieee_new_section_hook): Check bfd_alloc.
-	(do_one): Check bfd_alloc.  Return a boolean.
-	(ieee_slurp_section_data): Check it.
-	(init_for_output): Check bfd_alloc.  Return a boolean.
-	(ieee_set_section_contents): Check it.
-	(do_with_relocs):  Check bfd_alloc.  Return a boolean.
-	(ieee_bfd_debug_info_accumulate): Ditto.  FIXME void.
-	(ieee_mkobject): Check bfd_zalloc.
-	(ieee_make_empty_symbol): Check bfd_zmalloc.
-
-	* hpux-core.c (hpux_core_make_empty_symbol): Check
-	bfd_zalloc.
-
-	* hppabsd-core.c (hppabsd_core_make_empty_symbol): Check
-	bfd_zalloc.
-	(hppabsd_core_core_file_p): Check bfd_zalloc.
-
-	* hp300hpux.c (MY(slurp_symbol_table)): Check bfd_alloc.
-
-	* elfcode.h (elf_new_section_hook): Check bfd_alloc.
-	(bfd_section_from_phdr): Ditto.
-	(write_relocs): Ditto.  FIXME void
-	(elf_map_symbols assign_section_numbers map_program_segments):
-	Ditto.  Return a boolean. 
-	(swap_out_syms): Ditto.  Check elf_map_symbols.
-	(elf_slurp_symbol_table): Check bfd_zalloc.
-	(elf_slurp_reloca_table): Check bfd_alloc.
-	(elf_slurp_reloc_table): Ditto.
-	(elf_compute_section_file_positions): Check assign_section_numbers.
-	(assign_file_positions_except_relocs): Return a boolean.
-	Check map_program_segments.
-	(elf_compute_section_file_positions): Check it.
-
-	* elf32-mips.c (mips_elf_final_link): Check bfd_alloc.
-
-	* elf32-hppa.c (hppa_elf_stub_branch_reloc): Check bfd_zmalloc and
-	realloc. 
-	(hppa_elf_stub_reloc): Ditto.
-	(hppa_elf_build_arg_reloc_stub): Check bfd_zalloc.
-	(hppa_elf_build_long_branch_stub): Ditto.
-	(elf32_hppa_backend_symbol_table_processing): Ditto.
-
-	* ecoff.c (ecoff_set_symbol_info): Check bfd_alloc.  Return a boolean.
-	(ecoff_slurp_symbol_table): Check it.
-	(ecoff_slurp_armap): Check bfd_alloc.
-	(ecoff_write_armap): Check bfd_zalloc.
-	(ecoff_link_hash_newfunc): Check bfd_hash_allocate and
-	_bfd_link_hash_newfunc. 
-	(ecoff_link_add_externals): Check bfd_alloc.
-
-	* ctor.c (bfd_constructor_entry): Check bfd_alloc.
-
-	* coffgen.c (coff_real_object_p): Check bfd_alloc.
-	(coff_renumber_symbols): Check bfd_alloc_by_size_t.  Return a boolean.
-	(coff_write_symbol): Check bfd_alloc.  FIXME int
-	(coff_write_linenumbers): Check bfd_alloc.  Return a boolean.
-	(coff_section_symbol): Check bfd_alloc_by_size_t.
-	(coff_get_normalized_symtab): Check bfd_alloc.
-	(coff_bfd_make_debug_symbol): Check bfd_zalloc.
-	* libcoff-in.h: Change decls of coff_renumber_symbols,
-	coff_write_linenumbers.
-	* libcoff.h: Rebuilt.
-	* coffcode.h (coff_write_object_contents): Check
-	coff_renumber_symbols, coff_write_linenumbers.
-
-	* coffcode.h: Indent.
-	(coff_add_missing_symbols): Check bfd_alloc_by_size_t.  Return a
-	boolean. 
-	(coff_write_object_contents): Check it.
-
-	* coff-alpha.c (alpha_relocate_section): Check bfd_alloc.
-	* coff-mips.c (mips_relocate_section): Ditto.
-
-	* archive.c (bfd_slurp_bsd_armap_f2): Check bfd_alloc value.
-	(do_slurp_bsd_armap): Ditto.
-	(compute_and_write_armap): Check bfd_realloc value.
-
-	* aoutx.h (translate_from_native_sym_flags): Check bfd_alloc
-	return value.  Return boolean value.
-	(NAME(aout,make_empty_symbol)): Check bfd_zalloc return value.
-	(NAME(aout,slurp_symbol_table)): Check bf_alloc and bfd_zalloc
-	return value.
-	(add_to_stringtab): Ditto.  FIXME void
-	(aout_link_hash_newfunc): Check bfd_hash_allocate return value.
-	(aout_link_add_symbols): Check bfd_alloc value.
-	(translate_symbol_table): Check translate_from_native_sym_flags.
-	* hp300hpux.c (MY(slurp_symbol_table)): Ditto.
-	* aoutx.h (aout_link_hash_newfunc): Check _bfd_link_hash_newfunc.
-
-	* opncls.c (bfd_zalloc bfd_realloc): Check result of bfd_alloc.
-
-	* opncls.c (obstack_chunk_alloc): Define as malloc, not
-	bfd_xmalloc_by_size_t. 
-	(_bfd_new_bfd): Check obstack_begin for 0 return.
-
-	* ieee.c (obstack_chunk_alloc): Define as malloc, not
-	bfd_xmalloc_by_size_t. 
-	(ieee_archive_p): Check obstack_begin for 0 return and
-	obstack_finish for NULL return.
-
-	* hash.c (obstack_chunk_alloc): Define as malloc, not
-	bfd_xmalloc_by_size_t. 
-	(bfd_hash_table_init_n): Check obstack_begin for 0 return and
-	obstack_finish for NULL return.
-	(bfd_hash_lookup): Check obstack_alloc for NULL return.
-
-	* ecofflink.c (obstack_chunk_alloc): Define as malloc, not
-	bfd_xmalloc_by_size_t. 
-	bfd_ecoff_debug_accumulate
-	bfd_ecoff_debug_accumulate_other): Check obstack_alloc.
-	(add_file_shuffle add_memory_shuffle): Check obstack_alloc for
-	NULL return.  Return boolean, not void.
-	(bfd_ecoff_debug_init): Check obstack_begin for 0 return.
-	(bfd_ecoff_debug_accumulate): Check add_file_shuffle
-	and add_memory_shuffle return. 
-	(string_hash_newfunc): Check bfd_hash_allocate and bfd_hash_newfunc.
-	(bfd_ecoff_debug_accumulate): Check bfd_alloc.
-	(ecoff_add_string): Check add_memory_shuffle return.
-
-	* libbfd-in.h (xmalloc, bfd_xmalloc, bfd_xmalloc_by_size_t):
-	Remove decls. 
-	* libbfd.h: Rebuilt.
-
-Fri Feb 11 15:35:32 1994  Stu Grossman  (grossman at cygnus.com)
-
-	* configure.host:  Add Lynx/rs6000 support.
-	* config/i386-nlm.mt:  Enable a.out file support.
-	* config/rs6000lynx.mh:  Lynx/rs6000 host support.
-
-Fri Feb 11 17:25:58 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* archive.c (compute_and_write_armap): Rewrite somewhat to improve
-	memory usage.
-
-Fri Feb 11 13:10:42 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-	* archive.c: Change all references to '\n' in archive magic
-	to '\012', for greater portability.
-	* ecoff.c (ecoff_write_armap): Ditto.
-
-Thu Feb 10 12:58:48 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (aout_link_write_other_symbol): Check strip settings to
-	see whether symbol should be output.
-	* genlink.h (struct generic_write_global_symbol_info): Added info
-	field.
-	* linker.c (_bfd_generic_final_link): Initialize wginfo.info.
-	(_bfd_generic_link_write_global_symbol): Check strip settings to
-	see whether symbol should be output.
-	* elf32-mips.c (mips_elf_final_link): Initialize wginfo.info.
-
-Wed Feb  9 21:34:58 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_reloc_queue_find): Do not examine a NULL queue entry.
-
-	* som.c: Cast return values from BFD memory allocation routines to
-	avoid warnings from the HP compiler.
-
-Wed Feb  9 12:55:02 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-alpha.c (alpha_relocate_section): Accept a LITERAL
-	reloc on an "ldl" instruction too.
-
-	* archive.c (bfd_ar_hdr_from_filesystem): Cast status elements
-	when passing them to sprintf.  Use %ld instead of %d.
-
-	* coff-rs6000.c (rs6000coff_mkarchive): Return false.
-	(rs6000_coff_snarf_ar_hdr): Don't declare errno; it's not used.
-	Also removed unused variable namelen.
-	(rs6000coff_write_armap): Declare orl_count and stridx parameters.
-
-Tue Feb  8 18:00:34 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* libbfd-in.h (xmalloc): Don't declare parameter type, to avoid
-	conflicts.
-	* libbfd.h: Rebuilt.
-
-Tue Feb  8 15:55:50 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* coff-alpha.c (reloc_nil): New function.
-	(alpha_howto_table): Use it as special_function to prevent certain
-	relocs from being adjusted by bfd_perform_relocation.  IGNORE
-	reloc should be partial_inplace.
-	(alpha_ecoff_get_relocated_section_contents): Accept a LITERAL
-	reloc on an "ldl" instruction too.
-
-Tue Feb  8 00:32:28 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* elf32-hppa.c (CURRENT_STUB_OFFSET, hppa_elf_build_arg_reloc_stub,
-	hppa_elf_build_long_branch_stub):  Cast to char * instead of int
-	before performing pointer arithmetic.
-
-Mon Feb  7 20:56:27 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* config.bfd (hppa*-*-osf*): Use bfd_name hppaosf for this
-	configuration.
-	(hppa*-*-*elf*): This configuration used hppa-elf now.
-
-	* som.c: This file is also used for HOST_HPPAOSF.
-
-	* targets.c (bfd_target_vector): Enable som_vec for HOST_HPPAOSF.
-
-	* hosts/hppaosf.h: New host configuration file.
-
-	* config/hppabsd.mt (SELECT_VECS): Add bfd_elf32_hppa_vec as
-	BSD handles both SOM and ELF object files.
-
-	* config/hppaosf.mh (HDEFINES): Delete.  No longer needed.
-	(RANLIB): Doesn't do anything, define it to be "echo".
-
-	* config/hppaosf.mt: New target makefile fragment for a PA running
-	OSF1.
-
-Mon Feb  7 15:02:06 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* archures.c (enum bfd_architecture): Added bfd_arch_powerpc.
-	(archures_init_table): If SELECT_ARCHITECTURES is not defined,
-	added bfd_powerpc_arch.
-	* bfd-in2.h: Rebuilt.
-	* cpu-powerpc.c: New file.
-	* Makefile.in (ALL_MACHINES, CFILES): Added cpu-powerpc.c.
-	Rebuilt dependencies.
-
-	* elfcode.h (bfd_section_from_shdr): Get vma and alignment_power
-	of an SHT_STRTAB section from sh_addr and sh_addralign, rather
-	than just setting them to zero.
-
-Sun Feb  6 20:04:10 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* elfcode.h (prep_headers, swap_out_syms): Check for NULL return
-	from bfd_new_strtab. 
-	(elf_compute_section_file_positions): Check for false return from
-	swap_out_syms. 
-
-	* linker.c (default_indirect_link_order): Check for NULL return
-	from bfd_get_relocated_section_contents.
-
-	* syms.c: Make example application in doc call xmalloc, not
-	bfd_xmalloc. 
-
-	* aoutx.h (NAME(aout,slurp_symbol_table),
-	aout_link_get_symbols, NAME(aout,link_hash_table_create)):
-	* bout.c (b_out_slurp_reloc_table, b_out_squirt_out_relocs):
-	* ecoff.c (ecoff_bfd_link_hash_table_create): 
-	* ecofflink.c (bfd_ecoff_debug_init): 
-	* format.c (bfd_check_format_matches): 
-	* linker.c (_bfd_generic_link_hash_table_create): 
-	(_bfd_generic_final_link): 
-	* reloc16.c (bfd_coff_reloc16_relax_section): 
-	(bfd_coff_reloc16_get_relocated_section_contents): 
-	* elf32-hppa.c (hppa_elf_build_arg_reloc_stub): 
-	* elf32-mips.c (mips_elf_final_link): 
-	* elfcode.h (bfd_new_strtab): 
-	(bfd_add_2_to_strtab): 
-	(elf_slurp_symbol_table): 
-	(elf_corefile_note): 
-	* libbfd.c (bfd_zmalloc): 
-	Use malloc and check the result, instead of bfd_xmalloc.
-
-Sat Feb  5 12:39:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config.bfd: Put m68*-*-sysv* line after m68*-*-sysv4*.
-
-Sat Feb  5 05:32:44 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* srec.c (srec_write_record):  Put CONST keyword for "src" before
-	"unsigned", some compilers don't like it after "unsigned".
-	* libcoff.h, libcoff-in.h (bfd_perform_slip):  Rename "value" to
-	"val" in prototype declaration because some compilers don't like
-	arguments whose names are the same as types.
-
-Sat Feb  5 01:14:38 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (aout_link_check_ar_symbols): Correct test for whether
-	object file defines symbol.  Also, if skipping a symbol, skip the
-	second symbol of a N_WARNING or N_INDR symbol as well.
-
-Fri Feb  4 23:55:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	Add basic support for writing RS/6000 XCOFF files.
-	* coff-rs6000.c (dummy_reloc): Removed.
-	(rs6000coff_howto_table): Defined XCOFF relocs.
-	(RTYPE2HOWTO): Defined to use rs6000coff_rtype2howto.
-	(rs6000coff_rtype2howto): New function.
-	(coff_bfd_reloc_type_lookup): Defined to use
-	rs6000coff_reloc_type_lookup. 
-	(rs6000coff_reloc_type_lookup): New function.
-	(SELECT_RELOC): Defined to set r_type and r_size fields.
-	(COFF_LONG_FILENAMES): Defined.
-	* coffcode.h (combined_entry_type): Changed fix_tag and fix_end
-	fields to bitfields.  Added fields fix_value and fix_scnlen.
-	(sec_to_styp_flags): If STYP_DEBUG is defined, use it rather than
-	STYP_INFO for the type of a section named .debug.
-	(coff_add_missing_symbols): Don't define if RS6000COFF_C.
-	(coff_write_object_contents): If RS6000COFF_C, don't call
-	coff_add_missing_symbols.
-	(coff_slurp_symbol_table): If RS6000COFF_C, then if the last aux
-	entry has type STY_LD change the x_scnlen into a pointer to a
-	symbol and set fix_scnlen.  Also, for a C_BSTAT symbol, change the
-	value into a pointer to a symbol and set fix_value.
-	* libcoff.h: Rebuilt.
-	* coffgen.c (coff_mangle_symbols): Reindent.  If fix_value is set,
-	get the symbol offset. Likewise for fix_scnlen.
-	(string_size): Change type to bfd_size_type.
-	(debug_string_size, debug_string_section): New static variables.
-	(coff_fix_symbol_name): If bfd_coff_symname_in_debug returns true,
-	write the symbol name into the .debug section; assume that the
-	section has already been created with the right size.
-	(coff_write_symbols): Initialize debug_string_size to 0.  If
-	bfd_coff_symname_in_debug returns true, don't put symbol name in
-	usual string table.  After writing out all symbols, if
-	debug_string_size is not 0, check that it matches the size of the
-	.debug section.
-	(coff_get_normalized_symtab): Clear new fix_value and fix_scnlen
-	fields.  If the string offset is 0, always use an empty string as
-	the name.
-	(coff_make_empty_symbol): Zero out the symbol structure.
-	* reloc.c (bfd_perform_relocation): Work around one gross hack
-	with another: actually look at the target name to avoid the broken
-	COFF check.
-	(bfd_reloc_code_real_type): Add BFD_RELOC_PPC_B26,
-	BFD_RELOC_PPC_BA26 and BFD_RELOC_PPC_TOC16.
-	* bfd-in2.h: Rebuilt.
-
-Fri Feb  4 17:28:32 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* libbfd.c (bfd_zmalloc): Call bfd_xmalloc instead of malloc.
-	(bfd_xmalloc, bfd_xmalloc_by_size_t): Functions deleted.
-	* libbfd-in.h: Define them as macros calling xmalloc and declare
-	xmalloc. 
-	* libbfd.h: Rebuilt.
-
-Thu Feb  3 16:49:35 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecofflink.c (bfd_ecoff_debug_externals): If a small undefined
-	symbol has a value in the ECOFF symbol but not in the BFD symbol,
-	keep the value in the ECOFF symbol.  This helps gas.
-
-	* linker.c (_bfd_generic_link_output_symbols,
-	_bfd_generic_link_write_global_symbol): Don't require that all
-	references to a common symbol be themselves common symbols.
-
-	* aoutx.h (aout_reloc_index_to_section): Handle N_UNDF.
-
-Wed Feb  2 20:37:19 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* libbfd.c, bfd-in.h, hosts/alphaosf.h, hosts/sparc-ll.h, aoutf1.h,
-	sparclynx.c, Makefile.in: Change HOST_64_BIT to BFD_HOST_64_BIT.
-	* bfd-in2.h: Rebuilt.
-
-Wed Feb  2 12:30:13 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coffswap.h (coff_swap_reloc_out): If RS6000COFF_C, handle type
-	and size correctly.
-	(coff_swap_aux_in): If RS6000COFF_C, change x_csect.x_scnlen to
-	x_csect.x_scnlen.l to match change in coff/internal.h.
-	(coff_swap_aux_out): Likewise.
-
-	* coff-mips.c (mips_ecoff_backend_data), coff-alpha.c
-	(alpha_ecoff_backend_data): Change casts of aux_in and aux_out
-	fields to match yesterday's changes.
-
-	* coffcode.h (coff_write_relocs): If SELECT_RELOC is defined, pass
-	in the internal_reloc itself, not the type.
-	* coff-apollo.c, coff-h8300.c, coff-h8500.c, coff-i386.c,
-	coff-m68k.c, coff-sh.c, coff-we32k.c, coff-z8k.c: Changed
-	definition of SELECT_RELOC accordingly.
-
-Tue Feb  1 12:05:44 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coffcode.h (bfd_coff_backend_data): Added new arguments to
-	_bfd_coff_swap_aux_in and _bfd_coff_swap_aux_out: aux index number
-	and number of aux entries.
-	(bfd_coff_swap_aux_in, bfd_coff_swap_aux_out): Changed
-	accordingly.
-	* libcoff.h: Rebuilt.
-	* coffswap.h (coff_swap_aux_in, coff_swap_aux_out): Accept new
-	arguments.  If RS6000COFF_C, only treat C_EXT and C_HIDEXT
-	specially if this is the last aux entry.
-	* coffgen.c (coff_write_symbol, coff_get_normalized_symtab): Pass
-	new arguments to swap_aux functions.
-
-Sun Jan 30 15:14:36 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* gen-aout.c (main): Set DEFAULT_ARCH based on preprocessor macros
-	(only testing for m68k and vax at the moment); do verify that the
-	preprocessor didn't trash the arch name inside the string version.
-	Don't print out "pagesize =" line that prevents output from
-	compiling.  Derive BYTES_IN_WORD and ARCH values from sizeof
-	results.
-	* Makefile.in (aout-params.h): Pass gen-aout a dummy target name.
-	(check, installcheck): Identify directory in "no testsuites"
-	message.
-
-Sun Jan 30 13:25:28 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (aout_link_write_symbols): Write out correct value for
-	object file symbol.
-
-Fri Jan 28 18:34:05 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* hosts/vaxbsd.h (HOST_STACK_END_ADDR): Vax BSD doesn't define
-	KERNBASE, so hard-code 0x80000000 instead.
-
-Thu Jan 27 13:54:08 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* linker.c (generic_link_add_symbol_list): If symbol is common,
-	set the BSF_OLD_COMMON flag.
-
-Wed Jan 26 13:47:15 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* format.c (bfd_check_format_matches): Put the new entry in the
-	correct element of matching_vector.
-
-Tue Jan 25 11:43:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* som.c, som.h (bfd_som_set_section_attributes,
-	bfd_som_set_subsection_attributes): Change parameters from char
-	to int.  Following a prototype with an old-style function definition
-	in the presence of widened parameters is a GCC-ism not supported
-	by the HP compiler in ANSI mode.
-
-Tue Jan 25 11:46:46 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* reloc.c (bfd_get_reloc_size): Size of type -2 is 4 bytes, not 2.
-
-	* hp300hpux.c (MY(write_object_contents)): Write out the symbols
-	before writing out the relocs, so that the right symbol indices
-	are used.
-
-	* archive.c (do_slurp_bsd_armap, bfd_slurp_bsd_armap_f2): Do not
-	try to overlay the internal carsyms on the external symdefs.  That
-	can not work if the size of a host pointer is larger than 4 bytes.
-
-	* format.c (bfd_check_format_matches): Cast result of
-	bfd_xmalloc_by_size_t.
-	* opncls.c (_bfd_new_bfd): Avoid ANSI C prototype.
-
-	* archive.c: Reindented to GNU standards.
-
-Mon Jan 24 14:41:23 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* opncls.c (_bfd_new_bfd, _bfd_new_bfd_contained_in): Add
-	"_bfd_" to function names.
-	* archive.c (_bfd_create_empty_archive_element_shell),
-	libbfd-in.h: Change callers.
-
-	* libbfd.c (bfd_zmalloc): Renamed from zalloc.
-	* libbfd.c (bfd_add_to_string_table),
-	trad-core.c (trad_unix_core_file_p),
-	targets.c (bfd_target_list),
-	ptrace-core.c (ptrace_unix_core_file_p),
-	opncls.c (new_bfd), libbfd-in.h,
-	ieee.c (ieee_make_empty_symbol),
-	elf32-hppa.c (hppa_elf_stub_branch_reloc),
-	(hppa_elf_stub_reloc): Change callers.
-	* libbfd.h: Regenerated.
-
-	* archive.c (_bfd_look_for_bfd_in_cache): Add "_bfd_" to name.
-	(_bfd_get_elt_at_filepos), 
-	coff-rs6000.c (rs6000coff_get_elt_at_filepos), libbfd-in.h:
-	Change callers.
-
-	* format.c (bfd_check_format_matches), libbfd-in.h, targets.c,
-	elfcode.h (elf_object_p): Rename target_vector to bfd_target_vector
-	and default_vector to bfd_default_vector.
-	* libbfd.h: Regenerated.
-
-	* format.c (bfd_check_format_matches): New function.
-	(bfd_check_format): Call it.
-	(bfd_matching_formats): Function removed.
-	* targets.c: Replace the vector added on Jan 21 with a count of
-	entries in default_vector.
-	* bfd-in2.h: Regenerated.
-
-Mon Jan 24 12:38:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* coff-alpha.c (alpha_ecoff_object_p): New function.  Set size of
-	.pdata section based on lnnoptr field, not section header.
-	(alpha_relocate_section): Don't bother to check if r_symndx >= 0,
-	since it is unsigned.
-	(ecoffalpha_little_vec): Use alpha_ecoff_object_p rather than
-	coff_object_p.
-	* ecoff.c (ecoff_new_section_hook): Set alignment_power field of
-	.pdata section to 3.
-	(ecoff_compute_section_file_positions): Save the size of the
-	.pdata section in the line_filepos field, and actually align the
-	.pdata section to an alignment power of 4.
-	(ecoff_compute_reloc_file_positions): Set output_has_begun after
-	calling ecoff_compute_section_file_positions.
-	(ecoff_write_object_contents): Set s_lnnoptr for the .pdata
-	section from the line_filepos field.  Set vstamp for the optional
-	header from the vstamp of the symbolic header.
-	(ecoff_bfd_final_link): Set vstamp of the symbolic header to the
-	vstamp used by the first object file in the link.
-
-	* ecofflink.c (ecoff_align_debug): Align RFDs to debug_align.
-
-	* linker.c (generic_link_check_achive_element): Set SEC_ALLOC flag
-	for a created common section.
-	(_bfd_generic_link_add_one_symbol): Likewise.
-
-	* elfcode.h (swap_out_syms): Use elf_section_from_bfd_section to
-	get the index of a common section, rather than always using
-	SHN_COMMON (MIPS has multiple common sections).
-
-	* elf32-hppa.c (hppa_elf_gen_reloc_type): Typo (== for =).
-
-	* bfd/aoutx.h (aout_link_input_section_std,
-	aout_link_input_section_ext): Pass additional arguments to
-	reloc_overflow callback.
-	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents,
-	alpha_relocat_section): Likewise.
-	* coff-h8300.c (h8300_reloc16_extra_cases): Likewise.
-	* coff-h8500.c (extra_case): Likewise.
-	* coff-mips.c (mips_relocate_section): Likewise.
-	* coff-z8k.c (extra_case): Likewise.
-	* elf32-hppa.c (hppa_elf_stub_finish): Likewise.
-	* reloc.c (bfd_generic_get_relocated_section_contents): Likewise.
-
-	* bout.c (calljx_callback, callj_callback): Use get_value to get
-	the symbol value and check for undefined symbols.
-	(get_value): If the symbol is undefined, look it up in the linker
-	hash table.
-	(b_out_get_relocated_section_contents): For PCREL24 and PCREL13
-	use get_value to get the symbol value and check for undefined
-	symbols.
-	* reloc16.c (bfd_coff_reloc16_get_value): If the symbol is
-	undefined, look it up in the linker hash table.
-
-	* aoutx.h (translate_symbol_table): The string index 0 has a
-	special meaning for normal symbols, but not for dynamic symbols.
-
-Sat Jan 22 12:26:01 1994  Stu Grossman  (grossman at cygnus.com)
-
-	* sparclynx.c:  Setup appropriate macros to enable core file
-	support.
-
-Fri Jan 21 16:25:35 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* targets.c: Add a vector of matching format names.
-	* format.c (bfd_matching_formats): New function to return it.
-	(bfd_check_format): Set it.
-	* bfd-in2.h: Regenerated.
-
-	* bfd-in.h: Remove decls of bfd_ec type and error printing functions.
-	Remove decl of type symclass; wasn't used.
-	* bfd.c: Document error handling, including code fragments
-	containing the error decls that were in bfd-in.h.
-	Remove DEFUNs.
-	* bfd-in2.h: Regenerated.
-
-Fri Jan 21 14:11:16 1994  Sean Fagan  (sef@cygnus.com)
-
-	* nlmcode.h, liblnm.h, nlm32-alpha.c nlm32-i386.c nlm32-sparc.c:
-	The sparc (and possibly other?) NLM format requires a different
-	way to write exports, so add a write_export field to the backend
-	data (and set it to NULL for everything but the sparc).
-
-Fri Jan 21 14:11:16 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* sunos.c (MY(read_dynamic_relocs)): Compare info->dynrel with NULL,
-	not (struct external_nlist *) NULL.  info->dynrel is a PTR, not
-	a struct external_nlist *.
-
-Fri Jan 21 09:29:01 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* bfd.c: Remove error strings for errors removed below.
-	* aoutx.h (translate_to_native_sym_flags), bfd-in.h (bfd_ec),
-	oasys.c (oasys_write_sections): Rename
-	bfd_error_nonrepresentable_section to nonrepresentable_section.
-	None of the other bfd error names start with "bfd_error".
-	Remove errors symbol_not_found and no_relocation_info, which seem
-	to be unused.
-	* bfd-in2.h: Regenerated.
-
-Fri Jan 21 01:11:55 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* bfd.c (bfd_get_gp_size): Added support for ELF.
-
-	* syms.c (BSF_DYNAMIC): New symbol flag.
-	(bfd_print_symbol_vandf): Print it.
-	* bfd-in2.h: Rebuilt.
-	* libaout.h (struct aout_backend_data): New read_dynamic_symbols
-	and read_dynamic_relocs fields.
-	(struct aoutdata): New dynamic_info field.
-	(obj_aout_dynamic_info): New accessor macro.
-	* sunos.c (struct sunos_dynamic_info): New structure.
-	(sunos_read_dynamic_info, MY(read_dynamic_symbols),
-	MY(read_dynamic_relocs)): New functions to read dynamic symbols
-	and relocs.
-	* aoutx.h (NAME(aout,some_aout_object_p)): If the object is
-	dynamically linked, set SEC_RELOC for both the .text and .data
-	sections.
-	(translate_from_native_sym_flags): Don't set BSF_LOCAL for an
-	undefined symbol.
-	(translate_symbol_table): New function, split out of
-	slurp_symbol_table; set the BSF_DYNAMIC flag appropriately.
-	(NAME(aout,slurp_symbol_table)): Read dynamic symbols, if any.
-	(NAME(aout,slurp_reloc_table)): Read dynamic relocs, if any.
-	(NAME(aout,get_reloc_upper_bound)): Include dynamic reloc count in
-	return value.
-	* aoutf1.h (NAME(aout,sunos4_write_object_contents)): Don't write
-	out dynamic symbols or relocs against reloc symbols, since they
-	are already in the .text section and we wouldn't know where to
-	write them anyhow.
-	(sunos4_aout_backend): Initialize read_dynamic_symbols and
-	read_dynamic_relocs fields.
-	* aout-target.h (MY(backend_data)): Initialize
-	read_dynamic_symbols and read_dynamic_relocs fields.
-
-Thu Jan 20 20:57:27 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* hosts/alphaosf.h (uint64e_type, uint64_type, int64_type): Delete
-	typedefs, since HOST_64_BIT will take care of defining them in
-	bfd.h.
-
-Wed Jan 19 17:28:59 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* config/alphaosf.mh (HDEFINES): Don't define HOST_64_BIT here;
-	that's dealt with elsewhere.
-	* hosts/alphaosf.h (sprintf_vma, fprintf_vma): New macros.
-	(uint64_typeHIGH, uint64_typeLOW): Comment with HOST_64_BIT so
-	they get copied to bfd.h.
-
-	* reloc.c (enum bfd_reloc_code_real): Add some Alpha relocation
-	types.  Reorganized some of the existing ones.
-	* coff-alpha.c (alpha_howto_table): Construct 64-bit negative one
-	values in case of compilation on a 32-bit machine.  Fix pcrel
-	fields of some reloc types.
-	(alpha_bfd_reloc_type_lookup): Handle more relocation types.
-
-	* bfd-in.h (uint64_typeHIGH, uint64_typeLOW): Supply default
-	definitions when not defined, regardless of whether uint64_type is
-	a defined macro or not.
-	(fprintf_vma, sprintf_vma): Define only if fprintf_vma is not
-	already defined.
-
-Wed Jan 19 00:02:54 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (translate_to_native_sym_flags): Set the type of a
-	BSF_WARNING symbol to N_WARNING.
-
-Tue Jan 18 16:43:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (aout_link_add_symbols): Increment sym_hash as well as p
-	for an indirect or warning symbol.
-	(aout_link_write_symbols): Update sym_hash with the target of an
-	indirect or warning symbol.  If an indirect symbol is defined,
-	output the calculated value and don't output the target symbol.
-
-Tue Jan 18 03:54:59 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h (translate_from_native_sym_flags): Give warning symbols
-	an (unused) nonzero section value, needed for check below.
-
-Mon Jan 17 15:12:07 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h (translate_from_native_sym_flags,
-	aout_link_add_symbols): Treat N_SET[ABDT] | N_EXT like
-	N_SET[ABDT].
-
-Fri Jan 14 16:45:43 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* elfcode.h (elf_object_p): If there is a SHT_DYNAMIC section, set
-	the DYNAMIC flag for the BFD.
-	(NAME(bfd_elf,write_object_contents)): Don't try to write out a
-	BFD with the DYNAMIC flag set, since we don't generate the program
-	header table correctly.
-
-Fri Jan 14 01:04:36 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* elfcode.h (elf_slurp_symbol_table):  Free x_symp at the end
-	of the function to avoid storage leak.
-
-Thu Jan 13 23:07:32 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_link_write_external): An ifd can be -1.
-
-Thu Jan 13 12:33:27 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (som_set_reloc_info): Provide a default symbol for
-	relocations which don't actually have an associated symbol.
-
-	* som.c (hppa_som_reloc): Add new "error message" argument.
-
-Wed Jan 12 13:36:43 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	Enable gdb to write to core files on more core file readers.
-	* libbfd.c (bfd_generic_set_section_contents):  Remove range check
-	for section size, it is already done in bfd_set_section_contents
-	with bfd_get_section_size_now.
-	* aix386-core.c, hppabsd-core.c, hpux-core.c, irix-core.c,
-	osf-core.c, ptrace-core.c, trad-core.c (*_set_section_contents):
-	Use bfd_generic_set_section_contents instead of bfd_false.
-
-Wed Jan 12 15:31:57 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* linker.c: Added initial documentation.
-
-	* linker.c (default_indirect_link_order): Don't expect space for
-	output relocations if there aren't any input relocations.
-
-Tue Jan 11 14:37:12 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* aoutx.h (NAME(aout,final_link)): Set a_entry before computing
-	file offsets.
-
-	* elfcode.h (swap_out_syms): A common symbol is STT_OBJECT, not
-	STT_NOTYPE.
-
-Tue Jan 11 09:10:56 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* config.bfd: Use ELF, not COFF for m88*-*-dgux*.
-	Combine m88k-*-* and m88110-*-* cases into m88*-*-*.
-
-Tue Jan 11 00:07:19 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecofflink.c: Extensive changes to compress and merge debugging
-	information, and to write some of out directly rather than saving
-	it in memory.  Several new functions and structures, and new
-	arguments to existing functions.
-	* ecoff.c (ecoff_compute_reloc_file_positions): Compute
-	sym_filepos as well.
-	(ecoff_get_extr): Use ifdmap instead of ifdbase.
-	(ecoff_write_object_contents): Don't compute sym_filepos here.
-	Only output symbols if outsymbols is not NULL.
-	(ecoff_bfd_final_link): Adjust for changes in ecoff_debug_info and
-	bfd_ecoff_debug functions.  Write out debugging information here.
-	(ecoff_final_link_debug_accumulate): Adjust for changes in
-	bfd_ecoff_debug functions.
-	(ecoff_link_write_external): Use ifdmap rather than ifdbase.
-	* elf32-mips.c (mips_elf_read_ecoff_info): Read external symbols
-	first, to put them in the first memory buffer.  Clear fdr field.
-	(mips_elf_get_extr): Use pointer to unswapped external symbol.
-	(mips_elf_final_link): Adjust for changes in bfd_ecoff functions.
-	Preserve .text, .data and .bss even if they are empty.  Save
-	pointer to unswapped external symbol rather than copying it.
-	Don't free up the external symbols.
-	* libelf.h (elf_symbol_type): Change mips_extr to PTR.
-	* bfd-in.h (bfd_ecoff_debug_init, bfd_ecoff_debug_free): Declare.
-	(bfd_ecoff_debug_accumulate): Update declaration.
-	(bfd_ecoff_debug_accumulate_other): Rename declaration from
-	bfd_ecoff_debug_link_other and update.
-	(bfd_ecoff_write_accumulated_debug): Declare.
-	* bfd-in2.h: Rebuilt.
-	* Makefile.in: Rebuilt dependencies.
-
-Mon Jan 10 20:46:53 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* Makefile.in (install): Remove "@" which follows a backslash.  In
-	this position it just causes errors, not suppresses echoes.
-
-Mon Jan 10 09:06:21 1994  Jeffrey A. Law  (law@snake.cs.utah.edu)
-
-	* som.c (hppa_som_gen_reloc_type): Fix handling of LT and RT
-	field selectors.
-
-Sun Jan  9 04:32:25 1994  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* config/i386-netbsd.mt (SELECT_VECS): Include i386bsd_vec.
-
-Fri Jan  7 10:27:27 1994  David J. Mackenzie  (djm@rtl.cygnus.com)
-
-	* aoutx.h (adjust_z_magic): Don't merge the start of bss with the
-	end of data if they are not contiguous.
-
-	* aoutf1.h (sunos4_aout_backend): Comment the fields' meanings.
-
-Fri Jan  7 15:40:16 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_mkobject_hook): Don't set SEC_SHARED_LIBRARY flag
-	for .reginfo section here.
-	(ecoff_new_section_hook): Set it here instead.
-
-Fri Jan  7 10:29:27 1994  Stan Shebs  (shebs@andros.cygnus.com)
-
-    	* bfd-in.h: (bfd_boolean): Add workaround for systems that also
-	define true and false as enums.
-	(ALMOST_STDC): Add as alternative to __STDC__.
-	* bfd-in2.h: Rebuilt.
-	* syms.c (bfd_print_symbol_vandf): Convert a PTR to FILE*.
-
-Thu Jan  6 14:24:44 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aoutx.h (translate_to_native_sym_flags): Catch the case where
-	there is no output section.
-
-Thu Jan  6 14:37:42 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* nlmcode.h (nlm_object_p): If we can't read the fixed header,
-	count it as a wrong format error, not a system call error, since
-	the object file might simply be too small.
-
-	* targets.c (target_vector): Added nlm32_alpha_vec inside #ifdef
-	BFD64.
-	* Makefile.in (BFD32_BACKENDS): Remove nlm32-alpha.o.
-	(BFD64_BACKENDS): Add nlm32-alpha.o.  It depends on 64 bit
-	support, even though it is for an Alpha in 32 bit mode.
-	* configure.in (nlm32_alpha_vec): Set target64 to true.
-
-	* nlm32-gen.c, nlm64-gen.c: Removed.  All nlm targets are
-	different, so there is no point to providing a generic one.
-	* libnlm.h: Don't bother to check for nlm_backend(bfd) being NULL
-	in the backend accessor macros; that should no longer be possible.
-	* targets.c (target_vector): Removed nlm32_big_generic_vec,
-	nlm64_big_generic_vec, nlm64_little_generic_vec.
-	* configure.in (nlm32_big_generic_vec, nlm32_little_generic_vec,
-	nlm64_big_generic_vec, nlm64_little_generic_vec): Removed.
-	* Makefile.in: Rebuilt dependencies, and
-	(BFD32_BACKENDS): Removed nlm32-gen.o.
-	(BFD64_BACKENDS): Removed nlm64-gen.o.
-	(CFILES): Removed nlm32-gen.c and nlm64-gen.c.
-
-	* hp300hpux.c (ARCH_SIZE): Define before including aoutx.h.
-
-	* linker.c (_bfd_generic_link_add_one_symbol): Add constructor and
-	bitsize arguments.  Changed all callers (aoutx.h).
-	* libbfd-in.h (_bfd_generic_link_add_one_symbol): Add constructor
-	and bitsize arguments to declaration.
-	* libbfd.h: Rebuilt.
-
-	* ecoff.c: First cut at new style of linker backend for
-	ECOFF--added a bunch of functions.  Also:
-	(ecoff_sec_to_styp_flags): Set flags for .pdata and .xdata.
-	(ecoff_slurp_symbolic_header): New function.
-	(ecoff_slurp_symbolic_info): Call ecoff_slurp_symbolic_header.
-	(ecoff_compute_reloc_file_positions): New function.
-	(ecoff_set_section_contents): Get out quickly if count is zero.
-	Check errors better.
-	(ecoff_write_object_contents): Put .xdata section in data segment.
-	Call ecoff_compute_reloc_file_positions.  Don't output relocs or
-	external symbols if outsymbols is NULL.
-	(ecoff_bfd_final_link): Completely rewritten.
-	* libecoff.h: Include bfdlink.h.
-	(struct ecoff_backend_data): Add relocate_section field.
-	(ecoff_data_type): Add sym_hashes and symndx_to_section fields.
-	(struct ecoff_link_hash_entry): Define.
-	(struct ecoff_link_hash_table): Define.
-	(ecoff_bfd_link_add_symbols): Declare as function, not macro.
-	(ecoff_bfd_link_hash_table_create): Likewise.
-	* ecofflink.c (bfd_ecoff_debug_one_external): New function.
-	(bfd_ecoff_debug_externals): Call bfd_ecoff_debug_one_external.
-	* bfd-in.h (bfd_ecoff_debug_one_external): Declare.
-	* bfd-in2.h: Rebuilt.
-	* coff-alpha.c (alpha_howto_table): Mark BRADDR as
-	partial_inplace, and set the src_mask to 0x1fffff.
-	(alpha_ecoff_get_relocated_section_contents): Remove unused
-	variable gp_warned.
-	(alpha_convert_external_reloc): New static function.
-	(alpha_relocate_section): New static function.
-	(alpha_ecoff_backend_data): Initialize relocate_section field.
-	* coff-mips.c (mips_relocate_refhi): New static function.
-	(mips_relocate_section): New static function.
-	(mips_ecoff_backend_data): Initialize relocate_section field.
-
-	* reloc.c (_bfd_relocate_contents): Corrected signed overflow
-	checking when there is an addend.
-
-	* aoutx.h (NAME(aout,final_link)): Don't abort when trying to link
-	a non a.out file, just pass it to _bfd_default_link_order.
-	(aout_link_input_section_std): When doing a final PC relative link
-	against a section symbol, subtract the VMA of the input section.
-	(aout_link_input_section_ext): Likewise.
-
-	* linker.c (default_indirect_link_order): Renamed from
-	_bfd_generic_indirect_link_order and made static.
-	(_bfd_generic_final_link): Don't switch on link_order type, just
-	call _bfd_default_link_order.
-	(_bfd_default_link_order): Handle bfd_indirect_link_order type.
-	* genlink.h: Removed declaration of
-	_bfd_generic_indirect_link_order.
-	* elf32-mips.c (mips_elf_final_link): Don't switch on link_order
-	type, just call _bfd_default_link_order.
-
-Tue Jan  4 21:23:37 1994  Ian Lance Taylor  (ian@cygnus.com)
-
-	* linker.c (generic_link_check_archive_element): Base the name of
-	the created common section on the name of the section the symbol
-	came from.
-	(_bfd_generic_link_add_one_symbol): (case BIG): A common symbol
-	must have a section, so don't bother to create one.
-
-Mon Jan  3 15:32:16 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* aout-target.h (MY(vec)): Add DYNAMIC to mask of object flags.
-	* aoutf1.h (NAME(aout,sunos4_write_object_contents)):
-	If the DYNAMIC flag is set, set it in the exec header.
-	* aoutx.h (NAME(aout,some_aout_object_p)): If the object is
-	dynamically linked, set the DYNAMIC flag in the BFD.
-	* libaout.h (N_SET_DYNAMIC): New macro.
-	(N_DYNAMIC): Add missing 0 in mask.
-
-Mon Jan  3 11:41:45 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* ecoff.c (ecoff_get_extr): Don't output section symbols as
-	external symbols.
-
-	* bfd-in.h, hash.c: Change bfd_hash_allocate argument from size_t
-	to unsigned int, because size_t may not be defined in bfd.h.
-	* bfd-in2.h: Rebuilt.
-
-	* bfd-in.h (bfd_get{b,l}[_signed_]{16,32,64}): Declare argument to
-	be a const pointer.
-	* bfd-in2.h: Rebuilt.
-	* libbfd.c (bfd_get{b,l}[_signed_]{16,32,64}): Declare argument to
-	be a const pointer.
-	* targets.c (bfd_target): Change swap function pointers
-	accordingly.
-	* archive.c (do_slurp_coff_armap): Change swap accordingly.
-	* aix386-core.c: Change NO_GET and NO_GETS accordingly.
-	* hppabsd-core.c, hpux-core.c, irix-core.c, osf-core.c,
-	ptrace-core.c, trad-core.c: Change NO_GET and NO_SIGNED_GET
-	accordingly.
-
-	* libbfd-in.h (struct artdata): Added tdata field.
-	(_bfd_add_bfd_to_archive_cache): Declare.
-	(_bfd_get_elt_at_filepos): Declare.
-	(_bfd_snarf_ar_hdr): Renamed from snarf_ar_hdr.
-	* libbfd.h: Rebuilt.
-	* archive.c: Cleaned up some more.
-	(_bfd_generic_mkarchive, bfd_generic_archive_p): Initialize
-	pointer elements of artdata.
-	(_bfd_add_bfd_to_archive_cache): Renamed from add_bfd_to_cache.
-	(_bfd_snarf_ar_hdr): Renamed from snarf_ar_hdr.
-	(_bfd_get_elt_at_filepos): Renamed from get_elt_at_filepos.
-	(get_extended_arelt_filename, bfd_construct_extended_name_table,
-	bfd_ar_hdr_from_filesystem, compute_and_write_armap): Made static.
-	* ecoff.c: Some comment changes.
-	(ecoff_slurp_armap): Handle rename of snarf_ar_hdr.  Set
-	ardata->tdata to raw_armap.
-	(ecoff_archive_p): Initialize pointer elements of artdata.
-	* coff-rs6000.c (rs6000coff_get_elt_at_filepos): Handle rename of
-	add_bfd_to_cache.
-
-	* hash.c: Added some documentation.
-
-Mon Jan  3 11:09:28 1994  Jim Kingdon  (kingdon@lioth.cygnus.com)
-
-	* aout-target.h, netbsd386.c: Replace NO_SWAP_MAGIC with SWAP_MAGIC,
-	and do the swapping here rather than calling ntohl from the N_*
-	macros.  This cleans up assumptions about the size of a host long,
-	the existence to ntohl, etc.
-
-Sat Jan  1 13:50:05 1994  Rob Savoye  (rob@darkstar.cygnus.com)
-
-	* config.bfd: Add support for VSTa micro-kernel. It currently uses
-	i386-aout.
-
-Sat Jan  1 10:18:54 1994  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* hosts/i386mach3.h (HOST_SEGMENT_SIZE): Fix value.
-	* i386mach3.c (SEGMENT_SIZE): Fix value.
-
-For older changes see ChangeLog-9193
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/bfd/ChangeLog-9697 b/bfd/ChangeLog-9697
deleted file mode 100644
index dc22c8c7c8b..00000000000
--- a/bfd/ChangeLog-9697
+++ /dev/null
@@ -1,6711 +0,0 @@
-Tue Dec 30 12:45:18 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_check_relocs): If -Bsymbolic, don't
-	allocate space for a PC relative reloc against a symbol which is
-	defined in a regular file.
-	(elf32_sparc_relocate_section): If -Bsymbolic, don't copy a PC
-	relative reloc against a symbol which is defined in a regular
-	file.
-
-Mon Dec 29 18:02:28 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Jonathan Stone <jonathan@DSG.Stanford.EDU>:
-	* config.bfd (mips-dec-netbsd*): Add ECOFF vectors to
-	targ_selvecs.
-	(mips*el-*-netbsd*): Like mips-dec-netbsd*.
-	(mips*-*-netbsd*): New target.
-
-Mon Dec 29 17:13:28 1997  H.J. Lu  (hjl@gnu.org)
-
-	* elflink.h (elf_link_assign_sym_version): Change error message
-	from "undefined version name" to "undefined versioned symbol
-	name".
-
-Mon Dec 29 11:41:16 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (coff_arm_relocate_section): Fix typo from previous
-	delta.
-
-Tue Dec 23 17:01:10 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd-in.h (_bfd_dwarf2_find_nearest_line): Declare.
-	* libbfd.h: Rebuild.
-
-	* peicode.h (coff_swap_scnhdr_out): Set .reloc section to be
-	shared.  Set stab* sections to be shared and read.  Set .rsrc
-	section to be read and shared.
-
-Mon Dec 22 13:20:57 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am: Rebuild dependencies.
- 	(ALL_MACHINES_CFILES): Add dwarf2.lo.
-	(ALL_MACHINES_CFILES): Add dwarf2.c.
-	* Makefile.in: Rebuild.
-
-	* coff-arm.c: Don't include obstack.h.
-
-Mon Dec 22 13:04:33 1997  Joel Sherrill  <joel@oarcorp.com>
-
-        * config.bfd (i[3456]86*-go32-rtems*): Fix to be the same as
-	i[3456]86-go32.
-
-Thu Dec 18 16:01:25 1997  Doug Evans  <devans@canuck.cygnus.com>
-
-	* configure: Regenerate to get @SHELL@ substituted.
-
-Wed Dec 17 09:45:09 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (coff_arm_relocate_section): Only look at section
-	owner if there is one.
-
-	* elf.c (assign_file_positions_for_segments): Fail if there is not
-	enough room for the program headers.
-
-Tue Dec 16 08:09:56 1997  Gavin Koch  <gavin@cygnus.com>
-
-	* elf.c (_bfd_elf_find_nearest_line): Call
-	_bfd_dwarf2_find_nearest_line first.
-	* elf32-mips.c (_bfd_mips_elf_find_nearest_line): Same.
-	* dwarf2.c: New file; implement _bfd_dwarf2_find_nearest_line.
-
-Mon Dec 15 16:08:52 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* archures.c: Add bfd_mach_m32r.
-
-Mon Dec 15 16:11:22 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coffcode.h (ALIGN_SECTIONS_IN_FILE): Define if I960 not defined.
-	(coff_compute_section_file_positions): Use ALIGN_SECTIONS_IN_FILE
-	to decide when to align the file sections for paging.
-	* coffcode.h (ALIGN_SECTIONS_IN_FILE): Undefine for TIC80COFF.
-
-Mon Dec 15 15:01:15 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-m32r.c (m32r_elf_object_p): New Function.
-	(m32r_elf_final_write_processing):  New Function.
-	(m32r_elf_set_private_flags):  New Function.
-	(m32r_elf_copy_private_bfd_data):  New Function.
-	(m32r_elf_merge_private_bfd_data):  New Function.
-	(m32r_elf_print_private_bfd_data):  New Function.
-	(elf_backend_object_p): Point to m32r_object_p.
-	(elf_backend_final_write_processing): Point to
-	m32r_elf_final_write_processing.
-	(bfd_elf32_bfd_copy_private_bfd_data): Point to
-	m32r_elf_copy_private_bfd_data.
-	(bfd_elf32_bfd_merge_private_bfd_data): Point to
-	m32r_elf_merge_private_bfd_data.
-	(bfd_elf32_bfd_set_private_flags): Point to
-	m32r_elf_set_private_bfd_data.
-	(bfd_elf32_bfd_print_private_bfd_data): Point to
-	m32r_elf_print_private_bfd_data.
-
-
-	* bfd-in2.h (bfd_mach_m32r): Add identifier for M32R architecture
-	machines.
-
-Fri Dec 12 11:30:28 1997  Brendan Kehoe  <brendan@canuck.cygnus.com>
-
-	* configure: Only build libbfd shared if --enable-shared's value
-	was `yes', or was set to `*bfd*'.
-	* aclocal.m4: Likewise.
-	* NOTE: this really needs to be fixed in libtool/libtool.m4, the
-	original source of this bit of code.  It's not clear what the best fix
-	would be, though.
-
-Thu Dec 11 17:48:11 1997  Richard Henderson  <rth@cygnus.com>
-
-	* linker.c (generic_link_add_symbol_list): Always init udata.p so
-	that the generic relaxation code can function when input and output
-	file formats are mismatched.
-
-Thu Dec 11 01:02:18 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (bfd_coff_small_swap_table): Initialize new fields.
-
-	* elf.c (assign_file_positions_for_segments): For a loadable
-	section, make sure that the load address is correct relative to
-	the load address of the segment plus the size of the segment so
-	far.
-
-	* coffcode.h (_coff_link_output_has_begun): Make static.
-	(_coff_final_link_postscript): Likewise.
-
-Wed Dec 10 23:37:11 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_input_bfd): Handle a relocateable link in
-	which a relocation refers to an indirect or warning symbol.
-
-Wed Dec 10 11:15:55 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (bfd_arm_coff_final_link): Function deleted.
-	(coff_arm_final_link_postscript): New function.
-	(coff_arm_link_output_has_begun): New function.
-
-	* libcoff.h (struct bfd_coff_backend_data): Add new fields:
-	_bfd_coff_link_output_has_begun and
-	_bfd_coff_final_link_postscript.  Add new macros:
-	bfd_coff_link_output_has_begun() and
-	bfd_coff_final_link_postscript().
-
-	* cofflink.c (_bfd_coff_final_link): Insert calls to
-	bfd_coff_link_output_has_begun() and
-	bfd_coff_final_link_postscript().
-
-	* coffcode.h: Add two new fields to bfd_coff_backend_data
-	structure: _bfd_coff_link_output_has_begun and
-	_bfd_coff_final_link_postscript.  Add default initialisers for
-	these fields.  Add overridable aliases for the coff swap functions
-	in the backend data structure.
-
-	* elf32-v850.c: Update with patches from the branch to fix
-	HI16_S/LO16 reloc pairs.
-
-Wed Dec 10 14:06:48 1997  Michael Meissner  <meissner@cygnus.com>
-
-	* elf32-d30v.c (d30v_info_to_howto_rela): New function to support
-	RELA relocations.
-	(USE_REL): Don't define any more, switch to using RELA
-	relocations.
-	(elf_info_to_howto): Define as d30v_info_to_howto_rela.
-
-Tue Dec  9 11:37:53 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* archures.c (bfd_mach_mips*): Define.
-	(bfd_default_scan): For 3000 and 4000 replace magic constant with
- 	macro.
-
-	* cpu-mips.c (N): Define.
-	(bfd_mips_arch, arch_info_struct): Re-write using macro N, replace
- 	numbers with bfd_mach_mips* macros.
-
-Fri Dec  5 11:13:46 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_reloc, v850_elf_store_addend_in_insn,
-	v850_elf_relocate_section): Fix reloc addend handling.
-	(v850_elf_section_from_bfd_section, v850_elf_symbol_processing,
-	v850_elf_add_symbol_hook, v850_elf_link_output_symbol_hook,
-	v850_elf_section_from_shdr, v850_elf_fake_sections): New functions
-	to create and handle special common sections.
-	(v850_elf_final_link_relocate): Fix HI16 and HI16_S relocations
-	which have data stored in the instructions.
-
-Tue Dec  2 10:26:16 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (TARGET_UNDERSCORE): Revert back to '_'
-	(USER_LABEL_PREFIX): Revert back to '_'
-
-	* config.bfd (targ_cpu): Add support for Thumb target.
-
-Mon Dec  1 20:24:18 1997  J"orn Rennecke <amylaar@cygnus.co.uk>
-
-	* coff-sh.c (sh_coff_howtos): Add R_SH_SWITCH8 entry.
-	(get_symbol_value): Handle R_SH_SWITCH8.
-	(sh_relax_delete_bytes): Likewise.
-
-Wed Nov 26 14:13:34 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (TARGET_UNDERSCORE): Changed to match definition in
-	gcc/config/arm/semi.h
-
-	* coffcode.h (coff_slurp_symbol_table): Add ARM and Thumb symbol
-	classes.
-
-Sun Nov 23 16:02:58 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* freebsd.h (SWAP_MAGIC): Read magic number little and not big
- 	endian.
-
-Wed Nov 26 09:30:37 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coffcode.h (coff_mkobject_hook): Only set private flags for non
-	PE ARM ports.
-
-Tue Nov 25 15:33:23 1997  Richard Henderson  <rth@cygnus.com>
-
-	* binary.c (binary_set_section_contents): Also ignore NEVER_LOAD
-	sections.
-
-Tue Nov 25 10:55:36 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data): Do not
-	complain if inout and output formats differ.
-
-Tue Nov 25 11:26:27 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (BFD32_BACKENDS): Remove tekhex.lo.
-	(BFD32_BACKENDS_CFILES): Remove tekhex.c.
-	* Makefile.in: Rebuild.
-	* aclocal.m4, configure, src/Makefile.in: Rebuild with current
-	automake and autoconf.
-
-	* coff-arm.c (arm_allocate_interworking_sections): Fix typo
-	(COFF_WITH_PR to COFF_WITH_PE).
-
-Mon Nov 24 15:47:49 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c: Make variables and some functions static, so that
-	this file can be included in multiple object files.
-	(coff_arm_bfd_final_link): Fix minor bug.
-
-Sat Nov 22 15:16:00 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c: Add support for PIC and APCS-FLOAT type binaries.
-
-	* coffcode.h: Add support for PIC and APCS-FLOAT type binaries.
-
-Sat Nov 22 16:06:56 1997  Klaus Kaempf  <kkaempf@progis.de>
-
-	* evax-emh.c (_bfd_evax_write_emh): Use alloca instead of strdup.
-
-Sat Nov 22 12:29:30 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_add_one_symbol): When overriding a defined
-	symbol, set it to undefined, not new.
-
-	* elf32-sh.c (sh_elf_relax_delete_bytes): Don't kill LABEL
-	relocs.
-
-Fri Nov 21 14:14:22 1997  Richard Henderson  <rth@cygnus.com>
-
-	* coff-sh.c (sh_relax_section): Force sign extention of USES r_offset.
-	(sh_relax_delete_bytes): Don't kill LABEL relocs.
-
-Mon Nov 17 15:08:38 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf-m10300.c (elf32_mn10300_finish_hash_table_entry): Fix typo.
-	(mn10300_elf_relax_section): Likewise.
-
-Sat Nov 15 15:36:07 1997  Fred Fish  <fnf@cygnus.com>
-
-	* peicode.h (coff_swap_aouthdr_in): Cast second arg of
-	bfd_h_get_* calls to "bfd_byte *".
-
-Tue Nov 11 10:37:23 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf-m10300.c (elf32_mn10300_link_hash_entry): Add new field
-	"movm_stack_size".
-	(mn10300_elf_relax_section): Include stack space for register saves
-	in the imm8 field of a "call" instruction.
-	(compute_function_info): Determine how much stack is allocated by
-	the movm instruction.  Fix typo.
-	(elf32_mn10300_link_hash_newfunc): Initialize movm_stack_size.
-
-Mon Nov 10 14:32:40 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Don't crash if
-	a version dependency could not be found.
-
-Tue Nov  4 12:05:56 1997  Klaus K"ampf  <kkaempf@progis.de>
-
-	* configure.com: Get version info from configure.in
-
-Fri Oct 24 11:15:58 1997  Jakub Jelinek  <jj@sunsite.mff.cuni.cz>
-
-	* elf64-sparc.c (sparc64_elf_merge_private_bfd_data):
-	New function. Avoid mixing US1 and HAL R1 code.
-	Set resulting memory ordering to the strongest one used.
-	(sparc64_elf_object_p): Set bfd_mach correctly.
-
-Thu Oct 23 14:09:33 1997  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-sparc.c (sparc64_elf_howto_table): Add UA64 & UA16.
-	(sparc64_elf_check_relocs): Handle them.
-	(sparc64_elf_relocate_section): Likewise.  Before emitting a dyn reloc,
-	check alignment and transmute R_SPARC_x<->R_SPARC_UAx.
-
-Thu Oct 23 00:53:14 1997  Richard Henderson  <rth@dot.cygnus.com>
-
-	* configure.in (sparc*-*-linux*): Use trad-core and ...
-	* hosts/sparclinux.h: New file.
-
-Thu Oct 23 00:25:29 1997  Richard Henderson  <rth@dot.cygnus.com>
-
-	* config.bfd (sparc64-*-linux*): New target.
-
-	* elf-bfd.h (struct elf_backend_data): Add plt_alignment member.
-	* elflink.c (_bfd_elf_create_got_section): Set .got alignment based
-	on arch_size.
-	(_bfd_elf_create_dynamic_sections): Likewise for .rel* sections.
-	Set .plt alignment from new plt_alignment.
-	* elflink.h (elf_link_create_dynamic_sections): Set version section
-	alignment to LOG_FILE_ALIGN.
-	* elfxx-target.h (elf_backend_plt_alignment): Provide default.
-	(elfXX_bed): Init plt_alignment.
-
-	* elf64-sparc.c (sparc64_elf_check_relocs,
-	sparc64_elf_adjust_dynamic_symbol, sparc64_elf_size_dynamic_sections,
-	sparc64_elf_adjust_dynindx, sparc64_elf_finish_dynamic_symbol,
-	sparc64_elf_finish_dynamic_sections): New functions.
-	(sparc64_elf_howto_table): Fix a few name strings.
-	(ELF_DYNAMIC_INTERPRETER): New definition.
-	(sparc64_elf_relocate_section): Handle shared libraries.
-
-	* elf64-sparc.c (struct plt_template, plt_*_header, plt_*_entry,
-	sparc64_elf_build_plt_entry, sparc64_elf_finish_dynamic_symbol):
-	PLT definitions sparc64-linux originally choose.  These will go
-	away soon in favour of the official abi definitions.
-
-Wed Oct 22 16:08:45 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (coff_small_object_p): New static function.
-	(coff_small_new_section_hook): New static function.
-	(bfd_coff_small_swap_table): New static const structure.
-	(coff_small_close_and_cleanup): Define.
-	(coff_small_bfd_free_cached_info): Define.
-	(coff_small_get_section_contents): Define.
-	(coff_small_get_section_contents_in_window): Define.
-	(shcoff_small_vec): New static structure.
-	(shlcoff_small_vec): New static structure.
-	* targets.c (bfd_target_vector): Add shcoff_small_vec and
-	shlcoff_small_vec.
-	* config.bfd (sh-*-elf*): Add shcoff_small_vec and
-	shlcoff_small_vec to targ_selvecs.
-	(sh-*-*): Likewise.
-	* configure.in: Add shcoff_small_vec and shlcoff_small_vec cases.
-	* configure: Rebuild.
-
-Mon Oct 20 15:01:27 1997  Klaus K"ampf  <kkaempf@progis.de>
-
-	* evax-egsd.c: Weak symbols are global.
-
-	* evax-emh.c: Use proper casts.
-
-	* evax-egsd.c (_bfd_evax_write_egsd): Remove unneeded uname.
-
-	* evax-egsd.c: Section names and symbols have different
-	length restrictions. Add length parameter to
-	_bfd_evax_length_hash_symbol.
-	* evax-etir.c: Likewise.
-	* evax-misc.c (_bfd_evax_length_hash_symbol): Add length
-	parameter.
-	* evax.h (EOBJ_S_C_SECSIZ): Define.
-
-	* evax-alpha.c: Remove duplicate test.
-
-	* evax-emh.c: SYS$ functions are upper-case.
-
-	* evax-egsd.c: Create separate sections for common symbols.
-	* evax-etir.c: Don't output common section.
-	* evax.h: Bump up section count.
-
-	* configure.com: Use 64bit integers with DEC C.
-
-	* evax-egsd.c: Make section flags dec c compatible.
-
-Mon Oct 20 09:38:31 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (normalize): Delete function.
-	(som_bfd_ar_write_symbol_stuff): New parameter elength.  All callers
-	changed.  Use passed in elength to determine size of the extended
-	name table instead of computing it again.
-
-Sun Oct 19 23:36:21 1997  Jim Wilson  <wilson@cygnus.com>
-
-	* peicode.h (coff_swap_scnhdr_out): Use |= not = to set
-	IMAGE_SCN_MEM_READ for an unrecognized section.
-
-Sun Oct 19 21:04:56 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (som_bfd_ar_write_symbol_stuff): Account for trailing
-	'/' in the extended name table.
-
-Fri Oct 17 00:04:13 1997  Richard Henderson  <rth@cygnus.com>
-
-	* elflink.h (elf_link_assign_sym_version): For explicitly versioned
-	symbols, check globals list before matching on locals.
-
-Thu Oct 16 08:17:06 1997  Michael Meissner  <meissner@cygnus.com>
-
-	* peicode.h (coff_swap_scnhdr_out,pe_print_idata): Fix mangled
-	patch.
-
-Wed Oct 15 13:45:10 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (pe_mkobject_hook): Set DLL flag.
-	(pe_bfd_copy_private_bfd_data): Copy DLL flag.
-
-	* peicode.h (coff_swap_scnhdr_out): Set IMAGE_SCN_MEM_DISCARDABLE
-	for .stab* sections.  Replace strlen of constant strings with
-	number.
-
-Tue Oct 14 15:42:45 1997  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_merge_ind_symbols): New function to
-	merge got and reloc entries from ind syms to their target.
-	(elf64_alpha_always_size_sections): Call it.
-	(elf64_alpha_check_relocs): Operate on the target of indirect symbols.
-	(elf64_alpha_can_merge_gots): Likewise.
-	(elf64_alpha_merge_gots): Likewise.
-
-	* elf64-alpha.c (elf64_alpha_relocate_section): Back out HJ's change,
-	as it is insufficient to handle the relocation changes as well.
-
-Mon Oct 13 23:10:08 1997  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_calc_dynrel_sizes): Allow for RELATIVE
-	relocs for symbols in shlibs that have been forced local.
-	(elf64_alpha_relocate_section): Output RELATIVEs in .got for same.
-
-Mon Oct 13 21:24:04 1997  Richard Henderson  <rth@cygnus.com>
-
-	* elf64-alpha.c (elf64_alpha_relocate_section): Use the
-	got_enties of the default symbol for the default versioned
-	symbol.  Patch from hjl@gnu.ai.mit.edu, modified not to use
-	alloca in the loop.
-
-Mon Oct 13 17:37:37 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_final_link_relocate): Only use the bottom
-	24 bits of the PC when computing a PC relative relocation.
-
-Fri Oct 10 16:01:30 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_reloc, v850_elf_final_link_relocate):
-	Correct value for maximum positive 22 bit PC relative relocation.
-	(v850_elf_final_link_relocate):  Prevent overflow from HI16_S and
-	HI_16 relocations.  Correct bit adjustment in TDA offsets.
-
-Thu Oct  9 16:43:39 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf64-sparc.c (sparc_elf_{hix22,lox10}_reloc): New functions.
-	(sparc64_elf_howto_table): Use them for HIX22,LOX10 relocs.
-
-Wed Oct  8 11:38:45 1997  Richard Henderson  <rth@cygnus.com>
-
-	* elfcore.h (bfd_prstatus): Pedanticly, alignment_power should
-	be LOG_FILE_ALIGN.
-
-Wed Oct  8 11:36:00 1997  Richard Henderson  <rth@cygnus.com>
-
-	* config.bfd: Missed one alpha* change.
-
-Tue Oct  7 13:00:17 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Remove BFD64 support.
-	* elf64-sparc.c (SPARC64_OLD_RELOCS): Undef.
-	(MINUS_ONE): New macro.
-	(sparc_elf_notsup_reloc): New function.
-	(sparc64_elf_howto_table): Add entries for DISP64,PLT64,HIX22,LOX10,
-	H44,M44,L44,REGISTER.
-	(sparc_reloc_map): Likewise.  Map BFD_RELOC_CTOR to R_SPARC_64.
-	(init_insn_reloc): New function.
-	(sparc_elf_wdisp16_reloc): Use it.
-	(sparc64_elf_relocate_section): Add entries for OLO10,HIX22,LOX10.
-
-Tue Oct  7 11:40:37 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* som.c (som_construct_extended_name_table): Remove static
-	function, and define as macro instead.
-
-Fri Oct  3 14:02:17 1997  Richard Henderson  <rth@cygnus.com>
-
-	* config.bfd: Change alpha-*-* to alpha*-*-*; config.guess now
-	recognizes alphaev5 etc.
-	* configure.host: Likewise.
-
-Fri Oct  3 11:23:47 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	Make ld -s work on AIX:
-	* xcofflink.c (xcoff_link_add_symbols): Don't create the .debug
-	section if we are stripping.
-	(bfd_xcoff_size_dynamic_sections): Don't set the .debug section
-	size if we are stripping.
-	(_bfd_xcoff_bfd_final_link): Don't set SEC_RELOC or rel_filepos,
-	and don't write out relocs, if we are stripping.
-	(xcoff_link_input_bfd): Don't set up reloc if we are stripping.
-	(xcoff_write_global_symbol): Don't write out symbol or reloc if we
-	are stripping.
-
-	* configure.in: Don't include elf.lo again for ELF targets; it's
-	always in the library anyhow.
-	* configure: Rebuild.
-
-	* bfd-in2.h: Rebuild.
-
-	* elf32-sparc.c (sparc_elf_wdisp16_reloc): Cast to bfd_byte *, not
-	char *, when calling bfd_get_32 and bfd_put_32.
-	* sunos.c (sunos_scan_dynamic_symbol): Cast contents to char *
-	when calling strcpy.
-
-Thu Oct  2 16:15:50 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* reloc.c (bfd_check_overflow): New function.
-	(bfd_perform_relocation, bfd_install_relocation): Use it.
-	(BFD_RELOC_SPARC_{DISP64,PLT64}): New relocs.
-	(BFD_RELOC_SPARC_{HIX22,LOX10,H44,M44,L44,REGISTER}): New relocs.
-	* bfd-in2.h: Regenerate.
-	* libbfd.h: Regenerate.
-
-Thu Oct  2 13:17:18 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (coff_swap_scnhdr_out): Set IMAGE_SCN_MEM_READ for an
-	unrecognized section.  From Jon Thackray <jont@harlequin.co.uk>.
-
-Wed Oct  1 14:03:44 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am ($(BFD_H)): Change stmp-bfd.h to stmp-bfd-h.
- 	(stmp-bfd-h): Rename from stmp-bfd.h.
- 	(BFD_H_FILES, LIBBFD_H_FILES, LIBCOFF_H_FILES): New variables.
-	($(srcdir)/bfd-in2.h): Just depend upon stmp-bin2-h.
-	(stmp-bin2-h): New target.
-	($(srcdir)/libbfd.h): Just depend upon stmp-lbfd-h.
-	(stmp-lbfd-h): New target.
-	($(srcdir)/libcoff.h): Just depend upon stmp-lcoff-h.
-	(stmp-lcoff-h): New target.
-	(CLEANFILES): Change stmp-bfd.h to stmp-bfd-h.  Add stmp-bin2.h,
-	stmp-lbfd-h, and stmp-lcoff-h.
-	* Makefile.in: Rebuild.
-
-	* configure.in: Use a diversion to set enable_shared before the
-	arguments are parsed.
-	* configure: Rebuild.
-
-Tue Sep 30 14:18:32 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-sparc.c (_bfd_sparc_elf_howto_table): R_SPARC_GLOB_JMP
-	renamed to R_SPARC_UNUSED_42.
-	(sparc_reloc_map): Delete R_SPARC_GLOB_JMP entry.
-	* elf64-sparc.c (_bfd_sparc_elf_howto_table): R_SPARC_GLOB_JMP
-	renamed to R_SPARC_UNUSED_42.
-	(sparc_reloc_map): Delete R_SPARC_GLOB_JMP entry.
-	* reloc.c (BFD_RELOC_SPARC_GLOB_JMP): Delete.
-	* bfd-in2.h: Regenerated.
-	* libbfd.h: Regenerated.
-
-Thu Sep 25 12:15:02 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_merge_symbol): Don't check the hash creator until
-	after we have set *sym_hash.
-
-Wed Sep 24 16:52:28 1997  Joel Sherrill  <joel@oarcorp.com>
-
-        * config.bfd (sh*-*-rtems*): New target, like sh-*-*elf*.
-
-Wed Sep 24 11:27:23 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (libbfd_a_SOURCES): Define.
-	* Makefile.in: Rebuild.
-
-	* configure.in: Call AC_CHECK_TOOL before AM_PROG_LIBTOOL.
-	* aclocal.m4: Rebuild with new libtool.
-	* configure: Rebuild.
-
-Tue Sep 23 19:03:13 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (map_sections_to_segments): Even if we are not demand
-	paged, don't put a loadable section after a nonloadable section.
-	(assign_file_positions_for_segments): Increment the file offset
-	for a section with contents, even if it is not loadable.
-
-Sun Sep 21 11:03:24 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_final_link_relocate): Add return code
-	indicating that __ctbp could not be found.
-
-Thu Sep 18 15:04:57 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_check_relocs): Improve error message.
-
-Wed Sep 17 09:54:51 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_final_link_relocate, v850_elf_reloc,
-	v850_elf_check_relocs, v850_elf_reloc_map, v850_elf_howto_table):
-	Add support for the CALLT relocs.
-
-	* reloc.c (COMMENT): Add BFD_RELOC_V850_CALLT_6_7_OFFSET and
-	BFD_RELOC_V850_CALLT_16_16_OFFSET.
-
-	* elf32-v850.c (v850_elf_final_link_relocate): Add checks to catch
-	relocations against non-existant symbols.
-
-Tue Sep 16 14:20:27 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* reloc.c: Add BFR_RELOC_V850_TDA_16_16_OFFSET.
-
-	* elf32-v850.c (v850_elf_reloc, v850_elf_final_link_relocate,
-	v850_elf_howto_table, v850_elf_reloc_map): Add support for a 16
-	bit reloc in the tiny data area.
-
-Mon Sep 15 11:27:36 1997  Ken Raeburn  <raeburn@cygnus.com>
-
-	Merged changes from Martin Hunt:
-
-	* elf32-d30v.c (bfd_elf_d30v_reloc): Change pc-relative relocs
-	over 2^32 bytes to be absolute.  Needed because D30V PC doesn't
-	necessarily wrap.
-
-	* reloc.c, elf32-d30v.c (BFD_RELOC_D30V_9_PCREL,
-	BFD_RELOC_D30V_9_PCREL_R): New relocs.
-
-	* elf32-d30v.c (bfd_elf_d30v_reloc_21): New function.
-	Do 15 and 21 bit pc-relative relocations.
-	* reloc.c (BFD_RELOC_D30V_15_PCREL_R, BFD_RELOC_D30V_21_PCREL_R):
-	New relocations.
-
-	* elf32-d30v.c (bfd_elf_d30v_reloc): Addend needs to be
-	added to the relocation, not or'd.
-
-Wed Sep 10 15:17:25 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_reloc): Remove spurious error message.
-
-Wed Sep 10 11:17:50 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* archures.c (bfd_default_scan): Use strcasecmp.
-	(bfd_default_scan): Test for match with arch_name + ":" +
- 	printable_name.
-	(bfd_default_scan): Test for match with printable_name - ":".
-	(bfd_default_scan): Delete w65, h8300, h8500, z8k, i960 special
- 	cases.  Each implements their own scan function.
-	(bfd_default_scan): Delete 386, 2900, 860, mips 2000, mips 4400
- 	special cases.  Since info->mach == 0.  The test mach == number
- 	fails.
-	(bfd_arch_list): New function, return name of all the supported
- 	architectures.
-
-Tue Sep  9 10:21:56 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_print_private_bfd_data): Break after
-	decoding architecture.
-	(v850_elf_reloc): Do not complain if a R_V850_LO16 reloc has bit
-	15 set.
-
-Sun Sep  7 12:25:22 1997  H.J. Lu  (hjl@gnu.ai.mit.edu)
-
-	* bfd/elf64-alpha.c (reloc_howto_type): Fix the howto table.
-
-Thu Sep  4 09:44:10 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am: Rebuild dependencies.
- 	(ALL_MACHINES_CFILES): Add cpu-v850.c.
-	(ALL_MACHINES_CFILES): Add elf32-v850.c.
-	* Makefile.in: Rebuild.
-
-	* reloc.c: Remove extraneous commas from relocation entries.
-	Remove BFD_RELOC_V850_16_PCREL.
-	* bfd-in2.h: Rebuild.
-
-	* xcofflink.c (xcoff_link_add_symbols): Put XTY_CM/XMC_TD symbols
-	in sections named .tocbss rather than .bss.
-
-Wed Sep  3 11:23:23 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* libbfd.h, bfd-in2.h, elf32-v850.c: Removed
-	BFD_RELOC_V850_16_PCREL.
-
-Tue Sep  2 20:44:10 1997  Fred Fish  <fnf@cygnus.com>
-
-	* cofflink.c (coff_link_check_ar_symbols): Handle C_SYSTEM syms
-	the same as C_EXT syms.
-	(coff_link_add_symbols): Ditto.
-	(_bfd_coff_link_input_bfd): Ditto.
-	(_bfd_coff_write_task_globals): Add save_global_to_static.  Use
-	it to preserve and restore state of global_to_static flag.
-
-Tue Sep  2 17:45:22 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_object_p): Set machine number based on
-	bits in e_flags field rather than magic numbers.
-	(v850_elf_final_write_processing, v850_elf_set_private_flags,
-	v850_elf_copy_private_bfd_data, v850_elf_merge_private_bfd_data,
-	v850_elf_print_private_bfd_data): New functions.
-
-Tue Sep  2 17:43:49 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf.c (prep_headers): Remove V850E magic number.
-	* elf.c (prep_headers): Remove V850EA magic number.
-
-Tue Sep  2 17:35:05 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* cpu-arc.c (arc_get_mach): Properly scan defined mach entries.
-
-Tue Sep  2 18:29:37 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf-m10200.c (mn10200_elf_final_link_relocate): PC relative
-	instructions are relative to the next instruction, not the
-	current instruction.
-	(mn10200_elf_relax_section): Similarly.
-
-Tue Sep  2 15:45:45 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cpu-v850.c: Use a macro to construct bfd_arch_info_type
-	entries.
-
-	* reloc.c, libbfd.h, bfd-in2.h, elf32-v850.c: Replace
-	BFD_RELOC_V850_{SDA/TDA/ZDA}_OFFSET relocs with new bit pattern
-	specific versions: BFD_RELOC_V850_{area}_{bits}_OFFSET.
-
-Thu Aug 28 17:01:09 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* cpu-v850.c: Remove "plain" from v850 printable name.
-	(scan): Use strcasecmp.
-
-	* archures.c (bfd_mach_v850): Define.
-
-	* cpu-sh.c (scan_mach): Compare with table instead of hardwired to
- 	just sh/SH, use strcasecmp.
-	(arch_info_struct): Add entries for sh3 et.al.
-
-	* archures.c (bfd_mach_sh, ...): Define.
-
-Wed Aug 27 17:33:07 1997  Andrew Cagney  <cagney@b1.cygnus.com>
-
-	* archures.c (bfd_archures_list): Always NULL terminate the list.
-
-Tue Aug 26 17:26:51 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am: Rebuild dependencies.
-	(ALL_MACHINES_CFILES): Add cpu-arc.c.
-	(ALL_MACHINES_CFILES): Add elf32-arc.c.
-	(elf32-arc.lo): Remove explicit dependency.
-	* Makefile.in: Rebuild.
-
-	* acinclude.m4 (BFD_CC_FOR_BUILD): Set EXEEXT_FOR_BUILD.
-	* doc/Makefile.am (MKDOC): Use EXEEXT_FOR_BUILD, not EXEEXT.
-	* aclocal.m4, configure, Makefile.in, doc/Makefile.in: Rebuild.
-
-Mon Aug 25 16:14:34 1997  Christopher Provenzano  <proven@cygnus.com>
-
-	* configure: Rebuild with latest devo autoconf for NT support
-
-Mon Aug 25 16:11:04 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cpu-arm.c (compatible): If B is a default type, return A.
-
-Mon Aug 25 15:35:46 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cpu-v850.c (scan): New function.
-	(arch_info_struct): New structure.
-	(bfd_v850_arch): Add link into arch_info_structure.
-
-	* config.bfd (targ_cpu): All v850 variants use the bfd_arch_v850
-	architecture.
-
-	* elf32-v850.c (v850_elf_object_p): New function.
-
-	* archures.c (bfd_mach_v850e): Machine value for v850e.
-
-	* bfd-in2.h (bfd_mach_v850e): Machine value for v850e.
-
-	* elf32-v850.c (ELF_MACHINE_CODE): Default to v850e machine
-	number.
-
-	* elf.c (prep_headers): Add support for v850e machine number.
-
-	* archures.c (bfd_mach_v850ea): Machine value for v850ea.
-
-	* bfd-in2.h (bfd_mach_v850ea): Machine value for v850ea.
-
-	* elf32-v850.c (ELF_MACHINE_CODE): Default to v850ea machine
-	number.
-
-	* elf.c (prep_headers): Add support for v850ea machine number.
-
-Mon Aug 25 14:07:33 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* syms.c (_bfd_stab_section_find_nearest_line): Clear the
- 	cached_stab field if the offset prevents us from using the cache.
-
-Mon Aug 25 12:08:13 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aout-target.h (MY(vec)): Add SEC_CODE and SEC_DATA to section
-	flags.
-	* aout-arm.c (aout_arm_little_vec): Likewise.
-	(aout_arm_big_vec): Likewise.
-	* bout.c (b_out_vec_big_host): Likewise.
-	(b_out_vec_little_host): Likewise.
-	* mipsbsd.c (aout_mips_little_vec): Likewise.
-	(aout_mips_big_vec): Likewise.
-
-Tue Aug 19 10:09:10 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-tic80.c (COFF_ALIGN_IN_SFLAGS): Define to 1.
-	* coffcode.h (styp_to_sec_flags): Ignore incoming STYP_INFO
-	bit in s_flags if COFF_ALIGN_IN_S_FLAGS is defined.
-
-Tue Aug 19 08:47:17 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-i960.c (COFF_ALIGN_IN_SECTION_HEADER): Define to 1.
-	(GET_SCNHDR_ALIGN, PUT_SCNHDR_ALIGN): Define.
-	* coff-m88k.c (GET_SCNHDR_NRELOC, GET_SCNHDR_NLNNO): Define.
-	* coffcode.h (coff_set_alignment_hook): Conditionally compile in if
-	COFF_ALIGN_IN_SECTION_HEADER is defined.  Convert alignment to power
-	of two for I960 only.
-	* coffswap.h (GET_SCNHDR_NRELOC, PUT_SCNHDR_NRELOC, GET_SCNDHR_NLNNO,
-	PUT_SCNHDR_NLNNO, GET_SCNHDR_FLAGS, PUT_SCNHDR_FLAGS): Provide
-	default definitions.
-	(coff_swap_scnhdr_in): Use GET_SCNHDR_FLAGS, GET_SCNHDR_NRELOC,
-	GET_SCNHDR_NLNNO, and GET_SCNHDR_ALIGN.
-	(coff_swap_scnhdr_out): Use PUT_SCNHDR_FLAGS, PUT_SCNHDR_ALIGN.
-	* Makefile.in (coff-tic80.o): Depends upon coffswap.h.
-	* coff-tic80.c (COFF_ALIGN_IN_SECTION_HEADER): Define to 1.
-	(GET_SCNHDR_FLAGS, PUT_SCNHDR_FLAGS): Define
-	* coffcode.h (coff_write_object_contents): Set alignment field in
- 	section header for TIC80COFF files.
-
-Mon Aug 18 11:36:19 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* elf32-v850.c (v850_elf_howto_table, v850_elf_reloc_map,
-	v850_elf_check_relocs, v850_elf_reloc,
-	v850_elf_final_link_relocate):  Add support for
-	BFD_RELOC_V850_16_PCREL relocation.
-
-	* reloc.c (COMMENT): Add suuport for BFD_RELOC_V850_16_PCREL
-	relocation.
-
-	* libbfd.h: Add support for BFD_RELOC_V850_16_PCREL relocation.
-
-	* bfd-in2.h: Add support for BFD_RELOC_V850_16_PCREL relocation.
-
-Mon Aug 18 11:33:56 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cpu-v850e: New file.
-
-	* elf.c (prep_headers): Add support for v850e target.
-
-	* bfd-in2.h (bfd_architecture): Add support for v850e target.
-
-	* config.bfd: Add support for v850e target.
-
-	* archures.c: Add support for v850e target.
-
-Mon Aug 18 11:33:56 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cpu-v850ea: New file.
-
-	* elf.c (prep_headers): Add support for v850ea target.
-
-	* bfd-in2.h (bfd_architecture): Add support for v850ea target.
-
-	* config.bfd: Add support for v850ea target.
-
-	* archures.c: Add support for v850ea target.
-
-Fri Aug 15 12:01:28 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffgen.c (coff_find_nearest_line): Correctly handle the offset
-	argument as section relative, rather than an absolute address.
-	From Jan Hoogenraad <hoogenrd@natlab.research.philips.com>.
-
-Fri Aug 15 04:58:02 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* config.bfd (arc-*-elf*): Add.
-	* configure.in (bfd_elf32_{little,big}arc_vec): Add.
-	* configure: Rebuild.
-	* Makefile.am (ALL_MACHINES): Add cpu-arc.lo.
-	(BFD32_BACKENDS): Add elf32-arc.lo.
-	(cpu-arc.lo,elf32-arc.lo): Add rules for.
-	* Makefile.in: Rebuild.
-	* archures.c (architecture list): Add bfd_arch_arc.
-	(bfd_archures_list): Add bfd_arc_arch.
-	(bfd_mach_arc_base): Define.
-	* reloc.c (BFD_RELOC_ARC_B22_PCREL,BFD_RELOC_ARC_B26): Add.
-	* targets.c (bfd_elf32_{little,big}arc_vec): Declare.
-	(bfd_target_vect): Add them.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* cpu-arc.c, elf32-arc.c: New files.
-	* elf.c (pre_headers): Recognize bfd_arch_arc.
-
-Tue Aug 12 11:45:18 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,final_link)): If no symbols, make sure the
-	data section is correctly rounded to a page in the file.
-
-Mon Aug 11 12:45:43 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,final_link)): Don't emit the string table if
-	there are no symbols.
-
-Sun Aug 10 14:45:56 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-stgo32.c: Rename from coff-stubgo32.c to avoid old System V
-	file system 14 character limit.
-	* Makefile.am, configure.in: Corresponding changes.
-	* Makefile.in, configure: Rebuild.
-
-Fri Aug  8 18:34:36 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am: (ALL_MACHINES_CFILES): Add elf32-d10v.c.
-	Rebuild dependencies.
-	* Makefile.in: Rebuild.
-
-Wed Aug  6 18:56:51 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (docdir): Define.
-	* Makefile.in: Rebuild.
-
-Tue Aug  5 23:05:03 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure: Rebuild with autoconf 2.12.1.
-
-Mon Aug  4 12:00:35 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aclocal.m4, configure: Rebuild with new automake patches.
-
-Sun Aug  3 08:15:12 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* rs6000-core.c (make_bfd_asection):  New function to add a section
-	to the core file bfd.
-	(rs6000coff_core_p):  Use make_bfd_asection to add the core file
-	sections.
-	Use BFD routines to seek, read and stat the core file.
-	Handle .data sections from loaded objects and anonymously mmapped
-	regions, these are available in AIX 4 core files.
-
-Fri Aug  1 12:58:32 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Set enable_shared before AM_PROG_LIBTOOL.
-	* acinclude.m4: Move acmacros.m4 in here.  Remove AM_PROG_LIBTOOL
-	copy; use a patches libtool instead.
-	* acmacros.m4: Remove.
-	* Makefile.in, aclocal.m4, configure: Rebuild.
-
-Thu Jul 31 19:55:36 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am: New file, based on old Makefile.in.
-	* acmacros.m4: New file, copied from old aclocal.m4.
-	* acinclude.m4: New file.
-	* configure.in: Call AM_PROG_LIBTOOL.  Remove shared library
-	handling; now handled by libtool.  Replace AC_CONFIG_HEADER with
-	AM_CONFIG_HEADER.  Replace AC_PROG_INSTALL with AM_PROG_INSTALL.
-	Call AM_MAINTAINER_MODE, AM_CYGWIN32, and AM_EXEEXT.  Change all
-	.o files to .lo.  Remove stamp-h handling in AC_OUTPUT.
-	* acconfig.h: Mention PACKAGE and VERSION.
-	* stamp-h.in: New file.
-	* dep-in.sed: Change .o to .lo.
-	* Makefile.in: Now built with automake.
-	* aclocal.m4: Now built with aclocal.
-	* config.in, configure: Rebuild.
-	* VERSION: Remove.
-
-Thu Jul 31 12:09:20 1997  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Don't set TEXTREL
- 	if there is only a relocation to a read-only but not allocatable
- 	section (like .stab).
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
-	* elf32-i386.c (elf_i386_size_dynamic_sections): Likewise.
-	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
-	* elf32-mips.c (mips_elf_size_dynamic_sections): Likewise.
-	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Likewise.
-
-	* elf32-ppc.c (ppc_elf_howto_raw): Correct various comments.
-	(ppc_elf_create_linker_section): These sections are not
-	created by the linker (that is, they are created by the user
-	putting data in them). In particular, they can be the source
-	and target of relocations.
-	(ppc_elf_adjust_dynamic_symbol): Check postcondition of
- 	bfd_elf32_link_record_dynamic_symbol.  Align 16-byte common
- 	objects (for instance, 'long double') to 16-byte boundaries.
-	(ppc_elf_size_dynamic_sections): Make the code that generates
-	section symbols exactly the same as for sparc, reducing the
-	number of section symbols output.
-	(ppc_elf_check_relocs): Check postcondition of
-	bfd_elf32_link_record_dynamic_symbol.  Make default case the
-	same as corresponding code for sparc, fixing bug involving
-	.rela.stabs.
-	(ppc_elf_finish_dynamic_symbol): Fix case involving GOT symbols
- 	forced to be local because of versioning (by replicating
- 	corresponding change in sparc).  Treat R_PPC_RELATIVE RELA relocs
- 	as usual in ELF, not as pseudo-REL relocs (as the sparc linker
- 	does).
-	(ppc_elf_relocate_section): Add handy debugging code for when
- 	assertion fails.  Add some more 'symbol made local because of
- 	versioning' cases.
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Cope with addend when
-	processing a GOT relocation as required by ABI.
-
-Wed Jul 30 21:30:35 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elflink.h (NAME(bfd_elf,record_link_assignment)): Remove any
-	version info if this symbol came from a dynamic object.
-	(elf_link_add_object_symbols): Set the version info of a symbol
-	only if the object actually contains version definitions and
-	defines this symbol.
-
-Mon Jul 28 18:07:43 1997  Rob Savoye  <rob@chinadoll.cygnus.com>
-
-	* aclocal.m4: Add CYGWIN and EXEEXT autoconf macros.
-        * configure.in: Use CYGWIN and EXEEXT autoconf macro to look for
-        win32 dependencies.
-        * configure: Regenerated with autoconf 2.12.
-        * doc/Makefile.in: Add $(EXEEXT) to chew executable.
-
-Mon Jul 28 02:50:29 1997  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* rs6000-core.c (rs6000coff_core_p):  If CORE_TRUNC is set, print
-	a warning rather than returning an error.
-
-Sun Jul 27 19:54:14 1997  Felix Lee  <flee@cygnus.com>
-
-	* coffswap.h (coff_swap_aux_in): add semicolon to make MSVC happy.
-
-Fri Jul 25 14:50:08 1997  Felix Lee  <flee@cygnus.com>
-
-	* cisco-core.c: define signals for wingdb.
-
-Fri Jul 25 16:27:07 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecofflink.c (bfd_ecoff_debug_accumulate): Only merge files with
-	the same number of aux entries.
-
-Fri Jul 25 08:22:15 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (hppa_som_gen_reloc_type): Use R_DATA_EXPR for the
-	difference of two symbols if the relocation size is 32 bits.
-	(som_write_fixups): Handle R_DATA_EXPR.
-
-Wed Jul 23 16:08:02 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i386.c (coff_i386_reloc): Don't offset a common symbol by
-	its value if COFF_WITH_PE is defined.
-
-Tue Jul 22 17:19:45 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
-
-	* coff-stubgo32.c: New file.
-	* go32stub.h: New file.
-	* coff-i386.c: If COFF_GO32_EXE, include coff/go32exe.h.
-	* coffswap.h (coff_swap_filehdr_in): Invoke
-	COFF_ADJUST_FILEHDR_IN_PRE and COFF_ADJUST_FILEHDR_IN_POST if they
-	are defined.
-	(coff_swap_filehdr_out): Invoke COFF_ADJUST_FILEHDR_OUT_PRE and
-	COFF_ADJUST_FILEHDR_OUT_POST if they are defined.
-	(coff_swap_aux_in): Invoke COFF_ADJUST_AUX_IN_PRE and
-	COFF_ADJUST_AUX_IN_POST if they are defined.
-	(coff_swap_aux_out): Invoke COFF_ADJUST_AUX_OUT_PRE and
-	COFF_ADJUST_AUX_OUT_POST if they are defined.
-	(coff_swap_scnhdr_in): Invoke COFF_ADJUST_SCNHDR_IN_PRE and
-	COFF_ADJUST_SCNHDR_IN_POST if they are defined.
-	(coff_swap_scnhdr_out): Invoke COFF_ADJUST_SCNHDR_OUT_PRE and
-	COFF_ADJUST_SCNHDR_OUT_POST if they are defined.
-	* targets.c (go32stubbedcoff_vec): Declare.
-	(bfd_target_vector): Add go32stubbedcoff_vec.
-	* configure.in (go32coff_vec): New target vector.
-	(go32stubbedcoff_vec): Likewise.
-	* config.bfd (i[3456]86-*-msdosdjgpp*): New target.
-	(i[3456]86-*-go32*): Change to be like new msdosdjgpp*.
-	* Makefile.in: Rebuild dependencies.
- 	(BFD32_BACKENDS): Add coff-stubgo32.o.
-	(BFD32_BACKENDS_CFILES): Add coff-stubgo32.c.
-	(HFILES): Add go32stub.h.
-
-Tue Jul 22 15:09:12 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Check for fdopen.
-	* configure, config.in: Rebuild.
-	* opncls.c (bfd_fdopenr): Check HAVE_FDOPEN rather than VMS or
-	__GO32__.  Reindent a bit.
-
-Sun Jul 20 20:05:20 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_create_dynamic_sections): Set SEC_LINKER_CREATED
-	flag for newly created sections.
-	(sunos_add_dynamic_symbols): Don't discard newly created sections
-	if shared library is dynobj.
-
-Mon Jul 14 15:33:55 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (map_sections_to_segments): When checking whether
-	including a section in a segment would force us to skip a page,
-	align the address of the next segment to avoid wraparound
-	problems.
-
-Tue Jul  8 12:11:29 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coffcode.h (coff_write_object_contents): Initialize
- 	target id field to TIC80_TARGET_ID.
-	* coffswap.h (coff_swap_filehdr_out): Swap out target id field
- 	if used.
-	(coff_swap_filehdr_in): Swap in target id field if used.
-
-Mon Jul  7 16:41:20 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i386.c (coff_i386_is_local_label_name): New static function
-	if TARGET_UNDERSCORE.
-	(coff_bfd_is_local_label_name): Define if TARGET_UNDERSCORE.
-	(i386coff_vec): Add SEC_CODE and SEC_DATA to section_flags.
-
-Mon Jun 30 14:29:26 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-m68k.c (howto_table): Use complain_overflow_bitfield, not
-	complain_overflow_signed, for 32 bit PC relative relocations.
-
-Thu Jun 26 01:26:31 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): When a version
-	indirection symbol is overridden, make the original symbol point
-	at the real overriding symbol.
-
-	* elf.c (bfd_elf_string_from_elf_section): Check for an invalid
-	string index.
-
-	* elflink.h (elf_link_output_extsym): Use the right section for a
-	common symbol.
-	* elf32-mips.c (mips_elf_link_output_symbol_hook): If a common
-	symbol was in .scommon, mark it as SHN_MIPS_SCOMMON.
-
-Wed Jun 25 12:43:10 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
-
-	* elflink.h (elf_merge_symbols): Resolve indirect and warning
-	symbols before checking for new symbols.
-
-	* elfcore.h (elf_corefile_note): Move out of HAVE_SYS_PROCFS_H.
-
-Tue Jun 24 11:20:43 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffgen.c (coff_object_p): Read the f_opthdr bytes from the
-	file, not aoutsz bytes (they are different in XCOFF .o files).
-
-	* xcofflink.c (xcoff_link_add_symbols): Permit symbols to be
-	redefined by objects included from archives.
-
-Mon Jun 23 18:03:27 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_merge_symbol): In the case of a new defined
-	symbol overriding an old defined symbol, return the hash table
-	entry which we modify, even if it is the target of an
-	indirection.
-	(elf_link_add_object_symbols): If the real name of the symbol gets
-	overridden, convert the versioned symbol into an indirect symbol
-	to the real symbol.
-
-	* elflink.h (elf_merge_symbol): New static function, broken out of
-	elf_link_add_object_symbols.
-	(elf_link_add_object_symbols): Call it.
-
-Sun Jun 22 19:40:57 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i386.c (i3coff_object_p): If COFF_IMAGE_WITH_PE, hack to
-	handle case where COFF filehdr does not immediately follow PE
-	header.
-	* coffgen.c (coff_object_p): Remove useless seek to current
-	location.
-
-Wed Jun 18 19:03:38 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* linker.c (link_action): Change COMMON_ROW/indr to from CREF to
-	REFC.
-
-Tue Jun 17 11:55:02 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_link_input_bfd): If stripping debugging
-	symbols, skip N_ABS symbols with debugging storage classes.
-
-Mon Jun 16 18:56:27 1997  Geoff Keating  <geoffk@ozemail.com.au>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Don't emit R_PPC_REL*
-	relocs in shared libraries which refer to local symbols.  Cope
-	with addend when processing a GOT relocation.
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Only create symbols
-	for sections that the linker didn't create.
-	(ppc_elf_finish_dynamic_sections): Only try to write out a section
-	symbol if it was created in ppc_elf_size_dynamic_sections.
-	(ppc_elf_relocate_section): Complain if we have to generate a reloc
-	relative to a section for which we didn't output a symbol.
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Clean up.  PLT
-	relocs are 'rela' relocs, like everything else.  .rela.plt is not
-	a read-only section, so we don't have to special-case it.
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Entries in the
-	.rela.bss section are (of course) 'rela' relocs not 'rel' relocs.
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Initialise srelgot.
-	(ppc_elf_relocate_section): @got offsets are 4 from start of the
-	actual .got section.
-	* elflink.c (_bfd_elf_create_got_section): The three reserved
-	words start from the symbol '_GLOBAL_OFFSET_TABLE_'.
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): '.rela' is 5
-	characters, not 4.
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Use
-	_bfd_elf_create_got_section to create the GOT rather than
-	ppc_elf_create_linker_section. Create the '.rela.got' section
-	ourselves.
-	(ppc_elf_finish_dynamic_symbol): Set up GOT relocations when a
-	symbol has a GOT entry.
-	(ppc_elf_relocate_section): Record when a symbol is used through
-	the GOT, and allocate space in the GOT for each such symbol.
-	(ppc_elf_adjust_dynamic_symbol): Delete unused .got.plt stuff.
-	(ppc_elf_create_linker_section): Delete unused LINKER_SECTION_GOT
-	stuff.
-
-	* elf32-ppc.c (ppc_elf_howto_raw): GOT16_HA relocs should be
-	treated in a similar way to ADDR16_HA relocs.
-	(ppc_elf_relocate_section): PLTREL24 relocs do not get copied into
-	shared objects; the linker must deal with them.
-	(ppc_elf_create_linker_section): Stop setting
-	_GLOBAL_OFFSET_TABLE_ to the wrong value; delete unused
-	LINKER_SECTION_PLT stuff.
-	(ppc_elf_check_relocs): Delete unused LINKER_SECTION_PLT stuff.
-	(ppc_elf_finish_dynamic_sections): Use BFD calls to get GOT
-	section, not ELF-specific calls.
-	(elf_backend_plt_not_loaded): Set to 1.
-	(elf_backend_got_symbol_offset): Set to 4.
-	* elf-bfd.h (elf_backend_data): Add 'plt_not_loaded' member
-	for when ld.so fills in the PLT; and 'got_symbol_offset' member.
-	* elflink.c (_bfd_elf_create_dynamic_sections): Apply
-	plt_not_loaded member.
-	(_bfd_elf_create_got_section): Apply got_symbol_offset.
-	* elfxx-target.h (elf_backend_plt_not_loaded): Set default to
-	'loaded'.
-	(elf_backend_G_O_T_offset): Set default to 0.
-	(elfNN_bed): Set added fields.
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Was setting
-	DT_RELENT in shared objects; should be DT_RELAENT.
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Propagate
-	R_PPC_ADDR16_HA relocs to shared objects. Cope with case where
-	such a reloc (in a non-shared object) refers to a symbol that's
-	not defined.
-
-Mon Jun 16 14:42:14 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
-
-	* elfcode.h (put_signed_word): Define.
-	(get_signed_word): Define.
-	(elf_swap_reloca_in): Use get_signed_word for the r_addend field.
-	(elf_swap_reloca_out): Use put_signed_word for the r_addend
-	field.
-	* elf32-m68k.c (elf_m68k_finish_dynamic_symbol): Use
-	bfd_get_signed_32 to set the r_addend field.
-	* elf64-mips.c (mips_elf64_swap_reloca_in): Use
-	bfd_h_get_signed_64 to set the r_addend field.
-
-Mon Jun 16 12:31:29 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-i386.c (elf_i386_relocate_section): When generating a
-	shared library, do the relocation if the input section is not
-	allocated in memory.
-
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Call
-	elf_link_assign_sym_version before elf_adjust_dynamic_symbol.
-	(elf_fix_symbol_flags): New static function, broken out of
-	elf_adjust_dynamic_symbol.
-	(elf_adjust_dynamic_symbol): Call elf_fix_symbol_flags.
-	(elf_link_assign_sym_version): Likewise.  Permit a symbol to be
-	forced local even if NEEDS_PLT is set.  When forcing a symbol to
-	be local, clear NEEDS_PLT.
-	(elf_link_output_extsym): Remove unused local bed.
-
-Wed Jun 11 22:44:20 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c (elf32_mn10300_link_hash_entry): New structure
-	for derived elf linker hash table entries.  References to
-	elf_link_hash_entry changed appropriately.
-	(elf32_mn10300_link_hash_table): New structure for derived elf
-	linker hash table.
-	(elf32_mn10300_hash_table): Define.
-	(elf32_mn10300_link_hash_traverse): Likewise.
-	(elf32_mn10300_link_hash_newfunc): New function.
-	(elf32_mn10300_link_hash_table_create): Likewise.
-	(elf32_mn10300_finish_hash_table_entry): Likewise.
-	(mn10300_elf_relax_section): Handle "call" -> "calls", removal
-	of prologue code, and call:32->call:16 relaxing.
-	(compute_function_info: New function.
-	(bfd_elf32_bfd_ilink_hash_table_create): Define.
-
-Wed Jun 11 00:00:07 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_output_extsym): Call finish_dynamic_symbol
-	for a symbol which is being forced to be local.
-	* elf32-i386.c (elf_i386_relocate_section): Write out the
-	relocation value for a GOT reloc for a symbol which is turning
-	into a local symbol.
-	(elf_i386_finish_dynamic_symbol): If a symbol is turning into a
-	local symbol, write out a RELATIVE reloc rather than a GLOB_DAT
-	reloc.
-	* elf32-m68k.c, elf32-sparc.c: Corresponding changes.
-
-	* elf32-i386.c (elf_i386_relocate_section): Get the relocation
-	value if the symbol is turning into a local symbol.
-	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-
-1997-06-10 22:58  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Also read verneed
-	information by calling `_bfd_elf_slurp_version_tables'.
-	(elf_link_add_object_symbols): For undefined symbols look for
-	version information in the verneed records.
-	(elf_link_add_object_symbols): Use soname of shared object
-	for verneed record if it is available.
-
-Tue Jun 10 11:13:03 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
-
-	* cpu-arm.c: Add prototypes for compatible and scan.
-	* cofflink.c: Add prototype for mark_relocs.
-
-	* archive.c (bfd_special_undocumented_glue): Change filename to
-	const pointer.  Add prototype.
-
-Mon Jun  9 12:34:21 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elflink.h (elf_link_add_object_symbols): Ignore relocations of
-	sections that will be discarded.
-
-1997-06-06 22:58  Ulrich Drepper  <drepper@cygnus.com>
-
-	* elflink.h (elf_link_find_version_dependencies): When searching
-	for known version symbol skip non-matching verdef records, not
-	matching records.
-
-Thu Jun  5 15:52:45 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Write a long,
-	not a bfd_vma, to the base file, to match how dlltool reads it.
-
-Tue Jun  3 16:57:45 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* reloc.c: Add thumb relocations.
-
-	* bfd-in2.h: Add Thumb relocations.
-
-	* libbfd.h: Add Thumb relocations.
-
-Mon Jun  2 10:41:52 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* cpu-m68k.c (arch_info_struct): Fix 68060 cpu name.
-
-Fri May 30 12:46:27 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Set dynindx
-	for a section even if it is not loaded.
-
-	* cofflink.c (coff_link_add_symbols): If PE file, don't subtract
-	section VMA.
-	(_bfd_coff_link_input_bfd): Separate section VMA handling for
-	input and output files.
-	(_bfd_coff_generic_relocate_section): Check whether input file,
-	not output file, is a PE file.
-
-Wed May 28 15:48:43 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c: (coff_arm_bfd_set_private_flags): Make static.
-
-Wed May 28 16:16:04 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-i386.c (coff_i386_reloc): Don't just exit if we see an
-	R_IMAGEBASE reloc.
-
-Wed May 28 09:48:43 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cpu-arm.c (compatible): Add test for supersets of ARM
-	architectures.
-
-Tue May 27 19:42:03 1997  Bob Manson  <manson@charmed.cygnus.com>
-
-	* cofflink.c (_bfd_coff_final_link): Initialize global_to_static
-	member.
-
-Tue May 27 14:34:08 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* coff-arm.c (coff_arm_bfd_set_private_flags): Make global.  It is
-	called directly by gas/config/tc-arm.c.
-
-Tue May 27 15:58:53 1997  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c (PLT_ENTRY_*): Use a new thread-safe format.
-	(elf64_alpha_finish_dynamic_symbol): Fill it in properly.
-
-Mon May 26 14:05:13 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-ppc.c (coff_ppc_relocate_section): If PE file, don't add
-	section VMA.
-
-Mon May 26 10:57:48 1997  Fred Fish  <fnf@cygnus.com>
-
-	* peicode.h (coff_bfd_print_private_bfd_data): #undef before #define.
-	(coff_bfd_copy_private_bfd_data): Ditto.
-	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data): Make static.
-	(coff_arm_bfd_print_private_bfd_data): Ditto.
-	(coff_arm_bfd_set_private_flags): Ditto.
-	(coff_arm_bfd_copy_private_bfd_data): Ditto.
-
-Fri May 23 15:14:58 1997  Fred Fish  <fnf@cygnus.com>
-
-	* libcoff-in.h (struct coff_final_link_info): Add boolean
-	global_to_static member for support of task linking.
-	(_bfd_coff_write_task_globals): Add prototype.
-	* libcoff.h: Regenerate.
-	* coffcode.h (coff_write_object_contents): Use #ifdef to
-	check RS6000COFF_C, to be consistent with all other uses
-	in this file.
-	* cofflink.c (_bfd_coff_final_link): If doing task linking,
-	call _bfd_coff_write_task_globals.
-	(_bfd_coff_link_input_bfd): If doing task linking, convert
-	global functions to static.
-	(_bfd_coff_write_global_sym): If doing task linking, convert
-	global variables to static.
-	(_bfd_coff_write_task_globals): New function.
-	* coff-tic80.c (TIC80COFF): Define this instead of just TIC80.
-	(C_AUTOARG): #undef since it clashes with C_UEXT.
-	(C_LASTENT): #undef since it clashes with C_STATLAB.
-	* coffcode.h (coff_write_object_contents): Use TIC80COFF
-	rather than TIC80.
-	(coff_slurp_symbol_table): Use C_SYSTEM.  Hide C_AUTOARG use
-	when TIC80COFF defined (clashes with C_UEXT).  Explicitly
-	recognize C_UEXT, C_STATLAB, and C_EXTLAB as unsupported.
-
-Fri May 23 12:38:24 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-tic80.c (tic80_howto_table): Change overflow check for most
-	PP relocations to complain_overflow_dont.
-
-Thu May 22 20:22:14 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-tic80.c (tic80_howto_table): Add PP relocations.  Change
-	name of R_RELLONG to "RELLONG".  Set rightshift and complain for
-	M_PPCR.
-	(ppbase_reloc, glob15_reloc): New static functions.
-	(glob16_reloc, local16_reloc): New static functions.
-	(rtype2howto): Handle all relocation types.
-	(coff_tic80_relocate_section): New static function.
-	(coff_relocate_section): Define to coff_tic80_relocate_section.
-	* Makefile.in (coff-tic80.o): Depends upon include/coff/tic80.h.
-
-Wed May 21 17:15:50 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_slurp_symbol_table): If COFF_WITH_PE or
-	COFF_IMAGE_WITH_PE, don't subtract the section VMA from the symbol
-	value.
-	* coffgen.c (fixup_symbol_value): Add abfd parameter.  Change all
-	callers.  If PE file, don't add section VMA.
-	(coff_write_alien_symbol): If PE file, don't add section VMA.
-	* cofflink.c (_bfd_coff_link_input_bfd): Likewise.
-	(_bfd_coff_write_global_sym): Likewise.
-	(_bfd_coff_generic_relocate_section): Likewise.
-
-	* peicode.h: Add & 0xffffffff when using ImageBase in case bfd_vma
-	is 64 bits.
-
-Wed May 21 09:58:10 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cofflink.c (mark_relocs): Add new function to mark symbols which
-	are used by relocations.
-	(_bfd_coff_link_input_bfd): Add call to mark_relocs() and code to
-	suppress the skipping of symbols that have thus been marked.
-
-Tue May 20 18:45:26 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (sh_merge_private_data): New static function.
-	(coff_bfd_merge_private_bfd_data): Define.
-
-Mon May 19 14:46:00 1997  Mark Alexander  <marka@cygnus.com>
-
-	* coff-tic80.c: Remove unnecessary #ifdefs.
-	* config.bfd: Set targ_underscore to yes for tic80.
-
-Mon May 19 14:26:36 1997  Mark Alexander  <marka@cygnus.com>
-
-	* coff-tic80.c (NAMES_HAVE_UNDERSCORE): Define (fixes problem
-	with unresolved external symbols in GDB).
-
-Fri May 16 10:23:03 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf-m10300.c (elf32_mn10300_relax_section): Read in all
-	the symbols associated with each BFD.
-	(mn10300_elf_relax_delete_bytes): Don't adjust the same symbol
-	more than once.
-	* elf-m10200.c: Likewise.
-	* elf32-m32r.c: Likewise.
-	* elf32-sh.c: Likewise.
-
-Fri May 16 12:10:52 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Don't decrease the
-	alignment of a common symbol.  If two symbols that look like
-	common symbols are found in two shared libraries, and the size is
-	different, use the larger size, and warn if --warn-common.  If a
-	common symbol overrides a definition in a shared library, set the
-	size to the larger size, and warn if --warn-common.
-
-Thu May 15 14:31:28 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* cpu-arm.c (compatible):  Allow default machine to be polymorphed
-	into any other machine type.
-
-	* coffcode.h (coff_set_flags):  Initialise flags variable to 0.
-
-	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data):  When merging
-	data into an unitialised destination set its machine type as well.
-
-Thu May 15 16:40:20 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Force ELF symbol size
-	to common symbol size.  Consistently treat uninitialized symbols
-	in shared objects as common symbols.
-
-Fri May  9 10:15:27 1997  Nick Clifton  <nickc@cygnus.com>
-
-	* archures.c (constants):  Added new constants to identify the
-	type of the ARM architecture: bfd_mach_arm_2, bfd_mach_arm_2a,
-	bfd_mach_arm_3,	bfd_mach_arm_3M, bfd_mach_arm_4 and bfd_mach_arm_4T.
-
-	* bfd-in2.h (constants):   Added new constants to identify
-	the type of the ARM architecture: bfd_mach_arm_2, bfd_mach_arm_2a,
-	bfd_mach_arm_3, bfd_mach_arm_3M, bfd_mach_arm_4 and
-	bfd_mach_arm_4T.  This file is auto-magically generated from the
-	archures.c file.  This update is just to save work.
-
-	* coff-arm.c (coff_arm_bfd_merge_private_bfd_data,
-	coff_arm_bfd_print_private_bfd_data,
-	coff_arm_bfd_set_private_flags,
-	coff_arm_bfd_copy_private_bfd_data): Added these new functions.
-	(global): Macro redefinitions set up to use these new functions.
-
-	* coffcode.h (coff_mkobject_hook): Added call to
-	coff_arm_bfd_set_private_flags().
-	(coff_set_arch_mach_hook): Added code to set machine type based on
-	bits stored in internal flags.
-  	(coff_set_flags): Added code to set the new bits in the flags
-	field based on the machine number.
-	(function definition macros): Made all function definition macros
-	conditional so that they can be overridden by target specific
-	files.
-
-	* cpu-arm.c (compatible): Added this function.  (arch_info_struct):
-	Structure extended to include new types, one each for ARMv2,
-	ARMv2a, ARMv3, ARMv3M, ARMv4 and ARMv4T.
-
-	* libcoff-in.h (struct coff_tdata):  Added flags field.
-
-Fri May  9 17:40:02 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* config.bfd (i[3456]86-*-gnu*): Don't include Mach support.
-
-	* config.bfd: Change #if 0 around uses of host_aout_vec to #if
-	HAVE_host_aout_vec.
-
-Mon May  5 13:57:32 1997  Mike Meissner  <meissner@cygnus.com>
-
-	* coffgen.c (coff_find_nearest_line): If there are no syments,
-	just return false.
-
-Mon May  5 18:18:45 1997  Philip Blundell  <pjb27@cam.ac.uk>
-
-	* config.bfd: cope with '*-*-linux-gnuaout' targets.
-
-Thu May  1 11:31:12 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* targmatch.sed: Add explicit \n characters to work around bug in
-	HP/UX 10.20 sed program.
-
-Wed Apr 30 12:27:03 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (copy_private_bfd_data): Cast csecs to avoid sign
-	extension problems.
-
-Tue Apr 22 12:06:08 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (do_maintainer_clean): Don't remove bfd-in2.h.
-
-Mon Apr 21 11:21:31 1997  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf32-m68k.c: Follow the last changes in elf32-i386.c:
-	(struct elf_m68k_pcrel_relocs_copied, struct
-	elf_m68k_link_hash_entry, struct elf_m68k_link_hash_table,
-	elf_m68k_link_hash_traverse, elf_m68k_hash_table,
-	elf_m68k_link_hash_newfunc, elf_m68k_link_hash_table_create,
-	elf_m68k_discard_copies, bfd_elf32_bfd_link_hash_table_create):
-	New definitions.
-	(elf_m68k_check_relocs): If linking with -Bsymbolic, don't copy
-	PC relative relocs for a global symbol defined in a regular
-	object, and count the number of PC relative relocs copied for any
-	global symbol.
-	(elf_m68k_size_dynamic_sections): If linking with -Bsymbolic,
-	traverse with elf_m68k_discard_copies.
-
-Sat Apr 19 22:50:14 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-i386.c (elf_i386_check_relocs): Only count PC relative
-	relocs.  From Jamie Lokier <jamie@rebellion.co.uk>.
-
-	* coffcode.h (coff_compute_section_file_positions): Force the
-	potential last byte in the file to be written out when
-	COFF_IMAGE_WITH_PE.
-
-Thu Apr 17 13:46:56 1997  Per Fogelstrom  <pefo@openbsd.org>
-
-	* configure.host (mips*-*-openbsd*): New host.
-
-Thu Apr 17 11:10:54 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Only subtract the
-	section VMA from the symbol value if this is a fully linked file.
-
-	* elf32-i386.c (struct elf_i386_pcrel_relocs_copied): Define.
-	(struct elf_i386_link_hash_entry): Define.
-	(struct elf_i386_link_hash_table): Define.
-	(elf_i386_link_hash_traverse): Define.
-	(elf_i386_hash_table): Define.
-	(elf_i386_link_hash_newfunc): New static function.
-	(elf_i386_link_hash_table_create): New static function.
-	(elf_i386_check_relocs): If linking with -Bsymbolic, don't copy
-	PC relative relocs for a global symbol defined in a regular
-	object, and count the number of PC relative relocs copied for any
-	global symbol.
-	(elf_i386_size_dynamic_sections): If linking with -Bsymbolic,
-	traverse with elf_i386_discard_copies.
-	(elf_i386_discard_copies): New static function.
-	(bfd_elf32_bfd_link_hash_table_create): Define.
-
-	From Gordon W. Ross <gwr@mc.com>:
-	* aoutf1.h (MY_entry_is_text_address): Define if not defined.
-	(sunos4_aout_backend): Use MY_entry_is_text_address.
-
-Wed Apr 16 12:43:32 1997  Martin Hunt  <hunt@cygnus.com>
-
-	* elf32-d30v.c (elf_d30v_howto_table): Changed size of
-	R_D30V_32_NORMAL to 2 (4 bytes).
-
-Wed Apr 16 14:02:29 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Gordon W. Ross <gwr@mc.com>:
-	* netbsd.h (N_SHARED_LIB): Define.
-	(SEGMENT_SIZE): Don't define.
-	* m68knetbsd.c (SEGMENT_SIZE): Don't define (revert change of
-	April 11).
-	* sparcnetbsd.c (TARGET_PAGE_SIZE): Define as 0x2000.
-	(SEGMENT_SIZE): Don't define.
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Set .rela.bss size
-	to sizeof Rela structure, not sizeof Rel structure.  From Gary
-	Thomas <g.thomas@opengroup.org>.
-
-Tue Apr 15 11:50:37 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aout-target.h (MY(callback)): If entry_is_text_address, adjust
-	whenever entry is larger than text address, but only by whole
-	pages.  From Gordon W. Ross <gwr@mc.com>.
-
-	* Makefile.in (install): Depend upon installdirs.  Use
-	mkinstalldirs to build $(oldincludedir).
-	(installdirs): New target.
-
-	* elflink.h (elf_link_add_object_symbols): Don't call check_relocs
-	if this is a debugging section which we are stripping.
-
-Mon Apr 14 12:39:30 1997  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c (elf64_alpha_object_p): Allocate the
-	alpha-specific target data struct.
-
-Mon Apr 14 11:45:46 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Thomas Graichen <graichen@rzpd.de>:
-	* Makefile.in: Always use $(SHELL) when running move-if-change.
-	* configure.in: Use ${CONFIG_SHELL} when running $ac_config_sub.
-	* configure: Rebuild.
-
-Fri Apr 11 15:43:24 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_slurp_symbol_table): Only subtract the section
-	VMA if this is an executable file or a shared object.
-
-	* targets.c (netbsd_core_vec): Declare.  From Gordon W. Ross
-	<gwr@mc.com>.
-
-	* libaout.h (struct aout_backend_data): Add entry_is_text_address
-	field.
-	* aout-target.h (SEGMENT_SIZE): Define to TARGET_PAGE_SIZE at the
-	start of the file.  Remove uses later on which switch using
-	ifdef.
-	(MY(callback)): Handle entry_is_text_address.
-	(MY_entry_is_text_address): Define if not defined.
-	(MY(backend_data)): Initialize new field.
-	* aoutf1.h (sunos4_aout_backend): Likewise.
-	* i386aout.c (MY(backend_data)): Likewise.
-	* i386mach3.c (MY(backend_data)): Likewise.
-	* mipsbsd.c (MY(backend_data)): Likewise.
-	* sparclynx.c (sparclynx_aout_backend): Likewise.
-	* netbsd.h (SEGMENT_SIZE): Define if not defined.
-	(MY_entry_is_text_address): Define.
-	* m68knetbsd.c (SEGMENT_SIZE): Define as 0x20000.
-
-	* xcofflink.c (bfd_xcoff_import_symbol): Handle importing a symbol
-	whose name starts with `.'.
-
-Fri Apr 11 11:57:15 1997  Niklas Hallqvist  <niklas@appli.se>
-
-	* config.bfd: (i[3456]86-*-openbsd*, m68*-*-openbsd*,
-	mips*el*-*-openbsd*, mips*-*-openbsd*, ns32k-*-openbsd*,
-	powerpc-*-*bsd*, sparc-*-openbsd*): New targets.
-	* configure.in (i[3456]86-*-openbsd*, mips*-*-openbsd*,
-	m68*-*-openbsd*, ns32k-*-openbsd*, powerpc-*-*bsd*,
-	sparc-*-openbsd*): New targets.
-	* configure: Rebuild.
-
-Tue Apr  8 18:09:29 1997  Jamie Lokier  <jamie@rebellion.co.uk>
-
-	* stabs.c (struct stab_section_info): New field
-	`cumulative_skips'.
-	(_bfd_link_section_stabs): Fill the above array.
-	(_bfd_stab_section_offset): Use `cumulative_skips' to
-	speed up offset calculation.
-
-Tue Apr  8 00:01:31 1997  Jeffrey A Law  (law@cygnus.com)
-
-        * elf-mn10300.c (mn10300_elf_relax_section): Don't forget the
-        addend for non pc-relative relocations.
-
-	* elf-m10300.c (bfd_elf32_mn10300_reloc): Remove prototype
-	for non-existent function.
-
-	* elf-m10300.c (mn10300_elf_relax_section): New function.
-	(mn10300_elf_relax_delete_bytes): Likewise.
-	(mn10300_elf_symbol_address_p): Likewise.
-	(mn10300_elf_get_relocated_section_contents): Likewise.
-	(bfd_elf32_bfd_relax_section): Define.
-	(bfd_elf32_bfd_get_relocated_section_contents): Likewise.
-
-Mon Apr  7 16:47:09 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Set SHLIB_LIBS.
-	* configure.in: Substitute SHLIB_LIBS.
-	* configure: Rebuild.
-	* Makefile.in (SHLIB_LIBS): New variable.
-	($(SHLIB)): Use $(SHLIB_LIBS).
-
-Mon Apr  7 10:53:52 1997  Michael Snyder  <msnyder@cleaver.cygnus.com>
-
-	* bfd-in.h bfd-in2.h: add bfd_section_lma macro to correspond
-	with bfd_section_vma.
-
-Fri Apr  4 11:37:15 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Update file names for bfd_elf32_mn10[23]00_vec.
-	Correct CPU file names for mn10[23]00.
-	* configure: Rebuild.
-
-	* bfd.c (bfd_record_phdr): Cast count to size_t before
-	subtraction.
-
-	* coff-ppc.c (dump_toc): Add cast to avoid warning from SunOS cc.
-	* coff-rs6000.c (xcoff_read_ar_hdr): Likewise.
-	(xcoff_write_archive_contents): LIkewise.
-	* elf32-mips.c (_bfd_mips_elf_set_section_contents): Likewise.
-	(mips_elf_create_procedure_table): Likewise.
-	* peicode.h (pe_print_idata): Likewise.
-	(pe_print_edata, pe_print_pdata, pe_print_reloc): Likewise.
-	* xcofflink.c (xcoff_get_section_contents): Likewise.
-	(_bfd_xcoff_canonicalize_dynamic_symtab): Likewise.
-	(xcoff_link_add_symbols): Likewise.
-	(xcoff_link_add_symbols): Likewise.
-
-	* ppcboot.c (ppcboot_set_arch_mach): Make static.
-	(ppcboot_bfd_print_private_bfd_data): Likewise.
-
-	* elf32-mips.c (elf_mips_ctor64_howto): Set complain_on_overflow
-	to complain_overflow_signed.
-
-Thu Apr  3 11:51:54 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* VERSION: Set to 2.8.1.
-
-	* Branched binutils 2.8.
-
-	* elf32-ppc.c (ppc_elf_check_relocs):  Don't check SEC_ALLOC when
-	deciding whether to copy a reloc into a shared object.
-	(ppc_elf_relocate_section): Likewise.  Relocate R_PPC_RELATIVE
-	relocs in unallocated sections.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Relocate
-	R_SPARC_RELATIVE relocs in unallocated sections.
-
-Wed Apr  2 16:19:41 1997  Mike Meissner  <meissner@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Undo March 26 change and
-	always create got section so that the _GLOBAL_OFFSET_TABLE_ label
-	is always created.
-
-Wed Apr  2 10:49:07 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Let a common symbol
-	override an uninitialized symbol from a shared library with a
-	smaller size.
-
-	* elf-m10200.c: Rename from elf32-mn10200.c.
-	* elf-m10300.c: Rename from elf32-mn10300.c.
-	* cpu-m10200.c: Rename from cpu-mn10200.c
-	* cpu-m10300.c: Rename from cpu-mn10300.c
-	* Makefile.in: Update accordingly.
-
-	* elf32-mips.c (elf_mips_ctor64_howto): New static variable.
-	(elf_mips_isa): Move to earlier in file.
-	(mips_reloc_map): Remove BFD_RELOC_CTOR entry.
-	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_CTOR
-	specially.
-
-	* elf32-mips.c (mips16_jump_reloc): Print a warning rather than
-	calling abort.
-
-Tue Apr  1 16:18:05 1997  Klaus Kaempf  <kkaempf@progis.de>
-
-	* configure.com: New file.
-	* config.h-vms: Remove file.
-	* makefile.vms: Update for new configure scheme.
-
-Mon Mar 31 23:28:39 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
-
-	* libcoff-in.h (ppc_allocate_toc_section): Declare.
-	(ppc_process_before_allocation): Declare.
-	* libcoff.h: Rebuild.
-
-	* coffcode.h (coff_mkobject_hook): Declare if not a macro.
-
-Mon Mar 31 16:29:50 1997  Joel Sherrill  <joel@oarcorp.com>
-
-        * config.bfd (hppa*-*-rtems*): New target, like hppa-*-*elf*.
-
-Mon Mar 31 16:11:35 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-a29k.c (coff_a29k_relocate_section): Don't use symndx as a
-	symbol index for a R_IHCONST reloc.
-
-Mon Mar 31 15:40:59 1997  Philippe De Muyter  <phdm@info.ucl.ac.be>
-
-	* targmatch.sed: Do not use \(\) recursively.
-
-Fri Mar 28 14:44:08 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
-
-	* m68klinux.c (MACHTYPE_OK): Define.
-	* i386linux.c (MACHTYPE_OK): Define.
-
-Fri Mar 28 11:56:15 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	From David S. Miller <davem@caip.rutgers.edu> and H.J. Lu
-	<hjl@gnu.ai.mit.edu>:
-	* sparclinux.c: New file.
-	* bfd-in.h (bfd_sparclinux_size_dynamic_sections): Declare.
-	* bfd-in2.h: Rebuild.
-	* config.bfd (sparc-*-linuxaout*, sparc-*-linux*): New targets.
-	* configure.in (sparclinux_vec): Add to list of vectors.
-	* configure: Rebuild.
-	* targets.c (sparclinux_vec): Declare.
-	(bfd_target_vector): Add sparclinux_vec.
-	* Makefile.in: Rebuild dependencies.
-	(BFD32_BACKENDS): Add sparclinux.o.
-	(BFD32_BACKENDS_CFILES): Add sparclinux.c.
-
-	* coff-mips.c (mips_ecoff_backend_data): Initialize new
-	bfd_coff_backend_data field.
-	* coff-alpha.c (alpha_ecoff_backend_data): Likewise.
-
-	* config.bfd: Add bfd_elf64_{big,little}mips_vec to targ_selvecs
-	for mips*el*-*-linux* and mips*-*-linux*.  From H.J. Lu
-	<hjl@lucon.org> and Ralf Baechle <ralf@gnu.ai.mit.edu>.
-
-	* bfd.c: Include "libiberty.h".
-	(strerror): Don't declare.
-	(bfd_errmsg): Call xstrerror rather than strerror.
-
-Thu Mar 27 12:55:42 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-i386.c (elf_i386_adjust_dynamic_symbol): Generate a COPY
-	reloc even if the symbol is in the .bss section.
-	* elf32-m68k.c (elf_m68k_adjust_dynamic_symbol): Likewise.
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Likewise.
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Likewise.
-
-	* coffcode.h (bfd_coff_backend_data): Add new field
-	_bfd_coff_default_section_alignment_power.
-	(bfd_coff_default_section_alignment_power): Define.
-	(bfd_coff_std_swap_table): Initialize new field.
-	* libcoff.h: Rebuild.
-	* cofflink.c (coff_link_add_symbols): Limit alignment of a common
-	symbol to the default section alignment.
-
-	* COPYING: Update FSF address.
-
-Thu Mar 27 00:45:57 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* elf32-d30v.c (elf_d30v_howto_table): Fix a typo in the
-	21-bit absolute that made it act as a relative.
-
-Wed Mar 26 14:50:20 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.c (_bfd_elf_create_linker_section): Don't set
-	bss_section and rel_section from existing sections.
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Only create the got section
-	if it is needed.
-
-Tue Mar 25 22:26:56 1997  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* aoutx.h (some_aout_object_p):  Change executable test to fix
-	problems with embedded a.out systems.
-
-Tue Mar 25 14:35:37 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* stabs.c (_bfd_stab_section_offset): New function.
-	* libbfd-in.h (_bfd_stab_section_offset): Declare.
-	* libbfd.h: Rebuild.
-	* elf32-i386.c (elf_i386_relocate_section): Adjust the offset of a
-	stab reloc.
-	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
-	* elf32-mips.c (mips_elf_relocate_section): Likewise.
-	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-	* elf64-alpha.c (elf64_alpha_relocate_section): Likewise.
-
-	* stabs.c (_bfd_link_section_stabs): Copy over the first header
-	symbol.  Check for memory allocation failure of *psinfo.
-	(_bfd_write_section_stabs): Add psinfo parameter.  Change all
-	callers.  Set the value of the header symbol.
-	* libbfd-in.h (_bfd_write_section_stabs): Update declaration.
-	* libbfd.h: Rebuild.
-
-Mon Mar 24 20:07:29 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-tic80.c (tic80_howto_table): Add R_ABS entry.
-	(rtype2howto): Handle R_ABS reloc type.  Also abort on unhandled
-	reloc types, rather than silently failing to generate an output file.
-
-Mon Mar 24 13:41:00 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* targmatch.sed: Use the hold space to put the #ifdef around the
-	the string constant.
-	* targets.c (UNSUPPORTED_TARGET): Don't define.
-	(find_target): Don't check for UNSUPPORTED_TARGET.
-	(bfd_set_default_target): Don't try to optimize by checking for
-	default.
-
-	* Makefile.in: Rebuild dependencies.
- 	(ALL_MACHINES_CFILES): Add cpu-m32r.c.
-	(BFD32_BACKENDS_CFILES): Add elf32-m32r.c.
-	(elf32-m32r.o): Remove explicit target.
-
-	* config.bfd: Don't set targ_underscore for i[3456]86-*-gnu* or
-	i[3456]86-*-linux*.
-
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Don't
-	count section symbols for sections that were created by the
-	linker, or are not allocatable or not loadable.
-	(elf32_sparc_finish_dynamic_sections): Output output section
-	symbols for section for which we made space for them.
-
-Fri Mar 21 13:08:26 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): If there is
-	no .rela.plt section, don't output a DT_PLTGOT dynamic entry.
-
-Fri Mar 21 12:36:46 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-m32r.c (m32r_elf_howto_table): Use special function for LO16.
-	(m32r_hi16_list): New static local.
-	(m32r_elf_hi16_reloc): Don't perform reloc, just queue it up.
-	(m32r_elf_do_hi16_reloc): Delete.
-	(m32r_elf_relocate_hi16): New function.
-	(m32r_elf_lo16_reloc): New function.
-	(m32r_elf_relocate_section): For HI16 relocs, scan for corresponding
-	LO16 reloc.
-
-	Mon Mar 10 16:03:31 1997  Doug Evans  <dje@seba.cygnus.com>
-
-	* elf32-m32r.c (m32r_elf_create_linker_section): Delete.
-	(m32r_elf_add_symbol_hook): Rewrite _SDA_BASE_ support.
-	(m32r_elf_final_sda_base): New function.
-	(m32r_elf_relocate_section): Rewrite sdata support.
-	(m32r_elf_finish_dynamic_sections): Delete.
-
-Thu Mar 20 12:39:02 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	Based on patches from Philippe De Muyter <phdm@info.ucl.ac.be>.
-	* coff-svm68k.c: New file.  Just defines some macros and includes
-	coff-m68k.c.
-	* coff-m68k.c: Add functions to handle common addends, moved in
-	from cf-m68klynx.c.  Control them using COFF_COMMON_ADDEND macro.
-	Control whether relocs are visible using STATIC_RELOCS.
-	* cf-m68klynx.c: Simplify greatly: just define macros to control
-	coff-m68k.c.
-	* coff-aux.c: Likewise.  Just leave add_one_symbol routine.
-	* targets. (m68ksysvcoff_vec): Declare.
-	(bfd_target_vector): Add m68ksysvcoff_vec.
-	* config.bfd (m68*-motorola-sysv*): New target.
-	* configure.in (m68ksysvcoff_vec): New vector.
-	* configure: Rebuild.
-	* Makefile.in: Rebuild dependencies.
- 	(BFD32_BACKENDS): Add coff-svm68k.o.
-	(BFD32_BACKENDS_CFILES): Add coff-svm68k.c.
-
-	* binary.c (binary_set_section_contents): Don't get misled if the
- 	first section is not loadable.  From Matthew L. Martin
- 	<mlm@xedia.com>.
-
-	* elflink.h (elf_bfd_final_link): Set the value of a section
-	symbol to the section address unless doing a relocateable link.
-
-Tue Mar 18 23:03:17 1997  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c (elf64_alpha_adjust_dynamic_symbol): Don't create
-	.plt entry if we've taken the function's address.
-	(elf64_alpha_merge_gots): Merge collected flags info as well.
-
-Tue Mar 18 22:40:09 1997  H.J. Lu  <hjl@lucon.org>
-
-	* Many files: Add function prototypes.
-	* cpu-m68k.c (bfd_default_scan_num_mach): Don't declare.
-	* ecofflink.c: Include "libcoff.h" and "libecoff.h".
-	* elf32-ppc.c (ppc_elf_fake_sections): Make static.
-	* opncls.c (bfd_openstreamr): Change stream parameter to PTR.
-	* peicode.h: Change several void * parameters to PTR.
-	* srec.c (srec_get_symbol_info): Make static.
-	* syms.c (bfd_symbol_is_absolute): Remove.
-	* Makefile.in: Rebuild dependencies.
-
-Tue Mar 18 12:58:08 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-m32r.c (m32r_elf_is_local_label_name): Remove.
-	(bfd_elf32_bfd_is_local_label): Don't define.
-
-	* xcofflink.c (_bfd_xcoff_bfd_final_link): Call bfd_malloc rather
-	than malloc.
-
-Mon Mar 17 11:32:53 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd-in.h: Don't include obstack.h.
-	(struct bfd_hash_table): Change memory field to PTR.
-	* bfd.c (struct _bfd): Change memory field to PTR.
-	* bfd-in2.h: Rebuild.
-	* libbfd-in.h (bfd_release): Declare as function, don't define as
-	macro.
-	* libbfd.h: Rebuild.
-	* opncls.c: Include "objalloc.h" rather than "obstack.h".  Use
-	objalloc routines rather than obstack routines.
-	(obstack_chunk_alloc, obstack_chunk_free): Don't define.
-	(getpagesize): Don't define.
-	(_bfd_new_bfd): Don't set _bfd_chunksize.
-	(bfd_openr): Free new bfd and objalloc on failure.
-	(bfd_fdopenr, bfd_openstreamr, bfd_openw): Likewise.
-	(bfd_alloc_size): Remove.
-	(bfd_release): New function.
-	* hash.c: Include "objalloc.h" rather than "obstack.h".  Use
-	objalloc routines rather than obstack routines.
-	(obstack_chunk_alloc, obstack_chunk_free): Don't define.
-	* ecofflink.c: Include "objalloc.h" rather than "obstack.h".  Use
-	objalloc routines rather than obstack routines.
-	(obstack_chunk_alloc, obstack_chunk_free): Don't define.
-	(struct accumulate): Change memory to struct objalloc *.
-	* liboasys.h (oasys_data_type): Remove oasys_obstack field.
-	* dep-in.sed: Don't remove obstack.h from dependency list.
-	* Makefile.in: Rebuild dependencies.
-	(BFD_H_DEPS): Remove obstack.h.
-	(install): Don't install obstack.h.
-	* Many files: Don't include "obstack.h".
-	* VERSION: Bump.
-
-	* opncls.c (bfd_alloc_grow, bfd_alloc_finish): Remove.
-	* libbfd-in.h (bfd_alloc_grow, bfd_alloc_finish): Don't declare.
-	* libbfd.h: Rebuild.
-	* ieee.c (ieee_archive_p): Rewrite to not use bfd_alloc_grow.
-	* sunos.c (sunos_add_dynamic_symbols): Likewise.
-	* srec.c (srec_scan): Rewrite to not use obstack_1grow.
-
-	* opncls.c (bfd_alloc): Rename from bfd_alloc_by_size_t.  Remove
-	old version of bfd_alloc.
-	* libbfd-in.h (bfd_alloc_by_size_t): Don't declare.
-	* libbfd.h: Rebuild.
-	* Several files: Call bfd_alloc rather than bfd_alloc_by_size_t.
-
-Sat Mar 15 15:24:18 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_is_local_label_name): Accept the generic
-	ELF local label syntax as well.
-
-Sat Mar 15 10:16:42 1997  Fred Fish  <fnf@cygnus.com>
-
-	* config.bfd (powerpc-*-beos*): New target.
-	* configure.in (powerpc-*-beos*): Add case that explicitly
-	does not set COREFILE for now.  A future BeOS version is
-	expected to support core files.
-	* configure: Regenerate with autoconf.
-
-Fri Mar 14 16:43:22 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_check_relocs): Give an error if CALL16 is
- 	seen with a local symbol, rather than crashing.
-
-	* elfcode.h (elf_slurp_symbol_table): Don't try to read the
-	version symbols if there aren't any.
-
-Thu Mar 13 16:38:30 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-tic80.c (coff_rtype_to_howto): Define
-	(coff_tic80_rtype_to_howto): Clone generic coff version and
-	add code to handle the funky TI "internal relocations".
-
-Thu Mar 13 14:08:53 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Don't warn about type
-	or size changes because of a weak symbol.
-
-	* cisco-core.c (SIGEMT): Define if not defined.
-
-Wed Mar 12 21:36:05 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Use extsymoff when
-	setting ever.  Sanity check the version number.  Sort out copying
-	flags and other information when adding an indirect symbol.
-	(NAME(bfd_elf,size_dynamic_sections)): Preserve any dynamic
-	symbols added by the backend.  Clear the entire contents of the
-	versym section.
-	(elf_export_symbol): Ignore indirect symbols.
-	(elf_link_output_extsym): Accept a section without an owner in an
-	assert.
-	* elfcode.h (elf_slurp_symbol_table): Add a sanity check on the
-	version count.  Correct the allocation of x_versymp.
-
-	* elf32-mips.c (mips_elf_add_symbol_hook): Don't set the owner of
-	the magic sections used for SHN_MIPS_TEXT and SHN_MIPS_DATA.
-	Don't return bfd_und_section_ptr when info->shared.
-	(mips_elf_final_link): Set the alignment of .rtproc to 4, not 12.
-	(mips_elf_create_dynamic_sections): Correct type: ^= for &=.
-	(mips_elf_check_relocs): Resolve an indirect symbol in
-	sym_hashes.
-	(mips_elf_finish_dynamic_symbol): Don't change SHN_ABS into
-	SHN_MIPS_TEXT or SHN_MIPS_DATA.
-
-	* elf.c (bfd_elf_print_symbol): Tweak version output slightly.
-
-Tue Mar 11 01:38:36 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Eric Youngdale <eric@andante.jic.com>:
-	* elf-bfd.h (ELF_LINK_FORCED_LOCAL): Define.
-	* elf.c (bfd_elf_print_symbol): Correct errors in last change.
-	* elflink.h (elf_link_add_object_symbols): Handle cases in which a
-	versioned symbol appears in both a regular and a shared object.
-	(elf_link_assign_sym_version): Set ELF_LINK_FORCED_LOCAL when
-	appropriate.  Improve error message.
-	(struct elf_outext_info): Rename from elf_finfo_failed.  Change
-	all uses.  Add localsyms field.
-	(elf_bfd_final_link): When generating a shared library, call
-	elf_link_output_extsym to output all local symbols.
-	(elf_link_output_extsym): Handle symbols which were forced to
-	become local.
-
-Sun Mar  9 23:08:49 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Eric Youngdale <eric@andante.jic.com>:
-	* elf-bfd.h (elf_symbol_type): Add version field.
-	* elfcode.h (elf_slurp_symbol_table): Set version field.
-	* elflink.h (elf_link_add_object_symbols): When creating an
- 	indirect symbol for a default version symbol, set DEF_DYNAMIC if
- 	appropriate.  Set up an indirection from the nondefault version of
-	the symbol as well.
-	(NAME(bfd_elf,size_dynamic_sections)): Call
-	elf_link_assign_sym_version before checking whether there are any
-	versions.  Always record the version name as a dynamic symbol.
-	Initialize counters.
-	(elf_link_assign_sym_version): After finding a version, see if a
-	symbol should be forced to local scope.  Create a new version
-	definition if appropriate.
-	(elf_link_output_extsym): Correct indirect symbol handling.
-	* elf.c (bfd_elf_print_symbol): Print version information.
-	(bfd_section_from_shdr): Turn version sections into BFD sections.
-	(elf_fake_sections): Only copy cverdefs and cverrefs into sh_info
-	if sh_info is not already set.
-	(_bfd_elf_copy_private_section_data): Copy sh_info for version
-	sections.
-	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Tell
-	_bfd_stringtab_add to copy the name into permanent memory if
-	appropriate.
-
-Fri Mar  7 11:55:31 1997  H.J. Lu  <hjl@gnu.ai.mit.edu>
-
-	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Fully parenthesize.
-
-Fri Mar  7 10:37:30 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (bfd_coff_backend_data): Change
-	_bfd_coff_compute_section_file_positions to return a boolean
-	value.  Change all callers.
-	(coff_compute_section_file_positions): Change return type to
-	boolean.  If the size of the last section changed, then output a
-	zero byte at the end of the file.
-	* libcoff.h: Rebuild.
-
-	* xcofflink.c (_bfd_xcoff_bfd_final_link): Always allocate space
-	for at least 6 output symbols.
-	(xcoff_write_global_symbol): When emitting TOC entry relocs, also
-	emit a TC csect to represent the space they take up.  For an XO
-	symbol, just emit a reference, not a csect.
-
-	* Makefile.in ($(SHLINK)): Just use ln -s, not ln -sf, since
-	Solaris doesn't like the combined options, and the -f is
-	unnecessary.
-	(stamp-tshlink, install): Likewise.
-
-	* elf32-mips.c (mips_elf_relocate_section): Correct R_MIPS16_26
-	handling when little endian.
-
-Thu Mar  6 13:51:51 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c (mn10300_elf_final_link_relocate): New function.
-	(mn10300_elf_relocate_section): Likewise.
-	(elf_backend_relocate_section): Define.
-
-	* elf32-mn10300.c (reloc_type): Remove PCREL{8,16,32}_{1,2}BYTE
-	relocs.  Replace them with generic PCREL_{8,16,32} relocs.
-	(elf32_mn10300_howto_table): Likewise.
-	(elf32_mn10300_reloc_map): Likewise.
-	(bfd_elf32_mn10300_reloc): Delete unused function.
-
-Thu Mar  6 12:19:59 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-tic80.c (rtype2howto): If passed a relocation type we don't
-	understand, just set the howto field to NULL, and the caller will
-	print an appropriate error message.
-	* coffcode.h (coff_slurp_reloc_table): Pull duplicate declarations and
-	code fragment out of both legs of #ifdef RELOC_PROCESSING ... #endif
-	block.  Use NULL for initializations of "ptr" rather than bare 0.
-	* coff-h8300.c: Fix typo in comment.
-	* coff-h8500.c: Ditto.
-	* coff-w65.c: Ditto
-	* coff-z8k.c: Ditto.
-
-Wed Mar  5 13:59:09 1997  Doug Evans  <dje@seba.cygnus.com>
-
-	* elf32-m32r.c (m32r_elf_do_10_pcrel_reloc): Fix overflow calc.
-	(m32r_elf_relax_section, m32r_elf_relax_delete_bytes,
-	m32r_elf_get_relocated_section_contents): First pass at relax support.
-
-Mon Mar  3 13:27:09 1997  Ulrich Drepper  <drepper@rtl.cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Use correct sh_size
-	entry for reading verdef records.
-	Use correct braces for computing increments of extverdaux and
-	exteverdef record pointers.
-
-Sun Mar  2 22:47:54 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-tic80.c (COFF_DEFAULT_SECTION_ALIGNMENT_POWER): Set this to 2
-	instead of 4.
-
-Sun Mar  2 16:25:35 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_find_version_dependencies): Check that
-	DEF_REGULAR is not set as well as checking that DEF_DYNAMIC is
-	set.
-
-Fri Feb 28 16:52:40 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coffcode.h (coff_set_flags): Add case for TIC80_ARCH_MAGIC.
-
-Fri Feb 28 15:06:45 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* targets.c (bfd_default_vector): Make non-const.
-	(find_target): New static function, broken out of
-	bfd_find_target.
-	(bfd_set_default_target): New function.
-	(bfd_find_target): Call find_target.  When defaulting, use
-	bfd_default_vector[0] if it is not NULL.
-	* libbfd-in.h (bfd_default_vector): Adjust declaration.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-	* syms.c (bfd_is_local_label): Return false if the symbol has no
-	name.
-	* coff-i960.c (coff_i960_is_local_label_name): New function.
-	(coff_bfd_is_local_label_name): Define.
-	* coff-m68k.c (m68k_coff_is_local_label_name): New function.
-	(coff_bfd_is_local_label_name): Define.
-	* coff-rs6000.c (xcoff_is_local_label_name): New function.
-	(coff_bfd_is_local_label_name): Define.
-	* elf.c (_bfd_elf_is_local_label_name): Treat symbols beginning
-	with .. or _.L_ as local.
-	* elf32-i386.c (elf_i386_is_local_label_name): New function.
-	(bfd_elf32_bfd_is_local_label_name): Define.
-	* evax-alpha.c (evax_bfd_is_local_label_name): Treat symbols
-	beginning with $ as local.
-
-Thu Feb 27 18:36:23 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (aout_link_write_symbols): Use bfd_is_local_label_name
-	rather than comparing against info->lprefix.
-	* cofflink.c (_bfd_coff_link_input_bfd): Likewise.
-	* elflink.h (elf_link_input_bfd): Likewise.
-	* linker.c (_bfd_generic_link_output_symbols): Likewise.
-	* xcofflink.c (xcoff_link_input_bfd): Likewise.
-
-	* elfxx-target.h (bfd_elfNN_bfd_is_local_label_name): Define as
-	_bfd_elf_is_local_label_name if not already defined.
-	* elf.c (_bfd_elf_is_local_label_name): New function.
-	* elf-bfd.h (_bfd_elf_is_local_label_name): Declare.
-
-	* coff-m88k.c (coff_bfd_is_local_label_name): Define.
-	(m88k_is_local_label_name): New static function.
-
-	* coffcode.h (coff_bfd_is_local_label_name): Define as
-	_bfd_coff_is_local_label_name if not already defined.
-	* coffgen.c (_bfd_coff_is_local_label_name): New function.
-	* libcoff-in.h (_bfd_coff_is_local_label_name): Declare.
-	* libcoff.h: Rebuild.
-
-	* targets.c (BFD_JUMP_TABLE_SYMBOLS): Change _bfd_is_local_label
-	to _bfd_is_local_label_name.
-	(bfd_target): Likewise.
-	* syms.c (bfd_is_local_label): Define as function, not macro.
-	(bfd_is_local_name): Define.
-	* libbfd.c (bfd_generic_is_local_label_name): Rename from
-	bfd_generic_is_local_label, and take a string rather than a
-	symbol.
-	* libbfd-in.h (_bfd_nosymbols_bfd_is_local_label): Don't define.
-	(_bfd_nosymbols_bfd_is_local_label_name): Define.
- 	(bfd_generic_is_local_label): Don't declare.
-	(bfd_generic_is_local_label_name): Declare.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* All backends: Change local_label to local_label_name.
-
-	* elf32-mips.c (struct mips_got_info): Add assigned_gotno field.
-	(mips_elf_relocate_got_local): Change return type to boolean.
-	Don't assume that the first zero entry is unassigned; instead, use
-	assigned_gotno.
-	(mips_elf_relocate_section): Check return value of
-	mips_elf_relocate_got_local.
-	(mips_elf_create_got_section): Initialize assigned_gotno field.
-
-Wed Feb 26 15:19:51 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* elf32-d30v.c (bfd_elf_d30v_reloc): Add code to do 32-bit
-	relocations.
-
-Wed Feb 26 13:33:03 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_input_bfd): Don't skip symbols from sections
-	that have no contents merely because linker_mark is not set.
-
-Tue Feb 25 18:51:35 1997  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* config.bfd (mips*-*-lnews*): New target.
-	* coff-mips.c (mips_relocate_section): Make assert compare
-	content byteorder instead of header byteorder.
-	(ecoff_biglittle_vec): New BFD, big-endian headers, little-endian
-	data.
-	* targets.c (bfd_target_vector): Add ecoff_biglittle_vec.
-	* configure.in (ecoff_biglittle_vec): Add case.
-	* configure: Update.
-
-Tue Feb 25 00:32:49 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (elf_fake_sections): Use SHT_NOTE for any section whose
-	name begins with ".note".
-	(map_sections_to_segments): Add a PT_NOTE segment for any loadable
-	section whose name begins with ".note".
-	(get_program_header_size): Corresponding change.
-
-	* elf32-mips.c (mips_elf_relocate_section): Check for misaligned
-	jal and for jal overflow.
-
-Mon Feb 24 17:53:14 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Eric Youngdale <eric@andante.jic.com>:
-	* elflink.h (elf_link_add_archive_symbols): If a default symbol is
-	not found, try looking it up again without the version name.
-	(elf_link_add_object_symbols): Always link against the dynamic
-	symbol table of a dynamic object.  When linking against a dynamic
-	object, include version strings in symbol names, and set up
-	version information.  Add indirect symbols for default versions.
-	(elf_link_create_dynamic_sections): Add special version sections.
-	(struct elf_assign_sym_version_info): Define.
-	(struct elf_find_verdep_info): Define.
-	(NAME(bfd_elf,size_dynamic_sections)): Add verdefs parameter.  Set
-	up version sections.
-	(elf_adjust_dynamic_symbol): Ignore indirect symbols.
-	(elf_link_find_version_dependencies): New static function.
-	(elf_link_assign_sym_version): New static function.
-	(elf_link_renumber_dynsyms): New static function.
-	(struct elf_final_link_info): Add symver_sec field.
-	(elf_bfd_final_link): Initialize finfo.symver_sec.  Don't count
-	local symbols of a dynamic object.  Handle DT_VER* constants.
-	(elf_link_output_extsym): Simplify BFD_ASSERT checking for a
-	dynamic object.  Skip indirect symbols from ELF objects.  Remove
-	the version name before choosing a hash bucket.  Write out the
-	version information if appropriate.
-	(elf_link_input_bfd): Check for DYNAMIC, not ET_DYN.
-	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
-	(bfd_elf64_size_dynamic_sections): Likewise.
-	* bfd-in2.h: Rebuild.
-	* elf-bfd.h (struct elf_link_hash_entry): Add verinfo field.
-	Change elf_link_hash_flags to unsigned short.
-	(ELF_LINK_HIDDEN): Define.
-	(struct elf_obj_tdata): Add fields dynversym_hdr, dynverref_hdr,
-	dynverdef_hdr, dynversym_section, dynverdef_section,
-	dynverref_section, cverdefs, cverrefs, verdef, verref.
-	(elf_dynversym, elf_dynverdef, elf_dynverref): Define.
-	(_bfd_elf_swap_verdef_in, _bfd_elf_swap_verdef_out): Declare.
-	(_bfd_elf_swap_verdaux_in, _bfd_elf_swap_verdaux_out): Declare.
-	(_bfd_elf_swap_verneed_in, _bfd_elf_swap_verneed_out): Declare.
-	(_bfd_elf_swap_vernaux_in, _bfd_elf_swap_vernaux_out): Declare.
-	(_bfd_elf_swap_versym_in, _bfd_elf_swap_versym_out): Declare.
-	(_bfd_elf_slurp_version_tables): Declare.
-	* elf.c (_bfd_elf_swap_verdef_in): New function.
-	(_bfd_elf_swap_verdef_out): Likewise.
-	(_bfd_elf_swap_verdaux_in, _bfd_elf_swap_verdaux_out): Likewise.
-	(_bfd_elf_swap_verneed_in, _bfd_elf_swap_verneed_out): Likewise.
-	(_bfd_elf_swap_vernaux_in, _bfd_elf_swap_vernaux_out): Likewise.
-	(_bfd_elf_swap_versym_in, _bfd_elf_swap_versym_out): Likewise.
-	(_bfd_elf_print_private_bfd_data): Add DT_VER* constants.  Print
-	version information if there is any.
-	(_bfd_elf_link_hash_newfunc): Initialize verinfo field.
-	(bfd_section_from_shdr): Handle SHT_GNU_ver* section types.
-	(elf_fake_sections): Handle .gnu.version* section names.
-	(assign_section_numbers): Handle SHT_GNU_ver* section types.
-	(_bfd_elf_slurp_version_tables): New function.
-	* elflink.c (_bfd_elf_link_record_dynamic_symbol): Don't include
-	version name in string entered in dynamic hash table.
-	* elfcode.h: Include fnmatch.h.
-	* elf32-i386.c (elf_i386_relocate_section): Handle a dynamic
-	symbol which was forced to become local.
-	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
-	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-	* elf64-alpha.c (alpha_elf_dynamic_symbol_p): Likewise.
-
-Fri Feb 21 16:15:18 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10200.c (mn10200_elf_final_link_relocate): Simplify
-	somewhat.
-	(mn10200_elf_relax_section): Correctly compute a symbol's value
-	when the symbol is local, but not in the same section as we are
-	relaxing.  Implement abs24 -> abs16, imm24 -> imm16 and d24 -> d16
-	relaxing.
-
-Fri Feb 21 13:55:14 1997  Doug Evans  <dje@seba.cygnus.com>
-
-	* elf32-m32r.c: Rewrite to use ELF backend linker.
-	Store lower 16 bits of addend in R_M32R_HI16_[SU]LO insns.
-	Add small data area support (R_M32R_SDA16).
-	* reloc.c: Document BFD_RELOC_M32R_SDA16.
-	* bfd-in2.h,libbfd.h: Regenerated.
-
-Thu Feb 20 23:50:31 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10200.c (mn10200_elf_relax_section): New function.
-	(mn10200_elf_relax_delete_bytes): Likewise.
-	(mn10200_elf_symbol_address_p): Likewise.
-	(mn10200_elf_get_relocated_section_contents): Likewise.
-	(bfd_elf32_bfd_relax_section): Define.
-	(bfd_elf32_bfd_get_relocated_section_contents): Likewise.
-
-	* elf32-mn10200.c (mn10200_elf_final_link_relocate): New function.
-	(mn10200_elf_relocate_section): Likewise.
-	(elf_backend_relocate_section): Define.
-
-Tue Feb 18 17:22:59 1997  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* Makefile.in, archures.c, config.bfd, configure.in, elf.c,
-	reloc.c, targets.c: New target, elf-*-D30V.
-
-	* bfd-in2.h, configure, libbfd.h: Rebuilt.
-
-	* cpu-d30v.c, elf32-d30v.c: New files.
-
-Tue Feb 18 15:31:48 1997  Fred Fish  <fnf@cygnus.com>
-
-	* reloc.c (struct reloc_howto_struct): Fix typo in comment.
-	* bfd-in2.h: Regenerated.
-	* coff-tic80.c (RTYPE2HOWTO): Replace abort with real function.
-	(rtype2howto): Add function.
-	(tic80_howto_table): Add.
-
-Tue Feb 18 11:41:00 1997  Dawn Perchik  <dawn@cygnus.com>
-
-	* sysdep.h: Don't define errno in MSVC if error.h is included.
-
-Tue Feb 18 10:04:13 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (v850_elf_relocate_section): Make sure r_symndx
-	is initialized before it is used.
-
-Mon Feb 17 11:28:40 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* hp300hpux.c (convert_sym_type): Don't convert a secondary common
-	symbol into a weak undefined symbol; leave it as a common symbol.
-
-Fri Feb 14 19:08:03 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Don't issue a warning
-	about a symbol defined in a dynamic object if it has already been
-	defined in a regular object.
-
-Thu Feb 13 20:53:22 1997  Klaus Kaempf  (kkaempf@progis.de)
-
-	* makefile.vms: Add gcc flags to allow compiling with current gcc
-	snapshot
-	(targmatch.h): New dependency.
-
-	* reloc.c (BFD_RELOC_ALPHA_CODEADDR): New relocation for
-	openVMS/Alpha.
-	* evax.h (ALPHA_R_CODEADDR): New relocation.
-	* evax-alpha.c (ALPHA_R_CODEADDR): 64 bit procedure relocation for
-	openVMS/Alpha.
-	* evax-etir.c (ALPHA_R_CODEADDR): Output object code for this
-	relocation.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-	Restrict symbol length to 64 bytes, case preserving:
-	* evax-emh.c (_bfd_evax_write_emh): Remove case hacking.
-	* evax-misc.c (_bfd_evax_case_hack_symbol): Remove.
-	(_bfd_evax_length_hash_symbol): Added.
-	* evax-etir.c (_bfd_evax_write_etir): Call
-	_bfd_evax_length_hash_symbol before output of symbol.
-	* evax-egsd.c (_bfd_evax_write_egsd): Likewise.
-	* evax.h (flag_hash_long_names, flag_show_after_trunc): Remove.
-
-	* evax-emh.c: Output filename to object file without path.
-
-	* evax-egsd.c: New sections for local and global commons.
-
-	* evax-alpha.c, evax-emh.c, evax-egsd.c, evax-etir.c,
-	evax-misc.c, evax.h: Remove 8 bit characters from copyright
-	notices.  Replace AXP with Alpha.
-
-Wed Feb 12 18:10:30 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_create_dynamic_sections): We need the dynamic
-	sections if we are creating a shared library.
-
-Tue Feb 11 15:45:43 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* configure.host (i386-windows): Don't set host64=true.
-
-Tue Feb 11 15:27:32 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (reloc_type): Add R_MIPS16_GPREL.
-	(elf_mips16_gprel_howto): New static variable.
-	(mips16_gprel_reloc): New static function.
-	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_MIPS16_GPREL.
-	(mips_info_to_howto_rel): Handle R_MIPS16_GPREL.
-	(mips_elf_relocate_section): Handle R_MIPS16_GPREL.
-	* reloc.c (BFD_RELOC_MIPS16_GPREL): Define.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-Mon Feb 10 23:25:00 1997  Doug Evans  <dje@seba.cygnus.com>
-
-	* elf32-m32r.c (elf_m32r_howto_table): Change partial_inplace to true
-	for R_M32R_{16,32,24,HI16_ULO,HI16_SLO,LO16}.
-
-Fri Feb  7 12:39:11 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_input_bfd): If we've discarded a section,
-	the output section will be the absolute section; don't print an
-	assertion message for that case when doing a relocateable link.
-
-Thu Feb  6 16:55:43 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (FN_STUB, CALL_STUB, CALL_FP_STUB): Define.
-	(struct mips_elf_link_hash_entry): Add new fields fn_stub,
-	need_fn_sub, call_stub, and call_fp_stub.
-	(struct mips_elf_link_hash_table): Add field mips16_stubs_seen.
-	(mips_elf_link_hash_newfunc): Initialize new fields.
-	(mips_elf_link_hash_table_create): Likewise.
-	(mips_elf_relocate_section): Redirect relocations to use mips16
-	stubs when appropriate.
-	(mips_elf_check_relocs): Attach stub sections to the appropriate
-	symbol.  Set need_fn_stub when appropriate.
-	(mips_elf_always_size_sections): New static function.
-	(mips_elf_check_mips16_stubs): New static function.
-	(elf_backend_always_size_sections): Define.
-	* elf-bfd.h (struct elf_obj_tdata): Add local_stubs field.
-
-	* elflink.h (elf_link_input_bfd): Discard local symbols that are
-	attached to sections which are not being included in the link.
-
-Wed Feb  5 13:20:17 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Ignore the
-	symbol value when computing the addend for a pc_relative
-	pcrel_offset reloc.
-
-Mon Feb  3 11:54:06 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): If doing a
-	relocateable link, just skip pc_relative pcrel_offset relocs.
-	* coff-arm.c (coff_arm_rtype_to_howto): Return a different howto
-	structure for an ARM26 reloc which can be resolved.
-	(coff_arm_adjust_symndx): Only convert ARM26 to ARM26D if the
-	reloc can be resolved.
-
-	* coff-h8300.c (h8300_reloc16_extra_cases): Correct off by one
-	error in overflow check for R_RELBYTE.
-
-Fri Jan 31 14:07:27 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_slurp_section_data): Pick up the start address.
-	From Mark Rasin <mark.rasin@telrad.co.il>.
-
-	* aoutx.h (aout_link_write_symbols): Don't apply discard_l to
-	debugging symbols.
-
-Wed Jan 29 00:00:49 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10200.c (reloc_type): Add 16bit pc-relative reloc.
-	(elf_mn10200_howto_table): Likewise.
-	(mn10200_reloc_map): Likewise.
-
-Mon Jan 27 12:07:35 1997  Doug Evans  <dje@seba.cygnus.com>
-
-	* reloc.c: Add relocs BFD_RELOC_M32R_{HI16_[US]LO,LO16}.
-	* bfd-in2.h, libbfd.h: Regenerated.
-	* elf32-m32r.c: Add support for them.
-
-Mon Jan 27 12:25:02 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aout-arm.c (MY_swap_std_reloc_in): Remove unused r_length.
-	* elf32-ppc.c (ppc_elf_check_relocs): Remove unused plt.
-	* elf32-v850.c (v850_elf_final_link_relocate): Remove used
-	r_format and r_pcrel.  Always return a value.
-	* riscix.c (MY_final_link_callback): Define to dummy value.
-
-	* elf32-i386.c (elf_i386_size_dynamic_sections): When checking for
-	relocations against the text segment, look up the output name of
-	the reloc section.
-	* elf32-m68k.c (elf_m68k_size_dynamic_sections): Likewise.
-	* elf32-mips.c (mips_elf_size_dynamic_sections): Likewise.
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Likewise.
-	* elf32-sparc.c (elf32_sparc_size_dynamic_sections): Likewise.
-	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Likewise.
-
-Wed Jan 22 15:40:28 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-tic80.c (tic80coff_vec): Use correct data put/get
-	routines for little endian data.
-	* coffcode.h (coff_write_object_contents): Set magic to
- 	TIC80_ARCH_MAGIC for TIc80.
-
-Tue Jan 21 12:32:43 1997  Fred Fish  <fnf@cygnus.com>
-
-	* coff-tic80.c (tic80coff_vec): Change to little endian data
-	as the default.
-
-Thu Jan 16 17:45:57 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Change type of
-	auxiliary_filters parameter to be const char * const *.  Accept a
-	NULL terminated array.
-	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
-	(bfd_elf32_size_dynamic_sections): Update declaration.
-	* bfd-in2.h: Rebuild.
-
-Wed Jan 15 11:21:32 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_adjust_dynamic_symbol): Treat a
-	NOTYPE symbol in a text section as a FUNC symbol.
-
-	* coffcode.h (coff_compute_section_file_positions): Force
-	relocbase to be aligned to COFF_DEFAULT_SECTION_ALIGNMENT_POWER.
-
-Tue Jan 14 08:46:33 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* libaout.h (machine_type): Reserve several values for sparclet.
-
-Mon Jan 13 22:39:08 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* config.bfd (tic80-*-*): Don't require 'coff'.
-
-Mon Jan 13 19:36:25 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-v850.c (v850_elf_howto_table): Set the special_function
-	table to v850_elf_reloc for all non-standard relocations.
-	(v850_elf_check_relocs): Add check for h being non-null.
-	(v850_elf_reloc): Add  R_V850_ZDA_OFFSET support.  Use switch
-	statement instead of multiple ifs.
-	(v850_elf_relocate_section): Fix up error message, don't just call
-	abort.
-
-Mon Jan  6 13:28:35 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10200.c (elf_mn10200_howto): Don't ever set partial-inplace.
-	Use bfd_elf_generic_reloc as special function for all relocs.
-	(bfd_elf32_mn10200_reloc): Remove unnecessary function.
-
-	* elf32-mn10200.c (elf_mn10200_howto): Set pcrel_offset for
-	24bit pc-relative reloc.
-
-Fri Jan  3 16:33:00 1997  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (coff-tic80.o): Add coffcode.h to dependency list.
-	* coff-tic80.c (tic80coff_vec): Data byte order is big endian and
-	header byte order is little endian.  Use correct bfd_get and
-	bfd_put routines for little endian headers.
-	* coffcode.h (coff_set_arch_mach_hook): Set arch to
-	bfd_arch_tic80 for TIC80_ARCH_MAGIC number.
-
-Fri Jan  3 16:54:08 1997  Jeffrey A Law  (law@cygnus.com)
-
-	* reloc.c: Add BFD_RELOC_24.
-	* elf32-mn10200.c (enum reloc_type): Add 24bit and pcrel relocs.
-	(elf_mn10200_howto, mn10200_reloc_map): Corresponding changes.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-
-Fri Jan  3 16:58:31 1997  Richard Henderson  <rth@tamu.edu>
-
-	elf64-alpha multiple .got rewrite:
-
-	* elf-bfd.h (struct elf_backend_data): Add always_size_sections entry.
-	(bfd_elf*_mkobject): Don't define here ...
-	* elfxx-target.h: ... but rather here.  Default always_size_sections
-	hook to NULL.
-	* elf.c (elf_mkobject): Rename to bfd_elf_mkobject, since that was
-	what the #defines in elf-bfd.h transmuted it to anyway.
-
-	* section.c: Add SEC_LINKER_CREATED flag.
-	* bfd-in2.h: Rebuild.
-	* elf32-i386.c (elf_i386_check_relocs): Add SEC_LINKER_CREATED to
-	relocation section flags.
-	(elf_i386_size_dynamic_sections): Use SEC_LINKER_CREATED instead of
-	SEC_IN_MEMORY to recognize generated bits.
-	* elf32-m68k.c (elf_m68k_check_relocs, elf_m68k_size_dynamic_sections):
-	Likewise.
-	* elf32-mips.c (mips_elf_final_link, mips_elf_create_dynamic_sections,
-	mips_elf_create_compact_rel_section, mips_elf_create_got_section,
-	mips_elf_check_relocs, mips_elf_size_dynamic_sections): Likewise.
-	* elf32-ppc.c (ppc_elf_create_linker_section,
-	ppc_elf_size_dynamic_sections): Likewise.
-	* elf32-sparc.c (elf32_sparc_check_relocs,
-	elf32_sparc_size_dynamic_sections): Likewise.
-	* elflink.c (_bfd_elf_create_got_section): Add SEC_LINKER_CREATED to
-	section flags.
-	(_bfd_elf_create_dynamic_sections): Likewise.
-	(_bfd_elf_make_linker_section_rela): Likewise.
-	* elflink.h (elf_link_create_dynamic_sections): Likewise.
-	(bfd_elf,size_dynamic_sections): Call the always_size_sections hook.
-	(elf_bfd_final_link): Use SEC_LINKER_CREATED instead of SEC_IN_MEMORY
-	to identify generated bits.
-	(elf_link_input_bfd): Likewise.
-
-	* elf64-alpha.c: Rewrite everything touching relocations.
-
-Fri Jan  3 11:42:53 1997  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-v850.c (all functions and static variables): Go through
-	and regularize names to be of the form v850_elf_<xxx>.
-	(toplevel): Include <elf/v850.h>.
-	(enum reloc_type): Move to include/elf/v850.h.
-	(v850_elf_check_relocs): For common variables, if the variable is
-	referenced by a R_V850_{SDA,ZDA,TDA} relocation, put the variable
-	into the appropriate section.
-	(elf_backend_check_relocs): Define.
-
-Tue Dec 31 15:15:28 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-v850.c (elf_v850_howto_table): Fix some spacing.
-
-Tue Dec 31 14:44:50 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* config.bfd (mips*el-*-linux*): New target.
-	(mips*-*-linux*): New target.
-
-	* elf32-mips.c (_bfd_mips_elf_merge_private_bfd_data): Clean up.
-	Return a useful value.
-
-	* Makefile.in (ALL_CFLAGS): Add -D_GNU_SOURCE.
-
-	* configure.in: Check ac_cv_func_mmap_fixed_mapped, not
-	ac_cv_func_mmap.
-	* configure: Rebuild.
-	* configure.host: Use ac_cv_func_mmap_fixed_mapped instead of
-	ac_cv_func_mmap in bfd/configure.host.
-
-	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Add
-	filter_shlib and auxiliary_filter_shlib parameters.
-	* elf.c (_bfd_elf_print_private_bfd_data): Handle DT_AUXILIARY and
-	DT_FILTER.
-	* bfd-in.h (bfd_elf32_size_dynamic_sections): Update declaration.
-	(bfd_elf64_size_dynamic_sections): Likewise.
-	* bfd-in2.h: Rebuild.
-
-Mon Dec 30 18:48:52 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_build_ldsyms): When exporting all defined
-	symbols, don't export a symbol which is defined by an object in an
-	archive which contains shared objects.
-
-Mon Dec 30 16:12:58 1996  Fred Fish  <fnf@cygnus.com>
-
-	* archures.c (enum bfd_architecture): Add bfd_arch_tic80
-	for TI TMS320c80 (MVP).
-	(bfd_archures_list): Add bfd_tic80_arch.
-	* bfd-in2.h: Regenerate by running "make headers".
-
-Sun Dec 29 16:18:52 1996  Fred Fish  <fnf@cygnus.com>
-
-	* cpu-tic80.c (bfd_tic80_arch): Add struct.
-	* configure.in (case $vec): Correct typo, "tb" not "tp".
-	Also add cofflink.o for tic80coff_vec.
-	* configure: Regenerate with autoconf.
-
-Mon Dec 30 11:54:56 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd.c: Patch up the mmap code so that it is only built if BFD
-	is configured with --with-mmap.
-
-Sun Dec 29 10:48:57 1996  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (BFD32_BACKENDS): Add coff-tic80.o
-	(ALL_MACHINES): Add cpu-tic80.o
-	(cpu-tic80.o, coff-tic80.o): Add dependencies.
-	* coff-tic80.c: Add skeleton, cloned from another coff config.
-	* coffcode.h (coff_write_object_contents): Set magic to TIC80MAGIC
- 	for TIc80.
-
-Fri Dec 27 20:56:41 1996  Fred Fish  <fnf@cygnus.com>
-
-	* TODO: Correct a misspelling.
-	* coff-tic80.c: New file for TI TMS320C80 (MVP).
-	* cpu-tic80.c: New file for TI TMS320C80 (MVP).
-	* configure.in (case $vec): Add tic80coff_vec entry.
-	* configure: Regenerate with autoconf.
-	* archures.c (bfd_tic80_arch): Declare.
-	* bfd-in2.h (enum bfd_architecture): Add bfd_arch_tic80.
-	* config.bfd (case ${targ}): Add tic80*-*-coff* target.
-	* targets.c (tic80coff_vec): Add decl as extern bfd_target.
-	(bfd_target_vector): Add tic80coff_vec entry.
-
-Fri Dec 27 11:48:12 1996  H.J. Lu  <hjl@lucon.org>
-
-	* elflink.h (elf_buckets): Add some more values for larger
-	binaries.
-
-Thu Dec 26 18:36:54 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (install): Move subdir_do out of conditional. From
-	Fred Fish <fnf@cygnus.com>.
-
-Wed Dec 18 10:04:30 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10200.c (enum reloc_type): Enable basic 8, 16, and
-	32 bit relocs.
-	(elf_mn10200_howto_table): Likewise.
-	(mn10200_reloc_map): Likewise.
-
-Tue Dec 17 11:09:36 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_add_symbol_hook): Add 1 to the value of a
-	mips16 symbol during the link.
-	(mips_elf_finish_dynamic_symbol): Subtract 1 from the value of a
-	mips16 symbol.
-	(mips_elf_link_output_symbol_hook): New static function.
-	(elf_backend_link_output_symbol_hook): Define.
-
-	* elf.c (bfd_elf_print_symbol): Print the st_other field if it is
-	not zero.
-
-Mon Dec 16 14:38:39 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (bfd_section_from_shdr): Don't check for reloc sections
-	against SEC_DEBUGGING sections here (revert patch of December 5).
-	* elfcode.h (elf_object_p): Check for them here, instead.
-
-Sun Dec 15 14:46:06 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcode.h (elf_slurp_reloc_table): Add dynamic parameter.
-	* elf.c (_bfd_elf_canonicalize_reloc): Pass new argument to
-	slurp_reloc_table.
-	(_bfd_elf_get_dynamic_reloc_upper_bound): New function.
-	(_bfd_elf_canonicalize_dynamic_reloc): New function.
-	* elf-bfd.h (struct elf_size_info): Update declaration of
-	slurp_reloc_table.
-	(_bfd_elf_get_dynamic_reloc_upper_bound): Declare.
-	(_bfd_elf_canonicalize_dynamic_reloc): Declare.
-	* elfxx-target.h: Use new dynamic reloc routines by default.
-	* elf64-mips.c (mips_elf64_slurp_reloc_table): Add dynamic
-	parameter.
-
-Fri Dec 13 13:18:49 1996  Dan Wilder  <dan@gasboy.com>
-
-	* coffcode.h (coff_set_flags): Use MC68KBCSMAGIC for bfd_arch_m68k
-	if NAMES_HAVE_UNDERSCORE is defined.
-
-Fri Dec 13 11:13:23 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* libaout.h (enum machine_type): Change M_SPARCLET from 142 to 131.
-
-Thu Dec 12 15:07:20 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Move R_PPC_PLTREL24 into the
-	supported relocs.
-
-Thu Dec 12 14:55:41 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Only add a weak
-	symbol if the real definition is in the dynamic symbol table.
-	After finding the real definition, then, if it is dynamic, add the
-	weak symbol to the dynamic symbol table.
-
-	* coff-aux.c (coff_m68k_aux_link_add_one_symbol): Make static.
-
-	* ppcboot.c (ppcboot_set_arch_mach): Don't define; it's a
-	function.
-	(ppcboot_bfd_print_private_bfd_data): Don't take the address of an
-	array.
-
-Tue Dec 10 23:23:52 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c (reloc_type): Remove big endian mn10300 reloc
-	variants.
-	(elf32_mn10300_howto_table, mn10300_reloc_map): Likewise.
-	(bfd_elf32_mn10300_reloc): Write data in little endian format.
-	* reloc.c: Remove mn10300 big endian relocs.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-
-	* elf32-mn10200.c: Update from elf32-mn10300.c.
-
-Fri Dec  6 15:18:05 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c (elf_symbol_leading_char): Define.
-
-	* elf32-mn10300.c: Add some comments.
-
-Fri Dec  6 17:16:43 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ihex.c (ihex_scan): Always initialize buf before jumping to
-	error_return.
-	(ihex_read_section): Likewise.
-
-Thu Dec  5 22:29:18 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c (elf_mn10300_howto_table): Don't set partial-
-	inplace for most relocs.
-
-Thu Dec  5 13:24:46 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Calling check_relocs
-	even if SEC_ALLOC is not set.
-	* elf32-i386.c (elf_i386_check_relocs): Don't check SEC_ALLOC
-	when deciding whether to copy a reloc into a shared object.
-	(elf_i386_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
-	(elf32_sparc_relocate_section): Likewise.
-	* elf32-i386.c (elf_i386_check_relocs): Don't set SEC_ALLOC in a
-	reloc section if it is not set in the source section.
-	* elf32-sparc.c (elf32_sparc_check_relocs): Likewise.
-	* elf.c (bfd_section_from_shdr): Mark a reloc section associated
-	with a SEC_DEBUGGING section as SEC_DEBUGGING.
-
-Wed Dec  4 14:18:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): #if 0 code that
-	expects a .got.plt until we actually create it.
-
-Mon Dec  2 12:13:51 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_generic_relocate_section): Print an error
-	message for bfd_reloc_outofrange, rather than aborting.  From
-	Philippe De Muyter <phdm@info.ucl.ac.be>.
-
-	* cofflink.c (_bfd_coff_final_link): If there aren't any relocs in
-	a relocateable link, don't try to process them.  From Heinz Wrobel
-	<wrobel@lpr.e-technik.tu-muenchen.de>.
-
-Mon Dec  2 00:39:24 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c (mn10300_info_howto): Renamed from
-	mn10300_info_howto_rel.  Tweak reloc argument to be an
-	Elf32_Internal_Rela.
-	(USE_RELA): Define instead of USE_REL.
-	(elf_info_to_howto, elf_info_howto_rel): Corresponding changes.
-
-Sun Dec  1 00:18:59 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* configure.in, configure:  Handle mips*-sgi-irix6*.
-	* irix-core.c (irix_core_core_file_p):  Accept CORE_MAGICN32
-	core files.
-
-Wed Nov 27 12:10:25 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-i386.c (elf_i386_relocate_section): Warn about a
-	relocation against a symbol defined in a section with no output
-	section.
-
-Tue Nov 26 11:07:31 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aclocal.m4 (BFD_CC_FOR_BUILD): Don't require AC_C_CROSS.
-	* configure, config.in: Rebuild with autoconf 2.12.
-
-	* elf-bfd.h (struct elf_link_hash_entry): Add other field.
-	* elf.c (_bfd_elf_link_hash_newfunc): Initialize other field.
-	(swap_out_syms): Set st_other from existing st_other field.
-	* elflink.h (elf_link_add_object_symbols): Store st_other in hash
-	table other field.
-	(elf_link_output_extsym): Set the other field from the global hash
-	table entry.
-	* elf32-mips.c (enum reloc_type): Add R_MIPS16_26.
-	(elf_mips16_jump_howto): New static variable.
-	(mips16_jump_reloc): New static function.
-	(bfd_elf32_bfd_reloc_type_lookup): Handle BFD_RELOC_MIPS16_JMP.
-	(mips_info_to_howto_rel): Handle R_MIPS16_26.
-	(mips_elf_relocate_section): Handle R_MIPS16_26.  Handle R_MIPS_26
-	to a mips16 symbol.
-	* reloc.c (BFD_RELOC_MIPS16_JMP): Add to list of relocs.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* cpu-mips.c (arch_info_struct): Add mips:16 entry.
-
-Mon Nov 25 11:23:32 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Use long long for mips-sgi-irix6*.
-
-	* coffswap.h (coff_swap_scnhdr_out): Make line number overflow
-	only a warning.  From Philippe De Muyter <phdemuyt@ulb.ac.be>.
-
-Mon Nov 25 08:52:29 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c (bfd_elf32_mn10300_reloc): New function.
-	(enum reloc_type): Add more reloc types.
-	(elf32_mn10300_howto_table): Update for new reloc types.
-	(elf32_mn10300_reloc_map): Update for new reloc types.
-	* reloc.c: Add some new relocs for the mn10300 series.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-
-Sat Nov 23 13:26:18 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (setup_sections): Don't lose for a space which has
-	no data, but some symbols.
-
-Fri Nov 22 11:32:13 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (struct sunos_link_hash_table): Add got_needed field.
-	(sunos_link_hash_table_create): Initialize got_needed.
-	(sunos_create_dynamic_sections): Only set .got section size if it
-	is not already set.  Set got_needed.
-	(bfd_sunos_size_dynamic_sections): Check got_needed.  Only set
-	sdynptr, and only handle dynamic sections, if dynamic sections are
-	needed.
-	(sunos_scan_std_relocs): Pass false to create_dynamic_sections.
-	Initialize .got section.
-	(sunos_scan_ext_relocs): Likewise.
-	(sunos_write_dynamic_symbol): Set up PLT entry even if this is not
-	a dynamic symbol.
-	(sunos_finish_dynamic_link): Check got_needed.  Only set up
-	dynamic linking information if needed.
-
-Thu Nov 21 10:31:31 1996  Rob Savoye  (rob@cygnus.com)
-
-	* config.bfd: Added VersaDOS format to the Ericsson configuration.
-
-Wed Nov 20 16:31:31 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-mn10300.c: Rough cut at relocs for the mn10300.
-
-Wed Nov 13 08:12:38 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* Makefile.in (elf32-d10v.o): Don't depend on elf/d10v.h
-	anymore.
-
-Tue Nov 12 13:30:00 1996  Dawn Perchik  <dawn@cygnus.com>
-
-	* filemode.c: Include sysdep.h.
-	* ihex.c: Add casts to eliminate compiler warnings.
-	* sunos.c: Add casts to eliminate compiler warnings.
-
-Mon Nov 11 10:37:02 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_adjust_dynamic_symbol): Create .got.plt
-	section.
-	(ppc_elf_check_relocs): Add support for R_PPC_LOCAL24PC.  Make
-	appropriate relocations in the .so file if shared.
-	(ppc_elf_relocate_section): Ditto.
-
-Tue Oct 29 15:03:02 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-m32r.c (elf_m32r_howto_table, R_M32R_24): Use
-	complain_overflow_unsigned.
-
-Tue Oct 29 12:53:46 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* elf32-d10v.c (elf_d10v_howto_table): Don't complain on
-	overflows for R_D10V_16 and R_D10V_18.
-
-Tue Oct 29 13:23:53 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_write_section_part): Use LMA rather than VMA.
-	(do_with_relocs): Likewise.
-	(do_as_repeat): Likewise.
-	(copy_expression): Likewise.
-
-Fri Oct 25 16:56:40 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_write_external_part): Correctly record whether
-	there is an external part.
-
-Thu Oct 24 14:32:52 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (elf32_v850_bfd_final_link_relocate): Correctly
-	handle tda offsets for sld.w and sst.w instructions.
-	Fix alignment check in sld.w and sst.w tda reloc handling.
-
-Thu Oct 24 09:08:47 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* aclocal.m4, configure:  Set USE_BINARY_FOPEN for *-*-windows.
-
-Wed Oct 23 00:53:16 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c: Add comments about assumptions about
-	char, short & long sizes.
-	(elf32_v850_bfd_final_link_relocate): Fix sign extension
-	problems for several relocs.
-
-	* elf32-v850.c (elf32_v850_howto_table): Fix typo in
-	R_V850_SDA_OFFSET entry.
-
-Wed Oct 23 00:20:34 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (bfd_xcoff_import_symbol): Don't allocate ldsym.
-	Store import file index in ldindx.
-	(xcoff_build_ldsyms): Assume that ldsym was not previously
-	allocated.  For an imported symbol, copy ldindx into l_ifile.
-
-Tue Oct 22 19:20:38 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (elf_v850_howto_table): Fix ordering of
-	R_V850_ZDA_OFFSET and R_V850_TDA_OFFSET.  Fix various
-	fields in R_V850_TDA_OFFSET.
-	(elf32_v850_bfd_final_link_relocate): Tweak pc-relative
-	relocs to work more like other relocs.  Handle R_V850_TDA_OFFSET
-	relocations.
-
-	* elf32-v850.c: Include bfdlink.h.
-	(bfd_elf32_v850_reloc): Return an error if we get a reloc
-	we can't handle.
-	(elf32_v850_bfd_final_link_relocate): New function.
-	(v850_elf_relocation_section): Likewise.
-	(elf_backend_relocate_section): Define.
-
-Tue Oct 22 17:22:43 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* binary.c (binary_set_section_contents): Ignore sections which
-	don't have SEC_LOAD and SEC_ALLOC set.
-
-Mon Oct 21 12:13:05 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* linker.c (_bfd_generic_final_link): Avoid losing static
-	symbols in the .bss section.
-
-Mon Oct 21 10:54:58 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (elf_mips_howto_table): Describe R_MIPS_64.
-	(mips32_64bit_reloc): New static function.
-	(mips_reloc_map): Add entry for BFD_RELOC_64.
-	(mips_elf_relocate_section): Handle R_MIPS_64.
-
-	* linker.c (default_indirect_link_order): Print an error message
-	when attempting to do a relocateable link with different object
-	file formats, rather than calling abort.
-
-Thu Oct 17 10:43:29 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* reloc.c (m32r relocs): Rename them.
-	* bfd-in2.h, libbfd.h: Regenerated.
-	* elf32-m32r.c: Update.
-	(m32r_elf_10_pcrel_reloc): New function.
-	(elf_m32r_howto_table, R_M32R_10_PCREL entry): Use it.
-	(elf_m32r_howto_table, R_M32R_24 entry): Fix {src,dst}_masks.
-
-Wed Oct 16 11:24:35 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* linker.c (_bfd_generic_final_link): Set "linker_mark" for
-	all sections that will be included in the output file.
-	(_bfd_generic_link_output_symbols): Discard symbols in sections
-	which are being discarded.
-	* elf32-v850.c (enum reloc_type): Add R_V850_SDA_OFFSET,
-	R_V850_TDA_OFFSET and R_V850_ZDA_OFFSET.
-	(elf_v850_howto_table): Corresponding changes.
-	(elf_v850_reloc_map): Corresponding changes.
-	* reloc.c: Add additional V850 relocations.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-
-	* elf32-v850.c (bfd_elf32_v850_reloc): Mask out bits we
-	no longer want in pc-relative relocs.
-
-Tue Oct 15 22:17:37 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (bfd_elf32_v850_reloc): Don't silently
-	accept a reloc against an undefined sybmol!
-
-Tue Oct 15 16:17:28 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* elf32-v850.c:  Define elf_symbol_leading_char to be '_'.
-
-Tue Oct 15 12:40:41 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* VERSION: Bump for new relocation.
-
-	* hosts/i386bsd.h: If NBPG is not defined, define it as
-	PAGE_SIZE, for recent versions of FreeBSD.
-
-Mon Oct 14 12:37:26 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Use `long long' as the 64 bit type on a Solaris
-	host, since both gcc and the SunPRO compilers support it.
-
-Mon Oct 14 11:17:24 1996  Richard Henderson  <rth@tamu.edu>
-
-	* reloc.c: Create a new BFD_RELOC_ALPHA_ELF_LITERAL.  It was a
-	mistake to have reused the ECOFF LITERAL for ELF since they have
-	different semantics.
-	* elf64-alpha.c (elf_reloc_map): Map from ELF_LITERAL.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Trap .got
-	section overflow.
-
-	* elf64-alpha.c (elf64_alpha_relocate_section): Do not emit a
-	dynamic relocation for an undefweak symbol when we are building
-	a static executable.
-
-Thu Oct 10 11:15:06 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* mpw-make.sed (config.bfd, targmatch.sed): Edit references to
-	point explicitly to srcdir.
-	(targmatch.h): Edit references to point explicitly to objdir.
-
-Thu Oct 10 14:14:23 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* config.bfd: When setting targ_cpu, don't get confused by
-	linux-gnu.
-
-Tue Oct  8 08:51:19 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* configure.host:  Add support for windows host (a build done
-	under the Microsoft build environment).
-
-Tue Oct  8 11:40:16 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): If a symbol is a weak
-	definition in a dynamic object, add it to the dynamic symbol table
-	if any dynamic object mentions it.  Reverts part of last patch.
-
-	* sunos.c (struct sunos_link_hash_table): Add got_base field.
-	(sunos_link_hash_table_create): Initialize got_base.
-	(bfd_sunos_size_dynamic_sections): If the .got section is more
-	than 0x1000 bytes, set __GLOBAL_OFFSET_TABLE_ and got_base to
-	0x1000.
-	(sunos_check_dynamic_reloc): Subtract got_base from a base
-	relative relocation.
-
-	* elf32-mips.c (elf_mips_isa): New static function.
-	(_bfd_mips_elf_merge_private_bfd_data): Don't warn about linking
-	-mips1 and -mips2 code together, or -mips3 and -mips4 code.
-
-Mon Oct  7 11:44:17 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* archive.c (do_slurp_coff_armap): Only treat archive as little
-	endian for i960 COFF.
-
-Fri Oct  4 13:49:01 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_compute_section_file_positions): Adjust sofar
- 	by the change in size of the section when EXEC_P is not set.
-
-	* coff-m68k.c (coff_rtype_to_howto): Define if not defined.
-	(m68kcoff_rtype_to_howto): New static function.
-	* cf-m68klynx.c (coff_m68k_lynx_rtype_to_howto): Add the section
-	VMA to the addend for a PC relative reloc.
-
-	* dep-in.sed: Rework backslash loop a bit to avoid bug in sed on
-	HP/UX 10.20.
-	* Makefile.in: Rebuild dependencies.
-
-	* dep-in.sed: Remove ../bfd/sysdep.h, since it will appear when
-	som.h is included.
-
-Fri Oct  4 11:41:39 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* Makefile.in: Remove explicit dependencies for mn10200 and
-	mn10300 files.
-	(ALL_MACHINE_CFILES): Add cpu-mn10200.c and cpu-mn10300.c.
-	(BFD32_BACKENDS_CFILES): Add elf32-mn10200.c and elf32-mn10300.c
-	(dependencies): Rebuilt.
-
-Thu Oct  3 16:57:51 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (coff_link_add_symbols): Set obj_coff_keep_syms
-	during this function.
-
-	* elflink.c (_bfd_elf_create_linker_section): Only use an existing
-	section if the flags are compatible.
-
-	* configure.in: Add havevecs, and put it in tdefaults.
-	* mpw-config.in: Likewise.
-	* configure: Rebuild.
-	* targmatch.sed: New file; a sed script to build targmatch.h from
-	config.bfd.
-	* config.bfd: Add #if, #endif, and comments for targmatch.h.
-	* targets.c: Include "fnmatch.h".
-	(struct targmatch): Define.
-	(bfd_target_match): Define by including targmatch.h.
-	(bfd_find_target): If the target is not found by name, search for
-	it as a configuration triplet.
-	* Makefile.in: Rebuild dependencies.
- 	(BFD32_BACKENDS): Add aout-arm.o, aout-sparcle.o, hp300bsd.o,
-	i386dynix.o, m68k4knetbsd.o, and riscix.o.
-	(BFD32_BACKENDS_CFILES): Add aout-arm.c, aout-sparcle.c,
-	hp300bsd.c, i386dynix.c, m68k4knetbsd.c, and riscix.c.
-	(HFILES): Add targmatch.h.  Also, alphabetize and reindent.
-	(CFILES): Remove i386dynix.c and hp300bsd.c.
-	(targmatch.h): New target.
-	(do_clean): Remove targmatch.h.
-
-	* configure.in: Add BFD_NEED_DECLARATION(getenv).
-	* acconfig.h: Add NEED_DECLARATION_GETENV.
-	* configure, config.in: Rebuild.
-	* sysdep.h: If NEED_DECLARATION_GETENV, declare getenv.
-	* aout-adobe.c (aout_adobe_object_p): Don't declare getenv.
-
-Thu Oct  3 09:29:09 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* cpu-mn10x00.c, elf32-mn10x00: Removed.
-	* cpu-mn10200.c, cpu-mn10300.c: New files.
-	* elf32-mn10200.c, elf32-mn10300.c: New files.
-	* Makefile.in: Break mn10x00 support into two separate
-	configurations, mn10200 and mn10300.
-	* archures.c, config.bfd, configure.in, elf.c, targets.c: Likewise.
-	* bfd-in2.h, configure: Rebuilt.
-
-Thu Oct  3 15:38:19 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-	* Makefile.in (do_clean): Move config.log to do_distclean.
-
-Wed Oct  2 21:40:55 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* cpu-mn10x00.c, elf32-mn10x00.c: New files.
-	* Makefile.in (ALL_MACHINES): Add cpu-mn10x00.o.
-	(BFD32_BACKENDS): Similarly for elf32-mn10x00.o.
-	(elf32-mn10x00.o): Add dependencies.
-	* archures.c (enum bfd_architecture): Add bfd_arch_mn10x00.
-	(bfd_mn10x00_arch): Declare.
-	(bfd_archures_list): Add bfd_mn10x00_arch.
-	* config.bfd: Add mn10x00-*-*.
-	* configure.in: Add bfd_elf32_mn10x00_vec.
-	* elf.c (prep_headers): Handle bfd_arch_mn10x00.
-	* targets.c (bfd_elf32_mn10x00_vec): Declare.
-	(bfd_target_vector): Add bfd_elf32_mn10x00_vec.
-	* bfd-in2.h, configure: Rebuilt.
-
-Wed Oct  2 15:46:45 1996  Klaus Kaempf  <kkaempf@progis.de>
-
-	openVMS/Alpha: Provide filename and case_hack flags via
-	symbol table from gas.
-	Add case_hack code for symbol output from vax/vms.
-	* evax-alpha.c (evax_initialize): Remove filename handling,
-	filename is provided via symbol table.
-	(evax_get_symtab): Use local symbol count when setting up table.
-	* evax-egsd.c (_bfd_evax_slurp_egsd): Print correct name when
-	debugging.
-	(_bfd_evax_write_egsd): Skip file name symbol.
-	* evax-emh.c (get_vms_time_string): Local function now.
-	(_bfd_evax_write_emh): Extract source filename and case_hack flags
-	from symbol table.
-	* evax_write_etir (_bfd_evax_write_etir): Pass all symbol names
-	through _bfd_evax_case_hack_symbol.
-	* evax-misc.c (hash_string, _bfd_evax_case_hack_symbol): New
-	functions.
-	(_bfd_evax_basename): Removed.
-	(_bfd_get_vms_time_string): Moved to evax-emh.c.
-	* evax.h (evax_private_data_struct): Remove filename.
-	(flag_hash_long_names, flag_show_after_trunc,
-	flag_no_hash_mixed_case, vms_name_mapping): New flags for
-	vms_case_hack.
-
-Wed Oct  2 12:02:02 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* freebsd.h (N_GET_MAGIC_NET): Don't use ntohl.
-	(N_GETMID_NET, N_GETFLAG_NET): Likewise.
-	(NO_SWAP_MAGIC): Don't define.
-	(SWAP_MAGIC): Define.
-
-	* cofflink.c (_bfd_coff_link_input_bfd): Don't crash if there is
-	no hash table entry for a global symbol.
-
-Tue Oct  1 16:14:22 1996  Joel Sherrill  <joel@oarcorp.com>
-
-	* config.bfd (mips*-*-rtems*): New target, like mips*-*-elf*.
-
-Tue Oct  1 12:31:39 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (coff_link_add_symbols): Don't override a meaningful
-	symbol type with T_NULL.  Warn if symbol type changes.  Based on
-	patch from Philippe De Muyter <phdm@info.ucl.ac.be>.
-
-	* elflink.h (elf_link_add_object_symbols): Only put a symbol from
-	a dynamic object in the dynamic symbol table if it is referenced
-	or defined by a regular object.
-
-Fri Sep 27 18:41:07 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* elf32-v850.c (bfd_elf32_v850_is_local_label):  New function to
-	remove dwarf local labels.  Shrinks binaries by a factor of 3!
-
-Mon Sep 23 13:33:00 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_add_symbol_hook): Create the .sbss section
-	by hand, rather than by calling bfd_make_section.
-
-Mon Sep 23 09:23:41 1996  Doug Evans  <dje@seba.cygnus.com>
-
-	* reloc.c: Rename m32r relocs.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-	* elf32-m32r.c: Update.
-
-Fri Sep 20 11:43:43 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (aout_link_input_section_ext): When doing a relocateable
-	link, adjust the symbol index of a base relative reloc.  Don't
-	change the addend of a PC relative reloc if pcrel_offset is set.
-	* sunos.c (bfd_sunos_size_dynamic_sections): Don't do anything for
-	a relocateable link.
-
-	* reloc.c (bfd_perform_relocation): Apply the relocation even if
-	it is zero, in case src_mask matters.
-	(bfd_install_relocation): Likewise.
-
-Thu Sep 19 11:03:06 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_symbols): Always initialize
-	keep_syms.
- 	(_bfd_xcoff_bfd_final_link): Don't set target_index
-	to an uninitialized value.
-
-Tue Sep 17 14:18:31 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_slurp_line_table): Warn about illegal symbol
-	indices, rather than crashing.
-	(coff_slurp_reloc_table): Likewise.  Check whether the howto field
-	is NULL.
-	* coff-sh.c (sh_relocate_section): Check for an illegal symbol
-	index.
-
-Mon Sep 16 12:39:36 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-arm.c (aoutarm_std_reloc_howto): Change dst_mask for ARM26D
- 	reloc to 0.
-	(coff_arm_adjust_symndx): New static function.
-	(coff_adjust_symndx): Define.
-
-	* srec.c (srec_scan): Accept multiple symbols on a single line.
-	From Pascal Martin <pmartin@alsys.com>.
-
-	* README: New file.
-
-Fri Sep 13 14:32:42 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* aoutf1.h (MY_bfd_merge_private_bfd_data): Define.
-	(sunos_merge_private_bfd_data): New function.
-
-Fri Sep 13 15:50:57 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd.c (bfd_copy_private_bfd_data): Switch on output BFD rather
-	than input BFD.
-	(bfd_merge_private_bfd_data): Likewise.
-	* section.c (bfd_copy_private_section_data): Likewise.
-	* syms.c (bfd_copy_private_symbol_data): Likewise.
-	* bfd-in2.h: Rebuild.
-	* aout-target.h (MY_bfd_copy_private_section_data): Check that
-	both BFD's are the right flavour.
-	* ecoff.c (_bfd_ecoff_bfd_copy_private_bfd_data): Likewise.
-	* elf.c (_bfd_elf_copy_private_symbol_data): Likewise.
-	* elf32-mips.c (_bfd_mips_elf_copy_private_bfd_data): Likewise.
-	(_bfd_mips_elf_merge_private_bfd_data): Likewise.
-	* elf32-ppc.c (ppc_elf_copy_private_bfd_data): Likewise.
-	(ppc_elf_merge_private_bfd_data): Likewise.
-	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Likewise.
-	* peicode.h (pe_bfd_copy_private_section_data): Likewise.
-
-	* elf32-hppa.c (elf_hppa_howto_table): Fill in some fields for
-	R_PARISC_DIR32, so that _bfd_stab_section_find_nearest_line passes
-	its sanity check.
-
-Thu Sep 12 11:45:57 1996  Doug Evans  <dje@seba.cygnus.com>
-
-	* reloc.c: Add m32r relocs.
-	* bfd-in2.h, libbfd.h: Rebuilt.
-	* cpu-m32r.c,elf32-m32r.c: New files.
-
-Thu Sep 12 11:10:05 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_vec): Set symbol_leading_char field to '_'.
-
-Wed Sep 11 11:57:56 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* tekhex.c (first_phase): Change type parameter from char to int.
-	(out): Likewise.
-	(pass_over): Change func to expect int, not char.
-
-	* elf.c (assign_file_positions_for_segments): Test SEC_ALLOC
-	rather than SEC_LOAD when aligning the file offset for the first
-	section in a segment.
-
-Tue Sep 10 16:18:30 1996  Fred Fish  <fnf@cygnus.com>
-
-	* syms.c (coff_section_type): Make arg const.
-	* irix-core.c (irix_core_core_file_p): Remove extraneous extra arg
-	to make_bfd_asection().
-	* elf-bfd.h (bfd_section_from_phdr): Add prototype.
-	* elfcode.h (bfd_section_from_phdr): Remove prototype.
-	(_bfd_elf_stringtab_init): Remove prototype.
-
-	* netbsd-core.c (swap_abort): Add prototype.
-	* aix386-core.c (swap_abort): Ditto & make static
-	* hpux-core.c (swap_abort): Ditto & make static.
-	* irix-core.c (swap_abort): Ditto & make static.
-	* ptrace-core.c (swap_abort): Ditto & make static.
-	* trad-core.c (swap_abort): Ditto & make static.
-	* coffswap.h (coff_swap_reloc_in): Ditto.
-	(coff_swap_reloc_out): Ditto.
-	(coff_swap_filehdr_in): Ditto.
-	(coff_swap_filehdr_out): Ditto.
-	(coff_swap_sym_in): Ditto.
-	(coff_swap_sym_out): Ditto.
-	(coff_swap_aux_in): Ditto.
-	(coff_swap_aux_out): Ditto.
-	(coff_swap_lineno_in): Ditto.
-	(coff_swap_lineno_out): Ditto.
-	(coff_swap_aouthdr_in): Ditto.
-	(coff_swap_aouthdr_out): Ditto.
-	(coff_swap_scnhdr_in): Ditto.
-	(coff_swap_scnhdr_out): Ditto.
-	* ihex.c (ihex_sizeof_headers): Ditto.
-	* tekhex.c (getsym): Ditto.
-	(find_chunk): Ditto & make static.
-	(insert_byte): Ditto.
-	(first_phase): Ditto.
-	(pass_over): Ditto.
-	(tekhex_get_symtab): Ditto & make static.
-	(tekhex_get_symtab_upper_bound): Ditto & make static.
-	(tekhex_mkobject): Ditto.
-	(tekhex_object_p): Ditto.
-	(move_section_contents): Ditto.
-	(tekhex_get_section_contents): Ditto.
-	(tekhex_set_arch_mach): Ditto & make static.
-	(tekhex_set_section_contents): Ditto.
-	(writevalue): Ditto.
-	(writesym): Ditto.
-	(out): Ditto.
-	(tekhex_write_object_contents): Ditto.
-	(tekhex_sizeof_headers): Ditto.
-	(tekhex_make_empty_symbol): Ditto.
-	(tekhex_get_symbol_info): Ditto.
-	(tekhex_print_symbol): Ditto.
-	* irix-core.c (make_bfd_asection): Ditto.
-	(irix_core_core_file_p): Ditto.
-	(irix_core_core_file_failing_command): Ditto.
-	(irix_core_core_file_failing_signal): Ditto.
-	(irix_core_core_file_matches_executable_p): Ditto.
-	(irix_core_make_empty_symbol): Ditto.
-	* coff-mips.c (mips_bfd_reloc_type_lookup): Ditto.
-	* srec.c (srec_new_symbol): Ditto.
-	(srec_get_section_contents): Ditto.
-	(srec_set_arch_mach): Ditto.
-	(srec_set_section_contents): Ditto.
-	(internal_srec_write_object_contents): Ditto.
-	(srec_write_object_contents): Ditto.
-	(symbolsrec_write_object_contents): Ditto.
-	(srec_sizeof_headers): Ditto.
-	(srec_make_empty_symbol): Ditto.
-	(srec_get_symtab_upper_bound): Ditto.
-	(srec_get_symtab): Ditto.
-	(srec_print_symbol): Ditto and make static.
-	* elf.c (elf_read): Ditto
-	(assign_section_numbers): Ditto.
-	(elf_fake_sections): Ditto.
-	(sym_is_global): Ditto.
-	(elf_map_symbols): Ditto.
-	(get_program_header_size): Ditto.
-	* coffgen.c (make_a_section_from_file): Ditto.
-	(coff_real_object_p): Ditto.
-	(fixup_symbol_value): Ditto.
-	(build_debug_section): Ditto.
-	(copy_name): Ditto.
-	* syms.c (coff_section_type): Ditto.
-
-Mon Sep  9 22:36:01 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* bfd-in2.h: Rebuilt after m32r changes.
-
-Mon Sep  9 12:31:22 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* config.bfd,configure.in,configure: Add m32r support.
-	* Makefile.in,archures.c,elf.c,targets.c: Likewise.
-	* config.bfd: Keep target list alphabetically sorted.
-
-Mon Sep  9 11:48:41 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (bfd_elf32_v850_reloc, case R_V850_HI16): Don't forget
-	to add in the constant part found in the instruction itself.
-	(case R_V850_HI16_S): Likewise.
-
-Fri Sep  6 17:04:39 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* elf32-d10v.c (elf_d10v_howto_table): Modify the size of R_D10V_16
-	and R_D10V_18 to be 1 (word).
-
-Thu Sep  5 15:23:08 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* stabs.c (_bfd_link_section_stabs): If the output_section field
-	of either section is bfd_abs_section, then the linker is
-	discarding the section and we should not optimize it.
-
-Tue Sep  3 12:16:20 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* Makefile.in (aout-sparcle.o): New target.
-	* aoutf1.h (TARGET_IS_BIG_ENDIAN_P): Don't define if little endian.
-	* config.bfd (sparclet-*-aout*): Add case.
-	* configure.in (sparcle_aout_vec): Add case.
-	* configure: Regenerated.
-	* targets.c (sparcle_aout_vec): Declare.
-	(bfd_target_vector): Add sparcle_aout_vec.
-	* aout-sparcle.c: New file.
-
-Tue Sep  3 00:57:02 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (bfd_elf32_v850_reloc): Fix handling of
-	low order sign bit propogation for R_V850_HI16_S.
-
-	* elf32-v850.c (bfd_elf32_v850_reloc): New function for
-	handling V850 specific relocs.
-	(elf_v850_howto_table): Use the new function for some
-	relocations.  Twiddle masks & shifts for some relocs.
-	Set partial_inplace where needed.
-
-Mon Sep  2 12:12:34 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cpu-mips.c: Add an explicit mips:3000 entry, and change the
-	default architecture to a machine number of 0.
-	* elf32-mips.c (_bfd_mips_elf_object_p): Set the machine number
-	for E_MIPS_ARCH_1.
-	(_bfd_mips_elf_merge_private_bfd_data): If the machine number of
-	the output BFD is the default, set it from the first input BFD.
-
-Sun Sep  1 18:38:01 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (elf_v850_howto_table): All the 16bit relocs
-	insert at bitpos zero.  The HI16 relocs are shifted right
-	by 16 bits.  Fix src_mask for all relocs.
-	(TARGET_LITTLE_SYM, TARGET_LITTLE_NAME): Define.  The V850 is
-	little endian!
-	(TARGET_BIG_SYM, TARGET_BIG_NAME): Remove.  The V850 is little
-	endian!
-
-Sun Sep  1 15:41:08 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* rs6000-core.c (rs6000coff_core_file_matches_executable_p):
-	Rewrite to use BFD file read routines and to avoid using a fixed
-	length for the file name.
-
-Sat Aug 31 10:22:25 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-v850.c (enum reloc_type): Add R_V850_{32,16,8}.
-	(elf_v850_howto_table): Add support for R_V850_{32,16,8}.
-	(v850_reloc_map): Add translation from BFD_RELOC_{32,16,8}
-	to R_V850_{32,16,8}.
-
-Fri Aug 30 18:06:04 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
-
-	* elf32-v850.c (reloc_type): Add R_V850_HI16_S.
-	(elf_v850_howto_table): Add info for HI16_S reloc.
-	(v850_reloc_map): Add HI_16_S reloc.
-	* reloc.c: Define BFD_RELOC_V850_* relocs.
-
-Fri Aug 30 11:49:19 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	Add SH ELF support.
-	* elf32-sh.c: New file.
-	* elf.c (prep_headers): Handle bfd_arch_sh.
-	* elfcode.h (write_relocs): Handle absolute symbol.
-	* elf-bfd.h (_bfd_elf32_link_read_relocs): Declare.
-	(_bfd_elf64_link_read_relocs): Declare.
-	* elflink.h (NAME(_bfd_elf,link_read_relocs)): Rename from
-	elf_link_read_relocs.  Make globally visible.  Change all
-	callers.
-	(elf_link_input_bfd): Get external symbols from cache in
-	symtab_hdr->contents.  Get contents from cache in
-	elf_section_data.
-	* elfxx-target.h (bfD_elfNN_bfd_relax_section): Only define if not
-	already defined.
-	* reloc.c: Define BFD_RELOC_SH_* relocs.
-	* libbfd-in.h (_bfd_sh_align_load_span): Declare.
-	* coff-sh.c (sh_insns_conflict): Fix a return value.
-	(_bfd_sh_align_load_span): New globally visible function, broken
-	out of sh_align_load.
-	(sh_align_load): Call _bfd_sh_align_load_span.
-	(sh_swap_insns): Change relocs parameter to PTR.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* targets.c (bfd_elf32_sh_vec): Declare.
-	(bfd_elf32_shl_vec): Declare.
-	* config.bfd (sh-*-elf*): New target.
-	* configure.in (bfd_elf32_sh_vec): New target vector.
-	(bfd_elf32_shl_vec): New target vector.
-	* configure: Rebuild.
-	* Makefile.in: Rebuild dependencies.
- 	(BFD32_BACKENDS): Add elf32-sh.o.
-	(BFD32_BACKENDS_CFILES): Add elf32-sh.c.
-
-	* elf.c (map_sections_to_segments): Check that LMA does not skip a
-	page before checking D_PAGED.
-
-	* ihex.c (ihex_scan): Removed unnecessary extbase variable.
-	(ihex_write_object_contents): Remove extbase; always use segbase
-	instead.
-
-Thu Aug 29 16:52:17 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* configure.in (i[345]86-*-*): Recognize i686 for pentium pro.
-	* configure.host (i[345]86-*-*): Ditto.
-	* config.bfd (i[345]86-*-*): Ditto.
-	* configure: Regenerate.
-
-	* config.bfd (i[3456]86-*-dgux*): Recognize as a synonym for x86
-	elf.
-
-Tue Aug 27 09:18:18 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-hppa.c (hppa_elf_gen_reloc_type): Add new argument.
-	* elf32-hppa.h (hppa_elf_gen_reloc_type): Update prototype.
-	* som.c (hppa_som_gen_reloc_type): Add new argument.  If
-	we encounter an R_DATA_ONE_SYMBOL reloc against a symbol that
-	will have an ST_CODE type, change the symbol's type to ST_DATA.
-	* som.c (hppa_som_gen_reloc_type): Update prototype.
-
-Tue Aug 27 00:12:22 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_check_relocs): Set dynobj if needed for
-	R_MIPS_32 and R_MIPS_REL32.  Set sgot and g as soon as possible.
-	(mips_elf_size_dynamic_sections): Don't require .got to exist.
-	(mips_elf_finish_dynamic_sections): Likewise.
-
-Thu Aug 22 10:54:38 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host (HLDENV): New variable to set.  Set it for
-	*-*-sysv4*, since those linkers may not support -R but they always
-	support LD_RUN_PATH.
-
-	* libieee.h (NSECTIONS): Don't define.
-	(ieee_data_struct): Change section_table to asection **.  Add
-	section_table_size.
-	* ieee.c (get_section_entry): If the table isn't big enough, make
-	it bigger.
-	(ieee_slurp_sections): Remove assertion about number of sections.
-	(ieee_object_p): Adjust initialization of ieee to match changes to
-	the structure.
-
-	* xcofflink.c (xcoff_mark): Don't copy relocs for undefined
-	symbols merely because we are generating a shared library.
-	(xcoff_build_ldsyms): Don't set up global linkage code for an
-	undefined symbol merely because we are generating a shared
-	library.
-
-Tue Aug 20 15:06:05 1996  J.T. Conklin  <jtc@hippo.cygnus.com>
-
-	* Makefile.in (ALL_MACHINES): Add cpu-v850.o.
-	(BFD32_BACKENDS) Add elf32-v850.o.
-	* archures.c: Add bfd_v850_arch.
-	* bfd-in2.h: Add bfd_v850_arch.
-	* config.bfd (v850-*-*): New target.
-	* configure: (bfd_elf32_v850_vec) New vector.
-	* configure.in: (bfd_elf32_v850_vec) New vector.
-	* cpu-v850.c: New file.
-	* elf.c (prep_headers): Added case bfd_arch_v850.
-	* elf32-v850.c: New file.
-	* targets.c (bfd_elf32_v850_vec): New vector.
-
-Fri Aug 16 16:25:35 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_dynamic_symbols): Create and define
- 	a function code symbol for an XMC_XO symbol.
-
-Thu Aug 15 12:33:29 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* mpw-config.in: Update editing of autoconf vars to reflect
-	Jul 18 configure.in change.
-	* mpw-make.sed: Update editing of include pathnames to be
-	more general, add @DASH_C_FLAG@ to explicit compile rule edit.
-
-Thu Aug 15 10:35:13 1996  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c (elf64_alpha_output_extsym): The section from
-	which to offset to get the .plt entry address is ".plt".
-
-Thu Aug 15 16:40:30 1996  James G. Smith  <jsmith@cygnus.co.uk>
-
-	* reloc.c: (BFD_RELOC_ARM_THUMB_ADD, BFD_RELOC_ARM_THUMB_IMM,
-	BFD_RELOC_ARM_THUMB_SHIFT, BFD_RELOC_ARM_THUMB_OFFSET):
- 	Added, for internal use by the ARM gas.
-	* libbfd.h: Rebuilt
-	* bfd-in2.h: Rebuilt
-
-Wed Aug 14 17:02:09 1996  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c (elf64_alpha_size_dynamic_sections): Correct typo
-	in section dynidx start.
-
-Tue Aug 13 14:35:38 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (_bfd_elf_make_section_from_shdr): Treat sections whose
-	name begins with .gnu.linkonce as SEC_LINK_ONCE.  This is an
-	optimization for g++.
-
-Tue Aug 13 17:04:40 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_merge_private_bfd_data): If one module has
-	the -mrelocatable-lib bit set and the other doesn't, clear the
-	-mrelocatable-lib bit in the header.
-
-Sat Aug 10 22:59:17 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_link_add_object_symbols): Do not resolve a common
-	symbol against a STT_FUNC symbol in a shared library.
-
-Fri Aug  9 12:44:57 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_dynamic_symbols): If a descriptor
- 	symbol is found, automatically define the corresponding function
- 	code.
-
-	* cofflink.c (coff_link_add_symbols): Only set (*sym_hash)->numaux
-	if sym.n_numaux is not zero.
-	(_bfd_coff_link_input_bfd): Permit the symbol and the hash table
-	entry to disagree about the number of aux entries if the symbol
-	has zero.
-
-	* elf32-mips.c (mips_elf_check_relocs): Create the .rel.dyn
-	section if it might be needed, not just if info->shared.
-	(mips_elf_adjust_dynamic_symbol): Make room for a null element at
-	the start of .rel.dyn if we are going to use it.
-	(mips_elf_finish_dynamic_sections): Only clear the first element
-	of .rel.dyn if the size is greater than zero.
-
-Thu Aug  8 16:24:55 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_input_bfd): If we already called the
-	undefined_symbol callback for a symbol, then don't issue any more
-	warnings about loader relocs.
-	(_bfd_ppc_xcoff_relocate_section): Don't do any further processing
-	after calling the undefined_symbol callback.
-
-	* xcofflink.c (XCOFF_MULTIPLY_DEFINED): Define.
-	(xcoff_link_add_symbols): Permit multiple definitions of a symbol
-	as the AIX linker seems to do.
-
-Thu Aug  8 12:21:56 1996  Klaus Kaempf  <kkaempf@progis.de>
-
-	* evax-alpha.c (evax_alpha_vec): Corrected flags, cleanup.
-	(evax_initialize): Remove evax_reloc_table.
-	(evax_close_and_cleanup): Ditto.
-	(reloc_nil): Ditto.
-	(alpha_howto_table): Remove ALPHA_R_SWREL32 and ALPHA_R_SWREL64
-	entries.
-	(evax_bfd_reloc_type_lookup): Ditto.
-	* evax-egsd.c (_bfd_evax_slurp_egsd): Add a few casts; set
-	cooked_size == raw_size.
-	* evax-emh.c (_bfd_evax_register_filename): Remove.
-	* evax-etir.c (etir_stc): Allow ETIR_S_C_STC_xx commands.
-	* evax-misc.c (add_new_contents): Malloc section at full size.
-	(_bfd_save_evax_section): Memcpy section contents directly.
-	* evax.h (ALPHA_R_SWREL32, ALPHA_R_SWREL64): Remove.
-	(evax_reloc_table): Remove.
-
-	* hosts/alphavms.h (O_ACCMODE): Define if needed.
-
-	* makefile.vms: Add better support for DEC C compilation
-	Add evax.h dependencies
-
-	* reloc.c (bfd_get_reloc_size): Add case for 16 byte reloc.
-	(BFD_RELOC_SWREL32,BFD_RELOC_SWREL64): Remove.
-	(BFD_RELOC_ALPHA_BASEREG): Remove.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-Thu Aug  8 08:17:32 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* archive.c (bsd_write_armap):  Ifdef around calls to getuid and
-	getgid if _WIN32 is defined.
-	* opncls.c (bfd_fdopenr):  Remove unnecessary WINGDB ifdef.
-
-Wed Aug  7 23:19:00 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* aoutx.h bfd-in.h bfd-in2.h opncls.c riscix.c som.c targets.c:
-	Change NO_FLAGS to BFD_NO_FLAGS to avoid conflict with an HPUX
-	include file.
-	* libbfd.c:  Create dummy getpagesize() macro if HAVE_GETPAGESIZE
-	isn't defined.
-
-Wed Aug  7 14:11:44 1996  Philippe De Muyter  <phdm@info.ucl.ac.be>
-
-	* configure.in: Call BFD_NEEDED_DECLARATION on strstr and
-	realloc.
-	* acconfig.h (NEED_DECLARATION_STRSTR): New macro.
-	(NEED_DECLARATION_REALLOC): New macro.
-	* configure, config.in: Rebuild.
-	* sysdep.h (strstr): Declare if NEED_DECLARATION_STRSTR.
-	(realloc): Declare if NEED_DECLARATION_REALLOC.
-
-	* aclocal.m4 (BFD_NEED_DECLARATION): Include <string.h> or
-	<strings.h> if they exist.
-
-	* ieee.c (ieee_set_section_contents): Cast bfd_alloc return.
-
-Wed Aug  7 12:12:03 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cpu-i386.c (i8086_arch): Architecture info for the i8086.
-
-	Based on patches from Eric Valette <valette@crf.canon.fr>:
-	* elf32-i386.c (enum reloc_type): Add FIRST_INVALID_RELOC,
-	LAST_INVALID_RELOC, R_386_16, R_386_PC16, R_386_8, R_386_PC8.
-	(elf_howto_table): Add entries for new relocs.
-	(elf_i386_reloc_type_lookup): Handle new relocs.
-	(elf_i386_info_to_howto): Just call abort.
-	(elf_i386_info_to_howto_rel): Check that the reloc type is valid.
-	(elf_i386_relocate_section): Likewise.
-
-Tue Aug  6 12:54:56 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* elf32-d10v.c (elf_d10v_howto_table): Added R_D10V_32.
-
-Mon Aug  5 13:42:41 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (_bfd_elf_make_section_from_shdr): For a loadable section,
-	only get the LMA from the phdr if they are in the same part of the
-	file.
-
-	* elf.c (map_sections_to_segments): Rewrite tests for starting a
-	new segment to make them more comprehensible.  If the relationship
-	between the LMA and the VMA changed, start a new segment.  Don't
-	check dynsec when deciding whether to start a new segment for a
-	writeable section; -N will now handle this.
-
-Thu Aug  1 22:43:08 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* libhppa.h: Remove "esel" changes.  Not the right approach.
-	* som.c: Corresponding changes.
-	(som_bfd_derive_misc_symbol_info): Use ST_DATA for symbols
-	which don't have a SOM symbol type associated with them.
-	Reverses a 1994 change.
-
-Wed Jul 31 15:50:55 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	Make ld -N more reasonable for ELF:
-	* elf.c (map_sections_to_segments): If D_PAGED is not set, set
-	phdr_in_section to false, and always use a single load segment.
-	(elf_sort_sections): Sort sections by LMA after VMA.
-	(assign_file_positions_for_segments): If D_PAGED is not set, don't
-	align to maxpagesize.
-	(assign_file_positions_except_relocs): Likewise.
-	* elfcode.h (elf_object_p): If a section is loaded but not page
-	aligned, clear D_PAGED.
-
-Wed Jul 31 15:00:12 1996  James G. Smith  <jsmith@cygnus.co.uk>
-
-	* reloc.c: (BFD_RELOC_ARM_OFFSETIMM8, BFD_RELOC_ARM_HWLITERAL):
- 	Added, for internal use by the ARM gas.
-	* libbfd.h: Rebuilt
-	* bfd-in2.h: Rebuilt
-
-Tue Jul 30 14:14:57 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* libhppa.h (R_HPPA_ESEL): New field selector.
-	(e_esel): Similarly.
-	* som.c (hppa_som_gen_reloc_type): If we encounter an e_esel,
-	then generate R_COMP2 (PUSH_SYM), R_DATA_EXPR fixup stream.
-	(som_write_fixups): Handle R_DATA_EXPR just like R_CODE_EXPR.
-
-Tue Jul 30 13:31:27 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (_bfd_xcoff_bfd_link_add_symbols): Do the regular
-	archive search before looking for stripped dynamic objects.
-
-Fri Jul 26 17:51:39 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_build_ldsyms): Make exporting an undefined
-	symbol a warning rather than an error.
-
-Wed Jul 24 12:02:53 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): Track the virtual
-	memory position separately from the file position, and use it to
-	compute the alignment adjustment.
-
-Tue Jul 23 10:43:31 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* elf32-d10v.c (elf_d10v_howto_table): Changed all relocs to "long"
- 	and fixed mask on R_D10V_10_PCREL_L.
-
-Mon Jul 22 15:30:30 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf64-mips.c: Include "aout/ar.h".
-	(mips_elf64_slurp_armap): New static function.
-	(mips_elf64_write_armap): New static function.
-	(bfd_elf64_archive_*): Define.
-	* elfxx-target.h (bfd_elfNN_archive_p): Define if not defined.
-	Use instead of bfd_generic_archive_p.
-	(bfd_elfNN_write_archive_contents): Define if not defined.  Use
-	instead of _bfd_write_archive_contents.
-	(bfd_elfNN_mkdarchive): Define if not defined.  Use instead of
-	_bfd_generic_mkarchive.
-	(TARGET_BIG_SYM): If bfd_elfNN_archive_functions is defined, use
-	bfd_elfNN_archive in BFD_JUMP_TABLE_ARCHIVE rather than
-	_bfd_archive_coff.
-	(TARGET_LITTLE_SYM): Likewise.
-	* archive.c (bfd_slurp_armap): Check for and reject an archive map
-	name of /SYM64/.
-	* Makefile.in: Rebuild dependencies.
-
-	* elf32-mips.c (_bfd_mips_elf_final_write_processing): Handle
-	SHT_MIPS_LIBLIST, SHT_MIPS_CONTENT, SHT_MIPS_SYMBOL_LIB, and
-	SHT_MIPS_EVENTS sections.
-	(_bfd_mips_elf_section_from_shdr): Handle SHT_MIPS_IFACE,
-	SHT_MIPS_CONTENT, SHT_MIPS_SYMBOL_LIB, and SHT_MIPS_EVENTS
-	sections.
-	(_bfd_mips_elf_fake_sections): Likewise.
-
-	* libecoff.h (ecoff_data_type): Add rdata_in_text field.
-	* ecoff.c (ecoff_compute_section_file_positions): Copy
-	rdata_in_text from backend info to tdata.  Clear it if any data
-	section comes before .rdata.
-	(_bfd_ecoff_write_object_contents): Use rdata_in_text field in
-	tdata rather than backend info.
-
-Fri Jul 19 18:15:51 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Fix test for whether a compiler has a 64 bit
-	type.  From Jim Wilson <wilson@cygnus.com>.
-
-Thu Jul 18 15:39:10 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host (mips-sgi-irix6*): New host.
-
-	* configure.in: Set and substitute VERSION, BFD_HOST_64BIT_LONG
-	(replacing HOST_64BITLONG), BFD_HOST_64_BIT_DEFINED,
-	BFD_HOST_64_BIT, and BFD_HOST_U_64_BIT.  Add bfd-in2.h:bfd-in2.h
-	to AC_OUTPUT call.
-	* configure: Rebuild.
-	* bfd-in.h (BFD_ARCH_SIZE): Define as @wordsize@, not @WORDSIZE@.
-	(BFD_HOST_64_BIT): Define conditionally.
-	(BFD_HOST_U_64_BIT): Define when BFD_HOST_64_BIT is defined.
-	(bfd_vma): Typedef as BFD_HOST_U_64_BIT.
-	(symvalue, bfd_size_type): Likewise.
-	* bfd-in2.h: Rebuild.
-	* Makefile.in (do_clean): Remove bfd-tmp.h.
-	(do_distclean): Remove bfd-in3.h.
-	(stmp-bfd.h): Just do copy-if-change bfd-in3.h bfd.h.
-	(bfd-in3.h): New target.
-
-	* config.bfd (sparc-*-sysv4*): Don't build sunos_big_vec.  From
-	Andrew Gierth <ANDREWG@microlise.co.uk>.
-
-	* configure.host: Set INSTALL_SHLIB.
-	* configure.in: Call AC_SUBST (INSTALL_SHLIB).
-	* configure: Rebuild.
-	* Makefile.in (install): Use @INSTALL_SHLIB@.
-
-	* config.bfd (mips*-*-irix6*): New target.
-	* configure.host: Handle Irix 6 shared library like Irix 5.
-
-	* xcofflink.c (xcoff_link_add_symbols): Don't check an XMC_TD
-	symbol for a magic name.
-	(xcoff_link_input_bfd): Don't change the reloc symbol for an
-	XMC_TD symbol.
-	(_bfd_ppc_xcoff_relocate_section): Don't get the TOC offset for an
-	XMC_TD symbol.
-
-Thu Jul 18 11:36:31 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* mpw-config.in: Add ELF support to mips config, create the
-	elf32-target.h file in the object dir.
-	* mpw-make.sed: Edit elfXX-target.h refs at beginnings of lines.
-
-Wed Jul 17 18:02:32 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c: Redid debug scheme - numerous fprintf's gone.
-	Also removed most abort calls, in favor of using bfd reporting.
-
-Wed Jul 17 14:51:52 1996  Martin M. Hunt  <hunt@pizza.cygnus.com>
-
-	* Makefile.in (ALL_MACHINES): Add cpu-d10v.o.
-	(BFD32_BACKENDS) Add elf32-d10v.o.
-	* archures.c: Add bfd_d10v_arch.
-	* bfd-in2.h: Add bfd_d10v_arch.
-	* config.bfd (d10v-*-*): New target.
-	* configure: (bfd_elf32_d10v_vec) New vector.
-	* configure.in: (bfd_elf32_d10v_vec) New vector.
-	* cpu-d10v.c: New file.
-	* elf.c (prep_headers): Added case bfd_arch_d10v.
-	* elf32-d10v.c: New file.
-	* libbfd.h: Rebuild.
-	* reloc.c (BFD_RELOC_D10V_10_PCREL_R, BFD_RELOC_D10V_10_PCREL_L,
- 	BFD_RELOC_D10V_18, BFD_RELOC_D10V_18_PCREL): Define.
-	* targets.c (bfd_elf32_d10v_vec): New vector.
-
-Wed Jul 17 10:58:55 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (coff_ppc_relocate_section): Removed bogus fprintf
-
-Tue Jul 16 23:49:02 1996  Stu Grossman  (grossman@critters.cygnus.com)
-
-	* archures.c bfd-in2.h:  Add bfd_mach_i386_i386 and
-	bfd_mach_i386_i8086 machine types.
-
-Wed Jul 10 12:42:56 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_new_section_hook): Set SEC_CODE for _INIT
-	and _FINI sections.
-
-Wed Jul 10 11:18:21 1996  Richard Henderson  <rth@tamu.edu>
-
-	* coffcode.h (coff_set_section_contents): A/UX does not require
-	special handling of the _LIB section.
-
-Tue Jul  9 15:52:20 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* coff-h8300.c (h8300_reloc16_extra_cases): Use the correct
-	value for R_RELBYTE.
-
-	* reloc16.c (bfd_coff_reloc16_relax_section): Only "shrinks"
-	array if one was allocated.
-
-Tue Jul  9 12:21:54 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Kazumoto Kojima <kkojima@kk.info.kanagawa-u.ac.jp>:
-	* elf32-mips.c (struct mips_elf_link_hash_table): Add new fields
-	use_rld_obj_head and rld_value.
-	(mips_elf_link_hash_table_create): Initialize new fields.
-	(mips_elf_add_symbol_hook): Mark __rld_obj_head symbol as
-	dynamic.
-	(mips_elf_create_dynamic_sections): Create .rld_map section.  If
-	__rld_obj_head symbol not seen, create an __rld_map symbol.
-	(mips_elf_size_dynamic_sections): Make space in .rld_map section.
-	Create a DT_MIPS_RLD_MAP entry rather than a DT_DEBUG entry.
-	(mips_elf_finish_dynamic_symbol): Save value of __rld_map or
-	__rld_obj_head symbol.
-	(mips_elf_finish_dynamic_sections): Handle DT_MIPS_RLD_MAP.
-
-Mon Jul  8 16:18:03 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_reloc_map): Remove BFD_RELOC_32_PCREL entry.
-
-	* elf32-ppc.c (ppc_elf_howto_raw): For R_PPC_ADDR16_HA, use
-	ppc_elf_addr16_ha_reloc.
-	(ppc_elf_addr16_ha_reloc): New static function.
-
-	* coff-mips.c (struct mips_hi): Define.
-	(mips_refhi_list): New static variable.
- 	(mips_refhi_addr, mips_refhi_addend): Remove.
-	(mips_refhi_reloc): Maintain a list of unmatched REFHI relocs.
-	(mips_reflo_reloc): Process mips_refhi_list.
-	(mips_relhi_list): New static variable.
-	(mips_relhi_addr, mips_relhi_addend): Remove.
-	(mips_relhi_reloc): Maintain a list of unmatched RELHI relocs.
-	(mips_rello_reloc): Process mips_relhi_list.
-	(mips_relocate_section): Permit an arbitrary number of REFHI or
-	RELHI relocs before the associated REFLO or RELLO reloc.
-
-Fri Jul  5 19:27:49 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aout-target.h (MY(callback)): Set reloc_count fields.
-
-Thu Jul  4 12:00:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (sunos_add_dynamic_symbols): Don't create dynamic
-	sections unless this is a SunOS link.
-
-	* VERSION: Set to 2.7.1.
-
-	* Released binutils 2.7.
-
-Wed Jul  3 14:59:47 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* i386aout.c: Include "aout/aout64.h".
- 	(i386aout_write_object_contents): New static function.
-	(MY_write_object_contents): Define.
-
-	* netbsd.h (MY(write_object_contents)): Make sure that
-	adjust_sizes_and_vmas is called before fiddling with the magic
-	number.
-
-Tue Jul  2 23:30:39 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* stabs.c (_bfd_link_section_stabs): Fix casts of psinfo.
-
-Sun Jun 30 13:34:33 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libbfd-in.h (itos, stoi): Don't define.
-	* libbfd.h: Rebuild.
-	* i386lynx.c (KEEPIT): Define as udata.i.
-	(NAME(lynx,swap_std_reloc_out)): Don't use stoi.
-	(NAME(lynx,swap_ext_reloc_out)): Likewise.
-	* riscix.c (riscix_swap_std_reloc_out): Use udata.i rather than
-	flags.  Don't use stoi.
-
-	* elf32-mips.c (ELF_MAGPAGESIZE): Change definition to 0x1000.
-
-	* elf.c (map_sections_to_segments): Don't start a new segment for
- 	a writable section if it's on the same page as the previous
- 	segment.  Reset the writable variable for a readonly section.
-
-Sat Jun 29 16:18:51 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* peicode.h (coff_swap_aouthdr_in): Missing initializations of
-	first_thunk_address, thunk_size, and import_table_size.
-	* peicode.h: Improved some diagnostics regarding edata sections.
-
-	* coff-ppc.c (coff_ppc_relocate_section): Earlier error check
-	on IMGLUE relocs.
-	(coff_ppc_relocate_section): Improved diagnostic for large TOCDEFN's.
-	(TARGET_LITTLE_SYM): Added missing D_PAGED.
-
-Fri Jun 28 13:48:45 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_check_ar_symbols): An undefined symbol
-	with XCOFF_DEF_DYNAMIC set is really defined.
-	(xcoff_link_check_dynamic_ar_symbols): Likewise.
-	(xcoff_link_add_symbols): Only create special sections if using an
-	XCOFF hash table.
-
-	* reloc.c (bfd_perform_relocation): Handle xcoff-powermac like
-	aixcoff-rs6000.
-	(bfd_install_relocation): Likewise.
-
-Fri Jun 28 11:17:00 1996  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c (struct alpha_elf_link_hash_entry): Add flags
-	field.
-	(ALPHA_ELF_LINK_HASH_LU_ADDR): Define.
-	(ALPHA_ELF_LINK_HASH_LU_MEM): Define.
-	(ALPHA_ELF_LINK_HASH_LU_FUNC): Define.
-	(elf64_alpha_link_hash_newfunc): Initialize flags field.
-	(elf64_alpha_check_relocs): Record types of LITUSE entries that
-	are found for LITERAL relocs.
-	(elf64_alpha_adjust_dynamic_symbol): If a symbol has its address
-	taken, we cannot generate a .plt entry for the symbol.
-
-Thu Jun 27 11:24:29 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Add AC_ISC_POSIX, and check for setitimer and
-	sysconf functions (for gprof).
-	* configure, config.in: Rebuild.
-
-Wed Jun 26 16:29:02 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_archive_p): Check the first object file in
-	an archive if it has a map.  If the object file has the wrong
-	xvec, reject it.
-
-	* coff-alpha.c (alpha_adjust_reloc_in): Set the addend for a
-	BRADDR, SREL16, SREL32, or SREL64 reloc against an external
-	symbol.
-	(alpha_relocate_section): Likewise.
-
-	* coffswap.h (coff_swap_reloc_out): Use RELSZ, not sizeof.
-	(coff_swap_filehdr_out): Use FILHSZ, not sizeof.
-	(coff_swap_sym_out): Use SYMESZ, not sizeof.
-	(coff_swap_aux_out): Use AUXESZ, not sizeof.
-	(coff_swap_lineno_out): Use LINESZ, not sizeof.
-	(coff_swap_aouthdr_out): Use AOUTSZ, not sizeof.
-	(coff_swap_scnhdr_out): Use SCNHSZ, not sizeof.
-	* peicode.h: Corresponding changes.
-
-Tue Jun 25 15:28:34 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elflink.h (elf_create_pointer_linker_section): Comment out code
-	dealing with making GOT pointers negative of the GOT symbol for
-	now.
-
-Tue Jun 25 11:41:24 1996  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c (elf64_alpha_adjust_dynamic_symbol): Don't
-	increment the .rela.plt size until after we're done creating the
-	.plt entry.
-	(elf64_alpha_finish_dynamic_symbol): Change .plt entry to load the
-	.rela.plt offset directly rather than calculating it.
-
-Mon Jun 24 17:15:10 1996  Jason Molenda  (crash@godzilla.cygnus.co.jp)
-
-        * Makefile.in, (bindir, libdir, datadir, mandir, infodir, includedir):
-	Use autoconf-set values.
-        * doc/Makefile.in (bindir, libdir, datadir, mandir, infodir,
-	includedir, INSTALL, INSTALL_PROGRAM, INSTALL_DATA): Use autoconf-set
-	values.
-        (docdir): Deleted.
-        * configure.in (AC_PREREQ): autoconf v2.5 or higher.
-        * configure: Rebuilt.
-
-Mon Jun 24 22:50:35 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* som.c (som_write_fixups): Fix typo in R_END_TRY for exception
-	handling code > 1k away.
-
-Mon Jun 24 18:41:06 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elflink.h (elf_create_pointer_linker_section): If DEBUG is
-	defined, output whenever the symbol is updated.
-
-Mon Jun 24 17:58:12 1996  Jouke Numan  <jnuman@bazis.nl>
-
-	* elf.c (elf_fake_sections): Don't set sh_addr of a non SEC_ALLOC
-	section to 0 if user_set_vma is set.
-	* elflink.h (elf_bfd_final_link): Likewise.
-
-Sun Jun 23 20:42:51 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	Partially undo patch of Jun 20.
-	* coffcode.h (coff_set_alignment_hook): Use COFF_IMAGE_WITH_PE.
-	(coff_compute_section_file_positions): Likewise.
-	(coff_write_object_contents): Likewise.  Re-add deleted code, but
-	use #ifdef COFF_WITH_PE, not COFF_OBJ_WITH_PE.
-	* peicode.h (pe_bfd_copy_private_bfd_data): Re-add #ifdef.
-
-Fri Jun 21 17:38:15 1996  Joel Sherrill  <joel@merlin.gcs.redstone.army.mil>
-
-	* config.bfd: Add support for *-*-rtems* configurations.
-
-Fri Jun 21 15:19:59 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (prep_headers): Add bfd_arch_alpha case.
-
-Fri Jun 21 12:35:27 1996  Richard Henderson  <rth@tamu.edu>
-
-	* elf64-alpha.c: New file.
-	* config.bfd (alpha-*-linuxecoff*): New target.
-	(alpha-*-linux*, alpha-*-elf*): New targets.
-	* configure.in (bfd_elf64_alpha_vec): New vector.
-	* configure: Rebuild.
-	* targets.c (bfd_elf64_alpha_vec): Declare.
-	(bfd_target_vector): Add bfd_elf64_alpha_vec if BFD64.
-	* reloc.c (BFD_RELOC_ALPHA_GPDISP): Define.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* Makefile.in: Rebuild dependencies.
- 	(BFD64_BACKENDS): Add elf64-alpha.o.
-	(BFD64_BACKENDS_CFILES): Add elf64-alpha.c.
-
-Thu Jun 20 18:14:25 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (ecoff_armap_hash): If hlog is 0, just return 0, rather
-	than relying on a right shift of 32.
-
-Thu Jun 20 11:00:57 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* coffcode.h (coff_set_alignment_hook): Change COFF_IMAGE_WITH_PE
-	ifdef to COFF_WITH_PE.
-	(coff_compute_section_file_positions): Likewise.
-	(coff_write_object_contents): Likewise.  Delete COFF_OBJ_WITH_PE.
-	* pe-{arm,i386,ppc}.c (COFF_OBJ_WITH_PE): Delete.
-	* peicode.h (pe_bfd_copy_private_bfd_data): Delete ifdef
-	COFF_IMAGE_WITH_PE, always include.
-
-	* peicode.h (coff_swap_scnhdr_out): ".drectve" doesn't have trailing 0.
-
-Wed Jun 19 11:37:52 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (map_sections_to_segments): Fix up the test for -Ttext to
-	approximate the correct answer if SIZEOF_HEADERS was not used.
-
-	* binary.c (binary_set_section_contents): Set section file
-	position based on LMA rather than VMA.
-
-Wed Jun 19 11:19:25 1996  Manfred Hollstein KS/EIC5 60/3/142 #40283  <manfred@lts.sel.alcatel.de>
-
-	* linker.c (_bfd_generic_link_output_symbols): Don't output any
-	symbols if info->strip == strip_all.
-
-Tue Jun 18 15:17:36 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
-
-	* coff-h8300.c: Remove #if 0 code.
-	(compatable): Don't allow mixing/matching of different architectures.
-
-	* archures.c (bfd_mach_h8300s): Add.
-	* bfd-in2.h: Rebuilt.
-	* coff-h8300.c (funcvec_hash_newfunc): Handle H8/S too.
-	(BADMAG): Likewise.
-	(h8300_reloc16_estimate): Likewise.
-	(h8300_reloc16_extra_cases): Likewise.
-	(h8300_bfd_link_add_symbols): Likewise.
-	* coffcode.h (coff_set_arch_mach_hook): Likewise.
-	(coff_set_flags): Likewise.
-	* cpu-h8300.c (h8300_scan): Likewise.
-	Add H8/S to bfd_h8300_arch list.
-
-Tue Jun 18 14:42:58 1996  Klaus Kaempf  <kkaempf@progis.de>
-
-	Added support for Alpha OpenVMS:
-	* evax.h, evax-alpha.c, evax-egsd.c, evax-emh.c: New files.
-	* evax-etir.c, evax-misc.c, hosts/alphavms.h: New files.
-	* config.h-vms, makefile.vms: New files.
-	* config.bfd (alpha-*-*vms*): New target.
-	* configure.in (evax_alpha_vec): New target vector.
-	* configure: Rebuild.
-	* reloc.c (BFD_RELOC_SWREL32, BFD_RELOC_SWREL64): Define.
-	(BFD_RELOC_ALPHA_LINKAGE, BFD_RELOC_ALPHA_BASEREG): Define.
-	* targets.c (bfd_target_evax_flavour): Define.
-	(evax_alpha_vec): Declare.
-	(bfd_target_vector): Add ecoffalpha_little_vec and evax_alpha_vec
-	if BFD64 is defined.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* Makefile.in: Rebuild dependencies.
-	(BFD64_BACKENDS): Add evax-alpha.o, evax-egsd.o, evax-etir.o,
-	evax-emh.o, and evax-misc.o.
-	(BFD64_BACKENDS_CFILES): Add evax-alpha.c, evax-egsd.c,
-	evax-etir.c, evax-emh.c, and evax-misc.c.
-	(HFILES): Add evax.h.
-
-Tue Jun 18 13:54:18 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-h8300.c (h8300_reloc16_extra_cases): Make name a const
-	pointer.
-	(h8300_bfd_link_add_symbols): Likewise.
-
-Mon Jun 17 10:06:50 1996  Jeffrey A. Law  <law@rtl.cygnus.com>
-
-	* som.h (R_HPPA_BEGIN_TRY, R_HPPA_END_TRY): Define.
-	* som.c (som_write_fixups): Handle R_BEGIN_TRY and R_END_TRY.
-
-Mon Jun 17 12:49:11 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_relocate_section): Don't create a reloc
-	for R_MIPS_REL32 and R_MIPS_32 relocs if no dynamic sections were
-	created.
-	(mips_elf_check_relocs): Only create .rel.dyn for R_MIPS_REL32 and
-	R_MIPS_32 relocs if creating a shared library.
-
-Thu Jun 13 20:14:51 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* peicode.h (add_data_entry): Use pei_section_data rather than
-	_cooked_size.  Corresponds to May 13 change in coffcode.h.
-
-Thu Jun 13 10:23:40 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_final_link): Handle long section names.
-	* coffcode.h (coff_write_object_contents): If there are long
-	section names, always set the f_symptr field, even if there are no
-	symbols.
-	* peicode.h (coff_swap_filehdr_in): Don't clear the f_symptr field
-	if there are no symbols.
-
-	* coffgen.c (make_a_section_from_file): Check return value of
-	_bfd_coff_read_string_table.
-	(coff_real_object_p): Check return value of
-	make_a_section_from_file.
-	(_bfd_coff_read_string_table): Check that there are some symbols
-	before trying to read the string table size.
-
-Wed Jun 12 11:16:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_symbols): When considering whether
-	to replace a symbol in a dynamic object with a symbol from another
-	dynamic object, do the replacement if the existing symbol is
-	global linkage code.
-
-	* xcofflink.c (_bfd_ppc_xcoff_relocate_section): Check explicitly
-	for _ptrgl, and treat it as global linkage code.
-
-	* aoutx.h (NAME(aout,find_nearest_line)): Notice if we find a
-	filename or N_SO symbol past the offset, and use it to indicate
-	that there is no line number or function when appropriate.
-
-Tue Jun 11 15:24:48 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_build_ldsyms): Set XCOFF_DEF_REGULAR for a
-	common symbol defined by the linker.  Don't export function code
-	even if export_defineds is set.
-
-Mon Jun 10 11:57:27 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* coff-h8300.c (howto_table): Add new entries for R_BCC_INV
-	and R_JMP_DEL.
-	(rtype2howto): Handle R_BCC_INV and R_JMP_DEL.
-	(h8300_symbol_address_p): New function.
-	(h8300_reloc16_estimate): Eliminate jumps made unnecessary by
-	relaxing.
-
-Sun Jun  9 16:30:20 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* coff-h8300.c (h8300_reloc16_estimate): Fix many minor spacing
-	problems.
-	(h8300_reloc16_estimate, cases R_JMP1, R_JMP2): Adjust "dot"
-	correctly for the two variants.  Allow relaxing if the target
-	is 128 bytes away since after relaxation it'll be 126 bytes away.
-	(h8300_reloc16_estimate, case R_PCRWORD): Correctly adjust
-	"dot" and "value".  Allow relaxing if the target is 128 bytes
-	away since after relaxation it'll be 126 bytes away.
-	* reloc16.c (bfd_coff_reloc16_relax_section): Keep relaxing
-	the given section until nothing changes.
-
-Thu Jun  6 15:24:45 1996  Richard Henderson  <rth@tamu.edu>
-
-	* ecoff.c (_bfd_ecoff_new_section_hook): Remove the _PDATA
- 	alignment hack--we can get the lnnoptr info another way without
- 	suddenly increasing the alignment requirements.  Set the flags for
-	the _PDATA section.
-	(ecoff_compute_section_file_positions): Do so.
-
-Thu Jun  6 11:24:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_write_object_contents): Put a timestamp in the file
-	to keep the HP emulator database happy.
-
-	* config.bfd: Recognize powerpc-*-linux* and powerpcle-*-linux*.
-	From Kevin Buettner <kev@primenet.com>.
-
-Wed Jun  5 15:16:04 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (translate_to_native_sym_flags): Don't try to print the
-	name of a NULL section.
-
-Tue Jun  4 18:53:58 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* linker.c (_bfd_generic_link_add_one_symbol): If notice_all is
-	set, always call the notice callback.
-
-	* VERSION: Increment for bfdlink.h change.
-
-Mon Jun  3 11:01:53 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (COFF_DEFAULT_SECTION_ALIGNMENT_POWER): Set to 4.
-	(sh_relax_delete_bytes): Correct handling of differently sized
-	trailing alignment reloc.
-
-	* bfd-in.h: Use #error if BFD_HOST_64_BIT can not be defined.
-	* bfd-in2.h: Rebuild.
-	* configure.in: Warn if there is no known 64 bit type.
-	* configure: Rebuild.
-
-	* Makefile.in: Rebuild dependencies.
- 	(BFD32_BACKENDS): Add ppcboot.o.
-	(BFD32_BACKENDS_CFILES): Add ppcboot.c.
-
-	* elf32-mips.c (mips_elf_size_dynamic_sections): Initialize c.
-	From Per Fogelstrom <per.fogelstrom@mailbox200.swipnet.se>.
-
-Sat Jun  1 21:49:58 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf64-mips.c (bfd_mips_elf64_swap_reginfo_in)
-	(bfd_mips_elf64_swap_reginfo_out): Move from here...
-	* elf32-mips.c (bfd_mips_elf64_swap_reginfo_in)
-	(bfd_mips_elf64_swap_reginfo_out): ...to here.
-
-Fri May 31 13:51:28 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf64-mips.c: Improve reloc special_functions and handling of
-	SHT_MIPS_OPTIONS section.
-	* elf32-mips.c (_bfd_mips_elf_hi16_reloc): Rename from
-	mips_elf_hi16_reloc and make globally visible.
-	(_bfd_mips_elf_lo16_reloc): Rename from mips_elf_lo16_reloc and
-	make globally visible.
-	(_bfd_mips_elf_got16_reloc): Rename from mips_elf_got16_reloc and
-	make globally visible.
-	(_bfd_mips_elf_gprel16_reloc): Rename from mips_elf_gprel16_reloc
-	and make globally visible.
-	(gprel16_with_gp): Check howto->src_mask before using value in
-	insn.
-	(_bfd_mips_elf_gprel32_reloc): Rename from mips_elf_gprel32_reloc
-	and make globally visible.
-	(gprel32_with_gp): Check howto->src_mask before fetching value.
-	(bfd_mips_elf_swap_options_in): New function.
-	(bfd_mips_elf_swap_options_out): New function.
-	(_bfd_mips_elf_set_private_flags): Rename from
-	mips_elf_set_private_flags and make globally visible.
-	(_bfd_mips_elf_copy_private_bfd_data): Rename from
-	mips_elf_copy_private_bfd_data and make globally visible.
-	(_bfd_mips_elf_merge_private_bfd_data): Rename from
-	mips_elf_merge_private_bfd_data and make globally visible.
-	(_bfd_mips_elf_section_from_shdr): Accept .MIPS.options as a name
-	for a SHT_MIPS_OPTIONS section.
-	(mips_elf32_section_from_shdr): Handle SHT_MIPS_OPTIONS section.
-	(_bfd_mips_elf_fake_sections): Consider .MIPS.options to be the
-	name of a SHT_MIPS_OPTIONS section.
-	(_bfd_mips_elf_set_section_contents): New function.
-	(mips_elf32_section_processing): Set the GP value in a
-	SHT_MIPS_OPTIONS section.
-	(_bfd_mips_elf_find_nearest_line): Rename from
-	mips_elf_find_nearest_line and make globally visible.
-	(bfd_elf32_set_section_contents): Define.
-	* elf-bfd.h (_bfd_mips_elf_hi16_reloc): Declare.
-	(_bfd_mips_elf_lo16_reloc): Declare.
-	(_bfd_mips_elf_gprel16_reloc): Declare.
-	(_bfd_mips_elf_got16_reloc): Declare.
-	(_bfd_mips_elf_gprel32_reloc): Declare.
-	(_bfd_mips_elf_set_private_flags): Declare.
-	(_bfd_mips_elf_copy_private_bfd_data): Declare.
-	(_bfd_mips_elf_merge_private_bfd_data): Declare.
-	(_bfd_mips_elf_find_nearest_line): Declare.
-	(_bfd_mips_elf_set_section_contents): Declare.
-
-	* elf32-hppa.c (elf32_hppa_info_to_howto): Rename from
-	elf_info_to_howto.
-	(elf_info_to_howto): Define.
-	* elf32-sparc.c (elf32_sparc_info_to_howto): Rename from
-	elf_info_to_howto.
-	(elf_info_to_howto): Define.
-	* elf64-sparc.c (sparc64_elf_info_to_howto): Rename from
-	elf_info_to_howto.
-	(elf_info_to_howto): Define.
-
-	* coff-w65.c (h8300_reloc16_estimate): Rename R_MOVB[12] to
-	R_MOV16B[12], to match change in coff/internal.h.
-
-Thu May 30 12:38:49 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf64-mips.c: Extensive additions to provide better support for
-	writing files and for gas.
-	* elf32-mips.c (_bfd_mips_elf_object_p): New function, broken out
-	of mips_elf_object_p.
-	(mips_elf32_object_p): Rename from mips_elf_object_p; call
-	_bfd_mips_elf_object_p.
-	(_bfd_mips_elf_final_write_processing): Rename from
-	mips_elf_final_write_processing and make globally visible.
-	(_bfd_mips_elf_fake_sections): Rename from
-	mips_elf_fake_sections and make globally visible.
-	(_bfd_mips_elf_section_from_bfd_section): Rename from
-	mips_elf_section_from_bfd_section and make globally visible.
-	(_bfd_mips_elf_section_processing): New function, broken out of
-	mips_elf_section_processing.
-	(mips_elf32_section_processing): Rename from
-	mips_elf_section_processing; call
-	_bfd_mips_elf_section_processing.
-	(_bfd_mips_elf_symbol_processing): Rename from
-	mips_elf_symbol_processing and make globally visible.
-	(_bfd_mips_elf_read_ecoff_info): Rename from
-	mips_elf_read_ecoff_info and make globally visible.
-	(mips_elf32_ecoff_debug_swap): Rename from
-	mips_elf_ecoff_debug_swap.
-	* elf.c (_bfd_elf_symbol_from_bfd_symbol): Use asymbol rather than
-	struct symbol_cache_entry.
-	(_bfd_elf_validate_reloc): New function, moved in from
-	elfcode.h:validate_reloc.
-	* elfcode.h (validate_reloc): Remove; moved into elf.c and renamed
-	to _bfd_elf_validate_reloc.  Change all callers.
-	* elf-bfd.h (bfd_section_from_shdr): Declare.
-	(_bfd_elf_symbol_from_bfd_symbol): Declare.
-	(_bfd_elf_validate_reloc): Declare.
-	(_bfd_mips_elf_object_p): Declare.
-	(_bfd_mips_elf_fake_sections): Declare.
-	(_bfd_mips_elf_section_from_bfd_section): Declare.
-	(_bfd_mips_elf_section_processing): Declare.
-	(_bfd_mips_elf_symbol_processing): Declare.
-	(_bfd_mips_elf_read_ecoff_info): Declare.
-	(_bfd_mips_elf_final_write_processing): Declare.
-	* elfxx-target.h (bfd_elfNN_get_reloc_upper_bound): Don't define
-	if already defined.
-
-	* elf32-mips.c (mips_elf_object_p): Handle E_MIPS_ARCH_4.
-	(mips_elf_final_write_processing): Likewise.
-
-Wed May 29 16:15:29 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	64-bit MIPS ELF ABI objdump support:
-	* elf64-mips.c: New file.
-	* Makefile.in: Rebuild dependencies.
- 	(BFD64_BACKENDS): Add elf64-mips.o.
-	(BFD64_BACKENDS_CFILES): Add elf64-mips.c.
-	* config.bfd (mips*el-*-elf*) Add bfd_elf64_bigmips_vec and
-	bfd_elf64_littlemips_vec to targ_selvecs.
-	(mips*-*-elf*): Likewise.
-	* confingure.in: Add bfd_elf64_bigmips_vec and
-	bfd_elf64_littlemips_vec to vector switch.
-	* configure: Rebuild.
-	* elf32-mips.c (_bfd_mips_elf_section_from_shdr): New function,
-	broken out of mips_elf_section_from_shdr.
-	(mips_elf32_section_from_shdr): Rename from
-	mips_elf_section_from_shdr.  Call new function.
-	(elf_backend_section_from_shdr): Update name of renamed function.
-	* elf-bfd.h (struct elf_size_info): Change second parameter of
-	write_out_phdrs to be const.  Likewise for second parameter of
-	swap_symbol_out.
-	(struct bfd_elf_section_data): Add rel_hdr2 field.
-	(bfd_elf32_swap_symbol_in): Change second parameter to be const.
-	(bfd_elf32_swap_symbol_out): Likewise.
-	(bfd_elf32_swap_reloc_in): Likewise.
-	(bfd_elf32_swap_reloc_out): Likewise.
-	(bfd_elf32_swap_reloca_in): Likewise.
-	(bfd_elf32_swap_reloca_out): Likewise.
-	(bfd_elf32_swap_phdr_in): Likewise.
-	(bfd_elf32_swap_phdr_out): Likewise.
-	(bfd_elf32_swap_dyn_in): Likewise.
-	(bfd_elf32_swap_dyn_out): Likewise.
-	(bfd_elf32_slurp_symbol_table): Declare.
-	(bfd_elf32_write_shdrs_and_ehdr): Declare.
-	(bfd_elf32_write_out_phdrs): Declare.
-	(bfd_elf64_swap_symbol_in): Change second parameter to be const.
-	(bfd_elf64_swap_symbol_out): Likewise.
-	(bfd_elf64_swap_reloc_in): Likewise.
-	(bfd_elf64_swap_reloc_out): Likewise.
-	(bfd_elf64_swap_reloca_in): Likewise.
-	(bfd_elf64_swap_reloca_out): Likewise.
-	(bfd_elf64_swap_phdr_in): Likewise.
-	(bfd_elf64_swap_phdr_out): Likewise.
-	(bfd_elf64_swap_dyn_in): Likewise.
-	(bfd_elf64_swap_dyn_out): Likewise.
-	(bfd_elf64_slurp_symbol_table): Declare.
-	(bfd_elf64_write_shdrs_and_ehdr): Declare.
-	(bfd_elf64_write_out_phdrs): Declare.
-	(_bfd_mips_elf_section_from_shdr): Declare.
-	* elf.c (bfd_section_from_shdr): Remove assertion requiring
-	SHT_REL/SHT_RELA to match use_rela_p.  If there is already a reloc
-	section for the section, add the new one to rel_hdr2.  Increment
-	reloc_count rather than setting it.
-	* elfcode.h (elf_slurp_symbol_table): Define name as macro.
-	Remove static declaration.
-	(elf_write_shdrs_and_ehdr): Define name as macro.
-	(elf_write_out_phdrs): Likewise.
-	(elf_swap_ehdr_in, elf_swap_ehdr_out): Declare.
-	(elf_swap_shdr_in, elf_swap_shdr_out): Declare.
-	(elf_swap_symbol_in): Change second parameter to be const.
-	(elf_swap_symbol_out): Likewise.
-	(elf_swap_ehdr_in, elf_swap_ehdr_out): Likewise.
-	(elf_swap_shdr_in, elf_swap_shdr_out): Likewise.
-	(elf_swap_phdr_in, elf_swap_phdr_out): Likewise.
-	(elf_swap_reloc_in, elf_swap_reloc_out): Likewise.
-	(elf_swap_reloca_in, elf_swap_reloca_out): Likewise.
-	(elf_write_out_phdrs): Rename from write_out_phdrs.  Change second
-	parameter to be const.  Make non-static.
-	(elf_write_shdrs_and_ehdr): Rename from write_shdrs_and_ehdr.
-	Make non-static.
-	(elf_slurp_symbol_table): Make non-static.
-	(NAME(_bfd_elf,size_info)): Update names of renamed functions.
-	* elfxx-target.h (elf_info_to_howto): Define if not defined.
-	(elf_backend_size_info): Likewise.
-	(elfNN_bed): Use elf_backend_size_info.
-	* targets.c (bfd_elf64_bigmips_vec): Declare.
-	(bfd_elf64_littlemips_vec): Declare.
-	(bfd_target_vector): Add bfd_elf64_bigmips_vec and
-	bfd_elf64_littlemips_vec if BFD64 is defined.
-
-	* libbfd.c (bfd_get_file_window): Add cast to fprintf argument.
-
-Tue May 28 11:42:08 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (sh_relax_delete_bytes): Insert nop instructions, not
-	zeroes, in alignment holes.
-
-	* configure: Rebuild with autoconf 2.10.
-
-	* aoutx.h (NAME(aout,find_nearest_line)): Make room for the
-	potential leading underscore in the allocated buffer.
-
-Fri May 24 14:28:38 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_add_symbol_hook): Do not put small common
-	symbols into .sbss if this is a relocatable link.
-
-Thu May 23 12:26:24 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (_bfd_ppc_xcoff_relocate_section): Warn about
-	undefined symbols when creating a shared library.
-
-Fri May 17 13:54:15 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c: Add a bunch of new code and static const arrays to
-	support aligning loads and stores on four byte memory boundaries.
-	Also:
-	(sh_coff_howtos): Add entries for R_SH_CODE, R_SH_DATA and
-	R_SH_LABEL.
-	(sh_relax_section): Look for R_SH_CODE relocs.  If we find one,
-	call sh_align_loads.
-	(sh_relax_delete_bytes): Don't mark R_SH_CODE or R_SH_DATA relocs
-	as unused.
-
-Thu May 16 16:34:13 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cache.c (bfd_open_file): Unlink the file before opening it for
-	write.  From Marty Leisner <leisner@sdsp.mc.xerox.com>.
-
-	* opncls.c (bfd_fdopenr): Set opened_once.
-
-Tue May 14 12:35:32 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* som.c (som_slurp_reloc_table): Clear external_relocs cache after
-	freeing it.
-
-	* libbfd.c: Remove #ifdef FILE_OFFSET_IS_CHAR_INDEX, and compile
-	the code unconditionally.
-
-Mon May 13 19:51:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libcoff-in.h (struct pei_section_tdata): Define structure.
-	(pei_section_data): Define macro.
-	* libcoff.h: Rebuild.
-	* coffcode.h (coff_set_alignment_hook): If COFF_IMAGE_WITH_PE,
-	store s_paddr field in pei_section_data.
-	(coff_compute_section_file_positions): Use pei_section_data rather
-	than _cooked_size, and don't overwrite an existing value.
-	(coff_write_object_contents): If COFF_OBJ_WITH_PE, set s_paddr to
-	0.  If COFF_IMAGE_WITH_PE, set s_paddr to pei_section_data.
-	* peicode.h (coff_bfd_copy_private_section_data): Define if
-	COFF_IMAGE_WITH_PE.
- 	(pe_bfd_copy_private_section_data): New static function if
-	COFF_IMAGE_WITH_PE.
-
-Wed May  8 16:10:38 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* srec.c (srec_set_arch_mach): Write as a function rather than a
-	macro definition.
-
-	* xcofflink.c (_bfd_xcoff_bfd_link_add_symbols): If an archive has
-	no map, just check each member in turn to see whether it is
-	required.
-
-Wed May  8 09:17:34 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* ppcboot.c (ppcboot_object_p): Check for type 0x41 in partition
-	table.  Call BFD_ASSERT to validate header size, instead of
-	calling fatal.
-	(ppcboot_bfd_print_private_bfd_data): Put quotes around partition
-	name.
-
-Tue May  7 16:10:19 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* ppcboot.c: New target for looking at PPCbug boot records.
-
-	* config{ure.in,.bfd}: Add support for ppcboot target.
-	* targets.c: Ditto.
-	* configure: Regenerate.
-
-Tue May  7 11:15:19 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* coff-h8300.c (howto_table): Update names to match recent
-	changes to include/coff/internal.h.  Fix minor errors in the
-	existing relocs.  Add R_MOVL1 and R_MOVL2.
-	(rtype2howto): Similarly.
-	(h8300_reloc16_estimate): Rewrite to simplify, fix bugs in the
-	existing relaxing code  and peform more relaxing.
-	(h8300_reloc16_extra_cases): Likewise.
-
-Mon May  6 18:24:09 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* reloc16.c (bfd_coff_reloc16_get_value): Handle common
-	symbols correctly.
-
-Sat May  4 05:08:45 1996  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
-
-	* elfcode.h (elf_object_p):  Reject generic ELF target if
-	e_machine matches an alternate machine code in a specific backend.
-
-	* netbsd-core.c (netbsd_core_vec):  Remove initializer for
-	obsolete align_power_min field.
-
-Fri May  3 13:07:35 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* coff-h8300.c (reloc_howto_type): Add howto entry for
-	R_PCRWORD_B.
-	(rtype2howto): Handle R_PCRWORD_B.
-	(h8300_reloc16_extra_cases): Handle R_PCRWORD_B.
-	(h8300_reloc_16_estimate): Likewise.  Try to turn a 16bit
-	pc-relative branch (R_PCRWORD) into an 8bit pc-relative
-	branch (R_PCWORD_B).
-
-Fri May  3 10:47:41 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (translate_from_native_sym_flags): Set the section for
-	BSF_CONSTRUCTOR symbols.
-
-	* cofflink.c (_bfd_coff_link_input_bfd): Correct setting of
-	last_bf_index.
-
-Wed May  1 18:39:32 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* coffcode.h (coff_write_object_contents): In comdat section lookup,
-	stop looking when section is found.
-
-Wed May  1 14:17:57 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (STRING_SIZE_SIZE): Define.
-	(styp_to_sec_flags): Handle long symbol names when looking for the
-	section symbol.
-	(bfd_coff_backend_data): Add _bfd_coff_long_section_names field.
-	(bfd_coff_long_section_names): Define.
-	(coff_write_object_contents): Handle long section names.
-	(bfd_coff_std_swap_table): Initialize new field.
-	* libcoff.h: Rebuild.
-	* coffgen.c (make_a_section_from_file): Handle long section
-	names.
-	(coff_write_symbols): Handle long section names.
-	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-	* pe-arm.c (COFF_LONG_SECTION_NAMES): Define.
-	* pei-arm.c (COFF_LONG_SECTION_NAMES): Define.
-	* pe-i386.c (COFF_LONG_SECTION_NAMES): Define.
-	* pei-i386.c (COFF_LONG_SECTION_NAMES): Define.
-	* pe-ppc.c (COFF_LONG_SECTION_NAMES): Define.
-	* pei-ppc.c (COFF_LONG_SECTION_NAMES): Define.
-
-	* bout.c (b_out_callback): Set lma of sections.
-	(b_out_bfd_get_relocated_section_contents): Rename in_abfd
-	parameter to output_bfd.  Used input_bfd instead of output_bfd in
-	several places.
-
-Tue Apr 30 17:56:39 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (translate_from_native_sym_flags): Don't create
-	SEC_CONSTRUCTOR sections.
-	* ecoff.c (ecoff_set_symbol_info): Likewise.
-
-	* elf32-mips.c (mips_elf_copy_private_bfd_data): Copy elf_gp.
-	From Don Bowman <bowman@waterloo.hp.com>.
-
-Tue Apr 30 17:06:32 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* coff-arm.c (armcoff_little_vec): If COFF_WITH_PE is defined, add
-	SEC_LINK_ONCE and SEC_LINK_DUPLICATES to section_flags.
-
-Mon Apr 29 13:15:17 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (struct mips_elf_link_hash_entry): Add
-	mips_32_relocs field.
-	(mips_elf_link_hash_newfunc): Initialize mips_32_relocs field.
-	(mips_elf_relocate_section): Copy R_MIPS_REL32 and R_MIPS_32
-	relocs against a global symbol which is not defined in a regular
-	file.
-	(mips_elf_check_relocs): For a R_MIPS_REL32 or R_MIPS_32 reloc
-	against a global symbol, increment mips_32_relocs.
-	(mips_elf_adjust_dynamic_symbol): If mips_32_relocs is set, and
-	the symbol is not defined in a regular file, make room in the
-	.rel.dyn section.
-
-Fri Apr 26 18:00:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (ecoff_compute_section_file_positions): Track the real
-	file position and the virtual file position separately.  Set
-	filepos information bsaed on the real file position.
-	(_bfd_ecoff_set_section_contents): Handle .lib sections like the
-	Jan 23 change to coffcode.h.
-
-	* som.c (som_slurp_symbol_table): Set the symbol count to the
-	number of BFD symbols created.
-
-Fri Apr 26 12:34:29 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_check_relocs): Forward relocations to the
-	output file if linking shared objects.  Loop to check all relocs,
-	rather than returning false on first error.
-
-Thu Apr 25 13:25:12 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_create_linker_section): Add PLT case.
-	(ppc_elf_additional_program_headers): If .interp section, bump #
-	of program headers by 1.
-	(ppc_elf_adjust_dynamic_symbol): Flesh out support.
-	(ppc_elf_size_dynamic_sections): Add support for .plt section.
-	(ppc_elf_check_relocs): Print out filename in debug code.  Enable
-	PLT support.
-	(ppc_elf_finish_dynamic_symbol): Add support for PLT's, beef up
-	debug output.
-	(ppc_elf_relocate_section): If the output section isn't defined,
-	don't abort, just give an error message.
-
-	* elflink.c (_bfd_elf_create_dynamic_sections): If the section
-	being created is .sdata or .sdata2, don't make the symbol dynamic.
-
-Wed Apr 24 14:04:07 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (_bfd_xcoff_bfd_link_add_symbols): Look through the
-	members of an archive for dynamic objects with no symbols, and
-	pass them directly to check_archive_element.
-	(xcoff_link_check_ar_symbols): Pass dynamic objects to
-	xcoff_link_check_dynamic_ar_symbols.
-	(xcoff_link_check_dynamic_ar_symbols): New static function.
-
-	* coff-rs6000.c (rs6000coff_vec): Change BFD_JUMP_TABLE_DYNAMIC
-	from _bfd_nodynamic to _bfd_xcoff.
-	* libcoff-in.h (_bfd_xcoff_get_dynamic_symtab_upper_bound):
-	Declare.
-	(_bfd_xcoff_canonicalize_dynamic_symtab): Declare.
-	(_bfd_xcoff_get_dynamic_reloc_upper_bound): Declare.
-	(_bfd_xcoff_canonicalize_dynamic_reloc): Declare.
-	* libcoff.h: Rebuild.
-	* xcofflink.c (xcoff_swap_ldrel_in): New static function.
-	(xcoff_get_section_contents): New static function.
-	(_bfd_xcoff_get_dynamic_symtab_upper_bound): New function.
-	(_bfd_xcoff_canonicalize_dynamic_symtab): New function.
-	(_bfd_xcoff_get_dynamic_reloc_upper_bound): New function.
-	(xcoff_dynamic_reloc): New static variable.
-	(_bfd_xcoff_canonicalize_dynamic_reloc): New function.
-	(xcoff_link_add_dynamic_symbols): Use xcoff_get_section_contents.
-
-Tue Apr 23 12:48:42 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sparc.c (bfd_coff_generic_reloc): Return bfd_reloc_ok even
-	if reloc_entry->addend is not 0.
-	(CALC_ADDEND): Just set the addend to reloc.r_offset.
-
-Mon Apr 22 18:29:01 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-sparc.c (_bfd_sparc_elf_howto_table): Fix spelling of
-	R_SPARC_GLOB_JMP.
-	* elf64-sparc.c (sparc64_elf_howto_table): Likewise.
-	Add entries for R_SPARC_[56].
-	(sparc_reloc_map): Add entries for R_SPARC_[56].
-
-Mon Apr 22 15:07:24 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	Optimize linking of stabs in sections as used in ELF and COFF.
-	* stabs.c: New file.
-	* libbfd-in.h (_bfd_link_section_stabs): Declare.
-	(_bfd_write_section_stabs): Declare.
-	(_bfd_write_stab_strings): Declare.
-	* libbfd.h: Rebuild.
-	* libcoff-in.h (struct coff_section_tdata): Add stab_info field.
-	(struct coff_link_hash_table): Add stab_info field.
-	* libcoff.h: Rebuild.
-	* cofflink.c (_bfd_coff_link_hash_table_init): Initialize
-	stab_info field.
-	(coff_link_add_symbols): Call _bfd_link_section_stabs if
-	appropriate.
-	(_bfd_coff_final_link): Write out stab strings hash table.
-	(_bfd_coff_link_input_bfd): Handle optimized stabs sections.
-	* coff-ppc.c (ppc_bfd_coff_final_link): Write out stab strings
-	hash table.
-	* elf-bfd.h (struct elf_link_hash_table): Add stab_info field.
-	(struct bfd_elf_section_data): Add stab_info field.
-	* elf.c (_bfd_elf_link_hash_table_init): Initialize stab_info
-	field.
-	* elflink.h (elf_link_add_object_symbols): If appropriate, call
-	_bfd_link_section_stabs.
-	(elf_bfd_final_link): Write out stab strings hash table.
-	(elf_link_input_bfd): Handle optimized stabs sections.
-	* reloc.c (_bfd_final_link_relocate): Check address against
-	_raw_size rather than _cooked_size.
-	* Makefile.in: Rebuild dependencies.
-	(BFD_LIBS): Add stabs.o
-	(BFD_LIBS_CFILES): Add stabs.c.
-
-	* VERSION: Increment for bfdlink.h change.
-
-	* coffgen.c (coff_renumber_symbols): Correct handling of
-	BSF_NOT_AT_END common symbols.
-
-Fri Apr 19 19:21:56 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-ppc.c (record_toc): Add cast to avoid warning.
-	(ppc_allocate_toc_section): Likewise.
-	(coff_ppc_relocate_section): Remove ANSI C string concatenation.
-	(ppc_coff_reloc_type_lookup): Remove unreached code.
-	* coffcode.h (coff_write_object_contents): Don't take the address
-	of an array.
-	* peicode.h (pe_print_idata): Add casts to avoid warning.
-	(pe_print_edata): Likewise.
-	(pe_print_reloc): Remove ANSI C string concatenation.
-
-Thu Apr 18 18:51:18 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libcoff-in.h (struct coff_final_link_info): Add last_bf_index
-	and last_bf fields.
-	* libcoff.h: Rebuild.
-	* coffswap.h (coff_swap_aux_in): Swap endndx field for C_FCN
-	symbols.
-	(coff_swap_aux_out): Likewise.
-	* peicode.h (coff_swap_aux_in): Likewise.
-	(coff_swap_aux_out): Likewise.
-	* coffgen.c (coff_pointerize_aux): Check endndx field for C_FCN
-	symbols.
-	* cofflink.c (_bfd_coff_final_link): Initialize last_bf_index
-	field.
-	(_bfd_coff_link_input_bfd): Check endndx field for C_FCN symbols.
-	Fix up .bf endndx link fields.
-	* coff-ppc.c (ppc_bfd_coff_final_link): Initialize last_bf_index
-	field.
-	* xcofflink.c (xcoff_link_input_bfd): Check endndx field for C_FCN
-	symbols.
-
-Wed Apr 17 12:08:24 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* pe{,i}-ppc.c (PPC_PE): Define instead of PPC, so that compiling
-	on Solaris PowerPC systems doesn't get confused.
-
-	* ccffcode.h (coff_write_object_contents): Use #ifdef PPC_PE, not
-	#ifdef PPC.
-
-	* elfcore.h (bfd_prstatus, bfd_fpregset): Add thread argument.
-	(elf_corefile_note): If HAVE_SYS_PROCFS_H is not defined, don't
-	update did_reg and did_reg2.
-
-Wed Apr 17 13:07:37 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_input_bfd): Check for TOC overflow.
-
-	* linker.c (_bfd_generic_link_add_one_symbol): When calling the
-	callback routines, pass h->root.string rather than name, in case
-	copy is true and name is transient.
-
-Tue Apr 16 16:36:38 1996  Stu Grossman  (grossman@lisa.cygnus.com)
-
-	* elfcore.h:  Add support for core files with multiple threads.
-	(Primarily for Solaris.)
-
-Tue Apr 16 13:44:08 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (NAME(aout,squirt_out_relocs)): Don't do anything if
-	section->orelocation is NULL.
-
-	* coffgen.c (bfd_coff_get_syment): New function.
-	(bfd_coff_get_auxent): New function.
-	* bfd-in.h (bfd_coff_get_syment): Declare.
-	(bfd_coff_get_auxent): Declare.
-	* bfd-in2.h: Rebuild.
-
-Mon Apr 15 19:06:59 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (struct mips_hi16): Define.
-	(mips_hi16_addr, mips_hi16_addend): Remove.
-	(mips_hi16_list): New static variable.
-	(mips_elf_hi16_reloc): Maintain a list of unmatched HI16 relocs.
-	(mips_elf_lo16_reloc): Process mips_hi16_list.
-	(mips_elf_relocate_section): Permit an arbitrary number of HI16
-	relocs before the associated LO16 reloc.
-
-Wed Apr 10 00:23:53 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* versados.c (versados_scan): Check bfd_alloc return value.
-	(versados_object_p): Check all bfd_read return values.  Require
-	that lang field be less than 10, to avoid confusion with Intel Hex
-	files.
-
-	* libaout.h (WRITE_HEADERS): Write out the relocs even if there
-	aren't any symbols.
-	* aoutx.h (NAME(aout,swap_std_reloc_out)): Set r_index to N_ABS,
-	not 0, for an absolute symbol.
-	(NAME(aout,swap_ext_reloc_out)): Likewise.
-
-	* ihex.c (ihex_scan): Accept a length of 4 for record type 5.
-	(ihex_write_object_contents): For a large start address, output
-	the full 32 bit address in record type 5.
-
-	* ieee.c (ieee_write_byte): Change second parameter from bfd_byte
-	to int to avoid promotion problems in prototype.
-
-Tue Apr  9 11:44:21 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Use ${srcdir} when looking for picfrag.
-
-	* configure.host: Switch on ${libdir}, not $(libdir).  From
-	alan@spri.levels.unisa.edu.au (Alan Modra).
-
-	* aoutx.h (aout_link_add_symbols): Always call add_dynamic_symbols
-	entry point, not just for DYNAMIC objects.
-	* sunos.c (sunos_add_dynamic_symbols): Always call
-	sunos_create_dynamic_sections.  If called with a non DYNAMIC
-	object, don't do anything else.
-	(sunos_add_one_symbol): Don't call sunos_create_dynamic_sections.
-
-Mon Apr  8 12:09:36 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Permit --enable-shared to specify a list of
-	directories.
-	* configure: Rebuild.
-
-	* configure.host: Set HLDFLAGS and SHLIB_CFLAGS for *-dec-osf*
-	host when configuring with --enable-shard.
-
-Fri Apr  5 12:24:13 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* config.bfd: Add i[345]86-*-freebsdelf* target; from John Polstra
-	<jdp@polstra.com>.
-
-	* linker.c (link_action): For WARN_ROW/warn, use MWARN, not CYCLE,
-	to avoid crashing in bfd_hash_replace.
-
-	* sysdep.h: Use #ifdef, not #if.
-
-Thu Apr  4 23:32:23 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* config.in: Rebuild.
-
-Thu Apr  4 18:49:09 1996  Fred Fish  <fnf@cygnus.com>
-
-	* configure.in (mips-sony-bsd*): Fix typo in AC_DEFINE.
-	(AC_CHECK_HEADERS): Check for sys/time.h
-	(AC_HEADER_TIME): Add macro.
-	* configure: Rebuild.
-	* sysdep.h: Use TIME_WITH_SYS_TIME and HAVE_SYS_TIME_H
-	to control what combination of <time> and <sys/time.h>
-	get included.
-
-Tue Apr  2 13:11:53 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* aoutf1.h (sunos_32_set_arch_mach): Handle M_SPARCLET.
-	(aout_32_sunos4_write_object_contents): Likewise.
-	* aoutx.h (NAME(aout,machine_type)): Handle
-	bfd_mach_sparc_{sparclet,sparclite}.
-	* archures.c (bfd_mach_sparc_{sparclet,sparclite}): Define.
-	(bfd_mach_sparc_v9_p): Update.
-	* cpu-sparc.c (arch_info_struct): Add entries for sparclet,sparclite.
-	* libaout.h (enum machine_type): Add M_SPARCLET.
-	* sunos.c (MACHTYPE_OK): Define.
-	* bfd-in2.h: Regenerated.
-
-Tue Apr  2 00:33:18 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf-bfd.h (struct elf_link_hash_table): Add hgot field.
-	* elf.c (_bfd_elf_link_hash_table_init): Initialize hgot field.
-	* elflink.c (_bfd_elf_create_got_section): Store the
-	_GLOBAL_OFFSET_TABLE_ hash table entry in the hgot field.
-	* elf32-sparc.c (elf32_sparc_check_relocs): If the size of the
-	global offset table goes over 0x1000, set the value of
-	_GLOBAL_OFFSET_TABLE_ to 0x1000 into the section.
-	(elf32_sparc_relocate_section): Subtract the offset of
-	_GLOBAL_OFFSET_TABLE_ when handling GOT relocations.
-
-	* elfcode.h: Don't include <string.h>.
-
-Mon Apr  1 10:39:24 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* linker.c (_bfd_generic_link_hash_newfunc): Renamed from
-	generic_link_hash_newfunc.  All references changed.
-	* genlink.h (_bfd_generic_link_hash_newfunc): Declaration
-	moved here from libbfd-in.h.
-	* libbfd-in.h: Corresponding changes.
-	* libbfd.h: Regenerated.
-
-Mon Apr  1 12:35:36 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (aout_link_input_section_std): When reporting an
-	overflow error, use the name of the symbol in the hash table if
-	available.
-	(aout_link_input_section_ext): Likewise.
-
-	* elflink.h (elf_adjust_dynamic_symbol): If a common symbol got
-	defined in a regular file, set ELF_LINK_HASH_DEF_REGULAR.
-
-Sun Mar 31 01:58:41 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* peicode.h (coff_swap_aouthdr_out): Delete test for .junk.
-	* coffcode.h (coff_compute_section_file_positions): Likewise.
-	(coff_write_object_contents): Likewise.
-
-Fri Mar 29 12:44:36 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* section.c (SEC_LINK_ONCE): Define.
-	(SEC_LINK_DUPLICATES): Define.
-	(SEC_LINK_DUPLICATES_DISCARD): Define.
-	(SEC_LINK_DUPLICATES_ONE_ONLY): Define.
-	(SEC_LINK_DUPLICATES_SAME_SIZE): Define.
-	(SEC_LINK_DUPLICATES_SAME_CONTENTS): Define.
-	* bfd-in2.h: Rebuild.
-	* coffcode.h (sec_to_styp_flags): If COFF_WITH_PE, turn
-	SEC_LINK_ONCE into IMAGE_SCN_LNK_COMDAT.
-	(styp_to_sec_flags): If COFF_WITH_PE, turn IMAGE_SCN_LNK_REMOVE
-	into SEC_EXCLUDE.  If IMAGE_SCN_LNK_COMDAT is set, set
-	SEC_LINK_ONCE, and look through the symbol table for the setting
-	for SEC_LINK_DUPLICATES.
-	(coff_write_object_contents): If COFF_WITH_PE, if SEC_LINK_ONCE is
-	set for a section, find the section symbol in the symbol table,
-	and set the aux entry based on SEC_LINK_DUPLICATES.
-	* coffgen.c (coff_print_symbol): Add a space before "checksum".
-	* coff-arm.c (armcoff_big_vec): If COFF_WITH_PE is defined, add
-	SEC_LINK_ONCE and SEC_LINK_DUPLICATES to section_flags.
-	* coff-i386.c (i386coff_vec): Likewise.
-	* coff-ppc.c (TARGET_LITTLE_SYM, TARGET_BIG_SYM): Likewise.
-
-	* VERSION: Bump to 2.6.1.
-	* Makefile.in (stamp-h): Depend upon VERSION.
-
-Thu Mar 28 23:48:49 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* libbfd-in.h (generic_link_hash_newfunc): Add declaration.
-	* libbfd.h: Rebuilt.
-	* linker.c (generic_link_hash_newfunc): No longer static.
-	* coffcode.h (coff_bfd_link_hash_create): Allow specific targets
-	to override.
-	* coff-h8300.c: Add two derived hash tables and their associated
-	funtions and #defines for use by the h8300 linker.
-	(h8300_reloc16_extra_cases, case R_MEM_INDIRECT): Create entries in
-	the function vector as needed.  Place the address of the function
-	vector entry in the location specified by the R_MEM_INDIRECT reloc.
-	Rewrite the vectors section contents as necessary.
-	(h8300_bfd_link_add_symbols): New function for the h8300 linker.
-	(coff_bfd_link_add_symbols): Define to use h8300 specific version.
-	(coff_bfd_link_hash_table_create): Likewise.
-
-Thu Mar 28 17:44:08 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libhppa.h: If gcc 2.7 or higher, declare all the functions with
-	__attribute__ ((__unused__)) so that -Wall doesn't warn about
-	them.
-	(hppa_rebuild_insn): Pass pointer to correct type to
-	low_sign_unext and dis_assemble_21.
-
-Thu Mar 28 11:00:36 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* config.bfd (sparc64-{sysv4*,solaris2*}): Delete.
-	Stick with sparc-*-{sysv4*,solaris2*}.
-
-Wed Mar 27 10:43:34 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* peicode.h (coff_swap_aux_in): Swap in extra PE x_scn fields.
-	(coff_swap_aux_out): Swap out extra PE x_scn fields.
-	* coffswap.h (coff_swap_aux_in): Zero out extra PE x_scn fields.
-	* coffgen.c (coff_print_symbol): If any of the extra PE x_scn
-	fields is non-zero, print them.
-
-	* coff-ppc.c (ppc_record_toc_entry): Put inside COFF_IMAGE_WITH_PE
-	ifdef.  Remove unused variables.
-	(ppc_record_data_in_toc_entry): Ifdef out.  Removed unused
-	variables.
-	(ppc_mark_symbol_as_glue): Put inside COFF_IMAGE_WITH_PE ifdef.
-	(get_symbol_value): Ifdef out.
-	(pe_ppc_reloc): Ifdef out.  Remove unused variables.
-	(coff_ppc_relocate_section): Remove unused variables.  Make
-	fprintf strings and argument types correspond.  Put before_addr in
-	DEBUG_RELOC ifdef.
-	(dump_toc): Make fprintf strings and argument types correspond.
-	(ppc_process_before_allocation): Remove unused variables.  Always
-	return a value.
-	(ppc_reflo_reloc): Ifdef out.
-	(ppc_addr32nb_reloc): Ifdef out.
-	(ppc_coff_rtype2howto): Make fprintf strings and argument types
-	correspond.
-	(coff_ppc_rtype_to_howto): Likewise.
-	(ppc_coff_swap_sym_in_hook): Remove unused variables.
-
-	* peicode.h (pe_print_idata): Move otherwise unused variables into
-	the #ifdef where they are used.  Always return a value.
-	(pe_print_edata): Make fprintf strings and argument types
-	correspond.  Always return a value.
-	(pe_print_pdata): Removed unused variable addr_value.  Always
-	return a value.
-	(pe_print_reloc): Remove unused variable onaline.  Make fprintf
-	strings and argument types correspond.  Always return a value.
-
-	* elf32-ppc.c (ppc_elf_fake_sections): Return true.
-	(ppc_elf_finish_dynamic_symbol): Move definition of unused
-	variable rela inside #if 0 section where it is used.
-
-	* ns32k.h: New file.
-	* cpu-ns32k.h: Include ns32k.h.  Rename externally visible
-	functions to start with _bfd_.
-	* aout-ns32k.c: Include ns32k.h.  Change references to renamed
-	functions in cpu-ns32k.h.
-	* Makefile.in: Rebuild dependencies.
-	(HFILES): Add ns32k.h.
-
-	* section.c (struct sec): Add linker_mark field.  Change
-	user_set_vma and reloc_done to be single bit fields.
-	(STD_SECTION): Update accordingly.
-	* bfd-in2.h: Rebuild.
-	* aoutx.h (NAME(aout,final_link)): Mark sections included in the
-	link.
-	(aout_link_input_bfd): Don't link unmarked sections.
-	* cofflink.c (_bfd_coff_final_link): Mark sections included in the
-	link.
-	(_bfd_coff_link_input_bfd): Don't link unmarked sections.
-	* coff-ppc.c (ppc_bfd_coff_final_link): Mark sections included in
-	the link.
-	* elflink.h (elf_bfd_final_link): Mark sections included in the
-	link.
-	(elf_link_input_bfd): Don't link unmarked sections.
-	* xcofflink.c (_bfd_xcoff_bfd_final_link): Mark sections included
-	in the link.
-	(xcoff_link_input_bfd): Don't link unmarked sections.
-
-	* coffswap.h (coff_swap_scnhdr_out): Include section name in
-	overflow error messages.
-
-Tue Mar 26 15:46:18 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd.c (_bfd_default_error_handler): If _bfd_error_program_name
-	is not set, print "BFD: " before the error message.
-
-	* configure.in: Use AC_CHECK_TOOL to find ar and ranlib.  From
-	Miles Bader <miles@gnu.ai.mit.edu>.
-	* configure: Rebuild.
-
-Fri Mar 22 12:17:00 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_input_bfd): Fix scan for C_BINCL/C_EINCL
-	symbols.
-
-	* config.bfd: Add ieee_vec to targ_selvecs for i960 targets and
-	m68k-aout, m68k-coff, and m68k-elf targets.
-
-Fri Mar 22 11:33:44 1996  Martin Anantharaman  <martin@goofy.imech.uni-duisburg.de>
-
-	* ieee.c: Changed #ifdef KEEPMINUSPCININST to #if KEEPMINUSPCININST.
-	(ieee_generic_stat_arch_elt): Restructured to prevent
-	ieee_object_p from being called repeatedly.
-
-Thu Mar 21 11:00:47 1996  steve chamberlain  <sac@slash.cygnus.com>
-
-	* coffcode.h (coff_write_object_contents):  Allocate
-	buffers large enough for any FILEHDR or AOUTHDR.
-
-Thu Mar 21 16:28:17 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* ecofflink.c (lookup_line): New static function, renamed and
-	slighly changed from old _bfd_ecoff_locate_line.
-	(_bfd_ecoff_locate_line): Cache line number information.  Use
-	lookup_line for actual lookup.
-
-Thu Mar 21 14:59:11 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* peicode.h (pe_print_pdata): Warn if the .pdata section is not a
-	multiple of 20 bytes.
-
-Thu Mar 21 13:54:40 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ecoff.c (_bfd_ecoff_find_nearest_line): Use bfd_zalloc to
-	allocate ecoff_find_line, and don't initialize by hand.
-	* elf32-mips.c (mips_elf_find_nearest_line): Use bfd_zalloc for
-	mips_elf_find_line, and don't call memset.
-
-	* coffcode.h (coff_compute_section_file_positions): If not
-	producing a final executable, don't consider sofar when aligning
-	the section to the correct size.
-
-Wed Mar 20 16:53:12 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_add_missing_symbols): Ifdef out.
-	(coff_write_object_contents): Don't call coff_add_missing_symbols.
-	* coffgen.c (coff_section_symbol): Ifdef out.
-
-Mon Mar 18 12:54:41 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf32-mips.c (mips_elf_gprel32_reloc): Initialize gp if
-	output_bfd is not NULL.
-
-Thu Mar 14 17:12:06 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* coffgen.c (coff_get_normalized_symtab): Call bfd_zalloc instead
-	of bfd_alloc (fixes fix_line not being initialized).
-	Delete zeroing of fix_{value,tag,end,scnlen} fields.
-
-Thu Mar 14 16:06:06 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* coffcode.h: Allow specific backends to override the
-	bfd_link_add_symbols routine.
-
-	* coff-h8300.c: Include genlink.h.
-	(howto_table): Add R_MEM_INDIRECT.
-	(rtype2howto): Support R_MEM_INDIRECT.
-	(h8300_reloc16_extra_cases): Handle R_MEM_INDIRECT like R_RELBYTE
-	for now.
-
-Tue Mar 12 12:41:17 1996  David Mosberger-Tang  <davidm@koala.azstarnet.com>
-
-	* coff-alpha.c (alpha_relocate_section): Use
-	info->callbacks_warning, rather than _bfd_error_handler, for
-	"multiple gp" warning.
-
-Tue Mar 12 12:10:55 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* linker.c (bfd_wrapped_link_hash_lookup): New function.
-	(_bfd_generic_link_add_one_symbol): Remove BFD_ASSERT on hash
-	table string.  Use bfd_wrapped_link_hash_lookup.
-	(_bfd_generic_link_write_global_symbol): Remove BFD_ASSERT on hash
-	table string.
-	* aoutx.h (aout_link_write_symbols): Use the name from the hash
-	table, if any, when writing out symbols.
-	(aout_link_input_section_std): Use the name from the hash table,
-	if any, when reporting undefined symbols.
-	(aout_link_input_section_ext): Likewise.
-	(aout_link_reloc_link_order): Use bfd_wrapped_link_hash_lookup.
-	* bout.c (get_value): Likewise.
-	* cofflink.c (_bfd_coff_reloc_link_order): Likewise.
-	* ecoff.c (ecoff_reloc_link_order): Likewise.
-	* elflink.h (elf_link_add_object_symbols): Likewise.
-	(elf_reloc_link_order): Likewise.
-	* linker.c (_bfd_generic_link_output_symbols): Likewise.
-	(_bfd_generic_reloc_link_order): Likewise.
-	(default_indirect_link_order): Likewise.
-	* reloc16.c (bfd_coff_reloc16_get_value): Likewise.
-	* sunos.c (sunos_add_one_symbol): Likewise.
-	* xcofflink.c (xcoff_link_add_symbols): Likewise.
-	(bfd_xcoff_link_count_reloc): Likewise.
-	(xcoff_reloc_link_order): Likewise.
-
-	* ecoffswap.h (ecoff_swap_fdr_in): If ECOFF_64, turn 0xffffffff
-	into -1 for intern->rss.
-
-	* configure: Rebuild with autoconf 2.8.
-
-Mon Mar 11 12:28:31 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* stab-syms.c (__define_stab_duplicate): Define.
-	(bfd_get_stab_name): Rename from aout_stab_name.  Rewrite to use a
-	switch.
-	* bfd-in.h (bfd_get_stab_name): Declare.
-	* bfd-in2.h: Rebuild.
-	* Makefile.in: Rebuild dependencies.
-	(BFD_LIBS): Add stab-syms.o.
-	(BFD_LIBS_CFILES): Add stab-syms.c.
-	(BFD32_BACKENDS): Remove stab-syms.o.
-	(BFD32_BACKENDS_CFILES): Remove stab-syms.c.
-	* configure.in: Don't list stab-syms.o in bfd_backends.
-	* configure: Rebuild.
-	* libaout.h (aout_stab_name): Don't declare.
-	* aoutx.h (NAME(aout,get_symbol_info)): Call bfd_get_stab_name,
-	not aout_stab_name.
-
-Fri Mar  8 11:26:20 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): Adjust file offset
-	for section alignment even if SEC_LOAD is not set.
-
-Tue Mar  5 12:02:23 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Don't set SHLIB or SHLINK to an empty string,
-	since they appear as targets in Makefile.in.
-	* configure: Rebuild.
-
-	* sunos.c (sunos_scan_ext_relocs): If not making a shared library,
-	don't fiddle with a symbol which is not defined anywhere.
-
-Mon Mar  4 12:49:16 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_mark): Treat undefined imported symbols as
-	though they are defined in a shared library.
-	(xcoff_build_ldsyms): Likewise.
-
-	* coffgen.c (coff_find_nearest_line): Don't look at the line
-	numbers for the section if section->lineno is NULL.
-
-	* elf.c (_bfd_elf_symbol_from_bfd_symbol): Print a useful error
-	message rather than calling BFD_ASSERT.
-	* elfcode.h (write_relocs): Check return value of
-	_bfd_elf_symbol_from_bfd_symbol.
-
-Fri Mar  1 09:42:59 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_add_symbol_hook): Don't set SEC_LOAD flag
-	for .sbss section.
-
-Wed Feb 28 11:25:47 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* libhppa.h (hppa_reloc_field_selector_type): Add R_HPPA_NLSEL
-	and R_HPPA_NLRSEL.
-	(e_nsel, e_nlsel, e_nlrsel): Undefine.  Add to
-	hppa_reloc_field_selector_type_alt.
-	(hppa_field_adjust): Handle e_nlsel, e_nlrsel.  Fix e_nsel handling.
-	* som.c (hppa_som_gen_reloc_type): Handle N', NL' NLR' field
-	selectors.
-	(som_write_fixups): Finish handling of R_N0SEL and R_N1SEL.
-
-Wed Feb 28 11:00:24 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): Adjust the segment
-	memory size for the alignment of a SEC_ALLOC section, not just a
-	SEC_LOAD section.
-
-Tue Feb 27 14:17:31 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* m68klinux.c: New file.
-	* hosts/m68klinux.h: New file.
-	* config.bfd (m68*-*-linuxaout*, m68*-*-linux*): New targets.
-	* configure.in (m68*-*-linux*): New native host.
-	(m68klinux_vec): New vector.
-	* configure: Rebuild.
-	* targets.c (m68klinux_vec): Declare.
-	* i386linux.c (bfd_i386linux_size_dynamic_sections): Renamed from
-	bfd_linux_size_dynmic_sections to avoid clash with m68klinux.c.
-	* bfd-in.h (bfd_i386linux_size_dynamic_sections): Rename
-	declaration from bfd_linux_size_dynamic_sections.
-	(bfd_m68klinux_size_dynamic_sections): Declare.
-	* bfd-in2.h: Rebuild.
-	* Makefile.in: Rebuild dependencies.
-	(BFD32_BACKENDS): Add m68klinux.o.
-	(BFD32_BACKENDS_CFILES): Add m68klinux.c.
-
-Tue Feb 27 11:31:34 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* libhppa.h (pa_arch): Add pa20.
-	(hppa_reloc_field_selector_type): Add R_HPPA_NSEL.
-	(e_nsel): Undefine.  Add to hppa_reloc_field_selector_type_alt.
-	(hppa_field_adjust): Handle e_nsel.
-	* som.c: Provide default definitions for many new relocs found only
-	in hpux10 include files.
-	(som_fixup_formats): Add several new relocs from hpux10.
-	(som_hppa_howto_table): Add hpux10 relocs.
-	(som_write_fixups): Handle R_N0SEL and R_N1SEL hpux10 relocs.
-
-Mon Feb 26 12:52:48 1996  Stan Shebs  <shebs@andros.cygnus.com>
-
-	* mpw-make.sed: Edit out recent shared library support, and
-	rules to rebuild .h files using doc/chew.
-
-Mon Feb 26 14:48:39 1996  David Mosberger-Tang  <davidm@AZStarNet.com>
-
-	* ecoff.c (ecoff_compute_section_file_positions): Adjust the file
-	size even of sections with no contents.
-
-Mon Feb 26 14:01:13 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cofflink.c (_bfd_coff_link_input_bfd): When merging, skip names
-	starting with '$' the way we skip names starting with '.'.  When
-	updating x_endndx, don't be fooled by an index which has been
-	merged.
-
-	* cofflink.c (_bfd_coff_link_input_bfd): Don't try to optimize a
-	struct/union/enum type with no elements.
-
-Sat Feb 24 11:38:58 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd.c (bfd_errmsg): Handle a NULL return from strerror.
-
-	* archive.c (bfd_generic_archive_p): If the first file in the
-	archive can not be recognized as an object, don't assume that this
-	is the wrong format.
-
-	* elf.c (bfd_elf_set_dt_needed_name): Don't do anything if the
-	format is not bfd_object.
-	(bfd_elf_get_dt_soname): Likewise.
-
-Wed Feb 21 13:58:04 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-sh.c (sh_relax_delete_bytes): Correct range of R_SH_USES
-	reloc.
-
-Tue Feb 20 16:22:44 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* bfd.c (tdata): Add netbsd_core_data.
-	* bfd-in2.h: Regenerated.
-
-Tue Feb 20 16:50:02 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* sunos.c (SUNOS_CONSTRUCTOR): Define.
-	(sunos_add_one_symbol): Don't let a symbol from a dynamic object
-	override a constructor symbol.  Set SUNOS_CONSTRUCTOR when
-	appropriate.
-
-	* bout.c (b_out_squirt_out_relocs): Use udata.i rather than flags
-	to get the symbol index, matching 14 Jul 95 change.
-
-Tue Feb 20 08:26:27 1996  Fred Fish  <fnf@phydeaux.cygnus.com>
-
-	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents):
-	Remove duplicate definition of gp.
-
-Mon Feb 19 12:37:41 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Don't
-	assume that we can set the GP value and then get the same value,
-	since it won't be true if the output file is neither ELF nor
-	ECOFF.
-	* coff-mips.c (mips_adjust_reloc_in): Don't bother to use
-	_bfd_get_gp_value here.
-	(mips_gprel_reloc): Don't assume we can set and get the GP value.
-	* elf32-mips.c (mips_elf_hi16_reloc): Get gp value from
-	mips_elf_final_gp.
-	(mips_elf_lo16_reloc): Likewise.
-	(mips_elf_final_gp): Add pgp parameter.  Set it to the GP value.
-	Don't require that the BFD be ELF.
-	(mips_elf_gprel16_reloc): Get gp value from mips_elf_final_gp.
-	(mips_elf_gprel32_reloc): Likewise.
-	(mips_elf_relocate_section): Don't assume we can set and get the
-	GP value.
-	(mips_elf_finish_dynamic_symbol): Don't bother to use
-	_bfd_get_gp_value here.
-
-	* elf32-mips.c (mips_elf_create_procedure_table): Initialize sv.
-	Don't change epdr between malloc and free.  Be careful not to free
-	NULL pointers.  Zero out the first RPDR.
-
-	* configure.host: On Linux, only pass -rpath option if $(libdir)
-	is neither /lib nor /usr/lib.  From Alan Modra
-	<alan@mullet.Levels.UniSA.Edu.Au>.
-
-	* elf-bfd.h (struct elf_obj_tdata): Rename dt_needed_name to
-	dt_name.
-	(elf_dt_name): Rename from elf_dt_needed_name.
-	* elf.c (bfd_elf_set_dt_needed_name): Use elf_dt_name, not
-	elf_dt_needed_name.
-	(bfd_elf_get_dt_soname): New function.
-	* elflink.h (elf_link_add_object_symbols): Use elf_dt_name, not
-	elf_dt_needed_name.  Save the SONAME back in elf_dt_name.
-	* bfd-in.h (bfd_elf_get_dt_soname): Declare.
-	* bfd-in2.h: Rebuild.
-
-Mon Feb 19 02:50:23 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_reloc_type_lookup): Renamed from
-	_bfd_sparc_elf_reloc_type_lookup.
-	(bfd_elf32_bfd_reloc_type_lookup): Update.
-	* elf64-sparc.c (SPARC64_OLD_RELOCS): Define.
-	(sparc64_elf_howto_table): Define.
-	(sparc_reloc_map): Define.
-	(sparc64_elf_reloc_type_lookup): New function.
-	(sparc_elf_wdisp16_reloc): New function.
-	(elf_info_to_howto): Use sparc64_elf_howto_table.
-	(sparc64_elf_relocate_section): Likewise.
-	(bfd_elf64_bfd_reloc_type_lookup): Update.
-
-Sun Feb 18 15:02:25 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Check for 'do not mix' from native linker before
-	trying to use -rpath.
-
-Fri Feb 16 12:46:18 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd.c (_bfd_get_gp_value): New function.
-	(_bfd_set_gp_value): New function.
-	* libbfd-in.h (_bfd_get_gp_value): Declare.
-	(_bfd_set_gp_value): Declare.
-	* libbfd.h: Rebuild.
-	* coff-alpha.c (alpha_ecoff_get_relocated_section_contents): Use
-	_bfd_get_gp_value and _bfd_set_gp_value rather than referring
-	directly to the fields in the tdata information.
-	(alpha_relocate_section): Likewise.
-	* coff-mips.c (mips_adjust_reloc_in): Likewise.
-	(mips_gprel_reloc): Likewise.
-	(mips_relocate_section): Likewise.
-	* elf32-mips.c (mips_elf_hi16_reloc): Likewise.
-	(mips_elf_lo16_reloc): Likewise.
-	(mips_elf_final_gp): Likewise.
-	(mips_elf_gprel16_reloc): Likewise.
-	(mips_elf_gprel32_reloc): Likewise.
-	(mips_elf_relocate_section): Likewise.
-	(mips_elf_finish_dynamic_symbol): Likewise.
-
-	* bout.c (b_out_set_arch_mach): Recognize bfd_mach_i960_jx.
-
-Thu Feb 15 11:29:13 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.in: Call AC_PROG_CC before configure.host.
-	* configure: Rebuild.
-	* configure.host: Don't set information which autoconf should
-	figure out, namely CC, CFLAGS, LDFLAGS, AR, and RANLIB.
-
-	* configure.host: Remove go32 and win32 host information, since it
-	should no longer be needed.
-
-	* elf.c (map_sections_to_segments): If we have a .dynamic section,
-	then start a new segment rather than put a writable section in a
-	readonly segment.
-
-	* configure.host: Set RPATH_ENVVAR.
-
-	* Makefile.in: Rebuild dependencies.
-
-	* elflink.c (_bfd_elf_create_linker_section): Remove unused
-	zero_section variable.
-
-Thu Feb 15 10:39:17 1996  H.J. Lu  <hjl@zoom.com>
-
-	* Makefile.in ($(srcdir)/bfd-in2.h): Rename target from bfd-in2.h.
-	($(srcdir)/libbfd.h): Rename from libbfd.h.
-	($(srcdir)/libcoff.h): Rename from libcoff.h.
-
-Wed Feb 14 16:29:07 1996  Martin Anantharaman  <martin@mail.imech.uni-duisburg.de>
-
-	* ieee.c (ieee_write_expression): Only use an R variable for a
-	local symbol.  Don't output a zero offset.  Handle a zero address.
-	(SRC_MASK, PCREL_OFFSET): Define based on KEEPMINUSPCININST.
-	(rel32_howto, rel16_howto, rel8_howto): Use SRC_MASK and
-	PCREL_OFFSET.
-	(parse_expression): Don't try to handle multiple occurrences of a
-	P variable.  Handle I variables differently from X variables.  Fix
-	the order of minus expressions.
-	(ieee_slurp_external_symbols): Generate an I variable for an NN
-	record.  Fix handling of ATI and ATX records.
-	(ieee_slurp_sections): Only set minimal section attributes.
-	Adjust them later, based on the section contents.
-	(ieee_object_p): Read in the file until just after the ME record.
-	Call ieee_slurp_section_data to set the section flags.
-	(do_one): Add iterations parameter.  Only repeat the first load
-	item.  Set the section and file reloc flags.
-	(ieee_slurp_section_data): Set section flags.  Pass iterations to
-	do_one.
-	(ieee_canonicalize_reloc): Handle I variables.
-	(do_with_relocs): Only emit relocation size when necessary.
-	Increase MAXRUN to 127.  Change ov to be assigned, and take
-	src_mask and pcrel_offset into account.
-	(ieee_write_data_part): Skip sections that are not loaded.
-	(ieee_write_external_part): Don't output optional last entry of WX
-	records.
-	(ieee_write_me_part): Make setting of me_record neater.
-	(ieee_generic_stat_arch_elt): Get the size of an archive element.
-
-	* syms.c (stt): Add entries for zerovars, vars, and code.
-
-	* elfcode.h (validate_reloc): New static function.
-	(write_relocs): Call validate_reloc for non ELF relocs.
-
-	* elfxx-target.h (elf_symbol_leading_char): Define if not defined.
-	(TARGET_BIG_SYM): Use elf_symbol_leading_char.
-	(TARGET_LITTLE_SYM): Likewise.
-
-	* config.bfd (m68*-*-psos*): New target.
-
-Tue Feb 13 15:56:22 1996  Bryan Ford  <baford@snake.cs.utah.edu>
-
-	* i386msdos.c: Remove some #if 0 code.
-	(msdos_write_object_contents): Don't include empty sections in the
-	size computation, regardless of their address.
-
-Tue Feb 13 15:36:37 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Don't segfault if dynboj
-	is NULL, ie, the -r switch is used.
-
-Tue Feb 13 14:35:15 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* reloc.c (BFD_RELOC_MIPS_GOT_HI16): Define.
-	(BFD_RELOC_MIPS_GOT_LO16): Define.
-	(BFD_RELOC_MIPS_CALL_HI16, BFD_RELOC_MIPS_CALL_LO16): Define.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* elf32-mips.c (mips_reloc_map): Map new relocs.
-
-	* configure.host: Set HDLFLAGS for *-*-hpux with --enable-shared.
-
-	* Makefile.in ($(SHLINK)): Check ts against $(SHLIB), not
-	$(SHLINK).
-
-	* ieee.c (get_symbol): Set the section to bfd_abs_section.
-	(do_with_relocs): If EXEC_P is set and there are no relocs, use a
-	simple number for the section address, rather than an expression.
-	Limit the number of bytes between relocs to MAXRUN.
-	(ieee_write_me_part): Set me_record to the file offset after the
-	start address.
-	(ieee_write_processor): New static function.
-	(ieee_write_object_contents): Use ieee_write_processor.
-
-Fri Feb  9 10:53:00 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Use ${CC-gcc} when testing for -rpath on SunOS.
-
-	* coff-aux.c: Change include of aux.h to aux-coff.h.
-
-Thu Feb  8 14:01:03 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf32-m68k.c (elf_m68k_relocate_section): For a R_68K_RELATIVE
-	relocation put the addend both in the reloc entry and the data.
-	(elf_m68k_finish_dynamic_symbol): Likewise.  Mask out marker in
-	GOT offset value.
-
-	* elf32-m68k.c (elf_m68k_relocate_section): If -Bsymbolic, resolve
-	a R_68K_PCxx reloc against a defined global symbol directly.
-	(elf_m68k_check_relocs): Don't count such a reloc.
-
-	* elf32-m68k.c (elf_m68k_check_relocs): Don't record a symbol with
-	a PLTxx reloc as dynamic.  Disallow PLTxxO reloc against a local
-	symbol for now, otherwise always record the symbol as dynamic.
-	(elf_m68k_adjust_dynamic_symbol): If a symbol with a PLTxx reloc
-	is not referenced by a dynamic object, and we are not making a
-	shared object, then don't make a PLT entry.  If we do make a PLT
-	entry, make sure the symbol has been recorded as dynamic.
-
-Wed Feb  7 13:56:06 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: When making a shared library, set HLDFLAGS to
-	pass an appropriate -rpath option.  Use the make variable SONAME
-	as the shared library soname, rather than computing it here.  On
-	SunOS, build stamp-tshlink in place of $(SHLINK).
-	* Makefile.in (SONAME): New variable.
-	($(SHLINK)): Make a link to the transformed name, as well.
-	(stamp-tshlink): New target.
-	(install): Skip stamp-tshlink during install.
-
-Wed Feb  7 13:37:39 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_add_symbol_hook): Do not assume that the
-	linker sections have been set up yet.
-
-	* elf.c (make_mapping): Add an additional argument to suppress
-	making the first section include the program headers.
-	(map_sections_to_segments): If the user used -Ttext such that the
-	program headers are on a different page, do not set the flags
-	saying that this section includes the program headers.
-
-Tue Feb  6 14:04:49 1996  J.T. Conklin  <jtc@rtl.cygnus.com>
-
-	* configure.in (*-*-netbsd*): Set COREFILE to netbsd-core.c.
-	don't define TRAD_HEADER.
-	* configure: Rebuild.
-
-	* netbsd-core.c: New file, support for NetBSD core files.
-	* hosts/*nbsd.h: Removed.
-
-Tue Feb  6 11:47:49 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* reloc.c (BFD_RELOC_SPARC_[567]): New reloc types.
-	(BFD_RELOC_SPARC_LO7 reloc type): Deleted.
-	* libbfd.h, bfd-in2.h: Regenerated.
-	* elf32-sparc.c (_bfd_sparc_elf_reloc_type_lookup): Renamed from
-	bfd_elf32_bfd_reloc_type_lookup.
-	(reloc_type{,_names}): Deleted.
-	(_bfd_sparc_elf_howto_table): Renamed from elf_sparc_howto_table.
-	Add sparc64 relocs.
-	(sparc_reloc_map): Add sparc64 relocs.
-	(sparc_elf_notsupported_reloc): New static function.
-	(sparc_elf_wdisp16_reloc): New static function.
-	(elf32_sparc_check_relocs): Handle R_SPARC_WDISP{16,19}.
-	(elf32_sparc_relocate_section): Likewise.
-	(bfd_elf32_bfd_reloc_type_lookup): Define.
-	* elf64-sparc.c (sparc64_elf_wdisp16_reloc): Deleted.
-	(reloc_type{,_names}): Deleted.
-	(elf_sparc_howto_table): Deleted.
-	(sparc_reloc_map): Deleted.
-	(_bfd_sparc_elf_howto_table): Renamed from elf_sparc_howto_table.
-	(bfd_elf64_bfd_reloc_type_lookup): Change from function to #define.
-
-Tue Feb  6 12:12:22 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* configure.host: Make SHLIB_CFLAGS include $(PICFLAG) on a
-	*-*-hpux* host.
-
-	* Makefile.in (program_transform_name): New variable.
-	(install): Transform library name before installing it.
-
-Mon Feb  5 10:38:27 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* archures.c (bfd_mach_i960_hx): Define.
-	* bfd-in2.h: Rebuild.
-	* cpu-i960.c (scan_960_mach): Accept machine "hx".
-	(MATRIX): Expand entries for HX.
-	(arch_info_struct): Add i960:hx entry.
-	* bout.c (b_out_set_arch_mach): Handle bfd_mach_i960_hx.
-	* coffcode.h (coff_set_arch_mach_hook): Handle F_I960HX.
-	(coff_set_flags): Handle bfd_mach_i960_hx.
-
-	Support for building as a shared library, based on patches from
-	Alan Modra <alan@spri.levels.unisa.edu.au>:
-	* configure.in: Add AC_ARG_ENABLE for shared and commonbfdlib.
-	New substitutions: ALLLIBS, PICFLAG, SHLIB, SHLIB_CC,
-	SHLIB_CFLAGS, COMMON_SHLIB, PICLIST, SHLINK.
-	* configure: Rebuild.
-	* configure.host: If --enable-shared, adjust shared library stuff
-	based on the host.  If the host is SunOS, and the linker supports
-	-rpath, set HLDFLAGS to use it.
-	* Makefile.in (ALLLIBS): New variable.
-	(PICFLAG, SHLIB, SHLIB_CC, SHLIB_CFLAGS): New variables.
-	(COMMON_SHLIB, SHLINK): New variables.
-	(.c.o): If PICFLAG is set, compile twice, once PIC, once normal.
-	(STAGESTUFF): Remove variable.
-	(all): Depend upon $(ALLLIBS) and @PICLIST@ rather than
-	$(TARGETLIB).
-	(stamp-ofiles): New target, like old ofiles target, but build
-	using a temporary file and move-if-change, and touch stamp-ofiles
-	when done.
-	(ofiles): Just depend upon stamp-ofiles.
-	(stamp-piclist, piclist): New targets.
-	($(SHLIB), $(SHLINK)): New targets.
-	(targets.o, archures.o): Build twice if PICFLAG is set.
-	(do_mostlyclean): Remove pic/*.o.
-	(do_clean): Remove stamp-ofiles, $(SHLIB), $(SHLINK), piclist, and
-	stamp-piclist.
-	(do_distclean): Remove pic and stamp-picdir.
-	(install): Install shared libraries.
-	($(OFILES)): Depend upon stamp-picdir.
-	(stamp-picdir): New target.
-
-	* libcoff-in.h: Add comment reminding people that libcoff.h is a
-	generated file.
-	* libcoff.h: Rebuild.
-
-	* elflink.h (elf_adjust_dynamic_symbol): Don't try to get the
-	flavour of a section with no owner.
-
-	* elf32-mips.c (mips_elf_create_dynamic_sections): Clear
-	ELF_LINK_NON_ELF flag.
-	(mips_elf_create_got_section): Likewise.
-
-	* elf.c: Revert last change, since it breaks dynamic linking.
-	* elf-bfd.h (struct elf_backend_data): Remove want_hdr_in_seg
-	field.
-	* elf32-mips.c (elf_backend_want_hdr_in_seg): Don't define.
-	* elfxx-target.h (elf_backend_want_hdr_in_seg): Don't define.
-	(elfNN_bed): Don't initialize want_hdr_in_seg field.
-
-Sun Feb  4 20:45:13 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): If the backend does
-	not want the elf header or the program headers in the address
-	space, do not include them in the calculations.
-
-	* elf32-ppc.c (ppc_elf_additional_program_headers): New hook
-	function to determine if we need additional program headers.
-	(ppc_elf_modify_segment_map): Define as a NOP function for now.
-	(ppc_elf_create_linker_section): .sdata2 is a read-only section.
-
-Sat Feb  3 23:00:03 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h: Move today's libcoff.h change into coffcode.h.
-
-Sat Feb  3 15:43:44 1996  Fred Fish  <fnf@cygnus.com>
-
-	* libcoff.h (bfd_coff_link_add_one_symbol): Combine macro args
-	back into one line.  Some compilers (sunos 4.1.3 for example)
-	won't accept args split across more than one line.
-
-Fri Feb  2 11:42:15 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* aclocal.m4 (BFD_BINARY_FOPEN): Understand cygwin32.
-	* configure: Regenerate.
-
-Fri Feb  2 12:12:16 1996  Jeffrey A Law  (law@cygnus.com)
-
-	* elf32-hppa.c (elf32_hppa_backend_symbol_table_processing): Don't
-	try to do arithmetic on a void *, cast it to a unsigned char * first.
-
-Thu Feb  1 16:04:06 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf-bfd.h (ELF_LINK_NON_ELF): Define.
-	* elf.c (_bfd_elf_link_hash_newfunc): Set elf_link_hash_flags to
-	ELF_LINK_NON_ELF.
-	* elflink.h (elf_link_add_object_symbols): Reset ELF_LINK_NON_ELF
-	flag for a newly defined symbol.
-	(NAME(bfd_elf,record_link_assignment)): Likewise.
-	(elf_adjust_dynamic_symbol): If ELF_LINK_NON_ELF is set, try to
-	set the DEF or REF_REGULAR flags correctly.
-
-	* Makefile.in (bfd-in2.h): Make bfd.h, not protos, in docdir.
-	(libbfd.h, libcoff.h): Corresponding change.
-
-	* elf32-i386.c (elf_i386_check_relocs): Don't record a symbol with
-	a PLT32 reloc as dynamic.
-	(elf_i386_adjust_dynamic_symbol): If a symbol with a PLT32 reloc
-	is not referenced by a dynamic object, and we are not making a
-	shared object, then don't make a PLT entry.  If we do make a PLT
-	entry, make sure the symbol has been recorded as dynamic.
-
-Wed Jan 31 17:23:32 1996  Steve Chamberlain  <sac@slash.cygnus.com>
-
-	* coff-i386.c (coff_i386_reloc_type_lookup): Add BFD_RELOC_32_PCREL.
-	* config.bfd (i[345]86-*-win32): Becomes i[345]86-*-cygwin32.
-	(powerpcle-*-cygwin32): New.
-	* peicode.h (add_data_entry): Get address from vma.
-
-Wed Jan 31 16:23:57 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elflink.c (_bfd_elf_create_linker_section): If the symbol
-	attached to the section has already been created as an undefined
-	symbol, treat it as if it hasn't been created yet.
-
-Wed Jan 31 16:16:53 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elflink.h (elf_bfd_final_link): Don't output initial dummy
-	symbol or section symbols if stripping all symbols and this is not
-	a relocateable link.  Don't output the symbol string table if
-	there are no symbols.
-	(elf_link_flush_output_syms): Don't do anything if there are no
-	symbols to flush.
-
-Wed Jan 31 12:55:49 1996  Richard Henderson  <rth@tamu.edu>
-
-	* coff-aux.c: New file.
-	* hosts/m68kaux.h: New file.
-	* config.bfd (m68*-apple-aux*): New target.
-	* configure.in (m68*-apple-aux*): New native host.
-	(m68kaux_coff_vec): New vector.
-	* configure: Rebuild.
-	* targets.c (m68kaux_coff_vec): Declare.
-	* coffcode.h (bfd_coff_backend_data): Add field
-	_bfd_coff_link_add_one_symbol.
-	(bfd_coff_link_add_one_symbol): Define.
-	(compare_arelent_ptr): New static function if TARG_AUX.
-	(coff_write_relocs): If TARG_AUX, sort the relocs.
-	(coff_write_object_contents): Set A/UX aouthdr magic number.
-	(coff_link_add_one_symbol): Define if not defined.
-	(bfd_coff_std_swap_table): Initialize new field.
-	* libcoff.h: Rebuild.
-	* cofflink.c (coff_link_add_symbols): Call
-	bfd_coff_link_add_one_symbol rather than
-	_bfd_generic_link_add_one_symbol.
-	* coff-m68k.c (COFF_PAGE_SIZE): Don't define if already defined.
-	* coff-alpha.c (alpha_ecoff_backend_data): Initialize new field.
-	* coff-mips.c (mips_ecoff_backend_data): Likewise.
-	* Makefile.in: Rebuild dependencies.
-	(BFD32_BACKENDS): Add coff-aux.o.
-	(BFD32_BACKENDS_CFILES): Add coff-aux.c.
-
-Wed Jan 31 11:37:46 1996  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* elf32-m68k.c (elf_m68k_relocate_section): Fix R_68K_GOT*
-	relocation; ignore addend with R_68K_{GOT,PLT}*O relocation.
-
-Tue Jan 30 12:09:04 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (do_maintainer_clean): Remove $(srcdir)/bfd-in2.h,
-	$(srcdir)/libbfd.h and $(srcdir)/libcoff.h.
-	(maintainer-clean): Warn about deleting special files.
-	(bfd-in2.h, libbfd.h, libcoff.h): New targets.
-
-	* elf32-hppa.c (elf32_hppa_relocate_section): Handle indirect and
-	warning symbols correctly.
-	* elf32-i386.c (elf_i386_relocate_section): Likewise.
-	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
-	* elf32-mips.c (mips_elf_relocate_section): Likewise.
-	* elf32-ppc.c (ppc_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-	* elf64-sparc.c (sparc64_elf_relocate_section): Likewise.
-
-	* syms.c (_bfd_stab_section_find_nearest_line): Add casts to avoid
-	warnings.
-
-Mon Jan 29 14:27:24 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* libcoff-in.h: aligned newly exported names with bfd naming
-	conventions. Removed an erroneous define of POWERPC_LE_PE.
- 	* libcoff.h: Rebuild.
-	* cofflink.c, coff-ppc.c: the above function name changes
-
-Mon Jan 29 13:06:28 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Basim Kadhim <kadhim@spock.cs.colorado.edu>:
-	* ecoff.c (struct extsym_info): Define.
-	(_bfd_ecoff_bfd_final_link): Pass a pointer to struct extsym_info
-	to ecoff_link_write_external.
-	(ecoff_link_write_external): Accept a struct extsym_info pointer.
-	Strip symbols when appropriate.
-
-	Based on patches from Ronald F. Guilmette <rfg@monkeys.com>:
-	* syms.c (BSF_OBJECT): Define.
-	(bfd_print_symbol_vandf): Print 'O' for BSF_OBJECT.
-	* bfd-in2.h: Rebuild.
-	* elfcode.h (elf_slurp_symbol_table): Set BSF_OBJECT for an
-	STT_OBJECT symbol.
-	* elf.c (swap_out_syms): Only set type to STT_OBJECT if BSF_OBJECT
-	is set.
-
-	* elf32-i386.c (elf_i386_relocate_section): If -Bsymbolic, when
-	copying relocs into a shared object, treat a defined global symbol
-	as a local symbol.
-	* elf32-m68k.c (elf_m68k_relocate_section): Likewise.
-	* elf32-mips.c (mips_elf_relocate_section): Likewise.
-	* elf32-sparc.c (elf32_sparc_relocate_section): Likewise.
-
-	* elflink.h (elf_link_add_object_symbols): Only set weakdef to a
-	real defined symbol, not to a weak defined symbol.
-
-Mon Jan 29 11:34:36 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* cofflink.c: removed the POWERPC_LE_PE hack, promoted some types
-	and made a few static functions externs.
-
-	* coff-ppc.c (ppc_bfd_coff_final_link): new function, replaces the
-	POWERPC_LE_PE hack in cofflink.
-
-	* libcoff-in.h: promoted the following from cofflink.c to allow
-	_bfd_coff_final_link to be overridden -  STRING_SIZE_SIZE,
-	coff_debug_merge_element, struct coff_debug_merge_type,
-	coff_debug_merge_hash_entry, coff_debug_merge_hash_table,
-	coff_debug_merge_hash_table_init,  coff_debug_merge_hash_table_free,
-	coff_debug_merge_hash_lookup, coff_link_section_info,
-	coff_final_link_info, coff_debug_merge_hash_newfunc,
-	coff_write_global_sym, coff_link_input_bfd, coff_reloc_link_order.
-
-	* libcoff.h: re-gen'd
-
-Fri Jan 26 18:33:35 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* syms.c: Include "bfdlink.h".
-	(struct stab_find_info): Define.
-	(_bfd_stab_section_find_nearest_line): New function.
-	* libbfd-in.h (_bfd_stab_section_find_nearest_line): Declare.
-	* libbfd.h: Rebuild.
-	* elf-bfd.h (struct elf_obj_tdata): Add line_info field.
-	* elf.c (_bfd_elf_find_nearest_line): Try calling
-	_bfd_stab_section_find_nearest_line before searching the ELF
-	symbol table.  Find the closest STT_FUNC symbol, not the last one.
-	* libcoff-in.h (coff_data_type): Add line_info field.
- 	* libcoff.h: Rebuild.
-	* coffgen.c (coff_find_nearest_line): Try calling
-	_bfd_stab_section_find_nearest_line before searching the COFF
-	symbol table.
-	* Makefile.in: Rebuild dependencies.
-
-Fri Jan 26 16:11:19 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (R_PPC_EMB_SDA21 relocations): Make relocation size
-	4 bytes, so we get the correct value when updating the register
-	field in little endian mode.
-
-Thu Jan 25 12:14:16 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* libcoff-in.h (struct xcoff_tdata): Remove toc_section and
-	entry_section fields.  Add sntoc and snentry fields.
-	* libcoff.h: Rebuild.
-	* coffcode.h (coff_mkobject_hook): Initialize sntoc and snentry,
-	not toc_section and entry_section (the COFF file does not have any
-	sections at this point).
-	(coff_write_object_contents): Set o_snentry and o_sntoc from
-	snentry and sntoc rather than entry_section and toc_section.
-	* coff-rs6000.c (xcoff_copy_private_bfd_data): Copy sntoc and
-	snentry, not toc_section and entry_section.
-	* xcofflink.c (bfd_xcoff_size_dynamic_sections): Don't set
-	entry_section from hentry.
-	(xcoff_link_input_bfd): If a defined symbol has XCOFF_ENTRY set,
-	set snenty.
-	(xcoff_link_input_bfd): Set sntoc, not toc_section.
-	(xcoff_write_global_symbol): Get toc_section from sntoc, rather
-	than using toc_section directly.
-
-	* archures.c: Add missing `.' in enum bfd_architecture.
-	* bfd-in2.h: Rebuild.
-
-	* config.bfd (i[345]86-*-sco*elf*): Use bfd_elf32_i386_vec.  From
-	Robert Lipe <robertl@arnet.com>.
-
-Thu Jan 25 12:08:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_size_dynamic_sections): Add .rela.sdata{,2}
-	to sections we allocate.  Use bfd_zalloc to allocate initialial
-	sections, not bfd_alloc.
-	(ppc_elf_check_relocs): Remove BFD_ASSERTs for !shared from
-	SDA{,2}I16 relocations.
-	(ppc_elf_add_symbol_hook): Use the value of -G nn to determine
-	whether to put something in .sbss or not.
-	(ppc_elf_relocate_section): Add support for more relocations.  Add
-	in sec->output_offset where appropriate.  Make error messages
-	include the symbol name.
-
-	* elflink.c (_bfd_elf_create_linker_section): Lookup symbol before
-	trying to add it to the symbol table, so _GLOBAL_OFFSET_TABLE_
-	doesn't get redefined messages if -shared.
-
-	* elflink.h (elf_create_pointer_linker_section) Only bump RELA
-	section if the rel_section field has been set up.
-
-Wed Jan 24 20:40:26 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Fix typo in eabi
-	relocations.
-
-Wed Jan 24 10:38:34 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* elf32-sparc.c (elf32_sparc_merge_private_bfd_data): Delete checking
-	of flags, only flags used are controlled by mach number.  Bump up
-	output file mach number to highest of input file mach numbers.
-	(elf32_sparc_object_p): Watch for EF_SPARC_SUN_US1.
-	(elf32_sparc_final_write_processing): Set EF_SPARC_SUN_US1 if v8plusa.
-
-	* config.bfd (sparc64-*-{sysv4*,solaris2*}): Comment out
-	bfd_elf64_sparc_vec support.
-
-Tue Jan 23 14:33:05 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_copy_private_bfd_data): Don't complain if
-	the embedded bit is set on some objects and not on others.  Just
-	or it together.
-	(ppc_elf_relocate_section): Implement R_PPC_EMB_{SDA21,RELSDA}
-	relocations.
-
-Tue Jan 23 14:22:45 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_new_section_hook): Don't try to align the
-	.stabstr section.
-
-	* coffcode.h (coff_set_section_contents): Fix the handling of the
-	.lib section to work even if the entire section contents are
-	written at once.  From Gvran Uddeborg <gvran@uddeborg.pp.se> and
-	Robert Lipe <robertl@arnet.com>.
-
-Mon Jan 22 18:45:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elflink.h (elf_finish_pointer_linker_section): Don't allocate
-	memory here for contents.
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Bump up _SDA_BASE_ and
-	_SDA2_BASE_ by 32768.
-	(ppc_elf_size_dynamic_sections): #if out PLT code which we haven't
-	started using.  Allocate contents for .sdata and .sdata2 sections
-	also.
-	(ppc_elf_check_relocs): Use bfd_get_section_name in debug message,
-	rather than _name.
-	(ppc_elf_finish_dynamic_symbol): Remove code that attempted to
-	size _SDA{,2}_BASE_.
-	(ppc_elf_relocate_section): Change how sdata{,2} relocations are
-	done.
-
-Mon Jan 22 08:52:04 1996  Doug Evans  <dje@charmed.cygnus.com>
-
-	* elflink.h (elf_finish_pointer_linker_section): Fix typo.
-
-	* archures.c (bfd_mach_sparc_v9): Renamed from bfd_mach_sparc64.
-	(bfd_mach_sparc_{v8plus,v8plusa}): Define.
-	(bfd_mach_sparc_v9a): Define.
-	(bfd_mach_sparc_v9_p): Define.
-	* bfd-in2.h: Regenerated.
-	* aoutx.h (aout,machine_type): bfd_mach_sparc64 renamed to
-	bfd_mach_sparc_v9.
-	* elf64-sparc.c (sparc64_elf_object_p): Likewise.
-	* config.bfd (sparc64-*-sysv4*,sparc64-*-solaris2*): Set targ_defvec
-	to bfd_elf32_sparc_vec.
-	* cpu-sparc.c (arch_info_struct): Renamed from sparc_arch_info.
-	Add v8plus{,a} support.
-	Add v9a support.
-	(sparc_compatible): New function.
-	* elf32-sparc.h: #include "elf/sparc.h".
-	(elf32_sparc_merge_private_bfd_data, elf32_sparc_object_p,
-	elf32_sparc_final_write_processing): New functions.
-	(bfd_elf32_bfd_merge_private_bfd_data, elf_backend_object_p,
-	elf_backend_final_write_processing): Define.
-
-Mon Jan 22 11:21:51 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf-bfd.h (struct elf_link_hash_entry): Add
-	linker_section_pointer field.
-	(enum elf_linker_section_enum): Enumeration for new way of
-	creating linker dynamic sections and symbols.
-	(elf_linker_section{,_pointers}): New structures for creating
-	dynamic sections and symbols.
-	(elf_obj_tdata): Add linker_section_pointers and linker_section
-	fields.
-	(elf_local_ptr_offsets,elf_linker_section): New accessor macros.
-	(_bfd_elf_create_linker_section): New declarations.
-	(_bfd_elf_find_pointer_linker_section): Ditto.
-	(bfd_elf{32,64}_{create,finish}_pointer_linker_section): Ditto.
-	(_bfd_elf_make_linker_section_rela): Ditto.
-
-	* elf.c (_bfd_elf_link_hash_newfunc): Initialize new fields.
-
-	* elf32-ppc.c (ppc_elf_create_dynamic_sections): Delete.
-	(ppc_elf_create_linker_section): New function to create the
-	sections .got, .sdata, and .sdata2.
-	(ppc_elf_size_dynamic_sections): Zap .rela.{sdata,sdata2} if
-	needed.
-	(ppc_elf_check_relocs): Support more of the eabi relocations.
-	(ppc_elf_relocate_section): Ditto.
-	(ppc_elf_finish_dynamic_symbols): Adjust _SDA{,2}_BASE_ by 32768
-	if the .sdata{,2} + .sbss{,2} section size is > 32k.
-
-	* elflink.h (elf_create_pointer_linker_section): New function to
-	create initialized pointers in dynamic linker sections.
-	(elf_finish_pointer_linker_section): Actually intialize the
-	pointers created above.
-
-	* elfcode.h (bfd_elf{32,64}_create_pointer_linker_section): New
-	macros to provide both 32 and 64 bit versions of
-	elf_create_pointer_linker_section.
-	(bfd_elf{32,64}_finish_pointer_linker_section): New macros to
-	provide both 32 and 64 bit versions of
-	elf_finish_pointer_linker_section.
-
-	* elflink.c (_bfd_elf_create_linker_section): New function to
-	create a linker section.
-	(_bfd_elf_find_pointer_linker_section): Find a unique pointer to a
-	given address in the linker pointer offsets created for a given
-	symbol.
-	(_bfd_elf_make_linker_section_rela): Make a RELA section
-	corresponding to the generated linker section.
-
-Sat Jan 20 08:36:10 1996  Doug Evans  <dje@canuck.cygnus.com>
-
-	* elf32-sparc.c (ELF_MACHINE_ALT1): Define.
-
-Thu Jan 18 18:25:34 1996  Kim Knuttila  <krk@cygnus.com>
-
-	* coff-ppc.c (coff_ppc_relocate_section): changed TOCDEFN relocs.
-	(coff_ppc_relocate_section): Handle special values for gcc built dlls.
-	(dump_toc): fix diagnosing code to identify out-of-toc-bounds entries.
-	Also begin the toc at 4 as an eye catcher ('31313131' marks the first
-	toc entry in an objdump) for now.
-	(ppc_do_last, ppc_get_last): New function - needed to save processing
-	the toc owner to the end.
-	(ppc_coff_swap_sym_in_hook): Removed an incorrect hack for doing the
-	toc owner last.
-
-	* cofflink.c (_bfd_coff_final_link): Added a new hack to keep the
-	toc owner from being done till last. Must define POWERPC_LE_PC
-	to enable it.
-
-	* coffcode.h (coff_set_alignment_hook): alignment setting for .stab
-
-	* peicode.h (coff_swap_scnhdr_out): set section flags for stab/str
-	to INFO.
-	(coff_swap_aouthdr_out): Removed a non-working hack for computing the
-	SizeOfImage for PowerPC. Ignore the size of the .junk section.
-
-Thu Jan 18 17:42:12 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elfcore.h: Include <signal.h> before <sys/procfs.h>.
-
-Wed Jan 17 12:40:14 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* cpu-powerpc.c (arch_info_struct): Change last entry to not point
-	back to first.
-	(bfd_powerpc_arch): Point at first entry in arch_info_struct.
-
-Tue Jan 16 15:10:49 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): Don't increment file
-	offset for a segment which contains no loadable sections.
-
-Mon Jan 15 17:46:27 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* reloc.c: Add new PowerPC relocations.
-	* {bfd-in2,libbfd}.h: Regenerate.
-
-	* elf32-ppc.c (ppc_elf_howto_raw): Add more PPC relocations.
-	(ppc_elf_reloc_type_lookup): Lookup new relocations.
-
-Mon Jan 15 14:29:44 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* aoutx.h (howto_table_ext): Fix RELOC_BASE10 and RELOC_BASE22
-	entries.
-
-	* sunos.c (sunos_scan_ext_relocs): Don't fail assert if
-        info->shared.
-
-	* coffgen.c (coff_find_nearest_line): Don't try to cache
-	information in sections that are not owned by a BFD.  From Richard
-	Henderson <richard@atheist.tamu.edu>.
-
-	* elf32-mips.c: Numerous changes to dynamic linking code, mostly
-	from Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
-	* elflink.h (elf_link_output_extsym): Remove special check for
-	_rld_new_interface.
-
-	* ecoffswap.h: Add prototypes for static functions.
-
-Sun Jan 14 21:36:08 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_{unsupported,std}_reloc): Remove functions.
-	(ppc_elf_howto_raw): Remove ppc_elf_{unsupported,std}_reloc
-	references.
-	(ppc_elf_relocate_section):  No longer allow .sdata/.sbss sections
-	to satisfy a TOC16 relocation. 	Rewrite unsupported relocation
-	support.  Begin support for R_PPC_SDA{2,}REL.
-
-Sat Jan 13 09:36:52 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_create_dynamic_sections): New function to
-	create the .got and .got.neg sections.
-	(ppc_elf_size_dynamic_sections): Call it.
-	(ppc_elf_check_relocs): Call it.
-	(ppc_elf_size_dynamic_sections): Support .got.neg, just like .got.
-	(ppc_elf_check_relocs): Add error messages for relocations we
-	don't yet support.  Do not include R_PPC_SDAREL16 like a GOT
-	relocation.
-
-Fri Jan 12 15:27:59 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf32-ppc.c (ppc_elf_fake_sections): Define, and handle the new
-	section flags for V.4 and eabi.
-
-Fri Jan 12 13:59:16 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* elf.c (assign_file_positions_for_segments): If a segment
-	contains no sections, don't mark it as readable.
-
-	* elf-bfd.h (_bfd_elf_section_from_bfd_section): Declare.
-	* elfcode.h (_bfd_elf_section_from_bfd_section): Don't declare.
-
-	* elf.c (_bfd_elf_print_private_bfd_data): Dump contents of
-	dynamic section, if there is one.
-	* elf-bfd.h (struct elf_size_info): Add swap_dyn_in field.
-	(bfd_elf32_swap_dyn_in): Change type of second parameter to PTR.
-	(bfd_elf64_swap_dyn_in): Likewise.
-	* elfcode.h (elf_swap_dyn_in): Change type of second parameter to
-	PTR.
-	(NAME(_bfd_elf,size_info)): Initialize swap_dyn_in field.
-
-	* elf32-i386.c (elf_i386_size_dynamic_sections): Don't create a
-	DT_TEXTREL entry because of .rel.plt.  From Martin Pirker
-	<pirker@eiunix.tuwien.ac.at>.
-
-Thu Jan 11 17:06:14 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* section.c (SEC_{EXCLUDE,SORT_ENTRIES}): New section flags for
-	PowerPC V.4 and eabi.
- 	* bfd-in2.h: Regenerate.
-	* libfd.h: Regenerate.
-
-	* elfxx-target.h (TARGET_{BIG,LITTLE}_SYM): Add new flags.
-
-	* elf32-ppc.c (ppc_elf_section_from_shdr): Support SHT_ORDERED
-	section type and SHF_EXCLUDE section flag, turning them into the
-	appropriate bfd section flag.
-
-Thu Jan 11 11:23:30 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* xcofflink.c (xcoff_link_add_symbols): Create the special
-	sections if we see a DYNAMIC object, in case that is the only
-	XCOFF input object we see.
-
-	* elf32-mips.c: Extensive changes for a start at dynamic linking
-	support, from Kazumoto Kojima <kkojima@info.kanagawa-u.ac.jp>.
-
-	* elf-bfd.h (struct elf_backend_data): Add type_change_ok field.
-	(struct elf_backend_data): Remove
-	elf_backend_create_program_headers field.  Add
-	elf_backend_additional_program_headers and
-	elf_backend_modify_segment_map fields.
-	* elfxx-target.h (elf_backend_type_change_ok): Define if not
-	defined.
-	(elf_backend_additional_program_headers): Likewise.
-	(elf_backend_modify_segment_map): Likewise.
-	(elf_backend_create_program_headers): Don't define.
-	(elfNN_bed): Change to account for field changes.
-	* elf.c (assign_file_positions_for_segments): Call new
-	modify_segment_map backend function.  Don't call old
-	create_program_headers backend function.
-	(get_program_header_size): Call additional_program_headers rather
-	than create_program_headers.
-	* elflink.h (elf_link_add_object_symbols): Initialize
-	type_change_ok from new backend field.
-	(elf_link_output_extsym): Don't warn if _rld_new_interface is
-	defined.
-	(elf_reloc_link_order): Treat a reloc against a defined symbol as
-	a reloc against the appropriate section.
-
-	* elf-bfd.h (struct bfd_elf_section_data): Add tdata field.
-	(struct elf_obj_tdata): Rename ppc_flags_init field to flags_init.
-	(elf_flags_init): Rename from elf_ppc_flags_init.
-	* elf32-ppc.c (ppc_elf_set_private_flags): Use elf_flags_init, not
-	elf_ppc_flags_init.
-	(ppc_elf_copy_private_bfd_data): Likewise.
-	(ppc_elf_merge_private_bfd_data): Likewise.
-
-	* elf32-m68k.c (howto_table): Change src_mask to 0 for all
-	relocation entries.
-
-Tue Jan  9 15:22:53 1996  David Mosberger-Tang  <davidm@azstarnet.com>
-
-	* coff-alpha.c (alpha_relocate_section): During final link, allow
- 	output .lita section to be bigger than 64k by adjusting gp value
- 	on a per-input section basis.
-	* libecoff.h (struct ecoff_tdata): Add issued_multiple_gp_warning
-	field.
-	(struct ecoff_section_tdata): Add gp field.
-
-Tue Jan  9 12:00:36 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	Handle Alpha ECOFF changes in OSF/1 3.2.
-	* libecoff.h (struct ecoff_backend_data): Add get_elt_at_filepos
-	field.
-	* coff-alpha.c: Include "aout/ar.h".
-	(alpha_ecoff_get_relocated_section_contents): Don't require an
-	ALPHA_R_IGNORE reloc after an ALPHA_R_GPDISP reloc, since OSF/1
-	3.2 doesn't generate one.
-	(alpha_relocate_section): Likewise.
-	(alpha_ecoff_slurp_armap): Define.
-	(alpha_ecoff_slurp_extended_name_table): Define.
-	(alpha_ecoff_construct_extended_name_table): Define.
-	(alpha_ecoff_truncate_arname): Define.
-	(alpha_ecoff_write_armap): Define.
-	(alpha_ecoff_generic_stat_arch_elt): Define.
-	(alpha_ecoff_update_armap_timestamp): Define.
-	(ARFZMAG): Define.
-	(alpha_ecoff_read_ar_hdr): New static function.
-	(alpha_ecoff_get_elt_at_filepos): New static function.
-	(alpha_ecoff_openr_next_archived_file): New static function.
-	(alpha_ecoff_get_elt_at_index): New static function.
-	(alpha_ecoff_backend_data): Initialize get_elt_at_filepos field.
-	(ecoffalpha_little_vec): Change BFD_JUMP_TABLE_ARCHIVE from
-	_bfd_ecoff to alpha_ecoff.
-	* ecoff.c (ecoff_link_add_archive_symbols): Use get_elt_at_filepos
-	field from backend structure, rather than always calling
-	_bfd_get_elt_at_filepos.
-	* coff-mips.c (mips_ecoff_backend_data): Initialize
-	get_elt_at_filepos field.
-	* archive.c (_bfd_generic_read_ar_hdr_mag): New function, copied
-	from _bfd_generic_read_ar_hdr with minor changes.
-	(_bfd_generic_read_ar_hdr): Use _bfd_generic_read_ar_hdr_mag.
-	* libbfd-in.h (_bfd_generic_read_ar_hdr_mag): Declare.
-	* libbfd.h: Rebuild.
-
-	* bfd-in.h (BFD_IN_MEMORY): Define.
-	* libbfd-in.h (struct bfd_in_memory): Define.
-	* libbfd.c (bfd_read): Handle BFD_IN_MEMORY flag.
-	(bfd_get_file_window): Don't try to map a BFD_IN_MEMORY file.
-	(bfd_write, bfd_stat): Abort if BFD_IN_MEMORY is set.
-	(bfd_tell, bfd_flush, bfd_seek): Handle BFD_IN_MEMORY flag.
-	* bfd.c (struct _bfd): Change iostream field from char * to PTR.
-	(bfd_get_size): Handle BFD_IN_MEMORY flag.
-	* cache.c (bfd_cache_close): Ignore BFD_IN_MEMORY files.
-	(bfd_open_file): Cast to PTR, not char *, when setting iostream.
-	(bfd_cache_lookup_worker): Abort if BFD_IN_MEMORY is set.
-	* opncls.c (bfd_fdopenr): Cast to PTR, not char *, when setting
-	iostream.
-	(bfd_openstreamr): Likewise.
-	* aoutx.h (NAME(aout,some_aout_object_p)): Only fstat iostream if
-	BFD_IN_MEMORY is not set.
-	* riscix.c (riscix_some_aout_object_p): Likewise.
-	* bfd-in2.h, libbfd.h: Rebuild.
-
-	* targets.c (bfd_target): Add _bfd_get_elt_at_index field.
-	(BFD_JUMP_TABLE_ARCHIVE): Add _get_elt_at_index.
-	(bfd_get_elt_at_index): Define.
-	* archive.c (_bfd_generic_get_elt_at_index): Rename from
-	bfd_get_elt_at_index.  Change index parameter from int to
-	symindex.
-	* libbfd-in.h (_bfd_generic_get_elt_at_index): Declare.
-	(_bfd_noarchive_get_elt_at_index): Define.
-	(_bfd_archive_bsd_get_elt_at_index): Define.
-	(_bfd_archive_coff_get_elt_at_index): Define.
-	* bfd-in2.h, libbfd.h: Rebuild.
-	* aout-target.h (MY_get_elt_at_index): Define if not defined.
-	* coff-rs6000.c (xcoff_get_elt_at_index): Define.
-	* ieee.c (ieee_get_elt_at_index): Define.
-	* libecoff.h (_bfd_ecoff_get_elt_at_index): Define.
-	* oasys.c (oasys_get_elt_at_index): Define.
-	* som.c (som_get_elt_at_index): Define.
-
-	* ecoff.c (_bfd_ecoff_find_nearest_line): Don't restrict line
-	numbers to the .text section.
-
-Mon Jan  8 17:00:57 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_write_debug_part): Change return type to boolean.
-	If there is a SEC_DEBUGGING section, get the contents of the debug
-	information part from it.
-	(ieee_set_section_contents): Store the contents of a SEC_DEBUGGING
-	section in memory.
-	(ieee_write_object_contents): Check ieee_write_debug_part return.
-
-Thu Jan  4 17:12:37 1996  Fred Fish  <fnf@cygnus.com>
-
-	* config.bfd (i[345]86-*-freebsd*): Add target.
-	* configure.in (i386freebsd_vec): Add vec.
-	* configure: Regenerate.
-	* Makefile.in (BFD32_BACKENDS): Add i386freebsd.o.
-	(BFD32_BACKENDS_CFILES): Add i386freebsd.c.
-	Rebuild dependencies..
-	* freebsd.h: New file.
-	* i386freebsd.c: New file.
-	* targets.c (i386freebsd_vec): Declare.
-	(bfd_target_vector): Add i386freebsd_vec.
-	* i386linux.c (SEGMENT_SIZE): Define as TARGET_PAGE_SIZE
-	* i386netbsd.c (SEGMENT_SIZE):  Define as TARGET_PAGE_SIZE
-
-Thu Jan  4 16:27:46 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* ieee.c (ieee_slurp_debug): New static function.
-	(ieee_object_p): Call it.
-	(ieee_slurp_section_data): Skip debugging sections.
-	(ieee_get_reloc_upper_bound): Likewise.
-	(ieee_get_section_contents): Likewise.
-	(ieee_canonicalize_reloc): Likewise.
-	(ieee_write_section_part): Likewise.
-	(ieee_write_debug_part): Likewise.
-	(ieee_write_data_part): Likewise.
-	(init_for_output): Likewise.
-
-Wed Jan  3 19:42:47 1996  Michael Meissner  <meissner@wogglebug.tiac.net>
-
-	* elf32-ppc.c (ppc_elf_relocate_section): Make @GOT relocations
-	work.
-	(ppc_elf_howto_raw): Just use bfd_elf_generic_reloc for all howto
-	relocs, since ppc_elf_relocate_section handles the linker case.
-	(ppc_elf_{addr16_ha,got16,toc16,brtaken}_reloc): Delete, no longer
-	used.
-	(ppc_elf_{addr16_ha,got16,toc16,brtaken}_inner): Merge these into
-	ppc_elf_relocate_section since that is now the only caller.
-	(ppc_elf_relocate_section): Ditto.
-
-Wed Jan  3 15:11:30 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* coffcode.h (coff_write_object_contents): If we don't know the
-	section of the entry point for an XCOFF executable, always set the
-	entry address to -1.
-
-Tue Jan  2 14:17:15 1996  Michael Meissner  <meissner@tiktok.cygnus.com>
-
-	* elf.c (bfd_section_from_shdr): Add support for note sections.
-
-Tue Jan  2 13:10:25 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfd-in.h (struct _symbol_info): Add stab_type field.
-	* bfd-in2.h: Rebuild.
-	* aoutx.h (NAME(aout,get_symbol_info)): Set stab_type.
-
-	* elf32-ppc.c: Remove trailing newline from calls to
-        _bfd_error_handler.
-	(ppc_elf_merge_private_bfd_data): Only warn about endianness
-	difference if target endianness is known.
-
-For older changes see ChangeLog-9495
-
-Local Variables:
-mode: change-log
-left-margin: 8
-fill-column: 74
-version-control: never
-End:
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
deleted file mode 100644
index a15531171d8..00000000000
--- a/bfd/Makefile.am
+++ /dev/null
@@ -1,1065 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCDIR = $(srcdir)/../include
-CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
-DEP = mkdep
-
-SUBDIRS = doc po
-
-docdir = doc
-
-lib_LTLIBRARIES = libbfd.la
-
-# bfd.h goes here, for now
-BFD_H = bfd.h
-
-# Jim Kingdon notes:
-# Writing S-records should be included in all (or at least most)
-# *-*-coff, *-*-aout, etc., configurations, because people will want to
-# be able to use objcopy to create S-records.  (S-records are not useful
-# for the debugger, so if you are downloading things as S-records you
-# need two copies of the executable, one to download and one for the
-# debugger).
-BFD_LIBS = \
-	archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo \
-	format.lo init.lo libbfd.lo opncls.lo reloc.lo \
-	section.lo syms.lo targets.lo hash.lo linker.lo \
-	srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo
-
-BFD_LIBS_CFILES = \
-	archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
-	format.c init.c libbfd.c opncls.c reloc.c \
-	section.c syms.c targets.c hash.c linker.c \
-	srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c
-
-# This list is alphabetized to make it easier to keep in sync
-# with the decls and initializer in archures.c.
-ALL_MACHINES = \
-	cpu-a29k.lo \
-	cpu-alpha.lo \
-	cpu-arc.lo \
-	cpu-arm.lo \
-	cpu-d10v.lo \
-	cpu-d30v.lo \
-	cpu-fr30.lo \
-	cpu-h8300.lo \
-	cpu-h8500.lo \
-	cpu-hppa.lo \
-	cpu-i386.lo \
-	cpu-i860.lo \
-	cpu-i960.lo \
-	cpu-m32r.lo \
-	cpu-m68k.lo \
-	cpu-m88k.lo \
-	cpu-m10200.lo \
-	cpu-m10300.lo \
-	cpu-mcore.lo \
-	cpu-mips.lo \
-	cpu-ns32k.lo \
-	cpu-powerpc.lo \
-	cpu-rs6000.lo \
-	cpu-sh.lo \
-	cpu-sparc.lo \
-	cpu-tic30.lo \
-	cpu-tic80.lo \
-	cpu-v850.lo \
-	cpu-vax.lo \
-	cpu-we32k.lo \
-	cpu-w65.lo \
-	cpu-z8k.lo
-
-ALL_MACHINES_CFILES = \
-	cpu-a29k.c \
-	cpu-alpha.c \
-	cpu-arc.c \
-	cpu-arm.c \
-	cpu-d10v.c \
-	cpu-d30v.c \
-	cpu-fr30.c \
-	cpu-h8300.c \
-	cpu-h8500.c \
-	cpu-hppa.c \
-	cpu-i386.c \
-	cpu-i860.c \
-	cpu-i960.c \
-	cpu-m32r.c \
-	cpu-m68k.c \
-	cpu-m88k.c \
-	cpu-m10200.c \
-	cpu-m10300.c \
-	cpu-mcore.c \
-	cpu-mips.c \
-	cpu-ns32k.c \
-	cpu-powerpc.c \
-	cpu-rs6000.c \
-	cpu-sh.c \
-	cpu-sparc.c \
-	cpu-tic30.c \
-	cpu-tic80.c \
-	cpu-v850.c \
-	cpu-vax.c \
-	cpu-we32k.c \
-	cpu-w65.c \
-	cpu-z8k.c
-
-# The .o files needed by all of the 32 bit vectors that are configured into
-# target_vector in targets.c if configured with --enable-targets=all.
-BFD32_BACKENDS = \
-	aout-adobe.lo \
-	aout-arm.lo \
-	aout-ns32k.lo \
-	aout-sparcle.lo \
-	aout-tic30.lo \
-	aout0.lo \
-	aout32.lo \
-	bout.lo \
-	cf-i386lynx.lo \
-	cf-m68klynx.lo \
-	cf-sparclynx.lo \
-	coff-a29k.lo \
-	coff-apollo.lo \
-	coff-arm.lo \
-	coff-aux.lo \
-	coff-h8300.lo \
-	coff-h8500.lo \
-	coff-i386.lo \
-	coff-go32.lo \
-	coff-i860.lo \
-	coff-i960.lo \
-	coff-m68k.lo \
-	coff-m88k.lo \
-	coff-mips.lo \
-	coff-pmac.lo \
-	coff-rs6000.lo \
-	coff-sh.lo \
-	coff-sparc.lo \
-	coff-stgo32.lo \
-	coff-svm68k.lo \
-	coff-tic30.lo \
-	coff-tic80.lo \
-	coff-u68k.lo \
-	coff-we32k.lo \
-	coff-w65.lo \
-	coff-z8k.lo \
-	cofflink.lo \
-	dwarf2.lo \
-	ecoff.lo \
-	ecofflink.lo \
-	elf.lo \
-	elf32-arc.lo \
-	elfarm-oabi.lo \
-	elfarm-nabi.lo \
-	elf32-d10v.lo \
-	elf32-d30v.lo \
-	elf32-fr30.lo \
-	elf32-gen.lo \
-	elf32-hppa.lo \
-	elf32-i386.lo \
-	elf32-i860.lo \
-	elf32-m32r.lo \
-	elf32-m68k.lo \
-	elf32-m88k.lo \
-	elf-m10200.lo \
-	elf-m10300.lo \
-	elf32-mcore.lo \
-	elf32-mips.lo \
-	elf32-ppc.lo \
-	elf32-sh.lo \
-	elf32-sparc.lo \
-	elf32-v850.lo \
-	elf32.lo \
-	elflink.lo \
-	hp300bsd.lo \
-	hp300hpux.lo \
-	som.lo \
-	i386aout.lo \
-	i386bsd.lo \
-	i386dynix.lo \
-	i386freebsd.lo \
-	i386linux.lo \
-	i386lynx.lo \
-	i386msdos.lo \
-	i386netbsd.lo \
-	i386mach3.lo \
-	i386os9k.lo \
-	ieee.lo \
-	m68k4knetbsd.lo \
-	m68klinux.lo \
-	m68klynx.lo \
-	m68knetbsd.lo \
-	m88kmach3.lo \
-	mipsbsd.lo \
-	newsos3.lo \
-	nlm.lo \
-	nlm32-i386.lo \
-	nlm32-sparc.lo \
-	nlm32-ppc.lo \
-	nlm32.lo \
-	ns32knetbsd.lo \
-	oasys.lo \
-	pc532-mach.lo \
-	pe-arm.lo \
-	pei-arm.lo \
-	pe-i386.lo \
-	pei-i386.lo \
-	pe-mcore.lo \
-	pei-mcore.lo \
-	pe-ppc.lo \
-	pei-ppc.lo \
-	ppcboot.lo \
-	reloc16.lo \
-	riscix.lo \
-	sparclinux.lo \
-	sparclynx.lo \
-	sparcnetbsd.lo \
-	sunos.lo \
-	vaxnetbsd.lo \
-	versados.lo \
-	vms.lo \
-	vms-gsd.lo \
-	vms-hdr.lo \
-	vms-misc.lo \
-	vms-tir.lo \
-	xcofflink.lo
-
-BFD32_BACKENDS_CFILES = \
-	aout-adobe.c \
-	aout-arm.c \
-	aout-ns32k.c \
-	aout-sparcle.c \
-	aout-tic30.c \
-	aout0.c \
-	aout32.c \
-	bout.c \
-	cf-i386lynx.c \
-	cf-m68klynx.c \
-	cf-sparclynx.c \
-	coff-a29k.c \
-	coff-apollo.c \
-	coff-arm.c \
-	coff-aux.c \
-	coff-h8300.c \
-	coff-h8500.c \
-	coff-i386.c \
-	coff-i860.c \
-	coff-go32.c \
-	coff-i960.c \
-	coff-m68k.c \
-	coff-m88k.c \
-	coff-mips.c \
-	coff-pmac.c \
-	coff-rs6000.c \
-	coff-sh.c \
-	coff-sparc.c \
-	coff-stgo32.c \
-	coff-svm68k.c \
-	coff-tic30.c \
-	coff-tic80.c \
-	coff-u68k.c \
-	coff-we32k.c \
-	coff-w65.c \
-	coff-z8k.c \
-	cofflink.c \
-	dwarf2.c \
-	ecoff.c \
-	ecofflink.c \
-	elf.c \
-	elf32-arc.c \
-	elfarm-oabi.c \
-	elfarm-nabi.c \
-	elf32-d10v.c \
-	elf32-d30v.c \
-	elf32-fr30.c \
-	elf32-gen.c \
-	elf32-hppa.c \
-	elf32-i386.c \
-	elf32-i860.c \
-	elf32-m32r.c \
-	elf32-m68k.c \
-	elf32-m88k.c \
-	elf-m10200.c \
-	elf-m10300.c \
-	elf32-mcore.c \
-	elf32-mips.c \
-	elf32-ppc.c \
-	elf32-sh.c \
-	elf32-sparc.c \
-	elf32-v850.c \
-	elf32.c \
-	elflink.c \
-	hp300bsd.c \
-	hp300hpux.c \
-	som.c \
-	i386aout.c \
-	i386bsd.c \
-	i386dynix.c \
-	i386freebsd.c \
-	i386linux.c \
-	i386lynx.c \
-	i386msdos.c \
-	i386netbsd.c \
-	i386mach3.c \
-	i386os9k.c \
-	ieee.c \
-	m68k4knetbsd.c \
-	m68klinux.c \
-	m68klynx.c \
-	m68knetbsd.c \
-	m88kmach3.c \
-	mipsbsd.c \
-	newsos3.c \
-	nlm.c \
-	nlm32-i386.c \
-	nlm32-sparc.c \
-	nlm32-ppc.c \
-	nlm32.c \
-	ns32knetbsd.c \
-	oasys.c \
-	pc532-mach.c \
-	pe-arm.c \
-	pei-arm.c \
-	pe-i386.c \
-	pei-i386.c \
-	pe-mcore.c \
-	pei-mcore.c \
-	pe-ppc.c \
-	pei-ppc.c \
-	ppcboot.c \
-	reloc16.c \
-	riscix.c \
-	sparclinux.c \
-	sparclynx.c \
-	sparcnetbsd.c \
-	sunos.c \
-	vaxnetbsd.c \
-	versados.c \
-	vms.c \
-	vms-gsd.c \
-	vms-hdr.c \
-	vms-misc.c \
-	vms-tir.c \
-	xcofflink.c
-
-# The .o files needed by all of the 64 bit vectors that are configured into
-# target_vector in targets.c if configured with --enable-targets=all
-# and --enable-64-bit-bfd.
-BFD64_BACKENDS = \
-	aout64.lo \
-	coff-alpha.lo \
-	demo64.lo \
-	elf64-alpha.lo \
-	elf64-gen.lo \
-	elf64-mips.lo \
-	elf64-sparc.lo \
-	elf64.lo \
-	nlm32-alpha.lo \
-	nlm64.lo
-
-BFD64_BACKENDS_CFILES = \
-	aout64.c \
-	coff-alpha.c \
-	demo64.c \
-	elf64-alpha.c \
-	elf64-gen.c \
-	elf64-mips.c \
-	elf64-sparc.c \
-	elf64.c \
-	nlm32-alpha.c \
-	nlm64.c
-
-OPTIONAL_BACKENDS = \
-	aix386-core.lo \
-	hpux-core.lo \
-	irix-core.lo \
-	lynx-core.lo \
-	osf-core.lo \
-	sco5-core.lo \
-	trad-core.lo \
-	cisco-core.lo
-
-OPTIONAL_BACKENDS_CFILES = \
-	aix386-core.c \
-	hpux-core.c \
-	irix-core.c \
-	lynx-core.c \
-	osf-core.c \
-	sco5-core.c \
-	trad-core.c \
-	cisco-core.c
-
-# These are defined by configure.in:
-WORDSIZE = @wordsize@
-ALL_BACKENDS = @all_backends@
-BFD_BACKENDS = @bfd_backends@
-BFD_MACHINES = @bfd_machines@
-TDEFAULTS = @tdefaults@
-
-INCLUDES = -D_GNU_SOURCE @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
-
-# C source files that correspond to .o's.
-CFILES = \
-	$(BFD_LIBS_CFILES) \
-	$(ALL_MACHINES_CFILES) \
-	$(BFD32_BACKENDS_CFILES) \
-	$(BFD64_BACKENDS_CFILES) \
-	$(OPTIONAL_BACKENDS_CFILES)
-
-## This is a list of all .h files which are in the source tree.
-SOURCE_HFILES = \
-	aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h \
-	ecoffswap.h elf32-hppa.h \
-	elfcode.h genlink.h go32stub.h hppa_stubs.h libaout.h \
-	libbfd.h libcoff.h libecoff.h elf-bfd.h libhppa.h libieee.h \
-	libnlm.h liboasys.h netbsd.h nlm-target.h nlmcode.h ns32k.h \
-	som.h vms.h
-
-HFILES = \
-	elf32-target.h elf64-target.h targmatch.h \
-	$(SOURCE_HFILES)
-
-POTFILES = $(CFILES) $(SOURCE_HFILES)
-
-po/POTFILES.in: @MAINT@ Makefile
-	for file in $(POTFILES); do echo $$file; done | sort > tmp \
-	  && mv tmp $(srcdir)/po/POTFILES.in
-
-diststuff: info
-
-# Various kinds of .o files to put in libbfd.a:
-# BFD_BACKENDS	Routines the configured targets need.
-# BFD_MACHINES	Architecture-specific routines the configured targets need.
-# COREFILE	Core file routines for a native configuration
-OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@
-
-stamp-ofiles: Makefile
-	rm -f tofiles
-	f=""; \
-	for i in $(OFILES) ; do \
-	  case " $$f " in \
-	    *" $$i "*) ;; \
-	    *) f="$$f $$i" ;; \
-	  esac ; \
-	done ; \
-	echo $$f > tofiles
-	$(SHELL) $(srcdir)/../move-if-change tofiles ofiles
-	touch stamp-ofiles
-
-ofiles: stamp-ofiles ; @true
-
-libbfd_la_SOURCES = $(BFD_LIBS_CFILES)
-libbfd_la_DEPENDENCIES = $(OFILES) ofiles
-libbfd_la_LIBADD = `cat ofiles` @WIN32LIBADD@
-libbfd_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@
-
-# libtool will build .libs/libbfd.a.  We create libbfd.a in the build
-# directory so that we don't have to convert all the programs that use
-# libbfd.a simultaneously.  This is a hack which should be removed if
-# everything else starts using libtool.  FIXME.
-
-noinst_LIBRARIES = libbfd.a
-libbfd_a_SOURCES =
-
-stamp-lib: libbfd.la
-	if [ -f .libs/libbfd.a ]; then \
-	  cp .libs/libbfd.a libbfd.tmp; \
-	  $(SHELL) $(srcdir)/../move-if-change libbfd.tmp libbfd.a; \
-	else true; fi
-	touch stamp-lib
-
-libbfd.a: stamp-lib ; @true
-
-# This file holds an array associating configuration triplets and
-# vector names.  It is built from config.bfd.  It is not compiled by
-# itself, but is included by targets.c.
-targmatch.h: config.bfd targmatch.sed
-	rm -f targmatch.h
-	sed -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
-	mv -f targmatch.new targmatch.h
-
-# When compiling archures.c and targets.c, supply the default target
-# info from configure.
-
-targets.lo: targets.c config.status
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $(TDEFAULTS) $(srcdir)/targets.c
-
-archures.lo: archures.c config.status
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $(TDEFAULTS) $(srcdir)/archures.c
-
-elf32-target.h : elfxx-target.h
-	rm -f elf32-target.h
-	sed -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
-	mv -f elf32-target.new elf32-target.h
-
-elf64-target.h : elfxx-target.h
-	rm -f elf64-target.h
-	sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
-	mv -f elf64-target.new elf64-target.h
-
-BFD_H_DEPS= $(INCDIR)/ansidecl.h
-LOCAL_H_DEPS= libbfd.h sysdep.h config.h
-$(BFD_LIBS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-$(BFD_MACHINES): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-$(BFD_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-$(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-
-# Install BFD include file, and others that it needs.
-install-data-local: $(BFD_H)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(includedir)
-	$(INSTALL_DATA) $(BFD_H) $(includedir)/bfd.h
-	$(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
-	$(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h
-
-# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES).
-.dep: dep.sed $(CFILES) $(HFILES) bfd.h
-	rm -f .dep1
-	$(MAKE) DEP=$(DEP) .dep1
-	sed -f dep.sed <.dep1 >.dep
-
-# This rule really wants a mkdep that runs "gcc -MM".
-# The NetBSD mkdep overwrites any existing file contents, and doesn't insert
-# the "DO NOT DELETE" line.
-# Other mkdep versions require a file that already exists, and do insert it.
-# Hence the weirdness....
-.dep1: $(CFILES)
-	rm -f .dep2 .dep2a
-	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
-	echo > .dep2a
-	$(DEP) -f .dep2a $(INCLUDES) $(CFLAGS) $?
-	sed -e '/DO NOT DELETE/d' -e '/^$$/d' < .dep2a >> .dep2
-	rm -f .dep2a
-	$(SHELL) $(srcdir)/../move-if-change .dep2 .dep1
-
-dep.sed: dep-in.sed config.status
-	sed <$(srcdir)/dep-in.sed >dep.sed	\
-		-e 's!@BFD_H@!$(BFD_H)!'	\
-		-e 's!@INCDIR@!$(INCDIR)!'	\
-		-e 's!@SRCDIR@!$(srcdir)!'
-
-dep: .dep
-	sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
-	cat .dep >> tmp-Makefile
-	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile Makefile
-
-dep-in: .dep
-	sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
-	cat .dep >> tmp-Makefile.in
-	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
-
-dep-am: .dep
-	sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
-	cat .dep >> tmp-Makefile.am
-	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
-
-host-aout.lo: Makefile
-
-# The following program can be used to generate a simple config file
-# which can be folded into an h-XXX file for a new host, with some editing.
-aout-params.h: gen-aout
-	./gen-aout host > aout-params.h
-gen-aout: $(srcdir)/gen-aout.c Makefile
-	$(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c
-
-$(BFD_H): stmp-bfd-h ; @true
-
-stmp-bfd-h: bfd-in3.h
-	rm -f bfd-tmp.h
-	cp bfd-in3.h bfd-tmp.h
-	$(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H)
-	rm -f bfd-tmp.h
-	touch stmp-bfd-h
-
-BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
-	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c
-LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c
-LIBCOFF_H_FILES = libcoff-in.h coffcode.h
-
-# Could really use a "copy-if-change"...
-headers:
-	(cd $(docdir); $(MAKE) protos $(FLAGS_TO_PASS))
-	cp $(docdir)/bfd.h bfd-in2.h-new
-	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
-	cp $(docdir)/libbfd.h libbfd.h-new
-	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
-	cp $(docdir)/libcoff.h libcoff.h-new
-	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
-
-# We only rebuild the header files automatically if we have been
-# configured with --enable-maintainer-mode.
-
-$(srcdir)/bfd-in2.h: @MAINT@ stmp-bin2-h ; @true
-stmp-bin2-h: $(BFD_H_FILES)
-	(cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h)
-	cp $(docdir)/bfd.h bfd-in2.h-new
-	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
-	touch stmp-bin2-h
-
-$(srcdir)/libbfd.h: @MAINT@ stmp-lbfd-h ; @true
-stmp-lbfd-h: $(LIBBFD_H_FILES)
-	(cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h)
-	cp $(docdir)/libbfd.h libbfd.h-new
-	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
-	touch stmp-lbfd-h
-
-$(srcdir)/libcoff.h: @MAINT@ stmp-lcoff-h ; @true
-stmp-lcoff-h: $(LIBCOFF_H_FILES)
-	(cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h)
-	cp $(docdir)/libcoff.h libcoff.h-new
-	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
-	touch stmp-lcoff-h
-
-MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \
-	targmatch.h
-
-CLEANFILES = bfd.h dep.sed stmp-bfd-h .dep .dep1 libbfd.a stamp-lib \
-	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
-
-# We want to rerun configure if config.bfd or configure.host change.
-config.status: $(srcdir)/configure $(srcdir)/config.bfd $(srcdir)/configure.host
-	$(SHELL) ./config.status --recheck
-
-
-elfarm-oabi.lo: elfarm-oabi.c elf32-arm.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-
-# What appears below is generated by a hacked mkdep using gcc -MM.
-elfarm-nabi.lo: elfarm-nabi.c elf32-arm.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-
-# What appears below is generated by a hacked mkdep using gcc -MM.
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-archive.lo: archive.c $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h
-archures.lo: archures.c
-bfd.lo: bfd.c $(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h libcoff.h \
-  libecoff.h $(INCDIR)/coff/ecoff.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
-cache.lo: cache.c
-coffgen.lo: coffgen.c $(INCDIR)/coff/internal.h libcoff.h \
-  $(INCDIR)/bfdlink.h
-corefile.lo: corefile.c
-format.lo: format.c
-init.lo: init.c
-libbfd.lo: libbfd.c
-opncls.lo: opncls.c $(INCDIR)/objalloc.h
-reloc.lo: reloc.c $(INCDIR)/bfdlink.h
-section.lo: section.c $(INCDIR)/bfdlink.h
-syms.lo: syms.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def
-targets.lo: targets.c $(INCDIR)/fnmatch.h targmatch.h
-hash.lo: hash.c $(INCDIR)/objalloc.h
-linker.lo: linker.c $(INCDIR)/bfdlink.h genlink.h
-srec.lo: srec.c $(INCDIR)/libiberty.h
-binary.lo: binary.c
-tekhex.lo: tekhex.c $(INCDIR)/libiberty.h
-ihex.lo: ihex.c $(INCDIR)/libiberty.h
-stabs.lo: stabs.c $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
-stab-syms.lo: stab-syms.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab.def
-cpu-a29k.lo: cpu-a29k.c
-cpu-alpha.lo: cpu-alpha.c
-cpu-arc.lo: cpu-arc.c
-cpu-arm.lo: cpu-arm.c
-cpu-d10v.lo: cpu-d10v.c
-cpu-d30v.lo: cpu-d30v.c
-cpu-fr30.lo: cpu-fr30.c
-cpu-h8300.lo: cpu-h8300.c
-cpu-h8500.lo: cpu-h8500.c
-cpu-hppa.lo: cpu-hppa.c
-cpu-i386.lo: cpu-i386.c
-cpu-i860.lo: cpu-i860.c
-cpu-i960.lo: cpu-i960.c
-cpu-m32r.lo: cpu-m32r.c
-cpu-m68k.lo: cpu-m68k.c
-cpu-m88k.lo: cpu-m88k.c
-cpu-m10200.lo: cpu-m10200.c
-cpu-m10300.lo: cpu-m10300.c
-cpu-mcore.lo: cpu-mcore.c
-cpu-mips.lo: cpu-mips.c
-cpu-ns32k.lo: cpu-ns32k.c ns32k.h
-cpu-powerpc.lo: cpu-powerpc.c
-cpu-rs6000.lo: cpu-rs6000.c
-cpu-sh.lo: cpu-sh.c
-cpu-sparc.lo: cpu-sparc.c
-cpu-tic30.lo: cpu-tic30.c
-cpu-tic80.lo: cpu-tic80.c
-cpu-v850.lo: cpu-v850.c
-cpu-vax.lo: cpu-vax.c
-cpu-we32k.lo: cpu-we32k.c
-cpu-w65.lo: cpu-w65.c
-cpu-z8k.lo: cpu-z8k.c
-aout-adobe.lo: aout-adobe.c $(INCDIR)/aout/adobe.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h \
-  $(INCDIR)/bfdlink.h
-aout-arm.lo: aout-arm.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aoutx.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-aout-ns32k.lo: aout-ns32k.c $(INCDIR)/aout/aout64.h \
-  ns32k.h libaout.h $(INCDIR)/bfdlink.h
-aout-sparcle.lo: aout-sparcle.c $(INCDIR)/bfdlink.h \
-  libaout.h aoutf1.h $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-aout-tic30.lo: aout-tic30.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h aoutx.h
-aout0.lo: aout0.c aoutf1.h $(INCDIR)/aout/sun4.h libaout.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-aout32.lo: aout32.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h
-bout.lo: bout.c $(INCDIR)/bfdlink.h genlink.h $(INCDIR)/bout.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h
-cf-i386lynx.lo: cf-i386lynx.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/coff/sparc.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-a29k.lo: coff-a29k.c $(INCDIR)/coff/a29k.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-apollo.lo: coff-apollo.c $(INCDIR)/coff/apollo.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-arm.lo: coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-aux.lo: coff-aux.c $(INCDIR)/coff/aux-coff.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/m68k.h coff-m68k.c libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-h8300.lo: coff-h8300.c $(INCDIR)/bfdlink.h genlink.h \
-  $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h libcoff.h \
-  coffcode.h coffswap.h
-coff-h8500.lo: coff-h8500.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/h8500.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-i386.lo: coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-i860.lo: coff-i860.c $(INCDIR)/coff/i860.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-go32.lo: coff-go32.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-i960.lo: coff-i960.c $(INCDIR)/coff/i960.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-m68k.lo: coff-m68k.c $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-m88k.lo: coff-m88k.c $(INCDIR)/coff/m88k.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-mips.lo: coff-mips.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/mips.h libcoff.h libecoff.h coffswap.h \
-  ecoffswap.h
-coff-pmac.lo: coff-pmac.c coff-rs6000.c $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-rs6000.lo: coff-rs6000.c $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-sh.lo: coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-sparc.lo: coff-sparc.c $(INCDIR)/coff/sparc.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-stgo32.lo: coff-stgo32.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/go32exe.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h \
-  go32stub.h
-coff-svm68k.lo: coff-svm68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-tic30.lo: coff-tic30.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic30.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic80.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-u68k.lo: coff-u68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-we32k.lo: coff-we32k.c $(INCDIR)/coff/we32k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-w65.lo: coff-w65.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/w65.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-z8k.lo: coff-z8k.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/z8k.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-cofflink.lo: cofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  libcoff.h
-dwarf2.lo: dwarf2.c $(INCDIR)/libiberty.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf2.h
-ecoff.lo: ecoff.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/ar.h \
-  $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  libcoff.h libecoff.h
-ecofflink.lo: ecofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/objalloc.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  libcoff.h libecoff.h
-elf.lo: elf.c $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
-elf32-arc.lo: elf32-arc.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elfarm-oabi.lo: elfarm-oabi.c $(INCDIR)/elf/arm-oabi.h \
-  $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-arm.h elf32-target.h
-elfarm-nabi.lo: elfarm-nabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \
-  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h elf32-arm.h \
-  elf32-target.h
-elf32-d10v.lo: elf32-d10v.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-fr30.lo: elf32-fr30.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/fr30.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-gen.lo: elf32-gen.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-hppa.lo: elf32-hppa.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  elf32-hppa.h libhppa.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h \
-  hppa_stubs.h elf32-target.h
-elf32-i386.lo: elf32-i386.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/i386.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-i860.lo: elf32-i860.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-m32r.lo: elf32-m32r.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/m32r.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-m68k.lo: elf32-m68k.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-m88k.lo: elf32-m88k.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf-m10200.lo: elf-m10200.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf-m10300.lo: elf-m10300.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-target.h
-elf32-mcore.lo: elf32-mcore.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/mcore.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-target.h
-elf32-mips.lo: elf32-mips.c $(INCDIR)/bfdlink.h genlink.h \
-  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h ecoffswap.h \
-  elf32-target.h
-elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-sparc.lo: elf32-sparc.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-target.h
-elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/v850.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  elfcore.h elflink.h
-elflink.lo: elflink.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
-hp300bsd.lo: hp300bsd.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-hp300hpux.lo: hp300hpux.c $(INCDIR)/aout/hp300hpux.h \
-  aoutx.h $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-som.lo: som.c
-i386aout.lo: i386aout.c $(INCDIR)/aout/aout64.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386bsd.lo: i386bsd.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386dynix.lo: i386dynix.c $(INCDIR)/aout/dynix3.h aoutx.h \
-  $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-i386freebsd.lo: i386freebsd.c freebsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386linux.lo: i386linux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-i386lynx.lo: i386lynx.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386msdos.lo: i386msdos.c libaout.h $(INCDIR)/bfdlink.h
-i386netbsd.lo: i386netbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386mach3.lo: i386mach3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-i386os9k.lo: i386os9k.c $(INCDIR)/bfdlink.h libaout.h \
-  $(INCDIR)/os9k.h
-ieee.lo: ieee.c $(INCDIR)/ieee.h libieee.h
-m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-m68klinux.lo: m68klinux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-m68klynx.lo: m68klynx.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-m68knetbsd.lo: m68knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-m88kmach3.lo: m88kmach3.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-mipsbsd.lo: mipsbsd.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-newsos3.lo: newsos3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-nlm.lo: nlm.c libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h
-nlm32-i386.lo: nlm32-i386.c $(INCDIR)/nlm/i386-ext.h \
-  libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h
-nlm32-sparc.lo: nlm32-sparc.c $(INCDIR)/nlm/sparc32-ext.h \
-  libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h
-nlm32-ppc.lo: nlm32-ppc.c $(INCDIR)/nlm/ppc-ext.h libnlm.h \
-  $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \
-  nlmswap.h nlm-target.h
-nlm32.lo: nlm32.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \
-  $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h
-ns32knetbsd.lo: ns32knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-oasys.lo: oasys.c $(INCDIR)/oasys.h liboasys.h
-pc532-mach.lo: pc532-mach.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-pe-arm.lo: pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-arm.lo: pei-arm.c coff-arm.c $(INCDIR)/coff/arm.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pe-i386.lo: pe-i386.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-i386.lo: pei-i386.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pe-mcore.lo: pe-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-mcore.lo: pei-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pe-ppc.lo: pe-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-ppc.lo: pei-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-ppcboot.lo: ppcboot.c
-reloc16.lo: reloc16.c $(INCDIR)/bfdlink.h genlink.h \
-  $(INCDIR)/coff/internal.h libcoff.h
-riscix.lo: riscix.c libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \
-  aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h
-sparclinux.lo: sparclinux.c $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  libaout.h $(INCDIR)/bfdlink.h aout-target.h
-sparclynx.lo: sparclynx.c $(INCDIR)/aout/sun4.h libaout.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-sparcnetbsd.lo: sparcnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \
-  $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-vaxnetbsd.lo: vaxnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-versados.lo: versados.c $(INCDIR)/libiberty.h
-vms.lo: vms.c $(INCDIR)/bfdlink.h vms.h
-vms-gsd.lo: vms-gsd.c $(INCDIR)/bfdlink.h vms.h
-vms-hdr.lo: vms-hdr.c $(INCDIR)/bfdlink.h vms.h
-vms-misc.lo: vms-misc.c $(INCDIR)/bfdlink.h vms.h
-vms-tir.lo: vms-tir.c $(INCDIR)/bfdlink.h vms.h
-xcofflink.lo: xcofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  libcoff.h
-aout64.lo: aout64.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h
-coff-alpha.lo: coff-alpha.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h libcoff.h \
-  libecoff.h coffswap.h ecoffswap.h
-demo64.lo: demo64.c aoutf1.h $(INCDIR)/aout/sun4.h \
-  libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-elf64-alpha.lo: elf64-alpha.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \
-  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h \
-  libcoff.h libecoff.h ecoffswap.h elf64-target.h
-elf64-gen.lo: elf64-gen.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf64-target.h
-elf64-mips.lo: elf64-mips.c $(INCDIR)/aout/ar.h $(INCDIR)/bfdlink.h \
-  genlink.h elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h ecoffswap.h \
-  elf64-target.h
-elf64-sparc.lo: elf64-sparc.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \
-  elf64-target.h
-elf64.lo: elf64.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  elfcore.h elflink.h
-nlm32-alpha.lo: nlm32-alpha.c $(INCDIR)/nlm/alpha-ext.h \
-  libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h
-nlm64.lo: nlm64.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \
-  $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h
-aix386-core.lo: aix386-core.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h
-hpux-core.lo: hpux-core.c
-irix-core.lo: irix-core.c
-lynx-core.lo: lynx-core.c
-osf-core.lo: osf-core.c
-sco5-core.lo: sco5-core.c libaout.h $(INCDIR)/bfdlink.h
-trad-core.lo: trad-core.c libaout.h $(INCDIR)/bfdlink.h \
-  hosts/i386linux.h
-cisco-core.lo: cisco-core.c
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
deleted file mode 100644
index 9258df13b2f..00000000000
--- a/bfd/Makefile.in
+++ /dev/null
@@ -1,1599 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = .
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-BFD_HOST_64BIT_LONG = @BFD_HOST_64BIT_LONG@
-BFD_HOST_64_BIT = @BFD_HOST_64_BIT@
-BFD_HOST_64_BIT_DEFINED = @BFD_HOST_64_BIT_DEFINED@
-BFD_HOST_U_64_BIT = @BFD_HOST_U_64_BIT@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CC_FOR_BUILD = @CC_FOR_BUILD@
-COREFILE = @COREFILE@
-COREFLAG = @COREFLAG@
-DATADIRNAME = @DATADIRNAME@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-HDEFINES = @HDEFINES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-NM = @NM@
-PACKAGE = @PACKAGE@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-TDEFINES = @TDEFINES@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-VERSION = @VERSION@
-WIN32LDFLAGS = @WIN32LDFLAGS@
-WIN32LIBADD = @WIN32LIBADD@
-all_backends = @all_backends@
-bfd_backends = @bfd_backends@
-bfd_machines = @bfd_machines@
-l = @l@
-tdefaults = @tdefaults@
-wordsize = @wordsize@
-
-AUTOMAKE_OPTIONS = cygnus
-
-INCDIR = $(srcdir)/../include
-CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
-DEP = mkdep
-
-SUBDIRS = doc po
-
-docdir = doc
-
-lib_LTLIBRARIES = libbfd.la
-
-# bfd.h goes here, for now
-BFD_H = bfd.h
-
-# Jim Kingdon notes:
-# Writing S-records should be included in all (or at least most)
-# *-*-coff, *-*-aout, etc., configurations, because people will want to
-# be able to use objcopy to create S-records.  (S-records are not useful
-# for the debugger, so if you are downloading things as S-records you
-# need two copies of the executable, one to download and one for the
-# debugger).
-BFD_LIBS = \
-	archive.lo archures.lo bfd.lo cache.lo coffgen.lo corefile.lo \
-	format.lo init.lo libbfd.lo opncls.lo reloc.lo \
-	section.lo syms.lo targets.lo hash.lo linker.lo \
-	srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo
-
-
-BFD_LIBS_CFILES = \
-	archive.c archures.c bfd.c cache.c coffgen.c corefile.c \
-	format.c init.c libbfd.c opncls.c reloc.c \
-	section.c syms.c targets.c hash.c linker.c \
-	srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c
-
-
-# This list is alphabetized to make it easier to keep in sync
-# with the decls and initializer in archures.c.
-ALL_MACHINES = \
-	cpu-a29k.lo \
-	cpu-alpha.lo \
-	cpu-arc.lo \
-	cpu-arm.lo \
-	cpu-d10v.lo \
-	cpu-d30v.lo \
-	cpu-fr30.lo \
-	cpu-h8300.lo \
-	cpu-h8500.lo \
-	cpu-hppa.lo \
-	cpu-i386.lo \
-	cpu-i860.lo \
-	cpu-i960.lo \
-	cpu-m32r.lo \
-	cpu-m68k.lo \
-	cpu-m88k.lo \
-	cpu-m10200.lo \
-	cpu-m10300.lo \
-	cpu-mcore.lo \
-	cpu-mips.lo \
-	cpu-ns32k.lo \
-	cpu-powerpc.lo \
-	cpu-rs6000.lo \
-	cpu-sh.lo \
-	cpu-sparc.lo \
-	cpu-tic30.lo \
-	cpu-tic80.lo \
-	cpu-v850.lo \
-	cpu-vax.lo \
-	cpu-we32k.lo \
-	cpu-w65.lo \
-	cpu-z8k.lo
-
-
-ALL_MACHINES_CFILES = \
-	cpu-a29k.c \
-	cpu-alpha.c \
-	cpu-arc.c \
-	cpu-arm.c \
-	cpu-d10v.c \
-	cpu-d30v.c \
-	cpu-fr30.c \
-	cpu-h8300.c \
-	cpu-h8500.c \
-	cpu-hppa.c \
-	cpu-i386.c \
-	cpu-i860.c \
-	cpu-i960.c \
-	cpu-m32r.c \
-	cpu-m68k.c \
-	cpu-m88k.c \
-	cpu-m10200.c \
-	cpu-m10300.c \
-	cpu-mcore.c \
-	cpu-mips.c \
-	cpu-ns32k.c \
-	cpu-powerpc.c \
-	cpu-rs6000.c \
-	cpu-sh.c \
-	cpu-sparc.c \
-	cpu-tic30.c \
-	cpu-tic80.c \
-	cpu-v850.c \
-	cpu-vax.c \
-	cpu-we32k.c \
-	cpu-w65.c \
-	cpu-z8k.c
-
-
-# The .o files needed by all of the 32 bit vectors that are configured into
-# target_vector in targets.c if configured with --enable-targets=all.
-BFD32_BACKENDS = \
-	aout-adobe.lo \
-	aout-arm.lo \
-	aout-ns32k.lo \
-	aout-sparcle.lo \
-	aout-tic30.lo \
-	aout0.lo \
-	aout32.lo \
-	bout.lo \
-	cf-i386lynx.lo \
-	cf-m68klynx.lo \
-	cf-sparclynx.lo \
-	coff-a29k.lo \
-	coff-apollo.lo \
-	coff-arm.lo \
-	coff-aux.lo \
-	coff-h8300.lo \
-	coff-h8500.lo \
-	coff-i386.lo \
-	coff-go32.lo \
-	coff-i860.lo \
-	coff-i960.lo \
-	coff-m68k.lo \
-	coff-m88k.lo \
-	coff-mips.lo \
-	coff-pmac.lo \
-	coff-rs6000.lo \
-	coff-sh.lo \
-	coff-sparc.lo \
-	coff-stgo32.lo \
-	coff-svm68k.lo \
-	coff-tic30.lo \
-	coff-tic80.lo \
-	coff-u68k.lo \
-	coff-we32k.lo \
-	coff-w65.lo \
-	coff-z8k.lo \
-	cofflink.lo \
-	dwarf2.lo \
-	ecoff.lo \
-	ecofflink.lo \
-	elf.lo \
-	elf32-arc.lo \
-	elfarm-oabi.lo \
-	elfarm-nabi.lo \
-	elf32-d10v.lo \
-	elf32-d30v.lo \
-	elf32-fr30.lo \
-	elf32-gen.lo \
-	elf32-hppa.lo \
-	elf32-i386.lo \
-	elf32-i860.lo \
-	elf32-m32r.lo \
-	elf32-m68k.lo \
-	elf32-m88k.lo \
-	elf-m10200.lo \
-	elf-m10300.lo \
-	elf32-mcore.lo \
-	elf32-mips.lo \
-	elf32-ppc.lo \
-	elf32-sh.lo \
-	elf32-sparc.lo \
-	elf32-v850.lo \
-	elf32.lo \
-	elflink.lo \
-	hp300bsd.lo \
-	hp300hpux.lo \
-	som.lo \
-	i386aout.lo \
-	i386bsd.lo \
-	i386dynix.lo \
-	i386freebsd.lo \
-	i386linux.lo \
-	i386lynx.lo \
-	i386msdos.lo \
-	i386netbsd.lo \
-	i386mach3.lo \
-	i386os9k.lo \
-	ieee.lo \
-	m68k4knetbsd.lo \
-	m68klinux.lo \
-	m68klynx.lo \
-	m68knetbsd.lo \
-	m88kmach3.lo \
-	mipsbsd.lo \
-	newsos3.lo \
-	nlm.lo \
-	nlm32-i386.lo \
-	nlm32-sparc.lo \
-	nlm32-ppc.lo \
-	nlm32.lo \
-	ns32knetbsd.lo \
-	oasys.lo \
-	pc532-mach.lo \
-	pe-arm.lo \
-	pei-arm.lo \
-	pe-i386.lo \
-	pei-i386.lo \
-	pe-mcore.lo \
-	pei-mcore.lo \
-	pe-ppc.lo \
-	pei-ppc.lo \
-	ppcboot.lo \
-	reloc16.lo \
-	riscix.lo \
-	sparclinux.lo \
-	sparclynx.lo \
-	sparcnetbsd.lo \
-	sunos.lo \
-	vaxnetbsd.lo \
-	versados.lo \
-	vms.lo \
-	vms-gsd.lo \
-	vms-hdr.lo \
-	vms-misc.lo \
-	vms-tir.lo \
-	xcofflink.lo
-
-
-BFD32_BACKENDS_CFILES = \
-	aout-adobe.c \
-	aout-arm.c \
-	aout-ns32k.c \
-	aout-sparcle.c \
-	aout-tic30.c \
-	aout0.c \
-	aout32.c \
-	bout.c \
-	cf-i386lynx.c \
-	cf-m68klynx.c \
-	cf-sparclynx.c \
-	coff-a29k.c \
-	coff-apollo.c \
-	coff-arm.c \
-	coff-aux.c \
-	coff-h8300.c \
-	coff-h8500.c \
-	coff-i386.c \
-	coff-i860.c \
-	coff-go32.c \
-	coff-i960.c \
-	coff-m68k.c \
-	coff-m88k.c \
-	coff-mips.c \
-	coff-pmac.c \
-	coff-rs6000.c \
-	coff-sh.c \
-	coff-sparc.c \
-	coff-stgo32.c \
-	coff-svm68k.c \
-	coff-tic30.c \
-	coff-tic80.c \
-	coff-u68k.c \
-	coff-we32k.c \
-	coff-w65.c \
-	coff-z8k.c \
-	cofflink.c \
-	dwarf2.c \
-	ecoff.c \
-	ecofflink.c \
-	elf.c \
-	elf32-arc.c \
-	elfarm-oabi.c \
-	elfarm-nabi.c \
-	elf32-d10v.c \
-	elf32-d30v.c \
-	elf32-fr30.c \
-	elf32-gen.c \
-	elf32-hppa.c \
-	elf32-i386.c \
-	elf32-i860.c \
-	elf32-m32r.c \
-	elf32-m68k.c \
-	elf32-m88k.c \
-	elf-m10200.c \
-	elf-m10300.c \
-	elf32-mcore.c \
-	elf32-mips.c \
-	elf32-ppc.c \
-	elf32-sh.c \
-	elf32-sparc.c \
-	elf32-v850.c \
-	elf32.c \
-	elflink.c \
-	hp300bsd.c \
-	hp300hpux.c \
-	som.c \
-	i386aout.c \
-	i386bsd.c \
-	i386dynix.c \
-	i386freebsd.c \
-	i386linux.c \
-	i386lynx.c \
-	i386msdos.c \
-	i386netbsd.c \
-	i386mach3.c \
-	i386os9k.c \
-	ieee.c \
-	m68k4knetbsd.c \
-	m68klinux.c \
-	m68klynx.c \
-	m68knetbsd.c \
-	m88kmach3.c \
-	mipsbsd.c \
-	newsos3.c \
-	nlm.c \
-	nlm32-i386.c \
-	nlm32-sparc.c \
-	nlm32-ppc.c \
-	nlm32.c \
-	ns32knetbsd.c \
-	oasys.c \
-	pc532-mach.c \
-	pe-arm.c \
-	pei-arm.c \
-	pe-i386.c \
-	pei-i386.c \
-	pe-mcore.c \
-	pei-mcore.c \
-	pe-ppc.c \
-	pei-ppc.c \
-	ppcboot.c \
-	reloc16.c \
-	riscix.c \
-	sparclinux.c \
-	sparclynx.c \
-	sparcnetbsd.c \
-	sunos.c \
-	vaxnetbsd.c \
-	versados.c \
-	vms.c \
-	vms-gsd.c \
-	vms-hdr.c \
-	vms-misc.c \
-	vms-tir.c \
-	xcofflink.c
-
-
-# The .o files needed by all of the 64 bit vectors that are configured into
-# target_vector in targets.c if configured with --enable-targets=all
-# and --enable-64-bit-bfd.
-BFD64_BACKENDS = \
-	aout64.lo \
-	coff-alpha.lo \
-	demo64.lo \
-	elf64-alpha.lo \
-	elf64-gen.lo \
-	elf64-mips.lo \
-	elf64-sparc.lo \
-	elf64.lo \
-	nlm32-alpha.lo \
-	nlm64.lo
-
-
-BFD64_BACKENDS_CFILES = \
-	aout64.c \
-	coff-alpha.c \
-	demo64.c \
-	elf64-alpha.c \
-	elf64-gen.c \
-	elf64-mips.c \
-	elf64-sparc.c \
-	elf64.c \
-	nlm32-alpha.c \
-	nlm64.c
-
-
-OPTIONAL_BACKENDS = \
-	aix386-core.lo \
-	hpux-core.lo \
-	irix-core.lo \
-	lynx-core.lo \
-	osf-core.lo \
-	sco5-core.lo \
-	trad-core.lo \
-	cisco-core.lo
-
-
-OPTIONAL_BACKENDS_CFILES = \
-	aix386-core.c \
-	hpux-core.c \
-	irix-core.c \
-	lynx-core.c \
-	osf-core.c \
-	sco5-core.c \
-	trad-core.c \
-	cisco-core.c
-
-
-# These are defined by configure.in:
-WORDSIZE = @wordsize@
-ALL_BACKENDS = @all_backends@
-BFD_BACKENDS = @bfd_backends@
-BFD_MACHINES = @bfd_machines@
-TDEFAULTS = @tdefaults@
-
-INCLUDES = -D_GNU_SOURCE @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
-
-# C source files that correspond to .o's.
-CFILES = \
-	$(BFD_LIBS_CFILES) \
-	$(ALL_MACHINES_CFILES) \
-	$(BFD32_BACKENDS_CFILES) \
-	$(BFD64_BACKENDS_CFILES) \
-	$(OPTIONAL_BACKENDS_CFILES)
-
-
-SOURCE_HFILES = \
-	aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h \
-	ecoffswap.h elf32-hppa.h \
-	elfcode.h genlink.h go32stub.h hppa_stubs.h libaout.h \
-	libbfd.h libcoff.h libecoff.h elf-bfd.h libhppa.h libieee.h \
-	libnlm.h liboasys.h netbsd.h nlm-target.h nlmcode.h ns32k.h \
-	som.h vms.h
-
-
-HFILES = \
-	elf32-target.h elf64-target.h targmatch.h \
-	$(SOURCE_HFILES)
-
-
-POTFILES = $(CFILES) $(SOURCE_HFILES)
-
-# Various kinds of .o files to put in libbfd.a:
-# BFD_BACKENDS	Routines the configured targets need.
-# BFD_MACHINES	Architecture-specific routines the configured targets need.
-# COREFILE	Core file routines for a native configuration
-OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@
-
-libbfd_la_SOURCES = $(BFD_LIBS_CFILES)
-libbfd_la_DEPENDENCIES = $(OFILES) ofiles
-libbfd_la_LIBADD = `cat ofiles` @WIN32LIBADD@
-libbfd_la_LDFLAGS = -release $(VERSION) @WIN32LDFLAGS@
-
-# libtool will build .libs/libbfd.a.  We create libbfd.a in the build
-# directory so that we don't have to convert all the programs that use
-# libbfd.a simultaneously.  This is a hack which should be removed if
-# everything else starts using libtool.  FIXME.
-
-noinst_LIBRARIES = libbfd.a
-libbfd_a_SOURCES = 
-
-BFD_H_DEPS = $(INCDIR)/ansidecl.h
-LOCAL_H_DEPS = libbfd.h sysdep.h config.h
-
-BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
-	reloc.c syms.c bfd.c archive.c corefile.c targets.c format.c
-
-LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c cache.c reloc.c archures.c elf.c
-LIBCOFF_H_FILES = libcoff-in.h coffcode.h
-
-MOSTLYCLEANFILES = elf32-target.h elf64-target.h ofiles stamp-ofiles \
-	targmatch.h
-
-
-CLEANFILES = bfd.h dep.sed stmp-bfd-h .dep .dep1 libbfd.a stamp-lib \
-	stmp-bin2-h stmp-lbfd-h stmp-lcoff-h
-
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  bfd-in3.h
-LIBRARIES =  $(noinst_LIBRARIES)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I.
-CPPFLAGS = @CPPFLAGS@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-libbfd_a_LIBADD = 
-libbfd_a_OBJECTS = 
-LTLIBRARIES =  $(lib_LTLIBRARIES)
-
-libbfd_la_OBJECTS =  archive.lo archures.lo bfd.lo cache.lo coffgen.lo \
-corefile.lo format.lo init.lo libbfd.lo opncls.lo reloc.lo section.lo \
-syms.lo targets.lo hash.lo linker.lo srec.lo binary.lo tekhex.lo \
-ihex.lo stabs.lo stab-syms.lo
-CFLAGS = @CFLAGS@
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  README ./stamp-h.in COPYING ChangeLog Makefile.am \
-Makefile.in TODO acinclude.m4 aclocal.m4 bfd-in2.h config.in configure \
-configure.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-SOURCES = $(libbfd_a_SOURCES) $(libbfd_la_SOURCES)
-OBJECTS = $(libbfd_a_OBJECTS) $(libbfd_la_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in  acinclude.m4
-	cd $(srcdir) && $(ACLOCAL)
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
-	cd $(srcdir) && $(AUTOCONF)
-
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h:config.in \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.in: @MAINTAINER_MODE_TRUE@$(srcdir)/stamp-h.in
-	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
-	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
-
-mostlyclean-hdr:
-
-clean-hdr:
-
-distclean-hdr:
-	-rm -f config.h
-
-maintainer-clean-hdr:
-bfd-in3.h: $(top_builddir)/config.status bfd-in2.h
-	cd $(top_builddir) && CONFIG_FILES=$@:bfd-in2.h CONFIG_HEADERS= $(SHELL) ./config.status
-
-mostlyclean-noinstLIBRARIES:
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-distclean-noinstLIBRARIES:
-
-maintainer-clean-noinstLIBRARIES:
-
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
-
-mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
-
-distclean-compile:
-	-rm -f *.tab.c
-
-maintainer-clean-compile:
-
-.c.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.s.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-.S.lo:
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-
-maintainer-clean-libtool:
-
-mostlyclean-libLTLIBRARIES:
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-
-distclean-libLTLIBRARIES:
-
-maintainer-clean-libLTLIBRARIES:
-
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "$(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \
-	    $(LIBTOOL)  --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
-	done
-
-libbfd.la: $(libbfd_la_OBJECTS) $(libbfd_la_DEPENDENCIES)
-	$(LINK) -rpath $(libdir) $(libbfd_la_LDFLAGS) $(libbfd_la_OBJECTS) $(libbfd_la_LIBADD) $(LIBS)
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive install-info-recursive \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
-	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" = "." && dot_seen=yes; \
-	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-
-tags: TAGS
-
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.in $(TAGS_DEPENDENCIES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
-	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(ETAGS_ARGS)config.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.in $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
-
-clean-tags:
-
-distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-distdir: $(DISTFILES)
-	-rm -rf $(distdir)
-	mkdir $(distdir)
-	-chmod 777 $(distdir)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	for subdir in $(SUBDIRS); do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d $(distdir)/$$subdir \
-	    || mkdir $(distdir)/$$subdir \
-	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
-check-am:
-check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-info-am: 
-install-info: install-info-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-install-exec-am: install-libLTLIBRARIES
-install-exec: install-exec-recursive
-
-install-data-am: install-data-local
-install-data: install-data-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am: uninstall-libLTLIBRARIES
-uninstall: uninstall-recursive
-all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-	$(mkinstalldirs)  $(DESTDIR)$(libdir)
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-
-maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
-		mostlyclean-compile mostlyclean-libtool \
-		mostlyclean-libLTLIBRARIES mostlyclean-tags \
-		mostlyclean-generic
-
-mostlyclean: mostlyclean-recursive
-
-clean-am:  clean-hdr clean-noinstLIBRARIES clean-compile clean-libtool \
-		clean-libLTLIBRARIES clean-tags clean-generic \
-		mostlyclean-am
-
-clean: clean-recursive
-
-distclean-am:  distclean-hdr distclean-noinstLIBRARIES distclean-compile \
-		distclean-libtool distclean-libLTLIBRARIES \
-		distclean-tags distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-recursive
-	-rm -f config.status
-
-maintainer-clean-am:  maintainer-clean-hdr \
-		maintainer-clean-noinstLIBRARIES \
-		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-libLTLIBRARIES maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
-clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile mostlyclean-libtool distclean-libtool \
-clean-libtool maintainer-clean-libtool mostlyclean-libLTLIBRARIES \
-distclean-libLTLIBRARIES clean-libLTLIBRARIES \
-maintainer-clean-libLTLIBRARIES uninstall-libLTLIBRARIES \
-install-libLTLIBRARIES install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-info-am \
-install-info all-recursive-am install-exec-am install-exec \
-install-data-local install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-
-
-po/POTFILES.in: @MAINT@ Makefile
-	for file in $(POTFILES); do echo $$file; done | sort > tmp \
-	  && mv tmp $(srcdir)/po/POTFILES.in
-
-diststuff: info
-
-stamp-ofiles: Makefile
-	rm -f tofiles
-	f=""; \
-	for i in $(OFILES) ; do \
-	  case " $$f " in \
-	    *" $$i "*) ;; \
-	    *) f="$$f $$i" ;; \
-	  esac ; \
-	done ; \
-	echo $$f > tofiles
-	$(SHELL) $(srcdir)/../move-if-change tofiles ofiles
-	touch stamp-ofiles
-
-ofiles: stamp-ofiles ; @true
-
-stamp-lib: libbfd.la
-	if [ -f .libs/libbfd.a ]; then \
-	  cp .libs/libbfd.a libbfd.tmp; \
-	  $(SHELL) $(srcdir)/../move-if-change libbfd.tmp libbfd.a; \
-	else true; fi
-	touch stamp-lib
-
-libbfd.a: stamp-lib ; @true
-
-# This file holds an array associating configuration triplets and
-# vector names.  It is built from config.bfd.  It is not compiled by
-# itself, but is included by targets.c.
-targmatch.h: config.bfd targmatch.sed
-	rm -f targmatch.h
-	sed -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
-	mv -f targmatch.new targmatch.h
-
-# When compiling archures.c and targets.c, supply the default target
-# info from configure.
-
-targets.lo: targets.c config.status
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $(TDEFAULTS) $(srcdir)/targets.c
-
-archures.lo: archures.c config.status
-	$(LIBTOOL) --mode=compile $(COMPILE) -c $(TDEFAULTS) $(srcdir)/archures.c
-
-elf32-target.h : elfxx-target.h
-	rm -f elf32-target.h
-	sed -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
-	mv -f elf32-target.new elf32-target.h
-
-elf64-target.h : elfxx-target.h
-	rm -f elf64-target.h
-	sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
-	mv -f elf64-target.new elf64-target.h
-$(BFD_LIBS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-$(BFD_MACHINES): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-$(BFD_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-$(OPTIONAL_BACKENDS): $(BFD_H) $(BFD_H_DEPS) $(LOCAL_H_DEPS)
-
-# Install BFD include file, and others that it needs.
-install-data-local: $(BFD_H)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(includedir)
-	$(INSTALL_DATA) $(BFD_H) $(includedir)/bfd.h
-	$(INSTALL_DATA) $(INCDIR)/ansidecl.h $(includedir)/ansidecl.h
-	$(INSTALL_DATA) $(INCDIR)/bfdlink.h $(includedir)/bfdlink.h
-
-# Have to get rid of .dep1 here so that "$?" later includes all of $(CFILES).
-.dep: dep.sed $(CFILES) $(HFILES) bfd.h
-	rm -f .dep1
-	$(MAKE) DEP=$(DEP) .dep1
-	sed -f dep.sed <.dep1 >.dep
-
-# This rule really wants a mkdep that runs "gcc -MM".
-# The NetBSD mkdep overwrites any existing file contents, and doesn't insert
-# the "DO NOT DELETE" line.
-# Other mkdep versions require a file that already exists, and do insert it.
-# Hence the weirdness....
-.dep1: $(CFILES)
-	rm -f .dep2 .dep2a
-	echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > .dep2
-	echo > .dep2a
-	$(DEP) -f .dep2a $(INCLUDES) $(CFLAGS) $?
-	sed -e '/DO NOT DELETE/d' -e '/^$$/d' < .dep2a >> .dep2
-	rm -f .dep2a
-	$(SHELL) $(srcdir)/../move-if-change .dep2 .dep1
-
-dep.sed: dep-in.sed config.status
-	sed <$(srcdir)/dep-in.sed >dep.sed	\
-		-e 's!@BFD_H@!$(BFD_H)!'	\
-		-e 's!@INCDIR@!$(INCDIR)!'	\
-		-e 's!@SRCDIR@!$(srcdir)!'
-
-dep: .dep
-	sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < Makefile > tmp-Makefile
-	cat .dep >> tmp-Makefile
-	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile Makefile
-
-dep-in: .dep
-	sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.in > tmp-Makefile.in
-	cat .dep >> tmp-Makefile.in
-	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.in $(srcdir)/Makefile.in
-
-dep-am: .dep
-	sed -e '/^..DO NOT DELETE THIS LINE/,$$d' < $(srcdir)/Makefile.am > tmp-Makefile.am
-	cat .dep >> tmp-Makefile.am
-	$(SHELL) $(srcdir)/../move-if-change tmp-Makefile.am $(srcdir)/Makefile.am
-
-host-aout.lo: Makefile
-
-# The following program can be used to generate a simple config file
-# which can be folded into an h-XXX file for a new host, with some editing.
-aout-params.h: gen-aout
-	./gen-aout host > aout-params.h
-gen-aout: $(srcdir)/gen-aout.c Makefile
-	$(CC) -o gen-aout $(CFLAGS) $(LFLAGS) $(srcdir)/gen-aout.c
-
-$(BFD_H): stmp-bfd-h ; @true
-
-stmp-bfd-h: bfd-in3.h
-	rm -f bfd-tmp.h
-	cp bfd-in3.h bfd-tmp.h
-	$(SHELL) $(srcdir)/../move-if-change bfd-tmp.h $(BFD_H)
-	rm -f bfd-tmp.h
-	touch stmp-bfd-h
-
-# Could really use a "copy-if-change"...
-headers:
-	(cd $(docdir); $(MAKE) protos $(FLAGS_TO_PASS))
-	cp $(docdir)/bfd.h bfd-in2.h-new
-	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
-	cp $(docdir)/libbfd.h libbfd.h-new
-	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
-	cp $(docdir)/libcoff.h libcoff.h-new
-	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
-
-# We only rebuild the header files automatically if we have been
-# configured with --enable-maintainer-mode.
-
-$(srcdir)/bfd-in2.h: @MAINT@ stmp-bin2-h ; @true
-stmp-bin2-h: $(BFD_H_FILES)
-	(cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) bfd.h)
-	cp $(docdir)/bfd.h bfd-in2.h-new
-	$(SHELL) $(srcdir)/../move-if-change bfd-in2.h-new $(srcdir)/bfd-in2.h
-	touch stmp-bin2-h
-
-$(srcdir)/libbfd.h: @MAINT@ stmp-lbfd-h ; @true
-stmp-lbfd-h: $(LIBBFD_H_FILES)
-	(cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libbfd.h)
-	cp $(docdir)/libbfd.h libbfd.h-new
-	$(SHELL) $(srcdir)/../move-if-change libbfd.h-new $(srcdir)/libbfd.h
-	touch stmp-lbfd-h
-
-$(srcdir)/libcoff.h: @MAINT@ stmp-lcoff-h ; @true
-stmp-lcoff-h: $(LIBCOFF_H_FILES)
-	(cd $(docdir); $(MAKE) $(FLAGS_TO_PASS) libcoff.h)
-	cp $(docdir)/libcoff.h libcoff.h-new
-	$(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
-	touch stmp-lcoff-h
-
-# We want to rerun configure if config.bfd or configure.host change.
-config.status: $(srcdir)/configure $(srcdir)/config.bfd $(srcdir)/configure.host
-	$(SHELL) ./config.status --recheck
-
-
-elfarm-oabi.lo: elfarm-oabi.c elf32-arm.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-
-# What appears below is generated by a hacked mkdep using gcc -MM.
-elfarm-nabi.lo: elfarm-nabi.c elf32-arm.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-
-# What appears below is generated by a hacked mkdep using gcc -MM.
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-archive.lo: archive.c $(INCDIR)/aout/ar.h $(INCDIR)/aout/ranlib.h
-archures.lo: archures.c
-bfd.lo: bfd.c $(INCDIR)/libiberty.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h libcoff.h \
-  libecoff.h $(INCDIR)/coff/ecoff.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
-cache.lo: cache.c
-coffgen.lo: coffgen.c $(INCDIR)/coff/internal.h libcoff.h \
-  $(INCDIR)/bfdlink.h
-corefile.lo: corefile.c
-format.lo: format.c
-init.lo: init.c
-libbfd.lo: libbfd.c
-opncls.lo: opncls.c $(INCDIR)/objalloc.h
-reloc.lo: reloc.c $(INCDIR)/bfdlink.h
-section.lo: section.c $(INCDIR)/bfdlink.h
-syms.lo: syms.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def
-targets.lo: targets.c $(INCDIR)/fnmatch.h targmatch.h
-hash.lo: hash.c $(INCDIR)/objalloc.h
-linker.lo: linker.c $(INCDIR)/bfdlink.h genlink.h
-srec.lo: srec.c $(INCDIR)/libiberty.h
-binary.lo: binary.c
-tekhex.lo: tekhex.c $(INCDIR)/libiberty.h
-ihex.lo: ihex.c $(INCDIR)/libiberty.h
-stabs.lo: stabs.c $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
-stab-syms.lo: stab-syms.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab.def
-cpu-a29k.lo: cpu-a29k.c
-cpu-alpha.lo: cpu-alpha.c
-cpu-arc.lo: cpu-arc.c
-cpu-arm.lo: cpu-arm.c
-cpu-d10v.lo: cpu-d10v.c
-cpu-d30v.lo: cpu-d30v.c
-cpu-fr30.lo: cpu-fr30.c
-cpu-h8300.lo: cpu-h8300.c
-cpu-h8500.lo: cpu-h8500.c
-cpu-hppa.lo: cpu-hppa.c
-cpu-i386.lo: cpu-i386.c
-cpu-i860.lo: cpu-i860.c
-cpu-i960.lo: cpu-i960.c
-cpu-m32r.lo: cpu-m32r.c
-cpu-m68k.lo: cpu-m68k.c
-cpu-m88k.lo: cpu-m88k.c
-cpu-m10200.lo: cpu-m10200.c
-cpu-m10300.lo: cpu-m10300.c
-cpu-mcore.lo: cpu-mcore.c
-cpu-mips.lo: cpu-mips.c
-cpu-ns32k.lo: cpu-ns32k.c ns32k.h
-cpu-powerpc.lo: cpu-powerpc.c
-cpu-rs6000.lo: cpu-rs6000.c
-cpu-sh.lo: cpu-sh.c
-cpu-sparc.lo: cpu-sparc.c
-cpu-tic30.lo: cpu-tic30.c
-cpu-tic80.lo: cpu-tic80.c
-cpu-v850.lo: cpu-v850.c
-cpu-vax.lo: cpu-vax.c
-cpu-we32k.lo: cpu-we32k.c
-cpu-w65.lo: cpu-w65.c
-cpu-z8k.lo: cpu-z8k.c
-aout-adobe.lo: aout-adobe.c $(INCDIR)/aout/adobe.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h \
-  $(INCDIR)/bfdlink.h
-aout-arm.lo: aout-arm.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aoutx.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-aout-ns32k.lo: aout-ns32k.c $(INCDIR)/aout/aout64.h \
-  ns32k.h libaout.h $(INCDIR)/bfdlink.h
-aout-sparcle.lo: aout-sparcle.c $(INCDIR)/bfdlink.h \
-  libaout.h aoutf1.h $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-aout-tic30.lo: aout-tic30.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h aoutx.h
-aout0.lo: aout0.c aoutf1.h $(INCDIR)/aout/sun4.h libaout.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-aout32.lo: aout32.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h
-bout.lo: bout.c $(INCDIR)/bfdlink.h genlink.h $(INCDIR)/bout.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def libaout.h
-cf-i386lynx.lo: cf-i386lynx.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-cf-m68klynx.lo: cf-m68klynx.c coff-m68k.c $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-cf-sparclynx.lo: cf-sparclynx.c coff-sparc.c $(INCDIR)/coff/sparc.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-a29k.lo: coff-a29k.c $(INCDIR)/coff/a29k.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-apollo.lo: coff-apollo.c $(INCDIR)/coff/apollo.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-arm.lo: coff-arm.c $(INCDIR)/coff/arm.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-aux.lo: coff-aux.c $(INCDIR)/coff/aux-coff.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/m68k.h coff-m68k.c libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-h8300.lo: coff-h8300.c $(INCDIR)/bfdlink.h genlink.h \
-  $(INCDIR)/coff/h8300.h $(INCDIR)/coff/internal.h libcoff.h \
-  coffcode.h coffswap.h
-coff-h8500.lo: coff-h8500.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/h8500.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-i386.lo: coff-i386.c $(INCDIR)/coff/i386.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-i860.lo: coff-i860.c $(INCDIR)/coff/i860.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-go32.lo: coff-go32.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-i960.lo: coff-i960.c $(INCDIR)/coff/i960.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-m68k.lo: coff-m68k.c $(INCDIR)/coff/m68k.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-m88k.lo: coff-m88k.c $(INCDIR)/coff/m88k.h $(INCDIR)/coff/internal.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h
-coff-mips.lo: coff-mips.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/mips.h libcoff.h libecoff.h coffswap.h \
-  ecoffswap.h
-coff-pmac.lo: coff-pmac.c coff-rs6000.c $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-rs6000.lo: coff-rs6000.c $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/rs6000.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-sh.lo: coff-sh.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/sh.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-sparc.lo: coff-sparc.c $(INCDIR)/coff/sparc.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-stgo32.lo: coff-stgo32.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/go32exe.h \
-  libcoff.h $(INCDIR)/bfdlink.h coffcode.h coffswap.h \
-  go32stub.h
-coff-svm68k.lo: coff-svm68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-tic30.lo: coff-tic30.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic30.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-tic80.lo: coff-tic80.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/tic80.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-u68k.lo: coff-u68k.c coff-m68k.c $(INCDIR)/coff/m68k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-we32k.lo: coff-we32k.c $(INCDIR)/coff/we32k.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h \
-  coffcode.h coffswap.h
-coff-w65.lo: coff-w65.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/w65.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-coff-z8k.lo: coff-z8k.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/z8k.h \
-  $(INCDIR)/coff/internal.h libcoff.h coffcode.h coffswap.h
-cofflink.lo: cofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  libcoff.h
-dwarf2.lo: dwarf2.c $(INCDIR)/libiberty.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/elf/dwarf2.h
-ecoff.lo: ecoff.c $(INCDIR)/bfdlink.h $(INCDIR)/aout/ar.h \
-  $(INCDIR)/aout/ranlib.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  libaout.h $(INCDIR)/aout/aout64.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  libcoff.h libecoff.h
-ecofflink.lo: ecofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/objalloc.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  libcoff.h libecoff.h
-elf.lo: elf.c $(INCDIR)/bfdlink.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
-elf32-arc.lo: elf32-arc.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/arc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elfarm-oabi.lo: elfarm-oabi.c $(INCDIR)/elf/arm-oabi.h \
-  $(INCDIR)/elf/reloc-macros.h elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-arm.h elf32-target.h
-elfarm-nabi.lo: elfarm-nabi.c $(INCDIR)/elf/arm.h $(INCDIR)/elf/reloc-macros.h \
-  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h elf32-arm.h \
-  elf32-target.h
-elf32-d10v.lo: elf32-d10v.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-d30v.lo: elf32-d30v.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-fr30.lo: elf32-fr30.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/fr30.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-gen.lo: elf32-gen.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-hppa.lo: elf32-hppa.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  elf32-hppa.h libhppa.h $(INCDIR)/elf/hppa.h $(INCDIR)/elf/reloc-macros.h \
-  hppa_stubs.h elf32-target.h
-elf32-i386.lo: elf32-i386.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/i386.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-i860.lo: elf32-i860.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf32-m32r.lo: elf32-m32r.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/m32r.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-m68k.lo: elf32-m68k.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/m68k.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-m88k.lo: elf32-m88k.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf-m10200.lo: elf-m10200.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf32-target.h
-elf-m10300.lo: elf-m10300.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/mn10300.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-target.h
-elf32-mcore.lo: elf32-mcore.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/mcore.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-target.h
-elf32-mips.lo: elf32-mips.c $(INCDIR)/bfdlink.h genlink.h \
-  elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/mips.h ecoffswap.h \
-  elf32-target.h
-elf32-ppc.lo: elf32-ppc.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/ppc.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-sh.lo: elf32-sh.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/sh.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32-sparc.lo: elf32-sparc.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \
-  elf32-target.h
-elf32-v850.lo: elf32-v850.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  $(INCDIR)/elf/v850.h $(INCDIR)/elf/reloc-macros.h elf32-target.h
-elf32.lo: elf32.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  elfcore.h elflink.h
-elflink.lo: elflink.c $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
-hp300bsd.lo: hp300bsd.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-hp300hpux.lo: hp300hpux.c $(INCDIR)/aout/hp300hpux.h \
-  aoutx.h $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-som.lo: som.c
-i386aout.lo: i386aout.c $(INCDIR)/aout/aout64.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386bsd.lo: i386bsd.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386dynix.lo: i386dynix.c $(INCDIR)/aout/dynix3.h aoutx.h \
-  $(INCDIR)/bfdlink.h libaout.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-i386freebsd.lo: i386freebsd.c freebsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386linux.lo: i386linux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-i386lynx.lo: i386lynx.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386msdos.lo: i386msdos.c libaout.h $(INCDIR)/bfdlink.h
-i386netbsd.lo: i386netbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-i386mach3.lo: i386mach3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-i386os9k.lo: i386os9k.c $(INCDIR)/bfdlink.h libaout.h \
-  $(INCDIR)/os9k.h
-ieee.lo: ieee.c $(INCDIR)/ieee.h libieee.h
-m68k4knetbsd.lo: m68k4knetbsd.c netbsd.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-m68klinux.lo: m68klinux.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-m68klynx.lo: m68klynx.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-m68knetbsd.lo: m68knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-m88kmach3.lo: m88kmach3.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-mipsbsd.lo: mipsbsd.c libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-newsos3.lo: newsos3.c $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h libaout.h \
-  $(INCDIR)/bfdlink.h aout-target.h
-nlm.lo: nlm.c libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h
-nlm32-i386.lo: nlm32-i386.c $(INCDIR)/nlm/i386-ext.h \
-  libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h
-nlm32-sparc.lo: nlm32-sparc.c $(INCDIR)/nlm/sparc32-ext.h \
-  libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h
-nlm32-ppc.lo: nlm32-ppc.c $(INCDIR)/nlm/ppc-ext.h libnlm.h \
-  $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h \
-  nlmswap.h nlm-target.h
-nlm32.lo: nlm32.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \
-  $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h
-ns32knetbsd.lo: ns32knetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-oasys.lo: oasys.c $(INCDIR)/oasys.h liboasys.h
-pc532-mach.lo: pc532-mach.c libaout.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/aout/aout64.h aout-target.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-pe-arm.lo: pe-arm.c coff-arm.c $(INCDIR)/coff/arm.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-arm.lo: pei-arm.c coff-arm.c $(INCDIR)/coff/arm.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pe-i386.lo: pe-i386.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-i386.lo: pei-i386.c coff-i386.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pe-mcore.lo: pe-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-mcore.lo: pei-mcore.c coff-mcore.c $(INCDIR)/coff/mcore.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pe-ppc.lo: pe-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-pei-ppc.lo: pei-ppc.c coff-ppc.c $(INCDIR)/coff/powerpc.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/pe.h libcoff.h \
-  $(INCDIR)/bfdlink.h coffcode.h peicode.h
-ppcboot.lo: ppcboot.c
-reloc16.lo: reloc16.c $(INCDIR)/bfdlink.h genlink.h \
-  $(INCDIR)/coff/internal.h libcoff.h
-riscix.lo: riscix.c libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \
-  aout-target.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h
-sparclinux.lo: sparclinux.c $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  libaout.h $(INCDIR)/bfdlink.h aout-target.h
-sparclynx.lo: sparclynx.c $(INCDIR)/aout/sun4.h libaout.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-sparcnetbsd.lo: sparcnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-sunos.lo: sunos.c $(INCDIR)/bfdlink.h libaout.h aoutf1.h \
-  $(INCDIR)/aout/sun4.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h aout-target.h
-vaxnetbsd.lo: vaxnetbsd.c netbsd.h libaout.h $(INCDIR)/bfdlink.h \
-  aout-target.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
-  $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h
-versados.lo: versados.c $(INCDIR)/libiberty.h
-vms.lo: vms.c $(INCDIR)/bfdlink.h vms.h
-vms-gsd.lo: vms-gsd.c $(INCDIR)/bfdlink.h vms.h
-vms-hdr.lo: vms-hdr.c $(INCDIR)/bfdlink.h vms.h
-vms-misc.lo: vms-misc.c $(INCDIR)/bfdlink.h vms.h
-vms-tir.lo: vms-tir.c $(INCDIR)/bfdlink.h vms.h
-xcofflink.lo: xcofflink.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  libcoff.h
-aout64.lo: aout64.c aoutx.h $(INCDIR)/bfdlink.h libaout.h \
-  $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def \
-  $(INCDIR)/aout/ar.h
-coff-alpha.lo: coff-alpha.c $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/ecoff.h \
-  $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h libcoff.h \
-  libecoff.h coffswap.h ecoffswap.h
-demo64.lo: demo64.c aoutf1.h $(INCDIR)/aout/sun4.h \
-  libaout.h $(INCDIR)/bfdlink.h $(INCDIR)/aout/aout64.h \
-  $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def $(INCDIR)/aout/ar.h \
-  aout-target.h
-elf64-alpha.lo: elf64-alpha.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/alpha.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/coff/internal.h $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h \
-  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h $(INCDIR)/aout/ar.h \
-  libcoff.h libecoff.h ecoffswap.h elf64-target.h
-elf64-gen.lo: elf64-gen.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  elf64-target.h
-elf64-mips.lo: elf64-mips.c $(INCDIR)/aout/ar.h $(INCDIR)/bfdlink.h \
-  genlink.h elf-bfd.h $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h \
-  $(INCDIR)/elf/external.h $(INCDIR)/elf/mips.h $(INCDIR)/elf/reloc-macros.h \
-  $(INCDIR)/coff/sym.h $(INCDIR)/coff/symconst.h $(INCDIR)/coff/internal.h \
-  $(INCDIR)/coff/ecoff.h $(INCDIR)/coff/alpha.h ecoffswap.h \
-  elf64-target.h
-elf64-sparc.lo: elf64-sparc.c elf-bfd.h $(INCDIR)/elf/common.h \
-  $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h $(INCDIR)/bfdlink.h \
-  $(INCDIR)/elf/sparc.h $(INCDIR)/elf/reloc-macros.h \
-  elf64-target.h
-elf64.lo: elf64.c elfcode.h $(INCDIR)/bfdlink.h elf-bfd.h \
-  $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
-  elfcore.h elflink.h
-nlm32-alpha.lo: nlm32-alpha.c $(INCDIR)/nlm/alpha-ext.h \
-  libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
-  $(INCDIR)/nlm/external.h nlmswap.h nlm-target.h
-nlm64.lo: nlm64.c nlmcode.h libnlm.h $(INCDIR)/nlm/common.h \
-  $(INCDIR)/nlm/internal.h $(INCDIR)/nlm/external.h
-aix386-core.lo: aix386-core.c $(INCDIR)/coff/i386.h \
-  $(INCDIR)/coff/internal.h libcoff.h $(INCDIR)/bfdlink.h
-hpux-core.lo: hpux-core.c
-irix-core.lo: irix-core.c
-lynx-core.lo: lynx-core.c
-osf-core.lo: osf-core.c
-sco5-core.lo: sco5-core.c libaout.h $(INCDIR)/bfdlink.h
-trad-core.lo: trad-core.c libaout.h $(INCDIR)/bfdlink.h \
-  hosts/i386linux.h
-cisco-core.lo: cisco-core.c
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/bfd/PORTING b/bfd/PORTING
deleted file mode 100644
index c8bfd77b96f..00000000000
--- a/bfd/PORTING
+++ /dev/null
@@ -1,83 +0,0 @@
-	Preliminary Notes on Porting BFD
-	--------------------------------
-
-The 'host' is the system a tool runs *on*.
-The 'target' is the system a tool runs *for*, i.e.
-a tool can read/write the binaries of the target.
-
-Porting to a new host
----------------------
-Pick a name for your host. Call that <host>.
-(<host> might be sun4, ...)
-Create a file hosts/<host>.mh.
-
-Porting to a new target
------------------------
-Pick a name for your target. Call that <target>.
-Call the name for your CPU architecture <cpu>.
-You need to create <target>.c and config/<target>.mt,
-and add a case for it to a case statements in bfd/configure.host and
-bfd/config.bfd, which associates each canonical host type with a BFD
-host type (used as the base of the makefile fragment names), and to the
-table in bfd/configure.in which associates each target vector with
-the .o files it uses.
-
-config/<target>.mt is a Makefile fragment.
-The following is usually enough:
-DEFAULT_VECTOR=<target>_vec
-SELECT_ARCHITECTURES=bfd_<cpu>_arch
-
-See the list of cpu types in archures.c, or "ls cpu-*.c".
-If your architecture is new, you need to add it to the tables
-in bfd/archures.c, opcodes/configure.in, and binutils/objdump.c.
-
-For more information about .mt and .mh files, see config/README.
-
-The file <target>.c is the hard part.  It implements the
-bfd_target <target>_vec, which includes pointers to
-functions that do the actual <target>-specific methods.
-
-Porting to a <target> that uses the a.out binary format
--------------------------------------------------------
-
-In this case, the include file aout-target.h probaby does most
-of what you need. The program gen-aout generates <target>.c for
-you automatically for many a.out systems.  Do:
-	make gen-aout
-	./gen-aout <target> > <target>.c
-(This only works if you are building on the target ("native").
-If you must make a cross-port from scratch, copy the most
-similar existing file that includes aout-target.h, and fix what is wrong.)
-
-Check the parameters in <target>.c, and fix anything that is wrong.
-(Also let us know about it; perhaps we can improve gen-aout.c.)
-
-TARGET_IS_BIG_ENDIAN_P
-	Should be defined if <target> is big-endian.
-
-N_HEADER_IN_TEXT(x)
-	See discussion in ../include/aout/aout64.h.
-
-BYTES_IN_WORD
-	Number of bytes per word. (Usually 4 but can be 8.)
-
-ARCH
-	Number of bits per word.  (Usually 32, but can be 64.)
-
-ENTRY_CAN_BE_ZERO
-	Define if the extry point (start address of an
-	executable program) can be 0x0.
-
-TEXT_START_ADDR
-	The address of the start of the text segemnt in
-	virtual memory.  Normally, the same as the entry point.
-
-TARGET_PAGE_SIZE
-
-SEGMENT_SIZE
-        Usually, the same as the TARGET_PAGE_SIZE.
-        Alignment needed for the data segment.
-
-TARGETNAME
-	The name of the target, for run-time lookups.
-	Usually "a.out-<target>"
diff --git a/bfd/README b/bfd/README
deleted file mode 100644
index 51ce133355f..00000000000
--- a/bfd/README
+++ /dev/null
@@ -1,49 +0,0 @@
-BFD is a an object file library.  It permits applications to use the
-same routines to process object files regardless of their format.
-
-BFD is used by the GNU debugger, assembler, linker, and the binary
-utilities.
-
-The documentation on using BFD is scanty and may be occasionally
-incorrect.  Pointers to documentation problems, or an entirely
-rewritten manual, would be appreciated.
-
-There is some BFD internals documentation in doc/bfdint.texi which may
-help programmers who want to modify BFD.
-
-BFD is normally built as part of another package.  See the build
-instructions for that package, probably in a README file in the
-appropriate directory.
-
-BFD supports the following configure options:
-
-  --target=TARGET
-	The default target for which to build the library.  TARGET is
-	a configuration target triplet, such as sparc-sun-solaris.
-  --enable-targets=TARGET,TARGET,TARGET...
-	Additional targets the library should support.  To include
-	support for all known targets, use --enable-targets=all.
-  --enable-64-bit-bfd
-	Include support for 64 bit targets.  This is automatically
-	turned on if you explicitly request a 64 bit target, but not
-	for --enable-targets=all.  This requires a compiler with a 64
-	bit integer type, such as gcc.
-  --enable-shared
-	Build BFD as a shared library.
-  --with-mmap
-	Use mmap when accessing files.  This is faster on some hosts,
-	but slower on others.  It may not work on all hosts.
-
-Report bugs with BFD to bug-gnu-utils@gnu.org.
-
-Patches are encouraged.  When sending patches, always send the output
-of diff -u or diff -c from the original file to the new file.  Do not
-send default diff output.  Do not make the diff from the new file to
-the original file.  Remember that any patch must not break other
-systems.  Remember that BFD must support cross compilation from any
-host to any target, so patches which use ``#ifdef HOST'' are not
-acceptable.  Please also read the ``Reporting Bugs'' section of the
-gcc manual.
-
-Bug reports without patches will be remembered, but they may never get
-fixed until somebody volunteers to fix them.
diff --git a/bfd/TODO b/bfd/TODO
deleted file mode 100644
index 7a127352521..00000000000
--- a/bfd/TODO
+++ /dev/null
@@ -1,25 +0,0 @@
-Things that still need to be done: -*- Text -*-
-
- o - A source of space lossage is that all the target-dependent code
-     is in a single bfd_target structure.  Hence all the code for
-     *writing* object files is still pulled into all the applications
-     that only care about *reading* (gdb, nm, objdump), while gas has
-     to carry along all the unneeded baggage for reading objects.  And
-     so on.  This would be a substantial change, and the payoff would
-     not all that great (essentially none if bfd is used as a shared
-     library).
-
- o - The storage needed by BFD data structures is also larger than strictly
-     needed.  This may be difficult to do much about.
-
- o - implement bfd_abort, which should close the bfd but not alter the
-     filesystem.
-
- o - update the bfd doc; write a how-to-write-a-backend doc, take out
-     the stupid quips and fill in all the blanks.
-
- o - upgrade the reloc handling as per Steve's suggestion.
-
-
-
-
diff --git a/bfd/acinclude.m4 b/bfd/acinclude.m4
deleted file mode 100644
index dbe1c30fc81..00000000000
--- a/bfd/acinclude.m4
+++ /dev/null
@@ -1,104 +0,0 @@
-dnl See whether we need to use fopen-bin.h rather than fopen-same.h.
-AC_DEFUN(BFD_BINARY_FOPEN,
-[AC_REQUIRE([AC_CANONICAL_SYSTEM])
-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 Get a default for CC_FOR_BUILD to put into Makefile.
-AC_DEFUN(BFD_CC_FOR_BUILD,
-[# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test -z "$CC_FOR_BUILD"; then
-  if test "x$cross_compiling" = "xno"; then
-    CC_FOR_BUILD='$(CC)'
-  else
-    CC_FOR_BUILD=gcc
-  fi
-fi
-AC_SUBST(CC_FOR_BUILD)
-# Also set EXEEXT_FOR_BUILD.
-if test "x$cross_compiling" = "xno"; then
-  EXEEXT_FOR_BUILD='$(EXEEXT)'
-else
-  AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
-    [cat > ac_c_test.c << 'EOF'
-int main() {
-/* Nothing needed here */
-}
-EOF
-    ${CC_FOR_BUILD} -o ac_c_test am_c_test.c 1>&5 2>&5
-    bfd_cv_build_exeext=`echo ac_c_test.* | grep -v ac_c_test.c | sed -e s/ac_c_test//`
-    rm -f ac_c_test*
-    test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
-  EXEEXT_FOR_BUILD=""
-  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-fi
-AC_SUBST(EXEEXT_FOR_BUILD)])dnl
-
-dnl See whether we need a declaration for a function.
-AC_DEFUN(BFD_NEED_DECLARATION,
-[AC_MSG_CHECKING([whether $1 must be declared])
-AC_CACHE_VAL(bfd_cv_decl_needed_$1,
-[AC_TRY_COMPILE([
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif],
-[char *(*pfn) = (char *(*)) $1],
-bfd_cv_decl_needed_$1=no, bfd_cv_decl_needed_$1=yes)])
-AC_MSG_RESULT($bfd_cv_decl_needed_$1)
-if test $bfd_cv_decl_needed_$1 = yes; then
-  AC_DEFINE([NEED_DECLARATION_]translit($1, [a-z], [A-Z]), 1,
-	    [Define if $1 is not declared in system header files.])
-fi
-])dnl
-
-dnl Check for existence of a type $1 in sys/procfs.h
-
-AC_DEFUN(BFD_HAVE_SYS_PROCFS_TYPE,
-[AC_MSG_CHECKING([for $1 in sys/procfs.h])
- AC_CACHE_VAL(bfd_cv_have_sys_procfs_type_$1,
-   [AC_TRY_COMPILE([#include <sys/procfs.h>],
-      [$1 avar],
-      bfd_cv_have_sys_procfs_type_$1=yes,
-      bfd_cv_have_sys_procfs_type_$1=no
-   )])
- if test $bfd_cv_have_sys_procfs_type_$1 = yes; then
-   AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z]), 1,
-	     [Define if <sys/procfs.h> has $1.])
- fi
- AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_$1)
-])
-
-
-dnl Check for existence of member $2 in type $1 in sys/procfs.h
-
-AC_DEFUN(BFD_HAVE_SYS_PROCFS_TYPE_MEMBER,
-[AC_MSG_CHECKING([for $1.$2 in sys/procfs.h])
- AC_CACHE_VAL(bfd_cv_have_sys_procfs_type_member_$1_$2,
-   [AC_TRY_COMPILE([#include <sys/procfs.h>],
-      [$1 avar; void* aref = (void*) &avar.$2],
-      bfd_cv_have_sys_procfs_type_member_$1_$2=yes,
-      bfd_cv_have_sys_procfs_type_member_$1_$2=no
-   )])
- if test $bfd_cv_have_sys_procfs_type_member_$1_$2 = yes; then
-   AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z])[_]translit($2, [a-z], [A-Z]), 1,
-	     [Define if <sys/procfs.h> has $1.$2.])
- fi
- AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_member_$1_$2)
-])
-
-
diff --git a/bfd/aclocal.m4 b/bfd/aclocal.m4
deleted file mode 100644
index 43580002449..00000000000
--- a/bfd/aclocal.m4
+++ /dev/null
@@ -1,861 +0,0 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4
-
-dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
-
-dnl See whether we need to use fopen-bin.h rather than fopen-same.h.
-AC_DEFUN(BFD_BINARY_FOPEN,
-[AC_REQUIRE([AC_CANONICAL_SYSTEM])
-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 Get a default for CC_FOR_BUILD to put into Makefile.
-AC_DEFUN(BFD_CC_FOR_BUILD,
-[# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test -z "$CC_FOR_BUILD"; then
-  if test "x$cross_compiling" = "xno"; then
-    CC_FOR_BUILD='$(CC)'
-  else
-    CC_FOR_BUILD=gcc
-  fi
-fi
-AC_SUBST(CC_FOR_BUILD)
-# Also set EXEEXT_FOR_BUILD.
-if test "x$cross_compiling" = "xno"; then
-  EXEEXT_FOR_BUILD='$(EXEEXT)'
-else
-  AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext,
-    [cat > ac_c_test.c << 'EOF'
-int main() {
-/* Nothing needed here */
-}
-EOF
-    ${CC_FOR_BUILD} -o ac_c_test am_c_test.c 1>&5 2>&5
-    bfd_cv_build_exeext=`echo ac_c_test.* | grep -v ac_c_test.c | sed -e s/ac_c_test//`
-    rm -f ac_c_test*
-    test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no])
-  EXEEXT_FOR_BUILD=""
-  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-fi
-AC_SUBST(EXEEXT_FOR_BUILD)])dnl
-
-dnl See whether we need a declaration for a function.
-AC_DEFUN(BFD_NEED_DECLARATION,
-[AC_MSG_CHECKING([whether $1 must be declared])
-AC_CACHE_VAL(bfd_cv_decl_needed_$1,
-[AC_TRY_COMPILE([
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif],
-[char *(*pfn) = (char *(*)) $1],
-bfd_cv_decl_needed_$1=no, bfd_cv_decl_needed_$1=yes)])
-AC_MSG_RESULT($bfd_cv_decl_needed_$1)
-if test $bfd_cv_decl_needed_$1 = yes; then
-  AC_DEFINE([NEED_DECLARATION_]translit($1, [a-z], [A-Z]), 1,
-	    [Define if $1 is not declared in system header files.])
-fi
-])dnl
-
-dnl Check for existence of a type $1 in sys/procfs.h
-
-AC_DEFUN(BFD_HAVE_SYS_PROCFS_TYPE,
-[AC_MSG_CHECKING([for $1 in sys/procfs.h])
- AC_CACHE_VAL(bfd_cv_have_sys_procfs_type_$1,
-   [AC_TRY_COMPILE([#include <sys/procfs.h>],
-      [$1 avar],
-      bfd_cv_have_sys_procfs_type_$1=yes,
-      bfd_cv_have_sys_procfs_type_$1=no
-   )])
- if test $bfd_cv_have_sys_procfs_type_$1 = yes; then
-   AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z]), 1,
-	     [Define if <sys/procfs.h> has $1.])
- fi
- AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_$1)
-])
-
-
-dnl Check for existence of member $2 in type $1 in sys/procfs.h
-
-AC_DEFUN(BFD_HAVE_SYS_PROCFS_TYPE_MEMBER,
-[AC_MSG_CHECKING([for $1.$2 in sys/procfs.h])
- AC_CACHE_VAL(bfd_cv_have_sys_procfs_type_member_$1_$2,
-   [AC_TRY_COMPILE([#include <sys/procfs.h>],
-      [$1 avar; void* aref = (void*) &avar.$2],
-      bfd_cv_have_sys_procfs_type_member_$1_$2=yes,
-      bfd_cv_have_sys_procfs_type_member_$1_$2=no
-   )])
- if test $bfd_cv_have_sys_procfs_type_member_$1_$2 = yes; then
-   AC_DEFINE([HAVE_]translit($1, [a-z], [A-Z])[_]translit($2, [a-z], [A-Z]), 1,
-	     [Define if <sys/procfs.h> has $1.$2.])
- fi
- AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_member_$1_$2)
-])
-
-
-
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
-
-# serial 1
-
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
-
-AC_DEFUN(AM_INIT_AUTOMAKE,
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
-
-#
-# Check to make sure that the build environment is sane.
-#
-
-AC_DEFUN(AM_SANITY_CHECK,
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "[$]2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-rm -f conftest*
-AC_MSG_RESULT(yes)])
-
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
-AC_DEFUN(AM_MISSING_PROG,
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
-else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
-fi
-AC_SUBST($1)])
-
-
-# serial 25 AM_PROG_LIBTOOL
-AC_DEFUN(AM_PROG_LIBTOOL,
-[AC_REQUIRE([AM_ENABLE_SHARED])dnl
-AC_REQUIRE([AM_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_RANLIB])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AM_PROG_LD])dnl
-AC_REQUIRE([AM_PROG_NM])dnl
-AC_REQUIRE([AC_PROG_LN_S])dnl
-dnl
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  CFLAGS="$CFLAGS -belf"
-  ;;
-
-*-*-cygwin*)
-  AM_SYS_LIBTOOL_CYGWIN
-  ;;
-
-esac
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| AC_MSG_ERROR([libtool configure failed])
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-])
-
-# AM_ENABLE_SHARED - implement the --enable-shared flag
-# Usage: AM_ENABLE_SHARED[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_SHARED,
-[define([AM_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(shared,
-changequote(<<, >>)dnl
-<<  --enable-shared[=PKGS]  build shared libraries [default=>>AM_ENABLE_SHARED_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_shared=AM_ENABLE_SHARED_DEFAULT)dnl
-])
-
-# AM_DISABLE_SHARED - set the default shared flag to --disable-shared
-AC_DEFUN(AM_DISABLE_SHARED,
-[AM_ENABLE_SHARED(no)])
-
-# AM_DISABLE_STATIC - set the default static flag to --disable-static
-AC_DEFUN(AM_DISABLE_STATIC,
-[AM_ENABLE_STATIC(no)])
-
-# AM_ENABLE_STATIC - implement the --enable-static flag
-# Usage: AM_ENABLE_STATIC[(DEFAULT)]
-#   Where DEFAULT is either `yes' or `no'.  If omitted, it defaults to
-#   `yes'.
-AC_DEFUN(AM_ENABLE_STATIC,
-[define([AM_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE(static,
-changequote(<<, >>)dnl
-<<  --enable-static[=PKGS]  build static libraries [default=>>AM_ENABLE_STATIC_DEFAULT],
-changequote([, ])dnl
-[p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac],
-enable_static=AM_ENABLE_STATIC_DEFAULT)dnl
-])
-
-
-# AM_PROG_LD - find the path to the GNU or non-GNU linker
-AC_DEFUN(AM_PROG_LD,
-[AC_ARG_WITH(gnu-ld,
-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],
-test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)
-AC_REQUIRE([AC_PROG_CC])
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by GCC])
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-  # Accept absolute paths.
-changequote(,)dnl
-  /* | [A-Za-z]:\\*)
-changequote([,])dnl
-    test -z "$LD" && LD="$ac_prog"
-    ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(ac_cv_path_LD,
-[if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
-AM_PROG_LD_GNU
-])
-
-AC_DEFUN(AM_PROG_LD_GNU,
-[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi])
-])
-
-# AM_PROG_NM - find the path to a BSD-compatible name lister
-AC_DEFUN(AM_PROG_NM,
-[AC_MSG_CHECKING([for BSD-compatible nm])
-AC_CACHE_VAL(ac_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  ac_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-fi])
-NM="$ac_cv_path_NM"
-AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
-])
-
-# AM_SYS_LIBTOOL_CYGWIN - find tools needed on cygwin
-AC_DEFUN(AM_SYS_LIBTOOL_CYGWIN,
-[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-AC_CHECK_TOOL(AS, as, false)
-])
-
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
-
-AC_DEFUN(AM_CONFIG_HEADER,
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
-
-# Add --enable-maintainer-mode option to configure.
-# From Jim Meyering
-
-# serial 1
-
-AC_DEFUN(AM_MAINTAINER_MODE,
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT($USE_MAINTAINER_MODE)
-  AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes)
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-# Define a conditional.
-
-AC_DEFUN(AM_CONDITIONAL,
-[AC_SUBST($1_TRUE)
-AC_SUBST($1_FALSE)
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi])
-
-# This file is derived from `gettext.m4'.  The difference is that the
-# included macros assume Cygnus-style source and build trees.
-
-# Macro to add for using GNU gettext.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 3
-
-AC_DEFUN(CY_WITH_NLS,
-  [AC_MSG_CHECKING([whether NLS is requested])
-    dnl Default is enabled NLS
-    AC_ARG_ENABLE(nls,
-      [  --disable-nls           do not use Native Language Support],
-      USE_NLS=$enableval, USE_NLS=yes)
-    AC_MSG_RESULT($USE_NLS)
-    AC_SUBST(USE_NLS)
-
-    USE_INCLUDED_LIBINTL=no
-
-    dnl If we use NLS figure out what method
-    if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested])
-      AC_MSG_CHECKING([whether included gettext is requested])
-      AC_ARG_WITH(included-gettext,
-        [  --with-included-gettext use the GNU gettext library included here],
-        nls_cv_force_use_gnu_gettext=$withval,
-        nls_cv_force_use_gnu_gettext=no)
-      AC_MSG_RESULT($nls_cv_force_use_gnu_gettext)
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-        dnl User does not insist on using GNU NLS library.  Figure out what
-        dnl to use.  If gettext or catgets are available (in this order) we
-        dnl use this.  Else we have to fall back to GNU NLS library.
-	dnl catgets is only used if permitted by option --with-catgets.
-	nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
-
-	AC_CHECK_HEADER(libintl.h,
-	  [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc,
-	    [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")],
-	       gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)])
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
-		 gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])])
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      AC_DEFINE(HAVE_GETTEXT, 1,
-			[Define as 1 if you have gettext and don't want to use GNU gettext.])
-	      AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-		[test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
-	      if test "$MSGFMT" != "no"; then
-		AC_CHECK_FUNCS(dcgettext)
-		AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-		AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-		  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-		AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr],
-		  [CATOBJEXT=.gmo
-		   DATADIRNAME=share],
-		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	])
-
-	dnl In the standard gettext, we would now check for catgets.
-        dnl However, we never want to use catgets for our releases.
-
-        if test "$CATOBJEXT" = "NONE"; then
-	  dnl Neither gettext nor catgets in included in the C library.
-	  dnl Fall back on GNU gettext library.
-	  nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-        dnl Mark actions used to generate GNU NLS library.
-        INTLOBJS="\$(GETTOBJS)"
-        AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt)
-        AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
-        AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
-	  [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
-        AC_SUBST(MSGFMT)
-	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/../intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=libintl.h
-        nls_cv_header_libgt=libgettext.h
-      fi
-
-      dnl Test whether we really found GNU xgettext.
-      if test "$XGETTEXT" != ":"; then
-	dnl If it is no GNU xgettext we define it as : so that the
-	dnl Makefiles still can work.
-	if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  AC_MSG_RESULT(
-	    [found xgettext programs is not GNU xgettext; ignore it])
-	  XGETTEXT=":"
-	fi
-      fi
-
-      # We need to process the po/ directory.
-      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=libintl.h
-      nls_cv_header_libgt=libgettext.h
-    fi
-
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
-    fi
-
-    dnl These rules are solely for the distribution goal.  While doing this
-    dnl we only have to keep exactly one list of the available catalogs
-    dnl in configure.in.
-    for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-    dnl Make all variables we use known to autoconf.
-    AC_SUBST(USE_INCLUDED_LIBINTL)
-    AC_SUBST(CATALOGS)
-    AC_SUBST(CATOBJEXT)
-    AC_SUBST(DATADIRNAME)
-    AC_SUBST(GMOFILES)
-    AC_SUBST(INSTOBJEXT)
-    AC_SUBST(INTLDEPS)
-    AC_SUBST(INTLLIBS)
-    AC_SUBST(INTLOBJS)
-    AC_SUBST(POFILES)
-    AC_SUBST(POSUB)
-  ])
-
-AC_DEFUN(CY_GNU_GETTEXT,
-  [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
-   AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
-   AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
-   AC_REQUIRE([AC_C_INLINE])dnl
-   AC_REQUIRE([AC_TYPE_OFF_T])dnl
-   AC_REQUIRE([AC_TYPE_SIZE_T])dnl
-   AC_REQUIRE([AC_FUNC_ALLOCA])dnl
-   AC_REQUIRE([AC_FUNC_MMAP])dnl
-
-   AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h])
-   AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     AC_CHECK_FUNCS(stpcpy)
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     AC_DEFINE(HAVE_STPCPY, 1, [Define if you have the stpcpy function])
-   fi
-
-   AM_LC_MESSAGES
-   CY_WITH_NLS
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       AC_MSG_CHECKING(for catalogs to be installed)
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       AC_MSG_RESULT($LINGUAS)
-     fi
-
-     dnl Construct list of names of catalog files to be constructed.
-     if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-   dnl The reference to <locale.h> in the installed <libintl.h> file
-   dnl must be resolved because we cannot expect the users of this
-   dnl to define HAVE_LOCALE_H.
-   if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   AC_SUBST(INCLUDE_LOCALE_H)
-
-   dnl Determine which catalog format we have (if any is needed)
-   dnl For now we know about two different formats:
-   dnl   Linux libc-5 and the normal X/Open format
-   if test -f $srcdir/po2tbl.sed.in; then
-      if test "$CATOBJEXT" = ".cat"; then
-	 AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen)
-
-	 dnl Transform the SED scripts while copying because some dumb SEDs
-         dnl cannot handle comments.
-	 sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed
-      fi
-      dnl po2tbl.sed is always needed.
-      sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-	 $srcdir/po2tbl.sed.in > po2tbl.sed
-   fi
-
-   dnl In the intl/Makefile.in we have a special dependency which makes
-   dnl only sense for gettext.  We comment this out for non-gettext
-   dnl packages.
-   if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   AC_SUBST(GT_NO)
-   AC_SUBST(GT_YES)
-
-   MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs"
-   AC_SUBST(MKINSTALLDIRS)
-
-   dnl *** For now the libtool support in intl/Makefile is not for real.
-   l=
-   AC_SUBST(l)
-
-   dnl Generate list of files to be processed by xgettext which will
-   dnl be included in po/Makefile.  But only do this if the po directory
-   dnl exists in srcdir.
-   if test -d $srcdir/po; then
-      test -d po || mkdir po
-      if test "x$srcdir" != "x."; then
-	 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-	    posrcprefix="$srcdir/"
-	 else
-	    posrcprefix="../$srcdir/"
-	 fi
-      else
-	 posrcprefix="../"
-      fi
-      rm -f po/POTFILES
-      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	 < $srcdir/po/POTFILES.in > po/POTFILES
-   fi
-  ])
-
-# Search path for a program which passes the given test.
-# Ulrich Drepper <drepper@cygnus.com>, 1996.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
-dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
-AC_DEFUN(AM_PATH_PROG_WITH_TEST,
-[# Extract the first word of "$2", so it can be a program name with args.
-set dummy $2; ac_word=[$]2
-AC_MSG_CHECKING([for $ac_word])
-AC_CACHE_VAL(ac_cv_path_$1,
-[case "[$]$1" in
-  /*)
-  ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in ifelse([$5], , $PATH, [$5]); do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if [$3]; then
-	ac_cv_path_$1="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-dnl If no 4th arg is given, leave the cache variable unset,
-dnl so AC_PATH_PROGS will keep looking.
-ifelse([$4], , , [  test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
-])dnl
-  ;;
-esac])dnl
-$1="$ac_cv_path_$1"
-if test -n "[$]$1"; then
-  AC_MSG_RESULT([$]$1)
-else
-  AC_MSG_RESULT(no)
-fi
-AC_SUBST($1)dnl
-])
-
-# Check whether LC_MESSAGES is available in <locale.h>.
-# Ulrich Drepper <drepper@cygnus.com>, 1995.
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-# serial 1
-
-AC_DEFUN(AM_LC_MESSAGES,
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
-       am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-		[Define if your locale.h file contains LC_MESSAGES.])
-    fi
-  fi])
-
diff --git a/bfd/aix386-core.c b/bfd/aix386-core.c
deleted file mode 100644
index a75fa94262a..00000000000
--- a/bfd/aix386-core.c
+++ /dev/null
@@ -1,283 +0,0 @@
-/* BFD back-end for AIX on PS/2 core files.
-   This was based on trad-core.c, which was written by John Gilmore of
-        Cygnus Support.
-   Copyright 1988, 89, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Minh Tran-Le <TRANLE@INTELLICORP.COM>.
-   Converted to back end form by Ian Lance Taylor <ian@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/i386.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#include <signal.h>
-
-#if defined (_AIX) && defined (_I386)
-#define NOCHECKS		/* this is for coredump.h */
-#define _h_USER			/* avoid including user.h from coredump.h */
-#include <uinfo.h>
-#include <sys/i386/coredump.h>
-#endif /* _AIX && _I386 */
-
-/* maybe this could work on some other i386 but I have not tried it
- * mtranle@paris - Tue Sep 24 12:49:35 1991
- */
-
-#ifndef COR_MAGIC
-# define COR_MAGIC "core"
-#endif
-
-/* need this cast because ptr is really void * */
-#define core_hdr(bfd) \
-    (((bfd->tdata.trad_core_data))->hdr)
-#define core_section(bfd,n) \
-    (((bfd)->tdata.trad_core_data)->sections[n])
-#define core_regsec(bfd) \
-    (((bfd)->tdata.trad_core_data)->reg_section)
-#define core_reg2sec(bfd) \
-    (((bfd)->tdata.trad_core_data)->reg2_section)
-
-/* These are stored in the bfd's tdata */
-struct trad_core_struct {
-  struct corehdr *hdr;		/* core file header */
-  asection *reg_section;
-  asection *reg2_section;
-  asection *sections[MAX_CORE_SEGS];
-};
-
-static void swap_abort PARAMS ((void));
-
-static const bfd_target *
-aix386_core_file_p (abfd)
-     bfd *abfd;
-{
-  int i,n;
-  unsigned char longbuf[4];	/* Raw bytes of various header fields */
-  int core_size = sizeof (struct corehdr);
-  struct corehdr *core;
-  struct mergem {
-    struct trad_core_struct coredata;
-    struct corehdr internal_core;
-  } *mergem;
-
-  if (bfd_read ((PTR)longbuf, 1, sizeof (longbuf), abfd) != sizeof (longbuf))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  if (strncmp(longbuf,COR_MAGIC,4)) return 0;
-
-  if (bfd_seek (abfd, 0L, false) < 0) return 0;
-
-  mergem = (struct mergem *)bfd_zalloc (abfd, sizeof (struct mergem));
-  if (mergem == NULL)
-    return 0;
-
-  core = &mergem->internal_core;
-
-  if ((bfd_read ((PTR) core, 1, core_size, abfd)) != core_size)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      bfd_release (abfd, (char *)mergem);
-      return 0;
-    }
-
-  set_tdata (abfd, &mergem->coredata);
-  core_hdr (abfd) = core;
-
-  /* create the sections.  This is raunchy, but bfd_close wants to reclaim
-     them */
-  core_regsec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_regsec (abfd) == NULL)
-    {
-    loser:
-      bfd_release (abfd, (char *)mergem);
-      return 0;
-    }
-  core_reg2sec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_reg2sec (abfd) == NULL)
-    {
-    loser1:
-     bfd_release (abfd, core_regsec (abfd));
-      goto loser;
-    }
-
-  for (i=0, n=0 ; (i < MAX_CORE_SEGS) && (core->cd_segs[i].cs_type) ; i++)
-    {
-      if (core->cd_segs[i].cs_offset == 0)
-	continue;
-      core_section (abfd,n) =
-	(asection *) bfd_zalloc (abfd, sizeof (asection));
-      if (core_section (abfd,n) == NULL)
-	{
-	  int j;
-	  if (n > 0)
-	    {
-	      for (j=0; j < n; j++)
-		bfd_release (abfd, core_section(abfd, j));
-	    }
-	  bfd_release (abfd, (char *)mergem);
-	  goto loser1;
-	}
-
-      switch (core->cd_segs[i].cs_type)
-	{
-	case COR_TYPE_DATA:
-	  core_section (abfd, n)->name = ".data";
-	  core_section (abfd, n)->flags = (SEC_ALLOC + SEC_LOAD +
-					   SEC_HAS_CONTENTS);
-	  break;
-	case COR_TYPE_STACK:
-	  core_section (abfd, n)->name = ".stack";
-	  core_section (abfd, n)->flags = (SEC_ALLOC + SEC_LOAD +
-					   SEC_HAS_CONTENTS);
-	  break;
-	case COR_TYPE_LIBDATA:
-	  core_section (abfd, n)->name = ".libdata";
-	  core_section (abfd, n)->flags = (SEC_ALLOC + SEC_HAS_CONTENTS);
-	  break;
-	case COR_TYPE_WRITE:
-	  core_section (abfd, n)->name = ".writeable";
-	  core_section (abfd, n)->flags = (SEC_ALLOC + SEC_HAS_CONTENTS);
-	  break;
-	case COR_TYPE_MSC:
-	  core_section (abfd, n)->name = ".misc";
-	  core_section (abfd, n)->flags = (SEC_ALLOC + SEC_HAS_CONTENTS);
-	  break;
-	default:
-	  core_section (abfd, n)->name = ".unknown";
-	  core_section (abfd, n)->flags = (SEC_ALLOC + SEC_HAS_CONTENTS);
-	  break;
-	}
-      core_section (abfd, n)->_raw_size = core->cd_segs[i].cs_len;
-      core_section (abfd, n)->vma       = core->cd_segs[i].cs_address;
-      core_section (abfd, n)->filepos   = core->cd_segs[i].cs_offset;
-      core_section (abfd, n)->alignment_power = 2;
-      core_section (abfd, n)->next      = NULL;
-      if (n > 0)
-	core_section (abfd, (n-1))->next = core_section (abfd, n);
-
-      abfd->section_count = ++n;
-    }
-
-  core_regsec (abfd)->name = ".reg";
-  core_reg2sec (abfd)->name = ".reg2";
-
-  core_regsec (abfd)->flags = SEC_HAS_CONTENTS;
-  core_reg2sec (abfd)->flags = SEC_HAS_CONTENTS;
-
-  core_regsec (abfd)->_raw_size = sizeof(core->cd_regs);
-  core_reg2sec (abfd)->_raw_size = sizeof(core->cd_fpregs);
-
-  core_regsec (abfd)->vma = -1;
-  core_reg2sec (abfd)->vma = -1;
-
-  /* We'll access the regs afresh in the core file, like any section: */
-  core_regsec (abfd)->filepos = (file_ptr)offsetof(struct corehdr,cd_regs[0]);
-  core_reg2sec (abfd)->filepos = (file_ptr)offsetof(struct corehdr,
-						    cd_fpregs);
-
-  /* add the 2 reg fake sections to abfd */
-  abfd->section_count += 2;
-  abfd->sections = core_regsec (abfd);
-  core_regsec (abfd)->next = core_reg2sec (abfd);
-  core_reg2sec (abfd)->next = core_section (abfd, 0);
-
-  return abfd->xvec;
-}
-
-static char *
-aix386_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return core_hdr (abfd)->cd_comm;
-}
-
-static int
-aix386_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_hdr (abfd)->cd_cursig;
-}
-
-static boolean
-aix386_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
-{
-  return true;			/* FIXME, We have no way of telling at this
-				   point */
-}
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define	NO_GET	((PROTO(bfd_vma, (*), (       const bfd_byte *))) swap_abort )
-#define NO_GETS ((PROTO(bfd_signed_vma, (*), (const bfd_byte *))) swap_abort )
-#define	NO_PUT	((PROTO(void,        (*), (bfd_vma, bfd_byte *))) swap_abort )
-
-const bfd_target aix386_core_vec =
-  {
-    "aix386-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_BIG,		/* target byte order */
-    BFD_ENDIANG_BIG,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,						/* leading underscore */
-    ' ',					/* ar_pad_char */
-    16,						/* ar_max_namelen */
-    NO_GET, NO_GETS, NO_PUT,
-    NO_GET, NO_GETS, NO_PUT,
-    NO_GET, NO_GETS, NO_PUT, /* data */
-    NO_GET, NO_GETS, NO_PUT,
-    NO_GET, NO_GETS, NO_PUT,
-    NO_GET, NO_GETS, NO_PUT, /* hdrs */
-
-    {_bfd_dummy_target, _bfd_dummy_target,
-     _bfd_dummy_target, aix386_core_file_p},
-    {bfd_false, bfd_false,	/* bfd_create_object */
-     bfd_false, bfd_false},
-    {bfd_false, bfd_false,	/* bfd_write_contents */
-     bfd_false, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-     BFD_JUMP_TABLE_COPY (_bfd_generic),
-     BFD_JUMP_TABLE_CORE (aix386),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-     BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
-     BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-     BFD_JUMP_TABLE_WRITE (_bfd_generic),
-     BFD_JUMP_TABLE_LINK (_bfd_nolink),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0
-};
diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c
deleted file mode 100644
index 2c11ffe9ff2..00000000000
--- a/bfd/aout-adobe.c
+++ /dev/null
@@ -1,527 +0,0 @@
-/* BFD back-end for a.out.adobe binaries.
-   Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
-   Written by Cygnus Support.  Based on bout.c.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include "aout/adobe.h"
-
-#include "aout/stab_gnu.h"
-#include "libaout.h"		/* BFD a.out internal data structures */
-
-extern const bfd_target a_out_adobe_vec;		/* Forward decl */
-
-static const bfd_target *aout_adobe_callback PARAMS ((bfd *));
-
-extern boolean aout_32_slurp_symbol_table PARAMS ((bfd *abfd));
-extern boolean aout_32_write_syms PARAMS ((bfd *));
-static void aout_adobe_write_section PARAMS ((bfd *abfd, sec_ptr sect));
-
-/* Swaps the information in an executable header taken from a raw byte
-   stream memory image, into the internal exec_header structure.  */
-
-void aout_adobe_swap_exec_header_in
-  PARAMS ((bfd *abfd, struct external_exec *raw_bytes,
-	   struct internal_exec *execp));
-	 
-void
-aout_adobe_swap_exec_header_in (abfd, raw_bytes, execp)
-     bfd *abfd;
-     struct external_exec *raw_bytes;
-     struct internal_exec *execp;
-{
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
-  /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info   = bfd_h_get_32 (abfd, bytes->e_info);
-  execp->a_text   = GET_WORD (abfd, bytes->e_text);
-  execp->a_data   = GET_WORD (abfd, bytes->e_data);
-  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
-  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
-  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
-  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
-  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
-}
-
-/* Swaps the information in an internal exec header structure into the
-   supplied buffer ready for writing to disk.  */
-
-PROTO(void, aout_adobe_swap_exec_header_out,
-	  (bfd *abfd,
-	   struct internal_exec *execp,
-	   struct external_exec *raw_bytes));
-void
-aout_adobe_swap_exec_header_out (abfd, execp, raw_bytes)
-     bfd *abfd;
-     struct internal_exec *execp;
-     struct external_exec *raw_bytes;
-{
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
-  /* Now fill in fields in the raw data, from the fields in the exec struct. */
-  bfd_h_put_32 (abfd, execp->a_info  , bytes->e_info);
-  PUT_WORD (abfd, execp->a_text  , bytes->e_text);
-  PUT_WORD (abfd, execp->a_data  , bytes->e_data);
-  PUT_WORD (abfd, execp->a_bss   , bytes->e_bss);
-  PUT_WORD (abfd, execp->a_syms  , bytes->e_syms);
-  PUT_WORD (abfd, execp->a_entry , bytes->e_entry);
-  PUT_WORD (abfd, execp->a_trsize, bytes->e_trsize);
-  PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize);
-}
-
-
-static const bfd_target *
-aout_adobe_object_p (abfd)
-     bfd *abfd;
-{
-  struct internal_exec anexec;
-  struct external_exec exec_bytes;
-  char *targ;
-
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE) {
-    if (bfd_get_error () != bfd_error_system_call)
-      bfd_set_error (bfd_error_wrong_format);
-    return 0;
-  }
-
-  anexec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
-
-  /* Normally we just compare for the magic number.
-     However, a bunch of Adobe tools aren't fixed up yet; they generate
-     files using ZMAGIC(!).
-     If the environment variable GNUTARGET is set to "a.out.adobe", we will
-     take just about any a.out file as an Adobe a.out file.  FIXME!  */
-
-  if (N_BADMAG (anexec)) {
-    targ = getenv ("GNUTARGET");
-    if (targ && !strcmp (targ, a_out_adobe_vec.name))
-      ;		/* Just continue anyway, if specifically set to this format */
-    else
-      {
-	bfd_set_error (bfd_error_wrong_format);
-	return 0;
-      }
-  }
-
-  aout_adobe_swap_exec_header_in (abfd, &exec_bytes, &anexec);
-  return aout_32_some_aout_object_p (abfd, &anexec, aout_adobe_callback);
-}
-
-
-/* Finish up the opening of a b.out file for reading.  Fill in all the
-   fields that are not handled by common code.  */
-
-static const bfd_target *
-aout_adobe_callback (abfd)
-     bfd *abfd;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-  asection *sect;
-  struct external_segdesc ext[1];
-  char *section_name;
-  char try_again[30];	/* name and number */
-  char *newname;
-  int trynum;
-  flagword flags;
-
-  /* Architecture and machine type -- unknown in this format.  */
-  bfd_set_arch_mach(abfd, bfd_arch_unknown, 0);
-
-  /* The positions of the string table and symbol table.  */
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
-
-  /* Suck up the section information from the file, one section at a time.  */
-
-  for (;;) {
-    if (bfd_read ((PTR) ext, 1, sizeof (*ext), abfd) != sizeof (*ext)) {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-    switch (ext->e_type[0]) {
-    case N_TEXT:
-      section_name = ".text";
-      flags = SEC_CODE | SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
-      break;
-
-    case N_DATA:
-      section_name = ".data";
-      flags = SEC_DATA | SEC_LOAD | SEC_ALLOC | SEC_HAS_CONTENTS;
-      break;
-
-    case N_BSS:
-      section_name = ".bss";
-      flags = SEC_DATA | SEC_HAS_CONTENTS;
-      break;
-
-    case 0:
-      goto no_more_sections;
-
-    default:
-      (*_bfd_error_handler)
-	(_("%s: Unknown section type in a.out.adobe file: %x\n"), 
-	 bfd_get_filename (abfd), ext->e_type[0]);
-      goto no_more_sections;
-    }
-
-    /* First one is called ".text" or whatever; subsequent ones are
-       ".text1", ".text2", ... */
-
-    bfd_set_error (bfd_error_no_error);
-    sect = bfd_make_section (abfd, section_name);
-    trynum = 0;
-    while (!sect) {
-      if (bfd_get_error () != bfd_error_no_error)
-	return 0;	/* Some other error -- slide into the sunset */
-      sprintf (try_again, "%s%d", section_name, ++trynum);
-      sect = bfd_make_section (abfd, try_again);
-    }
-
-    /* Fix the name, if it is a sprintf'd name.  */
-    if (sect->name == try_again) {
-      newname = (char *) bfd_zalloc(abfd, strlen (sect->name));
-      if (newname == NULL)
-	return 0;
-      strcpy (newname, sect->name);
-      sect->name = newname;
-    }
-
-    /* Now set the section's attributes.  */
-    bfd_set_section_flags (abfd, sect, flags);
-    sect->_raw_size = ((ext->e_size[0] << 8)	/* Assumed big-endian */
-		      | ext->e_size[1] << 8)
-		      | ext->e_size[2];
-    sect->_cooked_size = sect->_raw_size;
-    sect->vma = bfd_h_get_32 (abfd, ext->e_virtbase);
-    sect->filepos = bfd_h_get_32 (abfd, ext->e_filebase);
-    /* FIXME XXX alignment? */
-
-    /* Set relocation information for first section of each type.  */
-    if (trynum == 0) switch (ext->e_type[0]) {
-    case N_TEXT:
-      sect->rel_filepos = N_TRELOFF (*execp);
-      sect->reloc_count = execp->a_trsize;
-      break;
-
-    case N_DATA:
-      sect->rel_filepos = N_DRELOFF (*execp);
-      sect->reloc_count = execp->a_drsize;
-      break;
-    }
-  }
-no_more_sections:  
-
-  adata(abfd).reloc_entry_size = sizeof (struct reloc_std_external);
-  adata(abfd).symbol_entry_size = sizeof (struct external_nlist);
-  adata(abfd).page_size = 1; /* Not applicable. */
-  adata(abfd).segment_size = 1; /* Not applicable. */
-  adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-
-  return abfd->xvec;
-}
-
-struct bout_data_struct {
-    struct aoutdata a;
-    struct internal_exec e;
-};
-
-static boolean
-aout_adobe_mkobject (abfd)
-     bfd *abfd;
-{
-  struct bout_data_struct *rawptr;
-
-  rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));
-  if (rawptr == NULL)
-      return false;
-
-  abfd->tdata.bout_data = rawptr;
-  exec_hdr (abfd) = &rawptr->e;
-
-  adata(abfd).reloc_entry_size = sizeof (struct reloc_std_external);
-  adata(abfd).symbol_entry_size = sizeof (struct external_nlist);
-  adata(abfd).page_size = 1; /* Not applicable. */
-  adata(abfd).segment_size = 1; /* Not applicable. */
-  adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-
-  return true;
-}
-
-
-static boolean
-aout_adobe_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec swapped_hdr;
-  static struct external_segdesc sentinel[1];	/* Initialized to zero */
-  asection *sect;
-
-  exec_hdr (abfd)->a_info = ZMAGIC;
-
-  /* Calculate text size as total of text sections, etc. */
-
-  exec_hdr (abfd)->a_text = 0;
-  exec_hdr (abfd)->a_data = 0;
-  exec_hdr (abfd)->a_bss  = 0;
-  exec_hdr (abfd)->a_trsize = 0;
-  exec_hdr (abfd)->a_drsize = 0;
-
-  for (sect = abfd->sections; sect; sect = sect->next) {
-    if (sect->flags & SEC_CODE)	{
-      exec_hdr (abfd)->a_text += sect->_raw_size;
-      exec_hdr (abfd)->a_trsize += sect->reloc_count *
-                                   sizeof (struct reloc_std_external);
-    } else if (sect->flags & SEC_DATA)	{
-      exec_hdr (abfd)->a_data += sect->_raw_size;
-      exec_hdr (abfd)->a_drsize += sect->reloc_count *
-                                   sizeof (struct reloc_std_external);
-    } else if (sect->flags & SEC_ALLOC && !(sect->flags & SEC_LOAD)) {
-      exec_hdr (abfd)->a_bss  += sect->_raw_size;
-    }
-  }
-
-  exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd)
-    				* sizeof (struct external_nlist);
-  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
-
-  aout_adobe_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr);
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || (bfd_write ((PTR) &swapped_hdr, 1, EXEC_BYTES_SIZE, abfd)
-	  != EXEC_BYTES_SIZE))
-    return false;
-
-  /* Now write out the section information.  Text first, data next, rest
-     afterward.  */
-
-  for (sect = abfd->sections; sect; sect = sect->next) {
-    if (sect->flags & SEC_CODE)	{
-      aout_adobe_write_section (abfd, sect);
-    }
-  }
-  for (sect = abfd->sections; sect; sect = sect->next) {
-    if (sect->flags & SEC_DATA)	{
-      aout_adobe_write_section (abfd, sect);
-    }
-  }
-  for (sect = abfd->sections; sect; sect = sect->next) {
-    if (!(sect->flags & (SEC_CODE|SEC_DATA))) {
-      aout_adobe_write_section (abfd, sect);
-    }
-  }
-
-  /* Write final `sentinel` section header (with type of 0).  */
-  if (bfd_write ((PTR) sentinel, 1, sizeof (*sentinel), abfd)
-      != sizeof (*sentinel))
-    return false;
-
-  /* Now write out reloc info, followed by syms and strings */
-  if (bfd_get_symcount (abfd) != 0) 
-    {
-      if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*exec_hdr(abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      if (! aout_32_write_syms (abfd))
-	return false;
-
-      if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*exec_hdr(abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      for (sect = abfd->sections; sect; sect = sect->next) {
-        if (sect->flags & SEC_CODE)	{
-          if (!aout_32_squirt_out_relocs (abfd, sect))
-            return false;
-        }
-      }
-
-      if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*exec_hdr(abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      for (sect = abfd->sections; sect; sect = sect->next) {
-        if (sect->flags & SEC_DATA)	{
-          if (!aout_32_squirt_out_relocs (abfd, sect))
-            return false;
-        }
-      }
-    }
-  return true;
-}
-
-static void
-aout_adobe_write_section (abfd, sect)
-     bfd *abfd;
-     sec_ptr sect;
-{
-  /* FIXME XXX */
-}
-
-static boolean
-aout_adobe_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  file_ptr section_start;
-  sec_ptr sect;
-
-  if (abfd->output_has_begun == false) { /* set by bfd.c handler */
-
-    /* Assign file offsets to sections.  Text sections are first, and
-       are contiguous.  Then data sections.  Everything else at the end.  */
-
-    section_start = N_TXTOFF (ignore<-->me);
-
-    for (sect = abfd->sections; sect; sect = sect->next) {
-      if (sect->flags & SEC_CODE)	{
-        sect->filepos = section_start;
-	/* FIXME:  Round to alignment */
-	section_start += sect->_raw_size;
-      }
-    }
-
-    for (sect = abfd->sections; sect; sect = sect->next) {
-      if (sect->flags & SEC_DATA)	{
-        sect->filepos = section_start;
-	/* FIXME:  Round to alignment */
-	section_start += sect->_raw_size;
-      }
-    }
-
-    for (sect = abfd->sections; sect; sect = sect->next) {
-      if (sect->flags & SEC_HAS_CONTENTS &&
-	  !(sect->flags & (SEC_CODE|SEC_DATA)))	{
-        sect->filepos = section_start;
-	/* FIXME:  Round to alignment */
-	section_start += sect->_raw_size;
-      }
-    }
-  }
-
-  /* regardless, once we know what we're doing, we might as well get going */
-  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
-
-  if (count != 0) {
-    return (bfd_write ((PTR)location, 1, count, abfd) == count) ?true:false;
-  }
-  return true;
-}
-
-static boolean
-aout_adobe_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
-
-  if (arch == bfd_arch_unknown
-      || arch == bfd_arch_m68k)
-    return true;
-
-  return false;
-}
-
-static int 
-aout_adobe_sizeof_headers (ignore_abfd, ignore)
-     bfd *ignore_abfd;
-     boolean ignore;
-{
-  return sizeof(struct internal_exec);
-}
-
-
-
-
-/* Build the transfer vector for Adobe A.Out files.  */
-
-#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
-
-#define aout_32_bfd_make_debug_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
-
-#define aout_32_bfd_reloc_type_lookup \
-  ((reloc_howto_type *(*) \
-    PARAMS ((bfd *, bfd_reloc_code_real_type))) bfd_nullvoidptr)
-
-#define	aout_32_set_arch_mach		aout_adobe_set_arch_mach
-#define	aout_32_set_section_contents	aout_adobe_set_section_contents
-
-#define	aout_32_sizeof_headers		aout_adobe_sizeof_headers
-#define aout_32_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define aout_32_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
-#define aout_32_bfd_relax_section       bfd_generic_relax_section
-#define aout_32_bfd_gc_sections         bfd_generic_gc_sections
-#define aout_32_bfd_link_hash_table_create \
-  _bfd_generic_link_hash_table_create
-#define aout_32_bfd_link_add_symbols	_bfd_generic_link_add_symbols
-#define aout_32_bfd_final_link		_bfd_generic_final_link
-#define aout_32_bfd_link_split_section	_bfd_generic_link_split_section
-
-const bfd_target a_out_adobe_vec =
-{
-  "a.out.adobe",		/* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is unknown (big assumed) */
-  BFD_ENDIAN_BIG,		/* hdr byte order is big */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT ),
-  /* section flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_DATA | SEC_RELOC),
-  '_',				/*  symbol leading char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
- {_bfd_dummy_target, aout_adobe_object_p, /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, aout_adobe_mkobject, /* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
- {bfd_false, aout_adobe_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (aout_32),
-     BFD_JUMP_TABLE_COPY (_bfd_generic),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
-     BFD_JUMP_TABLE_SYMBOLS (aout_32),
-     BFD_JUMP_TABLE_RELOCS (aout_32),
-     BFD_JUMP_TABLE_WRITE (aout_32),
-     BFD_JUMP_TABLE_LINK (aout_32),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/aout-arm.c b/bfd/aout-arm.c
deleted file mode 100644
index beb900beaa1..00000000000
--- a/bfd/aout-arm.c
+++ /dev/null
@@ -1,546 +0,0 @@
-/* BFD back-end for raw ARM a.out binaries.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-   
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-#define N_TXTADDR(x) \
-  ((N_MAGIC(x) == NMAGIC) ? 0x8000 : \
-   (N_MAGIC(x) != ZMAGIC) ? 0 : \
-   (N_SHARED_LIB(x)) ? ((x).a_entry & ~(TARGET_PAGE_SIZE - 1)) : \
-   TEXT_START_ADDR)
-
-#define TEXT_START_ADDR 0x8000
-#define TARGET_PAGE_SIZE 0x8000
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_arm
-
-#define MY(OP) CAT(aoutarm_,OP)
-#define N_BADMAG(x) ((((x).a_info & ~007200) != ZMAGIC) && \
-                     (((x).a_info & ~006000) != OMAGIC) && \
-                     ((x).a_info != NMAGIC))
-#define N_MAGIC(x) ((x).a_info & ~07200)
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#define MYARM(OP) CAT(aoutarm_,OP)
-reloc_howto_type 	*MYARM(bfd_reloc_type_lookup)
-				PARAMS((bfd *, bfd_reloc_code_real_type));
-static boolean 		MYARM(write_object_contents)	PARAMS((bfd *));
-
-/* Avoid multiple defininitions from aoutx if supporting standarad a.out 
-   as well as our own.  */
-#define NAME(x,y) CAT3(aoutarm,_32_,y)
-
-#define MY_bfd_reloc_type_lookup aoutarm_bfd_reloc_type_lookup
-
-#include "libaout.h"
-#include "aout/aout64.h"
-
-static bfd_reloc_status_type
-MY(fix_pcrel_26_done)	PARAMS ((bfd *, arelent *, asymbol *, PTR,
-				 asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-MY(fix_pcrel_26)	 PARAMS ((bfd *, arelent *, asymbol *, PTR,
-				  asection *, bfd *, char **));
-static void MY(swap_std_reloc_in) PARAMS ((bfd *, struct reloc_std_external *,
-					   arelent *, asymbol **,
-					   bfd_size_type));
-void MY(swap_std_reloc_out) PARAMS ((bfd *, arelent *, 
-				     struct reloc_std_external *));
-
-reloc_howto_type MY(howto_table)[] =
-{
-  /* type rs size bsz pcrel bitpos ovrf sf name part_inpl readmask setmask
-     pcdone */
-  HOWTO (0, 0, 0, 8, false, 0, complain_overflow_bitfield, 0, "8", true,
-	 0x000000ff, 0x000000ff, false),
-  HOWTO (1, 0, 1, 16, false, 0, complain_overflow_bitfield, 0, "16", true,
-	 0x0000ffff, 0x0000ffff, false),
-  HOWTO (2, 0, 2, 32, false, 0, complain_overflow_bitfield, 0, "32", true,
-	 0xffffffff, 0xffffffff, false),
-  HOWTO (3, 2, 2, 26, true, 0, complain_overflow_signed, MY(fix_pcrel_26),
-	 "ARM26", true, 0x00ffffff, 0x00ffffff, true),
-  HOWTO (4, 0, 0, 8, true, 0, complain_overflow_signed, 0, "DISP8", true,
-	 0x000000ff, 0x000000ff, true),
-  HOWTO (5, 0, 1, 16, true, 0, complain_overflow_signed, 0, "DISP16", true,
-	 0x0000ffff, 0x0000ffff, true),
-  HOWTO (6, 0, 2, 32, true, 0, complain_overflow_signed, 0, "DISP32", true,
-	 0xffffffff, 0xffffffff, true),
-  HOWTO (7, 2, 2, 26, false, 0, complain_overflow_signed,
-	 MY(fix_pcrel_26_done), "ARM26D", true, 0x0, 0x0,
-	 false),
-  {-1},
-  HOWTO (9, 0, -1, 16, false, 0, complain_overflow_bitfield, 0, "NEG16", true,
-	 0x0000ffff, 0x0000ffff, false),
-  HOWTO (10, 0, -2, 32, false, 0, complain_overflow_bitfield, 0, "NEG32", true,
-	 0xffffffff, 0xffffffff, false)
-};
-
-#define RELOC_ARM_BITS_NEG_BIG      ((unsigned int) 0x08)
-#define RELOC_ARM_BITS_NEG_LITTLE   ((unsigned int) 0x10)
-
-reloc_howto_type *
-MY(reloc_howto)(abfd, rel, r_index, r_extern, r_pcrel)
-     bfd *abfd;
-     struct reloc_std_external *rel;
-     int *r_index;
-     int *r_extern;
-     int *r_pcrel;
-{
-  unsigned int r_length;
-  unsigned int r_pcrel_done;
-  unsigned int r_neg;
-  int index;
-
-  *r_pcrel = 0;
-  if (bfd_header_big_endian (abfd))
-    {
-      *r_index     =  ((rel->r_index[0] << 16)
-		       | (rel->r_index[1] << 8)
-		       | rel->r_index[2]);
-      *r_extern    = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
-      r_pcrel_done = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
-      r_neg 	   = (0 != (rel->r_type[0] & RELOC_ARM_BITS_NEG_BIG));
-      r_length     = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_BIG)
-		      >> RELOC_STD_BITS_LENGTH_SH_BIG);
-    }
-  else
-    {
-      *r_index     = ((rel->r_index[2] << 16)
-		      | (rel->r_index[1] << 8)
-		      | rel->r_index[0]);
-      *r_extern    = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
-      r_pcrel_done = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
-      r_neg 	   = (0 != (rel->r_type[0] & RELOC_ARM_BITS_NEG_LITTLE));
-      r_length     = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
-		      >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
-    }
-  index = r_length + 4 * r_pcrel_done + 8 * r_neg;
-  if (index == 3)
-    *r_pcrel = 1;
-
-  return MY(howto_table) + index;
-}
- 
-#define MY_reloc_howto(BFD, REL, IN, EX, PC) \
-	MY(reloc_howto) (BFD, REL, &IN, &EX, &PC)
-
-void
-MY(put_reloc)(abfd, r_extern, r_index, value, howto, reloc)
-     bfd *abfd;
-     int r_extern;
-     int r_index;
-     long value;
-     reloc_howto_type *howto;
-     struct reloc_std_external *reloc;
-{
-  unsigned int r_length;
-  int r_pcrel;
-  int r_neg;
-
-  PUT_WORD (abfd, value, reloc->r_address);
-  r_length = howto->size ;	/* Size as a power of two */
-
-  /* Special case for branch relocations. */
-  if (howto->type == 3 || howto->type == 7)
-    r_length = 3;
-
-  r_pcrel  = howto->type & 4; 	/* PC Relative done? */
-  r_neg = howto->type & 8;	/* Negative relocation */
-  if (bfd_header_big_endian (abfd))
-    {
-      reloc->r_index[0] = r_index >> 16;
-      reloc->r_index[1] = r_index >> 8;
-      reloc->r_index[2] = r_index;
-      reloc->r_type[0] =
-	((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
-	 | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
-	 | (r_neg ?	 RELOC_ARM_BITS_NEG_BIG : 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-    }
-  else
-    {
-      reloc->r_index[2] = r_index >> 16;
-      reloc->r_index[1] = r_index >> 8;
-      reloc->r_index[0] = r_index;
-      reloc->r_type[0] =
-	((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
-	 | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
-	 | (r_neg ?	 RELOC_ARM_BITS_NEG_LITTLE : 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-    }
-}
- 
-#define MY_put_reloc(BFD, EXT, IDX, VAL, HOWTO, RELOC) \
-  MY(put_reloc)(BFD, EXT, IDX, VAL, HOWTO, RELOC)
-
-void
-MY(relocatable_reloc)(howto, abfd, reloc, amount, r_addr)
-     reloc_howto_type *howto;
-     bfd *abfd;
-     struct reloc_std_external *reloc;
-     bfd_vma *amount;
-     bfd_vma r_addr;
-{
-  if (howto->type == 3)
-    {
-      if (reloc->r_type[0] 
-	  & (bfd_header_big_endian (abfd)
-	     ? RELOC_STD_BITS_EXTERN_BIG : RELOC_STD_BITS_EXTERN_LITTLE))
-	{
-	  /* The reloc is still external, so don't modify anything. */
-	  *amount = 0;
-	}
-      else
-	{
-	  *amount -= r_addr;
-	  /* Change the r_pcrel value -- on the ARM, this bit is set once the
-	     relocation is done.  */
-	  if (bfd_header_big_endian (abfd))
-	    reloc->r_type[0] |= RELOC_STD_BITS_PCREL_BIG;
-	  else
-	    reloc->r_type[0] |= RELOC_STD_BITS_PCREL_LITTLE;
-	}
-    }
-  else if (howto->type == 7)
-    *amount = 0;
-}
-
-#define MY_relocatable_reloc(HOW, BFD, REL, AMOUNT, ADDR) \
-  MY(relocatable_reloc)(HOW, BFD, REL, &(AMOUNT), ADDR)
-
-static bfd_reloc_status_type
-MY(fix_pcrel_26_done) (abfd, reloc_entry, symbol, data, input_section,
-		       output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* This is dead simple at present.  */
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-MY(fix_pcrel_26) (abfd, reloc_entry, symbol, data, input_section,
-		  output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_size_type addr = reloc_entry->address;
-  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  
-  /* If this is an undefined symbol, return error */
-  if (symbol->section == &bfd_und_section
-      && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined;
-
-  /* If the sections are different, and we are doing a partial relocation,
-     just ignore it for now.  */
-  if (symbol->section->name != input_section->name
-      && output_bfd != (bfd *)NULL)
-    return bfd_reloc_ok;
-
-  relocation = (target & 0x00ffffff) << 2;
-  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend */
-  relocation += symbol->value;
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-  relocation -= input_section->output_section->vma;
-  relocation -= input_section->output_offset;
-  relocation -= addr;
-  if (relocation & 3)
-    return bfd_reloc_overflow;
-
-  /* Check for overflow */
-  if (relocation & 0x02000000)
-    {
-      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
-	flag = bfd_reloc_overflow;
-    }
-  else if (relocation & ~0x03ffffff)
-    flag = bfd_reloc_overflow;
-
-  target &= ~0x00ffffff;
-  target |= (relocation >> 2) & 0x00ffffff;
-  bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
-
-  /* Now the ARM magic... Change the reloc type so that it is marked as done.
-     Strictly this is only necessary if we are doing a partial relocation.  */
-  reloc_entry->howto = &MY(howto_table)[7];
-  
-  return flag;
-}
-
-reloc_howto_type *
-MY(bfd_reloc_type_lookup)(abfd,code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-#define ASTD(i,j)       case i: return &MY(howto_table)[j]
-  if (code == BFD_RELOC_CTOR)
-    switch (bfd_get_arch_info (abfd)->bits_per_address)
-      {
-      case 32:
-        code = BFD_RELOC_32;
-        break;
-      default: return (CONST struct reloc_howto_struct *) 0;
-      }
-
-  switch (code)
-    {
-      ASTD (BFD_RELOC_16, 1);
-      ASTD (BFD_RELOC_32, 2);
-      ASTD (BFD_RELOC_ARM_PCREL_BRANCH, 3);
-      ASTD (BFD_RELOC_8_PCREL, 4);
-      ASTD (BFD_RELOC_16_PCREL, 5);
-      ASTD (BFD_RELOC_32_PCREL, 6);
-    default: return (CONST struct reloc_howto_struct *) 0;
-    }
-}
-
-#define MY_swap_std_reloc_in MY(swap_std_reloc_in)
-#define MY_swap_std_reloc_out MY(swap_std_reloc_out)
-#define MY_get_section_contents _bfd_generic_get_section_contents
-/* #define MY_bfd_link_hash_table_create _bfd_generic_link_hash_table_create */
-/* #define MY_bfd_link_add_symbols _bfd_generic_link_add_symbols */
-/* #define MY_bfd_final_link _bfd_generic_final_link */
-
-#include "aoutx.h"
-
-static void
-MY_swap_std_reloc_in (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_std_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
-{
-  int r_index;
-  int r_extern;
-  int r_pcrel;
-  struct aoutdata *su = &(abfd->tdata.aout_data->a);
-
-  cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
-
-  cache_ptr->howto = MY_reloc_howto (abfd, bytes, r_index, r_extern, r_pcrel);
-
-  MOVE_ADDRESS (0);
-}
-
-void
-MY_swap_std_reloc_out (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     struct reloc_std_external *natptr;
-{
-  int r_index;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  int r_extern;
-  int r_length;
-  int r_pcrel;
-  int r_neg = 0;	/* Negative relocs use the BASEREL bit.  */
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD(abfd, g->address, natptr->r_address);
-
-  r_length = g->howto->size ;   /* Size as a power of two */
-  if (r_length < 0)
-    {
-      r_length = -r_length;
-      r_neg = 1;
-    }
-
-  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC? */
-
-  /* For RISC iX, in pc-relative relocs the r_pcrel bit means that the
-     relocation has been done already (Only for the 26-bit one I think)???!!!
-     */
-
-  if (g->howto->type == 3)
-    {
-      r_length = 3;
-      r_pcrel = 0;
-    }
-  else if (g->howto->type == 7)
-    { 
-      r_length = 3;
-      r_pcrel = 1;
-    }
-  
-
-#if 0
-  /* For a standard reloc, the addend is in the object file.  */
-  r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
-#endif
-
-  /* name was clobbered by aout_write_syms to be symbol index */
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here
-     */
-
-  if (bfd_is_com_section (output_section)
-      || output_section == &bfd_abs_section
-      || output_section == &bfd_und_section)
-    {
-      if (bfd_abs_section.symbol == sym)
-	{
-	  /* Whoops, looked like an abs symbol, but is really an offset
-	     from the abs section */
-	  r_index = 0;
-	  r_extern = 0;
-	}
-      else
-	{
-	  /* Fill in symbol */
-	  r_extern = 1;
-	  r_index = (*(g->sym_ptr_ptr))->KEEPIT;
-	}
-    }
-  else
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_index  = output_section->target_index;
-    }
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd))
-    {
-      natptr->r_index[0] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[2] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_BIG: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_BIG: 0)
-	 | (r_neg    ?   RELOC_ARM_BITS_NEG_BIG: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-    }
-  else
-    {
-      natptr->r_index[2] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[0] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_LITTLE: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_LITTLE: 0)
-	 | (r_neg    ?   RELOC_ARM_BITS_NEG_LITTLE: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-    }
-}
-
-#define MY_BFD_TARGET
-
-#include "aout-target.h"
-
-const bfd_target aout_arm_little_vec =
-{
-  "a.out-arm-little",           /* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_LITTLE,            /* target byte order (little) */
-  BFD_ENDIAN_LITTLE,            /* target headers byte order (little) */
-  (HAS_RELOC | EXEC_P |         /* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  MY_symbol_leading_char,
-  AR_PAD_CHAR,                  /* ar_pad_char */
-  15,                           /* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-    {_bfd_dummy_target, MY_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, MY_core_file_p},
-    {bfd_false, MY_mkobject,    /* bfd_set_format */
-       _bfd_generic_mkarchive, bfd_false},
-    {bfd_false, MY_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (MY),
-     BFD_JUMP_TABLE_COPY (MY),
-     BFD_JUMP_TABLE_CORE (MY),
-     BFD_JUMP_TABLE_ARCHIVE (MY),
-     BFD_JUMP_TABLE_SYMBOLS (MY),
-     BFD_JUMP_TABLE_RELOCS (MY),
-     BFD_JUMP_TABLE_WRITE (MY),
-     BFD_JUMP_TABLE_LINK (MY),
-     BFD_JUMP_TABLE_DYNAMIC (MY),
-
-  (PTR) MY_backend_data,
-};
-
-const bfd_target aout_arm_big_vec =
-{
-  "a.out-arm-big",           /* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_BIG,               /* target byte order (big) */
-  BFD_ENDIAN_BIG,               /* target headers byte order (big) */
-  (HAS_RELOC | EXEC_P |         /* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  MY_symbol_leading_char,
-  AR_PAD_CHAR,                  /* ar_pad_char */
-  15,                           /* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-    {_bfd_dummy_target, MY_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, MY_core_file_p},
-    {bfd_false, MY_mkobject,    /* bfd_set_format */
-       _bfd_generic_mkarchive, bfd_false},
-    {bfd_false, MY_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (MY),
-     BFD_JUMP_TABLE_COPY (MY),
-     BFD_JUMP_TABLE_CORE (MY),
-     BFD_JUMP_TABLE_ARCHIVE (MY),
-     BFD_JUMP_TABLE_SYMBOLS (MY),
-     BFD_JUMP_TABLE_RELOCS (MY),
-     BFD_JUMP_TABLE_WRITE (MY),
-     BFD_JUMP_TABLE_LINK (MY),
-     BFD_JUMP_TABLE_DYNAMIC (MY),
-
-  (PTR) MY_backend_data,
-};
diff --git a/bfd/aout-encap.c b/bfd/aout-encap.c
deleted file mode 100644
index c25f9037dce..00000000000
--- a/bfd/aout-encap.c
+++ /dev/null
@@ -1,236 +0,0 @@
-/* BFD back-end for a.out files encapsulated with COFF headers.
-   Copyright (C) 1990, 1991 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* THIS MODULE IS NOT FINISHED.  IT PROBABLY DOESN'T EVEN COMPILE.  */
-
-#if 0
-#define	TARGET_PAGE_SIZE	4096
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-#define TEXT_START_ADDR 0
-#define BYTES_IN_WORD 4
-#endif
-
-#include "bfd.h"
-#include <sysdep.h>
-#include "libbfd.h"
-#include <aout/aout64.h>
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-const bfd_target *encap_real_callback ();
-
-const bfd_target *
-encap_object_p (abfd)
-     bfd *abfd;
-{
-  unsigned char magicbuf[4]; /* Raw bytes of magic number from file */
-  unsigned long magic;		/* Swapped magic number */
-  short coff_magic;
-  struct external_exec exec_bytes;
-  struct internal_exec exec;
-
-  if (bfd_read ((PTR)magicbuf, 1, sizeof (magicbuf), abfd) !=
-      sizeof (magicbuf))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  
-  coff_magic = bfd_h_get_16 (abfd, magicbuf);
-  if (coff_magic != COFF_MAGIC)
-    return 0;			/* Not an encap coff file */
-
-  __header_offset_temp==COFF_MAGIC ? sizeof(struct coffheader) : 0)
-  (fseek ((f), HEADER_OFFSET((f)), 1))
-
-  magic = bfd_h_get_32 (abfd, magicbuf);
-
-  if (N_BADMAG (*((struct internal_exec *) &magic))) return 0;
-
-  struct external_exec exec_bytes;
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE) {
-    if (bfd_get_error () != bfd_error_system_call)
-      bfd_set_error (bfd_error_wrong_format);
-    return 0;
-  }
-  NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec);
-
-  return aout_32_some_aout_object_p (abfd, &exec, encap_realcallback);
-}
-
-/* Finish up the reading of a encapsulated-coff a.out file header */
-const bfd_target *
-encap_real_callback (abfd)
-     bfd *abfd;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-  
-  MY(callback)(abfd, execp);
-  
-  /* If we have a coff header, it can give us better values for
-     text_start and exec_data_start.  This is particularly useful
-     for remote debugging of embedded systems.  */
-  if (N_FLAGS(exec_aouthdr) & N_FLAGS_COFF_ENCAPSULATE)
-  {
-	  struct coffheader ch;
-	  int val;
-	  val = lseek (execchan, -(sizeof (AOUTHDR) + sizeof (ch)), 1);
-	  if (val == -1)
-		  perror_with_name (filename);
-	  val = myread (execchan, &ch, sizeof (ch));
-	  if (val < 0)
-		  perror_with_name (filename);
-	  text_start = ch.text_start;
-	  exec_data_start = ch.data_start;
-  } else
-	 {
-	  text_start =
-	    IS_OBJECT_FILE (exec_aouthdr) ? 0 : N_TXTADDR (exec_aouthdr);
-	  exec_data_start = IS_OBJECT_FILE (exec_aouthdr)
-	    ? exec_aouthdr.a_text : N_DATADDR (exec_aouthdr);
-  }
-
-  /* Determine the architecture and machine type of the object file.  */
-  bfd_default_set_arch_mach(abfd, bfd_arch_m68k, 0); /* FIXME */
-
-  return abfd->xvec;
-}
-
-/* Write an object file in Encapsulated COFF format.
-   Section contents have already been written.  We write the
-   file header, symbols, and relocation.  */
-
-boolean
-encap_write_object_contents (abfd)
-     bfd *abfd;
-{
-  bfd_size_type data_pad = 0;
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-/****** FIXME:  Fragments from the old GNU LD program for dealing with
-        encap coff.  */
-struct coffheader coffheader;
-int need_coff_header;
-
-  /* Determine whether to count the header as part of
-     the text size, and initialize the text size accordingly.
-     This depends on the kind of system and on the output format selected.  */
-
-  N_SET_MAGIC (outheader, magic);
-#ifdef INITIALIZE_HEADER
-  INITIALIZE_HEADER;
-#endif
-
-  text_size = sizeof (struct exec);
-#ifdef COFF_ENCAPSULATE
-  if (relocatable_output == 0 && file_table[0].just_syms_flag == 0)
-    {
-      need_coff_header = 1;
-      /* set this flag now, since it will change the values of N_TXTOFF, etc */
-      N_SET_FLAGS (outheader, aout_backend_info (abfd)->exec_hdr_flags);
-      text_size += sizeof (struct coffheader);
-    }
-#endif
-
-#ifdef COFF_ENCAPSULATE
-  if (need_coff_header)
-    {
-      /* We are encapsulating BSD format within COFF format.  */
-      struct coffscn *tp, *dp, *bp;
-
-      tp = &coffheader.scns[0];
-      dp = &coffheader.scns[1];
-      bp = &coffheader.scns[2];
-
-      strcpy (tp->s_name, ".text");
-      tp->s_paddr = text_start;
-      tp->s_vaddr = text_start;
-      tp->s_size = text_size;
-      tp->s_scnptr = sizeof (struct coffheader) + sizeof (struct exec);
-      tp->s_relptr = 0;
-      tp->s_lnnoptr = 0;
-      tp->s_nreloc = 0;
-      tp->s_nlnno = 0;
-      tp->s_flags = 0x20;
-      strcpy (dp->s_name, ".data");
-      dp->s_paddr = data_start;
-      dp->s_vaddr = data_start;
-      dp->s_size = data_size;
-      dp->s_scnptr = tp->s_scnptr + tp->s_size;
-      dp->s_relptr = 0;
-      dp->s_lnnoptr = 0;
-      dp->s_nreloc = 0;
-      dp->s_nlnno = 0;
-      dp->s_flags = 0x40;
-      strcpy (bp->s_name, ".bss");
-      bp->s_paddr = dp->s_vaddr + dp->s_size;
-      bp->s_vaddr = bp->s_paddr;
-      bp->s_size = bss_size;
-      bp->s_scnptr = 0;
-      bp->s_relptr = 0;
-      bp->s_lnnoptr = 0;
-      bp->s_nreloc = 0;
-      bp->s_nlnno = 0;
-      bp->s_flags = 0x80;
-
-      coffheader.f_magic = COFF_MAGIC;
-      coffheader.f_nscns = 3;
-      /* store an unlikely time so programs can
-       * tell that there is a bsd header
-       */
-      coffheader.f_timdat = 1;
-      coffheader.f_symptr = 0;
-      coffheader.f_nsyms = 0;
-      coffheader.f_opthdr = 28;
-      coffheader.f_flags = 0x103;
-      /* aouthdr */
-      coffheader.magic = ZMAGIC;
-      coffheader.vstamp = 0;
-      coffheader.tsize = tp->s_size;
-      coffheader.dsize = dp->s_size;
-      coffheader.bsize = bp->s_size;
-      coffheader.entry = outheader.a_entry;
-      coffheader.text_start = tp->s_vaddr;
-      coffheader.data_start = dp->s_vaddr;
-    }
-#endif
-
-#ifdef COFF_ENCAPSULATE
-  if (need_coff_header)
-    mywrite (&coffheader, sizeof coffheader, 1, outdesc);
-#endif
-
-#ifndef COFF_ENCAPSULATE
-  padfile (N_TXTOFF (outheader) - sizeof outheader, outdesc);
-#endif
-
-  text_size -= N_TXTOFF (outheader);
-  WRITE_HEADERS(abfd, execp);
-  return true;
-}
-
-#define MY_write_object_content encap_write_object_contents
-#define MY_object_p encap_object_p
-#define MY_exec_hdr_flags N_FLAGS_COFF_ENCAPSULATE
-
-#include "aout-target.h"
diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
deleted file mode 100644
index c1335aa84d7..00000000000
--- a/bfd/aout-ns32k.c
+++ /dev/null
@@ -1,370 +0,0 @@
-/* BFD back-end for ns32k a.out-ish binaries.
-   Copyright (C) 1990, 91, 92, 94, 95, 96, 1998 Free Software Foundation, Inc.
-   Contributed by Ian Dall (idall@eleceng.adelaide.edu.au).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define BYTES_IN_WORD 4
-
-#include "bfd.h"
-#include "aout/aout64.h"
-#include "ns32k.h"
-
-#define MYNS(OP) CAT(ns32kaout_,OP)
-reloc_howto_type *
-MYNS(bfd_reloc_type_lookup)
-  PARAMS((bfd *abfd AND
-	  bfd_reloc_code_real_type code));
-
-boolean
-MYNS(write_object_contents)
-  PARAMS((bfd *abfd));
-
-/* Avoid multiple definitions from aoutx if supporting standard a.out format(s)
- * as well as this one
- */
-#define NAME(x,y) CAT3(ns32kaout,_32_,y)
-
-void bfd_ns32k_arch PARAMS ((void));
-
-#include "libaout.h"
-
-#define MY(OP) MYNS(OP)
-
-#define MY_swap_std_reloc_in MY(swap_std_reloc_in)
-#define MY_swap_std_reloc_out MY(swap_std_reloc_out)
-
-static void
-MY_swap_std_reloc_in PARAMS ((bfd *abfd, struct reloc_std_external *bytes,
-			      arelent *cache_ptr, asymbol **symbols,
-			      bfd_size_type symcount));
-
-static void
-MY_swap_std_reloc_out PARAMS ((bfd *abfd, arelent *g,
-			       struct reloc_std_external *natptr));
-
-/* The ns32k series is ah, unusual, when it comes to relocation.
- * There are three storage methods for relocateable objects.  There
- * are displacements, immediate operands and ordinary twos complement
- * data. Of these, only the last fits into the standard relocation
- * scheme.  Immediate operands are stored huffman encoded and
- * immediate operands are stored big endian (where as the natural byte
- * order is little endian for this achitecture).
-
- * Note that the ns32k displacement storage method is orthogonal to
- * whether the relocation is pc relative or not. The "displacement"
- * storage scheme is used for essentially all address constants. The
- * displacement can be relative to zero (absolute displacement),
- * relative to the pc (pc relative), the stack pointer, the frame
- * pointer, the static base register and general purpose register etc.
-
- * For example:
- *
- *  sym1: .long .	# pc relative 2's complement
- *  sym1: .long foo	# 2's complement not pc relative
- *
- *  self:  movd @self, r0 # pc relative displacement
- *	   movd foo, r0 # non pc relative displacement
- *
- *  self:  movd self, r0 # pc relative immediate
- *         movd foo, r0 # non pc relative immediate
- *
- * In addition, for historical reasons the encoding of the relocation types
- * in the a.out format relocation entries is such that even the relocation
- * methods which are standard are not encoded the standard way.
- *
- */
-
-reloc_howto_type MY(howto_table)[] = 
-{
-  /* ns32k immediate operands */
-  HOWTO (BFD_RELOC_NS32K_IMM_8, 0, 0, 8, false, 0, true,
-	 _bfd_ns32k_reloc_imm, "NS32K_IMM_8",
-	 true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_16, 0, 1, 16, false, 0, true,
-	 _bfd_ns32k_reloc_imm,  "NS32K_IMM_16",
-	 true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_32, 0, 2, 32, false, 0, true,
-	 _bfd_ns32k_reloc_imm, "NS32K_IMM_32",
-	 true, 0xffffffff,0xffffffff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_8_PCREL, 0, 0, 8, true, 0, false,
-	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_8",
-	 true, 0x000000ff, 0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_16_PCREL, 0, 1, 16, true, 0, false,
-	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_16",
-	 true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_IMM_32_PCREL, 0, 2, 32, true, 0, false,
-	 _bfd_ns32k_reloc_imm, "PCREL_NS32K_IMM_32",
-	 true, 0xffffffff,0xffffffff, false),
-
-  /* ns32k displacements */
-  HOWTO (BFD_RELOC_NS32K_DISP_8, 0, 0, 8, false, 0, true,
-	 _bfd_ns32k_reloc_disp, "NS32K_DISP_8",
-	 true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_16, 0, 1, 16, false, 0, true,
-	 _bfd_ns32k_reloc_disp, "NS32K_DISP_16",
-	 true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_32, 0, 2, 32, false, 0, true,
-	 _bfd_ns32k_reloc_disp, "NS32K_DISP_32",
-	 true, 0xffffffff, 0xffffffff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_8_PCREL, 0, 0, 8, true, 0, false,
-	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_8",
-	 true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_16_PCREL, 0, 1, 16, true, 0, false,
-	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_16",
-	 true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_NS32K_DISP_32_PCREL, 0, 2, 32, true, 0, false,
-	 _bfd_ns32k_reloc_disp, "PCREL_NS32K_DISP_32",
-	 true, 0xffffffff,0xffffffff, false),
-
-  /* Normal 2's complement */
-  HOWTO (BFD_RELOC_8, 0, 0, 8, false, 0, complain_overflow_bitfield,0,
-	 "8", true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_16, 0, 1, 16, false, 0, complain_overflow_bitfield,0,
-	 "16", true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_32, 0, 2, 32, false, 0, complain_overflow_bitfield,0,
-	 "32", true, 0xffffffff,0xffffffff, false),
-  HOWTO (BFD_RELOC_8_PCREL, 0, 0, 8, true, 0, complain_overflow_signed, 0,
-	 "PCREL_8", true, 0x000000ff,0x000000ff, false),
-  HOWTO (BFD_RELOC_16_PCREL, 0, 1, 16, true, 0, complain_overflow_signed, 0,
-	 "PCREL_16", true, 0x0000ffff,0x0000ffff, false),
-  HOWTO (BFD_RELOC_32_PCREL, 0, 2, 32, true, 0, complain_overflow_signed, 0,
-	 "PCREL_32", true, 0xffffffff,0xffffffff, false),
-};
-
-
-#define CTOR_TABLE_RELOC_HOWTO(BFD) (MY(howto_table) + 14)
-
-#define RELOC_STD_BITS_NS32K_TYPE_BIG 0x06
-#define RELOC_STD_BITS_NS32K_TYPE_LITTLE 0x60
-#define RELOC_STD_BITS_NS32K_TYPE_SH_BIG 1
-#define RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE 5
-
-reloc_howto_type *
-MY(reloc_howto)(abfd, rel, r_index, r_extern, r_pcrel)
-     bfd *abfd;
-     struct reloc_std_external *rel;
-     int *r_index;
-     int *r_extern;
-     int *r_pcrel;
-{
-  unsigned int r_length;
-  int r_ns32k_type;
-/*  BFD_ASSERT(bfd_header_little_endian (abfd)); */
-  *r_index =  ((rel->r_index[2] << 16)
-	       | (rel->r_index[1] << 8)
-	       |  rel->r_index[0] );
-  *r_extern  = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
-  *r_pcrel   = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
-  r_length  =  ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
-		>> RELOC_STD_BITS_LENGTH_SH_LITTLE);
-  r_ns32k_type  =  ((rel->r_type[0] & RELOC_STD_BITS_NS32K_TYPE_LITTLE)
-		    >> RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE);
-  return (MY(howto_table) + r_length + 3 * (*r_pcrel) + 6 * r_ns32k_type);
-}
-
-#define MY_reloc_howto(BFD,REL,IN,EX,PC) MY(reloc_howto)(BFD, REL, &IN, &EX, &PC)
-
-void
-MY(put_reloc)(abfd, r_extern, r_index, value, howto, reloc)
-     bfd *abfd;
-     int r_extern;
-     int r_index;
-     long value;
-     reloc_howto_type *howto;
-     struct reloc_std_external *reloc;
-{
-  unsigned int r_length;
-  int r_pcrel;
-  int r_ns32k_type;
-  PUT_WORD (abfd, value, reloc->r_address);
-  r_length = howto->size ;	/* Size as a power of two */
-  r_pcrel  = (int) howto->pc_relative; /* Relative to PC? */
-  r_ns32k_type = (howto - MY(howto_table) )/6;
-/*  BFD_ASSERT (bfd_header_little_endian (abfd)); */
-  reloc->r_index[2] = r_index >> 16;
-  reloc->r_index[1] = r_index >> 8;
-  reloc->r_index[0] = r_index;
-  reloc->r_type[0] =
-    (r_extern?    RELOC_STD_BITS_EXTERN_LITTLE: 0)
-      | (r_pcrel?     RELOC_STD_BITS_PCREL_LITTLE: 0)
-	| (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE)
-	  | (r_ns32k_type <<  RELOC_STD_BITS_NS32K_TYPE_SH_LITTLE);
-}
-
-#define MY_put_reloc(BFD, EXT, IDX, VAL, HOWTO, RELOC) \
-  MY(put_reloc)(BFD, EXT, IDX, VAL, HOWTO, RELOC)
-
-#define STAT_FOR_EXEC
-
-#define MY_final_link_relocate _bfd_ns32k_final_link_relocate
-#define MY_relocate_contents _bfd_ns32k_relocate_contents
-
-#include <aoutx.h>
-
-reloc_howto_type *
-MY(bfd_reloc_type_lookup)(abfd,code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-
-#define ENTRY(i,j)	case i: return &MY(howto_table)[j]
-
-  int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE;
-
-  BFD_ASSERT(ext == 0);
-  if (code == BFD_RELOC_CTOR)
-    switch (bfd_get_arch_info (abfd)->bits_per_address)
-      {
-      case 32:
-	code = BFD_RELOC_32;
-	break;
-      }
-  switch (code)
-    {
-      ENTRY(BFD_RELOC_NS32K_IMM_8, 0);
-      ENTRY(BFD_RELOC_NS32K_IMM_16, 1);
-      ENTRY(BFD_RELOC_NS32K_IMM_32, 2);
-      ENTRY(BFD_RELOC_NS32K_IMM_8_PCREL, 3);
-      ENTRY(BFD_RELOC_NS32K_IMM_16_PCREL, 4);
-      ENTRY(BFD_RELOC_NS32K_IMM_32_PCREL, 5);
-      ENTRY(BFD_RELOC_NS32K_DISP_8, 6);
-      ENTRY(BFD_RELOC_NS32K_DISP_16, 7);
-      ENTRY(BFD_RELOC_NS32K_DISP_32, 8);
-      ENTRY(BFD_RELOC_NS32K_DISP_8_PCREL, 9);
-      ENTRY(BFD_RELOC_NS32K_DISP_16_PCREL, 10);
-      ENTRY(BFD_RELOC_NS32K_DISP_32_PCREL, 11);
-      ENTRY(BFD_RELOC_8, 12);
-      ENTRY(BFD_RELOC_16, 13);
-      ENTRY(BFD_RELOC_32, 14);
-      ENTRY(BFD_RELOC_8_PCREL, 15);
-      ENTRY(BFD_RELOC_16_PCREL, 16);
-      ENTRY(BFD_RELOC_32_PCREL, 17);
-    default: return (reloc_howto_type *) NULL;
-    }
-#undef ENTRY
-}
-
-
-static void
-MY_swap_std_reloc_in (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_std_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
-{
-  int r_index;
-  int r_extern;
-  int r_pcrel;
-  struct aoutdata  *su = &(abfd->tdata.aout_data->a);
-
-  cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
-
-  /* now the fun stuff */
-
-  cache_ptr->howto = MY_reloc_howto(abfd, bytes, r_index, r_extern, r_pcrel);
-
-  MOVE_ADDRESS(0);
-}
-
-static void
-MY_swap_std_reloc_out (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     struct reloc_std_external *natptr;
-{
-  int r_index;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  int r_extern;
-  unsigned int r_addend;
-  asection *output_section = sym->section->output_section;
-
-  r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
-    
-  /* name was clobbered by aout_write_syms to be symbol index */
-
-  /* If this relocation is relative to a symbol then set the 
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     Check for that here.  */
-
-  if (bfd_is_com_section (output_section)
-      || output_section == &bfd_abs_section
-      || output_section == &bfd_und_section) 
-    {
-      if (bfd_abs_section.symbol == sym)
-	{
-	  /* Whoops, looked like an abs symbol, but is really an offset
-	     from the abs section */
-	  r_index = 0;
-	  r_extern = 0;
-	}
-      else 
-	{
-	  /* Fill in symbol */
-	  r_extern = 1;
-#undef KEEPIT
-#define KEEPIT udata.i
-	  r_index =  (*(g->sym_ptr_ptr))->KEEPIT;
-#undef KEEPIT     
-	}
-    }
-  else 
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_index  = output_section->target_index;      
-    }
-
-  MY_put_reloc (abfd, r_extern, r_index, g->address, g->howto, natptr);
-}
-
-bfd_reloc_status_type
-_bfd_ns32k_relocate_contents (howto, input_bfd, relocation, location)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd_vma relocation;
-     bfd_byte *location;
-{
-  int r_ns32k_type = (howto - MY(howto_table)) / 6;
-  long (*get_data) PARAMS ((bfd_byte *, long, long));
-  int (*put_data) PARAMS ((long, bfd_byte *, long, long));
-
-  switch (r_ns32k_type)
-    {
-    case 0:
-      get_data = _bfd_ns32k_get_immediate;
-      put_data = _bfd_ns32k_put_immediate;
-      break;
-    case 1:
-      get_data = _bfd_ns32k_get_displacement;
-      put_data = _bfd_ns32k_put_displacement;
-      break;
-    case 2:
-      return _bfd_relocate_contents (howto, input_bfd, relocation,
-				    location);
-      /* NOT REACHED */
-      break;
-    default:
-      return bfd_reloc_notsupported;
-    }
-  return _bfd_do_ns32k_reloc_contents (howto, input_bfd, relocation,
-				       location, get_data, put_data);
-}
diff --git a/bfd/aout-sparcle.c b/bfd/aout-sparcle.c
deleted file mode 100644
index 903b1367cb3..00000000000
--- a/bfd/aout-sparcle.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* BFD backend for sparc little-endian aout binaries.
-   Copyright (C) 1996 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGETNAME "a.out-sparc-little"
-#define MY(OP) CAT(sparcle_aout_,OP)
-
-#include "bfd.h"
-#include "bfdlink.h"
-#include "libaout.h"
-
-#define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_SPARCLET)
-
-/* Include the usual a.out support.  */
-#define TARGET_IS_LITTLE_ENDIAN_P
-#include "aoutf1.h"
diff --git a/bfd/aout-target.h b/bfd/aout-target.h
deleted file mode 100644
index 1aee07aada0..00000000000
--- a/bfd/aout-target.h
+++ /dev/null
@@ -1,650 +0,0 @@
-/* Define a target vector and some small routines for a variant of a.out.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997
-   Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-/*#include "libaout.h"*/
-
-#ifndef SEGMENT_SIZE
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#endif
-
-extern reloc_howto_type * NAME(aout,reloc_type_lookup)
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-
-/* Set parameters about this a.out file that are machine-dependent.
-   This routine is called from some_aout_object_p just before it returns.  */
-#ifndef MY_callback
-
-static const bfd_target *MY(callback) PARAMS ((bfd *));
-
-static const bfd_target *
-MY(callback) (abfd)
-     bfd *abfd;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-  unsigned int arch_align_power;
-  unsigned long arch_align;
-
-  /* Calculate the file positions of the parts of a newly read aout header */
-  obj_textsec (abfd)->_raw_size = N_TXTSIZE(*execp);
-
-  /* The virtual memory addresses of the sections */
-  obj_textsec (abfd)->vma = N_TXTADDR(*execp);
-  obj_datasec (abfd)->vma = N_DATADDR(*execp);
-  obj_bsssec  (abfd)->vma = N_BSSADDR(*execp);
-
-  /* For some targets, if the entry point is not in the same page
-     as the start of the text, then adjust the VMA so that it is.
-     FIXME: Do this with a macro like SET_ARCH_MACH instead?  */
-  if (aout_backend_info (abfd)->entry_is_text_address
-      && execp->a_entry > obj_textsec (abfd)->vma)
-    {
-      bfd_vma adjust;
-
-      adjust = execp->a_entry - obj_textsec (abfd)->vma;
-      /* Adjust only by whole pages. */
-      adjust &= ~(TARGET_PAGE_SIZE - 1);
-      obj_textsec (abfd)->vma += adjust;
-      obj_datasec (abfd)->vma += adjust;
-      obj_bsssec (abfd)->vma += adjust;
-    }
-
-  /* Set the load addresses to be the same as the virtual addresses.  */
-  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
-  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
-  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
-
-  /* The file offsets of the sections */
-  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
-  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
-
-  /* The file offsets of the relocation info */
-  obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp);
-  obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp);
-
-  /* The file offsets of the string table and symbol table.  */
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-  
-  /* Determine the architecture and machine type of the object file.  */
-#ifdef SET_ARCH_MACH
-  SET_ARCH_MACH(abfd, *execp);
-#else
-  bfd_default_set_arch_mach(abfd, DEFAULT_ARCH, 0);
-#endif
-
-  /* The number of relocation records.  This must be called after
-     SET_ARCH_MACH.  It assumes that SET_ARCH_MACH will set
-     obj_reloc_entry_size correctly, if the reloc size is not
-     RELOC_STD_SIZE.  */
-  obj_textsec (abfd)->reloc_count =
-    execp->a_trsize / obj_reloc_entry_size (abfd);
-  obj_datasec (abfd)->reloc_count =
-    execp->a_drsize / obj_reloc_entry_size (abfd);
-
-  /* Now that we know the architecture, set the alignments of the
-     sections.  This is normally done by NAME(aout,new_section_hook),
-     but when the initial sections were created the architecture had
-     not yet been set.  However, for backward compatibility, we don't
-     set the alignment power any higher than as required by the size
-     of the section.  */
-  arch_align_power = bfd_get_arch_info (abfd)->section_align_power;
-  arch_align = 1 << arch_align_power;
-  if ((BFD_ALIGN (obj_textsec (abfd)->_raw_size, arch_align)
-       == obj_textsec (abfd)->_raw_size)
-      && (BFD_ALIGN (obj_datasec (abfd)->_raw_size, arch_align)
-	  == obj_datasec (abfd)->_raw_size)
-      && (BFD_ALIGN (obj_bsssec (abfd)->_raw_size, arch_align)
-	  == obj_bsssec (abfd)->_raw_size))
-    {
-      obj_textsec (abfd)->alignment_power = arch_align_power;
-      obj_datasec (abfd)->alignment_power = arch_align_power;
-      obj_bsssec (abfd)->alignment_power = arch_align_power;
-    }
-
-  /* Don't set sizes now -- can't be sure until we know arch & mach.
-     Sizes get set in set_sizes callback, later.  */
-#if 0
-  adata(abfd).page_size = TARGET_PAGE_SIZE;
-  adata(abfd).segment_size = SEGMENT_SIZE;
-  adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-#endif
-
-  return abfd->xvec;
-}
-#endif
-
-#ifndef MY_object_p
-/* Finish up the reading of an a.out file header */
-
-static const bfd_target *MY(object_p) PARAMS ((bfd *));
-
-static const bfd_target *
-MY(object_p) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;	/* Raw exec header from file */
-  struct internal_exec exec;		/* Cleaned-up exec header */
-  const bfd_target *target;
-
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE) {
-    if (bfd_get_error () != bfd_error_system_call)
-      bfd_set_error (bfd_error_wrong_format);
-    return 0;
-  }
-
-#ifdef SWAP_MAGIC
-  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
-#else
-  exec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
-#endif /* SWAP_MAGIC */
-
-  if (N_BADMAG (exec)) return 0;
-#ifdef MACHTYPE_OK
-  if (!(MACHTYPE_OK (N_MACHTYPE (exec)))) return 0;
-#endif
-
-  NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec);
-
-#ifdef SWAP_MAGIC
-  /* swap_exec_header_in read in a_info with the wrong byte order */
-  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
-#endif /* SWAP_MAGIC */
-
-  target = NAME(aout,some_aout_object_p) (abfd, &exec, MY(callback));
-
-#ifdef ENTRY_CAN_BE_ZERO
-  /* The NEWSOS3 entry-point is/was 0, which (amongst other lossage)
-   * means that it isn't obvious if EXEC_P should be set.
-   * All of the following must be true for an executable:
-   * There must be no relocations, the bfd can be neither an
-   * archive nor an archive element, and the file must be executable. */
-
-  if (exec.a_trsize + exec.a_drsize == 0
-      && bfd_get_format(abfd) == bfd_object && abfd->my_archive == NULL)
-    {
-      struct stat buf;
-#ifndef S_IXUSR
-#define S_IXUSR 0100	/* Execute by owner.  */
-#endif
-      if (stat(abfd->filename, &buf) == 0 && (buf.st_mode & S_IXUSR))
-	abfd->flags |= EXEC_P;
-    }
-#endif /* ENTRY_CAN_BE_ZERO */
-
-  return target;
-}
-#define MY_object_p MY(object_p)
-#endif
-
-
-#ifndef MY_mkobject
-
-static boolean MY(mkobject) PARAMS ((bfd *));
-
-static boolean
-MY(mkobject) (abfd)
-     bfd *abfd;
-{
-  if (NAME(aout,mkobject)(abfd) == false)
-    return false;
-#if 0 /* Sizes get set in set_sizes callback, later, after we know
-	 the architecture and machine.  */
-  adata(abfd).page_size = TARGET_PAGE_SIZE;
-  adata(abfd).segment_size = SEGMENT_SIZE;
-  adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-#endif
-  return true;
-}
-#define MY_mkobject MY(mkobject)
-#endif
-
-#ifndef MY_bfd_copy_private_section_data
-
-/* Copy private section data.  This actually does nothing with the
-   sections.  It copies the subformat field.  We copy it here, because
-   we need to know whether this is a QMAGIC file before we set the
-   section contents, and copy_private_bfd_data is not called until
-   after the section contents have been set.  */
-
-static boolean MY_bfd_copy_private_section_data
-  PARAMS ((bfd *, asection *, bfd *, asection *));
-
-/*ARGSUSED*/
-static boolean
-MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
-     bfd *ibfd;
-     asection *isec;
-     bfd *obfd;
-     asection *osec;
-{
-  if (bfd_get_flavour (ibfd) == bfd_target_aout_flavour
-      && bfd_get_flavour (obfd) == bfd_target_aout_flavour)
-    obj_aout_subformat (obfd) = obj_aout_subformat (ibfd);
-  return true;
-}
-
-#endif
-
-/* Write an object file.
-   Section contents have already been written.  We write the
-   file header, symbols, and relocation.  */
-
-#ifndef MY_write_object_contents
-static boolean
-MY(write_object_contents) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-#if CHOOSE_RELOC_SIZE
-  CHOOSE_RELOC_SIZE(abfd);
-#else
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-#endif
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
-}
-#define MY_write_object_contents MY(write_object_contents)
-#endif
-
-#ifndef MY_set_sizes
-
-static boolean MY(set_sizes) PARAMS ((bfd *));
-
-static boolean
-MY(set_sizes) (abfd)
-     bfd *abfd;
-{
-  adata(abfd).page_size = TARGET_PAGE_SIZE;
-  adata(abfd).segment_size = SEGMENT_SIZE;
-
-#ifdef ZMAGIC_DISK_BLOCK_SIZE
-  adata(abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE;
-#else
-  adata(abfd).zmagic_disk_block_size = TARGET_PAGE_SIZE;
-#endif
-
-  adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-  return true;
-}
-#define MY_set_sizes MY(set_sizes)
-#endif
-
-#ifndef MY_exec_hdr_flags
-#define MY_exec_hdr_flags 0
-#endif
-
-#ifndef MY_backend_data
-
-#ifndef MY_zmagic_contiguous
-#define MY_zmagic_contiguous 0
-#endif
-#ifndef MY_text_includes_header
-#define MY_text_includes_header 0
-#endif
-#ifndef MY_entry_is_text_address
-#define MY_entry_is_text_address 0
-#endif
-#ifndef MY_exec_header_not_counted
-#define MY_exec_header_not_counted 0
-#endif
-#ifndef MY_add_dynamic_symbols
-#define MY_add_dynamic_symbols 0
-#endif
-#ifndef MY_add_one_symbol
-#define MY_add_one_symbol 0
-#endif
-#ifndef MY_link_dynamic_object
-#define MY_link_dynamic_object 0
-#endif
-#ifndef MY_write_dynamic_symbol
-#define MY_write_dynamic_symbol 0
-#endif
-#ifndef MY_check_dynamic_reloc
-#define MY_check_dynamic_reloc 0
-#endif
-#ifndef MY_finish_dynamic_link
-#define MY_finish_dynamic_link 0
-#endif
-
-static CONST struct aout_backend_data MY(backend_data) = {
-  MY_zmagic_contiguous,
-  MY_text_includes_header,
-  MY_entry_is_text_address,
-  MY_exec_hdr_flags,
-  0,				/* text vma? */
-  MY_set_sizes,
-  MY_exec_header_not_counted,
-  MY_add_dynamic_symbols,
-  MY_add_one_symbol,
-  MY_link_dynamic_object,
-  MY_write_dynamic_symbol,
-  MY_check_dynamic_reloc,
-  MY_finish_dynamic_link
-};
-#define MY_backend_data &MY(backend_data)
-#endif
-
-#ifndef MY_final_link_callback
-
-/* Callback for the final_link routine to set the section offsets.  */
-
-static void MY_final_link_callback
-  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-
-static void
-MY_final_link_callback (abfd, ptreloff, pdreloff, psymoff)
-     bfd *abfd;
-     file_ptr *ptreloff;
-     file_ptr *pdreloff;
-     file_ptr *psymoff;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  *ptreloff = N_TRELOFF (*execp);
-  *pdreloff = N_DRELOFF (*execp);
-  *psymoff = N_SYMOFF (*execp);
-}
-
-#endif
-
-#ifndef MY_bfd_final_link
-
-/* Final link routine.  We need to use a call back to get the correct
-   offsets in the output file.  */
-
-static boolean MY_bfd_final_link PARAMS ((bfd *, struct bfd_link_info *));
-
-static boolean
-MY_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
-}
-
-#endif
-
-/* We assume BFD generic archive files.  */
-#ifndef	MY_openr_next_archived_file
-#define	MY_openr_next_archived_file	bfd_generic_openr_next_archived_file
-#endif
-#ifndef MY_get_elt_at_index
-#define MY_get_elt_at_index		_bfd_generic_get_elt_at_index
-#endif
-#ifndef	MY_generic_stat_arch_elt
-#define	MY_generic_stat_arch_elt	bfd_generic_stat_arch_elt
-#endif
-#ifndef	MY_slurp_armap
-#define	MY_slurp_armap			bfd_slurp_bsd_armap
-#endif
-#ifndef	MY_slurp_extended_name_table
-#define	MY_slurp_extended_name_table	_bfd_slurp_extended_name_table
-#endif
-#ifndef MY_construct_extended_name_table
-#define MY_construct_extended_name_table \
-  _bfd_archive_bsd_construct_extended_name_table
-#endif
-#ifndef	MY_write_armap
-#define	MY_write_armap		bsd_write_armap
-#endif
-#ifndef MY_read_ar_hdr
-#define MY_read_ar_hdr		_bfd_generic_read_ar_hdr
-#endif
-#ifndef	MY_truncate_arname
-#define	MY_truncate_arname		bfd_bsd_truncate_arname
-#endif
-#ifndef MY_update_armap_timestamp
-#define MY_update_armap_timestamp _bfd_archive_bsd_update_armap_timestamp
-#endif
-
-/* No core file defined here -- configure in trad-core.c separately.  */
-#ifndef	MY_core_file_failing_command
-#define	MY_core_file_failing_command _bfd_nocore_core_file_failing_command
-#endif
-#ifndef	MY_core_file_failing_signal
-#define	MY_core_file_failing_signal	_bfd_nocore_core_file_failing_signal
-#endif
-#ifndef	MY_core_file_matches_executable_p
-#define	MY_core_file_matches_executable_p	\
-				_bfd_nocore_core_file_matches_executable_p
-#endif
-#ifndef	MY_core_file_p
-#define	MY_core_file_p		_bfd_dummy_target
-#endif
-
-#ifndef MY_bfd_debug_info_start
-#define MY_bfd_debug_info_start		bfd_void
-#endif
-#ifndef MY_bfd_debug_info_end
-#define MY_bfd_debug_info_end		bfd_void
-#endif
-#ifndef MY_bfd_debug_info_accumulate
-#define MY_bfd_debug_info_accumulate	\
-			(void (*) PARAMS ((bfd*, struct sec *))) bfd_void
-#endif
-
-#ifndef MY_core_file_failing_command
-#define MY_core_file_failing_command NAME(aout,core_file_failing_command)
-#endif
-#ifndef MY_core_file_failing_signal
-#define MY_core_file_failing_signal NAME(aout,core_file_failing_signal)
-#endif
-#ifndef MY_core_file_matches_executable_p
-#define MY_core_file_matches_executable_p NAME(aout,core_file_matches_executable_p)
-#endif
-#ifndef MY_set_section_contents
-#define MY_set_section_contents NAME(aout,set_section_contents)
-#endif
-#ifndef MY_get_section_contents
-#define MY_get_section_contents NAME(aout,get_section_contents)
-#endif
-#ifndef MY_get_section_contents_in_window
-#define MY_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
-#endif
-#ifndef MY_new_section_hook
-#define MY_new_section_hook NAME(aout,new_section_hook)
-#endif
-#ifndef MY_get_symtab_upper_bound
-#define MY_get_symtab_upper_bound NAME(aout,get_symtab_upper_bound)
-#endif
-#ifndef MY_get_symtab
-#define MY_get_symtab NAME(aout,get_symtab)
-#endif
-#ifndef MY_get_reloc_upper_bound
-#define MY_get_reloc_upper_bound NAME(aout,get_reloc_upper_bound)
-#endif
-#ifndef MY_canonicalize_reloc
-#define MY_canonicalize_reloc NAME(aout,canonicalize_reloc)
-#endif
-#ifndef MY_make_empty_symbol
-#define MY_make_empty_symbol NAME(aout,make_empty_symbol)
-#endif
-#ifndef MY_print_symbol
-#define MY_print_symbol NAME(aout,print_symbol)
-#endif
-#ifndef MY_get_symbol_info
-#define MY_get_symbol_info NAME(aout,get_symbol_info)
-#endif
-#ifndef MY_get_lineno
-#define MY_get_lineno NAME(aout,get_lineno)
-#endif
-#ifndef MY_set_arch_mach
-#define MY_set_arch_mach NAME(aout,set_arch_mach)
-#endif
-#ifndef MY_find_nearest_line
-#define MY_find_nearest_line NAME(aout,find_nearest_line)
-#endif
-#ifndef MY_sizeof_headers
-#define MY_sizeof_headers NAME(aout,sizeof_headers)
-#endif
-#ifndef MY_bfd_get_relocated_section_contents
-#define MY_bfd_get_relocated_section_contents \
-			bfd_generic_get_relocated_section_contents
-#endif
-#ifndef MY_bfd_relax_section
-#define MY_bfd_relax_section bfd_generic_relax_section
-#endif
-#ifndef MY_bfd_gc_sections
-#define MY_bfd_gc_sections bfd_generic_gc_sections
-#endif
-#ifndef MY_bfd_reloc_type_lookup
-#define MY_bfd_reloc_type_lookup NAME(aout,reloc_type_lookup)
-#endif
-#ifndef MY_bfd_make_debug_symbol
-#define MY_bfd_make_debug_symbol 0
-#endif
-#ifndef MY_read_minisymbols
-#define MY_read_minisymbols NAME(aout,read_minisymbols)
-#endif
-#ifndef MY_minisymbol_to_symbol
-#define MY_minisymbol_to_symbol NAME(aout,minisymbol_to_symbol)
-#endif
-#ifndef MY_bfd_link_hash_table_create
-#define MY_bfd_link_hash_table_create NAME(aout,link_hash_table_create)
-#endif
-#ifndef MY_bfd_link_add_symbols
-#define MY_bfd_link_add_symbols NAME(aout,link_add_symbols)
-#endif
-#ifndef MY_bfd_link_split_section
-#define MY_bfd_link_split_section  _bfd_generic_link_split_section
-#endif
-
-
-#ifndef MY_bfd_copy_private_bfd_data
-#define MY_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
-#endif
-
-#ifndef MY_bfd_merge_private_bfd_data
-#define MY_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
-#endif
-
-#ifndef MY_bfd_copy_private_symbol_data
-#define MY_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
-#endif
-
-#ifndef MY_bfd_print_private_bfd_data
-#define MY_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
-#endif
-
-#ifndef MY_bfd_set_private_flags
-#define MY_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-#endif
-
-#ifndef MY_bfd_is_local_label_name
-#define MY_bfd_is_local_label_name bfd_generic_is_local_label_name
-#endif
-
-#ifndef MY_bfd_free_cached_info
-#define MY_bfd_free_cached_info NAME(aout,bfd_free_cached_info)
-#endif
-
-#ifndef MY_close_and_cleanup
-#define MY_close_and_cleanup MY_bfd_free_cached_info
-#endif
-
-#ifndef MY_get_dynamic_symtab_upper_bound
-#define MY_get_dynamic_symtab_upper_bound \
-  _bfd_nodynamic_get_dynamic_symtab_upper_bound
-#endif
-#ifndef MY_canonicalize_dynamic_symtab
-#define MY_canonicalize_dynamic_symtab \
-  _bfd_nodynamic_canonicalize_dynamic_symtab
-#endif
-#ifndef MY_get_dynamic_reloc_upper_bound
-#define MY_get_dynamic_reloc_upper_bound \
-  _bfd_nodynamic_get_dynamic_reloc_upper_bound
-#endif
-#ifndef MY_canonicalize_dynamic_reloc
-#define MY_canonicalize_dynamic_reloc \
-  _bfd_nodynamic_canonicalize_dynamic_reloc
-#endif
-
-/* Aout symbols normally have leading underscores */
-#ifndef MY_symbol_leading_char 
-#define MY_symbol_leading_char '_'
-#endif
-
-/* Aout archives normally use spaces for padding */
-#ifndef AR_PAD_CHAR
-#define AR_PAD_CHAR ' '
-#endif
-
-#ifndef MY_BFD_TARGET
-const bfd_target MY(vec) =
-{
-  TARGETNAME,		/* name */
-  bfd_target_aout_flavour,
-#ifdef TARGET_IS_BIG_ENDIAN_P
-  BFD_ENDIAN_BIG,		/* target byte order (big) */
-  BFD_ENDIAN_BIG,		/* target headers byte order (big) */
-#else
-  BFD_ENDIAN_LITTLE,		/* target byte order (little) */
-  BFD_ENDIAN_LITTLE,		/* target headers byte order (little) */
-#endif
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  MY_symbol_leading_char,
-  AR_PAD_CHAR,			/* ar_pad_char */
-  15,				/* ar_max_namelen */
-#ifdef TARGET_IS_BIG_ENDIAN_P
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-#else
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-#endif
-    {_bfd_dummy_target, MY_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, MY_core_file_p},
-    {bfd_false, MY_mkobject,	/* bfd_set_format */
-       _bfd_generic_mkarchive, bfd_false},
-    {bfd_false, MY_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (MY),
-     BFD_JUMP_TABLE_COPY (MY),
-     BFD_JUMP_TABLE_CORE (MY),
-     BFD_JUMP_TABLE_ARCHIVE (MY),
-     BFD_JUMP_TABLE_SYMBOLS (MY),
-     BFD_JUMP_TABLE_RELOCS (MY),
-     BFD_JUMP_TABLE_WRITE (MY),
-     BFD_JUMP_TABLE_LINK (MY),
-     BFD_JUMP_TABLE_DYNAMIC (MY),
-
-  (PTR) MY_backend_data,
-};
-#endif /* MY_BFD_TARGET */
diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c
deleted file mode 100644
index eae6cb754cb..00000000000
--- a/bfd/aout-tic30.c
+++ /dev/null
@@ -1,1065 +0,0 @@
-/* BFD back-end for TMS320C30 a.out binaries.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#define TARGET_IS_BIG_ENDIAN_P
-#define N_HEADER_IN_TEXT(x) 1
-#define BYTES_IN_WORD 4
-#define TEXT_START_ADDR 1024
-#define TARGET_PAGE_SIZE 128
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_tic30
-#define ARCH_SIZE 32
-
-#define MY(OP) CAT(tic30_aout_,OP)
-#define TARGETNAME "a.out-tic30"
-#define NAME(x,y) CAT3(tic30_aout,_32_,y)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libaout.h"
-
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-
-static bfd_reloc_status_type tic30_aout_fix_16
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type tic30_aout_fix_32
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type tic30_aout_fix_pcrel_16
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *tic30_aout_reloc_howto
-  PARAMS ((bfd *, struct reloc_std_external *, int *, int *, int *));
-static bfd_reloc_status_type tic30_aout_relocate_contents
-  PARAMS ((reloc_howto_type *, bfd *, bfd_vma, bfd_byte *));
-static bfd_reloc_status_type tic30_aout_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma,
-	   bfd_vma, bfd_vma));
-static const bfd_target *tic30_aout_object_p PARAMS ((bfd *));
-static boolean tic30_aout_write_object_contents PARAMS ((bfd *));
-static boolean tic30_aout_set_sizes PARAMS ((bfd *));
-
-#define MY_reloc_howto(BFD,REL,IN,EX,PC) tic30_aout_reloc_howto(BFD,REL,&IN,&EX,&PC)
-#define MY_final_link_relocate tic30_aout_final_link_relocate
-#define MY_object_p tic30_aout_object_p
-#define MY_mkobject NAME(aout,mkobject)
-#define MY_write_object_contents tic30_aout_write_object_contents
-#define MY_set_sizes tic30_aout_set_sizes
-
-#ifndef MY_exec_hdr_flags
-#define MY_exec_hdr_flags 1
-#endif
-
-#ifndef MY_backend_data
-
-#ifndef MY_zmagic_contiguous
-#define MY_zmagic_contiguous 0
-#endif
-#ifndef MY_text_includes_header
-#define MY_text_includes_header 0
-#endif
-#ifndef MY_entry_is_text_address
-#define MY_entry_is_text_address 0
-#endif
-#ifndef MY_exec_header_not_counted
-#define MY_exec_header_not_counted 1
-#endif
-#ifndef MY_add_dynamic_symbols
-#define MY_add_dynamic_symbols 0
-#endif
-#ifndef MY_add_one_symbol
-#define MY_add_one_symbol 0
-#endif
-#ifndef MY_link_dynamic_object
-#define MY_link_dynamic_object 0
-#endif
-#ifndef MY_write_dynamic_symbol
-#define MY_write_dynamic_symbol 0
-#endif
-#ifndef MY_check_dynamic_reloc
-#define MY_check_dynamic_reloc 0
-#endif
-#ifndef MY_finish_dynamic_link
-#define MY_finish_dynamic_link 0
-#endif
-
-static CONST struct aout_backend_data tic30_aout_backend_data =
-{
-  MY_zmagic_contiguous,
-  MY_text_includes_header,
-  MY_entry_is_text_address,
-  MY_exec_hdr_flags,
-  0,				/* text vma? */
-  MY_set_sizes,
-  MY_exec_header_not_counted,
-  MY_add_dynamic_symbols,
-  MY_add_one_symbol,
-  MY_link_dynamic_object,
-  MY_write_dynamic_symbol,
-  MY_check_dynamic_reloc,
-  MY_finish_dynamic_link
-};
-#define MY_backend_data &tic30_aout_backend_data
-#endif
-
-/* FIXME: This is wrong.  aoutx.h should really only be included by
-   aout32.c.  */
-
-#include "aoutx.h"
-
-/* This table lists the relocation types for the TMS320C30.  There are
-   only a few relocations required, and all must be divided by 4 (>>
-   2) to get the 32-bit addresses in the format the TMS320C30 likes
-   it. */
-reloc_howto_type tic30_aout_howto_table[] =
-{
-  {-1},
-  HOWTO (1, 2, 1, 16, false, 0, 0, tic30_aout_fix_16,
-	 "16", false, 0x0000FFFF, 0x0000FFFF, false),
-  HOWTO (2, 2, 2, 24, false, 0, complain_overflow_bitfield, NULL,
-	 "24", false, 0x00FFFFFF, 0x00FFFFFF, false),
-  HOWTO (3, 18, 3, 24, false, 0, complain_overflow_bitfield, NULL,
-	 "LDP", false, 0x00FF0000, 0x000000FF, false),
-  HOWTO (4, 2, 4, 32, false, 0, complain_overflow_bitfield, tic30_aout_fix_32,
-	 "32", false, 0xFFFFFFFF, 0xFFFFFFFF, false),
-  HOWTO (5, 2, 1, 16, true, 0, complain_overflow_signed,
-	 tic30_aout_fix_pcrel_16, "PCREL", true, 0x0000FFFF, 0x0000FFFF, true),
-  {-1},
-  {-1},
-  {-1},
-  {-1},
-  {-1}
-};
-
-extern reloc_howto_type *NAME (aout, reloc_type_lookup) ();
-
-reloc_howto_type *
-tic30_aout_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_8:
-    case BFD_RELOC_TIC30_LDP:
-      return &tic30_aout_howto_table[3];
-    case BFD_RELOC_16:
-      return &tic30_aout_howto_table[1];
-    case BFD_RELOC_24:
-      return &tic30_aout_howto_table[2];
-    case BFD_RELOC_16_PCREL:
-      return &tic30_aout_howto_table[5];
-    case BFD_RELOC_32:
-      return &tic30_aout_howto_table[4];
-    default:
-      return (reloc_howto_type *) NULL;
-    }
-}
-
-static reloc_howto_type *
-tic30_aout_reloc_howto (abfd, relocs, r_index, r_extern, r_pcrel)
-     bfd *abfd;
-     struct reloc_std_external *relocs;
-     int *r_index;
-     int *r_extern;
-     int *r_pcrel;
-{
-  unsigned int r_length;
-  unsigned int r_pcrel_done;
-  int index;
-
-  *r_pcrel = 0;
-  if (bfd_header_big_endian (abfd))
-    {
-      *r_index = ((relocs->r_index[0] << 16) | (relocs->r_index[1] << 8) | relocs->r_index[2]);
-      *r_extern = (0 != (relocs->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
-      r_pcrel_done = (0 != (relocs->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
-      r_length = ((relocs->r_type[0] & RELOC_STD_BITS_LENGTH_BIG) >> RELOC_STD_BITS_LENGTH_SH_BIG);
-    }
-  else
-    {
-      *r_index = ((relocs->r_index[2] << 16) | (relocs->r_index[1] << 8) | relocs->r_index[0]);
-      *r_extern = (0 != (relocs->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
-      r_pcrel_done = (0 != (relocs->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
-      r_length = ((relocs->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE) >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
-    }
-  index = r_length + 4 * r_pcrel_done;
-  return tic30_aout_howto_table + index;
-}
-
-/* This function is used as a callback for 16-bit relocs.  This is
-   required for relocations between segments.  A line in aoutx.h
-   requires that any relocations for the data section should point to
-   the end of the aligned text section, plus an offset.  By default,
-   this does not happen, therefore this function takes care of
-   that. */
-
-static bfd_reloc_status_type
-tic30_aout_fix_16 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-
-  /* Make sure that the symbol's section is defined. */
-  if (symbol->section == &bfd_und_section && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined;
-  /* Get the size of the input section and turn it into the TMS320C30
-     32-bit address format. */
-  relocation = (symbol->section->vma >> 2);
-  relocation += bfd_get_16 (abfd, (bfd_byte *) data + reloc_entry->address);
-  bfd_put_16 (abfd, relocation, (bfd_byte *) data + reloc_entry->address);
-  return bfd_reloc_ok;
-}
-
-/* This function does the same thing as tic30_aout_fix_16 except for 32
-   bit relocations. */
-
-static bfd_reloc_status_type
-tic30_aout_fix_32 (abfd, reloc_entry, symbol, data, input_section,
-		   output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-
-  /* Make sure that the symbol's section is defined. */
-  if (symbol->section == &bfd_und_section && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_ok : bfd_reloc_undefined;
-  /* Get the size of the input section and turn it into the TMS320C30
-     32-bit address format. */
-  relocation = (symbol->section->vma >> 2);
-  relocation += bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
-  bfd_put_32 (abfd, relocation, (bfd_byte *) data + reloc_entry->address);
-  return bfd_reloc_ok;
-}
-
-/* This function is used to work out pc-relative offsets for the
-   TMS320C30.  The data already placed by md_pcrel_from within gas is
-   useless for a relocation, so we just get the offset value and place
-   a version of this within the object code.
-   tic30_aout_final_link_relocate will then calculate the required
-   relocation to add on to the value in the object code. */
-
-static bfd_reloc_status_type
-tic30_aout_fix_pcrel_16 (abfd, reloc_entry, symbol, data, input_section,
-			 output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation = 1;
-  bfd_byte offset_data = bfd_get_8 (abfd, (bfd_byte *) data + reloc_entry->address - 1);
-
-  /* The byte before the location of the fix contains bits 23-16 of
-     the pcrel instruction.  Bit 21 is set for a delayed instruction
-     which requires on offset of 3 instead of 1. */
-  if (offset_data & 0x20)
-    relocation -= 3;
-  else
-    relocation -= 1;
-  bfd_put_16 (abfd, relocation, (bfd_byte *) data + reloc_entry->address);
-  return bfd_reloc_ok;
-}
-
-/* These macros will get 24-bit values from the bfd definition.
-   Big-endian only. */
-#define bfd_getb_24(BFD,ADDR) (bfd_get_8(BFD,ADDR) << 16) | \
-                              (bfd_get_8(BFD,ADDR+1) << 8) | \
-                              (bfd_get_8(BFD,ADDR+2))
-
-#define bfd_putb_24(BFD,DATA,ADDR) bfd_put_8(BFD,(bfd_byte)((DATA >> 16) & 0xFF),ADDR); \
-	                               bfd_put_8(BFD,(bfd_byte)((DATA >> 8) & 0xFF),ADDR+1); \
-		         				   bfd_put_8(BFD,(bfd_byte)(DATA & 0xFF),ADDR+2)
-
-/* Set parameters about this a.out file that are machine-dependent.
-   This routine is called from some_aout_object_p just before it returns.  */
-
-static const bfd_target *
-tic30_aout_callback (abfd)
-     bfd *abfd;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-  unsigned int arch_align_power;
-  unsigned long arch_align;
-
-  /* Calculate the file positions of the parts of a newly read aout header */
-  obj_textsec (abfd)->_raw_size = N_TXTSIZE (*execp);
-
-  /* The virtual memory addresses of the sections */
-  obj_textsec (abfd)->vma = N_TXTADDR (*execp);
-  obj_datasec (abfd)->vma = N_DATADDR (*execp);
-  obj_bsssec (abfd)->vma = N_BSSADDR (*execp);
-
-  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
-  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
-  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
-
-  /* The file offsets of the sections */
-  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
-  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
-
-  /* The file offsets of the relocation info */
-  obj_textsec (abfd)->rel_filepos = N_TRELOFF (*execp);
-  obj_datasec (abfd)->rel_filepos = N_DRELOFF (*execp);
-
-  /* The file offsets of the string table and symbol table.  */
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-
-  /* Determine the architecture and machine type of the object file.  */
-#ifdef SET_ARCH_MACH
-  SET_ARCH_MACH (abfd, *execp);
-#else
-  bfd_default_set_arch_mach (abfd, DEFAULT_ARCH, 0);
-#endif
-
-  /* Now that we know the architecture, set the alignments of the
-     sections.  This is normally done by NAME(aout,new_section_hook),
-     but when the initial sections were created the architecture had
-     not yet been set.  However, for backward compatibility, we don't
-     set the alignment power any higher than as required by the size
-     of the section.  */
-  arch_align_power = bfd_get_arch_info (abfd)->section_align_power;
-  arch_align = 1 << arch_align_power;
-  if ((BFD_ALIGN (obj_textsec (abfd)->_raw_size, arch_align)
-       == obj_textsec (abfd)->_raw_size)
-      && (BFD_ALIGN (obj_datasec (abfd)->_raw_size, arch_align)
-	  == obj_datasec (abfd)->_raw_size)
-      && (BFD_ALIGN (obj_bsssec (abfd)->_raw_size, arch_align)
-	  == obj_bsssec (abfd)->_raw_size))
-    {
-      obj_textsec (abfd)->alignment_power = arch_align_power;
-      obj_datasec (abfd)->alignment_power = arch_align_power;
-      obj_bsssec (abfd)->alignment_power = arch_align_power;
-    }
-  return abfd->xvec;
-}
-
-static bfd_reloc_status_type
-tic30_aout_final_link_relocate (howto, input_bfd, input_section, contents,
-				address, value, addend)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma address;
-     bfd_vma value;
-     bfd_vma addend;
-{
-  bfd_vma relocation;
-
-  if (address > input_section->_raw_size)
-    return bfd_reloc_outofrange;
-
-  relocation = value + addend;
-  if (howto->pc_relative)
-    {
-      relocation -= (input_section->output_section->vma + input_section->output_offset);
-      if (howto->pcrel_offset)
-	relocation -= address;
-    }
-  return tic30_aout_relocate_contents (howto, input_bfd, relocation,
-				       contents + address);
-}
-
-bfd_reloc_status_type
-tic30_aout_relocate_contents (howto, input_bfd, relocation, location)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd_vma relocation;
-     bfd_byte *location;
-{
-  bfd_vma x;
-  boolean overflow;
-
-  if (howto->size < 0)
-    relocation = -relocation;
-
-  switch (howto->size)
-    {
-    default:
-    case 0:
-      abort ();
-      break;
-    case 1:
-      x = bfd_get_16 (input_bfd, location);
-      break;
-    case 2:
-      x = bfd_getb_24 (input_bfd, location);
-      break;
-    case 3:
-      x = bfd_get_8 (input_bfd, location);
-      break;
-    case 4:
-      x = bfd_get_32 (input_bfd, location);
-      break;
-    }
-  overflow = false;
-  if (howto->complain_on_overflow != complain_overflow_dont)
-    {
-      bfd_vma check;
-      bfd_signed_vma signed_check;
-      bfd_vma add;
-      bfd_signed_vma signed_add;
-
-      if (howto->rightshift == 0)
-	{
-	  check = relocation;
-	  signed_check = (bfd_signed_vma) relocation;
-	}
-      else
-	{
-	  check = relocation >> howto->rightshift;
-	  if ((bfd_signed_vma) relocation >= 0)
-	    signed_check = check;
-	  else
-	    signed_check = (check | ((bfd_vma) - 1 & ~((bfd_vma) - 1 >> howto->rightshift)));
-	}
-      add = x & howto->src_mask;
-      signed_add = add;
-      if ((add & (((~howto->src_mask) >> 1) & howto->src_mask)) != 0)
-	signed_add -= (((~howto->src_mask) >> 1) & howto->src_mask) << 1;
-      if (howto->bitpos == 0)
-	{
-	  check += add;
-	  signed_check += signed_add;
-	}
-      else
-	{
-	  check += add >> howto->bitpos;
-	  if (signed_add >= 0)
-	    signed_check += add >> howto->bitpos;
-	  else
-	    signed_check += ((add >> howto->bitpos) | ((bfd_vma) - 1 & ~((bfd_vma) - 1 >> howto->bitpos)));
-	}
-      switch (howto->complain_on_overflow)
-	{
-	case complain_overflow_signed:
-	  {
-	    bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
-	    bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
-	    if (signed_check > reloc_signed_max || signed_check < reloc_signed_min)
-	      overflow = true;
-	  }
-	  break;
-	case complain_overflow_unsigned:
-	  {
-	    bfd_vma reloc_unsigned_max = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
-	    if (check > reloc_unsigned_max)
-	      overflow = true;
-	  }
-	  break;
-	case complain_overflow_bitfield:
-	  {
-	    bfd_vma reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
-	    if ((check & ~reloc_bits) != 0 && (((bfd_vma) signed_check & ~reloc_bits) != (-1 & ~reloc_bits)))
-	      overflow = true;
-	  }
-	  break;
-	default:
-	  abort ();
-	}
-    }
-  relocation >>= (bfd_vma) howto->rightshift;
-  relocation <<= (bfd_vma) howto->bitpos;
-  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + relocation) & howto->dst_mask));
-  switch (howto->size)
-    {
-    default:
-    case 0:
-      abort ();
-      break;
-    case 1:
-      bfd_put_16 (input_bfd, x, location);
-      break;
-    case 2:
-      bfd_putb_24 (input_bfd, x, location);
-      break;
-    case 3:
-      bfd_put_8 (input_bfd, x, location);
-      break;
-    case 4:
-      bfd_put_32 (input_bfd, x, location);
-      break;
-    }
-  return overflow ? bfd_reloc_overflow : bfd_reloc_ok;
-}
-
-/* Finish up the reading of an a.out file header */
-
-static const bfd_target *
-tic30_aout_object_p (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;	/* Raw exec header from file */
-  struct internal_exec exec;	/* Cleaned-up exec header */
-  const bfd_target *target;
-
-  if (bfd_read ((PTR) & exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-#ifdef SWAP_MAGIC
-  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
-#else
-  exec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
-#endif /* SWAP_MAGIC */
-
-  if (N_BADMAG (exec))
-    return 0;
-#ifdef MACHTYPE_OK
-  if (!(MACHTYPE_OK (N_MACHTYPE (exec))))
-    return 0;
-#endif
-
-  NAME (aout, swap_exec_header_in) (abfd, &exec_bytes, &exec);
-
-#ifdef SWAP_MAGIC
-  /* swap_exec_header_in read in a_info with the wrong byte order */
-  exec.a_info = SWAP_MAGIC (exec_bytes.e_info);
-#endif /* SWAP_MAGIC */
-
-  target = NAME (aout, some_aout_object_p) (abfd, &exec, tic30_aout_callback);
-
-#ifdef ENTRY_CAN_BE_ZERO
-  /* The NEWSOS3 entry-point is/was 0, which (amongst other lossage)
-   * means that it isn't obvious if EXEC_P should be set.
-   * All of the following must be true for an executable:
-   * There must be no relocations, the bfd can be neither an
-   * archive nor an archive element, and the file must be executable. */
-
-  if (exec.a_trsize + exec.a_drsize == 0
-      && bfd_get_format (abfd) == bfd_object && abfd->my_archive == NULL)
-    {
-      struct stat buf;
-#ifndef S_IXUSR
-#define S_IXUSR 0100		/* Execute by owner.  */
-#endif
-      if (stat (abfd->filename, &buf) == 0 && (buf.st_mode & S_IXUSR))
-	abfd->flags |= EXEC_P;
-    }
-#endif /* ENTRY_CAN_BE_ZERO */
-
-  return target;
-}
-
-/* Copy private section data.  This actually does nothing with the
-   sections.  It copies the subformat field.  We copy it here, because
-   we need to know whether this is a QMAGIC file before we set the
-   section contents, and copy_private_bfd_data is not called until
-   after the section contents have been set.  */
-
-/*ARGSUSED */
-static boolean
-MY_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
-     bfd *ibfd;
-     asection *isec;
-     bfd *obfd;
-     asection *osec;
-{
-  if (bfd_get_flavour (obfd) == bfd_target_aout_flavour)
-    obj_aout_subformat (obfd) = obj_aout_subformat (ibfd);
-  return true;
-}
-
-/* Write an object file.
-   Section contents have already been written.  We write the
-   file header, symbols, and relocation.  */
-
-static boolean
-tic30_aout_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-#if CHOOSE_RELOC_SIZE
-  CHOOSE_RELOC_SIZE (abfd);
-#else
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-#endif
-  {
-    bfd_size_type text_size;	/* dummy vars */
-    file_ptr text_end;
-    if (adata (abfd).magic == undecided_magic)
-      NAME (aout, adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
-
-    execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;
-    execp->a_entry = bfd_get_start_address (abfd);
-
-    execp->a_trsize = ((obj_textsec (abfd)->reloc_count) * obj_reloc_entry_size (abfd));
-    execp->a_drsize = ((obj_datasec (abfd)->reloc_count) * obj_reloc_entry_size (abfd));
-    NAME (aout, swap_exec_header_out) (abfd, execp, &exec_bytes);
-
-    if (adata (abfd).exec_bytes_size > 0)
-      {
-	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-	  return false;
-	if (bfd_write ((PTR) & exec_bytes, 1, adata (abfd).exec_bytes_size, abfd) != adata (abfd).exec_bytes_size)
-	  return false;
-      }
-    /* Now write out reloc info, followed by syms and strings */
-
-    if (bfd_get_outsymbols (abfd) != (asymbol **) NULL
-	&& bfd_get_symcount (abfd) != 0)
-      {
-	if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*execp)), SEEK_SET) != 0)
-	  return false;
-
-	if (!NAME (aout, write_syms) (abfd))
-	  return false;
-      }
-
-    if (bfd_seek (abfd, (file_ptr) (N_TRELOFF (*execp)), SEEK_SET) != 0)
-      return false;
-    if (!NAME (aout, squirt_out_relocs) (abfd, obj_textsec (abfd)))
-      return false;
-
-    if (bfd_seek (abfd, (file_ptr) (N_DRELOFF (*execp)), SEEK_SET) != 0)
-      return false;
-    if (!NAME (aout, squirt_out_relocs) (abfd, obj_datasec (abfd)))
-      return false;
-  }
-
-  return true;
-}
-
-static boolean
-tic30_aout_set_sizes (abfd)
-     bfd *abfd;
-{
-  adata (abfd).page_size = TARGET_PAGE_SIZE;
-
-#ifdef SEGMENT_SIZE
-  adata (abfd).segment_size = SEGMENT_SIZE;
-#else
-  adata (abfd).segment_size = TARGET_PAGE_SIZE;
-#endif
-
-#ifdef ZMAGIC_DISK_BLOCK_SIZE
-  adata (abfd).zmagic_disk_block_size = ZMAGIC_DISK_BLOCK_SIZE;
-#else
-  adata (abfd).zmagic_disk_block_size = TARGET_PAGE_SIZE;
-#endif
-
-  adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-
-  return true;
-}
-
-#ifndef MY_final_link_callback
-
-/* Callback for the final_link routine to set the section offsets.  */
-
-static void MY_final_link_callback
-  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-
-static void
-MY_final_link_callback (abfd, ptreloff, pdreloff, psymoff)
-     bfd *abfd;
-     file_ptr *ptreloff;
-     file_ptr *pdreloff;
-     file_ptr *psymoff;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  *ptreloff = obj_datasec (abfd)->filepos + execp->a_data;
-  *pdreloff = *ptreloff + execp->a_trsize;
-  *psymoff = *pdreloff + execp->a_drsize;;
-}
-
-#endif
-
-#ifndef MY_bfd_final_link
-
-/* Final link routine.  We need to use a call back to get the correct
-   offsets in the output file.  */
-
-static boolean
-MY_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-  file_ptr pos;
-  bfd_vma vma = 0;
-  int pad;
-
-  /* Set the executable header size to 0, as we don't want one for an
-     output. */
-  adata (abfd).exec_bytes_size = 0;
-  pos = adata (abfd).exec_bytes_size;
-  /* Text.  */
-  vma = info->create_object_symbols_section->vma;
-  pos += vma;
-  obj_textsec (abfd)->filepos = pos;
-  obj_textsec (abfd)->vma = vma;
-  obj_textsec (abfd)->user_set_vma = 1;
-  pos += obj_textsec (abfd)->_raw_size;
-  vma += obj_textsec (abfd)->_raw_size;
-
-  /* Data.  */
-  if (abfd->flags & D_PAGED)
-    {
-      if (info->create_object_symbols_section->next->vma > 0)
-	obj_datasec (abfd)->vma = info->create_object_symbols_section->next->vma;
-      else
-	obj_datasec (abfd)->vma = BFD_ALIGN (vma, adata (abfd).segment_size);
-    }
-  else
-    {
-      obj_datasec (abfd)->vma = BFD_ALIGN (vma, 4);
-    }
-  if (obj_datasec (abfd)->vma < vma)
-    {
-      obj_datasec (abfd)->vma = BFD_ALIGN (vma, 4);
-    }
-  obj_datasec (abfd)->user_set_vma = 1;
-  vma = obj_datasec (abfd)->vma;
-  obj_datasec (abfd)->filepos = vma + adata (abfd).exec_bytes_size;
-  execp->a_text = vma - obj_textsec (abfd)->vma;
-  obj_textsec (abfd)->_raw_size = execp->a_text;
-
-  /* Since BSS follows data immediately, see if it needs alignment.  */
-  vma += obj_datasec (abfd)->_raw_size;
-  pad = align_power (vma, obj_bsssec (abfd)->alignment_power) - vma;
-  obj_datasec (abfd)->_raw_size += pad;
-  pos += obj_datasec (abfd)->_raw_size;
-  execp->a_data = obj_datasec (abfd)->_raw_size;
-
-  /* BSS.  */
-  obj_bsssec (abfd)->vma = vma;
-  obj_bsssec (abfd)->user_set_vma = 1;
-
-  /* We are fully resized, so don't readjust in final_link. */
-  adata (abfd).magic = z_magic;
-
-  return NAME (aout, final_link) (abfd, info, MY_final_link_callback);
-}
-
-#endif
-
-enum machine_type
-tic30_aout_machine_type (arch, machine, unknown)
-     enum bfd_architecture arch;
-     unsigned long machine;
-     boolean *unknown;
-{
-  enum machine_type arch_flags;
-
-  arch_flags = M_UNKNOWN;
-  *unknown = true;
-
-  switch (arch)
-    {
-    case bfd_arch_tic30:
-      *unknown = false;
-      break;
-    default:
-      arch_flags = M_UNKNOWN;
-    }
-  if (arch_flags != M_UNKNOWN)
-    *unknown = false;
-  return arch_flags;
-}
-
-boolean
-tic30_aout_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  if (!bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
-  if (arch != bfd_arch_unknown)
-    {
-      boolean unknown;
-      tic30_aout_machine_type (arch, machine, &unknown);
-      if (unknown)
-	return false;
-    }
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-  return (*aout_backend_info (abfd)->set_sizes) (abfd);
-}
-
-/* We assume BFD generic archive files.  */
-#ifndef	MY_openr_next_archived_file
-#define	MY_openr_next_archived_file	bfd_generic_openr_next_archived_file
-#endif
-#ifndef MY_get_elt_at_index
-#define MY_get_elt_at_index		_bfd_generic_get_elt_at_index
-#endif
-#ifndef	MY_generic_stat_arch_elt
-#define	MY_generic_stat_arch_elt	bfd_generic_stat_arch_elt
-#endif
-#ifndef	MY_slurp_armap
-#define	MY_slurp_armap			bfd_slurp_bsd_armap
-#endif
-#ifndef	MY_slurp_extended_name_table
-#define	MY_slurp_extended_name_table	_bfd_slurp_extended_name_table
-#endif
-#ifndef MY_construct_extended_name_table
-#define MY_construct_extended_name_table \
-  _bfd_archive_bsd_construct_extended_name_table
-#endif
-#ifndef	MY_write_armap
-#define	MY_write_armap		bsd_write_armap
-#endif
-#ifndef MY_read_ar_hdr
-#define MY_read_ar_hdr		_bfd_generic_read_ar_hdr
-#endif
-#ifndef	MY_truncate_arname
-#define	MY_truncate_arname		bfd_bsd_truncate_arname
-#endif
-#ifndef MY_update_armap_timestamp
-#define MY_update_armap_timestamp _bfd_archive_bsd_update_armap_timestamp
-#endif
-
-/* No core file defined here -- configure in trad-core.c separately.  */
-#ifndef	MY_core_file_failing_command
-#define	MY_core_file_failing_command _bfd_nocore_core_file_failing_command
-#endif
-#ifndef	MY_core_file_failing_signal
-#define	MY_core_file_failing_signal	_bfd_nocore_core_file_failing_signal
-#endif
-#ifndef	MY_core_file_matches_executable_p
-#define	MY_core_file_matches_executable_p	\
-				_bfd_nocore_core_file_matches_executable_p
-#endif
-#ifndef	MY_core_file_p
-#define	MY_core_file_p		_bfd_dummy_target
-#endif
-
-#ifndef MY_bfd_debug_info_start
-#define MY_bfd_debug_info_start		bfd_void
-#endif
-#ifndef MY_bfd_debug_info_end
-#define MY_bfd_debug_info_end		bfd_void
-#endif
-#ifndef MY_bfd_debug_info_accumulate
-#define MY_bfd_debug_info_accumulate	\
-			(void (*) PARAMS ((bfd*, struct sec *))) bfd_void
-#endif
-
-#ifndef MY_core_file_failing_command
-#define MY_core_file_failing_command NAME(aout,core_file_failing_command)
-#endif
-#ifndef MY_core_file_failing_signal
-#define MY_core_file_failing_signal NAME(aout,core_file_failing_signal)
-#endif
-#ifndef MY_core_file_matches_executable_p
-#define MY_core_file_matches_executable_p NAME(aout,core_file_matches_executable_p)
-#endif
-#ifndef MY_set_section_contents
-#define MY_set_section_contents NAME(aout,set_section_contents)
-#endif
-#ifndef MY_get_section_contents
-#define MY_get_section_contents aout_32_get_section_contents
-#endif
-#ifndef MY_get_section_contents_in_window
-#define MY_get_section_contents_in_window _bfd_generic_get_section_contents_in_window
-#endif
-#ifndef MY_new_section_hook
-#define MY_new_section_hook NAME(aout,new_section_hook)
-#endif
-#ifndef MY_get_symtab_upper_bound
-#define MY_get_symtab_upper_bound NAME(aout,get_symtab_upper_bound)
-#endif
-#ifndef MY_get_symtab
-#define MY_get_symtab NAME(aout,get_symtab)
-#endif
-#ifndef MY_get_reloc_upper_bound
-#define MY_get_reloc_upper_bound NAME(aout,get_reloc_upper_bound)
-#endif
-#ifndef MY_canonicalize_reloc
-#define MY_canonicalize_reloc NAME(aout,canonicalize_reloc)
-#endif
-#ifndef MY_make_empty_symbol
-#define MY_make_empty_symbol NAME(aout,make_empty_symbol)
-#endif
-#ifndef MY_print_symbol
-#define MY_print_symbol NAME(aout,print_symbol)
-#endif
-#ifndef MY_get_symbol_info
-#define MY_get_symbol_info NAME(aout,get_symbol_info)
-#endif
-#ifndef MY_get_lineno
-#define MY_get_lineno NAME(aout,get_lineno)
-#endif
-#ifndef MY_set_arch_mach
-#define MY_set_arch_mach tic30_aout_set_arch_mach
-#endif
-#ifndef MY_find_nearest_line
-#define MY_find_nearest_line NAME(aout,find_nearest_line)
-#endif
-#ifndef MY_sizeof_headers
-#define MY_sizeof_headers NAME(aout,sizeof_headers)
-#endif
-#ifndef MY_bfd_get_relocated_section_contents
-#define MY_bfd_get_relocated_section_contents \
-			bfd_generic_get_relocated_section_contents
-#endif
-#ifndef MY_bfd_relax_section
-#define MY_bfd_relax_section bfd_generic_relax_section
-#endif
-#ifndef MY_bfd_gc_sections
-#define MY_bfd_gc_sections bfd_generic_gc_sections
-#endif
-#ifndef MY_bfd_reloc_type_lookup
-#define MY_bfd_reloc_type_lookup tic30_aout_reloc_type_lookup
-#endif
-#ifndef MY_bfd_make_debug_symbol
-#define MY_bfd_make_debug_symbol 0
-#endif
-#ifndef MY_read_minisymbols
-#define MY_read_minisymbols NAME(aout,read_minisymbols)
-#endif
-#ifndef MY_minisymbol_to_symbol
-#define MY_minisymbol_to_symbol NAME(aout,minisymbol_to_symbol)
-#endif
-#ifndef MY_bfd_link_hash_table_create
-#define MY_bfd_link_hash_table_create NAME(aout,link_hash_table_create)
-#endif
-#ifndef MY_bfd_link_add_symbols
-#define MY_bfd_link_add_symbols NAME(aout,link_add_symbols)
-#endif
-#ifndef MY_bfd_link_split_section
-#define MY_bfd_link_split_section  _bfd_generic_link_split_section
-#endif
-
-
-#ifndef MY_bfd_copy_private_bfd_data
-#define MY_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
-#endif
-
-#ifndef MY_bfd_merge_private_bfd_data
-#define MY_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
-#endif
-
-#ifndef MY_bfd_copy_private_symbol_data
-#define MY_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
-#endif
-
-#ifndef MY_bfd_print_private_bfd_data
-#define MY_bfd_print_private_bfd_data _bfd_generic_bfd_print_private_bfd_data
-#endif
-
-#ifndef MY_bfd_set_private_flags
-#define MY_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-#endif
-
-#ifndef MY_bfd_is_local_label_name
-#define MY_bfd_is_local_label_name bfd_generic_is_local_label_name
-#endif
-
-#ifndef MY_bfd_free_cached_info
-#define MY_bfd_free_cached_info NAME(aout,bfd_free_cached_info)
-#endif
-
-#ifndef MY_close_and_cleanup
-#define MY_close_and_cleanup MY_bfd_free_cached_info
-#endif
-
-#ifndef MY_get_dynamic_symtab_upper_bound
-#define MY_get_dynamic_symtab_upper_bound \
-  _bfd_nodynamic_get_dynamic_symtab_upper_bound
-#endif
-#ifndef MY_canonicalize_dynamic_symtab
-#define MY_canonicalize_dynamic_symtab \
-  _bfd_nodynamic_canonicalize_dynamic_symtab
-#endif
-#ifndef MY_get_dynamic_reloc_upper_bound
-#define MY_get_dynamic_reloc_upper_bound \
-  _bfd_nodynamic_get_dynamic_reloc_upper_bound
-#endif
-#ifndef MY_canonicalize_dynamic_reloc
-#define MY_canonicalize_dynamic_reloc \
-  _bfd_nodynamic_canonicalize_dynamic_reloc
-#endif
-
-/* Aout symbols normally have leading underscores */
-#ifndef MY_symbol_leading_char
-#define MY_symbol_leading_char '_'
-#endif
-
-/* Aout archives normally use spaces for padding */
-#ifndef AR_PAD_CHAR
-#define AR_PAD_CHAR ' '
-#endif
-
-#ifndef MY_BFD_TARGET
-const bfd_target tic30_aout_vec =
-{
-  TARGETNAME,			/* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_BIG,		/* target byte order (big) */
-  BFD_ENDIAN_BIG,		/* target headers byte order (big) */
-  (HAS_RELOC |			/* object flags */
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  MY_symbol_leading_char,
-  AR_PAD_CHAR,			/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-  {_bfd_dummy_target, MY_object_p,	/* bfd_check_format */
-   bfd_generic_archive_p, MY_core_file_p},
-  {bfd_false, MY_mkobject,	/* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, MY_write_object_contents,		/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (MY),
-  BFD_JUMP_TABLE_COPY (MY),
-  BFD_JUMP_TABLE_CORE (MY),
-  BFD_JUMP_TABLE_ARCHIVE (MY),
-  BFD_JUMP_TABLE_SYMBOLS (MY),
-  BFD_JUMP_TABLE_RELOCS (MY),
-  BFD_JUMP_TABLE_WRITE (MY),
-  BFD_JUMP_TABLE_LINK (MY),
-  BFD_JUMP_TABLE_DYNAMIC (MY),
-
-  (PTR) MY_backend_data,
-};
-#endif /* MY_BFD_TARGET */
diff --git a/bfd/aout0.c b/bfd/aout0.c
deleted file mode 100644
index 5bc7ae0f67f..00000000000
--- a/bfd/aout0.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* BFD backend for SunOS style a.out with flags set to 0
-   Copyright (C) 1990, 91, 92, 93, 1994 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGETNAME "a.out-zero-big"
-#define MY(OP) CAT(aout0_big_,OP)
-
-#include "bfd.h"
-
-#define MY_exec_hdr_flags 0
-
-#define MACHTYPE_OK(mtype) \
-  ((mtype) == M_UNKNOWN || (mtype) == M_68010 || (mtype) == M_68020)
-
-/* Include the usual a.out support.  */
-#include "aoutf1.h"
diff --git a/bfd/aout32.c b/bfd/aout32.c
deleted file mode 100644
index bfc40b46303..00000000000
--- a/bfd/aout32.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* BFD back-end for 32-bit a.out files.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define ARCH_SIZE 32
-
-#include "aoutx.h"
diff --git a/bfd/aout64.c b/bfd/aout64.c
deleted file mode 100644
index 84036c885a2..00000000000
--- a/bfd/aout64.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* BFD back-end for 64-bit a.out files.
-   Copyright 1990, 1991, 1992  Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define ARCH_SIZE 64
-
-/* aoutx.h requires definitions for BMAGIC and QMAGIC.  */
-#ifndef BMAGIC
-#define BMAGIC 0
-#endif
-#ifndef QMAGIC
-#define QMAGIC 0
-#endif
-
-#include "aoutx.h"
diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h
deleted file mode 100644
index fdf95b5b117..00000000000
--- a/bfd/aoutf1.h
+++ /dev/null
@@ -1,859 +0,0 @@
-/* A.out "format 1" file handling code for BFD.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include "aout/sun4.h"
-#include "libaout.h"		/* BFD a.out internal data structures */
-
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-
-/* This is needed to reject a NewsOS file, e.g. in
-   gdb/testsuite/gdb.t10/crossload.exp. <kingdon@cygnus.com>
-   I needed to add M_UNKNOWN to recognize a 68000 object, so this will
-   probably no longer reject a NewsOS object.  <ian@cygnus.com>. */
-#ifndef MACHTYPE_OK
-#define MACHTYPE_OK(mtype) \
-  (((mtype) == M_SPARC && bfd_lookup_arch (bfd_arch_sparc, 0) != NULL) \
-   || (((mtype) == M_UNKNOWN || (mtype) == M_68010 || (mtype) == M_68020) \
-       && bfd_lookup_arch (bfd_arch_m68k, 0) != NULL))
-#endif
-
-/*
-The file @code{aoutf1.h} contains the code for BFD's
-a.out back end. Control over the generated back end is given by these
-two preprocessor names:
-@table @code
-@item ARCH_SIZE
-This value should be either 32 or 64, depending upon the size of an
-int in the target format. It changes the sizes of the structs which
-perform the memory/disk mapping of structures.
-
-The 64 bit backend may only be used if the host compiler supports 64
-ints (eg long long with gcc), by defining the name @code{BFD_HOST_64_BIT} in @code{bfd.h}.
-With this name defined, @emph{all} bfd operations are performed with 64bit
-arithmetic, not just those to a 64bit target.
-
-@item TARGETNAME
-The name put into the target vector.
-@item
-@end table
-
-*/
-
-/*SUPPRESS558*/
-/*SUPPRESS529*/
-
-#if ARCH_SIZE == 64
-#define sunos_set_arch_mach sunos_64_set_arch_mach
-#define sunos_write_object_contents aout_64_sunos4_write_object_contents
-#else
-#define sunos_set_arch_mach sunos_32_set_arch_mach
-#define sunos_write_object_contents aout_32_sunos4_write_object_contents
-#endif
-
-static boolean sunos_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-static void sunos_set_arch_mach PARAMS ((bfd *, int));
-static void choose_reloc_size PARAMS ((bfd *));
-static boolean sunos_write_object_contents PARAMS ((bfd *));
-static const bfd_target *sunos4_core_file_p PARAMS ((bfd *));
-static char *sunos4_core_file_failing_command PARAMS ((bfd *));
-static int sunos4_core_file_failing_signal PARAMS ((bfd *));
-static boolean sunos4_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-static boolean sunos4_set_sizes PARAMS ((bfd *));
-
-/* Merge backend data into the output file.
-   This is necessary on sparclet-aout where we want the resultant machine
-   number to be M_SPARCLET if any input file is M_SPARCLET.  */
-
-#define MY_bfd_merge_private_bfd_data sunos_merge_private_bfd_data
-
-static boolean
-sunos_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd, *obfd;
-{
-  if (bfd_get_flavour (ibfd) != bfd_target_aout_flavour
-      || bfd_get_flavour (obfd) != bfd_target_aout_flavour)
-    return true;
-
-  if (bfd_get_arch (obfd) == bfd_arch_sparc)
-    {
-      if (bfd_get_mach (obfd) < bfd_get_mach (ibfd))
-	bfd_set_arch_mach (obfd, bfd_arch_sparc, bfd_get_mach (ibfd));
-    }
-
-  return true;
-}
-
-/* This is either sunos_32_set_arch_mach or sunos_64_set_arch_mach,
-   depending upon ARCH_SIZE.  */
-
-static void
-sunos_set_arch_mach (abfd, machtype)
-     bfd *abfd;
-     int machtype;
-{
-  /* Determine the architecture and machine type of the object file.  */
-  enum bfd_architecture arch;
-  long machine;
-  switch (machtype)
-    {
-
-    case M_UNKNOWN:
-      /* Some Sun3s make magic numbers without cpu types in them, so
-	 we'll default to the 68000. */
-      arch = bfd_arch_m68k;
-      machine = bfd_mach_m68000;
-      break;
-
-    case M_68010:
-    case M_HP200:
-      arch = bfd_arch_m68k;
-      machine = bfd_mach_m68010;
-      break;
-
-    case M_68020:
-    case M_HP300:
-      arch = bfd_arch_m68k;
-      machine = bfd_mach_m68020;
-      break;
-
-    case M_SPARC:
-      arch = bfd_arch_sparc;
-      machine = 0;
-      break;
-
-    case M_SPARCLET:
-      arch = bfd_arch_sparc;
-      machine = bfd_mach_sparc_sparclet;
-      break;
-
-    case M_SPARCLITE_LE:
-      arch = bfd_arch_sparc;
-      machine = bfd_mach_sparc_sparclite_le;
-      break;
-
-    case M_386:
-    case M_386_DYNIX:
-      arch = bfd_arch_i386;
-      machine = 0;
-      break;
-
-    case M_29K:
-      arch = bfd_arch_a29k;
-      machine = 0;
-      break;
-
-    case M_HPUX:
-      arch = bfd_arch_m68k;
-      machine = 0;
-      break;
-
-    default:
-      arch = bfd_arch_obscure;
-      machine = 0;
-      break;
-    }
-  bfd_set_arch_mach (abfd, arch, machine);
-}
-
-#define SET_ARCH_MACH(ABFD, EXEC) \
-  NAME(sunos,set_arch_mach)(ABFD, N_MACHTYPE (EXEC)); \
-  choose_reloc_size(ABFD);
-
-/* Determine the size of a relocation entry, based on the architecture */
-static void
-choose_reloc_size (abfd)
-     bfd *abfd;
-{
-  switch (bfd_get_arch (abfd))
-    {
-    case bfd_arch_sparc:
-    case bfd_arch_a29k:
-      obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
-      break;
-    default:
-      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-      break;
-    }
-}
-
-/* Write an object file in SunOS format.  Section contents have
-   already been written.  We write the file header, symbols, and
-   relocation.  The real name of this function is either
-   aout_64_sunos4_write_object_contents or
-   aout_32_sunos4_write_object_contents, depending upon ARCH_SIZE.  */
-
-static boolean
-sunos_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  /* Magic number, maestro, please!  */
-  switch (bfd_get_arch (abfd))
-    {
-    case bfd_arch_m68k:
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_m68000:
-	  N_SET_MACHTYPE (*execp, M_UNKNOWN);
-	  break;
-	case bfd_mach_m68010:
-	  N_SET_MACHTYPE (*execp, M_68010);
-	  break;
-	default:
-	case bfd_mach_m68020:
-	  N_SET_MACHTYPE (*execp, M_68020);
-	  break;
-	}
-      break;
-    case bfd_arch_sparc:
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_sparc_sparclet:
-	  N_SET_MACHTYPE (*execp, M_SPARCLET);
-	  break;
-	case bfd_mach_sparc_sparclite_le:
-	  N_SET_MACHTYPE (*execp, M_SPARCLITE_LE);
-	  break;
-	default:
-	  N_SET_MACHTYPE (*execp, M_SPARC);
-	  break;
-	}
-      break;
-    case bfd_arch_i386:
-      N_SET_MACHTYPE (*execp, M_386);
-      break;
-    case bfd_arch_a29k:
-      N_SET_MACHTYPE (*execp, M_29K);
-      break;
-    default:
-      N_SET_MACHTYPE (*execp, M_UNKNOWN);
-    }
-
-  choose_reloc_size (abfd);
-
-  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
-
-  N_SET_DYNAMIC (*execp, bfd_get_file_flags (abfd) & DYNAMIC);
-
-  WRITE_HEADERS (abfd, execp);
-
-  return true;
-}
-
-/* core files */
-
-#define CORE_MAGIC 0x080456
-#define CORE_NAMELEN 16
-
-/* The core structure is taken from the Sun documentation.
-  Unfortunately, they don't document the FPA structure, or at least I
-  can't find it easily.  Fortunately the core header contains its own
-  length.  So this shouldn't cause problems, except for c_ucode, which
-  so far we don't use but is easy to find with a little arithmetic. */
-
-/* But the reg structure can be gotten from the SPARC processor handbook.
-  This really should be in a GNU include file though so that gdb can use
-  the same info. */
-struct regs
-{
-  int r_psr;
-  int r_pc;
-  int r_npc;
-  int r_y;
-  int r_g1;
-  int r_g2;
-  int r_g3;
-  int r_g4;
-  int r_g5;
-  int r_g6;
-  int r_g7;
-  int r_o0;
-  int r_o1;
-  int r_o2;
-  int r_o3;
-  int r_o4;
-  int r_o5;
-  int r_o6;
-  int r_o7;
-};
-
-/* Taken from Sun documentation: */
-
-/* FIXME:  It's worse than we expect.  This struct contains TWO substructs
-  neither of whose size we know, WITH STUFF IN BETWEEN THEM!  We can't
-  even portably access the stuff in between!  */
-
-struct external_sparc_core
-  {
-    int c_magic;		/* Corefile magic number */
-    int c_len;			/* Sizeof (struct core) */
-#define	SPARC_CORE_LEN	432
-    int c_regs[19];		/* General purpose registers -- MACHDEP SIZE */
-    struct external_exec c_aouthdr;	/* A.out header */
-    int c_signo;		/* Killing signal, if any */
-    int c_tsize;		/* Text size (bytes) */
-    int c_dsize;		/* Data size (bytes) */
-    int c_ssize;		/* Stack size (bytes) */
-    char c_cmdname[CORE_NAMELEN + 1];	/* Command name */
-    double fp_stuff[1];		/* external FPU state (size unknown by us) */
-    /* The type "double" is critical here, for alignment.
-    SunOS declares a struct here, but the struct's alignment
-      is double since it contains doubles.  */
-    int c_ucode;		/* Exception no. from u_code */
-    /* (this member is not accessible by name since we don't
-    portably know the size of fp_stuff.) */
-  };
-
-/* Core files generated by the BCP (the part of Solaris which allows
-   it to run SunOS4 a.out files).  */
-struct external_solaris_bcp_core
-  {
-    int c_magic;		/* Corefile magic number */
-    int c_len;			/* Sizeof (struct core) */
-#define	SOLARIS_BCP_CORE_LEN	456
-    int c_regs[19];		/* General purpose registers -- MACHDEP SIZE */
-    int c_exdata_vp;		/* exdata structure */
-    int c_exdata_tsize;
-    int c_exdata_dsize;
-    int c_exdata_bsize;
-    int c_exdata_lsize;
-    int c_exdata_nshlibs;
-    short c_exdata_mach;
-    short c_exdata_mag;
-    int c_exdata_toffset;
-    int c_exdata_doffset;
-    int c_exdata_loffset;
-    int c_exdata_txtorg;
-    int c_exdata_datorg;
-    int c_exdata_entloc;
-    int c_signo;		/* Killing signal, if any */
-    int c_tsize;		/* Text size (bytes) */
-    int c_dsize;		/* Data size (bytes) */
-    int c_ssize;		/* Stack size (bytes) */
-    char c_cmdname[CORE_NAMELEN + 1];	/* Command name */
-    double fp_stuff[1];		/* external FPU state (size unknown by us) */
-    /* The type "double" is critical here, for alignment.
-    SunOS declares a struct here, but the struct's alignment
-      is double since it contains doubles.  */
-    int c_ucode;		/* Exception no. from u_code */
-    /* (this member is not accessible by name since we don't
-    portably know the size of fp_stuff.) */
-  };
-
-struct external_sun3_core
-  {
-    int c_magic;		/* Corefile magic number */
-    int c_len;			/* Sizeof (struct core) */
-#define	SUN3_CORE_LEN	826	/* As of SunOS 4.1.1 */
-    int c_regs[18];		/* General purpose registers -- MACHDEP SIZE */
-    struct external_exec c_aouthdr;	/* A.out header */
-    int c_signo;		/* Killing signal, if any */
-    int c_tsize;		/* Text size (bytes) */
-    int c_dsize;		/* Data size (bytes) */
-    int c_ssize;		/* Stack size (bytes) */
-    char c_cmdname[CORE_NAMELEN + 1];	/* Command name */
-    double fp_stuff[1];		/* external FPU state (size unknown by us) */
-    /* The type "double" is critical here, for alignment.
-    SunOS declares a struct here, but the struct's alignment
-      is double since it contains doubles.  */
-    int c_ucode;		/* Exception no. from u_code */
-    /* (this member is not accessible by name since we don't
-    portably know the size of fp_stuff.) */
-  };
-
-struct internal_sunos_core
-  {
-    int c_magic;		/* Corefile magic number */
-    int c_len;			/* Sizeof (struct core) */
-    long c_regs_pos;		/* file offset of General purpose registers */
-    int c_regs_size;		/* size of General purpose registers */
-    struct internal_exec c_aouthdr;	/* A.out header */
-    int c_signo;		/* Killing signal, if any */
-    int c_tsize;		/* Text size (bytes) */
-    int c_dsize;		/* Data size (bytes) */
-    bfd_vma c_data_addr;	/* Data start (address) */
-    int c_ssize;		/* Stack size (bytes) */
-    bfd_vma c_stacktop;		/* Stack top (address) */
-    char c_cmdname[CORE_NAMELEN + 1];	/* Command name */
-    long fp_stuff_pos;		/* file offset of external FPU state (regs) */
-    int fp_stuff_size;		/* Size of it */
-    int c_ucode;		/* Exception no. from u_code */
-  };
-
-static void swapcore_sun3
-  PARAMS ((bfd *, char *, struct internal_sunos_core *));
-static void swapcore_sparc
-  PARAMS ((bfd *, char *, struct internal_sunos_core *));
-static void swapcore_solaris_bcp
-  PARAMS ((bfd *, char *, struct internal_sunos_core *));
-
-/* byte-swap in the Sun-3 core structure */
-static void
-swapcore_sun3 (abfd, ext, intcore)
-     bfd *abfd;
-     char *ext;
-     struct internal_sunos_core *intcore;
-{
-  struct external_sun3_core *extcore = (struct external_sun3_core *) ext;
-
-  intcore->c_magic = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_magic);
-  intcore->c_len = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_len);
-  intcore->c_regs_pos = (long) (((struct external_sun3_core *) 0)->c_regs);
-  intcore->c_regs_size = sizeof (extcore->c_regs);
-#if ARCH_SIZE == 64
-  aout_64_swap_exec_header_in
-#else
-  aout_32_swap_exec_header_in
-#endif
-    (abfd, &extcore->c_aouthdr, &intcore->c_aouthdr);
-  intcore->c_signo = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_signo);
-  intcore->c_tsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_tsize);
-  intcore->c_dsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_dsize);
-  intcore->c_data_addr = N_DATADDR (intcore->c_aouthdr);
-  intcore->c_ssize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_ssize);
-  memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
-  intcore->fp_stuff_pos = (long) (((struct external_sun3_core *) 0)->fp_stuff);
-  /* FP stuff takes up whole rest of struct, except c_ucode. */
-  intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
-    (file_ptr) (((struct external_sun3_core *) 0)->fp_stuff);
-  /* Ucode is the last thing in the struct -- just before the end */
-  intcore->c_ucode =
-    bfd_h_get_32 (abfd,
-    intcore->c_len - sizeof (extcore->c_ucode) + (unsigned char *) extcore);
-  intcore->c_stacktop = 0x0E000000;	/* By experimentation */
-}
-
-
-/* byte-swap in the Sparc core structure */
-static void
-swapcore_sparc (abfd, ext, intcore)
-     bfd *abfd;
-     char *ext;
-     struct internal_sunos_core *intcore;
-{
-  struct external_sparc_core *extcore = (struct external_sparc_core *) ext;
-
-  intcore->c_magic = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_magic);
-  intcore->c_len = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_len);
-  intcore->c_regs_pos = (long) (((struct external_sparc_core *) 0)->c_regs);
-  intcore->c_regs_size = sizeof (extcore->c_regs);
-#if ARCH_SIZE == 64
-  aout_64_swap_exec_header_in
-#else
-  aout_32_swap_exec_header_in
-#endif
-    (abfd, &extcore->c_aouthdr, &intcore->c_aouthdr);
-  intcore->c_signo = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_signo);
-  intcore->c_tsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_tsize);
-  intcore->c_dsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_dsize);
-  intcore->c_data_addr = N_DATADDR (intcore->c_aouthdr);
-  intcore->c_ssize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_ssize);
-  memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
-  intcore->fp_stuff_pos = (long) (((struct external_sparc_core *) 0)->fp_stuff);
-  /* FP stuff takes up whole rest of struct, except c_ucode. */
-  intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
-    (file_ptr) (((struct external_sparc_core *) 0)->fp_stuff);
-  /* Ucode is the last thing in the struct -- just before the end */
-  intcore->c_ucode =
-    bfd_h_get_32 (abfd,
-    intcore->c_len - sizeof (extcore->c_ucode) + (unsigned char *) extcore);
-
-  /* Supposedly the user stack grows downward from the bottom of kernel memory.
-     Presuming that this remains true, this definition will work.  */
-  /* Now sun has provided us with another challenge.  The value is different
-     for sparc2 and sparc10 (both running SunOS 4.1.3).  We pick one or
-     the other based on the current value of the stack pointer.  This
-     loses (a) if the stack pointer has been clobbered, or (b) if the stack
-     is larger than 128 megabytes.
-
-     It's times like these you're glad they're switching to ELF.
-
-     Note that using include files or nlist on /vmunix would be wrong,
-     because we want the value for this core file, no matter what kind of
-     machine we were compiled on or are running on.  */
-#define SPARC_USRSTACK_SPARC2 ((bfd_vma)0xf8000000)
-#define SPARC_USRSTACK_SPARC10 ((bfd_vma)0xf0000000)
-  {
-    bfd_vma sp = bfd_h_get_32
-    (abfd, (unsigned char *) &((struct regs *) &extcore->c_regs[0])->r_o6);
-    if (sp < SPARC_USRSTACK_SPARC10)
-      intcore->c_stacktop = SPARC_USRSTACK_SPARC10;
-    else
-      intcore->c_stacktop = SPARC_USRSTACK_SPARC2;
-  }
-}
-
-/* byte-swap in the Solaris BCP core structure */
-static void
-swapcore_solaris_bcp (abfd, ext, intcore)
-     bfd *abfd;
-     char *ext;
-     struct internal_sunos_core *intcore;
-{
-  struct external_solaris_bcp_core *extcore =
-    (struct external_solaris_bcp_core *) ext;
-
-  intcore->c_magic = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_magic);
-  intcore->c_len = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_len);
-  intcore->c_regs_pos = (long) (((struct external_solaris_bcp_core *) 0)->c_regs);
-  intcore->c_regs_size = sizeof (extcore->c_regs);
-
-  /* The Solaris BCP exdata structure does not contain an a_syms field,
-     so we are unable to synthesize an internal exec header.
-     Luckily we are able to figure out the start address of the data section,
-     which is the only thing needed from the internal exec header,
-     from the exdata structure.
-
-     As of Solaris 2.3, BCP core files for statically linked executables
-     are buggy. The exdata structure is not properly filled in, and
-     the data section is written from address zero instead of the data
-     start address.  */
-  memset ((PTR) &intcore->c_aouthdr, 0, sizeof (struct internal_exec));
-  intcore->c_data_addr =
-    bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_exdata_datorg);
-  intcore->c_signo = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_signo);
-  intcore->c_tsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_tsize);
-  intcore->c_dsize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_dsize);
-  intcore->c_ssize = bfd_h_get_32 (abfd, (unsigned char *) &extcore->c_ssize);
-  memcpy (intcore->c_cmdname, extcore->c_cmdname, sizeof (intcore->c_cmdname));
-  intcore->fp_stuff_pos =
-    (long) (((struct external_solaris_bcp_core *) 0)->fp_stuff);
-  /* FP stuff takes up whole rest of struct, except c_ucode. */
-  intcore->fp_stuff_size = intcore->c_len - (sizeof extcore->c_ucode) -
-    (file_ptr) (((struct external_solaris_bcp_core *) 0)->fp_stuff);
-  /* Ucode is the last thing in the struct -- just before the end */
-  intcore->c_ucode =
-    bfd_h_get_32 (abfd,
-    intcore->c_len - sizeof (extcore->c_ucode) + (unsigned char *) extcore);
-
-  /* Supposedly the user stack grows downward from the bottom of kernel memory.
-     Presuming that this remains true, this definition will work.  */
-  /* Now sun has provided us with another challenge.  The value is different
-     for sparc2 and sparc10 (both running SunOS 4.1.3).  We pick one or
-     the other based on the current value of the stack pointer.  This
-     loses (a) if the stack pointer has been clobbered, or (b) if the stack
-     is larger than 128 megabytes.
-
-     It's times like these you're glad they're switching to ELF.
-
-     Note that using include files or nlist on /vmunix would be wrong,
-     because we want the value for this core file, no matter what kind of
-     machine we were compiled on or are running on.  */
-#define SPARC_USRSTACK_SPARC2 ((bfd_vma)0xf8000000)
-#define SPARC_USRSTACK_SPARC10 ((bfd_vma)0xf0000000)
-  {
-    bfd_vma sp = bfd_h_get_32
-    (abfd, (unsigned char *) &((struct regs *) &extcore->c_regs[0])->r_o6);
-    if (sp < SPARC_USRSTACK_SPARC10)
-      intcore->c_stacktop = SPARC_USRSTACK_SPARC10;
-    else
-      intcore->c_stacktop = SPARC_USRSTACK_SPARC2;
-  }
-}
-
-/* need this cast because ptr is really void * */
-#define core_hdr(bfd) ((bfd)->tdata.sun_core_data)
-#define core_datasec(bfd) (core_hdr(bfd)->data_section)
-#define core_stacksec(bfd) (core_hdr(bfd)->stack_section)
-#define core_regsec(bfd) (core_hdr(bfd)->reg_section)
-#define core_reg2sec(bfd) (core_hdr(bfd)->reg2_section)
-
-/* These are stored in the bfd's tdata */
-struct sun_core_struct
-{
-  struct internal_sunos_core *hdr;	/* core file header */
-  asection *data_section;
-  asection *stack_section;
-  asection *reg_section;
-  asection *reg2_section;
-};
-
-static const bfd_target *
-sunos4_core_file_p (abfd)
-     bfd *abfd;
-{
-  unsigned char longbuf[4];	/* Raw bytes of various header fields */
-  bfd_size_type core_size;
-  unsigned long core_mag;
-  struct internal_sunos_core *core;
-  char *extcore;
-  struct mergem
-    {
-      struct sun_core_struct suncoredata;
-      struct internal_sunos_core internal_sunos_core;
-      char external_core[1];
-    }
-   *mergem;
-
-  if (bfd_read ((PTR) longbuf, 1, sizeof (longbuf), abfd) !=
-      sizeof (longbuf))
-    return 0;
-  core_mag = bfd_h_get_32 (abfd, longbuf);
-
-  if (core_mag != CORE_MAGIC)
-    return 0;
-
-  /* SunOS core headers can vary in length; second word is size; */
-  if (bfd_read ((PTR) longbuf, 1, sizeof (longbuf), abfd) !=
-      sizeof (longbuf))
-    return 0;
-  core_size = bfd_h_get_32 (abfd, longbuf);
-  /* Sanity check */
-  if (core_size > 20000)
-    return 0;
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) < 0)
-    return 0;
-
-  mergem = (struct mergem *) bfd_zalloc (abfd, core_size + sizeof (struct mergem));
-  if (mergem == NULL)
-    return 0;
-
-  extcore = mergem->external_core;
-
-  if ((bfd_read ((PTR) extcore, 1, core_size, abfd)) != core_size)
-    {
-      bfd_release (abfd, (char *) mergem);
-      return 0;
-    }
-
-  /* Validate that it's a core file we know how to handle, due to sun
-     botching the positioning of registers and other fields in a machine
-     dependent way.  */
-  core = &mergem->internal_sunos_core;
-  switch (core_size)
-    {
-    case SPARC_CORE_LEN:
-      swapcore_sparc (abfd, extcore, core);
-      break;
-    case SUN3_CORE_LEN:
-      swapcore_sun3 (abfd, extcore, core);
-      break;
-    case SOLARIS_BCP_CORE_LEN:
-      swapcore_solaris_bcp (abfd, extcore, core);
-      break;
-    default:
-      bfd_set_error (bfd_error_system_call);	/* FIXME */
-      bfd_release (abfd, (char *) mergem);
-      return 0;
-    }
-
-  abfd->tdata.sun_core_data = &mergem->suncoredata;
-  abfd->tdata.sun_core_data->hdr = core;
-
-  /* create the sections.  This is raunchy, but bfd_close wants to reclaim
-     them */
-  core_stacksec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_stacksec (abfd) == NULL)
-    {
-    loser:
-      bfd_release (abfd, (char *) mergem);
-      return 0;
-    }
-  core_datasec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_datasec (abfd) == NULL)
-    {
-    loser1:
-      bfd_release (abfd, core_stacksec (abfd));
-      goto loser;
-    }
-  core_regsec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_regsec (abfd) == NULL)
-    {
-    loser2:
-      bfd_release (abfd, core_datasec (abfd));
-      goto loser1;
-    }
-  core_reg2sec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_reg2sec (abfd) == NULL)
-    {
-      bfd_release (abfd, core_regsec (abfd));
-      goto loser2;
-    }
-
-  core_stacksec (abfd)->name = ".stack";
-  core_datasec (abfd)->name = ".data";
-  core_regsec (abfd)->name = ".reg";
-  core_reg2sec (abfd)->name = ".reg2";
-
-  core_stacksec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-  core_datasec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-  core_regsec (abfd)->flags = SEC_HAS_CONTENTS;
-  core_reg2sec (abfd)->flags = SEC_HAS_CONTENTS;
-
-  core_stacksec (abfd)->_raw_size = core->c_ssize;
-  core_datasec (abfd)->_raw_size = core->c_dsize;
-  core_regsec (abfd)->_raw_size = core->c_regs_size;
-  core_reg2sec (abfd)->_raw_size = core->fp_stuff_size;
-
-  core_stacksec (abfd)->vma = (core->c_stacktop - core->c_ssize);
-  core_datasec (abfd)->vma = core->c_data_addr;
-  core_regsec (abfd)->vma = 0;
-  core_reg2sec (abfd)->vma = 0;
-
-  core_stacksec (abfd)->filepos = core->c_len + core->c_dsize;
-  core_datasec (abfd)->filepos = core->c_len;
-  /* We'll access the regs afresh in the core file, like any section: */
-  core_regsec (abfd)->filepos = (file_ptr) core->c_regs_pos;
-  core_reg2sec (abfd)->filepos = (file_ptr) core->fp_stuff_pos;
-
-  /* Align to word at least */
-  core_stacksec (abfd)->alignment_power = 2;
-  core_datasec (abfd)->alignment_power = 2;
-  core_regsec (abfd)->alignment_power = 2;
-  core_reg2sec (abfd)->alignment_power = 2;
-
-  abfd->sections = core_stacksec (abfd);
-  core_stacksec (abfd)->next = core_datasec (abfd);
-  core_datasec (abfd)->next = core_regsec (abfd);
-  core_regsec (abfd)->next = core_reg2sec (abfd);
-
-  abfd->section_count = 4;
-
-  return abfd->xvec;
-}
-
-static char *
-sunos4_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return core_hdr (abfd)->hdr->c_cmdname;
-}
-
-static int
-sunos4_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_hdr (abfd)->hdr->c_signo;
-}
-
-static boolean
-sunos4_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
-{
-  if (core_bfd->xvec != exec_bfd->xvec)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return false;
-    }
-
-  /* Solaris core files do not include an aouthdr. */
-  if ((core_hdr (core_bfd)->hdr)->c_len == SOLARIS_BCP_CORE_LEN)
-    return true;
-
-  return (memcmp ((char *) &((core_hdr (core_bfd)->hdr)->c_aouthdr),
-		  (char *) exec_hdr (exec_bfd),
-		  sizeof (struct internal_exec)) == 0) ? true : false;
-}
-
-#define MY_set_sizes sunos4_set_sizes
-static boolean
-sunos4_set_sizes (abfd)
-     bfd *abfd;
-{
-  switch (bfd_get_arch (abfd))
-    {
-    default:
-      return false;
-    case bfd_arch_sparc:
-      adata (abfd).page_size = 0x2000;
-      adata (abfd).segment_size = 0x2000;
-      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
-    case bfd_arch_m68k:
-      adata (abfd).page_size = 0x2000;
-      adata (abfd).segment_size = 0x20000;
-      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
-    }
-}
-
-/* We default to setting the toolversion field to 1, as is required by
-   SunOS.  */
-#ifndef MY_exec_hdr_flags
-#define MY_exec_hdr_flags 1
-#endif
-
-#ifndef MY_entry_is_text_address
-#define MY_entry_is_text_address 0
-#endif
-#ifndef MY_add_dynamic_symbols
-#define MY_add_dynamic_symbols 0
-#endif
-#ifndef MY_add_one_symbol
-#define MY_add_one_symbol 0
-#endif
-#ifndef MY_link_dynamic_object
-#define MY_link_dynamic_object 0
-#endif
-#ifndef MY_write_dynamic_symbol
-#define MY_write_dynamic_symbol 0
-#endif
-#ifndef MY_check_dynamic_reloc
-#define MY_check_dynamic_reloc 0
-#endif
-#ifndef MY_finish_dynamic_link
-#define MY_finish_dynamic_link 0
-#endif
-
-static CONST struct aout_backend_data sunos4_aout_backend =
-{
-  0,				/* zmagic files are not contiguous */
-  1,				/* text includes header */
-  MY_entry_is_text_address,
-  MY_exec_hdr_flags,
-  0,				/* default text vma */
-  sunos4_set_sizes,
-  0,				/* header is counted in zmagic text */
-  MY_add_dynamic_symbols,
-  MY_add_one_symbol,
-  MY_link_dynamic_object,
-  MY_write_dynamic_symbol,
-  MY_check_dynamic_reloc,
-  MY_finish_dynamic_link
-};
-
-#define	MY_core_file_failing_command 	sunos4_core_file_failing_command
-#define	MY_core_file_failing_signal	sunos4_core_file_failing_signal
-#define	MY_core_file_matches_executable_p sunos4_core_file_matches_executable_p
-
-#define MY_bfd_debug_info_start		bfd_void
-#define MY_bfd_debug_info_end		bfd_void
-#define MY_bfd_debug_info_accumulate	\
-			(void (*) PARAMS ((bfd *, struct sec *))) bfd_void
-#define MY_core_file_p			sunos4_core_file_p
-#define MY_write_object_contents	NAME(aout,sunos4_write_object_contents)
-#define MY_backend_data			&sunos4_aout_backend
-
-#ifndef TARGET_IS_LITTLE_ENDIAN_P
-#define TARGET_IS_BIG_ENDIAN_P
-#endif
-
-#include "aout-target.h"
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
deleted file mode 100644
index 2704eecccfe..00000000000
--- a/bfd/aoutx.h
+++ /dev/null
@@ -1,5706 +0,0 @@
-/* BFD semi-generic back-end for a.out binaries.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	a.out backends
-
-
-DESCRIPTION
-
-	BFD supports a number of different flavours of a.out format,
-	though the major differences are only the sizes of the
-	structures on disk, and the shape of the relocation
-	information.
-
-	The support is split into a basic support file @file{aoutx.h}
-	and other files which derive functions from the base. One
-	derivation file is @file{aoutf1.h} (for a.out flavour 1), and
-	adds to the basic a.out functions support for sun3, sun4, 386
-	and 29k a.out files, to create a target jump vector for a
-	specific target.
-
-	This information is further split out into more specific files
-	for each machine, including @file{sunos.c} for sun3 and sun4,
-	@file{newsos3.c} for the Sony NEWS, and @file{demo64.c} for a
-	demonstration of a 64 bit a.out format.
-
-	The base file @file{aoutx.h} defines general mechanisms for
-	reading and writing records to and from disk and various
-	other methods which BFD requires. It is included by
-	@file{aout32.c} and @file{aout64.c} to form the names
-	<<aout_32_swap_exec_header_in>>, <<aout_64_swap_exec_header_in>>, etc.
-
-	As an example, this is what goes on to make the back end for a
-	sun4, from @file{aout32.c}:
-
-|	#define ARCH_SIZE 32
-|	#include "aoutx.h"
-
-	Which exports names:
-
-|	...
-|	aout_32_canonicalize_reloc
-|	aout_32_find_nearest_line
-|	aout_32_get_lineno
-|	aout_32_get_reloc_upper_bound
-|	...
-
-	from @file{sunos.c}:
-
-|	#define TARGET_NAME "a.out-sunos-big"
-|	#define VECNAME    sunos_big_vec
-|	#include "aoutf1.h"
-
-	requires all the names from @file{aout32.c}, and produces the jump vector
-
-|	sunos_big_vec
-
-	The file @file{host-aout.c} is a special case.  It is for a large set
-	of hosts that use ``more or less standard'' a.out files, and
-	for which cross-debugging is not interesting.  It uses the
-	standard 32-bit a.out support routines, but determines the
-	file offsets and addresses of the text, data, and BSS
-	sections, the machine architecture and machine type, and the
-	entry point address, in a host-dependent manner.  Once these
-	values have been determined, generic code is used to handle
-	the  object file.
-
-	When porting it to run on a new system, you must supply:
-
-|        HOST_PAGE_SIZE
-|        HOST_SEGMENT_SIZE
-|        HOST_MACHINE_ARCH       (optional)
-|        HOST_MACHINE_MACHINE    (optional)
-|        HOST_TEXT_START_ADDR
-|        HOST_STACK_END_ADDR
-
-	in the file @file{../include/sys/h-@var{XXX}.h} (for your host).  These
-	values, plus the structures and macros defined in @file{a.out.h} on
-	your host system, will produce a BFD target that will access
-	ordinary a.out files on your host. To configure a new machine
-	to use @file{host-aout.c}, specify:
-
-|	TDEFAULTS = -DDEFAULT_VECTOR=host_aout_big_vec
-|	TDEPFILES= host-aout.o trad-core.o
-
-	in the @file{config/@var{XXX}.mt} file, and modify @file{configure.in}
-	to use the
-	@file{@var{XXX}.mt} file (by setting "<<bfd_target=XXX>>") when your
-	configuration is selected.
-
-*/
-
-/* Some assumptions:
-   * Any BFD with D_PAGED set is ZMAGIC, and vice versa.
-     Doesn't matter what the setting of WP_TEXT is on output, but it'll
-     get set on input.
-   * Any BFD with D_PAGED clear and WP_TEXT set is NMAGIC.
-   * Any BFD with both flags clear is OMAGIC.
-   (Just want to make these explicit, so the conditions tested in this
-   file make sense if you're more familiar with a.out than with BFD.)  */
-
-#define KEEPIT udata.i
-
-#include <ctype.h>
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-
-#include "libaout.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-
-static boolean aout_get_external_symbols PARAMS ((bfd *));
-static boolean translate_from_native_sym_flags
-  PARAMS ((bfd *, aout_symbol_type *));
-static boolean translate_to_native_sym_flags
-  PARAMS ((bfd *, asymbol *, struct external_nlist *));
-static void adjust_o_magic PARAMS ((bfd *, struct internal_exec *));
-static void adjust_z_magic PARAMS ((bfd *, struct internal_exec *));
-static void adjust_n_magic PARAMS ((bfd *, struct internal_exec *));
-
-/*
-SUBSECTION
-	Relocations
-
-DESCRIPTION
-	The file @file{aoutx.h} provides for both the @emph{standard}
-	and @emph{extended} forms of a.out relocation records.
-
-	The standard records contain only an
-	address, a symbol index, and a type field. The extended records
-	(used on 29ks and sparcs) also have a full integer for an
-	addend.
-
-*/
-#ifndef CTOR_TABLE_RELOC_HOWTO
-#define CTOR_TABLE_RELOC_IDX 2
-#define CTOR_TABLE_RELOC_HOWTO(BFD) ((obj_reloc_entry_size(BFD) == RELOC_EXT_SIZE \
-	     ? howto_table_ext : howto_table_std) \
-	    + CTOR_TABLE_RELOC_IDX)
-#endif
-
-#ifndef MY_swap_std_reloc_in
-#define MY_swap_std_reloc_in NAME(aout,swap_std_reloc_in)
-#endif
-
-#ifndef MY_swap_std_reloc_out
-#define MY_swap_std_reloc_out NAME(aout,swap_std_reloc_out)
-#endif
-
-#ifndef MY_final_link_relocate
-#define MY_final_link_relocate _bfd_final_link_relocate
-#endif
-
-#ifndef MY_relocate_contents
-#define MY_relocate_contents _bfd_relocate_contents
-#endif
-
-#define howto_table_ext NAME(aout,ext_howto_table)
-#define howto_table_std NAME(aout,std_howto_table)
-
-reloc_howto_type howto_table_ext[] =
-{
-  /* type           rs   size bsz  pcrel bitpos ovrf                  sf name          part_inpl readmask setmask pcdone */
-  HOWTO(RELOC_8,      0,  0,  	8,  false, 0, complain_overflow_bitfield,0,"8",        false, 0,0x000000ff, false),
-  HOWTO(RELOC_16,     0,  1, 	16, false, 0, complain_overflow_bitfield,0,"16",       false, 0,0x0000ffff, false),
-  HOWTO(RELOC_32,     0,  2, 	32, false, 0, complain_overflow_bitfield,0,"32",       false, 0,0xffffffff, false),
-  HOWTO(RELOC_DISP8,  0,  0, 	8,  true,  0, complain_overflow_signed,0,"DISP8", 	false, 0,0x000000ff, false),
-  HOWTO(RELOC_DISP16, 0,  1, 	16, true,  0, complain_overflow_signed,0,"DISP16", 	false, 0,0x0000ffff, false),
-  HOWTO(RELOC_DISP32, 0,  2, 	32, true,  0, complain_overflow_signed,0,"DISP32", 	false, 0,0xffffffff, false),
-  HOWTO(RELOC_WDISP30,2,  2, 	30, true,  0, complain_overflow_signed,0,"WDISP30", 	false, 0,0x3fffffff, false),
-  HOWTO(RELOC_WDISP22,2,  2, 	22, true,  0, complain_overflow_signed,0,"WDISP22", 	false, 0,0x003fffff, false),
-  HOWTO(RELOC_HI22,   10, 2, 	22, false, 0, complain_overflow_bitfield,0,"HI22",	false, 0,0x003fffff, false),
-  HOWTO(RELOC_22,     0,  2, 	22, false, 0, complain_overflow_bitfield,0,"22",       false, 0,0x003fffff, false),
-  HOWTO(RELOC_13,     0,  2, 	13, false, 0, complain_overflow_bitfield,0,"13",       false, 0,0x00001fff, false),
-  HOWTO(RELOC_LO10,   0,  2, 	10, false, 0, complain_overflow_dont,0,"LO10",     false, 0,0x000003ff, false),
-  HOWTO(RELOC_SFA_BASE,0, 2, 	32, false, 0, complain_overflow_bitfield,0,"SFA_BASE", false, 0,0xffffffff, false),
-  HOWTO(RELOC_SFA_OFF13,0,2, 	32, false, 0, complain_overflow_bitfield,0,"SFA_OFF13",false, 0,0xffffffff, false),
-  HOWTO(RELOC_BASE10, 0,  2, 	10, false, 0, complain_overflow_dont,0,"BASE10",   false, 0,0x000003ff, false),
-  HOWTO(RELOC_BASE13, 0,  2,	13, false, 0, complain_overflow_signed,0,"BASE13",   false, 0,0x00001fff, false),
-  HOWTO(RELOC_BASE22, 10, 2,	22, false, 0, complain_overflow_bitfield,0,"BASE22",   false, 0,0x003fffff, false),
-  HOWTO(RELOC_PC10,   0,  2,	10, true,  0, complain_overflow_dont,0,"PC10",	false, 0,0x000003ff, true),
-  HOWTO(RELOC_PC22,   10,  2,	22, true,  0, complain_overflow_signed,0,"PC22", false, 0,0x003fffff, true),
-  HOWTO(RELOC_JMP_TBL,2,  2, 	30, true,  0, complain_overflow_signed,0,"JMP_TBL", 	false, 0,0x3fffffff, false),
-  HOWTO(RELOC_SEGOFF16,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"SEGOFF16",	false, 0,0x00000000, false),
-  HOWTO(RELOC_GLOB_DAT,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"GLOB_DAT",	false, 0,0x00000000, false),
-  HOWTO(RELOC_JMP_SLOT,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"JMP_SLOT",	false, 0,0x00000000, false),
-  HOWTO(RELOC_RELATIVE,0, 2,	0,  false, 0, complain_overflow_bitfield,0,"RELATIVE",	false, 0,0x00000000, false),
-  HOWTO(0,  0, 0,    0,  false, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(0,  0, 0,    0,  false, 0, complain_overflow_dont, 0, "R_SPARC_NONE",    false,0,0x00000000,true),
-#define RELOC_SPARC_REV32 RELOC_WDISP19
-  HOWTO(RELOC_SPARC_REV32,    0,  2, 	32, false, 0, complain_overflow_dont,0,"R_SPARC_REV32",       false, 0,0xffffffff, false),
-};
-
-/* Convert standard reloc records to "arelent" format (incl byte swap).  */
-
-reloc_howto_type howto_table_std[] = {
-  /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
-HOWTO( 0,	       0,  0,  	8,  false, 0, complain_overflow_bitfield,0,"8",		true, 0x000000ff,0x000000ff, false),
-HOWTO( 1,	       0,  1, 	16, false, 0, complain_overflow_bitfield,0,"16",	true, 0x0000ffff,0x0000ffff, false),
-HOWTO( 2,	       0,  2, 	32, false, 0, complain_overflow_bitfield,0,"32",	true, 0xffffffff,0xffffffff, false),
-HOWTO( 3,	       0,  4, 	64, false, 0, complain_overflow_bitfield,0,"64",	true, 0xdeaddead,0xdeaddead, false),
-HOWTO( 4,	       0,  0, 	8,  true,  0, complain_overflow_signed,  0,"DISP8",	true, 0x000000ff,0x000000ff, false),
-HOWTO( 5,	       0,  1, 	16, true,  0, complain_overflow_signed,  0,"DISP16",	true, 0x0000ffff,0x0000ffff, false),
-HOWTO( 6,	       0,  2, 	32, true,  0, complain_overflow_signed,  0,"DISP32",	true, 0xffffffff,0xffffffff, false),
-HOWTO( 7,	       0,  4, 	64, true,  0, complain_overflow_signed,  0,"DISP64",	true, 0xfeedface,0xfeedface, false),
-HOWTO( 8,	       0,  2,    0, false, 0, complain_overflow_bitfield,0,"GOT_REL",	false,         0,0x00000000, false),
-HOWTO( 9,	       0,  1,   16, false, 0, complain_overflow_bitfield,0,"BASE16",	false,0xffffffff,0xffffffff, false),
-HOWTO(10,	       0,  2,   32, false, 0, complain_overflow_bitfield,0,"BASE32",	false,0xffffffff,0xffffffff, false),
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-  HOWTO(16,	       0,  2,	 0, false, 0, complain_overflow_bitfield,0,"JMP_TABLE", false,         0,0x00000000, false),
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 }, { -1 }, { -1 }, { -1 }, { -1 }, { -1 }, { -1 }, { -1 },
-  HOWTO(32,	       0,  2,	 0, false, 0, complain_overflow_bitfield,0,"RELATIVE",  false,         0,0x00000000, false),
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-{ -1 },
-  HOWTO(40,	       0,  2,	 0, false, 0, complain_overflow_bitfield,0,"BASEREL",   false,         0,0x00000000, false),
-};
-
-#define TABLE_SIZE(TABLE)	(sizeof(TABLE)/sizeof(TABLE[0]))
-
-reloc_howto_type *
-NAME(aout,reloc_type_lookup) (abfd,code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-#define EXT(i,j)	case i: return &howto_table_ext[j]
-#define STD(i,j)	case i: return &howto_table_std[j]
-  int ext = obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE;
-  if (code == BFD_RELOC_CTOR)
-    switch (bfd_get_arch_info (abfd)->bits_per_address)
-      {
-      case 32:
-	code = BFD_RELOC_32;
-	break;
-      case 64:
-	code = BFD_RELOC_64;
-	break;
-      }
-  if (ext)
-    switch (code)
-      {
-	EXT (BFD_RELOC_32, 2);
-	EXT (BFD_RELOC_HI22, 8);
-	EXT (BFD_RELOC_LO10, 11);
-	EXT (BFD_RELOC_32_PCREL_S2, 6);
-	EXT (BFD_RELOC_SPARC_WDISP22, 7);
-	EXT (BFD_RELOC_SPARC13, 10);
-	EXT (BFD_RELOC_SPARC_GOT10, 14);
-	EXT (BFD_RELOC_SPARC_BASE13, 15);
-	EXT (BFD_RELOC_SPARC_GOT13, 15);
-	EXT (BFD_RELOC_SPARC_GOT22, 16);
-	EXT (BFD_RELOC_SPARC_PC10, 17);
-	EXT (BFD_RELOC_SPARC_PC22, 18);
-	EXT (BFD_RELOC_SPARC_WPLT30, 19);
-	EXT (BFD_RELOC_SPARC_REV32, 26);
-      default: return (reloc_howto_type *) NULL;
-      }
-  else
-    /* std relocs */
-    switch (code)
-      {
-	STD (BFD_RELOC_16, 1);
-	STD (BFD_RELOC_32, 2);
-	STD (BFD_RELOC_8_PCREL, 4);
-	STD (BFD_RELOC_16_PCREL, 5);
-	STD (BFD_RELOC_32_PCREL, 6);
-	STD (BFD_RELOC_16_BASEREL, 9);
-	STD (BFD_RELOC_32_BASEREL, 10);
-      default: return (reloc_howto_type *) NULL;
-      }
-}
-
-/*
-SUBSECTION
-	Internal entry points
-
-DESCRIPTION
-	@file{aoutx.h} exports several routines for accessing the
-	contents of an a.out file, which are gathered and exported in
-	turn by various format specific files (eg sunos.c).
-
-*/
-
-/*
-FUNCTION
-	 aout_@var{size}_swap_exec_header_in
-
-SYNOPSIS
-	void aout_@var{size}_swap_exec_header_in,
-           (bfd *abfd,
-            struct external_exec *raw_bytes,
-            struct internal_exec *execp);
-
-DESCRIPTION
-	Swap the information in an executable header @var{raw_bytes} taken
-	from a raw byte stream memory image into the internal exec header
-	structure @var{execp}.
-*/
-
-#ifndef NAME_swap_exec_header_in
-void
-NAME(aout,swap_exec_header_in) (abfd, raw_bytes, execp)
-     bfd *abfd;
-     struct external_exec *raw_bytes;
-     struct internal_exec *execp;
-{
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
-  /* The internal_exec structure has some fields that are unused in this
-     configuration (IE for i960), so ensure that all such uninitialized
-     fields are zero'd out.  There are places where two of these structs
-     are memcmp'd, and thus the contents do matter. */
-  memset ((PTR) execp, 0, sizeof (struct internal_exec));
-  /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info   = bfd_h_get_32 (abfd, bytes->e_info);
-  execp->a_text   = GET_WORD (abfd, bytes->e_text);
-  execp->a_data   = GET_WORD (abfd, bytes->e_data);
-  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
-  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
-  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
-  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
-  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
-}
-#define NAME_swap_exec_header_in NAME(aout,swap_exec_header_in)
-#endif
-
-/*
-FUNCTION
-	aout_@var{size}_swap_exec_header_out
-
-SYNOPSIS
-	void aout_@var{size}_swap_exec_header_out
-	  (bfd *abfd,
-	   struct internal_exec *execp,
-	   struct external_exec *raw_bytes);
-
-DESCRIPTION
-	Swap the information in an internal exec header structure
-	@var{execp} into the buffer @var{raw_bytes} ready for writing to disk.
-*/
-void
-NAME(aout,swap_exec_header_out) (abfd, execp, raw_bytes)
-     bfd *abfd;
-     struct internal_exec *execp;
-     struct external_exec *raw_bytes;
-{
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
-  /* Now fill in fields in the raw data, from the fields in the exec struct. */
-  bfd_h_put_32 (abfd, execp->a_info  , bytes->e_info);
-  PUT_WORD (abfd, execp->a_text  , bytes->e_text);
-  PUT_WORD (abfd, execp->a_data  , bytes->e_data);
-  PUT_WORD (abfd, execp->a_bss   , bytes->e_bss);
-  PUT_WORD (abfd, execp->a_syms  , bytes->e_syms);
-  PUT_WORD (abfd, execp->a_entry , bytes->e_entry);
-  PUT_WORD (abfd, execp->a_trsize, bytes->e_trsize);
-  PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize);
-}
-
-/* Make all the section for an a.out file.  */
-
-boolean
-NAME(aout,make_sections) (abfd)
-     bfd *abfd;
-{
-  if (obj_textsec (abfd) == (asection *) NULL
-      && bfd_make_section (abfd, ".text") == (asection *) NULL)
-    return false;
-  if (obj_datasec (abfd) == (asection *) NULL
-      && bfd_make_section (abfd, ".data") == (asection *) NULL)
-    return false;
-  if (obj_bsssec (abfd) == (asection *) NULL
-      && bfd_make_section (abfd, ".bss") == (asection *) NULL)
-    return false;
-  return true;
-}
-
-/*
-FUNCTION
-	aout_@var{size}_some_aout_object_p
-
-SYNOPSIS
-	const bfd_target *aout_@var{size}_some_aout_object_p
-	 (bfd *abfd,
-	  const bfd_target *(*callback_to_real_object_p)());
-
-DESCRIPTION
-	Some a.out variant thinks that the file open in @var{abfd}
-	checking is an a.out file.  Do some more checking, and set up
-	for access if it really is.  Call back to the calling
-	environment's "finish up" function just before returning, to
-	handle any last-minute setup.
-*/
-
-const bfd_target *
-NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p)
-     bfd *abfd;
-     struct internal_exec *execp;
-     const bfd_target *(*callback_to_real_object_p) PARAMS ((bfd *));
-{
-  struct aout_data_struct *rawptr, *oldrawptr;
-  const bfd_target *result;
-
-  rawptr = (struct aout_data_struct  *) bfd_zalloc (abfd, sizeof (struct aout_data_struct ));
-  if (rawptr == NULL)
-    return 0;
-
-  oldrawptr = abfd->tdata.aout_data;
-  abfd->tdata.aout_data = rawptr;
-
-  /* Copy the contents of the old tdata struct.
-     In particular, we want the subformat, since for hpux it was set in
-     hp300hpux.c:swap_exec_header_in and will be used in
-     hp300hpux.c:callback.  */
-  if (oldrawptr != NULL)
-    *abfd->tdata.aout_data = *oldrawptr;
-
-  abfd->tdata.aout_data->a.hdr = &rawptr->e;
-  *(abfd->tdata.aout_data->a.hdr) = *execp;	/* Copy in the internal_exec struct */
-  execp = abfd->tdata.aout_data->a.hdr;
-
-  /* Set the file flags */
-  abfd->flags = BFD_NO_FLAGS;
-  if (execp->a_drsize || execp->a_trsize)
-    abfd->flags |= HAS_RELOC;
-  /* Setting of EXEC_P has been deferred to the bottom of this function */
-  if (execp->a_syms)
-    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
-  if (N_DYNAMIC(*execp))
-    abfd->flags |= DYNAMIC;
-
-  if (N_MAGIC (*execp) == ZMAGIC)
-    {
-      abfd->flags |= D_PAGED | WP_TEXT;
-      adata (abfd).magic = z_magic;
-    }
-  else if (N_MAGIC (*execp) == QMAGIC)
-    {
-      abfd->flags |= D_PAGED | WP_TEXT;
-      adata (abfd).magic = z_magic;
-      adata (abfd).subformat = q_magic_format;
-    }
-  else if (N_MAGIC (*execp) == NMAGIC)
-    {
-      abfd->flags |= WP_TEXT;
-      adata (abfd).magic = n_magic;
-    }
-  else if (N_MAGIC (*execp) == OMAGIC
-	   || N_MAGIC (*execp) == BMAGIC)
-    adata (abfd).magic = o_magic;
-  else
-    {
-      /* Should have been checked with N_BADMAG before this routine
-	 was called.  */
-      abort ();
-    }
-
-  bfd_get_start_address (abfd) = execp->a_entry;
-
-  obj_aout_symbols (abfd) = (aout_symbol_type *)NULL;
-  bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist);
-
-  /* The default relocation entry size is that of traditional V7 Unix.  */
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-
-  /* The default symbol entry size is that of traditional Unix. */
-  obj_symbol_entry_size (abfd) = EXTERNAL_NLIST_SIZE;
-
-#ifdef USE_MMAP
-  bfd_init_window (&obj_aout_sym_window (abfd));
-  bfd_init_window (&obj_aout_string_window (abfd));
-#endif
-  obj_aout_external_syms (abfd) = NULL;
-  obj_aout_external_strings (abfd) = NULL;
-  obj_aout_sym_hashes (abfd) = NULL;
-
-  if (! NAME(aout,make_sections) (abfd))
-    return NULL;
-
-  obj_datasec (abfd)->_raw_size = execp->a_data;
-  obj_bsssec (abfd)->_raw_size = execp->a_bss;
-
-  obj_textsec (abfd)->flags =
-    (execp->a_trsize != 0
-     ? (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC)
-     : (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS));
-  obj_datasec (abfd)->flags =
-    (execp->a_drsize != 0
-     ? (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS | SEC_RELOC)
-     : (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS));
-  obj_bsssec (abfd)->flags = SEC_ALLOC;
-
-#ifdef THIS_IS_ONLY_DOCUMENTATION
-  /* The common code can't fill in these things because they depend
-     on either the start address of the text segment, the rounding
-     up of virtual addresses between segments, or the starting file
-     position of the text segment -- all of which varies among different
-     versions of a.out.  */
-
-  /* Call back to the format-dependent code to fill in the rest of the
-     fields and do any further cleanup.  Things that should be filled
-     in by the callback:  */
-
-  struct exec *execp = exec_hdr (abfd);
-
-  obj_textsec (abfd)->size = N_TXTSIZE(*execp);
-  obj_textsec (abfd)->raw_size = N_TXTSIZE(*execp);
-  /* data and bss are already filled in since they're so standard */
-
-  /* The virtual memory addresses of the sections */
-  obj_textsec (abfd)->vma = N_TXTADDR(*execp);
-  obj_datasec (abfd)->vma = N_DATADDR(*execp);
-  obj_bsssec  (abfd)->vma = N_BSSADDR(*execp);
-
-  /* The file offsets of the sections */
-  obj_textsec (abfd)->filepos = N_TXTOFF(*execp);
-  obj_datasec (abfd)->filepos = N_DATOFF(*execp);
-
-  /* The file offsets of the relocation info */
-  obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp);
-  obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp);
-
-  /* The file offsets of the string table and symbol table.  */
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
-
-  /* Determine the architecture and machine type of the object file.  */
-  switch (N_MACHTYPE (*exec_hdr (abfd))) {
-  default:
-    abfd->obj_arch = bfd_arch_obscure;
-    break;
-  }
-
-  adata(abfd)->page_size = TARGET_PAGE_SIZE;
-  adata(abfd)->segment_size = SEGMENT_SIZE;
-  adata(abfd)->exec_bytes_size = EXEC_BYTES_SIZE;
-
-  return abfd->xvec;
-
-  /* The architecture is encoded in various ways in various a.out variants,
-     or is not encoded at all in some of them.  The relocation size depends
-     on the architecture and the a.out variant.  Finally, the return value
-     is the bfd_target vector in use.  If an error occurs, return zero and
-     set bfd_error to the appropriate error code.
-
-     Formats such as b.out, which have additional fields in the a.out
-     header, should cope with them in this callback as well.  */
-#endif				/* DOCUMENTATION */
-
-  result = (*callback_to_real_object_p)(abfd);
-
-  /* Now that the segment addresses have been worked out, take a better
-     guess at whether the file is executable.  If the entry point
-     is within the text segment, assume it is.  (This makes files
-     executable even if their entry point address is 0, as long as
-     their text starts at zero.).
-
-     This test had to be changed to deal with systems where the text segment
-     runs at a different location than the default.  The problem is that the
-     entry address can appear to be outside the text segment, thus causing an
-     erroneous conclusion that the file isn't executable.
-
-     To fix this, we now accept any non-zero entry point as an indication of
-     executability.  This will work most of the time, since only the linker
-     sets the entry point, and that is likely to be non-zero for most systems. */
-
-  if (execp->a_entry != 0
-      || (execp->a_entry >= obj_textsec(abfd)->vma
-	  && execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->_raw_size))
-    abfd->flags |= EXEC_P;
-#ifdef STAT_FOR_EXEC
-  else
-    {
-      struct stat stat_buf;
-
-      /* The original heuristic doesn't work in some important cases.
-        The a.out file has no information about the text start
-        address.  For files (like kernels) linked to non-standard
-        addresses (ld -Ttext nnn) the entry point may not be between
-        the default text start (obj_textsec(abfd)->vma) and
-        (obj_textsec(abfd)->vma) + text size.  This is not just a mach
-        issue.  Many kernels are loaded at non standard addresses.  */
-      if (abfd->iostream != NULL
-	  && (abfd->flags & BFD_IN_MEMORY) == 0
-	  && (fstat(fileno((FILE *) (abfd->iostream)), &stat_buf) == 0)
-	  && ((stat_buf.st_mode & 0111) != 0))
-	abfd->flags |= EXEC_P;
-    }
-#endif /* STAT_FOR_EXEC */
-
-  if (result)
-    {
-#if 0 /* These should be set correctly anyways.  */
-      abfd->sections = obj_textsec (abfd);
-      obj_textsec (abfd)->next = obj_datasec (abfd);
-      obj_datasec (abfd)->next = obj_bsssec (abfd);
-#endif
-    }
-  else
-    {
-      free (rawptr);
-      abfd->tdata.aout_data = oldrawptr;
-    }
-  return result;
-}
-
-/*
-FUNCTION
-	aout_@var{size}_mkobject
-
-SYNOPSIS
-	boolean aout_@var{size}_mkobject, (bfd *abfd);
-
-DESCRIPTION
-	Initialize BFD @var{abfd} for use with a.out files.
-*/
-
-boolean
-NAME(aout,mkobject) (abfd)
-     bfd *abfd;
-{
-  struct aout_data_struct  *rawptr;
-
-  bfd_set_error (bfd_error_system_call);
-
-  /* Use an intermediate variable for clarity */
-  rawptr = (struct aout_data_struct *)bfd_zalloc (abfd, sizeof (struct aout_data_struct ));
-
-  if (rawptr == NULL)
-    return false;
-
-  abfd->tdata.aout_data = rawptr;
-  exec_hdr (abfd) = &(rawptr->e);
-
-  obj_textsec (abfd) = (asection *)NULL;
-  obj_datasec (abfd) = (asection *)NULL;
-  obj_bsssec (abfd) = (asection *)NULL;
-
-  return true;
-}
-
-
-/*
-FUNCTION
-	aout_@var{size}_machine_type
-
-SYNOPSIS
-	enum machine_type  aout_@var{size}_machine_type
-	 (enum bfd_architecture arch,
-	  unsigned long machine));
-
-DESCRIPTION
-	Keep track of machine architecture and machine type for
-	a.out's. Return the <<machine_type>> for a particular
-	architecture and machine, or <<M_UNKNOWN>> if that exact architecture
-	and machine can't be represented in a.out format.
-
-	If the architecture is understood, machine type 0 (default)
-	is always understood.
-*/
-
-enum machine_type
-NAME(aout,machine_type) (arch, machine, unknown)
-     enum bfd_architecture arch;
-     unsigned long machine;
-     boolean *unknown;
-{
-  enum machine_type arch_flags;
-
-  arch_flags = M_UNKNOWN;
-  *unknown = true;
-
-  switch (arch) {
-  case bfd_arch_sparc:
-    if (machine == 0
-	|| machine == bfd_mach_sparc
-	|| machine == bfd_mach_sparc_sparclite
-	|| machine == bfd_mach_sparc_sparclite_le
-	|| machine == bfd_mach_sparc_v9)
-      arch_flags = M_SPARC;
-    else if (machine == bfd_mach_sparc_sparclet)
-      arch_flags = M_SPARCLET;
-    break;
-
-  case bfd_arch_m68k:
-    switch (machine) {
-    case 0:		  arch_flags = M_68010; break;
-    case bfd_mach_m68000: arch_flags = M_UNKNOWN; *unknown = false; break;
-    case bfd_mach_m68010: arch_flags = M_68010; break;
-    case bfd_mach_m68020: arch_flags = M_68020; break;
-    default:		  arch_flags = M_UNKNOWN; break;
-    }
-    break;
-
-  case bfd_arch_i386:
-    if (machine == 0)	arch_flags = M_386;
-    break;
-
-  case bfd_arch_a29k:
-    if (machine == 0)	arch_flags = M_29K;
-    break;
-
-  case bfd_arch_arm:
-    if (machine == 0)	arch_flags = M_ARM;
-    break;
-    
-  case bfd_arch_mips:
-    switch (machine) {
-    case 0:
-    case bfd_mach_mips3000:
-    case bfd_mach_mips3900:
-      arch_flags = M_MIPS1;
-      break;
-    case bfd_mach_mips6000:
-      arch_flags = M_MIPS2;
-      break;
-    case bfd_mach_mips4000:
-    case bfd_mach_mips4010:
-    case bfd_mach_mips4100:
-    case bfd_mach_mips4300:
-    case bfd_mach_mips4400:
-    case bfd_mach_mips4600:
-    case bfd_mach_mips4650:
-    case bfd_mach_mips8000:
-    case bfd_mach_mips10000:
-    case bfd_mach_mips16:
-      /* FIXME: These should be MIPS3 or MIPS4.  */
-      arch_flags = M_MIPS2;
-      break;
-    default:
-      arch_flags = M_UNKNOWN;
-      break;
-    }
-    break;
-
-  case bfd_arch_ns32k:
-    switch (machine) {
-    case 0:    		arch_flags = M_NS32532; break;
-    case 32032:		arch_flags = M_NS32032; break;
-    case 32532:		arch_flags = M_NS32532; break;
-    default:		arch_flags = M_UNKNOWN; break;
-    }
-    break;
-
-  case bfd_arch_vax:
-    *unknown = false;
-    break;
-
-  default:
-    arch_flags = M_UNKNOWN;
-  }
-
-  if (arch_flags != M_UNKNOWN)
-    *unknown = false;
-
-  return arch_flags;
-}
-
-
-/*
-FUNCTION
-	aout_@var{size}_set_arch_mach
-
-SYNOPSIS
-	boolean aout_@var{size}_set_arch_mach,
-	 (bfd *,
-	  enum bfd_architecture arch,
-	  unsigned long machine));
-
-DESCRIPTION
-	Set the architecture and the machine of the BFD @var{abfd} to the
-	values @var{arch} and @var{machine}.  Verify that @var{abfd}'s format
-	can support the architecture required.
-*/
-
-boolean
-NAME(aout,set_arch_mach) (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
-
-  if (arch != bfd_arch_unknown)
-    {
-      boolean unknown;
-
-      NAME(aout,machine_type) (arch, machine, &unknown);
-      if (unknown)
-	return false;
-    }
-
-  /* Determine the size of a relocation entry */
-  switch (arch) {
-  case bfd_arch_sparc:
-  case bfd_arch_a29k:
-  case bfd_arch_mips:
-    obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
-    break;
-  default:
-    obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-    break;
-  }
-
-  return (*aout_backend_info(abfd)->set_sizes) (abfd);
-}
-
-static void
-adjust_o_magic (abfd, execp)
-     bfd *abfd;
-     struct internal_exec *execp;
-{
-  file_ptr pos = adata (abfd).exec_bytes_size;
-  bfd_vma vma = 0;
-  int pad = 0;
-
-  /* Text.  */
-  obj_textsec(abfd)->filepos = pos;
-  if (!obj_textsec(abfd)->user_set_vma)
-    obj_textsec(abfd)->vma = vma;
-  else
-    vma = obj_textsec(abfd)->vma;
-
-  pos += obj_textsec(abfd)->_raw_size;
-  vma += obj_textsec(abfd)->_raw_size;
-
-  /* Data.  */
-  if (!obj_datasec(abfd)->user_set_vma)
-    {
-#if 0	    /* ?? Does alignment in the file image really matter? */
-      pad = align_power (vma, obj_datasec(abfd)->alignment_power) - vma;
-#endif
-      obj_textsec(abfd)->_raw_size += pad;
-      pos += pad;
-      vma += pad;
-      obj_datasec(abfd)->vma = vma;
-    }
-  else
-    vma = obj_datasec(abfd)->vma;
-  obj_datasec(abfd)->filepos = pos;
-  pos += obj_datasec(abfd)->_raw_size;
-  vma += obj_datasec(abfd)->_raw_size;
-
-  /* BSS.  */
-  if (!obj_bsssec(abfd)->user_set_vma)
-    {
-#if 0
-      pad = align_power (vma, obj_bsssec(abfd)->alignment_power) - vma;
-#endif
-      obj_datasec(abfd)->_raw_size += pad;
-      pos += pad;
-      vma += pad;
-      obj_bsssec(abfd)->vma = vma;
-    }
-  else
-    {
-      /* The VMA of the .bss section is set by the the VMA of the
-         .data section plus the size of the .data section.  We may
-         need to add padding bytes to make this true.  */
-      pad = obj_bsssec (abfd)->vma - vma;
-      if (pad > 0)
-	{
-	  obj_datasec (abfd)->_raw_size += pad;
-	  pos += pad;
-	}
-    }
-  obj_bsssec(abfd)->filepos = pos;
-
-  /* Fix up the exec header.  */
-  execp->a_text = obj_textsec(abfd)->_raw_size;
-  execp->a_data = obj_datasec(abfd)->_raw_size;
-  execp->a_bss = obj_bsssec(abfd)->_raw_size;
-  N_SET_MAGIC (*execp, OMAGIC);
-}
-
-static void
-adjust_z_magic (abfd, execp)
-     bfd *abfd;
-     struct internal_exec *execp;
-{
-  bfd_size_type data_pad, text_pad;
-  file_ptr text_end;
-  CONST struct aout_backend_data *abdp;
-  int ztih;			/* Nonzero if text includes exec header.  */
-  
-  abdp = aout_backend_info (abfd);
-
-  /* Text.  */
-  ztih = (abdp != NULL
-	  && (abdp->text_includes_header
-	      || obj_aout_subformat (abfd) == q_magic_format));
-  obj_textsec(abfd)->filepos = (ztih
-				? adata(abfd).exec_bytes_size
-				: adata(abfd).zmagic_disk_block_size);
-  if (! obj_textsec(abfd)->user_set_vma)
-    {
-      /* ?? Do we really need to check for relocs here?  */
-      obj_textsec(abfd)->vma = ((abfd->flags & HAS_RELOC)
-				? 0
-				: (ztih
-				   ? (abdp->default_text_vma
-				      + adata(abfd).exec_bytes_size)
-				   : abdp->default_text_vma));
-      text_pad = 0;
-    }
-  else
-    {
-      /* The .text section is being loaded at an unusual address.  We
-         may need to pad it such that the .data section starts at a page
-         boundary.  */
-      if (ztih)
-	text_pad = ((obj_textsec (abfd)->filepos - obj_textsec (abfd)->vma)
-		    & (adata (abfd).page_size - 1));
-      else
-	text_pad = ((- obj_textsec (abfd)->vma)
-		    & (adata (abfd).page_size - 1));
-    }
-
-  /* Find start of data.  */
-  if (ztih)
-    {
-      text_end = obj_textsec (abfd)->filepos + obj_textsec (abfd)->_raw_size;
-      text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
-    }
-  else
-    {
-      /* Note that if page_size == zmagic_disk_block_size, then
-	 filepos == page_size, and this case is the same as the ztih
-	 case.  */
-      text_end = obj_textsec (abfd)->_raw_size;
-      text_pad += BFD_ALIGN (text_end, adata (abfd).page_size) - text_end;
-      text_end += obj_textsec (abfd)->filepos;
-    }
-  obj_textsec(abfd)->_raw_size += text_pad;
-  text_end += text_pad;
-
-  /* Data.  */
-  if (!obj_datasec(abfd)->user_set_vma)
-    {
-      bfd_vma vma;
-      vma = obj_textsec(abfd)->vma + obj_textsec(abfd)->_raw_size;
-      obj_datasec(abfd)->vma = BFD_ALIGN (vma, adata(abfd).segment_size);
-    }
-  if (abdp && abdp->zmagic_mapped_contiguous)
-    {
-      text_pad = (obj_datasec(abfd)->vma
-		  - obj_textsec(abfd)->vma
-		  - obj_textsec(abfd)->_raw_size);
-      obj_textsec(abfd)->_raw_size += text_pad;
-    }
-  obj_datasec(abfd)->filepos = (obj_textsec(abfd)->filepos
-				+ obj_textsec(abfd)->_raw_size);
-  
-  /* Fix up exec header while we're at it.  */
-  execp->a_text = obj_textsec(abfd)->_raw_size;
-  if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted)))
-    execp->a_text += adata(abfd).exec_bytes_size;
-  if (obj_aout_subformat (abfd) == q_magic_format)
-    N_SET_MAGIC (*execp, QMAGIC);
-  else
-    N_SET_MAGIC (*execp, ZMAGIC);
-
-  /* Spec says data section should be rounded up to page boundary.  */
-  obj_datasec(abfd)->_raw_size
-    = align_power (obj_datasec(abfd)->_raw_size,
-		   obj_bsssec(abfd)->alignment_power);
-  execp->a_data = BFD_ALIGN (obj_datasec(abfd)->_raw_size,
-			     adata(abfd).page_size);
-  data_pad = execp->a_data - obj_datasec(abfd)->_raw_size;
-
-  /* BSS.  */
-  if (!obj_bsssec(abfd)->user_set_vma)
-    obj_bsssec(abfd)->vma = (obj_datasec(abfd)->vma
-			     + obj_datasec(abfd)->_raw_size);
-  /* If the BSS immediately follows the data section and extra space
-     in the page is left after the data section, fudge data
-     in the header so that the bss section looks smaller by that
-     amount.  We'll start the bss section there, and lie to the OS.
-     (Note that a linker script, as well as the above assignment,
-     could have explicitly set the BSS vma to immediately follow
-     the data section.)  */
-  if (align_power (obj_bsssec(abfd)->vma, obj_bsssec(abfd)->alignment_power)
-      == obj_datasec(abfd)->vma + obj_datasec(abfd)->_raw_size)
-    execp->a_bss = (data_pad > obj_bsssec(abfd)->_raw_size) ? 0 :
-      obj_bsssec(abfd)->_raw_size - data_pad;
-  else
-    execp->a_bss = obj_bsssec(abfd)->_raw_size;
-}
-
-static void
-adjust_n_magic (abfd, execp)
-     bfd *abfd;
-     struct internal_exec *execp;
-{
-  file_ptr pos = adata(abfd).exec_bytes_size;
-  bfd_vma vma = 0;
-  int pad;
-  
-  /* Text.  */
-  obj_textsec(abfd)->filepos = pos;
-  if (!obj_textsec(abfd)->user_set_vma)
-    obj_textsec(abfd)->vma = vma;
-  else
-    vma = obj_textsec(abfd)->vma;
-  pos += obj_textsec(abfd)->_raw_size;
-  vma += obj_textsec(abfd)->_raw_size;
-
-  /* Data.  */
-  obj_datasec(abfd)->filepos = pos;
-  if (!obj_datasec(abfd)->user_set_vma)
-    obj_datasec(abfd)->vma = BFD_ALIGN (vma, adata(abfd).segment_size);
-  vma = obj_datasec(abfd)->vma;
-  
-  /* Since BSS follows data immediately, see if it needs alignment.  */
-  vma += obj_datasec(abfd)->_raw_size;
-  pad = align_power (vma, obj_bsssec(abfd)->alignment_power) - vma;
-  obj_datasec(abfd)->_raw_size += pad;
-  pos += obj_datasec(abfd)->_raw_size;
-
-  /* BSS.  */
-  if (!obj_bsssec(abfd)->user_set_vma)
-    obj_bsssec(abfd)->vma = vma;
-  else
-    vma = obj_bsssec(abfd)->vma;
-
-  /* Fix up exec header.  */
-  execp->a_text = obj_textsec(abfd)->_raw_size;
-  execp->a_data = obj_datasec(abfd)->_raw_size;
-  execp->a_bss = obj_bsssec(abfd)->_raw_size;
-  N_SET_MAGIC (*execp, NMAGIC);
-}
-
-boolean
-NAME(aout,adjust_sizes_and_vmas) (abfd, text_size, text_end)
-     bfd *abfd;
-     bfd_size_type *text_size;
-     file_ptr *text_end;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  if (! NAME(aout,make_sections) (abfd))
-    return false;
-
-  if (adata(abfd).magic != undecided_magic)
-    return true;
-
-  obj_textsec(abfd)->_raw_size =
-    align_power(obj_textsec(abfd)->_raw_size,
-		obj_textsec(abfd)->alignment_power);
-
-  *text_size = obj_textsec (abfd)->_raw_size;
-  /* Rule (heuristic) for when to pad to a new page.  Note that there
-     are (at least) two ways demand-paged (ZMAGIC) files have been
-     handled.  Most Berkeley-based systems start the text segment at
-     (TARGET_PAGE_SIZE).  However, newer versions of SUNOS start the text
-     segment right after the exec header; the latter is counted in the
-     text segment size, and is paged in by the kernel with the rest of
-     the text. */
-
-  /* This perhaps isn't the right way to do this, but made it simpler for me
-     to understand enough to implement it.  Better would probably be to go
-     right from BFD flags to alignment/positioning characteristics.  But the
-     old code was sloppy enough about handling the flags, and had enough
-     other magic, that it was a little hard for me to understand.  I think
-     I understand it better now, but I haven't time to do the cleanup this
-     minute.  */
-
-  if (abfd->flags & D_PAGED)
-    /* Whether or not WP_TEXT is set -- let D_PAGED override.  */
-    adata(abfd).magic = z_magic;
-  else if (abfd->flags & WP_TEXT)
-    adata(abfd).magic = n_magic;
-  else
-    adata(abfd).magic = o_magic;
-
-#ifdef BFD_AOUT_DEBUG /* requires gcc2 */
-#if __GNUC__ >= 2
-  fprintf (stderr, "%s text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x,%x>\n",
-	   ({ char *str;
-	      switch (adata(abfd).magic) {
-	      case n_magic: str = "NMAGIC"; break;
-	      case o_magic: str = "OMAGIC"; break;
-	      case z_magic: str = "ZMAGIC"; break;
-	      default: abort ();
-	      }
-	      str;
-	    }),
-	   obj_textsec(abfd)->vma, obj_textsec(abfd)->_raw_size,
-	   	obj_textsec(abfd)->alignment_power,
-	   obj_datasec(abfd)->vma, obj_datasec(abfd)->_raw_size,
-	   	obj_datasec(abfd)->alignment_power,
-	   obj_bsssec(abfd)->vma, obj_bsssec(abfd)->_raw_size,
-	   	obj_bsssec(abfd)->alignment_power);
-#endif
-#endif
-
-  switch (adata(abfd).magic)
-    {
-    case o_magic:
-      adjust_o_magic (abfd, execp);
-      break;
-    case z_magic:
-      adjust_z_magic (abfd, execp);
-      break;
-    case n_magic:
-      adjust_n_magic (abfd, execp);
-      break;
-    default:
-      abort ();
-    }
-
-#ifdef BFD_AOUT_DEBUG
-  fprintf (stderr, "       text=<%x,%x,%x> data=<%x,%x,%x> bss=<%x,%x>\n",
-	   obj_textsec(abfd)->vma, obj_textsec(abfd)->_raw_size,
-	   	obj_textsec(abfd)->filepos,
-	   obj_datasec(abfd)->vma, obj_datasec(abfd)->_raw_size,
-	   	obj_datasec(abfd)->filepos,
-	   obj_bsssec(abfd)->vma, obj_bsssec(abfd)->_raw_size);
-#endif
-
-  return true;
-}
-
-/*
-FUNCTION
-	aout_@var{size}_new_section_hook
-
-SYNOPSIS
-        boolean aout_@var{size}_new_section_hook,
-	   (bfd *abfd,
-	    asection *newsect));
-
-DESCRIPTION
-	Called by the BFD in response to a @code{bfd_make_section}
-	request.
-*/
-boolean
-NAME(aout,new_section_hook) (abfd, newsect)
-     bfd *abfd;
-     asection *newsect;
-{
-  /* align to double at least */
-  newsect->alignment_power = bfd_get_arch_info(abfd)->section_align_power;
-
-
-  if (bfd_get_format (abfd) == bfd_object)
-  {
-    if (obj_textsec(abfd) == NULL && !strcmp(newsect->name, ".text")) {
-	obj_textsec(abfd)= newsect;
-	newsect->target_index = N_TEXT;
-	return true;
-      }
-
-    if (obj_datasec(abfd) == NULL && !strcmp(newsect->name, ".data")) {
-	obj_datasec(abfd) = newsect;
-	newsect->target_index = N_DATA;
-	return true;
-      }
-
-    if (obj_bsssec(abfd) == NULL && !strcmp(newsect->name, ".bss")) {
-	obj_bsssec(abfd) = newsect;
-	newsect->target_index = N_BSS;
-	return true;
-      }
-
-  }
-
-  /* We allow more than three sections internally */
-  return true;
-}
-
-boolean
-NAME(aout,set_section_contents) (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  file_ptr text_end;
-  bfd_size_type text_size;
-
-  if (! abfd->output_has_begun)
-    {
-      if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
-	return false;
-    }
-
-  if (section == obj_bsssec (abfd))
-    {
-      bfd_set_error (bfd_error_no_contents);
-      return false;
-    }
-
-  if (section != obj_textsec (abfd)
-      && section != obj_datasec (abfd))
-    {
-      (*_bfd_error_handler)
-	(_("%s: can not represent section `%s' in a.out object file format"),
-	 bfd_get_filename (abfd), bfd_get_section_name (abfd, section));
-      bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
-    }
-
-  if (count != 0)
-    {
-      if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0
-	  || bfd_write (location, 1, count, abfd) != count)
-	return false;
-    }
-
-  return true;
-}
-
-/* Read the external symbols from an a.out file.  */
-
-static boolean
-aout_get_external_symbols (abfd)
-     bfd *abfd;
-{
-  if (obj_aout_external_syms (abfd) == (struct external_nlist *) NULL)
-    {
-      bfd_size_type count;
-      struct external_nlist *syms;
-
-      count = exec_hdr (abfd)->a_syms / EXTERNAL_NLIST_SIZE;
-
-#ifdef USE_MMAP
-      if (bfd_get_file_window (abfd,
-			       obj_sym_filepos (abfd), exec_hdr (abfd)->a_syms,
-			       &obj_aout_sym_window (abfd), true) == false)
-	return false;
-      syms = (struct external_nlist *) obj_aout_sym_window (abfd).data;
-#else
-      /* We allocate using malloc to make the values easy to free
-	 later on.  If we put them on the objalloc it might not be
-	 possible to free them.  */
-      syms = ((struct external_nlist *)
-	      bfd_malloc ((size_t) count * EXTERNAL_NLIST_SIZE));
-      if (syms == (struct external_nlist *) NULL && count != 0)
-	return false;
-
-      if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
-	  || (bfd_read (syms, 1, exec_hdr (abfd)->a_syms, abfd)
-	      != exec_hdr (abfd)->a_syms))
-	{
-	  free (syms);
-	  return false;
-	}
-#endif
-
-      obj_aout_external_syms (abfd) = syms;
-      obj_aout_external_sym_count (abfd) = count;
-    }
-      
-  if (obj_aout_external_strings (abfd) == NULL
-      && exec_hdr (abfd)->a_syms != 0)
-    {
-      unsigned char string_chars[BYTES_IN_WORD];
-      bfd_size_type stringsize;
-      char *strings;
-
-      /* Get the size of the strings.  */
-      if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
-	  || (bfd_read ((PTR) string_chars, BYTES_IN_WORD, 1, abfd)
-	      != BYTES_IN_WORD))
-	return false;
-      stringsize = GET_WORD (abfd, string_chars);
-
-#ifdef USE_MMAP
-      if (bfd_get_file_window (abfd, obj_str_filepos (abfd), stringsize,
-			       &obj_aout_string_window (abfd), true) == false)
-	return false;
-      strings = (char *) obj_aout_string_window (abfd).data;
-#else
-      strings = (char *) bfd_malloc ((size_t) stringsize + 1);
-      if (strings == NULL)
-	return false;
-
-      /* Skip space for the string count in the buffer for convenience
-	 when using indexes.  */
-      if (bfd_read (strings + BYTES_IN_WORD, 1, stringsize - BYTES_IN_WORD,
-		    abfd)
-	  != stringsize - BYTES_IN_WORD)
-	{
-	  free (strings);
-	  return false;
-	}
-#endif
-
-      /* Ensure that a zero index yields an empty string.  */
-      strings[0] = '\0';
-
-      strings[stringsize - 1] = 0;
-
-      obj_aout_external_strings (abfd) = strings;
-      obj_aout_external_string_size (abfd) = stringsize;
-    }
-
-  return true;
-}
-
-/* Translate an a.out symbol into a BFD symbol.  The desc, other, type
-   and symbol->value fields of CACHE_PTR will be set from the a.out
-   nlist structure.  This function is responsible for setting
-   symbol->flags and symbol->section, and adjusting symbol->value.  */
-
-static boolean
-translate_from_native_sym_flags (abfd, cache_ptr)
-     bfd *abfd;
-     aout_symbol_type *cache_ptr;
-{
-  flagword visible;
-
-  if ((cache_ptr->type & N_STAB) != 0
-      || cache_ptr->type == N_FN)
-    {
-      asection *sec;
-
-      /* This is a debugging symbol.  */
-
-      cache_ptr->symbol.flags = BSF_DEBUGGING;
-
-      /* Work out the symbol section.  */
-      switch (cache_ptr->type & N_TYPE)
-	{
-	case N_TEXT:
-	case N_FN:
-	  sec = obj_textsec (abfd);
-	  break;
-	case N_DATA:
-	  sec = obj_datasec (abfd);
-	  break;
-	case N_BSS:
-	  sec = obj_bsssec (abfd);
-	  break;
-	default:
-	case N_ABS:
-	  sec = bfd_abs_section_ptr;
-	  break;
-	}
-
-      cache_ptr->symbol.section = sec;
-      cache_ptr->symbol.value -= sec->vma;
-
-      return true;
-    }
-
-  /* Get the default visibility.  This does not apply to all types, so
-     we just hold it in a local variable to use if wanted.  */
-  if ((cache_ptr->type & N_EXT) == 0)
-    visible = BSF_LOCAL;
-  else
-    visible = BSF_GLOBAL;
-
-  switch (cache_ptr->type)
-    {
-    default:
-    case N_ABS: case N_ABS | N_EXT:
-      cache_ptr->symbol.section = bfd_abs_section_ptr;
-      cache_ptr->symbol.flags = visible;
-      break;
-
-    case N_UNDF | N_EXT:
-      if (cache_ptr->symbol.value != 0)
-	{
-	  /* This is a common symbol.  */
-	  cache_ptr->symbol.flags = BSF_GLOBAL;
-	  cache_ptr->symbol.section = bfd_com_section_ptr;
-	}
-      else
-	{
-	  cache_ptr->symbol.flags = 0;
-	  cache_ptr->symbol.section = bfd_und_section_ptr;
-	}
-      break;
-
-    case N_TEXT: case N_TEXT | N_EXT:
-      cache_ptr->symbol.section = obj_textsec (abfd);
-      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
-      cache_ptr->symbol.flags = visible;
-      break;
-
-      /* N_SETV symbols used to represent set vectors placed in the
-	 data section.  They are no longer generated.  Theoretically,
-	 it was possible to extract the entries and combine them with
-	 new ones, although I don't know if that was ever actually
-	 done.  Unless that feature is restored, treat them as data
-	 symbols.  */
-    case N_SETV: case N_SETV | N_EXT:
-    case N_DATA: case N_DATA | N_EXT:
-      cache_ptr->symbol.section = obj_datasec (abfd);
-      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
-      cache_ptr->symbol.flags = visible;
-      break;
-
-    case N_BSS: case N_BSS | N_EXT:
-      cache_ptr->symbol.section = obj_bsssec (abfd);
-      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
-      cache_ptr->symbol.flags = visible;
-      break;
-
-    case N_SETA: case N_SETA | N_EXT:
-    case N_SETT: case N_SETT | N_EXT:
-    case N_SETD: case N_SETD | N_EXT:
-    case N_SETB: case N_SETB | N_EXT:
-      {
-	/* This code is no longer needed.  It used to be used to make
-           the linker handle set symbols, but they are now handled in
-           the add_symbols routine instead.  */
-#if 0
-	asection *section;
-	arelent_chain *reloc;
-	asection *into_section;
-
-	/* This is a set symbol.  The name of the symbol is the name
-	   of the set (e.g., __CTOR_LIST__).  The value of the symbol
-	   is the value to add to the set.  We create a section with
-	   the same name as the symbol, and add a reloc to insert the
-	   appropriate value into the section.
-
-	   This action is actually obsolete; it used to make the
-	   linker do the right thing, but the linker no longer uses
-	   this function.  */
-
-	section = bfd_get_section_by_name (abfd, cache_ptr->symbol.name);
-	if (section == NULL)
-	  {
-	    char *copy;
-
-	    copy = bfd_alloc (abfd, strlen (cache_ptr->symbol.name) + 1);
-	    if (copy == NULL)
-	      return false;
-
-	    strcpy (copy, cache_ptr->symbol.name);
-	    section = bfd_make_section (abfd, copy);
-	    if (section == NULL)
-	      return false;
-	  }
-
-	reloc = (arelent_chain *) bfd_alloc (abfd, sizeof (arelent_chain));
-	if (reloc == NULL)
-	  return false;
-
-	/* Build a relocation entry for the constructor.  */
-	switch (cache_ptr->type & N_TYPE)
-	  {
-	  case N_SETA:
-	    into_section = bfd_abs_section_ptr;
-	    cache_ptr->type = N_ABS;
-	    break;
-	  case N_SETT:
-	    into_section = obj_textsec (abfd);
-	    cache_ptr->type = N_TEXT;
-	    break;
-	  case N_SETD:
-	    into_section = obj_datasec (abfd);
-	    cache_ptr->type = N_DATA;
-	    break;
-	  case N_SETB:
-	    into_section = obj_bsssec (abfd);
-	    cache_ptr->type = N_BSS;
-	    break;
-	  }
-
-	/* Build a relocation pointing into the constructor section
-	   pointing at the symbol in the set vector specified.  */
-	reloc->relent.addend = cache_ptr->symbol.value;
-	cache_ptr->symbol.section = into_section;
-	reloc->relent.sym_ptr_ptr = into_section->symbol_ptr_ptr;
-
-	/* We modify the symbol to belong to a section depending upon
-	   the name of the symbol, and add to the size of the section
-	   to contain a pointer to the symbol. Build a reloc entry to
-	   relocate to this symbol attached to this section.  */
-	section->flags = SEC_CONSTRUCTOR | SEC_RELOC;
-
-	section->reloc_count++;
-	section->alignment_power = 2;
-
-	reloc->next = section->constructor_chain;
-	section->constructor_chain = reloc;
-	reloc->relent.address = section->_raw_size;
-	section->_raw_size += BYTES_IN_WORD;
-
-	reloc->relent.howto = CTOR_TABLE_RELOC_HOWTO(abfd);
-
-#endif /* 0 */
-
-	switch (cache_ptr->type & N_TYPE)
-	  {
-	  case N_SETA:
-	    cache_ptr->symbol.section = bfd_abs_section_ptr;
-	    break;
-	  case N_SETT:
-	    cache_ptr->symbol.section = obj_textsec (abfd);
-	    break;
-	  case N_SETD:
-	    cache_ptr->symbol.section = obj_datasec (abfd);
-	    break;
-	  case N_SETB:
-	    cache_ptr->symbol.section = obj_bsssec (abfd);
-	    break;
-	  }
-
-	cache_ptr->symbol.flags |= BSF_CONSTRUCTOR;
-      }
-      break;
-
-    case N_WARNING:
-      /* This symbol is the text of a warning message.  The next
-	 symbol is the symbol to associate the warning with.  If a
-	 reference is made to that symbol, a warning is issued.  */
-      cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_WARNING;
-      cache_ptr->symbol.section = bfd_abs_section_ptr;
-      break;
-
-    case N_INDR: case N_INDR | N_EXT:
-      /* An indirect symbol.  This consists of two symbols in a row.
-	 The first symbol is the name of the indirection.  The second
-	 symbol is the name of the target.  A reference to the first
-	 symbol becomes a reference to the second.  */
-      cache_ptr->symbol.flags = BSF_DEBUGGING | BSF_INDIRECT | visible;
-      cache_ptr->symbol.section = bfd_ind_section_ptr;
-      break;
-
-    case N_WEAKU:
-      cache_ptr->symbol.section = bfd_und_section_ptr;
-      cache_ptr->symbol.flags = BSF_WEAK;
-      break;
-
-    case N_WEAKA:
-      cache_ptr->symbol.section = bfd_abs_section_ptr;
-      cache_ptr->symbol.flags = BSF_WEAK;
-      break;
-
-    case N_WEAKT:
-      cache_ptr->symbol.section = obj_textsec (abfd);
-      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
-      cache_ptr->symbol.flags = BSF_WEAK;
-      break;
-
-    case N_WEAKD:
-      cache_ptr->symbol.section = obj_datasec (abfd);
-      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
-      cache_ptr->symbol.flags = BSF_WEAK;
-      break;
-
-    case N_WEAKB:
-      cache_ptr->symbol.section = obj_bsssec (abfd);
-      cache_ptr->symbol.value -= cache_ptr->symbol.section->vma;
-      cache_ptr->symbol.flags = BSF_WEAK;
-      break;
-    }
-
-  return true;
-}
-
-/* Set the fields of SYM_POINTER according to CACHE_PTR.  */
-
-static boolean
-translate_to_native_sym_flags (abfd, cache_ptr, sym_pointer)
-     bfd *abfd;
-     asymbol *cache_ptr;
-     struct external_nlist *sym_pointer;
-{
-  bfd_vma value = cache_ptr->value;
-  asection *sec;
-  bfd_vma off;
-
-  /* Mask out any existing type bits in case copying from one section
-     to another.  */
-  sym_pointer->e_type[0] &= ~N_TYPE;
-
-  sec = bfd_get_section (cache_ptr);
-  off = 0;
-
-  if (sec == NULL)
-    {
-      /* This case occurs, e.g., for the *DEBUG* section of a COFF
-	 file.  */
-      (*_bfd_error_handler)
-	(_("%s: can not represent section for symbol `%s' in a.out object file format"),
-	 bfd_get_filename (abfd), 
-	 cache_ptr->name != NULL ? cache_ptr->name : _("*unknown*"));
-      bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
-    }
-
-  if (sec->output_section != NULL)
-    {
-      off = sec->output_offset;
-      sec = sec->output_section;
-    }
-
-  if (bfd_is_abs_section (sec))
-    sym_pointer->e_type[0] |= N_ABS;
-  else if (sec == obj_textsec (abfd))
-    sym_pointer->e_type[0] |= N_TEXT;
-  else if (sec == obj_datasec (abfd))
-    sym_pointer->e_type[0] |= N_DATA;
-  else if (sec == obj_bsssec (abfd))
-    sym_pointer->e_type[0] |= N_BSS;
-  else if (bfd_is_und_section (sec))
-    sym_pointer->e_type[0] = N_UNDF | N_EXT;
-  else if (bfd_is_ind_section (sec))
-    sym_pointer->e_type[0] = N_INDR;
-  else if (bfd_is_com_section (sec))
-    sym_pointer->e_type[0] = N_UNDF | N_EXT;
-  else
-    {
-      (*_bfd_error_handler)
-	(_("%s: can not represent section `%s' in a.out object file format"),
-	 bfd_get_filename (abfd), bfd_get_section_name (abfd, sec));
-      bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
-    }
-
-  /* Turn the symbol from section relative to absolute again */
-  value += sec->vma + off;
-
-  if ((cache_ptr->flags & BSF_WARNING) != 0)
-    sym_pointer->e_type[0] = N_WARNING;
-
-  if ((cache_ptr->flags & BSF_DEBUGGING) != 0)
-    sym_pointer->e_type[0] = ((aout_symbol_type *) cache_ptr)->type;
-  else if ((cache_ptr->flags & BSF_GLOBAL) != 0)
-    sym_pointer->e_type[0] |= N_EXT;
-
-  if ((cache_ptr->flags & BSF_CONSTRUCTOR) != 0)
-    {
-      int type = ((aout_symbol_type *) cache_ptr)->type;
-      switch (type)
-	{
-	case N_ABS:	type = N_SETA; break;
-	case N_TEXT:	type = N_SETT; break;
-	case N_DATA:	type = N_SETD; break;
-	case N_BSS:	type = N_SETB; break;
-	}
-      sym_pointer->e_type[0] = type;
-    }
-
-  if ((cache_ptr->flags & BSF_WEAK) != 0)
-    {
-      int type;
-
-      switch (sym_pointer->e_type[0] & N_TYPE)
-	{
-	default:
-	case N_ABS:	type = N_WEAKA; break;
-	case N_TEXT:	type = N_WEAKT; break;
-	case N_DATA:	type = N_WEAKD; break;
-	case N_BSS:	type = N_WEAKB; break;
-	case N_UNDF:	type = N_WEAKU; break;
-	}
-      sym_pointer->e_type[0] = type;
-    }
-
-  PUT_WORD(abfd, value, sym_pointer->e_value);
-
-  return true;
-}
-
-/* Native-level interface to symbols. */
-
-asymbol *
-NAME(aout,make_empty_symbol) (abfd)
-     bfd *abfd;
-{
-  aout_symbol_type  *new =
-    (aout_symbol_type *)bfd_zalloc (abfd, sizeof (aout_symbol_type));
-  if (!new)
-    return NULL;
-  new->symbol.the_bfd = abfd;
-
-  return &new->symbol;
-}
-
-/* Translate a set of internal symbols into external symbols.  */
-
-boolean
-NAME(aout,translate_symbol_table) (abfd, in, ext, count, str, strsize, dynamic)
-     bfd *abfd;
-     aout_symbol_type *in;
-     struct external_nlist *ext;
-     bfd_size_type count;
-     char *str;
-     bfd_size_type strsize;
-     boolean dynamic;
-{
-  struct external_nlist *ext_end;
-
-  ext_end = ext + count;
-  for (; ext < ext_end; ext++, in++)
-    {
-      bfd_vma x;
-
-      x = GET_WORD (abfd, ext->e_strx);
-      in->symbol.the_bfd = abfd;
-
-      /* For the normal symbols, the zero index points at the number
-	 of bytes in the string table but is to be interpreted as the
-	 null string.  For the dynamic symbols, the number of bytes in
-	 the string table is stored in the __DYNAMIC structure and the
-	 zero index points at an actual string.  */
-      if (x == 0 && ! dynamic)
-	in->symbol.name = "";
-      else if (x < strsize)
-	in->symbol.name = str + x;
-      else
-	return false;
-
-      in->symbol.value = GET_SWORD (abfd,  ext->e_value);
-      in->desc = bfd_h_get_16 (abfd, ext->e_desc);
-      in->other = bfd_h_get_8 (abfd, ext->e_other);
-      in->type = bfd_h_get_8 (abfd,  ext->e_type);
-      in->symbol.udata.p = NULL;
-
-      if (! translate_from_native_sym_flags (abfd, in))
-	return false;
-
-      if (dynamic)
-	in->symbol.flags |= BSF_DYNAMIC;
-    }
-
-  return true;
-}
-
-/* We read the symbols into a buffer, which is discarded when this
-   function exits.  We read the strings into a buffer large enough to
-   hold them all plus all the cached symbol entries. */
-
-boolean
-NAME(aout,slurp_symbol_table) (abfd)
-     bfd *abfd;
-{
-  struct external_nlist *old_external_syms;
-  aout_symbol_type *cached;
-  size_t cached_size;
-
-  /* If there's no work to be done, don't do any */
-  if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
-    return true;
-
-  old_external_syms = obj_aout_external_syms (abfd);
-
-  if (! aout_get_external_symbols (abfd))
-    return false;
-
-  cached_size = (obj_aout_external_sym_count (abfd)
-		 * sizeof (aout_symbol_type));
-  cached = (aout_symbol_type *) bfd_malloc (cached_size);
-  if (cached == NULL && cached_size != 0)
-    return false;
-  if (cached_size != 0)
-    memset (cached, 0, cached_size);
-
-  /* Convert from external symbol information to internal.  */
-  if (! (NAME(aout,translate_symbol_table)
-	 (abfd, cached,
-	  obj_aout_external_syms (abfd),
-	  obj_aout_external_sym_count (abfd),
-	  obj_aout_external_strings (abfd),
-	  obj_aout_external_string_size (abfd),
-	  false)))
-    {
-      free (cached);
-      return false;
-    }
-
-  bfd_get_symcount (abfd) = obj_aout_external_sym_count (abfd);
-
-  obj_aout_symbols (abfd) = cached;
-
-  /* It is very likely that anybody who calls this function will not
-     want the external symbol information, so if it was allocated
-     because of our call to aout_get_external_symbols, we free it up
-     right away to save space.  */
-  if (old_external_syms == (struct external_nlist *) NULL
-      && obj_aout_external_syms (abfd) != (struct external_nlist *) NULL)
-    {
-#ifdef USE_MMAP
-      bfd_free_window (&obj_aout_sym_window (abfd));
-#else
-      free (obj_aout_external_syms (abfd));
-#endif
-      obj_aout_external_syms (abfd) = NULL;
-    }
-
-  return true;
-}
-
-/* We use a hash table when writing out symbols so that we only write
-   out a particular string once.  This helps particularly when the
-   linker writes out stabs debugging entries, because each different
-   contributing object file tends to have many duplicate stabs
-   strings.
-
-   This hash table code breaks dbx on SunOS 4.1.3, so we don't do it
-   if BFD_TRADITIONAL_FORMAT is set.  */
-
-static bfd_size_type add_to_stringtab
-  PARAMS ((bfd *, struct bfd_strtab_hash *, const char *, boolean));
-static boolean emit_stringtab PARAMS ((bfd *, struct bfd_strtab_hash *));
-
-/* Get the index of a string in a strtab, adding it if it is not
-   already present.  */
-
-static INLINE bfd_size_type
-add_to_stringtab (abfd, tab, str, copy)
-     bfd *abfd;
-     struct bfd_strtab_hash *tab;
-     const char *str;
-     boolean copy;
-{
-  boolean hash;
-  bfd_size_type index;
-
-  /* An index of 0 always means the empty string.  */
-  if (str == 0 || *str == '\0')
-    return 0;
-
-  /* Don't hash if BFD_TRADITIONAL_FORMAT is set, because SunOS dbx
-     doesn't understand a hashed string table.  */
-  hash = true;
-  if ((abfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
-
-  index = _bfd_stringtab_add (tab, str, hash, copy);
-
-  if (index != (bfd_size_type) -1)
-    {
-      /* Add BYTES_IN_WORD to the return value to account for the
-	 space taken up by the string table size.  */
-      index += BYTES_IN_WORD;
-    }
-
-  return index;
-}
-
-/* Write out a strtab.  ABFD is already at the right location in the
-   file.  */
-
-static boolean
-emit_stringtab (abfd, tab)
-     register bfd *abfd;
-     struct bfd_strtab_hash *tab;
-{
-  bfd_byte buffer[BYTES_IN_WORD];
-
-  /* The string table starts with the size.  */
-  PUT_WORD (abfd, _bfd_stringtab_size (tab) + BYTES_IN_WORD, buffer);
-  if (bfd_write ((PTR) buffer, 1, BYTES_IN_WORD, abfd) != BYTES_IN_WORD)
-    return false;
-
-  return _bfd_stringtab_emit (abfd, tab);
-}
-
-boolean
-NAME(aout,write_syms) (abfd)
-     bfd *abfd;
-{
-  unsigned int count ;
-  asymbol **generic = bfd_get_outsymbols (abfd);
-  struct bfd_strtab_hash *strtab;
-
-  strtab = _bfd_stringtab_init ();
-  if (strtab == NULL)
-    return false;
-
-  for (count = 0; count < bfd_get_symcount (abfd); count++)
-    {
-      asymbol *g = generic[count];
-      bfd_size_type indx;
-      struct external_nlist nsp;
-
-      indx = add_to_stringtab (abfd, strtab, g->name, false);
-      if (indx == (bfd_size_type) -1)
-	goto error_return;
-      PUT_WORD (abfd, indx, (bfd_byte *) nsp.e_strx);
-
-      if (bfd_asymbol_flavour(g) == abfd->xvec->flavour)
-	{
-	  bfd_h_put_16(abfd, aout_symbol(g)->desc,  nsp.e_desc);
-	  bfd_h_put_8(abfd, aout_symbol(g)->other,  nsp.e_other);
-	  bfd_h_put_8(abfd, aout_symbol(g)->type,  nsp.e_type);
-	}
-      else
-	{
-	  bfd_h_put_16(abfd,0, nsp.e_desc);
-	  bfd_h_put_8(abfd, 0, nsp.e_other);
-	  bfd_h_put_8(abfd, 0, nsp.e_type);
-	}
-
-      if (! translate_to_native_sym_flags (abfd, g, &nsp))
-	goto error_return;
-
-      if (bfd_write((PTR)&nsp,1,EXTERNAL_NLIST_SIZE, abfd)
-	  != EXTERNAL_NLIST_SIZE)
-	goto error_return;
-
-      /* NB: `KEEPIT' currently overlays `udata.p', so set this only
-	 here, at the end.  */
-      g->KEEPIT = count;
-    }
-
-  if (! emit_stringtab (abfd, strtab))
-    goto error_return;
-
-  _bfd_stringtab_free (strtab);
-
-  return true;
-
-error_return:
-  _bfd_stringtab_free (strtab);
-  return false;
-}
-
-
-long
-NAME(aout,get_symtab) (abfd, location)
-     bfd *abfd;
-     asymbol **location;
-{
-    unsigned int counter = 0;
-    aout_symbol_type *symbase;
-
-    if (!NAME(aout,slurp_symbol_table)(abfd))
-      return -1;
-
-    for (symbase = obj_aout_symbols(abfd); counter++ < bfd_get_symcount (abfd);)
-      *(location++) = (asymbol *)( symbase++);
-    *location++ =0;
-    return bfd_get_symcount (abfd);
-}
-
-
-/* Standard reloc stuff */
-/* Output standard relocation information to a file in target byte order. */
-
-extern void  NAME(aout,swap_std_reloc_out)
-  PARAMS ((bfd *, arelent *, struct reloc_std_external *));
-
-void
-NAME(aout,swap_std_reloc_out) (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     struct reloc_std_external *natptr;
-{
-  int r_index;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  int r_extern;
-  unsigned int r_length;
-  int r_pcrel;
-  int r_baserel, r_jmptable, r_relative;
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD(abfd, g->address, natptr->r_address);
-
-  r_length = g->howto->size ;	/* Size as a power of two */
-  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC? */
-  /* XXX This relies on relocs coming from a.out files.  */
-  r_baserel = (g->howto->type & 8) != 0;
-  r_jmptable = (g->howto->type & 16) != 0;
-  r_relative = (g->howto->type & 32) != 0;
-
-#if 0
-  /* For a standard reloc, the addend is in the object file.  */
-  r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
-#endif
-
-  /* name was clobbered by aout_write_syms to be symbol index */
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here
-     */
-
-
-  if (bfd_is_com_section (output_section)
-      || bfd_is_abs_section (output_section)
-      || bfd_is_und_section (output_section))
-    {
-      if (bfd_abs_section_ptr->symbol == sym)
-      {
-	/* Whoops, looked like an abs symbol, but is really an offset
-	   from the abs section */
-	r_index = N_ABS;
-	r_extern = 0;
-       }
-      else
-      {
-	/* Fill in symbol */
-	r_extern = 1;
-	r_index = (*(g->sym_ptr_ptr))->KEEPIT;
-
-      }
-    }
-  else
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_index  = output_section->target_index;
-    }
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd)) {
-      natptr->r_index[0] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[2] = r_index;
-      natptr->r_type[0] =
-       (r_extern?    RELOC_STD_BITS_EXTERN_BIG: 0)
-	| (r_pcrel?     RELOC_STD_BITS_PCREL_BIG: 0)
-	 | (r_baserel?   RELOC_STD_BITS_BASEREL_BIG: 0)
-	  | (r_jmptable?  RELOC_STD_BITS_JMPTABLE_BIG: 0)
-	   | (r_relative?  RELOC_STD_BITS_RELATIVE_BIG: 0)
-	    | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG);
-    } else {
-	natptr->r_index[2] = r_index >> 16;
-	natptr->r_index[1] = r_index >> 8;
-	natptr->r_index[0] = r_index;
-	natptr->r_type[0] =
-	 (r_extern?    RELOC_STD_BITS_EXTERN_LITTLE: 0)
-	  | (r_pcrel?     RELOC_STD_BITS_PCREL_LITTLE: 0)
-	   | (r_baserel?   RELOC_STD_BITS_BASEREL_LITTLE: 0)
-	    | (r_jmptable?  RELOC_STD_BITS_JMPTABLE_LITTLE: 0)
-	     | (r_relative?  RELOC_STD_BITS_RELATIVE_LITTLE: 0)
-	      | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE);
-      }
-}
-
-
-/* Extended stuff */
-/* Output extended relocation information to a file in target byte order. */
-
-extern void NAME(aout,swap_ext_reloc_out)
-  PARAMS ((bfd *, arelent *, struct reloc_ext_external *));
-
-void
-NAME(aout,swap_ext_reloc_out) (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     register struct reloc_ext_external *natptr;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_type;
-  unsigned int r_addend;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD (abfd, g->address, natptr->r_address);
-
-  r_type = (unsigned int) g->howto->type;
-
-  r_addend = g->addend;
-  if ((sym->flags & BSF_SECTION_SYM) != 0)
-    r_addend += (*(g->sym_ptr_ptr))->section->output_section->vma;
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here.  */
-
-  if (bfd_is_abs_section (bfd_get_section (sym)))
-    {
-      r_extern = 0;
-      r_index = N_ABS;
-    }
-  else if ((sym->flags & BSF_SECTION_SYM) == 0)
-    {
-      if (bfd_is_und_section (bfd_get_section (sym))
-	  || (sym->flags & BSF_GLOBAL) != 0)
-	r_extern = 1;
-      else
-	r_extern = 0;
-      r_index = (*(g->sym_ptr_ptr))->KEEPIT;
-    }
-  else
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_index = output_section->target_index;
-    }
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd)) {
-    natptr->r_index[0] = r_index >> 16;
-    natptr->r_index[1] = r_index >> 8;
-    natptr->r_index[2] = r_index;
-    natptr->r_type[0] =
-      ((r_extern? RELOC_EXT_BITS_EXTERN_BIG: 0)
-       | (r_type << RELOC_EXT_BITS_TYPE_SH_BIG));
-  } else {
-    natptr->r_index[2] = r_index >> 16;
-    natptr->r_index[1] = r_index >> 8;
-    natptr->r_index[0] = r_index;
-    natptr->r_type[0] =
-     (r_extern? RELOC_EXT_BITS_EXTERN_LITTLE: 0)
-      | (r_type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
-  }
-
-  PUT_WORD (abfd, r_addend, natptr->r_addend);
-}
-
-/* BFD deals internally with all things based from the section they're
-   in. so, something in 10 bytes into a text section  with a base of
-   50 would have a symbol (.text+10) and know .text vma was 50.
-
-   Aout keeps all it's symbols based from zero, so the symbol would
-   contain 60. This macro subs the base of each section from the value
-   to give the true offset from the section */
-
-
-#define MOVE_ADDRESS(ad)       						\
-  if (r_extern) {							\
-   /* undefined symbol */						\
-     cache_ptr->sym_ptr_ptr = symbols + r_index;			\
-     cache_ptr->addend = ad;						\
-     } else {								\
-    /* defined, section relative. replace symbol with pointer to    	\
-       symbol which points to section  */				\
-    switch (r_index) {							\
-    case N_TEXT:							\
-    case N_TEXT | N_EXT:						\
-      cache_ptr->sym_ptr_ptr  = obj_textsec(abfd)->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad  - su->textsec->vma;			\
-      break;								\
-    case N_DATA:							\
-    case N_DATA | N_EXT:						\
-      cache_ptr->sym_ptr_ptr  = obj_datasec(abfd)->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad - su->datasec->vma;			\
-      break;								\
-    case N_BSS:								\
-    case N_BSS | N_EXT:							\
-      cache_ptr->sym_ptr_ptr  = obj_bsssec(abfd)->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad - su->bsssec->vma;				\
-      break;								\
-    default:								\
-    case N_ABS:								\
-    case N_ABS | N_EXT:							\
-     cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad;						\
-      break;								\
-    }									\
-  }     								\
-
-void
-NAME(aout,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_ext_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
-{
-  unsigned int r_index;
-  int r_extern;
-  unsigned int r_type;
-  struct aoutdata *su = &(abfd->tdata.aout_data->a);
-
-  cache_ptr->address = (GET_SWORD (abfd, bytes->r_address));
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd)) {
-    r_index =  (bytes->r_index[0] << 16)
-	     | (bytes->r_index[1] << 8)
-	     |  bytes->r_index[2];
-    r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
-    r_type   =       (bytes->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
-				      >> RELOC_EXT_BITS_TYPE_SH_BIG;
-  } else {
-    r_index =  (bytes->r_index[2] << 16)
-	     | (bytes->r_index[1] << 8)
-	     |  bytes->r_index[0];
-    r_extern = (0 != (bytes->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
-    r_type   =       (bytes->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
-				      >> RELOC_EXT_BITS_TYPE_SH_LITTLE;
-  }
-
-  cache_ptr->howto =  howto_table_ext + r_type;
-
-  /* Base relative relocs are always against the symbol table,
-     regardless of the setting of r_extern.  r_extern just reflects
-     whether the symbol the reloc is against is local or global.  */
-  if (r_type == RELOC_BASE10
-      || r_type == RELOC_BASE13
-      || r_type == RELOC_BASE22)
-    r_extern = 1;
-
-  if (r_extern && r_index > symcount)
-    {
-      /* We could arrange to return an error, but it might be useful
-         to see the file even if it is bad.  */
-      r_extern = 0;
-      r_index = N_ABS;
-    }
-
-  MOVE_ADDRESS(GET_SWORD(abfd, bytes->r_addend));
-}
-
-void
-NAME(aout,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_std_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
-{
-  unsigned int r_index;
-  int r_extern;
-  unsigned int r_length;
-  int r_pcrel;
-  int r_baserel, r_jmptable, r_relative;
-  struct aoutdata  *su = &(abfd->tdata.aout_data->a);
-  unsigned int howto_idx;
-
-  cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd)) {
-    r_index =  (bytes->r_index[0] << 16)
-      | (bytes->r_index[1] << 8)
-	|  bytes->r_index[2];
-    r_extern  = (0 != (bytes->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
-    r_pcrel   = (0 != (bytes->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
-    r_baserel = (0 != (bytes->r_type[0] & RELOC_STD_BITS_BASEREL_BIG));
-    r_jmptable= (0 != (bytes->r_type[0] & RELOC_STD_BITS_JMPTABLE_BIG));
-    r_relative= (0 != (bytes->r_type[0] & RELOC_STD_BITS_RELATIVE_BIG));
-    r_length  =       (bytes->r_type[0] & RELOC_STD_BITS_LENGTH_BIG)
-      			>> RELOC_STD_BITS_LENGTH_SH_BIG;
-  } else {
-    r_index =  (bytes->r_index[2] << 16)
-      | (bytes->r_index[1] << 8)
-	|  bytes->r_index[0];
-    r_extern  = (0 != (bytes->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
-    r_pcrel   = (0 != (bytes->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
-    r_baserel = (0 != (bytes->r_type[0] & RELOC_STD_BITS_BASEREL_LITTLE));
-    r_jmptable= (0 != (bytes->r_type[0] & RELOC_STD_BITS_JMPTABLE_LITTLE));
-    r_relative= (0 != (bytes->r_type[0] & RELOC_STD_BITS_RELATIVE_LITTLE));
-    r_length  =       (bytes->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
-      			>> RELOC_STD_BITS_LENGTH_SH_LITTLE;
-  }
-
-  howto_idx = r_length + 4 * r_pcrel + 8 * r_baserel
-	      + 16 * r_jmptable + 32 * r_relative;
-  BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_std));
-  cache_ptr->howto =  howto_table_std + howto_idx;
-  BFD_ASSERT (cache_ptr->howto->type != (unsigned int) -1);
-
-  /* Base relative relocs are always against the symbol table,
-     regardless of the setting of r_extern.  r_extern just reflects
-     whether the symbol the reloc is against is local or global.  */
-  if (r_baserel)
-    r_extern = 1;
-
-  if (r_extern && r_index > symcount)
-    {
-      /* We could arrange to return an error, but it might be useful
-         to see the file even if it is bad.  */
-      r_extern = 0;
-      r_index = N_ABS;
-    }
-
-  MOVE_ADDRESS(0);
-}
-
-/* Read and swap the relocs for a section.  */
-
-boolean
-NAME(aout,slurp_reloc_table) (abfd, asect, symbols)
-     bfd *abfd;
-     sec_ptr asect;
-     asymbol **symbols;
-{
-  unsigned int count;
-  bfd_size_type reloc_size;
-  PTR relocs;
-  arelent *reloc_cache;
-  size_t each_size;
-  unsigned int counter = 0;
-  arelent *cache_ptr;
-
-  if (asect->relocation)
-    return true;
-
-  if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
-
-  if (asect == obj_datasec (abfd))
-    reloc_size = exec_hdr(abfd)->a_drsize;
-  else if (asect == obj_textsec (abfd))
-    reloc_size = exec_hdr(abfd)->a_trsize;
-  else if (asect == obj_bsssec (abfd))
-    reloc_size = 0;
-  else
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
-
-  each_size = obj_reloc_entry_size (abfd);
-
-  count = reloc_size / each_size;
-
-  reloc_cache = (arelent *) bfd_malloc ((size_t) (count * sizeof (arelent)));
-  if (reloc_cache == NULL && count != 0)
-    return false;
-  memset (reloc_cache, 0, count * sizeof (arelent));
-
-  relocs = bfd_malloc ((size_t) reloc_size);
-  if (relocs == NULL && reloc_size != 0)
-    {
-      free (reloc_cache);
-      return false;
-    }
-
-  if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size)
-    {
-      free (relocs);
-      free (reloc_cache);
-      return false;
-    }
-
-  cache_ptr = reloc_cache;
-  if (each_size == RELOC_EXT_SIZE)
-    {
-      register struct reloc_ext_external *rptr =
-	(struct reloc_ext_external *) relocs;
-
-      for (; counter < count; counter++, rptr++, cache_ptr++)
-	NAME(aout,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols,
-				      bfd_get_symcount (abfd));
-    }
-  else
-    {
-      register struct reloc_std_external *rptr =
-	(struct reloc_std_external *) relocs;
-
-      for (; counter < count; counter++, rptr++, cache_ptr++)
-	MY_swap_std_reloc_in (abfd, rptr, cache_ptr, symbols,
-			      bfd_get_symcount (abfd));
-    }
-
-  free (relocs);
-
-  asect->relocation = reloc_cache;
-  asect->reloc_count = cache_ptr - reloc_cache;
-
-  return true;
-}
-
-/* Write out a relocation section into an object file.  */
-
-boolean
-NAME(aout,squirt_out_relocs) (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  arelent **generic;
-  unsigned char *native, *natptr;
-  size_t each_size;
-
-  unsigned int count = section->reloc_count;
-  size_t natsize;
-
-  if (count == 0 || section->orelocation == NULL)
-    return true;
-
-  each_size = obj_reloc_entry_size (abfd);
-  natsize = each_size * count;
-  native = (unsigned char *) bfd_zalloc (abfd, natsize);
-  if (!native)
-    return false;
-
-  generic = section->orelocation;
-
-  if (each_size == RELOC_EXT_SIZE)
-    {
-      for (natptr = native;
-	   count != 0;
-	   --count, natptr += each_size, ++generic)
-	NAME(aout,swap_ext_reloc_out) (abfd, *generic, (struct reloc_ext_external *)natptr);
-    }
-  else
-    {
-      for (natptr = native;
-	   count != 0;
-	   --count, natptr += each_size, ++generic)
-	MY_swap_std_reloc_out(abfd, *generic, (struct reloc_std_external *)natptr);
-    }
-
-  if ( bfd_write ((PTR) native, 1, natsize, abfd) != natsize) {
-    bfd_release(abfd, native);
-    return false;
-  }
-  bfd_release (abfd, native);
-
-  return true;
-}
-
-/* This is stupid.  This function should be a boolean predicate */
-long
-NAME(aout,canonicalize_reloc) (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count;
-
-  if (section == obj_bsssec (abfd))
-    {
-      *relptr = NULL;
-      return 0;
-    }
-
-  if (!(tblptr || NAME(aout,slurp_reloc_table)(abfd, section, symbols)))
-    return -1;
-
-  if (section->flags & SEC_CONSTRUCTOR) {
-    arelent_chain *chain = section->constructor_chain;
-    for (count = 0; count < section->reloc_count; count ++) {
-      *relptr ++ = &chain->relent;
-      chain = chain->next;
-    }
-  }
-  else {
-    tblptr = section->relocation;
-
-    for (count = 0; count++ < section->reloc_count;)
-      {
-	*relptr++ = tblptr++;
-      }
-  }
-  *relptr = 0;
-
-  return section->reloc_count;
-}
-
-long
-NAME(aout,get_reloc_upper_bound) (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  if (bfd_get_format (abfd) != bfd_object) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return -1;
-  }
-  if (asect->flags & SEC_CONSTRUCTOR) {
-    return (sizeof (arelent *) * (asect->reloc_count+1));
-  }
-
-  if (asect == obj_datasec (abfd))
-    return (sizeof (arelent *)
-	    * ((exec_hdr(abfd)->a_drsize / obj_reloc_entry_size (abfd))
-	       + 1));
-
-  if (asect == obj_textsec (abfd))
-    return (sizeof (arelent *)
-	    * ((exec_hdr(abfd)->a_trsize / obj_reloc_entry_size (abfd))
-	       + 1));
-
-  if (asect == obj_bsssec (abfd))
-    return sizeof (arelent *);
-
-  if (asect == obj_bsssec (abfd))
-    return 0;
-
-  bfd_set_error (bfd_error_invalid_operation);
-  return -1;
-}
-
-
-long
-NAME(aout,get_symtab_upper_bound) (abfd)
-     bfd *abfd;
-{
-  if (!NAME(aout,slurp_symbol_table)(abfd))
-    return -1;
-
-  return (bfd_get_symcount (abfd)+1) * (sizeof (aout_symbol_type *));
-}
-
-/*ARGSUSED*/
- alent *
-NAME(aout,get_lineno) (ignore_abfd, ignore_symbol)
-     bfd *ignore_abfd;
-     asymbol *ignore_symbol;
-{
-return (alent *)NULL;
-}
-
-/*ARGSUSED*/
-void
-NAME(aout,get_symbol_info) (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-
-  if (ret->type == '?')
-    {
-      int type_code = aout_symbol(symbol)->type & 0xff;
-      const char *stab_name = bfd_get_stab_name (type_code);
-      static char buf[10];
-
-      if (stab_name == NULL)
-	{
-	  sprintf(buf, "(%d)", type_code);
-	  stab_name = buf;
-	}
-      ret->type = '-';
-      ret->stab_type = type_code;
-      ret->stab_other = (unsigned)(aout_symbol(symbol)->other & 0xff);
-      ret->stab_desc = (unsigned)(aout_symbol(symbol)->desc & 0xffff);
-      ret->stab_name = stab_name;
-    }
-}
-
-/*ARGSUSED*/
-void
-NAME(aout,print_symbol) (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *)afile;
-
-  switch (how) {
-  case bfd_print_symbol_name:
-    if (symbol->name)
-      fprintf(file,"%s", symbol->name);
-    break;
-  case bfd_print_symbol_more:
-    fprintf(file,"%4x %2x %2x",(unsigned)(aout_symbol(symbol)->desc & 0xffff),
-	    (unsigned)(aout_symbol(symbol)->other & 0xff),
-	    (unsigned)(aout_symbol(symbol)->type));
-    break;
-  case bfd_print_symbol_all:
-    {
-   CONST char *section_name = symbol->section->name;
-
-
-      bfd_print_symbol_vandf((PTR)file,symbol);
-
-      fprintf(file," %-5s %04x %02x %02x",
-	      section_name,
-	      (unsigned)(aout_symbol(symbol)->desc & 0xffff),
-	      (unsigned)(aout_symbol(symbol)->other & 0xff),
-	      (unsigned)(aout_symbol(symbol)->type  & 0xff));
-      if (symbol->name)
-        fprintf(file," %s", symbol->name);
-    }
-    break;
-  }
-}
-
-/* If we don't have to allocate more than 1MB to hold the generic
-   symbols, we use the generic minisymbol methord: it's faster, since
-   it only translates the symbols once, not multiple times.  */
-#define MINISYM_THRESHOLD (1000000 / sizeof (asymbol))
-
-/* Read minisymbols.  For minisymbols, we use the unmodified a.out
-   symbols.  The minisymbol_to_symbol function translates these into
-   BFD asymbol structures.  */
-
-long
-NAME(aout,read_minisymbols) (abfd, dynamic, minisymsp, sizep)
-     bfd *abfd;
-     boolean dynamic;
-     PTR *minisymsp;
-     unsigned int *sizep;
-{
-  if (dynamic)
-    {
-      /* We could handle the dynamic symbols here as well, but it's
-         easier to hand them off.  */
-      return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
-    }
-
-  if (! aout_get_external_symbols (abfd))
-    return -1;
-
-  if (obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
-    return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
-
-  *minisymsp = (PTR) obj_aout_external_syms (abfd);
-
-  /* By passing the external symbols back from this routine, we are
-     giving up control over the memory block.  Clear
-     obj_aout_external_syms, so that we do not try to free it
-     ourselves.  */
-  obj_aout_external_syms (abfd) = NULL;
-
-  *sizep = EXTERNAL_NLIST_SIZE;
-  return obj_aout_external_sym_count (abfd);
-}
-
-/* Convert a minisymbol to a BFD asymbol.  A minisymbol is just an
-   unmodified a.out symbol.  The SYM argument is a structure returned
-   by bfd_make_empty_symbol, which we fill in here.  */
-
-asymbol *
-NAME(aout,minisymbol_to_symbol) (abfd, dynamic, minisym, sym)
-     bfd *abfd;
-     boolean dynamic;
-     const PTR minisym;
-     asymbol *sym;
-{
-  if (dynamic
-      || obj_aout_external_sym_count (abfd) < MINISYM_THRESHOLD)
-    return _bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym);
-
-  memset (sym, 0, sizeof (aout_symbol_type));
-
-  /* We call translate_symbol_table to translate a single symbol.  */
-  if (! (NAME(aout,translate_symbol_table)
-	 (abfd,
-	  (aout_symbol_type *) sym,
-	  (struct external_nlist *) minisym,
-	  (bfd_size_type) 1,
-	  obj_aout_external_strings (abfd),
-	  obj_aout_external_string_size (abfd),
-	  false)))
-    return NULL;
-
-  return sym;
-}
-
-/*
- provided a BFD, a section and an offset into the section, calculate
- and return the name of the source file and the line nearest to the
- wanted location.
-*/
-
-boolean
-NAME(aout,find_nearest_line)
-     (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     CONST char **filename_ptr;
-     CONST char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  /* Run down the file looking for the filename, function and linenumber */
-  asymbol **p;
-  CONST char *directory_name = NULL;
-  CONST char *main_file_name = NULL;
-  CONST char *current_file_name = NULL;
-  CONST char *line_file_name = NULL; /* Value of current_file_name at line number. */
-  CONST char *line_directory_name = NULL; /* Value of directory_name at line number. */
-  bfd_vma low_line_vma = 0;
-  bfd_vma low_func_vma = 0;
-  asymbol *func = 0;
-  size_t filelen, funclen;
-  char *buf;
-
-  *filename_ptr = abfd->filename;
-  *functionname_ptr = 0;
-  *line_ptr = 0;
-  if (symbols != (asymbol **)NULL) {
-    for (p = symbols; *p; p++) {
-      aout_symbol_type  *q = (aout_symbol_type *)(*p);
-    next:
-      switch (q->type){
-      case N_TEXT:
-	/* If this looks like a file name symbol, and it comes after
-           the line number we have found so far, but before the
-           offset, then we have probably not found the right line
-           number.  */
-	if (q->symbol.value <= offset
-	    && ((q->symbol.value > low_line_vma
-		 && (line_file_name != NULL
-		     || *line_ptr != 0))
-		|| (q->symbol.value > low_func_vma
-		    && func != NULL)))
-	  {
-	    const char *symname;
-
-	    symname = q->symbol.name;
-	    if (strcmp (symname + strlen (symname) - 2, ".o") == 0)
-	      {
-		if (q->symbol.value > low_line_vma)
-		  {
-		    *line_ptr = 0;
-		    line_file_name = NULL;
-		  }
-		if (q->symbol.value > low_func_vma)
-		  func = NULL;
-	      }
-	  }
-	break;
-
-      case N_SO:
-	/* If this symbol is less than the offset, but greater than
-           the line number we have found so far, then we have not
-           found the right line number.  */
-	if (q->symbol.value <= offset)
-	  {
-	    if (q->symbol.value > low_line_vma)
-	      {
-		*line_ptr = 0;
-		line_file_name = NULL;
-	      }
-	    if (q->symbol.value > low_func_vma)
-	      func = NULL;
-	  }
-
-	main_file_name = current_file_name = q->symbol.name;
-	/* Look ahead to next symbol to check if that too is an N_SO. */
-	p++;
-	if (*p == NULL)
-	  break;
-	q = (aout_symbol_type *)(*p);
-	if (q->type != (int)N_SO)
-	  goto next;
-
-	/* Found a second N_SO  First is directory; second is filename. */
-	directory_name = current_file_name;
-	main_file_name = current_file_name = q->symbol.name;
-	if (obj_textsec(abfd) != section)
-	  goto done;
-	break;
-      case N_SOL:
-	current_file_name = q->symbol.name;
-	break;
-
-      case N_SLINE:
-
-      case N_DSLINE:
-      case N_BSLINE:
-	/* We'll keep this if it resolves nearer than the one we have
-           already.  */
-	if (q->symbol.value >= low_line_vma
-	    && q->symbol.value <= offset)
-	  {
-	    *line_ptr = q->desc;
-	    low_line_vma = q->symbol.value;
-	    line_file_name = current_file_name;
-	    line_directory_name = directory_name;
-	  }
-	break;
-      case N_FUN:
-	{
-	  /* We'll keep this if it is nearer than the one we have already */
-	  if (q->symbol.value >= low_func_vma &&
-	      q->symbol.value <= offset) {
-	    low_func_vma = q->symbol.value;
-	    func = (asymbol *)q;
-	  }
-	  else if (q->symbol.value > offset)
-	    goto done;
-	}
-	break;
-      }
-    }
-  }
-
- done:
-  if (*line_ptr != 0)
-    {
-      main_file_name = line_file_name;
-      directory_name = line_directory_name;
-    }
-
-  if (main_file_name == NULL
-      || main_file_name[0] == '/'
-      || directory_name == NULL)
-    filelen = 0;
-  else
-    filelen = strlen (directory_name) + strlen (main_file_name);
-  if (func == NULL)
-    funclen = 0;
-  else
-    funclen = strlen (bfd_asymbol_name (func));
-
-  if (adata (abfd).line_buf != NULL)
-    free (adata (abfd).line_buf);
-  if (filelen + funclen == 0)
-    adata (abfd).line_buf = buf = NULL;
-  else
-    {
-      buf = (char *) bfd_malloc (filelen + funclen + 3);
-      adata (abfd).line_buf = buf;
-      if (buf == NULL)
-	return false;
-    }
-
-  if (main_file_name != NULL)
-    {
-      if (main_file_name[0] == '/' || directory_name == NULL)
-	*filename_ptr = main_file_name;
-      else
-	{
-	  sprintf (buf, "%s%s", directory_name, main_file_name);
-	  *filename_ptr = buf;
-	  buf += filelen + 1;
-	}
-    }
-
-  if (func)
-    {
-      const char *function = func->name;
-      char *p;
-
-      /* The caller expects a symbol name.  We actually have a
-	 function name, without the leading underscore.  Put the
-	 underscore back in, so that the caller gets a symbol name.  */
-      if (bfd_get_symbol_leading_char (abfd) == '\0')
-	strcpy (buf, function);
-      else
-	{
-	  buf[0] = bfd_get_symbol_leading_char (abfd);
-	  strcpy (buf + 1, function);
-	}
-      /* Have to remove : stuff */
-      p = strchr (buf, ':');
-      if (p != NULL)
-	*p = '\0';
-      *functionname_ptr = buf;
-    }
-
-  return true;
-}
-
-/*ARGSUSED*/
-int
-NAME(aout,sizeof_headers) (abfd, execable)
-     bfd *abfd;
-     boolean execable;
-{
-  return adata(abfd).exec_bytes_size;
-}
-
-/* Free all information we have cached for this BFD.  We can always
-   read it again later if we need it.  */
-
-boolean
-NAME(aout,bfd_free_cached_info) (abfd)
-     bfd *abfd;
-{
-  asection *o;
-
-  if (bfd_get_format (abfd) != bfd_object)
-    return true;
-
-#define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }
-  BFCI_FREE (obj_aout_symbols (abfd));
-#ifdef USE_MMAP
-  obj_aout_external_syms (abfd) = 0;
-  bfd_free_window (&obj_aout_sym_window (abfd));
-  bfd_free_window (&obj_aout_string_window (abfd));
-  obj_aout_external_strings (abfd) = 0;
-#else
-  BFCI_FREE (obj_aout_external_syms (abfd));
-  BFCI_FREE (obj_aout_external_strings (abfd));
-#endif
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    BFCI_FREE (o->relocation);
-#undef BFCI_FREE
-
-  return true;
-}
-
-/* a.out link code.  */
-
-static boolean aout_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean aout_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean aout_link_free_symbols PARAMS ((bfd *));
-static boolean aout_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean aout_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Routine to create an entry in an a.out link hash table.  */
-
-struct bfd_hash_entry *
-NAME(aout,link_hash_newfunc) (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct aout_link_hash_entry *ret = (struct aout_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct aout_link_hash_entry *) NULL)
-    ret = ((struct aout_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct aout_link_hash_entry)));
-  if (ret == (struct aout_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct aout_link_hash_entry *)
-	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				 table, string));
-  if (ret)
-    {
-      /* Set local fields.  */
-      ret->written = false;
-      ret->indx = -1;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize an a.out link hash table.  */
-
-boolean
-NAME(aout,link_hash_table_init) (table, abfd, newfunc)
-     struct aout_link_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  return _bfd_link_hash_table_init (&table->root, abfd, newfunc);
-}
-
-/* Create an a.out link hash table.  */
-
-struct bfd_link_hash_table *
-NAME(aout,link_hash_table_create) (abfd)
-     bfd *abfd;
-{
-  struct aout_link_hash_table *ret;
-
-  ret = ((struct aout_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct aout_link_hash_table)));
-  if (ret == NULL)
-    return (struct bfd_link_hash_table *) NULL;
-  if (! NAME(aout,link_hash_table_init) (ret, abfd,
-					 NAME(aout,link_hash_newfunc)))
-    {
-      free (ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-  return &ret->root;
-}
-
-/* Given an a.out BFD, add symbols to the global hash table as
-   appropriate.  */
-
-boolean
-NAME(aout,link_add_symbols) (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      return aout_link_add_object_symbols (abfd, info);
-    case bfd_archive:
-      return _bfd_generic_link_add_archive_symbols
-	(abfd, info, aout_link_check_archive_element);
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-}
-
-/* Add symbols from an a.out object file.  */
-
-static boolean
-aout_link_add_object_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  if (! aout_get_external_symbols (abfd))
-    return false;
-  if (! aout_link_add_symbols (abfd, info))
-    return false;
-  if (! info->keep_memory)
-    {
-      if (! aout_link_free_symbols (abfd))
-	return false;
-    }
-  return true;
-}
-
-/* Check a single archive element to see if we need to include it in
-   the link.  *PNEEDED is set according to whether this element is
-   needed in the link or not.  This is called from
-   _bfd_generic_link_add_archive_symbols.  */
-
-static boolean
-aout_link_check_archive_element (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  if (! aout_get_external_symbols (abfd))
-    return false;
-
-  if (! aout_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
-
-  if (*pneeded)
-    {
-      if (! aout_link_add_symbols (abfd, info))
-	return false;
-    }
-
-  if (! info->keep_memory || ! *pneeded)
-    {
-      if (! aout_link_free_symbols (abfd))
-	return false;
-    }
-
-  return true;
-}
-
-/* Free up the internal symbols read from an a.out file.  */
-
-static boolean
-aout_link_free_symbols (abfd)
-     bfd *abfd;
-{
-  if (obj_aout_external_syms (abfd) != (struct external_nlist *) NULL)
-    {
-#ifdef USE_MMAP
-      bfd_free_window (&obj_aout_sym_window (abfd));
-#else
-      free ((PTR) obj_aout_external_syms (abfd));
-#endif
-      obj_aout_external_syms (abfd) = (struct external_nlist *) NULL;
-    }
-  if (obj_aout_external_strings (abfd) != (char *) NULL)
-    {
-#ifdef USE_MMAP
-      bfd_free_window (&obj_aout_string_window (abfd));
-#else
-      free ((PTR) obj_aout_external_strings (abfd));
-#endif
-      obj_aout_external_strings (abfd) = (char *) NULL;
-    }
-  return true;
-}
-
-/* Look through the internal symbols to see if this object file should
-   be included in the link.  We should include this object file if it
-   defines any symbols which are currently undefined.  If this object
-   file defines a common symbol, then we may adjust the size of the
-   known symbol but we do not include the object file in the link
-   (unless there is some other reason to include it).  */
-
-static boolean
-aout_link_check_ar_symbols (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  register struct external_nlist *p;
-  struct external_nlist *pend;
-  char *strings;
-
-  *pneeded = false;
-
-  /* Look through all the symbols.  */
-  p = obj_aout_external_syms (abfd);
-  pend = p + obj_aout_external_sym_count (abfd);
-  strings = obj_aout_external_strings (abfd);
-  for (; p < pend; p++)
-    {
-      int type = bfd_h_get_8 (abfd, p->e_type);
-      const char *name;
-      struct bfd_link_hash_entry *h;
-
-      /* Ignore symbols that are not externally visible.  This is an
-	 optimization only, as we check the type more thoroughly
-	 below.  */
-      if (((type & N_EXT) == 0
-	   || (type & N_STAB) != 0
-	   || type == N_FN)
-	  && type != N_WEAKA
-	  && type != N_WEAKT
-	  && type != N_WEAKD
-	  && type != N_WEAKB)
-	{
-	  if (type == N_WARNING
-	      || type == N_INDR)
-	    ++p;
-	  continue;
-	}
-
-      name = strings + GET_WORD (abfd, p->e_strx);
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
-
-      /* We are only interested in symbols that are currently
-	 undefined or common.  */
-      if (h == (struct bfd_link_hash_entry *) NULL
-	  || (h->type != bfd_link_hash_undefined
-	      && h->type != bfd_link_hash_common))
-	{
-	  if (type == (N_INDR | N_EXT))
-	    ++p;
-	  continue;
-	}
-
-      if (type == (N_TEXT | N_EXT)
-	  || type == (N_DATA | N_EXT)
-	  || type == (N_BSS | N_EXT)
-	  || type == (N_ABS | N_EXT)
-	  || type == (N_INDR | N_EXT))
-	{
-	  /* This object file defines this symbol.  We must link it
-	     in.  This is true regardless of whether the current
-	     definition of the symbol is undefined or common.  If the
-	     current definition is common, we have a case in which we
-	     have already seen an object file including
-	         int a;
-	     and this object file from the archive includes
-	         int a = 5;
-	     In such a case we must include this object file.
-
-	     FIXME: The SunOS 4.1.3 linker will pull in the archive
-	     element if the symbol is defined in the .data section,
-	     but not if it is defined in the .text section.  That
-	     seems a bit crazy to me, and I haven't implemented it.
-	     However, it might be correct.  */
-	  if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-	    return false;
-	  *pneeded = true;
-	  return true;
-	}
-
-      if (type == (N_UNDF | N_EXT))
-	{
-	  bfd_vma value;
-
-	  value = GET_WORD (abfd, p->e_value);
-	  if (value != 0)
-	    {
-	      /* This symbol is common in the object from the archive
-		 file.  */
-	      if (h->type == bfd_link_hash_undefined)
-		{
-		  bfd *symbfd;
-		  unsigned int power;
-
-		  symbfd = h->u.undef.abfd;
-		  if (symbfd == (bfd *) NULL)
-		    {
-		      /* This symbol was created as undefined from
-			 outside BFD.  We assume that we should link
-			 in the object file.  This is done for the -u
-			 option in the linker.  */
-		      if (! (*info->callbacks->add_archive_element) (info,
-								     abfd,
-								     name))
-			return false;
-		      *pneeded = true;
-		      return true;
-		    }
-		  /* Turn the current link symbol into a common
-		     symbol.  It is already on the undefs list.  */
-		  h->type = bfd_link_hash_common;
-		  h->u.c.p = ((struct bfd_link_hash_common_entry *)
-			      bfd_hash_allocate (&info->hash->table,
-				  sizeof (struct bfd_link_hash_common_entry)));
-		  if (h->u.c.p == NULL)
-		    return false;
-
-		  h->u.c.size = value;
-
-		  /* FIXME: This isn't quite right.  The maximum
-		     alignment of a common symbol should be set by the
-		     architecture of the output file, not of the input
-		     file.  */
-		  power = bfd_log2 (value);
-		  if (power > bfd_get_arch_info (abfd)->section_align_power)
-		    power = bfd_get_arch_info (abfd)->section_align_power;
-		  h->u.c.p->alignment_power = power;
-
-		  h->u.c.p->section = bfd_make_section_old_way (symbfd,
-								"COMMON");
-		}
-	      else
-		{
-		  /* Adjust the size of the common symbol if
-		     necessary.  */
-		  if (value > h->u.c.size)
-		    h->u.c.size = value;
-		}
-	    }
-	}
-
-      if (type == N_WEAKA
-	  || type == N_WEAKT
-	  || type == N_WEAKD
-	  || type == N_WEAKB)
-	{
-	  /* This symbol is weak but defined.  We must pull it in if
-	     the current link symbol is undefined, but we don't want
-	     it if the current link symbol is common.  */
-	  if (h->type == bfd_link_hash_undefined)
-	    {
-	      if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-		return false;
-	      *pneeded = true;
-	      return true;
-	    }
-	}
-    }
-
-  /* We do not need this object file.  */
-  return true;
-}
-
-/* Add all symbols from an object file to the hash table.  */
-
-static boolean
-aout_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  boolean (*add_one_symbol) PARAMS ((struct bfd_link_info *, bfd *,
-				     const char *, flagword, asection *,
-				     bfd_vma, const char *, boolean,
-				     boolean,
-				     struct bfd_link_hash_entry **));
-  struct external_nlist *syms;
-  bfd_size_type sym_count;
-  char *strings;
-  boolean copy;
-  struct aout_link_hash_entry **sym_hash;
-  register struct external_nlist *p;
-  struct external_nlist *pend;
-
-  syms = obj_aout_external_syms (abfd);
-  sym_count = obj_aout_external_sym_count (abfd);
-  strings = obj_aout_external_strings (abfd);
-  if (info->keep_memory)
-    copy = false;
-  else
-    copy = true;
-
-  if (aout_backend_info (abfd)->add_dynamic_symbols != NULL)
-    {
-      if (! ((*aout_backend_info (abfd)->add_dynamic_symbols)
-	     (abfd, info, &syms, &sym_count, &strings)))
-	return false;
-    }
-
-  /* We keep a list of the linker hash table entries that correspond
-     to particular symbols.  We could just look them up in the hash
-     table, but keeping the list is more efficient.  Perhaps this
-     should be conditional on info->keep_memory.  */
-  sym_hash = ((struct aout_link_hash_entry **)
-	      bfd_alloc (abfd,
-			 ((size_t) sym_count
-			  * sizeof (struct aout_link_hash_entry *))));
-  if (sym_hash == NULL && sym_count != 0)
-    return false;
-  obj_aout_sym_hashes (abfd) = sym_hash;
-
-  add_one_symbol = aout_backend_info (abfd)->add_one_symbol;
-  if (add_one_symbol == NULL)
-    add_one_symbol = _bfd_generic_link_add_one_symbol;
-
-  p = syms;
-  pend = p + sym_count;
-  for (; p < pend; p++, sym_hash++)
-    {
-      int type;
-      const char *name;
-      bfd_vma value;
-      asection *section;
-      flagword flags;
-      const char *string;
-
-      *sym_hash = NULL;
-
-      type = bfd_h_get_8 (abfd, p->e_type);
-
-      /* Ignore debugging symbols.  */
-      if ((type & N_STAB) != 0)
-	continue;
-
-      name = strings + GET_WORD (abfd, p->e_strx);
-      value = GET_WORD (abfd, p->e_value);
-      flags = BSF_GLOBAL;
-      string = NULL;
-      switch (type)
-	{
-	default:
-	  abort ();
-
-	case N_UNDF:
-	case N_ABS:
-	case N_TEXT:
-	case N_DATA:
-	case N_BSS:
-	case N_FN_SEQ:
-	case N_COMM:
-	case N_SETV:
-	case N_FN:
-	  /* Ignore symbols that are not externally visible.  */
-	  continue;
-	case N_INDR:
-	  /* Ignore local indirect symbol.  */
-	  ++p;
-	  ++sym_hash;
-	  continue;
-
-	case N_UNDF | N_EXT:
-	  if (value == 0)
-	    {
-	      section = bfd_und_section_ptr;
-	      flags = 0;
-	    }
-	  else
-	    section = bfd_com_section_ptr;
-	  break;
-	case N_ABS | N_EXT:
-	  section = bfd_abs_section_ptr;
-	  break;
-	case N_TEXT | N_EXT:
-	  section = obj_textsec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_DATA | N_EXT:
-	case N_SETV | N_EXT:
-	  /* Treat N_SETV symbols as N_DATA symbol; see comment in
-	     translate_from_native_sym_flags.  */
-	  section = obj_datasec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_BSS | N_EXT:
-	  section = obj_bsssec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_INDR | N_EXT:
-	  /* An indirect symbol.  The next symbol is the symbol
-	     which this one really is.  */
-	  BFD_ASSERT (p + 1 < pend);
-	  ++p;
-	  string = strings + GET_WORD (abfd, p->e_strx);
-	  section = bfd_ind_section_ptr;
-	  flags |= BSF_INDIRECT;
-	  break;
-	case N_COMM | N_EXT:
-	  section = bfd_com_section_ptr;
-	  break;
-	case N_SETA: case N_SETA | N_EXT:
-	  section = bfd_abs_section_ptr;
-	  flags |= BSF_CONSTRUCTOR;
-	  break;
-	case N_SETT: case N_SETT | N_EXT:
-	  section = obj_textsec (abfd);
-	  flags |= BSF_CONSTRUCTOR;
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_SETD: case N_SETD | N_EXT:
-	  section = obj_datasec (abfd);
-	  flags |= BSF_CONSTRUCTOR;
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_SETB: case N_SETB | N_EXT:
-	  section = obj_bsssec (abfd);
-	  flags |= BSF_CONSTRUCTOR;
-	  value -= bfd_get_section_vma (abfd, section);
-	  break;
-	case N_WARNING:
-	  /* A warning symbol.  The next symbol is the one to warn
-	     about.  */
-	  BFD_ASSERT (p + 1 < pend);
-	  ++p;
-	  string = name;
-	  name = strings + GET_WORD (abfd, p->e_strx);
-	  section = bfd_und_section_ptr;
-	  flags |= BSF_WARNING;
-	  break;
-	case N_WEAKU:
-	  section = bfd_und_section_ptr;
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKA:
-	  section = bfd_abs_section_ptr;
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKT:
-	  section = obj_textsec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKD:
-	  section = obj_datasec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  flags = BSF_WEAK;
-	  break;
-	case N_WEAKB:
-	  section = obj_bsssec (abfd);
-	  value -= bfd_get_section_vma (abfd, section);
-	  flags = BSF_WEAK;
-	  break;
-	}
-
-      if (! ((*add_one_symbol)
-	     (info, abfd, name, flags, section, value, string, copy, false,
-	      (struct bfd_link_hash_entry **) sym_hash)))
-	return false;
-
-      /* Restrict the maximum alignment of a common symbol based on
-	 the architecture, since a.out has no way to represent
-	 alignment requirements of a section in a .o file.  FIXME:
-	 This isn't quite right: it should use the architecture of the
-	 output file, not the input files.  */
-      if ((*sym_hash)->root.type == bfd_link_hash_common
-	  && ((*sym_hash)->root.u.c.p->alignment_power >
-	      bfd_get_arch_info (abfd)->section_align_power))
-	(*sym_hash)->root.u.c.p->alignment_power =
-	  bfd_get_arch_info (abfd)->section_align_power;
-
-      /* If this is a set symbol, and we are not building sets, then
-	 it is possible for the hash entry to not have been set.  In
-	 such a case, treat the symbol as not globally defined.  */
-      if ((*sym_hash)->root.type == bfd_link_hash_new)
-	{
-	  BFD_ASSERT ((flags & BSF_CONSTRUCTOR) != 0);
-	  *sym_hash = NULL;
-	}
-
-      if (type == (N_INDR | N_EXT) || type == N_WARNING)
-	++sym_hash;
-    }
-
-  return true;
-}
-
-/* A hash table used for header files with N_BINCL entries.  */
-
-struct aout_link_includes_table
-{
-  struct bfd_hash_table root;
-};
-
-/* A linked list of totals that we have found for a particular header
-   file.  */
-
-struct aout_link_includes_totals
-{
-  struct aout_link_includes_totals *next;
-  bfd_vma total;
-};
-
-/* An entry in the header file hash table.  */
-
-struct aout_link_includes_entry
-{
-  struct bfd_hash_entry root;
-  /* List of totals we have found for this file.  */
-  struct aout_link_includes_totals *totals;
-};
-
-/* Look up an entry in an the header file hash table.  */
-
-#define aout_link_includes_lookup(table, string, create, copy) \
-  ((struct aout_link_includes_entry *) \
-   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-
-/* During the final link step we need to pass around a bunch of
-   information, so we do it in an instance of this structure.  */
-
-struct aout_final_link_info
-{
-  /* General link information.  */
-  struct bfd_link_info *info;
-  /* Output bfd.  */
-  bfd *output_bfd;
-  /* Reloc file positions.  */
-  file_ptr treloff, dreloff;
-  /* File position of symbols.  */
-  file_ptr symoff;
-  /* String table.  */
-  struct bfd_strtab_hash *strtab;
-  /* Header file hash table.  */
-  struct aout_link_includes_table includes;
-  /* A buffer large enough to hold the contents of any section.  */
-  bfd_byte *contents;
-  /* A buffer large enough to hold the relocs of any section.  */
-  PTR relocs;
-  /* A buffer large enough to hold the symbol map of any input BFD.  */
-  int *symbol_map;
-  /* A buffer large enough to hold output symbols of any input BFD.  */
-  struct external_nlist *output_syms;
-};
-
-static struct bfd_hash_entry *aout_link_includes_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean aout_link_input_bfd
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static boolean aout_link_write_symbols
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd));
-static boolean aout_link_write_other_symbol
-  PARAMS ((struct aout_link_hash_entry *, PTR));
-static boolean aout_link_input_section
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
-	   asection *input_section, file_ptr *reloff_ptr,
-	   bfd_size_type rel_size));
-static boolean aout_link_input_section_std
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
-	   asection *input_section, struct reloc_std_external *,
-	   bfd_size_type rel_size, bfd_byte *contents));
-static boolean aout_link_input_section_ext
-  PARAMS ((struct aout_final_link_info *, bfd *input_bfd,
-	   asection *input_section, struct reloc_ext_external *,
-	   bfd_size_type rel_size, bfd_byte *contents));
-static INLINE asection *aout_reloc_index_to_section
-  PARAMS ((bfd *, int));
-static boolean aout_link_reloc_link_order
-  PARAMS ((struct aout_final_link_info *, asection *,
-	   struct bfd_link_order *));
-
-/* The function to create a new entry in the header file hash table.  */
-
-static struct bfd_hash_entry *
-aout_link_includes_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct aout_link_includes_entry *ret =
-    (struct aout_link_includes_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct aout_link_includes_entry *) NULL)
-    ret = ((struct aout_link_includes_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct aout_link_includes_entry)));
-  if (ret == (struct aout_link_includes_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct aout_link_includes_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-  if (ret)
-    {
-      /* Set local fields.  */
-      ret->totals = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Do the final link step.  This is called on the output BFD.  The
-   INFO structure should point to a list of BFDs linked through the
-   link_next field which can be used to find each BFD which takes part
-   in the output.  Also, each section in ABFD should point to a list
-   of bfd_link_order structures which list all the input sections for
-   the output section.  */
-
-boolean
-NAME(aout,final_link) (abfd, info, callback)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     void (*callback) PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-{
-  struct aout_final_link_info aout_info;
-  boolean includes_hash_initialized = false;
-  register bfd *sub;
-  bfd_size_type trsize, drsize;
-  size_t max_contents_size;
-  size_t max_relocs_size;
-  size_t max_sym_count;
-  bfd_size_type text_size;
-  file_ptr text_end;
-  register struct bfd_link_order *p;
-  asection *o;
-  boolean have_link_order_relocs;
-
-  if (info->shared)
-    abfd->flags |= DYNAMIC;
-
-  aout_info.info = info;
-  aout_info.output_bfd = abfd;
-  aout_info.contents = NULL;
-  aout_info.relocs = NULL;
-  aout_info.symbol_map = NULL;
-  aout_info.output_syms = NULL;
-
-  if (! bfd_hash_table_init_n (&aout_info.includes.root,
-			       aout_link_includes_newfunc,
-			       251))
-    goto error_return;
-  includes_hash_initialized = true;
-
-  /* Figure out the largest section size.  Also, if generating
-     relocateable output, count the relocs.  */
-  trsize = 0;
-  drsize = 0;
-  max_contents_size = 0;
-  max_relocs_size = 0;
-  max_sym_count = 0;
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      size_t sz;
-
-      if (info->relocateable)
-	{
-	  if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
-	    {
-	      trsize += exec_hdr (sub)->a_trsize;
-	      drsize += exec_hdr (sub)->a_drsize;
-	    }
-	  else
-	    {
-	      /* FIXME: We need to identify the .text and .data sections
-		 and call get_reloc_upper_bound and canonicalize_reloc to
-		 work out the number of relocs needed, and then multiply
-		 by the reloc size.  */
-	      (*_bfd_error_handler)
-		(_("%s: relocateable link from %s to %s not supported"),
-		 bfd_get_filename (abfd),
-		 sub->xvec->name, abfd->xvec->name);
-	      bfd_set_error (bfd_error_invalid_operation);
-	      goto error_return;
-	    }
-	}
-
-      if (bfd_get_flavour (sub) == bfd_target_aout_flavour)
-	{
-	  sz = bfd_section_size (sub, obj_textsec (sub));
-	  if (sz > max_contents_size)
-	    max_contents_size = sz;
-	  sz = bfd_section_size (sub, obj_datasec (sub));
-	  if (sz > max_contents_size)
-	    max_contents_size = sz;
-
-	  sz = exec_hdr (sub)->a_trsize;
-	  if (sz > max_relocs_size)
-	    max_relocs_size = sz;
-	  sz = exec_hdr (sub)->a_drsize;
-	  if (sz > max_relocs_size)
-	    max_relocs_size = sz;
-
-	  sz = obj_aout_external_sym_count (sub);
-	  if (sz > max_sym_count)
-	    max_sym_count = sz;
-	}
-    }
-
-  if (info->relocateable)
-    {
-      if (obj_textsec (abfd) != (asection *) NULL)
-	trsize += (_bfd_count_link_order_relocs (obj_textsec (abfd)
-						 ->link_order_head)
-		   * obj_reloc_entry_size (abfd));
-      if (obj_datasec (abfd) != (asection *) NULL)
-	drsize += (_bfd_count_link_order_relocs (obj_datasec (abfd)
-						 ->link_order_head)
-		   * obj_reloc_entry_size (abfd));
-    }
-
-  exec_hdr (abfd)->a_trsize = trsize;
-  exec_hdr (abfd)->a_drsize = drsize;
-
-  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
-
-  /* Adjust the section sizes and vmas according to the magic number.
-     This sets a_text, a_data and a_bss in the exec_hdr and sets the
-     filepos for each section.  */
-  if (! NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end))
-    goto error_return;
-
-  /* The relocation and symbol file positions differ among a.out
-     targets.  We are passed a callback routine from the backend
-     specific code to handle this.
-     FIXME: At this point we do not know how much space the symbol
-     table will require.  This will not work for any (nonstandard)
-     a.out target that needs to know the symbol table size before it
-     can compute the relocation file positions.  This may or may not
-     be the case for the hp300hpux target, for example.  */
-  (*callback) (abfd, &aout_info.treloff, &aout_info.dreloff,
-	       &aout_info.symoff);
-  obj_textsec (abfd)->rel_filepos = aout_info.treloff;
-  obj_datasec (abfd)->rel_filepos = aout_info.dreloff;
-  obj_sym_filepos (abfd) = aout_info.symoff;
-
-  /* We keep a count of the symbols as we output them.  */
-  obj_aout_external_sym_count (abfd) = 0;
-
-  /* We accumulate the string table as we write out the symbols.  */
-  aout_info.strtab = _bfd_stringtab_init ();
-  if (aout_info.strtab == NULL)
-    goto error_return;
-
-  /* Allocate buffers to hold section contents and relocs.  */
-  aout_info.contents = (bfd_byte *) bfd_malloc (max_contents_size);
-  aout_info.relocs = (PTR) bfd_malloc (max_relocs_size);
-  aout_info.symbol_map = (int *) bfd_malloc (max_sym_count * sizeof (int *));
-  aout_info.output_syms = ((struct external_nlist *)
-			   bfd_malloc ((max_sym_count + 1)
-				       * sizeof (struct external_nlist)));
-  if ((aout_info.contents == NULL && max_contents_size != 0)
-      || (aout_info.relocs == NULL && max_relocs_size != 0)
-      || (aout_info.symbol_map == NULL && max_sym_count != 0)
-      || aout_info.output_syms == NULL)
-    goto error_return;
-
-  /* If we have a symbol named __DYNAMIC, force it out now.  This is
-     required by SunOS.  Doing this here rather than in sunos.c is a
-     hack, but it's easier than exporting everything which would be
-     needed.  */
-  {
-    struct aout_link_hash_entry *h;
-
-    h = aout_link_hash_lookup (aout_hash_table (info), "__DYNAMIC",
-			       false, false, false);
-    if (h != NULL)
-      aout_link_write_other_symbol (h, &aout_info);
-  }
-
-  /* The most time efficient way to do the link would be to read all
-     the input object files into memory and then sort out the
-     information into the output file.  Unfortunately, that will
-     probably use too much memory.  Another method would be to step
-     through everything that composes the text section and write it
-     out, and then everything that composes the data section and write
-     it out, and then write out the relocs, and then write out the
-     symbols.  Unfortunately, that requires reading stuff from each
-     input file several times, and we will not be able to keep all the
-     input files open simultaneously, and reopening them will be slow.
-
-     What we do is basically process one input file at a time.  We do
-     everything we need to do with an input file once--copy over the
-     section contents, handle the relocation information, and write
-     out the symbols--and then we throw away the information we read
-     from it.  This approach requires a lot of lseeks of the output
-     file, which is unfortunate but still faster than reopening a lot
-     of files.
-
-     We use the output_has_begun field of the input BFDs to see
-     whether we have already handled it.  */
-  for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next)
-    sub->output_has_begun = false;
-
-  /* Mark all sections which are to be included in the link.  This
-     will normally be every section.  We need to do this so that we
-     can identify any sections which the linker has decided to not
-     include.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order)
-	    p->u.indirect.section->linker_mark = true;
-	}
-    }
-
-  have_link_order_relocs = false;
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    {
-      for (p = o->link_order_head;
-	   p != (struct bfd_link_order *) NULL;
-	   p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order
-	      && (bfd_get_flavour (p->u.indirect.section->owner)
-		  == bfd_target_aout_flavour))
-	    {
-	      bfd *input_bfd;
-
-	      input_bfd = p->u.indirect.section->owner;
-	      if (! input_bfd->output_has_begun)
-		{
-		  if (! aout_link_input_bfd (&aout_info, input_bfd))
-		    goto error_return;
-		  input_bfd->output_has_begun = true;
-		}
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    {
-	      /* These are handled below.  */
-	      have_link_order_relocs = true;
-	    }
-	  else
-	    {
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		goto error_return;
-	    }
-	}
-    }
-
-  /* Write out any symbols that we have not already written out.  */
-  aout_link_hash_traverse (aout_hash_table (info),
-			   aout_link_write_other_symbol,
-			   (PTR) &aout_info);
-
-  /* Now handle any relocs we were asked to create by the linker.
-     These did not come from any input file.  We must do these after
-     we have written out all the symbols, so that we know the symbol
-     indices to use.  */
-  if (have_link_order_relocs)
-    {
-      for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-	{
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      if (p->type == bfd_section_reloc_link_order
-		  || p->type == bfd_symbol_reloc_link_order)
-		{
-		  if (! aout_link_reloc_link_order (&aout_info, o, p))
-		    goto error_return;
-		}
-	    }
-	}
-    }
-
-  if (aout_info.contents != NULL)
-    {
-      free (aout_info.contents);
-      aout_info.contents = NULL;
-    }
-  if (aout_info.relocs != NULL)
-    {
-      free (aout_info.relocs);
-      aout_info.relocs = NULL;
-    }
-  if (aout_info.symbol_map != NULL)
-    {
-      free (aout_info.symbol_map);
-      aout_info.symbol_map = NULL;
-    }
-  if (aout_info.output_syms != NULL)
-    {
-      free (aout_info.output_syms);
-      aout_info.output_syms = NULL;
-    }
-  if (includes_hash_initialized)
-    {
-      bfd_hash_table_free (&aout_info.includes.root);
-      includes_hash_initialized = false;
-    }
-
-  /* Finish up any dynamic linking we may be doing.  */
-  if (aout_backend_info (abfd)->finish_dynamic_link != NULL)
-    {
-      if (! (*aout_backend_info (abfd)->finish_dynamic_link) (abfd, info))
-	goto error_return;
-    }
-
-  /* Update the header information.  */
-  abfd->symcount = obj_aout_external_sym_count (abfd);
-  exec_hdr (abfd)->a_syms = abfd->symcount * EXTERNAL_NLIST_SIZE;
-  obj_str_filepos (abfd) = obj_sym_filepos (abfd) + exec_hdr (abfd)->a_syms;
-  obj_textsec (abfd)->reloc_count =
-    exec_hdr (abfd)->a_trsize / obj_reloc_entry_size (abfd);
-  obj_datasec (abfd)->reloc_count =
-    exec_hdr (abfd)->a_drsize / obj_reloc_entry_size (abfd);
-
-  /* Write out the string table, unless there are no symbols.  */
-  if (abfd->symcount > 0)
-    {
-      if (bfd_seek (abfd, obj_str_filepos (abfd), SEEK_SET) != 0
-	  || ! emit_stringtab (abfd, aout_info.strtab))
-	goto error_return;
-    }
-  else if (obj_textsec (abfd)->reloc_count == 0
-	   && obj_datasec (abfd)->reloc_count == 0)
-    {
-      bfd_byte b;
-
-      b = 0;
-      if (bfd_seek (abfd,
-		    (obj_datasec (abfd)->filepos
-		     + exec_hdr (abfd)->a_data
-		     - 1),
-		    SEEK_SET) != 0
-	  || bfd_write (&b, 1, 1, abfd) != 1)
-	goto error_return;
-    }
-
-  return true;
-
- error_return:
-  if (aout_info.contents != NULL)
-    free (aout_info.contents);
-  if (aout_info.relocs != NULL)
-    free (aout_info.relocs);
-  if (aout_info.symbol_map != NULL)
-    free (aout_info.symbol_map);
-  if (aout_info.output_syms != NULL)
-    free (aout_info.output_syms);
-  if (includes_hash_initialized)
-    bfd_hash_table_free (&aout_info.includes.root);
-  return false;
-}
-
-/* Link an a.out input BFD into the output file.  */
-
-static boolean
-aout_link_input_bfd (finfo, input_bfd)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  bfd_size_type sym_count;
-
-  BFD_ASSERT (bfd_get_format (input_bfd) == bfd_object);
-
-  /* If this is a dynamic object, it may need special handling.  */
-  if ((input_bfd->flags & DYNAMIC) != 0
-      && aout_backend_info (input_bfd)->link_dynamic_object != NULL)
-    {
-      return ((*aout_backend_info (input_bfd)->link_dynamic_object)
-	      (finfo->info, input_bfd));
-    }
-
-  /* Get the symbols.  We probably have them already, unless
-     finfo->info->keep_memory is false.  */
-  if (! aout_get_external_symbols (input_bfd))
-    return false;
-
-  sym_count = obj_aout_external_sym_count (input_bfd);
-
-  /* Write out the symbols and get a map of the new indices.  The map
-     is placed into finfo->symbol_map.  */
-  if (! aout_link_write_symbols (finfo, input_bfd))
-    return false;
-
-  /* Relocate and write out the sections.  These functions use the
-     symbol map created by aout_link_write_symbols.  The linker_mark
-     field will be set if these sections are to be included in the
-     link, which will normally be the case.  */
-  if (obj_textsec (input_bfd)->linker_mark)
-    {
-      if (! aout_link_input_section (finfo, input_bfd,
-				     obj_textsec (input_bfd),
-				     &finfo->treloff,
-				     exec_hdr (input_bfd)->a_trsize))
-	return false;
-    }
-  if (obj_datasec (input_bfd)->linker_mark)
-    {
-      if (! aout_link_input_section (finfo, input_bfd,
-				     obj_datasec (input_bfd),
-				     &finfo->dreloff,
-				     exec_hdr (input_bfd)->a_drsize))
-	return false;
-    }
-
-  /* If we are not keeping memory, we don't need the symbols any
-     longer.  We still need them if we are keeping memory, because the
-     strings in the hash table point into them.  */
-  if (! finfo->info->keep_memory)
-    {
-      if (! aout_link_free_symbols (input_bfd))
-	return false;
-    }
-
-  return true;
-}
-
-/* Adjust and write out the symbols for an a.out file.  Set the new
-   symbol indices into a symbol_map.  */
-
-static boolean
-aout_link_write_symbols (finfo, input_bfd)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  bfd *output_bfd;
-  bfd_size_type sym_count;
-  char *strings;
-  enum bfd_link_strip strip;
-  enum bfd_link_discard discard;
-  struct external_nlist *outsym;
-  bfd_size_type strtab_index;
-  register struct external_nlist *sym;
-  struct external_nlist *sym_end;
-  struct aout_link_hash_entry **sym_hash;
-  int *symbol_map;
-  boolean pass;
-  boolean skip_next;
-
-  output_bfd = finfo->output_bfd;
-  sym_count = obj_aout_external_sym_count (input_bfd);
-  strings = obj_aout_external_strings (input_bfd);
-  strip = finfo->info->strip;
-  discard = finfo->info->discard;
-  outsym = finfo->output_syms;
-
-  /* First write out a symbol for this object file, unless we are
-     discarding such symbols.  */
-  if (strip != strip_all
-      && (strip != strip_some
-	  || bfd_hash_lookup (finfo->info->keep_hash, input_bfd->filename,
-			      false, false) != NULL)
-      && discard != discard_all)
-    {
-      bfd_h_put_8 (output_bfd, N_TEXT, outsym->e_type);
-      bfd_h_put_8 (output_bfd, 0, outsym->e_other);
-      bfd_h_put_16 (output_bfd, (bfd_vma) 0, outsym->e_desc);
-      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
-				       input_bfd->filename, false);
-      if (strtab_index == (bfd_size_type) -1)
-	return false;
-      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
-      PUT_WORD (output_bfd,
-		(bfd_get_section_vma (output_bfd,
-				      obj_textsec (input_bfd)->output_section)
-		 + obj_textsec (input_bfd)->output_offset),
-		outsym->e_value);
-      ++obj_aout_external_sym_count (output_bfd);
-      ++outsym;
-    }
-
-  pass = false;
-  skip_next = false;
-  sym = obj_aout_external_syms (input_bfd);
-  sym_end = sym + sym_count;
-  sym_hash = obj_aout_sym_hashes (input_bfd);
-  symbol_map = finfo->symbol_map;
-  memset (symbol_map, 0, sym_count * sizeof *symbol_map);
-  for (; sym < sym_end; sym++, sym_hash++, symbol_map++)
-    {
-      const char *name;
-      int type;
-      struct aout_link_hash_entry *h;
-      boolean skip;
-      asection *symsec;
-      bfd_vma val = 0;
-      boolean copy;
-
-      /* We set *symbol_map to 0 above for all symbols.  If it has
-         already been set to -1 for this symbol, it means that we are
-         discarding it because it appears in a duplicate header file.
-         See the N_BINCL code below.  */
-      if (*symbol_map == -1)
-	continue;
-
-      /* Initialize *symbol_map to -1, which means that the symbol was
-         not copied into the output file.  We will change it later if
-         we do copy the symbol over.  */
-      *symbol_map = -1;
-
-      type = bfd_h_get_8 (input_bfd, sym->e_type);
-      name = strings + GET_WORD (input_bfd, sym->e_strx);
-
-      h = NULL;
-
-      if (pass)
-	{
-	  /* Pass this symbol through.  It is the target of an
-	     indirect or warning symbol.  */
-	  val = GET_WORD (input_bfd, sym->e_value);
-	  pass = false;
-	}
-      else if (skip_next)
-	{
-	  /* Skip this symbol, which is the target of an indirect
-	     symbol that we have changed to no longer be an indirect
-	     symbol.  */
-	  skip_next = false;
-	  continue;
-	}
-      else
-	{
-	  struct aout_link_hash_entry *hresolve;
-
-	  /* We have saved the hash table entry for this symbol, if
-	     there is one.  Note that we could just look it up again
-	     in the hash table, provided we first check that it is an
-	     external symbol. */
-	  h = *sym_hash;
-
-	  /* Use the name from the hash table, in case the symbol was
-             wrapped.  */
-	  if (h != NULL)
-	    name = h->root.root.string;
-
-	  /* If this is an indirect or warning symbol, then change
-	     hresolve to the base symbol.  We also change *sym_hash so
-	     that the relocation routines relocate against the real
-	     symbol.  */
-	  hresolve = h;
-	  if (h != (struct aout_link_hash_entry *) NULL
-	      && (h->root.type == bfd_link_hash_indirect
-		  || h->root.type == bfd_link_hash_warning))
-	    {
-	      hresolve = (struct aout_link_hash_entry *) h->root.u.i.link;
-	      while (hresolve->root.type == bfd_link_hash_indirect
-		     || hresolve->root.type == bfd_link_hash_warning)
-		hresolve = ((struct aout_link_hash_entry *)
-			    hresolve->root.u.i.link);
-	      *sym_hash = hresolve;
-	    }
-
-	  /* If the symbol has already been written out, skip it.  */
-	  if (h != (struct aout_link_hash_entry *) NULL
-	      && h->root.type != bfd_link_hash_warning
-	      && h->written)
-	    {
-	      if ((type & N_TYPE) == N_INDR
-		  || type == N_WARNING)
-		skip_next = true;
-	      *symbol_map = h->indx;
-	      continue;
-	    }
-
-	  /* See if we are stripping this symbol.  */
-	  skip = false;
-	  switch (strip)
-	    {
-	    case strip_none:
-	      break;
-	    case strip_debugger:
-	      if ((type & N_STAB) != 0)
-		skip = true;
-	      break;
-	    case strip_some:
-	      if (bfd_hash_lookup (finfo->info->keep_hash, name, false, false)
-		  == NULL)
-		skip = true;
-	      break;
-	    case strip_all:
-	      skip = true;
-	      break;
-	    }
-	  if (skip)
-	    {
-	      if (h != (struct aout_link_hash_entry *) NULL)
-		h->written = true;
-	      continue;
-	    }
-
-	  /* Get the value of the symbol.  */
-	  if ((type & N_TYPE) == N_TEXT
-	      || type == N_WEAKT)
-	    symsec = obj_textsec (input_bfd);
-	  else if ((type & N_TYPE) == N_DATA
-		   || type == N_WEAKD)
-	    symsec = obj_datasec (input_bfd);
-	  else if ((type & N_TYPE) == N_BSS
-		   || type == N_WEAKB)
-	    symsec = obj_bsssec (input_bfd);
-	  else if ((type & N_TYPE) == N_ABS
-		   || type == N_WEAKA)
-	    symsec = bfd_abs_section_ptr;
-	  else if (((type & N_TYPE) == N_INDR
-		    && (hresolve == (struct aout_link_hash_entry *) NULL
-			|| (hresolve->root.type != bfd_link_hash_defined
-			    && hresolve->root.type != bfd_link_hash_defweak
-			    && hresolve->root.type != bfd_link_hash_common)))
-		   || type == N_WARNING)
-	    {
-	      /* Pass the next symbol through unchanged.  The
-		 condition above for indirect symbols is so that if
-		 the indirect symbol was defined, we output it with
-		 the correct definition so the debugger will
-		 understand it.  */
-	      pass = true;
-	      val = GET_WORD (input_bfd, sym->e_value);
-	      symsec = NULL;
-	    }
-	  else if ((type & N_STAB) != 0)
-	    {
-	      val = GET_WORD (input_bfd, sym->e_value);
-	      symsec = NULL;
-	    }
-	  else
-	    {
-	      /* If we get here with an indirect symbol, it means that
-		 we are outputting it with a real definition.  In such
-		 a case we do not want to output the next symbol,
-		 which is the target of the indirection.  */
-	      if ((type & N_TYPE) == N_INDR)
-		skip_next = true;
-
-	      symsec = NULL;
-
-	      /* We need to get the value from the hash table.  We use
-		 hresolve so that if we have defined an indirect
-		 symbol we output the final definition.  */
-	      if (h == (struct aout_link_hash_entry *) NULL)
-		{
-		  switch (type & N_TYPE)
-		    {
-		    case N_SETT:
-		      symsec = obj_textsec (input_bfd);
-		      break;
-		    case N_SETD:
-		      symsec = obj_datasec (input_bfd);
-		      break;
-		    case N_SETB:
-		      symsec = obj_bsssec (input_bfd);
-		      break;
-		    case N_SETA:
-		      symsec = bfd_abs_section_ptr;
-		      break;
-		    default:
-		      val = 0;
-		      break;
-		    }
-		}
-	      else if (hresolve->root.type == bfd_link_hash_defined
-		       || hresolve->root.type == bfd_link_hash_defweak)
-		{
-		  asection *input_section;
-		  asection *output_section;
-
-		  /* This case usually means a common symbol which was
-		     turned into a defined symbol.  */
-		  input_section = hresolve->root.u.def.section;
-		  output_section = input_section->output_section;
-		  BFD_ASSERT (bfd_is_abs_section (output_section)
-			      || output_section->owner == output_bfd);
-		  val = (hresolve->root.u.def.value
-			 + bfd_get_section_vma (output_bfd, output_section)
-			 + input_section->output_offset);
-
-		  /* Get the correct type based on the section.  If
-		     this is a constructed set, force it to be
-		     globally visible.  */
-		  if (type == N_SETT
-		      || type == N_SETD
-		      || type == N_SETB
-		      || type == N_SETA)
-		    type |= N_EXT;
-
-		  type &=~ N_TYPE;
-
-		  if (output_section == obj_textsec (output_bfd))
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_TEXT
-			     : N_WEAKT);
-		  else if (output_section == obj_datasec (output_bfd))
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_DATA
-			     : N_WEAKD);
-		  else if (output_section == obj_bsssec (output_bfd))
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_BSS
-			     : N_WEAKB);
-		  else
-		    type |= (hresolve->root.type == bfd_link_hash_defined
-			     ? N_ABS
-			     : N_WEAKA);
-		}
-	      else if (hresolve->root.type == bfd_link_hash_common)
-		val = hresolve->root.u.c.size;
-	      else if (hresolve->root.type == bfd_link_hash_undefweak)
-		{
-		  val = 0;
-		  type = N_WEAKU;
-		}
-	      else
-		val = 0;
-	    }
-	  if (symsec != (asection *) NULL)
-	    val = (symsec->output_section->vma
-		   + symsec->output_offset
-		   + (GET_WORD (input_bfd, sym->e_value)
-		      - symsec->vma));
-
-	  /* If this is a global symbol set the written flag, and if
-	     it is a local symbol see if we should discard it.  */
-	  if (h != (struct aout_link_hash_entry *) NULL)
-	    {
-	      h->written = true;
-	      h->indx = obj_aout_external_sym_count (output_bfd);
-	    }
-	  else if ((type & N_TYPE) != N_SETT
-		   && (type & N_TYPE) != N_SETD
-		   && (type & N_TYPE) != N_SETB
-		   && (type & N_TYPE) != N_SETA)
-	    {
-	      switch (discard)
-		{
-		case discard_none:
-		  break;
-		case discard_l:
-		  if ((type & N_STAB) == 0
-		      && bfd_is_local_label_name (input_bfd, name))
-		    skip = true;
-		  break;
-		case discard_all:
-		  skip = true;
-		  break;
-		}
-	      if (skip)
-		{
-		  pass = false;
-		  continue;
-		}
-	    }
-
-	  /* An N_BINCL symbol indicates the start of the stabs
-	     entries for a header file.  We need to scan ahead to the
-	     next N_EINCL symbol, ignoring nesting, adding up all the
-	     characters in the symbol names, not including the file
-	     numbers in types (the first number after an open
-	     parenthesis).  */
-	  if (type == N_BINCL)
-	    {
-	      struct external_nlist *incl_sym;
-	      int nest;
-	      struct aout_link_includes_entry *incl_entry;
-	      struct aout_link_includes_totals *t;
-
-	      val = 0;
-	      nest = 0;
-	      for (incl_sym = sym + 1; incl_sym < sym_end; incl_sym++)
-		{
-		  int incl_type;
-
-		  incl_type = bfd_h_get_8 (input_bfd, incl_sym->e_type);
-		  if (incl_type == N_EINCL)
-		    {
-		      if (nest == 0)
-			break;
-		      --nest;
-		    }
-		  else if (incl_type == N_BINCL)
-		    ++nest;
-		  else if (nest == 0)
-		    {
-		      const char *s;
-
-		      s = strings + GET_WORD (input_bfd, incl_sym->e_strx);
-		      for (; *s != '\0'; s++)
-			{
-			  val += *s;
-			  if (*s == '(')
-			    {
-			      /* Skip the file number.  */
-			      ++s;
-			      while (isdigit ((unsigned char) *s))
-				++s;
-			      --s;
-			    }
-			}
-		    }
-		}
-
-	      /* If we have already included a header file with the
-                 same value, then replace this one with an N_EXCL
-                 symbol.  */
-	      copy = ! finfo->info->keep_memory;
-	      incl_entry = aout_link_includes_lookup (&finfo->includes,
-						      name, true, copy);
-	      if (incl_entry == NULL)
-		return false;
-	      for (t = incl_entry->totals; t != NULL; t = t->next)
-		if (t->total == val)
-		  break;
-	      if (t == NULL)
-		{
-		  /* This is the first time we have seen this header
-                     file with this set of stabs strings.  */
-		  t = ((struct aout_link_includes_totals *)
-		       bfd_hash_allocate (&finfo->includes.root,
-					  sizeof *t));
-		  if (t == NULL)
-		    return false;
-		  t->total = val;
-		  t->next = incl_entry->totals;
-		  incl_entry->totals = t;
-		}
-	      else
-		{
-		  int *incl_map;
-
-		  /* This is a duplicate header file.  We must change
-                     it to be an N_EXCL entry, and mark all the
-                     included symbols to prevent outputting them.  */
-		  type = N_EXCL;
-
-		  nest = 0;
-		  for (incl_sym = sym + 1, incl_map = symbol_map + 1;
-		       incl_sym < sym_end;
-		       incl_sym++, incl_map++)
-		    {
-		      int incl_type;
-
-		      incl_type = bfd_h_get_8 (input_bfd, incl_sym->e_type);
-		      if (incl_type == N_EINCL)
-			{
-			  if (nest == 0)
-			    {
-			      *incl_map = -1;
-			      break;
-			    }
-			  --nest;
-			}
-		      else if (incl_type == N_BINCL)
-			++nest;
-		      else if (nest == 0)
-			*incl_map = -1;
-		    }
-		}
-	    }
-	}
-
-      /* Copy this symbol into the list of symbols we are going to
-	 write out.  */
-      bfd_h_put_8 (output_bfd, type, outsym->e_type);
-      bfd_h_put_8 (output_bfd, bfd_h_get_8 (input_bfd, sym->e_other),
-		   outsym->e_other);
-      bfd_h_put_16 (output_bfd, bfd_h_get_16 (input_bfd, sym->e_desc),
-		    outsym->e_desc);
-      copy = false;
-      if (! finfo->info->keep_memory)
-	{
-	  /* name points into a string table which we are going to
-	     free.  If there is a hash table entry, use that string.
-	     Otherwise, copy name into memory.  */
-	  if (h != (struct aout_link_hash_entry *) NULL)
-	    name = h->root.root.string;
-	  else
-	    copy = true;
-	}
-      strtab_index = add_to_stringtab (output_bfd, finfo->strtab,
-				       name, copy);
-      if (strtab_index == (bfd_size_type) -1)
-	return false;
-      PUT_WORD (output_bfd, strtab_index, outsym->e_strx);
-      PUT_WORD (output_bfd, val, outsym->e_value);
-      *symbol_map = obj_aout_external_sym_count (output_bfd);
-      ++obj_aout_external_sym_count (output_bfd);
-      ++outsym;
-    }
-
-  /* Write out the output symbols we have just constructed.  */
-  if (outsym > finfo->output_syms)
-    {
-      bfd_size_type outsym_count;
-
-      if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0)
-	return false;
-      outsym_count = outsym - finfo->output_syms;
-      if (bfd_write ((PTR) finfo->output_syms,
-		     (bfd_size_type) EXTERNAL_NLIST_SIZE,
-		     (bfd_size_type) outsym_count, output_bfd)
-	  != outsym_count * EXTERNAL_NLIST_SIZE)
-	return false;
-      finfo->symoff += outsym_count * EXTERNAL_NLIST_SIZE;
-    }
-
-  return true;
-}
-
-/* Write out a symbol that was not associated with an a.out input
-   object.  */
-
-static boolean
-aout_link_write_other_symbol (h, data)
-     struct aout_link_hash_entry *h;
-     PTR data;
-{
-  struct aout_final_link_info *finfo = (struct aout_final_link_info *) data;
-  bfd *output_bfd;
-  int type;
-  bfd_vma val;
-  struct external_nlist outsym;
-  bfd_size_type indx;
-
-  output_bfd = finfo->output_bfd;
-
-  if (aout_backend_info (output_bfd)->write_dynamic_symbol != NULL)
-    {
-      if (! ((*aout_backend_info (output_bfd)->write_dynamic_symbol)
-	     (output_bfd, finfo->info, h)))
-	{
-	  /* FIXME: No way to handle errors.  */
-	  abort ();
-	}
-    }
-
-  if (h->written)
-    return true;
-
-  h->written = true;
-
-  /* An indx of -2 means the symbol must be written.  */
-  if (h->indx != -2
-      && (finfo->info->strip == strip_all
-	  || (finfo->info->strip == strip_some
-	      && bfd_hash_lookup (finfo->info->keep_hash, h->root.root.string,
-				  false, false) == NULL)))
-    return true;
-
-  switch (h->root.type)
-    {
-    default:
-      abort ();
-      /* Avoid variable not initialized warnings.  */
-      return true;
-    case bfd_link_hash_new:
-      /* This can happen for set symbols when sets are not being
-         built.  */
-      return true;
-    case bfd_link_hash_undefined:
-      type = N_UNDF | N_EXT;
-      val = 0;
-      break;
-    case bfd_link_hash_defined:
-    case bfd_link_hash_defweak:
-      {
-	asection *sec;
-
-	sec = h->root.u.def.section->output_section;
-	BFD_ASSERT (bfd_is_abs_section (sec)
-		    || sec->owner == output_bfd);
-	if (sec == obj_textsec (output_bfd))
-	  type = h->root.type == bfd_link_hash_defined ? N_TEXT : N_WEAKT;
-	else if (sec == obj_datasec (output_bfd))
-	  type = h->root.type == bfd_link_hash_defined ? N_DATA : N_WEAKD;
-	else if (sec == obj_bsssec (output_bfd))
-	  type = h->root.type == bfd_link_hash_defined ? N_BSS : N_WEAKB;
-	else
-	  type = h->root.type == bfd_link_hash_defined ? N_ABS : N_WEAKA;
-	type |= N_EXT;
-	val = (h->root.u.def.value
-	       + sec->vma
-	       + h->root.u.def.section->output_offset);
-      }
-      break;
-    case bfd_link_hash_common:
-      type = N_UNDF | N_EXT;
-      val = h->root.u.c.size;
-      break;
-    case bfd_link_hash_undefweak:
-      type = N_WEAKU;
-      val = 0;
-    case bfd_link_hash_indirect:
-    case bfd_link_hash_warning:
-      /* FIXME: Ignore these for now.  The circumstances under which
-	 they should be written out are not clear to me.  */
-      return true;
-    }
-
-  bfd_h_put_8 (output_bfd, type, outsym.e_type);
-  bfd_h_put_8 (output_bfd, 0, outsym.e_other);
-  bfd_h_put_16 (output_bfd, 0, outsym.e_desc);
-  indx = add_to_stringtab (output_bfd, finfo->strtab, h->root.root.string,
-			   false);
-  if (indx == (bfd_size_type) -1)
-    {
-      /* FIXME: No way to handle errors.  */
-      abort ();
-    }
-  PUT_WORD (output_bfd, indx, outsym.e_strx);
-  PUT_WORD (output_bfd, val, outsym.e_value);
-
-  if (bfd_seek (output_bfd, finfo->symoff, SEEK_SET) != 0
-      || bfd_write ((PTR) &outsym, (bfd_size_type) EXTERNAL_NLIST_SIZE,
-		    (bfd_size_type) 1, output_bfd) != EXTERNAL_NLIST_SIZE)
-    {
-      /* FIXME: No way to handle errors.  */
-      abort ();
-    }
-
-  finfo->symoff += EXTERNAL_NLIST_SIZE;
-  h->indx = obj_aout_external_sym_count (output_bfd);
-  ++obj_aout_external_sym_count (output_bfd);
-
-  return true;
-}
-
-/* Link an a.out section into the output file.  */
-
-static boolean
-aout_link_input_section (finfo, input_bfd, input_section, reloff_ptr,
-			 rel_size)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-     asection *input_section;
-     file_ptr *reloff_ptr;
-     bfd_size_type rel_size;
-{
-  bfd_size_type input_size;
-  PTR relocs;
-
-  /* Get the section contents.  */
-  input_size = bfd_section_size (input_bfd, input_section);
-  if (! bfd_get_section_contents (input_bfd, input_section,
-				  (PTR) finfo->contents,
-				  (file_ptr) 0, input_size))
-    return false;
-
-  /* Read in the relocs if we haven't already done it.  */
-  if (aout_section_data (input_section) != NULL
-      && aout_section_data (input_section)->relocs != NULL)
-    relocs = aout_section_data (input_section)->relocs;
-  else
-    {
-      relocs = finfo->relocs;
-      if (rel_size > 0)
-	{
-	  if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
-	      || bfd_read (relocs, 1, rel_size, input_bfd) != rel_size)
-	    return false;
-	}
-    }
-
-  /* Relocate the section contents.  */
-  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
-    {
-      if (! aout_link_input_section_std (finfo, input_bfd, input_section,
-					 (struct reloc_std_external *) relocs,
-					 rel_size, finfo->contents))
-	return false;
-    }
-  else
-    {
-      if (! aout_link_input_section_ext (finfo, input_bfd, input_section,
-					 (struct reloc_ext_external *) relocs,
-					 rel_size, finfo->contents))
-	return false;
-    }
-
-  /* Write out the section contents.  */
-  if (! bfd_set_section_contents (finfo->output_bfd,
-				  input_section->output_section,
-				  (PTR) finfo->contents,
-				  input_section->output_offset,
-				  input_size))
-    return false;
-
-  /* If we are producing relocateable output, the relocs were
-     modified, and we now write them out.  */
-  if (finfo->info->relocateable && rel_size > 0)
-    {
-      if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0)
-	return false;
-      if (bfd_write (relocs, (bfd_size_type) 1, rel_size, finfo->output_bfd)
-	  != rel_size)
-	return false;
-      *reloff_ptr += rel_size;
-
-      /* Assert that the relocs have not run into the symbols, and
-	 that if these are the text relocs they have not run into the
-	 data relocs.  */
-      BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
-		  && (reloff_ptr != &finfo->treloff
-		      || (*reloff_ptr
-			  <= obj_datasec (finfo->output_bfd)->rel_filepos)));
-    }
-
-  return true;
-}
-
-/* Get the section corresponding to a reloc index.  */
-
-static INLINE asection *
-aout_reloc_index_to_section (abfd, indx)
-     bfd *abfd;
-     int indx;
-{
-  switch (indx & N_TYPE)
-    {
-    case N_TEXT:
-      return obj_textsec (abfd);
-    case N_DATA:
-      return obj_datasec (abfd);
-    case N_BSS:
-      return obj_bsssec (abfd);
-    case N_ABS:
-    case N_UNDF:
-      return bfd_abs_section_ptr;
-    default:
-      abort ();
-    }
-}
-
-/* Relocate an a.out section using standard a.out relocs.  */
-
-static boolean
-aout_link_input_section_std (finfo, input_bfd, input_section, relocs,
-			     rel_size, contents)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-     asection *input_section;
-     struct reloc_std_external *relocs;
-     bfd_size_type rel_size;
-     bfd_byte *contents;
-{
-  boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *,
-					  bfd *, asection *,
-					  struct aout_link_hash_entry *,
-					  PTR, bfd_byte *, boolean *,
-					  bfd_vma *));
-  bfd *output_bfd;
-  boolean relocateable;
-  struct external_nlist *syms;
-  char *strings;
-  struct aout_link_hash_entry **sym_hashes;
-  int *symbol_map;
-  bfd_size_type reloc_count;
-  register struct reloc_std_external *rel;
-  struct reloc_std_external *rel_end;
-
-  output_bfd = finfo->output_bfd;
-  check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
-
-  BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE);
-  BFD_ASSERT (input_bfd->xvec->header_byteorder
-	      == output_bfd->xvec->header_byteorder);
-
-  relocateable = finfo->info->relocateable;
-  syms = obj_aout_external_syms (input_bfd);
-  strings = obj_aout_external_strings (input_bfd);
-  sym_hashes = obj_aout_sym_hashes (input_bfd);
-  symbol_map = finfo->symbol_map;
-
-  reloc_count = rel_size / RELOC_STD_SIZE;
-  rel = relocs;
-  rel_end = rel + reloc_count;
-  for (; rel < rel_end; rel++)
-    {
-      bfd_vma r_addr;
-      int r_index;
-      int r_extern;
-      int r_pcrel;
-      int r_baserel = 0;
-      reloc_howto_type *howto;
-      struct aout_link_hash_entry *h = NULL;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_addr = GET_SWORD (input_bfd, rel->r_address);
-
-#ifdef MY_reloc_howto
-      howto = MY_reloc_howto(input_bfd, rel, r_index, r_extern, r_pcrel);
-#else      
-      {
-	int r_jmptable;
-	int r_relative;
-	int r_length;
-	unsigned int howto_idx;
-
-	if (bfd_header_big_endian (input_bfd))
-	  {
-	    r_index   =  ((rel->r_index[0] << 16)
-			  | (rel->r_index[1] << 8)
-			  | rel->r_index[2]);
-	    r_extern  = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG));
-	    r_pcrel   = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
-	    r_baserel = (0 != (rel->r_type[0] & RELOC_STD_BITS_BASEREL_BIG));
-	    r_jmptable= (0 != (rel->r_type[0] & RELOC_STD_BITS_JMPTABLE_BIG));
-	    r_relative= (0 != (rel->r_type[0] & RELOC_STD_BITS_RELATIVE_BIG));
-	    r_length  = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_BIG)
-			 >> RELOC_STD_BITS_LENGTH_SH_BIG);
-	  }
-	else
-	  {
-	    r_index   = ((rel->r_index[2] << 16)
-			 | (rel->r_index[1] << 8)
-			 | rel->r_index[0]);
-	    r_extern  = (0 != (rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE));
-	    r_pcrel   = (0 != (rel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
-	    r_baserel = (0 != (rel->r_type[0]
-			       & RELOC_STD_BITS_BASEREL_LITTLE));
-	    r_jmptable= (0 != (rel->r_type[0]
-			       & RELOC_STD_BITS_JMPTABLE_LITTLE));
-	    r_relative= (0 != (rel->r_type[0]
-			       & RELOC_STD_BITS_RELATIVE_LITTLE));
-	    r_length  = ((rel->r_type[0] & RELOC_STD_BITS_LENGTH_LITTLE)
-			 >> RELOC_STD_BITS_LENGTH_SH_LITTLE);
-	  }
-
-	howto_idx = (r_length + 4 * r_pcrel + 8 * r_baserel
-		     + 16 * r_jmptable + 32 * r_relative);
-	BFD_ASSERT (howto_idx < TABLE_SIZE (howto_table_std));
-	howto = howto_table_std + howto_idx;
-      }
-#endif
-
-      if (relocateable)
-	{
-	  /* We are generating a relocateable output file, and must
-	     modify the reloc accordingly.  */
-	  if (r_extern)
-	    {
-	      /* If we know the symbol this relocation is against,
-		 convert it into a relocation against a section.  This
-		 is what the native linker does.  */
-	      h = sym_hashes[r_index];
-	      if (h != (struct aout_link_hash_entry *) NULL
-		  && (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak))
-		{
-		  asection *output_section;
-
-		  /* Change the r_extern value.  */
-		  if (bfd_header_big_endian (output_bfd))
-		    rel->r_type[0] &=~ RELOC_STD_BITS_EXTERN_BIG;
-		  else
-		    rel->r_type[0] &=~ RELOC_STD_BITS_EXTERN_LITTLE;
-
-		  /* Compute a new r_index.  */
-		  output_section = h->root.u.def.section->output_section;
-		  if (output_section == obj_textsec (output_bfd))
-		    r_index = N_TEXT;
-		  else if (output_section == obj_datasec (output_bfd))
-		    r_index = N_DATA;
-		  else if (output_section == obj_bsssec (output_bfd))
-		    r_index = N_BSS;
-		  else
-		    r_index = N_ABS;
-
-		  /* Add the symbol value and the section VMA to the
-		     addend stored in the contents.  */
-		  relocation = (h->root.u.def.value
-				+ output_section->vma
-				+ h->root.u.def.section->output_offset);
-		}
-	      else
-		{
-		  /* We must change r_index according to the symbol
-		     map.  */
-		  r_index = symbol_map[r_index];
-
-		  if (r_index == -1)
-		    {
-		      if (h != NULL)
-			{
-			  /* We decided to strip this symbol, but it
-                             turns out that we can't.  Note that we
-                             lose the other and desc information here.
-                             I don't think that will ever matter for a
-                             global symbol.  */
-			  if (h->indx < 0)
-			    {
-			      h->indx = -2;
-			      h->written = false;
-			      if (! aout_link_write_other_symbol (h,
-								  (PTR) finfo))
-				return false;
-			    }
-			  r_index = h->indx;
-			}
-		      else
-			{
-			  const char *name;
-
-			  name = strings + GET_WORD (input_bfd,
-						     syms[r_index].e_strx);
-			  if (! ((*finfo->info->callbacks->unattached_reloc)
-				 (finfo->info, name, input_bfd, input_section,
-				  r_addr)))
-			    return false;
-			  r_index = 0;
-			}
-		    }
-
-		  relocation = 0;
-		}
-
-	      /* Write out the new r_index value.  */
-	      if (bfd_header_big_endian (output_bfd))
-		{
-		  rel->r_index[0] = r_index >> 16;
-		  rel->r_index[1] = r_index >> 8;
-		  rel->r_index[2] = r_index;
-		}
-	      else
-		{
-		  rel->r_index[2] = r_index >> 16;
-		  rel->r_index[1] = r_index >> 8;
-		  rel->r_index[0] = r_index;
-		}
-	    }
-	  else
-	    {
-	      asection *section;
-
-	      /* This is a relocation against a section.  We must
-		 adjust by the amount that the section moved.  */
-	      section = aout_reloc_index_to_section (input_bfd, r_index);
-	      relocation = (section->output_section->vma
-			    + section->output_offset
-			    - section->vma);
-	    }
-
-	  /* Change the address of the relocation.  */
-	  PUT_WORD (output_bfd,
-		    r_addr + input_section->output_offset,
-		    rel->r_address);
-
-	  /* Adjust a PC relative relocation by removing the reference
-	     to the original address in the section and including the
-	     reference to the new address.  */
-	  if (r_pcrel)
-	    relocation -= (input_section->output_section->vma
-			   + input_section->output_offset
-			   - input_section->vma);
-
-#ifdef MY_relocatable_reloc
-	  MY_relocatable_reloc (howto, output_bfd, rel, relocation, r_addr);
-#endif
-
-	  if (relocation == 0)
-	    r = bfd_reloc_ok;
-	  else
-	    r = MY_relocate_contents (howto,
-					input_bfd, relocation,
-					contents + r_addr);
-	}
-      else
-	{
-	  boolean hundef;
-
-	  /* We are generating an executable, and must do a full
-	     relocation.  */
-	  hundef = false;
-
-	  if (r_extern)
-	    {
-	      h = sym_hashes[r_index];
-
-	      if (h != (struct aout_link_hash_entry *) NULL
-		  && (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak))
-		{
-		  relocation = (h->root.u.def.value
-				+ h->root.u.def.section->output_section->vma
-				+ h->root.u.def.section->output_offset);
-		}
-	      else if (h != (struct aout_link_hash_entry *) NULL
-		       && h->root.type == bfd_link_hash_undefweak)
-		relocation = 0;
-	      else
-		{
-		  hundef = true;
-		  relocation = 0;
-		}
-	    }
-	  else
-	    {
-	      asection *section;
-
-	      section = aout_reloc_index_to_section (input_bfd, r_index);
-	      relocation = (section->output_section->vma
-			    + section->output_offset
-			    - section->vma);
-	      if (r_pcrel)
-		relocation += input_section->vma;
-	    }
-
-	  if (check_dynamic_reloc != NULL)
-	    {
-	      boolean skip;
-
-	      if (! ((*check_dynamic_reloc)
-		     (finfo->info, input_bfd, input_section, h,
-		      (PTR) rel, contents, &skip, &relocation)))
-		return false;
-	      if (skip)
-		continue;
-	    }
-
-	  /* Now warn if a global symbol is undefined.  We could not
-             do this earlier, because check_dynamic_reloc might want
-             to skip this reloc.  */
-	  if (hundef && ! finfo->info->shared && ! r_baserel)
-	    {
-	      const char *name;
-
-	      if (h != NULL)
-		name = h->root.root.string;
-	      else
-		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
-	      if (! ((*finfo->info->callbacks->undefined_symbol)
-		     (finfo->info, name, input_bfd, input_section, r_addr)))
-		return false;
-	    }
-
-	  r = MY_final_link_relocate (howto,
-				      input_bfd, input_section,
-				      contents, r_addr, relocation,
-				      (bfd_vma) 0);
-	}
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else if (r_extern)
-		  name = strings + GET_WORD (input_bfd,
-					     syms[r_index].e_strx);
-		else
-		  {
-		    asection *s;
-
-		    s = aout_reloc_index_to_section (input_bfd, r_index);
-		    name = bfd_section_name (input_bfd, s);
-		  }
-		if (! ((*finfo->info->callbacks->reloc_overflow)
-		       (finfo->info, name, howto->name,
-			(bfd_vma) 0, input_bfd, input_section, r_addr)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Relocate an a.out section using extended a.out relocs.  */
-
-static boolean
-aout_link_input_section_ext (finfo, input_bfd, input_section, relocs,
-			     rel_size, contents)
-     struct aout_final_link_info *finfo;
-     bfd *input_bfd;
-     asection *input_section;
-     struct reloc_ext_external *relocs;
-     bfd_size_type rel_size;
-     bfd_byte *contents;
-{
-  boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *,
-					  bfd *, asection *,
-					  struct aout_link_hash_entry *,
-					  PTR, bfd_byte *, boolean *,
-					  bfd_vma *));
-  bfd *output_bfd;
-  boolean relocateable;
-  struct external_nlist *syms;
-  char *strings;
-  struct aout_link_hash_entry **sym_hashes;
-  int *symbol_map;
-  bfd_size_type reloc_count;
-  register struct reloc_ext_external *rel;
-  struct reloc_ext_external *rel_end;
-
-  output_bfd = finfo->output_bfd;
-  check_dynamic_reloc = aout_backend_info (output_bfd)->check_dynamic_reloc;
-
-  BFD_ASSERT (obj_reloc_entry_size (input_bfd) == RELOC_EXT_SIZE);
-  BFD_ASSERT (input_bfd->xvec->header_byteorder
-	      == output_bfd->xvec->header_byteorder);
-
-  relocateable = finfo->info->relocateable;
-  syms = obj_aout_external_syms (input_bfd);
-  strings = obj_aout_external_strings (input_bfd);
-  sym_hashes = obj_aout_sym_hashes (input_bfd);
-  symbol_map = finfo->symbol_map;
-
-  reloc_count = rel_size / RELOC_EXT_SIZE;
-  rel = relocs;
-  rel_end = rel + reloc_count;
-  for (; rel < rel_end; rel++)
-    {
-      bfd_vma r_addr;
-      int r_index;
-      int r_extern;
-      unsigned int r_type;
-      bfd_vma r_addend;
-      struct aout_link_hash_entry *h = NULL;
-      asection *r_section = NULL;
-      bfd_vma relocation;
-
-      r_addr = GET_SWORD (input_bfd, rel->r_address);
-
-      if (bfd_header_big_endian (input_bfd))
-	{
-	  r_index  = ((rel->r_index[0] << 16)
-		      | (rel->r_index[1] << 8)
-		      | rel->r_index[2]);
-	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
-	  r_type   = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
-		      >> RELOC_EXT_BITS_TYPE_SH_BIG);
-	}
-      else
-	{
-	  r_index  = ((rel->r_index[2] << 16)
-		      | (rel->r_index[1] << 8)
-		      | rel->r_index[0]);
-	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
-	  r_type   = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
-		      >> RELOC_EXT_BITS_TYPE_SH_LITTLE);
-	}
-
-      r_addend = GET_SWORD (input_bfd, rel->r_addend);
-
-      BFD_ASSERT (r_type < TABLE_SIZE (howto_table_ext));
-
-      if (relocateable)
-	{
-	  /* We are generating a relocateable output file, and must
-	     modify the reloc accordingly.  */
-	  if (r_extern
-	      || r_type == RELOC_BASE10
-	      || r_type == RELOC_BASE13
-	      || r_type == RELOC_BASE22)
-	    {
-	      /* If we know the symbol this relocation is against,
-		 convert it into a relocation against a section.  This
-		 is what the native linker does.  */
-	      if (r_type == RELOC_BASE10
-		  || r_type == RELOC_BASE13
-		  || r_type == RELOC_BASE22)
-		h = NULL;
-	      else
-		h = sym_hashes[r_index];
-	      if (h != (struct aout_link_hash_entry *) NULL
-		  && (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak))
-		{
-		  asection *output_section;
-
-		  /* Change the r_extern value.  */
-		  if (bfd_header_big_endian (output_bfd))
-		    rel->r_type[0] &=~ RELOC_EXT_BITS_EXTERN_BIG;
-		  else
-		    rel->r_type[0] &=~ RELOC_EXT_BITS_EXTERN_LITTLE;
-
-		  /* Compute a new r_index.  */
-		  output_section = h->root.u.def.section->output_section;
-		  if (output_section == obj_textsec (output_bfd))
-		    r_index = N_TEXT;
-		  else if (output_section == obj_datasec (output_bfd))
-		    r_index = N_DATA;
-		  else if (output_section == obj_bsssec (output_bfd))
-		    r_index = N_BSS;
-		  else
-		    r_index = N_ABS;
-
-		  /* Add the symbol value and the section VMA to the
-		     addend.  */
-		  relocation = (h->root.u.def.value
-				+ output_section->vma
-				+ h->root.u.def.section->output_offset);
-
-		  /* Now RELOCATION is the VMA of the final
-		     destination.  If this is a PC relative reloc,
-		     then ADDEND is the negative of the source VMA.
-		     We want to set ADDEND to the difference between
-		     the destination VMA and the source VMA, which
-		     means we must adjust RELOCATION by the change in
-		     the source VMA.  This is done below.  */
-		}
-	      else
-		{
-		  /* We must change r_index according to the symbol
-		     map.  */
-		  r_index = symbol_map[r_index];
-
-		  if (r_index == -1)
-		    {
-		      if (h != NULL)
-			{
-			  /* We decided to strip this symbol, but it
-                             turns out that we can't.  Note that we
-                             lose the other and desc information here.
-                             I don't think that will ever matter for a
-                             global symbol.  */
-			  if (h->indx < 0)
-			    {
-			      h->indx = -2;
-			      h->written = false;
-			      if (! aout_link_write_other_symbol (h,
-								  (PTR) finfo))
-				return false;
-			    }
-			  r_index = h->indx;
-			}
-		      else
-			{
-			  const char *name;
-
-			  name = strings + GET_WORD (input_bfd,
-						     syms[r_index].e_strx);
-			  if (! ((*finfo->info->callbacks->unattached_reloc)
-				 (finfo->info, name, input_bfd, input_section,
-				  r_addr)))
-			    return false;
-			  r_index = 0;
-			}
-		    }
-
-		  relocation = 0;
-
-		  /* If this is a PC relative reloc, then the addend
-		     is the negative of the source VMA.  We must
-		     adjust it by the change in the source VMA.  This
-		     is done below.  */
-		}
-
-	      /* Write out the new r_index value.  */
-	      if (bfd_header_big_endian (output_bfd))
-		{
-		  rel->r_index[0] = r_index >> 16;
-		  rel->r_index[1] = r_index >> 8;
-		  rel->r_index[2] = r_index;
-		}
-	      else
-		{
-		  rel->r_index[2] = r_index >> 16;
-		  rel->r_index[1] = r_index >> 8;
-		  rel->r_index[0] = r_index;
-		}
-	    }
-	  else
-	    {
-	      /* This is a relocation against a section.  We must
-		 adjust by the amount that the section moved.  */
-	      r_section = aout_reloc_index_to_section (input_bfd, r_index);
-	      relocation = (r_section->output_section->vma
-			    + r_section->output_offset
-			    - r_section->vma);
-
-	      /* If this is a PC relative reloc, then the addend is
-		 the difference in VMA between the destination and the
-		 source.  We have just adjusted for the change in VMA
-		 of the destination, so we must also adjust by the
-		 change in VMA of the source.  This is done below.  */
-	    }
-
-	  /* As described above, we must always adjust a PC relative
-	     reloc by the change in VMA of the source.  However, if
-	     pcrel_offset is set, then the addend does not include the
-	     location within the section, in which case we don't need
-	     to adjust anything.  */
-	  if (howto_table_ext[r_type].pc_relative
-	      && ! howto_table_ext[r_type].pcrel_offset)
-	    relocation -= (input_section->output_section->vma
-			   + input_section->output_offset
-			   - input_section->vma);
-
-	  /* Change the addend if necessary.  */
-	  if (relocation != 0)
-	    PUT_WORD (output_bfd, r_addend + relocation, rel->r_addend);
-
-	  /* Change the address of the relocation.  */
-	  PUT_WORD (output_bfd,
-		    r_addr + input_section->output_offset,
-		    rel->r_address);
-	}
-      else
-	{
-	  boolean hundef;
-	  bfd_reloc_status_type r;
-
-	  /* We are generating an executable, and must do a full
-	     relocation.  */
-	  hundef = false;
-
-	  if (r_extern)
-	    {
-	      h = sym_hashes[r_index];
-
-	      if (h != (struct aout_link_hash_entry *) NULL
-		  && (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak))
-		{
-		  relocation = (h->root.u.def.value
-				+ h->root.u.def.section->output_section->vma
-				+ h->root.u.def.section->output_offset);
-		}
-	      else if (h != (struct aout_link_hash_entry *) NULL
-		       && h->root.type == bfd_link_hash_undefweak)
-		relocation = 0;
-	      else
-		{
-		  hundef = true;
-		  relocation = 0;
-		}
-	    }
-	  else if (r_type == RELOC_BASE10
-		   || r_type == RELOC_BASE13
-		   || r_type == RELOC_BASE22)
-	    {
-	      struct external_nlist *sym;
-	      int type;
-
-	      /* For base relative relocs, r_index is always an index
-                 into the symbol table, even if r_extern is 0.  */
-	      sym = syms + r_index;
-	      type = bfd_h_get_8 (input_bfd, sym->e_type);
-	      if ((type & N_TYPE) == N_TEXT
-		  || type == N_WEAKT)
-		r_section = obj_textsec (input_bfd);
-	      else if ((type & N_TYPE) == N_DATA
-		       || type == N_WEAKD)
-		r_section = obj_datasec (input_bfd);
-	      else if ((type & N_TYPE) == N_BSS
-		       || type == N_WEAKB)
-		r_section = obj_bsssec (input_bfd);
-	      else if ((type & N_TYPE) == N_ABS
-		       || type == N_WEAKA)
-		r_section = bfd_abs_section_ptr;
-	      else
-		abort ();
-	      relocation = (r_section->output_section->vma
-			    + r_section->output_offset
-			    + (GET_WORD (input_bfd, sym->e_value)
-			       - r_section->vma));
-	    }
-	  else
-	    {
-	      r_section = aout_reloc_index_to_section (input_bfd, r_index);
-
-	      /* If this is a PC relative reloc, then R_ADDEND is the
-		 difference between the two vmas, or
-		   old_dest_sec + old_dest_off - (old_src_sec + old_src_off)
-		 where
-		   old_dest_sec == section->vma
-		 and
-		   old_src_sec == input_section->vma
-		 and
-		   old_src_off == r_addr
-
-		 _bfd_final_link_relocate expects RELOCATION +
-		 R_ADDEND to be the VMA of the destination minus
-		 r_addr (the minus r_addr is because this relocation
-		 is not pcrel_offset, which is a bit confusing and
-		 should, perhaps, be changed), or
-		   new_dest_sec
-		 where
-		   new_dest_sec == output_section->vma + output_offset
-		 We arrange for this to happen by setting RELOCATION to
-		   new_dest_sec + old_src_sec - old_dest_sec
-
-		 If this is not a PC relative reloc, then R_ADDEND is
-		 simply the VMA of the destination, so we set
-		 RELOCATION to the change in the destination VMA, or
-		   new_dest_sec - old_dest_sec
-		 */
-	      relocation = (r_section->output_section->vma
-			    + r_section->output_offset
-			    - r_section->vma);
-	      if (howto_table_ext[r_type].pc_relative)
-		relocation += input_section->vma;
-	    }
-
-	  if (check_dynamic_reloc != NULL)
-	    {
-	      boolean skip;
-
-	      if (! ((*check_dynamic_reloc)
-		     (finfo->info, input_bfd, input_section, h,
-		      (PTR) rel, contents, &skip, &relocation)))
-		return false;
-	      if (skip)
-		continue;
-	    }
-
-	  /* Now warn if a global symbol is undefined.  We could not
-             do this earlier, because check_dynamic_reloc might want
-             to skip this reloc.  */
-	  if (hundef
-	      && ! finfo->info->shared
-	      && r_type != RELOC_BASE10
-	      && r_type != RELOC_BASE13
-	      && r_type != RELOC_BASE22)
-	    {
-	      const char *name;
-
-	      if (h != NULL)
-		name = h->root.root.string;
-	      else
-		name = strings + GET_WORD (input_bfd, syms[r_index].e_strx);
-	      if (! ((*finfo->info->callbacks->undefined_symbol)
-		     (finfo->info, name, input_bfd, input_section, r_addr)))
-		return false;
-	    }
-
-	  if (r_type != RELOC_SPARC_REV32)
-	    r = MY_final_link_relocate (howto_table_ext + r_type,
-					input_bfd, input_section,
-					contents, r_addr, relocation,
-					r_addend);
-	  else
-	    {
-	      bfd_vma x;
-
-	      x = bfd_get_32 (input_bfd, contents + r_addr);
-	      x = x + relocation + r_addend;
-	      bfd_putl32 (/*input_bfd,*/ x, contents + r_addr);
-	      r = bfd_reloc_ok;
-	    }
-
-	  if (r != bfd_reloc_ok)
-	    {
-	      switch (r)
-		{
-		default:
-		case bfd_reloc_outofrange:
-		  abort ();
-		case bfd_reloc_overflow:
-		  {
-		    const char *name;
-
-		    if (h != NULL)
-		      name = h->root.root.string;
-		    else if (r_extern
-			     || r_type == RELOC_BASE10
-			     || r_type == RELOC_BASE13
-			     || r_type == RELOC_BASE22)
-		      name = strings + GET_WORD (input_bfd,
-						 syms[r_index].e_strx);
-		    else
-		      {
-			asection *s;
-
-			s = aout_reloc_index_to_section (input_bfd, r_index);
-			name = bfd_section_name (input_bfd, s);
-		      }
-		    if (! ((*finfo->info->callbacks->reloc_overflow)
-			   (finfo->info, name, howto_table_ext[r_type].name,
-			    r_addend, input_bfd, input_section, r_addr)))
-		      return false;
-		  }
-		  break;
-		}
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Handle a link order which is supposed to generate a reloc.  */
-
-static boolean
-aout_link_reloc_link_order (finfo, o, p)
-     struct aout_final_link_info *finfo;
-     asection *o;
-     struct bfd_link_order *p;
-{
-  struct bfd_link_order_reloc *pr;
-  int r_index;
-  int r_extern;
-  reloc_howto_type *howto;
-  file_ptr *reloff_ptr;
-  struct reloc_std_external srel;
-  struct reloc_ext_external erel;
-  PTR rel_ptr;
-
-  pr = p->u.reloc.p;
-
-  if (p->type == bfd_section_reloc_link_order)
-    {
-      r_extern = 0;
-      if (bfd_is_abs_section (pr->u.section))
-	r_index = N_ABS | N_EXT;
-      else
-	{
-	  BFD_ASSERT (pr->u.section->owner == finfo->output_bfd);
-	  r_index = pr->u.section->target_index;
-	}
-    }
-  else
-    {
-      struct aout_link_hash_entry *h;
-
-      BFD_ASSERT (p->type == bfd_symbol_reloc_link_order);
-      r_extern = 1;
-      h = ((struct aout_link_hash_entry *)
-	   bfd_wrapped_link_hash_lookup (finfo->output_bfd, finfo->info,
-					 pr->u.name, false, false, true));
-      if (h != (struct aout_link_hash_entry *) NULL
-	  && h->indx >= 0)
-	r_index = h->indx;
-      else if (h != NULL)
-	{
-	  /* We decided to strip this symbol, but it turns out that we
-	     can't.  Note that we lose the other and desc information
-	     here.  I don't think that will ever matter for a global
-	     symbol.  */
-	  h->indx = -2;
-	  h->written = false;
-	  if (! aout_link_write_other_symbol (h, (PTR) finfo))
-	    return false;
-	  r_index = h->indx;
-	}
-      else
-	{
-	  if (! ((*finfo->info->callbacks->unattached_reloc)
-		 (finfo->info, pr->u.name, (bfd *) NULL,
-		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
-	  r_index = 0;
-	}
-    }
-
-  howto = bfd_reloc_type_lookup (finfo->output_bfd, pr->reloc);
-  if (howto == 0)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  if (o == obj_textsec (finfo->output_bfd))
-    reloff_ptr = &finfo->treloff;
-  else if (o == obj_datasec (finfo->output_bfd))
-    reloff_ptr = &finfo->dreloff;
-  else
-    abort ();
-
-  if (obj_reloc_entry_size (finfo->output_bfd) == RELOC_STD_SIZE)
-    {
-#ifdef MY_put_reloc
-      MY_put_reloc(finfo->output_bfd, r_extern, r_index, p->offset, howto,
-		   &srel);
-#else
-      {
-	int r_pcrel;
-	int r_baserel;
-	int r_jmptable;
-	int r_relative;
-	int r_length;
-
-	r_pcrel = howto->pc_relative;
-	r_baserel = (howto->type & 8) != 0;
-	r_jmptable = (howto->type & 16) != 0;
-	r_relative = (howto->type & 32) != 0;
-	r_length = howto->size;
-
-	PUT_WORD (finfo->output_bfd, p->offset, srel.r_address);
-	if (bfd_header_big_endian (finfo->output_bfd))
-	  {
-	    srel.r_index[0] = r_index >> 16;
-	    srel.r_index[1] = r_index >> 8;
-	    srel.r_index[2] = r_index;
-	    srel.r_type[0] =
-	      ((r_extern ?     RELOC_STD_BITS_EXTERN_BIG : 0)
-	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_BIG : 0)
-	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_BIG : 0)
-	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
-	       | (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
-	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-	  }
-	else
-	  {
-	    srel.r_index[2] = r_index >> 16;
-	    srel.r_index[1] = r_index >> 8;
-	    srel.r_index[0] = r_index;
-	    srel.r_type[0] =
-	      ((r_extern ?     RELOC_STD_BITS_EXTERN_LITTLE : 0)
-	       | (r_pcrel ?    RELOC_STD_BITS_PCREL_LITTLE : 0)
-	       | (r_baserel ?  RELOC_STD_BITS_BASEREL_LITTLE : 0)
-	       | (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
-	       | (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
-	       | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-	  }
-      }
-#endif
-      rel_ptr = (PTR) &srel;
-
-      /* We have to write the addend into the object file, since
-	 standard a.out relocs are in place.  It would be more
-	 reliable if we had the current contents of the file here,
-	 rather than assuming zeroes, but we can't read the file since
-	 it was opened using bfd_openw.  */
-      if (pr->addend != 0)
-	{
-	  bfd_size_type size;
-	  bfd_reloc_status_type r;
-	  bfd_byte *buf;
-	  boolean ok;
-
-	  size = bfd_get_reloc_size (howto);
-	  buf = (bfd_byte *) bfd_zmalloc (size);
-	  if (buf == (bfd_byte *) NULL)
-	    return false;
-	  r = MY_relocate_contents (howto, finfo->output_bfd,
-				      pr->addend, buf);
-	  switch (r)
-	    {
-	    case bfd_reloc_ok:
-	      break;
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      if (! ((*finfo->info->callbacks->reloc_overflow)
-		     (finfo->info,
-		      (p->type == bfd_section_reloc_link_order
-		       ? bfd_section_name (finfo->output_bfd,
-					   pr->u.section)
-		       : pr->u.name),
-		      howto->name, pr->addend, (bfd *) NULL,
-		      (asection *) NULL, (bfd_vma) 0)))
-		{
-		  free (buf);
-		  return false;
-		}
-	      break;
-	    }
-	  ok = bfd_set_section_contents (finfo->output_bfd, o,
-					 (PTR) buf,
-					 (file_ptr) p->offset,
-					 size);
-	  free (buf);
-	  if (! ok)
-	    return false;
-	}
-    }
-  else
-    {
-      PUT_WORD (finfo->output_bfd, p->offset, erel.r_address);
-
-      if (bfd_header_big_endian (finfo->output_bfd))
-	{
-	  erel.r_index[0] = r_index >> 16;
-	  erel.r_index[1] = r_index >> 8;
-	  erel.r_index[2] = r_index;
-	  erel.r_type[0] =
-	    ((r_extern ? RELOC_EXT_BITS_EXTERN_BIG : 0)
-	     | (howto->type << RELOC_EXT_BITS_TYPE_SH_BIG));
-	}
-      else
-	{
-	  erel.r_index[2] = r_index >> 16;
-	  erel.r_index[1] = r_index >> 8;
-	  erel.r_index[0] = r_index;
-	  erel.r_type[0] =
-	    (r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
-	      | (howto->type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
-	}
-
-      PUT_WORD (finfo->output_bfd, pr->addend, erel.r_addend);
-
-      rel_ptr = (PTR) &erel;
-    }
-
-  if (bfd_seek (finfo->output_bfd, *reloff_ptr, SEEK_SET) != 0
-      || (bfd_write (rel_ptr, (bfd_size_type) 1,
-		     obj_reloc_entry_size (finfo->output_bfd),
-		     finfo->output_bfd)
-	  != obj_reloc_entry_size (finfo->output_bfd)))
-    return false;
-
-  *reloff_ptr += obj_reloc_entry_size (finfo->output_bfd);
-
-  /* Assert that the relocs have not run into the symbols, and that n
-     the text relocs have not run into the data relocs.  */
-  BFD_ASSERT (*reloff_ptr <= obj_sym_filepos (finfo->output_bfd)
-	      && (reloff_ptr != &finfo->treloff
-		  || (*reloff_ptr
-		      <= obj_datasec (finfo->output_bfd)->rel_filepos)));
-
-  return true;
-}
diff --git a/bfd/archive.c b/bfd/archive.c
deleted file mode 100644
index 8ac5aa4e95d..00000000000
--- a/bfd/archive.c
+++ /dev/null
@@ -1,2127 +0,0 @@
-/* BFD back-end for archive files (libraries).
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.  Mostly Gumby Henkel-Wallace's fault.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-@setfilename archive-info
-SECTION
-	Archives
-
-DESCRIPTION
-	An archive (or library) is just another BFD.  It has a symbol
-	table, although there's not much a user program will do with it.
-
-	The big difference between an archive BFD and an ordinary BFD
-	is that the archive doesn't have sections.  Instead it has a
-	chain of BFDs that are considered its contents.  These BFDs can
-	be manipulated like any other.  The BFDs contained in an
-	archive opened for reading will all be opened for reading.  You
-	may put either input or output BFDs into an archive opened for
-	output; they will be handled correctly when the archive is closed.
-
-	Use <<bfd_openr_next_archived_file>> to step through
-	the contents of an archive opened for input.  You don't
-	have to read the entire archive if you don't want
-	to!  Read it until you find what you want.
-
-	Archive contents of output BFDs are chained through the
-	<<next>> pointer in a BFD.  The first one is findable through
-	the <<archive_head>> slot of the archive.  Set it with
-	<<bfd_set_archive_head>> (q.v.).  A given BFD may be in only one
-	open output archive at a time.
-
-	As expected, the BFD archive code is more general than the
-	archive code of any given environment.  BFD archives may
-	contain files of different formats (e.g., a.out and coff) and
-	even different architectures.  You may even place archives
-	recursively into archives!
-
-	This can cause unexpected confusion, since some archive
-	formats are more expressive than others.  For instance, Intel
-	COFF archives can preserve long filenames; SunOS a.out archives
-	cannot.  If you move a file from the first to the second
-	format and back again, the filename may be truncated.
-	Likewise, different a.out environments have different
-	conventions as to how they truncate filenames, whether they
-	preserve directory names in filenames, etc.  When
-	interoperating with native tools, be sure your files are
-	homogeneous.
-
-	Beware: most of these formats do not react well to the
-	presence of spaces in filenames.  We do the best we can, but
-	can't always handle this case due to restrictions in the format of
-	archives.  Many Unix utilities are braindead in regards to
-	spaces and such in filenames anyway, so this shouldn't be much
-	of a restriction.
-
-	Archives are supported in BFD in <<archive.c>>.
-
-*/
-
-/* Assumes:
-   o - all archive elements start on an even boundary, newline padded;
-   o - all arch headers are char *;
-   o - all arch headers are the same size (across architectures).
-*/
-
-/* Some formats provide a way to cram a long filename into the short
-   (16 chars) space provided by a BSD archive.  The trick is: make a
-   special "file" in the front of the archive, sort of like the SYMDEF
-   entry.  If the filename is too long to fit, put it in the extended
-   name table, and use its index as the filename.  To prevent
-   confusion prepend the index with a space.  This means you can't
-   have filenames that start with a space, but then again, many Unix
-   utilities can't handle that anyway.
-
-   This scheme unfortunately requires that you stand on your head in
-   order to write an archive since you need to put a magic file at the
-   front, and need to touch every entry to do so.  C'est la vie.
-
-   We support two variants of this idea:
-   The SVR4 format (extended name table is named "//"),
-   and an extended pseudo-BSD variant (extended name table is named
-   "ARFILENAMES/").  The origin of the latter format is uncertain.
-
-   BSD 4.4 uses a third scheme:  It writes a long filename
-   directly after the header.  This allows 'ar q' to work.
-   We currently can read BSD 4.4 archives, but not write them.
-*/
-
-/* Summary of archive member names:
-
- Symbol table (must be first):
- "__.SYMDEF       " - Symbol table, Berkeley style, produced by ranlib.
- "/               " - Symbol table, system 5 style.
-
- Long name table (must be before regular file members):
- "//              " - Long name table, System 5 R4 style.
- "ARFILENAMES/    " - Long name table, non-standard extended BSD (not BSD 4.4).
-
- Regular file members with short names:
- "filename.o/     " - Regular file, System 5 style (embedded spaces ok).
- "filename.o      " - Regular file, Berkeley style (no embedded spaces).
-
- Regular files with long names (or embedded spaces, for BSD variants):
- "/18             " - SVR4 style, name at offset 18 in name table.
- "#1/23           " - Long name (or embedded paces) 23 characters long,
-		      BSD 4.4 style, full name follows header.
-		      Implemented for reading, not writing.
- " 18             " - Long name 18 characters long, extended pseudo-BSD.
- */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/ar.h"
-#include "aout/ranlib.h"
-#include <ctype.h>
-
-#ifndef errno
-extern int errno;
-#endif
-
-#ifdef GNU960
-#define BFD_GNU960_ARMAG(abfd)	(BFD_COFF_FILE_P((abfd)) ? ARMAG : ARMAGB)
-#endif
-
-/* Define offsetof for those systems which lack it */
-
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-#endif
-
-/* We keep a cache of archive filepointers to archive elements to
-   speed up searching the archive by filepos.  We only add an entry to
-   the cache when we actually read one.  We also don't sort the cache;
-   it's generally short enough to search linearly.
-   Note that the pointers here point to the front of the ar_hdr, not
-   to the front of the contents!
-*/
-struct ar_cache
-{
-  file_ptr ptr;
-  bfd *arelt;
-  struct ar_cache *next;
-};
-
-#define ar_padchar(abfd) ((abfd)->xvec->ar_pad_char)
-#define ar_maxnamelen(abfd) ((abfd)->xvec->ar_max_namelen)
-
-#define arch_eltdata(bfd) ((struct areltdata *)((bfd)->arelt_data))
-#define arch_hdr(bfd) ((struct ar_hdr *)arch_eltdata(bfd)->arch_header)
-
-static char *get_extended_arelt_filename PARAMS ((bfd *arch,
-						  const char *name));
-static boolean do_slurp_bsd_armap PARAMS ((bfd *abfd));
-static boolean do_slurp_coff_armap PARAMS ((bfd *abfd));
-static const char *normalize PARAMS ((bfd *, const char *file));
-static struct areltdata *bfd_ar_hdr_from_filesystem PARAMS ((bfd *abfd,
-							     const char *,
-							     bfd *member));
-
-boolean
-_bfd_generic_mkarchive (abfd)
-     bfd *abfd;
-{
-  abfd->tdata.aout_ar_data = ((struct artdata *)
-			      bfd_zalloc (abfd, sizeof (struct artdata)));
-
-  if (bfd_ardata (abfd) == NULL)
-    return false;
-
-  bfd_ardata (abfd)->cache = NULL;
-  bfd_ardata (abfd)->archive_head = NULL;
-  bfd_ardata (abfd)->symdefs = NULL;
-  bfd_ardata (abfd)->extended_names = NULL;
-  bfd_ardata (abfd)->tdata = NULL;
-
-  return true;
-}
-
-/*
-FUNCTION
-	bfd_get_next_mapent
-
-SYNOPSIS
-	symindex bfd_get_next_mapent(bfd *abfd, symindex previous, carsym **sym);
-
-DESCRIPTION
-	Step through archive @var{abfd}'s symbol table (if it
-	has one).  Successively update @var{sym} with the next symbol's
-	information, returning that symbol's (internal) index into the
-	symbol table.
-
-	Supply <<BFD_NO_MORE_SYMBOLS>> as the @var{previous} entry to get
-	the first one; returns <<BFD_NO_MORE_SYMBOLS>> when you've already
-	got the last one.
-
-	A <<carsym>> is a canonical archive symbol.  The only
-	user-visible element is its name, a null-terminated string.
-*/
-
-symindex
-bfd_get_next_mapent (abfd, prev, entry)
-     bfd *abfd;
-     symindex prev;
-     carsym **entry;
-{
-  if (!bfd_has_map (abfd))
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return BFD_NO_MORE_SYMBOLS;
-    }
-
-  if (prev == BFD_NO_MORE_SYMBOLS)
-    prev = 0;
-  else
-    ++prev;
-  if (prev >= bfd_ardata (abfd)->symdef_count)
-    return BFD_NO_MORE_SYMBOLS;
-
-  *entry = (bfd_ardata (abfd)->symdefs + prev);
-  return prev;
-}
-
-/* To be called by backends only */
-
-bfd *
-_bfd_create_empty_archive_element_shell (obfd)
-     bfd *obfd;
-{
-  return _bfd_new_bfd_contained_in (obfd);
-}
-
-/*
-FUNCTION
-	bfd_set_archive_head
-
-SYNOPSIS
-	boolean bfd_set_archive_head(bfd *output, bfd *new_head);
-
-DESCRIPTION
-	Set the head of the chain of
-	BFDs contained in the archive @var{output} to @var{new_head}.
-*/
-
-boolean
-bfd_set_archive_head (output_archive, new_head)
-     bfd *output_archive;
-     bfd *new_head;
-{
-
-  output_archive->archive_head = new_head;
-  return true;
-}
-
-bfd *
-_bfd_look_for_bfd_in_cache (arch_bfd, filepos)
-     bfd *arch_bfd;
-     file_ptr filepos;
-{
-  struct ar_cache *current;
-
-  for (current = bfd_ardata (arch_bfd)->cache; current != NULL;
-       current = current->next)
-    if (current->ptr == filepos)
-      return current->arelt;
-
-  return NULL;
-}
-
-/* Kind of stupid to call cons for each one, but we don't do too many */
-boolean
-_bfd_add_bfd_to_archive_cache (arch_bfd, filepos, new_elt)
-     bfd *arch_bfd, *new_elt;
-     file_ptr filepos;
-{
-  struct ar_cache *new_cache = ((struct ar_cache *)
-				bfd_zalloc (arch_bfd,
-					    sizeof (struct ar_cache)));
-
-  if (new_cache == NULL)
-    return false;
-
-  new_cache->ptr = filepos;
-  new_cache->arelt = new_elt;
-  new_cache->next = (struct ar_cache *) NULL;
-  if (bfd_ardata (arch_bfd)->cache == NULL)
-    bfd_ardata (arch_bfd)->cache = new_cache;
-  else
-    {
-      struct ar_cache *current = bfd_ardata (arch_bfd)->cache;
-
-      while (current->next != NULL)
-	current = current->next;
-      current->next = new_cache;
-    }
-
-  return true;
-}
-
-/* The name begins with space.  Hence the rest of the name is an index into
-   the string table. */
-
-static char *
-get_extended_arelt_filename (arch, name)
-     bfd *arch;
-     const char *name;
-{
-  unsigned long index = 0;
-
-  /* Should extract string so that I can guarantee not to overflow into
-     the next region, but I'm too lazy. */
-  errno = 0;
-  /* Skip first char, which is '/' in SVR4 or ' ' in some other variants. */
-  index = strtol (name + 1, NULL, 10);
-  if (errno != 0)
-    {
-      bfd_set_error (bfd_error_malformed_archive);
-      return NULL;
-    }
-
-  return bfd_ardata (arch)->extended_names + index;
-}
-
-/* This functions reads an arch header and returns an areltdata pointer, or
-   NULL on error.
-
-   Presumes the file pointer is already in the right place (ie pointing
-   to the ar_hdr in the file).   Moves the file pointer; on success it
-   should be pointing to the front of the file contents; on failure it
-   could have been moved arbitrarily.
-*/
-
-PTR
-_bfd_generic_read_ar_hdr (abfd)
-     bfd *abfd;
-{
-  return _bfd_generic_read_ar_hdr_mag (abfd, (const char *) NULL);
-}
-
-/* Alpha ECOFF uses an optional different ARFMAG value, so we have a
-   variant of _bfd_generic_read_ar_hdr which accepts a magic string.  */
-
-PTR
-_bfd_generic_read_ar_hdr_mag (abfd, mag)
-     bfd *abfd;
-     const char *mag;
-{
-  struct ar_hdr hdr;
-  char *hdrp = (char *) &hdr;
-  unsigned int parsed_size;
-  struct areltdata *ared;
-  char *filename = NULL;
-  unsigned int namelen = 0;
-  unsigned int allocsize = sizeof (struct areltdata) + sizeof (struct ar_hdr);
-  char *allocptr = 0;
-
-  if (bfd_read ((PTR) hdrp, 1, sizeof (struct ar_hdr), abfd)
-      != sizeof (struct ar_hdr))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_no_more_archived_files);
-      return NULL;
-    }
-  if (strncmp (hdr.ar_fmag, ARFMAG, 2) != 0
-      && (mag == NULL
-	  || strncmp (hdr.ar_fmag, mag, 2) != 0))
-    {
-      bfd_set_error (bfd_error_malformed_archive);
-      return NULL;
-    }
-
-  errno = 0;
-  parsed_size = strtol (hdr.ar_size, NULL, 10);
-  if (errno != 0)
-    {
-      bfd_set_error (bfd_error_malformed_archive);
-      return NULL;
-    }
-
-  /* Extract the filename from the archive - there are two ways to
-     specify an extended name table, either the first char of the
-     name is a space, or it's a slash.  */
-  if ((hdr.ar_name[0] == '/'
-       || (hdr.ar_name[0] == ' '
-	   && memchr (hdr.ar_name, '/', ar_maxnamelen (abfd)) == NULL))
-      && bfd_ardata (abfd)->extended_names != NULL)
-    {
-      filename = get_extended_arelt_filename (abfd, hdr.ar_name);
-      if (filename == NULL)
-	{
-	  bfd_set_error (bfd_error_malformed_archive);
-	  return NULL;
-	}
-    }
-  /* BSD4.4-style long filename.
-     Only implemented for reading, so far! */
-  else if (hdr.ar_name[0] == '#'
-	   && hdr.ar_name[1] == '1'
-	   && hdr.ar_name[2] == '/'
-	   && isdigit ((unsigned char) hdr.ar_name[3]))
-    {
-      /* BSD-4.4 extended name */
-      namelen = atoi (&hdr.ar_name[3]);
-      allocsize += namelen + 1;
-      parsed_size -= namelen;
-
-      allocptr = bfd_zalloc (abfd, allocsize);
-      if (allocptr == NULL)
-	return NULL;
-      filename = (allocptr
-		  + sizeof (struct areltdata)
-		  + sizeof (struct ar_hdr));
-      if (bfd_read (filename, 1, namelen, abfd) != namelen)
-	{
-	  if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_no_more_archived_files);
-	  return NULL;
-	}
-      filename[namelen] = '\0';
-    }
-  else
-    {
-      /* We judge the end of the name by looking for '/' or ' '.
-	 Note:  The SYSV format (terminated by '/') allows embedded
-	 spaces, so only look for ' ' if we don't find '/'. */
-
-      char *e;
-      e = memchr (hdr.ar_name, '\0', ar_maxnamelen (abfd));
-      if (e == NULL)
-	{
-          e = memchr (hdr.ar_name, '/', ar_maxnamelen (abfd));
-	  if (e == NULL)
-            e = memchr (hdr.ar_name, ' ', ar_maxnamelen (abfd));
-	}
-
-      if (e != NULL)
-	namelen = e - hdr.ar_name;
-      else
-	{
-	  /* If we didn't find a termination character, then the name
-	     must be the entire field.  */
-	  namelen = ar_maxnamelen (abfd);
-	}
-
-      allocsize += namelen + 1;
-    }
-
-  if (!allocptr)
-    {
-      allocptr = bfd_zalloc (abfd, allocsize);
-      if (allocptr == NULL)
-	return NULL;
-    }
-
-  ared = (struct areltdata *) allocptr;
-
-  ared->arch_header = allocptr + sizeof (struct areltdata);
-  memcpy ((char *) ared->arch_header, (char *) &hdr, sizeof (struct ar_hdr));
-  ared->parsed_size = parsed_size;
-
-  if (filename != NULL)
-    ared->filename = filename;
-  else
-    {
-      ared->filename = allocptr + (sizeof (struct areltdata) +
-				   sizeof (struct ar_hdr));
-      if (namelen)
-	memcpy (ared->filename, hdr.ar_name, namelen);
-      ared->filename[namelen] = '\0';
-    }
-
-  return (PTR) ared;
-}
-
-/* This is an internal function; it's mainly used when indexing
-   through the archive symbol table, but also used to get the next
-   element, since it handles the bookkeeping so nicely for us.  */
-
-bfd *
-_bfd_get_elt_at_filepos (archive, filepos)
-     bfd *archive;
-     file_ptr filepos;
-{
-  struct areltdata *new_areldata;
-  bfd *n_nfd;
-
-  n_nfd = _bfd_look_for_bfd_in_cache (archive, filepos);
-  if (n_nfd)
-    return n_nfd;
-
-  if (0 > bfd_seek (archive, filepos, SEEK_SET))
-    return NULL;
-
-  if ((new_areldata = (struct areltdata *) _bfd_read_ar_hdr (archive)) == NULL)
-    return NULL;
-
-  n_nfd = _bfd_create_empty_archive_element_shell (archive);
-  if (n_nfd == NULL)
-    {
-      bfd_release (archive, (PTR) new_areldata);
-      return NULL;
-    }
-
-  n_nfd->origin = bfd_tell (archive);
-  n_nfd->arelt_data = (PTR) new_areldata;
-  n_nfd->filename = new_areldata->filename;
-
-  if (_bfd_add_bfd_to_archive_cache (archive, filepos, n_nfd))
-    return n_nfd;
-
-  /* huh? */
-  bfd_release (archive, (PTR) n_nfd);
-  bfd_release (archive, (PTR) new_areldata);
-  return NULL;
-}
-
-/* Return the BFD which is referenced by the symbol in ABFD indexed by
-   INDEX.  INDEX should have been returned by bfd_get_next_mapent.  */
-
-bfd *
-_bfd_generic_get_elt_at_index (abfd, index)
-     bfd *abfd;
-     symindex index;
-{
-  carsym *entry;
-
-  entry = bfd_ardata (abfd)->symdefs + index;
-  return _bfd_get_elt_at_filepos (abfd, entry->file_offset);
-}
-
-/*
-FUNCTION
-	bfd_openr_next_archived_file
-
-SYNOPSIS
-	bfd *bfd_openr_next_archived_file(bfd *archive, bfd *previous);
-
-DESCRIPTION
-	Provided a BFD, @var{archive}, containing an archive and NULL, open
-	an input BFD on the first contained element and returns that.
-	Subsequent calls should pass
-	the archive and the previous return value to return a created
-	BFD to the next contained element. NULL is returned when there
-	are no more.
-
-*/
-
-bfd *
-bfd_openr_next_archived_file (archive, last_file)
-     bfd *archive;
-     bfd *last_file;
-{
-  if ((bfd_get_format (archive) != bfd_archive) ||
-      (archive->direction == write_direction))
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return NULL;
-    }
-
-  return BFD_SEND (archive,
-		   openr_next_archived_file,
-		   (archive,
-		    last_file));
-}
-
-bfd *
-bfd_generic_openr_next_archived_file (archive, last_file)
-     bfd *archive;
-     bfd *last_file;
-{
-  file_ptr filestart;
-
-  if (!last_file)
-    filestart = bfd_ardata (archive)->first_file_filepos;
-  else
-    {
-      unsigned int size = arelt_size (last_file);
-      /* Pad to an even boundary...
-	 Note that last_file->origin can be odd in the case of
-	 BSD-4.4-style element with a long odd size. */
-      filestart = last_file->origin + size;
-      filestart += filestart % 2;
-    }
-
-  return _bfd_get_elt_at_filepos (archive, filestart);
-}
-
-
-const bfd_target *
-bfd_generic_archive_p (abfd)
-     bfd *abfd;
-{
-  struct artdata *tdata_hold;
-  char armag[SARMAG + 1];
-
-  tdata_hold = abfd->tdata.aout_ar_data;
-
-  if (bfd_read ((PTR) armag, 1, SARMAG, abfd) != SARMAG)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-#ifdef GNU960
-  if (strncmp (armag, BFD_GNU960_ARMAG (abfd), SARMAG) != 0)
-    return 0;
-#else
-  if (strncmp (armag, ARMAG, SARMAG) != 0 &&
-      strncmp (armag, ARMAGB, SARMAG) != 0)
-    return 0;
-#endif
-
-  /* We are setting bfd_ardata(abfd) here, but since bfd_ardata
-     involves a cast, we can't do it as the left operand of assignment. */
-  abfd->tdata.aout_ar_data = ((struct artdata *)
-			      bfd_zalloc (abfd, sizeof (struct artdata)));
-
-  if (bfd_ardata (abfd) == NULL)
-    return NULL;
-
-  bfd_ardata (abfd)->first_file_filepos = SARMAG;
-  bfd_ardata (abfd)->cache = NULL;
-  bfd_ardata (abfd)->archive_head = NULL;
-  bfd_ardata (abfd)->symdefs = NULL;
-  bfd_ardata (abfd)->extended_names = NULL;
-  bfd_ardata (abfd)->tdata = NULL;
-
-  if (!BFD_SEND (abfd, _bfd_slurp_armap, (abfd)))
-    {
-      bfd_release (abfd, bfd_ardata (abfd));
-      abfd->tdata.aout_ar_data = tdata_hold;
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (!BFD_SEND (abfd, _bfd_slurp_extended_name_table, (abfd)))
-    {
-      bfd_release (abfd, bfd_ardata (abfd));
-      abfd->tdata.aout_ar_data = tdata_hold;
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (bfd_has_map (abfd))
-    {
-      bfd *first;
-
-      /* This archive has a map, so we may presume that the contents
-	 are object files.  Make sure that if the first file in the
-	 archive can be recognized as an object file, it is for this
-	 target.  If not, assume that this is the wrong format.  If
-	 the first file is not an object file, somebody is doing
-	 something weird, and we permit it so that ar -t will work.
-
-	 This is done because any normal format will recognize any
-	 normal archive, regardless of the format of the object files.
-	 We do accept an empty archive.  */
-
-      first = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
-      if (first != NULL)
-	{
-	  boolean fail;
-
-	  first->target_defaulted = false;
-	  fail = false;
-	  if (bfd_check_format (first, bfd_object)
-	      && first->xvec != abfd->xvec)
-	    {
-	      (void) bfd_close (first);
-	      bfd_release (abfd, bfd_ardata (abfd));
-	      abfd->tdata.aout_ar_data = tdata_hold;
-	      bfd_set_error (bfd_error_wrong_format);
-	      return NULL;
-	    }
-
-	  /* We ought to close first here, but we can't, because we
-             have no way to remove it from the archive cache.  FIXME.  */
-	}
-    }
-
-  return abfd->xvec;
-}
-
-/* Some constants for a 32 bit BSD archive structure.  We do not
-   support 64 bit archives presently; so far as I know, none actually
-   exist.  Supporting them would require changing these constants, and
-   changing some bfd_h_get_32 to bfd_h_get_64.  */
-
-/* The size of an external symdef structure.  */
-#define BSD_SYMDEF_SIZE 8
-
-/* The offset from the start of a symdef structure to the file offset.  */
-#define BSD_SYMDEF_OFFSET_SIZE 4
-
-/* The size of the symdef count.  */
-#define BSD_SYMDEF_COUNT_SIZE 4
-
-/* The size of the string count.  */
-#define BSD_STRING_COUNT_SIZE 4
-
-/* Returns false on error, true otherwise */
-
-static boolean
-do_slurp_bsd_armap (abfd)
-     bfd *abfd;
-{
-  struct areltdata *mapdata;
-  unsigned int counter;
-  bfd_byte *raw_armap, *rbase;
-  struct artdata *ardata = bfd_ardata (abfd);
-  char *stringbase;
-  unsigned int parsed_size;
-  carsym *set;
-
-  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
-  if (mapdata == NULL)
-    return false;
-  parsed_size = mapdata->parsed_size;
-  bfd_release (abfd, (PTR) mapdata);	/* Don't need it any more. */
-
-  raw_armap = (bfd_byte *) bfd_zalloc (abfd, parsed_size);
-  if (raw_armap == (bfd_byte *) NULL)
-    return false;
-
-  if (bfd_read ((PTR) raw_armap, 1, parsed_size, abfd) != parsed_size)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_malformed_archive);
-    byebye:
-      bfd_release (abfd, (PTR) raw_armap);
-      return false;
-    }
-
-  ardata->symdef_count = bfd_h_get_32 (abfd, raw_armap) / BSD_SYMDEF_SIZE;
-
-  if (ardata->symdef_count * BSD_SYMDEF_SIZE >
-      parsed_size - BSD_SYMDEF_COUNT_SIZE)
-    {
-      /* Probably we're using the wrong byte ordering.  */
-      bfd_set_error (bfd_error_wrong_format);
-      goto byebye;
-    }
-
-  ardata->cache = 0;
-  rbase = raw_armap + BSD_SYMDEF_COUNT_SIZE;
-  stringbase = ((char *) rbase
-		+ ardata->symdef_count * BSD_SYMDEF_SIZE
-		+ BSD_STRING_COUNT_SIZE);
-  ardata->symdefs = (carsym *) bfd_alloc (abfd,
-					  (ardata->symdef_count
-					   * sizeof (carsym)));
-  if (!ardata->symdefs)
-    return false;
-
-  for (counter = 0, set = ardata->symdefs;
-       counter < ardata->symdef_count;
-       counter++, set++, rbase += BSD_SYMDEF_SIZE)
-    {
-      set->name = bfd_h_get_32 (abfd, rbase) + stringbase;
-      set->file_offset = bfd_h_get_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
-    }
-
-  ardata->first_file_filepos = bfd_tell (abfd);
-  /* Pad to an even boundary if you have to */
-  ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
-  /* FIXME, we should provide some way to free raw_ardata when
-     we are done using the strings from it.  For now, it seems
-     to be allocated on an objalloc anyway... */
-  bfd_has_map (abfd) = true;
-  return true;
-}
-
-/* Returns false on error, true otherwise */
-static boolean
-do_slurp_coff_armap (abfd)
-     bfd *abfd;
-{
-  struct areltdata *mapdata;
-  int *raw_armap, *rawptr;
-  struct artdata *ardata = bfd_ardata (abfd);
-  char *stringbase;
-  unsigned int stringsize;
-  unsigned int parsed_size;
-  carsym *carsyms;
-  unsigned int nsymz;		/* Number of symbols in armap. */
-  bfd_vma (*swap) PARAMS ((const bfd_byte *));
-  char int_buf[sizeof (long)];
-  unsigned int carsym_size, ptrsize, i;
-
-  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
-  if (mapdata == NULL)
-    return false;
-  parsed_size = mapdata->parsed_size;
-  bfd_release (abfd, (PTR) mapdata);	/* Don't need it any more. */
-
-  if (bfd_read ((PTR) int_buf, 1, 4, abfd) != 4)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_malformed_archive);
-      return false;
-    }
-  /* It seems that all numeric information in a coff archive is always
-     in big endian format, nomatter the host or target. */
-  swap = bfd_getb32;
-  nsymz = bfd_getb32 ((PTR) int_buf);
-  stringsize = parsed_size - (4 * nsymz) - 4;
-
-#if 1
-  /* ... except that some archive formats are broken, and it may be our
-     fault - the i960 little endian coff sometimes has big and sometimes
-     little, because our tools changed.  Here's a horrible hack to clean
-     up the crap.  */
-
-  if (stringsize > 0xfffff
-      && bfd_get_arch (abfd) == bfd_arch_i960
-      && bfd_get_flavour (abfd) == bfd_target_coff_flavour)
-    {
-      /* This looks dangerous, let's do it the other way around */
-      nsymz = bfd_getl32 ((PTR) int_buf);
-      stringsize = parsed_size - (4 * nsymz) - 4;
-      swap = bfd_getl32;
-    }
-#endif
-
-  /* The coff armap must be read sequentially.  So we construct a
-     bsd-style one in core all at once, for simplicity. */
-
-  carsym_size = (nsymz * sizeof (carsym));
-  ptrsize = (4 * nsymz);
-
-  ardata->symdefs = (carsym *) bfd_zalloc (abfd, carsym_size + stringsize + 1);
-  if (ardata->symdefs == NULL)
-    return false;
-  carsyms = ardata->symdefs;
-  stringbase = ((char *) ardata->symdefs) + carsym_size;
-
-  /* Allocate and read in the raw offsets. */
-  raw_armap = (int *) bfd_alloc (abfd, ptrsize);
-  if (raw_armap == NULL)
-    goto release_symdefs;
-  if (bfd_read ((PTR) raw_armap, 1, ptrsize, abfd) != ptrsize
-      || bfd_read ((PTR) stringbase, 1, stringsize, abfd) != stringsize)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_malformed_archive);
-      goto release_raw_armap;
-    }
-
-  /* OK, build the carsyms */
-  for (i = 0; i < nsymz; i++)
-    {
-      rawptr = raw_armap + i;
-      carsyms->file_offset = swap ((PTR) rawptr);
-      carsyms->name = stringbase;
-      stringbase += strlen (stringbase) + 1;
-      carsyms++;
-    }
-  *stringbase = 0;
-
-  ardata->symdef_count = nsymz;
-  ardata->first_file_filepos = bfd_tell (abfd);
-  /* Pad to an even boundary if you have to */
-  ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
-
-
-  bfd_has_map (abfd) = true;
-  bfd_release (abfd, (PTR) raw_armap);
-
-
-  /* Check for a second archive header (as used by PE) */
-  {
-    struct areltdata *tmp;
-
-    bfd_seek (abfd,   ardata->first_file_filepos, SEEK_SET);
-    tmp = (struct areltdata *) _bfd_read_ar_hdr (abfd);
-    if (tmp != NULL) 
-      {
-	if (tmp->arch_header[0] == '/'
-	    && tmp->arch_header[1] == ' ') 
-	  {
-	    ardata->first_file_filepos +=
-	      (tmp->parsed_size + sizeof(struct ar_hdr) + 1) & ~1;
-	  }
-	bfd_release (abfd, tmp);
-      }
-  }
-
-  return true;
-
-release_raw_armap:
-  bfd_release (abfd, (PTR) raw_armap);
-release_symdefs:
-  bfd_release (abfd, (PTR) (ardata)->symdefs);
-  return false;
-}
-
-/* This routine can handle either coff-style or bsd-style armaps.
-   Returns false on error, true otherwise */
-
-boolean
-bfd_slurp_armap (abfd)
-     bfd *abfd;
-{
-  char nextname[17];
-  int i = bfd_read ((PTR) nextname, 1, 16, abfd);
-
-  if (i == 0)
-    return true;
-  if (i != 16)
-    return false;
-
-  if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
-    return false;
-
-  if (!strncmp (nextname, "__.SYMDEF       ", 16)
-      || !strncmp (nextname, "__.SYMDEF/      ", 16)) /* old Linux archives */
-    return do_slurp_bsd_armap (abfd);
-  else if (!strncmp (nextname, "/               ", 16))
-    return do_slurp_coff_armap (abfd);
-  else if (!strncmp (nextname, "/SYM64/         ", 16))
-    {
-      /* Irix 6 archive--must be recognized by code in elf64-mips.c.  */
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  bfd_has_map (abfd) = false;
-  return true;
-}
-
-/* Returns false on error, true otherwise */
-/* flavor 2 of a bsd armap, similar to bfd_slurp_bsd_armap except the
-   header is in a slightly different order and the map name is '/'.
-   This flavour is used by hp300hpux. */
-
-#define HPUX_SYMDEF_COUNT_SIZE 2
-
-boolean
-bfd_slurp_bsd_armap_f2 (abfd)
-     bfd *abfd;
-{
-  struct areltdata *mapdata;
-  char nextname[17];
-  unsigned int counter;
-  bfd_byte *raw_armap, *rbase;
-  struct artdata *ardata = bfd_ardata (abfd);
-  char *stringbase;
-  unsigned int stringsize;
-  carsym *set;
-  int i = bfd_read ((PTR) nextname, 1, 16, abfd);
-
-  if (i == 0)
-    return true;
-  if (i != 16)
-    return false;
-
-  /* The archive has at least 16 bytes in it */
-  if (bfd_seek (abfd, -16L, SEEK_CUR) != 0)
-    return false;
-
-  if (!strncmp (nextname, "__.SYMDEF       ", 16)
-      || !strncmp (nextname, "__.SYMDEF/      ", 16)) /* old Linux archives */
-    return do_slurp_bsd_armap (abfd);
-
-  if (strncmp (nextname, "/               ", 16))
-    {
-      bfd_has_map (abfd) = false;
-      return true;
-    }
-
-  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
-  if (mapdata == NULL)
-    return false;
-
-  raw_armap = (bfd_byte *) bfd_zalloc (abfd, mapdata->parsed_size);
-  if (raw_armap == NULL)
-    {
-    byebye:
-      bfd_release (abfd, (PTR) mapdata);
-      return false;
-    }
-
-  if (bfd_read ((PTR) raw_armap, 1, mapdata->parsed_size, abfd) !=
-      mapdata->parsed_size)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_malformed_archive);
-    byebyebye:
-      bfd_release (abfd, (PTR) raw_armap);
-      goto byebye;
-    }
-
-  ardata->symdef_count = bfd_h_get_16 (abfd, (PTR) raw_armap);
-
-  if (ardata->symdef_count * BSD_SYMDEF_SIZE
-      > mapdata->parsed_size - HPUX_SYMDEF_COUNT_SIZE)
-    {
-      /* Probably we're using the wrong byte ordering.  */
-      bfd_set_error (bfd_error_wrong_format);
-      goto byebyebye;
-    }
-
-  ardata->cache = 0;
-
-  stringsize = bfd_h_get_32 (abfd, raw_armap + HPUX_SYMDEF_COUNT_SIZE);
-  /* skip sym count and string sz */
-  stringbase = ((char *) raw_armap
-		+ HPUX_SYMDEF_COUNT_SIZE
-		+ BSD_STRING_COUNT_SIZE);
-  rbase = (bfd_byte *) stringbase + stringsize;
-  ardata->symdefs = (carsym *) bfd_alloc (abfd,
-					  (ardata->symdef_count
-					   * BSD_SYMDEF_SIZE));
-  if (!ardata->symdefs)
-    return false;
-
-  for (counter = 0, set = ardata->symdefs;
-       counter < ardata->symdef_count;
-       counter++, set++, rbase += BSD_SYMDEF_SIZE)
-    {
-      set->name = bfd_h_get_32 (abfd, rbase) + stringbase;
-      set->file_offset = bfd_h_get_32 (abfd, rbase + BSD_SYMDEF_OFFSET_SIZE);
-    }
-
-  ardata->first_file_filepos = bfd_tell (abfd);
-  /* Pad to an even boundary if you have to */
-  ardata->first_file_filepos += (ardata->first_file_filepos) % 2;
-  /* FIXME, we should provide some way to free raw_ardata when
-     we are done using the strings from it.  For now, it seems
-     to be allocated on an objalloc anyway... */
-  bfd_has_map (abfd) = true;
-  return true;
-}
-
-/** Extended name table.
-
-  Normally archives support only 14-character filenames.
-
-  Intel has extended the format: longer names are stored in a special
-  element (the first in the archive, or second if there is an armap);
-  the name in the ar_hdr is replaced by <space><index into filename
-  element>.  Index is the P.R. of an int (decimal).  Data General have
-  extended the format by using the prefix // for the special element */
-
-/* Returns false on error, true otherwise */
-boolean
-_bfd_slurp_extended_name_table (abfd)
-     bfd *abfd;
-{
-  char nextname[17];
-  struct areltdata *namedata;
-
-  /* FIXME:  Formatting sucks here, and in case of failure of BFD_READ,
-     we probably don't want to return true.  */
-  bfd_seek (abfd, bfd_ardata (abfd)->first_file_filepos, SEEK_SET);
-  if (bfd_read ((PTR) nextname, 1, 16, abfd) == 16)
-    {
-      if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
-	return false;
-
-      if (strncmp (nextname, "ARFILENAMES/    ", 16) != 0 &&
-	  strncmp (nextname, "//              ", 16) != 0)
-	{
-	  bfd_ardata (abfd)->extended_names = NULL;
-	  return true;
-	}
-
-      namedata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
-      if (namedata == NULL)
-	return false;
-
-      bfd_ardata (abfd)->extended_names =
-	bfd_zalloc (abfd, namedata->parsed_size);
-      if (bfd_ardata (abfd)->extended_names == NULL)
-	{
-	byebye:
-	  bfd_release (abfd, (PTR) namedata);
-	  return false;
-	}
-
-      if (bfd_read ((PTR) bfd_ardata (abfd)->extended_names, 1,
-		    namedata->parsed_size, abfd) != namedata->parsed_size)
-	{
-	  if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_malformed_archive);
-	  bfd_release (abfd, (PTR) (bfd_ardata (abfd)->extended_names));
-	  bfd_ardata (abfd)->extended_names = NULL;
-	  goto byebye;
-	}
-
-      /* Since the archive is supposed to be printable if it contains
-	 text, the entries in the list are newline-padded, not null
-	 padded. In SVR4-style archives, the names also have a
-	 trailing '/'.  DOS/NT created archive often have \ in them
-	 We'll fix all problems here..  */
-      {
-	char *temp = bfd_ardata (abfd)->extended_names;
-	char *limit = temp + namedata->parsed_size;
-	for (; temp < limit; ++temp) {
-	  if (*temp == '\012')
-	    temp[temp[-1] == '/' ? -1 : 0] = '\0';
-	  if (*temp == '\\')
-	    *temp = '/';
-	}
-      }
-
-      /* Pad to an even boundary if you have to */
-      bfd_ardata (abfd)->first_file_filepos = bfd_tell (abfd);
-      bfd_ardata (abfd)->first_file_filepos +=
-	(bfd_ardata (abfd)->first_file_filepos) % 2;
-
-      /* FIXME, we can't release namedata here because it was allocated
-	 below extended_names on the objalloc... */
-      /* bfd_release (abfd, namedata); */
-    }
-  return true;
-}
-
-#ifdef VMS
-
-/* Return a copy of the stuff in the filename between any :]> and a
-   semicolon */
-static const char *
-normalize (abfd, file)
-     bfd *abfd;
-     const char *file;
-{
-  CONST char *first;
-  CONST char *last;
-  char *copy;
-
-  first = file + strlen (file) - 1;
-  last = first + 1;
-
-  while (first != file)
-    {
-      if (*first == ';')
-	last = first;
-      if (*first == ':' || *first == ']' || *first == '>')
-	{
-	  first++;
-	  break;
-	}
-      first--;
-    }
-
-  copy = (char *) bfd_alloc (abfd, last - first + 1);
-  if (copy == NULL)
-    return NULL;
-
-  memcpy (copy, first, last - first);
-  copy[last - first] = 0;
-
-  return copy;
-}
-
-#else
-static const char *
-normalize (abfd, file)
-     bfd *abfd;
-     const char *file;
-{
-  const char *filename = strrchr (file, '/');
-
-  if (filename != (char *) NULL)
-    filename++;
-  else
-    filename = file;
-  return filename;
-}
-#endif
-
-/* Build a BFD style extended name table.  */
-
-boolean
-_bfd_archive_bsd_construct_extended_name_table (abfd, tabloc, tablen, name)
-     bfd *abfd;
-     char **tabloc;
-     bfd_size_type *tablen;
-     const char **name;
-{
-  *name = "ARFILENAMES/";
-  return _bfd_construct_extended_name_table (abfd, false, tabloc, tablen);
-}
-
-/* Build an SVR4 style extended name table.  */
-
-boolean
-_bfd_archive_coff_construct_extended_name_table (abfd, tabloc, tablen, name)
-     bfd *abfd;
-     char **tabloc;
-     bfd_size_type *tablen;
-     const char **name;
-{
-  *name = "//";
-  return _bfd_construct_extended_name_table (abfd, true, tabloc, tablen);
-}
-
-/* Follows archive_head and produces an extended name table if
-   necessary.  Returns (in tabloc) a pointer to an extended name
-   table, and in tablen the length of the table.  If it makes an entry
-   it clobbers the filename so that the element may be written without
-   further massage.  Returns true if it ran successfully, false if
-   something went wrong.  A successful return may still involve a
-   zero-length tablen!  */
-
-boolean
-_bfd_construct_extended_name_table (abfd, trailing_slash, tabloc, tablen)
-     bfd *abfd;
-     boolean trailing_slash;
-     char **tabloc;
-     bfd_size_type *tablen;
-{
-  unsigned int maxname = abfd->xvec->ar_max_namelen;
-  unsigned int total_namelen = 0;
-  bfd *current;
-  char *strptr;
-
-  *tablen = 0;
-
-  /* Figure out how long the table should be */
-  for (current = abfd->archive_head; current != NULL; current = current->next)
-    {
-      const char *normal;
-      unsigned int thislen;
-
-      normal = normalize (current, current->filename);
-      if (normal == NULL)
-	return false;
-
-      thislen = strlen (normal);
-
-      if (thislen > maxname
-	  && (bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
-	thislen = maxname;
-
-      if (thislen > maxname)
-	{
-	  /* Add one to leave room for \n.  */
-	  total_namelen += thislen + 1;
-	  if (trailing_slash)
-	    {
-	      /* Leave room for trailing slash.  */
-	      ++total_namelen;
-	    }
-	}
-      else
-	{
-	  struct ar_hdr *hdr = arch_hdr (current);
-	  if (strncmp (normal, hdr->ar_name, thislen) != 0
-	      || (thislen < sizeof hdr->ar_name
-		  && hdr->ar_name[thislen] != ar_padchar (current)))
-	    {
-	      /* Must have been using extended format even though it
-	         didn't need to.  Fix it to use normal format.  */
-	      memcpy (hdr->ar_name, normal, thislen);
-	      if (thislen < maxname
-		  || (thislen == maxname && thislen < sizeof hdr->ar_name))
-		hdr->ar_name[thislen] = ar_padchar (current);
-	    }
-	}
-    }
-
-  if (total_namelen == 0)
-    return true;
-
-  *tabloc = bfd_zalloc (abfd, total_namelen);
-  if (*tabloc == NULL)
-    return false;
-
-  *tablen = total_namelen;
-  strptr = *tabloc;
-
-  for (current = abfd->archive_head; current != NULL; current =
-       current->next)
-    {
-      const char *normal;
-      unsigned int thislen;
-
-      normal = normalize (current, current->filename);
-      if (normal == NULL)
-	return false;
-
-      thislen = strlen (normal);
-      if (thislen > maxname)
-	{
-	  /* Works for now; may need to be re-engineered if we
-	     encounter an oddball archive format and want to
-	     generalise this hack. */
-	  struct ar_hdr *hdr = arch_hdr (current);
-	  strcpy (strptr, normal);
-	  if (! trailing_slash)
-	    strptr[thislen] = '\012';
-	  else
-	    {
-	      strptr[thislen] = '/';
-	      strptr[thislen + 1] = '\012';
-	    }
-	  hdr->ar_name[0] = ar_padchar (current);
-	  /* We know there will always be enough room (one of the few
-	     cases where you may safely use sprintf). */
-	  sprintf ((hdr->ar_name) + 1, "%-d", (unsigned) (strptr - *tabloc));
-	  /* Kinda Kludgy.  We should just use the returned value of
-	     sprintf but not all implementations get this right */
-	  {
-	    char *temp = hdr->ar_name + 2;
-	    for (; temp < hdr->ar_name + maxname; temp++)
-	      if (*temp == '\0')
-		*temp = ' ';
-	  }
-	  strptr += thislen + 1;
-	  if (trailing_slash)
-	    ++strptr;
-	}
-    }
-
-  return true;
-}
-
-/** A couple of functions for creating ar_hdrs */
-
-/* Takes a filename, returns an arelt_data for it, or NULL if it can't
-   make one.  The filename must refer to a filename in the filesystem.
-   The filename field of the ar_hdr will NOT be initialized.  If member
-   is set, and it's an in-memory bfd, we fake it. */
-
-static struct areltdata *
-bfd_ar_hdr_from_filesystem (abfd, filename, member)
-     bfd *abfd;
-     const char *filename;
-     bfd *member;
-{
-  struct stat status;
-  struct areltdata *ared;
-  struct ar_hdr *hdr;
-  char *temp, *temp1;
-
-  if (member && (member->flags & BFD_IN_MEMORY) != 0)
-    {
-      /* Assume we just "made" the member, and fake it */
-      struct bfd_in_memory *bim = (struct bfd_in_memory *) member->iostream;
-      time(&status.st_mtime);
-      status.st_uid = getuid();
-      status.st_gid = getgid();
-      status.st_mode = 0644;
-      status.st_size = bim->size;
-    }
-  else if (stat (filename, &status) != 0)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return NULL;
-    }
-
-  ared = (struct areltdata *) bfd_zalloc (abfd, sizeof (struct ar_hdr) +
-					  sizeof (struct areltdata));
-  if (ared == NULL)
-    return NULL;
-  hdr = (struct ar_hdr *) (((char *) ared) + sizeof (struct areltdata));
-
-  /* ar headers are space padded, not null padded! */
-  memset ((PTR) hdr, ' ', sizeof (struct ar_hdr));
-
-  strncpy (hdr->ar_fmag, ARFMAG, 2);
-
-  /* Goddamned sprintf doesn't permit MAXIMUM field lengths */
-  sprintf ((hdr->ar_date), "%-12ld", (long) status.st_mtime);
-  sprintf ((hdr->ar_uid), "%ld", (long) status.st_uid);
-  sprintf ((hdr->ar_gid), "%ld", (long) status.st_gid);
-  sprintf ((hdr->ar_mode), "%-8o", (unsigned int) status.st_mode);
-  sprintf ((hdr->ar_size), "%-10ld", (long) status.st_size);
-  /* Correct for a lossage in sprintf whereby it null-terminates.  I cannot
-     understand how these C losers could design such a ramshackle bunch of
-     IO operations */
-  temp = (char *) hdr;
-  temp1 = temp + sizeof (struct ar_hdr) - 2;
-  for (; temp < temp1; temp++)
-    {
-      if (*temp == '\0')
-	*temp = ' ';
-    }
-  strncpy (hdr->ar_fmag, ARFMAG, 2);
-  ared->parsed_size = status.st_size;
-  ared->arch_header = (char *) hdr;
-
-  return ared;
-}
-
-/* This is magic required by the "ar" program.  Since it's
-    undocumented, it's undocumented.  You may think that it would take
-    a strong stomach to write this, and it does, but it takes even a
-    stronger stomach to try to code around such a thing!  */
-
-struct ar_hdr *bfd_special_undocumented_glue PARAMS ((bfd *, const char *));
-
-struct ar_hdr *
-bfd_special_undocumented_glue (abfd, filename)
-     bfd *abfd;
-     const char *filename;
-{
-  struct areltdata *ar_elt = bfd_ar_hdr_from_filesystem (abfd, filename, 0);
-  if (ar_elt == NULL)
-    return NULL;
-  return (struct ar_hdr *) ar_elt->arch_header;
-}
-
-
-/* Analogous to stat call */
-int
-bfd_generic_stat_arch_elt (abfd, buf)
-     bfd *abfd;
-     struct stat *buf;
-{
-  struct ar_hdr *hdr;
-  char *aloser;
-
-  if (abfd->arelt_data == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  hdr = arch_hdr (abfd);
-
-#define foo(arelt, stelt, size)  \
-  buf->stelt = strtol (hdr->arelt, &aloser, size); \
-  if (aloser == hdr->arelt) return -1;
-
-  foo (ar_date, st_mtime, 10);
-  foo (ar_uid, st_uid, 10);
-  foo (ar_gid, st_gid, 10);
-  foo (ar_mode, st_mode, 8);
-
-  buf->st_size = arch_eltdata (abfd)->parsed_size;
-
-  return 0;
-}
-
-void
-bfd_dont_truncate_arname (abfd, pathname, arhdr)
-     bfd *abfd;
-     CONST char *pathname;
-     char *arhdr;
-{
-  /* FIXME: This interacts unpleasantly with ar's quick-append option.
-     Fortunately ic960 users will never use that option.  Fixing this
-     is very hard; fortunately I know how to do it and will do so once
-     intel's release is out the door. */
-
-  struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
-  size_t length;
-  const char *filename;
-  size_t maxlen = ar_maxnamelen (abfd);
-
-  if ((bfd_get_file_flags (abfd) & BFD_TRADITIONAL_FORMAT) != 0)
-    {
-      bfd_bsd_truncate_arname (abfd, pathname, arhdr);
-      return;
-    }
-
-  filename = normalize (abfd, pathname);
-  if (filename == NULL)
-    {
-      /* FIXME */
-      abort ();
-    }
-
-  length = strlen (filename);
-
-  if (length <= maxlen)
-    memcpy (hdr->ar_name, filename, length);
-
-  /* Add the padding character if there is room for it.  */
-  if (length < maxlen
-      || (length == maxlen && length < sizeof hdr->ar_name))
-    (hdr->ar_name)[length] = ar_padchar (abfd);
-}
-
-void
-bfd_bsd_truncate_arname (abfd, pathname, arhdr)
-     bfd *abfd;
-     CONST char *pathname;
-     char *arhdr;
-{
-  struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
-  int length;
-  CONST char *filename = strrchr (pathname, '/');
-  int maxlen = ar_maxnamelen (abfd);
-
-  if (filename == NULL)
-    filename = pathname;
-  else
-    ++filename;
-
-  length = strlen (filename);
-
-  if (length <= maxlen)
-    memcpy (hdr->ar_name, filename, length);
-  else
-    {
-      /* pathname: meet procrustes */
-      memcpy (hdr->ar_name, filename, maxlen);
-      length = maxlen;
-    }
-
-  if (length < maxlen)
-    (hdr->ar_name)[length] = ar_padchar (abfd);
-}
-
-/* Store name into ar header.  Truncates the name to fit.
-   1> strip pathname to be just the basename.
-   2> if it's short enuf to fit, stuff it in.
-   3> If it doesn't end with .o, truncate it to fit
-   4> truncate it before the .o, append .o, stuff THAT in.  */
-
-/* This is what gnu ar does.  It's better but incompatible with the
-   bsd ar. */
-
-void
-bfd_gnu_truncate_arname (abfd, pathname, arhdr)
-     bfd *abfd;
-     CONST char *pathname;
-     char *arhdr;
-{
-  struct ar_hdr *hdr = (struct ar_hdr *) arhdr;
-  int length;
-  CONST char *filename = strrchr (pathname, '/');
-  int maxlen = ar_maxnamelen (abfd);
-
-  if (filename == NULL)
-    filename = pathname;
-  else
-    ++filename;
-
-  length = strlen (filename);
-
-  if (length <= maxlen)
-    memcpy (hdr->ar_name, filename, length);
-  else
-    {				/* pathname: meet procrustes */
-      memcpy (hdr->ar_name, filename, maxlen);
-      if ((filename[length - 2] == '.') && (filename[length - 1] == 'o'))
-	{
-	  hdr->ar_name[maxlen - 2] = '.';
-	  hdr->ar_name[maxlen - 1] = 'o';
-	}
-      length = maxlen;
-    }
-
-  if (length < 16)
-    (hdr->ar_name)[length] = ar_padchar (abfd);
-}
-
-/* The BFD is open for write and has its format set to bfd_archive */
-
-boolean
-_bfd_write_archive_contents (arch)
-     bfd *arch;
-{
-  bfd *current;
-  char *etable = NULL;
-  bfd_size_type elength = 0;
-  const char *ename = NULL;
-  boolean makemap = bfd_has_map (arch);
-  boolean hasobjects = false;	/* if no .o's, don't bother to make a map */
-  bfd_size_type wrote;
-  unsigned int i;
-  int tries;
-
-  /* Verify the viability of all entries; if any of them live in the
-     filesystem (as opposed to living in an archive open for input)
-     then construct a fresh ar_hdr for them.  */
-  for (current = arch->archive_head; current; current = current->next)
-    {
-      if (bfd_write_p (current))
-	{
-	  bfd_set_error (bfd_error_invalid_operation);
-	  return false;
-	}
-      if (!current->arelt_data)
-	{
-	  current->arelt_data =
-	    (PTR) bfd_ar_hdr_from_filesystem (arch, current->filename, current);
-	  if (!current->arelt_data)
-	    return false;
-
-	  /* Put in the file name */
-	  BFD_SEND (arch, _bfd_truncate_arname, (arch,
-						 current->filename,
-					      (char *) arch_hdr (current)));
-	}
-
-      if (makemap && ! hasobjects)
-	{			/* don't bother if we won't make a map! */
-	  if ((bfd_check_format (current, bfd_object))
-#if 0				/* FIXME -- these are not set correctly */
-	      && ((bfd_get_file_flags (current) & HAS_SYMS))
-#endif
-	    )
-	    hasobjects = true;
-	}
-    }
-
-  if (!BFD_SEND (arch, _bfd_construct_extended_name_table,
-		 (arch, &etable, &elength, &ename)))
-    return false;
-
-  if (bfd_seek (arch, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
-#ifdef GNU960
-  wrote = bfd_write (BFD_GNU960_ARMAG (arch), 1, SARMAG, arch);
-#else
-  wrote = bfd_write (ARMAG, 1, SARMAG, arch);
-#endif
-  if (wrote != SARMAG)
-    return false;
-
-  if (makemap && hasobjects)
-    {
-      if (_bfd_compute_and_write_armap (arch, elength) != true)
-	return false;
-    }
-
-  if (elength != 0)
-    {
-      struct ar_hdr hdr;
-
-      memset ((char *) (&hdr), 0, sizeof (struct ar_hdr));
-      strcpy (hdr.ar_name, ename);
-      /* Round size up to even number in archive header.  */
-      sprintf (&(hdr.ar_size[0]), "%-10d",
-	       (int) ((elength + 1) & ~1));
-      strncpy (hdr.ar_fmag, ARFMAG, 2);
-      for (i = 0; i < sizeof (struct ar_hdr); i++)
-	if (((char *) (&hdr))[i] == '\0')
-	  (((char *) (&hdr))[i]) = ' ';
-      if ((bfd_write ((char *) &hdr, 1, sizeof (struct ar_hdr), arch)
-	   != sizeof (struct ar_hdr))
-	  || bfd_write (etable, 1, elength, arch) != elength)
-	return false;
-      if ((elength % 2) == 1)
-	{
-	  if (bfd_write ("\012", 1, 1, arch) != 1)
-	    return false;
-	}
-    }
-
-  for (current = arch->archive_head; current; current = current->next)
-    {
-      char buffer[DEFAULT_BUFFERSIZE];
-      unsigned int remaining = arelt_size (current);
-      struct ar_hdr *hdr = arch_hdr (current);
-
-      /* write ar header */
-      if (bfd_write ((char *) hdr, 1, sizeof (*hdr), arch) != sizeof (*hdr))
-	return false;
-      if (bfd_seek (current, (file_ptr) 0, SEEK_SET) != 0)
-	return false;
-      while (remaining)
-	{
-	  unsigned int amt = DEFAULT_BUFFERSIZE;
-	  if (amt > remaining)
-	    amt = remaining;
-	  errno = 0;
-	  if (bfd_read (buffer, amt, 1, current) != amt)
-	    {
-	      if (bfd_get_error () != bfd_error_system_call)
-		bfd_set_error (bfd_error_malformed_archive);
-	      return false;
-	    }
-	  if (bfd_write (buffer, amt, 1, arch) != amt)
-	    return false;
-	  remaining -= amt;
-	}
-      if ((arelt_size (current) % 2) == 1)
-	{
-	  if (bfd_write ("\012", 1, 1, arch) != 1)
-	    return false;
-	}
-    }
-
-  if (makemap && hasobjects)
-    {
-      /* Verify the timestamp in the archive file.  If it would not be
-	 accepted by the linker, rewrite it until it would be.  If
-	 anything odd happens, break out and just return.  (The
-	 Berkeley linker checks the timestamp and refuses to read the
-	 table-of-contents if it is >60 seconds less than the file's
-	 modified-time.  That painful hack requires this painful hack.  */
-      tries = 1;
-      do
-	{
-	  if (bfd_update_armap_timestamp (arch))
-	    break;
-	  (*_bfd_error_handler)
-	    (_("Warning: writing archive was slow: rewriting timestamp\n"));
-	}
-      while (++tries < 6);
-    }
-
-  return true;
-}
-
-/* Note that the namidx for the first symbol is 0 */
-
-boolean
-_bfd_compute_and_write_armap (arch, elength)
-     bfd *arch;
-     unsigned int elength;
-{
-  char *first_name = NULL;
-  bfd *current;
-  file_ptr elt_no = 0;
-  struct orl *map = NULL;
-  int orl_max = 1024;		/* fine initial default */
-  int orl_count = 0;
-  int stridx = 0;		/* string index */
-  asymbol **syms = NULL;
-  long syms_max = 0;
-  boolean ret;
-
-  /* Dunno if this is the best place for this info... */
-  if (elength != 0)
-    elength += sizeof (struct ar_hdr);
-  elength += elength % 2;
-
-  map = (struct orl *) bfd_malloc (orl_max * sizeof (struct orl));
-  if (map == NULL)
-    goto error_return;
-
-  /* We put the symbol names on the arch objalloc, and then discard
-     them when done.  */
-  first_name = bfd_alloc (arch, 1);
-  if (first_name == NULL)
-    goto error_return;
-
-  /* Drop all the files called __.SYMDEF, we're going to make our
-     own */
-  while (arch->archive_head &&
-	 strcmp (arch->archive_head->filename, "__.SYMDEF") == 0)
-    arch->archive_head = arch->archive_head->next;
-
-  /* Map over each element */
-  for (current = arch->archive_head;
-       current != (bfd *) NULL;
-       current = current->next, elt_no++)
-    {
-      if ((bfd_check_format (current, bfd_object) == true)
-	  && ((bfd_get_file_flags (current) & HAS_SYMS)))
-	{
-	  long storage;
-	  long symcount;
-	  long src_count;
-
-	  storage = bfd_get_symtab_upper_bound (current);
-	  if (storage < 0)
-	    goto error_return;
-
-	  if (storage != 0)
-	    {
-	      if (storage > syms_max)
-		{
-		  if (syms_max > 0)
-		    free (syms);
-		  syms_max = storage;
-		  syms = (asymbol **) bfd_malloc ((size_t) syms_max);
-		  if (syms == NULL)
-		    goto error_return;
-		}
-	      symcount = bfd_canonicalize_symtab (current, syms);
-	      if (symcount < 0)
-		goto error_return;
-
-	      /* Now map over all the symbols, picking out the ones we want */
-	      for (src_count = 0; src_count < symcount; src_count++)
-		{
-		  flagword flags = (syms[src_count])->flags;
-		  asection *sec = syms[src_count]->section;
-
-		  if ((flags & BSF_GLOBAL ||
-		       flags & BSF_WEAK ||
-		       flags & BSF_INDIRECT ||
-		       bfd_is_com_section (sec))
-		      && ! bfd_is_und_section (sec))
-		    {
-		      size_t namelen;
-		      struct orl *new_map;
-
-		      /* This symbol will go into the archive header */
-		      if (orl_count == orl_max)
-			{
-			  orl_max *= 2;
-			  new_map =
-			    ((struct orl *)
-			     bfd_realloc (map, orl_max * sizeof (struct orl)));
-			  if (new_map == (struct orl *) NULL)
-			    goto error_return;
-
-			  map = new_map;
-			}
-
-		      namelen = strlen (syms[src_count]->name);
-		      map[orl_count].name = ((char **)
-					     bfd_alloc (arch,
-							sizeof (char *)));
-		      if (map[orl_count].name == NULL)
-			goto error_return;
-		      *(map[orl_count].name) = bfd_alloc (arch, namelen + 1);
-		      if (*(map[orl_count].name) == NULL)
-			goto error_return;
-		      strcpy (*(map[orl_count].name), syms[src_count]->name);
-		      (map[orl_count]).pos = (file_ptr) current;
-		      (map[orl_count]).namidx = stridx;
-
-		      stridx += namelen + 1;
-		      ++orl_count;
-		    }
-		}
-	    }
-
-	  /* Now ask the BFD to free up any cached information, so we
-	     don't fill all of memory with symbol tables.  */
-	  if (! bfd_free_cached_info (current))
-	    goto error_return;
-	}
-    }
-
-  /* OK, now we have collected all the data, let's write them out */
-  ret = BFD_SEND (arch, write_armap,
-		  (arch, elength, map, orl_count, stridx));
-
-  if (syms_max > 0)
-    free (syms);
-  if (map != NULL)
-    free (map);
-  if (first_name != NULL)
-    bfd_release (arch, first_name);
-
-  return ret;
-
- error_return:
-  if (syms_max > 0)
-    free (syms);
-  if (map != NULL)
-    free (map);
-  if (first_name != NULL)
-    bfd_release (arch, first_name);
-
-  return false;
-}
-
-boolean
-bsd_write_armap (arch, elength, map, orl_count, stridx)
-     bfd *arch;
-     unsigned int elength;
-     struct orl *map;
-     unsigned int orl_count;
-     int stridx;
-{
-  int padit = stridx & 1;
-  unsigned int ranlibsize = orl_count * BSD_SYMDEF_SIZE;
-  unsigned int stringsize = stridx + padit;
-  /* Include 8 bytes to store ranlibsize and stringsize in output. */
-  unsigned int mapsize = ranlibsize + stringsize + 8;
-  file_ptr firstreal;
-  bfd *current = arch->archive_head;
-  bfd *last_elt = current;	/* last element arch seen */
-  bfd_byte temp[4];
-  unsigned int count;
-  struct ar_hdr hdr;
-  struct stat statbuf;
-  unsigned int i;
-
-  firstreal = mapsize + elength + sizeof (struct ar_hdr) + SARMAG;
-
-  stat (arch->filename, &statbuf);
-  memset ((char *) (&hdr), 0, sizeof (struct ar_hdr));
-  sprintf (hdr.ar_name, RANLIBMAG);
-  /* Remember the timestamp, to keep it holy.  But fudge it a little.  */
-  bfd_ardata (arch)->armap_timestamp = statbuf.st_mtime + ARMAP_TIME_OFFSET;
-  bfd_ardata (arch)->armap_datepos = (SARMAG
-				      + offsetof (struct ar_hdr, ar_date[0]));
-  sprintf (hdr.ar_date, "%ld", bfd_ardata (arch)->armap_timestamp);
-#ifndef _WIN32
-  sprintf (hdr.ar_uid, "%ld", (long) getuid ());
-  sprintf (hdr.ar_gid, "%ld", (long) getgid ());
-#else
-  sprintf (hdr.ar_uid, "%ld", (long) 666);
-  sprintf (hdr.ar_gid, "%ld", (long) 42);
-#endif
-  sprintf (hdr.ar_size, "%-10d", (int) mapsize);
-  strncpy (hdr.ar_fmag, ARFMAG, 2);
-  for (i = 0; i < sizeof (struct ar_hdr); i++)
-    if (((char *) (&hdr))[i] == '\0')
-      (((char *) (&hdr))[i]) = ' ';
-  if (bfd_write ((char *) &hdr, 1, sizeof (struct ar_hdr), arch)
-      != sizeof (struct ar_hdr))
-    return false;
-  bfd_h_put_32 (arch, (bfd_vma) ranlibsize, temp);
-  if (bfd_write (temp, 1, sizeof (temp), arch) != sizeof (temp))
-    return false;
-
-  for (count = 0; count < orl_count; count++)
-    {
-      bfd_byte buf[BSD_SYMDEF_SIZE];
-
-      if (((bfd *) (map[count]).pos) != last_elt)
-	{
-	  do
-	    {
-	      firstreal += arelt_size (current) + sizeof (struct ar_hdr);
-	      firstreal += firstreal % 2;
-	      current = current->next;
-	    }
-	  while (current != (bfd *) (map[count]).pos);
-	}			/* if new archive element */
-
-      last_elt = current;
-      bfd_h_put_32 (arch, map[count].namidx, buf);
-      bfd_h_put_32 (arch, firstreal, buf + BSD_SYMDEF_OFFSET_SIZE);
-      if (bfd_write (buf, BSD_SYMDEF_SIZE, 1, arch) != BSD_SYMDEF_SIZE)
-	return false;
-    }
-
-  /* now write the strings themselves */
-  bfd_h_put_32 (arch, stringsize, temp);
-  if (bfd_write (temp, 1, sizeof (temp), arch) != sizeof (temp))
-    return false;
-  for (count = 0; count < orl_count; count++)
-    {
-      size_t len = strlen (*map[count].name) + 1;
-
-      if (bfd_write (*map[count].name, 1, len, arch) != len)
-	return false;
-    }
-
-  /* The spec sez this should be a newline.  But in order to be
-     bug-compatible for sun's ar we use a null. */
-  if (padit)
-    {
-      if (bfd_write ("", 1, 1, arch) != 1)
-	return false;
-    }
-
-  return true;
-}
-
-/* At the end of archive file handling, update the timestamp in the
-   file, so the linker will accept it.
-
-   Return true if the timestamp was OK, or an unusual problem happened.
-   Return false if we updated the timestamp.  */
-
-boolean
-_bfd_archive_bsd_update_armap_timestamp (arch)
-     bfd *arch;
-{
-  struct stat archstat;
-  struct ar_hdr hdr;
-  unsigned int i;
-
-  /* Flush writes, get last-write timestamp from file, and compare it
-     to the timestamp IN the file.  */
-  bfd_flush (arch);
-  if (bfd_stat (arch, &archstat) == -1)
-    {
-      perror (_("Reading archive file mod timestamp"));
-      return true;		/* Can't read mod time for some reason */
-    }
-  if (archstat.st_mtime <= bfd_ardata (arch)->armap_timestamp)
-    return true;		/* OK by the linker's rules */
-
-  /* Update the timestamp.  */
-  bfd_ardata (arch)->armap_timestamp = archstat.st_mtime + ARMAP_TIME_OFFSET;
-
-  /* Prepare an ASCII version suitable for writing.  */
-  memset (hdr.ar_date, 0, sizeof (hdr.ar_date));
-  sprintf (hdr.ar_date, "%ld", bfd_ardata (arch)->armap_timestamp);
-  for (i = 0; i < sizeof (hdr.ar_date); i++)
-    if (hdr.ar_date[i] == '\0')
-      (hdr.ar_date)[i] = ' ';
-
-  /* Write it into the file.  */
-  bfd_ardata (arch)->armap_datepos = (SARMAG
-				      + offsetof (struct ar_hdr, ar_date[0]));
-  if (bfd_seek (arch, bfd_ardata (arch)->armap_datepos, SEEK_SET) != 0
-      || (bfd_write (hdr.ar_date, sizeof (hdr.ar_date), 1, arch)
-	  != sizeof (hdr.ar_date)))
-    {
-      /* FIXME: bfd can't call perror.  */
-      perror (_("Writing updated armap timestamp"));
-      return true;		/* Some error while writing */
-    }
-
-  return false;			/* We updated the timestamp successfully.  */
-}
-
-/* A coff armap looks like :
-   lARMAG
-   struct ar_hdr with name = '/'
-   number of symbols
-   offset of file for symbol 0
-   offset of file for symbol 1
-
-   offset of file for symbol n-1
-   symbol name 0
-   symbol name 1
-
-   symbol name n-1
-*/
-
-boolean
-coff_write_armap (arch, elength, map, symbol_count, stridx)
-     bfd *arch;
-     unsigned int elength;
-     struct orl *map;
-     unsigned int symbol_count;
-     int stridx;
-{
-  /* The size of the ranlib is the number of exported symbols in the
-     archive * the number of bytes in a int, + an int for the count */
-  unsigned int ranlibsize = (symbol_count * 4) + 4;
-  unsigned int stringsize = stridx;
-  unsigned int mapsize = stringsize + ranlibsize;
-  file_ptr archive_member_file_ptr;
-  bfd *current = arch->archive_head;
-  unsigned int count;
-  struct ar_hdr hdr;
-  unsigned int i;
-  int padit = mapsize & 1;
-
-  if (padit)
-    mapsize++;
-
-  /* work out where the first object file will go in the archive */
-  archive_member_file_ptr = (mapsize
-			     + elength
-			     + sizeof (struct ar_hdr)
-			     + SARMAG);
-
-  memset ((char *) (&hdr), 0, sizeof (struct ar_hdr));
-  hdr.ar_name[0] = '/';
-  sprintf (hdr.ar_size, "%-10d", (int) mapsize);
-  sprintf (hdr.ar_date, "%ld", (long) time (NULL));
-  /* This, at least, is what Intel coff sets the values to.: */
-  sprintf ((hdr.ar_uid), "%d", 0);
-  sprintf ((hdr.ar_gid), "%d", 0);
-  sprintf ((hdr.ar_mode), "%-7o", (unsigned) 0);
-  strncpy (hdr.ar_fmag, ARFMAG, 2);
-
-  for (i = 0; i < sizeof (struct ar_hdr); i++)
-    if (((char *) (&hdr))[i] == '\0')
-      (((char *) (&hdr))[i]) = ' ';
-
-  /* Write the ar header for this item and the number of symbols */
-
-  if (bfd_write ((PTR) &hdr, 1, sizeof (struct ar_hdr), arch)
-      != sizeof (struct ar_hdr))
-    return false;
-
-  bfd_write_bigendian_4byte_int (arch, symbol_count);
-
-  /* Two passes, first write the file offsets for each symbol -
-     remembering that each offset is on a two byte boundary.  */
-
-  /* Write out the file offset for the file associated with each
-     symbol, and remember to keep the offsets padded out.  */
-
-  current = arch->archive_head;
-  count = 0;
-  while (current != (bfd *) NULL && count < symbol_count)
-    {
-      /* For each symbol which is used defined in this object, write out
-	 the object file's address in the archive */
-
-      while (((bfd *) (map[count]).pos) == current)
-	{
-	  bfd_write_bigendian_4byte_int (arch, archive_member_file_ptr);
-	  count++;
-	}
-      /* Add size of this archive entry */
-      archive_member_file_ptr += (arelt_size (current)
-				  + sizeof (struct ar_hdr));
-      /* remember aboout the even alignment */
-      archive_member_file_ptr += archive_member_file_ptr % 2;
-      current = current->next;
-    }
-
-  /* now write the strings themselves */
-  for (count = 0; count < symbol_count; count++)
-    {
-      size_t len = strlen (*map[count].name) + 1;
-
-      if (bfd_write (*map[count].name, 1, len, arch) != len)
-	return false;
-    }
-
-  /* The spec sez this should be a newline.  But in order to be
-     bug-compatible for arc960 we use a null. */
-  if (padit)
-    {
-      if (bfd_write ("", 1, 1, arch) != 1)
-	return false;
-    }
-
-  return true;
-}
diff --git a/bfd/archures.c b/bfd/archures.c
deleted file mode 100644
index f2438623364..00000000000
--- a/bfd/archures.c
+++ /dev/null
@@ -1,896 +0,0 @@
-/* BFD library support routines for architectures.
-   Copyright (C) 1990, 91-98, 1999 Free Software Foundation, Inc.
-   Hacked by John Gilmore and Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include <ctype.h>
-
-/*
-
-SECTION
-	Architectures
-
-	BFD keeps one atom in a BFD describing the
-	architecture of the data attached to the BFD: a pointer to a
-	<<bfd_arch_info_type>>.  
-
-	Pointers to structures can be requested independently of a BFD
-	so that an architecture's information can be interrogated
-	without access to an open BFD.
-
-	The architecture information is provided by each architecture package.
-	The set of default architectures is selected by the macro
-	<<SELECT_ARCHITECTURES>>.  This is normally set up in the
-	@file{config/@var{target}.mt} file of your choice.  If the name is not
-	defined, then all the architectures supported are included. 
-
-	When BFD starts up, all the architectures are called with an
-	initialize method.  It is up to the architecture back end to
-	insert as many items into the list of architectures as it wants to;
-	generally this would be one for each machine and one for the
-	default case (an item with a machine field of 0). 
-
-	BFD's idea of an architecture is implemented in	@file{archures.c}.
-*/
-
-/*
-
-SUBSECTION
-	bfd_architecture
-
-DESCRIPTION
-	This enum gives the object file's CPU architecture, in a
-	global sense---i.e., what processor family does it belong to?
-	Another field indicates which processor within
-	the family is in use.  The machine gives a number which
-	distinguishes different versions of the architecture,
-	containing, for example, 2 and 3 for Intel i960 KA and i960 KB,
-	and 68020 and 68030 for Motorola 68020 and 68030. 
-
-.enum bfd_architecture 
-.{
-.  bfd_arch_unknown,   {* File arch not known *}
-.  bfd_arch_obscure,   {* Arch known, not one of these *}
-.  bfd_arch_m68k,      {* Motorola 68xxx *}
-.#define bfd_mach_m68000 1
-.#define bfd_mach_m68008 2
-.#define bfd_mach_m68010 3
-.#define bfd_mach_m68020 4
-.#define bfd_mach_m68030 5
-.#define bfd_mach_m68040 6
-.#define bfd_mach_m68060 7
-.#define bfd_mach_cpu32  8
-.  bfd_arch_vax,       {* DEC Vax *}   
-.  bfd_arch_i960,      {* Intel 960 *}
-.    {* The order of the following is important.
-.       lower number indicates a machine type that 
-.       only accepts a subset of the instructions
-.       available to machines with higher numbers.
-.       The exception is the "ca", which is
-.       incompatible with all other machines except 
-.       "core". *}
-.
-.#define bfd_mach_i960_core      1
-.#define bfd_mach_i960_ka_sa     2
-.#define bfd_mach_i960_kb_sb     3
-.#define bfd_mach_i960_mc        4
-.#define bfd_mach_i960_xa        5
-.#define bfd_mach_i960_ca        6
-.#define bfd_mach_i960_jx	 7
-.#define bfd_mach_i960_hx        8
-.
-.  bfd_arch_a29k,      {* AMD 29000 *}
-.  bfd_arch_sparc,     {* SPARC *}
-.#define bfd_mach_sparc			1
-.{* The difference between v8plus and v9 is that v9 is a true 64 bit env.  *}
-.#define bfd_mach_sparc_sparclet	2
-.#define bfd_mach_sparc_sparclite	3
-.#define bfd_mach_sparc_v8plus		4
-.#define bfd_mach_sparc_v8plusa		5 {* with ultrasparc add'ns *}
-.#define bfd_mach_sparc_sparclite_le	6
-.#define bfd_mach_sparc_v9		7
-.#define bfd_mach_sparc_v9a		8 {* with ultrasparc add'ns *}
-.{* Nonzero if MACH has the v9 instruction set.  *}
-.#define bfd_mach_sparc_v9_p(mach) \
-.  ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a)
-.  bfd_arch_mips,      {* MIPS Rxxxx *}
-.#define bfd_mach_mips3000		3000
-.#define bfd_mach_mips3900		3900
-.#define bfd_mach_mips4000		4000
-.#define bfd_mach_mips4010		4010
-.#define bfd_mach_mips4100		4100
-.#define bfd_mach_mips4111		4111
-.#define bfd_mach_mips4300		4300
-.#define bfd_mach_mips4400		4400
-.#define bfd_mach_mips4600		4600
-.#define bfd_mach_mips4650		4650
-.#define bfd_mach_mips5000		5000
-.#define bfd_mach_mips6000		6000
-.#define bfd_mach_mips8000		8000
-.#define bfd_mach_mips10000		10000
-.#define bfd_mach_mips16		16
-.  bfd_arch_i386,      {* Intel 386 *}
-.#define bfd_mach_i386_i386 0
-.#define bfd_mach_i386_i8086 1
-.#define bfd_mach_i386_i386_intel_syntax 2
-.  bfd_arch_we32k,     {* AT&T WE32xxx *}
-.  bfd_arch_tahoe,     {* CCI/Harris Tahoe *}
-.  bfd_arch_i860,      {* Intel 860 *}
-.  bfd_arch_romp,      {* IBM ROMP PC/RT *}
-.  bfd_arch_alliant,   {* Alliant *}
-.  bfd_arch_convex,    {* Convex *}
-.  bfd_arch_m88k,      {* Motorola 88xxx *}
-.  bfd_arch_pyramid,   {* Pyramid Technology *}
-.  bfd_arch_h8300,     {* Hitachi H8/300 *}
-.#define bfd_mach_h8300   1
-.#define bfd_mach_h8300h  2
-.#define bfd_mach_h8300s  3
-.  bfd_arch_powerpc,   {* PowerPC *}
-.  bfd_arch_rs6000,    {* IBM RS/6000 *}
-.  bfd_arch_hppa,      {* HP PA RISC *}
-.  bfd_arch_d10v,      {* Mitsubishi D10V *}
-.  bfd_arch_d30v,      {* Mitsubishi D30V *}
-.  bfd_arch_z8k,       {* Zilog Z8000 *}
-.#define bfd_mach_z8001		1
-.#define bfd_mach_z8002		2
-.  bfd_arch_h8500,     {* Hitachi H8/500 *}
-.  bfd_arch_sh,        {* Hitachi SH *}
-.#define bfd_mach_sh            0
-.#define bfd_mach_sh3        0x30
-.#define bfd_mach_sh3e       0x3e
-.  bfd_arch_alpha,     {* Dec Alpha *}
-.#define bfd_mach_alpha_ev4  0x10
-.#define bfd_mach_alpha_ev5  0x20
-.#define bfd_mach_alpha_ev6  0x30
-.  bfd_arch_arm,       {* Advanced Risc Machines ARM *}
-.#define bfd_mach_arm_2		1
-.#define bfd_mach_arm_2a		2
-.#define bfd_mach_arm_3		3
-.#define bfd_mach_arm_3M 	4
-.#define bfd_mach_arm_4 		5
-.#define bfd_mach_arm_4T 	6
-.  bfd_arch_ns32k,     {* National Semiconductors ns32000 *}
-.  bfd_arch_w65,       {* WDC 65816 *}
-.  bfd_arch_tic30,     {* Texas Instruments TMS320C30 *}
-.  bfd_arch_tic80,     {* TI TMS320c80 (MVP) *}
-.  bfd_arch_v850,      {* NEC V850 *}
-.#define bfd_mach_v850          0
-.#define bfd_mach_v850e 	'E'
-.#define bfd_mach_v850ea	'A'
-.  bfd_arch_arc,       {* Argonaut RISC Core *}
-.#define bfd_mach_arc_base 0
-.  bfd_arch_m32r,      {* Mitsubishi M32R/D *}
-.#define bfd_mach_m32r		0 {* backwards compatibility *}
-.  bfd_arch_mn10200,   {* Matsushita MN10200 *}
-.  bfd_arch_mn10300,   {* Matsushita MN10300 *}
-.#define bfd_mach_mn10300		300
-.  bfd_arch_fr30,
-.#define bfd_mach_fr30		0x46523330
-.  bfd_arch_mcore,
-.  bfd_arch_last
-.  };
-
-
-*/
-
-/*
-
-SUBSECTION
-	bfd_arch_info
-
-DESCRIPTION
-	This structure contains information on architectures for use
-	within BFD.
-
-.
-.typedef struct bfd_arch_info 
-.{
-.  int bits_per_word;
-.  int bits_per_address;
-.  int bits_per_byte;
-.  enum bfd_architecture arch;
-.  unsigned long mach;
-.  const char *arch_name;
-.  const char *printable_name;
-.  unsigned int section_align_power;
-. {* true if this is the default machine for the architecture *}
-.  boolean the_default;	
-.  const struct bfd_arch_info * (*compatible)
-.	PARAMS ((const struct bfd_arch_info *a,
-.	         const struct bfd_arch_info *b));
-.
-.  boolean (*scan) PARAMS ((const struct bfd_arch_info *, const char *));
-.
-.  const struct bfd_arch_info *next;
-.} bfd_arch_info_type;
-*/
-
-extern const bfd_arch_info_type bfd_a29k_arch;
-extern const bfd_arch_info_type bfd_alpha_arch;
-extern const bfd_arch_info_type bfd_arc_arch;
-extern const bfd_arch_info_type bfd_arm_arch;
-extern const bfd_arch_info_type bfd_d10v_arch;
-extern const bfd_arch_info_type bfd_d30v_arch;
-extern const bfd_arch_info_type bfd_h8300_arch;
-extern const bfd_arch_info_type bfd_h8500_arch;
-extern const bfd_arch_info_type bfd_hppa_arch;
-extern const bfd_arch_info_type bfd_i386_arch;
-extern const bfd_arch_info_type bfd_i860_arch;
-extern const bfd_arch_info_type bfd_i960_arch;
-extern const bfd_arch_info_type bfd_m32r_arch;
-extern const bfd_arch_info_type bfd_m68k_arch;
-extern const bfd_arch_info_type bfd_m88k_arch;
-extern const bfd_arch_info_type bfd_mips_arch;
-extern const bfd_arch_info_type bfd_mn10200_arch;
-extern const bfd_arch_info_type bfd_mn10300_arch;
-extern const bfd_arch_info_type bfd_powerpc_arch;
-extern const bfd_arch_info_type bfd_rs6000_arch;
-extern const bfd_arch_info_type bfd_sh_arch;
-extern const bfd_arch_info_type bfd_sparc_arch;
-extern const bfd_arch_info_type bfd_tic30_arch;
-extern const bfd_arch_info_type bfd_tic80_arch;
-extern const bfd_arch_info_type bfd_vax_arch;
-extern const bfd_arch_info_type bfd_we32k_arch;
-extern const bfd_arch_info_type bfd_z8k_arch;
-extern const bfd_arch_info_type bfd_ns32k_arch;
-extern const bfd_arch_info_type bfd_w65_arch;
-extern const bfd_arch_info_type bfd_v850_arch;
-extern const bfd_arch_info_type bfd_fr30_arch;
-extern const bfd_arch_info_type bfd_mcore_arch;
-
-static const bfd_arch_info_type * const bfd_archures_list[] =
-{
-#ifdef SELECT_ARCHITECTURES
-  SELECT_ARCHITECTURES,
-#else
-  &bfd_a29k_arch,
-  &bfd_alpha_arch,
-  &bfd_arc_arch,
-  &bfd_arm_arch,
-  &bfd_d10v_arch,
-  &bfd_d30v_arch,
-  &bfd_h8300_arch,
-  &bfd_h8500_arch,
-  &bfd_hppa_arch,
-  &bfd_i386_arch,
-  &bfd_i860_arch,
-  &bfd_i960_arch,
-  &bfd_m32r_arch,
-  &bfd_m68k_arch,
-  &bfd_m88k_arch,
-  &bfd_mips_arch,
-  &bfd_mn10200_arch,
-  &bfd_mn10300_arch,
-  &bfd_powerpc_arch,
-  &bfd_rs6000_arch,
-  &bfd_sh_arch,
-  &bfd_sparc_arch,
-  &bfd_tic30_arch,
-  &bfd_tic80_arch,
-  &bfd_vax_arch,
-  &bfd_we32k_arch,
-  &bfd_z8k_arch,
-  &bfd_ns32k_arch,
-  &bfd_w65_arch,
-  &bfd_v850_arch,
-  &bfd_fr30_arch,
-  & bfd_mcore_arch,
-#endif
-  0
-};
-
-/*
-FUNCTION
-	bfd_printable_name
-
-SYNOPSIS
-	const char *bfd_printable_name(bfd *abfd);
-
-DESCRIPTION
-	Return a printable string representing the architecture and machine
-	from the pointer to the architecture info structure.
-
-*/
-
-const char *
-bfd_printable_name (abfd)
-     bfd *abfd;
-{
-  return abfd->arch_info->printable_name;
-}
-
-
-
-/*
-FUNCTION
-	bfd_scan_arch
-
-SYNOPSIS
-	const bfd_arch_info_type *bfd_scan_arch(const char *string);
-
-DESCRIPTION
-	Figure out if BFD supports any cpu which could be described with
-	the name @var{string}.  Return a pointer to an <<arch_info>>
-	structure if a machine is found, otherwise NULL.
-
-*/
-
-const bfd_arch_info_type *
-bfd_scan_arch (string)
-     const char *string;
-{
-  const bfd_arch_info_type * const *app, *ap;
-
-  /* Look through all the installed architectures */
-  for (app = bfd_archures_list; *app != NULL; app++)
-    {
-      for (ap = *app; ap != NULL; ap = ap->next)
-	{
-	  if (ap->scan (ap, string))
-	    return ap;
-	}
-    }
-
-  return NULL;
-}
-
-
-
-/*
-FUNCTION
-	bfd_arch_list
-
-SYNOPSIS
-	const char **bfd_arch_list(void);
-
-DESCRIPTION
-	Return a freshly malloced NULL-terminated vector of the names
-	of all the valid BFD architectures.  Do not modify the names.
-
-*/
-
-const char **
-bfd_arch_list ()
-{
-  int vec_length = 0;
-  const char **name_ptr;
-  const char **name_list;
-  const bfd_arch_info_type * const *app;
-
-  /* Determine the number of architectures */
-  vec_length = 0;
-  for (app = bfd_archures_list; *app != NULL; app++)
-    {
-      const bfd_arch_info_type *ap;
-      for (ap = *app; ap != NULL; ap = ap->next)
-	{
-	  vec_length++;
-	}
-    }
-
-  name_list = (CONST char **)
-    bfd_malloc ((vec_length + 1) * sizeof (char **));
-  if (name_list == NULL)
-    return NULL;
-
-  /* Point the list at each of the names */
-  name_ptr = name_list;
-  for (app = bfd_archures_list; *app != NULL; app++)
-    {
-      const bfd_arch_info_type *ap;
-      for (ap = *app; ap != NULL; ap = ap->next)
-	{
-	  *name_ptr = ap->printable_name;
-	  name_ptr++;
-	}
-    }
-  *name_ptr = NULL;
-
-  return name_list;
-}
-
-
-
-/*
-FUNCTION
-	bfd_arch_get_compatible
-
-SYNOPSIS
-	const bfd_arch_info_type *bfd_arch_get_compatible(
-		const bfd *abfd,
-	        const bfd *bbfd);
-
-DESCRIPTION
-	Determine whether two BFDs'
-	architectures and machine types are compatible.  Calculates
-	the lowest common denominator between the two architectures
-	and machine types implied by the BFDs and returns a pointer to
-	an <<arch_info>> structure describing the compatible machine.
-*/
-
-const bfd_arch_info_type *
-bfd_arch_get_compatible (abfd, bbfd)
-     const bfd *abfd;
-     const bfd *bbfd;
-{
-  /* If either architecture is unknown, then all we can do is assume
-     the user knows what he's doing.  */
-  if (abfd->arch_info->arch == bfd_arch_unknown)
-  	return bbfd->arch_info;
-  if (bbfd->arch_info->arch == bfd_arch_unknown)
-  	return abfd->arch_info;
-
-  /* Otherwise architecture-specific code has to decide.  */
-  return abfd->arch_info->compatible (abfd->arch_info, bbfd->arch_info);
-}
-
-
-/*
-INTERNAL_DEFINITION
-	bfd_default_arch_struct
-
-DESCRIPTION
-	The <<bfd_default_arch_struct>> is an item of
-	<<bfd_arch_info_type>> which has been initialized to a fairly
-	generic state.  A BFD starts life by pointing to this
-	structure, until the correct back end has determined the real
-	architecture of the file.
-
-.extern const bfd_arch_info_type bfd_default_arch_struct;
-
-*/
-
-const bfd_arch_info_type bfd_default_arch_struct =
-{
-    32,32,8,bfd_arch_unknown,0,"unknown","unknown",2,true,
-    bfd_default_compatible,
-    bfd_default_scan, 
-    0,
-};
-
-/*
-FUNCTION
-	bfd_set_arch_info
-
-SYNOPSIS
-	void bfd_set_arch_info(bfd *abfd, const bfd_arch_info_type *arg);
-
-DESCRIPTION
-	Set the architecture info of @var{abfd} to @var{arg}.
-*/
-
-void
-bfd_set_arch_info (abfd, arg)
-     bfd *abfd;
-     const bfd_arch_info_type *arg;
-{
-  abfd->arch_info = arg;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_default_set_arch_mach
-
-SYNOPSIS
-	boolean bfd_default_set_arch_mach(bfd *abfd,
-		enum bfd_architecture arch,
-		unsigned long mach);
-
-DESCRIPTION
-	Set the architecture and machine type in BFD @var{abfd}
-	to @var{arch} and @var{mach}.  Find the correct
-	pointer to a structure and insert it into the <<arch_info>>
-	pointer. 
-*/
-
-boolean
-bfd_default_set_arch_mach (abfd, arch, mach)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long mach;
-{
-  const bfd_arch_info_type * const *app, *ap;
-
-  for (app = bfd_archures_list; *app != NULL; app++)
-    {
-      for (ap = *app; ap != NULL; ap = ap->next)
-	{
-	  if (ap->arch == arch
-	      && (ap->mach == mach
-		  || (mach == 0 && ap->the_default)))
-	    {
-	      abfd->arch_info = ap;
-	      return true;
-	    }
-	}
-    }
-
-  abfd->arch_info = &bfd_default_arch_struct;
-  bfd_set_error (bfd_error_bad_value);
-  return false;
-}
-
-
-/*
-FUNCTION
-	bfd_get_arch
-
-SYNOPSIS
-	enum bfd_architecture bfd_get_arch(bfd *abfd);
-
-DESCRIPTION
-	Return the enumerated type which describes the BFD @var{abfd}'s
-	architecture.
-
-*/
-
-enum bfd_architecture
-bfd_get_arch (abfd)
-     bfd *abfd;
-{
-    return abfd->arch_info->arch;
-}
-
-/*
-FUNCTION
-	bfd_get_mach
-
-SYNOPSIS
-	unsigned long bfd_get_mach(bfd *abfd);
-
-DESCRIPTION
-	Return the long type which describes the BFD @var{abfd}'s
-	machine.
-*/
-
-unsigned long  
-bfd_get_mach (abfd)
-     bfd *abfd;
-{
-    return abfd->arch_info->mach;
-}
-
-/*
-FUNCTION
-	bfd_arch_bits_per_byte
-
-SYNOPSIS
-	unsigned int bfd_arch_bits_per_byte(bfd *abfd);
-
-DESCRIPTION
-	Return the number of bits in one of the BFD @var{abfd}'s
-	architecture's bytes.
-
-*/
-
-unsigned int
-bfd_arch_bits_per_byte (abfd)
-     bfd *abfd;
-{
-  return abfd->arch_info->bits_per_byte;
-}
-
-/*
-FUNCTION
-	bfd_arch_bits_per_address
-
-SYNOPSIS
-	unsigned int bfd_arch_bits_per_address(bfd *abfd);
-
-DESCRIPTION
-	Return the number of bits in one of the BFD @var{abfd}'s
-	architecture's addresses.
-*/
-
-unsigned int
-bfd_arch_bits_per_address (abfd)
-     bfd *abfd;
-{
-  return abfd->arch_info->bits_per_address;
-}
-
-
-/*
-INTERNAL_FUNCTION 
-	bfd_default_compatible
-
-SYNOPSIS
-	const bfd_arch_info_type *bfd_default_compatible
-	(const bfd_arch_info_type *a,
-	const bfd_arch_info_type *b);
-
-DESCRIPTION
-	The default function for testing for compatibility.
-*/
-
-const bfd_arch_info_type *
-bfd_default_compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  if (a->arch != b->arch)
-    return NULL;
-
-  if (a->mach > b->mach)
-    return a;
-
-  if (b->mach > a->mach)
-    return b;
-
-  return a;
-}
-
-
-/*
-INTERNAL_FUNCTION
-	bfd_default_scan
-
-SYNOPSIS
-	boolean bfd_default_scan(const struct bfd_arch_info *info, const char *string);
-
-DESCRIPTION
-	The default function for working out whether this is an
-	architecture hit and a machine hit.
-*/
-
-boolean 
-bfd_default_scan (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  const char *ptr_src;
-  const char *ptr_tst;
-  unsigned long number;
-  enum bfd_architecture arch;
-  const char *printable_name_colon;
-
-  /* Exact match of the architecture name (ARCH_NAME) and also the
-     default architecture? */
-  if (strcasecmp (string, info->arch_name) == 0
-      && info->the_default)
-    return true;
-
-  /* Exact match of the machine name (PRINTABLE_NAME)? */
-  if (strcasecmp (string, info->printable_name) == 0)
-    return true;
-     
-  /* Given that printable_name contains no colon, attempt to match:
-     ARCH_NAME [ ":" ] PRINTABLE_NAME? */
-  printable_name_colon = strchr (info->printable_name, ':');
-  if (printable_name_colon == NULL)
-    {
-      int strlen_arch_name = strlen (info->arch_name);
-      if (strncasecmp (string, info->arch_name, strlen_arch_name) == 0)
-	{
-	  if (string[strlen_arch_name] == ':')
-	    {
-	      if (strcasecmp (string + strlen_arch_name + 1,
-			      info->printable_name) == 0)
-		return true;
-	    }
-	  else
-	    {
-	      if (strcasecmp (string + strlen_arch_name,
-			      info->printable_name) == 0)
-		return true;
-	    }
-	}
-    }
-
-  /* Given that PRINTABLE_NAME has the form: <arch> ":" <mach>;
-     Attempt to match: <arch> <mach>? */
-  if (printable_name_colon != NULL)
-    {
-      int colon_index = printable_name_colon - info->printable_name;
-      if (strncasecmp (string, info->printable_name, colon_index) == 0
-	  && strcasecmp (string + colon_index,
-			 info->printable_name + colon_index + 1) == 0)
-	return true;
-    }
-
-  /* Given that PRINTABLE_NAME has the form: <arch> ":" <mach>; Do not
-     attempt to match just <mach>, it could be ambigious.  This test
-     is left until later. */
-
-  /* NOTE: The below is retained for compatibility only. Please do not
-     add to this code */
-
-  /* See how much of the supplied string matches with the
-     architecture, eg the string m68k:68020 would match the 68k entry
-     up to the :, then we get left with the machine number */
-
-  for (ptr_src = string, ptr_tst = info->arch_name; 
-       *ptr_src && *ptr_tst;
-       ptr_src++, ptr_tst++) 
-    {
-      if (*ptr_src != *ptr_tst) break;
-    }
-
-  /* Chewed up as much of the architecture as will match, skip any
-     colons */
-  if (*ptr_src == ':')
-    ptr_src++;
-  
-  if (*ptr_src == 0)
-    {
-      /* nothing more, then only keep this one if it is the default
-	 machine for this architecture */
-      return info->the_default;
-    }
-
-  number = 0;
-  while (isdigit ((unsigned char) *ptr_src))
-    {
-      number = number * 10 + *ptr_src  - '0';
-      ptr_src++;
-    }
-
-  /* NOTE: The below is retained for compatibility only.
-     PLEASE DO NOT ADD TO THIS CODE. */
-
-  switch (number) 
-    {
-      /* FIXME: These are needed to parse IEEE objects.  */
-    case 68000: 
-      arch = bfd_arch_m68k;
-      number = bfd_mach_m68000;
-      break;
-    case 68010:
-      arch = bfd_arch_m68k;
-      number = bfd_mach_m68010;
-      break;
-    case 68020:
-      arch = bfd_arch_m68k;
-      number = bfd_mach_m68020;
-      break;
-    case 68030:
-      arch = bfd_arch_m68k;
-      number = bfd_mach_m68030;
-      break;
-    case 68040:
-      arch = bfd_arch_m68k;
-      number = bfd_mach_m68040;
-      break;
-    case 68060:
-      arch = bfd_arch_m68k;
-      number = bfd_mach_m68060;
-      break;
-    case 68332:
-      arch = bfd_arch_m68k;
-      number = bfd_mach_cpu32;
-      break;
-
-    case 32000:
-      arch = bfd_arch_we32k;
-      break;
-
-    case 3000:
-      arch = bfd_arch_mips;
-      number = bfd_mach_mips3000;
-      break;
-
-    case 4000:
-      arch = bfd_arch_mips;
-      number = bfd_mach_mips4000;
-      break;
-
-    case 6000:
-      arch = bfd_arch_rs6000;
-      break;
-
-    default:  
-      return false;
-    }
-
-  if (arch != info->arch) 
-    return false;
-
-  if (number != info->mach)
-    return false;
-
-  return true;
-}
-
-
-/*
-FUNCTION
-	bfd_get_arch_info
-
-SYNOPSIS
-	const bfd_arch_info_type * bfd_get_arch_info(bfd *abfd);
-
-DESCRIPTION
-	Return the architecture info struct in @var{abfd}.
-*/
-
-const bfd_arch_info_type *
-bfd_get_arch_info (abfd)
-     bfd *abfd;
-{
-  return abfd->arch_info;
-}
-
-
-/*
-FUNCTION
-	bfd_lookup_arch
-
-SYNOPSIS
-	const bfd_arch_info_type *bfd_lookup_arch
-		(enum bfd_architecture
-		arch,
-		unsigned long machine);
-
-DESCRIPTION
-	Look for the architecure info structure which matches the
-	arguments @var{arch} and @var{machine}. A machine of 0 matches the
-	machine/architecture structure which marks itself as the
-	default.
-*/
-
-const bfd_arch_info_type * 
-bfd_lookup_arch (arch, machine)
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  const bfd_arch_info_type * const *app, *ap;
-
-  for (app = bfd_archures_list; *app != NULL; app++)
-    {
-      for (ap = *app; ap != NULL; ap = ap->next)
-	{
-	  if (ap->arch == arch
-	      && (ap->mach == machine
-		  || (machine == 0 && ap->the_default)))
-	    return ap;
-	}
-    }
-
-  return NULL;
-}
-
-
-/*
-FUNCTION
-	bfd_printable_arch_mach
-
-SYNOPSIS
-	const char *bfd_printable_arch_mach
-		(enum bfd_architecture arch, unsigned long machine);
-
-DESCRIPTION
-	Return a printable string representing the architecture and
-	machine type. 
-
-	This routine is depreciated.
-*/
-
-const char *
-bfd_printable_arch_mach (arch, machine)
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-    const bfd_arch_info_type *ap = bfd_lookup_arch (arch, machine);
-
-    if (ap)
-      return ap->printable_name;
-    return "UNKNOWN!";
-}
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
deleted file mode 100644
index 8bdbf80f1b1..00000000000
--- a/bfd/bfd-in.h
+++ /dev/null
@@ -1,727 +0,0 @@
-/* Main header file for the bfd library -- portable access to object files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
-   Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-** NOTE: bfd.h and bfd-in2.h are GENERATED files.  Don't change them;
-** instead, change bfd-in.h or the other BFD source files processed to
-** generate these files.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* bfd.h -- The only header file required by users of the bfd library 
-
-The bfd.h file is generated from bfd-in.h and various .c files; if you
-change it, your changes will probably be lost.
-
-All the prototypes and definitions following the comment "THE FOLLOWING
-IS EXTRACTED FROM THE SOURCE" are extracted from the source files for
-BFD.  If you change it, someone oneday will extract it from the source
-again, and your changes will be lost.  To save yourself from this bind,
-change the definitions in the source in the bfd directory.  Type "make
-docs" and then "make headers" in that directory, and magically this file
-will change to reflect your changes.
-
-If you don't have the tools to perform the extraction, then you are
-safe from someone on your system trampling over your header files.
-You should still maintain the equivalence between the source and this
-file though; every change you make to the .c file should be reflected
-here.  */
-
-#ifndef __BFD_H_SEEN__
-#define __BFD_H_SEEN__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ansidecl.h"
-
-/* These two lines get substitutions done by commands in Makefile.in.  */
-#define BFD_VERSION  "@VERSION@"
-#define BFD_ARCH_SIZE @wordsize@
-#define BFD_HOST_64BIT_LONG @BFD_HOST_64BIT_LONG@
-#if @BFD_HOST_64_BIT_DEFINED@
-#define BFD_HOST_64_BIT @BFD_HOST_64_BIT@
-#define BFD_HOST_U_64_BIT @BFD_HOST_U_64_BIT@
-#endif
-
-#if BFD_ARCH_SIZE >= 64
-#define BFD64
-#endif
-
-#ifndef INLINE
-#if __GNUC__ >= 2
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-#endif
-
-/* forward declaration */
-typedef struct _bfd bfd;
-
-/* To squelch erroneous compiler warnings ("illegal pointer
-   combination") from the SVR3 compiler, we would like to typedef
-   boolean to int (it doesn't like functions which return boolean.
-   Making sure they are never implicitly declared to return int
-   doesn't seem to help).  But this file is not configured based on
-   the host.  */
-/* General rules: functions which are boolean return true on success
-   and false on failure (unless they're a predicate).   -- bfd.doc */
-/* I'm sure this is going to break something and someone is going to
-   force me to change it. */
-/* typedef enum boolean {false, true} boolean; */
-/* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h>  -fnf */
-/* It gets worse if the host also defines a true/false enum... -sts */
-/* And even worse if your compiler has built-in boolean types... -law */
-#if defined (__GNUG__) && (__GNUC_MINOR__ > 5)
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif
-#ifdef MPW
-/* Pre-emptive strike - get the file with the enum. */
-#include <Types.h>
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif /* MPW */
-#ifndef TRUE_FALSE_ALREADY_DEFINED
-typedef enum bfd_boolean {false, true} boolean;
-#define BFD_TRUE_FALSE
-#else
-/* Use enum names that will appear nowhere else.  */
-typedef enum bfd_boolean {bfd_fffalse, bfd_tttrue} boolean;
-#endif
-
-/* A pointer to a position in a file.  */
-/* FIXME:  This should be using off_t from <sys/types.h>.
-   For now, try to avoid breaking stuff by not including <sys/types.h> here.
-   This will break on systems with 64-bit file offsets (e.g. 4.4BSD).
-   Probably the best long-term answer is to avoid using file_ptr AND off_t 
-   in this header file, and to handle this in the BFD implementation
-   rather than in its interface.  */
-/* typedef off_t	file_ptr; */
-typedef long int file_ptr;
-
-/* Support for different sizes of target format ints and addresses.
-   If the type `long' is at least 64 bits, BFD_HOST_64BIT_LONG will be
-   set to 1 above.  Otherwise, if gcc is being used, this code will
-   use gcc's "long long" type.  Otherwise, BFD_HOST_64_BIT must be
-   defined above.  */
-
-#ifndef BFD_HOST_64_BIT
-# if BFD_HOST_64BIT_LONG
-#  define BFD_HOST_64_BIT long
-#  define BFD_HOST_U_64_BIT unsigned long
-# else
-#  ifdef __GNUC__
-#   if __GNUC__ >= 2
-#    define BFD_HOST_64_BIT long long
-#    define BFD_HOST_U_64_BIT unsigned long long
-#   endif /* __GNUC__ >= 2 */
-#  endif /* ! defined (__GNUC__) */
-# endif /* ! BFD_HOST_64BIT_LONG */
-#endif /* ! defined (BFD_HOST_64_BIT) */
-
-#ifdef BFD64
-
-#ifndef BFD_HOST_64_BIT
- #error No 64 bit integer type available
-#endif /* ! defined (BFD_HOST_64_BIT) */
-
-typedef BFD_HOST_U_64_BIT bfd_vma;
-typedef BFD_HOST_64_BIT bfd_signed_vma;
-typedef BFD_HOST_U_64_BIT bfd_size_type;
-typedef BFD_HOST_U_64_BIT symvalue;
-
-#ifndef fprintf_vma
-#if BFD_HOST_64BIT_LONG
-#define sprintf_vma(s,x) sprintf (s, "%016lx", x)
-#define fprintf_vma(f,x) fprintf (f, "%016lx", x)
-#else
-#define _bfd_int64_low(x) ((unsigned long) (((x) & 0xffffffff)))
-#define _bfd_int64_high(x) ((unsigned long) (((x) >> 32) & 0xffffffff))
-#define fprintf_vma(s,x) \
-  fprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-#define sprintf_vma(s,x) \
-  sprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-#endif
-#endif
-
-#else /* not BFD64  */
-
-/* Represent a target address.  Also used as a generic unsigned type
-   which is guaranteed to be big enough to hold any arithmetic types
-   we need to deal with.  */
-typedef unsigned long bfd_vma;
-
-/* A generic signed type which is guaranteed to be big enough to hold any
-   arithmetic types we need to deal with.  Can be assumed to be compatible
-   with bfd_vma in the same way that signed and unsigned ints are compatible
-   (as parameters, in assignment, etc).  */
-typedef long bfd_signed_vma;
-
-typedef unsigned long symvalue;
-typedef unsigned long bfd_size_type;
-
-/* Print a bfd_vma x on stream s.  */
-#define fprintf_vma(s,x) fprintf(s, "%08lx", x)
-#define sprintf_vma(s,x) sprintf(s, "%08lx", x)
-
-#endif /* not BFD64  */
-
-#define printf_vma(x) fprintf_vma(stdout,x)
-
-typedef unsigned int flagword;	/* 32 bits of flags */
-typedef unsigned char bfd_byte;
-
-/** File formats */
-
-typedef enum bfd_format {
-	      bfd_unknown = 0,	/* file format is unknown */
-	      bfd_object,	/* linker/assember/compiler output */
-	      bfd_archive,	/* object archive file */
-	      bfd_core,		/* core dump */
-	      bfd_type_end}	/* marks the end; don't use it! */
-         bfd_format;
-
-/* Values that may appear in the flags field of a BFD.  These also
-   appear in the object_flags field of the bfd_target structure, where
-   they indicate the set of flags used by that backend (not all flags
-   are meaningful for all object file formats) (FIXME: at the moment,
-   the object_flags values have mostly just been copied from backend
-   to another, and are not necessarily correct).  */
-
-/* No flags.  */
-#define BFD_NO_FLAGS   	0x00
-
-/* BFD contains relocation entries.  */
-#define HAS_RELOC   	0x01
-
-/* BFD is directly executable.  */
-#define EXEC_P      	0x02
-
-/* BFD has line number information (basically used for F_LNNO in a
-   COFF header).  */
-#define HAS_LINENO  	0x04
-
-/* BFD has debugging information.  */
-#define HAS_DEBUG   	0x08
-
-/* BFD has symbols.  */
-#define HAS_SYMS    	0x10
-
-/* BFD has local symbols (basically used for F_LSYMS in a COFF
-   header).  */
-#define HAS_LOCALS  	0x20
-
-/* BFD is a dynamic object.  */
-#define DYNAMIC     	0x40
-
-/* Text section is write protected (if D_PAGED is not set, this is
-   like an a.out NMAGIC file) (the linker sets this by default, but
-   clears it for -r or -N).  */
-#define WP_TEXT     	0x80
-
-/* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the
-   linker sets this by default, but clears it for -r or -n or -N).  */
-#define D_PAGED     	0x100
-
-/* BFD is relaxable (this means that bfd_relax_section may be able to
-   do something) (sometimes bfd_relax_section can do something even if
-   this is not set).  */
-#define BFD_IS_RELAXABLE 0x200
-
-/* This may be set before writing out a BFD to request using a
-   traditional format.  For example, this is used to request that when
-   writing out an a.out object the symbols not be hashed to eliminate
-   duplicates.  */
-#define BFD_TRADITIONAL_FORMAT 0x400
-
-/* This flag indicates that the BFD contents are actually cached in
-   memory.  If this is set, iostream points to a bfd_in_memory struct.  */
-#define BFD_IN_MEMORY 0x800
-
-/* symbols and relocation */
-
-/* A count of carsyms (canonical archive symbols).  */
-typedef unsigned long symindex;
-
-/* How to perform a relocation.  */
-typedef const struct reloc_howto_struct reloc_howto_type;
-
-#define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
-
-/* General purpose part of a symbol X;
-   target specific parts are in libcoff.h, libaout.h, etc.  */
-
-#define bfd_get_section(x) ((x)->section)
-#define bfd_get_output_section(x) ((x)->section->output_section)
-#define bfd_set_section(x,y) ((x)->section) = (y)
-#define bfd_asymbol_base(x) ((x)->section->vma)
-#define bfd_asymbol_value(x) (bfd_asymbol_base(x) + (x)->value)
-#define bfd_asymbol_name(x) ((x)->name)
-/*Perhaps future: #define bfd_asymbol_bfd(x) ((x)->section->owner)*/
-#define bfd_asymbol_bfd(x) ((x)->the_bfd)
-#define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour)
-
-/* A canonical archive symbol.  */
-/* This is a type pun with struct ranlib on purpose! */
-typedef struct carsym {
-  char *name;
-  file_ptr file_offset;		/* look here to find the file */
-} carsym;			/* to make these you call a carsymogen */
-
-  
-/* Used in generating armaps (archive tables of contents).
-   Perhaps just a forward definition would do? */
-struct orl {			/* output ranlib */
-  char **name;			/* symbol name */ 
-  file_ptr pos;			/* bfd* or file position */
-  int namidx;			/* index into string table */
-};
-
-
-/* Linenumber stuff */
-typedef struct lineno_cache_entry {
-  unsigned int line_number;	/* Linenumber from start of function*/  
-  union {
-    struct symbol_cache_entry *sym; /* Function name */
-    unsigned long offset;	/* Offset into section */
-  } u;
-} alent;
-
-/* object and core file sections */
-
-#define	align_power(addr, align)	\
-	( ((addr) + ((1<<(align))-1)) & (-1 << (align)))
-
-typedef struct sec *sec_ptr;
-
-#define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0)
-#define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0)
-#define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
-#define bfd_section_name(bfd, ptr) ((ptr)->name)
-#define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr))
-#define bfd_section_vma(bfd, ptr) ((ptr)->vma)
-#define bfd_section_lma(bfd, ptr) ((ptr)->lma)
-#define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
-#define bfd_get_section_flags(bfd, ptr) ((ptr)->flags + 0)
-#define bfd_get_section_userdata(bfd, ptr) ((ptr)->userdata)
-
-#define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
-
-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma= (val)), ((ptr)->user_set_vma = (boolean)true), true)
-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),true)
-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),true)
-
-typedef struct stat stat_type; 
-
-typedef enum bfd_print_symbol
-{ 
-  bfd_print_symbol_name,
-  bfd_print_symbol_more,
-  bfd_print_symbol_all
-} bfd_print_symbol_type;
-    
-/* Information about a symbol that nm needs.  */
-
-typedef struct _symbol_info
-{
-  symvalue value;
-  char type;
-  CONST char *name;            /* Symbol name.  */
-  unsigned char stab_type;     /* Stab type.  */
-  char stab_other;             /* Stab other. */
-  short stab_desc;             /* Stab desc.  */
-  CONST char *stab_name;       /* String for stab type.  */
-} symbol_info;
-
-/* Get the name of a stabs type code.  */
-
-extern const char *bfd_get_stab_name PARAMS ((int));
-
-/* Hash table routines.  There is no way to free up a hash table.  */
-
-/* An element in the hash table.  Most uses will actually use a larger
-   structure, and an instance of this will be the first field.  */
-
-struct bfd_hash_entry
-{
-  /* Next entry for this hash code.  */
-  struct bfd_hash_entry *next;
-  /* String being hashed.  */
-  const char *string;
-  /* Hash code.  This is the full hash code, not the index into the
-     table.  */
-  unsigned long hash;
-};
-
-/* A hash table.  */
-
-struct bfd_hash_table
-{
-  /* The hash array.  */
-  struct bfd_hash_entry **table;
-  /* The number of slots in the hash table.  */
-  unsigned int size;
-  /* A function used to create new elements in the hash table.  The
-     first entry is itself a pointer to an element.  When this
-     function is first invoked, this pointer will be NULL.  However,
-     having the pointer permits a hierarchy of method functions to be
-     built each of which calls the function in the superclass.  Thus
-     each function should be written to allocate a new block of memory
-     only if the argument is NULL.  */
-  struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-					     struct bfd_hash_table *,
-					     const char *));
-   /* An objalloc for this hash table.  This is a struct objalloc *,
-     but we use PTR to avoid requiring the inclusion of objalloc.h.  */
-  PTR memory;
-};
-
-/* Initialize a hash table.  */
-extern boolean bfd_hash_table_init
-  PARAMS ((struct bfd_hash_table *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-
-/* Initialize a hash table specifying a size.  */
-extern boolean bfd_hash_table_init_n
-  PARAMS ((struct bfd_hash_table *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *),
-	   unsigned int size));
-
-/* Free up a hash table.  */
-extern void bfd_hash_table_free PARAMS ((struct bfd_hash_table *));
-
-/* Look up a string in a hash table.  If CREATE is true, a new entry
-   will be created for this string if one does not already exist.  The
-   COPY argument must be true if this routine should copy the string
-   into newly allocated memory when adding an entry.  */
-extern struct bfd_hash_entry *bfd_hash_lookup
-  PARAMS ((struct bfd_hash_table *, const char *, boolean create,
-	   boolean copy));
-
-/* Replace an entry in a hash table.  */
-extern void bfd_hash_replace
-  PARAMS ((struct bfd_hash_table *, struct bfd_hash_entry *old,
-	   struct bfd_hash_entry *nw));
-
-/* Base method for creating a hash table entry.  */
-extern struct bfd_hash_entry *bfd_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
-	   const char *));
-
-/* Grab some space for a hash table entry.  */
-extern PTR bfd_hash_allocate PARAMS ((struct bfd_hash_table *,
-				      unsigned int));
-
-/* Traverse a hash table in a random order, calling a function on each
-   element.  If the function returns false, the traversal stops.  The
-   INFO argument is passed to the function.  */
-extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *,
-				       boolean (*) (struct bfd_hash_entry *,
-						    PTR),
-				       PTR info));
-
-/* Semi-portable string concatenation in cpp.
-   The CAT4 hack is to avoid a problem with some strict ANSI C preprocessors.
-   The problem is, "32_" is not a valid preprocessing token, and we don't
-   want extra underscores (e.g., "nlm_32_").  The XCAT2 macro will cause the
-   inner CAT macros to be evaluated first, producing still-valid pp-tokens.
-   Then the final concatenation can be done.  (Sigh.)  */
-#ifndef CAT
-#ifdef SABER
-#define CAT(a,b)	a##b
-#define CAT3(a,b,c)	a##b##c
-#define CAT4(a,b,c,d)	a##b##c##d
-#else
-#if defined(__STDC__) || defined(ALMOST_STDC)
-#define CAT(a,b) a##b
-#define CAT3(a,b,c) a##b##c
-#define XCAT2(a,b)	CAT(a,b)
-#define CAT4(a,b,c,d)	XCAT2(CAT(a,b),CAT(c,d))
-#else
-#define CAT(a,b) a/**/b
-#define CAT3(a,b,c) a/**/b/**/c
-#define CAT4(a,b,c,d)	a/**/b/**/c/**/d
-#endif
-#endif
-#endif
-
-#define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table
-
-/* User program access to BFD facilities */
-
-/* Direct I/O routines, for programs which know more about the object
-   file than BFD does.  Use higher level routines if possible.  */
-
-extern bfd_size_type bfd_read
-  PARAMS ((PTR, bfd_size_type size, bfd_size_type nitems, bfd *abfd));
-extern bfd_size_type bfd_write
-  PARAMS ((const PTR, bfd_size_type size, bfd_size_type nitems, bfd *abfd));
-extern int bfd_seek PARAMS ((bfd *abfd, file_ptr fp, int direction));
-extern long bfd_tell PARAMS ((bfd *abfd));
-extern int bfd_flush PARAMS ((bfd *abfd));
-extern int bfd_stat PARAMS ((bfd *abfd, struct stat *));
-
-
-/* Cast from const char * to char * so that caller can assign to
-   a char * without a warning.  */
-#define bfd_get_filename(abfd) ((char *) (abfd)->filename)
-#define bfd_get_cacheable(abfd) ((abfd)->cacheable)
-#define bfd_get_format(abfd) ((abfd)->format)
-#define bfd_get_target(abfd) ((abfd)->xvec->name)
-#define bfd_get_flavour(abfd) ((abfd)->xvec->flavour)
-#define bfd_big_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG)
-#define bfd_little_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_LITTLE)
-#define bfd_header_big_endian(abfd) \
-  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_BIG)
-#define bfd_header_little_endian(abfd) \
-  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_LITTLE)
-#define bfd_get_file_flags(abfd) ((abfd)->flags)
-#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
-#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
-#define bfd_my_archive(abfd) ((abfd)->my_archive)
-#define bfd_has_map(abfd) ((abfd)->has_armap)
-
-#define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
-#define bfd_usrdata(abfd) ((abfd)->usrdata)
-
-#define bfd_get_start_address(abfd) ((abfd)->start_address)
-#define bfd_get_symcount(abfd) ((abfd)->symcount)
-#define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
-#define bfd_count_sections(abfd) ((abfd)->section_count)
-
-#define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
-
-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = (boolean)(bool)), true)
-
-extern boolean bfd_record_phdr
-  PARAMS ((bfd *, unsigned long, boolean, flagword, boolean, bfd_vma,
-	   boolean, boolean, unsigned int, struct sec **));
-
-/* Byte swapping routines.  */
-
-bfd_vma		bfd_getb64	   PARAMS ((const unsigned char *));
-bfd_vma 	bfd_getl64	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_64 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_64 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb32	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl32	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_32 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_32 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb16	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl16	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_16 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_16 PARAMS ((const unsigned char *));
-void		bfd_putb64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb16	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl16	   PARAMS ((bfd_vma, unsigned char *));
-
-/* Externally visible ECOFF routines.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct ecoff_debug_info;
-struct ecoff_debug_swap;
-struct ecoff_extr;
-struct symbol_cache_entry;
-struct bfd_link_info;
-struct bfd_link_hash_entry;
-struct bfd_elf_version_tree;
-#endif
-extern bfd_vma bfd_ecoff_get_gp_value PARAMS ((bfd * abfd));
-extern boolean bfd_ecoff_set_gp_value PARAMS ((bfd *abfd, bfd_vma gp_value));
-extern boolean bfd_ecoff_set_regmasks
-  PARAMS ((bfd *abfd, unsigned long gprmask, unsigned long fprmask,
-	   unsigned long *cprmask));
-extern PTR bfd_ecoff_debug_init
-  PARAMS ((bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap,
-	   struct bfd_link_info *));
-extern void bfd_ecoff_debug_free
-  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap,
-	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate
-  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap,
-	   bfd *input_bfd, struct ecoff_debug_info *input_debug,
-	   const struct ecoff_debug_swap *input_swap,
-	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate_other
-  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
-	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_externals
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap,
-	   boolean relocateable,
-	   boolean (*get_extr) (struct symbol_cache_entry *,
-				struct ecoff_extr *),
-	   void (*set_index) (struct symbol_cache_entry *,
-			      bfd_size_type)));
-extern boolean bfd_ecoff_debug_one_external
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap,
-	   const char *name, struct ecoff_extr *esym));
-extern bfd_size_type bfd_ecoff_debug_size
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap));
-extern boolean bfd_ecoff_write_debug
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap, file_ptr where));
-extern boolean bfd_ecoff_write_accumulated_debug
-  PARAMS ((PTR handle, bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap,
-	   struct bfd_link_info *info, file_ptr where));
-extern boolean bfd_mips_ecoff_create_embedded_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
-	   char **));
-
-/* Externally visible ELF routines.  */
-
-struct bfd_link_needed_list
-{
-  struct bfd_link_needed_list *next;
-  bfd *by;
-  const char *name;
-};
-
-extern boolean bfd_elf32_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern boolean bfd_elf64_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern struct bfd_link_needed_list *bfd_elf_get_needed_list
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf_get_bfd_needed_list
-  PARAMS ((bfd *, struct bfd_link_needed_list **));
-extern boolean bfd_elf32_size_dynamic_sections
-  PARAMS ((bfd *, const char *, const char *, boolean, const char *,
-	   const char * const *, struct bfd_link_info *, struct sec **,
-	   struct bfd_elf_version_tree *));
-extern boolean bfd_elf64_size_dynamic_sections
-  PARAMS ((bfd *, const char *, const char *, boolean, const char *,
-	   const char * const *, struct bfd_link_info *, struct sec **,
-	   struct bfd_elf_version_tree *));
-extern void bfd_elf_set_dt_needed_name PARAMS ((bfd *, const char *));
-extern const char *bfd_elf_get_dt_soname PARAMS ((bfd *));
-
-/* SunOS shared library support routines for the linker.  */
-
-extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sunos_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_sunos_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *, struct sec **, struct sec **,
-	   struct sec **));
-
-/* Linux shared library support routines for the linker.  */
-
-extern boolean bfd_i386linux_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_m68klinux_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sparclinux_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* mmap hacks */
-
-struct _bfd_window_internal;
-typedef struct _bfd_window_internal bfd_window_internal;
-
-typedef struct _bfd_window {
-  /* What the user asked for.  */
-  PTR data;
-  bfd_size_type size;
-  /* The actual window used by BFD.  Small user-requested read-only
-     regions sharing a page may share a single window into the object
-     file.  Read-write versions shouldn't until I've fixed things to
-     keep track of which portions have been claimed by the
-     application; don't want to give the same region back when the
-     application wants two writable copies!  */
-  struct _bfd_window_internal *i;
-} bfd_window;
-
-extern void bfd_init_window PARAMS ((bfd_window *));
-extern void bfd_free_window PARAMS ((bfd_window *));
-extern boolean bfd_get_file_window
-  PARAMS ((bfd *, file_ptr, bfd_size_type, bfd_window *, boolean));
-
-/* XCOFF support routines for the linker.  */
-
-extern boolean bfd_xcoff_link_record_set
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
-	   bfd_size_type));
-extern boolean bfd_xcoff_import_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
-	   bfd_vma, const char *, const char *, const char *));
-extern boolean bfd_xcoff_export_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
-	   boolean));
-extern boolean bfd_xcoff_link_count_reloc
-  PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, const char *,
-	   unsigned long, unsigned long, unsigned long, boolean,
-	   int, boolean, boolean, struct sec **));
-
-/* Externally visible COFF routines.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct internal_syment;
-union internal_auxent;
-#endif
-
-extern boolean bfd_coff_get_syment
-  PARAMS ((bfd *, struct symbol_cache_entry *, struct internal_syment *));
-
-extern boolean bfd_coff_get_auxent
-  PARAMS ((bfd *, struct symbol_cache_entry *, int, union internal_auxent *));
-
-extern boolean bfd_coff_set_symbol_class
-  PARAMS ((bfd *, struct symbol_cache_entry *, unsigned int));
-
-/* ARM Interworking support.  Called from linker.  */
-extern boolean bfd_arm_allocate_interworking_sections
-  PARAMS ((struct bfd_link_info *));
-
-extern boolean bfd_arm_process_before_allocation
-  PARAMS ((bfd *, struct bfd_link_info *, int));
-
-extern boolean bfd_arm_get_bfd_for_interworking
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* ELF ARM Interworking support.  Called from linker.  */
-  extern boolean bfd_elf32_arm_allocate_interworking_sections
-    PARAMS ((struct bfd_link_info *));
- 
-  extern boolean bfd_elf32_arm_process_before_allocation
-    PARAMS ((bfd *, struct bfd_link_info *));
- 
-  extern boolean bfd_elf32_arm_get_bfd_for_interworking
-    PARAMS ((bfd *, struct bfd_link_info *));
-
-/* And more from the source.  */
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
deleted file mode 100644
index 8e86304d953..00000000000
--- a/bfd/bfd-in2.h
+++ /dev/null
@@ -1,3003 +0,0 @@
-/* Main header file for the bfd library -- portable access to object files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
-   Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-
-** NOTE: bfd.h and bfd-in2.h are GENERATED files.  Don't change them;
-** instead, change bfd-in.h or the other BFD source files processed to
-** generate these files.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* bfd.h -- The only header file required by users of the bfd library 
-
-The bfd.h file is generated from bfd-in.h and various .c files; if you
-change it, your changes will probably be lost.
-
-All the prototypes and definitions following the comment "THE FOLLOWING
-IS EXTRACTED FROM THE SOURCE" are extracted from the source files for
-BFD.  If you change it, someone oneday will extract it from the source
-again, and your changes will be lost.  To save yourself from this bind,
-change the definitions in the source in the bfd directory.  Type "make
-docs" and then "make headers" in that directory, and magically this file
-will change to reflect your changes.
-
-If you don't have the tools to perform the extraction, then you are
-safe from someone on your system trampling over your header files.
-You should still maintain the equivalence between the source and this
-file though; every change you make to the .c file should be reflected
-here.  */
-
-#ifndef __BFD_H_SEEN__
-#define __BFD_H_SEEN__
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#include "ansidecl.h"
-
-/* These two lines get substitutions done by commands in Makefile.in.  */
-#define BFD_VERSION  "@VERSION@"
-#define BFD_ARCH_SIZE @wordsize@
-#define BFD_HOST_64BIT_LONG @BFD_HOST_64BIT_LONG@
-#if @BFD_HOST_64_BIT_DEFINED@
-#define BFD_HOST_64_BIT @BFD_HOST_64_BIT@
-#define BFD_HOST_U_64_BIT @BFD_HOST_U_64_BIT@
-#endif
-
-#if BFD_ARCH_SIZE >= 64
-#define BFD64
-#endif
-
-#ifndef INLINE
-#if __GNUC__ >= 2
-#define INLINE __inline__
-#else
-#define INLINE
-#endif
-#endif
-
-/* forward declaration */
-typedef struct _bfd bfd;
-
-/* To squelch erroneous compiler warnings ("illegal pointer
-   combination") from the SVR3 compiler, we would like to typedef
-   boolean to int (it doesn't like functions which return boolean.
-   Making sure they are never implicitly declared to return int
-   doesn't seem to help).  But this file is not configured based on
-   the host.  */
-/* General rules: functions which are boolean return true on success
-   and false on failure (unless they're a predicate).   -- bfd.doc */
-/* I'm sure this is going to break something and someone is going to
-   force me to change it. */
-/* typedef enum boolean {false, true} boolean; */
-/* Yup, SVR4 has a "typedef enum boolean" in <sys/types.h>  -fnf */
-/* It gets worse if the host also defines a true/false enum... -sts */
-/* And even worse if your compiler has built-in boolean types... -law */
-#if defined (__GNUG__) && (__GNUC_MINOR__ > 5)
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif
-#ifdef MPW
-/* Pre-emptive strike - get the file with the enum. */
-#include <Types.h>
-#define TRUE_FALSE_ALREADY_DEFINED
-#endif /* MPW */
-#ifndef TRUE_FALSE_ALREADY_DEFINED
-typedef enum bfd_boolean {false, true} boolean;
-#define BFD_TRUE_FALSE
-#else
-/* Use enum names that will appear nowhere else.  */
-typedef enum bfd_boolean {bfd_fffalse, bfd_tttrue} boolean;
-#endif
-
-/* A pointer to a position in a file.  */
-/* FIXME:  This should be using off_t from <sys/types.h>.
-   For now, try to avoid breaking stuff by not including <sys/types.h> here.
-   This will break on systems with 64-bit file offsets (e.g. 4.4BSD).
-   Probably the best long-term answer is to avoid using file_ptr AND off_t 
-   in this header file, and to handle this in the BFD implementation
-   rather than in its interface.  */
-/* typedef off_t	file_ptr; */
-typedef long int file_ptr;
-
-/* Support for different sizes of target format ints and addresses.
-   If the type `long' is at least 64 bits, BFD_HOST_64BIT_LONG will be
-   set to 1 above.  Otherwise, if gcc is being used, this code will
-   use gcc's "long long" type.  Otherwise, BFD_HOST_64_BIT must be
-   defined above.  */
-
-#ifndef BFD_HOST_64_BIT
-# if BFD_HOST_64BIT_LONG
-#  define BFD_HOST_64_BIT long
-#  define BFD_HOST_U_64_BIT unsigned long
-# else
-#  ifdef __GNUC__
-#   if __GNUC__ >= 2
-#    define BFD_HOST_64_BIT long long
-#    define BFD_HOST_U_64_BIT unsigned long long
-#   endif /* __GNUC__ >= 2 */
-#  endif /* ! defined (__GNUC__) */
-# endif /* ! BFD_HOST_64BIT_LONG */
-#endif /* ! defined (BFD_HOST_64_BIT) */
-
-#ifdef BFD64
-
-#ifndef BFD_HOST_64_BIT
- #error No 64 bit integer type available
-#endif /* ! defined (BFD_HOST_64_BIT) */
-
-typedef BFD_HOST_U_64_BIT bfd_vma;
-typedef BFD_HOST_64_BIT bfd_signed_vma;
-typedef BFD_HOST_U_64_BIT bfd_size_type;
-typedef BFD_HOST_U_64_BIT symvalue;
-
-#ifndef fprintf_vma
-#if BFD_HOST_64BIT_LONG
-#define sprintf_vma(s,x) sprintf (s, "%016lx", x)
-#define fprintf_vma(f,x) fprintf (f, "%016lx", x)
-#else
-#define _bfd_int64_low(x) ((unsigned long) (((x) & 0xffffffff)))
-#define _bfd_int64_high(x) ((unsigned long) (((x) >> 32) & 0xffffffff))
-#define fprintf_vma(s,x) \
-  fprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-#define sprintf_vma(s,x) \
-  sprintf ((s), "%08lx%08lx", _bfd_int64_high (x), _bfd_int64_low (x))
-#endif
-#endif
-
-#else /* not BFD64  */
-
-/* Represent a target address.  Also used as a generic unsigned type
-   which is guaranteed to be big enough to hold any arithmetic types
-   we need to deal with.  */
-typedef unsigned long bfd_vma;
-
-/* A generic signed type which is guaranteed to be big enough to hold any
-   arithmetic types we need to deal with.  Can be assumed to be compatible
-   with bfd_vma in the same way that signed and unsigned ints are compatible
-   (as parameters, in assignment, etc).  */
-typedef long bfd_signed_vma;
-
-typedef unsigned long symvalue;
-typedef unsigned long bfd_size_type;
-
-/* Print a bfd_vma x on stream s.  */
-#define fprintf_vma(s,x) fprintf(s, "%08lx", x)
-#define sprintf_vma(s,x) sprintf(s, "%08lx", x)
-
-#endif /* not BFD64  */
-
-#define printf_vma(x) fprintf_vma(stdout,x)
-
-typedef unsigned int flagword;	/* 32 bits of flags */
-typedef unsigned char bfd_byte;
-
-/** File formats */
-
-typedef enum bfd_format {
-	      bfd_unknown = 0,	/* file format is unknown */
-	      bfd_object,	/* linker/assember/compiler output */
-	      bfd_archive,	/* object archive file */
-	      bfd_core,		/* core dump */
-	      bfd_type_end}	/* marks the end; don't use it! */
-         bfd_format;
-
-/* Values that may appear in the flags field of a BFD.  These also
-   appear in the object_flags field of the bfd_target structure, where
-   they indicate the set of flags used by that backend (not all flags
-   are meaningful for all object file formats) (FIXME: at the moment,
-   the object_flags values have mostly just been copied from backend
-   to another, and are not necessarily correct).  */
-
-/* No flags.  */
-#define BFD_NO_FLAGS   	0x00
-
-/* BFD contains relocation entries.  */
-#define HAS_RELOC   	0x01
-
-/* BFD is directly executable.  */
-#define EXEC_P      	0x02
-
-/* BFD has line number information (basically used for F_LNNO in a
-   COFF header).  */
-#define HAS_LINENO  	0x04
-
-/* BFD has debugging information.  */
-#define HAS_DEBUG   	0x08
-
-/* BFD has symbols.  */
-#define HAS_SYMS    	0x10
-
-/* BFD has local symbols (basically used for F_LSYMS in a COFF
-   header).  */
-#define HAS_LOCALS  	0x20
-
-/* BFD is a dynamic object.  */
-#define DYNAMIC     	0x40
-
-/* Text section is write protected (if D_PAGED is not set, this is
-   like an a.out NMAGIC file) (the linker sets this by default, but
-   clears it for -r or -N).  */
-#define WP_TEXT     	0x80
-
-/* BFD is dynamically paged (this is like an a.out ZMAGIC file) (the
-   linker sets this by default, but clears it for -r or -n or -N).  */
-#define D_PAGED     	0x100
-
-/* BFD is relaxable (this means that bfd_relax_section may be able to
-   do something) (sometimes bfd_relax_section can do something even if
-   this is not set).  */
-#define BFD_IS_RELAXABLE 0x200
-
-/* This may be set before writing out a BFD to request using a
-   traditional format.  For example, this is used to request that when
-   writing out an a.out object the symbols not be hashed to eliminate
-   duplicates.  */
-#define BFD_TRADITIONAL_FORMAT 0x400
-
-/* This flag indicates that the BFD contents are actually cached in
-   memory.  If this is set, iostream points to a bfd_in_memory struct.  */
-#define BFD_IN_MEMORY 0x800
-
-/* symbols and relocation */
-
-/* A count of carsyms (canonical archive symbols).  */
-typedef unsigned long symindex;
-
-/* How to perform a relocation.  */
-typedef const struct reloc_howto_struct reloc_howto_type;
-
-#define BFD_NO_MORE_SYMBOLS ((symindex) ~0)
-
-/* General purpose part of a symbol X;
-   target specific parts are in libcoff.h, libaout.h, etc.  */
-
-#define bfd_get_section(x) ((x)->section)
-#define bfd_get_output_section(x) ((x)->section->output_section)
-#define bfd_set_section(x,y) ((x)->section) = (y)
-#define bfd_asymbol_base(x) ((x)->section->vma)
-#define bfd_asymbol_value(x) (bfd_asymbol_base(x) + (x)->value)
-#define bfd_asymbol_name(x) ((x)->name)
-/*Perhaps future: #define bfd_asymbol_bfd(x) ((x)->section->owner)*/
-#define bfd_asymbol_bfd(x) ((x)->the_bfd)
-#define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour)
-
-/* A canonical archive symbol.  */
-/* This is a type pun with struct ranlib on purpose! */
-typedef struct carsym {
-  char *name;
-  file_ptr file_offset;		/* look here to find the file */
-} carsym;			/* to make these you call a carsymogen */
-
-  
-/* Used in generating armaps (archive tables of contents).
-   Perhaps just a forward definition would do? */
-struct orl {			/* output ranlib */
-  char **name;			/* symbol name */ 
-  file_ptr pos;			/* bfd* or file position */
-  int namidx;			/* index into string table */
-};
-
-
-/* Linenumber stuff */
-typedef struct lineno_cache_entry {
-  unsigned int line_number;	/* Linenumber from start of function*/  
-  union {
-    struct symbol_cache_entry *sym; /* Function name */
-    unsigned long offset;	/* Offset into section */
-  } u;
-} alent;
-
-/* object and core file sections */
-
-#define	align_power(addr, align)	\
-	( ((addr) + ((1<<(align))-1)) & (-1 << (align)))
-
-typedef struct sec *sec_ptr;
-
-#define bfd_get_section_name(bfd, ptr) ((ptr)->name + 0)
-#define bfd_get_section_vma(bfd, ptr) ((ptr)->vma + 0)
-#define bfd_get_section_alignment(bfd, ptr) ((ptr)->alignment_power + 0)
-#define bfd_section_name(bfd, ptr) ((ptr)->name)
-#define bfd_section_size(bfd, ptr) (bfd_get_section_size_before_reloc(ptr))
-#define bfd_section_vma(bfd, ptr) ((ptr)->vma)
-#define bfd_section_lma(bfd, ptr) ((ptr)->lma)
-#define bfd_section_alignment(bfd, ptr) ((ptr)->alignment_power)
-#define bfd_get_section_flags(bfd, ptr) ((ptr)->flags + 0)
-#define bfd_get_section_userdata(bfd, ptr) ((ptr)->userdata)
-
-#define bfd_is_com_section(ptr) (((ptr)->flags & SEC_IS_COMMON) != 0)
-
-#define bfd_set_section_vma(bfd, ptr, val) (((ptr)->vma = (ptr)->lma= (val)), ((ptr)->user_set_vma = (boolean)true), true)
-#define bfd_set_section_alignment(bfd, ptr, val) (((ptr)->alignment_power = (val)),true)
-#define bfd_set_section_userdata(bfd, ptr, val) (((ptr)->userdata = (val)),true)
-
-typedef struct stat stat_type; 
-
-typedef enum bfd_print_symbol
-{ 
-  bfd_print_symbol_name,
-  bfd_print_symbol_more,
-  bfd_print_symbol_all
-} bfd_print_symbol_type;
-    
-/* Information about a symbol that nm needs.  */
-
-typedef struct _symbol_info
-{
-  symvalue value;
-  char type;
-  CONST char *name;            /* Symbol name.  */
-  unsigned char stab_type;     /* Stab type.  */
-  char stab_other;             /* Stab other. */
-  short stab_desc;             /* Stab desc.  */
-  CONST char *stab_name;       /* String for stab type.  */
-} symbol_info;
-
-/* Get the name of a stabs type code.  */
-
-extern const char *bfd_get_stab_name PARAMS ((int));
-
-/* Hash table routines.  There is no way to free up a hash table.  */
-
-/* An element in the hash table.  Most uses will actually use a larger
-   structure, and an instance of this will be the first field.  */
-
-struct bfd_hash_entry
-{
-  /* Next entry for this hash code.  */
-  struct bfd_hash_entry *next;
-  /* String being hashed.  */
-  const char *string;
-  /* Hash code.  This is the full hash code, not the index into the
-     table.  */
-  unsigned long hash;
-};
-
-/* A hash table.  */
-
-struct bfd_hash_table
-{
-  /* The hash array.  */
-  struct bfd_hash_entry **table;
-  /* The number of slots in the hash table.  */
-  unsigned int size;
-  /* A function used to create new elements in the hash table.  The
-     first entry is itself a pointer to an element.  When this
-     function is first invoked, this pointer will be NULL.  However,
-     having the pointer permits a hierarchy of method functions to be
-     built each of which calls the function in the superclass.  Thus
-     each function should be written to allocate a new block of memory
-     only if the argument is NULL.  */
-  struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-					     struct bfd_hash_table *,
-					     const char *));
-   /* An objalloc for this hash table.  This is a struct objalloc *,
-     but we use PTR to avoid requiring the inclusion of objalloc.h.  */
-  PTR memory;
-};
-
-/* Initialize a hash table.  */
-extern boolean bfd_hash_table_init
-  PARAMS ((struct bfd_hash_table *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-
-/* Initialize a hash table specifying a size.  */
-extern boolean bfd_hash_table_init_n
-  PARAMS ((struct bfd_hash_table *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *),
-	   unsigned int size));
-
-/* Free up a hash table.  */
-extern void bfd_hash_table_free PARAMS ((struct bfd_hash_table *));
-
-/* Look up a string in a hash table.  If CREATE is true, a new entry
-   will be created for this string if one does not already exist.  The
-   COPY argument must be true if this routine should copy the string
-   into newly allocated memory when adding an entry.  */
-extern struct bfd_hash_entry *bfd_hash_lookup
-  PARAMS ((struct bfd_hash_table *, const char *, boolean create,
-	   boolean copy));
-
-/* Replace an entry in a hash table.  */
-extern void bfd_hash_replace
-  PARAMS ((struct bfd_hash_table *, struct bfd_hash_entry *old,
-	   struct bfd_hash_entry *nw));
-
-/* Base method for creating a hash table entry.  */
-extern struct bfd_hash_entry *bfd_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
-	   const char *));
-
-/* Grab some space for a hash table entry.  */
-extern PTR bfd_hash_allocate PARAMS ((struct bfd_hash_table *,
-				      unsigned int));
-
-/* Traverse a hash table in a random order, calling a function on each
-   element.  If the function returns false, the traversal stops.  The
-   INFO argument is passed to the function.  */
-extern void bfd_hash_traverse PARAMS ((struct bfd_hash_table *,
-				       boolean (*) (struct bfd_hash_entry *,
-						    PTR),
-				       PTR info));
-
-/* Semi-portable string concatenation in cpp.
-   The CAT4 hack is to avoid a problem with some strict ANSI C preprocessors.
-   The problem is, "32_" is not a valid preprocessing token, and we don't
-   want extra underscores (e.g., "nlm_32_").  The XCAT2 macro will cause the
-   inner CAT macros to be evaluated first, producing still-valid pp-tokens.
-   Then the final concatenation can be done.  (Sigh.)  */
-#ifndef CAT
-#ifdef SABER
-#define CAT(a,b)	a##b
-#define CAT3(a,b,c)	a##b##c
-#define CAT4(a,b,c,d)	a##b##c##d
-#else
-#if defined(__STDC__) || defined(ALMOST_STDC)
-#define CAT(a,b) a##b
-#define CAT3(a,b,c) a##b##c
-#define XCAT2(a,b)	CAT(a,b)
-#define CAT4(a,b,c,d)	XCAT2(CAT(a,b),CAT(c,d))
-#else
-#define CAT(a,b) a/**/b
-#define CAT3(a,b,c) a/**/b/**/c
-#define CAT4(a,b,c,d)	a/**/b/**/c/**/d
-#endif
-#endif
-#endif
-
-#define COFF_SWAP_TABLE (PTR) &bfd_coff_std_swap_table
-
-/* User program access to BFD facilities */
-
-/* Direct I/O routines, for programs which know more about the object
-   file than BFD does.  Use higher level routines if possible.  */
-
-extern bfd_size_type bfd_read
-  PARAMS ((PTR, bfd_size_type size, bfd_size_type nitems, bfd *abfd));
-extern bfd_size_type bfd_write
-  PARAMS ((const PTR, bfd_size_type size, bfd_size_type nitems, bfd *abfd));
-extern int bfd_seek PARAMS ((bfd *abfd, file_ptr fp, int direction));
-extern long bfd_tell PARAMS ((bfd *abfd));
-extern int bfd_flush PARAMS ((bfd *abfd));
-extern int bfd_stat PARAMS ((bfd *abfd, struct stat *));
-
-
-/* Cast from const char * to char * so that caller can assign to
-   a char * without a warning.  */
-#define bfd_get_filename(abfd) ((char *) (abfd)->filename)
-#define bfd_get_cacheable(abfd) ((abfd)->cacheable)
-#define bfd_get_format(abfd) ((abfd)->format)
-#define bfd_get_target(abfd) ((abfd)->xvec->name)
-#define bfd_get_flavour(abfd) ((abfd)->xvec->flavour)
-#define bfd_big_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_BIG)
-#define bfd_little_endian(abfd) ((abfd)->xvec->byteorder == BFD_ENDIAN_LITTLE)
-#define bfd_header_big_endian(abfd) \
-  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_BIG)
-#define bfd_header_little_endian(abfd) \
-  ((abfd)->xvec->header_byteorder == BFD_ENDIAN_LITTLE)
-#define bfd_get_file_flags(abfd) ((abfd)->flags)
-#define bfd_applicable_file_flags(abfd) ((abfd)->xvec->object_flags)
-#define bfd_applicable_section_flags(abfd) ((abfd)->xvec->section_flags)
-#define bfd_my_archive(abfd) ((abfd)->my_archive)
-#define bfd_has_map(abfd) ((abfd)->has_armap)
-
-#define bfd_valid_reloc_types(abfd) ((abfd)->xvec->valid_reloc_types)
-#define bfd_usrdata(abfd) ((abfd)->usrdata)
-
-#define bfd_get_start_address(abfd) ((abfd)->start_address)
-#define bfd_get_symcount(abfd) ((abfd)->symcount)
-#define bfd_get_outsymbols(abfd) ((abfd)->outsymbols)
-#define bfd_count_sections(abfd) ((abfd)->section_count)
-
-#define bfd_get_symbol_leading_char(abfd) ((abfd)->xvec->symbol_leading_char)
-
-#define bfd_set_cacheable(abfd,bool) (((abfd)->cacheable = (boolean)(bool)), true)
-
-extern boolean bfd_record_phdr
-  PARAMS ((bfd *, unsigned long, boolean, flagword, boolean, bfd_vma,
-	   boolean, boolean, unsigned int, struct sec **));
-
-/* Byte swapping routines.  */
-
-bfd_vma		bfd_getb64	   PARAMS ((const unsigned char *));
-bfd_vma 	bfd_getl64	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_64 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_64 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb32	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl32	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_32 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_32 PARAMS ((const unsigned char *));
-bfd_vma		bfd_getb16	   PARAMS ((const unsigned char *));
-bfd_vma		bfd_getl16	   PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getb_signed_16 PARAMS ((const unsigned char *));
-bfd_signed_vma	bfd_getl_signed_16 PARAMS ((const unsigned char *));
-void		bfd_putb64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl64	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl32	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putb16	   PARAMS ((bfd_vma, unsigned char *));
-void		bfd_putl16	   PARAMS ((bfd_vma, unsigned char *));
-
-/* Externally visible ECOFF routines.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct ecoff_debug_info;
-struct ecoff_debug_swap;
-struct ecoff_extr;
-struct symbol_cache_entry;
-struct bfd_link_info;
-struct bfd_link_hash_entry;
-struct bfd_elf_version_tree;
-#endif
-extern bfd_vma bfd_ecoff_get_gp_value PARAMS ((bfd * abfd));
-extern boolean bfd_ecoff_set_gp_value PARAMS ((bfd *abfd, bfd_vma gp_value));
-extern boolean bfd_ecoff_set_regmasks
-  PARAMS ((bfd *abfd, unsigned long gprmask, unsigned long fprmask,
-	   unsigned long *cprmask));
-extern PTR bfd_ecoff_debug_init
-  PARAMS ((bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap,
-	   struct bfd_link_info *));
-extern void bfd_ecoff_debug_free
-  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap,
-	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate
-  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap,
-	   bfd *input_bfd, struct ecoff_debug_info *input_debug,
-	   const struct ecoff_debug_swap *input_swap,
-	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_accumulate_other
-  PARAMS ((PTR handle, bfd *output_bfd, struct ecoff_debug_info *output_debug,
-	   const struct ecoff_debug_swap *output_swap, bfd *input_bfd,
-	   struct bfd_link_info *));
-extern boolean bfd_ecoff_debug_externals
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap,
-	   boolean relocateable,
-	   boolean (*get_extr) (struct symbol_cache_entry *,
-				struct ecoff_extr *),
-	   void (*set_index) (struct symbol_cache_entry *,
-			      bfd_size_type)));
-extern boolean bfd_ecoff_debug_one_external
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap,
-	   const char *name, struct ecoff_extr *esym));
-extern bfd_size_type bfd_ecoff_debug_size
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap));
-extern boolean bfd_ecoff_write_debug
-  PARAMS ((bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap, file_ptr where));
-extern boolean bfd_ecoff_write_accumulated_debug
-  PARAMS ((PTR handle, bfd *abfd, struct ecoff_debug_info *debug,
-	   const struct ecoff_debug_swap *swap,
-	   struct bfd_link_info *info, file_ptr where));
-extern boolean bfd_mips_ecoff_create_embedded_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, struct sec *, struct sec *,
-	   char **));
-
-/* Externally visible ELF routines.  */
-
-struct bfd_link_needed_list
-{
-  struct bfd_link_needed_list *next;
-  bfd *by;
-  const char *name;
-};
-
-extern boolean bfd_elf32_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern boolean bfd_elf64_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, boolean));
-extern struct bfd_link_needed_list *bfd_elf_get_needed_list
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf_get_bfd_needed_list
-  PARAMS ((bfd *, struct bfd_link_needed_list **));
-extern boolean bfd_elf32_size_dynamic_sections
-  PARAMS ((bfd *, const char *, const char *, boolean, const char *,
-	   const char * const *, struct bfd_link_info *, struct sec **,
-	   struct bfd_elf_version_tree *));
-extern boolean bfd_elf64_size_dynamic_sections
-  PARAMS ((bfd *, const char *, const char *, boolean, const char *,
-	   const char * const *, struct bfd_link_info *, struct sec **,
-	   struct bfd_elf_version_tree *));
-extern void bfd_elf_set_dt_needed_name PARAMS ((bfd *, const char *));
-extern const char *bfd_elf_get_dt_soname PARAMS ((bfd *));
-
-/* SunOS shared library support routines for the linker.  */
-
-extern struct bfd_link_needed_list *bfd_sunos_get_needed_list
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sunos_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_sunos_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *, struct sec **, struct sec **,
-	   struct sec **));
-
-/* Linux shared library support routines for the linker.  */
-
-extern boolean bfd_i386linux_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_m68klinux_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_sparclinux_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* mmap hacks */
-
-struct _bfd_window_internal;
-typedef struct _bfd_window_internal bfd_window_internal;
-
-typedef struct _bfd_window {
-  /* What the user asked for.  */
-  PTR data;
-  bfd_size_type size;
-  /* The actual window used by BFD.  Small user-requested read-only
-     regions sharing a page may share a single window into the object
-     file.  Read-write versions shouldn't until I've fixed things to
-     keep track of which portions have been claimed by the
-     application; don't want to give the same region back when the
-     application wants two writable copies!  */
-  struct _bfd_window_internal *i;
-} bfd_window;
-
-extern void bfd_init_window PARAMS ((bfd_window *));
-extern void bfd_free_window PARAMS ((bfd_window *));
-extern boolean bfd_get_file_window
-  PARAMS ((bfd *, file_ptr, bfd_size_type, bfd_window *, boolean));
-
-/* XCOFF support routines for the linker.  */
-
-extern boolean bfd_xcoff_link_record_set
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
-	   bfd_size_type));
-extern boolean bfd_xcoff_import_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
-	   bfd_vma, const char *, const char *, const char *));
-extern boolean bfd_xcoff_export_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_hash_entry *,
-	   boolean));
-extern boolean bfd_xcoff_link_count_reloc
-  PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_record_link_assignment
-  PARAMS ((bfd *, struct bfd_link_info *, const char *));
-extern boolean bfd_xcoff_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, const char *,
-	   unsigned long, unsigned long, unsigned long, boolean,
-	   int, boolean, boolean, struct sec **));
-
-/* Externally visible COFF routines.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct internal_syment;
-union internal_auxent;
-#endif
-
-extern boolean bfd_coff_get_syment
-  PARAMS ((bfd *, struct symbol_cache_entry *, struct internal_syment *));
-
-extern boolean bfd_coff_get_auxent
-  PARAMS ((bfd *, struct symbol_cache_entry *, int, union internal_auxent *));
-
-extern boolean bfd_coff_set_symbol_class
-  PARAMS ((bfd *, struct symbol_cache_entry *, unsigned int));
-
-/* ARM Interworking support.  Called from linker.  */
-extern boolean bfd_arm_allocate_interworking_sections
-  PARAMS ((struct bfd_link_info *));
-
-extern boolean bfd_arm_process_before_allocation
-  PARAMS ((bfd *, struct bfd_link_info *, int));
-
-extern boolean bfd_arm_get_bfd_for_interworking
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* ELF ARM Interworking support.  Called from linker.  */
-  extern boolean bfd_elf32_arm_allocate_interworking_sections
-    PARAMS ((struct bfd_link_info *));
- 
-  extern boolean bfd_elf32_arm_process_before_allocation
-    PARAMS ((bfd *, struct bfd_link_info *));
- 
-  extern boolean bfd_elf32_arm_get_bfd_for_interworking
-    PARAMS ((bfd *, struct bfd_link_info *));
-
-/* And more from the source.  */
-void 
-bfd_init PARAMS ((void));
-
-bfd *
-bfd_openr PARAMS ((CONST char *filename, CONST char *target));
-
-bfd *
-bfd_fdopenr PARAMS ((CONST char *filename, CONST char *target, int fd));
-
-bfd *
-bfd_openstreamr PARAMS ((const char *, const char *, PTR));
-
-bfd *
-bfd_openw PARAMS ((CONST char *filename, CONST char *target));
-
-boolean 
-bfd_close PARAMS ((bfd *abfd));
-
-boolean 
-bfd_close_all_done PARAMS ((bfd *));
-
-bfd *
-bfd_create PARAMS ((CONST char *filename, bfd *templ));
-
-boolean 
-bfd_make_writable PARAMS ((bfd *abfd));
-
-boolean 
-bfd_make_readable PARAMS ((bfd *abfd));
-
-
- /* Byte swapping macros for user section data.  */
-
-#define bfd_put_8(abfd, val, ptr) \
-                (*((unsigned char *)(ptr)) = (unsigned char)(val))
-#define bfd_put_signed_8 \
-               bfd_put_8
-#define bfd_get_8(abfd, ptr) \
-                (*(unsigned char *)(ptr))
-#define bfd_get_signed_8(abfd, ptr) \
-               ((*(unsigned char *)(ptr) ^ 0x80) - 0x80)
-
-#define bfd_put_16(abfd, val, ptr) \
-                BFD_SEND(abfd, bfd_putx16, ((val),(ptr)))
-#define bfd_put_signed_16 \
-                bfd_put_16
-#define bfd_get_16(abfd, ptr) \
-                BFD_SEND(abfd, bfd_getx16, (ptr))
-#define bfd_get_signed_16(abfd, ptr) \
-                BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
-
-#define bfd_put_32(abfd, val, ptr) \
-                BFD_SEND(abfd, bfd_putx32, ((val),(ptr)))
-#define bfd_put_signed_32 \
-                bfd_put_32
-#define bfd_get_32(abfd, ptr) \
-                BFD_SEND(abfd, bfd_getx32, (ptr))
-#define bfd_get_signed_32(abfd, ptr) \
-                BFD_SEND(abfd, bfd_getx_signed_32, (ptr))
-
-#define bfd_put_64(abfd, val, ptr) \
-                BFD_SEND(abfd, bfd_putx64, ((val), (ptr)))
-#define bfd_put_signed_64 \
-                bfd_put_64
-#define bfd_get_64(abfd, ptr) \
-                BFD_SEND(abfd, bfd_getx64, (ptr))
-#define bfd_get_signed_64(abfd, ptr) \
-                BFD_SEND(abfd, bfd_getx_signed_64, (ptr))
-
-
- /* Byte swapping macros for file header data.  */
-
-#define bfd_h_put_8(abfd, val, ptr) \
-               bfd_put_8 (abfd, val, ptr)
-#define bfd_h_put_signed_8(abfd, val, ptr) \
-               bfd_put_8 (abfd, val, ptr)
-#define bfd_h_get_8(abfd, ptr) \
-               bfd_get_8 (abfd, ptr)
-#define bfd_h_get_signed_8(abfd, ptr) \
-               bfd_get_signed_8 (abfd, ptr)
-
-#define bfd_h_put_16(abfd, val, ptr) \
-                BFD_SEND(abfd, bfd_h_putx16,(val,ptr))
-#define bfd_h_put_signed_16 \
-                bfd_h_put_16
-#define bfd_h_get_16(abfd, ptr) \
-                BFD_SEND(abfd, bfd_h_getx16,(ptr))
-#define bfd_h_get_signed_16(abfd, ptr) \
-                BFD_SEND(abfd, bfd_h_getx_signed_16, (ptr))
-
-#define bfd_h_put_32(abfd, val, ptr) \
-                BFD_SEND(abfd, bfd_h_putx32,(val,ptr))
-#define bfd_h_put_signed_32 \
-                bfd_h_put_32
-#define bfd_h_get_32(abfd, ptr) \
-                BFD_SEND(abfd, bfd_h_getx32,(ptr))
-#define bfd_h_get_signed_32(abfd, ptr) \
-                BFD_SEND(abfd, bfd_h_getx_signed_32, (ptr))
-
-#define bfd_h_put_64(abfd, val, ptr) \
-                BFD_SEND(abfd, bfd_h_putx64,(val, ptr))
-#define bfd_h_put_signed_64 \
-                bfd_h_put_64
-#define bfd_h_get_64(abfd, ptr) \
-                BFD_SEND(abfd, bfd_h_getx64,(ptr))
-#define bfd_h_get_signed_64(abfd, ptr) \
-                BFD_SEND(abfd, bfd_h_getx_signed_64, (ptr))
-
-typedef struct sec
-{
-         /* The name of the section; the name isn't a copy, the pointer is
-        the same as that passed to bfd_make_section. */
-
-    CONST char *name;
-
-         /* Which section is it; 0..nth.      */
-
-   int index;
-
-         /* The next section in the list belonging to the BFD, or NULL. */
-
-    struct sec *next;
-
-         /* The field flags contains attributes of the section. Some
-           flags are read in from the object file, and some are
-           synthesized from other information.  */
-
-    flagword flags;
-
-#define SEC_NO_FLAGS   0x000
-
-         /* Tells the OS to allocate space for this section when loading.
-           This is clear for a section containing debug information
-           only. */
-#define SEC_ALLOC      0x001
-
-         /* Tells the OS to load the section from the file when loading.
-           This is clear for a .bss section. */
-#define SEC_LOAD       0x002
-
-         /* The section contains data still to be relocated, so there is
-           some relocation information too. */
-#define SEC_RELOC      0x004
-
-#if 0    /* Obsolete ? */
-#define SEC_BALIGN     0x008
-#endif
-
-         /* A signal to the OS that the section contains read only
-          data. */
-#define SEC_READONLY   0x010
-
-         /* The section contains code only. */
-#define SEC_CODE       0x020
-
-         /* The section contains data only. */
-#define SEC_DATA       0x040
-
-         /* The section will reside in ROM. */
-#define SEC_ROM        0x080
-
-         /* The section contains constructor information. This section
-           type is used by the linker to create lists of constructors and
-           destructors used by <<g++>>. When a back end sees a symbol
-           which should be used in a constructor list, it creates a new
-           section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
-           the symbol to it, and builds a relocation. To build the lists
-           of constructors, all the linker has to do is catenate all the
-           sections called <<__CTOR_LIST__>> and relocate the data
-           contained within - exactly the operations it would peform on
-           standard data. */
-#define SEC_CONSTRUCTOR 0x100
-
-         /* The section is a constructor, and should be placed at the
-          end of the text, data, or bss section(?). */
-#define SEC_CONSTRUCTOR_TEXT 0x1100
-#define SEC_CONSTRUCTOR_DATA 0x2100
-#define SEC_CONSTRUCTOR_BSS  0x3100
-
-         /* The section has contents - a data section could be
-           <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
-           <<SEC_HAS_CONTENTS>> */
-#define SEC_HAS_CONTENTS 0x200
-
-         /* An instruction to the linker to not output the section
-           even if it has information which would normally be written. */
-#define SEC_NEVER_LOAD 0x400
-
-         /* The section is a COFF shared library section.  This flag is
-           only for the linker.  If this type of section appears in
-           the input file, the linker must copy it to the output file
-           without changing the vma or size.  FIXME: Although this
-           was originally intended to be general, it really is COFF
-           specific (and the flag was renamed to indicate this).  It
-           might be cleaner to have some more general mechanism to
-           allow the back end to control what the linker does with
-           sections. */
-#define SEC_COFF_SHARED_LIBRARY 0x800
-
-         /* The section contains common symbols (symbols may be defined
-           multiple times, the value of a symbol is the amount of
-           space it requires, and the largest symbol value is the one
-           used).  Most targets have exactly one of these (which we
-           translate to bfd_com_section_ptr), but ECOFF has two. */
-#define SEC_IS_COMMON 0x8000
-
-         /* The section contains only debugging information.  For
-           example, this is set for ELF .debug and .stab sections.
-           strip tests this flag to see if a section can be
-           discarded. */
-#define SEC_DEBUGGING 0x10000
-
-         /* The contents of this section are held in memory pointed to
-           by the contents field.  This is checked by
-           bfd_get_section_contents, and the data is retrieved from
-           memory if appropriate.  */
-#define SEC_IN_MEMORY 0x20000
-
-         /* The contents of this section are to be excluded by the
-           linker for executable and shared objects unless those
-           objects are to be further relocated.  */
-#define SEC_EXCLUDE 0x40000
-
-        /* The contents of this section are to be sorted by the
-          based on the address specified in the associated symbol
-          table.  */
-#define SEC_SORT_ENTRIES 0x80000
-
-        /* When linking, duplicate sections of the same name should be
-          discarded, rather than being combined into a single section as
-          is usually done.  This is similar to how common symbols are
-          handled.  See SEC_LINK_DUPLICATES below.  */
-#define SEC_LINK_ONCE 0x100000
-
-        /* If SEC_LINK_ONCE is set, this bitfield describes how the linker
-          should handle duplicate sections.  */
-#define SEC_LINK_DUPLICATES 0x600000
-
-        /* This value for SEC_LINK_DUPLICATES means that duplicate
-          sections with the same name should simply be discarded. */
-#define SEC_LINK_DUPLICATES_DISCARD 0x0
-
-        /* This value for SEC_LINK_DUPLICATES means that the linker
-          should warn if there are any duplicate sections, although
-          it should still only link one copy.  */
-#define SEC_LINK_DUPLICATES_ONE_ONLY 0x200000
-
-        /* This value for SEC_LINK_DUPLICATES means that the linker
-          should warn if any duplicate sections are a different size.  */
-#define SEC_LINK_DUPLICATES_SAME_SIZE 0x400000
-
-        /* This value for SEC_LINK_DUPLICATES means that the linker
-          should warn if any duplicate sections contain different
-          contents.  */
-#define SEC_LINK_DUPLICATES_SAME_CONTENTS 0x600000
-
-        /* This section was created by the linker as part of dynamic
-          relocation or other arcane processing.  It is skipped when
-          going through the first-pass output, trusting that someone
-          else up the line will take care of it later.  */
-#define SEC_LINKER_CREATED 0x800000
-
-        /* This section should not be subject to garbage collection.  */
-#define SEC_KEEP 0x1000000
-
-        /*  End of section flags.  */
-
-        /* Some internal packed boolean fields.  */
-
-        /* See the vma field.  */
-       unsigned int user_set_vma : 1;
-
-        /* Whether relocations have been processed.  */
-       unsigned int reloc_done : 1;
-
-        /* A mark flag used by some of the linker backends.  */
-       unsigned int linker_mark : 1;
-
-        /* A mark flag used by some linker backends for garbage collection.  */
-       unsigned int gc_mark : 1;
-
-        /* End of internal packed boolean fields.  */
-
-        /*  The virtual memory address of the section - where it will be
-           at run time.  The symbols are relocated against this.  The
-           user_set_vma flag is maintained by bfd; if it's not set, the
-           backend can assign addresses (for example, in <<a.out>>, where
-           the default address for <<.data>> is dependent on the specific
-           target and various flags).  */
-
-   bfd_vma vma;
-
-        /*  The load address of the section - where it would be in a
-           rom image; really only used for writing section header
-           information. */
-
-   bfd_vma lma;
-
-         /* The size of the section in bytes, as it will be output.
-           contains a value even if the section has no contents (e.g., the
-           size of <<.bss>>). This will be filled in after relocation */
-
-   bfd_size_type _cooked_size;
-
-         /* The original size on disk of the section, in bytes.  Normally this
-           value is the same as the size, but if some relaxing has
-           been done, then this value will be bigger.  */
-
-   bfd_size_type _raw_size;
-
-         /* If this section is going to be output, then this value is the
-           offset into the output section of the first byte in the input
-           section. E.g., if this was going to start at the 100th byte in
-           the output section, this value would be 100. */
-
-   bfd_vma output_offset;
-
-         /* The output section through which to map on output. */
-
-   struct sec *output_section;
-
-         /* The alignment requirement of the section, as an exponent of 2 -
-           e.g., 3 aligns to 2^3 (or 8). */
-
-   unsigned int alignment_power;
-
-         /* If an input section, a pointer to a vector of relocation
-           records for the data in this section. */
-
-   struct reloc_cache_entry *relocation;
-
-         /* If an output section, a pointer to a vector of pointers to
-           relocation records for the data in this section. */
-
-   struct reloc_cache_entry **orelocation;
-
-         /* The number of relocation records in one of the above  */
-
-   unsigned reloc_count;
-
-         /* Information below is back end specific - and not always used
-           or updated.  */
-
-         /* File position of section data    */
-
-   file_ptr filepos;
-
-         /* File position of relocation info */
-
-   file_ptr rel_filepos;
-
-         /* File position of line data       */
-
-   file_ptr line_filepos;
-
-         /* Pointer to data for applications */
-
-   PTR userdata;
-
-         /* If the SEC_IN_MEMORY flag is set, this points to the actual
-           contents.  */
-   unsigned char *contents;
-
-         /* Attached line number information */
-
-   alent *lineno;
-
-         /* Number of line number records   */
-
-   unsigned int lineno_count;
-
-         /* When a section is being output, this value changes as more
-           linenumbers are written out */
-
-   file_ptr moving_line_filepos;
-
-         /* What the section number is in the target world  */
-
-   int target_index;
-
-   PTR used_by_bfd;
-
-         /* If this is a constructor section then here is a list of the
-           relocations created to relocate items within it. */
-
-   struct relent_chain *constructor_chain;
-
-         /* The BFD which owns the section. */
-
-   bfd *owner;
-
-         /* A symbol which points at this section only */
-   struct symbol_cache_entry *symbol;
-   struct symbol_cache_entry **symbol_ptr_ptr;
-
-   struct bfd_link_order *link_order_head;
-   struct bfd_link_order *link_order_tail;
-} asection ;
-
-     /* These sections are global, and are managed by BFD.  The application
-       and target back end are not permitted to change the values in
-       these sections.  New code should use the section_ptr macros rather
-       than referring directly to the const sections.  The const sections
-       may eventually vanish.  */
-#define BFD_ABS_SECTION_NAME "*ABS*"
-#define BFD_UND_SECTION_NAME "*UND*"
-#define BFD_COM_SECTION_NAME "*COM*"
-#define BFD_IND_SECTION_NAME "*IND*"
-
-     /* the absolute section */
-extern const asection bfd_abs_section;
-#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
-#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)
-     /* Pointer to the undefined section */
-extern const asection bfd_und_section;
-#define bfd_und_section_ptr ((asection *) &bfd_und_section)
-#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)
-     /* Pointer to the common section */
-extern const asection bfd_com_section;
-#define bfd_com_section_ptr ((asection *) &bfd_com_section)
-     /* Pointer to the indirect section */
-extern const asection bfd_ind_section;
-#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
-#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
-
-extern const struct symbol_cache_entry * const bfd_abs_symbol;
-extern const struct symbol_cache_entry * const bfd_com_symbol;
-extern const struct symbol_cache_entry * const bfd_und_symbol;
-extern const struct symbol_cache_entry * const bfd_ind_symbol;
-#define bfd_get_section_size_before_reloc(section) \
-     (section->reloc_done ? (abort(),1): (section)->_raw_size)
-#define bfd_get_section_size_after_reloc(section) \
-     ((section->reloc_done) ? (section)->_cooked_size: (abort(),1))
-asection *
-bfd_get_section_by_name PARAMS ((bfd *abfd, CONST char *name));
-
-asection *
-bfd_make_section_old_way PARAMS ((bfd *abfd, CONST char *name));
-
-asection *
-bfd_make_section_anyway PARAMS ((bfd *abfd, CONST char *name));
-
-asection *
-bfd_make_section PARAMS ((bfd *, CONST char *name));
-
-boolean 
-bfd_set_section_flags PARAMS ((bfd *abfd, asection *sec, flagword flags));
-
-void 
-bfd_map_over_sections PARAMS ((bfd *abfd,
-    void (*func)(bfd *abfd,
-    asection *sect,
-    PTR obj),
-    PTR obj));
-
-boolean 
-bfd_set_section_size PARAMS ((bfd *abfd, asection *sec, bfd_size_type val));
-
-boolean 
-bfd_set_section_contents
- PARAMS ((bfd *abfd,
-    asection *section,
-    PTR data,
-    file_ptr offset,
-    bfd_size_type count));
-
-boolean 
-bfd_get_section_contents
- PARAMS ((bfd *abfd, asection *section, PTR location,
-    file_ptr offset, bfd_size_type count));
-
-boolean 
-bfd_copy_private_section_data PARAMS ((bfd *ibfd, asection *isec, bfd *obfd, asection *osec));
-
-#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
-     BFD_SEND (obfd, _bfd_copy_private_section_data, \
-               (ibfd, isection, obfd, osection))
-void 
-_bfd_strip_section_from_output
- PARAMS ((asection *section));
-
-enum bfd_architecture 
-{
-  bfd_arch_unknown,    /* File arch not known */
-  bfd_arch_obscure,    /* Arch known, not one of these */
-  bfd_arch_m68k,       /* Motorola 68xxx */
-#define bfd_mach_m68000 1
-#define bfd_mach_m68008 2
-#define bfd_mach_m68010 3
-#define bfd_mach_m68020 4
-#define bfd_mach_m68030 5
-#define bfd_mach_m68040 6
-#define bfd_mach_m68060 7
-#define bfd_mach_cpu32  8
-  bfd_arch_vax,        /* DEC Vax */   
-  bfd_arch_i960,       /* Intel 960 */
-     /* The order of the following is important.
-       lower number indicates a machine type that 
-       only accepts a subset of the instructions
-       available to machines with higher numbers.
-       The exception is the "ca", which is
-       incompatible with all other machines except 
-       "core". */
-
-#define bfd_mach_i960_core      1
-#define bfd_mach_i960_ka_sa     2
-#define bfd_mach_i960_kb_sb     3
-#define bfd_mach_i960_mc        4
-#define bfd_mach_i960_xa        5
-#define bfd_mach_i960_ca        6
-#define bfd_mach_i960_jx        7
-#define bfd_mach_i960_hx        8
-
-  bfd_arch_a29k,       /* AMD 29000 */
-  bfd_arch_sparc,      /* SPARC */
-#define bfd_mach_sparc                 1
- /* The difference between v8plus and v9 is that v9 is a true 64 bit env.  */
-#define bfd_mach_sparc_sparclet        2
-#define bfd_mach_sparc_sparclite       3
-#define bfd_mach_sparc_v8plus          4
-#define bfd_mach_sparc_v8plusa         5  /* with ultrasparc add'ns */
-#define bfd_mach_sparc_sparclite_le    6
-#define bfd_mach_sparc_v9              7
-#define bfd_mach_sparc_v9a             8  /* with ultrasparc add'ns */
- /* Nonzero if MACH has the v9 instruction set.  */
-#define bfd_mach_sparc_v9_p(mach) \
-  ((mach) >= bfd_mach_sparc_v8plus && (mach) <= bfd_mach_sparc_v9a)
-  bfd_arch_mips,       /* MIPS Rxxxx */
-#define bfd_mach_mips3000              3000
-#define bfd_mach_mips3900              3900
-#define bfd_mach_mips4000              4000
-#define bfd_mach_mips4010              4010
-#define bfd_mach_mips4100              4100
-#define bfd_mach_mips4111              4111
-#define bfd_mach_mips4300              4300
-#define bfd_mach_mips4400              4400
-#define bfd_mach_mips4600              4600
-#define bfd_mach_mips4650              4650
-#define bfd_mach_mips5000              5000
-#define bfd_mach_mips6000              6000
-#define bfd_mach_mips8000              8000
-#define bfd_mach_mips10000             10000
-#define bfd_mach_mips16                16
-  bfd_arch_i386,       /* Intel 386 */
-#define bfd_mach_i386_i386 0
-#define bfd_mach_i386_i8086 1
-#define bfd_mach_i386_i386_intel_syntax 2
-  bfd_arch_we32k,      /* AT&T WE32xxx */
-  bfd_arch_tahoe,      /* CCI/Harris Tahoe */
-  bfd_arch_i860,       /* Intel 860 */
-  bfd_arch_romp,       /* IBM ROMP PC/RT */
-  bfd_arch_alliant,    /* Alliant */
-  bfd_arch_convex,     /* Convex */
-  bfd_arch_m88k,       /* Motorola 88xxx */
-  bfd_arch_pyramid,    /* Pyramid Technology */
-  bfd_arch_h8300,      /* Hitachi H8/300 */
-#define bfd_mach_h8300   1
-#define bfd_mach_h8300h  2
-#define bfd_mach_h8300s  3
-  bfd_arch_powerpc,    /* PowerPC */
-  bfd_arch_rs6000,     /* IBM RS/6000 */
-  bfd_arch_hppa,       /* HP PA RISC */
-  bfd_arch_d10v,       /* Mitsubishi D10V */
-  bfd_arch_d30v,       /* Mitsubishi D30V */
-  bfd_arch_z8k,        /* Zilog Z8000 */
-#define bfd_mach_z8001         1
-#define bfd_mach_z8002         2
-  bfd_arch_h8500,      /* Hitachi H8/500 */
-  bfd_arch_sh,         /* Hitachi SH */
-#define bfd_mach_sh            0
-#define bfd_mach_sh3        0x30
-#define bfd_mach_sh3e       0x3e
-  bfd_arch_alpha,      /* Dec Alpha */
-#define bfd_mach_alpha_ev4  0x10
-#define bfd_mach_alpha_ev5  0x20
-#define bfd_mach_alpha_ev6  0x30
-  bfd_arch_arm,        /* Advanced Risc Machines ARM */
-#define bfd_mach_arm_2         1
-#define bfd_mach_arm_2a                2
-#define bfd_mach_arm_3         3
-#define bfd_mach_arm_3M        4
-#define bfd_mach_arm_4                 5
-#define bfd_mach_arm_4T        6
-  bfd_arch_ns32k,      /* National Semiconductors ns32000 */
-  bfd_arch_w65,        /* WDC 65816 */
-  bfd_arch_tic30,      /* Texas Instruments TMS320C30 */
-  bfd_arch_tic80,      /* TI TMS320c80 (MVP) */
-  bfd_arch_v850,       /* NEC V850 */
-#define bfd_mach_v850          0
-#define bfd_mach_v850e         'E'
-#define bfd_mach_v850ea        'A'
-  bfd_arch_arc,        /* Argonaut RISC Core */
-#define bfd_mach_arc_base 0
-  bfd_arch_m32r,       /* Mitsubishi M32R/D */
-#define bfd_mach_m32r          0  /* backwards compatibility */
-  bfd_arch_mn10200,    /* Matsushita MN10200 */
-  bfd_arch_mn10300,    /* Matsushita MN10300 */
-#define bfd_mach_mn10300               300
-  bfd_arch_fr30,
-#define bfd_mach_fr30          0x46523330
-  bfd_arch_mcore,
-  bfd_arch_last
-  };
-
-typedef struct bfd_arch_info 
-{
-  int bits_per_word;
-  int bits_per_address;
-  int bits_per_byte;
-  enum bfd_architecture arch;
-  unsigned long mach;
-  const char *arch_name;
-  const char *printable_name;
-  unsigned int section_align_power;
-  /* true if this is the default machine for the architecture */
-  boolean the_default; 
-  const struct bfd_arch_info * (*compatible)
-       PARAMS ((const struct bfd_arch_info *a,
-                const struct bfd_arch_info *b));
-
-  boolean (*scan) PARAMS ((const struct bfd_arch_info *, const char *));
-
-  const struct bfd_arch_info *next;
-} bfd_arch_info_type;
-const char *
-bfd_printable_name PARAMS ((bfd *abfd));
-
-const bfd_arch_info_type *
-bfd_scan_arch PARAMS ((const char *string));
-
-const char **
-bfd_arch_list PARAMS ((void));
-
-const bfd_arch_info_type *
-bfd_arch_get_compatible PARAMS ((
-    const bfd *abfd,
-    const bfd *bbfd));
-
-void 
-bfd_set_arch_info PARAMS ((bfd *abfd, const bfd_arch_info_type *arg));
-
-enum bfd_architecture 
-bfd_get_arch PARAMS ((bfd *abfd));
-
-unsigned long 
-bfd_get_mach PARAMS ((bfd *abfd));
-
-unsigned int 
-bfd_arch_bits_per_byte PARAMS ((bfd *abfd));
-
-unsigned int 
-bfd_arch_bits_per_address PARAMS ((bfd *abfd));
-
-const bfd_arch_info_type * 
-bfd_get_arch_info PARAMS ((bfd *abfd));
-
-const bfd_arch_info_type *
-bfd_lookup_arch
- PARAMS ((enum bfd_architecture
-    arch,
-    unsigned long machine));
-
-const char *
-bfd_printable_arch_mach
- PARAMS ((enum bfd_architecture arch, unsigned long machine));
-
-typedef enum bfd_reloc_status
-{
-        /* No errors detected */
-  bfd_reloc_ok,
-
-        /* The relocation was performed, but there was an overflow. */
-  bfd_reloc_overflow,
-
-        /* The address to relocate was not within the section supplied. */
-  bfd_reloc_outofrange,
-
-        /* Used by special functions */
-  bfd_reloc_continue,
-
-        /* Unsupported relocation size requested. */
-  bfd_reloc_notsupported,
-
-        /* Unused */
-  bfd_reloc_other,
-
-        /* The symbol to relocate against was undefined. */
-  bfd_reloc_undefined,
-
-        /* The relocation was performed, but may not be ok - presently
-          generated only when linking i960 coff files with i960 b.out
-          symbols.  If this type is returned, the error_message argument
-          to bfd_perform_relocation will be set.  */
-  bfd_reloc_dangerous
- }
- bfd_reloc_status_type;
-
-
-typedef struct reloc_cache_entry
-{
-        /* A pointer into the canonical table of pointers  */
-  struct symbol_cache_entry **sym_ptr_ptr;
-
-        /* offset in section */
-  bfd_size_type address;
-
-        /* addend for relocation value */
-  bfd_vma addend;
-
-        /* Pointer to how to perform the required relocation */
-  reloc_howto_type *howto;
-
-} arelent;
-enum complain_overflow
-{
-        /* Do not complain on overflow. */
-  complain_overflow_dont,
-
-        /* Complain if the bitfield overflows, whether it is considered
-          as signed or unsigned. */
-  complain_overflow_bitfield,
-
-        /* Complain if the value overflows when considered as signed
-          number. */
-  complain_overflow_signed,
-
-        /* Complain if the value overflows when considered as an
-          unsigned number. */
-  complain_overflow_unsigned
-};
-
-struct reloc_howto_struct
-{
-        /*  The type field has mainly a documentary use - the back end can
-           do what it wants with it, though normally the back end's
-           external idea of what a reloc number is stored
-           in this field. For example, a PC relative word relocation
-           in a coff environment has the type 023 - because that's
-           what the outside world calls a R_PCRWORD reloc. */
-  unsigned int type;
-
-        /*  The value the final relocation is shifted right by. This drops
-           unwanted data from the relocation.  */
-  unsigned int rightshift;
-
-        /*  The size of the item to be relocated.  This is *not* a
-           power-of-two measure.  To get the number of bytes operated
-           on by a type of relocation, use bfd_get_reloc_size.  */
-  int size;
-
-        /*  The number of bits in the item to be relocated.  This is used
-           when doing overflow checking.  */
-  unsigned int bitsize;
-
-        /*  Notes that the relocation is relative to the location in the
-           data section of the addend. The relocation function will
-           subtract from the relocation value the address of the location
-           being relocated. */
-  boolean pc_relative;
-
-        /*  The bit position of the reloc value in the destination.
-           The relocated value is left shifted by this amount. */
-  unsigned int bitpos;
-
-        /* What type of overflow error should be checked for when
-          relocating. */
-  enum complain_overflow complain_on_overflow;
-
-        /* If this field is non null, then the supplied function is
-          called rather than the normal function. This allows really
-          strange relocation methods to be accomodated (e.g., i960 callj
-          instructions). */
-  bfd_reloc_status_type (*special_function)
-                                   PARAMS ((bfd *abfd,
-                                            arelent *reloc_entry,
-                                            struct symbol_cache_entry *symbol,
-                                            PTR data,
-                                            asection *input_section,
-                                            bfd *output_bfd,
-                                            char **error_message));
-
-        /* The textual name of the relocation type. */
-  char *name;
-
-        /* When performing a partial link, some formats must modify the
-          relocations rather than the data - this flag signals this.*/
-  boolean partial_inplace;
-
-        /* The src_mask selects which parts of the read in data
-          are to be used in the relocation sum.  E.g., if this was an 8 bit
-          bit of data which we read and relocated, this would be
-          0x000000ff. When we have relocs which have an addend, such as
-          sun4 extended relocs, the value in the offset part of a
-          relocating field is garbage so we never use it. In this case
-          the mask would be 0x00000000. */
-  bfd_vma src_mask;
-
-        /* The dst_mask selects which parts of the instruction are replaced
-          into the instruction. In most cases src_mask == dst_mask,
-          except in the above special case, where dst_mask would be
-          0x000000ff, and src_mask would be 0x00000000.   */
-  bfd_vma dst_mask;
-
-        /* When some formats create PC relative instructions, they leave
-          the value of the pc of the place being relocated in the offset
-          slot of the instruction, so that a PC relative relocation can
-          be made just by adding in an ordinary offset (e.g., sun3 a.out).
-          Some formats leave the displacement part of an instruction
-          empty (e.g., m88k bcs); this flag signals the fact.*/
-  boolean pcrel_offset;
-
-};
-#define HOWTO(C, R,S,B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
-  {(unsigned)C,R,S,B, P, BI, O,SF,NAME,INPLACE,MASKSRC,MASKDST,PC}
-#define NEWHOWTO( FUNCTION, NAME,SIZE,REL,IN) HOWTO(0,0,SIZE,0,REL,0,complain_overflow_dont,FUNCTION, NAME,false,0,0,IN)
-
-#define HOWTO_PREPARE(relocation, symbol)      \
-  {                                            \
-  if (symbol != (asymbol *)NULL) {             \
-    if (bfd_is_com_section (symbol->section)) { \
-      relocation = 0;                          \
-    }                                          \
-    else {                                     \
-      relocation = symbol->value;              \
-    }                                          \
-  }                                            \
-}
-unsigned int 
-bfd_get_reloc_size  PARAMS ((reloc_howto_type *));
-
-typedef struct relent_chain {
-  arelent relent;
-  struct   relent_chain *next;
-} arelent_chain;
-bfd_reloc_status_type
-
-bfd_check_overflow
- PARAMS ((enum complain_overflow how,
-    unsigned int bitsize,
-    unsigned int rightshift,
-    unsigned int addrsize,
-    bfd_vma relocation));
-
-bfd_reloc_status_type
-
-bfd_perform_relocation
- PARAMS ((bfd *abfd,
-    arelent *reloc_entry,
-    PTR data,
-    asection *input_section,
-    bfd *output_bfd,
-    char **error_message));
-
-bfd_reloc_status_type
-
-bfd_install_relocation
- PARAMS ((bfd *abfd,
-    arelent *reloc_entry,
-    PTR data, bfd_vma data_start,
-    asection *input_section,
-    char **error_message));
-
-enum bfd_reloc_code_real {
-  _dummy_first_bfd_reloc_code_real,
-
-
-/* Basic absolute relocations of N bits. */
-  BFD_RELOC_64,
-  BFD_RELOC_32,
-  BFD_RELOC_26,
-  BFD_RELOC_24,
-  BFD_RELOC_16,
-  BFD_RELOC_14,
-  BFD_RELOC_8,
-
-/* PC-relative relocations.  Sometimes these are relative to the address
-of the relocation itself; sometimes they are relative to the start of
-the section containing the relocation.  It depends on the specific target.
-
-The 24-bit relocation is used in some Intel 960 configurations. */
-  BFD_RELOC_64_PCREL,
-  BFD_RELOC_32_PCREL,
-  BFD_RELOC_24_PCREL,
-  BFD_RELOC_16_PCREL,
-  BFD_RELOC_12_PCREL,
-  BFD_RELOC_8_PCREL,
-
-/* For ELF. */
-  BFD_RELOC_32_GOT_PCREL,
-  BFD_RELOC_16_GOT_PCREL,
-  BFD_RELOC_8_GOT_PCREL,
-  BFD_RELOC_32_GOTOFF,
-  BFD_RELOC_16_GOTOFF,
-  BFD_RELOC_LO16_GOTOFF,
-  BFD_RELOC_HI16_GOTOFF,
-  BFD_RELOC_HI16_S_GOTOFF,
-  BFD_RELOC_8_GOTOFF,
-  BFD_RELOC_32_PLT_PCREL,
-  BFD_RELOC_24_PLT_PCREL,
-  BFD_RELOC_16_PLT_PCREL,
-  BFD_RELOC_8_PLT_PCREL,
-  BFD_RELOC_32_PLTOFF,
-  BFD_RELOC_16_PLTOFF,
-  BFD_RELOC_LO16_PLTOFF,
-  BFD_RELOC_HI16_PLTOFF,
-  BFD_RELOC_HI16_S_PLTOFF,
-  BFD_RELOC_8_PLTOFF,
-
-/* Relocations used by 68K ELF. */
-  BFD_RELOC_68K_GLOB_DAT,
-  BFD_RELOC_68K_JMP_SLOT,
-  BFD_RELOC_68K_RELATIVE,
-
-/* Linkage-table relative. */
-  BFD_RELOC_32_BASEREL,
-  BFD_RELOC_16_BASEREL,
-  BFD_RELOC_LO16_BASEREL,
-  BFD_RELOC_HI16_BASEREL,
-  BFD_RELOC_HI16_S_BASEREL,
-  BFD_RELOC_8_BASEREL,
-  BFD_RELOC_RVA,
-
-/* Absolute 8-bit relocation, but used to form an address like 0xFFnn. */
-  BFD_RELOC_8_FFnn,
-
-/* These PC-relative relocations are stored as word displacements --
-i.e., byte displacements shifted right two bits.  The 30-bit word
-displacement (<<32_PCREL_S2>> -- 32 bits, shifted 2) is used on the
-SPARC.  (SPARC tools generally refer to this as <<WDISP30>>.)  The
-signed 16-bit displacement is used on the MIPS, and the 23-bit
-displacement is used on the Alpha. */
-  BFD_RELOC_32_PCREL_S2,
-  BFD_RELOC_16_PCREL_S2,
-  BFD_RELOC_23_PCREL_S2,
-
-/* High 22 bits and low 10 bits of 32-bit value, placed into lower bits of
-the target word.  These are used on the SPARC. */
-  BFD_RELOC_HI22,
-  BFD_RELOC_LO10,
-
-/* For systems that allocate a Global Pointer register, these are
-displacements off that register.  These relocation types are
-handled specially, because the value the register will have is
-decided relatively late. */
-  BFD_RELOC_GPREL16,
-  BFD_RELOC_GPREL32,
-
-/* Reloc types used for i960/b.out. */
-  BFD_RELOC_I960_CALLJ,
-
-/* SPARC ELF relocations.  There is probably some overlap with other
-relocation types already defined. */
-  BFD_RELOC_NONE,
-  BFD_RELOC_SPARC_WDISP22,
-  BFD_RELOC_SPARC22,
-  BFD_RELOC_SPARC13,
-  BFD_RELOC_SPARC_GOT10,
-  BFD_RELOC_SPARC_GOT13,
-  BFD_RELOC_SPARC_GOT22,
-  BFD_RELOC_SPARC_PC10,
-  BFD_RELOC_SPARC_PC22,
-  BFD_RELOC_SPARC_WPLT30,
-  BFD_RELOC_SPARC_COPY,
-  BFD_RELOC_SPARC_GLOB_DAT,
-  BFD_RELOC_SPARC_JMP_SLOT,
-  BFD_RELOC_SPARC_RELATIVE,
-  BFD_RELOC_SPARC_UA32,
-
-/* I think these are specific to SPARC a.out (e.g., Sun 4). */
-  BFD_RELOC_SPARC_BASE13,
-  BFD_RELOC_SPARC_BASE22,
-
-/* SPARC64 relocations */
-#define BFD_RELOC_SPARC_64 BFD_RELOC_64
-  BFD_RELOC_SPARC_10,
-  BFD_RELOC_SPARC_11,
-  BFD_RELOC_SPARC_OLO10,
-  BFD_RELOC_SPARC_HH22,
-  BFD_RELOC_SPARC_HM10,
-  BFD_RELOC_SPARC_LM22,
-  BFD_RELOC_SPARC_PC_HH22,
-  BFD_RELOC_SPARC_PC_HM10,
-  BFD_RELOC_SPARC_PC_LM22,
-  BFD_RELOC_SPARC_WDISP16,
-  BFD_RELOC_SPARC_WDISP19,
-  BFD_RELOC_SPARC_7,
-  BFD_RELOC_SPARC_6,
-  BFD_RELOC_SPARC_5,
-#define BFD_RELOC_SPARC_DISP64 BFD_RELOC_64_PCREL
-  BFD_RELOC_SPARC_PLT64,
-  BFD_RELOC_SPARC_HIX22,
-  BFD_RELOC_SPARC_LOX10,
-  BFD_RELOC_SPARC_H44,
-  BFD_RELOC_SPARC_M44,
-  BFD_RELOC_SPARC_L44,
-  BFD_RELOC_SPARC_REGISTER,
-
-/* SPARC little endian relocation */
-  BFD_RELOC_SPARC_REV32,
-
-/* Alpha ECOFF and ELF relocations.  Some of these treat the symbol or
-"addend" in some special way.
-For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when
-writing; when reading, it will be the absolute section symbol.  The
-addend is the displacement in bytes of the "lda" instruction from
-the "ldah" instruction (which is at the address of this reloc). */
-  BFD_RELOC_ALPHA_GPDISP_HI16,
-
-/* For GPDISP_LO16 ("ignore") relocations, the symbol is handled as
-with GPDISP_HI16 relocs.  The addend is ignored when writing the
-relocations out, and is filled in with the file's GP value on
-reading, for convenience. */
-  BFD_RELOC_ALPHA_GPDISP_LO16,
-
-/* The ELF GPDISP relocation is exactly the same as the GPDISP_HI16
-relocation except that there is no accompanying GPDISP_LO16
-relocation. */
-  BFD_RELOC_ALPHA_GPDISP,
-
-/* The Alpha LITERAL/LITUSE relocs are produced by a symbol reference;
-the assembler turns it into a LDQ instruction to load the address of
-the symbol, and then fills in a register in the real instruction.
-
-The LITERAL reloc, at the LDQ instruction, refers to the .lita
-section symbol.  The addend is ignored when writing, but is filled
-in with the file's GP value on reading, for convenience, as with the
-GPDISP_LO16 reloc.
-
-The ELF_LITERAL reloc is somewhere between 16_GOTOFF and GPDISP_LO16.
-It should refer to the symbol to be referenced, as with 16_GOTOFF,
-but it generates output not based on the position within the .got
-section, but relative to the GP value chosen for the file during the
-final link stage.
-
-The LITUSE reloc, on the instruction using the loaded address, gives
-information to the linker that it might be able to use to optimize
-away some literal section references.  The symbol is ignored (read
-as the absolute section symbol), and the "addend" indicates the type
-of instruction using the register:
-1 - "memory" fmt insn
-2 - byte-manipulation (byte offset reg)
-3 - jsr (target of branch)
-
-The GNU linker currently doesn't do any of this optimizing. */
-  BFD_RELOC_ALPHA_LITERAL,
-  BFD_RELOC_ALPHA_ELF_LITERAL,
-  BFD_RELOC_ALPHA_LITUSE,
-
-/* The HINT relocation indicates a value that should be filled into the
-"hint" field of a jmp/jsr/ret instruction, for possible branch-
-prediction logic which may be provided on some processors. */
-  BFD_RELOC_ALPHA_HINT,
-
-/* The LINKAGE relocation outputs a linkage pair in the object file,
-which is filled by the linker. */
-  BFD_RELOC_ALPHA_LINKAGE,
-
-/* The CODEADDR relocation outputs a STO_CA in the object file,
-which is filled by the linker. */
-  BFD_RELOC_ALPHA_CODEADDR,
-
-/* Bits 27..2 of the relocation address shifted right 2 bits;
-simple reloc otherwise. */
-  BFD_RELOC_MIPS_JMP,
-
-/* The MIPS16 jump instruction. */
-  BFD_RELOC_MIPS16_JMP,
-
-/* MIPS16 GP relative reloc. */
-  BFD_RELOC_MIPS16_GPREL,
-
-/* High 16 bits of 32-bit value; simple reloc. */
-  BFD_RELOC_HI16,
-
-/* High 16 bits of 32-bit value but the low 16 bits will be sign
-extended and added to form the final result.  If the low 16
-bits form a negative number, we need to add one to the high value
-to compensate for the borrow when the low bits are added. */
-  BFD_RELOC_HI16_S,
-
-/* Low 16 bits. */
-  BFD_RELOC_LO16,
-
-/* Like BFD_RELOC_HI16_S, but PC relative. */
-  BFD_RELOC_PCREL_HI16_S,
-
-/* Like BFD_RELOC_LO16, but PC relative. */
-  BFD_RELOC_PCREL_LO16,
-
-/* Relocation relative to the global pointer. */
-#define BFD_RELOC_MIPS_GPREL BFD_RELOC_GPREL16
-
-/* Relocation against a MIPS literal section. */
-  BFD_RELOC_MIPS_LITERAL,
-
-/* MIPS ELF relocations. */
-  BFD_RELOC_MIPS_GOT16,
-  BFD_RELOC_MIPS_CALL16,
-#define BFD_RELOC_MIPS_GPREL32 BFD_RELOC_GPREL32
-  BFD_RELOC_MIPS_GOT_HI16,
-  BFD_RELOC_MIPS_GOT_LO16,
-  BFD_RELOC_MIPS_CALL_HI16,
-  BFD_RELOC_MIPS_CALL_LO16,
-
-
-/* i386/elf relocations */
-  BFD_RELOC_386_GOT32,
-  BFD_RELOC_386_PLT32,
-  BFD_RELOC_386_COPY,
-  BFD_RELOC_386_GLOB_DAT,
-  BFD_RELOC_386_JUMP_SLOT,
-  BFD_RELOC_386_RELATIVE,
-  BFD_RELOC_386_GOTOFF,
-  BFD_RELOC_386_GOTPC,
-
-/* ns32k relocations */
-  BFD_RELOC_NS32K_IMM_8,
-  BFD_RELOC_NS32K_IMM_16,
-  BFD_RELOC_NS32K_IMM_32,
-  BFD_RELOC_NS32K_IMM_8_PCREL,
-  BFD_RELOC_NS32K_IMM_16_PCREL,
-  BFD_RELOC_NS32K_IMM_32_PCREL,
-  BFD_RELOC_NS32K_DISP_8,
-  BFD_RELOC_NS32K_DISP_16,
-  BFD_RELOC_NS32K_DISP_32,
-  BFD_RELOC_NS32K_DISP_8_PCREL,
-  BFD_RELOC_NS32K_DISP_16_PCREL,
-  BFD_RELOC_NS32K_DISP_32_PCREL,
-
-/* Power(rs6000) and PowerPC relocations. */
-  BFD_RELOC_PPC_B26,
-  BFD_RELOC_PPC_BA26,
-  BFD_RELOC_PPC_TOC16,
-  BFD_RELOC_PPC_B16,
-  BFD_RELOC_PPC_B16_BRTAKEN,
-  BFD_RELOC_PPC_B16_BRNTAKEN,
-  BFD_RELOC_PPC_BA16,
-  BFD_RELOC_PPC_BA16_BRTAKEN,
-  BFD_RELOC_PPC_BA16_BRNTAKEN,
-  BFD_RELOC_PPC_COPY,
-  BFD_RELOC_PPC_GLOB_DAT,
-  BFD_RELOC_PPC_JMP_SLOT,
-  BFD_RELOC_PPC_RELATIVE,
-  BFD_RELOC_PPC_LOCAL24PC,
-  BFD_RELOC_PPC_EMB_NADDR32,
-  BFD_RELOC_PPC_EMB_NADDR16,
-  BFD_RELOC_PPC_EMB_NADDR16_LO,
-  BFD_RELOC_PPC_EMB_NADDR16_HI,
-  BFD_RELOC_PPC_EMB_NADDR16_HA,
-  BFD_RELOC_PPC_EMB_SDAI16,
-  BFD_RELOC_PPC_EMB_SDA2I16,
-  BFD_RELOC_PPC_EMB_SDA2REL,
-  BFD_RELOC_PPC_EMB_SDA21,
-  BFD_RELOC_PPC_EMB_MRKREF,
-  BFD_RELOC_PPC_EMB_RELSEC16,
-  BFD_RELOC_PPC_EMB_RELST_LO,
-  BFD_RELOC_PPC_EMB_RELST_HI,
-  BFD_RELOC_PPC_EMB_RELST_HA,
-  BFD_RELOC_PPC_EMB_BIT_FLD,
-  BFD_RELOC_PPC_EMB_RELSDA,
-
-/* The type of reloc used to build a contructor table - at the moment
-probably a 32 bit wide absolute relocation, but the target can choose.
-It generally does map to one of the other relocation types. */
-  BFD_RELOC_CTOR,
-
-/* ARM 26 bit pc-relative branch.  The lowest two bits must be zero and are
-not stored in the instruction. */
-  BFD_RELOC_ARM_PCREL_BRANCH,
-
-/* These relocs are only used within the ARM assembler.  They are not
-(at present) written to any object files. */
-  BFD_RELOC_ARM_IMMEDIATE,
-  BFD_RELOC_ARM_OFFSET_IMM,
-  BFD_RELOC_ARM_SHIFT_IMM,
-  BFD_RELOC_ARM_SWI,
-  BFD_RELOC_ARM_MULTI,
-  BFD_RELOC_ARM_CP_OFF_IMM,
-  BFD_RELOC_ARM_ADR_IMM,
-  BFD_RELOC_ARM_LDR_IMM,
-  BFD_RELOC_ARM_LITERAL,
-  BFD_RELOC_ARM_IN_POOL,
-  BFD_RELOC_ARM_OFFSET_IMM8,
-  BFD_RELOC_ARM_HWLITERAL,
-  BFD_RELOC_ARM_THUMB_ADD,
-  BFD_RELOC_ARM_THUMB_IMM,
-  BFD_RELOC_ARM_THUMB_SHIFT,
-  BFD_RELOC_ARM_THUMB_OFFSET,
-  BFD_RELOC_ARM_GOT12,
-  BFD_RELOC_ARM_GOT32,
-  BFD_RELOC_ARM_JUMP_SLOT,
-  BFD_RELOC_ARM_COPY,
-  BFD_RELOC_ARM_GLOB_DAT,
-  BFD_RELOC_ARM_PLT32,
-  BFD_RELOC_ARM_RELATIVE,
-  BFD_RELOC_ARM_GOTOFF,
-  BFD_RELOC_ARM_GOTPC,
-
-/* Hitachi SH relocs.  Not all of these appear in object files. */
-  BFD_RELOC_SH_PCDISP8BY2,
-  BFD_RELOC_SH_PCDISP12BY2,
-  BFD_RELOC_SH_IMM4,
-  BFD_RELOC_SH_IMM4BY2,
-  BFD_RELOC_SH_IMM4BY4,
-  BFD_RELOC_SH_IMM8,
-  BFD_RELOC_SH_IMM8BY2,
-  BFD_RELOC_SH_IMM8BY4,
-  BFD_RELOC_SH_PCRELIMM8BY2,
-  BFD_RELOC_SH_PCRELIMM8BY4,
-  BFD_RELOC_SH_SWITCH16,
-  BFD_RELOC_SH_SWITCH32,
-  BFD_RELOC_SH_USES,
-  BFD_RELOC_SH_COUNT,
-  BFD_RELOC_SH_ALIGN,
-  BFD_RELOC_SH_CODE,
-  BFD_RELOC_SH_DATA,
-  BFD_RELOC_SH_LABEL,
-
-/* Thumb 23-, 12- and 9-bit pc-relative branches.  The lowest bit must
-be zero and is not stored in the instruction. */
-  BFD_RELOC_THUMB_PCREL_BRANCH9,
-  BFD_RELOC_THUMB_PCREL_BRANCH12,
-  BFD_RELOC_THUMB_PCREL_BRANCH23,
-
-/* Argonaut RISC Core (ARC) relocs.
-ARC 22 bit pc-relative branch.  The lowest two bits must be zero and are
-not stored in the instruction.  The high 20 bits are installed in bits 26
-through 7 of the instruction. */
-  BFD_RELOC_ARC_B22_PCREL,
-
-/* ARC 26 bit absolute branch.  The lowest two bits must be zero and are not
-stored in the instruction.  The high 24 bits are installed in bits 23
-through 0. */
-  BFD_RELOC_ARC_B26,
-
-/* Mitsubishi D10V relocs.
-This is a 10-bit reloc with the right 2 bits
-assumed to be 0. */
-  BFD_RELOC_D10V_10_PCREL_R,
-
-/* Mitsubishi D10V relocs.
-This is a 10-bit reloc with the right 2 bits
-assumed to be 0.  This is the same as the previous reloc
-except it is in the left container, i.e.,
-shifted left 15 bits. */
-  BFD_RELOC_D10V_10_PCREL_L,
-
-/* This is an 18-bit reloc with the right 2 bits
-assumed to be 0. */
-  BFD_RELOC_D10V_18,
-
-/* This is an 18-bit reloc with the right 2 bits
-assumed to be 0. */
-  BFD_RELOC_D10V_18_PCREL,
-
-/* Mitsubishi D30V relocs.
-This is a 6-bit absolute reloc. */
-  BFD_RELOC_D30V_6,
-
-/* This is a 6-bit pc-relative reloc with 
-the right 3 bits assumed to be 0. */
-  BFD_RELOC_D30V_9_PCREL,
-
-/* This is a 6-bit pc-relative reloc with 
-the right 3 bits assumed to be 0. Same
-as the previous reloc but on the right side
-of the container. */
-  BFD_RELOC_D30V_9_PCREL_R,
-
-/* This is a 12-bit absolute reloc with the 
-right 3 bitsassumed to be 0. */
-  BFD_RELOC_D30V_15,
-
-/* This is a 12-bit pc-relative reloc with 
-the right 3 bits assumed to be 0. */
-  BFD_RELOC_D30V_15_PCREL,
-
-/* This is a 12-bit pc-relative reloc with 
-the right 3 bits assumed to be 0. Same
-as the previous reloc but on the right side
-of the container. */
-  BFD_RELOC_D30V_15_PCREL_R,
-
-/* This is an 18-bit absolute reloc with 
-the right 3 bits assumed to be 0. */
-  BFD_RELOC_D30V_21,
-
-/* This is an 18-bit pc-relative reloc with 
-the right 3 bits assumed to be 0. */
-  BFD_RELOC_D30V_21_PCREL,
-
-/* This is an 18-bit pc-relative reloc with 
-the right 3 bits assumed to be 0. Same
-as the previous reloc but on the right side
-of the container. */
-  BFD_RELOC_D30V_21_PCREL_R,
-
-/* This is a 32-bit absolute reloc. */
-  BFD_RELOC_D30V_32,
-
-/* This is a 32-bit pc-relative reloc. */
-  BFD_RELOC_D30V_32_PCREL,
-
-/* Mitsubishi M32R relocs.
-This is a 24 bit absolute address. */
-  BFD_RELOC_M32R_24,
-
-/* This is a 10-bit pc-relative reloc with the right 2 bits assumed to be 0. */
-  BFD_RELOC_M32R_10_PCREL,
-
-/* This is an 18-bit reloc with the right 2 bits assumed to be 0. */
-  BFD_RELOC_M32R_18_PCREL,
-
-/* This is a 26-bit reloc with the right 2 bits assumed to be 0. */
-  BFD_RELOC_M32R_26_PCREL,
-
-/* This is a 16-bit reloc containing the high 16 bits of an address
-used when the lower 16 bits are treated as unsigned. */
-  BFD_RELOC_M32R_HI16_ULO,
-
-/* This is a 16-bit reloc containing the high 16 bits of an address
-used when the lower 16 bits are treated as signed. */
-  BFD_RELOC_M32R_HI16_SLO,
-
-/* This is a 16-bit reloc containing the lower 16 bits of an address. */
-  BFD_RELOC_M32R_LO16,
-
-/* This is a 16-bit reloc containing the small data area offset for use in
-add3, load, and store instructions. */
-  BFD_RELOC_M32R_SDA16,
-
-/* This is a 9-bit reloc */
-  BFD_RELOC_V850_9_PCREL,
-
-/* This is a 22-bit reloc */
-  BFD_RELOC_V850_22_PCREL,
-
-/* This is a 16 bit offset from the short data area pointer. */
-  BFD_RELOC_V850_SDA_16_16_OFFSET,
-
-/* This is a 16 bit offset (of which only 15 bits are used) from the
-short data area pointer. */
-  BFD_RELOC_V850_SDA_15_16_OFFSET,
-
-/* This is a 16 bit offset from the zero data area pointer. */
-  BFD_RELOC_V850_ZDA_16_16_OFFSET,
-
-/* This is a 16 bit offset (of which only 15 bits are used) from the
-zero data area pointer. */
-  BFD_RELOC_V850_ZDA_15_16_OFFSET,
-
-/* This is an 8 bit offset (of which only 6 bits are used) from the
-tiny data area pointer. */
-  BFD_RELOC_V850_TDA_6_8_OFFSET,
-
-/* This is an 8bit offset (of which only 7 bits are used) from the tiny
-data area pointer. */
-  BFD_RELOC_V850_TDA_7_8_OFFSET,
-
-/* This is a 7 bit offset from the tiny data area pointer. */
-  BFD_RELOC_V850_TDA_7_7_OFFSET,
-
-/* This is a 16 bit offset from the tiny data area pointer. */
-  BFD_RELOC_V850_TDA_16_16_OFFSET,
-
-/* This is a 5 bit offset (of which only 4 bits are used) from the tiny
-data area pointer. */
-  BFD_RELOC_V850_TDA_4_5_OFFSET,
-
-/* This is a 4 bit offset from the tiny data area pointer. */
-  BFD_RELOC_V850_TDA_4_4_OFFSET,
-
-/* This is a 16 bit offset from the short data area pointer, with the
-bits placed non-contigously in the instruction. */
-  BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET,
-
-/* This is a 16 bit offset from the zero data area pointer, with the
-bits placed non-contigously in the instruction. */
-  BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET,
-
-/* This is a 6 bit offset from the call table base pointer. */
-  BFD_RELOC_V850_CALLT_6_7_OFFSET,
-
-/* This is a 16 bit offset from the call table base pointer. */
-  BFD_RELOC_V850_CALLT_16_16_OFFSET,
-
-
-/* This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
-instruction. */
-  BFD_RELOC_MN10300_32_PCREL,
-
-/* This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
-instruction. */
-  BFD_RELOC_MN10300_16_PCREL,
-
-/* This is a 8bit DP reloc for the tms320c30, where the most
-significant 8 bits of a 24 bit word are placed into the least
-significant 8 bits of the opcode. */
-  BFD_RELOC_TIC30_LDP,
-
-/* This is a 48 bit reloc for the FR30 that stores 32 bits. */
-  BFD_RELOC_FR30_48,
-
-/* This is a 32 bit reloc for the FR30 that stores 20 bits split up into
-two sections. */
-  BFD_RELOC_FR30_20,
-
-/* This is a 16 bit reloc for the FR30 that stores a 6 bit word offset in
-4 bits. */
-  BFD_RELOC_FR30_6_IN_4,
-
-/* This is a 16 bit reloc for the FR30 that stores an 8 bit byte offset
-into 8 bits. */
-  BFD_RELOC_FR30_8_IN_8,
-
-/* This is a 16 bit reloc for the FR30 that stores a 9 bit short offset
-into 8 bits. */
-  BFD_RELOC_FR30_9_IN_8,
-
-/* This is a 16 bit reloc for the FR30 that stores a 10 bit word offset
-into 8 bits. */
-  BFD_RELOC_FR30_10_IN_8,
-
-/* This is a 16 bit reloc for the FR30 that stores a 9 bit pc relative
-short offset into 8 bits. */
-  BFD_RELOC_FR30_9_PCREL,
-
-/* This is a 16 bit reloc for the FR30 that stores a 12 bit pc relative
-short offset into 11 bits. */
-  BFD_RELOC_FR30_12_PCREL,
-
-/* Motorola Mcore relocations. */
-  BFD_RELOC_MCORE_PCREL_IMM8BY4,
-  BFD_RELOC_MCORE_PCREL_IMM11BY2,
-  BFD_RELOC_MCORE_PCREL_IMM4BY2,
-  BFD_RELOC_MCORE_PCREL_32,
-  BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2,
-
-/* These two relocations are used by the linker to determine which of 
-the entries in a C++ virtual function table are actually used.  When
-the --gc-sections option is given, the linker will zero out the entries
-that are not used, so that the code for those functions need not be
-included in the output.
-
-VTABLE_INHERIT is a zero-space relocation used to describe to the
-linker the inheritence tree of a C++ virtual function table.  The
-relocation's symbol should be the parent class' vtable, and the
-relocation should be located at the child vtable.
-
-VTABLE_ENTRY is a zero-space relocation that describes the use of a
-virtual function table entry.  The reloc's symbol should refer to the
-table of the class mentioned in the code.  Off of that base, an offset
-describes the entry that is being used.  For Rela hosts, this offset 
-is stored in the reloc's addend.  For Rel hosts, we are forced to put
-this offset in the reloc's section offset. */
-  BFD_RELOC_VTABLE_INHERIT,
-  BFD_RELOC_VTABLE_ENTRY,
-  BFD_RELOC_UNUSED };
-typedef enum bfd_reloc_code_real bfd_reloc_code_real_type;
-reloc_howto_type *
-
-bfd_reloc_type_lookup  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-
-const char *
-bfd_get_reloc_code_name  PARAMS ((bfd_reloc_code_real_type code));
-
-
-typedef struct symbol_cache_entry
-{
-        /* A pointer to the BFD which owns the symbol. This information
-          is necessary so that a back end can work out what additional
-          information (invisible to the application writer) is carried
-          with the symbol.
-
-          This field is *almost* redundant, since you can use section->owner
-          instead, except that some symbols point to the global sections
-          bfd_{abs,com,und}_section.  This could be fixed by making
-          these globals be per-bfd (or per-target-flavor).  FIXME. */
-
-  struct _bfd *the_bfd;  /* Use bfd_asymbol_bfd(sym) to access this field. */
-
-        /* The text of the symbol. The name is left alone, and not copied; the
-          application may not alter it. */
-  CONST char *name;
-
-        /* The value of the symbol.  This really should be a union of a
-          numeric value with a pointer, since some flags indicate that
-          a pointer to another symbol is stored here.  */
-  symvalue value;
-
-        /* Attributes of a symbol: */
-
-#define BSF_NO_FLAGS    0x00
-
-        /* The symbol has local scope; <<static>> in <<C>>. The value
-          is the offset into the section of the data. */
-#define BSF_LOCAL      0x01
-
-        /* The symbol has global scope; initialized data in <<C>>. The
-          value is the offset into the section of the data. */
-#define BSF_GLOBAL     0x02
-
-        /* The symbol has global scope and is exported. The value is
-          the offset into the section of the data. */
-#define BSF_EXPORT     BSF_GLOBAL  /* no real difference */
-
-        /* A normal C symbol would be one of:
-          <<BSF_LOCAL>>, <<BSF_FORT_COMM>>,  <<BSF_UNDEFINED>> or
-          <<BSF_GLOBAL>> */
-
-        /* The symbol is a debugging record. The value has an arbitary
-          meaning. */
-#define BSF_DEBUGGING  0x08
-
-        /* The symbol denotes a function entry point.  Used in ELF,
-          perhaps others someday.  */
-#define BSF_FUNCTION    0x10
-
-        /* Used by the linker. */
-#define BSF_KEEP        0x20
-#define BSF_KEEP_G      0x40
-
-        /* A weak global symbol, overridable without warnings by
-          a regular global symbol of the same name.  */
-#define BSF_WEAK        0x80
-
-        /* This symbol was created to point to a section, e.g. ELF's
-          STT_SECTION symbols.  */
-#define BSF_SECTION_SYM 0x100
-
-        /* The symbol used to be a common symbol, but now it is
-          allocated. */
-#define BSF_OLD_COMMON  0x200
-
-        /* The default value for common data. */
-#define BFD_FORT_COMM_DEFAULT_VALUE 0
-
-        /* In some files the type of a symbol sometimes alters its
-          location in an output file - ie in coff a <<ISFCN>> symbol
-          which is also <<C_EXT>> symbol appears where it was
-          declared and not at the end of a section.  This bit is set
-          by the target BFD part to convey this information. */
-
-#define BSF_NOT_AT_END    0x400
-
-        /* Signal that the symbol is the label of constructor section. */
-#define BSF_CONSTRUCTOR   0x800
-
-        /* Signal that the symbol is a warning symbol.  The name is a
-          warning.  The name of the next symbol is the one to warn about;
-          if a reference is made to a symbol with the same name as the next
-          symbol, a warning is issued by the linker. */
-#define BSF_WARNING       0x1000
-
-        /* Signal that the symbol is indirect.  This symbol is an indirect
-          pointer to the symbol with the same name as the next symbol. */
-#define BSF_INDIRECT      0x2000
-
-        /* BSF_FILE marks symbols that contain a file name.  This is used
-          for ELF STT_FILE symbols.  */
-#define BSF_FILE          0x4000
-
-        /* Symbol is from dynamic linking information.  */
-#define BSF_DYNAMIC       0x8000
-
-        /* The symbol denotes a data object.  Used in ELF, and perhaps
-          others someday.  */
-#define BSF_OBJECT        0x10000
-
-  flagword flags;
-
-        /* A pointer to the section to which this symbol is
-          relative.  This will always be non NULL, there are special
-          sections for undefined and absolute symbols.  */
-  struct sec *section;
-
-        /* Back end special data.  */
-  union
-    {
-      PTR p;
-      bfd_vma i;
-    } udata;
-
-} asymbol;
-#define bfd_get_symtab_upper_bound(abfd) \
-     BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
-boolean 
-bfd_is_local_label PARAMS ((bfd *abfd, asymbol *sym));
-
-boolean 
-bfd_is_local_label_name PARAMS ((bfd *abfd, const char *name));
-
-#define bfd_is_local_label_name(abfd, name) \
-     BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
-#define bfd_canonicalize_symtab(abfd, location) \
-     BFD_SEND (abfd, _bfd_canonicalize_symtab,\
-                  (abfd, location))
-boolean 
-bfd_set_symtab  PARAMS ((bfd *abfd, asymbol **location, unsigned int count));
-
-void 
-bfd_print_symbol_vandf PARAMS ((PTR file, asymbol *symbol));
-
-#define bfd_make_empty_symbol(abfd) \
-     BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
-#define bfd_make_debug_symbol(abfd,ptr,size) \
-        BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
-int 
-bfd_decode_symclass PARAMS ((asymbol *symbol));
-
-void 
-bfd_symbol_info PARAMS ((asymbol *symbol, symbol_info *ret));
-
-boolean 
-bfd_copy_private_symbol_data PARAMS ((bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym));
-
-#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
-     BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
-               (ibfd, isymbol, obfd, osymbol))
-struct _bfd 
-{
-     /* The filename the application opened the BFD with.  */
-    CONST char *filename;                
-
-     /* A pointer to the target jump table.             */
-    const struct bfd_target *xvec;
-
-     /* To avoid dragging too many header files into every file that
-       includes `<<bfd.h>>', IOSTREAM has been declared as a "char
-       *", and MTIME as a "long".  Their correct types, to which they
-       are cast when used, are "FILE *" and "time_t".    The iostream
-       is the result of an fopen on the filename.  However, if the
-       BFD_IN_MEMORY flag is set, then iostream is actually a pointer
-       to a bfd_in_memory struct.  */
-    PTR iostream;
-
-     /* Is the file descriptor being cached?  That is, can it be closed as
-       needed, and re-opened when accessed later?  */
-
-    boolean cacheable;
-
-     /* Marks whether there was a default target specified when the
-       BFD was opened. This is used to select which matching algorithm
-       to use to choose the back end. */
-
-    boolean target_defaulted;
-
-     /* The caching routines use these to maintain a
-       least-recently-used list of BFDs */
-
-    struct _bfd *lru_prev, *lru_next;
-
-     /* When a file is closed by the caching routines, BFD retains
-       state information on the file here: */
-
-    file_ptr where;              
-
-     /* and here: (``once'' means at least once) */
-
-    boolean opened_once;
-
-     /* Set if we have a locally maintained mtime value, rather than
-       getting it from the file each time: */
-
-    boolean mtime_set;
-
-     /* File modified time, if mtime_set is true: */
-
-    long mtime;          
-
-     /* Reserved for an unimplemented file locking extension.*/
-
-    int ifd;
-
-     /* The format which belongs to the BFD. (object, core, etc.) */
-
-    bfd_format format;
-
-     /* The direction the BFD was opened with*/
-
-    enum bfd_direction {no_direction = 0,
-                        read_direction = 1,
-                        write_direction = 2,
-                        both_direction = 3} direction;
-
-     /* Format_specific flags*/
-
-    flagword flags;              
-
-     /* Currently my_archive is tested before adding origin to
-       anything. I believe that this can become always an add of
-       origin, with origin set to 0 for non archive files.   */
-
-    file_ptr origin;             
-
-     /* Remember when output has begun, to stop strange things
-       from happening. */
-    boolean output_has_begun;
-
-     /* Pointer to linked list of sections*/
-    struct sec  *sections;
-
-     /* The number of sections */
-    unsigned int section_count;
-
-     /* Stuff only useful for object files: 
-       The start address. */
-    bfd_vma start_address;
-
-     /* Used for input and output*/
-    unsigned int symcount;
-
-     /* Symbol table for output BFD (with symcount entries) */
-    struct symbol_cache_entry  **outsymbols;             
-
-     /* Pointer to structure which contains architecture information*/
-    const struct bfd_arch_info *arch_info;
-
-     /* Stuff only useful for archives:*/
-    PTR arelt_data;              
-    struct _bfd *my_archive;      /* The containing archive BFD.  */
-    struct _bfd *next;            /* The next BFD in the archive.  */
-    struct _bfd *archive_head;    /* The first BFD in the archive.  */
-    boolean has_armap;           
-
-     /* A chain of BFD structures involved in a link.  */
-    struct _bfd *link_next;
-
-     /* A field used by _bfd_generic_link_add_archive_symbols.  This will
-       be used only for archive elements.  */
-    int archive_pass;
-
-     /* Used by the back end to hold private data. */
-
-    union 
-      {
-      struct aout_data_struct *aout_data;
-      struct artdata *aout_ar_data;
-      struct _oasys_data *oasys_obj_data;
-      struct _oasys_ar_data *oasys_ar_data;
-      struct coff_tdata *coff_obj_data;
-      struct pe_tdata *pe_obj_data;
-      struct xcoff_tdata *xcoff_obj_data;
-      struct ecoff_tdata *ecoff_obj_data;
-      struct ieee_data_struct *ieee_data;
-      struct ieee_ar_data_struct *ieee_ar_data;
-      struct srec_data_struct *srec_data;
-      struct ihex_data_struct *ihex_data;
-      struct tekhex_data_struct *tekhex_data;
-      struct elf_obj_tdata *elf_obj_data;
-      struct nlm_obj_tdata *nlm_obj_data;
-      struct bout_data_struct *bout_data;
-      struct sun_core_struct *sun_core_data;
-      struct sco5_core_struct *sco5_core_data;
-      struct trad_core_struct *trad_core_data;
-      struct som_data_struct *som_data;
-      struct hpux_core_struct *hpux_core_data;
-      struct hppabsd_core_struct *hppabsd_core_data;
-      struct sgi_core_struct *sgi_core_data;
-      struct lynx_core_struct *lynx_core_data;
-      struct osf_core_struct *osf_core_data;
-      struct cisco_core_struct *cisco_core_data;
-      struct versados_data_struct *versados_data;
-      struct netbsd_core_struct *netbsd_core_data;
-      PTR any;
-      } tdata;
-  
-     /* Used by the application to hold private data*/
-    PTR usrdata;
-
-   /* Where all the allocated stuff under this BFD goes.  This is a
-     struct objalloc *, but we use PTR to avoid requiring the inclusion of
-     objalloc.h.  */
-    PTR memory;
-};
-
-typedef enum bfd_error
-{
-  bfd_error_no_error = 0,
-  bfd_error_system_call,
-  bfd_error_invalid_target,
-  bfd_error_wrong_format,
-  bfd_error_invalid_operation,
-  bfd_error_no_memory,
-  bfd_error_no_symbols,
-  bfd_error_no_armap,
-  bfd_error_no_more_archived_files,
-  bfd_error_malformed_archive,
-  bfd_error_file_not_recognized,
-  bfd_error_file_ambiguously_recognized,
-  bfd_error_no_contents,
-  bfd_error_nonrepresentable_section,
-  bfd_error_no_debug_section,
-  bfd_error_bad_value,
-  bfd_error_file_truncated,
-  bfd_error_file_too_big,
-  bfd_error_invalid_error_code
-} bfd_error_type;
-
-bfd_error_type 
-bfd_get_error  PARAMS ((void));
-
-void 
-bfd_set_error  PARAMS ((bfd_error_type error_tag));
-
-CONST char *
-bfd_errmsg  PARAMS ((bfd_error_type error_tag));
-
-void 
-bfd_perror  PARAMS ((CONST char *message));
-
-typedef void (*bfd_error_handler_type) PARAMS ((const char *, ...));
-
-bfd_error_handler_type 
-bfd_set_error_handler  PARAMS ((bfd_error_handler_type));
-
-void 
-bfd_set_error_program_name  PARAMS ((const char *));
-
-bfd_error_handler_type 
-bfd_get_error_handler  PARAMS ((void));
-
-long 
-bfd_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect));
-
-long 
-bfd_canonicalize_reloc
- PARAMS ((bfd *abfd,
-    asection *sec,
-    arelent **loc,
-    asymbol **syms));
-
-void 
-bfd_set_reloc
- PARAMS ((bfd *abfd, asection *sec, arelent **rel, unsigned int count)
-    
-    );
-
-boolean 
-bfd_set_file_flags PARAMS ((bfd *abfd, flagword flags));
-
-boolean 
-bfd_set_start_address PARAMS ((bfd *abfd, bfd_vma vma));
-
-long 
-bfd_get_mtime PARAMS ((bfd *abfd));
-
-long 
-bfd_get_size PARAMS ((bfd *abfd));
-
-int 
-bfd_get_gp_size PARAMS ((bfd *abfd));
-
-void 
-bfd_set_gp_size PARAMS ((bfd *abfd, int i));
-
-bfd_vma 
-bfd_scan_vma PARAMS ((CONST char *string, CONST char **end, int base));
-
-boolean 
-bfd_copy_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd));
-
-#define bfd_copy_private_bfd_data(ibfd, obfd) \
-     BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
-               (ibfd, obfd))
-boolean 
-bfd_merge_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd));
-
-#define bfd_merge_private_bfd_data(ibfd, obfd) \
-     BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
-               (ibfd, obfd))
-boolean 
-bfd_set_private_flags PARAMS ((bfd *abfd, flagword flags));
-
-#define bfd_set_private_flags(abfd, flags) \
-     BFD_SEND (abfd, _bfd_set_private_flags, \
-               (abfd, flags))
-#define bfd_sizeof_headers(abfd, reloc) \
-     BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, reloc))
-
-#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \
-     BFD_SEND (abfd, _bfd_find_nearest_line,  (abfd, sec, syms, off, file, func, line))
-
-        /* Do these three do anything useful at all, for any back end?  */
-#define bfd_debug_info_start(abfd) \
-        BFD_SEND (abfd, _bfd_debug_info_start, (abfd))
-
-#define bfd_debug_info_end(abfd) \
-        BFD_SEND (abfd, _bfd_debug_info_end, (abfd))
-
-#define bfd_debug_info_accumulate(abfd, section) \
-        BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
-
-
-#define bfd_stat_arch_elt(abfd, stat) \
-        BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
-
-#define bfd_update_armap_timestamp(abfd) \
-        BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
-
-#define bfd_set_arch_mach(abfd, arch, mach)\
-        BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
-
-#define bfd_relax_section(abfd, section, link_info, again) \
-       BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
-
-#define bfd_gc_sections(abfd, link_info) \
-       BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info))
-
-#define bfd_link_hash_table_create(abfd) \
-       BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
-
-#define bfd_link_add_symbols(abfd, info) \
-       BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
-
-#define bfd_final_link(abfd, info) \
-       BFD_SEND (abfd, _bfd_final_link, (abfd, info))
-
-#define bfd_free_cached_info(abfd) \
-       BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
-
-#define bfd_get_dynamic_symtab_upper_bound(abfd) \
-       BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
-
-#define bfd_print_private_bfd_data(abfd, file)\
-       BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
-
-#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
-       BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
-
-#define bfd_get_dynamic_reloc_upper_bound(abfd) \
-       BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
-
-#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
-       BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))
-
-extern bfd_byte *bfd_get_relocated_section_contents
-       PARAMS ((bfd *, struct bfd_link_info *,
-                 struct bfd_link_order *, bfd_byte *,
-                 boolean, asymbol **));
-
-symindex 
-bfd_get_next_mapent PARAMS ((bfd *abfd, symindex previous, carsym **sym));
-
-boolean 
-bfd_set_archive_head PARAMS ((bfd *output, bfd *new_head));
-
-bfd *
-bfd_openr_next_archived_file PARAMS ((bfd *archive, bfd *previous));
-
-CONST char *
-bfd_core_file_failing_command PARAMS ((bfd *abfd));
-
-int 
-bfd_core_file_failing_signal PARAMS ((bfd *abfd));
-
-boolean 
-core_file_matches_executable_p
- PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-
-#define BFD_SEND(bfd, message, arglist) \
-               ((*((bfd)->xvec->message)) arglist)
-
-#ifdef DEBUG_BFD_SEND
-#undef BFD_SEND
-#define BFD_SEND(bfd, message, arglist) \
-  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-    ((*((bfd)->xvec->message)) arglist) : \
-    (bfd_assert (__FILE__,__LINE__), NULL))
-#endif
-#define BFD_SEND_FMT(bfd, message, arglist) \
-            (((bfd)->xvec->message[(int)((bfd)->format)]) arglist)
-
-#ifdef DEBUG_BFD_SEND
-#undef BFD_SEND_FMT
-#define BFD_SEND_FMT(bfd, message, arglist) \
-  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-   (((bfd)->xvec->message[(int)((bfd)->format)]) arglist) : \
-   (bfd_assert (__FILE__,__LINE__), NULL))
-#endif
-enum bfd_flavour {
-  bfd_target_unknown_flavour,
-  bfd_target_aout_flavour,
-  bfd_target_coff_flavour,
-  bfd_target_ecoff_flavour,
-  bfd_target_elf_flavour,
-  bfd_target_ieee_flavour,
-  bfd_target_nlm_flavour,
-  bfd_target_oasys_flavour,
-  bfd_target_tekhex_flavour,
-  bfd_target_srec_flavour,
-  bfd_target_ihex_flavour,
-  bfd_target_som_flavour,
-  bfd_target_os9k_flavour,
-  bfd_target_versados_flavour,
-  bfd_target_msdos_flavour,
-  bfd_target_ovax_flavour,
-  bfd_target_evax_flavour
-};
-
-enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
-
- /* Forward declaration.  */
-typedef struct bfd_link_info _bfd_link_info;
-
-typedef struct bfd_target
-{
-  char *name;
-  enum bfd_flavour flavour;
-  enum bfd_endian byteorder;
-  enum bfd_endian header_byteorder;
-  flagword object_flags;       
-  flagword section_flags;
-  char symbol_leading_char;
-  char ar_pad_char;            
-  unsigned short ar_max_namelen;
-  bfd_vma      (*bfd_getx64) PARAMS ((const bfd_byte *));
-  bfd_signed_vma (*bfd_getx_signed_64) PARAMS ((const bfd_byte *));
-  void         (*bfd_putx64) PARAMS ((bfd_vma, bfd_byte *));
-  bfd_vma      (*bfd_getx32) PARAMS ((const bfd_byte *));
-  bfd_signed_vma (*bfd_getx_signed_32) PARAMS ((const bfd_byte *));
-  void         (*bfd_putx32) PARAMS ((bfd_vma, bfd_byte *));
-  bfd_vma      (*bfd_getx16) PARAMS ((const bfd_byte *));
-  bfd_signed_vma (*bfd_getx_signed_16) PARAMS ((const bfd_byte *));
-  void         (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *));
-  bfd_vma      (*bfd_h_getx64) PARAMS ((const bfd_byte *));
-  bfd_signed_vma (*bfd_h_getx_signed_64) PARAMS ((const bfd_byte *));
-  void         (*bfd_h_putx64) PARAMS ((bfd_vma, bfd_byte *));
-  bfd_vma      (*bfd_h_getx32) PARAMS ((const bfd_byte *));
-  bfd_signed_vma (*bfd_h_getx_signed_32) PARAMS ((const bfd_byte *));
-  void         (*bfd_h_putx32) PARAMS ((bfd_vma, bfd_byte *));
-  bfd_vma      (*bfd_h_getx16) PARAMS ((const bfd_byte *));
-  bfd_signed_vma (*bfd_h_getx_signed_16) PARAMS ((const bfd_byte *));
-  void         (*bfd_h_putx16) PARAMS ((bfd_vma, bfd_byte *));
-  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));
-  boolean             (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
-  boolean             (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
-
-   /* Generic entry points.  */
-#define BFD_JUMP_TABLE_GENERIC(NAME)\
-CAT(NAME,_close_and_cleanup),\
-CAT(NAME,_bfd_free_cached_info),\
-CAT(NAME,_new_section_hook),\
-CAT(NAME,_get_section_contents),\
-CAT(NAME,_get_section_contents_in_window)
-
-   /* Called when the BFD is being closed to do any necessary cleanup.  */
-  boolean       (*_close_and_cleanup) PARAMS ((bfd *));
-   /* Ask the BFD to free all cached information.  */
-  boolean (*_bfd_free_cached_info) PARAMS ((bfd *));
-   /* Called when a new section is created.  */
-  boolean       (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
-   /* Read the contents of a section.  */
-  boolean       (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, 
-                                            file_ptr, bfd_size_type));
-  boolean       (*_bfd_get_section_contents_in_window)
-                          PARAMS ((bfd *, sec_ptr, bfd_window *,
-                                   file_ptr, bfd_size_type));
-
-   /* Entry points to copy private data.  */
-#define BFD_JUMP_TABLE_COPY(NAME)\
-CAT(NAME,_bfd_copy_private_bfd_data),\
-CAT(NAME,_bfd_merge_private_bfd_data),\
-CAT(NAME,_bfd_copy_private_section_data),\
-CAT(NAME,_bfd_copy_private_symbol_data),\
-CAT(NAME,_bfd_set_private_flags),\
-CAT(NAME,_bfd_print_private_bfd_data)\
-   /* Called to copy BFD general private data from one object file
-     to another.  */
-  boolean       (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
-   /* Called to merge BFD general private data from one object file
-     to a common output file when linking.  */
-  boolean       (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
-   /* Called to copy BFD private section data from one object file
-     to another.  */
-  boolean       (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
-                                                       bfd *, sec_ptr));
-   /* Called to copy BFD private symbol data from one symbol 
-     to another.  */
-  boolean       (*_bfd_copy_private_symbol_data) PARAMS ((bfd *, asymbol *,
-                                                          bfd *, asymbol *));
-   /* Called to set private backend flags */
-  boolean       (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
-
-   /* Called to print private BFD data */
-  boolean       (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
-
-   /* Core file entry points.  */
-#define BFD_JUMP_TABLE_CORE(NAME)\
-CAT(NAME,_core_file_failing_command),\
-CAT(NAME,_core_file_failing_signal),\
-CAT(NAME,_core_file_matches_executable_p)
-  char *   (*_core_file_failing_command) PARAMS ((bfd *));
-  int      (*_core_file_failing_signal) PARAMS ((bfd *));
-  boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
-
-   /* Archive entry points.  */
-#define BFD_JUMP_TABLE_ARCHIVE(NAME)\
-CAT(NAME,_slurp_armap),\
-CAT(NAME,_slurp_extended_name_table),\
-CAT(NAME,_construct_extended_name_table),\
-CAT(NAME,_truncate_arname),\
-CAT(NAME,_write_armap),\
-CAT(NAME,_read_ar_hdr),\
-CAT(NAME,_openr_next_archived_file),\
-CAT(NAME,_get_elt_at_index),\
-CAT(NAME,_generic_stat_arch_elt),\
-CAT(NAME,_update_armap_timestamp)
-  boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
-  boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
-  boolean  (*_bfd_construct_extended_name_table)
-             PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-  void     (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *));
-  boolean  (*write_armap) PARAMS ((bfd *arch, 
-                              unsigned int elength,
-                              struct orl *map,
-                              unsigned int orl_count, 
-                              int stridx));
-  PTR (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
-  bfd *    (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev));
-#define bfd_get_elt_at_index(b,i) BFD_SEND(b, _bfd_get_elt_at_index, (b,i))
-  bfd *    (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
-  int      (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
-  boolean  (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
-
-   /* Entry points used for symbols.  */
-#define BFD_JUMP_TABLE_SYMBOLS(NAME)\
-CAT(NAME,_get_symtab_upper_bound),\
-CAT(NAME,_get_symtab),\
-CAT(NAME,_make_empty_symbol),\
-CAT(NAME,_print_symbol),\
-CAT(NAME,_get_symbol_info),\
-CAT(NAME,_bfd_is_local_label_name),\
-CAT(NAME,_get_lineno),\
-CAT(NAME,_find_nearest_line),\
-CAT(NAME,_bfd_make_debug_symbol),\
-CAT(NAME,_read_minisymbols),\
-CAT(NAME,_minisymbol_to_symbol)
-  long  (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
-  long  (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
-                                             struct symbol_cache_entry **));
-  struct symbol_cache_entry  *
-                (*_bfd_make_empty_symbol) PARAMS ((bfd *));
-  void          (*_bfd_print_symbol) PARAMS ((bfd *, PTR,
-                                      struct symbol_cache_entry *,
-                                      bfd_print_symbol_type));
-#define bfd_print_symbol(b,p,s,e) BFD_SEND(b, _bfd_print_symbol, (b,p,s,e))
-  void          (*_bfd_get_symbol_info) PARAMS ((bfd *,
-                                      struct symbol_cache_entry *,
-                                      symbol_info *));
-#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))
-  boolean       (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));
-
-  alent *    (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
-  boolean    (*_bfd_find_nearest_line) PARAMS ((bfd *abfd,
-                    struct sec *section, struct symbol_cache_entry **symbols,
-                    bfd_vma offset, CONST char **file, CONST char **func,
-                    unsigned int *line));
-  /* Back-door to allow format-aware applications to create debug symbols
-    while using BFD for everything else.  Currently used by the assembler
-    when creating COFF files.  */
-  asymbol *  (*_bfd_make_debug_symbol) PARAMS ((
-       bfd *abfd,
-       void *ptr,
-       unsigned long size));
-#define bfd_read_minisymbols(b, d, m, s) \
-  BFD_SEND (b, _read_minisymbols, (b, d, m, s))
-  long  (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *,
-                                      unsigned int *));
-#define bfd_minisymbol_to_symbol(b, d, m, f) \
-  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
-  asymbol *(*_minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR,
-                                             asymbol *));
-
-   /* Routines for relocs.  */
-#define BFD_JUMP_TABLE_RELOCS(NAME)\
-CAT(NAME,_get_reloc_upper_bound),\
-CAT(NAME,_canonicalize_reloc),\
-CAT(NAME,_bfd_reloc_type_lookup)
-  long  (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
-  long  (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
-                                            struct symbol_cache_entry **));
-   /* See documentation on reloc types.  */
-  reloc_howto_type *
-       (*reloc_type_lookup) PARAMS ((bfd *abfd,
-                                     bfd_reloc_code_real_type code));
-
-   /* Routines used when writing an object file.  */
-#define BFD_JUMP_TABLE_WRITE(NAME)\
-CAT(NAME,_set_arch_mach),\
-CAT(NAME,_set_section_contents)
-  boolean    (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
-                    unsigned long));
-  boolean       (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-                                            file_ptr, bfd_size_type));
-
-   /* Routines used by the linker.  */
-#define BFD_JUMP_TABLE_LINK(NAME)\
-CAT(NAME,_sizeof_headers),\
-CAT(NAME,_bfd_get_relocated_section_contents),\
-CAT(NAME,_bfd_relax_section),\
-CAT(NAME,_bfd_link_hash_table_create),\
-CAT(NAME,_bfd_link_add_symbols),\
-CAT(NAME,_bfd_final_link),\
-CAT(NAME,_bfd_link_split_section),\
-CAT(NAME,_bfd_gc_sections)
-  int        (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
-  bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *,
-                    struct bfd_link_info *, struct bfd_link_order *,
-                    bfd_byte *data, boolean relocateable,
-                    struct symbol_cache_entry **));
-
-  boolean    (*_bfd_relax_section) PARAMS ((bfd *, struct sec *,
-                    struct bfd_link_info *, boolean *again));
-
-   /* Create a hash table for the linker.  Different backends store
-     different information in this table.  */
-  struct bfd_link_hash_table *(*_bfd_link_hash_table_create) PARAMS ((bfd *));
-
-   /* Add symbols from this object file into the hash table.  */
-  boolean (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
-
-   /* Do a link based on the link_order structures attached to each
-     section of the BFD.  */
-  boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
-
-   /* Should this section be split up into smaller pieces during linking.  */
-  boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
-
-   /* Remove sections that are not referenced from the output.  */
-  boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
-
-   /* Routines to handle dynamic symbols and relocs.  */
-#define BFD_JUMP_TABLE_DYNAMIC(NAME)\
-CAT(NAME,_get_dynamic_symtab_upper_bound),\
-CAT(NAME,_canonicalize_dynamic_symtab),\
-CAT(NAME,_get_dynamic_reloc_upper_bound),\
-CAT(NAME,_canonicalize_dynamic_reloc)
-   /* Get the amount of memory required to hold the dynamic symbols. */
-  long  (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
-   /* Read in the dynamic symbols.  */
-  long  (*_bfd_canonicalize_dynamic_symtab)
-    PARAMS ((bfd *, struct symbol_cache_entry **));
-   /* Get the amount of memory required to hold the dynamic relocs.  */
-  long  (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
-   /* Read in the dynamic relocs.  */
-  long  (*_bfd_canonicalize_dynamic_reloc)
-    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
-
- PTR backend_data;
-} bfd_target;
-boolean 
-bfd_set_default_target  PARAMS ((const char *name));
-
-const bfd_target *
-bfd_find_target PARAMS ((CONST char *target_name, bfd *abfd));
-
-const char **
-bfd_target_list PARAMS ((void));
-
-boolean 
-bfd_check_format PARAMS ((bfd *abfd, bfd_format format));
-
-boolean 
-bfd_check_format_matches PARAMS ((bfd *abfd, bfd_format format, char ***matching));
-
-boolean 
-bfd_set_format PARAMS ((bfd *abfd, bfd_format format));
-
-CONST char *
-bfd_format_string PARAMS ((bfd_format format));
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/bfd/bfd.c b/bfd/bfd.c
deleted file mode 100644
index 597e8f0bc68..00000000000
--- a/bfd/bfd.c
+++ /dev/null
@@ -1,1159 +0,0 @@
-/* Generic BFD library interface and support routines.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	<<typedef bfd>>
-
-	A BFD has type <<bfd>>; objects of this type are the
-	cornerstone of any application using BFD. Using BFD
-	consists of making references though the BFD and to data in the BFD.
-
-	Here is the structure that defines the type <<bfd>>.  It
-	contains the major data about the file and pointers
-	to the rest of the data.
-
-CODE_FRAGMENT
-.
-.struct _bfd 
-.{
-.    {* The filename the application opened the BFD with.  *}
-.    CONST char *filename;                
-.
-.    {* A pointer to the target jump table.             *}
-.    const struct bfd_target *xvec;
-.
-.    {* To avoid dragging too many header files into every file that
-.       includes `<<bfd.h>>', IOSTREAM has been declared as a "char
-.       *", and MTIME as a "long".  Their correct types, to which they
-.       are cast when used, are "FILE *" and "time_t".    The iostream
-.       is the result of an fopen on the filename.  However, if the
-.       BFD_IN_MEMORY flag is set, then iostream is actually a pointer
-.       to a bfd_in_memory struct.  *}
-.    PTR iostream;
-.
-.    {* Is the file descriptor being cached?  That is, can it be closed as
-.       needed, and re-opened when accessed later?  *}
-.
-.    boolean cacheable;
-.
-.    {* Marks whether there was a default target specified when the
-.       BFD was opened. This is used to select which matching algorithm
-.       to use to choose the back end. *}
-.
-.    boolean target_defaulted;
-.
-.    {* The caching routines use these to maintain a
-.       least-recently-used list of BFDs *}
-.
-.    struct _bfd *lru_prev, *lru_next;
-.
-.    {* When a file is closed by the caching routines, BFD retains
-.       state information on the file here: *}
-.
-.    file_ptr where;              
-.
-.    {* and here: (``once'' means at least once) *}
-.
-.    boolean opened_once;
-.
-.    {* Set if we have a locally maintained mtime value, rather than
-.       getting it from the file each time: *}
-.
-.    boolean mtime_set;
-.
-.    {* File modified time, if mtime_set is true: *}
-.
-.    long mtime;          
-.
-.    {* Reserved for an unimplemented file locking extension.*}
-.
-.    int ifd;
-.
-.    {* The format which belongs to the BFD. (object, core, etc.) *}
-.
-.    bfd_format format;
-.
-.    {* The direction the BFD was opened with*}
-.
-.    enum bfd_direction {no_direction = 0,
-.                        read_direction = 1,
-.                        write_direction = 2,
-.                        both_direction = 3} direction;
-.
-.    {* Format_specific flags*}
-.
-.    flagword flags;              
-.
-.    {* Currently my_archive is tested before adding origin to
-.       anything. I believe that this can become always an add of
-.       origin, with origin set to 0 for non archive files.   *}
-.
-.    file_ptr origin;             
-.
-.    {* Remember when output has begun, to stop strange things
-.       from happening. *}
-.    boolean output_has_begun;
-.
-.    {* Pointer to linked list of sections*}
-.    struct sec  *sections;
-.
-.    {* The number of sections *}
-.    unsigned int section_count;
-.
-.    {* Stuff only useful for object files: 
-.       The start address. *}
-.    bfd_vma start_address;
-.
-.    {* Used for input and output*}
-.    unsigned int symcount;
-.
-.    {* Symbol table for output BFD (with symcount entries) *}
-.    struct symbol_cache_entry  **outsymbols;             
-.
-.    {* Pointer to structure which contains architecture information*}
-.    const struct bfd_arch_info *arch_info;
-.
-.    {* Stuff only useful for archives:*}
-.    PTR arelt_data;              
-.    struct _bfd *my_archive;     {* The containing archive BFD.  *}
-.    struct _bfd *next;           {* The next BFD in the archive.  *}
-.    struct _bfd *archive_head;   {* The first BFD in the archive.  *}
-.    boolean has_armap;           
-.
-.    {* A chain of BFD structures involved in a link.  *}
-.    struct _bfd *link_next;
-.
-.    {* A field used by _bfd_generic_link_add_archive_symbols.  This will
-.       be used only for archive elements.  *}
-.    int archive_pass;
-.
-.    {* Used by the back end to hold private data. *}
-.
-.    union 
-.      {
-.      struct aout_data_struct *aout_data;
-.      struct artdata *aout_ar_data;
-.      struct _oasys_data *oasys_obj_data;
-.      struct _oasys_ar_data *oasys_ar_data;
-.      struct coff_tdata *coff_obj_data;
-.      struct pe_tdata *pe_obj_data;
-.      struct xcoff_tdata *xcoff_obj_data;
-.      struct ecoff_tdata *ecoff_obj_data;
-.      struct ieee_data_struct *ieee_data;
-.      struct ieee_ar_data_struct *ieee_ar_data;
-.      struct srec_data_struct *srec_data;
-.      struct ihex_data_struct *ihex_data;
-.      struct tekhex_data_struct *tekhex_data;
-.      struct elf_obj_tdata *elf_obj_data;
-.      struct nlm_obj_tdata *nlm_obj_data;
-.      struct bout_data_struct *bout_data;
-.      struct sun_core_struct *sun_core_data;
-.      struct sco5_core_struct *sco5_core_data;
-.      struct trad_core_struct *trad_core_data;
-.      struct som_data_struct *som_data;
-.      struct hpux_core_struct *hpux_core_data;
-.      struct hppabsd_core_struct *hppabsd_core_data;
-.      struct sgi_core_struct *sgi_core_data;
-.      struct lynx_core_struct *lynx_core_data;
-.      struct osf_core_struct *osf_core_data;
-.      struct cisco_core_struct *cisco_core_data;
-.      struct versados_data_struct *versados_data;
-.      struct netbsd_core_struct *netbsd_core_data;
-.      PTR any;
-.      } tdata;
-.  
-.    {* Used by the application to hold private data*}
-.    PTR usrdata;
-.
-.  {* Where all the allocated stuff under this BFD goes.  This is a
-.     struct objalloc *, but we use PTR to avoid requiring the inclusion of
-.     objalloc.h.  *}
-.    PTR memory;
-.};
-.
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#ifdef ANSI_PROTOTYPES
-#include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-
-#include "libiberty.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "coff/sym.h"
-#include "libcoff.h"
-#include "libecoff.h"
-#undef obj_symbols
-#include "elf-bfd.h"
-
-#include <ctype.h>
-
-/* provide storage for subsystem, stack and heap data which may have been
-   passed in on the command line.  Ld puts this data into a bfd_link_info
-   struct which ultimately gets passed in to the bfd.  When it arrives, copy
-   it to the following struct so that the data will be available in coffcode.h
-   where it is needed.  The typedef's used are defined in bfd.h */
-
-
-
-/*
-SECTION
-	Error reporting
-
-	Most BFD functions return nonzero on success (check their
-	individual documentation for precise semantics).  On an error,
-	they call <<bfd_set_error>> to set an error condition that callers
-	can check by calling <<bfd_get_error>>.
-        If that returns <<bfd_error_system_call>>, then check
-	<<errno>>.
-
-	The easiest way to report a BFD error to the user is to
-	use <<bfd_perror>>.
-
-SUBSECTION
-	Type <<bfd_error_type>>
-
-	The values returned by <<bfd_get_error>> are defined by the
-	enumerated type <<bfd_error_type>>.
-
-CODE_FRAGMENT
-.
-.typedef enum bfd_error
-.{
-.  bfd_error_no_error = 0,
-.  bfd_error_system_call,
-.  bfd_error_invalid_target,
-.  bfd_error_wrong_format,
-.  bfd_error_invalid_operation,
-.  bfd_error_no_memory,
-.  bfd_error_no_symbols,
-.  bfd_error_no_armap,
-.  bfd_error_no_more_archived_files,
-.  bfd_error_malformed_archive,
-.  bfd_error_file_not_recognized,
-.  bfd_error_file_ambiguously_recognized,
-.  bfd_error_no_contents,
-.  bfd_error_nonrepresentable_section,
-.  bfd_error_no_debug_section,
-.  bfd_error_bad_value,
-.  bfd_error_file_truncated,
-.  bfd_error_file_too_big,
-.  bfd_error_invalid_error_code
-.} bfd_error_type;
-.
-*/
-
-static bfd_error_type bfd_error = bfd_error_no_error;
-
-CONST char *CONST bfd_errmsgs[] = {
-                        N_("No error"),
-                        N_("System call error"),
-                        N_("Invalid bfd target"),
-                        N_("File in wrong format"),
-                        N_("Invalid operation"),
-                        N_("Memory exhausted"),
-                        N_("No symbols"),
-			N_("Archive has no index; run ranlib to add one"),
-                        N_("No more archived files"),
-                        N_("Malformed archive"),
-                        N_("File format not recognized"),
-                        N_("File format is ambiguous"),
-                        N_("Section has no contents"),
-                        N_("Nonrepresentable section on output"),
-			N_("Symbol needs debug section which does not exist"),
-			N_("Bad value"),
-			N_("File truncated"),
-			N_("File too big"),
-                        N_("#<Invalid error code>")
-                       };
-
-/*
-FUNCTION
-	bfd_get_error
-
-SYNOPSIS
-	bfd_error_type bfd_get_error (void);
-
-DESCRIPTION
-	Return the current BFD error condition.
-*/
-
-bfd_error_type
-bfd_get_error ()
-{
-  return bfd_error;
-}
-
-/*
-FUNCTION
-	bfd_set_error
-
-SYNOPSIS
-	void bfd_set_error (bfd_error_type error_tag);
-
-DESCRIPTION
-	Set the BFD error condition to be @var{error_tag}.
-*/
-
-void
-bfd_set_error (error_tag)
-     bfd_error_type error_tag;
-{
-  bfd_error = error_tag;
-}
-
-/*
-FUNCTION
-	bfd_errmsg
-
-SYNOPSIS
-	CONST char *bfd_errmsg (bfd_error_type error_tag);
-
-DESCRIPTION
-	Return a string describing the error @var{error_tag}, or
-	the system error if @var{error_tag} is <<bfd_error_system_call>>.
-*/
-
-CONST char *
-bfd_errmsg (error_tag)
-     bfd_error_type error_tag;
-{
-#ifndef errno
-  extern int errno;
-#endif
-  if (error_tag == bfd_error_system_call)
-    return xstrerror (errno);
-
-  if ((((int)error_tag <(int) bfd_error_no_error) ||
-       ((int)error_tag > (int)bfd_error_invalid_error_code)))
-    error_tag = bfd_error_invalid_error_code;/* sanity check */
-
-  return _(bfd_errmsgs [(int)error_tag]);
-}
-
-/*
-FUNCTION
-	bfd_perror
-
-SYNOPSIS
-	void bfd_perror (CONST char *message);
-
-DESCRIPTION
-	Print to the standard error stream a string describing the
-	last BFD error that occurred, or the last system error if
-	the last BFD error was a system call failure.  If @var{message}
-	is non-NULL and non-empty, the error string printed is preceded
-	by @var{message}, a colon, and a space.  It is followed by a newline.
-*/
-
-void
-bfd_perror (message)
-     CONST char *message;
-{
-  if (bfd_get_error () == bfd_error_system_call)
-    perror((char *)message);            /* must be system error then... */
-  else {
-    if (message == NULL || *message == '\0')
-      fprintf (stderr, "%s\n", bfd_errmsg (bfd_get_error ()));
-    else
-      fprintf (stderr, "%s: %s\n", message, bfd_errmsg (bfd_get_error ()));
-  }
-}
-
-/*
-SUBSECTION
-	BFD error handler
-
-	Some BFD functions want to print messages describing the
-	problem.  They call a BFD error handler function.  This
-	function may be overriden by the program.
-
-	The BFD error handler acts like printf.
-
-CODE_FRAGMENT
-.
-.typedef void (*bfd_error_handler_type) PARAMS ((const char *, ...));
-.
-*/
-
-/* The program name used when printing BFD error messages.  */
-
-static const char *_bfd_error_program_name;
-
-/* This is the default routine to handle BFD error messages.  */
-
-#ifdef ANSI_PROTOTYPES
-
-static void _bfd_default_error_handler PARAMS ((const char *s, ...));
-
-static void
-_bfd_default_error_handler (const char *s, ...)
-{
-  va_list p;
-
-  if (_bfd_error_program_name != NULL)
-    fprintf (stderr, "%s: ", _bfd_error_program_name);
-  else
-    fprintf (stderr, "BFD: ");
-
-  va_start (p, s);
-
-  vfprintf (stderr, s, p);
-
-  va_end (p);
-
-  fprintf (stderr, "\n");
-}
-
-#else /* ! defined (ANSI_PROTOTYPES) */
-
-static void _bfd_default_error_handler ();
-
-static void
-_bfd_default_error_handler (va_alist)
-     va_dcl
-{
-  va_list p;
-  const char *s;
-
-  if (_bfd_error_program_name != NULL)
-    fprintf (stderr, "%s: ", _bfd_error_program_name);
-  else
-    fprintf (stderr, "BFD: ");
-
-  va_start (p);
-
-  s = va_arg (p, const char *);
-  vfprintf (stderr, s, p);
-
-  va_end (p);
-
-  fprintf (stderr, "\n");
-}
-
-#endif /* ! defined (ANSI_PROTOTYPES) */
-
-/* This is a function pointer to the routine which should handle BFD
-   error messages.  It is called when a BFD routine encounters an
-   error for which it wants to print a message.  Going through a
-   function pointer permits a program linked against BFD to intercept
-   the messages and deal with them itself.  */
-
-bfd_error_handler_type _bfd_error_handler = _bfd_default_error_handler;
-
-/*
-FUNCTION
-	bfd_set_error_handler
-
-SYNOPSIS
-	bfd_error_handler_type bfd_set_error_handler (bfd_error_handler_type);
-
-DESCRIPTION
-	Set the BFD error handler function.  Returns the previous
-	function.
-*/
-
-bfd_error_handler_type
-bfd_set_error_handler (pnew)
-     bfd_error_handler_type pnew;
-{
-  bfd_error_handler_type pold;
-
-  pold = _bfd_error_handler;
-  _bfd_error_handler = pnew;
-  return pold;
-}
-
-/*
-FUNCTION
-	bfd_set_error_program_name
-
-SYNOPSIS
-	void bfd_set_error_program_name (const char *);
-
-DESCRIPTION
-	Set the program name to use when printing a BFD error.  This
-	is printed before the error message followed by a colon and
-	space.  The string must not be changed after it is passed to
-	this function.
-*/
-
-void
-bfd_set_error_program_name (name)
-     const char *name;
-{
-  _bfd_error_program_name = name;
-}
-
-
-/*
-FUNCTION
-	bfd_get_error_handler
-
-SYNOPSIS
-	bfd_error_handler_type bfd_get_error_handler (void);
-
-DESCRIPTION
-	Return the BFD error handler function.
-*/
-
-bfd_error_handler_type
-bfd_get_error_handler ()
-{
-  return _bfd_error_handler;
-}
-
-/*
-SECTION
-	Symbols
-*/
-
-/*
-FUNCTION
-	bfd_get_reloc_upper_bound
-
-SYNOPSIS
-	long bfd_get_reloc_upper_bound(bfd *abfd, asection *sect);
-
-DESCRIPTION
-	Return the number of bytes required to store the
-	relocation information associated with section @var{sect}
-	attached to bfd @var{abfd}.  If an error occurs, return -1.
-
-*/
-
-
-long
-bfd_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  if (abfd->format != bfd_object) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return -1;
-  }
-
-  return BFD_SEND (abfd, _get_reloc_upper_bound, (abfd, asect));
-}
-
-/*
-FUNCTION
-	bfd_canonicalize_reloc
-
-SYNOPSIS
-	long bfd_canonicalize_reloc
-        	(bfd *abfd,
-		asection *sec,
-		arelent **loc,
-		asymbol	**syms);
-
-DESCRIPTION
-	Call the back end associated with the open BFD
-	@var{abfd} and translate the external form of the relocation
-	information attached to @var{sec} into the internal canonical
-	form.  Place the table into memory at @var{loc}, which has
-	been preallocated, usually by a call to
-	<<bfd_get_reloc_upper_bound>>.  Returns the number of relocs, or
-	-1 on error.
-
-	The @var{syms} table is also needed for horrible internal magic
-	reasons.
-
-
-*/
-long
-bfd_canonicalize_reloc (abfd, asect, location, symbols)
-     bfd *abfd;
-     sec_ptr asect;
-     arelent **location;
-     asymbol **symbols;
-{
-  if (abfd->format != bfd_object) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return -1;
-  }
-  return BFD_SEND (abfd, _bfd_canonicalize_reloc,
-		   (abfd, asect, location, symbols));
-}
-
-/*
-FUNCTION
-	bfd_set_reloc
-
-SYNOPSIS
-	void bfd_set_reloc
-	  (bfd *abfd, asection *sec, arelent **rel, unsigned int count)
-
-DESCRIPTION
-	Set the relocation pointer and count within
-	section @var{sec} to the values @var{rel} and @var{count}.
-	The argument @var{abfd} is ignored.
-
-*/
-/*ARGSUSED*/
-void
-bfd_set_reloc (ignore_abfd, asect, location, count)
-     bfd *ignore_abfd;
-     sec_ptr asect;
-     arelent **location;
-     unsigned int count;
-{
-  asect->orelocation = location;
-  asect->reloc_count = count;
-}
-
-/*
-FUNCTION
-	bfd_set_file_flags
-
-SYNOPSIS
-	boolean bfd_set_file_flags(bfd *abfd, flagword flags);
-
-DESCRIPTION
-	Set the flag word in the BFD @var{abfd} to the value @var{flags}.
-
-	Possible errors are:
-	o <<bfd_error_wrong_format>> - The target bfd was not of object format.
-	o <<bfd_error_invalid_operation>> - The target bfd was open for reading.
-	o <<bfd_error_invalid_operation>> -
-	The flag word contained a bit which was not applicable to the
-	type of file.  E.g., an attempt was made to set the <<D_PAGED>> bit
-	on a BFD format which does not support demand paging.
-
-*/
-
-boolean
-bfd_set_file_flags (abfd, flags)
-     bfd *abfd;
-     flagword flags;
-{
-  if (abfd->format != bfd_object) {
-    bfd_set_error (bfd_error_wrong_format);
-    return false;
-  }
-
-  if (bfd_read_p (abfd)) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return false;
-  }
-
-  bfd_get_file_flags (abfd) = flags;
-  if ((flags & bfd_applicable_file_flags (abfd)) != flags) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return false;
-  }
-
-return true;
-}
-
-void
-bfd_assert (file, line)
-     const char *file;
-     int line;
-{
-  (*_bfd_error_handler) (_("bfd assertion fail %s:%d"), file, line);
-}
-
-
-/*
-FUNCTION
-	bfd_set_start_address
-
-SYNOPSIS
- 	boolean bfd_set_start_address(bfd *abfd, bfd_vma vma);
-
-DESCRIPTION
-	Make @var{vma} the entry point of output BFD @var{abfd}.
-
-RETURNS
-	Returns <<true>> on success, <<false>> otherwise.
-*/
-
-boolean
-bfd_set_start_address(abfd, vma)
-bfd *abfd;
-bfd_vma vma;
-{
-  abfd->start_address = vma;
-  return true;
-}
-
-
-/*
-FUNCTION
-	bfd_get_mtime
-
-SYNOPSIS
-	long bfd_get_mtime(bfd *abfd);
-
-DESCRIPTION
-	Return the file modification time (as read from the file system, or
-	from the archive header for archive members).
-
-*/
-
-long
-bfd_get_mtime (abfd)
-     bfd *abfd;
-{
-  FILE *fp;
-  struct stat buf;
-
-  if (abfd->mtime_set)
-    return abfd->mtime;
-
-  fp = bfd_cache_lookup (abfd);
-  if (0 != fstat (fileno (fp), &buf))
-    return 0;
-
-  abfd->mtime = buf.st_mtime;		/* Save value in case anyone wants it */
-  return buf.st_mtime;
-}
-
-/*
-FUNCTION
-	bfd_get_size
-
-SYNOPSIS
-	long bfd_get_size(bfd *abfd);
-
-DESCRIPTION
-	Return the file size (as read from file system) for the file
-	associated with BFD @var{abfd}.
-
-	The initial motivation for, and use of, this routine is not
-	so we can get the exact size of the object the BFD applies to, since
-	that might not be generally possible (archive members for example).
-	It would be ideal if someone could eventually modify
-	it so that such results were guaranteed.
-
-	Instead, we want to ask questions like "is this NNN byte sized
-	object I'm about to try read from file offset YYY reasonable?"
-	As as example of where we might do this, some object formats
-	use string tables for which the first <<sizeof(long)>> bytes of the
-	table contain the size of the table itself, including the size bytes.
-	If an application tries to read what it thinks is one of these
-	string tables, without some way to validate the size, and for
-	some reason the size is wrong (byte swapping error, wrong location
-	for the string table, etc.), the only clue is likely to be a read
-	error when it tries to read the table, or a "virtual memory
-	exhausted" error when it tries to allocate 15 bazillon bytes
-	of space for the 15 bazillon byte table it is about to read.
-	This function at least allows us to answer the quesion, "is the
-	size reasonable?".
-*/
-
-long
-bfd_get_size (abfd)
-     bfd *abfd;
-{
-  FILE *fp;
-  struct stat buf;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    return ((struct bfd_in_memory *) abfd->iostream)->size;
-
-  fp = bfd_cache_lookup (abfd);
-  if (0 != fstat (fileno (fp), &buf))
-    return 0;
-
-  return buf.st_size;
-}
-
-/*
-FUNCTION
-	bfd_get_gp_size
-
-SYNOPSIS
-	int bfd_get_gp_size(bfd *abfd);
-
-DESCRIPTION
-	Return the maximum size of objects to be optimized using the GP
-	register under MIPS ECOFF.  This is typically set by the <<-G>>
-	argument to the compiler, assembler or linker.
-*/
-
-int
-bfd_get_gp_size (abfd)
-     bfd *abfd;
-{
-  if (abfd->format == bfd_object)
-    {
-      if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
-	return ecoff_data (abfd)->gp_size;
-      else if (abfd->xvec->flavour == bfd_target_elf_flavour)
-	return elf_gp_size (abfd);
-    }
-  return 0;
-}
-
-/*
-FUNCTION
-	bfd_set_gp_size
-
-SYNOPSIS
-	void bfd_set_gp_size(bfd *abfd, int i);
-
-DESCRIPTION
-	Set the maximum size of objects to be optimized using the GP
-	register under ECOFF or MIPS ELF.  This is typically set by
-	the <<-G>> argument to the compiler, assembler or linker.
-*/
-
-void
-bfd_set_gp_size (abfd, i)
-     bfd *abfd;
-     int i;
-{
-  /* Don't try to set GP size on an archive or core file! */
-  if (abfd->format != bfd_object)
-    return;
-  if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
-    ecoff_data (abfd)->gp_size = i;
-  else if (abfd->xvec->flavour == bfd_target_elf_flavour)
-    elf_gp_size (abfd) = i;
-}
-
-/* Get the GP value.  This is an internal function used by some of the
-   relocation special_function routines on targets which support a GP
-   register.  */
-
-bfd_vma
-_bfd_get_gp_value (abfd)
-     bfd *abfd;
-{
-  if (abfd->format == bfd_object)
-    {
-      if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
-	return ecoff_data (abfd)->gp;
-      else if (abfd->xvec->flavour == bfd_target_elf_flavour)
-	return elf_gp (abfd);
-    }
-  return 0;
-}
-
-/* Set the GP value.  */
-
-void
-_bfd_set_gp_value (abfd, v)
-     bfd *abfd;
-     bfd_vma v;
-{
-  if (abfd->format != bfd_object)
-    return;
-  if (abfd->xvec->flavour == bfd_target_ecoff_flavour)
-    ecoff_data (abfd)->gp = v;
-  else if (abfd->xvec->flavour == bfd_target_elf_flavour)
-    elf_gp (abfd) = v;
-}
-
-/*
-FUNCTION
-	bfd_scan_vma
-
-SYNOPSIS
-	bfd_vma bfd_scan_vma(CONST char *string, CONST char **end, int base);
-
-DESCRIPTION
-	Convert, like <<strtoul>>, a numerical expression
-	@var{string} into a <<bfd_vma>> integer, and return that integer.
-	(Though without as many bells and whistles as <<strtoul>>.)
-	The expression is assumed to be unsigned (i.e., positive).
-	If given a @var{base}, it is used as the base for conversion.
-	A base of 0 causes the function to interpret the string
-	in hex if a leading "0x" or "0X" is found, otherwise
-	in octal if a leading zero is found, otherwise in decimal.
-
-	Overflow is not detected.
-*/
-
-bfd_vma
-bfd_scan_vma (string, end, base)
-     CONST char *string;
-     CONST char **end;
-     int base;
-{
-  bfd_vma value;
-  int digit;
-
-  /* Let the host do it if possible.  */
-  if (sizeof(bfd_vma) <= sizeof(unsigned long))
-    return (bfd_vma) strtoul (string, (char **) end, base);
-
-  /* A negative base makes no sense, and we only need to go as high as hex.  */
-  if ((base < 0) || (base > 16))
-    return (bfd_vma) 0;
-
-  if (base == 0)
-    {
-      if (string[0] == '0')
-	{
-	  if ((string[1] == 'x') || (string[1] == 'X'))
-	    base = 16;
-	  /* XXX should we also allow "0b" or "0B" to set base to 2? */
-	  else
-	    base = 8;
-	}
-      else
-	base = 10;
-    }
-  if ((base == 16) &&
-      (string[0] == '0') && ((string[1] == 'x') || (string[1] == 'X')))
-    string += 2;
-  /* XXX should we also skip over "0b" or "0B" if base is 2? */
-    
-/* Speed could be improved with a table like hex_value[] in gas.  */
-#define HEX_VALUE(c) \
-  (isxdigit ((unsigned char) c)					\
-   ? (isdigit ((unsigned char) c)				\
-      ? (c - '0')						\
-      : (10 + c - (islower ((unsigned char) c) ? 'a' : 'A')))	\
-   : 42)
-
-  for (value = 0; (digit = HEX_VALUE(*string)) < base; string++)
-    {
-      value = value * base + digit;
-    }
-
-  if (end)
-    *end = string;
-
-  return value;
-}
-
-/*
-FUNCTION
-	bfd_copy_private_bfd_data
-
-SYNOPSIS
-	boolean bfd_copy_private_bfd_data(bfd *ibfd, bfd *obfd);
-
-DESCRIPTION
-	Copy private BFD information from the BFD @var{ibfd} to the 
-	the BFD @var{obfd}.  Return <<true>> on success, <<false>> on error.
-	Possible error returns are:
-
-	o <<bfd_error_no_memory>> -
-	Not enough memory exists to create private data for @var{obfd}.
-
-.#define bfd_copy_private_bfd_data(ibfd, obfd) \
-.     BFD_SEND (obfd, _bfd_copy_private_bfd_data, \
-.		(ibfd, obfd))
-
-*/
-
-/*
-FUNCTION
-	bfd_merge_private_bfd_data
-
-SYNOPSIS
-	boolean bfd_merge_private_bfd_data(bfd *ibfd, bfd *obfd);
-
-DESCRIPTION
-	Merge private BFD information from the BFD @var{ibfd} to the 
-	the output file BFD @var{obfd} when linking.  Return <<true>>
-	on success, <<false>> on error.  Possible error returns are:
-
-	o <<bfd_error_no_memory>> -
-	Not enough memory exists to create private data for @var{obfd}.
-
-.#define bfd_merge_private_bfd_data(ibfd, obfd) \
-.     BFD_SEND (obfd, _bfd_merge_private_bfd_data, \
-.		(ibfd, obfd))
-
-*/
-
-/*
-FUNCTION
-	bfd_set_private_flags
-
-SYNOPSIS
-	boolean bfd_set_private_flags(bfd *abfd, flagword flags);
-
-DESCRIPTION
-	Set private BFD flag information in the BFD @var{abfd}.
-	Return <<true>> on success, <<false>> on error.  Possible error
-	returns are:
-
-	o <<bfd_error_no_memory>> -
-	Not enough memory exists to create private data for @var{obfd}.
-
-.#define bfd_set_private_flags(abfd, flags) \
-.     BFD_SEND (abfd, _bfd_set_private_flags, \
-.		(abfd, flags))
-
-*/
-
-/*
-FUNCTION
-	stuff
-
-DESCRIPTION
-	Stuff which should be documented:
-
-.#define bfd_sizeof_headers(abfd, reloc) \
-.     BFD_SEND (abfd, _bfd_sizeof_headers, (abfd, reloc))
-.
-.#define bfd_find_nearest_line(abfd, sec, syms, off, file, func, line) \
-.     BFD_SEND (abfd, _bfd_find_nearest_line,  (abfd, sec, syms, off, file, func, line))
-.
-.       {* Do these three do anything useful at all, for any back end?  *}
-.#define bfd_debug_info_start(abfd) \
-.        BFD_SEND (abfd, _bfd_debug_info_start, (abfd))
-.
-.#define bfd_debug_info_end(abfd) \
-.        BFD_SEND (abfd, _bfd_debug_info_end, (abfd))
-.
-.#define bfd_debug_info_accumulate(abfd, section) \
-.        BFD_SEND (abfd, _bfd_debug_info_accumulate, (abfd, section))
-.
-.
-.#define bfd_stat_arch_elt(abfd, stat) \
-.        BFD_SEND (abfd, _bfd_stat_arch_elt,(abfd, stat))
-.
-.#define bfd_update_armap_timestamp(abfd) \
-.        BFD_SEND (abfd, _bfd_update_armap_timestamp, (abfd))
-.
-.#define bfd_set_arch_mach(abfd, arch, mach)\
-.        BFD_SEND ( abfd, _bfd_set_arch_mach, (abfd, arch, mach))
-.
-.#define bfd_relax_section(abfd, section, link_info, again) \
-.       BFD_SEND (abfd, _bfd_relax_section, (abfd, section, link_info, again))
-.
-.#define bfd_gc_sections(abfd, link_info) \
-.	BFD_SEND (abfd, _bfd_gc_sections, (abfd, link_info))
-.
-.#define bfd_link_hash_table_create(abfd) \
-.	BFD_SEND (abfd, _bfd_link_hash_table_create, (abfd))
-.
-.#define bfd_link_add_symbols(abfd, info) \
-.	BFD_SEND (abfd, _bfd_link_add_symbols, (abfd, info))
-.
-.#define bfd_final_link(abfd, info) \
-.	BFD_SEND (abfd, _bfd_final_link, (abfd, info))
-.
-.#define bfd_free_cached_info(abfd) \
-.       BFD_SEND (abfd, _bfd_free_cached_info, (abfd))
-.
-.#define bfd_get_dynamic_symtab_upper_bound(abfd) \
-.	BFD_SEND (abfd, _bfd_get_dynamic_symtab_upper_bound, (abfd))
-.
-.#define bfd_print_private_bfd_data(abfd, file)\
-.	BFD_SEND (abfd, _bfd_print_private_bfd_data, (abfd, file))
-.
-.#define bfd_canonicalize_dynamic_symtab(abfd, asymbols) \
-.	BFD_SEND (abfd, _bfd_canonicalize_dynamic_symtab, (abfd, asymbols))
-.
-.#define bfd_get_dynamic_reloc_upper_bound(abfd) \
-.	BFD_SEND (abfd, _bfd_get_dynamic_reloc_upper_bound, (abfd))
-.
-.#define bfd_canonicalize_dynamic_reloc(abfd, arels, asyms) \
-.	BFD_SEND (abfd, _bfd_canonicalize_dynamic_reloc, (abfd, arels, asyms))
-.
-.extern bfd_byte *bfd_get_relocated_section_contents
-.	PARAMS ((bfd *, struct bfd_link_info *,
-.		  struct bfd_link_order *, bfd_byte *,
-.		  boolean, asymbol **));
-.
-
-*/
-
-bfd_byte *
-bfd_get_relocated_section_contents (abfd, link_info, link_order, data,
-				    relocateable, symbols)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  bfd *abfd2;
-  bfd_byte *(*fn) PARAMS ((bfd *, struct bfd_link_info *,
-			   struct bfd_link_order *, bfd_byte *, boolean,
-			   asymbol **));
-
-  if (link_order->type == bfd_indirect_link_order)
-    {
-      abfd2 = link_order->u.indirect.section->owner;
-      if (abfd2 == 0)
-	abfd2 = abfd;
-    }
-  else
-    abfd2 = abfd;
-  fn = abfd2->xvec->_bfd_get_relocated_section_contents;
-
-  return (*fn) (abfd, link_info, link_order, data, relocateable, symbols);
-}
-
-/* Record information about an ELF program header.  */
-
-boolean
-bfd_record_phdr (abfd, type, flags_valid, flags, at_valid, at,
-		 includes_filehdr, includes_phdrs, count, secs)
-     bfd *abfd;
-     unsigned long type;
-     boolean flags_valid;
-     flagword flags;
-     boolean at_valid;
-     bfd_vma at;
-     boolean includes_filehdr;
-     boolean includes_phdrs;
-     unsigned int count;
-     asection **secs;
-{
-  struct elf_segment_map *m, **pm;
-
-  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour)
-    return true;
-
-  m = ((struct elf_segment_map *)
-       bfd_alloc (abfd,
-		  (sizeof (struct elf_segment_map)
-		   + ((size_t) count - 1) * sizeof (asection *))));
-  if (m == NULL)
-    return false;
-
-  m->next = NULL;
-  m->p_type = type;
-  m->p_flags = flags;
-  m->p_paddr = at;
-  m->p_flags_valid = flags_valid;
-  m->p_paddr_valid = at_valid;
-  m->includes_filehdr = includes_filehdr;
-  m->includes_phdrs = includes_phdrs;
-  m->count = count;
-  if (count > 0)
-    memcpy (m->sections, secs, count * sizeof (asection *));
-
-  for (pm = &elf_tdata (abfd)->segment_map; *pm != NULL; pm = &(*pm)->next)
-    ;
-  *pm = m;
-
-  return true;
-}
diff --git a/bfd/binary.c b/bfd/binary.c
deleted file mode 100644
index 6c63fff4adf..00000000000
--- a/bfd/binary.c
+++ /dev/null
@@ -1,386 +0,0 @@
-/* BFD back-end for binary objects.
-   Copyright 1994, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This is a BFD backend which may be used to write binary objects.
-   It may only be used for output, not input.  The intention is that
-   this may be used as an output format for objcopy in order to
-   generate raw binary data.
-
-   This is very simple.  The only complication is that the real data
-   will start at some address X, and in some cases we will not want to
-   include X zeroes just to get to that point.  Since the start
-   address is not meaningful for this object file format, we use it
-   instead to indicate the number of zeroes to skip at the start of
-   the file.  objcopy cooperates by specially setting the start
-   address to zero by default.  */
-
-#include <ctype.h>
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/* Any bfd we create by reading a binary file has three symbols:
-   a start symbol, an end symbol, and an absolute length symbol.  */
-#define BIN_SYMS 3
-
-static boolean binary_mkobject PARAMS ((bfd *));
-static const bfd_target *binary_object_p PARAMS ((bfd *));
-static boolean binary_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static long binary_get_symtab_upper_bound PARAMS ((bfd *));
-static char *mangle_name PARAMS ((bfd *, char *));
-static long binary_get_symtab PARAMS ((bfd *, asymbol **));
-static asymbol *binary_make_empty_symbol PARAMS ((bfd *));
-static void binary_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static boolean binary_set_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static int binary_sizeof_headers PARAMS ((bfd *, boolean));
-
-/* Create a binary object.  Invoked via bfd_set_format.  */
-
-static boolean
-binary_mkobject (abfd)
-     bfd *abfd;
-{
-  return true;
-}
-
-/* Any file may be considered to be a binary file, provided the target
-   was not defaulted.  That is, it must be explicitly specified as
-   being binary.  */
-
-static const bfd_target *
-binary_object_p (abfd)
-     bfd *abfd;
-{
-  struct stat statbuf;
-  asection *sec;
-
-  if (abfd->target_defaulted)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  abfd->symcount = BIN_SYMS;
-
-  /* Find the file size.  */
-  if (bfd_stat (abfd, &statbuf) < 0)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return NULL;
-    }
-
-  /* One data section.  */
-  sec = bfd_make_section (abfd, ".data");
-  if (sec == NULL)
-    return NULL;
-  sec->flags = SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS;
-  sec->vma = 0;
-  sec->_raw_size = statbuf.st_size;
-  sec->filepos = 0;
-
-  abfd->tdata.any = (PTR) sec;
-
-  return abfd->xvec;
-}
-
-#define binary_close_and_cleanup _bfd_generic_close_and_cleanup
-#define binary_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define binary_new_section_hook _bfd_generic_new_section_hook
-
-/* Get contents of the only section.  */
-
-static boolean
-binary_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (bfd_seek (abfd, offset, SEEK_SET) != 0
-      || bfd_read (location, 1, count, abfd) != count)
-    return false;
-  return true;
-}
-
-/* Return the amount of memory needed to read the symbol table.  */
-
-static long
-binary_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  return (BIN_SYMS + 1) * sizeof (asymbol *);
-}
-
-/* Create a symbol name based on the bfd's filename.  */
-
-static char *
-mangle_name (abfd, suffix)
-     bfd *abfd;
-     char *suffix;
-{
-  int size;
-  char *buf;
-  char *p;
-
-  size = (strlen (bfd_get_filename (abfd))
-	  + strlen (suffix)
-	  + sizeof "_binary__");
-
-  buf = (char *) bfd_alloc (abfd, size);
-  if (buf == NULL)
-    return "";
-
-  sprintf (buf, "_binary_%s_%s", bfd_get_filename (abfd), suffix);
-
-  /* Change any non-alphanumeric characters to underscores.  */
-  for (p = buf; *p; p++)
-    if (! isalnum ((unsigned char) *p))
-      *p = '_';
-
-  return buf;
-}
-
-/* Return the symbol table.  */
-
-static long
-binary_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  asection *sec = (asection *) abfd->tdata.any;
-  asymbol *syms;
-  unsigned int i;
-
-  syms = (asymbol *) bfd_alloc (abfd, BIN_SYMS * sizeof (asymbol));
-  if (syms == NULL)
-    return false;
-
-  /* Start symbol.  */
-  syms[0].the_bfd = abfd;
-  syms[0].name = mangle_name (abfd, "start");
-  syms[0].value = 0;
-  syms[0].flags = BSF_GLOBAL;
-  syms[0].section = sec;
-  syms[0].udata.p = NULL;
-
-  /* End symbol.  */
-  syms[1].the_bfd = abfd;
-  syms[1].name = mangle_name (abfd, "end");
-  syms[1].value = sec->_raw_size;
-  syms[1].flags = BSF_GLOBAL;
-  syms[1].section = sec;
-  syms[1].udata.p = NULL;
-
-  /* Size symbol.  */
-  syms[2].the_bfd = abfd;
-  syms[2].name = mangle_name (abfd, "size");
-  syms[2].value = sec->_raw_size;
-  syms[2].flags = BSF_GLOBAL;
-  syms[2].section = bfd_abs_section_ptr;
-  syms[2].udata.p = NULL;
-
-  for (i = 0; i < BIN_SYMS; i++)
-    *alocation++ = syms++;
-  *alocation = NULL;
-
-  return BIN_SYMS;
-}
-
-/* Make an empty symbol.  */
-
-static asymbol *
-binary_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  return (asymbol *) bfd_alloc (abfd, sizeof (asymbol));
-}
-
-#define binary_print_symbol _bfd_nosymbols_print_symbol
-
-/* Get information about a symbol.  */
-
-static void
-binary_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-#define binary_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define binary_get_lineno _bfd_nosymbols_get_lineno
-#define binary_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define binary_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define binary_read_minisymbols _bfd_generic_read_minisymbols
-#define binary_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define binary_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
-#define binary_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
-#define binary_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-/* Set the architecture of a binary file.  */
-#define binary_set_arch_mach _bfd_generic_set_arch_mach
-
-/* Write section contents of a binary file.  */
-
-static boolean
-binary_set_section_contents (abfd, sec, data, offset, size)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-     file_ptr offset;
-     bfd_size_type size;
-{
-  if (! abfd->output_has_begun)
-    {
-      boolean found_low;
-      bfd_vma low;
-      asection *s;
-
-      /* The lowest section LMA sets the virtual address of the start
-         of the file.  We use this to set the file position of all the
-         sections.  */
-      found_low = false;
-      low = 0;
-      for (s = abfd->sections; s != NULL; s = s->next)
-	if (((s->flags
-	      & (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC | SEC_NEVER_LOAD))
-	     == (SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC))
-	    && (! found_low || s->lma < low))
-	  {
-	    low = s->lma;
-	    found_low = true;
-	  }
-
-      for (s = abfd->sections; s != NULL; s = s->next)
-	{
-	  s->filepos = s->lma - low;
-
-	  /* Skip following warning check for sections that will not
-	     occupy file space.  */ 
-	  if ((s->flags
-	       & (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_NEVER_LOAD))
-	      != (SEC_HAS_CONTENTS | SEC_ALLOC))
-	    continue;
-
-	  /* If attempting to generate a binary file from a bfd with
-	     LMA's all over the place, huge (sparse?) binary files may
-	     result.  This condition attempts to detect this situation
-	     and print a warning.  Better heuristics would be nice to
-	     have. */
-
-	  if (s->filepos < 0)
-	    (*_bfd_error_handler)
-	      (_("Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."),
-	       bfd_get_section_name (abfd, s),
-	       (unsigned long) s->filepos);
-	}
-
-      abfd->output_has_begun = true;
-    }
-
-  /* We don't want to output anything for a section that is neither
-     loaded nor allocated.  The contents of such a section are not
-     meaningful in the binary format.  */
-  if ((sec->flags & (SEC_LOAD | SEC_ALLOC)) == 0)
-    return true;
-  if ((sec->flags & SEC_NEVER_LOAD) != 0)
-    return true;
-
-  return _bfd_generic_set_section_contents (abfd, sec, data, offset, size);
-}
-
-/* No space is required for header information.  */
-
-static int
-binary_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-{
-  return 0;
-}
-
-#define binary_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define binary_bfd_relax_section bfd_generic_relax_section
-#define binary_bfd_gc_sections bfd_generic_gc_sections
-#define binary_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define binary_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define binary_bfd_final_link _bfd_generic_final_link
-#define binary_bfd_link_split_section _bfd_generic_link_split_section
-#define binary_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-const bfd_target binary_vec =
-{
-  "binary",			/* name */
-  bfd_target_unknown_flavour,	/* flavour */
-  BFD_ENDIAN_UNKNOWN,		/* byteorder */
-  BFD_ENDIAN_UNKNOWN,		/* header_byteorder */
-  EXEC_P,			/* object_flags */
-  (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
-   | SEC_ROM | SEC_HAS_CONTENTS), /* section_flags */
-  0,				/* symbol_leading_char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-  {				/* bfd_check_format */
-    _bfd_dummy_target,
-    binary_object_p,		/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {				/* bfd_set_format */
-    bfd_false,
-    binary_mkobject,
-    bfd_false,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    bfd_true,
-    bfd_false,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (binary),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (binary),
-  BFD_JUMP_TABLE_RELOCS (binary),
-  BFD_JUMP_TABLE_WRITE (binary),
-  BFD_JUMP_TABLE_LINK (binary),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  NULL
-};
diff --git a/bfd/bout.c b/bfd/bout.c
deleted file mode 100644
index 4ef10f52057..00000000000
--- a/bfd/bout.c
+++ /dev/null
@@ -1,1534 +0,0 @@
-/* BFD back-end for Intel 960 b.out binaries.
-   Copyright 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "genlink.h"
-#include "bout.h"
-
-#include "aout/stab_gnu.h"
-#include "libaout.h"		/* BFD a.out internal data structures */
-
-
-static int aligncode PARAMS ((bfd *abfd, asection *input_section,
-			      arelent *r, unsigned int shrink));
-static void perform_slip PARAMS ((bfd *abfd, unsigned int slip,
-				  asection *input_section, bfd_vma value));
-static boolean b_out_squirt_out_relocs PARAMS ((bfd *abfd, asection *section));
-static const bfd_target *b_out_callback PARAMS ((bfd *));
-static bfd_reloc_status_type calljx_callback
-  PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR src, PTR dst,
-	   asection *));
-static bfd_reloc_status_type callj_callback
-  PARAMS ((bfd *, struct bfd_link_info *, arelent *, PTR data,
-	   unsigned int srcidx, unsigned int dstidx, asection *, boolean));
-static bfd_vma get_value PARAMS ((arelent *, struct bfd_link_info *,
-				  asection *));
-static int abs32code PARAMS ((bfd *, asection *, arelent *,
-			      unsigned int, struct bfd_link_info *));
-static boolean b_out_bfd_relax_section PARAMS ((bfd *, asection *,
-						struct bfd_link_info *,
-						boolean *));
-static bfd_byte *b_out_bfd_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
-
-/* Swaps the information in an executable header taken from a raw byte
-   stream memory image, into the internal exec_header structure.  */
-
-void
-bout_swap_exec_header_in (abfd, raw_bytes, execp)
-     bfd *abfd;
-     struct external_exec *raw_bytes;
-     struct internal_exec *execp;
-{
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
-  /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info   = bfd_h_get_32 (abfd, bytes->e_info);
-  execp->a_text   = GET_WORD (abfd, bytes->e_text);
-  execp->a_data   = GET_WORD (abfd, bytes->e_data);
-  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
-  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
-  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
-  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
-  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
-  execp->a_tload  = GET_WORD (abfd, bytes->e_tload);
-  execp->a_dload  = GET_WORD (abfd, bytes->e_dload);
-  execp->a_talign = bytes->e_talign[0];
-  execp->a_dalign = bytes->e_dalign[0];
-  execp->a_balign = bytes->e_balign[0];
-  execp->a_relaxable = bytes->e_relaxable[0];
-}
-
-/* Swaps the information in an internal exec header structure into the
-   supplied buffer ready for writing to disk.  */
-
-PROTO(void, bout_swap_exec_header_out,
-	  (bfd *abfd,
-	   struct internal_exec *execp,
-	   struct external_exec *raw_bytes));
-void
-bout_swap_exec_header_out (abfd, execp, raw_bytes)
-     bfd *abfd;
-     struct internal_exec *execp;
-     struct external_exec *raw_bytes;
-{
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
-  /* Now fill in fields in the raw data, from the fields in the exec struct. */
-  bfd_h_put_32 (abfd, execp->a_info  , bytes->e_info);
-  PUT_WORD (abfd, execp->a_text  , bytes->e_text);
-  PUT_WORD (abfd, execp->a_data  , bytes->e_data);
-  PUT_WORD (abfd, execp->a_bss   , bytes->e_bss);
-  PUT_WORD (abfd, execp->a_syms  , bytes->e_syms);
-  PUT_WORD (abfd, execp->a_entry , bytes->e_entry);
-  PUT_WORD (abfd, execp->a_trsize, bytes->e_trsize);
-  PUT_WORD (abfd, execp->a_drsize, bytes->e_drsize);
-  PUT_WORD (abfd, execp->a_tload , bytes->e_tload);
-  PUT_WORD (abfd, execp->a_dload , bytes->e_dload);
-  bytes->e_talign[0] = execp->a_talign;
-  bytes->e_dalign[0] = execp->a_dalign;
-  bytes->e_balign[0] = execp->a_balign;
-  bytes->e_relaxable[0] = execp->a_relaxable;
-}
-
-
-static const bfd_target *
-b_out_object_p (abfd)
-     bfd *abfd;
-{
-  struct internal_exec anexec;
-  struct external_exec exec_bytes;
-
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE) {
-    if (bfd_get_error () != bfd_error_system_call)
-      bfd_set_error (bfd_error_wrong_format);
-    return 0;
-  }
-
-  anexec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
-
-  if (N_BADMAG (anexec)) {
-    bfd_set_error (bfd_error_wrong_format);
-    return 0;
-  }
-
-  bout_swap_exec_header_in (abfd, &exec_bytes, &anexec);
-  return aout_32_some_aout_object_p (abfd, &anexec, b_out_callback);
-}
-
-
-/* Finish up the opening of a b.out file for reading.  Fill in all the
-   fields that are not handled by common code.  */
-
-static const bfd_target *
-b_out_callback (abfd)
-     bfd *abfd;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-  unsigned long bss_start;
-
-  /* Architecture and machine type */
-  bfd_set_arch_mach(abfd,
-		    bfd_arch_i960, /* B.out only used on i960 */
-		    bfd_mach_i960_core /* Default */
-		    );
-
-  /* The positions of the string table and symbol table.  */
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
-
-  /* The alignments of the sections */
-  obj_textsec (abfd)->alignment_power = execp->a_talign;
-  obj_datasec (abfd)->alignment_power = execp->a_dalign;
-  obj_bsssec  (abfd)->alignment_power = execp->a_balign;
-
-  /* The starting addresses of the sections.  */
-  obj_textsec (abfd)->vma = execp->a_tload;
-  obj_datasec (abfd)->vma = execp->a_dload;
-
-  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
-  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
-
-  /* And reload the sizes, since the aout module zaps them */
-  obj_textsec (abfd)->_raw_size = execp->a_text;
-
-  bss_start = execp->a_dload + execp->a_data; /* BSS = end of data section */
-  obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign);
-
-  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
-
-  /* The file positions of the sections */
-  obj_textsec (abfd)->filepos = N_TXTOFF(*execp);
-  obj_datasec (abfd)->filepos = N_DATOFF(*execp);
-
-  /* The file positions of the relocation info */
-  obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
-  obj_datasec (abfd)->rel_filepos =  N_DROFF(*execp);
-
-  adata(abfd).page_size = 1;	/* Not applicable. */
-  adata(abfd).segment_size = 1; /* Not applicable. */
-  adata(abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-
-  if (execp->a_relaxable)
-   abfd->flags |= BFD_IS_RELAXABLE;
-  return abfd->xvec;
-}
-
-struct bout_data_struct {
-    struct aoutdata a;
-    struct internal_exec e;
-};
-
-static boolean
-b_out_mkobject (abfd)
-     bfd *abfd;
-{
-  struct bout_data_struct *rawptr;
-
-  rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));
-  if (rawptr == NULL)
-    return false;
-
-  abfd->tdata.bout_data = rawptr;
-  exec_hdr (abfd) = &rawptr->e;
-
-  obj_textsec (abfd) = (asection *)NULL;
-  obj_datasec (abfd) = (asection *)NULL;
-  obj_bsssec (abfd) = (asection *)NULL;
-
-  return true;
-}
-
-static int
-b_out_symbol_cmp (a, b)
-     struct aout_symbol **a, **b;
-{
-  asection *sec;
-  bfd_vma av, bv;
-
-  /* Primary key is address */
-  sec = bfd_get_section (&(*a)->symbol);
-  av = sec->output_section->vma + sec->output_offset + (*a)->symbol.value;
-  sec = bfd_get_section (&(*b)->symbol);
-  bv = sec->output_section->vma + sec->output_offset + (*b)->symbol.value;
-
-  if (av < bv)
-    return -1;
-  if (av > bv)
-    return 1;
-
-  /* Secondary key puts CALLNAME syms last and BALNAME syms first, so
-     that they have the best chance of being contiguous.  */
-  if (IS_BALNAME ((*a)->other) || IS_CALLNAME ((*b)->other))
-    return -1;
-  if (IS_CALLNAME ((*a)->other) || IS_BALNAME ((*b)->other))
-    return 1;
-
-  return 0;
-}
-
-static boolean
-b_out_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec swapped_hdr;
-
-  if (! aout_32_make_sections (abfd))
-    return false;
-
-  exec_hdr (abfd)->a_info = BMAGIC;
-
-  exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_data = obj_datasec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * sizeof (struct nlist);
-  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
-  exec_hdr (abfd)->a_trsize = ((obj_textsec (abfd)->reloc_count) *
-                               sizeof (struct relocation_info));
-  exec_hdr (abfd)->a_drsize = ((obj_datasec (abfd)->reloc_count) *
-                               sizeof (struct relocation_info));
-
-  exec_hdr (abfd)->a_talign = obj_textsec (abfd)->alignment_power;
-  exec_hdr (abfd)->a_dalign = obj_datasec (abfd)->alignment_power;
-  exec_hdr (abfd)->a_balign = obj_bsssec (abfd)->alignment_power;
-
-  exec_hdr (abfd)->a_tload = obj_textsec (abfd)->vma;
-  exec_hdr (abfd)->a_dload = obj_datasec (abfd)->vma;
-
-  bout_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr);
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || (bfd_write ((PTR) &swapped_hdr, 1, EXEC_BYTES_SIZE, abfd)
-	  != EXEC_BYTES_SIZE))
-    return false;
-
-  /* Now write out reloc info, followed by syms and strings */
-  if (bfd_get_symcount (abfd) != 0)
-    {
-      /* Make sure {CALL,BAL}NAME symbols remain adjacent on output
-	 by sorting.  This is complicated by the fact that stabs are
-	 also ordered.  Solve this by shifting all stabs to the end
-	 in order, then sorting the rest.  */
-
-      asymbol **outsyms, **p, **q;
-
-      outsyms = bfd_get_outsymbols (abfd);
-      p = outsyms + bfd_get_symcount (abfd);
-
-      for (q = p--; p >= outsyms; p--)
-	{
-	  if ((*p)->flags & BSF_DEBUGGING)
-	    {
-	      asymbol *t = *--q;
-	      *q = *p;
-	      *p = t;
-	    }
-	}
-
-      if (q > outsyms)
-	qsort (outsyms, q - outsyms, sizeof(asymbol*), b_out_symbol_cmp);
-
-      /* Back to your regularly scheduled program.  */
-
-      if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*exec_hdr(abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      if (! aout_32_write_syms (abfd))
-	return false;
-
-      if (bfd_seek (abfd, (file_ptr)(N_TROFF(*exec_hdr(abfd))), SEEK_SET) != 0)
-	return false;
-
-      if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd))) return false;
-      if (bfd_seek (abfd, (file_ptr)(N_DROFF(*exec_hdr(abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd))) return false;
-    }
-  return true;
-}
-
-/** Some reloc hackery */
-
-#define CALLS	  0x66003800	/* Template for 'calls' instruction	*/
-#define BAL	  0x0b000000	/* Template for 'bal' instruction */
-#define BAL_MASK  0x00ffffff
-#define BALX	  0x85f00000	/* Template for 'balx' instruction	*/
-#define BALX_MASK 0x0007ffff
-#define CALL      0x09000000
-#define PCREL13_MASK 0x1fff
-
-
-#define output_addr(sec) ((sec)->output_offset+(sec)->output_section->vma)
-
-/* Magic to turn callx into calljx */
-static bfd_reloc_status_type
-calljx_callback (abfd, link_info, reloc_entry, src, dst, input_section)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     arelent *reloc_entry;
-     PTR src;
-     PTR dst;
-     asection *input_section;
-{
-  int word = bfd_get_32 (abfd, src);
-  asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr);
-  aout_symbol_type *symbol = aout_symbol (symbol_in);
-  bfd_vma value;
-
-  value = get_value (reloc_entry, link_info, input_section);
-
-  if (IS_CALLNAME (symbol->other))
-    {
-      aout_symbol_type *balsym = symbol+1;
-      int inst = bfd_get_32 (abfd, (bfd_byte *) src-4);
-      /* The next symbol should be an N_BALNAME */
-      BFD_ASSERT (IS_BALNAME (balsym->other));
-      inst &= BALX_MASK;
-      inst |= BALX;
-      bfd_put_32 (abfd, inst, (bfd_byte *) dst-4);
-      symbol = balsym;
-      value = (symbol->symbol.value
-	       + output_addr (symbol->symbol.section));
-    }
-
-  word += value + reloc_entry->addend;
-
-  bfd_put_32(abfd, word, dst);
-  return bfd_reloc_ok;
-}
-
-
-/* Magic to turn call into callj */
-static bfd_reloc_status_type
-callj_callback (abfd, link_info, reloc_entry,  data, srcidx, dstidx,
-		input_section, shrinking)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     arelent *reloc_entry;
-     PTR data;
-     unsigned int srcidx;
-     unsigned int dstidx;
-     asection *input_section;
-     boolean shrinking;
-{
-  int word = bfd_get_32 (abfd, (bfd_byte *) data + srcidx);
-  asymbol *symbol_in = *(reloc_entry->sym_ptr_ptr);
-  aout_symbol_type *symbol = aout_symbol (symbol_in);
-  bfd_vma value;
-
-  value = get_value (reloc_entry, link_info, input_section);
-
-  if (IS_OTHER(symbol->other))
-    {
-      /* Call to a system procedure - replace code with system
-	 procedure number.  */
-      word = CALLS | (symbol->other - 1);
-    }
-  else if (IS_CALLNAME(symbol->other))
-    {
-      aout_symbol_type *balsym = symbol+1;
-
-      /* The next symbol should be an N_BALNAME.  */
-      BFD_ASSERT(IS_BALNAME(balsym->other));
-      
-      /* We are calling a leaf, so replace the call instruction with a
-	 bal.  */
-      word = BAL | ((word
-		     + output_addr (balsym->symbol.section)
-		     + balsym->symbol.value + reloc_entry->addend
-		     - dstidx
-		     - output_addr (input_section))
-		    & BAL_MASK);
-    }
-  else if ((symbol->symbol.flags & BSF_SECTION_SYM) != 0)
-    {
-      /* A callj against a symbol in the same section is a fully
-         resolved relative call.  We don't need to do anything here.
-         If the symbol is not in the same section, I'm not sure what
-         to do; fortunately, this case will probably never arise.  */
-      BFD_ASSERT (! shrinking);
-      BFD_ASSERT (symbol->symbol.section == input_section);
-    }
-  else
-    {
-      word = CALL | (((word & BAL_MASK)
-		      + value
-		      + reloc_entry->addend
-		      - (shrinking ? dstidx : 0)
-		      - output_addr (input_section))
-		     & BAL_MASK);
-    }
-  bfd_put_32(abfd, word, (bfd_byte *) data + dstidx);
-  return bfd_reloc_ok;
-}
-
-/* type rshift size  bitsize  	pcrel	bitpos  absolute overflow check*/
-
-#define ABS32CODE 0
-#define ABS32CODE_SHRUNK 1
-#define PCREL24 2
-#define CALLJ 3
-#define ABS32 4
-#define PCREL13 5
-#define ABS32_MAYBE_RELAXABLE 1
-#define ABS32_WAS_RELAXABLE 2
-
-#define ALIGNER 10
-#define ALIGNDONE 11
-static reloc_howto_type howto_reloc_callj =
-HOWTO(CALLJ, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callj", true, 0x00ffffff, 0x00ffffff,false);
-static  reloc_howto_type howto_reloc_abs32 =
-HOWTO(ABS32, 0, 2, 32, false, 0, complain_overflow_bitfield,0,"abs32", true, 0xffffffff,0xffffffff,false);
-static reloc_howto_type howto_reloc_pcrel24 =
-HOWTO(PCREL24, 0, 2, 24, true, 0, complain_overflow_signed,0,"pcrel24", true, 0x00ffffff,0x00ffffff,false);
-
-static reloc_howto_type howto_reloc_pcrel13 =
-HOWTO(PCREL13, 0, 2, 13, true, 0, complain_overflow_signed,0,"pcrel13", true, 0x00001fff,0x00001fff,false);
-
-
-static reloc_howto_type howto_reloc_abs32codeshrunk =
-HOWTO(ABS32CODE_SHRUNK, 0, 2, 24, true, 0, complain_overflow_signed, 0,"callx->callj", true, 0x00ffffff, 0x00ffffff,false);
-
-static  reloc_howto_type howto_reloc_abs32code =
-HOWTO(ABS32CODE, 0, 2, 32, false, 0, complain_overflow_bitfield,0,"callx", true, 0xffffffff,0xffffffff,false);
-
-static reloc_howto_type howto_align_table[] = {
-  HOWTO (ALIGNER, 0, 0x1, 0, false, 0, complain_overflow_dont, 0, "align16", false, 0, 0, false),
-  HOWTO (ALIGNER, 0, 0x3, 0, false, 0, complain_overflow_dont, 0, "align32", false, 0, 0, false),
-  HOWTO (ALIGNER, 0, 0x7, 0, false, 0, complain_overflow_dont, 0, "align64", false, 0, 0, false),
-  HOWTO (ALIGNER, 0, 0xf, 0, false, 0, complain_overflow_dont, 0, "align128", false, 0, 0, false),
-};
-
-static reloc_howto_type howto_done_align_table[] = {
-  HOWTO (ALIGNDONE, 0x1, 0x1, 0, false, 0, complain_overflow_dont, 0, "donealign16", false, 0, 0, false),
-  HOWTO (ALIGNDONE, 0x3, 0x3, 0, false, 0, complain_overflow_dont, 0, "donealign32", false, 0, 0, false),
-  HOWTO (ALIGNDONE, 0x7, 0x7, 0, false, 0, complain_overflow_dont, 0, "donealign64", false, 0, 0, false),
-  HOWTO (ALIGNDONE, 0xf, 0xf, 0, false, 0, complain_overflow_dont, 0, "donealign128", false, 0, 0, false),
-};
-
-static reloc_howto_type *
-b_out_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    default:
-      return 0;
-    case BFD_RELOC_I960_CALLJ:
-      return &howto_reloc_callj;
-    case BFD_RELOC_32:
-    case BFD_RELOC_CTOR:
-      return &howto_reloc_abs32;
-    case BFD_RELOC_24_PCREL:
-      return &howto_reloc_pcrel24;
-    }
-}
-
-/* Allocate enough room for all the reloc entries, plus pointers to them all */
-
-static boolean
-b_out_slurp_reloc_table (abfd, asect, symbols)
-     bfd *abfd;
-     sec_ptr asect;
-     asymbol **symbols;
-{
-  register struct relocation_info *rptr;
-  unsigned int counter ;
-  arelent *cache_ptr ;
-  int extern_mask, pcrel_mask, callj_mask, length_shift;
-  int incode_mask;
-  int size_mask;
-  bfd_vma prev_addr = 0;
-  unsigned int count;
-  size_t  reloc_size;
-  struct relocation_info *relocs;
-  arelent *reloc_cache;
-
-  if (asect->relocation)
-    return true;
-  if (!aout_32_slurp_symbol_table (abfd))
-    return false;
-
-  if (asect == obj_datasec (abfd)) {
-    reloc_size = exec_hdr(abfd)->a_drsize;
-    goto doit;
-  }
-
-  if (asect == obj_textsec (abfd)) {
-    reloc_size = exec_hdr(abfd)->a_trsize;
-    goto doit;
-  }
-
-  if (asect == obj_bsssec (abfd)) {
-    reloc_size = 0;
-    goto doit;
-  }
-
-  bfd_set_error (bfd_error_invalid_operation);
-  return false;
-
- doit:
-  if (bfd_seek (abfd, (file_ptr)(asect->rel_filepos),  SEEK_SET) != 0)
-    return false;
-  count = reloc_size / sizeof (struct relocation_info);
-
-  relocs = (struct relocation_info *) bfd_malloc (reloc_size);
-  if (!relocs && reloc_size != 0)
-    return false;
-  reloc_cache = (arelent *) bfd_malloc ((count+1) * sizeof (arelent));
-  if (!reloc_cache) {
-    if (relocs != NULL)
-      free ((char*)relocs);
-    return false;
-  }
-
-  if (bfd_read ((PTR) relocs, 1, reloc_size, abfd) != reloc_size) {
-    free (reloc_cache);
-    if (relocs != NULL)
-      free (relocs);
-    return false;
-  }
-
-
-
-  if (bfd_header_big_endian (abfd)) {
-    /* big-endian bit field allocation order */
-    pcrel_mask  = 0x80;
-    extern_mask = 0x10;
-    incode_mask = 0x08;
-    callj_mask  = 0x02;
-    size_mask =   0x20;
-    length_shift = 5;
-  } else {
-    /* little-endian bit field allocation order */
-    pcrel_mask  = 0x01;
-    extern_mask = 0x08;
-    incode_mask = 0x10;
-    callj_mask  = 0x40;
-    size_mask   = 0x02;
-    length_shift = 1;
-  }
-
-  for (rptr = relocs, cache_ptr = reloc_cache, counter = 0;
-       counter < count;
-       counter++, rptr++, cache_ptr++)
-  {
-    unsigned char *raw = (unsigned char *)rptr;
-    unsigned int symnum;
-    cache_ptr->address = bfd_h_get_32 (abfd, raw + 0);
-    cache_ptr->howto = 0;
-    if (bfd_header_big_endian (abfd))
-    {
-      symnum = (raw[4] << 16) | (raw[5] << 8) | raw[6];
-    }
-    else
-    {
-      symnum = (raw[6] << 16) | (raw[5] << 8) | raw[4];
-    }
-
-    if (raw[7] & extern_mask)
-    {
-      /* if this is set then the r_index is a index into the symbol table;
-       * if the bit is not set then r_index contains a section map.
-       * we either fill in the sym entry with a pointer to the symbol,
-       * or point to the correct section
-       */
-      cache_ptr->sym_ptr_ptr = symbols + symnum;
-      cache_ptr->addend = 0;
-    } else
-    {
-      /* in a.out symbols are relative to the beginning of the
-       * file rather than sections ?
-       * (look in translate_from_native_sym_flags)
-       * the reloc entry addend has added to it the offset into the
-       * file of the data, so subtract the base to make the reloc
-       * section relative */
-      int s;
-      {
-	/* sign-extend symnum from 24 bits to whatever host uses */
-	s = symnum;
-	if (s & (1 << 23))
-	  s |= (~0) << 24;
-      }
-      cache_ptr->sym_ptr_ptr = (asymbol **)NULL;
-      switch (s)
-      {
-       case N_TEXT:
-       case N_TEXT | N_EXT:
-	cache_ptr->sym_ptr_ptr = obj_textsec(abfd)->symbol_ptr_ptr;
-	cache_ptr->addend = - obj_textsec(abfd)->vma;
-	break;
-       case N_DATA:
-       case N_DATA | N_EXT:
-	cache_ptr->sym_ptr_ptr = obj_datasec(abfd)->symbol_ptr_ptr;
-	cache_ptr->addend = - obj_datasec(abfd)->vma;
-	break;
-       case N_BSS:
-       case N_BSS | N_EXT:
-	cache_ptr->sym_ptr_ptr = obj_bsssec(abfd)->symbol_ptr_ptr;
-	cache_ptr->addend =  - obj_bsssec(abfd)->vma;
-	break;
-       case N_ABS:
-       case N_ABS | N_EXT:
-	cache_ptr->sym_ptr_ptr = obj_bsssec(abfd)->symbol_ptr_ptr;
-	cache_ptr->addend = 0;
-	break;
-      case -2: /* .align */
-	if (raw[7] & pcrel_mask)
-	  {
-	    cache_ptr->howto = &howto_align_table[(raw[7] >> length_shift) & 3];
-	    cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	  }
-	else
-	  {
-	    /* .org? */
-	    abort ();
-	  }
-	cache_ptr->addend = 0;
-	break;
-       default:
-	BFD_ASSERT(0);
-	break;
-      }
-
-    }
-
-    /* the i960 only has a few relocation types:
-       abs 32-bit and pcrel 24bit.   except for callj's!  */
-    if (cache_ptr->howto != 0)
-      ;
-    else if (raw[7] & callj_mask)
-    {
-      cache_ptr->howto = &howto_reloc_callj;
-    }
-    else if ( raw[7] & pcrel_mask)
-    {
-      if (raw[7] & size_mask)
-       cache_ptr->howto = &howto_reloc_pcrel13;
-      else
-       cache_ptr->howto = &howto_reloc_pcrel24;
-    }
-    else
-    {
-      if (raw[7] & incode_mask)
-      {
-	cache_ptr->howto = &howto_reloc_abs32code;
-      }
-      else
-      {
-	cache_ptr->howto = &howto_reloc_abs32;
-      }
-    }
-    if (cache_ptr->address < prev_addr)
-    {
-      /* Ouch! this reloc is out of order, insert into the right place
-       */
-      arelent tmp;
-      arelent *cursor = cache_ptr-1;
-      bfd_vma stop = cache_ptr->address;
-      tmp  = *cache_ptr;
-      while (cursor->address > stop && cursor >= reloc_cache)
-      {
-	cursor[1] = cursor[0];
-	cursor--;
-      }
-      cursor[1] = tmp;
-    }
-    else
-    {
-      prev_addr = cache_ptr->address;
-    }
-  }
-
-
-  if (relocs != NULL)
-    free (relocs);
-  asect->relocation = reloc_cache;
-  asect->reloc_count = count;
-
-
-  return true;
-}
-
-
-static boolean
-b_out_squirt_out_relocs (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  arelent **generic;
-  int r_extern = 0;
-  int r_idx;
-  int incode_mask;
-  int len_1;
-  unsigned int count = section->reloc_count;
-  struct relocation_info *native, *natptr;
-  size_t natsize = count * sizeof (struct relocation_info);
-  int extern_mask, pcrel_mask,  len_2, callj_mask;
-  if (count == 0) return true;
-  generic   = section->orelocation;
-  native = ((struct relocation_info *) bfd_malloc (natsize));
-  if (!native && natsize != 0)
-    return false;
-
-  if (bfd_header_big_endian (abfd))
-  {
-    /* Big-endian bit field allocation order */
-    pcrel_mask  = 0x80;
-    extern_mask = 0x10;
-    len_2       = 0x40;
-    len_1       = 0x20;
-    callj_mask  = 0x02;
-    incode_mask = 0x08;
-  }
-  else
-  {
-    /* Little-endian bit field allocation order */
-    pcrel_mask  = 0x01;
-    extern_mask = 0x08;
-    len_2       = 0x04;
-    len_1       = 0x02;
-    callj_mask  = 0x40;
-    incode_mask = 0x10;
-  }
-
-  for (natptr = native; count > 0; --count, ++natptr, ++generic)
-  {
-    arelent *g = *generic;
-    unsigned char *raw = (unsigned char *)natptr;
-    asymbol *sym = *(g->sym_ptr_ptr);
-
-    asection *output_section = sym->section->output_section;
-
-    bfd_h_put_32(abfd, g->address, raw);
-    /* Find a type in the output format which matches the input howto -
-     * at the moment we assume input format == output format FIXME!!
-     */
-    r_idx = 0;
-    /* FIXME:  Need callj stuff here, and to check the howto entries to
-       be sure they are real for this architecture.  */
-    if (g->howto== &howto_reloc_callj)
-    {
-      raw[7] = callj_mask + pcrel_mask + len_2;
-    }
-    else if (g->howto == &howto_reloc_pcrel24)
-    {
-      raw[7] = pcrel_mask + len_2;
-    }
-    else if (g->howto == &howto_reloc_pcrel13)
-    {
-      raw[7] = pcrel_mask + len_1;
-    }
-    else if (g->howto == &howto_reloc_abs32code)
-    {
-      raw[7] = len_2 + incode_mask;
-    }
-    else if (g->howto >= howto_align_table
-	     && g->howto <= (howto_align_table
-			    + sizeof (howto_align_table) / sizeof (howto_align_table[0])
-			    - 1))
-      {
-	/* symnum == -2; extern_mask not set, pcrel_mask set */
-	r_idx = -2;
-	r_extern = 0;
-	raw[7] = (pcrel_mask
-		  | ((g->howto - howto_align_table) << 1));
-      }
-    else {
-      raw[7] = len_2;
-    }
-
-    if (r_idx != 0)
-      /* already mucked with r_extern, r_idx */;
-    else if (bfd_is_com_section (output_section)
-	     || bfd_is_abs_section (output_section)
-	     || bfd_is_und_section (output_section))
-    {
-
-      if (bfd_abs_section_ptr->symbol == sym)
-      {
-	/* Whoops, looked like an abs symbol, but is really an offset
-	   from the abs section */
-	r_idx = 0;
-	r_extern = 0;
-       }
-      else
-      {
-	/* Fill in symbol */
-
-	r_extern = 1;
-	r_idx = (*g->sym_ptr_ptr)->udata.i;
-      }
-    }
-    else
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_idx  = output_section->target_index;
-    }
-
-    if (bfd_header_big_endian (abfd)) {
-      raw[4] = (unsigned char) (r_idx >> 16);
-      raw[5] = (unsigned char) (r_idx >>  8);
-      raw[6] = (unsigned char) (r_idx     );
-    } else {
-      raw[6] = (unsigned char) (r_idx >> 16);
-      raw[5] = (unsigned char) (r_idx>>  8);
-      raw[4] = (unsigned char) (r_idx     );
-    }
-    if (r_extern)
-     raw[7] |= extern_mask;
-  }
-
-  if (bfd_write ((PTR) native, 1, natsize, abfd) != natsize) {
-    free((PTR)native);
-    return false;
-  }
-  free ((PTR)native);
-
-  return true;
-}
-
-/* This is stupid.  This function should be a boolean predicate */
-static long
-b_out_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *tblptr;
-  unsigned int count;
-
-  if ((section->flags & SEC_CONSTRUCTOR) != 0)
-    {
-      arelent_chain *chain = section->constructor_chain;
-      for (count = 0; count < section->reloc_count; count++)
-	{
-	  *relptr++ = &chain->relent;
-	  chain = chain->next;
-	}
-    }
-  else
-    {
-      if (section->relocation == NULL
-	  && ! b_out_slurp_reloc_table (abfd, section, symbols))
-	return -1;
-
-      tblptr = section->relocation;
-      for (count = 0; count++ < section->reloc_count;)
-	*relptr++ = tblptr++;
-    }
-
-  *relptr = NULL;
-
-  return section->reloc_count;
-}
-
-static long
-b_out_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  if (bfd_get_format (abfd) != bfd_object) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return -1;
-  }
-
-  if (asect->flags & SEC_CONSTRUCTOR)
-    return sizeof (arelent *) * (asect->reloc_count + 1);
-
-  if (asect == obj_datasec (abfd))
-    return (sizeof (arelent *) *
-	    ((exec_hdr(abfd)->a_drsize / sizeof (struct relocation_info))
-	     +1));
-
-  if (asect == obj_textsec (abfd))
-    return (sizeof (arelent *) *
-	    ((exec_hdr(abfd)->a_trsize / sizeof (struct relocation_info))
-	     +1));
-
-  if (asect == obj_bsssec (abfd))
-    return 0;
-
-  bfd_set_error (bfd_error_invalid_operation);
-  return -1;
-}
-
-static boolean
-b_out_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-
-  if (abfd->output_has_begun == false) { /* set by bfd.c handler */
-    if (! aout_32_make_sections (abfd))
-      return false;
-
-    obj_textsec (abfd)->filepos = sizeof(struct internal_exec);
-    obj_datasec(abfd)->filepos = obj_textsec(abfd)->filepos
-                                 +  obj_textsec (abfd)->_raw_size;
-
-  }
-  /* regardless, once we know what we're doing, we might as well get going */
-  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
-
-  if (count != 0) {
-    return (bfd_write ((PTR)location, 1, count, abfd) == count) ?true:false;
-  }
-  return true;
-}
-
-static boolean
-b_out_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  bfd_default_set_arch_mach(abfd, arch, machine);
-
-  if (arch == bfd_arch_unknown)	/* Unknown machine arch is OK */
-    return true;
-  if (arch == bfd_arch_i960)	/* i960 default is OK */
-    switch (machine) {
-    case bfd_mach_i960_core:
-    case bfd_mach_i960_kb_sb:
-    case bfd_mach_i960_mc:
-    case bfd_mach_i960_xa:
-    case bfd_mach_i960_ca:
-    case bfd_mach_i960_ka_sa:
-    case bfd_mach_i960_jx:
-    case bfd_mach_i960_hx:
-    case 0:
-      return true;
-    default:
-      return false;
-    }
-
-  return false;
-}
-
-static int
-b_out_sizeof_headers (ignore_abfd, ignore)
-     bfd *ignore_abfd;
-     boolean ignore;
-{
-  return sizeof(struct internal_exec);
-}
-
-
-
-/************************************************************************/
-static bfd_vma
-get_value (reloc, link_info, input_section)
-     arelent *reloc;
-     struct bfd_link_info *link_info;
-     asection *input_section;
-{
-  bfd_vma value;
-  asymbol *symbol = *(reloc->sym_ptr_ptr);
-
-  /* A symbol holds a pointer to a section, and an offset from the
-     base of the section.  To relocate, we find where the section will
-     live in the output and add that in */
-
-  if (bfd_is_und_section (symbol->section))
-    {
-      struct bfd_link_hash_entry *h;
-
-      /* The symbol is undefined in this BFD.  Look it up in the
-	 global linker hash table.  FIXME: This should be changed when
-	 we convert b.out to use a specific final_link function and
-	 change the interface to bfd_relax_section to not require the
-	 generic symbols.  */
-      h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
-					bfd_asymbol_name (symbol),
-					false, false, true);
-      if (h != (struct bfd_link_hash_entry *) NULL
-	  && (h->type == bfd_link_hash_defined
-	      || h->type == bfd_link_hash_defweak))
-	value = h->u.def.value + output_addr (h->u.def.section);
-      else if (h != (struct bfd_link_hash_entry *) NULL
-	       && h->type == bfd_link_hash_common)
-	value = h->u.c.size;
-      else
-	{
-	  if (! ((*link_info->callbacks->undefined_symbol)
-		 (link_info, bfd_asymbol_name (symbol),
-		  input_section->owner, input_section, reloc->address)))
-	    abort ();
-	  value = 0;
-	}
-    }
-  else
-    {
-      value = symbol->value + output_addr (symbol->section);
-    }
-
-  /* Add the value contained in the relocation */
-  value += reloc->addend;
-
-  return value;
-}
-
-static void
-perform_slip (abfd, slip, input_section, value)
-     bfd *abfd;
-     unsigned int slip;
-     asection *input_section;
-     bfd_vma value;
-{
-  asymbol **s;
-
-  s = _bfd_generic_link_get_symbols (abfd);
-  BFD_ASSERT (s != (asymbol **) NULL);
-
-  /* Find all symbols past this point, and make them know
-     what's happened */
-  while (*s)
-  {
-    asymbol *p = *s;
-    if (p->section == input_section)
-    {
-      /* This was pointing into this section, so mangle it */
-      if (p->value > value)
-      {
-	p->value -=slip;
-	if (p->udata.p != NULL)
-	  {
-	    struct generic_link_hash_entry *h;
-
-	    h = (struct generic_link_hash_entry *) p->udata.p;
-	    BFD_ASSERT (h->root.type == bfd_link_hash_defined);
-	    h->root.u.def.value -= slip;
-	    BFD_ASSERT (h->root.u.def.value == p->value);
-	  }
-      }
-    }
-    s++;
-
-  }
-}
-
-/* This routine works out if the thing we want to get to can be
-   reached with a 24bit offset instead of a 32 bit one.
-   If it can, then it changes the amode */
-
-static int
-abs32code (abfd, input_section, r, shrink, link_info)
-     bfd *abfd;
-     asection *input_section;
-     arelent *r;
-     unsigned int shrink;
-     struct bfd_link_info *link_info;
-{
-  bfd_vma value = get_value (r, link_info, input_section);
-  bfd_vma dot = output_addr (input_section) + r->address;
-  bfd_vma gap;
-
-  /* See if the address we're looking at within 2^23 bytes of where
-     we are, if so then we can use a small branch rather than the
-     jump we were going to */
-
-  gap = value - (dot - shrink);
-
-
-  if (-1<<23 < (long)gap && (long)gap < 1<<23 )
-  {
-    /* Change the reloc type from 32bitcode possible 24, to 24bit
-       possible 32 */
-
-    r->howto = &howto_reloc_abs32codeshrunk;
-    /* The place to relc moves back by four bytes */
-    r->address -=4;
-
-    /* This will be four bytes smaller in the long run */
-    shrink += 4 ;
-    perform_slip (abfd, 4, input_section, r->address-shrink + 4);
-  }
-  return shrink;
-}
-
-static int
-aligncode (abfd, input_section, r, shrink)
-     bfd *abfd;
-     asection *input_section;
-     arelent *r;
-     unsigned int shrink;
-{
-  bfd_vma dot = output_addr (input_section) + r->address;
-  bfd_vma gap;
-  bfd_vma old_end;
-  bfd_vma new_end;
-  int shrink_delta;
-  int size = r->howto->size;
-
-  /* Reduce the size of the alignment so that it's still aligned but
-     smaller  - the current size is already the same size as or bigger
-     than the alignment required.  */
-
-  /* calculate the first byte following the padding before we optimize */
-  old_end = ((dot + size ) & ~size) + size+1;
-  /* work out where the new end will be - remember that we're smaller
-     than we used to be */
-  new_end = ((dot - shrink + size) & ~size);
-
-  /* This is the new end */
-  gap = old_end - ((dot + size) & ~size);
-
-  shrink_delta = (old_end - new_end) - shrink;
-
-  if (shrink_delta)
-  {
-    /* Change the reloc so that it knows how far to align to */
-    r->howto = howto_done_align_table + (r->howto - howto_align_table);
-
-    /* Encode the stuff into the addend - for future use we need to
-       know how big the reloc used to be */
-    r->addend = old_end - dot + r->address;
-
-    /* This will be N bytes smaller in the long run, adjust all the symbols */
-    perform_slip (abfd, shrink_delta, input_section, r->address - shrink);
-    shrink += shrink_delta;
-  }
-  return shrink;
-}
-
-static boolean
-b_out_bfd_relax_section (abfd, i, link_info, again)
-     bfd *abfd;
-     asection *i;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  /* Get enough memory to hold the stuff */
-  bfd *input_bfd = i->owner;
-  asection *input_section = i;
-  int shrink = 0 ;
-  arelent **reloc_vector = NULL;
-  long reloc_size = bfd_get_reloc_upper_bound(input_bfd,
-					      input_section);
-
-  if (reloc_size < 0)
-    return false;
-
-  /* We only run this relaxation once.  It might work to run it
-     multiple times, but it hasn't been tested.  */
-  *again = false;
-
-  if (reloc_size)
-    {
-      long reloc_count;
-
-      reloc_vector = (arelent **) bfd_malloc (reloc_size);
-      if (reloc_vector == NULL && reloc_size != 0)
-	goto error_return;
-
-      /* Get the relocs and think about them */
-      reloc_count =
-	bfd_canonicalize_reloc (input_bfd, input_section, reloc_vector,
-				_bfd_generic_link_get_symbols (input_bfd));
-      if (reloc_count < 0)
-	goto error_return;
-      if (reloc_count > 0)
-	{
-	  arelent **parent;
-	  for (parent = reloc_vector; *parent; parent++)
-	    {
-	      arelent *r = *parent;
-	      switch (r->howto->type)
-		{
-		case ALIGNER:
-		  /* An alignment reloc */
-		  shrink = aligncode (abfd, input_section, r, shrink);
-		  break;
-		case ABS32CODE:
-		  /* A 32bit reloc in an addressing mode */
-		  shrink = abs32code (input_bfd, input_section, r, shrink,
-				      link_info);
-		  break;
-		case ABS32CODE_SHRUNK:
-		  shrink+=4;
-		  break;
-		}
-	    }
-	}
-    }
-  input_section->_cooked_size = input_section->_raw_size - shrink;
-
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return true;
- error_return:
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return false;
-}
-
-static bfd_byte *
-b_out_bfd_get_relocated_section_contents (output_bfd, link_info, link_order,
-					  data, relocateable, symbols)
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  /* Get enough memory to hold the stuff */
-  bfd *input_bfd = link_order->u.indirect.section->owner;
-  asection *input_section = link_order->u.indirect.section;
-  long reloc_size = bfd_get_reloc_upper_bound (input_bfd,
-					       input_section);
-  arelent **reloc_vector = NULL;
-  long reloc_count;
-
-  if (reloc_size < 0)
-    goto error_return;
-
-  /* If producing relocateable output, don't bother to relax.  */
-  if (relocateable)
-    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
-						       link_order,
-						       data, relocateable,
-						       symbols);
-
-  reloc_vector = (arelent **) bfd_malloc (reloc_size);
-  if (reloc_vector == NULL && reloc_size != 0)
-    goto error_return;
-
-  input_section->reloc_done = 1;
-
-  /* read in the section */
-  BFD_ASSERT (true == bfd_get_section_contents (input_bfd,
-						input_section,
-						data,
-						0,
-						input_section->_raw_size));
-
-  reloc_count = bfd_canonicalize_reloc (input_bfd,
-					input_section,
-					reloc_vector,
-					symbols);
-  if (reloc_count < 0)
-    goto error_return;
-  if (reloc_count > 0)
-    {
-      arelent **parent = reloc_vector;
-      arelent *reloc ;
-
-      unsigned int dst_address = 0;
-      unsigned int src_address = 0;
-      unsigned int run;
-      unsigned int idx;
-
-      /* Find how long a run we can do */
-      while (dst_address < link_order->size)
-	{
-	  reloc = *parent;
-	  if (reloc)
-	    {
-	      /* Note that the relaxing didn't tie up the addresses in the
-		 relocation, so we use the original address to work out the
-		 run of non-relocated data */
-	      BFD_ASSERT (reloc->address >= src_address);
-	      run = reloc->address - src_address;
-	      parent++;
-	    }
-	  else
-	    {
-	      run = link_order->size - dst_address;
-	    }
-	  /* Copy the bytes */
-	  for (idx = 0; idx < run; idx++)
-	    {
-	      data[dst_address++] = data[src_address++];
-	    }
-
-	  /* Now do the relocation */
-
-	  if (reloc)
-	    {
-	      switch (reloc->howto->type)
-		{
-		case ABS32CODE:
-		  calljx_callback (input_bfd, link_info, reloc,
-				   src_address + data, dst_address + data,
-				   input_section);
-		  src_address+=4;
-		  dst_address+=4;
-		  break;
-		case ABS32:
-		  bfd_put_32 (input_bfd,
-			      (bfd_get_32 (input_bfd, data + src_address)
-			       + get_value (reloc, link_info, input_section)),
-			      data + dst_address);
-		  src_address+=4;
-		  dst_address+=4;
-		  break;
-		case CALLJ:
-		  callj_callback (input_bfd, link_info, reloc, data,
-				  src_address, dst_address, input_section,
-				  false);
-		  src_address+=4;
-		  dst_address+=4;
-		  break;
-		case ALIGNDONE:
-		  BFD_ASSERT (reloc->addend >= src_address);
-		  BFD_ASSERT (reloc->addend <= input_section->_raw_size);
-		  src_address = reloc->addend;
-		  dst_address = ((dst_address + reloc->howto->size)
-				 & ~reloc->howto->size);
-		  break;
-		case ABS32CODE_SHRUNK:
-		  /* This used to be a callx, but we've found out that a
-		     callj will reach, so do the right thing.  */
-		  callj_callback (input_bfd, link_info, reloc, data,
-				  src_address + 4, dst_address, input_section,
-				  true);
-		  dst_address+=4;
-		  src_address+=8;
-		  break;
-		case PCREL24:
-		  {
-		    long int word = bfd_get_32 (input_bfd,
-						data + src_address);
-		    bfd_vma value;
-
-		    value = get_value (reloc, link_info, input_section);
-		    word = ((word & ~BAL_MASK)
-			    | (((word & BAL_MASK)
-				+ value
-				- output_addr (input_section)
-				+ reloc->addend)
-			       & BAL_MASK));
-
-		    bfd_put_32 (input_bfd, word, data + dst_address);
-		    dst_address+=4;
-		    src_address+=4;
-
-		  }
-		  break;
-
-		case PCREL13:
-		  {
-		    long int word = bfd_get_32 (input_bfd,
-						data + src_address);
-		    bfd_vma value;
-
-		    value = get_value (reloc, link_info, input_section);
-		    word = ((word & ~PCREL13_MASK)
-			    | (((word & PCREL13_MASK)
-				+ value
-				+ reloc->addend
-				- output_addr (input_section))
-			       & PCREL13_MASK));
-
-		    bfd_put_32 (input_bfd, word, data + dst_address);
-		    dst_address+=4;
-		    src_address+=4;
-
-		  }
-		  break;
-
-		default:
-		  abort();
-		}
-	    }
-	}
-    }
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return data;
- error_return:
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return NULL;
-}
-/***********************************************************************/
-
-/* Build the transfer vectors for Big and Little-Endian B.OUT files.  */
-
-#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
-
-#define b_out_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define b_out_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define b_out_bfd_final_link _bfd_generic_final_link
-#define b_out_bfd_link_split_section  _bfd_generic_link_split_section
-#define b_out_bfd_gc_sections  bfd_generic_gc_sections
-
-#define aout_32_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-const bfd_target b_out_vec_big_host =
-{
-  "b.out.big",			/* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_BIG,		/* hdr byte order is big */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  '_',				/* symbol leading char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
- {_bfd_dummy_target, b_out_object_p, /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, b_out_mkobject,	/* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
- {bfd_false, b_out_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (aout_32),
-     BFD_JUMP_TABLE_COPY (_bfd_generic),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
-     BFD_JUMP_TABLE_SYMBOLS (aout_32),
-     BFD_JUMP_TABLE_RELOCS (b_out),
-     BFD_JUMP_TABLE_WRITE (b_out),
-     BFD_JUMP_TABLE_LINK (b_out),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0,
-};
-
-
-const bfd_target b_out_vec_little_host =
-{
-  "b.out.little",		/* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  '_',				/* symbol leading char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-  {_bfd_dummy_target, b_out_object_p, /* bfd_check_format */
-     bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, b_out_mkobject,	/* bfd_set_format */
-     _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, b_out_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (aout_32),
-     BFD_JUMP_TABLE_COPY (_bfd_generic),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
-     BFD_JUMP_TABLE_SYMBOLS (aout_32),
-     BFD_JUMP_TABLE_RELOCS (b_out),
-     BFD_JUMP_TABLE_WRITE (b_out),
-     BFD_JUMP_TABLE_LINK (b_out),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/cache.c b/bfd/cache.c
deleted file mode 100644
index b28de4bc4b9..00000000000
--- a/bfd/cache.c
+++ /dev/null
@@ -1,350 +0,0 @@
-/* BFD library -- caching of file descriptors.
-   Copyright 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support (steve@cygnus.com).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	File caching
-
-	The file caching mechanism is embedded within BFD and allows
-	the application to open as many BFDs as it wants without
-	regard to the underlying operating system's file descriptor
-	limit (often as low as 20 open files).  The module in
-	<<cache.c>> maintains a least recently used list of
-	<<BFD_CACHE_MAX_OPEN>> files, and exports the name
-	<<bfd_cache_lookup>>, which runs around and makes sure that
-	the required BFD is open. If not, then it chooses a file to
-	close, closes it and opens the one wanted, returning its file
-	handle. 
-
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-static void insert PARAMS ((bfd *));
-static void snip PARAMS ((bfd *));
-static boolean close_one PARAMS ((void));
-static boolean bfd_cache_delete PARAMS ((bfd *));
-
-/*
-INTERNAL_FUNCTION
-	BFD_CACHE_MAX_OPEN macro
-
-DESCRIPTION
-	The maximum number of files which the cache will keep open at
-	one time.
-
-.#define BFD_CACHE_MAX_OPEN 10
-
-*/
-
-/* The number of BFD files we have open.  */
-
-static int open_files;
-
-/*
-INTERNAL_FUNCTION
-	bfd_last_cache
-
-SYNOPSIS
-	extern bfd *bfd_last_cache;
-
-DESCRIPTION
-	Zero, or a pointer to the topmost BFD on the chain.  This is
-	used by the <<bfd_cache_lookup>> macro in @file{libbfd.h} to
-	determine when it can avoid a function call.
-*/
-
-bfd *bfd_last_cache;
-
-/*
-  INTERNAL_FUNCTION
-  	bfd_cache_lookup
- 
-  DESCRIPTION
- 	Check to see if the required BFD is the same as the last one
- 	looked up. If so, then it can use the stream in the BFD with
- 	impunity, since it can't have changed since the last lookup;
- 	otherwise, it has to perform the complicated lookup function.
- 
-  .#define bfd_cache_lookup(x) \
-  .    ((x)==bfd_last_cache? \
-  .      (FILE*)(bfd_last_cache->iostream): \
-  .       bfd_cache_lookup_worker(x))
- 
- 
- */
-
-/* Insert a BFD into the cache.  */
-
-static INLINE void
-insert (abfd)
-     bfd *abfd;
-{
-  if (bfd_last_cache == NULL)
-    {
-      abfd->lru_next = abfd;
-      abfd->lru_prev = abfd;
-    }
-  else
-    {
-      abfd->lru_next = bfd_last_cache;
-      abfd->lru_prev = bfd_last_cache->lru_prev;
-      abfd->lru_prev->lru_next = abfd;
-      abfd->lru_next->lru_prev = abfd;
-    }
-  bfd_last_cache = abfd;
-}
-
-/* Remove a BFD from the cache.  */
-
-static INLINE void
-snip (abfd)
-     bfd *abfd;
-{
-  abfd->lru_prev->lru_next = abfd->lru_next;
-  abfd->lru_next->lru_prev = abfd->lru_prev;
-  if (abfd == bfd_last_cache)
-    {
-      bfd_last_cache = abfd->lru_next;
-      if (abfd == bfd_last_cache)
-	bfd_last_cache = NULL;
-    }
-}
-
-/* We need to open a new file, and the cache is full.  Find the least
-   recently used cacheable BFD and close it.  */
-
-static boolean
-close_one ()
-{
-  register bfd *kill;
-
-  if (bfd_last_cache == NULL)
-    kill = NULL;
-  else
-    {
-      for (kill = bfd_last_cache->lru_prev;
-	   ! kill->cacheable;
-	   kill = kill->lru_prev)
-	{
-	  if (kill == bfd_last_cache)
-	    {
-	      kill = NULL;
-	      break;
-	    }
-	}
-    }
-
-  if (kill == NULL)
-    {
-      /* There are no open cacheable BFD's.  */
-      return true;
-    }
-
-  kill->where = ftell ((FILE *) kill->iostream);
-
-  return bfd_cache_delete (kill);
-}
-
-/* Close a BFD and remove it from the cache.  */
-
-static boolean
-bfd_cache_delete (abfd)
-     bfd *abfd;
-{
-  boolean ret;
-
-  if (fclose ((FILE *) abfd->iostream) == 0)
-    ret = true;
-  else
-    {
-      ret = false;
-      bfd_set_error (bfd_error_system_call);
-    }
-
-  snip (abfd);
-
-  abfd->iostream = NULL;
-  --open_files;
-
-  return ret;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_cache_init
-
-SYNOPSIS
-	boolean bfd_cache_init (bfd *abfd);
-
-DESCRIPTION
-	Add a newly opened BFD to the cache.
-*/
-
-boolean
-bfd_cache_init (abfd)
-     bfd *abfd;
-{
-  BFD_ASSERT (abfd->iostream != NULL);
-  if (open_files >= BFD_CACHE_MAX_OPEN)
-    {
-      if (! close_one ())
-	return false;
-    }
-  insert (abfd);
-  ++open_files;
-  return true;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_cache_close
-
-SYNOPSIS
-	boolean bfd_cache_close (bfd *abfd);
-
-DESCRIPTION
-	Remove the BFD @var{abfd} from the cache. If the attached file is open,
-	then close it too.
-
-RETURNS
-	<<false>> is returned if closing the file fails, <<true>> is
-	returned if all is well.
-*/
-
-boolean
-bfd_cache_close (abfd)
-     bfd *abfd;
-{
-  if (abfd->iostream == NULL
-      || (abfd->flags & BFD_IN_MEMORY) != 0)
-    return true;
-
-  return bfd_cache_delete (abfd);
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_open_file
-
-SYNOPSIS
-	FILE* bfd_open_file(bfd *abfd);
-
-DESCRIPTION
-	Call the OS to open a file for @var{abfd}.  Return the <<FILE *>>
-	(possibly <<NULL>>) that results from this operation.  Set up the
-	BFD so that future accesses know the file is open. If the <<FILE *>>
-	returned is <<NULL>>, then it won't have been put in the
-	cache, so it won't have to be removed from it.
-*/
-
-FILE *
-bfd_open_file (abfd)
-     bfd *abfd;
-{
-  abfd->cacheable = true;	/* Allow it to be closed later. */
-
-  if (open_files >= BFD_CACHE_MAX_OPEN)
-    {
-      if (! close_one ())
-	return NULL;
-    }
-
-  switch (abfd->direction)
-    {
-    case read_direction:
-    case no_direction:
-      abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RB);
-      break;
-    case both_direction:
-    case write_direction:
-      if (abfd->opened_once == true)
-	{
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_RUB);
-	  if (abfd->iostream == NULL)
-	    abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WUB);
-	}
-      else
-	{
-	  /* Create the file.  Unlink it first, for the convenience of
-             operating systems which worry about overwriting running
-             binaries.  */
-	  unlink (abfd->filename);
-	  abfd->iostream = (PTR) fopen (abfd->filename, FOPEN_WB);
-	  abfd->opened_once = true;
-	}
-      break;
-    }
-
-  if (abfd->iostream != NULL)
-    {
-      if (! bfd_cache_init (abfd))
-	return NULL;
-    }
-
-  return (FILE *) abfd->iostream;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_cache_lookup_worker
-
-SYNOPSIS
-	FILE *bfd_cache_lookup_worker(bfd *abfd);
-
-DESCRIPTION
-	Called when the macro <<bfd_cache_lookup>> fails to find a
-	quick answer.  Find a file descriptor for @var{abfd}.  If
-	necessary, it open it.  If there are already more than
-	<<BFD_CACHE_MAX_OPEN>> files open, it tries to close one first, to
-	avoid running out of file descriptors.  
-*/
-
-FILE *
-bfd_cache_lookup_worker (abfd)
-     bfd *abfd;
-{
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    abort ();
-
-  if (abfd->my_archive) 
-    abfd = abfd->my_archive;
-
-  if (abfd->iostream != NULL)
-    {
-      /* Move the file to the start of the cache.  */
-      if (abfd != bfd_last_cache)
-	{
-	  snip (abfd);
-	  insert (abfd);
-	}
-    }
-  else
-    {
-      if (bfd_open_file (abfd) == NULL)
-	return NULL;
-      if (fseek ((FILE *) abfd->iostream, abfd->where, SEEK_SET) != 0)
-	return NULL;
-    }
-
-  return (FILE *) abfd->iostream;
-}
diff --git a/bfd/cf-i386lynx.c b/bfd/cf-i386lynx.c
deleted file mode 100644
index 2a14bde8f12..00000000000
--- a/bfd/cf-i386lynx.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* BFD back-end for Intel 386 COFF LynxOS files.
-   Copyright 1993, 1994 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#define TARGET_SYM	i386lynx_coff_vec
-#define TARGET_NAME	"coff-i386-lynx"
-
-#define LYNXOS
-
-#define COFF_LONG_FILENAMES
-
-#include "coff-i386.c"
diff --git a/bfd/cf-m68klynx.c b/bfd/cf-m68klynx.c
deleted file mode 100644
index 7674f1b248b..00000000000
--- a/bfd/cf-m68klynx.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* BFD back-end for Motorola M68K COFF LynxOS files.
-   Copyright 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_SYM	m68klynx_coff_vec
-#define TARGET_NAME	"coff-m68k-lynx"
-#define LYNXOS
-#define COFF_LONG_FILENAMES
-#define STATIC_RELOCS
-#define COFF_COMMON_ADDEND
-
-#include "coff-m68k.c"
diff --git a/bfd/cf-sparclynx.c b/bfd/cf-sparclynx.c
deleted file mode 100644
index 774a099fefb..00000000000
--- a/bfd/cf-sparclynx.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* BFD back-end for Sparc COFF LynxOS files.
-   Copyright 1993 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_SYM	sparclynx_coff_vec
-#define TARGET_NAME	"coff-sparc-lynx"
-
-#define LYNXOS
-
-#define COFF_LONG_FILENAMES
-
-#include "coff-sparc.c"
diff --git a/bfd/cisco-core.c b/bfd/cisco-core.c
deleted file mode 100644
index 11c9bbd4945..00000000000
--- a/bfd/cisco-core.c
+++ /dev/null
@@ -1,327 +0,0 @@
-/* BFD back-end for CISCO crash dumps.
-
-Copyright 1994 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-/* core_file_failing_signal returns a host signal (this probably should
-   be fixed).  */
-#include <signal.h>
-
-/* for MSVC builds */
-#ifndef SIGTRAP
-# define SIGTRAP 5
-#endif
-#ifndef SIGEMT
-# define SIGEMT 6
-#endif
-#ifndef SIGBUS
-# define SIGBUS 10
-#endif
-
-#define CRASH_INFO (0xffc)
-#define CRASH_MAGIC 0xdead1234
-
-typedef enum {
-    CRASH_REASON_NOTCRASHED = 0,
-    CRASH_REASON_EXCEPTION = 1,
-    CRASH_REASON_CORRUPT = 2,
-  } crashreason;
-
-struct crashinfo_external
-{
-  char magic[4];			/* Magic number */
-  char version[4];		/* Version number */
-  char reason[4];		/* Crash reason */
-  char cpu_vector[4];		/* CPU vector for exceptions */
-  char registers[4];		/* Pointer to saved registers */
-  char rambase[4];		/* Base of RAM (not in V1 crash info) */
-};
-
-struct cisco_core_struct
-{
-  int sig;
-};
-
-static const bfd_target *
-cisco_core_file_p (abfd)
-     bfd *abfd;
-{
-  char buf[4];
-  unsigned int crashinfo_offset;
-  struct crashinfo_external crashinfo;
-  int nread;
-  unsigned int rambase;
-  sec_ptr asect;
-  struct stat statbuf;
-
-  if (bfd_seek (abfd, CRASH_INFO, SEEK_SET) != 0)
-    return NULL;
-
-  nread = bfd_read (buf, 1, 4, abfd);
-  if (nread != 4)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  crashinfo_offset = bfd_get_32 (abfd, buf);
-
-  if (bfd_seek (abfd, crashinfo_offset, SEEK_SET) != 0)
-    return NULL;
-
-  nread = bfd_read (&crashinfo, 1, sizeof (crashinfo), abfd);
-  if (nread != sizeof (crashinfo))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (bfd_stat (abfd, &statbuf) < 0)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return NULL;
-    }
-
-  if (bfd_get_32 (abfd, crashinfo.magic) != CRASH_MAGIC)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  switch (bfd_get_32 (abfd, crashinfo.version))
-    {
-    case 0:
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    case 1:
-      rambase = 0;
-      break;
-    default:
-    case 2:
-      rambase = bfd_get_32 (abfd, crashinfo.rambase);
-      break;
-    }
-
-  /* OK, we believe you.  You're a core file.  */
-
-  abfd->tdata.cisco_core_data =
-    ((struct cisco_core_struct *)
-     bfd_zmalloc (sizeof (struct cisco_core_struct)));
-  if (abfd->tdata.cisco_core_data == NULL)
-    return NULL;
-
-  switch ((crashreason) bfd_get_32 (abfd, crashinfo.reason))
-    {
-    case CRASH_REASON_NOTCRASHED:
-      /* Crash file probably came from write core.  */
-      abfd->tdata.cisco_core_data->sig = 0;
-      break;
-    case CRASH_REASON_CORRUPT:
-      /* The crash context area was corrupt -- proceed with caution.
-	 We have no way of passing this information back to the caller.  */
-      abfd->tdata.cisco_core_data->sig = 0;
-      break;
-    case CRASH_REASON_EXCEPTION:
-      /* Crash occured due to CPU exception.  */
-
-      /* This is 68k-specific; for MIPS we'll need to interpret
-	 cpu_vector differently based on the target configuration
-	 (since CISCO core files don't seem to have the processor
-	 encoded in them).  */
-
-      switch (bfd_get_32 (abfd, crashinfo.cpu_vector))
-	{
-	   /* bus error           */
-	case 2 : abfd->tdata.cisco_core_data->sig = SIGBUS; break;
-	   /* address error       */
-	case 3 : abfd->tdata.cisco_core_data->sig = SIGBUS; break;
-	   /* illegal instruction */
-	case 4 : abfd->tdata.cisco_core_data->sig = SIGILL;  break;
-	   /* zero divide         */
-	case 5 : abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	   /* chk instruction     */
-	case 6 : abfd->tdata.cisco_core_data->sig = SIGFPE; break;
-	   /* trapv instruction   */
-	case 7 : abfd->tdata.cisco_core_data->sig = SIGFPE; break;
-	   /* privilege violation */
-	case 8 : abfd->tdata.cisco_core_data->sig = SIGSEGV; break;
-	   /* trace trap          */
-	case 9 : abfd->tdata.cisco_core_data->sig = SIGTRAP;  break;
-	   /* line 1010 emulator  */
-	case 10: abfd->tdata.cisco_core_data->sig = SIGILL;  break;
-	   /* line 1111 emulator  */
-	case 11: abfd->tdata.cisco_core_data->sig = SIGILL;  break;
-
-	  /* Coprocessor protocol violation.  Using a standard MMU or FPU
-	     this cannot be triggered by software.  Call it a SIGBUS.  */
-	case 13: abfd->tdata.cisco_core_data->sig = SIGBUS;  break;
-
-	  /* interrupt           */
-	case 31: abfd->tdata.cisco_core_data->sig = SIGINT;  break;
-	  /* breakpoint          */
-	case 33: abfd->tdata.cisco_core_data->sig = SIGTRAP;  break;
-
-	  /* floating point err  */
-	case 48: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	  /* floating point err  */
-	case 49: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	  /* zero divide         */
-	case 50: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	  /* underflow           */
-	case 51: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	  /* operand error       */
-	case 52: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	   /* overflow            */
-	case 53: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	  /* NAN                 */
-	case 54: abfd->tdata.cisco_core_data->sig = SIGFPE;  break;
-	default:
-#ifndef SIGEMT
-#define SIGEMT SIGTRAP
-#endif
-	  /* "software generated"*/
-	  abfd->tdata.cisco_core_data->sig = SIGEMT;
-	}
-      break;
-    default:
-      /* Unknown crash reason.  */
-      abfd->tdata.cisco_core_data->sig = 0;
-      break;
-    }
-
-  abfd->sections = NULL;
-  abfd->section_count = 0;
-
-  asect = (asection *) bfd_zmalloc (sizeof (asection));
-  if (asect == NULL)
-    goto error_return;
-  asect->name = ".reg";
-  asect->flags = SEC_HAS_CONTENTS;
-  /* This can be bigger than the real size.  Set it to the size of the whole
-     core file.  */
-  asect->_raw_size = statbuf.st_size;
-  asect->vma = 0;
-  asect->filepos = bfd_get_32 (abfd, crashinfo.registers) - rambase;
-  asect->next = abfd->sections;
-  abfd->sections = asect;
-  ++abfd->section_count;
-
-  /* There is only one section containing data from the target system's RAM.
-     We call it .data.  */
-  asect = (asection *) bfd_zmalloc (sizeof (asection));
-  if (asect == NULL)
-    goto error_return;
-  asect->name = ".data";
-  asect->flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
-  /* The size of memory is the size of the core file itself.  */
-  asect->_raw_size = statbuf.st_size;
-  asect->vma = rambase;
-  asect->filepos = 0;
-  asect->next = abfd->sections;
-  abfd->sections = asect;
-  ++abfd->section_count;
-
-  return abfd->xvec;
-
- error_return:
-  {
-    sec_ptr nextsect;
-    for (asect = abfd->sections; asect != NULL;)
-      {
-	nextsect = asect->next;
-	free (asect);
-	asect = nextsect;
-      }
-    free (abfd->tdata.cisco_core_data);
-    return NULL;
-  }
-}
-
-char *
-cisco_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return NULL;
-}
-
-int
-cisco_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return abfd->tdata.cisco_core_data->sig;
-}
-
-boolean
-cisco_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
-{
-  return true;
-}
-
-const bfd_target cisco_core_vec =
-  {
-    "trad-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_BIG,		/* target byte order */
-    BFD_ENDIAN_BIG,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-    bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-    bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     cisco_core_file_p	/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (cisco),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
diff --git a/bfd/coff-a29k.c b/bfd/coff-a29k.c
deleted file mode 100644
index bbf23eed981..00000000000
--- a/bfd/coff-a29k.c
+++ /dev/null
@@ -1,640 +0,0 @@
-/* BFD back-end for AMD 29000 COFF binaries.
-   Copyright 1990, 91, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
-   Contributed by David Wood at New York University 7/8/91.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define A29K 1
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/a29k.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-static long get_symbol_value PARAMS ((asymbol *));
-static bfd_reloc_status_type a29k_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean coff_a29k_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-static boolean coff_a29k_adjust_symndx
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-	   struct internal_reloc *, boolean *));
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-
-#define INSERT_HWORD(WORD,HWORD)	\
-    (((WORD) & 0xff00ff00) | (((HWORD) & 0xff00) << 8) | ((HWORD)& 0xff))
-#define EXTRACT_HWORD(WORD) \
-    ((((WORD) & 0x00ff0000) >> 8) | ((WORD)& 0xff))
-#define SIGN_EXTEND_HWORD(HWORD) \
-    ((HWORD) & 0x8000 ? (HWORD)|(~0xffffL) : (HWORD))
-
-/* Provided the symbol, returns the value reffed */
-static long
-get_symbol_value (symbol)       
-     asymbol *symbol;
-{                                             
-  long relocation = 0;
-
-  if (bfd_is_com_section (symbol->section))
-  {
-    relocation = 0;                           
-  }
-  else 
-  {                                      
-    relocation = symbol->value +
-     symbol->section->output_section->vma +
-      symbol->section->output_offset;
-  }                                           
-
-  return(relocation);
-}
-
-/* this function is in charge of performing all the 29k relocations */
-
-static bfd_reloc_status_type
-a29k_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	    error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* the consth relocation comes in two parts, we have to remember
-     the state between calls, in these variables */
-  static boolean part1_consth_active = false;
-  static unsigned long part1_consth_value;
-
-  unsigned long insn;
-  unsigned long sym_value;
-  unsigned long unsigned_value;
-  unsigned short r_type;
-  long signed_value;
-
-  unsigned long addr = reloc_entry->address ; /*+ input_section->vma*/
-  bfd_byte  *hit_data =addr + (bfd_byte *)(data);
-	
-  r_type = reloc_entry->howto->type;
-
-  if (output_bfd) {
-    /* Partial linking - do nothing */
-    reloc_entry->address += input_section->output_offset;
-    return bfd_reloc_ok;
-
-  }
-
-  if (symbol_in != NULL
-      && bfd_is_und_section (symbol_in->section))
-  {
-    /* Keep the state machine happy in case we're called again */
-    if (r_type == R_IHIHALF) 
-    {
-      part1_consth_active = true;
-      part1_consth_value  = 0;
-    }
-    return(bfd_reloc_undefined);
-  }
-
-  if ((part1_consth_active) && (r_type != R_IHCONST)) 
-  {
-    part1_consth_active = false;
-    *error_message = (char *) _("Missing IHCONST");
-    return(bfd_reloc_dangerous);
-  }
-
-
-  sym_value = get_symbol_value(symbol_in);
-
-  switch (r_type) 
-  {
-   case R_IREL: 	
-    insn = bfd_get_32(abfd, hit_data); 
-    /* Take the value in the field and sign extend it */
-    signed_value = EXTRACT_HWORD(insn);
-    signed_value = SIGN_EXTEND_HWORD(signed_value);
-    signed_value <<= 2;
-
-    /* See the note on the R_IREL reloc in coff_a29k_relocate_section.  */
-    if (signed_value == - (long) reloc_entry->address)
-      signed_value = 0;
-
-    signed_value += sym_value + reloc_entry->addend;
-    if ((signed_value & ~0x3ffff) == 0)
-    {				/* Absolute jmp/call */
-      insn |= (1<<24);		/* Make it absolute */
-      /* FIXME: Should we change r_type to R_IABS */
-    } 
-    else 
-    {
-      /* Relative jmp/call, so subtract from the value the
-	 address of the place we're coming from */
-      signed_value -= (reloc_entry->address
-		       + input_section->output_section->vma
-		       + input_section->output_offset);
-      if (signed_value>0x1ffff || signed_value<-0x20000) 
-       return(bfd_reloc_overflow);
-    }
-    signed_value >>= 2;
-    insn = INSERT_HWORD(insn, signed_value);
-    bfd_put_32(abfd, insn ,hit_data); 
-    break;
-   case R_ILOHALF: 
-    insn = bfd_get_32(abfd, hit_data); 
-    unsigned_value = EXTRACT_HWORD(insn);
-    unsigned_value +=  sym_value + reloc_entry->addend;
-    insn = INSERT_HWORD(insn, unsigned_value);
-    bfd_put_32(abfd, insn, hit_data); 
-    break;
-   case R_IHIHALF:
-    insn = bfd_get_32(abfd, hit_data); 
-    /* consth, part 1 
-       Just get the symbol value that is referenced */
-    part1_consth_active = true;
-    part1_consth_value = sym_value + reloc_entry->addend;
-    /* Don't modify insn until R_IHCONST */
-    break;
-   case R_IHCONST:	
-    insn = bfd_get_32(abfd, hit_data); 
-    /* consth, part 2 
-       Now relocate the reference */
-    if (part1_consth_active == false) {
-      *error_message = (char *) _("Missing IHIHALF");
-      return(bfd_reloc_dangerous);
-    }
-    /* sym_ptr_ptr = r_symndx, in coff_slurp_reloc_table() */
-    unsigned_value = 0;		/*EXTRACT_HWORD(insn) << 16;*/
-    unsigned_value += reloc_entry->addend; /* r_symndx */
-    unsigned_value += part1_consth_value;
-    unsigned_value = unsigned_value >> 16;
-    insn = INSERT_HWORD(insn, unsigned_value);
-    part1_consth_active = false;
-    bfd_put_32(abfd, insn, hit_data); 
-    break;
-   case R_BYTE:
-    insn = bfd_get_8(abfd, hit_data); 
-    unsigned_value = insn + sym_value + reloc_entry->addend;	
-    if (unsigned_value & 0xffffff00)
-      return(bfd_reloc_overflow);
-    bfd_put_8(abfd, unsigned_value, hit_data); 
-    break;
-   case R_HWORD:
-    insn = bfd_get_16(abfd, hit_data); 
-    unsigned_value = insn + sym_value + reloc_entry->addend;	
-    if (unsigned_value & 0xffff0000)
-      return(bfd_reloc_overflow);
-    bfd_put_16(abfd, insn, hit_data); 
-    break;
-   case R_WORD:
-    insn = bfd_get_32(abfd, hit_data); 
-    insn += sym_value + reloc_entry->addend;  
-    bfd_put_32(abfd, insn, hit_data);
-    break;
-   default:
-    *error_message = _("Unrecognized reloc");
-    return (bfd_reloc_dangerous);
-  }
-
-
-  return(bfd_reloc_ok);	
-}
-
-/*      type	   rightshift
-		       size
-			  bitsize
-			       pc-relative
-				     bitpos
-					 absolute
-					     complain_on_overflow
-						  special_function
-						    relocation name
-							       partial_inplace 
-								      src_mask
-*/
-
-/*FIXME: I'm not real sure about this table */
-static reloc_howto_type howto_table[] = 
-{
-  {R_ABS,     0, 3, 32, false, 0, complain_overflow_bitfield,a29k_reloc,"ABS",     true, 0xffffffff,0xffffffff, false},
-  {1},  {2},  {3},   {4},  {5},  {6},  {7},  {8},  {9}, {10},
-  {11}, {12}, {13}, {14}, {15}, {16}, {17}, {18}, {19}, {20},
-  {21}, {22}, {23},
-  {R_IREL,    0, 3, 32, true,  0, complain_overflow_signed,a29k_reloc,"IREL",    true, 0xffffffff,0xffffffff, false},
-  {R_IABS,    0, 3, 32, false, 0, complain_overflow_bitfield, a29k_reloc,"IABS",    true, 0xffffffff,0xffffffff, false},
-  {R_ILOHALF, 0, 3, 16, true,  0, complain_overflow_signed, a29k_reloc,"ILOHALF", true, 0x0000ffff,0x0000ffff, false},
-  {R_IHIHALF, 0, 3, 16, true,  16, complain_overflow_signed, a29k_reloc,"IHIHALF", true, 0xffff0000,0xffff0000, false},
-  {R_IHCONST, 0, 3, 16, true,  0, complain_overflow_signed, a29k_reloc,"IHCONST", true, 0xffff0000,0xffff0000, false},
-  {R_BYTE,    0, 0, 8, false, 0, complain_overflow_bitfield, a29k_reloc,"BYTE",    true, 0x000000ff,0x000000ff, false},
-  {R_HWORD,   0, 1, 16, false, 0, complain_overflow_bitfield, a29k_reloc,"HWORD",   true, 0x0000ffff,0x0000ffff, false},
-  {R_WORD,    0, 2, 32, false, 0, complain_overflow_bitfield, a29k_reloc,"WORD",    true, 0xffffffff,0xffffffff, false},
-};
-
-#define BADMAG(x) A29KBADMAG(x)
-
-#define RELOC_PROCESSING(relent, reloc, symbols, abfd, section) \
- reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void
-reloc_processing (relent,reloc, symbols, abfd, section)
-     arelent *relent;
-     struct internal_reloc *reloc;
-     asymbol **symbols;
-     bfd *abfd;
-     asection *section;
-{
-    static bfd_vma ihihalf_vaddr = (bfd_vma) -1;
-
-    relent->address = reloc->r_vaddr;		
-    relent->howto = howto_table + reloc->r_type;
-    if (reloc->r_type == R_IHCONST) 
-    {		
-      /* The address of an R_IHCONST should always be the address of
-	 the immediately preceding R_IHIHALF.  relocs generated by gas
-	 are correct, but relocs generated by High C are different (I
-	 can't figure out what the address means for High C).  We can
-	 handle both gas and High C by ignoring the address here, and
-	 simply reusing the address saved for R_IHIHALF.  */
-        if (ihihalf_vaddr == (bfd_vma) -1)
-	  abort ();
-	relent->address = ihihalf_vaddr;
-	ihihalf_vaddr = (bfd_vma) -1;
-	relent->addend = reloc->r_symndx;		
-	relent->sym_ptr_ptr= bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
-    else 
-    {
-      asymbol *ptr;
-      relent->sym_ptr_ptr = symbols + obj_convert(abfd)[reloc->r_symndx];
-
-      ptr = *(relent->sym_ptr_ptr);
-
-      if (ptr 
-	  && bfd_asymbol_bfd(ptr) == abfd		
-
-	  && ((ptr->flags & BSF_OLD_COMMON)== 0))	
-      {						
-	  relent->addend = 0;
-      }						
-      else
-      {					
-	  relent->addend = 0;			
-      }			
-      relent->address-= section->vma;
-      if (reloc->r_type == R_IHIHALF)
-	ihihalf_vaddr = relent->address;
-      else if (ihihalf_vaddr != (bfd_vma) -1)
-	abort ();
-  }
-}
-
-/* The reloc processing routine for the optimized COFF linker.  */
-
-static boolean
-coff_a29k_relocate_section (output_bfd, info, input_bfd, input_section,
-			    contents, relocs, syms, sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc *rel;
-  struct internal_reloc *relend;
-  boolean hihalf;
-  bfd_vma hihalf_val;
-
-  /* If we are performing a relocateable link, we don't need to do a
-     thing.  The caller will take care of adjusting the reloc
-     addresses and symbol indices.  */
-  if (info->relocateable)
-    return true;
-
-  hihalf = false;
-  hihalf_val = 0;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      long symndx;
-      bfd_byte *loc;
-      struct coff_link_hash_entry *h;
-      struct internal_syment *sym;
-      asection *sec;
-      bfd_vma val;
-      boolean overflow;
-      unsigned long insn;
-      long signed_value;
-      unsigned long unsigned_value;
-      bfd_reloc_status_type rstat;
-
-      symndx = rel->r_symndx;
-      loc = contents + rel->r_vaddr - input_section->vma;
-
-      if (symndx == -1 || rel->r_type == R_IHCONST)
-	h = NULL;
-      else
-	h = obj_coff_sym_hashes (input_bfd)[symndx];
-
-      sym = NULL;
-      sec = NULL;
-      val = 0;
-
-      /* An R_IHCONST reloc does not have a symbol.  Instead, the
-         symbol index is an addend.  R_IHCONST is always used in
-         conjunction with R_IHHALF.  */
-      if (rel->r_type != R_IHCONST)
-	{
-	  if (h == NULL)
-	    {
-	      if (symndx == -1)
-		sec = bfd_abs_section_ptr;
-	      else
-		{
-		  sym = syms + symndx;
-		  sec = sections[symndx];
-		  val = (sec->output_section->vma
-			 + sec->output_offset
-			 + sym->n_value
-			 - sec->vma);
-		}
-	    }
-	  else
-	    {
-	      if (h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak)
-		{
-		  sec = h->root.u.def.section;
-		  val = (h->root.u.def.value
-			 + sec->output_section->vma
-			 + sec->output_offset);
-		}
-	      else
-		{
-		  if (! ((*info->callbacks->undefined_symbol)
-			 (info, h->root.root.string, input_bfd, input_section,
-			  rel->r_vaddr - input_section->vma)))
-		    return false;
-		}
-	    }
-
-	  if (hihalf)
-	    {
-	      if (! ((*info->callbacks->reloc_dangerous)
-		     (info, _("missing IHCONST reloc"), input_bfd,
-		      input_section, rel->r_vaddr - input_section->vma)))
-		return false;
-	      hihalf = false;
-	    }
-	}
-
-      overflow = false;
-
-      switch (rel->r_type)
-	{
-	default:
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-
-	case R_IREL:
-	  insn = bfd_get_32 (input_bfd, loc);
-
-	  /* Extract the addend.  */
-	  signed_value = EXTRACT_HWORD (insn);
-	  signed_value = SIGN_EXTEND_HWORD (signed_value);
-	  signed_value <<= 2;
-
-	  /* Unfortunately, there are two different versions of COFF
-	     a29k.  In the original AMD version, the value stored in
-	     the field for the R_IREL reloc is a simple addend.  In
-	     the GNU version, the value is the negative of the address
-	     of the reloc within section.  We try to cope here by
-	     assuming the AMD version, unless the addend is exactly
-	     the negative of the address; in the latter case we assume
-	     the GNU version.  This means that something like
-	         .text
-		 nop
-		 jmp i-4
-	     will fail, because the addend of -4 will happen to equal
-	     the negative of the address within the section.  The
-	     compiler will never generate code like this.
-
-	     At some point in the future we may want to take out this
-	     check.  */
-
-	  if (signed_value == - (long) (rel->r_vaddr - input_section->vma))
-	    signed_value = 0;
-
-	  /* Determine the destination of the jump.  */
-	  signed_value += val;
-
-	  if ((signed_value & ~0x3ffff) == 0)
-	    {
-	      /* We can use an absolute jump.  */
-	      insn |= (1 << 24);
-	    }
-	  else
-	    {
-	      /* Make the destination PC relative.  */
-	      signed_value -= (input_section->output_section->vma
-			       + input_section->output_offset
-			       + (rel->r_vaddr - input_section->vma));
-	      if (signed_value > 0x1ffff || signed_value < - 0x20000)
-		{
-		  overflow = true;
-		  signed_value = 0;
-		}
-	    }
-
-	  /* Put the adjusted value back into the instruction.  */
-	  signed_value >>= 2;
-	  insn = INSERT_HWORD (insn, signed_value);
-
-	  bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
-
-	  break;
-
-	case R_ILOHALF:
-	  insn = bfd_get_32 (input_bfd, loc);
-	  unsigned_value = EXTRACT_HWORD (insn);
-	  unsigned_value += val;
-	  insn = INSERT_HWORD (insn, unsigned_value);
-	  bfd_put_32 (input_bfd, insn, loc);
-	  break;
-
-	case R_IHIHALF:
-	  /* Save the value for the R_IHCONST reloc.  */
-	  hihalf = true;
-	  hihalf_val = val;
-	  break;
-
-	case R_IHCONST:
-	  if (! hihalf)
-	    {
-	      if (! ((*info->callbacks->reloc_dangerous)
-		     (info, _("missing IHIHALF reloc"), input_bfd,
-		      input_section, rel->r_vaddr - input_section->vma)))
-		return false;
-	      hihalf_val = 0;
-	    }
-
-	  insn = bfd_get_32 (input_bfd, loc);
-	  unsigned_value = rel->r_symndx + hihalf_val;
-	  unsigned_value >>= 16;
-	  insn = INSERT_HWORD (insn, unsigned_value);
-	  bfd_put_32 (input_bfd, (bfd_vma) insn, loc);
-
-	  hihalf = false;
-
-	  break;
-
-	case R_BYTE:
-	case R_HWORD:
-	case R_WORD:
-	  rstat = _bfd_relocate_contents (howto_table + rel->r_type,
-					  input_bfd, val, loc);
-	  if (rstat == bfd_reloc_overflow)
-	    overflow = true;
-	  else if (rstat != bfd_reloc_ok)
-	    abort ();
-	  break;
-	}
-
-      if (overflow)
-	{
-	  const char *name;
-	  char buf[SYMNMLEN + 1];
-
-	  if (symndx == -1)
-	    name = "*ABS*";
-	  else if (h != NULL)
-	    name = h->root.root.string;
-	  else if (sym == NULL)
-	    name = "*unknown*";
-	  else if (sym->_n._n_n._n_zeroes == 0
-		   && sym->_n._n_n._n_offset != 0)
-	    name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
-	  else
-	    {
-	      strncpy (buf, sym->_n._n_name, SYMNMLEN);
-	      buf[SYMNMLEN] = '\0';
-	      name = buf;
-	    }
-
-	  if (! ((*info->callbacks->reloc_overflow)
-		 (info, name, howto_table[rel->r_type].name, (bfd_vma) 0,
-		  input_bfd, input_section,
-		  rel->r_vaddr - input_section->vma)))
-	    return false;
-	}
-    }     
-
-  return true;
-}
-
-#define coff_relocate_section coff_a29k_relocate_section
-
-/* We don't want to change the symndx of a R_IHCONST reloc, since it
-   is actually an addend, not a symbol index at all.  */
-
-/*ARGSUSED*/
-static boolean
-coff_a29k_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
-     bfd *obfd;
-     struct bfd_link_info *info;
-     bfd *ibfd;
-     asection *sec;
-     struct internal_reloc *irel;
-     boolean *adjustedp;
-{
-  if (irel->r_type == R_IHCONST)
-    *adjustedp = true;
-  else
-    *adjustedp = false;
-  return true;
-}
-
-#define coff_adjust_symndx coff_a29k_adjust_symndx
-
-#include "coffcode.h"
-
-const bfd_target a29kcoff_big_vec =
-{
-  "coff-a29k-big",		/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC /* section flags */
-   | SEC_LOAD | SEC_RELOC  
-   | SEC_READONLY ),
-  '_',				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32,   bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,
-  /* hdrs */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32,   bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,
-
- {
-	    
-   _bfd_dummy_target,
-   coff_object_p,
-   bfd_generic_archive_p,
-   _bfd_dummy_target
-  },
- {
-   bfd_false,
-   coff_mkobject,
-   _bfd_generic_mkarchive,
-   bfd_false
-  },
- {
-   bfd_false,
-   coff_write_object_contents,
-   _bfd_write_archive_contents,
-   bfd_false
-  },
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE
- };
diff --git a/bfd/coff-alpha.c b/bfd/coff-alpha.c
deleted file mode 100644
index d841663edd5..00000000000
--- a/bfd/coff-alpha.c
+++ /dev/null
@@ -1,2402 +0,0 @@
-/* BFD back-end for ALPHA Extended-Coff files.
-   Copyright 1993, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Modified from coff-mips.c by Steve Chamberlain <sac@cygnus.com> and
-   Ian Lance Taylor <ian@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "coff/sym.h"
-#include "coff/symconst.h"
-#include "coff/ecoff.h"
-#include "coff/alpha.h"
-#include "aout/ar.h"
-#include "libcoff.h"
-#include "libecoff.h"
-
-/* Prototypes for static functions.  */
-
-static const bfd_target *alpha_ecoff_object_p PARAMS ((bfd *));
-static boolean alpha_ecoff_bad_format_hook PARAMS ((bfd *abfd, PTR filehdr));
-static PTR alpha_ecoff_mkobject_hook PARAMS ((bfd *, PTR filehdr, PTR aouthdr));
-static void alpha_ecoff_swap_reloc_in PARAMS ((bfd *, PTR,
-					      struct internal_reloc *));
-static void alpha_ecoff_swap_reloc_out PARAMS ((bfd *,
-					       const struct internal_reloc *,
-					       PTR));
-static void alpha_adjust_reloc_in PARAMS ((bfd *,
-					   const struct internal_reloc *,
-					   arelent *));
-static void alpha_adjust_reloc_out PARAMS ((bfd *, const arelent *,
-					    struct internal_reloc *));
-static reloc_howto_type *alpha_bfd_reloc_type_lookup
- PARAMS ((bfd *, bfd_reloc_code_real_type));
-static bfd_byte *alpha_ecoff_get_relocated_section_contents
-  PARAMS ((bfd *abfd, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *data, boolean relocateable, asymbol **symbols));
-static bfd_vma alpha_convert_external_reloc
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, struct external_reloc *,
-	   struct ecoff_link_hash_entry *));
-static boolean alpha_relocate_section PARAMS ((bfd *, struct bfd_link_info *,
-					       bfd *, asection *,
-					       bfd_byte *, PTR));
-static boolean alpha_adjust_headers
-  PARAMS ((bfd *, struct internal_filehdr *, struct internal_aouthdr *));
-static PTR alpha_ecoff_read_ar_hdr PARAMS ((bfd *));
-static bfd *alpha_ecoff_get_elt_at_filepos PARAMS ((bfd *, file_ptr));
-static bfd *alpha_ecoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
-static bfd *alpha_ecoff_get_elt_at_index PARAMS ((bfd *, symindex));
-
-/* ECOFF has COFF sections, but the debugging information is stored in
-   a completely different format.  ECOFF targets use some of the
-   swapping routines from coffswap.h, and some of the generic COFF
-   routines in coffgen.c, but, unlike the real COFF targets, do not
-   use coffcode.h itself.
-
-   Get the generic COFF swapping routines, except for the reloc,
-   symbol, and lineno ones.  Give them ecoff names.  Define some
-   accessor macros for the large sizes used for Alpha ECOFF.  */
-
-#define GET_FILEHDR_SYMPTR bfd_h_get_64
-#define PUT_FILEHDR_SYMPTR bfd_h_put_64
-#define GET_AOUTHDR_TSIZE bfd_h_get_64
-#define PUT_AOUTHDR_TSIZE bfd_h_put_64
-#define GET_AOUTHDR_DSIZE bfd_h_get_64
-#define PUT_AOUTHDR_DSIZE bfd_h_put_64
-#define GET_AOUTHDR_BSIZE bfd_h_get_64
-#define PUT_AOUTHDR_BSIZE bfd_h_put_64
-#define GET_AOUTHDR_ENTRY bfd_h_get_64
-#define PUT_AOUTHDR_ENTRY bfd_h_put_64
-#define GET_AOUTHDR_TEXT_START bfd_h_get_64
-#define PUT_AOUTHDR_TEXT_START bfd_h_put_64
-#define GET_AOUTHDR_DATA_START bfd_h_get_64
-#define PUT_AOUTHDR_DATA_START bfd_h_put_64
-#define GET_SCNHDR_PADDR bfd_h_get_64
-#define PUT_SCNHDR_PADDR bfd_h_put_64
-#define GET_SCNHDR_VADDR bfd_h_get_64
-#define PUT_SCNHDR_VADDR bfd_h_put_64
-#define GET_SCNHDR_SIZE bfd_h_get_64
-#define PUT_SCNHDR_SIZE bfd_h_put_64
-#define GET_SCNHDR_SCNPTR bfd_h_get_64
-#define PUT_SCNHDR_SCNPTR bfd_h_put_64
-#define GET_SCNHDR_RELPTR bfd_h_get_64
-#define PUT_SCNHDR_RELPTR bfd_h_put_64
-#define GET_SCNHDR_LNNOPTR bfd_h_get_64
-#define PUT_SCNHDR_LNNOPTR bfd_h_put_64
-
-#define ALPHAECOFF
-
-#define NO_COFF_RELOCS
-#define NO_COFF_SYMBOLS
-#define NO_COFF_LINENOS
-#define coff_swap_filehdr_in alpha_ecoff_swap_filehdr_in
-#define coff_swap_filehdr_out alpha_ecoff_swap_filehdr_out
-#define coff_swap_aouthdr_in alpha_ecoff_swap_aouthdr_in
-#define coff_swap_aouthdr_out alpha_ecoff_swap_aouthdr_out
-#define coff_swap_scnhdr_in alpha_ecoff_swap_scnhdr_in
-#define coff_swap_scnhdr_out alpha_ecoff_swap_scnhdr_out
-#include "coffswap.h"
-
-/* Get the ECOFF swapping routines.  */
-#define ECOFF_64
-#include "ecoffswap.h"
-
-/* How to process the various reloc types.  */
-
-static bfd_reloc_status_type
-reloc_nil PARAMS ((bfd *, arelent *, asymbol *, PTR,
-		   asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc;
-     asymbol *sym;
-     PTR data;
-     asection *sec;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return bfd_reloc_ok;
-}
-
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
-   from smaller values.  Start with zero, widen, *then* decrement.  */
-#define MINUS_ONE	(((bfd_vma)0) - 1)
-
-static reloc_howto_type alpha_howto_table[] =
-{
-  /* Reloc type 0 is ignored by itself.  However, it appears after a
-     GPDISP reloc to identify the location where the low order 16 bits
-     of the gp register are loaded.  */
-  HOWTO (ALPHA_R_IGNORE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "IGNORE",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 32 bit reference to a symbol.  */
-  HOWTO (ALPHA_R_REFLONG,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "REFLONG",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit reference to a symbol.  */
-  HOWTO (ALPHA_R_REFQUAD,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "REFQUAD",		/* name */
-	 true,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit GP relative offset.  This is just like REFLONG except
-     that when the value is used the value of the gp register will be
-     added in.  */
-  HOWTO (ALPHA_R_GPREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "GPREL32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Used for an instruction that refers to memory off the GP
-     register.  The offset is 16 bits of the 32 bit instruction.  This
-     reloc always seems to be against the .lita section.  */
-  HOWTO (ALPHA_R_LITERAL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "LITERAL",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* This reloc only appears immediately following a LITERAL reloc.
-     It identifies a use of the literal.  It seems that the linker can
-     use this to eliminate a portion of the .lita section.  The symbol
-     index is special: 1 means the literal address is in the base
-     register of a memory format instruction; 2 means the literal
-     address is in the byte offset register of a byte-manipulation
-     instruction; 3 means the literal address is in the target
-     register of a jsr instruction.  This does not actually do any
-     relocation.  */
-  HOWTO (ALPHA_R_LITUSE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "LITUSE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Load the gp register.  This is always used for a ldah instruction
-     which loads the upper 16 bits of the gp register.  The next reloc
-     will be an IGNORE reloc which identifies the location of the lda
-     instruction which loads the lower 16 bits.  The symbol index of
-     the GPDISP instruction appears to actually be the number of bytes
-     between the ldah and lda instructions.  This gives two different
-     ways to determine where the lda instruction is; I don't know why
-     both are used.  The value to use for the relocation is the
-     difference between the GP value and the current location; the
-     load will always be done against a register holding the current
-     address.  */
-  HOWTO (ALPHA_R_GPDISP,	/* type */
-	 16,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "GPDISP",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 21 bit branch.  The native assembler generates these for
-     branches within the text segment, and also fills in the PC
-     relative offset in the instruction.  */
-  HOWTO (ALPHA_R_BRADDR,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 21,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "BRADDR",		/* name */
-	 true,			/* partial_inplace */
-	 0x1fffff,		/* src_mask */
-	 0x1fffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A hint for a jump to a register.  */
-  HOWTO (ALPHA_R_HINT,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 14,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "HINT",		/* name */
-	 true,			/* partial_inplace */
-	 0x3fff,		/* src_mask */
-	 0x3fff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL64,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL64",		/* name */
-	 true,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Push a value on the reloc evaluation stack.  */
-  HOWTO (ALPHA_R_OP_PUSH,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "OP_PUSH",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Store the value from the stack at the given address.  Store it in
-     a bitfield of size r_size starting at bit position r_offset.  */
-  HOWTO (ALPHA_R_OP_STORE,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "OP_STORE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Subtract the reloc address from the value on the top of the
-     relocation stack.  */
-  HOWTO (ALPHA_R_OP_PSUB,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "OP_PSUB",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Shift the value on the top of the relocation stack right by the
-     given value.  */
-  HOWTO (ALPHA_R_OP_PRSHIFT,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "OP_PRSHIFT",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Adjust the GP value for a new range in the object file.  */
-  HOWTO (ALPHA_R_GPVALUE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "GPVALUE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false)			/* pcrel_offset */
-};
-
-/* Recognize an Alpha ECOFF file.  */
-
-static const bfd_target *
-alpha_ecoff_object_p (abfd)
-     bfd *abfd;
-{
-  static const bfd_target *ret;
-
-  ret = coff_object_p (abfd);
-
-  if (ret != NULL)
-    {
-      asection *sec;
-
-      /* Alpha ECOFF has a .pdata section.  The lnnoptr field of the
-	 .pdata section is the number of entries it contains.  Each
-	 entry takes up 8 bytes.  The number of entries is required
-	 since the section is aligned to a 16 byte boundary.  When we
-	 link .pdata sections together, we do not want to include the
-	 alignment bytes.  We handle this on input by faking the size
-	 of the .pdata section to remove the unwanted alignment bytes.
-	 On output we will set the lnnoptr field and force the
-	 alignment.  */
-      sec = bfd_get_section_by_name (abfd, _PDATA);
-      if (sec != (asection *) NULL)
-	{
-	  bfd_size_type size;
-
-	  size = sec->line_filepos * 8;
-	  BFD_ASSERT (size == bfd_section_size (abfd, sec)
-		      || size + 8 == bfd_section_size (abfd, sec));
-	  if (! bfd_set_section_size (abfd, sec, size))
-	    return NULL;
-	}
-    }
-
-  return ret;
-}
-
-/* See whether the magic number matches.  */
-
-static boolean
-alpha_ecoff_bad_format_hook (abfd, filehdr)
-     bfd *abfd;
-     PTR filehdr;
-{
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-
-  if (ALPHA_ECOFF_BADMAG (*internal_f))
-    return false;
-
-  return true;
-}
-
-/* This is a hook called by coff_real_object_p to create any backend
-   specific information.  */
-
-static PTR
-alpha_ecoff_mkobject_hook (abfd, filehdr, aouthdr)
-     bfd *abfd;
-     PTR filehdr;
-     PTR aouthdr;
-{
-  PTR ecoff;
-
-  ecoff = _bfd_ecoff_mkobject_hook (abfd, filehdr, aouthdr);
-
-  if (ecoff != NULL)
-    {
-      struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-
-      /* Set additional BFD flags according to the object type from the
-	 machine specific file header flags.  */
-      switch (internal_f->f_flags & F_ALPHA_OBJECT_TYPE_MASK)
-	{
-	case F_ALPHA_SHARABLE:
-	  abfd->flags |= DYNAMIC;
-	  break;
-	case F_ALPHA_CALL_SHARED:
-	  /* Always executable if using shared libraries as the run time
-	     loader might resolve undefined references.  */
-	  abfd->flags |= (DYNAMIC | EXEC_P);
-	  break;
-	}
-    }
-  return ecoff;
-}
-
-/* Reloc handling.  */
-
-/* Swap a reloc in.  */
-
-static void
-alpha_ecoff_swap_reloc_in (abfd, ext_ptr, intern)
-     bfd *abfd;
-     PTR ext_ptr;
-     struct internal_reloc *intern;
-{
-  const RELOC *ext = (RELOC *) ext_ptr;
-
-  intern->r_vaddr = bfd_h_get_64 (abfd, (bfd_byte *) ext->r_vaddr);
-  intern->r_symndx = bfd_h_get_32 (abfd, (bfd_byte *) ext->r_symndx);
-
-  BFD_ASSERT (bfd_header_little_endian (abfd));
-
-  intern->r_type = ((ext->r_bits[0] & RELOC_BITS0_TYPE_LITTLE)
-		    >> RELOC_BITS0_TYPE_SH_LITTLE);
-  intern->r_extern = (ext->r_bits[1] & RELOC_BITS1_EXTERN_LITTLE) != 0;
-  intern->r_offset = ((ext->r_bits[1] & RELOC_BITS1_OFFSET_LITTLE)
-		      >> RELOC_BITS1_OFFSET_SH_LITTLE);
-  /* Ignored the reserved bits.  */
-  intern->r_size = ((ext->r_bits[3] & RELOC_BITS3_SIZE_LITTLE)
-		    >> RELOC_BITS3_SIZE_SH_LITTLE);
-
-  if (intern->r_type == ALPHA_R_LITUSE
-      || intern->r_type == ALPHA_R_GPDISP)
-    {
-      /* Handle the LITUSE and GPDISP relocs specially.  Its symndx
-	 value is not actually a symbol index, but is instead a
-	 special code.  We put the code in the r_size field, and
-	 clobber the symndx.  */
-      if (intern->r_size != 0)
-	abort ();
-      intern->r_size = intern->r_symndx;
-      intern->r_symndx = RELOC_SECTION_NONE;
-    }
-  else if (intern->r_type == ALPHA_R_IGNORE)
-    {
-      /* The IGNORE reloc generally follows a GPDISP reloc, and is
-	 against the .lita section.  The section is irrelevant.  */
-      if (! intern->r_extern &&
-	  intern->r_symndx == RELOC_SECTION_ABS)
-	abort ();
-      if (! intern->r_extern && intern->r_symndx == RELOC_SECTION_LITA)
-	intern->r_symndx = RELOC_SECTION_ABS;
-    }
-}
-
-/* Swap a reloc out.  */
-
-static void
-alpha_ecoff_swap_reloc_out (abfd, intern, dst)
-     bfd *abfd;
-     const struct internal_reloc *intern;
-     PTR dst;
-{
-  RELOC *ext = (RELOC *) dst;
-  long symndx;
-  unsigned char size;
-
-  /* Undo the hackery done in swap_reloc_in.  */
-  if (intern->r_type == ALPHA_R_LITUSE
-      || intern->r_type == ALPHA_R_GPDISP)
-    {
-      symndx = intern->r_size;
-      size = 0;
-    }
-  else if (intern->r_type == ALPHA_R_IGNORE
-	   && ! intern->r_extern
-	   && intern->r_symndx == RELOC_SECTION_ABS)
-    {
-      symndx = RELOC_SECTION_LITA;
-      size = intern->r_size;
-    }
-  else
-    {
-      symndx = intern->r_symndx;
-      size = intern->r_size;
-    }
-
-  BFD_ASSERT (intern->r_extern
-	      || (intern->r_symndx >= 0 && intern->r_symndx <= 14));
-
-  bfd_h_put_64 (abfd, intern->r_vaddr, (bfd_byte *) ext->r_vaddr);
-  bfd_h_put_32 (abfd, symndx, (bfd_byte *) ext->r_symndx);
-
-  BFD_ASSERT (bfd_header_little_endian (abfd));
-
-  ext->r_bits[0] = ((intern->r_type << RELOC_BITS0_TYPE_SH_LITTLE)
-		    & RELOC_BITS0_TYPE_LITTLE);
-  ext->r_bits[1] = ((intern->r_extern ? RELOC_BITS1_EXTERN_LITTLE : 0)
-		    | ((intern->r_offset << RELOC_BITS1_OFFSET_SH_LITTLE)
-		       & RELOC_BITS1_OFFSET_LITTLE));
-  ext->r_bits[2] = 0;
-  ext->r_bits[3] = ((size << RELOC_BITS3_SIZE_SH_LITTLE)
-		    & RELOC_BITS3_SIZE_LITTLE);
-}
-
-/* Finish canonicalizing a reloc.  Part of this is generic to all
-   ECOFF targets, and that part is in ecoff.c.  The rest is done in
-   this backend routine.  It must fill in the howto field.  */
-
-static void
-alpha_adjust_reloc_in (abfd, intern, rptr)
-     bfd *abfd;
-     const struct internal_reloc *intern;
-     arelent *rptr;
-{
-  if (intern->r_type > ALPHA_R_GPVALUE)
-    abort ();
-
-  switch (intern->r_type)
-    {
-    case ALPHA_R_BRADDR:
-    case ALPHA_R_SREL16:
-    case ALPHA_R_SREL32:
-    case ALPHA_R_SREL64:
-      /* This relocs appear to be fully resolved when they are against
-         internal symbols.  Against external symbols, BRADDR at least
-         appears to be resolved against the next instruction.  */
-      if (! intern->r_extern)
-	rptr->addend = 0;
-      else
-	rptr->addend = - (intern->r_vaddr + 4);
-      break;
-
-    case ALPHA_R_GPREL32:
-    case ALPHA_R_LITERAL:
-      /* Copy the gp value for this object file into the addend, to
-	 ensure that we are not confused by the linker.  */
-      if (! intern->r_extern)
-	rptr->addend += ecoff_data (abfd)->gp;
-      break;
-
-    case ALPHA_R_LITUSE:
-    case ALPHA_R_GPDISP:
-      /* The LITUSE and GPDISP relocs do not use a symbol, or an
-	 addend, but they do use a special code.  Put this code in the
-	 addend field.  */
-      rptr->addend = intern->r_size;
-      break;
-
-    case ALPHA_R_OP_STORE:
-      /* The STORE reloc needs the size and offset fields.  We store
-	 them in the addend.  */
-      BFD_ASSERT (intern->r_offset <= 256 && intern->r_size <= 256);
-      rptr->addend = (intern->r_offset << 8) + intern->r_size;
-      break;
-
-    case ALPHA_R_OP_PUSH:
-    case ALPHA_R_OP_PSUB:
-    case ALPHA_R_OP_PRSHIFT:
-      /* The PUSH, PSUB and PRSHIFT relocs do not actually use an
-	 address.  I believe that the address supplied is really an
-	 addend.  */
-      rptr->addend = intern->r_vaddr;
-      break;
-
-    case ALPHA_R_GPVALUE:
-      /* Set the addend field to the new GP value.  */
-      rptr->addend = intern->r_symndx + ecoff_data (abfd)->gp;
-      break;
-
-    case ALPHA_R_IGNORE:
-      /* If the type is ALPHA_R_IGNORE, make sure this is a reference
-	 to the absolute section so that the reloc is ignored.  For
-	 some reason the address of this reloc type is not adjusted by
-	 the section vma.  We record the gp value for this object file
-	 here, for convenience when doing the GPDISP relocation.  */
-      rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-      rptr->address = intern->r_vaddr;
-      rptr->addend = ecoff_data (abfd)->gp;
-      break;
-
-    default:
-      break;
-    }
-
-  rptr->howto = &alpha_howto_table[intern->r_type];
-}
-
-/* When writing out a reloc we need to pull some values back out of
-   the addend field into the reloc.  This is roughly the reverse of
-   alpha_adjust_reloc_in, except that there are several changes we do
-   not need to undo.  */
-
-static void
-alpha_adjust_reloc_out (abfd, rel, intern)
-     bfd *abfd;
-     const arelent *rel;
-     struct internal_reloc *intern;
-{
-  switch (intern->r_type)
-    {
-    case ALPHA_R_LITUSE:
-    case ALPHA_R_GPDISP:
-      intern->r_size = rel->addend;
-      break;
-
-    case ALPHA_R_OP_STORE:
-      intern->r_size = rel->addend & 0xff;
-      intern->r_offset = (rel->addend >> 8) & 0xff;
-      break;
-
-    case ALPHA_R_OP_PUSH:
-    case ALPHA_R_OP_PSUB:
-    case ALPHA_R_OP_PRSHIFT:
-      intern->r_vaddr = rel->addend;
-      break;
-
-    case ALPHA_R_IGNORE:
-      intern->r_vaddr = rel->address;
-      break;
-
-    default:
-      break;
-    }
-}
-
-/* The size of the stack for the relocation evaluator.  */
-#define RELOC_STACKSIZE (10)
-
-/* Alpha ECOFF relocs have a built in expression evaluator as well as
-   other interdependencies.  Rather than use a bunch of special
-   functions and global variables, we use a single routine to do all
-   the relocation for a section.  I haven't yet worked out how the
-   assembler is going to handle this.  */
-
-static bfd_byte *
-alpha_ecoff_get_relocated_section_contents (abfd, link_info, link_order,
-					    data, relocateable, symbols)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  bfd *input_bfd = link_order->u.indirect.section->owner;
-  asection *input_section = link_order->u.indirect.section;
-  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
-  arelent **reloc_vector = NULL;
-  long reloc_count;
-  bfd *output_bfd = relocateable ? abfd : (bfd *) NULL;
-  bfd_vma gp;
-  boolean gp_undefined;
-  bfd_vma stack[RELOC_STACKSIZE];
-  int tos = 0;
-
-  if (reloc_size < 0)
-    goto error_return;
-  reloc_vector = (arelent **) bfd_malloc (reloc_size);
-  if (reloc_vector == NULL && reloc_size != 0)
-    goto error_return;
-
-  if (! bfd_get_section_contents (input_bfd, input_section, data,
-				  (file_ptr) 0, input_section->_raw_size))
-    goto error_return;
-
-  /* The section size is not going to change.  */
-  input_section->_cooked_size = input_section->_raw_size;
-  input_section->reloc_done = true;
-
-  reloc_count = bfd_canonicalize_reloc (input_bfd, input_section,
-					reloc_vector, symbols);
-  if (reloc_count < 0)
-    goto error_return;
-  if (reloc_count == 0)
-    goto successful_return;
-
-  /* Get the GP value for the output BFD.  */
-  gp_undefined = false;
-  gp = _bfd_get_gp_value (abfd);
-  if (gp == 0)
-    {
-      if (relocateable != false)
-	{
-	  asection *sec;
-	  bfd_vma lo;
-
-	  /* Make up a value.  */
-	  lo = (bfd_vma) -1;
-	  for (sec = abfd->sections; sec != NULL; sec = sec->next)
-	    {
-	      if (sec->vma < lo
-		  && (strcmp (sec->name, ".sbss") == 0
-		      || strcmp (sec->name, ".sdata") == 0
-		      || strcmp (sec->name, ".lit4") == 0
-		      || strcmp (sec->name, ".lit8") == 0
-		      || strcmp (sec->name, ".lita") == 0))
-		lo = sec->vma;
-	    }
-	  gp = lo + 0x8000;
-	  _bfd_set_gp_value (abfd, gp);
-	}
-      else
-	{
-	  struct bfd_link_hash_entry *h;
-
-	  h = bfd_link_hash_lookup (link_info->hash, "_gp", false, false,
-				    true);
-	  if (h == (struct bfd_link_hash_entry *) NULL
-	      || h->type != bfd_link_hash_defined)
-	    gp_undefined = true;
-	  else
-	    {
-	      gp = (h->u.def.value
-		    + h->u.def.section->output_section->vma
-		    + h->u.def.section->output_offset);
-	      _bfd_set_gp_value (abfd, gp);
-	    }
-	}
-    }
-
-  for (; *reloc_vector != (arelent *) NULL; reloc_vector++)
-    {
-      arelent *rel;
-      bfd_reloc_status_type r;
-      char *err;
-
-      rel = *reloc_vector;
-      r = bfd_reloc_ok;
-      switch (rel->howto->type)
-	{
-	case ALPHA_R_IGNORE:
-	  rel->address += input_section->output_offset;
-	  break;
-
-	case ALPHA_R_REFLONG:
-	case ALPHA_R_REFQUAD:
-	case ALPHA_R_BRADDR:
-	case ALPHA_R_HINT:
-	case ALPHA_R_SREL16:
-	case ALPHA_R_SREL32:
-	case ALPHA_R_SREL64:
-	  if (relocateable
-	      && ((*rel->sym_ptr_ptr)->flags & BSF_SECTION_SYM) == 0)
-	    {
-	      rel->address += input_section->output_offset;
-	      break;
-	    }
-	  r = bfd_perform_relocation (input_bfd, rel, data, input_section,
-				      output_bfd, &err);
-	  break;
-
-	case ALPHA_R_GPREL32:
-	  /* This relocation is used in a switch table.  It is a 32
-	     bit offset from the current GP value.  We must adjust it
-	     by the different between the original GP value and the
-	     current GP value.  The original GP value is stored in the
-	     addend.  We adjust the addend and let
-	     bfd_perform_relocation finish the job.  */
-	  rel->addend -= gp;
-	  r = bfd_perform_relocation (input_bfd, rel, data, input_section,
-				      output_bfd, &err);
-	  if (r == bfd_reloc_ok && gp_undefined)
-	    {
-	      r = bfd_reloc_dangerous;
-	      err = (char *) _("GP relative relocation used when GP not defined");
-	    }
-	  break;
-
-	case ALPHA_R_LITERAL:
-	  /* This is a reference to a literal value, generally
-	     (always?) in the .lita section.  This is a 16 bit GP
-	     relative relocation.  Sometimes the subsequent reloc is a
-	     LITUSE reloc, which indicates how this reloc is used.
-	     This sometimes permits rewriting the two instructions
-	     referred to by the LITERAL and the LITUSE into different
-	     instructions which do not refer to .lita.  This can save
-	     a memory reference, and permits removing a value from
-	     .lita thus saving GP relative space.
-
-	     We do not these optimizations.  To do them we would need
-	     to arrange to link the .lita section first, so that by
-	     the time we got here we would know the final values to
-	     use.  This would not be particularly difficult, but it is
-	     not currently implemented.  */
-
-	  {
-	    unsigned long insn;
-
-	    /* I believe that the LITERAL reloc will only apply to a
-	       ldq or ldl instruction, so check my assumption.  */
-	    insn = bfd_get_32 (input_bfd, data + rel->address);
-	    BFD_ASSERT (((insn >> 26) & 0x3f) == 0x29
-			|| ((insn >> 26) & 0x3f) == 0x28);
-
-	    rel->addend -= gp;
-	    r = bfd_perform_relocation (input_bfd, rel, data, input_section,
-					output_bfd, &err);
-	    if (r == bfd_reloc_ok && gp_undefined)
-	      {
-		r = bfd_reloc_dangerous;
-		err =
-		  (char *) _("GP relative relocation used when GP not defined");
-	      }
-	  }
-	  break;
-
-	case ALPHA_R_LITUSE:
-	  /* See ALPHA_R_LITERAL above for the uses of this reloc.  It
-	     does not cause anything to happen, itself.  */
-	  rel->address += input_section->output_offset;
-	  break;
-	    
-	case ALPHA_R_GPDISP:
-	  /* This marks the ldah of an ldah/lda pair which loads the
-	     gp register with the difference of the gp value and the
-	     current location.  The second of the pair is r_size bytes
-	     ahead; it used to be marked with an ALPHA_R_IGNORE reloc,
-	     but that no longer happens in OSF/1 3.2.  */
-	  {
-	    unsigned long insn1, insn2;
-	    bfd_vma addend;
-
-	    /* Get the two instructions.  */
-	    insn1 = bfd_get_32 (input_bfd, data + rel->address);
-	    insn2 = bfd_get_32 (input_bfd, data + rel->address + rel->addend);
-
-	    BFD_ASSERT (((insn1 >> 26) & 0x3f) == 0x09); /* ldah */
-	    BFD_ASSERT (((insn2 >> 26) & 0x3f) == 0x08); /* lda */
-
-	    /* Get the existing addend.  We must account for the sign
-	       extension done by lda and ldah.  */
-	    addend = ((insn1 & 0xffff) << 16) + (insn2 & 0xffff);
-	    if (insn1 & 0x8000)
-	      {
-		addend -= 0x80000000;
-		addend -= 0x80000000;
-	      }
-	    if (insn2 & 0x8000)
-	      addend -= 0x10000;
-
-	    /* The existing addend includes the different between the
-	       gp of the input BFD and the address in the input BFD.
-	       Subtract this out.  */
-	    addend -= (ecoff_data (input_bfd)->gp
-		       - (input_section->vma + rel->address));
-
-	    /* Now add in the final gp value, and subtract out the
-	       final address.  */
-	    addend += (gp
-		       - (input_section->output_section->vma
-			  + input_section->output_offset
-			  + rel->address));
-
-	    /* Change the instructions, accounting for the sign
-	       extension, and write them out.  */
-	    if (addend & 0x8000)
-	      addend += 0x10000;
-	    insn1 = (insn1 & 0xffff0000) | ((addend >> 16) & 0xffff);
-	    insn2 = (insn2 & 0xffff0000) | (addend & 0xffff);
-
-	    bfd_put_32 (input_bfd, (bfd_vma) insn1, data + rel->address);
-	    bfd_put_32 (input_bfd, (bfd_vma) insn2,
-			data + rel->address + rel->addend);
-
-	    rel->address += input_section->output_offset;
-	  }
-	  break;
-	  
-	case ALPHA_R_OP_PUSH:
-	  /* Push a value on the reloc evaluation stack.  */
-	  {
-	    asymbol *symbol;
-	    bfd_vma relocation;
-
-	    if (relocateable)
-	      {
-		rel->address += input_section->output_offset;
-		break;
-	      }
-
-	    /* Figure out the relocation of this symbol.  */
-	    symbol = *rel->sym_ptr_ptr;
-
-	    if (bfd_is_und_section (symbol->section))
-	      r = bfd_reloc_undefined;
-
-	    if (bfd_is_com_section (symbol->section))
-	      relocation = 0;
-	    else
-	      relocation = symbol->value;
-	    relocation += symbol->section->output_section->vma;
-	    relocation += symbol->section->output_offset;
-	    relocation += rel->addend;
-
-	    if (tos >= RELOC_STACKSIZE)
-	      abort ();
-
-	    stack[tos++] = relocation;
-	  }
-	  break;
-
-	case ALPHA_R_OP_STORE:
-	  /* Store a value from the reloc stack into a bitfield.  */
-	  {
-	    bfd_vma val;
-	    int offset, size;
-
-	    if (relocateable)
-	      {
-		rel->address += input_section->output_offset;
-		break;
-	      }
-
-	    if (tos == 0)
-	      abort ();
-
-	    /* The offset and size for this reloc are encoded into the
-	       addend field by alpha_adjust_reloc_in.  */
-	    offset = (rel->addend >> 8) & 0xff;
-	    size = rel->addend & 0xff;
-
-	    val = bfd_get_64 (abfd, data + rel->address);
-	    val &=~ (((1 << size) - 1) << offset);
-	    val |= (stack[--tos] & ((1 << size) - 1)) << offset;
-	    bfd_put_64 (abfd, val, data + rel->address);
-	  }
-	  break;
-
-	case ALPHA_R_OP_PSUB:
-	  /* Subtract a value from the top of the stack.  */
-	  {
-	    asymbol *symbol;
-	    bfd_vma relocation;
-
-	    if (relocateable)
-	      {
-		rel->address += input_section->output_offset;
-		break;
-	      }
-
-	    /* Figure out the relocation of this symbol.  */
-	    symbol = *rel->sym_ptr_ptr;
-
-	    if (bfd_is_und_section (symbol->section))
-	      r = bfd_reloc_undefined;
-
-	    if (bfd_is_com_section (symbol->section))
-	      relocation = 0;
-	    else
-	      relocation = symbol->value;
-	    relocation += symbol->section->output_section->vma;
-	    relocation += symbol->section->output_offset;
-	    relocation += rel->addend;
-
-	    if (tos == 0)
-	      abort ();
-
-	    stack[tos - 1] -= relocation;
-	  }
-	  break;
-
-	case ALPHA_R_OP_PRSHIFT:
-	  /* Shift the value on the top of the stack.  */
-	  {
-	    asymbol *symbol;
-	    bfd_vma relocation;
-
-	    if (relocateable)
-	      {
-		rel->address += input_section->output_offset;
-		break;
-	      }
-
-	    /* Figure out the relocation of this symbol.  */
-	    symbol = *rel->sym_ptr_ptr;
-
-	    if (bfd_is_und_section (symbol->section))
-	      r = bfd_reloc_undefined;
-
-	    if (bfd_is_com_section (symbol->section))
-	      relocation = 0;
-	    else
-	      relocation = symbol->value;
-	    relocation += symbol->section->output_section->vma;
-	    relocation += symbol->section->output_offset;
-	    relocation += rel->addend;
-
-	    if (tos == 0)
-	      abort ();
-
-	    stack[tos - 1] >>= relocation;
-	  }
-	  break;
-	    
-	case ALPHA_R_GPVALUE:
-	  /* I really don't know if this does the right thing.  */
-	  gp = rel->addend;
-	  gp_undefined = false;
-	  break;
-
-	default:
-	  abort ();
-	}
-
-      if (relocateable)
-	{
-	  asection *os = input_section->output_section;
-
-	  /* A partial link, so keep the relocs.  */
-	  os->orelocation[os->reloc_count] = rel;
-	  os->reloc_count++;
-	}
-
-      if (r != bfd_reloc_ok) 
-	{
-	  switch (r)
-	    {
-	    case bfd_reloc_undefined:
-	      if (! ((*link_info->callbacks->undefined_symbol)
-		     (link_info, bfd_asymbol_name (*rel->sym_ptr_ptr),
-		      input_bfd, input_section, rel->address)))
-		goto error_return;
-	      break;
-	    case bfd_reloc_dangerous: 
-	      if (! ((*link_info->callbacks->reloc_dangerous)
-		     (link_info, err, input_bfd, input_section,
-		      rel->address)))
-		goto error_return;
-	      break;
-	    case bfd_reloc_overflow:
-	      if (! ((*link_info->callbacks->reloc_overflow)
-		     (link_info, bfd_asymbol_name (*rel->sym_ptr_ptr),
-		      rel->howto->name, rel->addend, input_bfd,
-		      input_section, rel->address)))
-		goto error_return;
-	      break;
-	    case bfd_reloc_outofrange:
-	    default:
-	      abort ();
-	      break;
-	    }
-	}
-    }
-
-  if (tos != 0)
-    abort ();
-
- successful_return:
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return data;
-
- error_return:
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return NULL;
-}
-
-/* Get the howto structure for a generic reloc type.  */
-
-static reloc_howto_type *
-alpha_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  int alpha_type;
-
-  switch (code)
-    {
-    case BFD_RELOC_32:
-      alpha_type = ALPHA_R_REFLONG;
-      break;
-    case BFD_RELOC_64:
-    case BFD_RELOC_CTOR:
-      alpha_type = ALPHA_R_REFQUAD;
-      break;
-    case BFD_RELOC_GPREL32:
-      alpha_type = ALPHA_R_GPREL32;
-      break;
-    case BFD_RELOC_ALPHA_LITERAL:
-      alpha_type = ALPHA_R_LITERAL;
-      break;
-    case BFD_RELOC_ALPHA_LITUSE:
-      alpha_type = ALPHA_R_LITUSE;
-      break;
-    case BFD_RELOC_ALPHA_GPDISP_HI16:
-      alpha_type = ALPHA_R_GPDISP;
-      break;
-    case BFD_RELOC_ALPHA_GPDISP_LO16:
-      alpha_type = ALPHA_R_IGNORE;
-      break;
-    case BFD_RELOC_23_PCREL_S2:
-      alpha_type = ALPHA_R_BRADDR;
-      break;
-    case BFD_RELOC_ALPHA_HINT:
-      alpha_type = ALPHA_R_HINT;
-      break;
-    case BFD_RELOC_16_PCREL:
-      alpha_type = ALPHA_R_SREL16;
-      break;
-    case BFD_RELOC_32_PCREL:
-      alpha_type = ALPHA_R_SREL32;
-      break;
-    case BFD_RELOC_64_PCREL:
-      alpha_type = ALPHA_R_SREL64;
-      break;
-#if 0
-    case ???:
-      alpha_type = ALPHA_R_OP_PUSH;
-      break;
-    case ???:
-      alpha_type = ALPHA_R_OP_STORE;
-      break;
-    case ???:
-      alpha_type = ALPHA_R_OP_PSUB;
-      break;
-    case ???:
-      alpha_type = ALPHA_R_OP_PRSHIFT;
-      break;
-    case ???:
-      alpha_type = ALPHA_R_GPVALUE;
-      break;
-#endif
-    default:
-      return (reloc_howto_type *) NULL;
-    }
-
-  return &alpha_howto_table[alpha_type];
-}
-
-/* A helper routine for alpha_relocate_section which converts an
-   external reloc when generating relocateable output.  Returns the
-   relocation amount.  */
-
-static bfd_vma
-alpha_convert_external_reloc (output_bfd, info, input_bfd, ext_rel, h)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     struct external_reloc *ext_rel;
-     struct ecoff_link_hash_entry *h;
-{
-  unsigned long r_symndx;
-  bfd_vma relocation;
-
-  BFD_ASSERT (info->relocateable);
-
-  if (h->root.type == bfd_link_hash_defined
-      || h->root.type == bfd_link_hash_defweak)
-    {
-      asection *hsec;
-      const char *name;
-
-      /* This symbol is defined in the output.  Convert the reloc from
-	 being against the symbol to being against the section.  */
-
-      /* Clear the r_extern bit.  */
-      ext_rel->r_bits[1] &=~ RELOC_BITS1_EXTERN_LITTLE;
-
-      /* Compute a new r_symndx value.  */
-      hsec = h->root.u.def.section;
-      name = bfd_get_section_name (output_bfd, hsec->output_section);
-
-      r_symndx = -1;
-      switch (name[1])
-	{
-	case 'A':
-	  if (strcmp (name, "*ABS*") == 0)
-	    r_symndx = RELOC_SECTION_ABS;
-	  break;
-	case 'b':
-	  if (strcmp (name, ".bss") == 0)
-	    r_symndx = RELOC_SECTION_BSS;
-	  break;
-	case 'd':
-	  if (strcmp (name, ".data") == 0)
-	    r_symndx = RELOC_SECTION_DATA;
-	  break;
-	case 'f':
-	  if (strcmp (name, ".fini") == 0)
-	    r_symndx = RELOC_SECTION_FINI;
-	  break;
-	case 'i':
-	  if (strcmp (name, ".init") == 0)
-	    r_symndx = RELOC_SECTION_INIT;
-	  break;
-	case 'l':
-	  if (strcmp (name, ".lita") == 0)
-	    r_symndx = RELOC_SECTION_LITA;
-	  else if (strcmp (name, ".lit8") == 0)
-	    r_symndx = RELOC_SECTION_LIT8;
-	  else if (strcmp (name, ".lit4") == 0)
-	    r_symndx = RELOC_SECTION_LIT4;
-	  break;
-	case 'p':
-	  if (strcmp (name, ".pdata") == 0)
-	    r_symndx = RELOC_SECTION_PDATA;
-	  break;
-	case 'r':
-	  if (strcmp (name, ".rdata") == 0)
-	    r_symndx = RELOC_SECTION_RDATA;
-	  else if (strcmp (name, ".rconst") == 0)
-	    r_symndx = RELOC_SECTION_RCONST;
-	  break;
-	case 's':
-	  if (strcmp (name, ".sdata") == 0)
-	    r_symndx = RELOC_SECTION_SDATA;
-	  else if (strcmp (name, ".sbss") == 0)
-	    r_symndx = RELOC_SECTION_SBSS;
-	  break;
-	case 't':
-	  if (strcmp (name, ".text") == 0)
-	    r_symndx = RELOC_SECTION_TEXT;
-	  break;
-	case 'x':
-	  if (strcmp (name, ".xdata") == 0)
-	    r_symndx = RELOC_SECTION_XDATA;
-	  break;
-	}
-		      
-      if (r_symndx == -1)
-	abort ();
-
-      /* Add the section VMA and the symbol value.  */
-      relocation = (h->root.u.def.value
-		    + hsec->output_section->vma
-		    + hsec->output_offset);
-    }
-  else
-    {
-      /* Change the symndx value to the right one for
-	 the output BFD.  */
-      r_symndx = h->indx;
-      if (r_symndx == -1)
-	{
-	  /* Caller must give an error.  */
-	  r_symndx = 0;
-	}
-      relocation = 0;
-    }
-
-  /* Write out the new r_symndx value.  */
-  bfd_h_put_32 (input_bfd, (bfd_vma) r_symndx,
-		(bfd_byte *) ext_rel->r_symndx);
-
-  return relocation;
-}
-
-/* Relocate a section while linking an Alpha ECOFF file.  This is
-   quite similar to get_relocated_section_contents.  Perhaps they
-   could be combined somehow.  */
-
-static boolean
-alpha_relocate_section (output_bfd, info, input_bfd, input_section,
-			contents, external_relocs)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     PTR external_relocs;
-{
-  asection **symndx_to_section, *lita_sec;
-  struct ecoff_link_hash_entry **sym_hashes;
-  bfd_vma gp;
-  boolean gp_undefined;
-  bfd_vma stack[RELOC_STACKSIZE];
-  int tos = 0;
-  struct external_reloc *ext_rel;
-  struct external_reloc *ext_rel_end;
-
-  /* We keep a table mapping the symndx found in an internal reloc to
-     the appropriate section.  This is faster than looking up the
-     section by name each time.  */
-  symndx_to_section = ecoff_data (input_bfd)->symndx_to_section;
-  if (symndx_to_section == (asection **) NULL)
-    {
-      symndx_to_section = ((asection **)
-			   bfd_alloc (input_bfd,
-				      (NUM_RELOC_SECTIONS
-				       * sizeof (asection *))));
-      if (!symndx_to_section)
-	return false;
-
-      symndx_to_section[RELOC_SECTION_NONE] = NULL;
-      symndx_to_section[RELOC_SECTION_TEXT] =
-	bfd_get_section_by_name (input_bfd, ".text");
-      symndx_to_section[RELOC_SECTION_RDATA] =
-	bfd_get_section_by_name (input_bfd, ".rdata");
-      symndx_to_section[RELOC_SECTION_DATA] =
-	bfd_get_section_by_name (input_bfd, ".data");
-      symndx_to_section[RELOC_SECTION_SDATA] =
-	bfd_get_section_by_name (input_bfd, ".sdata");
-      symndx_to_section[RELOC_SECTION_SBSS] =
-	bfd_get_section_by_name (input_bfd, ".sbss");
-      symndx_to_section[RELOC_SECTION_BSS] =
-	bfd_get_section_by_name (input_bfd, ".bss");
-      symndx_to_section[RELOC_SECTION_INIT] =
-	bfd_get_section_by_name (input_bfd, ".init");
-      symndx_to_section[RELOC_SECTION_LIT8] =
-	bfd_get_section_by_name (input_bfd, ".lit8");
-      symndx_to_section[RELOC_SECTION_LIT4] =
-	bfd_get_section_by_name (input_bfd, ".lit4");
-      symndx_to_section[RELOC_SECTION_XDATA] =
-	bfd_get_section_by_name (input_bfd, ".xdata");
-      symndx_to_section[RELOC_SECTION_PDATA] =
-	bfd_get_section_by_name (input_bfd, ".pdata");
-      symndx_to_section[RELOC_SECTION_FINI] =
-	bfd_get_section_by_name (input_bfd, ".fini");
-      symndx_to_section[RELOC_SECTION_LITA] =
-	bfd_get_section_by_name (input_bfd, ".lita");
-      symndx_to_section[RELOC_SECTION_ABS] = bfd_abs_section_ptr;
-      symndx_to_section[RELOC_SECTION_RCONST] =
-	bfd_get_section_by_name (input_bfd, ".rconst");
-
-      ecoff_data (input_bfd)->symndx_to_section = symndx_to_section;
-    }
-
-  sym_hashes = ecoff_data (input_bfd)->sym_hashes;
-
-  /* On the Alpha, the .lita section must be addressable by the global
-     pointer.  To support large programs, we need to allow multiple
-     global pointers.  This works as long as each input .lita section
-     is <64KB big.  This implies that when producing relocatable
-     output, the .lita section is limited to 64KB. . */
-
-  lita_sec = symndx_to_section[RELOC_SECTION_LITA];
-  gp = _bfd_get_gp_value (output_bfd);
-  if (! info->relocateable && lita_sec != NULL)
-    {
-      struct ecoff_section_tdata *lita_sec_data;
-
-      /* Make sure we have a section data structure to which we can
-	 hang on to the gp value we pick for the section.  */
-      lita_sec_data = ecoff_section_data (input_bfd, lita_sec);
-      if (lita_sec_data == NULL)
-	{
-	  lita_sec_data = ((struct ecoff_section_tdata *)
-			   bfd_zalloc (input_bfd,
-				       sizeof (struct ecoff_section_tdata)));
-	  ecoff_section_data (input_bfd, lita_sec) = lita_sec_data;
-	}
-
-      if (lita_sec_data->gp != 0)
-	{
-	  /* If we already assigned a gp to this section, we better
-	     stick with that value.  */
-	  gp = lita_sec_data->gp;
-	}
-      else
-	{
-	  bfd_vma lita_vma;
-	  bfd_size_type lita_size;
-
-	  lita_vma = lita_sec->output_offset + lita_sec->output_section->vma;
-	  lita_size = lita_sec->_cooked_size;
-	  if (lita_size == 0)
-	    lita_size = lita_sec->_raw_size;
-
-	  if (gp == 0
-	      || lita_vma <  gp - 0x8000
-	      || lita_vma + lita_size >= gp + 0x8000)
-	    {
-	      /* Either gp hasn't been set at all or the current gp
-		 cannot address this .lita section.  In both cases we
-		 reset the gp to point into the "middle" of the
-		 current input .lita section.  */
-	      if (gp && !ecoff_data (output_bfd)->issued_multiple_gp_warning)
-		{
-		  (*info->callbacks->warning) (info,
-					       _("using multiple gp values"),
-					       (char *) NULL, output_bfd,
-					       (asection *) NULL, (bfd_vma) 0);
-		  ecoff_data (output_bfd)->issued_multiple_gp_warning = true;
-		}
-	      if (lita_vma < gp - 0x8000)
-		gp = lita_vma + lita_size - 0x8000;
-	      else
-		gp = lita_vma + 0x8000;
-
-	    }
-
-	  lita_sec_data->gp = gp;
-	}
-
-      _bfd_set_gp_value (output_bfd, gp);
-    }
-
-  gp_undefined = (gp == 0);
-
-  BFD_ASSERT (bfd_header_little_endian (output_bfd));
-  BFD_ASSERT (bfd_header_little_endian (input_bfd));
-
-  ext_rel = (struct external_reloc *) external_relocs;
-  ext_rel_end = ext_rel + input_section->reloc_count;
-  for (; ext_rel < ext_rel_end; ext_rel++)
-    {
-      bfd_vma r_vaddr;
-      unsigned long r_symndx;
-      int r_type;
-      int r_extern;
-      int r_offset;
-      int r_size;
-      boolean relocatep;
-      boolean adjust_addrp;
-      boolean gp_usedp;
-      bfd_vma addend;
-
-      r_vaddr = bfd_h_get_64 (input_bfd, (bfd_byte *) ext_rel->r_vaddr);
-      r_symndx = bfd_h_get_32 (input_bfd, (bfd_byte *) ext_rel->r_symndx);
-
-      r_type = ((ext_rel->r_bits[0] & RELOC_BITS0_TYPE_LITTLE)
-		>> RELOC_BITS0_TYPE_SH_LITTLE);
-      r_extern = (ext_rel->r_bits[1] & RELOC_BITS1_EXTERN_LITTLE) != 0;
-      r_offset = ((ext_rel->r_bits[1] & RELOC_BITS1_OFFSET_LITTLE)
-		  >> RELOC_BITS1_OFFSET_SH_LITTLE);
-      /* Ignored the reserved bits.  */
-      r_size = ((ext_rel->r_bits[3] & RELOC_BITS3_SIZE_LITTLE)
-		>> RELOC_BITS3_SIZE_SH_LITTLE);
-
-      relocatep = false;
-      adjust_addrp = true;
-      gp_usedp = false;
-      addend = 0;
-
-      switch (r_type)
-	{
-	default:
-	  abort ();
-
-	case ALPHA_R_IGNORE:
-	  /* This reloc appears after a GPDISP reloc.  On earlier
-	     versions of OSF/1, It marked the position of the second
-	     instruction to be altered by the GPDISP reloc, but it is
-	     not otherwise used for anything.  For some reason, the
-	     address of the relocation does not appear to include the
-	     section VMA, unlike the other relocation types.  */
-	  if (info->relocateable)
-	    bfd_h_put_64 (input_bfd,
-			  input_section->output_offset + r_vaddr,
-			  (bfd_byte *) ext_rel->r_vaddr);
-	  adjust_addrp = false;
-	  break;
-
-	case ALPHA_R_REFLONG:
-	case ALPHA_R_REFQUAD:
-	case ALPHA_R_HINT:
-	  relocatep = true;
-	  break;
-
-	case ALPHA_R_BRADDR:
-	case ALPHA_R_SREL16:
-	case ALPHA_R_SREL32:
-	case ALPHA_R_SREL64:
-	  if (r_extern)
-	    addend += - (r_vaddr + 4);
-	  relocatep = true;
-	  break;
-
-	case ALPHA_R_GPREL32:
-	  /* This relocation is used in a switch table.  It is a 32
-	     bit offset from the current GP value.  We must adjust it
-	     by the different between the original GP value and the
-	     current GP value.  */
-	  relocatep = true;
-	  addend = ecoff_data (input_bfd)->gp - gp;
-	  gp_usedp = true;
-	  break;
-
-	case ALPHA_R_LITERAL:
-	  /* This is a reference to a literal value, generally
-	     (always?) in the .lita section.  This is a 16 bit GP
-	     relative relocation.  Sometimes the subsequent reloc is a
-	     LITUSE reloc, which indicates how this reloc is used.
-	     This sometimes permits rewriting the two instructions
-	     referred to by the LITERAL and the LITUSE into different
-	     instructions which do not refer to .lita.  This can save
-	     a memory reference, and permits removing a value from
-	     .lita thus saving GP relative space.
-
-	     We do not these optimizations.  To do them we would need
-	     to arrange to link the .lita section first, so that by
-	     the time we got here we would know the final values to
-	     use.  This would not be particularly difficult, but it is
-	     not currently implemented.  */
-
-	  /* I believe that the LITERAL reloc will only apply to a ldq
-	     or ldl instruction, so check my assumption.  */
-	  {
-	    unsigned long insn;
-
-	    insn = bfd_get_32 (input_bfd,
-			       contents + r_vaddr - input_section->vma);
-	    BFD_ASSERT (((insn >> 26) & 0x3f) == 0x29
-			|| ((insn >> 26) & 0x3f) == 0x28);
-	  }
-
-	  relocatep = true;
-	  addend = ecoff_data (input_bfd)->gp - gp;
-	  gp_usedp = true;
-	  break;
-
-	case ALPHA_R_LITUSE:
-	  /* See ALPHA_R_LITERAL above for the uses of this reloc.  It
-	     does not cause anything to happen, itself.  */
-	  break;
-	    
-	case ALPHA_R_GPDISP:
-	  /* This marks the ldah of an ldah/lda pair which loads the
-	     gp register with the difference of the gp value and the
-	     current location.  The second of the pair is r_symndx
-	     bytes ahead.  It used to be marked with an ALPHA_R_IGNORE
-	     reloc, but OSF/1 3.2 no longer does that.  */
-	  {
-	    unsigned long insn1, insn2;
-
-	    /* Get the two instructions.  */
-	    insn1 = bfd_get_32 (input_bfd,
-				contents + r_vaddr - input_section->vma);
-	    insn2 = bfd_get_32 (input_bfd,
-				(contents
-				 + r_vaddr
-				 - input_section->vma
-				 + r_symndx));
-
-	    BFD_ASSERT (((insn1 >> 26) & 0x3f) == 0x09); /* ldah */
-	    BFD_ASSERT (((insn2 >> 26) & 0x3f) == 0x08); /* lda */
-
-	    /* Get the existing addend.  We must account for the sign
-	       extension done by lda and ldah.  */
-	    addend = ((insn1 & 0xffff) << 16) + (insn2 & 0xffff);
-	    if (insn1 & 0x8000)
-	      {
-		/* This is addend -= 0x100000000 without causing an
-		   integer overflow on a 32 bit host.  */
-		addend -= 0x80000000;
-		addend -= 0x80000000;
-	      }
-	    if (insn2 & 0x8000)
-	      addend -= 0x10000;
-
-	    /* The existing addend includes the difference between the
-	       gp of the input BFD and the address in the input BFD.
-	       We want to change this to the difference between the
-	       final GP and the final address.  */
-	    addend += (gp
-		       - ecoff_data (input_bfd)->gp
-		       + input_section->vma
-		       - (input_section->output_section->vma
-			  + input_section->output_offset));
-
-	    /* Change the instructions, accounting for the sign
-	       extension, and write them out.  */
-	    if (addend & 0x8000)
-	      addend += 0x10000;
-	    insn1 = (insn1 & 0xffff0000) | ((addend >> 16) & 0xffff);
-	    insn2 = (insn2 & 0xffff0000) | (addend & 0xffff);
-
-	    bfd_put_32 (input_bfd, (bfd_vma) insn1,
-			contents + r_vaddr - input_section->vma);
-	    bfd_put_32 (input_bfd, (bfd_vma) insn2,
-			contents + r_vaddr - input_section->vma + r_symndx);
-
-	    gp_usedp = true;
-	  }
-	  break;
-	  
-	case ALPHA_R_OP_PUSH:
-	case ALPHA_R_OP_PSUB:
-	case ALPHA_R_OP_PRSHIFT:
-	  /* Manipulate values on the reloc evaluation stack.  The
-	     r_vaddr field is not an address in input_section, it is
-	     the current value (including any addend) of the object
-	     being used.  */
-	  if (! r_extern)
-	    {
-	      asection *s;
-
-	      s = symndx_to_section[r_symndx];
-	      if (s == (asection *) NULL)
-		abort ();
-	      addend = s->output_section->vma + s->output_offset - s->vma;
-	    }
-	  else
-	    {
-	      struct ecoff_link_hash_entry *h;
-
-	      h = sym_hashes[r_symndx];
-	      if (h == (struct ecoff_link_hash_entry *) NULL)
-		abort ();
-
-	      if (! info->relocateable)
-		{
-		  if (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak)
-		    addend = (h->root.u.def.value
-			      + h->root.u.def.section->output_section->vma
-			      + h->root.u.def.section->output_offset);
-		  else
-		    {
-		      /* Note that we pass the address as 0, since we
-			 do not have a meaningful number for the
-			 location within the section that is being
-			 relocated.  */
-		      if (! ((*info->callbacks->undefined_symbol)
-			     (info, h->root.root.string, input_bfd,
-			      input_section, (bfd_vma) 0)))
-			return false;
-		      addend = 0;
-		    }
-		}
-	      else
-		{
-		  if (h->root.type != bfd_link_hash_defined
-		      && h->root.type != bfd_link_hash_defweak
-		      && h->indx == -1)
-		    {
-		      /* This symbol is not being written out.  Pass
-			 the address as 0, as with undefined_symbol,
-			 above.  */
-		      if (! ((*info->callbacks->unattached_reloc)
-			     (info, h->root.root.string, input_bfd,
-			      input_section, (bfd_vma) 0)))
-			return false;
-		    }
-
-		  addend = alpha_convert_external_reloc (output_bfd, info,
-							 input_bfd,
-							 ext_rel, h);
-		}
-	    }
-
-	  addend += r_vaddr;
-
-	  if (info->relocateable)
-	    {
-	      /* Adjust r_vaddr by the addend.  */
-	      bfd_h_put_64 (input_bfd, addend,
-			    (bfd_byte *) ext_rel->r_vaddr);
-	    }
-	  else
-	    {
-	      switch (r_type)
-		{
-		case ALPHA_R_OP_PUSH:
-		  if (tos >= RELOC_STACKSIZE)
-		    abort ();
-		  stack[tos++] = addend;
-		  break;
-
-		case ALPHA_R_OP_PSUB:
-		  if (tos == 0)
-		    abort ();
-		  stack[tos - 1] -= addend;
-		  break;
-
-		case ALPHA_R_OP_PRSHIFT:
-		  if (tos == 0)
-		    abort ();
-		  stack[tos - 1] >>= addend;
-		  break;
-		}
-	    }
-
-	  adjust_addrp = false;
-	  break;
-
-	case ALPHA_R_OP_STORE:
-	  /* Store a value from the reloc stack into a bitfield.  If
-	     we are generating relocateable output, all we do is
-	     adjust the address of the reloc.  */
-	  if (! info->relocateable)
-	    {
-	      bfd_vma mask;
-	      bfd_vma val;
-
-	      if (tos == 0)
-		abort ();
-
-	      /* Get the relocation mask.  The separate steps and the
-		 casts to bfd_vma are attempts to avoid a bug in the
-		 Alpha OSF 1.3 C compiler.  See reloc.c for more
-		 details.  */
-	      mask = 1;
-	      mask <<= (bfd_vma) r_size;
-	      mask -= 1;
-
-	      /* FIXME: I don't know what kind of overflow checking,
-		 if any, should be done here.  */
-	      val = bfd_get_64 (input_bfd,
-				contents + r_vaddr - input_section->vma);
-	      val &=~ mask << (bfd_vma) r_offset;
-	      val |= (stack[--tos] & mask) << (bfd_vma) r_offset;
-	      bfd_put_64 (input_bfd, val,
-			  contents + r_vaddr - input_section->vma);
-	    }
-	  break;
-
-	case ALPHA_R_GPVALUE:
-	  /* I really don't know if this does the right thing.  */
-	  gp = ecoff_data (input_bfd)->gp + r_symndx;
-	  gp_undefined = false;
-	  break;
-	}
-
-      if (relocatep)
-	{
-	  reloc_howto_type *howto;
-	  struct ecoff_link_hash_entry *h = NULL;
-	  asection *s = NULL;
-	  bfd_vma relocation;
-	  bfd_reloc_status_type r;
-
-	  /* Perform a relocation.  */
-
-	  howto = &alpha_howto_table[r_type];
-
-	  if (r_extern)
-	    {
-	      h = sym_hashes[r_symndx];
-	      /* If h is NULL, that means that there is a reloc
-		 against an external symbol which we thought was just
-		 a debugging symbol.  This should not happen.  */
-	      if (h == (struct ecoff_link_hash_entry *) NULL)
-		abort ();
-	    }
-	  else
-	    {
-	      if (r_symndx >= NUM_RELOC_SECTIONS)
-		s = NULL;
-	      else
-		s = symndx_to_section[r_symndx];
-
-	      if (s == (asection *) NULL)
-		abort ();
-	    }
-
-	  if (info->relocateable)
-	    {
-	      /* We are generating relocateable output, and must
-		 convert the existing reloc.  */
-	      if (r_extern)
-		{
-		  if (h->root.type != bfd_link_hash_defined
-		      && h->root.type != bfd_link_hash_defweak
-		      && h->indx == -1)
-		    {
-		      /* This symbol is not being written out.  */
-		      if (! ((*info->callbacks->unattached_reloc)
-			     (info, h->root.root.string, input_bfd,
-			      input_section, r_vaddr - input_section->vma)))
-			return false;
-		    }
-
-		  relocation = alpha_convert_external_reloc (output_bfd,
-							     info,
-							     input_bfd,
-							     ext_rel,
-							     h);
-		}
-	      else
-		{
-		  /* This is a relocation against a section.  Adjust
-		     the value by the amount the section moved.  */
-		  relocation = (s->output_section->vma
-				+ s->output_offset
-				- s->vma);
-		}
-
-	      /* If this is PC relative, the existing object file
-		 appears to already have the reloc worked out.  We
-		 must subtract out the old value and add in the new
-		 one.  */
-	      if (howto->pc_relative)
-		relocation -= (input_section->output_section->vma
-			       + input_section->output_offset
-			       - input_section->vma);
-
-	      /* Put in any addend.  */
-	      relocation += addend;
-
-	      /* Adjust the contents.  */
-	      r = _bfd_relocate_contents (howto, input_bfd, relocation,
-					  (contents
-					   + r_vaddr
-					   - input_section->vma));
-	    }
-	  else
-	    {
-	      /* We are producing a final executable.  */
-	      if (r_extern)
-		{
-		  /* This is a reloc against a symbol.  */
-		  if (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak)
-		    {
-		      asection *hsec;
-
-		      hsec = h->root.u.def.section;
-		      relocation = (h->root.u.def.value
-				    + hsec->output_section->vma
-				    + hsec->output_offset);
-		    }
-		  else
-		    {
-		      if (! ((*info->callbacks->undefined_symbol)
-			     (info, h->root.root.string, input_bfd,
-			      input_section,
-			      r_vaddr - input_section->vma)))
-			return false;
-		      relocation = 0;
-		    }
-		}
-	      else
-		{
-		  /* This is a reloc against a section.  */
-		  relocation = (s->output_section->vma
-				+ s->output_offset
-				- s->vma);
-
-		  /* Adjust a PC relative relocation by removing the
-		     reference to the original source section.  */
-		  if (howto->pc_relative)
-		    relocation += input_section->vma;
-		}
-
-	      r = _bfd_final_link_relocate (howto,
-					    input_bfd,
-					    input_section,
-					    contents,
-					    r_vaddr - input_section->vma,
-					    relocation,
-					    addend);
-	    }
-
-	  if (r != bfd_reloc_ok)
-	    {
-	      switch (r)
-		{
-		default:
-		case bfd_reloc_outofrange:
-		  abort ();
-		case bfd_reloc_overflow:
-		  {
-		    const char *name;
-
-		    if (r_extern)
-		      name = sym_hashes[r_symndx]->root.root.string;
-		    else
-		      name = bfd_section_name (input_bfd,
-					       symndx_to_section[r_symndx]);
-		    if (! ((*info->callbacks->reloc_overflow)
-			   (info, name, alpha_howto_table[r_type].name,
-			    (bfd_vma) 0, input_bfd, input_section,
-			    r_vaddr - input_section->vma)))
-		      return false;
-		  }
-		  break;
-		}
-	    }
-	}
-
-      if (info->relocateable && adjust_addrp)
-	{
-	  /* Change the address of the relocation.  */
-	  bfd_h_put_64 (input_bfd,
-			(input_section->output_section->vma
-			 + input_section->output_offset
-			 - input_section->vma
-			 + r_vaddr),
-			(bfd_byte *) ext_rel->r_vaddr);
-	}
-
-      if (gp_usedp && gp_undefined)
-	{
-	  if (! ((*info->callbacks->reloc_dangerous)
-		 (info, _("GP relative relocation when GP not defined"),
-		  input_bfd, input_section, r_vaddr - input_section->vma)))
-	    return false;
-	  /* Only give the error once per link.  */
-	  gp = 4;
-	  _bfd_set_gp_value (output_bfd, gp);
-	  gp_undefined = false;
-	}
-    }
-
-  if (tos != 0)
-    abort ();
-
-  return true;
-}
-
-/* Do final adjustments to the filehdr and the aouthdr.  This routine
-   sets the dynamic bits in the file header.  */
-
-/*ARGSUSED*/
-static boolean
-alpha_adjust_headers (abfd, fhdr, ahdr)
-     bfd *abfd;
-     struct internal_filehdr *fhdr;
-     struct internal_aouthdr *ahdr;
-{
-  if ((abfd->flags & (DYNAMIC | EXEC_P)) == (DYNAMIC | EXEC_P))
-    fhdr->f_flags |= F_ALPHA_CALL_SHARED;
-  else if ((abfd->flags & DYNAMIC) != 0)
-    fhdr->f_flags |= F_ALPHA_SHARABLE;
-  return true;
-}
-
-/* Archive handling.  In OSF/1 (or Digital Unix) v3.2, Digital
-   introduced archive packing, in which the elements in an archive are
-   optionally compressed using a simple dictionary scheme.  We know
-   how to read such archives, but we don't write them.  */
-
-#define alpha_ecoff_slurp_armap _bfd_ecoff_slurp_armap
-#define alpha_ecoff_slurp_extended_name_table \
-  _bfd_ecoff_slurp_extended_name_table
-#define alpha_ecoff_construct_extended_name_table \
-  _bfd_ecoff_construct_extended_name_table
-#define alpha_ecoff_truncate_arname _bfd_ecoff_truncate_arname
-#define alpha_ecoff_write_armap _bfd_ecoff_write_armap
-#define alpha_ecoff_generic_stat_arch_elt _bfd_ecoff_generic_stat_arch_elt
-#define alpha_ecoff_update_armap_timestamp _bfd_ecoff_update_armap_timestamp
-
-/* A compressed file uses this instead of ARFMAG.  */
-
-#define ARFZMAG "Z\012"
-
-/* Read an archive header.  This is like the standard routine, but it
-   also accepts ARFZMAG.  */
-
-static PTR
-alpha_ecoff_read_ar_hdr (abfd)
-     bfd *abfd;
-{
-  struct areltdata *ret;
-  struct ar_hdr *h;
-
-  ret = (struct areltdata *) _bfd_generic_read_ar_hdr_mag (abfd, ARFZMAG);
-  if (ret == NULL)
-    return NULL;
-
-  h = (struct ar_hdr *) ret->arch_header;
-  if (strncmp (h->ar_fmag, ARFZMAG, 2) == 0)
-    {
-      bfd_byte ab[8];
-
-      /* This is a compressed file.  We must set the size correctly.
-         The size is the eight bytes after the dummy file header.  */
-      if (bfd_seek (abfd, FILHSZ, SEEK_CUR) != 0
-	  || bfd_read (ab, 1, 8, abfd) != 8
-	  || bfd_seek (abfd, - (FILHSZ + 8), SEEK_CUR) != 0)
-	return NULL;
-
-      ret->parsed_size = bfd_h_get_64 (abfd, ab);
-    }
-
-  return (PTR) ret;
-}
-
-/* Get an archive element at a specified file position.  This is where
-   we uncompress the archive element if necessary.  */
-
-static bfd *
-alpha_ecoff_get_elt_at_filepos (archive, filepos)
-     bfd *archive;
-     file_ptr filepos;
-{
-  bfd *nbfd = NULL;
-  struct areltdata *tdata;
-  struct ar_hdr *hdr;
-  bfd_byte ab[8];
-  bfd_size_type size;
-  bfd_byte *buf, *p;
-  struct bfd_in_memory *bim;
-
-  nbfd = _bfd_get_elt_at_filepos (archive, filepos);
-  if (nbfd == NULL)
-    goto error_return;
-
-  if ((nbfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      /* We have already expanded this BFD.  */
-      return nbfd;
-    }
-
-  tdata = (struct areltdata *) nbfd->arelt_data;
-  hdr = (struct ar_hdr *) tdata->arch_header;
-  if (strncmp (hdr->ar_fmag, ARFZMAG, 2) != 0)
-    return nbfd;
-
-  /* We must uncompress this element.  We do this by copying it into a
-     memory buffer, and making bfd_read and bfd_seek use that buffer.
-     This can use a lot of memory, but it's simpler than getting a
-     temporary file, making that work with the file descriptor caching
-     code, and making sure that it is deleted at all appropriate
-     times.  It can be changed if it ever becomes important.  */
-
-  /* The compressed file starts with a dummy ECOFF file header.  */
-  if (bfd_seek (nbfd, FILHSZ, SEEK_SET) != 0)
-    goto error_return;
-
-  /* The next eight bytes are the real file size.  */
-  if (bfd_read (ab, 1, 8, nbfd) != 8)
-    goto error_return;
-  size = bfd_h_get_64 (nbfd, ab);
-
-  if (size == 0)
-    buf = NULL;
-  else
-    {
-      bfd_size_type left;
-      bfd_byte dict[4096];
-      unsigned int h;
-      bfd_byte b;
-
-      buf = (bfd_byte *) bfd_alloc (nbfd, size);
-      if (buf == NULL)
-	goto error_return;
-      p = buf;
-
-      left = size;
-
-      /* I don't know what the next eight bytes are for. */
-      if (bfd_read (ab, 1, 8, nbfd) != 8)
-	goto error_return;
-
-      /* This is the uncompression algorithm.  It's a simple
-	 dictionary based scheme in which each character is predicted
-	 by a hash of the previous three characters.  A control byte
-	 indicates whether the character is predicted or whether it
-	 appears in the input stream; each control byte manages the
-	 next eight bytes in the output stream.  */
-      memset (dict, 0, sizeof dict);
-      h = 0;
-      while (bfd_read (&b, 1, 1, nbfd) == 1)
-	{
-	  unsigned int i;
-
-	  for (i = 0; i < 8; i++, b >>= 1)
-	    {
-	      bfd_byte n;
-
-	      if ((b & 1) == 0)
-		n = dict[h];
-	      else
-		{
-		  if (! bfd_read (&n, 1, 1, nbfd))
-		    goto error_return;
-		  dict[h] = n;
-		}
-
-	      *p++ = n;
-
-	      --left;
-	      if (left == 0)
-		break;
-
-	      h <<= 4;
-	      h ^= n;
-	      h &= sizeof dict - 1;
-	    }
-
-	  if (left == 0)
-	    break;
-	}
-    }
-
-  /* Now the uncompressed file contents are in buf.  */
-  bim = ((struct bfd_in_memory *)
-	 bfd_alloc (nbfd, sizeof (struct bfd_in_memory)));
-  if (bim == NULL)
-    goto error_return;
-  bim->size = size;
-  bim->buffer = buf;
-
-  nbfd->mtime_set = true;
-  nbfd->mtime = strtol (hdr->ar_date, (char **) NULL, 10);
-
-  nbfd->flags |= BFD_IN_MEMORY;
-  nbfd->iostream = (PTR) bim;
-  BFD_ASSERT (! nbfd->cacheable);
-
-  return nbfd;
-
- error_return:
-  if (nbfd != NULL)
-    bfd_close (nbfd);
-  return NULL;  
-}
-
-/* Open the next archived file.  */
-
-static bfd *
-alpha_ecoff_openr_next_archived_file (archive, last_file)
-     bfd *archive;
-     bfd *last_file;
-{
-  file_ptr filestart;
-
-  if (last_file == NULL)
-    filestart = bfd_ardata (archive)->first_file_filepos;
-  else
-    {
-      struct areltdata *t;
-      struct ar_hdr *h;
-      bfd_size_type size;
-
-      /* We can't use arelt_size here, because that uses parsed_size,
-         which is the uncompressed size.  We need the compressed size.  */
-      t = (struct areltdata *) last_file->arelt_data;
-      h = (struct ar_hdr *) t->arch_header;
-      size = strtol (h->ar_size, (char **) NULL, 10);
-
-      /* Pad to an even boundary...
-	 Note that last_file->origin can be odd in the case of
-	 BSD-4.4-style element with a long odd size. */
-      filestart = last_file->origin + size;
-      filestart += filestart % 2;
-    }
-
-  return alpha_ecoff_get_elt_at_filepos (archive, filestart);
-}
-
-/* Open the archive file given an index into the armap.  */
-
-static bfd *
-alpha_ecoff_get_elt_at_index (abfd, index)
-     bfd *abfd;
-     symindex index;
-{
-  carsym *entry;
-
-  entry = bfd_ardata (abfd)->symdefs + index;
-  return alpha_ecoff_get_elt_at_filepos (abfd, entry->file_offset);
-}
-
-/* This is the ECOFF backend structure.  The backend field of the
-   target vector points to this.  */
-
-static const struct ecoff_backend_data alpha_ecoff_backend_data =
-{
-  /* COFF backend structure.  */
-  {
-    (void (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR))) bfd_void, /* aux_in */
-    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_in */
-    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_in */
-    (unsigned (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR)))bfd_void,/*aux_out*/
-    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_out */
-    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_out */
-    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* reloc_out */
-    alpha_ecoff_swap_filehdr_out, alpha_ecoff_swap_aouthdr_out,
-    alpha_ecoff_swap_scnhdr_out,
-    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, true, false, 4,
-    alpha_ecoff_swap_filehdr_in, alpha_ecoff_swap_aouthdr_in,
-    alpha_ecoff_swap_scnhdr_in, NULL,
-    alpha_ecoff_bad_format_hook, _bfd_ecoff_set_arch_mach_hook,
-    alpha_ecoff_mkobject_hook, _bfd_ecoff_styp_to_sec_flags,
-    _bfd_ecoff_set_alignment_hook, _bfd_ecoff_slurp_symbol_table,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-  },
-  /* Supported architecture.  */
-  bfd_arch_alpha,
-  /* Initial portion of armap string.  */
-  "________64",
-  /* The page boundary used to align sections in a demand-paged
-     executable file.  E.g., 0x1000.  */
-  0x2000,
-  /* True if the .rdata section is part of the text segment, as on the
-     Alpha.  False if .rdata is part of the data segment, as on the
-     MIPS.  */
-  true,
-  /* Bitsize of constructor entries.  */
-  64,
-  /* Reloc to use for constructor entries.  */
-  &alpha_howto_table[ALPHA_R_REFQUAD],
-  {
-    /* Symbol table magic number.  */
-    magicSym2,
-    /* Alignment of debugging information.  E.g., 4.  */
-    8,
-    /* Sizes of external symbolic information.  */
-    sizeof (struct hdr_ext),
-    sizeof (struct dnr_ext),
-    sizeof (struct pdr_ext),
-    sizeof (struct sym_ext),
-    sizeof (struct opt_ext),
-    sizeof (struct fdr_ext),
-    sizeof (struct rfd_ext),
-    sizeof (struct ext_ext),
-    /* Functions to swap in external symbolic data.  */
-    ecoff_swap_hdr_in,
-    ecoff_swap_dnr_in,
-    ecoff_swap_pdr_in,
-    ecoff_swap_sym_in,
-    ecoff_swap_opt_in,
-    ecoff_swap_fdr_in,
-    ecoff_swap_rfd_in,
-    ecoff_swap_ext_in,
-    _bfd_ecoff_swap_tir_in,
-    _bfd_ecoff_swap_rndx_in,
-    /* Functions to swap out external symbolic data.  */
-    ecoff_swap_hdr_out,
-    ecoff_swap_dnr_out,
-    ecoff_swap_pdr_out,
-    ecoff_swap_sym_out,
-    ecoff_swap_opt_out,
-    ecoff_swap_fdr_out,
-    ecoff_swap_rfd_out,
-    ecoff_swap_ext_out,
-    _bfd_ecoff_swap_tir_out,
-    _bfd_ecoff_swap_rndx_out,
-    /* Function to read in symbolic data.  */
-    _bfd_ecoff_slurp_symbolic_info
-  },
-  /* External reloc size.  */
-  RELSZ,
-  /* Reloc swapping functions.  */
-  alpha_ecoff_swap_reloc_in,
-  alpha_ecoff_swap_reloc_out,
-  /* Backend reloc tweaking.  */
-  alpha_adjust_reloc_in,
-  alpha_adjust_reloc_out,
-  /* Relocate section contents while linking.  */
-  alpha_relocate_section,
-  /* Do final adjustments to filehdr and aouthdr.  */
-  alpha_adjust_headers,
-  /* Read an element from an archive at a given file position.  */
-  alpha_ecoff_get_elt_at_filepos
-};
-
-/* Looking up a reloc type is Alpha specific.  */
-#define _bfd_ecoff_bfd_reloc_type_lookup alpha_bfd_reloc_type_lookup
-
-/* So is getting relocated section contents.  */
-#define _bfd_ecoff_bfd_get_relocated_section_contents \
-  alpha_ecoff_get_relocated_section_contents
-
-/* Handling file windows is generic.  */
-#define _bfd_ecoff_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-/* Relaxing sections is generic.  */
-#define _bfd_ecoff_bfd_relax_section bfd_generic_relax_section
-#define _bfd_ecoff_bfd_gc_sections bfd_generic_gc_sections
-
-const bfd_target ecoffalpha_little_vec =
-{
-  "ecoff-littlealpha",		/* name */
-  bfd_target_ecoff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | DYNAMIC | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-  {_bfd_dummy_target, alpha_ecoff_object_p, /* bfd_check_format */
-     _bfd_ecoff_archive_p, _bfd_dummy_target},
-  {bfd_false, _bfd_ecoff_mkobject,  /* bfd_set_format */
-     _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
-     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (alpha_ecoff),
-     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
-     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
-     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
-     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) &alpha_ecoff_backend_data
-};
diff --git a/bfd/coff-apollo.c b/bfd/coff-apollo.c
deleted file mode 100644
index 253ec8944b8..00000000000
--- a/bfd/coff-apollo.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/* BFD back-end for Apollo 68000 COFF binaries.
-   Copyright 1990, 91, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
-   By Troy Rollo (troy@cbme.unsw.edu.au)
-   Based on m68k standard COFF version Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/apollo.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-#ifdef ONLY_DECLARE_RELOCS
-extern reloc_howto_type apollocoff_howto_table[];
-#else
-reloc_howto_type apollocoff_howto_table[] = 
-{
-  HOWTO(R_RELBYTE,	       0,  0,  	8,  false, 0, complain_overflow_bitfield, 0, "8",	true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_RELWORD,	       0,  1, 	16, false, 0, complain_overflow_bitfield, 0, "16",	true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_RELLONG,	       0,  2, 	32, false, 0, complain_overflow_bitfield, 0, "32",	true, 0xffffffff,0xffffffff, false),
-  HOWTO(R_PCRBYTE,	       0,  0, 	8,  true,  0, complain_overflow_signed, 0, "DISP8",    true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_PCRWORD,	       0,  1, 	16, true,  0, complain_overflow_signed, 0, "DISP16",   true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_PCRLONG,	       0,  2, 	32, true,  0, complain_overflow_signed, 0, "DISP32",   true, 0xffffffff,0xffffffff, false),
-  HOWTO(R_RELLONG_NEG,	       0,  -2, 	32, false, 0, complain_overflow_bitfield, 0, "-32",	true, 0xffffffff,0xffffffff, false),
-};
-#endif /* not ONLY_DECLARE_RELOCS */
-
-#ifndef BADMAG
-#define BADMAG(x) M68KBADMAG(x)
-#endif
-#define APOLLO_M68 1		/* Customize coffcode.h */
-
-/* Turn a howto into a reloc number */
-
-#ifdef ONLY_DECLARE_RELOCS
-extern void apollo_rtype2howto PARAMS ((arelent *internal, int relocentry));
-extern int apollo_howto2rtype PARAMS ((reloc_howto_type *));
-#else
-void
-apollo_rtype2howto(internal, relocentry)
-     arelent *internal;
-     int relocentry;
-{
-  switch (relocentry) 
-  {
-   case R_RELBYTE:	internal->howto = apollocoff_howto_table + 0; break;
-   case R_RELWORD:	internal->howto = apollocoff_howto_table + 1; break;
-   case R_RELLONG:	internal->howto = apollocoff_howto_table + 2; break;
-   case R_PCRBYTE:	internal->howto = apollocoff_howto_table + 3; break;
-   case R_PCRWORD:	internal->howto = apollocoff_howto_table + 4; break;
-   case R_PCRLONG:	internal->howto = apollocoff_howto_table + 5; break;
-   case R_RELLONG_NEG:	internal->howto = apollocoff_howto_table + 6; break;
-  }
-}
-
-int 
-apollo_howto2rtype (internal)
-     reloc_howto_type *internal;
-{
-  if (internal->pc_relative) 
-  {
-    switch (internal->bitsize) 
-    {
-     case 32: return R_PCRLONG;
-     case 16: return R_PCRWORD;
-     case 8: return R_PCRBYTE;
-    }
-  }
-  else
-  {
-    switch (internal->bitsize)
-     {
-      case 32: return R_RELLONG;
-      case 16: return R_RELWORD;
-      case 8: return R_RELBYTE;
-     }
-  }
-  return R_RELLONG;    
-}
-#endif /* not ONLY_DECLARE_RELOCS */
-
-#define RTYPE2HOWTO(internal, relocentry) \
-  apollo_rtype2howto(internal, (relocentry)->r_type)
-
-#define SELECT_RELOC(external, internal) \
-  external.r_type = apollo_howto2rtype(internal);
-
-#include "coffcode.h"
-
-const bfd_target 
-#ifdef TARGET_SYM
-  TARGET_SYM =
-#else
-  apollocoff_vec =
-#endif
-{
-#ifdef TARGET_NAME
-  TARGET_NAME,
-#else
-  "apollo-m68k",			/* name */
-#endif
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-#ifdef NAMES_HAVE_UNDERSCORE
-  '_',
-#else
-  0,				/* leading underscore */
-#endif
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-   bfd_false},
- {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE
- };
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
deleted file mode 100644
index d478ce5f98c..00000000000
--- a/bfd/coff-arm.c
+++ /dev/null
@@ -1,2557 +0,0 @@
-/* BFD back-end for ARM COFF files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include "coff/arm.h"
-
-#include "coff/internal.h"
-
-#ifdef COFF_WITH_PE
-#include "coff/pe.h"
-#endif
-
-#include "libcoff.h"
-
-/* Macros for manipulation the bits in the flags field of the coff data
-   structure.  */
-#define APCS_26_FLAG(       abfd )	(coff_data (abfd)->flags & F_APCS_26)
-#define APCS_FLOAT_FLAG(    abfd )	(coff_data (abfd)->flags & F_APCS_FLOAT)
-#define PIC_FLAG(           abfd )	(coff_data (abfd)->flags & F_PIC)
-#define APCS_SET(           abfd )	(coff_data (abfd)->flags & F_APCS_SET)
-#define SET_APCS_FLAGS(     abfd, flgs)	(coff_data (abfd)->flags = \
-					(coff_data (abfd)->flags & ~ (F_APCS_26 | F_APCS_FLOAT | F_PIC)) \
-					 | (flgs | F_APCS_SET))
-#define INTERWORK_FLAG(     abfd ) 	(coff_data (abfd)->flags & F_INTERWORK)
-#define INTERWORK_SET(      abfd ) 	(coff_data (abfd)->flags & F_INTERWORK_SET)
-#define SET_INTERWORK_FLAG( abfd, flg )	(coff_data (abfd)->flags = \
-					(coff_data (abfd)->flags & ~ F_INTERWORK) \
-					 | (flg | F_INTERWORK_SET))
-     
-typedef enum {bunknown, b9, b12, b23} thumb_pcrel_branchtype;
-/* some typedefs for holding instructions */
-typedef unsigned long int insn32;
-typedef unsigned short int insn16;
-
-
-     /* Forward declarations for stupid compilers.  */
-static boolean coff_arm_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-           struct internal_reloc *, struct internal_syment *, asection **));
-static bfd_reloc_status_type aoutarm_fix_pcrel_26_done
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type aoutarm_fix_pcrel_26
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_thumb_pcrel_23
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_thumb_pcrel_12
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_thumb_pcrel_9
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_arm_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean coff_arm_adjust_symndx
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *,
-	   asection *, struct internal_reloc *,	boolean *));
-static reloc_howto_type * coff_arm_rtype_to_howto 
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
-static bfd_reloc_status_type coff_thumb_pcrel_common
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **,
-	   thumb_pcrel_branchtype));
-static CONST struct reloc_howto_struct * coff_arm_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static struct bfd_link_hash_table * coff_arm_link_hash_table_create
-  PARAMS ((bfd *));
-static insn32 insert_thumb_branch
-  PARAMS ((insn32, int));
-static struct coff_link_hash_entry * find_thumb_glue
-  PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
-static struct coff_link_hash_entry * find_arm_glue
-  PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
-static void record_arm_to_thumb_glue
-  PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
-static void record_thumb_to_arm_glue
-  PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
-static boolean coff_arm_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean coff_arm_print_private_bfd_data
-  PARAMS ((bfd *, PTR));
-static boolean _bfd_coff_arm_set_private_flags
-  PARAMS ((bfd *, flagword));
-static boolean coff_arm_copy_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean coff_arm_is_local_label_name
-  PARAMS ((bfd *, const char *));
-static boolean coff_arm_link_output_has_begun
-  PARAMS ((bfd *, struct coff_final_link_info *));
-static boolean coff_arm_final_link_postscript
-  PARAMS ((bfd *, struct coff_final_link_info *));
-
-/* The linker script knows the section names for placement.
-   The entry_names are used to do simple name mangling on the stubs.
-   Given a function name, and its type, the stub can be found. The
-   name can be changed. The only requirement is the %s be present.
-   */
-   
-#define THUMB2ARM_GLUE_SECTION_NAME ".glue_7t"
-#define THUMB2ARM_GLUE_ENTRY_NAME   "__%s_from_thumb"
-
-#define ARM2THUMB_GLUE_SECTION_NAME ".glue_7"
-#define ARM2THUMB_GLUE_ENTRY_NAME   "__%s_from_arm"
-
-/* Used by the assembler. */
-static bfd_reloc_status_type
-coff_arm_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-		 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  symvalue diff;
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  diff = reloc_entry->addend;
-
-#define DOIT(x) \
-  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
-
-    if (diff != 0)
-      {
-	reloc_howto_type *howto = reloc_entry->howto;
-	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
-
-	switch (howto->size)
-	  {
-	  case 0:
-	    {
-	      char x = bfd_get_8 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_8 (abfd, x, addr);
-	    }
-	    break;
-
-	  case 1:
-	    {
-	      short x = bfd_get_16 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_16 (abfd, x, addr);
-	    }
-	    break;
-
-	  case 2:
-	    {
-	      long x = bfd_get_32 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_32 (abfd, x, addr);
-	    }
-	    break;
-
-	  default:
-	    abort ();
-	  }
-      }
-
-  /* Now let bfd_perform_relocation finish everything up.  */
-  return bfd_reloc_continue;
-}
-
-/* If USER_LABEL_PREFIX is defined as "_" (see coff_arm_is_local_label_name()
-   in this file), then TARGET_UNDERSCORE should be defined, otherwise it
-   should not.  */
-#ifndef TARGET_UNDERSCORE
-#define TARGET_UNDERSCORE '_'
-#endif
-
-#ifndef PCRELOFFSET
-#define PCRELOFFSET true
-#endif
-
-/* These most certainly belong somewhere else. Just had to get rid of
-   the manifest constants in the code. */
-
-#define ARM_8        0
-#define ARM_16       1
-#define ARM_32       2
-#define ARM_26       3
-#define ARM_DISP8    4
-#define ARM_DISP16   5
-#define ARM_DISP32   6
-#define ARM_26D      7
-/* 8 is unused */
-#define ARM_NEG16    9
-#define ARM_NEG32   10
-#define ARM_RVA32   11
-#define ARM_THUMB9  12
-#define ARM_THUMB12 13
-#define ARM_THUMB23 14
-
-static reloc_howto_type aoutarm_std_reloc_howto[] = 
-{
-  /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
-  HOWTO(ARM_8,			/* type */
-	0,			/* rightshift */
-	0,			/* size */
-	8,			/* bitsize */
-	false,			/* pc_relative */
-	0,			/* bitpos */
-	complain_overflow_bitfield, /* complain_on_overflow */
-	coff_arm_reloc,		/* special_function */
-	"ARM_8",		/* name */
-        true,			/* partial_inplace */
-	0x000000ff,		/* src_mask */
-	0x000000ff,		/* dst_mask */
-	PCRELOFFSET		/* pcrel_offset */),
-  HOWTO(ARM_16,  
-	0, 
-	1, 
-	16, 
-	false,
-	0,
-	complain_overflow_bitfield,
-	coff_arm_reloc,
-	"ARM_16", 
-	true,
-	0x0000ffff,
-	0x0000ffff, 
-	PCRELOFFSET),
-  HOWTO(ARM_32, 
-	0,
-	2, 
-	32,
-	false,
-	0,
-	complain_overflow_bitfield,
-	coff_arm_reloc,
-	"ARM_32",
-        true,
-	0xffffffff,
-	0xffffffff,
-	PCRELOFFSET),
-  HOWTO(ARM_26,
-	2,
-	2,
-	24,
-	true,
-	0,
-	complain_overflow_signed,
-	aoutarm_fix_pcrel_26 ,
-	"ARM_26",
-	false,
-	0x00ffffff,
-	0x00ffffff, 
-	PCRELOFFSET),
-  HOWTO(ARM_DISP8,        
-	0,
-	0,
-	8, 
-	true,
-	0,
-	complain_overflow_signed, 
-	coff_arm_reloc,
-	"ARM_DISP8",  
-	true,
-	0x000000ff,
-	0x000000ff,
-	true),
-  HOWTO( ARM_DISP16, 
-	0,
-	1,
-	16,
-	true,
-	0,
-	complain_overflow_signed, 
-	coff_arm_reloc,
-	"ARM_DISP16",
-	true,
-	0x0000ffff,
-	0x0000ffff,
-	true),
-  HOWTO( ARM_DISP32,
-	0,
-	2,
-	32,
-	true,
-	0,
-	complain_overflow_signed, 
- 	coff_arm_reloc,
-	"ARM_DISP32",
-	true,
-	0xffffffff,
-	0xffffffff,
-	true),
-  HOWTO( ARM_26D,  
-	2, 
-	2,
-	24,
-	false,
-	0,
-	complain_overflow_dont,
-	aoutarm_fix_pcrel_26_done, 
-	"ARM_26D",
-	true,
-	0x00ffffff,
-	0x0,
-	false),
-  /* 8 is unused */
-  {-1},
-  HOWTO( ARM_NEG16,
-	0,
-	-1,
-	16,
-	false,
-	0, 
-	complain_overflow_bitfield,
-	coff_arm_reloc,
-	"ARM_NEG16",
-        true, 
-	0x0000ffff,
-	0x0000ffff, 
-	false),
-  HOWTO( ARM_NEG32, 
-	0, 
-	-2,
-	32,
-	false,
-	0,
-	complain_overflow_bitfield,
-	coff_arm_reloc,
-	"ARM_NEG32",
-        true,
-	0xffffffff,
-	0xffffffff,
-	false),
-  HOWTO( ARM_RVA32, 
-	0,
-	2, 
-	32,
-	false,
-	0,
-	complain_overflow_bitfield,
-	coff_arm_reloc,
-	"ARM_RVA32",
-        true,
-	0xffffffff,
-	0xffffffff,
-	PCRELOFFSET),
-  HOWTO( ARM_THUMB9,
-	1,
-	1,
-	8,
-	true,
-	0,
-	complain_overflow_signed,
-	coff_thumb_pcrel_9 ,
-	"ARM_THUMB9",
-	false,
-	0x000000ff,
-	0x000000ff, 
-	PCRELOFFSET),
-  HOWTO( ARM_THUMB12,
-	1,
-	1,
-	11,
-	true,
-	0,
-	complain_overflow_signed,
-	coff_thumb_pcrel_12 ,
-	"ARM_THUMB12",
-	false,
-	0x000007ff,
-	0x000007ff, 
-	PCRELOFFSET),
-  HOWTO( ARM_THUMB23,
-	1,
-	2,
-	22,
-	true,
-	0,
-	complain_overflow_signed,
-	coff_thumb_pcrel_23 ,
-	"ARM_THUMB23",
-	false,
-	0x07ff07ff,
-	0x07ff07ff, 
-	PCRELOFFSET),
-};
-
-#ifdef COFF_WITH_PE
-/* Return true if this relocation should
-   appear in the output .reloc section. */
-
-static boolean
-in_reloc_p (abfd, howto)
-     bfd * abfd;
-     reloc_howto_type * howto;
-{
-  return !howto->pc_relative && howto->type != ARM_RVA32;
-}     
-#endif
-
-
-#define RTYPE2HOWTO(cache_ptr, dst) \
-	    (cache_ptr)->howto = aoutarm_std_reloc_howto + (dst)->r_type;
-
-#define coff_rtype_to_howto coff_arm_rtype_to_howto
-
-static reloc_howto_type *
-coff_arm_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-  reloc_howto_type *howto;
-
-  howto = aoutarm_std_reloc_howto + rel->r_type;
-
-  if (rel->r_type == ARM_RVA32)
-    {
-      *addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase;
-    }
-
-  return howto;
-
-}
-/* Used by the assembler. */
-
-static bfd_reloc_status_type
-aoutarm_fix_pcrel_26_done (abfd, reloc_entry, symbol, data, input_section,
-			  output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* This is dead simple at present.  */
-  return bfd_reloc_ok;
-}
-
-/* Used by the assembler. */
-
-static bfd_reloc_status_type
-aoutarm_fix_pcrel_26 (abfd, reloc_entry, symbol, data, input_section,
-		     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_size_type addr = reloc_entry->address;
-  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  
-  /* If this is an undefined symbol, return error */
-  if (symbol->section == &bfd_und_section
-      && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
-
-  /* If the sections are different, and we are doing a partial relocation,
-     just ignore it for now.  */
-  if (symbol->section->name != input_section->name
-      && output_bfd != (bfd *)NULL)
-    return bfd_reloc_continue;
-
-  relocation = (target & 0x00ffffff) << 2;
-  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend */
-  relocation += symbol->value;
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-  relocation -= input_section->output_section->vma;
-  relocation -= input_section->output_offset;
-  relocation -= addr;
-  
-  if (relocation & 3)
-    return bfd_reloc_overflow;
-
-  /* Check for overflow */
-  if (relocation & 0x02000000)
-    {
-      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
-	flag = bfd_reloc_overflow;
-    }
-  else if (relocation & ~0x03ffffff)
-    flag = bfd_reloc_overflow;
-
-  target &= ~0x00ffffff;
-  target |= (relocation >> 2) & 0x00ffffff;
-  bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
-
-  /* Now the ARM magic... Change the reloc type so that it is marked as done.
-     Strictly this is only necessary if we are doing a partial relocation.  */
-  reloc_entry->howto = &aoutarm_std_reloc_howto[ARM_26D];
-
-  return flag;
-}
-
-static bfd_reloc_status_type
-coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data, input_section,
-		     output_bfd, error_message, btype)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-     thumb_pcrel_branchtype btype;
-{
-  bfd_vma relocation = 0;
-  bfd_size_type addr = reloc_entry->address;
-  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  bfd_vma dstmsk;
-  bfd_vma offmsk;
-  bfd_vma signbit;
-
-  /* NOTE: This routine is currently used by GAS, but not by the link
-     phase.  */
-
-  switch (btype)
-    {
-    case b9:
-      dstmsk  = 0x000000ff;
-      offmsk  = 0x000001fe;
-      signbit = 0x00000100;
-      break;
-
-    case b12:
-      dstmsk  = 0x000007ff;
-      offmsk  = 0x00000ffe;
-      signbit = 0x00000800;
-      break;
-
-    case b23:
-      dstmsk  = 0x07ff07ff;
-      offmsk  = 0x007fffff;
-      signbit = 0x00400000;
-      break;
-
-    default:
-      abort ();
-    }
-  
-  /* If this is an undefined symbol, return error */
-  if (symbol->section == &bfd_und_section
-      && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
-
-  /* If the sections are different, and we are doing a partial relocation,
-     just ignore it for now.  */
-  if (symbol->section->name != input_section->name
-      && output_bfd != (bfd *)NULL)
-    return bfd_reloc_continue;
-
-  switch (btype)
-    {
-    case b9:
-    case b12:
-      relocation = ((target & dstmsk) << 1);
-      break;
-
-    case b23:
-      if (bfd_big_endian (abfd))
-	relocation = ((target & 0x7ff) << 1)  | ((target & 0x07ff0000) >> 4);
-      else
-	relocation = ((target & 0x7ff) << 12) | ((target & 0x07ff0000) >> 15);
-      break;
-
-    default:
-      abort ();
-    }
-
-  relocation = (relocation ^ signbit) - signbit; /* Sign extend */
-  relocation += symbol->value;
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-  relocation -= input_section->output_section->vma;
-  relocation -= input_section->output_offset;
-  relocation -= addr;
-
-  if (relocation & 1)
-    return bfd_reloc_overflow;
-
-  /* Check for overflow */
-  if (relocation & signbit)
-    {
-      if ((relocation & ~offmsk) != ~offmsk)
-	flag = bfd_reloc_overflow;
-    }
-  else if (relocation & ~offmsk)
-    flag = bfd_reloc_overflow;
-
-  target &= ~dstmsk;
-  switch (btype)
-   {
-   case b9:
-   case b12:
-     target |= (relocation >> 1);
-     break;
-
-   case b23:
-     if (bfd_big_endian (abfd))
-       target |= ((relocation & 0xfff) >> 1)  | ((relocation << 4)  & 0x07ff0000);
-     else
-       target |= ((relocation & 0xffe) << 15) | ((relocation >> 12) & 0x7ff);
-     break;
-
-   default:
-     abort ();
-   }
-
-  bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
-
-  /* Now the ARM magic... Change the reloc type so that it is marked as done.
-     Strictly this is only necessary if we are doing a partial relocation.  */
-  reloc_entry->howto = & aoutarm_std_reloc_howto [ARM_26D];
-  
-  /* TODO: We should possibly have DONE entries for the THUMB PCREL relocations */
-  return flag;
-}
-
-static bfd_reloc_status_type
-coff_thumb_pcrel_23 (abfd, reloc_entry, symbol, data, input_section,
-		     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
-                                  input_section, output_bfd, error_message, b23);
-}
-
-static bfd_reloc_status_type
-coff_thumb_pcrel_12 (abfd, reloc_entry, symbol, data, input_section,
-		     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
-                                  input_section, output_bfd, error_message, b12);
-}
-
-static bfd_reloc_status_type
-coff_thumb_pcrel_9 (abfd, reloc_entry, symbol, data, input_section,
-		     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return coff_thumb_pcrel_common (abfd, reloc_entry, symbol, data,
-                                  input_section, output_bfd, error_message, b9);
-}
-
-
-static CONST struct reloc_howto_struct *
-coff_arm_reloc_type_lookup (abfd, code)
-      bfd * abfd;
-      bfd_reloc_code_real_type code;
-{
-#define ASTD(i,j)       case i: return &aoutarm_std_reloc_howto[j]
-  if (code == BFD_RELOC_CTOR)
-    switch (bfd_get_arch_info (abfd)->bits_per_address)
-      {
-      case 32:
-        code = BFD_RELOC_32;
-        break;
-      default: return (CONST struct reloc_howto_struct *) 0;
-      }
-
-  switch (code)
-    {
-      ASTD (BFD_RELOC_8,                    ARM_8);
-      ASTD (BFD_RELOC_16,                   ARM_16);
-      ASTD (BFD_RELOC_32,                   ARM_32);
-      ASTD (BFD_RELOC_ARM_PCREL_BRANCH,     ARM_26);
-      ASTD (BFD_RELOC_8_PCREL,              ARM_DISP8);
-      ASTD (BFD_RELOC_16_PCREL,             ARM_DISP16);
-      ASTD (BFD_RELOC_32_PCREL,             ARM_DISP32);
-      ASTD (BFD_RELOC_RVA,                  ARM_RVA32);
-      ASTD (BFD_RELOC_THUMB_PCREL_BRANCH9,  ARM_THUMB9);
-      ASTD (BFD_RELOC_THUMB_PCREL_BRANCH12, ARM_THUMB12);
-      ASTD (BFD_RELOC_THUMB_PCREL_BRANCH23, ARM_THUMB23);
-    default: return (CONST struct reloc_howto_struct *) 0;
-    }
-}
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-#define COFF_PAGE_SIZE 0x1000
-/* Turn a howto into a reloc  nunmber */
-
-#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
-#define BADMAG(x) ARMBADMAG(x)
-#define ARM 1			/* Customize coffcode.h */
-
-/* Extend the coff_link_hash_table structure with a few ARM specific fields.
-   This allows us to store global data here without actually creating any
-   global variables, which is a no-no in the BFD world.  */
-struct coff_arm_link_hash_table
-{
-  /* The original coff_link_hash_table structure.  MUST be first field.  */
-  struct coff_link_hash_table	root;
-  
-  /* The size in bytes of the section containg the Thumb-to-ARM glue.  */
-  long int 			thumb_glue_size;
-  
-  /* The size in bytes of the section containg the ARM-to-Thumb glue.  */
-  long int 			arm_glue_size;
-
-  /* An arbitary input BFD chosen to hold the glue sections.  */
-  bfd *				bfd_of_glue_owner;
-
-  /* Support interworking with old, non-interworking aware ARM code. */
-  int 				support_old_code;
-};
-
-/* Get the ARM coff linker hash table from a link_info structure.  */
-#define coff_arm_hash_table(info) \
-  ((struct coff_arm_link_hash_table *) ((info)->hash))
-
-/* Create an ARM coff linker hash table.  */
-
-static struct bfd_link_hash_table *
-coff_arm_link_hash_table_create (abfd)
-     bfd * abfd;
-{
-  struct coff_arm_link_hash_table * ret;
-
-  ret = ((struct coff_arm_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct coff_arm_link_hash_table)));
-  if (ret == (struct coff_arm_link_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_coff_link_hash_table_init
-      (& ret->root, abfd, _bfd_coff_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-
-  ret->thumb_glue_size   = 0;
-  ret->arm_glue_size     = 0;
-  ret->bfd_of_glue_owner = NULL;
-
-  return & ret->root.root;
-}
-
-static
-arm_emit_base_file_entry (info, output_bfd, input_section, reloc_offset)
-      struct bfd_link_info *info;
-      bfd *output_bfd;
-      asection *input_section;
-      bfd_vma reloc_offset;
-{
-  bfd_vma addr = reloc_offset
-                - input_section->vma
-                + input_section->output_offset
-                  + input_section->output_section->vma;
-
-  if (coff_data(output_bfd)->pe)
-     addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
-  fwrite (&addr, 1, sizeof (addr), (FILE *) info->base_file);
-
-}
-
-/* The thumb form of a long branch is a bit finicky, because the offset
-   encoding is split over two fields, each in it's own instruction. They
-   can occur in any order. So given a thumb form of long branch, and an 
-   offset, insert the offset into the thumb branch and return finished
-   instruction. 
-
-   It takes two thumb instructions to encode the target address. Each has 
-   11 bits to invest. The upper 11 bits are stored in one (identifed by
-   H-0.. see below), the lower 11 bits are stored in the other (identified 
-   by H-1). 
-
-   Combine together and shifted left by 1 (it's a half word address) and 
-   there you have it.
-
-     Op: 1111 = F,
-     H-0, upper address-0 = 000
-     Op: 1111 = F,
-     H-1, lower address-0 = 800
-
-   They can be ordered either way, but the arm tools I've seen always put 
-   the lower one first. It probably doesn't matter. krk@cygnus.com
-
-   XXX:  Actually the order does matter.  The second instruction (H-1)
-   moves the computed address into the PC, so it must be the second one
-   in the sequence.  The problem, however is that whilst little endian code
-   stores the instructions in HI then LOW order, big endian code does the
-   reverse.  nickc@cygnus.com  */
-
-#define LOW_HI_ORDER 0xF800F000
-#define HI_LOW_ORDER 0xF000F800
-
-static insn32
-insert_thumb_branch (br_insn, rel_off)
-     insn32 br_insn;
-     int rel_off;
-{
-  unsigned int low_bits;
-  unsigned int high_bits;
-
-
-  BFD_ASSERT((rel_off & 1) != 1);
-
-  rel_off >>= 1;                              /* half word aligned address */
-  low_bits = rel_off & 0x000007FF;            /* the bottom 11 bits */
-  high_bits = (rel_off >> 11) & 0x000007FF;   /* the top 11 bits */
-
-  if ((br_insn & LOW_HI_ORDER) == LOW_HI_ORDER)
-    br_insn = LOW_HI_ORDER | (low_bits << 16) | high_bits;
-  else if ((br_insn & HI_LOW_ORDER) == HI_LOW_ORDER)
-    br_insn = HI_LOW_ORDER | (high_bits << 16) | low_bits;
-  else
-    abort(); /* error - not a valid branch instruction form */
-
-  /* FIXME: abort is probably not the right call. krk@cygnus.com */
-
-  return br_insn;
-}
-
-
-static struct coff_link_hash_entry *
-find_thumb_glue (info, name, input_bfd)
-     struct bfd_link_info * info;
-     CONST char *           name;
-     bfd *                  input_bfd;
-{
-  char *                        tmp_name;
-  struct coff_link_hash_entry * myh;
-
-  tmp_name = ((char *)
-	 bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1));
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
-  
-  myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
-  
-  if (myh == NULL)
-    /* xgettext:c-format */
-    _bfd_error_handler (_("%s: unable to find THUMB glue '%s' for `%s'"),
-			bfd_get_filename (input_bfd), tmp_name, name);
-  
-  free (tmp_name);
-
-  return myh;
-}
-
-static struct coff_link_hash_entry *
-find_arm_glue (info, name, input_bfd)
-     struct bfd_link_info * info;
-     CONST char *           name;
-     bfd *                  input_bfd;
-{
-  char *                        tmp_name;
-  struct coff_link_hash_entry * myh;
-
-  tmp_name = ((char *)
-	      bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
-  
-  myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
-
-  if (myh == NULL)
-    /* xgettext:c-format */
-    _bfd_error_handler (_("%s: unable to find ARM glue '%s' for `%s'"),
-			bfd_get_filename (input_bfd), tmp_name, name);
-  
-  free (tmp_name);
-
-  return myh;
-}
-
-/*
-  ARM->Thumb glue:
-
-       .arm
-       __func_from_arm:
-	     ldr r12, __func_addr
-	     bx  r12
-       __func_addr:
-            .word func    @ behave as if you saw a ARM_32 reloc
-*/
-
-#define ARM2THUMB_GLUE_SIZE 12
-static const insn32 a2t1_ldr_insn       = 0xe59fc000;
-static const insn32 a2t2_bx_r12_insn    = 0xe12fff1c;
-static const insn32 a2t3_func_addr_insn = 0x00000001;
-
-#define A2T3_OFFSET 8
-
-/*
-   Thumb->ARM:				Thumb->(non-interworking aware) ARM
-
-   .thumb				.thumb
-   .align 2				.align 2
-      __func_from_thumb:		   __func_from_thumb:
-	   bx pc				push {r6, lr}
-	   nop					ldr  r6, __func_addr
-   .arm						mov  lr, pc
-      __func_change_to_arm:			bx   r6
-	   b func   			.arm
-					   __func_back_to_thumb:
-   		  				ldmia r13! {r6, lr}
-   					        bx    lr
-   					   __func_addr:
-					        .word	func 
-*/
-
-#define THUMB2ARM_GLUE_SIZE (globals->support_old_code ? 20 : 8)
-static const insn16 t2a1_bx_pc_insn = 0x4778;
-static const insn16 t2a2_noop_insn  = 0x46c0;
-static const insn32 t2a3_b_insn     = 0xea000000;
-
-#define T2A3_OFFSET 8
-
-static const insn16 t2a1_push_insn  = 0xb540;
-static const insn16 t2a2_ldr_insn   = 0x4e03;
-static const insn16 t2a3_mov_insn   = 0x46fe;
-static const insn16 t2a4_bx_insn    = 0x4730;
-static const insn32 t2a5_pop_insn   = 0xe8bd4040;
-static const insn32 t2a6_bx_insn    = 0xe12fff1e;
-
-/* TODO:
-     We should really create new local (static) symbols in destination
-     object for each stub we create.  We should also create local
-     (static) symbols within the stubs when switching between ARM and
-     Thumb code.  This will ensure that the debugger and disassembler
-     can present a better view of stubs.
-
-     We can treat stubs like literal sections, and for the THUMB9 ones
-     (short addressing range) we should be able to insert the stubs
-     between sections. i.e. the simplest approach (since relocations
-     are done on a section basis) is to dump the stubs at the end of
-     processing a section. That way we can always try and minimise the
-     offset to and from a stub. However, this does not map well onto
-     the way that the linker/BFD does its work: mapping all input
-     sections to output sections via the linker script before doing
-     all the processing.
-
-     Unfortunately it may be easier to just to disallow short range
-     Thumb->ARM stubs (i.e. no conditional inter-working branches,
-     only branch-and-link (BL) calls.  This will simplify the processing
-     since we can then put all of the stubs into their own section.
-
-  TODO:
-     On a different subject, rather than complaining when a
-     branch cannot fit in the number of bits available for the
-     instruction we should generate a trampoline stub (needed to
-     address the complete 32bit address space).  */
-
-/* The standard COFF backend linker does not cope with the special 
-   Thumb BRANCH23 relocation.  The alternative would be to split the
-   BRANCH23 into seperate HI23 and LO23 relocations. However, it is a
-   bit simpler simply providing our own relocation driver. */
-
-/* The reloc processing routine for the ARM/Thumb COFF linker.  NOTE:
-   This code is a very slightly modified copy of
-   _bfd_coff_generic_relocate_section.  It would be a much more
-   maintainable solution to have a MACRO that could be expanded within
-   _bfd_coff_generic_relocate_section that would only be provided for
-   ARM/Thumb builds.  It is only the code marked THUMBEXTENSION that
-   is different from the original.  */
-
-static boolean
-coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
-                           contents, relocs, syms, sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc * rel;
-  struct internal_reloc * relend;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-
-  for (; rel < relend; rel++)
-    {
-      int                            done = 0;
-      long                           symndx;
-      struct coff_link_hash_entry *  h;
-      struct internal_syment *       sym;
-      bfd_vma                        addend;
-      bfd_vma                        val;
-      reloc_howto_type *             howto;
-      bfd_reloc_status_type          rstat;
-      bfd_vma                        h_val;
-
-      symndx = rel->r_symndx;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	}
-      else
-	{    
-	  h = obj_coff_sym_hashes (input_bfd)[symndx];
-	  sym = syms + symndx;
-	}
-
-      /* COFF treats common symbols in one of two ways.  Either the
-         size of the symbol is included in the section contents, or it
-         is not.  We assume that the size is not included, and force
-         the rtype_to_howto function to adjust the addend as needed.  */
-
-      if (sym != NULL && sym->n_scnum != 0)
-	addend = - sym->n_value;
-      else
-	addend = 0;
-
-
-      howto = coff_rtype_to_howto (input_bfd, input_section, rel, h,
-				       sym, &addend);
-      if (howto == NULL)
-	return false;
-
-      /* The relocation_section function will skip pcrel_offset relocs
-         when doing a relocateable link.  However, we want to convert
-         ARM26 to ARM26D relocs if possible.  We return a fake howto in
-         this case without pcrel_offset set, and adjust the addend to
-         compensate.  */
-      if (rel->r_type == ARM_26
-          && h != NULL
-          && info->relocateable
-          && (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-          && h->root.u.def.section->output_section == input_section->output_section)
-        {
-          static reloc_howto_type fake_arm26_reloc = 
-	    HOWTO (ARM_26,
-    	       2,
-    	       2,
-    	       24,
-    	       true,
-    	       0,
-    	       complain_overflow_signed,
-    	       aoutarm_fix_pcrel_26 ,
-    	       "ARM_26",
-    	       false,
-    	       0x00ffffff,
-    	       0x00ffffff, 
-    	       false);
-
-          addend -= rel->r_vaddr - input_section->vma;
-          howto = &fake_arm26_reloc;
-        }
-
-      /* If we are doing a relocateable link, then we can just ignore
-         a PC relative reloc that is pcrel_offset.  It will already
-         have the correct value.  If this is not a relocateable link,
-         then we should ignore the symbol value.  */
-      if (howto->pc_relative && howto->pcrel_offset)
-        {
-          if (info->relocateable)
-            continue;
-          if (sym != NULL && sym->n_scnum != 0)
-            addend += sym->n_value;
-        }
-
-      val = 0;
-
-      if (h == NULL)
-	{
-	  asection *sec;
-
-	  if (symndx == -1)
-	    {
-	      sec = bfd_abs_section_ptr;
-	      val = 0;
-	    }
-	  else
-	    {
-	      sec = sections[symndx];
-              val = (sec->output_section->vma
-		     + sec->output_offset
-		     + sym->n_value
-		     - sec->vma);
-	    }
-	}
-      else
-	{
-#if 1 /* THUMBEXTENSION */
-          /* We don't output the stubs if we are generating a
-             relocatable output file, since we may as well leave the
-             stub generation to the final linker pass. If we fail to
-	     verify that the name is defined, we'll try to build stubs
-	     for an undefined name... */
-          if (! info->relocateable
-	      && (   h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak))
-            {
-	      asection *   h_sec = h->root.u.def.section;
-	      const char * name  = h->root.root.string;
-	      
-	      /* h locates the symbol referenced in the reloc.  */
-	      h_val = (h->root.u.def.value
-		       + h_sec->output_section->vma
-		       + h_sec->output_offset);
-
-              if (howto->type == ARM_26)
-                {
-                  if (   h->class == C_THUMBSTATFUNC
-		      || h->class == C_THUMBEXTFUNC)
-		    {
-		      /* Arm code calling a Thumb function */
-		      unsigned long int                 tmp;
-		      long int                          my_offset;
-		      asection *                        s;
-		      long int                          ret_offset;
-		      struct coff_link_hash_entry *     myh; 
-		      struct coff_arm_link_hash_table * globals;
-		      
-		      myh = find_arm_glue (info, name, input_bfd);
-		      if (myh == NULL)
-			return false;
-
-		      globals = coff_arm_hash_table (info);
-
-		      BFD_ASSERT (globals != NULL);
-		      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-			
-		      my_offset = myh->root.u.def.value;
-		      
-		      s = bfd_get_section_by_name (globals->bfd_of_glue_owner, 
-						  ARM2THUMB_GLUE_SECTION_NAME);
-		      BFD_ASSERT (s != NULL);
-		      BFD_ASSERT (s->contents != NULL);
-		      BFD_ASSERT (s->output_section != NULL);
-
-		      if ((my_offset & 0x01) == 0x01)
-			{
-			  if (h_sec->owner != NULL
-			      && INTERWORK_SET (h_sec->owner)
-			      && ! INTERWORK_FLAG (h_sec->owner))
-			    {
-			      _bfd_error_handler
-				/* xgettext:c-format */
-				(_("%s(%s): warning: interworking not enabled."),
-				 bfd_get_filename (h_sec->owner), name);
-			      _bfd_error_handler
-				/* xgettext:c-format */
-				(_("  first occurrence: %s: arm call to thumb"),
-				 bfd_get_filename (input_bfd));
-			    }
-
-			  --my_offset;
-			  myh->root.u.def.value = my_offset;
-
-			  bfd_put_32 (output_bfd, a2t1_ldr_insn,
-				      s->contents + my_offset);
-			  
-			  bfd_put_32 (output_bfd, a2t2_bx_r12_insn,
-				      s->contents + my_offset + 4);
-			  
-			  /* It's a thumb address.  Add the low order bit.  */
-			  bfd_put_32 (output_bfd, h_val | a2t3_func_addr_insn,
-				      s->contents + my_offset + 8);
-
-                          if (info->base_file)
-                            arm_emit_base_file_entry (info, output_bfd, s, A2T3_OFFSET);
-
-			}
-
-		      BFD_ASSERT (my_offset <= globals->arm_glue_size);
-
-		      tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr
-					- input_section->vma);
-		      
-		      tmp = tmp & 0xFF000000;
-
-		      /* Somehow these are both 4 too far, so subtract 8. */
-		      ret_offset =
-			s->output_offset
-			+ my_offset 
-			+ s->output_section->vma
-			- (input_section->output_offset
-			   + input_section->output_section->vma 
-			   + rel->r_vaddr)
-			- 8;
-
-		      tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
-		      
-		      bfd_put_32 (output_bfd, tmp, contents + rel->r_vaddr
-				  - input_section->vma);
-		      
-		      done = 1;
-		    }
-                }
-	      
-	      /* Note: We used to check for ARM_THUMB9 and ARM_THUMB12 */
-              else if (howto->type == ARM_THUMB23)
-                {
-                  if (   h->class == C_EXT 
-		      || h->class == C_STAT
-		      || h->class == C_LABEL)
-		    {
-		      /* Thumb code calling an ARM function */
-		      asection *                         s = 0;
-		      long int                           my_offset;
-		      unsigned long int                  tmp;
-		      long int                           ret_offset;
-		      struct coff_link_hash_entry *      myh;
-		      struct coff_arm_link_hash_table *  globals;
-
-		      myh = find_thumb_glue (info, name, input_bfd);
-		      if (myh == NULL)
-			return false;
-
-		      globals = coff_arm_hash_table (info);
-		      
-		      BFD_ASSERT (globals != NULL);
-		      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-		      
-		      my_offset = myh->root.u.def.value;
-		      
-		      s = bfd_get_section_by_name (globals->bfd_of_glue_owner, 
-						   THUMB2ARM_GLUE_SECTION_NAME);
-		      
-		      BFD_ASSERT (s != NULL);
-		      BFD_ASSERT (s->contents != NULL);
-		      BFD_ASSERT (s->output_section != NULL);
-		      
-		      if ((my_offset & 0x01) == 0x01)
-			{
-			  if (h_sec->owner != NULL
-			      && INTERWORK_SET (h_sec->owner)
-			      && ! INTERWORK_FLAG (h_sec->owner)
-			      && ! globals->support_old_code)
-			    {
-			      _bfd_error_handler
-				/* xgettext:c-format */
-				(_("%s(%s): warning: interworking not enabled."),
-				 bfd_get_filename (h_sec->owner), name);
-			      _bfd_error_handler
-				/* xgettext:c-format */
-				(_("  first occurrence: %s: thumb call to arm"),
-				 bfd_get_filename (input_bfd));
-			      _bfd_error_handler
-				(_("  consider relinking with --support-old-code enabled"));
-			    }
-			  
-			  -- my_offset;
-			  myh->root.u.def.value = my_offset;
-
-			  if (globals->support_old_code)
-			    {
-			      bfd_put_16 (output_bfd, t2a1_push_insn,
-					  s->contents + my_offset);
-			      
-			      bfd_put_16 (output_bfd, t2a2_ldr_insn,
-					  s->contents + my_offset + 2);
-
-			      bfd_put_16 (output_bfd, t2a3_mov_insn,
-					  s->contents + my_offset + 4);
-
-			      bfd_put_16 (output_bfd, t2a4_bx_insn,
-					  s->contents + my_offset + 6);
-			      
-			      bfd_put_32 (output_bfd, t2a5_pop_insn,
-					  s->contents + my_offset + 8);
-			      
-			      bfd_put_32 (output_bfd, t2a6_bx_insn,
-					  s->contents + my_offset + 12);
-			      
-			      /* Store the address of the function in the last word of the stub.  */
-			      bfd_put_32 (output_bfd, h_val,
-					  s->contents + my_offset + 16);
-			    }
-			  else
-			    {
-			      bfd_put_16 (output_bfd, t2a1_bx_pc_insn,
-					  s->contents + my_offset);
-		      
-			      bfd_put_16 (output_bfd, t2a2_noop_insn,
-					  s->contents + my_offset + 2);
-		      
-			      ret_offset =
-				((bfd_signed_vma) h_val)	/* Address of destination of the stub */
-				- ((bfd_signed_vma)
-				   (s->output_offset 		/* Offset from the start of the current section to the start of the stubs.  */
-				    + my_offset			/* Offset of the start of this stub from the start of the stubs.  */
-				    + s->output_section->vma) 	/* Address of the start of the current section.  */
-				   + 4				/* The branch instruction is 4 bytes into the stub.  */
-				   + 8);			/* ARM branches work from the pc of the instruction + 8.  */
-			      
-			      bfd_put_32 (output_bfd,
-					  t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
-					  s->contents + my_offset + 4);
-
-                              if (info->base_file)
-                                arm_emit_base_file_entry (info, output_bfd, s, T2A3_OFFSET);
-			    }
-			}
-
-		      BFD_ASSERT (my_offset <= globals->thumb_glue_size);
-
-		      /* Now go back and fix up the original BL insn to point
-			 to here.  */
-		      ret_offset =
-			s->output_offset
-			+ my_offset
-			- (input_section->output_offset
-			   + rel->r_vaddr)
-			-4;
-		      
-		      tmp = bfd_get_32 (input_bfd, contents + rel->r_vaddr
-					- input_section->vma);
-
-		      bfd_put_32 (output_bfd,
-				  insert_thumb_branch (tmp, ret_offset),
-				  contents + rel->r_vaddr
-				  - input_section->vma);
-		      
-                      if (info->base_file)
-                        arm_emit_base_file_entry (info, output_bfd, input_section, rel->r_vaddr);
-
-		      done = 1;
-                    }
-                }
-            }
-	  
-          /* If the relocation type and destination symbol does not
-             fall into one of the above categories, then we can just
-             perform a direct link. */
-
-	  if (done)
-	    rstat = bfd_reloc_ok;
-	  else 
-#endif /* THUMBEXTENSION */
-	    if (   h->root.type == bfd_link_hash_defined
-		|| h->root.type == bfd_link_hash_defweak)
-	    {
-	      asection *sec;
-
-	      sec = h->root.u.def.section;
-	      val = (h->root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	      }
-
-	  else if (! info->relocateable)
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	    }
-	}
-
-      if (info->base_file)
-	{
-	  /* Emit a reloc if the backend thinks it needs it. */
-	  if (sym && pe_data(output_bfd)->in_reloc_p(output_bfd, howto))
-            arm_emit_base_file_entry (info, output_bfd, input_section, rel->r_vaddr);
-	}
-  
-#if 1 /* THUMBEXTENSION */
-      if (done)
-	rstat = bfd_reloc_ok;
-      /* Only perform this fix during the final link, not a relocatable link.  nickc@cygnus.com  */
-      else if (! info->relocateable
-	       && howto->type == ARM_THUMB23)
-        {
-          /* This is pretty much a copy of what the default
-             _bfd_final_link_relocate and _bfd_relocate_contents
-             routines do to perform a relocation, with special
-             processing for the split addressing of the Thumb BL
-             instruction.  Again, it would probably be simpler adding a
-             ThumbBRANCH23 specific macro expansion into the default
-             code.  */
-	  
-          bfd_vma address = rel->r_vaddr - input_section->vma;
-	  
-          if (address > input_section->_raw_size)
-	    rstat = bfd_reloc_outofrange;
-          else
-            {
-              bfd_vma         relocation       = val + addend;
-	      int             size             = bfd_get_reloc_size (howto);
-	      boolean         overflow         = false;
-	      bfd_byte *      location         = contents + address;
-	      bfd_vma         x                = bfd_get_32 (input_bfd, location);
-	      bfd_vma         src_mask         = 0x007FFFFE;
-	      bfd_signed_vma  reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
-	      bfd_signed_vma  reloc_signed_min = ~reloc_signed_max;
-	      bfd_vma         check;
-	      bfd_signed_vma  signed_check;
-	      bfd_vma         add;
-	      bfd_signed_vma  signed_add;
-
-	      BFD_ASSERT (size == 4);
-	      
-              /* howto->pc_relative should be TRUE for type 14 BRANCH23 */
-              relocation -= (input_section->output_section->vma
-                             + input_section->output_offset);
-	      
-              /* howto->pcrel_offset should be TRUE for type 14 BRANCH23 */
-              relocation -= address;
-	      
-	      /* No need to negate the relocation with BRANCH23. */
-	      /* howto->complain_on_overflow == complain_overflow_signed for BRANCH23.  */
-	      /* howto->rightshift == 1 */
-	      /* Drop unwanted bits from the value we are relocating to.  */
-	      
-	      check = relocation >> howto->rightshift;
-		
-	      /* If this is a signed value, the rightshift just dropped
-		 leading 1 bits (assuming twos complement).  */
-	      if ((bfd_signed_vma) relocation >= 0)
-		signed_check = check;
-	      else
-		signed_check = (check
-				| ((bfd_vma) - 1
-				   & ~((bfd_vma) - 1 >> howto->rightshift)));
-	      
-	      /* Get the value from the object file.  */
-	      if (bfd_big_endian (input_bfd))
-		{
-		  add = (((x) & 0x07ff0000) >> 4) | (((x) & 0x7ff) << 1);
-		}
-	      else
-		{
-		  add = ((((x) & 0x7ff) << 12) | (((x) & 0x07ff0000) >> 15));
-		}
-
-	      /* Get the value from the object file with an appropriate sign.
-		 The expression involving howto->src_mask isolates the upper
-		 bit of src_mask.  If that bit is set in the value we are
-		 adding, it is negative, and we subtract out that number times
-		 two.  If src_mask includes the highest possible bit, then we
-		 can not get the upper bit, but that does not matter since
-		 signed_add needs no adjustment to become negative in that
-		 case.  */
-	      
-	      signed_add = add;
-	      
-	      if ((add & (((~ src_mask) >> 1) & src_mask)) != 0)
-		signed_add -= (((~ src_mask) >> 1) & src_mask) << 1;
-	      
-	      /* Add the value from the object file, shifted so that it is a
-		 straight number.  */
-	      /* howto->bitpos == 0 */
-	      
-	      signed_check += signed_add;
-	      relocation += signed_add;
-
-	      BFD_ASSERT (howto->complain_on_overflow == complain_overflow_signed);
-
-	      /* Assumes two's complement.  */
-	      if (   signed_check > reloc_signed_max
-		  || signed_check < reloc_signed_min)
-		overflow = true;
-	      
-	      /* Put RELOCATION into the correct bits:  */
-	      
-	      if (bfd_big_endian (input_bfd))
-		{
-		  relocation = (((relocation & 0xffe) >> 1)  | ((relocation << 4) & 0x07ff0000));
-		}
-	      else
-		{
-		  relocation = (((relocation & 0xffe) << 15) | ((relocation >> 12) & 0x7ff));
-		}
-	      
-	      /* Add RELOCATION to the correct bits of X:  */
-	      x = ((x & ~howto->dst_mask) | relocation);
-
-	      /* Put the relocated value back in the object file:  */
-	      bfd_put_32 (input_bfd, x, location);
-
-	      rstat = overflow ? bfd_reloc_overflow : bfd_reloc_ok;
-            }
-        }
-      else
-#endif /* THUMBEXTENSION */
-        rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-                                          contents,
-                                          rel->r_vaddr - input_section->vma,
-                                          val, addend);
-#if 1 /* THUMBEXTENSION */
-      /* FIXME: 
-	 Is this the best way to fix up thumb addresses? krk@cygnus.com
-	 Probably not, but it works, and if it works it don't need fixing!  nickc@cygnus.com */
-      /* Only perform this fix during the final link, not a relocatable link.  nickc@cygnus.com  */
-      if (! info->relocateable
-	  && rel->r_type == ARM_32)
-	{
-	  /* Determine if we need to set the bottom bit of a relocated address
-	     because the address is the address of a Thumb code symbol.  */
-	     
-	  int patchit = false;
-	  
-	  if (h != NULL
-	      && (   h->class == C_THUMBSTATFUNC
-		  || h->class == C_THUMBEXTFUNC))
-	    {
-	      patchit = true;
-	    }
-	  else if (sym != NULL
-		   && sym->n_scnum > N_UNDEF)
-	    {
-	      /* No hash entry - use the symbol instead.  */
-
-	      if (   sym->n_sclass == C_THUMBSTATFUNC
-		  || sym->n_sclass == C_THUMBEXTFUNC)
-		patchit = true;
-	    }
-
-	  if (patchit)
-	    {
-	      bfd_byte * location = contents + rel->r_vaddr - input_section->vma;
-	      bfd_vma    x        = bfd_get_32 (input_bfd, location);
-
-	      bfd_put_32 (input_bfd, x | 1, location);
-	    }
-	}
-#endif /* THUMBEXTENSION */      
-      
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	case bfd_reloc_ok:
-	  break;
-	case bfd_reloc_outofrange:
-	  (*_bfd_error_handler)
-	    (_("%s: bad reloc address 0x%lx in section `%s'"),
-	     bfd_get_filename (input_bfd),
-	     (unsigned long) rel->r_vaddr,
-	     bfd_get_section_name (input_bfd, input_section));
-	  return false;
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-	    char buf[SYMNMLEN + 1];
-
-	    if (symndx == -1)
-	      name = "*ABS*";
-	    else if (h != NULL)
-	      name = h->root.root.string;
-	    else
-	      {
-		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
-		if (name == NULL)
-		  return false;
-	      }
-
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, (bfd_vma) 0, input_bfd,
-		    input_section, rel->r_vaddr - input_section->vma)))
-	      return false;
-	  }
-	}
-    }
-
-  return true;
-}
-
-#ifndef COFF_WITH_PE
-boolean
-bfd_arm_allocate_interworking_sections (info) 
-     struct bfd_link_info * info;
-{
-  asection *                        s;
-  bfd_byte *                        foo;
-  struct coff_arm_link_hash_table * globals;
-#if 0
-  static char                       test_char = '1';
-#endif
-
-  globals = coff_arm_hash_table (info);
-  
-  BFD_ASSERT (globals != NULL);
-
-  if (globals->arm_glue_size != 0)
-    {
-      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-      
-      s = bfd_get_section_by_name
-	(globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
-
-      BFD_ASSERT (s != NULL);
-      
-      foo = (bfd_byte *) bfd_alloc
-	(globals->bfd_of_glue_owner, globals->arm_glue_size);
-#if 0
-      memset (foo, test_char, globals->arm_glue_size);
-#endif
-      
-      s->_raw_size = s->_cooked_size = globals->arm_glue_size;
-      s->contents = foo;
-    }
-
-  if (globals->thumb_glue_size != 0)
-    {
-      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-      
-      s = bfd_get_section_by_name
-	(globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
-
-      BFD_ASSERT (s != NULL);
-      
-      foo = (bfd_byte *) bfd_alloc
-	(globals->bfd_of_glue_owner, globals->thumb_glue_size);
-#if 0
-      memset (foo, test_char, globals->thumb_glue_size);
-#endif
-      
-      s->_raw_size = s->_cooked_size = globals->thumb_glue_size;
-      s->contents = foo;
-    }
-
-  return true;
-}
-
-static void
-record_arm_to_thumb_glue (info, h)
-     struct bfd_link_info *        info;
-     struct coff_link_hash_entry * h;
-{
-  const char *                      name = h->root.root.string;
-  register asection *               s;
-  char *                            tmp_name;
-  struct coff_link_hash_entry *     myh;
-  struct coff_arm_link_hash_table * globals;
-
-  globals = coff_arm_hash_table (info);
-
-  BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-  s = bfd_get_section_by_name
-    (globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
-
-  BFD_ASSERT (s != NULL);
-
-  tmp_name = ((char *)
-	      bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
-  
-  myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
-  
-  if (myh != NULL)
-    {
-      free (tmp_name);
-      return; /* we've already seen this guy */
-    }
-
-  /* The only trick here is using globals->arm_glue_size as the value. Even
-     though the section isn't allocated yet, this is where we will be putting
-     it.  */
-
-  bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
-				BSF_GLOBAL, 
-				s, globals->arm_glue_size + 1,
-				NULL, true, false, 
-				(struct bfd_link_hash_entry **) & myh);
-  
-  free (tmp_name);
-  
-  globals->arm_glue_size += ARM2THUMB_GLUE_SIZE;
-
-  return;
-}
-
-static void
-record_thumb_to_arm_glue (info, h)
-     struct bfd_link_info *        info;
-     struct coff_link_hash_entry * h;
-{
-  const char *                       name = h->root.root.string;
-  register asection *                s;
-  char *                             tmp_name;
-  struct coff_link_hash_entry *      myh;
-  struct coff_arm_link_hash_table *  globals;
-
-  
-  globals = coff_arm_hash_table (info);
-  
-  BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-  s = bfd_get_section_by_name
-    (globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
-
-  BFD_ASSERT (s != NULL);
-
-  tmp_name = (char *) bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
-
-  myh = coff_link_hash_lookup
-    (coff_hash_table (info), tmp_name, false, false, true);
-  
-  if (myh != NULL)
-    {
-      free (tmp_name);
-      return; /* we've already seen this guy */
-    }
-
-  bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
-				BSF_GLOBAL, s, globals->thumb_glue_size + 1,
-				NULL, true, false, 
-				(struct bfd_link_hash_entry **) & myh);
-  
-  /* If we mark it 'thumb', the disassembler will do a better job.  */
-  myh->class = C_THUMBEXTFUNC;
-
-  free (tmp_name);
-
-  /* Allocate another symbol to mark where we switch to arm mode.  */
-      
-#define CHANGE_TO_ARM "__%s_change_to_arm"
-#define BACK_FROM_ARM "__%s_back_from_arm"
-  
-  tmp_name = (char *) bfd_malloc (strlen (name) + strlen (CHANGE_TO_ARM) + 1);
-  
-  BFD_ASSERT (tmp_name);
-  
-  sprintf (tmp_name, globals->support_old_code ? BACK_FROM_ARM : CHANGE_TO_ARM, name);
-
-  myh = NULL;
-  
-  bfd_coff_link_add_one_symbol (info, globals->bfd_of_glue_owner, tmp_name,
-				BSF_LOCAL, s, globals->thumb_glue_size
-				+ (globals->support_old_code ? 8 : 4),
-				NULL, true, false, 
-				(struct bfd_link_hash_entry **) & myh);
-
-  free (tmp_name);  
-  
-  globals->thumb_glue_size += THUMB2ARM_GLUE_SIZE;
-
-  return;
-}
-
-/* Select a BFD to be used to hold the sections used by the glue code.
-   This function is called from the linker scripts in ld/emultempl/
-   {armcoff/pe}.em  */
-boolean
-bfd_arm_get_bfd_for_interworking (abfd, info)
-     bfd * 		    abfd;
-     struct bfd_link_info * info;
-{
-  struct coff_arm_link_hash_table * globals;
-  flagword   			    flags;
-  asection * 			    sec;
-    
-  /* If we are only performing a partial link do not bother
-     getting a bfd to hold the glue.  */
-  if (info->relocateable)
-    return true;
-  
-  globals = coff_arm_hash_table (info);
-  
-  BFD_ASSERT (globals != NULL);
-
-  if (globals->bfd_of_glue_owner != NULL)
-    return true;
-  
-  sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
-  
-  if (sec == NULL) 
-    {
-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-      
-      sec = bfd_make_section (abfd, ARM2THUMB_GLUE_SECTION_NAME);
-      
-      if (sec == NULL
-	  || ! bfd_set_section_flags (abfd, sec, flags)
-	  || ! bfd_set_section_alignment (abfd, sec, 2))
-	return false;
-    }
-
-  sec = bfd_get_section_by_name (abfd, THUMB2ARM_GLUE_SECTION_NAME);
-
-  if (sec == NULL) 
-    {
-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-      
-      sec = bfd_make_section (abfd, THUMB2ARM_GLUE_SECTION_NAME);
-      
-      if (sec == NULL
-	  || ! bfd_set_section_flags (abfd, sec, flags)
-	  || ! bfd_set_section_alignment (abfd, sec, 2))
-	return false;
-    }
-  
-  /* Save the bfd for later use.  */
-  globals->bfd_of_glue_owner = abfd;
-  
-  return true;
-}
-
-boolean
-bfd_arm_process_before_allocation (abfd, info, support_old_code)
-     bfd *                   abfd;
-     struct bfd_link_info *  info;
-     int		     support_old_code;
-{
-  asection * sec;
-  struct coff_arm_link_hash_table * globals;
-
-  /* If we are only performing a partial link do not bother
-     to construct any glue.  */
-  if (info->relocateable)
-    return true;
-  
-  /* Here we have a bfd that is to be included on the link.  We have a hook
-     to do reloc rummaging, before section sizes are nailed down.  */
-
-  _bfd_coff_get_external_symbols (abfd);
-
-  globals = coff_arm_hash_table (info);
-  
-  BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-  globals->support_old_code = support_old_code;
-  
-  /* Rummage around all the relocs and map the glue vectors.  */
-  sec = abfd->sections;
-
-  if (sec == NULL)
-    return true;
-
-  for (; sec != NULL; sec = sec->next)
-    {
-      struct internal_reloc * i;
-      struct internal_reloc * rel;
-
-      if (sec->reloc_count == 0) 
-	continue;
-
-      /* Load the relocs.  */
-      /* FIXME: there may be a storage leak here. */
-      
-      i = _bfd_coff_read_internal_relocs (abfd, sec, 1, 0, 0, 0);
-    
-      BFD_ASSERT (i != 0);
-
-      for (rel = i; rel < i + sec->reloc_count; ++rel) 
-	{
-	  unsigned short                 r_type  = rel->r_type;
-	  long                           symndx;
-	  struct coff_link_hash_entry *  h;
-
-	  symndx = rel->r_symndx;
-
-	  /* If the relocation is not against a symbol it cannot concern us. */
-	  if (symndx == -1)
-	    continue;
-
-	  h = obj_coff_sym_hashes (abfd)[symndx];
-
-	  /* If the relocation is against a static symbol it must be within
-	     the current section and so cannot be a cross ARM/Thumb relocation.  */
-	  if (h == NULL)
-	    continue;
-
-	  switch (r_type)
-	    {
-	    case ARM_26:
-	      /* This one is a call from arm code.  We need to look up
-		 the target of the call. If it is a thumb target, we
-		 insert glue.  */
-	      
-	      if (h->class == C_THUMBEXTFUNC)
-		record_arm_to_thumb_glue (info, h);
-	      break;
-	      
-	    case ARM_THUMB23:
-	      /* This one is a call from thumb code.  We used to look
-		 for ARM_THUMB9 and ARM_THUMB12 as well.  We need to look
-		 up the target of the call. If it is an arm target, we
-		 insert glue.  If the symbol does not exist it will be
-		 given a class of C_EXT and so we will generate a stub
-		 for it.  This is not really a problem, since the link
-		 is doomed anyway.  */
-
-	      switch (h->class)
-		{
-		case C_EXT:
-		case C_STAT:
-		case C_LABEL:
-		  record_thumb_to_arm_glue (info, h);
-		  break;
-		default:
-		  ;
-		}
-	      break;
-	      
-	    default:
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-#endif /* ! COFF_WITH_PE */
-
-#define coff_bfd_reloc_type_lookup 		coff_arm_reloc_type_lookup
-#define coff_relocate_section 			coff_arm_relocate_section
-#define coff_bfd_is_local_label_name 		coff_arm_is_local_label_name
-#define coff_adjust_symndx			coff_arm_adjust_symndx
-#define coff_link_output_has_begun 		coff_arm_link_output_has_begun
-#define coff_final_link_postscript		coff_arm_final_link_postscript
-#define coff_bfd_merge_private_bfd_data		coff_arm_merge_private_bfd_data
-#define coff_bfd_print_private_bfd_data		coff_arm_print_private_bfd_data
-#define coff_bfd_set_private_flags              _bfd_coff_arm_set_private_flags
-#define coff_bfd_copy_private_bfd_data          coff_arm_copy_private_bfd_data
-#define coff_bfd_link_hash_table_create		coff_arm_link_hash_table_create
-
-
-/* When doing a relocateable link, we want to convert ARM26 relocs
-   into ARM26D relocs.  */
-
-static boolean
-coff_arm_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
-     bfd *obfd;
-     struct bfd_link_info *info;
-     bfd *ibfd;
-     asection *sec;
-     struct internal_reloc *irel;
-     boolean *adjustedp;
-{
-  if (irel->r_type == 3)
-    {
-      struct coff_link_hash_entry *h;
-
-      h = obj_coff_sym_hashes (ibfd)[irel->r_symndx];
-      if (h != NULL
-	  && (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	  && h->root.u.def.section->output_section == sec->output_section)
-	irel->r_type = 7;
-    }
-  *adjustedp = false;
-  return true;
-}
-
-/* Called when merging the private data areas of two BFDs.
-   This is important as it allows us to detect if we are
-   attempting to merge binaries compiled for different ARM
-   targets, eg different CPUs or differents APCS's.     */
-
-static boolean
-coff_arm_merge_private_bfd_data (ibfd, obfd)
-     bfd *   ibfd;
-     bfd *   obfd;
-{
-  BFD_ASSERT (ibfd != NULL && obfd != NULL);
-
-  if (ibfd == obfd)
-    return true;
-
-  /* If the two formats are different we cannot merge anything.
-     This is not an error, since it is permissable to change the
-     input and output formats.  */
-  if (   ibfd->xvec->flavour != bfd_target_coff_flavour
-      || obfd->xvec->flavour != bfd_target_coff_flavour)
-    return true;
-
-  /* Verify that the APCS is the same for the two BFDs */
-  if (APCS_SET (ibfd))
-    {
-      if (APCS_SET (obfd))
-	{
-	  /* If the src and dest have different APCS flag bits set, fail.  */
-	  if (APCS_26_FLAG (obfd) != APCS_26_FLAG (ibfd))
-	    {
-	      _bfd_error_handler
-		/* xgettext: c-format */
-		(_("%s: ERROR: compiled for APCS-%d whereas target %s uses APCS-%d"),
-		 bfd_get_filename (ibfd), APCS_26_FLAG (ibfd) ? 26 : 32,
-		 bfd_get_filename (obfd), APCS_26_FLAG (obfd) ? 26 : 32
-		 );
-
-	      bfd_set_error (bfd_error_wrong_format);
-	      return false;
-	    }
-	  
-	  if (APCS_FLOAT_FLAG (obfd) != APCS_FLOAT_FLAG (ibfd))
-	    {
-	      const char *msg;
-
-	      if (APCS_FLOAT_FLAG (ibfd))
-		/* xgettext: c-format */
-		msg = _("%s: ERROR: passes floats in float registers whereas target %s uses integer registers");
-	      else
-		/* xgettext: c-format */
-		msg = _("%s: ERROR: passes floats in integer registers whereas target %s uses float registers");
-	      
-	      _bfd_error_handler (msg, bfd_get_filename (ibfd),
-				  bfd_get_filename (obfd));
-
-	      bfd_set_error (bfd_error_wrong_format);
-	      return false;
-	    }
-	  
-	  if (PIC_FLAG (obfd) != PIC_FLAG (ibfd))
-	    {
-	      const char * msg;
-
-	      if (PIC_FLAG (ibfd))
-		/* xgettext: c-format */
-		msg = _("%s: ERROR: compiled as position independent code, whereas target %s is absolute position");
-	      else
-		/* xgettext: c-format */
-		msg = _("%s: ERROR: compiled as absolute position code, whereas target %s is position independent");
-	      _bfd_error_handler (msg, bfd_get_filename (ibfd),
-				  bfd_get_filename (obfd));
-
-	      bfd_set_error (bfd_error_wrong_format);
-	      return false;
-	    }
-	}
-      else
-	{
-	  SET_APCS_FLAGS (obfd, APCS_26_FLAG (ibfd) | APCS_FLOAT_FLAG (ibfd) | PIC_FLAG (ibfd));
-	  
-	  /* Set up the arch and fields as well as these are probably wrong.  */
-	  bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
-	}
-    }
-
-  /* Check the interworking support.  */
-  if (INTERWORK_SET (ibfd))
-    {
-      if (INTERWORK_SET (obfd))
-	{
-	  /* If the src and dest differ in their interworking issue a warning.  */
-	  if (INTERWORK_FLAG (obfd) != INTERWORK_FLAG (ibfd))
-	    {
-	      const char * msg;
-
-	      if (INTERWORK_FLAG (ibfd))
-		/* xgettext: c-format */
-		msg = _("Warning: input file %s supports interworking, whereas %s does not.");
-	      else
-		/* xgettext: c-format */
-		msg = _("Warning: input file %s does not support interworking, whereas %s does.");
-	      
-	      _bfd_error_handler (msg, bfd_get_filename (ibfd),
-				  bfd_get_filename (obfd));
-	    }
-	}
-      else
-	{
-	  SET_INTERWORK_FLAG (obfd, INTERWORK_FLAG (ibfd));
-	}
-    }
-
-  return true;
-}
-
-
-/* Display the flags field.  */
-
-static boolean
-coff_arm_print_private_bfd_data (abfd, ptr)
-     bfd *   abfd;
-     PTR     ptr;
-{
-  FILE * file = (FILE *) ptr;
-  
-  BFD_ASSERT (abfd != NULL && ptr != NULL);
-  
-  /* xgettext:c-format */
-  fprintf (file, _("private flags = %x:"), coff_data (abfd)->flags);
-  
-  if (APCS_SET (abfd))
-    {
-      /* xgettext: APCS is ARM Prodecure Call Standard, it should not be translated.  */
-      fprintf (file, " [APCS-%d]", APCS_26_FLAG (abfd) ? 26 : 32);
-
-      if (APCS_FLOAT_FLAG (abfd))
-	fprintf (file, _(" [floats passed in float registers]"));
-      else
-	fprintf (file, _(" [floats passed in integer registers]"));
-
-      if (PIC_FLAG (abfd))
-	fprintf (file, _(" [position independent]"));
-      else
-	fprintf (file, _(" [absolute position]"));
-    }
-  
-  if (! INTERWORK_SET (abfd))
-    fprintf (file, _(" [interworking flag not initialised]"));
-  else if (INTERWORK_FLAG (abfd))
-    fprintf (file, _(" [interworking supported]"));
-  else
-    fprintf (file, _(" [interworking not supported]"));
-  
-  fputc ('\n', file);
-  
-  return true;
-}
-
-
-/* Copies the given flags into the coff_tdata.flags field.
-   Typically these flags come from the f_flags[] field of
-   the COFF filehdr structure, which contains important,
-   target specific information.
-   Note: Although this function is static, it is explicitly
-   called from both coffcode.h and peicode.h.  */
-
-static boolean
-_bfd_coff_arm_set_private_flags (abfd, flags)
-	bfd *	   abfd;
-	flagword   flags;
-{
-  flagword flag;
-
-  BFD_ASSERT (abfd != NULL);
-
-  flag = (flags & F_APCS26) ? F_APCS_26 : 0;
-  
-  /* Make sure that the APCS field has not been initialised to the opposite
-     value.  */
-  if (APCS_SET (abfd)
-      && (   (APCS_26_FLAG    (abfd) != flag)
-	  || (APCS_FLOAT_FLAG (abfd) != (flags & F_APCS_FLOAT))
-	  || (PIC_FLAG        (abfd) != (flags & F_PIC_INT ? F_PIC : 0))
-	  ))
-    return false;
-
-  flag |= (flags & (F_APCS_FLOAT | F_PIC));
-  
-  SET_APCS_FLAGS (abfd, flag);
-
-  flag = (flags & F_INTERWORK);
-  
-  /* If the BFD has already had its interworking flag set, but it
-     is different from the value that we have been asked to set,
-     then assume that that merged code will not support interworking
-     and set the flag accordingly.  */
-  if (INTERWORK_SET (abfd) && (INTERWORK_FLAG (abfd) != flag))
-    {
-      if (flag)
-	/* xgettext: c-format */
-	_bfd_error_handler (_("Warning: Not setting interworking flag of %s, since it has already been specified as non-interworking"),
-			    bfd_get_filename (abfd));
-      else
-	/* xgettext: c-format */
-	_bfd_error_handler (_("Warning: Clearing the interworking flag of %s due to outside request"),
-			    bfd_get_filename (abfd));
-      flag = 0;
-    }
-
-  SET_INTERWORK_FLAG (abfd, flag);
-
-  return true;
-}
-
-
-/* Copy the important parts of the target specific data
-   from one instance of a BFD to another.  */
-
-static boolean
-coff_arm_copy_private_bfd_data (src, dest)
-     bfd *  src;
-     bfd *  dest;
-{
-  BFD_ASSERT (src != NULL && dest != NULL);
- 
-  if (src == dest)
-    return true;
-
-  /* If the destination is not in the same format as the source, do not do
-     the copy.  */
-  if (src->xvec != dest->xvec)
-    return true;
-
-  /* copy the flags field */
-  if (APCS_SET (src))
-    {
-      if (APCS_SET (dest))
-	{
-	  /* If the src and dest have different APCS flag bits set, fail.  */
-	  if (APCS_26_FLAG (dest) != APCS_26_FLAG (src))
-	    return false;
-	  
-	  if (APCS_FLOAT_FLAG (dest) != APCS_FLOAT_FLAG (src))
-	    return false;
-	  
-	  if (PIC_FLAG (dest) != PIC_FLAG (src))
-	    return false;
-	}
-      else
-	SET_APCS_FLAGS (dest, APCS_26_FLAG (src) | APCS_FLOAT_FLAG (src)
-			| PIC_FLAG (src));
-    }
-
-  if (INTERWORK_SET (src))
-    {
-      if (INTERWORK_SET (dest))
-	{
-	  /* If the src and dest have different interworking flags then turn
-	     off the interworking bit.  */
-	  if (INTERWORK_FLAG (dest) != INTERWORK_FLAG (src))
-	    {
-	      if (INTERWORK_FLAG (dest))
-		{
-		  /* xgettext:c-format */
-		  _bfd_error_handler (("Warning: Clearing the interworking bit of %s, because the non-interworking code in %s has been copied into it"),
-				      bfd_get_filename (dest),
-				      bfd_get_filename (src));
-		}
-	      
-	      SET_INTERWORK_FLAG (dest, 0);
-	    }
-	}
-      else
-	{
-	  SET_INTERWORK_FLAG (dest, INTERWORK_FLAG (src));
-	}
-    }
-
-  return true;
-}
-
-/* Note:  the definitions here of LOCAL_LABEL_PREFIX and USER_LABEL_PREIFX
- *must* match the definitions in gcc/config/arm/coff.h and semi.h */
-#define LOCAL_LABEL_PREFIX "."
-#ifndef USER_LABEL_PREFIX
-#define USER_LABEL_PREFIX "_"
-#endif
-
-static boolean
-coff_arm_is_local_label_name (abfd, name)
-     bfd *        abfd;
-     const char * name;
-{
-#ifdef LOCAL_LABEL_PREFIX
-  /* If there is a prefix for local labels then look for this.
-     If the prefix exists, but it is empty, then ignore the test. */
-  
-  if (LOCAL_LABEL_PREFIX[0] != 0)
-    {
-      if (strncmp (name, LOCAL_LABEL_PREFIX, strlen (LOCAL_LABEL_PREFIX)) == 0)
-	return true;
-    }
-#endif
-#ifdef USER_LABEL_PREFIX
-  if (USER_LABEL_PREFIX[0] != 0)
-    {
-      if (strncmp (name, USER_LABEL_PREFIX, strlen (USER_LABEL_PREFIX)) == 0)
-	return false;
-    }
-#endif
-  
-  /* devo/gcc/config/dbxcoff.h defines ASM_OUTPUT_SOURCE_LINE to generate
-     local line numbers as .LM<number>, so treat these as local.  */
-  
-  switch (name[0])
-    {
-    case 'L': return true;
-    case '.': return (name[1] == 'L' && name[2] == 'M') ? true : false;
-    default:  return false;     /* Cannot make our minds up - default to
-				   false so that it will not be stripped
-				   by accident.  */ 
-    }
-}
-
-/* This piece of machinery exists only to guarantee that the bfd that holds
-   the glue section is written last. 
-
-   This does depend on bfd_make_section attaching a new section to the
-   end of the section list for the bfd. 
-
-   krk@cygnus.com  */
-
-static boolean
-coff_arm_link_output_has_begun (sub, info)
-     bfd * sub;
-     struct coff_final_link_info * info;
-{
-  return (sub->output_has_begun
-	  || sub == coff_arm_hash_table (info->info)->bfd_of_glue_owner);
-}
-
-static boolean
-coff_arm_final_link_postscript (abfd, pfinfo)
-     bfd * abfd;
-     struct coff_final_link_info * pfinfo;
-{
-  struct coff_arm_link_hash_table * globals;
-
-  globals = coff_arm_hash_table (pfinfo->info);
-  
-  BFD_ASSERT (globals != NULL);
-  
-  if (globals->bfd_of_glue_owner != NULL)
-    {
-      if (! _bfd_coff_link_input_bfd (pfinfo, globals->bfd_of_glue_owner))
-	return false;
-      
-      globals->bfd_of_glue_owner->output_has_begun = true;
-    }
-  
-  return true;
-}
-
-#if 0
-#define coff_SWAP_sym_in  arm_bfd_coff_swap_sym_in
-
-static void coff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
-
-/* Sepcial version of symbol swapper, used to grab a bfd
-   onto which the glue sections can be attached.  */
-static void
-arm_bfd_coff_swap_sym_in (abfd, ext1, in1)
-     bfd * abfd;
-     PTR   ext1;
-     PTR   in1;
-{
-  flagword flags;
-  register asection * s;
-
-  /* Do the normal swap in.  */
-  coff_swap_sym_in (abfd, ext1, in1);
-
-  if (bfd_of_glue_owner != NULL) /* we already have a toc, so go home */
-    return;
-
-  /* Save the bfd for later allocation.  */
-  bfd_of_glue_owner = abfd;
-
-  s = bfd_get_section_by_name (bfd_of_glue_owner , 
-			       ARM2THUMB_GLUE_SECTION_NAME);
-
-  if (s == NULL) 
-    {
-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY ;
-      
-      s = bfd_make_section (bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
-
-      if (s == NULL
-	  || !bfd_set_section_flags (bfd_of_glue_owner, s, flags)
-	  || !bfd_set_section_alignment (bfd_of_glue_owner, s, 2))
-	{
-	  /* FIXME: set appropriate bfd error */
-	  abort();
-	}
-    }
-
-  s = bfd_get_section_by_name (bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
-
-  if (s == NULL) 
-    {
-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY ;
-      
-      s = bfd_make_section (bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
-      
-      if (s == NULL
-	  || !bfd_set_section_flags (bfd_of_glue_owner, s, flags)
-	  || !bfd_set_section_alignment (bfd_of_glue_owner, s, 2))
-	{
-	  /* FIXME: set appropriate bfd error krk@cygnus.com */
-	  abort();
-	}
-    }
-  
-  return;
-}
-#endif
-
-#include "coffcode.h"
-
-const bfd_target
-#ifdef TARGET_LITTLE_SYM
-TARGET_LITTLE_SYM =
-#else
-armcoff_little_vec =
-#endif
-{
-#ifdef TARGET_LITTLE_NAME
-  TARGET_LITTLE_NAME,
-#else
-  "coff-arm-little",
-#endif
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-#ifndef COFF_WITH_PE
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-#else
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
-#endif
-
-#ifdef TARGET_UNDERSCORE
-  TARGET_UNDERSCORE,		/* leading underscore */
-#else
-  0,				/* leading underscore */
-#endif
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-/* Note that we allow an object file to be treated as a core file as well. */
-    {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, coff_object_p},
-    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-       bfd_false},
-    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) & bfd_coff_std_swap_table,
-};
-
-const bfd_target
-#ifdef TARGET_BIG_SYM
-TARGET_BIG_SYM =
-#else
-armcoff_big_vec =
-#endif
-{
-#ifdef TARGET_BIG_NAME
-  TARGET_BIG_NAME,
-#else
-  "coff-arm-big",
-#endif
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-#ifndef COFF_WITH_PE
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-#else
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
-#endif
-
-#ifdef TARGET_UNDERSCORE
-  TARGET_UNDERSCORE,		/* leading underscore */
-#else
-  0,				/* leading underscore */
-#endif
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-/* Note that we allow an object file to be treated as a core file as well. */
-    {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, coff_object_p},
-    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-       bfd_false},
-    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) & bfd_coff_std_swap_table,
-};
diff --git a/bfd/coff-aux.c b/bfd/coff-aux.c
deleted file mode 100644
index 6966392a33b..00000000000
--- a/bfd/coff-aux.c
+++ /dev/null
@@ -1,135 +0,0 @@
-/* BFD back-end for Apple M68K COFF A/UX 3.x files.
-   Copyright 1996, 1997 Free Software Foundation, Inc.
-   Written by Richard Henderson <rth@tamu.edu>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_SYM	m68kaux_coff_vec
-#define TARGET_NAME	"coff-m68k-aux"
-
-#ifndef TARG_AUX
-#define TARG_AUX
-#endif
-
-#define COFF_LONG_FILENAMES
-
-/* 4k pages */
-#define COFF_PAGE_SIZE 0x1000
-
-/* On AUX, a STYP_NOLOAD|STYP_BSS section is part of a shared library. */
-#define BSS_NOLOAD_IS_SHARED_LIBRARY
-
-#define STATIC_RELOCS
-
-#define COFF_COMMON_ADDEND
-
-#include "bfd.h"
-#include "sysdep.h"
-
-static boolean coff_m68k_aux_link_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, 
-           asection *, bfd_vma, const char *, boolean, boolean, 
-           struct bfd_link_hash_entry **));
-
-#define coff_link_add_one_symbol coff_m68k_aux_link_add_one_symbol
-
-#include "coff/aux-coff.h"  /* override coff/internal.h and coff/m68k.h */
-#include "coff-m68k.c"
-
-/* We need non-absolute symbols to override absolute symbols.  This
-   mirrors Apple's "solution" to let a static library symbol override
-   a shared library symbol.  On the whole not a good thing, given how
-   shared libraries work here, but can work if you are careful with
-   what you include in the shared object. */
-
-static boolean
-coff_m68k_aux_link_add_one_symbol (info, abfd, name, flags, section, value,
-				   string, copy, collect, hashp)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     asection *section;
-     bfd_vma value;
-     const char *string;
-     boolean copy;
-     boolean collect;
-     struct bfd_link_hash_entry **hashp;
-{
-  struct bfd_link_hash_entry *h;
-
-  if ((flags & (BSF_WARNING | BSF_CONSTRUCTOR | BSF_WEAK)) == 0 &&
-      !bfd_is_und_section (section) &&
-      !bfd_is_com_section (section))
-    {
-      /* The new symbol is a definition or an indirect definition */
-
-      /* This bit copied from linker.c */
-      if (hashp != NULL && *hashp != NULL)
-	{
-	  h = *hashp;
-	  BFD_ASSERT (strcmp (h->root.string, name) == 0);
-	}
-      else
-	{
-	  h = bfd_link_hash_lookup (info->hash, name, true, copy, false);
-	  if (h == NULL)
-	    {
-	      if (hashp != NULL)
-		*hashp = NULL;
-	      return false;
-	    }
-	}
-
-      if (info->notice_hash != (struct bfd_hash_table *) NULL
-	  && (bfd_hash_lookup (info->notice_hash, name, false, false)
-	      != (struct bfd_hash_entry *) NULL))
-	{
-	  if (! (*info->callbacks->notice) (info, name, abfd, section, value))
-	    return false;
-	}
-
-      if (hashp != (struct bfd_link_hash_entry **) NULL)
-	*hashp = h;
-      /* end duplication from linker.c */
-
-      if (h->type == bfd_link_hash_defined
-	  || h->type == bfd_link_hash_indirect)
-	{
-	  asection *msec;
-
-	  if (h->type == bfd_link_hash_defined)
-	    msec = h->u.def.section;
-	  else
-	    msec = bfd_ind_section_ptr;
-
-	  if (bfd_is_abs_section (msec) && !bfd_is_abs_section (section))
-	    {
-	      h->u.def.section = section;
-	      h->u.def.value = value;
-	      return true;
-	    }
-	  else if (bfd_is_abs_section (section) && !bfd_is_abs_section (msec))
-	    return true;
-	}
-    }
-
-  /* If we didn't exit early, finish processing in the generic routine */
-  return _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
-					   value, string, copy, collect,
-					   hashp);
-}
diff --git a/bfd/coff-go32.c b/bfd/coff-go32.c
deleted file mode 100644
index be4adb24f52..00000000000
--- a/bfd/coff-go32.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* BFD back-end for Intel 386 COFF files (go32 variant).
-   Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
-   Written by DJ Delorie.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_SYM		go32coff_vec
-#define TARGET_NAME		"coff-go32"
-#define TARGET_UNDERSCORE	'_'
-
-#include "coff-i386.c"
diff --git a/bfd/coff-h8300.c b/bfd/coff-h8300.c
deleted file mode 100644
index 74a4ec3962a..00000000000
--- a/bfd/coff-h8300.c
+++ /dev/null
@@ -1,1388 +0,0 @@
-/* BFD back-end for Hitachi H8/300 COFF binaries.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Steve Chamberlain, <sac@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "genlink.h"
-#include "coff/h8300.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
-
-/* We derive a hash table from the basic BFD hash table to
-   hold entries in the function vector.  Aside from the 
-   info stored by the basic hash table, we need the offset
-   of a particular entry within the hash table as well as
-   the offset where we'll add the next entry.  */
-
-struct funcvec_hash_entry
-{
-  /* The basic hash table entry.  */
-  struct bfd_hash_entry root;
-
-  /* The offset within the vectors section where
-     this entry lives.  */
-  bfd_vma offset;
-};
-
-struct funcvec_hash_table
-{
-  /* The basic hash table.  */
-  struct bfd_hash_table root;
-
-  bfd *abfd;
-
-  /* Offset at which we'll add the next entry.  */
-  unsigned int offset;
-};
-
-static struct bfd_hash_entry *
-funcvec_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-
-static boolean
-funcvec_hash_table_init
-  PARAMS ((struct funcvec_hash_table *, bfd *,
-           struct bfd_hash_entry *(*) PARAMS ((struct bfd_hash_entry *,
-                                               struct bfd_hash_table *,
-                                               const char *))));
-
-/* To lookup a value in the function vector hash table.  */
-#define funcvec_hash_lookup(table, string, create, copy) \
-  ((struct funcvec_hash_entry *) \
-   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-
-/* The derived h8300 COFF linker table.  Note it's derived from
-   the generic linker hash table, not the COFF backend linker hash
-   table!  We use this to attach additional data structures we
-   need while linking on the h8300.  */
-struct h8300_coff_link_hash_table
-{
-  /* The main hash table.  */
-  struct generic_link_hash_table root;
-
-  /* Section for the vectors table.  This gets attached to a
-     random input bfd, we keep it here for easy access.  */
-  asection *vectors_sec;
-
-  /* Hash table of the functions we need to enter into the function
-     vector.  */
-  struct funcvec_hash_table *funcvec_hash_table;
-};
-
-static struct bfd_link_hash_table *h8300_coff_link_hash_table_create
-  PARAMS ((bfd *));
-
-/* Get the H8/300 COFF linker hash table from a link_info structure.  */
-
-#define h8300_coff_hash_table(p) \
-  ((struct h8300_coff_link_hash_table *) ((coff_hash_table (p))))
-
-/* Initialize fields within a funcvec hash table entry.  Called whenever
-   a new entry is added to the funcvec hash table.  */
-
-static struct bfd_hash_entry *
-funcvec_hash_newfunc (entry, gen_table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *gen_table;
-     const char *string;
-{
-  struct funcvec_hash_entry *ret;
-  struct funcvec_hash_table *table;
-
-  ret = (struct funcvec_hash_entry *) entry;
-  table = (struct funcvec_hash_table *) gen_table;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == NULL)
-    ret = ((struct funcvec_hash_entry *)
-           bfd_hash_allocate (gen_table,
-                              sizeof (struct funcvec_hash_entry)));
-  if (ret == NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct funcvec_hash_entry *)
-         bfd_hash_newfunc ((struct bfd_hash_entry *) ret, gen_table, string));
-
-  if (ret == NULL)
-    return NULL;
-
-  /* Note where this entry will reside in the function vector table.  */
-  ret->offset = table->offset;
-
-  /* Bump the offset at which we store entries in the function
-     vector.  We'd like to bump up the size of the vectors section,
-     but it's not easily available here.  */
-  if (bfd_get_mach (table->abfd) == bfd_mach_h8300)
-    table->offset += 2;
-  else if (bfd_get_mach (table->abfd) == bfd_mach_h8300h
-	   || bfd_get_mach (table->abfd) == bfd_mach_h8300s)
-    table->offset += 4;
-  else
-    return NULL;
-
-  /* Everything went OK.  */
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize the function vector hash table.  */
-
-static boolean
-funcvec_hash_table_init (table, abfd, newfunc)
-     struct funcvec_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-                                                struct bfd_hash_table *,
-                                                const char *));
-{
-  /* Initialize our local fields, then call the generic initialization
-     routine.  */
-  table->offset = 0;
-  table->abfd = abfd;
-  return (bfd_hash_table_init (&table->root, newfunc));
-}
-
-/* Create the derived linker hash table.  We use a derived hash table
-   basically to hold "static" information during an h8/300 coff link
-   without using static variables.  */
-
-static struct bfd_link_hash_table *
-h8300_coff_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct h8300_coff_link_hash_table *ret;
-  ret = ((struct h8300_coff_link_hash_table *)
-         bfd_alloc (abfd, sizeof (struct h8300_coff_link_hash_table)));
-  if (ret == NULL)
-    return NULL;
-  if (!_bfd_link_hash_table_init (&ret->root.root, abfd, _bfd_generic_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  /* Initialize our data.  */
-  ret->vectors_sec = NULL;
-  ret->funcvec_hash_table = NULL;
-
-  /* OK.  Everything's intialized, return the base pointer.  */
-  return &ret->root.root;
-}
-
-/* special handling for H8/300 relocs.
-   We only come here for pcrel stuff and return normally if not an -r link.
-   When doing -r, we can't do any arithmetic for the pcrel stuff, because
-   the code in reloc.c assumes that we can manipulate the targets of
-   the pcrel branches.  This isn't so, since the H8/300 can do relaxing, 
-   which means that the gap after the instruction may not be enough to
-   contain the offset required for the branch, so we have to use the only
-   the addend until the final link */
-
-static bfd_reloc_status_type
-special (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-		 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_ok;
-}
-
-static reloc_howto_type howto_table[] =
-{
-  HOWTO (R_RELBYTE, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "8", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_RELWORD, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "16", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG, 0, 2, 32, false, 0, complain_overflow_bitfield, special, "32", false, 0xffffffff, 0xffffffff, false),
-  HOWTO (R_PCRBYTE, 0, 0, 8, true, 0, complain_overflow_signed, special, "DISP8", false, 0x000000ff, 0x000000ff, true),
-  HOWTO (R_PCRWORD, 0, 1, 16, true, 0, complain_overflow_signed, special, "DISP16", false, 0x0000ffff, 0x0000ffff, true),
-  HOWTO (R_PCRLONG, 0, 2, 32, true, 0, complain_overflow_signed, special, "DISP32", false, 0xffffffff, 0xffffffff, true),
-  HOWTO (R_MOV16B1, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "relaxable mov.b:16", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_MOV16B2, 0, 1, 8, false, 0, complain_overflow_bitfield, special, "relaxed mov.b:16", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_JMP1, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "16/pcrel", false, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_JMP2, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "pcrecl/16", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_JMPL1, 0, 2, 32, false, 0, complain_overflow_bitfield, special, "24/pcrell", false, 0x00ffffff, 0x00ffffff, false),
-  HOWTO (R_JMPL2, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "pc8/24", false, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_MOV24B1, 0, 1, 32, false, 0, complain_overflow_bitfield, special, "relaxable mov.b:24", false, 0xffffffff, 0xffffffff, false),
-  HOWTO (R_MOV24B2, 0, 1, 8, false, 0, complain_overflow_bitfield, special, "relaxed mov.b:24", false, 0x0000ffff, 0x0000ffff, false),
-
-  /* An indirect reference to a function.  This causes the function's address
-     to be added to the function vector in lo-mem and puts the address of
-     the function vector's entry in the jsr instruction.  */
-  HOWTO (R_MEM_INDIRECT, 0, 0, 8, false, 0, complain_overflow_bitfield, special, "8/indirect", false, 0x000000ff, 0x000000ff, false),
-
-  /* Internal reloc for relaxing.  This is created when a 16bit pc-relative
-     branch is turned into an 8bit pc-relative branch.  */
-  HOWTO (R_PCRWORD_B, 0, 0, 8, true, 0, complain_overflow_bitfield, special, "relaxed bCC:16", false, 0x000000ff, 0x000000ff, false),
-
-  HOWTO (R_MOVL1, 0, 2, 32, false, 0, complain_overflow_bitfield,special, "32/24 relaxable move", false, 0xffffffff, 0xffffffff, false),
-
-  HOWTO (R_MOVL2, 0, 1, 16, false, 0, complain_overflow_bitfield, special, "32/24 relaxed move", false, 0x0000ffff, 0x0000ffff, false),
-
-  HOWTO (R_BCC_INV, 0, 0, 8, true, 0, complain_overflow_signed, special, "DISP8 inverted", false, 0x000000ff, 0x000000ff, true),
-
-  HOWTO (R_JMP_DEL, 0, 0, 8, true, 0, complain_overflow_signed, special, "Deleted jump", false, 0x000000ff, 0x000000ff, true),
-};
-
-
-/* Turn a howto into a reloc number */
-
-#define SELECT_RELOC(x,howto) \
-  { x.r_type = select_reloc(howto); }
-
-#define BADMAG(x) (H8300BADMAG(x) && H8300HBADMAG(x) && H8300SBADMAG(x))
-#define H8300 1			/* Customize coffcode.h */
-#define __A_MAGIC_SET__
-
-
-
-/* Code to swap in the reloc */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
-#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
-  dst->r_stuff[0] = 'S'; \
-  dst->r_stuff[1] = 'C';
-
-
-static int
-select_reloc (howto)
-     reloc_howto_type *howto;
-{
-  return howto->type;
-}
-
-/* Code to turn a r_type into a howto ptr, uses the above howto table
-   */
-
-static void
-rtype2howto (internal, dst)
-     arelent *internal;
-     struct internal_reloc *dst;
-{
-  switch (dst->r_type)
-    {
-    case R_RELBYTE:
-      internal->howto = howto_table + 0;
-      break;
-    case R_RELWORD:
-      internal->howto = howto_table + 1;
-      break;
-    case R_RELLONG:
-      internal->howto = howto_table + 2;
-      break;
-    case R_PCRBYTE:
-      internal->howto = howto_table + 3;
-      break;
-    case R_PCRWORD:
-      internal->howto = howto_table + 4;
-      break;
-    case R_PCRLONG:
-      internal->howto = howto_table + 5;
-      break;
-    case R_MOV16B1:
-      internal->howto = howto_table + 6;
-      break;
-    case R_MOV16B2:
-      internal->howto = howto_table + 7;
-      break;
-    case R_JMP1:
-      internal->howto = howto_table + 8;
-      break;
-    case R_JMP2:
-      internal->howto = howto_table + 9;
-      break;
-    case R_JMPL1:
-      internal->howto = howto_table + 10;
-      break;
-    case R_JMPL2:
-      internal->howto = howto_table + 11;
-      break;
-    case R_MOV24B1:
-      internal->howto = howto_table + 12;
-      break;
-    case R_MOV24B2:
-      internal->howto = howto_table + 13;
-      break;
-    case R_MEM_INDIRECT:
-      internal->howto = howto_table + 14;
-      break;
-    case R_PCRWORD_B:
-      internal->howto = howto_table + 15;
-      break;
-    case R_MOVL1:
-      internal->howto = howto_table + 16;
-      break;
-    case R_MOVL2:
-      internal->howto = howto_table + 17;
-      break;
-    case R_BCC_INV:
-      internal->howto = howto_table + 18;
-      break;
-    case R_JMP_DEL:
-      internal->howto = howto_table + 19;
-      break;
-    default:
-      abort ();
-      break;
-    }
-}
-
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-
-/* Perform any necessary magic to the addend in a reloc entry */
-
-
-#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
- cache_ptr->addend =  ext_reloc.r_offset;
-
-
-#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
- reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void
-reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent * relent;
-     struct internal_reloc *reloc;
-     asymbol ** symbols;
-     bfd * abfd;
-     asection * section;
-{
-  relent->address = reloc->r_vaddr;
-  rtype2howto (relent, reloc);
-
-  if (((int) reloc->r_symndx) > 0)
-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
-  else
-    {
-      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
-
-
-
-  relent->addend = reloc->r_offset;
-
-  relent->address -= section->vma;
-  /*  relent->section = 0;*/
-}
-
-static boolean
-h8300_symbol_address_p (abfd, input_section, address)
-     bfd *abfd;
-     asection *input_section;
-     bfd_vma address;
-{
-  asymbol **s;
-
-  s = _bfd_generic_link_get_symbols (abfd);
-  BFD_ASSERT (s != (asymbol **) NULL);
-
-  /* Search all the symbols for one in INPUT_SECTION with
-     address ADDRESS.  */
-  while (*s) 
-    {
-      asymbol *p = *s;
-      if (p->section == input_section
-	  && (input_section->output_section->vma
-	      + input_section->output_offset
-	      + p->value) == address)
-	return true;
-      s++;
-    }    
-  return false;
-}
-
-
-/* If RELOC represents a relaxable instruction/reloc, change it into
-   the relaxed reloc, notify the linker that symbol addresses
-   have changed (bfd_perform_slip) and return how much the current
-   section has shrunk by.
-
-   FIXME: Much of this code has knowledge of the ordering of entries
-   in the howto table.  This needs to be fixed.  */
-
-static int
-h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
-     bfd *abfd;
-     asection *input_section;
-     arelent *reloc;
-     unsigned int shrink;
-     struct bfd_link_info *link_info;
-{
-  bfd_vma value;  
-  bfd_vma dot;
-  bfd_vma gap;
-  static asection *last_input_section = NULL;
-  static arelent *last_reloc = NULL;
-
-  /* The address of the thing to be relocated will have moved back by 
-     the size of the shrink - but we don't change reloc->address here,
-     since we need it to know where the relocation lives in the source
-     uncooked section.  */
-  bfd_vma address = reloc->address - shrink;
-
-  if (input_section != last_input_section)
-    last_reloc = NULL;
-
-  /* Only examine the relocs which might be relaxable.  */
-  switch (reloc->howto->type)
-    {     
-
-    /* This is the 16/24 bit absolute branch which could become an 8 bit
-       pc-relative branch.  */
-    case R_JMP1:
-    case R_JMPL1:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      /* Get the address of the next instruction (not the reloc).  */
-      dot = (input_section->output_section->vma
-	     + input_section->output_offset + address);
-
-      /* Adjust for R_JMP1 vs R_JMPL1.  */
-      dot += (reloc->howto->type == R_JMP1 ? 1 : 2);
-
-      /* Compute the distance from this insn to the branch target.  */
-      gap = value - dot;
-  
-      /* If the distance is within -128..+128 inclusive, then we can relax
-	 this jump.  +128 is valid since the target will move two bytes
-	 closer if we do relax this branch.  */
-      if ((int)gap >= -128 && (int)gap <= 128 )
-	{ 
-
-	  /* It's possible we may be able to eliminate this branch entirely;
-	     if the previous instruction is a branch around this instruction,
-	     and there's no label at this instruction, then we can reverse
-	     the condition on the previous branch and eliminate this jump.
-
-	       original:			new:
-		 bCC lab1			bCC' lab2
-		 jmp lab2
-		lab1:				lab1:
-	
-	     This saves 4 bytes instead of two, and should be relatively
-	     common.  */
-
-	  if (gap <= 126
-	      && last_reloc
-	      && last_reloc->howto->type == R_PCRBYTE)
-	    {
-	      bfd_vma last_value;
-	      last_value = bfd_coff_reloc16_get_value (last_reloc, link_info,
-						       input_section) + 1;
-
-	      if (last_value == dot + 2
-		  && last_reloc->address + 1 == reloc->address
-		  && ! h8300_symbol_address_p (abfd, input_section, dot - 2))
-		{
-		  reloc->howto = howto_table + 19;
-		  last_reloc->howto = howto_table + 18;
-		  last_reloc->sym_ptr_ptr = reloc->sym_ptr_ptr;
-		  last_reloc->addend = reloc->addend;
-		  shrink += 4;
-		  bfd_perform_slip (abfd, 4, input_section, address);
-		  break;
-		}
-	    }
-
-	  /* Change the reloc type.  */
-	  reloc->howto = reloc->howto + 1;	  
-
-	  /* This shrinks this section by two bytes.  */
-	  shrink += 2;
-	  bfd_perform_slip(abfd, 2, input_section, address);
-	}
-      break;
-
-    /* This is the 16 bit pc-relative branch which could become an 8 bit
-       pc-relative branch.  */
-    case R_PCRWORD:
-      /* Get the address of the target of this branch, add one to the value
-         because the addend field in PCrel jumps is off by -1.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section) + 1;
-	
-      /* Get the address of the next instruction if we were to relax.  */
-      dot = input_section->output_section->vma +
-	input_section->output_offset + address;
-  
-      /* Compute the distance from this insn to the branch target.  */
-      gap = value - dot;
-
-      /* If the distance is within -128..+128 inclusive, then we can relax
-	 this jump.  +128 is valid since the target will move two bytes
-	 closer if we do relax this branch.  */
-      if ((int)gap >= -128 && (int)gap <= 128 )
-	{ 
-	  /* Change the reloc type.  */
-	  reloc->howto = howto_table + 15;
-
-	  /* This shrinks this section by two bytes.  */
-	  shrink += 2;
-	  bfd_perform_slip(abfd, 2, input_section, address);
-	}
-      break;
-
-    /* This is a 16 bit absolute address in a mov.b insn, which can
-       become an 8 bit absolute address if it's in the right range.  */
-    case R_MOV16B1:
-      /* Get the address of the data referenced by this mov.b insn.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      /* The address is in 0xff00..0xffff inclusive on the h8300 or
-	 0xffff00..0xffffff inclusive on the h8300h, then we can
-	 relax this mov.b  */
-      if ((bfd_get_mach (abfd) == bfd_mach_h8300
-	   && value >= 0xff00
-	   && value <= 0xffff)
-	  || ((bfd_get_mach (abfd) == bfd_mach_h8300h
-	       || bfd_get_mach (abfd) == bfd_mach_h8300s)
-	      && value >= 0xffff00
-	      && value <= 0xffffff))
-	{
-	  /* Change the reloc type.  */
-	  reloc->howto = reloc->howto + 1;
-
-	  /* This shrinks this section by two bytes.  */
-	  shrink += 2;
-	  bfd_perform_slip(abfd, 2, input_section, address);
-	}
-      break;
-
-    /* Similarly for a 24 bit absolute address in a mov.b.  Note that
-       if we can't relax this into an 8 bit absolute, we'll fall through
-       and try to relax it into a 16bit absolute.  */
-    case R_MOV24B1:
-      /* Get the address of the data referenced by this mov.b insn.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      /* The address is in 0xffff00..0xffffff inclusive on the h8300h,
-	 then we can relax this mov.b  */
-      if ((bfd_get_mach (abfd) == bfd_mach_h8300h
-	   || bfd_get_mach (abfd) == bfd_mach_h8300s)
-	  && value >= 0xffff00
-	  && value <= 0xffffff)
-	{
-	  /* Change the reloc type.  */
-	  reloc->howto = reloc->howto + 1;
-
-	  /* This shrinks this section by four bytes.  */
-	  shrink += 4;
-	  bfd_perform_slip(abfd, 4, input_section, address);
-
-	  /* Done with this reloc.  */
-	  break;
-	}
-
-      /* FALLTHROUGH and try to turn the 32/24 bit reloc into a 16 bit
-	 reloc.  */
-
-    /* This is a 24/32 bit absolute address in a mov insn, which can
-       become an 16 bit absolute address if it's in the right range.  */
-    case R_MOVL1:
-      /* Get the address of the data referenced by this mov insn.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      /* If this address is in 0x0000..0x7fff inclusive or
-         0xff8000..0xffffff inclusive, then it can be relaxed.  */
-      if (value <= 0x7fff || value >= 0xff8000)
-	{
-	  /* Change the reloc type.  */
-	  reloc->howto = howto_table + 17;
-
-	  /* This shrinks this section by two bytes.  */
-	  shrink += 2;
-	  bfd_perform_slip(abfd, 2, input_section, address);
-	}
-      break;
-
-      /* No other reloc types represent relaxing opportunities.  */
-      default:
-	break;
-    }
-
-  last_reloc = reloc;
-  last_input_section = input_section;
-  return shrink;
-}
-
-
-/* Handle relocations for the H8/300, including relocs for relaxed
-   instructions.
-
-   FIXME: Not all relocations check for overflow!  */
-
-static void
-h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
-			   dst_ptr)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     arelent *reloc;
-     bfd_byte *data;
-     unsigned int *src_ptr;
-     unsigned int *dst_ptr;
-{
-  unsigned int src_address = *src_ptr;
-  unsigned int dst_address = *dst_ptr;
-  asection *input_section = link_order->u.indirect.section;
-  bfd_vma value;
-  bfd_vma dot;
-  int gap,tmp;
-
-  switch (reloc->howto->type)
-    {
-
-    /* Generic 8bit pc-relative relocation.  */
-    case R_PCRBYTE:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      dot = (link_order->offset 
-	     + dst_address 
-	     + link_order->u.indirect.section->output_section->vma);
-
-      gap = value - dot;
-
-      /* Sanity check.  */
-      if (gap < -128 || gap > 126)
-	{
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort ();
-	}
-
-      /* Everything looks OK.  Apply the relocation and update the
-	 src/dst address appropriately.  */
-
-      bfd_put_8 (abfd, gap, data + dst_address);
-      dst_address++;
-      src_address++;
-
-      /* All done.  */
-      break;
-
-    /* Generic 16bit pc-relative relocation.  */
-    case R_PCRWORD:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      /* Get the address of the instruction (not the reloc).  */
-      dot = (link_order->offset 
-	     + dst_address 
-	     + link_order->u.indirect.section->output_section->vma + 1);
-
-      gap = value - dot;
-
-      /* Sanity check.  */
-      if (gap > 32766 || gap < -32768)
-	{
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort ();
-	}
-
-      /* Everything looks OK.  Apply the relocation and update the
-	 src/dst address appropriately.  */
-
-      bfd_put_16 (abfd, gap, data + dst_address);
-      dst_address += 2;
-      src_address += 2;
-
-      /* All done.  */
-      break;
-
-    /* Generic 8bit absolute relocation.  */
-    case R_RELBYTE:
-      /* Get the address of the object referenced by this insn.  */
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      /* Sanity check.  */
-      if (value <= 0xff
-	  || (value >= 0x0000ff00 && value <= 0x0000ffff)
-  	  || (value >= 0x00ffff00 && value <= 0x00ffffff)
-	  || (value >= 0xffffff00 && value <= 0xffffffff))
-	{
-	  /* Everything looks OK.  Apply the relocation and update the
-	     src/dst address appropriately.  */
-
-	  bfd_put_8 (abfd, value & 0xff, data + dst_address);
-	  dst_address += 1;
-	  src_address += 1;
-	}
-      else
-	{
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort ();
-	}
-
-      /* All done.  */
-      break;
-
-    /* Various simple 16bit absolute relocations.  */
-    case R_MOV16B1:
-    case R_JMP1:
-    case R_RELWORD:
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-      bfd_put_16 (abfd, value, data + dst_address);
-      dst_address += 2;
-      src_address += 2;
-      break;
-
-    /* Various simple 24/32bit absolute relocations.  */
-    case R_MOV24B1:
-    case R_MOVL1:
-    case R_RELLONG:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-      bfd_put_32 (abfd, value, data + dst_address);
-      dst_address += 4;
-      src_address += 4;
-      break;
-
-    /* Another 24/32bit absolute relocation.  */
-    case R_JMPL1:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      value = ((value & 0x00ffffff)
-	       | (bfd_get_32 (abfd, data + src_address) & 0xff000000));
-      bfd_put_32 (abfd, value, data + dst_address);
-      dst_address += 4;
-      src_address += 4;
-      break;
-
-    /* A 16bit abolute relocation that was formerlly a 24/32bit
-       absolute relocation.  */
-    case R_MOVL2:
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      /* Sanity check.  */
-      if (value < 0x8000 || value > 0xff8000)
-	{
-	  /* Insert the 16bit value into the proper location.  */
-	  bfd_put_16 (abfd, value, data + dst_address);
-
-	  /* Fix the opcode.  For all the move insns, we simply
-	     need to turn off bit 0x20 in the previous byte.  */
-          data[dst_address - 1] &= ~0x20;
-	  dst_address += 2;
-	  src_address += 4;
-	}
-      else
-	{
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort ();
-        }
-      break;
-
-    /* A 16bit absolute branch that is now an 8-bit pc-relative branch.  */
-    case R_JMP2:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      /* Get the address of the next instruction.  */
-      dot = (link_order->offset
-	     + dst_address
-	     + link_order->u.indirect.section->output_section->vma + 1);
-
-      gap = value - dot;
-
-      /* Sanity check.  */
-      if (gap < -128 || gap > 126)
-	{
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort ();
-	}
-
-      /* Now fix the instruction itself.  */
-      switch (data[dst_address - 1])
-	{
-	case 0x5e:
-	  /* jsr -> bsr */
-	  bfd_put_8 (abfd, 0x55, data + dst_address - 1);
-	  break;
-	case 0x5a:
-	  /* jmp ->bra */
-	  bfd_put_8 (abfd, 0x40, data + dst_address - 1);
-	  break;
-
-	default:
-	  abort ();
-	}
-
-      /* Write out the 8bit value.  */
-      bfd_put_8 (abfd, gap, data + dst_address);
-
-      dst_address += 1;
-      src_address += 3;
-
-      break;
-
-    /* A 16bit pc-relative branch that is now an 8-bit pc-relative branch.  */
-    case R_PCRWORD_B:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      /* Get the address of the instruction (not the reloc).  */
-      dot = (link_order->offset
-	     + dst_address
-	     + link_order->u.indirect.section->output_section->vma - 1);
-
-      gap = value - dot;
-
-      /* Sanity check.  */
-      if (gap < -128 || gap > 126)
-	{
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort ();
-	}
-
-      /* Now fix the instruction.  */
-      switch (data[dst_address - 2])
-	{
-	case 0x58:
-	  /* bCC:16 -> bCC:8 */
-	  /* Get the condition code from the original insn.  */
-	  tmp = data[dst_address - 1];
-	  tmp &= 0xf0;
-	  tmp >>= 4;
-
-	  /* Now or in the high nibble of the opcode.  */
-	  tmp |= 0x40;
-
-	  /* Write it.  */
-	  bfd_put_8 (abfd, tmp, data + dst_address - 2);
-	  break;
-
-	default:
-	  abort ();
-	}
-
-	/* Output the target.  */
-	bfd_put_8 (abfd, gap, data + dst_address - 1);
-
-	/* We don't advance dst_address -- the 8bit reloc is applied at
-	   dst_address - 1, so the next insn should begin at dst_address.  */
-	src_address += 2;
-
-	break;
-      
-    /* Similarly for a 24bit absolute that is now 8 bits.  */
-    case R_JMPL2:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      /* Get the address of the instruction (not the reloc).  */
-      dot = (link_order->offset
-	     + dst_address
-	     + link_order->u.indirect.section->output_section->vma + 2);
-
-      gap = value - dot;
-
-      /* Fix the instruction.  */
-      switch (data[src_address])
-	{
-	case 0x5e:
-	  /* jsr -> bsr */
-	  bfd_put_8 (abfd, 0x55, data + dst_address);
-	  break;
-	case 0x5a:
-	  /* jmp ->bra */
-	  bfd_put_8 (abfd, 0x40, data + dst_address);
-	  break;
-	default:
-	  abort ();
-	}
-
-      bfd_put_8 (abfd, gap, data + dst_address + 1);
-      dst_address += 2;
-      src_address += 4;
-
-      break;
-
-    /* A 16bit absolute mov.b that is now an 8bit absolute mov.b.  */
-    case R_MOV16B2:
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      /* Sanity check.  */
-      if (data[dst_address - 2] != 0x6a)
-	abort ();
-
-      /* Fix up the opcode.  */
-      switch (data[src_address-1] & 0xf0)
-	{
-	case 0x00:
-	  data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x20;
-	  break;
-	case 0x80:
-	  data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x30;
-	  break;
-	default:
-	  abort ();
-	}
-
-      bfd_put_8 (abfd, value & 0xff, data + dst_address - 1);
-      src_address += 2;
-      break;
-
-    /* Similarly for a 24bit mov.b  */
-    case R_MOV24B2:
-      value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-
-      /* Sanity check.  */
-      if (data[dst_address - 2] != 0x6a)
-	abort ();
-
-      /* Fix up the opcode.  */
-      switch (data[src_address-1] & 0xf0)
-	{
-	case 0x20:
-	  data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x20;
-	  break;
-	case 0xa0:
-	  data[dst_address - 2] = (data[src_address-1] & 0xf) | 0x30;
-	  break;
-	default:
-	  abort ();
-	}
-
-      bfd_put_8 (abfd, value & 0xff, data + dst_address - 1);
-      src_address += 4;
-      break;
-
-    case R_BCC_INV:
-      /* Get the address of the target of this branch.  */
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      dot = (link_order->offset 
-	     + dst_address 
-	     + link_order->u.indirect.section->output_section->vma) + 1;
-
-      gap = value - dot;
-
-      /* Sanity check.  */
-      if (gap < -128 || gap > 126)
-	{
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort ();
-	}
-
-      /* Everything looks OK.  Fix the condition in the instruction, apply
-	 the relocation, and update the src/dst address appropriately.  */
-
-      bfd_put_8 (abfd, bfd_get_8 (abfd, data + dst_address - 1) ^ 1,
-		 data + dst_address - 1);
-      bfd_put_8 (abfd, gap, data + dst_address);
-      dst_address++;
-      src_address++;
-
-      /* All done.  */
-      break;
-
-    case R_JMP_DEL:
-      src_address += 4;
-      break;
-
-    /* An 8bit memory indirect instruction (jmp/jsr).
-
-       There's several things that need to be done to handle
-       this relocation.
-
-       If this is a reloc against the absolute symbol, then
-       we should handle it just R_RELBYTE.  Likewise if it's
-       for a symbol with a value ge 0 and le 0xff.
-
-       Otherwise it's a jump/call through the function vector,
-       and the linker is expected to set up the function vector
-       and put the right value into the jump/call instruction.  */
-    case R_MEM_INDIRECT:
-      {
-	/* We need to find the symbol so we can determine it's
-	   address in the function vector table.  */
-	asymbol *symbol;
-	bfd_vma value;
-	const char *name;
-	struct funcvec_hash_entry *h;
-	asection *vectors_sec = h8300_coff_hash_table (link_info)->vectors_sec;
-
-	/* First see if this is a reloc against the absolute symbol
-	   or against a symbol with a nonnegative value <= 0xff.  */
-	symbol = *(reloc->sym_ptr_ptr);
-	value = bfd_coff_reloc16_get_value (reloc, link_info, input_section);
-	if (symbol == bfd_abs_section_ptr->symbol
-	    || (value >= 0 && value <= 0xff))
-	  {
-	    /* This should be handled in a manner very similar to
-	       R_RELBYTES.   If the value is in range, then just slam
-	       the value into the right location.  Else trigger a
-	       reloc overflow callback.  */
-	    if (value >= 0 && value <= 0xff)
-	      {
-		bfd_put_8 (abfd, value, data + dst_address);
-		dst_address += 1;
-		src_address += 1;
-	      }
-	    else
-	      {
-		if (! ((*link_info->callbacks->reloc_overflow)
-		       (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-			reloc->howto->name, reloc->addend, input_section->owner,
-			input_section, reloc->address)))
-		  abort ();
-	      }
-	    break;
-	  }
-
-	/* This is a jump/call through a function vector, and we're
-	   expected to create the function vector ourselves. 
-
-	   First look up this symbol in the linker hash table -- we need
-	   the derived linker symbol which holds this symbol's index
-	   in the function vector.  */
-	name = symbol->name;
-	if (symbol->flags & BSF_LOCAL)
-	  {
-	    char *new_name = bfd_malloc (strlen (name) + 9);
-	    if (new_name == NULL)
-	      abort ();
-
-	    strcpy (new_name, name);
-	    sprintf (new_name + strlen (name), "_%08x",
-		     (int)symbol->section);
-	    name = new_name;
-	  }
-
-	h = funcvec_hash_lookup (h8300_coff_hash_table (link_info)->funcvec_hash_table,
-				 name, false, false);
-
-	/* This shouldn't ever happen.  If it does that means we've got
-	   data corruption of some kind.  Aborting seems like a reasonable
-	   think to do here.  */
-	if (h == NULL || vectors_sec == NULL)
-	  abort ();
-
-	/* Place the address of the function vector entry into the
-	   reloc's address.  */
-	bfd_put_8 (abfd,
-		   vectors_sec->output_offset + h->offset,
-		   data + dst_address);
-
-	dst_address++;
-	src_address++;
-
-	/* Now create an entry in the function vector itself.  */
-	if (bfd_get_mach (input_section->owner) == bfd_mach_h8300)
-	  bfd_put_16 (abfd,
-		      bfd_coff_reloc16_get_value (reloc,
-						  link_info,
-						  input_section),
-		      vectors_sec->contents + h->offset);
-	else if (bfd_get_mach (input_section->owner) == bfd_mach_h8300h
-		 || bfd_get_mach (input_section->owner) == bfd_mach_h8300s)
-	  bfd_put_32 (abfd,
-		      bfd_coff_reloc16_get_value (reloc,
-						  link_info,
-						  input_section),
-		      vectors_sec->contents + h->offset);
-	else
-	  abort ();
-
-	/* Gross.  We've already written the contents of the vector section
-	   before we get here...  So we write it again with the new data.  */
-	bfd_set_section_contents (vectors_sec->output_section->owner,
-				  vectors_sec->output_section,
-				  vectors_sec->contents,
-				  vectors_sec->output_offset,
-				  vectors_sec->_raw_size);
-	break;
-      }
-
-    default:
-      abort ();
-      break;
-
-    }
-
-  *src_ptr = src_address;
-  *dst_ptr = dst_address;
-}
-
-
-/* Routine for the h8300 linker.
-
-   This routine is necessary to handle the special R_MEM_INDIRECT
-   relocs on the h8300.  It's responsible for generating a vectors
-   section and attaching it to an input bfd as well as sizing
-   the vectors section.  It also creates our vectors hash table.
-
-   It uses the generic linker routines to actually add the symbols.
-   from this BFD to the bfd linker hash table.  It may add a few
-   selected static symbols to the bfd linker hash table.  */
-
-static boolean
-h8300_bfd_link_add_symbols(abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  asection *sec;
-  struct funcvec_hash_table *funcvec_hash_table;
-
-  /* If we haven't created a vectors section, do so now.  */
-  if (!h8300_coff_hash_table (info)->vectors_sec)
-    {
-      flagword flags;
-
-      /* Make sure the appropriate flags are set, including SEC_IN_MEMORY.  */
-      flags = (SEC_ALLOC | SEC_LOAD
-	       | SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_READONLY);
-      h8300_coff_hash_table (info)->vectors_sec = bfd_make_section (abfd,
-								    ".vectors");
-
-      /* If the section wasn't created, or we couldn't set the flags,
-	 quit quickly now, rather than dieing a painful death later.  */
-      if (! h8300_coff_hash_table (info)->vectors_sec
-	  || ! bfd_set_section_flags (abfd,
-				      h8300_coff_hash_table(info)->vectors_sec,
-				      flags))
-	return false;
-
-      /* Also create the vector hash table.  */
-      funcvec_hash_table = ((struct funcvec_hash_table *)
-	bfd_alloc (abfd, sizeof (struct funcvec_hash_table)));
-
-      if (!funcvec_hash_table)
-	return false;
-
-      /* And initialize the funcvec hash table.  */
-      if (!funcvec_hash_table_init (funcvec_hash_table, abfd,
-				    funcvec_hash_newfunc))
-	{
-	  bfd_release (abfd, funcvec_hash_table);
-	  return false;
-	}
-
-      /* Store away a pointer to the funcvec hash table.  */
-      h8300_coff_hash_table (info)->funcvec_hash_table = funcvec_hash_table;
-    }
-
-  /* Load up the function vector hash table.  */
-  funcvec_hash_table = h8300_coff_hash_table (info)->funcvec_hash_table;
-
-  /* Add the symbols using the generic code.  */
-  _bfd_generic_link_add_symbols (abfd, info);
-
-  /* Now scan the relocs for all the sections in this bfd; create
-     additional space in the .vectors section as needed.  */
-  for (sec = abfd->sections; sec; sec = sec->next)
-    {
-      long reloc_size, reloc_count, i;
-      asymbol **symbols;
-      arelent **relocs;
-
-      /* Suck in the relocs, symbols & canonicalize them.  */
-      reloc_size = bfd_get_reloc_upper_bound (abfd, sec);
-      if (reloc_size <= 0)
-	continue;
-
-      relocs = (arelent **)bfd_malloc ((size_t)reloc_size);
-      if (!relocs)
-	return false;
-
-      /* The symbols should have been read in by _bfd_generic link_add_symbols
-	 call abovec, so we can cheat and use the pointer to them that was
-	 saved in the above call.  */
-      symbols = _bfd_generic_link_get_symbols(abfd);
-      reloc_count = bfd_canonicalize_reloc (abfd, sec, relocs, symbols);
-      if (reloc_count <= 0)
-	{
-	  free (relocs);
-	  continue;
-	}
-
-      /* Now walk through all the relocations in this section.  */
-      for (i = 0; i < reloc_count; i++)
-	{
-	  arelent *reloc = relocs[i];
-	  asymbol *symbol = *(reloc->sym_ptr_ptr);
-	  const char *name;
-
-	  /* We've got an indirect reloc.  See if we need to add it
-	     to the function vector table.   At this point, we have
-	     to add a new entry for each unique symbol referenced
-	     by an R_MEM_INDIRECT relocation except for a reloc
-	     against the absolute section symbol.  */
-	  if (reloc->howto->type == R_MEM_INDIRECT
-	      && symbol != bfd_abs_section_ptr->symbol)
-
-	    {
-	      struct funcvec_hash_entry *h;
-
-	      name = symbol->name;
-	      if (symbol->flags & BSF_LOCAL)
-		{
-		  char *new_name = bfd_malloc (strlen (name) + 9);
-
-		  if (new_name == NULL)
-		    abort ();
-
-		  strcpy (new_name, name);
-		  sprintf (new_name + strlen (name), "_%08x",
-			   (int)symbol->section);
-		  name = new_name;
-		}
-
-	      /* Look this symbol up in the function vector hash table.  */
-	      h = funcvec_hash_lookup (h8300_coff_hash_table (info)->funcvec_hash_table,
-				       name, false, false);
-
-
-	      /* If this symbol isn't already in the hash table, add
-		 it and bump up the size of the hash table.  */
-	      if (h == NULL)
-		{
-		  h = funcvec_hash_lookup (h8300_coff_hash_table (info)->funcvec_hash_table,
-					   name, true, true);
-		  if (h == NULL)
-		    {
-		      free (relocs);
-		      return false;
-		    }
-
-		  /* Bump the size of the vectors section.  Each vector
-		     takes 2 bytes on the h8300 and 4 bytes on the h8300h.  */
-		  if (bfd_get_mach (abfd) == bfd_mach_h8300)
-		    h8300_coff_hash_table (info)->vectors_sec->_raw_size += 2;
-		  else if (bfd_get_mach (abfd) == bfd_mach_h8300h
-			   || bfd_get_mach (abfd) == bfd_mach_h8300s)
-		    h8300_coff_hash_table (info)->vectors_sec->_raw_size += 4;
-		}
-	    }
-	}
-
-      /* We're done with the relocations, release them.  */
-      free (relocs);
-    }
-
-  /* Now actually allocate some space for the function vector.  It's
-     wasteful to do this more than once, but this is easier.  */
-  if (h8300_coff_hash_table (info)->vectors_sec->_raw_size != 0)
-    {
-      /* Free the old contents.  */
-      if (h8300_coff_hash_table (info)->vectors_sec->contents)
-	free (h8300_coff_hash_table (info)->vectors_sec->contents);
-
-      /* Allocate new contents.  */
-      h8300_coff_hash_table (info)->vectors_sec->contents
-	= bfd_malloc (h8300_coff_hash_table (info)->vectors_sec->_raw_size);
-    }
-
-  return true;
-}
-
-#define coff_reloc16_extra_cases h8300_reloc16_extra_cases
-#define coff_reloc16_estimate h8300_reloc16_estimate
-#define coff_bfd_link_add_symbols h8300_bfd_link_add_symbols
-#define coff_bfd_link_hash_table_create h8300_coff_link_hash_table_create
-
-#define COFF_LONG_FILENAMES
-#include "coffcode.h"
-
-
-#undef coff_bfd_get_relocated_section_contents
-#undef coff_bfd_relax_section
-#define coff_bfd_get_relocated_section_contents \
-  bfd_coff_reloc16_get_relocated_section_contents
-#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
-
-
-
-const bfd_target h8300coff_vec =
-{
-  "coff-h8300",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  '_',				/* leading char */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
-   bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-h8500.c b/bfd/coff-h8500.c
deleted file mode 100644
index 91109eaa921..00000000000
--- a/bfd/coff-h8500.c
+++ /dev/null
@@ -1,354 +0,0 @@
-/* BFD back-end for Hitachi H8/500 COFF binaries.
-   Copyright 1993, 94, 95, 1997 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-   Written by Steve Chamberlain, <sac@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "coff/h8500.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
-
-static reloc_howto_type r_imm8 =
-HOWTO (R_H8500_IMM8, 0, 1, 8, false, 0,
-       complain_overflow_bitfield, 0, "r_imm8", true, 0x000000ff, 0x000000ff, false);
-
-static reloc_howto_type r_imm16 =
-HOWTO (R_H8500_IMM16, 0, 1, 16, false, 0,
-       complain_overflow_bitfield, 0, "r_imm16", true, 0x0000ffff, 0x0000ffff, false);
-
-static reloc_howto_type r_imm24 =
-HOWTO (R_H8500_IMM24, 0, 1, 24, false, 0,
-       complain_overflow_bitfield, 0, "r_imm24", true, 0x00ffffff, 0x00ffffff, false);
-
-static reloc_howto_type r_imm32 =
-HOWTO (R_H8500_IMM32, 0, 1, 32, false, 0,
-       complain_overflow_bitfield, 0, "r_imm32", true, 0xffffffff, 0xffffffff, false);
-
-
-static reloc_howto_type r_high8 =
-HOWTO (R_H8500_HIGH8, 0, 1, 8, false, 0,
-       complain_overflow_dont, 0, "r_high8", true, 0x000000ff, 0x000000ff, false);
-
-static reloc_howto_type r_low16 =
-HOWTO (R_H8500_LOW16, 0, 1, 16, false, 0,
-       complain_overflow_dont, 0, "r_low16", true, 0x0000ffff, 0x0000ffff, false);
-
-static reloc_howto_type r_pcrel8 =
-HOWTO (R_H8500_PCREL8, 0, 1, 8, true, 0, complain_overflow_signed, 0, "r_pcrel8", true, 0, 0, true);
-
-
-static reloc_howto_type r_pcrel16 =
-HOWTO (R_H8500_PCREL16, 0, 1, 16, true, 0, complain_overflow_signed, 0, "r_pcrel16", true, 0, 0, true);
-
-static reloc_howto_type r_high16 =
-HOWTO (R_H8500_HIGH16, 0, 1, 8, false, 0,
-       complain_overflow_dont, 0, "r_high16", true, 0x000ffff, 0x0000ffff, false);
-
-
-/* Turn a howto into a reloc number */
-
-static int 
-coff_h8500_select_reloc (howto)
-     reloc_howto_type *howto;
-{
-  return howto->type;
-}
-
-#define SELECT_RELOC(x,howto) x.r_type = coff_h8500_select_reloc(howto)
-
-
-#define BADMAG(x) H8500BADMAG(x)
-#define H8500 1			/* Customize coffcode.h */
-
-#define __A_MAGIC_SET__
-
-/* Code to swap in the reloc */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
-#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
-  dst->r_stuff[0] = 'S'; \
-  dst->r_stuff[1] = 'C';
-
-/* Code to turn a r_type into a howto ptr, uses the above howto table
-   */
-
-static void
-rtype2howto(internal, dst)
-     arelent * internal;
-     struct internal_reloc *dst;
-{
-  switch (dst->r_type)
-    {
-    default:
-      abort ();
-      break;
-    case R_H8500_IMM8:
-      internal->howto = &r_imm8;
-      break;
-    case R_H8500_IMM16:
-      internal->howto = &r_imm16;
-      break;
-    case R_H8500_IMM24:
-      internal->howto = &r_imm24;
-      break;
-    case R_H8500_IMM32:
-      internal->howto = &r_imm32;
-      break;
-    case R_H8500_PCREL8:
-      internal->howto = &r_pcrel8;
-      break;
-    case R_H8500_PCREL16:
-      internal->howto = &r_pcrel16;
-      break;
-    case R_H8500_HIGH8:
-      internal->howto = &r_high8;
-      break;
-    case R_H8500_HIGH16:
-      internal->howto = &r_high16;
-      break;
-    case R_H8500_LOW16:
-      internal->howto = &r_low16;
-      break;
-    }
-}
-
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-
-/* Perform any necessary magic to the addend in a reloc entry */
-
-
-#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
- cache_ptr->addend =  ext_reloc.r_offset;
-
-
-#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
- reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent * relent;
-     struct internal_reloc *reloc;
-     asymbol ** symbols;
-     bfd * abfd;
-     asection * section;
-{
-  relent->address = reloc->r_vaddr;
-  rtype2howto (relent, reloc);
-
-  if (reloc->r_symndx > 0)
-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
-  else
-    {
-      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
-
-
-  relent->addend = reloc->r_offset;
-  relent->address -= section->vma;
-}
-
-static void
-extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
-     bfd *in_abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     arelent *reloc;
-     bfd_byte *data;
-     unsigned int *src_ptr;
-     unsigned int *dst_ptr;
-{
-  bfd_byte *d = data+*dst_ptr;
-  asection *input_section = link_order->u.indirect.section;
-  switch (reloc->howto->type)
-    {
-    case R_H8500_IMM8:
-      bfd_put_8 (in_abfd,
-		 bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		 d);
-      (*dst_ptr) += 1;
-      (*src_ptr) += 1;
-      break;
-
-    case R_H8500_HIGH8:
-      bfd_put_8 (in_abfd,
-		 (bfd_coff_reloc16_get_value (reloc, link_info, input_section)
-		  >> 16),
-		 d );
-      (*dst_ptr) += 1;
-      (*src_ptr) += 1;
-      break;
-
-    case R_H8500_IMM16:
-      bfd_put_16 (in_abfd,
-		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		  d  );
-      (*dst_ptr) += 2;
-      (*src_ptr) += 2;
-      break;
-
-    case R_H8500_LOW16:
-      bfd_put_16 (in_abfd,
-		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		  d);
-
-      (*dst_ptr) += 2;
-      (*src_ptr) += 2;
-      break;
-      
-    case R_H8500_HIGH16:
-      bfd_put_16 (in_abfd,
-		  (bfd_coff_reloc16_get_value (reloc, link_info, input_section)
-		   >>16),
-		  d);
-
-      (*dst_ptr) += 2;
-      (*src_ptr) += 2;
-      break;
-
-    case R_H8500_IMM24:
-      {
-	int v = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-	int o = bfd_get_32(in_abfd, data+ *dst_ptr -1);
-	v = (v & 0x00ffffff) | (o & 0xff00000);
-	bfd_put_32 (in_abfd, v, data  + *dst_ptr -1);
-	(*dst_ptr) +=3;
-	(*src_ptr)+=3;;
-      }
-      break;
-    case R_H8500_IMM32:
-      {
-	int v = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-	bfd_put_32 (in_abfd, v, data  + *dst_ptr);
-	(*dst_ptr) +=4;
-	(*src_ptr)+=4;;
-      }
-      break;
-
-
-    case R_H8500_PCREL8:
-      {
-	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
-						  input_section);
-	bfd_vma dot = link_order->offset
-	  + *dst_ptr
-	    + link_order->u.indirect.section->output_section->vma;
-	int gap = dst - dot - 1; /* -1 since were in the odd byte of the
-				    word and the pc's been incremented */
-
-	if (gap > 128 || gap < -128)
-	  {
-	    if (! ((*link_info->callbacks->reloc_overflow)
-		   (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		    reloc->howto->name, reloc->addend, input_section->owner,
-		    input_section, reloc->address)))
-	      abort ();
-	  }
-	bfd_put_8 (in_abfd, gap, data + *dst_ptr);
-	(*dst_ptr)++;
-	(*src_ptr)++;
-	break;
-      }
-    case R_H8500_PCREL16:
-      {
-	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
-						  input_section);
-	bfd_vma dot = link_order->offset
-	  + *dst_ptr
-	    + link_order->u.indirect.section->output_section->vma;
-	int gap = dst - dot - 1; /* -1 since were in the odd byte of the
-				    word and the pc's been incremented */
-
-	if (gap > 32767 || gap < -32768)
-	  {
-	    if (! ((*link_info->callbacks->reloc_overflow)
-		   (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		    reloc->howto->name, reloc->addend, input_section->owner,
-		    input_section, reloc->address)))
-	      abort ();
-	  }
-	bfd_put_16 (in_abfd, gap, data + *dst_ptr);
-	(*dst_ptr)+=2;
-	(*src_ptr)+=2;
-	break;
-      }
-
-    default:
-      abort ();
-    }
-}
-
-#define coff_reloc16_extra_cases extra_case
-
-#include "coffcode.h"
-
-
-#undef  coff_bfd_get_relocated_section_contents
-#undef coff_bfd_relax_section
-#define coff_bfd_get_relocated_section_contents \
-  bfd_coff_reloc16_get_relocated_section_contents
-#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
-
-const bfd_target h8500coff_vec =
-{
-  "coff-h8500",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  '_',				/* leading symbol underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
-   bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-i386.c b/bfd/coff-i386.c
deleted file mode 100644
index 7898cc159ca..00000000000
--- a/bfd/coff-i386.c
+++ /dev/null
@@ -1,637 +0,0 @@
-/* BFD back-end for Intel 386 COFF files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include "coff/i386.h"
-
-#include "coff/internal.h"
-
-#ifdef COFF_WITH_PE
-#include "coff/pe.h"
-#endif
-
-#ifdef COFF_GO32_EXE
-#include "coff/go32exe.h"
-#endif
-
-#include "libcoff.h"
-
-static bfd_reloc_status_type coff_i386_reloc 
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *coff_i386_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *,
-
-	   bfd_vma *));
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-/* The page size is a guess based on ELF.  */
-
-#define COFF_PAGE_SIZE 0x1000
-
-/* For some reason when using i386 COFF the value stored in the .text
-   section for a reference to a common symbol is the value itself plus
-   any desired offset.  Ian Taylor, Cygnus Support.  */
-
-/* If we are producing relocateable output, we need to do some
-   adjustments to the object file that are not done by the
-   bfd_perform_relocation function.  This function is called by every
-   reloc type to make any required adjustments.  */
-
-static bfd_reloc_status_type
-coff_i386_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-		 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  symvalue diff;
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  if (bfd_is_com_section (symbol->section))
-    {
-#ifndef COFF_WITH_PE
-      /* We are relocating a common symbol.  The current value in the
-	 object file is ORIG + OFFSET, where ORIG is the value of the
-	 common symbol as seen by the object file when it was compiled
-	 (this may be zero if the symbol was undefined) and OFFSET is
-	 the offset into the common symbol (normally zero, but may be
-	 non-zero when referring to a field in a common structure).
-	 ORIG is the negative of reloc_entry->addend, which is set by
-	 the CALC_ADDEND macro below.  We want to replace the value in
-	 the object file with NEW + OFFSET, where NEW is the value of
-	 the common symbol which we are going to put in the final
-	 object file.  NEW is symbol->value.  */
-      diff = symbol->value + reloc_entry->addend;
-#else
-      /* In PE mode, we do not offset the common symbol.  */
-      diff = reloc_entry->addend;
-#endif
-    }
-  else
-    {
-      /* For some reason bfd_perform_relocation always effectively
-	 ignores the addend for a COFF target when producing
-	 relocateable output.  This seems to be always wrong for 386
-	 COFF, so we handle the addend here instead.  */
-      diff = reloc_entry->addend;
-    }
-
-#ifdef COFF_WITH_PE
-  /* FIXME: How should this case be handled?  */
-  if (reloc_entry->howto->type == R_IMAGEBASE && diff != 0)
-    abort ();
-#endif
-
-#define DOIT(x) \
-  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
-
-    if (diff != 0)
-      {
-	reloc_howto_type *howto = reloc_entry->howto;
-	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
-
-	switch (howto->size)
-	  {
-	  case 0:
-	    {
-	      char x = bfd_get_8 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_8 (abfd, x, addr);
-	    }
-	    break;
-
-	  case 1:
-	    {
-	      short x = bfd_get_16 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_16 (abfd, x, addr);
-	    }
-	    break;
-
-	  case 2:
-	    {
-	      long x = bfd_get_32 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_32 (abfd, x, addr);
-	    }
-	    break;
-
-	  default:
-	    abort ();
-	  }
-      }
-
-  /* Now let bfd_perform_relocation finish everything up.  */
-  return bfd_reloc_continue;
-}
-
-#ifdef COFF_WITH_PE
-/* Return true if this relocation should
-   appear in the output .reloc section. */
-
-static boolean in_reloc_p(abfd, howto)
-     bfd * abfd;
-     reloc_howto_type *howto;
-{
-  return ! howto->pc_relative && howto->type != R_IMAGEBASE;
-}     
-#endif
-
-#ifndef PCRELOFFSET
-#define PCRELOFFSET false
-#endif
-
-static reloc_howto_type howto_table[] = 
-{
-  {0},
-  {1},
-  {2},
-  {3},
-  {4},
-  {5},
-  HOWTO (R_DIR32,               /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,       /* special_function */                     
-	 "dir32",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 true),                /* pcrel_offset */
-  /* {7}, */
-  HOWTO (R_IMAGEBASE,            /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,       /* special_function */                     
-	 "rva32",	           /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-  {010},
-  {011},
-  {012},
-  {013},
-  {014},
-  {015},
-  {016},
-  HOWTO (R_RELBYTE,		/* type */                                 
-	 0,			/* rightshift */                           
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 8,			/* bitsize */                   
-	 false,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */                     
-	 "8",			/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x000000ff,		/* src_mask */                             
-	 0x000000ff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_RELWORD,		/* type */                                 
-	 0,			/* rightshift */                           
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,			/* bitsize */                   
-	 false,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */                     
-	 "16",			/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x0000ffff,		/* src_mask */                             
-	 0x0000ffff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_RELLONG,		/* type */                                 
-	 0,			/* rightshift */                           
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,			/* bitsize */                   
-	 false,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */                     
-	 "32",			/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0xffffffff,		/* src_mask */                             
-	 0xffffffff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_PCRBYTE,		/* type */                                 
-	 0,			/* rightshift */                           
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 8,			/* bitsize */                   
-	 true,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */                     
-	 "DISP8",		/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x000000ff,		/* src_mask */                             
-	 0x000000ff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_PCRWORD,		/* type */                                 
-	 0,			/* rightshift */                           
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,			/* bitsize */                   
-	 true,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */                     
-	 "DISP16",		/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x0000ffff,		/* src_mask */                             
-	 0x0000ffff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_PCRLONG,		/* type */                                 
-	 0,			/* rightshift */                           
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,			/* bitsize */                   
-	 true,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i386_reloc,	/* special_function */                     
-	 "DISP32",		/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0xffffffff,		/* src_mask */                             
-	 0xffffffff,		/* dst_mask */                             
-	 PCRELOFFSET)		/* pcrel_offset */
-};
-
-/* Turn a howto into a reloc  nunmber */
-
-#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
-#define BADMAG(x) I386BADMAG(x)
-#define I386 1			/* Customize coffcode.h */
-
-#define RTYPE2HOWTO(cache_ptr, dst) \
-	    (cache_ptr)->howto = howto_table + (dst)->r_type;
-
-/* For 386 COFF a STYP_NOLOAD | STYP_BSS section is part of a shared
-   library.  On some other COFF targets STYP_BSS is normally
-   STYP_NOLOAD.  */
-#define BSS_NOLOAD_IS_SHARED_LIBRARY
-
-/* Compute the addend of a reloc.  If the reloc is to a common symbol,
-   the object file contains the value of the common symbol.  By the
-   time this is called, the linker may be using a different symbol
-   from a different object file with a different value.  Therefore, we
-   hack wildly to locate the original symbol from this file so that we
-   can make the correct adjustment.  This macro sets coffsym to the
-   symbol from the original file, and uses it to set the addend value
-   correctly.  If this is not a common symbol, the usual addend
-   calculation is done, except that an additional tweak is needed for
-   PC relative relocs.
-   FIXME: This macro refers to symbols and asect; these are from the
-   calling function, not the macro arguments.  */
-
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
-  {								\
-    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;	\
-    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
-      coffsym = (obj_symbols (abfd)				\
-	         + (cache_ptr->sym_ptr_ptr - symbols));		\
-    else if (ptr)						\
-      coffsym = coff_symbol_from (abfd, ptr);			\
-    if (coffsym != (coff_symbol_type *) NULL			\
-	&& coffsym->native->u.syment.n_scnum == 0)		\
-      cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
-    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
-	     && ptr->section != (asection *) NULL)		\
-      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
-    else							\
-      cache_ptr->addend = 0;					\
-    if (ptr && howto_table[reloc.r_type].pc_relative)		\
-      cache_ptr->addend += asect->vma;				\
-  }
-
-/* We use the special COFF backend linker.  For normal i386 COFF, we
-   can use the generic relocate_section routine.  For PE, we need our
-   own routine.  */
-
-#ifndef COFF_WITH_PE
-
-#define coff_relocate_section _bfd_coff_generic_relocate_section
-
-#else /* COFF_WITH_PE */
-
-/* The PE relocate section routine.  The only difference between this
-   and the regular routine is that we don't want to do anything for a
-   relocateable link.  */
-
-static boolean coff_pe_i386_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-
-static boolean
-coff_pe_i386_relocate_section (output_bfd, info, input_bfd,
-			       input_section, contents, relocs, syms,
-			       sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  if (info->relocateable)
-    return true;
-
-  return _bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
-					     input_section, contents,
-					     relocs, syms, sections);
-}
-
-#define coff_relocate_section coff_pe_i386_relocate_section
-
-#endif /* COFF_WITH_PE */
-
-/* Convert an rtype to howto for the COFF backend linker.  */
-
-static reloc_howto_type *
-coff_i386_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-
-  reloc_howto_type *howto;
-
-  howto = howto_table + rel->r_type;
-
-#ifdef COFF_WITH_PE
-  *addendp = 0;
-#endif
-
-  if (howto->pc_relative)
-    *addendp += sec->vma;
-
-  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
-    {
-      /* This is a common symbol.  The section contents include the
-	 size (sym->n_value) as an addend.  The relocate_section
-	 function will be adding in the final value of the symbol.  We
-	 need to subtract out the current size in order to get the
-	 correct result.  */
- 
-      BFD_ASSERT (h != NULL);
-
-#ifndef COFF_WITH_PE
-      /* I think we *do* want to bypass this.  If we don't, I have
-	 seen some data parameters get the wrong relocation address.
-	 If I link two versions with and without this section bypassed
-	 and then do a binary comparison, the addresses which are
-	 different can be looked up in the map.  The case in which
-	 this section has been bypassed has addresses which correspond
-	 to values I can find in the map.  */
-      *addendp -= sym->n_value;
-#endif
-    }
-
-#ifndef COFF_WITH_PE
-  /* If the output symbol is common (in which case this must be a
-     relocateable link), we need to add in the final size of the
-     common symbol.  */
-  if (h != NULL && h->root.type == bfd_link_hash_common) 
-    *addendp += h->root.u.c.size;
-#endif
-
-#ifdef COFF_WITH_PE
-  if (howto->pc_relative)
-    {
-      *addendp -= 4;
-
-      /* If the symbol is defined, then the generic code is going to
-         add back the symbol value in order to cancel out an
-         adjustment it made to the addend.  However, we set the addend
-         to 0 at the start of this function.  We need to adjust here,
-         to avoid the adjustment the generic code will make.  FIXME:
-         This is getting a bit hackish.  */
-      if (sym != NULL && sym->n_scnum != 0)
-	*addendp -= sym->n_value;
-    }
-
-  if (rel->r_type == R_IMAGEBASE)
-    {
-      *addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase;
-    }
-#endif
-
-  return howto;
-}
-
-
-#define coff_bfd_reloc_type_lookup coff_i386_reloc_type_lookup
-
-
-static reloc_howto_type *
-coff_i386_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_RVA:
-      return howto_table +R_IMAGEBASE;
-    case BFD_RELOC_32:
-      return howto_table + R_DIR32;
-    case BFD_RELOC_32_PCREL:
-      return howto_table + R_PCRLONG;
-    default:
-      BFD_FAIL ();
-      return 0;
-    }
-}
-
-#define coff_rtype_to_howto coff_i386_rtype_to_howto
-
-#ifdef TARGET_UNDERSCORE
-
-/* If i386 gcc uses underscores for symbol names, then it does not use
-   a leading dot for local labels, so if TARGET_UNDERSCORE is defined
-   we treat all symbols starting with L as local.  */
-
-static boolean coff_i386_is_local_label_name PARAMS ((bfd *, const char *));
-
-static boolean
-coff_i386_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  if (name[0] == 'L')
-    return true;
-
-  return _bfd_coff_is_local_label_name (abfd, name);
-}
-
-#define coff_bfd_is_local_label_name coff_i386_is_local_label_name
-
-#endif /* TARGET_UNDERSCORE */
-
-#include "coffcode.h"
-
-static const bfd_target *
-i3coff_object_p (abfd)
-     bfd *abfd;
-{
-#ifdef COFF_IMAGE_WITH_PE
-  /* We need to hack badly to handle a PE image correctly.  In PE
-     images created by the GNU linker, the offset to the COFF header
-     is always the size.  However, this is not the case in images
-     generated by other PE linkers.  The PE format stores a four byte
-     offset to the PE signature just before the COFF header at
-     location 0x3c of the file.  We pick up that offset, verify that
-     the PE signature is there, and then set ourselves up to read in
-     the COFF header.  */
-  {
-    bfd_byte ext_offset[4];
-    file_ptr offset;
-    bfd_byte ext_signature[4];
-    unsigned long signature;
-
-    if (bfd_seek (abfd, 0x3c, SEEK_SET) != 0
-	|| bfd_read (ext_offset, 1, 4, abfd) != 4)
-      {
-	if (bfd_get_error () != bfd_error_system_call)
-	  bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-    offset = bfd_h_get_32 (abfd, ext_offset);
-    if (bfd_seek (abfd, offset, SEEK_SET) != 0
-	|| bfd_read (ext_signature, 1, 4, abfd) != 4)
-      {
-	if (bfd_get_error () != bfd_error_system_call)
-	  bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-    signature = bfd_h_get_32 (abfd, ext_signature);
-
-    if (signature != 0x4550)
-      {
-	bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-
-    /* Here is the hack.  coff_object_p wants to read filhsz bytes to
-       pick up the COFF header.  We adjust so that that will work.  20
-       is the size of the i386 COFF filehdr.  */
-
-    if (bfd_seek (abfd,
-		  (bfd_tell (abfd)
-		   - bfd_coff_filhsz (abfd)
-		   + 20),
-		  SEEK_SET)
-	!= 0)
-      {
-	if (bfd_get_error () != bfd_error_system_call)
-	  bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-  }
-#endif
-
-  return coff_object_p (abfd);
-}
-
-const bfd_target
-#ifdef TARGET_SYM
-  TARGET_SYM =
-#else
-  i386coff_vec =
-#endif
-{
-#ifdef TARGET_NAME
-  TARGET_NAME,
-#else
-  "coff-i386",			/* name */
-#endif
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-#ifndef COFF_WITH_PE
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_CODE | SEC_DATA),
-#else
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_CODE | SEC_DATA
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
-#endif
-
-#ifdef TARGET_UNDERSCORE
-  TARGET_UNDERSCORE,		/* leading underscore */
-#else
-  0,				/* leading underscore */
-#endif
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-/* Note that we allow an object file to be treated as a core file as well. */
-    {_bfd_dummy_target, i3coff_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, i3coff_object_p},
-    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-       bfd_false},
-    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c
deleted file mode 100644
index 929fa428cdb..00000000000
--- a/bfd/coff-i860.c
+++ /dev/null
@@ -1,422 +0,0 @@
-/* BFD back-end for Intel 860 COFF files.
-   Copyright 1990, 91, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
-   Created mostly by substituting "860" for "386" in coff-i386.c
-   Harry Dolan <dolan@ssd.intel.com>, October 1995
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include "coff/i860.h"
-
-#include "coff/internal.h"
-
-#include "libcoff.h"
-
-static bfd_reloc_status_type coff_i860_reloc 
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *coff_i860_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *,
-	   bfd_vma *));
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-/* The page size is a guess based on ELF.  */
-
-#define COFF_PAGE_SIZE 0x1000
-
-/* For some reason when using i860 COFF the value stored in the .text
-   section for a reference to a common symbol is the value itself plus
-   any desired offset.  Ian Taylor, Cygnus Support.  */
-
-/* If we are producing relocateable output, we need to do some
-   adjustments to the object file that are not done by the
-   bfd_perform_relocation function.  This function is called by every
-   reloc type to make any required adjustments.  */
-
-static bfd_reloc_status_type
-coff_i860_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-		 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  symvalue diff;
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-
-  if (bfd_is_com_section (symbol->section))
-    {
-      /* We are relocating a common symbol.  The current value in the
-	 object file is ORIG + OFFSET, where ORIG is the value of the
-	 common symbol as seen by the object file when it was compiled
-	 (this may be zero if the symbol was undefined) and OFFSET is
-	 the offset into the common symbol (normally zero, but may be
-	 non-zero when referring to a field in a common structure).
-	 ORIG is the negative of reloc_entry->addend, which is set by
-	 the CALC_ADDEND macro below.  We want to replace the value in
-	 the object file with NEW + OFFSET, where NEW is the value of
-	 the common symbol which we are going to put in the final
-	 object file.  NEW is symbol->value.  */
-      diff = symbol->value + reloc_entry->addend;
-    }
-  else
-    {
-      /* For some reason bfd_perform_relocation always effectively
-	 ignores the addend for a COFF target when producing
-	 relocateable output.  This seems to be always wrong for 860
-	 COFF, so we handle the addend here instead.  */
-      diff = reloc_entry->addend;
-    }
-
-
-#define DOIT(x) \
-  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
-
-    if (diff != 0)
-      {
-	reloc_howto_type *howto = reloc_entry->howto;
-	unsigned char *addr = (unsigned char *) data + reloc_entry->address;
-
-	switch (howto->size)
-	  {
-	  case 0:
-	    {
-	      char x = bfd_get_8 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_8 (abfd, x, addr);
-	    }
-	    break;
-
-	  case 1:
-	    {
-	      short x = bfd_get_16 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_16 (abfd, x, addr);
-	    }
-	    break;
-
-	  case 2:
-	    {
-	      long x = bfd_get_32 (abfd, addr);
-	      DOIT (x);
-	      bfd_put_32 (abfd, x, addr);
-	    }
-	    break;
-
-	  default:
-	    abort ();
-	  }
-      }
-
-  /* Now let bfd_perform_relocation finish everything up.  */
-  return bfd_reloc_continue;
-}
-
-#ifndef PCRELOFFSET
-#define PCRELOFFSET false
-#endif
-
-static reloc_howto_type howto_table[] = 
-{
-  {0},
-  {1},
-  {2},
-  {3},
-  {4},
-  {5},
-  HOWTO (R_DIR32,               /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i860_reloc,       /* special_function */                     
-	 "dir32",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 true),                /* pcrel_offset */
-  /* {7}, */
-  HOWTO (R_IMAGEBASE,            /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i860_reloc,       /* special_function */                     
-	 "rva32",	           /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-  {010},
-  {011},
-  {012},
-  {013},
-  {014},
-  {015},
-  {016},
-  HOWTO (R_RELBYTE,		/* type */                                 
-	 0,			/* rightshift */                           
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 8,			/* bitsize */                   
-	 false,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i860_reloc,	/* special_function */                     
-	 "8",			/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x000000ff,		/* src_mask */                             
-	 0x000000ff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_RELWORD,		/* type */                                 
-	 0,			/* rightshift */                           
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,			/* bitsize */                   
-	 false,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i860_reloc,	/* special_function */                     
-	 "16",			/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x0000ffff,		/* src_mask */                             
-	 0x0000ffff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_RELLONG,		/* type */                                 
-	 0,			/* rightshift */                           
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,			/* bitsize */                   
-	 false,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 coff_i860_reloc,	/* special_function */                     
-	 "32",			/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0xffffffff,		/* src_mask */                             
-	 0xffffffff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_PCRBYTE,		/* type */                                 
-	 0,			/* rightshift */                           
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 8,			/* bitsize */                   
-	 true,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i860_reloc,	/* special_function */                     
-	 "DISP8",		/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x000000ff,		/* src_mask */                             
-	 0x000000ff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_PCRWORD,		/* type */                                 
-	 0,			/* rightshift */                           
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,			/* bitsize */                   
-	 true,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i860_reloc,	/* special_function */                     
-	 "DISP16",		/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0x0000ffff,		/* src_mask */                             
-	 0x0000ffff,		/* dst_mask */                             
-	 PCRELOFFSET),		/* pcrel_offset */
-  HOWTO (R_PCRLONG,		/* type */                                 
-	 0,			/* rightshift */                           
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,			/* bitsize */                   
-	 true,			/* pc_relative */                          
-	 0,			/* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 coff_i860_reloc,	/* special_function */                     
-	 "DISP32",		/* name */                                 
-	 true,			/* partial_inplace */                      
-	 0xffffffff,		/* src_mask */                             
-	 0xffffffff,		/* dst_mask */                             
-	 PCRELOFFSET)		/* pcrel_offset */
-};
-
-/* Turn a howto into a reloc  nunmber */
-
-#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
-#define BADMAG(x) I860BADMAG(x)
-#define I860 1			/* Customize coffcode.h */
-
-#define RTYPE2HOWTO(cache_ptr, dst) \
-	    (cache_ptr)->howto = howto_table + (dst)->r_type;
-
-/* For 860 COFF a STYP_NOLOAD | STYP_BSS section is part of a shared
-   library.  On some other COFF targets STYP_BSS is normally
-   STYP_NOLOAD.  */
-#define BSS_NOLOAD_IS_SHARED_LIBRARY
-
-/* Compute the addend of a reloc.  If the reloc is to a common symbol,
-   the object file contains the value of the common symbol.  By the
-   time this is called, the linker may be using a different symbol
-   from a different object file with a different value.  Therefore, we
-   hack wildly to locate the original symbol from this file so that we
-   can make the correct adjustment.  This macro sets coffsym to the
-   symbol from the original file, and uses it to set the addend value
-   correctly.  If this is not a common symbol, the usual addend
-   calculation is done, except that an additional tweak is needed for
-   PC relative relocs.
-   FIXME: This macro refers to symbols and asect; these are from the
-   calling function, not the macro arguments.  */
-
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
-  {								\
-    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;	\
-    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
-      coffsym = (obj_symbols (abfd)				\
-	         + (cache_ptr->sym_ptr_ptr - symbols));		\
-    else if (ptr)						\
-      coffsym = coff_symbol_from (abfd, ptr);			\
-    if (coffsym != (coff_symbol_type *) NULL			\
-	&& coffsym->native->u.syment.n_scnum == 0)		\
-      cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
-    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
-	     && ptr->section != (asection *) NULL)		\
-      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
-    else							\
-      cache_ptr->addend = 0;					\
-    if (ptr && howto_table[reloc.r_type].pc_relative)		\
-      cache_ptr->addend += asect->vma;				\
-  }
-
-/* We use the special COFF backend linker.  */
-#define coff_relocate_section _bfd_coff_generic_relocate_section
-
-static reloc_howto_type *
-coff_i860_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-
-  reloc_howto_type *howto;
-
-  howto = howto_table + rel->r_type;
-
-  if (howto->pc_relative)
-    *addendp += sec->vma;
-
-  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
-    {
-      /* This is a common symbol.  The section contents include the
-	 size (sym->n_value) as an addend.  The relocate_section
-	 function will be adding in the final value of the symbol.  We
-	 need to subtract out the current size in order to get the
-	 correct result.  */
- 
-      BFD_ASSERT (h != NULL);
-
-
-      /* I think we *do* want to bypass this.  If we don't, I have seen some data
-	 parameters get the wrong relcation address.  If I link two versions
-	 with and without this section bypassed and then do a binary comparison,
-	 the addresses which are different can be looked up in the map.  The 
-	 case in which this section has been bypassed has addresses which correspond
-	 to values I can find in the map */
-      *addendp -= sym->n_value;
-    }
-
-  /* If the output symbol is common (in which case this must be a
-     relocateable link), we need to add in the final size of the
-     common symbol.  */
-  if (h != NULL && h->root.type == bfd_link_hash_common) 
-    *addendp += h->root.u.c.size;
-
-  return howto;
-}
-
-#define coff_rtype_to_howto coff_i860_rtype_to_howto
-
-#include "coffcode.h"
-
-static const bfd_target *
-i3coff_object_p(a)
-     bfd *a;
-{
-  return coff_object_p(a);
-}
-
-const bfd_target
-#ifdef TARGET_SYM
-  TARGET_SYM =
-#else
-  i860coff_vec =
-#endif
-{
-#ifdef TARGET_NAME
-  TARGET_NAME,
-#else
-  "coff-i860",			/* name */
-#endif
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  '_',				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-/* Note that we allow an object file to be treated as a core file as well. */
-    {_bfd_dummy_target, i3coff_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, i3coff_object_p},
-    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-       bfd_false},
-    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-i960.c b/bfd/coff-i960.c
deleted file mode 100644
index 25455d9ead8..00000000000
--- a/bfd/coff-i960.c
+++ /dev/null
@@ -1,703 +0,0 @@
-/* BFD back-end for Intel 960 COFF files.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define I960 1
-#define BADMAG(x) I960BADMAG(x)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/i960.h"
-#include "coff/internal.h"
-#include "libcoff.h"		/* to allow easier abstraction-breaking */
-
-static boolean coff_i960_is_local_label_name PARAMS ((bfd *, const char *));
-static bfd_reloc_status_type optcall_callback
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type coff_i960_relocate
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *coff_i960_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static boolean coff_i960_start_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean coff_i960_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-static boolean coff_i960_adjust_symndx
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-	   struct internal_reloc *, boolean *));
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-#define COFF_ALIGN_IN_SECTION_HEADER 1
-
-#define GET_SCNHDR_ALIGN bfd_h_get_32
-#define PUT_SCNHDR_ALIGN bfd_h_put_32
-
-/* The i960 does not support an MMU, so COFF_PAGE_SIZE can be
-   arbitrarily small.  */
-#define COFF_PAGE_SIZE 1
-
-#define COFF_LONG_FILENAMES
-
-/* This set of local label names is taken from gas.  */
-
-static boolean
-coff_i960_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return (name[0] == 'L'
-	  || (name[0] == '.'
-	      && (name[1] == 'C'
-		  || name[1] == 'I'
-		  || name[1] == '.')));
-}
-
-/* This is just like the usual CALC_ADDEND, but it includes the
-   section VMA for PC relative relocs.  */
-#ifndef CALC_ADDEND
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
-  {                                                             \
-    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
-    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
-      coffsym = (obj_symbols (abfd)                             \
-                 + (cache_ptr->sym_ptr_ptr - symbols));         \
-    else if (ptr)                                               \
-      coffsym = coff_symbol_from (abfd, ptr);                   \
-    if (coffsym != (coff_symbol_type *) NULL                    \
-        && coffsym->native->u.syment.n_scnum == 0)              \
-      cache_ptr->addend = 0;                                    \
-    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
-             && ptr->section != (asection *) NULL)              \
-      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
-    else                                                        \
-      cache_ptr->addend = 0;                                    \
-    if (ptr && (reloc.r_type == 25 || reloc.r_type == 27))	\
-      cache_ptr->addend += asect->vma;				\
-  }
-#endif
-
-#define CALLS	 0x66003800	/* Template for 'calls' instruction	*/
-#define BAL	 0x0b000000	/* Template for 'bal' instruction	*/
-#define BAL_MASK 0x00ffffff
-
-static bfd_reloc_status_type 
-optcall_callback (abfd, reloc_entry, symbol_in, data,
-		  input_section, ignore_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *ignore_bfd;
-     char **error_message;
-{
-  /* This item has already been relocated correctly, but we may be
-   * able to patch in yet better code - done by digging out the
-   * correct info on this symbol */
-  bfd_reloc_status_type result;
-  coff_symbol_type *cs = coffsymbol(symbol_in);
-
-  /* Don't do anything with symbols which aren't tied up yet,
-     except move the reloc. */
-  if (bfd_is_und_section (cs->symbol.section)) {
-    reloc_entry->address += input_section->output_offset;
-    return bfd_reloc_ok;
-  }
-    
-  /* So the target symbol has to be of coff type, and the symbol 
-     has to have the correct native information within it */
-  if ((bfd_asymbol_flavour(&cs->symbol) != bfd_target_coff_flavour)
-      || (cs->native == (combined_entry_type *)NULL))
-    {
-      /* This is interesting, consider the case where we're outputting coff
-	 from a mix n match input, linking from coff to a symbol defined in a
-	 bout file will cause this match to be true. Should I complain?  This
-	 will only work if the bout symbol is non leaf.  */
-      *error_message =
-	(char *) _("uncertain calling convention for non-COFF symbol");
-      result = bfd_reloc_dangerous;
-    }
-  else
-    {
-    switch (cs->native->u.syment.n_sclass) 
-      {
-      case C_LEAFSTAT:
-      case C_LEAFEXT:
-  	/* This is a call to a leaf procedure, replace instruction with a bal
-	   to the correct location.  */
-	{
-	  union internal_auxent *aux = &((cs->native+2)->u.auxent);
-	  int word = bfd_get_32(abfd, (bfd_byte *)data + reloc_entry->address);
-	  int olf = (aux->x_bal.x_balntry - cs->native->u.syment.n_value);
-	  BFD_ASSERT(cs->native->u.syment.n_numaux==2);
-
-	  /* We replace the original call instruction with a bal to
-	     the bal entry point - the offset of which is described in
-	     the 2nd auxent of the original symbol. We keep the native
-	     sym and auxents untouched, so the delta between the two
-	     is the offset of the bal entry point.  */
-	  word = ((word +  olf)  & BAL_MASK) | BAL;
-  	  bfd_put_32(abfd, word, (bfd_byte *) data + reloc_entry->address);
-  	}
-	result = bfd_reloc_ok;
-	break;
-      case C_SCALL:
-	/* This is a call to a system call, replace with a calls to # */
-	BFD_ASSERT(0);
-	result = bfd_reloc_ok;
-	break;
-      default:
-	result = bfd_reloc_ok;
-	break;
-      }
-  }
-  return result;
-}
-
-/* i960 COFF is used by VxWorks 5.1.  However, VxWorks 5.1 does not
-   appear to correctly handle a reloc against a symbol defined in the
-   same object file.  It appears to simply discard such relocs, rather
-   than adding their values into the object file.  We handle this here
-   by converting all relocs against defined symbols into relocs
-   against the section symbol, when generating a relocateable output
-   file.
-
-   Note that this function is only called if we are not using the COFF
-   specific backend linker.  It only does something when doing a
-   relocateable link, which will almost certainly fail when not
-   generating COFF i960 output, so this function is actually no longer
-   useful.  It was used before this target was converted to use the
-   COFF specific backend linker.  */
-
-static bfd_reloc_status_type 
-coff_i960_relocate (abfd, reloc_entry, symbol, data, input_section,
-		    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  asection *osec;
-
-  if (output_bfd == NULL)
-    {
-      /* Not generating relocateable output file.  */
-      return bfd_reloc_continue;
-    }
-
-  if (bfd_is_und_section (bfd_get_section (symbol)))
-    {
-      /* Symbol is not defined, so no need to worry about it.  */
-      return bfd_reloc_continue;
-    }
-
-  if (bfd_is_com_section (bfd_get_section (symbol)))
-    {
-      /* I don't really know what the right action is for a common
-         symbol.  */
-      return bfd_reloc_continue;
-    }
-
-  /* Convert the reloc to use the section symbol.  FIXME: This method
-     is ridiculous.  */
-  osec = bfd_get_section (symbol)->output_section;
-  if (coff_section_data (output_bfd, osec) != NULL
-      && coff_section_data (output_bfd, osec)->tdata != NULL)
-    reloc_entry->sym_ptr_ptr =
-      (asymbol **) coff_section_data (output_bfd, osec)->tdata;
-  else
-    {
-      const char *sec_name;
-      asymbol **syms, **sym_end;
-
-      sec_name = bfd_get_section_name (output_bfd, osec);
-      syms = bfd_get_outsymbols (output_bfd);
-      sym_end = syms + bfd_get_symcount (output_bfd);
-      for (; syms < sym_end; syms++)
-	{
-	  if (bfd_asymbol_name (*syms) != NULL
-	      && (*syms)->value == 0
-	      && strcmp ((*syms)->section->output_section->name,
-			 sec_name) == 0)
-	    break;
-	}
-
-      if (syms >= sym_end)
-	abort ();
-
-      reloc_entry->sym_ptr_ptr = syms;
-
-      if (coff_section_data (output_bfd, osec) == NULL)
-	{
-	  osec->used_by_bfd =
-	    ((PTR) bfd_zalloc (abfd,
-			       sizeof (struct coff_section_tdata)));
-	  if (osec->used_by_bfd == NULL)
-	    return bfd_reloc_overflow;
-	}
-      coff_section_data (output_bfd, osec)->tdata = (PTR) syms;
-    }
-
-  /* Let bfd_perform_relocation do its thing, which will include
-     stuffing the symbol addend into the object file.  */
-  return bfd_reloc_continue;
-}
-
-static reloc_howto_type howto_rellong =
-  HOWTO ((unsigned int) R_RELLONG, 0, 2, 32,false, 0,
-	 complain_overflow_bitfield, coff_i960_relocate,"rellong", true,
-	 0xffffffff, 0xffffffff, 0);
-static reloc_howto_type howto_iprmed =
-  HOWTO (R_IPRMED, 0, 2, 24,true,0, complain_overflow_signed,
-	 coff_i960_relocate, "iprmed ", true, 0x00ffffff, 0x00ffffff, 0);
-static reloc_howto_type howto_optcall =
-  HOWTO (R_OPTCALL, 0,2,24,true,0, complain_overflow_signed,
-	 optcall_callback, "optcall", true, 0x00ffffff, 0x00ffffff, 0);
-
-static reloc_howto_type *
-coff_i960_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    default:
-      return 0;
-    case BFD_RELOC_I960_CALLJ:
-      return &howto_optcall;
-    case BFD_RELOC_32:
-    case BFD_RELOC_CTOR:
-      return &howto_rellong;
-    case BFD_RELOC_24_PCREL:
-      return &howto_iprmed;
-    }
-}
-
-/* The real code is in coffcode.h */
-
-#define RTYPE2HOWTO(cache_ptr, dst) \
-{							\
-   reloc_howto_type *howto_ptr;				\
-   switch ((dst)->r_type) {				\
-     case 17: howto_ptr = &howto_rellong; break;	\
-     case 25: howto_ptr = &howto_iprmed; break;		\
-     case 27: howto_ptr = &howto_optcall; break;	\
-     default: howto_ptr = 0; break;			\
-     }							\
-   (cache_ptr)->howto = howto_ptr;			\
- }
-
-/* i960 COFF is used by VxWorks 5.1.  However, VxWorks 5.1 does not
-   appear to correctly handle a reloc against a symbol defined in the
-   same object file.  It appears to simply discard such relocs, rather
-   than adding their values into the object file.  We handle this by
-   converting all relocs against global symbols into relocs against
-   internal symbols at the start of the section.  This routine is
-   called at the start of the linking process, and it creates the
-   necessary symbols.  */
-
-static boolean
-coff_i960_start_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd_size_type symesz = bfd_coff_symesz (abfd);
-  asection *o;
-  bfd_byte *esym;
-
-  if (! info->relocateable)
-    return true;
-
-  esym = (bfd_byte *) bfd_malloc (symesz);
-  if (esym == NULL)
-    return false;
-
-  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
-    return false;
-
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      struct internal_syment isym;
-
-      strncpy (isym._n._n_name, o->name, SYMNMLEN);
-      isym.n_value = 0;
-      isym.n_scnum = o->target_index;
-      isym.n_type = T_NULL;
-      isym.n_sclass = C_STAT;
-      isym.n_numaux = 0;
-
-      bfd_coff_swap_sym_out (abfd, (PTR) &isym, (PTR) esym);
-
-      if (bfd_write (esym, symesz, 1, abfd) != symesz)
-	{
-	  free (esym);
-	  return false;
-	}
-
-      obj_raw_syment_count (abfd) += 1;
-    }
-
-  free (esym);
-
-  return true;
-}
-
-/* The reloc processing routine for the optimized COFF linker.  */
-
-static boolean
-coff_i960_relocate_section (output_bfd, info, input_bfd, input_section,
-			    contents, relocs, syms, sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc *rel;
-  struct internal_reloc *relend;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      long symndx;
-      struct coff_link_hash_entry *h;
-      struct internal_syment *sym;
-      bfd_vma addend;
-      bfd_vma val;
-      reloc_howto_type *howto;
-      bfd_reloc_status_type rstat = bfd_reloc_ok;
-      boolean done;
-
-      symndx = rel->r_symndx;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	}
-      else
-	{    
-	  h = obj_coff_sym_hashes (input_bfd)[symndx];
-	  sym = syms + symndx;
-	}
-
-      if (sym != NULL && sym->n_scnum != 0)
-	addend = - sym->n_value;
-      else
-	addend = 0;
-
-      switch (rel->r_type)
-	{
-	case 17: howto = &howto_rellong; break;
-	case 25: howto = &howto_iprmed; break;
-	case 27: howto = &howto_optcall; break;
-	default:
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      val = 0;
-
-      if (h == NULL)
-	{
-	  asection *sec;
-
-	  if (symndx == -1)
-	    {
-	      sec = bfd_abs_section_ptr;
-	      val = 0;
-	    }
-	  else
-	    {
-	      sec = sections[symndx];
-              val = (sec->output_section->vma
-		     + sec->output_offset
-		     + sym->n_value
-		     - sec->vma);
-	    }
-	}
-      else
-	{
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      asection *sec;
-
-	      sec = h->root.u.def.section;
-	      val = (h->root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	    }
-	  else if (! info->relocateable)
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	    }
-	}
-
-      done = false;
-
-      if (howto->type == R_OPTCALL && ! info->relocateable && symndx != -1)
-	{
-	  int class;
-
-	  if (h != NULL)
-	    class = h->class;
-	  else
-	    class = sym->n_sclass;
-
-	  switch (class)
-	    {
-	    case C_NULL:
-	      /* This symbol is apparently not from a COFF input file.
-                 We warn, and then assume that it is not a leaf
-                 function.  */
-	      if (! ((*info->callbacks->reloc_dangerous)
-		     (info,
-		      _("uncertain calling convention for non-COFF symbol"),
-		      input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	      break;
-	    case C_LEAFSTAT:
-	    case C_LEAFEXT:
-	      /* This is a call to a leaf procedure; use the bal
-                 instruction.  */
-	      {
-		long olf;
-		unsigned long word;
-
-		if (h != NULL)
-		  {
-		    BFD_ASSERT (h->numaux == 2);
-		    olf = h->aux[1].x_bal.x_balntry;
-		  }
-		else
-		  {
-		    bfd_byte *esyms;
-		    union internal_auxent aux;
-
-		    BFD_ASSERT (sym->n_numaux == 2);
-		    esyms = (bfd_byte *) obj_coff_external_syms (input_bfd);
-		    esyms += (symndx + 2) * bfd_coff_symesz (input_bfd);
-		    bfd_coff_swap_aux_in (input_bfd, (PTR) esyms, sym->n_type,
-					  sym->n_sclass, 1, sym->n_numaux,
-					  (PTR) &aux);
-		    olf = aux.x_bal.x_balntry;
-		  }
-
-		word = bfd_get_32 (input_bfd,
-				   (contents
-				    + (rel->r_vaddr - input_section->vma)));
-		word = ((word + olf - val) & BAL_MASK) | BAL;
-		bfd_put_32 (input_bfd,
-			    word,
-			    (contents
-			     + (rel->r_vaddr - input_section->vma)));
-		done = true;
-	      }
-	      break;
-	    case C_SCALL:
-	      BFD_ASSERT (0);
-	      break;
-	    }
-	}
-
-      if (! done)
-	{
-	  if (howto->pc_relative)
-	    addend += input_section->vma;
-	  rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					    contents,
-					    rel->r_vaddr - input_section->vma,
-					    val, addend);
-	}
-
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	case bfd_reloc_ok:
-	  break;
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-	    char buf[SYMNMLEN + 1];
-
-	    if (symndx == -1)
-	      name = "*ABS*";
-	    else if (h != NULL)
-	      name = h->root.root.string;
-	    else
-	      {
-		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
-		if (name == NULL)
-		  return false;
-	      }
-
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, (bfd_vma) 0, input_bfd,
-		    input_section, rel->r_vaddr - input_section->vma)))
-	      return false;
-	  }
-	}
-    }
-
-  return true;
-}
-
-/* Adjust the symbol index of any reloc against a global symbol to
-   instead be a reloc against the internal symbol we created specially
-   for the section.  */
-
-/*ARGSUSED*/
-static boolean
-coff_i960_adjust_symndx (obfd, info, ibfd, sec, irel, adjustedp)
-     bfd *obfd;
-     struct bfd_link_info *info;
-     bfd *ibfd;
-     asection *sec;
-     struct internal_reloc *irel;
-     boolean *adjustedp;
-{
-  struct coff_link_hash_entry *h;
-
-  *adjustedp = false;
-
-  h = obj_coff_sym_hashes (ibfd)[irel->r_symndx];
-  if (h == NULL
-      || (h->root.type != bfd_link_hash_defined
-	  && h->root.type != bfd_link_hash_defweak))
-    return true;
-
-  irel->r_symndx = h->root.u.def.section->output_section->target_index - 1;
-  *adjustedp = true;
-
-  return true;
-}
-
-#define coff_bfd_is_local_label_name coff_i960_is_local_label_name
-
-#define coff_start_final_link coff_i960_start_final_link
-
-#define coff_relocate_section coff_i960_relocate_section
-
-#define coff_adjust_symndx coff_i960_adjust_symndx
-
-#define coff_bfd_reloc_type_lookup coff_i960_reloc_type_lookup
-
-#include "coffcode.h"
-
-const bfd_target icoff_little_vec =
-{
-  "coff-Intel-little",		/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  '_',				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject,	/* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
- {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
-
-
-const bfd_target icoff_big_vec =
-{
-  "coff-Intel-big",		/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  '_',				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-     bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject,	/* bfd_set_format */
-     _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-m68k.c b/bfd/coff-m68k.c
deleted file mode 100644
index 5a06b17d50b..00000000000
--- a/bfd/coff-m68k.c
+++ /dev/null
@@ -1,480 +0,0 @@
-/* BFD back-end for Motorola 68000 COFF binaries.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/m68k.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-/* This source file is compiled multiple times for various m68k COFF
-   variants.  The following macros control its behaviour:
-
-   TARGET_SYM
-     The C name of the BFD target vector.  The default is m68kcoff_vec.
-   TARGET_NAME
-     The user visible target name.  The default is "coff-m68k".
-   NAMES_HAVE_UNDERSCORE
-     Whether symbol names have an underscore.
-   ONLY_DECLARE_RELOCS
-     Only declare the relocation howto array.  Don't actually compile
-     it.  The actual array will be picked up in another version of the
-     file.
-   STATIC_RELOCS
-     Make the relocation howto array, and associated functions, static.
-   COFF_COMMON_ADDEND
-     If this is defined, then, for a relocation against a common
-     symbol, the object file holds the value (the size) of the common
-     symbol.  If this is not defined, then, for a relocation against a
-     common symbol, the object file holds zero.  */
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-
-#ifndef COFF_PAGE_SIZE
-/* The page size is a guess based on ELF.  */
-#define COFF_PAGE_SIZE 0x2000
-#endif
-
-#ifndef COFF_COMMON_ADDEND
-#define RELOC_SPECIAL_FN 0
-#else
-static bfd_reloc_status_type m68kcoff_common_addend_special_fn
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *m68kcoff_common_addend_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *,
-	   bfd_vma *));
-#define RELOC_SPECIAL_FN m68kcoff_common_addend_special_fn
-#endif
-
-static boolean m68k_coff_is_local_label_name PARAMS ((bfd *, const char *));
-
-/* On the delta, a symbol starting with L% is local.  We won't see
-   such a symbol on other platforms, so it should be safe to always
-   consider it local here.  */
-
-static boolean
-m68k_coff_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  if (name[0] == 'L' && name[1] == '%')
-    return true;
-
-  return _bfd_coff_is_local_label_name (abfd, name);
-}
-
-#ifndef STATIC_RELOCS
-/* Clean up namespace.  */
-#define m68kcoff_howto_table	_bfd_m68kcoff_howto_table
-#define m68k_rtype2howto	_bfd_m68kcoff_rtype2howto
-#define m68k_howto2rtype	_bfd_m68kcoff_howto2rtype
-#define m68k_reloc_type_lookup	_bfd_m68kcoff_reloc_type_lookup
-#endif
-
-#ifdef ONLY_DECLARE_RELOCS
-extern reloc_howto_type m68kcoff_howto_table[];
-#else
-#ifdef STATIC_RELOCS
-static
-#endif
-reloc_howto_type m68kcoff_howto_table[] = 
-{
-  HOWTO(R_RELBYTE,	       0,  0,  	8,  false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "8",	true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_RELWORD,	       0,  1, 	16, false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "16",	true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_RELLONG,	       0,  2, 	32, false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "32",	true, 0xffffffff,0xffffffff, false),
-  HOWTO(R_PCRBYTE,	       0,  0, 	8,  true,  0, complain_overflow_signed, RELOC_SPECIAL_FN, "DISP8",    true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_PCRWORD,	       0,  1, 	16, true,  0, complain_overflow_signed, RELOC_SPECIAL_FN, "DISP16",   true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_PCRLONG,	       0,  2, 	32, true,  0, complain_overflow_signed, RELOC_SPECIAL_FN, "DISP32",   true, 0xffffffff,0xffffffff, false),
-  HOWTO(R_RELLONG_NEG,	       0,  -2, 	32, false, 0, complain_overflow_bitfield, RELOC_SPECIAL_FN, "-32",	true, 0xffffffff,0xffffffff, false),
-};
-#endif /* not ONLY_DECLARE_RELOCS */
-
-#ifndef BADMAG
-#define BADMAG(x) M68KBADMAG(x)
-#endif
-#define M68 1		/* Customize coffcode.h */
-
-/* Turn a howto into a reloc number */
-
-#ifdef ONLY_DECLARE_RELOCS
-extern void m68k_rtype2howto PARAMS ((arelent *internal, int relocentry));
-extern int m68k_howto2rtype PARAMS ((reloc_howto_type *));
-extern reloc_howto_type *m68k_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-#else
-#ifdef STATIC_RELOCS
-static
-#endif
-void
-m68k_rtype2howto(internal, relocentry)
-     arelent *internal;
-     int relocentry;
-{
-  switch (relocentry) 
-  {
-   case R_RELBYTE:	internal->howto = m68kcoff_howto_table + 0; break;
-   case R_RELWORD:	internal->howto = m68kcoff_howto_table + 1; break;
-   case R_RELLONG:	internal->howto = m68kcoff_howto_table + 2; break;
-   case R_PCRBYTE:	internal->howto = m68kcoff_howto_table + 3; break;
-   case R_PCRWORD:	internal->howto = m68kcoff_howto_table + 4; break;
-   case R_PCRLONG:	internal->howto = m68kcoff_howto_table + 5; break;
-   case R_RELLONG_NEG:	internal->howto = m68kcoff_howto_table + 6; break;
-  }
-}
-
-#ifdef STATIC_RELOCS
-static
-#endif
-int 
-m68k_howto2rtype (internal)
-     reloc_howto_type *internal;
-{
-  if (internal->pc_relative) 
-  {
-    switch (internal->bitsize) 
-    {
-     case 32: return R_PCRLONG;
-     case 16: return R_PCRWORD;
-     case 8: return R_PCRBYTE;
-    }
-  }
-  else 
-  {
-    switch (internal->bitsize) 
-     {
-      case 32: return R_RELLONG;
-      case 16: return R_RELWORD;
-      case 8: return R_RELBYTE;
-     }
-  }
-  return R_RELLONG;    
-}
-
-#ifdef STATIC_RELOCS
-static
-#endif
-reloc_howto_type *
-m68k_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    default:			return NULL;
-    case BFD_RELOC_8:		return m68kcoff_howto_table + 0;
-    case BFD_RELOC_16:		return m68kcoff_howto_table + 1;
-    case BFD_RELOC_CTOR:
-    case BFD_RELOC_32:		return m68kcoff_howto_table + 2;
-    case BFD_RELOC_8_PCREL:	return m68kcoff_howto_table + 3;
-    case BFD_RELOC_16_PCREL:	return m68kcoff_howto_table + 4;
-    case BFD_RELOC_32_PCREL:	return m68kcoff_howto_table + 5;
-      /* FIXME: There doesn't seem to be a code for R_RELLONG_NEG.  */
-    }
-  /*NOTREACHED*/
-}
-
-#endif /* not ONLY_DECLARE_RELOCS */
-
-#define RTYPE2HOWTO(internal, relocentry) \
-  m68k_rtype2howto(internal, (relocentry)->r_type)
-
-#define SELECT_RELOC(external, internal) \
-  external.r_type = m68k_howto2rtype (internal)
-
-#define coff_bfd_reloc_type_lookup m68k_reloc_type_lookup
-
-#ifndef COFF_COMMON_ADDEND
-#ifndef coff_rtype_to_howto
-
-#define coff_rtype_to_howto m68kcoff_rtype_to_howto
-
-static reloc_howto_type *m68kcoff_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *,
-	   bfd_vma *));
-
-/*ARGSUSED*/
-static reloc_howto_type *
-m68kcoff_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-  arelent relent;
-  reloc_howto_type *howto;
-
-  RTYPE2HOWTO (&relent, rel);
-
-  howto = relent.howto;
-
-  if (howto->pc_relative)
-    *addendp += sec->vma;
-
-  return howto;
-}
-
-#endif /* ! defined (coff_rtype_to_howto) */
-#endif /* ! defined (COFF_COMMON_ADDEND) */
-
-#ifdef COFF_COMMON_ADDEND
-
-/* If COFF_COMMON_ADDEND is defined, then when using m68k COFF the
-   value stored in the .text section for a reference to a common
-   symbol is the value itself plus any desired offset.  (taken from
-   work done by Ian Taylor, Cygnus Support, for I386 COFF).  */
-
-/* If we are producing relocateable output, we need to do some
-   adjustments to the object file that are not done by the
-   bfd_perform_relocation function.  This function is called by every
-   reloc type to make any required adjustments.  */
-
-static bfd_reloc_status_type
-m68kcoff_common_addend_special_fn (abfd, reloc_entry, symbol, data,
-				   input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  symvalue diff;
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  if (bfd_is_com_section (symbol->section))
-    {
-      /* We are relocating a common symbol.  The current value in the
-	 object file is ORIG + OFFSET, where ORIG is the value of the
-	 common symbol as seen by the object file when it was compiled
-	 (this may be zero if the symbol was undefined) and OFFSET is
-	 the offset into the common symbol (normally zero, but may be
-	 non-zero when referring to a field in a common structure).
-	 ORIG is the negative of reloc_entry->addend, which is set by
-	 the CALC_ADDEND macro below.  We want to replace the value in
-	 the object file with NEW + OFFSET, where NEW is the value of
-	 the common symbol which we are going to put in the final
-	 object file.  NEW is symbol->value.  */
-      diff = symbol->value + reloc_entry->addend;
-    }
-  else
-    {
-      /* For some reason bfd_perform_relocation always effectively
-	 ignores the addend for a COFF target when producing
-	 relocateable output.  This seems to be always wrong for 386
-	 COFF, so we handle the addend here instead.  */
-      diff = reloc_entry->addend;
-    }
-
-#define DOIT(x) \
-  x = ((x & ~howto->dst_mask) | (((x & howto->src_mask) + diff) & howto->dst_mask))
-
-  if (diff != 0)
-    {
-      reloc_howto_type *howto = reloc_entry->howto;
-      unsigned char *addr = (unsigned char *) data + reloc_entry->address;
-
-      switch (howto->size)
-	{
-	case 0:
-	  {
-	    char x = bfd_get_8 (abfd, addr);
-	    DOIT (x);
-	    bfd_put_8 (abfd, x, addr);
-	  }
-	  break;
-
-	case 1:
-	  {
-	    short x = bfd_get_16 (abfd, addr);
-	    DOIT (x);
-	    bfd_put_16 (abfd, x, addr);
-	  }
-	  break;
-
-	case 2:
-	  {
-	    long x = bfd_get_32 (abfd, addr);
-	    DOIT (x);
-	    bfd_put_32 (abfd, x, addr);
-	  }
-	  break;
-
-	default:
-	  abort ();
-	}
-    }
-
-  /* Now let bfd_perform_relocation finish everything up.  */
-  return bfd_reloc_continue;
-}
-
-/* Compute the addend of a reloc.  If the reloc is to a common symbol,
-   the object file contains the value of the common symbol.  By the
-   time this is called, the linker may be using a different symbol
-   from a different object file with a different value.  Therefore, we
-   hack wildly to locate the original symbol from this file so that we
-   can make the correct adjustment.  This macro sets coffsym to the
-   symbol from the original file, and uses it to set the addend value
-   correctly.  If this is not a common symbol, the usual addend
-   calculation is done, except that an additional tweak is needed for
-   PC relative relocs.
-   FIXME: This macro refers to symbols and asect; these are from the
-   calling function, not the macro arguments.  */
-
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
-  {								\
-    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;	\
-    if (ptr && bfd_asymbol_bfd (ptr) != abfd)			\
-      coffsym = (obj_symbols (abfd)				\
-	         + (cache_ptr->sym_ptr_ptr - symbols));		\
-    else if (ptr)						\
-      coffsym = coff_symbol_from (abfd, ptr);			\
-    if (coffsym != (coff_symbol_type *) NULL			\
-	&& coffsym->native->u.syment.n_scnum == 0)		\
-      cache_ptr->addend = - coffsym->native->u.syment.n_value;	\
-    else if (ptr && bfd_asymbol_bfd (ptr) == abfd		\
-	     && ptr->section != (asection *) NULL)		\
-      cache_ptr->addend = - (ptr->section->vma + ptr->value);	\
-    else							\
-      cache_ptr->addend = 0;					\
-    if (ptr && (reloc.r_type == R_PCRBYTE			\
-		|| reloc.r_type == R_PCRWORD			\
-		|| reloc.r_type == R_PCRLONG))			\
-      cache_ptr->addend += asect->vma;				\
-  }
-
-#ifndef coff_rtype_to_howto
-
-/* coff-m68k.c uses the special COFF backend linker.  We need to
-   adjust common symbols.  */
-
-/*ARGSUSED*/
-static reloc_howto_type *
-m68kcoff_common_addend_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-  arelent relent;
-  reloc_howto_type *howto;
-
-  RTYPE2HOWTO (&relent, rel);
-
-  howto = relent.howto;
-
-  if (howto->pc_relative)
-    *addendp += sec->vma;
-
-  if (sym != NULL && sym->n_scnum == 0 && sym->n_value != 0)
-    {
-      /* This is a common symbol.  The section contents include the
-	 size (sym->n_value) as an addend.  The relocate_section
-	 function will be adding in the final value of the symbol.  We
-	 need to subtract out the current size in order to get the
-	 correct result.  */
-      BFD_ASSERT (h != NULL);
-      *addendp -= sym->n_value;
-    }
-
-  /* If the output symbol is common (in which case this must be a
-     relocateable link), we need to add in the final size of the
-     common symbol.  */
-  if (h != NULL && h->root.type == bfd_link_hash_common)
-    *addendp += h->root.u.c.size;
-
-  return howto;
-}
-
-#define coff_rtype_to_howto m68kcoff_common_addend_rtype_to_howto
-
-#endif /* ! defined (coff_rtype_to_howto) */
-
-#endif /* COFF_COMMON_ADDEND */
-
-#define coff_bfd_is_local_label_name m68k_coff_is_local_label_name
-
-#define coff_relocate_section _bfd_coff_generic_relocate_section
-
-#include "coffcode.h"
-
-#ifndef TARGET_SYM
-#define TARGET_SYM m68kcoff_vec
-#endif
-
-#ifndef TARGET_NAME
-#define TARGET_NAME "coff-m68k"
-#endif
-
-const bfd_target TARGET_SYM =
-{
-  TARGET_NAME,
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-#ifdef NAMES_HAVE_UNDERSCORE
-  '_',
-#else
-  0,				/* leading underscore */
-#endif
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-   bfd_false},
- {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE
-};
diff --git a/bfd/coff-m88k.c b/bfd/coff-m88k.c
deleted file mode 100644
index 8da0b052530..00000000000
--- a/bfd/coff-m88k.c
+++ /dev/null
@@ -1,330 +0,0 @@
-/* BFD back-end for Motorola 88000 COFF "Binary Compatability Standard" files.
-   Copyright 1990, 91, 92, 93, 94, 95, 97, 1998 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define M88 1		/* Customize various include files */
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/m88k.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-static boolean m88k_is_local_label_name PARAMS ((bfd *, const char *));
-static bfd_reloc_status_type m88k_special_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static void rtype2howto PARAMS ((arelent *, struct internal_reloc *));
-static void reloc_processing
-  PARAMS ((arelent *, struct internal_reloc *, asymbol **, bfd *, asection *));
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-#define GET_SCNHDR_NRELOC bfd_h_get_32
-#define GET_SCNHDR_NLNNO bfd_h_get_32
-
-/* On coff-m88k, local labels start with '@'.  */
-
-#define coff_bfd_is_local_label_name m88k_is_local_label_name
-
-static boolean
-m88k_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return name[0] == '@';
-}
-
-static bfd_reloc_status_type 
-m88k_special_reloc (abfd, reloc_entry, symbol, data,
-		    input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  reloc_howto_type *howto = reloc_entry->howto;
-
-  switch (howto->type)
-    {
-    case R_HVRT16:
-    case R_LVRT16:
-      if (output_bfd != (bfd *) NULL)
-	{
-	  /* This is a partial relocation, and we want to apply the
-	     relocation to the reloc entry rather than the raw data.
-	     Modify the reloc inplace to reflect what we now know.  */
-
-	  reloc_entry->address += input_section->output_offset;
-	}
-      else
-	{
-	  bfd_vma output_base = 0;
-	  bfd_vma addr = reloc_entry->address;
-	  bfd_vma x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
-	  asection *reloc_target_output_section;
-	  long relocation = 0;
-
-	  /* Work out which section the relocation is targetted at and the
-	     initial relocation command value.  */
-
-	  /* Get symbol value.  (Common symbols are special.)  */
-	  if (bfd_is_com_section (symbol->section))
-	    relocation = 0;
-	  else
-	    relocation = symbol->value;
-
-	  reloc_target_output_section = symbol->section->output_section;
-
-	  /* Convert input-section-relative symbol value to absolute.  */
-	  if (output_bfd)
-	    output_base = 0;
-	  else
-	    output_base = reloc_target_output_section->vma;
-
-	  relocation += output_base + symbol->section->output_offset;
-
-	  /* Add in supplied addend.  */
-	  relocation += ((reloc_entry->addend << howto->bitsize) + x);
-
-	  reloc_entry->addend = 0;
-
-	  relocation >>= (bfd_vma) howto->rightshift;
-
-	  /* Shift everything up to where it's going to be used */
-
-	  relocation <<= (bfd_vma) howto->bitpos;
-
-	  if (relocation)
-	      bfd_put_16 (abfd, relocation, (unsigned char *) data + addr);
-	}
-
-      /* If we are not producing relocateable output, return an error if
-	 the symbol is not defined.  */
-      if (bfd_is_und_section (symbol->section) && output_bfd == (bfd *) NULL)
-	return bfd_reloc_undefined;
-
-      return bfd_reloc_ok;
-
-    default:
-      if (output_bfd != (bfd *) NULL)
-	{
-	  /* This is a partial relocation, and we want to apply the
-	     relocation to the reloc entry rather than the raw data.
-	     Modify the reloc inplace to reflect what we now know.  */
-
-	  reloc_entry->address += input_section->output_offset;
-	  return bfd_reloc_ok;
-	}
-      break;
-    }
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_ok;
-}
-
-static reloc_howto_type howto_table[] = 
-{
-  HOWTO (R_PCR16L,			/* type */
-	 02,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 true,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 m88k_special_reloc,		/* special_function */
-	 "PCR16L",			/* name */
-	 false,				/* partial_inplace */
-	 0x0000ffff,			/* src_mask */
-	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  HOWTO (R_PCR26L,			/* type */
-	 02,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 26,				/* bitsize */
-	 true,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 m88k_special_reloc,		/* special_function */
-	 "PCR26L",			/* name */
-	 false,				/* partial_inplace */
-	 0x03ffffff,			/* src_mask */
-	 0x03ffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  HOWTO (R_VRT16,			/* type */
-	 00,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 m88k_special_reloc,		/* special_function */
-	 "VRT16",			/* name */
-	 false,				/* partial_inplace */
-	 0x0000ffff,			/* src_mask */
-	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  HOWTO (R_HVRT16,			/* type */
-	 16,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 m88k_special_reloc,		/* special_function */
-	 "HVRT16",			/* name */
-	 false,				/* partial_inplace */
-	 0x0000ffff,			/* src_mask */
-	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  HOWTO (R_LVRT16,			/* type */
-	 00,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 m88k_special_reloc,		/* special_function */
-	 "LVRT16",			/* name */
-	 false,				/* partial_inplace */
-	 0x0000ffff,			/* src_mask */
-	 0x0000ffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  HOWTO (R_VRT32,			/* type */
-	 00,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 m88k_special_reloc,		/* special_function */
-	 "VRT32",			/* name */
-	 false,				/* partial_inplace */
-	 0xffffffff,			/* src_mask */
-	 0xffffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-};
-
-/* Code to turn an external r_type into a pointer to an entry in the
-   above howto table.  */
-static void
-rtype2howto (cache_ptr, dst)
-     arelent *cache_ptr;
-     struct internal_reloc *dst;
-{
-  if (dst->r_type >= R_PCR16L && dst->r_type <= R_VRT32)
-    {
-      cache_ptr->howto = howto_table + dst->r_type - R_PCR16L;
-    }
-  else
-    {
-      BFD_ASSERT (0);
-    }
-}
-
-#define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst)
-
-
-/* Code to swap in the reloc offset */
-#define SWAP_IN_RELOC_OFFSET  bfd_h_get_16
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_16
-
-
-#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section)	\
-  reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void
-reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent *relent;
-     struct internal_reloc *reloc;
-     asymbol **symbols;
-     bfd *abfd;
-     asection *section;
-{
-  relent->address = reloc->r_vaddr;
-  rtype2howto (relent, reloc);
-
-  if (((int) reloc->r_symndx) > 0)
-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
-  else
-    {
-      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
-
-  relent->addend = reloc->r_offset;
-  relent->address -= section->vma;
-}
-
-#define BADMAG(x) MC88BADMAG(x)
-#include "coffcode.h"
-
-#undef coff_write_armap
-
-const bfd_target m88kbcs_vec =
-{
-  "coff-m88kbcs",		/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  '_',				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-    {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, _bfd_dummy_target},
-    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-       bfd_false},
-    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c
deleted file mode 100644
index d787096e379..00000000000
--- a/bfd/coff-mcore.c
+++ /dev/null
@@ -1,703 +0,0 @@
-/* BFD back-end for Motorolla MCore COFF/PE
-   Copyright 1999
-   Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/mcore.h"
-#include "coff/internal.h"
-#include "coff/pe.h"
-#include "libcoff.h"
-
-#ifdef BADMAG
-#undef BADMAG
-#endif
-#define BADMAG(x) MCOREBADMAG(x)
-
-#ifndef NUM_ELEM
-#define NUM_ELEM(A) (sizeof (A) / sizeof (A)[0])
-#endif
-
-/* This file is compiled more than once, but we only compile the
-   final_link routine once.  */
-extern boolean mcore_bfd_coff_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-static struct bfd_link_hash_table * coff_mcore_link_hash_table_create
-  PARAMS ((bfd *));
-static bfd_reloc_status_type        mcore_coff_unsupported_reloc 
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean                      in_reloc_p
-  PARAMS ((bfd *, reloc_howto_type *));
-static boolean                      coff_mcore_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-static reloc_howto_type *           mcore_coff_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static reloc_howto_type *           coff_mcore_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *, bfd_vma *));
-static const bfd_target *           pe_object_p
-  PARAMS ((bfd *));
-
-
-
-/* The NT loader points the toc register to &toc + 32768, in order to
-   use the complete range of a 16-bit displacement. We have to adjust
-   for this when we fix up loads displaced off the toc reg.  */
-#define TOC_LOAD_ADJUSTMENT (-32768)
-#define TOC_SECTION_NAME ".private.toc"
-
-/* The main body of code is in coffcode.h.  */
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
-   from smaller values.  Start with zero, widen, *then* decrement.  */
-#define MINUS_ONE	(((bfd_vma)0) - 1)
-
-
-static reloc_howto_type mcore_coff_howto_table[] =
-{
-  /* Unused: */
-  HOWTO (IMAGE_REL_MCORE_ABSOLUTE,/* type */                                 
-	 0,	                 /* rightshift */                           
-	 0,	                 /* size (0 = byte, 1 = short, 2 = long) */ 
-	 0,	                 /* bitsize */                   
-	 false,	                 /* pc_relative */                          
-	 0,	                 /* bitpos */                               
-	 complain_overflow_dont, /* dont complain_on_overflow */
-	 0,		         /* special_function */                     
-	 "ABSOLUTE",             /* name */
-	 false,	                 /* partial_inplace */                      
-	 0x00,	 	         /* src_mask */                             
-	 0x00,        		 /* dst_mask */                             
-	 false),                 /* pcrel_offset */
-  
-  HOWTO (IMAGE_REL_MCORE_ADDR32,/* type */
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "ADDR32",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* 8 bits + 2 zero bits; jmpi/jsri/lrw instructions.
-     Should not appear in object files. */
-  HOWTO (IMAGE_REL_MCORE_PCREL_IMM8BY4,	/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mcore_coff_unsupported_reloc,	/* special_function */
-	 "IMM8BY4",             /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* bsr/bt/bf/br instructions; 11 bits + 1 zero bit 
-     Span 2k instructions == 4k bytes.
-     Only useful pieces at the relocated address are the opcode (5 bits) */
-  HOWTO (IMAGE_REL_MCORE_PCREL_IMM11BY2,/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 11,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 NULL,	                /* special_function */
-	 "IMM11BY2",            /* name */
-	 false,			/* partial_inplace */
-	 0x0,			/* src_mask */
-	 0x7ff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 4 bits + 1 zero bit; 'loopt' instruction only; unsupported. */
-  HOWTO (IMAGE_REL_MCORE_PCREL_IMM4BY2,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 4,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mcore_coff_unsupported_reloc,/* special_function */
-	 "IMM4BY2",              /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 32-bit pc-relative. Eventually this will help support PIC code. */
-  HOWTO (IMAGE_REL_MCORE_PCREL_32,/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 NULL,	                /* special_function */
-	 "PCREL_32",	        /* name */
-	 false,			/* partial_inplace */
-	 0x0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* Like PCREL_IMM11BY2, this relocation indicates that there is a
-     'jsri' at the specified address. There is a separate relocation
-     entry for the literal pool entry that it references, but we 
-     might be able to change the jsri to a bsr if the target turns out
-     to be close enough [even though we won't reclaim the literal pool
-     entry, we'll get some runtime efficiency back]. Note that this
-     is a relocation that we are allowed to safely ignore.  */ 
-  HOWTO (IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2,/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 11,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 NULL,	                /* special_function */
-	 "JSR_IMM11BY2",        /* name */
-	 false,			/* partial_inplace */
-	 0x0,			/* src_mask */
-	 0x7ff,			/* dst_mask */
-	 true)			/* pcrel_offset */
-};
-
-/* Extend the coff_link_hash_table structure with a few M*Core specific fields.
-   This allows us to store global data here without actually creating any
-   global variables, which is a no-no in the BFD world.  */
-typedef struct coff_mcore_link_hash_table
-{
-  /* The original coff_link_hash_table structure.  MUST be first field.  */
-  struct coff_link_hash_table	root;
-
-  bfd *                         bfd_of_toc_owner;
-  long int                      global_toc_size;
-  long int                      import_table_size;
-  long int                      first_thunk_address;
-  long int                      thunk_size;
-}
-mcore_hash_table;
-
-/* Get the MCore coff linker hash table from a link_info structure.  */
-#define coff_mcore_hash_table(info) \
-  ((mcore_hash_table *) ((info)->hash))
-
-/* Create an MCore coff linker hash table.  */
-static struct bfd_link_hash_table *
-coff_mcore_link_hash_table_create (abfd)
-     bfd * abfd;
-{
-  mcore_hash_table * ret;
-
-  ret = ((mcore_hash_table *) bfd_alloc (abfd, sizeof (* ret)));
-  if (ret == (mcore_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_coff_link_hash_table_init
-      (& ret->root, abfd, _bfd_coff_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-
-  ret->bfd_of_toc_owner = NULL;
-  ret->global_toc_size  = 0;
-  ret->import_table_size = 0;
-  ret->first_thunk_address = 0;
-  ret->thunk_size = 0;
-
-  return & ret->root.root;
-}
-
-/*ARGSUSED*/
-static bfd_reloc_status_type
-mcore_coff_unsupported_reloc (abfd, reloc_entry, symbol, data, input_section,
-			   output_bfd, error_message)
-     bfd * abfd;
-     arelent * reloc_entry;
-     asymbol * symbol;
-     PTR data;
-     asection * input_section;
-     bfd * output_bfd;
-     char ** error_message;
-{
-  BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0);
-  
-  _bfd_error_handler (_("%s: Relocation %s (%d) is not currently supported.\n"),
-		      bfd_get_filename (abfd),
-		      reloc_entry->howto->name,
-		      reloc_entry->howto->type);
-  
-  return bfd_reloc_notsupported;
-}
-
-
-/* A cheesy little macro to make the code a little more readable. */
-#define HOW2MAP(bfd_rtype, mcore_rtype)  \
- case bfd_rtype: return & mcore_coff_howto_table [mcore_rtype]
-
-static reloc_howto_type *
-mcore_coff_reloc_type_lookup (abfd, code)
-     bfd * abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    { 
-      HOW2MAP (BFD_RELOC_32,                       IMAGE_REL_MCORE_ADDR32);
-      HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM8BY4,      IMAGE_REL_MCORE_PCREL_IMM8BY4);
-      HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM11BY2,     IMAGE_REL_MCORE_PCREL_IMM11BY2);
-      HOW2MAP (BFD_RELOC_MCORE_PCREL_IMM4BY2,      IMAGE_REL_MCORE_PCREL_IMM4BY2);
-      HOW2MAP (BFD_RELOC_32_PCREL,                 IMAGE_REL_MCORE_PCREL_32);
-      HOW2MAP (BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2, IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2);
-   default: 
-      return NULL;
-    }
-  /*NOTREACHED*/
-}
-
-#undef HOW2MAP
-
-#define RTYPE2HOWTO(cache_ptr, dst) \
-  (cache_ptr)->howto = mcore_coff_howto_table + (dst)->r_type;
-
-static reloc_howto_type *
-coff_mcore_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd * abfd;
-     asection * sec;
-     struct internal_reloc * rel;
-     struct coff_link_hash_entry * h;
-     struct internal_syment * sym;
-     bfd_vma * addendp;
-{
-  reloc_howto_type * howto;
-
-
-  if (rel->r_type >= NUM_ELEM (mcore_coff_howto_table))
-    return NULL;
-  
-  howto = mcore_coff_howto_table + rel->r_type;
-  
-  if (howto->pc_relative)
-    {
-      * addendp = sec->vma - 2; /* XXX guess - is this right ? */
-      
-      /* If the symbol is defined, then the generic code is going to
-         add back the symbol value in order to cancel out an
-         adjustment it made to the addend.  However, we set the addend
-         to 0 at the start of this function.  We need to adjust here,
-         to avoid the adjustment the generic code will make.  FIXME:
-         This is getting a bit hackish.  */
-      if (sym != NULL && sym->n_scnum != 0)
-	* addendp -= sym->n_value;
-    }
-  else
-    * addendp = 0;
-  
-  return howto;
-}
-
-/* Return true if this relocation should
-   appear in the output .reloc section. */
-static boolean in_reloc_p (abfd, howto)
-     bfd * abfd;
-     reloc_howto_type * howto;
-{
-  return ! howto->pc_relative;
-}     
-
-/* The reloc processing routine for the optimized COFF linker.  */
-static boolean
-coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, syms, sections)
-     bfd * output_bfd;
-     struct bfd_link_info * info;
-     bfd * input_bfd;
-     asection * input_section;
-     bfd_byte * contents;
-     struct internal_reloc * relocs;
-     struct internal_syment * syms;
-     asection ** sections;
-{
-  struct internal_reloc * rel;
-  struct internal_reloc * relend;
-  boolean hihalf;
-  bfd_vma hihalf_val;
-  
-  /* If we are performing a relocateable link, we don't need to do a
-     thing.  The caller will take care of adjusting the reloc
-     addresses and symbol indices.  */
-  if (info->relocateable)
-    return true;
-  
-  BFD_ASSERT (input_bfd->xvec->byteorder
-	      == output_bfd->xvec->byteorder);
-
-  hihalf = false;
-  hihalf_val = 0;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  
-  for (; rel < relend; rel++)
-    {
-      asection *                     toc_section = NULL;
-      bfd_vma                        relocation;
-      long                           symndx;
-      struct internal_syment *       sym;
-      bfd_vma                        val;
-      bfd_vma                        addend;
-      bfd_reloc_status_type          rstat;
-      bfd_byte *                     loc;
-      unsigned short                 r_type = rel->r_type;
-      reloc_howto_type *             howto = NULL;
-      struct coff_link_hash_entry *  h;
-      const char *                   my_name;
-  
-      symndx = rel->r_symndx;
-      loc = contents + rel->r_vaddr - input_section->vma;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	}
-      else
-	{
-	  h = obj_coff_sym_hashes (input_bfd)[symndx];
-	  sym = syms + symndx;
-	}
-
-      /* Get the howto and initialise the addend.  */
-      howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
-				       sym, & addend);
-      if (howto == NULL)
-	return false;
-
-      val = 0;
-      
-      if (h == NULL)
-	{
-	  if (symndx == -1)
-	    my_name = "*ABS*";
-	  else
-	    {
-	      asection * sec = sections[symndx];
-	      
-	      val = (sym->n_value 
-		     + sec->output_section->vma
-		     + sec->output_offset);
-
-	      if (sym == NULL)
-		my_name = "*unknown*";
-	      else if (   sym->_n._n_n._n_zeroes == 0
-		       && sym->_n._n_n._n_offset != 0)
-		my_name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
-	      else 
-		{
-		  static char buf [SYMNMLEN + 1];
-		  
-		  strncpy (buf, sym->_n._n_name, SYMNMLEN);
-		  buf[SYMNMLEN] = '\0';
-		  my_name = buf;
-		}
-	    }
-	}
-      else
-	{
-	  if (   h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      asection * sec = h->root.u.def.section;
-	      
-	      val = (h->root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	    }
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	    }
-	  
-	  my_name = h->root.root.string;
-	}	
-
-      rstat = bfd_reloc_ok;
-      
-      /* Each case must do its own relocation, setting rstat appropriately.  */
-      switch (r_type)
-	{
-	default:
-	  _bfd_error_handler (_("%s: unsupported relocation type 0x%02x"),
-			      bfd_get_filename (input_bfd), r_type);
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	  
-	case IMAGE_REL_MCORE_ABSOLUTE:
-	  fprintf (stderr, 
-		   _("Warning: unsupported reloc %s <file %s, section %s>\n"), 
-		   howto->name,
-		   bfd_get_filename (input_bfd),
-		   input_section->name);
-	  
-	  fprintf (stderr,"sym %ld (%s), r_vaddr %ld (%lx)\n", 
-		   rel->r_symndx, my_name, (long) rel->r_vaddr,
-		   (unsigned long) rel->r_vaddr);  
-	  break;
-	  
-	case IMAGE_REL_MCORE_PCREL_IMM8BY4:
-	case IMAGE_REL_MCORE_PCREL_IMM11BY2:
-	case IMAGE_REL_MCORE_PCREL_IMM4BY2:
-	case IMAGE_REL_MCORE_PCREL_32:
-	case IMAGE_REL_MCORE_PCREL_JSR_IMM11BY2:
-	case IMAGE_REL_MCORE_ADDR32:
-	  rstat = _bfd_relocate_contents (howto, input_bfd, val, loc);
-	  break;
-	}
-      
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	  
-	case bfd_reloc_ok:
-	  break;
-	  
-	case bfd_reloc_overflow:
-	  if (! ((*info->callbacks->reloc_overflow)
-		 (info, my_name, howto->name, 
-		  (bfd_vma) 0, input_bfd,
-		  input_section, rel->r_vaddr - input_section->vma)))
-	    return false;
-	}
-    }     
-
-  return true;
-}
-
-
-/* Tailor coffcode.h -- macro heaven. */
-
-/* We use the special COFF backend linker, with our own special touch.  */
-
-#define coff_bfd_reloc_type_lookup   mcore_coff_reloc_type_lookup
-#define coff_relocate_section        coff_mcore_relocate_section
-#define coff_rtype_to_howto          coff_mcore_rtype_to_howto
-
-#define SELECT_RELOC(internal, howto) {internal.r_type = howto->type;}
-
-#define COFF_PAGE_SIZE               0x1000
-
-#include "coffcode.h"
-
-static const bfd_target *
-pe_object_p (abfd)
-     bfd * abfd;
-{
-#ifdef COFF_IMAGE_WITH_PE
-  /* We need to hack badly to handle a PE image correctly.  In PE
-     images created by the GNU linker, the offset to the COFF header
-     is always the size.  However, this is not the case in images
-     generated by other PE linkers.  The PE format stores a four byte
-     offset to the PE signature just before the COFF header at
-     location 0x3c of the file.  We pick up that offset, verify that
-     the PE signature is there, and then set ourselves up to read in
-     the COFF header.  */
-  {
-    bfd_byte ext_offset[4];
-    file_ptr offset;
-    bfd_byte ext_signature[4];
-    unsigned long signature;
-
-    if (bfd_seek (abfd, 0x3c, SEEK_SET) != 0
-	|| bfd_read (ext_offset, 1, 4, abfd) != 4)
-      {
-	if (bfd_get_error () != bfd_error_system_call)
-	  bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-    
-    offset = bfd_h_get_32 (abfd, ext_offset);
-    
-    if (bfd_seek (abfd, offset, SEEK_SET) != 0
-	|| bfd_read (ext_signature, 1, 4, abfd) != 4)
-      {
-	if (bfd_get_error () != bfd_error_system_call)
-	  bfd_set_error (bfd_error_wrong_format);
-	
-	return NULL;
-      }
-    
-    signature = bfd_h_get_32 (abfd, ext_signature);
-
-    if (signature != 0x4550)
-      {
-	bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-
-    /* Here is the hack.  coff_object_p wants to read filhsz bytes to
-       pick up the COFF header.  We adjust so that that will work.  20
-       is the size of the mips COFF filehdr.  */
-    if (bfd_seek (abfd, (bfd_tell (abfd) - bfd_coff_filhsz (abfd) + 20),
-		  SEEK_SET) != 0)
-      {
-	if (bfd_get_error () != bfd_error_system_call)
-	  bfd_set_error (bfd_error_wrong_format);
-	
-	return NULL;
-      }
-  }
-#endif
-
-  return coff_object_p (abfd);
-}
-
-/* The transfer vectors that lead the outside world to all of the above. */
-
-const bfd_target
-TARGET_BIG_SYM =
-{
-  TARGET_BIG_NAME,
-  bfd_target_coff_flavour,	
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
-
-  0,				/* leading char */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  { _bfd_dummy_target,
-    pe_object_p, 		/* bfd_check_format */
-    bfd_generic_archive_p, 	/* _bfd_dummy_target */
-    pe_object_p
-  },
-  { bfd_false,
-    coff_mkobject,
-    _bfd_generic_mkarchive, 	/* bfd_set_format */
-    bfd_false
-  },
-  { bfd_false,
-    coff_write_object_contents,	/* bfd_write_contents */
-    _bfd_write_archive_contents,
-    bfd_false
-  },
-
-  BFD_JUMP_TABLE_GENERIC (coff),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
-
-const bfd_target
-TARGET_LITTLE_SYM =
-{
-  TARGET_LITTLE_NAME,
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
-  
-  0,				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-/* Note that we allow an object file to be treated as a core file as well. */
-  {
-    _bfd_dummy_target,
-    pe_object_p, 		/* bfd_check_format */
-    bfd_generic_archive_p,
-    pe_object_p
-  },
-  {
-    bfd_false,
-    coff_mkobject,
-    _bfd_generic_mkarchive, 	/* bfd_set_format */
-    bfd_false
-  },
-  {
-    bfd_false,
-    coff_write_object_contents, /* bfd_write_contents */
-    _bfd_write_archive_contents,
-    bfd_false
-  },
-
-  BFD_JUMP_TABLE_GENERIC (coff),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
-
diff --git a/bfd/coff-mips.c b/bfd/coff-mips.c
deleted file mode 100644
index 051eb86b166..00000000000
--- a/bfd/coff-mips.c
+++ /dev/null
@@ -1,2726 +0,0 @@
-/* BFD back-end for MIPS Extended-Coff files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Original version by Per Bothner.
-   Full support added by Ian Lance Taylor, ian@cygnus.com.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "coff/sym.h"
-#include "coff/symconst.h"
-#include "coff/ecoff.h"
-#include "coff/mips.h"
-#include "libcoff.h"
-#include "libecoff.h"
-
-/* Prototypes for static functions.  */
-
-static boolean mips_ecoff_bad_format_hook PARAMS ((bfd *abfd, PTR filehdr));
-static void mips_ecoff_swap_reloc_in PARAMS ((bfd *, PTR,
-					      struct internal_reloc *));
-static void mips_ecoff_swap_reloc_out PARAMS ((bfd *,
-					       const struct internal_reloc *,
-					       PTR));
-static void mips_adjust_reloc_in PARAMS ((bfd *,
-					  const struct internal_reloc *,
-					  arelent *));
-static void mips_adjust_reloc_out PARAMS ((bfd *, const arelent *,
-					   struct internal_reloc *));
-static bfd_reloc_status_type mips_generic_reloc PARAMS ((bfd *abfd,
-							 arelent *reloc,
-							 asymbol *symbol,
-							 PTR data,
-							 asection *section,
-							 bfd *output_bfd,
-							 char **error));
-static bfd_reloc_status_type mips_refhi_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_reflo_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_gprel_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_relhi_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_rello_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-static bfd_reloc_status_type mips_switch_reloc PARAMS ((bfd *abfd,
-							arelent *reloc,
-							asymbol *symbol,
-							PTR data,
-							asection *section,
-							bfd *output_bfd,
-							char **error));
-static void mips_relocate_hi PARAMS ((struct internal_reloc *refhi,
-				      struct internal_reloc *reflo,
-				      bfd *input_bfd,
-				      asection *input_section,
-				      bfd_byte *contents,
-				      size_t adjust,
-				      bfd_vma relocation,
-				      boolean pcrel));
-static boolean mips_relocate_section PARAMS ((bfd *, struct bfd_link_info *,
-					      bfd *, asection *,
-					      bfd_byte *, PTR));
-static boolean mips_read_relocs PARAMS ((bfd *, asection *));
-static boolean mips_relax_section PARAMS ((bfd *, asection *,
-					   struct bfd_link_info *,
-					   boolean *));
-static boolean mips_relax_pcrel16 PARAMS ((struct bfd_link_info *, bfd *,
-					   asection *,
-					   struct ecoff_link_hash_entry *,
-					   bfd_byte *, bfd_vma));
-static reloc_howto_type *mips_bfd_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-
-
-/* ECOFF has COFF sections, but the debugging information is stored in
-   a completely different format.  ECOFF targets use some of the
-   swapping routines from coffswap.h, and some of the generic COFF
-   routines in coffgen.c, but, unlike the real COFF targets, do not
-   use coffcode.h itself.
-
-   Get the generic COFF swapping routines, except for the reloc,
-   symbol, and lineno ones.  Give them ECOFF names.  */
-#define MIPSECOFF
-#define NO_COFF_RELOCS
-#define NO_COFF_SYMBOLS
-#define NO_COFF_LINENOS
-#define coff_swap_filehdr_in mips_ecoff_swap_filehdr_in
-#define coff_swap_filehdr_out mips_ecoff_swap_filehdr_out
-#define coff_swap_aouthdr_in mips_ecoff_swap_aouthdr_in
-#define coff_swap_aouthdr_out mips_ecoff_swap_aouthdr_out
-#define coff_swap_scnhdr_in mips_ecoff_swap_scnhdr_in
-#define coff_swap_scnhdr_out mips_ecoff_swap_scnhdr_out
-#include "coffswap.h"
-
-/* Get the ECOFF swapping routines.  */
-#define ECOFF_32
-#include "ecoffswap.h"
-
-/* How to process the various relocs types.  */
-
-static reloc_howto_type mips_howto_table[] =
-{
-  /* Reloc type 0 is ignored.  The reloc reading code ensures that
-     this is a reference to the .abs section, which will cause
-     bfd_perform_relocation to do nothing.  */
-  HOWTO (MIPS_R_IGNORE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "IGNORE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 16 bit reference to a symbol, normally from a data section.  */
-  HOWTO (MIPS_R_REFHALF,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mips_generic_reloc,	/* special_function */
-	 "REFHALF",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit reference to a symbol, normally from a data section.  */
-  HOWTO (MIPS_R_REFWORD,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mips_generic_reloc,	/* special_function */
-	 "REFWORD",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 26 bit absolute jump address.  */
-  HOWTO (MIPS_R_JMPADDR,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 			/* This needs complex overflow
-				   detection, because the upper four
-				   bits must match the PC.  */
-	 mips_generic_reloc,	/* special_function */
-	 "JMPADDR",		/* name */
-	 true,			/* partial_inplace */
-	 0x3ffffff,		/* src_mask */
-	 0x3ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high 16 bits of a symbol value.  Handled by the function
-     mips_refhi_reloc.  */
-  HOWTO (MIPS_R_REFHI,		/* type */
-	 16,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mips_refhi_reloc,	/* special_function */
-	 "REFHI",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The low 16 bits of a symbol value.  */
-  HOWTO (MIPS_R_REFLO,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 mips_reflo_reloc,	/* special_function */
-	 "REFLO",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A reference to an offset from the gp register.  Handled by the
-     function mips_gprel_reloc.  */
-  HOWTO (MIPS_R_GPREL,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 mips_gprel_reloc,	/* special_function */
-	 "GPREL",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A reference to a literal using an offset from the gp register.
-     Handled by the function mips_gprel_reloc.  */
-  HOWTO (MIPS_R_LITERAL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 mips_gprel_reloc,	/* special_function */
-	 "LITERAL",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  { 8 },
-  { 9 },
-  { 10 },
-  { 11 },
-
-  /* This reloc is a Cygnus extension used when generating position
-     independent code for embedded systems.  It represents a 16 bit PC
-     relative reloc rightshifted twice as used in the MIPS branch
-     instructions.  */
-  HOWTO (MIPS_R_PCREL16,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 mips_generic_reloc,	/* special_function */
-	 "PCREL16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* This reloc is a Cygnus extension used when generating position
-     independent code for embedded systems.  It represents the high 16
-     bits of a PC relative reloc.  The next reloc must be
-     MIPS_R_RELLO, and the addend is formed from the addends of the
-     two instructions, just as in MIPS_R_REFHI and MIPS_R_REFLO.  The
-     final value is actually PC relative to the location of the
-     MIPS_R_RELLO reloc, not the MIPS_R_RELHI reloc.  */
-  HOWTO (MIPS_R_RELHI,		/* type */
-	 16,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mips_relhi_reloc,	/* special_function */
-	 "RELHI",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* This reloc is a Cygnus extension used when generating position
-     independent code for embedded systems.  It represents the low 16
-     bits of a PC relative reloc.  */
-  HOWTO (MIPS_R_RELLO,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 mips_rello_reloc,	/* special_function */
-	 "RELLO",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  { 15 },
-  { 16 },
-  { 17 },
-  { 18 },
-  { 19 },
-  { 20 },
-  { 21 },
-
-  /* This reloc is a Cygnus extension used when generating position
-     independent code for embedded systems.  It represents an entry in
-     a switch table, which is the difference between two symbols in
-     the .text section.  The symndx is actually the offset from the
-     reloc address to the subtrahend.  See include/coff/mips.h for
-     more details.  */
-  HOWTO (MIPS_R_SWITCH,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 mips_switch_reloc,	/* special_function */
-	 "SWITCH",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true)			/* pcrel_offset */
-};
-
-#define MIPS_HOWTO_COUNT \
-  (sizeof mips_howto_table / sizeof mips_howto_table[0])
-
-/* When the linker is doing relaxing, it may change a external PCREL16
-   reloc.  This typically represents an instruction like
-       bal foo
-   We change it to
-       .set  noreorder
-       bal   $L1
-       lui   $at,%hi(foo - $L1)
-     $L1:
-       addiu $at,%lo(foo - $L1)
-       addu  $at,$at,$31
-       jalr  $at
-   PCREL16_EXPANSION_ADJUSTMENT is the number of bytes this changes the
-   instruction by.  */
-
-#define PCREL16_EXPANSION_ADJUSTMENT (4 * 4)
-
-/* See whether the magic number matches.  */
-
-static boolean
-mips_ecoff_bad_format_hook (abfd, filehdr)
-     bfd *abfd;
-     PTR filehdr;
-{
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-
-  switch (internal_f->f_magic)
-    {
-    case MIPS_MAGIC_1:
-      /* I don't know what endianness this implies.  */
-      return true;
-
-    case MIPS_MAGIC_BIG:
-    case MIPS_MAGIC_BIG2:
-    case MIPS_MAGIC_BIG3:
-      return bfd_big_endian (abfd);
-
-    case MIPS_MAGIC_LITTLE:
-    case MIPS_MAGIC_LITTLE2:
-    case MIPS_MAGIC_LITTLE3:
-      return bfd_little_endian (abfd);
-
-    default:
-      return false;
-    }
-}
-
-/* Reloc handling.  MIPS ECOFF relocs are packed into 8 bytes in
-   external form.  They use a bit which indicates whether the symbol
-   is external.  */
-
-/* Swap a reloc in.  */
-
-static void
-mips_ecoff_swap_reloc_in (abfd, ext_ptr, intern)
-     bfd *abfd;
-     PTR ext_ptr;
-     struct internal_reloc *intern;
-{
-  const RELOC *ext = (RELOC *) ext_ptr;
-
-  intern->r_vaddr = bfd_h_get_32 (abfd, (bfd_byte *) ext->r_vaddr);
-  if (bfd_header_big_endian (abfd))
-    {
-      intern->r_symndx = (((int) ext->r_bits[0]
-			   << RELOC_BITS0_SYMNDX_SH_LEFT_BIG)
-			  | ((int) ext->r_bits[1]
-			     << RELOC_BITS1_SYMNDX_SH_LEFT_BIG)
-			  | ((int) ext->r_bits[2]
-			     << RELOC_BITS2_SYMNDX_SH_LEFT_BIG));
-      intern->r_type = ((ext->r_bits[3] & RELOC_BITS3_TYPE_BIG)
-			>> RELOC_BITS3_TYPE_SH_BIG);
-      intern->r_extern = (ext->r_bits[3] & RELOC_BITS3_EXTERN_BIG) != 0;
-    }
-  else
-    {
-      intern->r_symndx = (((int) ext->r_bits[0]
-			   << RELOC_BITS0_SYMNDX_SH_LEFT_LITTLE)
-			  | ((int) ext->r_bits[1]
-			     << RELOC_BITS1_SYMNDX_SH_LEFT_LITTLE)
-			  | ((int) ext->r_bits[2]
-			     << RELOC_BITS2_SYMNDX_SH_LEFT_LITTLE));
-      intern->r_type = (((ext->r_bits[3] & RELOC_BITS3_TYPE_LITTLE)
-			 >> RELOC_BITS3_TYPE_SH_LITTLE)
-			| ((ext->r_bits[3] & RELOC_BITS3_TYPEHI_LITTLE)
-			   << RELOC_BITS3_TYPEHI_SH_LITTLE));
-      intern->r_extern = (ext->r_bits[3] & RELOC_BITS3_EXTERN_LITTLE) != 0;
-    }
-
-  /* If this is a MIPS_R_SWITCH reloc, or an internal MIPS_R_RELHI or
-     MIPS_R_RELLO reloc, r_symndx is actually the offset from the
-     reloc address to the base of the difference (see
-     include/coff/mips.h for more details).  We copy symndx into the
-     r_offset field so as not to confuse ecoff_slurp_reloc_table in
-     ecoff.c.  In adjust_reloc_in we then copy r_offset into the reloc
-     addend.  */
-  if (intern->r_type == MIPS_R_SWITCH
-      || (! intern->r_extern
-	  && (intern->r_type == MIPS_R_RELLO
-	      || intern->r_type == MIPS_R_RELHI)))
-    {
-      BFD_ASSERT (! intern->r_extern);
-      intern->r_offset = intern->r_symndx;
-      if (intern->r_offset & 0x800000)
-	intern->r_offset -= 0x1000000;
-      intern->r_symndx = RELOC_SECTION_TEXT;
-    }
-}
-
-/* Swap a reloc out.  */
-
-static void
-mips_ecoff_swap_reloc_out (abfd, intern, dst)
-     bfd *abfd;
-     const struct internal_reloc *intern;
-     PTR dst;
-{
-  RELOC *ext = (RELOC *) dst;
-  long r_symndx;
-
-  BFD_ASSERT (intern->r_extern
-	      || (intern->r_symndx >= 0 && intern->r_symndx <= 12));
-
-  /* If this is a MIPS_R_SWITCH reloc, or an internal MIPS_R_RELLO or
-     MIPS_R_RELHI reloc, we actually want to write the contents of
-     r_offset out as the symbol index.  This undoes the change made by
-     mips_ecoff_swap_reloc_in.  */
-  if (intern->r_type != MIPS_R_SWITCH
-      && (intern->r_extern
-	  || (intern->r_type != MIPS_R_RELHI
-	      && intern->r_type != MIPS_R_RELLO)))
-    r_symndx = intern->r_symndx;
-  else
-    {
-      BFD_ASSERT (intern->r_symndx == RELOC_SECTION_TEXT);
-      r_symndx = intern->r_offset & 0xffffff;
-    }
-
-  bfd_h_put_32 (abfd, intern->r_vaddr, (bfd_byte *) ext->r_vaddr);
-  if (bfd_header_big_endian (abfd))
-    {
-      ext->r_bits[0] = r_symndx >> RELOC_BITS0_SYMNDX_SH_LEFT_BIG;
-      ext->r_bits[1] = r_symndx >> RELOC_BITS1_SYMNDX_SH_LEFT_BIG;
-      ext->r_bits[2] = r_symndx >> RELOC_BITS2_SYMNDX_SH_LEFT_BIG;
-      ext->r_bits[3] = (((intern->r_type << RELOC_BITS3_TYPE_SH_BIG)
-			 & RELOC_BITS3_TYPE_BIG)
-			| (intern->r_extern ? RELOC_BITS3_EXTERN_BIG : 0));
-    }
-  else
-    {
-      ext->r_bits[0] = r_symndx >> RELOC_BITS0_SYMNDX_SH_LEFT_LITTLE;
-      ext->r_bits[1] = r_symndx >> RELOC_BITS1_SYMNDX_SH_LEFT_LITTLE;
-      ext->r_bits[2] = r_symndx >> RELOC_BITS2_SYMNDX_SH_LEFT_LITTLE;
-      ext->r_bits[3] = (((intern->r_type << RELOC_BITS3_TYPE_SH_LITTLE)
-			 & RELOC_BITS3_TYPE_LITTLE)
-			| ((intern->r_type >> RELOC_BITS3_TYPEHI_SH_LITTLE
-			    & RELOC_BITS3_TYPEHI_LITTLE))
-			| (intern->r_extern ? RELOC_BITS3_EXTERN_LITTLE : 0));
-    }
-}
-
-/* Finish canonicalizing a reloc.  Part of this is generic to all
-   ECOFF targets, and that part is in ecoff.c.  The rest is done in
-   this backend routine.  It must fill in the howto field.  */
-
-static void
-mips_adjust_reloc_in (abfd, intern, rptr)
-     bfd *abfd;
-     const struct internal_reloc *intern;
-     arelent *rptr;
-{
-  if (intern->r_type > MIPS_R_SWITCH)
-    abort ();
-
-  if (! intern->r_extern
-      && (intern->r_type == MIPS_R_GPREL
-	  || intern->r_type == MIPS_R_LITERAL))
-    rptr->addend += ecoff_data (abfd)->gp;
-
-  /* If the type is MIPS_R_IGNORE, make sure this is a reference to
-     the absolute section so that the reloc is ignored.  */
-  if (intern->r_type == MIPS_R_IGNORE)
-    rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-
-  /* If this is a MIPS_R_SWITCH reloc, or an internal MIPS_R_RELHI or
-     MIPS_R_RELLO reloc, we want the addend field of the BFD relocto
-     hold the value which was originally in the symndx field of the
-     internal MIPS ECOFF reloc.  This value was copied into
-     intern->r_offset by mips_swap_reloc_in, and here we copy it into
-     the addend field.  */
-  if (intern->r_type == MIPS_R_SWITCH
-      || (! intern->r_extern
-	  && (intern->r_type == MIPS_R_RELHI
-	      || intern->r_type == MIPS_R_RELLO)))
-    rptr->addend = intern->r_offset;
-
-  rptr->howto = &mips_howto_table[intern->r_type];
-}
-
-/* Make any adjustments needed to a reloc before writing it out.  None
-   are needed for MIPS.  */
-
-static void
-mips_adjust_reloc_out (abfd, rel, intern)
-     bfd *abfd;
-     const arelent *rel;
-     struct internal_reloc *intern;
-{
-  /* For a MIPS_R_SWITCH reloc, or an internal MIPS_R_RELHI or
-     MIPS_R_RELLO reloc, we must copy rel->addend into
-     intern->r_offset.  This will then be written out as the symbol
-     index by mips_ecoff_swap_reloc_out.  This operation parallels the
-     action of mips_adjust_reloc_in.  */
-  if (intern->r_type == MIPS_R_SWITCH
-      || (! intern->r_extern
-	  && (intern->r_type == MIPS_R_RELHI
-	      || intern->r_type == MIPS_R_RELLO)))
-    intern->r_offset = rel->addend;
-}
-
-/* ECOFF relocs are either against external symbols, or against
-   sections.  If we are producing relocateable output, and the reloc
-   is against an external symbol, and nothing has given us any
-   additional addend, the resulting reloc will also be against the
-   same symbol.  In such a case, we don't want to change anything
-   about the way the reloc is handled, since it will all be done at
-   final link time.  Rather than put special case code into
-   bfd_perform_relocation, all the reloc types use this howto
-   function.  It just short circuits the reloc if producing
-   relocateable output against an external symbol.  */
-
-static bfd_reloc_status_type
-mips_generic_reloc (abfd,
-		    reloc_entry,
-		    symbol,
-		    data,
-		    input_section,
-		    output_bfd,
-		    error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  return bfd_reloc_continue;
-}
-
-/* Do a REFHI relocation.  This has to be done in combination with a
-   REFLO reloc, because there is a carry from the REFLO to the REFHI.
-   Here we just save the information we need; we do the actual
-   relocation when we see the REFLO.  MIPS ECOFF requires that the
-   REFLO immediately follow the REFHI.  As a GNU extension, we permit
-   an arbitrary number of HI relocs to be associated with a single LO
-   reloc.  This extension permits gcc to output the HI and LO relocs
-   itself.  */
-
-struct mips_hi
-{
-  struct mips_hi *next;
-  bfd_byte *addr;
-  bfd_vma addend;
-};
-
-/* FIXME: This should not be a static variable.  */
-
-static struct mips_hi *mips_refhi_list;
-
-static bfd_reloc_status_type
-mips_refhi_reloc (abfd,
-		  reloc_entry,
-		  symbol,
-		  data,
-		  input_section,
-		  output_bfd,
-		  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_reloc_status_type ret;
-  bfd_vma relocation;
-  struct mips_hi *n;
-
-  /* If we're relocating, and this an external symbol, we don't want
-     to change anything.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  ret = bfd_reloc_ok;
-  if (bfd_is_und_section (symbol->section)
-      && output_bfd == (bfd *) NULL)
-    ret = bfd_reloc_undefined;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Save the information, and let REFLO do the actual relocation.  */
-  n = (struct mips_hi *) bfd_malloc (sizeof *n);
-  if (n == NULL)
-    return bfd_reloc_outofrange;
-  n->addr = (bfd_byte *) data + reloc_entry->address;
-  n->addend = relocation;
-  n->next = mips_refhi_list;
-  mips_refhi_list = n;
-
-  if (output_bfd != (bfd *) NULL)
-    reloc_entry->address += input_section->output_offset;
-
-  return ret;
-}
-
-/* Do a REFLO relocation.  This is a straightforward 16 bit inplace
-   relocation; this function exists in order to do the REFHI
-   relocation described above.  */
-
-static bfd_reloc_status_type
-mips_reflo_reloc (abfd,
-		  reloc_entry,
-		  symbol,
-		  data,
-		  input_section,
-		  output_bfd,
-		  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (mips_refhi_list != NULL)
-    {
-      struct mips_hi *l;
-
-      l = mips_refhi_list;
-      while (l != NULL)
-	{
-	  unsigned long insn;
-	  unsigned long val;
-	  unsigned long vallo;
-	  struct mips_hi *next;
-
-	  /* Do the REFHI relocation.  Note that we actually don't
-	     need to know anything about the REFLO itself, except
-	     where to find the low 16 bits of the addend needed by the
-	     REFHI.  */
-	  insn = bfd_get_32 (abfd, l->addr);
-	  vallo = (bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address)
-		   & 0xffff);
-	  val = ((insn & 0xffff) << 16) + vallo;
-	  val += l->addend;
-
-	  /* The low order 16 bits are always treated as a signed
-	     value.  Therefore, a negative value in the low order bits
-	     requires an adjustment in the high order bits.  We need
-	     to make this adjustment in two ways: once for the bits we
-	     took from the data, and once for the bits we are putting
-	     back in to the data.  */
-	  if ((vallo & 0x8000) != 0)
-	    val -= 0x10000;
-	  if ((val & 0x8000) != 0)
-	    val += 0x10000;
-
-	  insn = (insn &~ 0xffff) | ((val >> 16) & 0xffff);
-	  bfd_put_32 (abfd, insn, l->addr);
-
-	  next = l->next;
-	  free (l);
-	  l = next;
-	}
-
-      mips_refhi_list = NULL;
-    }
-
-  /* Now do the REFLO reloc in the usual way.  */
-  return mips_generic_reloc (abfd, reloc_entry, symbol, data,
-			      input_section, output_bfd, error_message);
-}
-
-/* Do a GPREL relocation.  This is a 16 bit value which must become
-   the offset from the gp register.  */
-
-static bfd_reloc_status_type
-mips_gprel_reloc (abfd,
-		  reloc_entry,
-		  symbol,
-		  data,
-		  input_section,
-		  output_bfd,
-		  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  boolean relocateable;
-  bfd_vma gp;
-  bfd_vma relocation;
-  unsigned long val;
-  unsigned long insn;
-
-  /* If we're relocating, and this is an external symbol with no
-     addend, we don't want to change anything.  We will only have an
-     addend if this is a newly created reloc, not read from an ECOFF
-     file.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != (bfd *) NULL)
-    relocateable = true;
-  else
-    {
-      relocateable = false;
-      output_bfd = symbol->section->output_section->owner;
-    }
-
-  if (bfd_is_und_section (symbol->section)
-      && relocateable == false)
-    return bfd_reloc_undefined;
-
-  /* We have to figure out the gp value, so that we can adjust the
-     symbol value correctly.  We look up the symbol _gp in the output
-     BFD.  If we can't find it, we're stuck.  We cache it in the ECOFF
-     target data.  We don't need to adjust the symbol value for an
-     external symbol if we are producing relocateable output.  */
-  gp = _bfd_get_gp_value (output_bfd);
-  if (gp == 0
-      && (relocateable == false
-	  || (symbol->flags & BSF_SECTION_SYM) != 0))
-    {
-      if (relocateable != false)
-	{
-	  /* Make up a value.  */
-	  gp = symbol->section->output_section->vma + 0x4000;
-	  _bfd_set_gp_value (output_bfd, gp);
-	}
-      else
-	{
-	  unsigned int count;
-	  asymbol **sym;
-	  unsigned int i;
-
-	  count = bfd_get_symcount (output_bfd);
-	  sym = bfd_get_outsymbols (output_bfd);
-
-	  if (sym == (asymbol **) NULL)
-	    i = count;
-	  else
-	    {
-	      for (i = 0; i < count; i++, sym++)
-		{
-		  register CONST char *name;
-
-		  name = bfd_asymbol_name (*sym);
-		  if (*name == '_' && strcmp (name, "_gp") == 0)
-		    {
-		      gp = bfd_asymbol_value (*sym);
-		      _bfd_set_gp_value (output_bfd, gp);
-		      break;
-		    }
-		}
-	    }
-
-	  if (i >= count)
-	    {
-	      /* Only get the error once.  */
-	      gp = 4;
-	      _bfd_set_gp_value (output_bfd, gp);
-	      *error_message =
-		(char *) _("GP relative relocation when _gp not defined");
-	      return bfd_reloc_dangerous;
-	    }
-	}
-    }
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
-
-  /* Set val to the offset into the section or symbol.  */
-  val = ((insn & 0xffff) + reloc_entry->addend) & 0xffff;
-  if (val & 0x8000)
-    val -= 0x10000;
-
-  /* Adjust val for the final section location and GP value.  If we
-     are producing relocateable output, we don't want to do this for
-     an external symbol.  */
-  if (relocateable == false
-      || (symbol->flags & BSF_SECTION_SYM) != 0)
-    val += relocation - gp;
-
-  insn = (insn &~ 0xffff) | (val & 0xffff);
-  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
-
-  if (relocateable != false)
-    reloc_entry->address += input_section->output_offset;
-
-  /* Make sure it fit in 16 bits.  */
-  if (val >= 0x8000 && val < 0xffff8000)
-    return bfd_reloc_overflow;
-
-  return bfd_reloc_ok;
-}
-
-/* Do a RELHI relocation.  We do this in conjunction with a RELLO
-   reloc, just as REFHI and REFLO are done together.  RELHI and RELLO
-   are Cygnus extensions used when generating position independent
-   code for embedded systems.  */
-
-/* FIXME: This should not be a static variable.  */
-
-static struct mips_hi *mips_relhi_list;
-
-static bfd_reloc_status_type
-mips_relhi_reloc (abfd,
-		  reloc_entry,
-		  symbol,
-		  data,
-		  input_section,
-		  output_bfd,
-		  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_reloc_status_type ret;
-  bfd_vma relocation;
-  struct mips_hi *n;
-
-  /* If this is a reloc against a section symbol, then it is correct
-     in the object file.  The only time we want to change this case is
-     when we are relaxing, and that is handled entirely by
-     mips_relocate_section and never calls this function.  */
-  if ((symbol->flags & BSF_SECTION_SYM) != 0)
-    {
-      if (output_bfd != (bfd *) NULL)
-	reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* This is an external symbol.  If we're relocating, we don't want
-     to change anything.  */
-  if (output_bfd != (bfd *) NULL)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  ret = bfd_reloc_ok;
-  if (bfd_is_und_section (symbol->section)
-      && output_bfd == (bfd *) NULL)
-    ret = bfd_reloc_undefined;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Save the information, and let RELLO do the actual relocation.  */
-  n = (struct mips_hi *) bfd_malloc (sizeof *n);
-  if (n == NULL)
-    return bfd_reloc_outofrange;
-  n->addr = (bfd_byte *) data + reloc_entry->address;
-  n->addend = relocation;
-  n->next = mips_relhi_list;
-  mips_relhi_list = n;
-
-  if (output_bfd != (bfd *) NULL)
-    reloc_entry->address += input_section->output_offset;
-
-  return ret;
-}
-
-/* Do a RELLO relocation.  This is a straightforward 16 bit PC
-   relative relocation; this function exists in order to do the RELHI
-   relocation described above.  */
-
-static bfd_reloc_status_type
-mips_rello_reloc (abfd,
-		  reloc_entry,
-		  symbol,
-		  data,
-		  input_section,
-		  output_bfd,
-		  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (mips_relhi_list != NULL)
-    {
-      struct mips_hi *l;
-
-      l = mips_relhi_list;
-      while (l != NULL)
-	{
-	  unsigned long insn;
-	  unsigned long val;
-	  unsigned long vallo;
-	  struct mips_hi *next;
-
-	  /* Do the RELHI relocation.  Note that we actually don't
-	     need to know anything about the RELLO itself, except
-	     where to find the low 16 bits of the addend needed by the
-	     RELHI.  */
-	  insn = bfd_get_32 (abfd, l->addr);
-	  vallo = (bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address)
-		   & 0xffff);
-	  val = ((insn & 0xffff) << 16) + vallo;
-	  val += l->addend;
-
-	  /* If the symbol is defined, make val PC relative.  If the
-	     symbol is not defined we don't want to do this, because
-	     we don't want the value in the object file to incorporate
-	     the address of the reloc.  */
-	  if (! bfd_is_und_section (bfd_get_section (symbol))
-	      && ! bfd_is_com_section (bfd_get_section (symbol)))
-	    val -= (input_section->output_section->vma
-		    + input_section->output_offset
-		    + reloc_entry->address);
-
-	  /* The low order 16 bits are always treated as a signed
-	     value.  Therefore, a negative value in the low order bits
-	     requires an adjustment in the high order bits.  We need
-	     to make this adjustment in two ways: once for the bits we
-	     took from the data, and once for the bits we are putting
-	     back in to the data.  */
-	  if ((vallo & 0x8000) != 0)
-	    val -= 0x10000;
-	  if ((val & 0x8000) != 0)
-	    val += 0x10000;
-
-	  insn = (insn &~ 0xffff) | ((val >> 16) & 0xffff);
-	  bfd_put_32 (abfd, insn, l->addr);
-
-	  next = l->next;
-	  free (l);
-	  l = next;
-	}
-
-      mips_relhi_list = NULL;
-    }
-
-  /* If this is a reloc against a section symbol, then it is correct
-     in the object file.  The only time we want to change this case is
-     when we are relaxing, and that is handled entirely by
-     mips_relocate_section and never calls this function.  */
-  if ((symbol->flags & BSF_SECTION_SYM) != 0)
-    {
-      if (output_bfd != (bfd *) NULL)
-	reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* bfd_perform_relocation does not handle pcrel_offset relocations
-     correctly when generating a relocateable file, so handle them
-     directly here.  */
-  if (output_bfd != (bfd *) NULL)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* Now do the RELLO reloc in the usual way.  */
-  return mips_generic_reloc (abfd, reloc_entry, symbol, data,
-			      input_section, output_bfd, error_message);
-}
-
-/* This is the special function for the MIPS_R_SWITCH reloc.  This
-   special reloc is normally correct in the object file, and only
-   requires special handling when relaxing.  We don't want
-   bfd_perform_relocation to tamper with it at all.  */
-
-/*ARGSUSED*/
-static bfd_reloc_status_type
-mips_switch_reloc (abfd,
-		   reloc_entry,
-		   symbol,
-		   data,
-		   input_section,
-		   output_bfd,
-		   error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return bfd_reloc_ok;
-}
-
-/* Get the howto structure for a generic reloc type.  */
-
-static reloc_howto_type *
-mips_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  int mips_type;
-
-  switch (code)
-    {
-    case BFD_RELOC_16:
-      mips_type = MIPS_R_REFHALF;
-      break;
-    case BFD_RELOC_32:
-    case BFD_RELOC_CTOR:
-      mips_type = MIPS_R_REFWORD;
-      break;
-    case BFD_RELOC_MIPS_JMP:
-      mips_type = MIPS_R_JMPADDR;
-      break;
-    case BFD_RELOC_HI16_S:
-      mips_type = MIPS_R_REFHI;
-      break;
-    case BFD_RELOC_LO16:
-      mips_type = MIPS_R_REFLO;
-      break;
-    case BFD_RELOC_MIPS_GPREL:
-      mips_type = MIPS_R_GPREL;
-      break;
-    case BFD_RELOC_MIPS_LITERAL:
-      mips_type = MIPS_R_LITERAL;
-      break;
-    case BFD_RELOC_16_PCREL_S2:
-      mips_type = MIPS_R_PCREL16;
-      break;
-    case BFD_RELOC_PCREL_HI16_S:
-      mips_type = MIPS_R_RELHI;
-      break;
-    case BFD_RELOC_PCREL_LO16:
-      mips_type = MIPS_R_RELLO;
-      break;
-    case BFD_RELOC_GPREL32:
-      mips_type = MIPS_R_SWITCH;
-      break;
-    default:
-      return (reloc_howto_type *) NULL;
-    }
-
-  return &mips_howto_table[mips_type];
-}
-
-/* A helper routine for mips_relocate_section which handles the REFHI
-   and RELHI relocations.  The REFHI relocation must be followed by a
-   REFLO relocation (and RELHI by a RELLO), and the addend used is
-   formed from the addends of both instructions.  */
-
-static void
-mips_relocate_hi (refhi, reflo, input_bfd, input_section, contents, adjust,
-		  relocation, pcrel)
-     struct internal_reloc *refhi;
-     struct internal_reloc *reflo;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     size_t adjust;
-     bfd_vma relocation;
-     boolean pcrel;
-{
-  unsigned long insn;
-  unsigned long val;
-  unsigned long vallo;
-
-  if (refhi == NULL)
-    return;
-  
-  insn = bfd_get_32 (input_bfd,
-		     contents + adjust + refhi->r_vaddr - input_section->vma);
-  if (reflo == NULL)
-    vallo = 0;
-  else
-    vallo = (bfd_get_32 (input_bfd,
-			 contents + adjust + reflo->r_vaddr - input_section->vma)
-	     & 0xffff);
- 
-  val = ((insn & 0xffff) << 16) + vallo;
-  val += relocation;
-
-  /* The low order 16 bits are always treated as a signed value.
-     Therefore, a negative value in the low order bits requires an
-     adjustment in the high order bits.  We need to make this
-     adjustment in two ways: once for the bits we took from the data,
-     and once for the bits we are putting back in to the data.  */
-  if ((vallo & 0x8000) != 0)
-    val -= 0x10000;
-
-  if (pcrel)
-    val -= (input_section->output_section->vma
-	    + input_section->output_offset
-	    + (reflo->r_vaddr - input_section->vma + adjust));
-
-  if ((val & 0x8000) != 0)
-    val += 0x10000;
-
-  insn = (insn &~ 0xffff) | ((val >> 16) & 0xffff);
-  bfd_put_32 (input_bfd, (bfd_vma) insn,
-	      contents + adjust + refhi->r_vaddr - input_section->vma);
-}
-
-/* Relocate a section while linking a MIPS ECOFF file.  */
-
-static boolean
-mips_relocate_section (output_bfd, info, input_bfd, input_section,
-		       contents, external_relocs)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     PTR external_relocs;
-{
-  asection **symndx_to_section;
-  struct ecoff_link_hash_entry **sym_hashes;
-  bfd_vma gp;
-  boolean gp_undefined;
-  size_t adjust;
-  long *offsets;
-  struct external_reloc *ext_rel;
-  struct external_reloc *ext_rel_end;
-  unsigned int i;
-  boolean got_lo;
-  struct internal_reloc lo_int_rel;
-
-  BFD_ASSERT (input_bfd->xvec->byteorder
-	      == output_bfd->xvec->byteorder);
-
-  /* We keep a table mapping the symndx found in an internal reloc to
-     the appropriate section.  This is faster than looking up the
-     section by name each time.  */
-  symndx_to_section = ecoff_data (input_bfd)->symndx_to_section;
-  if (symndx_to_section == (asection **) NULL)
-    {
-      symndx_to_section = ((asection **)
-			   bfd_alloc (input_bfd,
-				      (NUM_RELOC_SECTIONS
-				       * sizeof (asection *))));
-      if (!symndx_to_section)
-	return false;
-
-      symndx_to_section[RELOC_SECTION_NONE] = NULL;
-      symndx_to_section[RELOC_SECTION_TEXT] =
-	bfd_get_section_by_name (input_bfd, ".text");
-      symndx_to_section[RELOC_SECTION_RDATA] =
-	bfd_get_section_by_name (input_bfd, ".rdata");
-      symndx_to_section[RELOC_SECTION_DATA] =
-	bfd_get_section_by_name (input_bfd, ".data");
-      symndx_to_section[RELOC_SECTION_SDATA] =
-	bfd_get_section_by_name (input_bfd, ".sdata");
-      symndx_to_section[RELOC_SECTION_SBSS] =
-	bfd_get_section_by_name (input_bfd, ".sbss");
-      symndx_to_section[RELOC_SECTION_BSS] =
-	bfd_get_section_by_name (input_bfd, ".bss");
-      symndx_to_section[RELOC_SECTION_INIT] =
-	bfd_get_section_by_name (input_bfd, ".init");
-      symndx_to_section[RELOC_SECTION_LIT8] =
-	bfd_get_section_by_name (input_bfd, ".lit8");
-      symndx_to_section[RELOC_SECTION_LIT4] =
-	bfd_get_section_by_name (input_bfd, ".lit4");
-      symndx_to_section[RELOC_SECTION_XDATA] = NULL;
-      symndx_to_section[RELOC_SECTION_PDATA] = NULL;
-      symndx_to_section[RELOC_SECTION_FINI] =
-	bfd_get_section_by_name (input_bfd, ".fini");
-      symndx_to_section[RELOC_SECTION_LITA] = NULL;
-      symndx_to_section[RELOC_SECTION_ABS] = NULL;
-
-      ecoff_data (input_bfd)->symndx_to_section = symndx_to_section;
-    }
-
-  sym_hashes = ecoff_data (input_bfd)->sym_hashes;
-
-  gp = _bfd_get_gp_value (output_bfd);
-  if (gp == 0)
-    gp_undefined = true;
-  else
-    gp_undefined = false;
-
-  got_lo = false;
-
-  adjust = 0;
-
-  if (ecoff_section_data (input_bfd, input_section) == NULL)
-    offsets = NULL;
-  else
-    offsets = ecoff_section_data (input_bfd, input_section)->offsets;
-
-  ext_rel = (struct external_reloc *) external_relocs;
-  ext_rel_end = ext_rel + input_section->reloc_count;
-  for (i = 0; ext_rel < ext_rel_end; ext_rel++, i++)
-    {
-      struct internal_reloc int_rel;
-      boolean use_lo = false;
-      bfd_vma addend;
-      reloc_howto_type *howto;
-      struct ecoff_link_hash_entry *h = NULL;
-      asection *s = NULL;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      if (! got_lo)
-	mips_ecoff_swap_reloc_in (input_bfd, (PTR) ext_rel, &int_rel);
-      else
-	{
-	  int_rel = lo_int_rel;
-	  got_lo = false;
-	}
-
-      BFD_ASSERT (int_rel.r_type
-		  < sizeof mips_howto_table / sizeof mips_howto_table[0]);
-
-      /* The REFHI and RELHI relocs requires special handling.  they
-	 must be followed by a REFLO or RELLO reloc, respectively, and
-	 the addend is formed from both relocs.  */
-      if (int_rel.r_type == MIPS_R_REFHI
-	  || int_rel.r_type == MIPS_R_RELHI)
-	{
-	  struct external_reloc *lo_ext_rel;
-
-	  /* As a GNU extension, permit an arbitrary number of REFHI
-             or RELHI relocs before the REFLO or RELLO reloc.  This
-             permits gcc to emit the HI and LO relocs itself.  */
-	  for (lo_ext_rel = ext_rel + 1;
-	       lo_ext_rel < ext_rel_end;
-	       lo_ext_rel++)
-	    {
-	      mips_ecoff_swap_reloc_in (input_bfd, (PTR) lo_ext_rel,
-					&lo_int_rel);
-	      if (lo_int_rel.r_type != int_rel.r_type)
-		break;
-	    }
-
-	  if (lo_ext_rel < ext_rel_end
-	      && (lo_int_rel.r_type
-		  == (int_rel.r_type == MIPS_R_REFHI
-		      ? MIPS_R_REFLO
-		      : MIPS_R_RELLO))
-	      && int_rel.r_extern == lo_int_rel.r_extern
-	      && int_rel.r_symndx == lo_int_rel.r_symndx)
-	    {
-	      use_lo = true;
-	      if (lo_ext_rel == ext_rel + 1)
-		got_lo = true;
-	    }
-	}
-
-      howto = &mips_howto_table[int_rel.r_type];
-
-      /* The SWITCH reloc must be handled specially.  This reloc is
-	 marks the location of a difference between two portions of an
-	 object file.  The symbol index does not reference a symbol,
-	 but is actually the offset from the reloc to the subtrahend
-	 of the difference.  This reloc is correct in the object file,
-	 and needs no further adjustment, unless we are relaxing.  If
-	 we are relaxing, we may have to add in an offset.  Since no
-	 symbols are involved in this reloc, we handle it completely
-	 here.  */
-      if (int_rel.r_type == MIPS_R_SWITCH)
-	{
-	  if (offsets != NULL
-	      && offsets[i] != 0)
-	    {
-	      r = _bfd_relocate_contents (howto, input_bfd,
-					  (bfd_vma) offsets[i],
-					  (contents
-					   + adjust
-					   + int_rel.r_vaddr
-					   - input_section->vma));
-	      BFD_ASSERT (r == bfd_reloc_ok);
-	    }
-
-	  continue;
-	}
-
-      if (int_rel.r_extern)
-	{
-	  h = sym_hashes[int_rel.r_symndx];
-	  /* If h is NULL, that means that there is a reloc against an
-	     external symbol which we thought was just a debugging
-	     symbol.  This should not happen.  */
-	  if (h == (struct ecoff_link_hash_entry *) NULL)
-	    abort ();
-	}
-      else
-	{
-	  if (int_rel.r_symndx < 0 || int_rel.r_symndx >= NUM_RELOC_SECTIONS)
-	    s = NULL;
-	  else
-	    s = symndx_to_section[int_rel.r_symndx];
-
-	  if (s == (asection *) NULL)
-	    abort ();
-	}
-
-      /* The GPREL reloc uses an addend: the difference in the GP
-	 values.  */
-      if (int_rel.r_type != MIPS_R_GPREL
-	  && int_rel.r_type != MIPS_R_LITERAL)
-	addend = 0;
-      else
-	{
-	  if (gp_undefined)
-	    {
-	      if (! ((*info->callbacks->reloc_dangerous)
-		     (info, _("GP relative relocation when GP not defined"),
-		      input_bfd, input_section,
-		      int_rel.r_vaddr - input_section->vma)))
-		return false;
-	      /* Only give the error once per link.  */
-	      gp = 4;
-	      _bfd_set_gp_value (output_bfd, gp);
-	      gp_undefined = false;
-	    }
-	  if (! int_rel.r_extern)
-	    {
-	      /* This is a relocation against a section.  The current
-		 addend in the instruction is the difference between
-		 INPUT_SECTION->vma and the GP value of INPUT_BFD.  We
-		 must change this to be the difference between the
-		 final definition (which will end up in RELOCATION)
-		 and the GP value of OUTPUT_BFD (which is in GP).  */
-	      addend = ecoff_data (input_bfd)->gp - gp;
-	    }
-	  else if (! info->relocateable
-		   || h->root.type == bfd_link_hash_defined
-		   || h->root.type == bfd_link_hash_defweak)
-	    {
-	      /* This is a relocation against a defined symbol.  The
-		 current addend in the instruction is simply the
-		 desired offset into the symbol (normally zero).  We
-		 are going to change this into a relocation against a
-		 defined symbol, so we want the instruction to hold
-		 the difference between the final definition of the
-		 symbol (which will end up in RELOCATION) and the GP
-		 value of OUTPUT_BFD (which is in GP).  */
-	      addend = - gp;
-	    }
-	  else
-	    {
-	      /* This is a relocation against an undefined or common
-		 symbol.  The current addend in the instruction is
-		 simply the desired offset into the symbol (normally
-		 zero).  We are generating relocateable output, and we
-		 aren't going to define this symbol, so we just leave
-		 the instruction alone.  */
-	      addend = 0;
-	    }
-	}
-
-      /* If we are relaxing, mips_relax_section may have set
-	 offsets[i] to some value.  A value of 1 means we must expand
-	 a PC relative branch into a multi-instruction of sequence,
-	 and any other value is an addend.  */
-      if (offsets != NULL
-	  && offsets[i] != 0)
-	{
-	  BFD_ASSERT (! info->relocateable);
-	  BFD_ASSERT (int_rel.r_type == MIPS_R_PCREL16
-		      || int_rel.r_type == MIPS_R_RELHI
-		      || int_rel.r_type == MIPS_R_RELLO);
-	  if (offsets[i] != 1)
-	    addend += offsets[i];
-	  else
-	    {
-	      bfd_byte *here;
-
-	      BFD_ASSERT (int_rel.r_extern
-			  && int_rel.r_type == MIPS_R_PCREL16);
-
-	      /* Move the rest of the instructions up.  */
-	      here = (contents
-		      + adjust
-		      + int_rel.r_vaddr
-		      - input_section->vma);
-	      memmove (here + PCREL16_EXPANSION_ADJUSTMENT, here,
-		       (size_t) (input_section->_raw_size
-				 - (int_rel.r_vaddr - input_section->vma)));
-		       
-	      /* Generate the new instructions.  */
-	      if (! mips_relax_pcrel16 (info, input_bfd, input_section,
-					h, here,
-					(input_section->output_section->vma
-					 + input_section->output_offset
-					 + (int_rel.r_vaddr
-					    - input_section->vma)
-					 + adjust)))
-		return false;
-
-	      /* We must adjust everything else up a notch.  */
-	      adjust += PCREL16_EXPANSION_ADJUSTMENT;
-
-	      /* mips_relax_pcrel16 handles all the details of this
-		 relocation.  */
-	      continue;
-	    }
-	}
-
-      /* If we are relaxing, and this is a reloc against the .text
-	 segment, we may need to adjust it if some branches have been
-	 expanded.  The reloc types which are likely to occur in the
-	 .text section are handled efficiently by mips_relax_section,
-	 and thus do not need to be handled here.  */
-      if (ecoff_data (input_bfd)->debug_info.adjust != NULL
-	  && ! int_rel.r_extern
-	  && int_rel.r_symndx == RELOC_SECTION_TEXT
-	  && (strcmp (bfd_get_section_name (input_bfd, input_section),
-		      ".text") != 0
-	      || (int_rel.r_type != MIPS_R_PCREL16
-		  && int_rel.r_type != MIPS_R_SWITCH
-		  && int_rel.r_type != MIPS_R_RELHI
-		  && int_rel.r_type != MIPS_R_RELLO)))
-	{
-	  bfd_vma adr;
-	  struct ecoff_value_adjust *a;
-
-	  /* We need to get the addend so that we know whether we need
-	     to adjust the address.  */
-	  BFD_ASSERT (int_rel.r_type == MIPS_R_REFWORD);
-
-	  adr = bfd_get_32 (input_bfd,
-			    (contents
-			     + adjust
-			     + int_rel.r_vaddr
-			     - input_section->vma));
-
-	  for (a = ecoff_data (input_bfd)->debug_info.adjust;
-	       a != (struct ecoff_value_adjust *) NULL;
-	       a = a->next)
-	    {
-	      if (adr >= a->start && adr < a->end)
-		addend += a->adjust;
-	    }
-	}
-
-      if (info->relocateable)
-	{
-	  /* We are generating relocateable output, and must convert
-	     the existing reloc.  */
-	  if (int_rel.r_extern)
-	    {
-	      if ((h->root.type == bfd_link_hash_defined
-		   || h->root.type == bfd_link_hash_defweak)
-		  && ! bfd_is_abs_section (h->root.u.def.section))
-		{
-		  const char *name;
-
-		  /* This symbol is defined in the output.  Convert
-		     the reloc from being against the symbol to being
-		     against the section.  */
-
-		  /* Clear the r_extern bit.  */
-		  int_rel.r_extern = 0;
-
-		  /* Compute a new r_symndx value.  */
-		  s = h->root.u.def.section;
-		  name = bfd_get_section_name (output_bfd,
-					       s->output_section);
-
-		  int_rel.r_symndx = -1;
-		  switch (name[1])
-		    {
-		    case 'b':
-		      if (strcmp (name, ".bss") == 0)
-			int_rel.r_symndx = RELOC_SECTION_BSS;
-		      break;
-		    case 'd':
-		      if (strcmp (name, ".data") == 0)
-			int_rel.r_symndx = RELOC_SECTION_DATA;
-		      break;
-		    case 'f':
-		      if (strcmp (name, ".fini") == 0)
-			int_rel.r_symndx = RELOC_SECTION_FINI;
-		      break;
-		    case 'i':
-		      if (strcmp (name, ".init") == 0)
-			int_rel.r_symndx = RELOC_SECTION_INIT;
-		      break;
-		    case 'l':
-		      if (strcmp (name, ".lit8") == 0)
-			int_rel.r_symndx = RELOC_SECTION_LIT8;
-		      else if (strcmp (name, ".lit4") == 0)
-			int_rel.r_symndx = RELOC_SECTION_LIT4;
-		      break;
-		    case 'r':
-		      if (strcmp (name, ".rdata") == 0)
-			int_rel.r_symndx = RELOC_SECTION_RDATA;
-		      break;
-		    case 's':
-		      if (strcmp (name, ".sdata") == 0)
-			int_rel.r_symndx = RELOC_SECTION_SDATA;
-		      else if (strcmp (name, ".sbss") == 0)
-			int_rel.r_symndx = RELOC_SECTION_SBSS;
-		      break;
-		    case 't':
-		      if (strcmp (name, ".text") == 0)
-			int_rel.r_symndx = RELOC_SECTION_TEXT;
-		      break;
-		    }
-		      
-		  if (int_rel.r_symndx == -1)
-		    abort ();
-
-		  /* Add the section VMA and the symbol value.  */
-		  relocation = (h->root.u.def.value
-				+ s->output_section->vma
-				+ s->output_offset);
-
-		  /* For a PC relative relocation, the object file
-		     currently holds just the addend.  We must adjust
-		     by the address to get the right value.  */
-		  if (howto->pc_relative)
-		    {
-		      relocation -= int_rel.r_vaddr - input_section->vma;
-
-		      /* If we are converting a RELHI or RELLO reloc
-			 from being against an external symbol to
-			 being against a section, we must put a
-			 special value into the r_offset field.  This
-			 value is the old addend.  The r_offset for
-			 both the RELHI and RELLO relocs are the same,
-			 and we set both when we see RELHI.  */
-		      if (int_rel.r_type == MIPS_R_RELHI)
-			{
-			  long addhi, addlo;
-
-			  addhi = bfd_get_32 (input_bfd,
-					      (contents
-					       + adjust
-					       + int_rel.r_vaddr
-					       - input_section->vma));
-			  addhi &= 0xffff;
-			  if (addhi & 0x8000)
-			    addhi -= 0x10000;
-			  addhi <<= 16;
-
-			  if (! use_lo)
-			    addlo = 0;
-			  else
-			    {
-			      addlo = bfd_get_32 (input_bfd,
-						  (contents
-						   + adjust
-						   + lo_int_rel.r_vaddr
-						   - input_section->vma));
-			      addlo &= 0xffff;
-			      if (addlo & 0x8000)
-				addlo -= 0x10000;
-
-			      lo_int_rel.r_offset = addhi + addlo;
-			    }
-
-			  int_rel.r_offset = addhi + addlo;
-			}
-		    }
-
-		  h = NULL;
-		}
-	      else
-		{
-		  /* Change the symndx value to the right one for the
-		     output BFD.  */
-		  int_rel.r_symndx = h->indx;
-		  if (int_rel.r_symndx == -1)
-		    {
-		      /* This symbol is not being written out.  */
-		      if (! ((*info->callbacks->unattached_reloc)
-			     (info, h->root.root.string, input_bfd,
-			      input_section,
-			      int_rel.r_vaddr - input_section->vma)))
-			return false;
-		      int_rel.r_symndx = 0;
-		    }
-		  relocation = 0;
-		}
-	    }
-	  else
-	    {
-	      /* This is a relocation against a section.  Adjust the
-		 value by the amount the section moved.  */
-	      relocation = (s->output_section->vma
-			    + s->output_offset
-			    - s->vma);
-	    }
-
-	  relocation += addend;
-	  addend = 0;
-
-	  /* Adjust a PC relative relocation by removing the reference
-	     to the original address in the section and including the
-	     reference to the new address.  However, external RELHI
-	     and RELLO relocs are PC relative, but don't include any
-	     reference to the address.  The addend is merely an
-	     addend.  */
-	  if (howto->pc_relative
-	      && (! int_rel.r_extern
-		  || (int_rel.r_type != MIPS_R_RELHI
-		      && int_rel.r_type != MIPS_R_RELLO)))
-	    relocation -= (input_section->output_section->vma
-			   + input_section->output_offset
-			   - input_section->vma);
-
-	  /* Adjust the contents.  */
-	  if (relocation == 0)
-	    r = bfd_reloc_ok;
-	  else
-	    {
-	      if (int_rel.r_type != MIPS_R_REFHI
-		  && int_rel.r_type != MIPS_R_RELHI)
-		r = _bfd_relocate_contents (howto, input_bfd, relocation,
-					    (contents
-					     + adjust
-					     + int_rel.r_vaddr
-					     - input_section->vma));
-	      else
-		{
-		  mips_relocate_hi (&int_rel,
-				    use_lo ? &lo_int_rel : NULL,
-				    input_bfd, input_section, contents,
-				    adjust, relocation,
-				    int_rel.r_type == MIPS_R_RELHI);
-		  r = bfd_reloc_ok;
-		}
-	    }
-
-	  /* Adjust the reloc address.  */
-	  int_rel.r_vaddr += (input_section->output_section->vma
-			      + input_section->output_offset
-			      - input_section->vma);
-
-	  /* Save the changed reloc information.  */
-	  mips_ecoff_swap_reloc_out (input_bfd, &int_rel, (PTR) ext_rel);
-	}
-      else
-	{
-	  /* We are producing a final executable.  */
-	  if (int_rel.r_extern)
-	    {
-	      /* This is a reloc against a symbol.  */
-	      if (h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak)
-		{
-		  asection *hsec;
-
-		  hsec = h->root.u.def.section;
-		  relocation = (h->root.u.def.value
-				+ hsec->output_section->vma
-				+ hsec->output_offset);
-		}
-	      else
-		{
-		  if (! ((*info->callbacks->undefined_symbol)
-			 (info, h->root.root.string, input_bfd,
-			  input_section,
-			  int_rel.r_vaddr - input_section->vma)))
-		    return false;
-		  relocation = 0;
-		}
-	    }
-	  else
-	    {
-	      /* This is a reloc against a section.  */
-	      relocation = (s->output_section->vma
-			    + s->output_offset
-			    - s->vma);
-
-	      /* A PC relative reloc is already correct in the object
-		 file.  Make it look like a pcrel_offset relocation by
-		 adding in the start address.  */
-	      if (howto->pc_relative)
-		{
-		  if (int_rel.r_type != MIPS_R_RELHI || ! use_lo)
-		    relocation += int_rel.r_vaddr + adjust;
-		  else
-		    relocation += lo_int_rel.r_vaddr + adjust;
-		}
-	    }
-
-	  if (int_rel.r_type != MIPS_R_REFHI
-	      && int_rel.r_type != MIPS_R_RELHI)
-	    r = _bfd_final_link_relocate (howto,
-					  input_bfd,
-					  input_section,
-					  contents,
-					  (int_rel.r_vaddr
-					   - input_section->vma
-					   + adjust),
-					  relocation,
-					  addend);
-	  else
-	    {
-	      mips_relocate_hi (&int_rel,
-				use_lo ? &lo_int_rel : NULL,
-				input_bfd, input_section, contents, adjust,
-				relocation,
-				int_rel.r_type == MIPS_R_RELHI);
-	      r = bfd_reloc_ok;
-	    }
-	}
-
-      /* MIPS_R_JMPADDR requires peculiar overflow detection.  The
-	 instruction provides a 28 bit address (the two lower bits are
-	 implicit zeroes) which is combined with the upper four bits
-	 of the instruction address.  */
-      if (r == bfd_reloc_ok
-	  && int_rel.r_type == MIPS_R_JMPADDR
-	  && (((relocation
-		+ addend
-		+ (int_rel.r_extern ? 0 : s->vma))
-	       & 0xf0000000)
-	      != ((input_section->output_section->vma
-		   + input_section->output_offset
-		   + (int_rel.r_vaddr - input_section->vma)
-		   + adjust)
-		  & 0xf0000000)))
-	r = bfd_reloc_overflow;
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (int_rel.r_extern)
-		  name = h->root.root.string;
-		else
-		  name = bfd_section_name (input_bfd, s);
-		if (! ((*info->callbacks->reloc_overflow)
-		       (info, name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section,
-			int_rel.r_vaddr - input_section->vma)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Read in the relocs for a section.  */
-
-static boolean
-mips_read_relocs (abfd, sec)
-     bfd *abfd;
-     asection *sec;
-{
-  struct ecoff_section_tdata *section_tdata;
-
-  section_tdata = ecoff_section_data (abfd, sec);
-  if (section_tdata == (struct ecoff_section_tdata *) NULL)
-    {
-      sec->used_by_bfd =
-	(PTR) bfd_alloc (abfd, sizeof (struct ecoff_section_tdata));
-      if (sec->used_by_bfd == NULL)
-	return false;
-
-      section_tdata = ecoff_section_data (abfd, sec);
-      section_tdata->external_relocs = NULL;
-      section_tdata->contents = NULL;
-      section_tdata->offsets = NULL;
-    }
-
-  if (section_tdata->external_relocs == NULL)
-    {
-      bfd_size_type external_relocs_size;
-
-      external_relocs_size = (ecoff_backend (abfd)->external_reloc_size
-			      * sec->reloc_count);
-
-      section_tdata->external_relocs =
-	(PTR) bfd_alloc (abfd, external_relocs_size);
-      if (section_tdata->external_relocs == NULL && external_relocs_size != 0)
-	return false;
-
-      if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
-	  || (bfd_read (section_tdata->external_relocs, 1,
-			external_relocs_size, abfd)
-	      != external_relocs_size))
-	return false;
-    }
-
-  return true;
-}
-
-/* Relax a section when linking a MIPS ECOFF file.  This is used for
-   embedded PIC code, which always uses PC relative branches which
-   only have an 18 bit range on MIPS.  If a branch is not in range, we
-   generate a long instruction sequence to compensate.  Each time we
-   find a branch to expand, we have to check all the others again to
-   make sure they are still in range.  This is slow, but it only has
-   to be done when -relax is passed to the linker.
-
-   This routine figures out which branches need to expand; the actual
-   expansion is done in mips_relocate_section when the section
-   contents are relocated.  The information is stored in the offsets
-   field of the ecoff_section_tdata structure.  An offset of 1 means
-   that the branch must be expanded into a multi-instruction PC
-   relative branch (such an offset will only occur for a PC relative
-   branch to an external symbol).  Any other offset must be a multiple
-   of four, and is the amount to change the branch by (such an offset
-   will only occur for a PC relative branch within the same section).
-
-   We do not modify the section relocs or contents themselves so that
-   if memory usage becomes an issue we can discard them and read them
-   again.  The only information we must save in memory between this
-   routine and the mips_relocate_section routine is the table of
-   offsets.  */
-
-static boolean
-mips_relax_section (abfd, sec, info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *info;
-     boolean *again;
-{
-  struct ecoff_section_tdata *section_tdata;
-  bfd_byte *contents = NULL;
-  long *offsets;
-  struct external_reloc *ext_rel;
-  struct external_reloc *ext_rel_end;
-  unsigned int i;
-
-  /* Assume we are not going to need another pass.  */
-  *again = false;
-
-  /* If we are not generating an ECOFF file, this is much too
-     confusing to deal with.  */
-  if (info->hash->creator->flavour != bfd_get_flavour (abfd))
-    return true;
-
-  /* If there are no relocs, there is nothing to do.  */
-  if (sec->reloc_count == 0)
-    return true;
-
-  /* We are only interested in PC relative relocs, and why would there
-     ever be one from anything but the .text section?  */
-  if (strcmp (bfd_get_section_name (abfd, sec), ".text") != 0)
-    return true;
-
-  /* Read in the relocs, if we haven't already got them.  */
-  section_tdata = ecoff_section_data (abfd, sec);
-  if (section_tdata == (struct ecoff_section_tdata *) NULL
-      || section_tdata->external_relocs == NULL)
-    {
-      if (! mips_read_relocs (abfd, sec))
-	goto error_return;
-      section_tdata = ecoff_section_data (abfd, sec);
-    }
-
-  if (sec->_cooked_size == 0)
-    {
-      /* We must initialize _cooked_size only the first time we are
-	 called.  */
-      sec->_cooked_size = sec->_raw_size;
-    }
-
-  contents = section_tdata->contents;
-  offsets = section_tdata->offsets;
-
-  /* Look for any external PC relative relocs.  Internal PC relative
-     relocs are already correct in the object file, so they certainly
-     can not overflow.  */
-  ext_rel = (struct external_reloc *) section_tdata->external_relocs;
-  ext_rel_end = ext_rel + sec->reloc_count;
-  for (i = 0; ext_rel < ext_rel_end; ext_rel++, i++)
-    {
-      struct internal_reloc int_rel;
-      struct ecoff_link_hash_entry *h;
-      asection *hsec;
-      bfd_signed_vma relocation;
-      struct external_reloc *adj_ext_rel;
-      unsigned int adj_i;
-      unsigned long ext_count;
-      struct ecoff_link_hash_entry **adj_h_ptr;
-      struct ecoff_link_hash_entry **adj_h_ptr_end;
-      struct ecoff_value_adjust *adjust;
-
-      /* If we have already expanded this reloc, we certainly don't
-	 need to do it again.  */
-      if (offsets != (long *) NULL && offsets[i] == 1)
-	continue;
-
-      /* Quickly check that this reloc is external PCREL16.  */
-      if (bfd_header_big_endian (abfd))
-	{
-	  if ((ext_rel->r_bits[3] & RELOC_BITS3_EXTERN_BIG) == 0
-	      || (((ext_rel->r_bits[3] & RELOC_BITS3_TYPE_BIG)
-		   >> RELOC_BITS3_TYPE_SH_BIG)
-		  != MIPS_R_PCREL16))
-	    continue;
-	}
-      else
-	{
-	  if ((ext_rel->r_bits[3] & RELOC_BITS3_EXTERN_LITTLE) == 0
-	      || (((ext_rel->r_bits[3] & RELOC_BITS3_TYPE_LITTLE)
-		   >> RELOC_BITS3_TYPE_SH_LITTLE)
-		  != MIPS_R_PCREL16))
-	    continue;
-	}
-
-      mips_ecoff_swap_reloc_in (abfd, (PTR) ext_rel, &int_rel);
-
-      h = ecoff_data (abfd)->sym_hashes[int_rel.r_symndx];
-      if (h == (struct ecoff_link_hash_entry *) NULL)
-	abort ();
-
-      if (h->root.type != bfd_link_hash_defined
-	  && h->root.type != bfd_link_hash_defweak)
-	{
-	  /* Just ignore undefined symbols.  These will presumably
-	     generate an error later in the link.  */
-	  continue;
-	}
-
-      /* Get the value of the symbol.  */
-      hsec = h->root.u.def.section;
-      relocation = (h->root.u.def.value
-		    + hsec->output_section->vma
-		    + hsec->output_offset);
-
-      /* Subtract out the current address.  */
-      relocation -= (sec->output_section->vma
-		     + sec->output_offset
-		     + (int_rel.r_vaddr - sec->vma));
-
-      /* The addend is stored in the object file.  In the normal case
-	 of ``bal symbol'', the addend will be -4.  It will only be
-	 different in the case of ``bal symbol+constant''.  To avoid
-	 always reading in the section contents, we don't check the
-	 addend in the object file (we could easily check the contents
-	 if we happen to have already read them in, but I fear that
-	 this could be confusing).  This means we will screw up if
-	 there is a branch to a symbol that is in range, but added to
-	 a constant which puts it out of range; in such a case the
-	 link will fail with a reloc overflow error.  Since the
-	 compiler will never generate such code, it should be easy
-	 enough to work around it by changing the assembly code in the
-	 source file.  */
-      relocation -= 4;
-
-      /* Now RELOCATION is the number we want to put in the object
-	 file.  See whether it fits.  */
-      if (relocation >= -0x20000 && relocation < 0x20000)
-	continue;
-
-      /* Now that we know this reloc needs work, which will rarely
-	 happen, go ahead and grab the section contents.  */
-      if (contents == (bfd_byte *) NULL)
-	{
-	  if (info->keep_memory)
-	    contents = (bfd_byte *) bfd_alloc (abfd, sec->_raw_size);
-	  else
-	    contents = (bfd_byte *) bfd_malloc ((size_t) sec->_raw_size);
-	  if (contents == (bfd_byte *) NULL)
-	    goto error_return;
-	  if (! bfd_get_section_contents (abfd, sec, (PTR) contents,
-					  (file_ptr) 0, sec->_raw_size))
-	    goto error_return;
-	  if (info->keep_memory)
-	    section_tdata->contents = contents;
-	}
-
-      /* We only support changing the bal instruction.  It would be
-	 possible to handle other PC relative branches, but some of
-	 them (the conditional branches) would require a different
-	 length instruction sequence which would complicate both this
-	 routine and mips_relax_pcrel16.  It could be written if
-	 somebody felt it were important.  Ignoring this reloc will
-	 presumably cause a reloc overflow error later on.  */
-      if (bfd_get_32 (abfd, contents + int_rel.r_vaddr - sec->vma)
-	  != 0x0411ffff) /* bgezal $0,. == bal . */
-	continue;
-
-      /* Bother.  We need to expand this reloc, and we will need to
-	 make another relaxation pass since this change may put other
-	 relocs out of range.  We need to examine the local branches
-	 and we need to allocate memory to hold the offsets we must
-	 add to them.  We also need to adjust the values of all
-	 symbols in the object file following this location.  */
-
-      sec->_cooked_size += PCREL16_EXPANSION_ADJUSTMENT;
-      *again = true;
-
-      if (offsets == (long *) NULL)
-	{
-	  size_t size;
-
-	  size = sec->reloc_count * sizeof (long);
-	  offsets = (long *) bfd_alloc (abfd, size);
-	  if (offsets == (long *) NULL)
-	    goto error_return;
-	  memset (offsets, 0, size);
-	  section_tdata->offsets = offsets;
-	}
-
-      offsets[i] = 1;
-
-      /* Now look for all PC relative references that cross this reloc
-	 and adjust their offsets.  */
-      adj_ext_rel = (struct external_reloc *) section_tdata->external_relocs;
-      for (adj_i = 0; adj_ext_rel < ext_rel_end; adj_ext_rel++, adj_i++)
-	{
-	  struct internal_reloc adj_int_rel;
-	  bfd_vma start, stop;
-	  int change;
-
-	  mips_ecoff_swap_reloc_in (abfd, (PTR) adj_ext_rel, &adj_int_rel);
-
-	  if (adj_int_rel.r_type == MIPS_R_PCREL16)
-	    {
-	      unsigned long insn;
-
-	      /* We only care about local references.  External ones
-		 will be relocated correctly anyhow.  */
-	      if (adj_int_rel.r_extern)
-		continue;
-
-	      /* We are only interested in a PC relative reloc within
-		 this section.  FIXME: Cross section PC relative
-		 relocs may not be handled correctly; does anybody
-		 care?  */
-	      if (adj_int_rel.r_symndx != RELOC_SECTION_TEXT)
-		continue;
-
-	      start = adj_int_rel.r_vaddr;
-
-	      insn = bfd_get_32 (abfd,
-				 contents + adj_int_rel.r_vaddr - sec->vma);
-
-	      stop = (insn & 0xffff) << 2;
-	      if ((stop & 0x20000) != 0)
-		stop -= 0x40000;
-	      stop += adj_int_rel.r_vaddr + 4;
-	    }
-	  else if (adj_int_rel.r_type == MIPS_R_RELHI)
-	    {
-	      struct internal_reloc rello;
-	      long addhi, addlo;
-
-	      /* The next reloc must be MIPS_R_RELLO, and we handle
-		 them together.  */
-	      BFD_ASSERT (adj_ext_rel + 1 < ext_rel_end);
-
-	      mips_ecoff_swap_reloc_in (abfd, (PTR) (adj_ext_rel + 1), &rello);
-
-	      BFD_ASSERT (rello.r_type == MIPS_R_RELLO);
-	      
-	      addhi = bfd_get_32 (abfd,
-				   contents + adj_int_rel.r_vaddr - sec->vma);
-	      addhi &= 0xffff;
-	      if (addhi & 0x8000)
-		addhi -= 0x10000;
-	      addhi <<= 16;
-
-	      addlo = bfd_get_32 (abfd, contents + rello.r_vaddr - sec->vma);
-	      addlo &= 0xffff;
-	      if (addlo & 0x8000)
-		addlo -= 0x10000;
-
-	      if (adj_int_rel.r_extern)
-		{
-		  /* The value we want here is
-		       sym - RELLOaddr + addend
-		     which we can express as
-		       sym - (RELLOaddr - addend)
-		     Therefore if we are expanding the area between
-		     RELLOaddr and RELLOaddr - addend we must adjust
-		     the addend.  This is admittedly ambiguous, since
-		     we might mean (sym + addend) - RELLOaddr, but in
-		     practice we don't, and there is no way to handle
-		     that case correctly since at this point we have
-		     no idea whether any reloc is being expanded
-		     between sym and sym + addend.  */
-		  start = rello.r_vaddr - (addhi + addlo);
-		  stop = rello.r_vaddr;
-		}
-	      else
-		{
-		  /* An internal RELHI/RELLO pair represents the
-		     difference between two addresses, $LC0 - foo.
-		     The symndx value is actually the difference
-		     between the reloc address and $LC0.  This lets us
-		     compute $LC0, and, by considering the addend,
-		     foo.  If the reloc we are expanding falls between
-		     those two relocs, we must adjust the addend.  At
-		     this point, the symndx value is actually in the
-		     r_offset field, where it was put by
-		     mips_ecoff_swap_reloc_in.  */
-		  start = rello.r_vaddr - adj_int_rel.r_offset;
-		  stop = start + addhi + addlo;
-		}
-	    }
-	  else if (adj_int_rel.r_type == MIPS_R_SWITCH)
-	    {
-	      /* A MIPS_R_SWITCH reloc represents a word of the form
-		   .word $L3-$LS12
-		 The value in the object file is correct, assuming the
-		 original value of $L3.  The symndx value is actually
-		 the difference between the reloc address and $LS12.
-		 This lets us compute the original value of $LS12 as
-		   vaddr - symndx
-		 and the original value of $L3 as
-		   vaddr - symndx + addend
-		 where addend is the value from the object file.  At
-		 this point, the symndx value is actually found in the
-		 r_offset field, since it was moved by
-		 mips_ecoff_swap_reloc_in.  */
-	      start = adj_int_rel.r_vaddr - adj_int_rel.r_offset;
-	      stop = start + bfd_get_32 (abfd,
-					 (contents
-					  + adj_int_rel.r_vaddr
-					  - sec->vma));
-	    }
-	  else
-	    continue;
-
-	  /* If the range expressed by this reloc, which is the
-	     distance between START and STOP crosses the reloc we are
-	     expanding, we must adjust the offset.  The sign of the
-	     adjustment depends upon the direction in which the range
-	     crosses the reloc being expanded.  */
-	  if (start <= int_rel.r_vaddr && stop > int_rel.r_vaddr)
-	    change = PCREL16_EXPANSION_ADJUSTMENT;
-	  else if (start > int_rel.r_vaddr && stop <= int_rel.r_vaddr)
-	    change = - PCREL16_EXPANSION_ADJUSTMENT;
-	  else
-	    change = 0;
-
-	  offsets[adj_i] += change;
-
-	  if (adj_int_rel.r_type == MIPS_R_RELHI)
-	    {
-	      adj_ext_rel++;
-	      adj_i++;
-	      offsets[adj_i] += change;
-	    }
-	}
-
-      /* Find all symbols in this section defined by this object file
-	 and adjust their values.  Note that we decide whether to
-	 adjust the value based on the value stored in the ECOFF EXTR
-	 structure, because the value stored in the hash table may
-	 have been changed by an earlier expanded reloc and thus may
-	 no longer correctly indicate whether the symbol is before or
-	 after the expanded reloc.  */
-      ext_count = ecoff_data (abfd)->debug_info.symbolic_header.iextMax;
-      adj_h_ptr = ecoff_data (abfd)->sym_hashes;
-      adj_h_ptr_end = adj_h_ptr + ext_count;
-      for (; adj_h_ptr < adj_h_ptr_end; adj_h_ptr++)
-	{
-	  struct ecoff_link_hash_entry *adj_h;
-
-	  adj_h = *adj_h_ptr;
-	  if (adj_h != (struct ecoff_link_hash_entry *) NULL
-	      && (adj_h->root.type == bfd_link_hash_defined
-		  || adj_h->root.type == bfd_link_hash_defweak)
-	      && adj_h->root.u.def.section == sec
-	      && adj_h->esym.asym.value > int_rel.r_vaddr)
-	    adj_h->root.u.def.value += PCREL16_EXPANSION_ADJUSTMENT;
-	}
-
-      /* Add an entry to the symbol value adjust list.  This is used
-	 by bfd_ecoff_debug_accumulate to adjust the values of
-	 internal symbols and FDR's.  */
-      adjust = ((struct ecoff_value_adjust *)
-		bfd_alloc (abfd, sizeof (struct ecoff_value_adjust)));
-      if (adjust == (struct ecoff_value_adjust *) NULL)
-	goto error_return;
-
-      adjust->start = int_rel.r_vaddr;
-      adjust->end = sec->vma + sec->_raw_size;
-      adjust->adjust = PCREL16_EXPANSION_ADJUSTMENT;
-
-      adjust->next = ecoff_data (abfd)->debug_info.adjust;
-      ecoff_data (abfd)->debug_info.adjust = adjust;
-    }
-
-  if (contents != (bfd_byte *) NULL && ! info->keep_memory)
-    free (contents);
-
-  return true;
-
- error_return:
-  if (contents != (bfd_byte *) NULL && ! info->keep_memory)
-    free (contents);
-  return false;
-}
-
-/* This routine is called from mips_relocate_section when a PC
-   relative reloc must be expanded into the five instruction sequence.
-   It handles all the details of the expansion, including resolving
-   the reloc.  */
-
-static boolean
-mips_relax_pcrel16 (info, input_bfd, input_section, h, location, address)
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     struct ecoff_link_hash_entry *h;
-     bfd_byte *location;
-     bfd_vma address;
-{
-  bfd_vma relocation;
-
-  /* 0x0411ffff is bgezal $0,. == bal .  */
-  BFD_ASSERT (bfd_get_32 (input_bfd, location) == 0x0411ffff);
-
-  /* We need to compute the distance between the symbol and the
-     current address plus eight.  */
-  relocation = (h->root.u.def.value
-		+ h->root.u.def.section->output_section->vma
-		+ h->root.u.def.section->output_offset);
-  relocation -= address + 8;
-
-  /* If the lower half is negative, increment the upper 16 half.  */
-  if ((relocation & 0x8000) != 0)
-    relocation += 0x10000;
-
-  bfd_put_32 (input_bfd, 0x04110001, location); /* bal .+8 */
-  bfd_put_32 (input_bfd,
-	      0x3c010000 | ((relocation >> 16) & 0xffff), /* lui $at,XX */
-	      location + 4);
-  bfd_put_32 (input_bfd,
-	      0x24210000 | (relocation & 0xffff), /* addiu $at,$at,XX */
-	      location + 8);
-  bfd_put_32 (input_bfd, 0x003f0821, location + 12); /* addu $at,$at,$ra */
-  bfd_put_32 (input_bfd, 0x0020f809, location + 16); /* jalr $at */
-
-  return true;
-}
-
-/* Given a .sdata section and a .rel.sdata in-memory section, store
-   relocation information into the .rel.sdata section which can be
-   used at runtime to relocate the section.  This is called by the
-   linker when the --embedded-relocs switch is used.  This is called
-   after the add_symbols entry point has been called for all the
-   objects, and before the final_link entry point is called.  This
-   function presumes that the object was compiled using
-   -membedded-pic.  */
-
-boolean
-bfd_mips_ecoff_create_embedded_relocs (abfd, info, datasec, relsec, errmsg)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *datasec;
-     asection *relsec;
-     char **errmsg;
-{
-  struct ecoff_link_hash_entry **sym_hashes;
-  struct ecoff_section_tdata *section_tdata;
-  struct external_reloc *ext_rel;
-  struct external_reloc *ext_rel_end;
-  bfd_byte *p;
-
-  BFD_ASSERT (! info->relocateable);
-
-  *errmsg = NULL;
-
-  if (datasec->reloc_count == 0)
-    return true;
-
-  sym_hashes = ecoff_data (abfd)->sym_hashes;
-
-  if (! mips_read_relocs (abfd, datasec))
-    return false;
-
-  relsec->contents = (bfd_byte *) bfd_alloc (abfd, datasec->reloc_count * 4);
-  if (relsec->contents == NULL)
-    return false;
-
-  p = relsec->contents;
-
-  section_tdata = ecoff_section_data (abfd, datasec);
-  ext_rel = (struct external_reloc *) section_tdata->external_relocs;
-  ext_rel_end = ext_rel + datasec->reloc_count;
-  for (; ext_rel < ext_rel_end; ext_rel++, p += 4)
-    {
-      struct internal_reloc int_rel;
-      boolean text_relative;
-
-      mips_ecoff_swap_reloc_in (abfd, (PTR) ext_rel, &int_rel);
-
-      /* We are going to write a four byte word into the runtime reloc
-	 section.  The word will be the address in the data section
-	 which must be relocated.  This must be on a word boundary,
-	 which means the lower two bits must be zero.  We use the
-	 least significant bit to indicate how the value in the data
-	 section must be relocated.  A 0 means that the value is
-	 relative to the text section, while a 1 indicates that the
-	 value is relative to the data section.  Given that we are
-	 assuming the code was compiled using -membedded-pic, there
-	 should not be any other possibilities.  */
-
-      /* We can only relocate REFWORD relocs at run time.  */
-      if (int_rel.r_type != MIPS_R_REFWORD)
-	{
-	  *errmsg = _("unsupported reloc type");
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      if (int_rel.r_extern)
-	{
-	  struct ecoff_link_hash_entry *h;
-
-	  h = sym_hashes[int_rel.r_symndx];
-	  /* If h is NULL, that means that there is a reloc against an
-	     external symbol which we thought was just a debugging
-	     symbol.  This should not happen.  */
-	  if (h == (struct ecoff_link_hash_entry *) NULL)
-	    abort ();
-	  if ((h->root.type == bfd_link_hash_defined
-	       || h->root.type == bfd_link_hash_defweak)
-	      && (h->root.u.def.section->flags & SEC_CODE) != 0)
-	    text_relative = true;
-	  else
-	    text_relative = false;
-	}
-      else
-	{
-	  switch (int_rel.r_symndx)
-	    {
-	    case RELOC_SECTION_TEXT:
-	      text_relative = true;
-	      break;
-	    case RELOC_SECTION_SDATA:
-	    case RELOC_SECTION_SBSS:
-	    case RELOC_SECTION_LIT8:
-	      text_relative = false;
-	      break;
-	    default:
-	      /* No other sections should appear in -membedded-pic
-                 code.  */
-	      *errmsg = _("reloc against unsupported section");
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-	}
-
-      if ((int_rel.r_offset & 3) != 0)
-	{
-	  *errmsg = _("reloc not properly aligned");
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      bfd_put_32 (abfd,
-		  (int_rel.r_vaddr - datasec->vma + datasec->output_offset
-		   + (text_relative ? 0 : 1)),
-		  p);
-    }
-
-  return true;
-}
-
-/* This is the ECOFF backend structure.  The backend field of the
-   target vector points to this.  */
-
-static const struct ecoff_backend_data mips_ecoff_backend_data =
-{
-  /* COFF backend structure.  */
-  {
-    (void (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR))) bfd_void, /* aux_in */
-    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_in */
-    (void (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_in */
-    (unsigned (*) PARAMS ((bfd *,PTR,int,int,int,int,PTR)))bfd_void,/*aux_out*/
-    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* sym_out */
-    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* lineno_out */
-    (unsigned (*) PARAMS ((bfd *,PTR,PTR))) bfd_void, /* reloc_out */
-    mips_ecoff_swap_filehdr_out, mips_ecoff_swap_aouthdr_out,
-    mips_ecoff_swap_scnhdr_out,
-    FILHSZ, AOUTSZ, SCNHSZ, 0, 0, 0, 0, true, false, 4,
-    mips_ecoff_swap_filehdr_in, mips_ecoff_swap_aouthdr_in,
-    mips_ecoff_swap_scnhdr_in, NULL,
-    mips_ecoff_bad_format_hook, _bfd_ecoff_set_arch_mach_hook,
-    _bfd_ecoff_mkobject_hook, _bfd_ecoff_styp_to_sec_flags,
-    _bfd_ecoff_set_alignment_hook, _bfd_ecoff_slurp_symbol_table,
-    NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-  },
-  /* Supported architecture.  */
-  bfd_arch_mips,
-  /* Initial portion of armap string.  */
-  "__________",
-  /* The page boundary used to align sections in a demand-paged
-     executable file.  E.g., 0x1000.  */
-  0x1000,
-  /* True if the .rdata section is part of the text segment, as on the
-     Alpha.  False if .rdata is part of the data segment, as on the
-     MIPS.  */
-  false,
-  /* Bitsize of constructor entries.  */
-  32,
-  /* Reloc to use for constructor entries.  */
-  &mips_howto_table[MIPS_R_REFWORD],
-  {
-    /* Symbol table magic number.  */
-    magicSym,
-    /* Alignment of debugging information.  E.g., 4.  */
-    4,
-    /* Sizes of external symbolic information.  */
-    sizeof (struct hdr_ext),
-    sizeof (struct dnr_ext),
-    sizeof (struct pdr_ext),
-    sizeof (struct sym_ext),
-    sizeof (struct opt_ext),
-    sizeof (struct fdr_ext),
-    sizeof (struct rfd_ext),
-    sizeof (struct ext_ext),
-    /* Functions to swap in external symbolic data.  */
-    ecoff_swap_hdr_in,
-    ecoff_swap_dnr_in,
-    ecoff_swap_pdr_in,
-    ecoff_swap_sym_in,
-    ecoff_swap_opt_in,
-    ecoff_swap_fdr_in,
-    ecoff_swap_rfd_in,
-    ecoff_swap_ext_in,
-    _bfd_ecoff_swap_tir_in,
-    _bfd_ecoff_swap_rndx_in,
-    /* Functions to swap out external symbolic data.  */
-    ecoff_swap_hdr_out,
-    ecoff_swap_dnr_out,
-    ecoff_swap_pdr_out,
-    ecoff_swap_sym_out,
-    ecoff_swap_opt_out,
-    ecoff_swap_fdr_out,
-    ecoff_swap_rfd_out,
-    ecoff_swap_ext_out,
-    _bfd_ecoff_swap_tir_out,
-    _bfd_ecoff_swap_rndx_out,
-    /* Function to read in symbolic data.  */
-    _bfd_ecoff_slurp_symbolic_info
-  },
-  /* External reloc size.  */
-  RELSZ,
-  /* Reloc swapping functions.  */
-  mips_ecoff_swap_reloc_in,
-  mips_ecoff_swap_reloc_out,
-  /* Backend reloc tweaking.  */
-  mips_adjust_reloc_in,
-  mips_adjust_reloc_out,
-  /* Relocate section contents while linking.  */
-  mips_relocate_section,
-  /* Do final adjustments to filehdr and aouthdr.  */
-  NULL,
-  /* Read an element from an archive at a given file position.  */
-  _bfd_get_elt_at_filepos
-};
-
-/* Looking up a reloc type is MIPS specific.  */
-#define _bfd_ecoff_bfd_reloc_type_lookup mips_bfd_reloc_type_lookup
-
-/* Getting relocated section contents is generic.  */
-#define _bfd_ecoff_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-
-/* Handling file windows is generic.  */
-#define _bfd_ecoff_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-/* Relaxing sections is MIPS specific.  */
-#define _bfd_ecoff_bfd_relax_section mips_relax_section
-
-/* GC of sections is not done.  */
-#define _bfd_ecoff_bfd_gc_sections bfd_generic_gc_sections
-
-const bfd_target ecoff_little_vec =
-{
-  "ecoff-littlemips",		/* name */
-  bfd_target_ecoff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-     _bfd_ecoff_archive_p, _bfd_dummy_target},
-  {bfd_false, _bfd_ecoff_mkobject,  /* bfd_set_format */
-     _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
-     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff),
-     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
-     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
-     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
-     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) &mips_ecoff_backend_data
-};
-
-const bfd_target ecoff_big_vec =
-{
-  "ecoff-bigmips",		/* name */
-  bfd_target_ecoff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-    _bfd_ecoff_archive_p, _bfd_dummy_target},
- {bfd_false, _bfd_ecoff_mkobject, /* bfd_set_format */
-    _bfd_generic_mkarchive, bfd_false},
- {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
-    _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
-     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff),
-     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
-     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
-     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
-     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) &mips_ecoff_backend_data
-};
-
-const bfd_target ecoff_biglittle_vec =
-{
-  "ecoff-biglittlemips",		/* name */
-  bfd_target_ecoff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-     _bfd_ecoff_archive_p, _bfd_dummy_target},
-  {bfd_false, _bfd_ecoff_mkobject,  /* bfd_set_format */
-     _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, _bfd_ecoff_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (_bfd_ecoff),
-     BFD_JUMP_TABLE_COPY (_bfd_ecoff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_ecoff),
-     BFD_JUMP_TABLE_SYMBOLS (_bfd_ecoff),
-     BFD_JUMP_TABLE_RELOCS (_bfd_ecoff),
-     BFD_JUMP_TABLE_WRITE (_bfd_ecoff),
-     BFD_JUMP_TABLE_LINK (_bfd_ecoff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) &mips_ecoff_backend_data
-};
diff --git a/bfd/coff-pmac.c b/bfd/coff-pmac.c
deleted file mode 100644
index f3332d98959..00000000000
--- a/bfd/coff-pmac.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* BFD back-end for Apple et al PowerPC Mac "XCOFF" files.
-   Copyright 1995 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_SYM	pmac_xcoff_vec
-#define TARGET_NAME	"xcoff-powermac"
-
-/* Tweak coffcode.h based on this being a PowerMac instead of RS/6000. */
-
-#define POWERMAC
-
-#include "coff-rs6000.c"
diff --git a/bfd/coff-ppc.c b/bfd/coff-ppc.c
deleted file mode 100644
index cf4504479b5..00000000000
--- a/bfd/coff-ppc.c
+++ /dev/null
@@ -1,2934 +0,0 @@
-/* BFD back-end for PowerPC Microsoft Portable Executable files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-
-   Original version pieced together by Kim Knuttila (krk@cygnus.com)
-
-   There is nothing new under the sun. This file draws a lot on other
-   coff files, in particular, those for the rs/6000, alpha, mips, and 
-   intel backends, and the PE work for the arm.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* Current State:
-   - objdump works
-   - relocs generated by gas
-   - ld will link files, but they do not run.
-   - dlltool will not produce correct output in some .reloc cases, and will 
-     not produce the right glue code for dll function calls.
-*/
-
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#include "libbfd.h"
-
-#include "coff/powerpc.h"
-#include "coff/internal.h"
-
-#include "coff/pe.h"
-
-#ifdef BADMAG
-#undef BADMAG
-#endif
-
-#define BADMAG(x) PPCBADMAG(x)
-
-#include "libcoff.h"
-
-/* This file is compiled more than once, but we only compile the
-   final_link routine once.  */
-extern boolean ppc_bfd_coff_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern void dump_toc PARAMS ((PTR));
-
-/* The toc is a set of bfd_vma fields. We use the fact that valid         */
-/* addresses are even (i.e. the bit representing "1" is off) to allow     */
-/* us to encode a little extra information in the field                   */
-/* - Unallocated addresses are intialized to 1.                           */
-/* - Allocated addresses are even numbers.                                */
-/* The first time we actually write a reference to the toc in the bfd,    */
-/* we want to record that fact in a fixup file (if it is asked for), so   */
-/* we keep track of whether or not an address has been written by marking */
-/* the low order bit with a "1" upon writing                              */
-
-#define SET_UNALLOCATED(x)  ((x) = 1)
-#define IS_UNALLOCATED(x)   ((x) == 1)
-
-#define IS_WRITTEN(x)       ((x) & 1)
-#define MARK_AS_WRITTEN(x)  ((x) |= 1)
-#define MAKE_ADDR_AGAIN(x)  ((x) &= ~1)
-
-
-/* Turn on this check if you suspect something amiss in the hash tables */
-#ifdef DEBUG_HASH
-
-/* Need a 7 char string for an eye catcher */
-#define EYE "krkjunk"
-
-#define HASH_CHECK_DCL char eye_catcher[8];
-#define HASH_CHECK_INIT(ret)      strcpy(ret->eye_catcher, EYE)
-#define HASH_CHECK(addr) \
- if (strcmp(addr->eye_catcher, EYE) != 0) \
-  { \
-    fprintf(stderr,\
-    _("File %s, line %d, Hash check failure, bad eye %8s\n"), \
-    __FILE__, __LINE__, addr->eye_catcher); \
-    abort(); \
- }
-
-
-#else
-
-#define HASH_CHECK_DCL
-#define HASH_CHECK_INIT(ret)
-#define HASH_CHECK(addr)
-
-#endif
-
-/* In order not to add an int to every hash table item for every coff
-   linker, we define our own hash table, derived from the coff one */
-
-/* PE linker hash table entries. */
-
-struct ppc_coff_link_hash_entry
-{
-  struct coff_link_hash_entry root; /* First entry, as required  */
-
-  /* As we wonder around the relocs, we'll keep the assigned toc_offset
-     here */
-  bfd_vma toc_offset;               /* Our addition, as required */
-  int symbol_is_glue;
-  unsigned long int glue_insn;
-
-  HASH_CHECK_DCL
-};
-
-
-/* PE linker hash table.  */
-
-struct ppc_coff_link_hash_table
-{
-  struct coff_link_hash_table root; /* First entry, as required */
-};
-
-static struct bfd_hash_entry *ppc_coff_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
-	   const char *));
-static boolean ppc_coff_link_hash_table_init
-  PARAMS ((struct ppc_coff_link_hash_table *, bfd *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-static struct bfd_link_hash_table *ppc_coff_link_hash_table_create
-  PARAMS ((bfd *));
-static boolean coff_ppc_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-static reloc_howto_type *coff_ppc_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *,
-	   bfd_vma *));
-
-/* Routine to create an entry in the link hash table.  */
-
-static struct bfd_hash_entry *
-ppc_coff_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct ppc_coff_link_hash_entry *ret = 
-    (struct ppc_coff_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct ppc_coff_link_hash_entry *) NULL)
-    ret = (struct ppc_coff_link_hash_entry *)
-      bfd_hash_allocate (table, 
-			 sizeof (struct ppc_coff_link_hash_entry));
-
-  if (ret == (struct ppc_coff_link_hash_entry *) NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct ppc_coff_link_hash_entry *)
-	 _bfd_coff_link_hash_newfunc ((struct bfd_hash_entry *) ret, 
-				      table, string));
-
-  if (ret)
-    {
-      /* Initialize the local fields.  */
-      SET_UNALLOCATED(ret->toc_offset);
-      ret->symbol_is_glue = 0;
-      ret->glue_insn = 0;
-
-      HASH_CHECK_INIT(ret);
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize a PE linker hash table.  */
-
-static boolean
-ppc_coff_link_hash_table_init (table, abfd, newfunc)
-     struct ppc_coff_link_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  return _bfd_coff_link_hash_table_init (&table->root, abfd, newfunc);
-}
-
-/* Create a PE linker hash table.  */
-
-static struct bfd_link_hash_table *
-ppc_coff_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct ppc_coff_link_hash_table *ret;
-
-  ret = ((struct ppc_coff_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct ppc_coff_link_hash_table)));
-  if (ret == NULL)
-    return NULL;
-  if (! ppc_coff_link_hash_table_init (ret, abfd,
-					ppc_coff_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-  return &ret->root.root;
-}
-
-/* Now, tailor coffcode.h to use our hash stuff */
-
-#define coff_bfd_link_hash_table_create ppc_coff_link_hash_table_create
-
-
-/* The nt loader points the toc register to &toc + 32768, in order to */
-/* use the complete range of a 16-bit displacement. We have to adjust */
-/* for this when we fix up loads displaced off the toc reg.           */
-#define TOC_LOAD_ADJUSTMENT (-32768)
-#define TOC_SECTION_NAME ".private.toc"
-
-/* The main body of code is in coffcode.h.  */
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
-   from smaller values.  Start with zero, widen, *then* decrement.  */
-#define MINUS_ONE	(((bfd_vma)0) - 1)
-
-/* these should definitely go in a header file somewhere... */
-
-/* NOP */
-#define IMAGE_REL_PPC_ABSOLUTE          0x0000
-
-/* 64-bit address */
-#define IMAGE_REL_PPC_ADDR64            0x0001
-
-/* 32-bit address */
-#define IMAGE_REL_PPC_ADDR32            0x0002
-
-/* 26-bit address, shifted left 2 (branch absolute) */
-#define IMAGE_REL_PPC_ADDR24            0x0003
-
-/* 16-bit address */
-#define IMAGE_REL_PPC_ADDR16            0x0004
-
-/* 16-bit address, shifted left 2 (load doubleword) */
-#define IMAGE_REL_PPC_ADDR14            0x0005
-
-/* 26-bit PC-relative offset, shifted left 2 (branch relative) */
-#define IMAGE_REL_PPC_REL24             0x0006
-
-/* 16-bit PC-relative offset, shifted left 2 (br cond relative) */
-#define IMAGE_REL_PPC_REL14             0x0007
-
-/* 16-bit offset from TOC base */
-#define IMAGE_REL_PPC_TOCREL16          0x0008
-
-/* 16-bit offset from TOC base, shifted left 2 (load doubleword) */
-#define IMAGE_REL_PPC_TOCREL14          0x0009
-
-/* 32-bit addr w/o image base */
-#define IMAGE_REL_PPC_ADDR32NB          0x000A
-
-/* va of containing section (as in an image sectionhdr) */
-#define IMAGE_REL_PPC_SECREL            0x000B
-
-/* sectionheader number */
-#define IMAGE_REL_PPC_SECTION           0x000C
-
-/* substitute TOC restore instruction iff symbol is glue code */
-#define IMAGE_REL_PPC_IFGLUE            0x000D
-
-/* symbol is glue code; virtual address is TOC restore instruction */
-#define IMAGE_REL_PPC_IMGLUE            0x000E
-
-/* va of containing section (limited to 16 bits) */
-#define IMAGE_REL_PPC_SECREL16          0x000F
-
-/* stuff to handle immediate data when the number of bits in the */
-/* data is greater than the number of bits in the immediate field */
-/* We need to do (usually) 32 bit arithmetic on 16 bit chunks */
-#define IMAGE_REL_PPC_REFHI             0x0010
-#define IMAGE_REL_PPC_REFLO             0x0011
-#define IMAGE_REL_PPC_PAIR              0x0012
-
-/* This is essentially the same as tocrel16, with TOCDEFN assumed */
-#define IMAGE_REL_PPC_TOCREL16_DEFN     0x0013
-
-/*  Flag bits in IMAGE_RELOCATION.TYPE */
-
-/* subtract reloc value rather than adding it */
-#define IMAGE_REL_PPC_NEG               0x0100
-
-/* fix branch prediction bit to predict branch taken */
-#define IMAGE_REL_PPC_BRTAKEN           0x0200
-
-/* fix branch prediction bit to predict branch not taken */
-#define IMAGE_REL_PPC_BRNTAKEN          0x0400
-
-/* toc slot defined in file (or, data in toc) */
-#define IMAGE_REL_PPC_TOCDEFN           0x0800
-
-/* masks to isolate above values in IMAGE_RELOCATION.Type */
-#define IMAGE_REL_PPC_TYPEMASK          0x00FF
-#define IMAGE_REL_PPC_FLAGMASK          0x0F00
-
-#define EXTRACT_TYPE(x)                 ((x) & IMAGE_REL_PPC_TYPEMASK)
-#define EXTRACT_FLAGS(x) ((x) & IMAGE_REL_PPC_FLAGMASK)
-#define EXTRACT_JUNK(x)  \
-           ((x) & ~(IMAGE_REL_PPC_TYPEMASK | IMAGE_REL_PPC_FLAGMASK))
-
-
-/* static helper functions to make relocation work */
-/* (Work In Progress) */
-
-static bfd_reloc_status_type ppc_refhi_reloc PARAMS ((bfd *abfd,
-						      arelent *reloc,
-						      asymbol *symbol,
-						      PTR data,
-						      asection *section,
-						      bfd *output_bfd,
-						      char **error));
-#if 0
-static bfd_reloc_status_type ppc_reflo_reloc PARAMS ((bfd *abfd,
-						      arelent *reloc,
-						      asymbol *symbol,
-						      PTR data,
-						      asection *section,
-						      bfd *output_bfd,
-						      char **error));
-#endif
-static bfd_reloc_status_type ppc_pair_reloc PARAMS ((bfd *abfd,
-						     arelent *reloc,
-						     asymbol *symbol,
-						     PTR data,
-						     asection *section,
-						     bfd *output_bfd,
-						     char **error));
-
-
-static bfd_reloc_status_type ppc_toc16_reloc PARAMS ((bfd *abfd,
-						      arelent *reloc,
-						      asymbol *symbol,
-						      PTR data,
-						      asection *section,
-						      bfd *output_bfd,
-						      char **error));
-
-#if 0
-static bfd_reloc_status_type ppc_addr32nb_reloc PARAMS ((bfd *abfd,
-							 arelent *reloc,
-							 asymbol *symbol,
-							 PTR data,
-							 asection *section,
-							 bfd *output_bfd,
-							 char **error));
-#endif
-static bfd_reloc_status_type ppc_section_reloc PARAMS ((bfd *abfd,
-							arelent *reloc,
-							asymbol *symbol,
-							PTR data,
-							asection *section,
-							bfd *output_bfd,
-							char **error));
-
-static bfd_reloc_status_type ppc_secrel_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-
-static bfd_reloc_status_type ppc_imglue_reloc PARAMS ((bfd *abfd,
-						       arelent *reloc,
-						       asymbol *symbol,
-						       PTR data,
-						       asection *section,
-						       bfd *output_bfd,
-						       char **error));
-
-
-
-static boolean in_reloc_p PARAMS((bfd *abfd, reloc_howto_type *howto));
-
-
-/* FIXME: It'll take a while to get through all of these. I only need a few to
-   get us started, so those I'll make sure work. Those marked FIXME are either
-   completely unverified or have a specific unknown marked in the comment */
-
-/*---------------------------------------------------------------------------*/
-/*                                                                           */
-/* Relocation entries for Windows/NT on PowerPC.                             */
-/*                                                                           */
-/* From the document "" we find the following listed as used relocs:         */
-/*                                                                           */
-/*   ABSOLUTE       : The noop                                               */
-/*   ADDR[64|32|16] : fields that hold addresses in data fields or the       */
-/*                    16 bit displacement field on a load/store.             */
-/*   ADDR[24|14]    : fields that hold addresses in branch and cond          */
-/*                    branches. These represent [26|16] bit addresses.       */
-/*                    The low order 2 bits are preserved.                    */
-/*   REL[24|14]     : branches relative to the Instruction Address           */
-/*                    register. These represent [26|16] bit addresses,       */
-/*                    as before. The instruction field will be zero, and     */
-/*                    the address of the SYM will be inserted at link time.  */
-/*   TOCREL16       : 16 bit displacement field referring to a slot in       */
-/*                    toc.                                                   */
-/*   TOCREL14       : 16 bit displacement field, similar to REL14 or ADDR14. */
-/*   ADDR32NB       : 32 bit address relative to the virtual origin.         */
-/*                    (On the alpha, this is always a linker generated thunk)*/
-/*                    (i.e. 32bit addr relative to the image base)           */
-/*   SECREL         : The value is relative to the start of the section      */
-/*                    containing the symbol.                                 */
-/*   SECTION        : access to the header containing the item. Supports the */
-/*                    codeview debugger.                                     */
-/*                                                                           */
-/* In particular, note that the document does not indicate that the          */
-/* relocations listed in the header file are used.                           */
-/*                                                                           */
-/*                                                                           */
-/*                                                                           */
-/*---------------------------------------------------------------------------*/
-
-static reloc_howto_type ppc_coff_howto_table[] =
-{
-  /* IMAGE_REL_PPC_ABSOLUTE 0x0000   NOP */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_ABSOLUTE, /* type */                                 
-	 0,	                 /* rightshift */                           
-	 0,	                 /* size (0 = byte, 1 = short, 2 = long) */ 
-	 0,	                 /* bitsize */                   
-	 false,	                 /* pc_relative */                          
-	 0,	                 /* bitpos */                               
-	 complain_overflow_dont, /* dont complain_on_overflow */
-	 0,		         /* special_function */                     
-	 "ABSOLUTE",             /* name */
-	 false,	                 /* partial_inplace */                      
-	 0x00,	 	         /* src_mask */                             
-	 0x00,        		 /* dst_mask */                             
-	 false),                 /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_ADDR64 0x0001  64-bit address */
-  /* Unused: */
-  HOWTO(IMAGE_REL_PPC_ADDR64,    /* type */                                 
-	0,	                 /* rightshift */                           
-	3,	                 /* size (0 = byte, 1 = short, 2 = long) */ 
-	64,	                 /* bitsize */                   
-	false,	                 /* pc_relative */                          
-	0,	                 /* bitpos */                               
-	complain_overflow_bitfield, 	 /* complain_on_overflow */
-	0,		         /* special_function */                     
-	"ADDR64",               /* name */
-	true,	                 /* partial_inplace */                      
-	MINUS_ONE,	 	 /* src_mask */
-	MINUS_ONE,        	 /* dst_mask */
-	false),                 /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_ADDR32 0x0002  32-bit address */
-  /* Used: */
-  HOWTO (IMAGE_REL_PPC_ADDR32,	/* type */
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "ADDR32",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_ADDR24 0x0003  26-bit address, shifted left 2 (branch absolute) */
-  /* the LI field is in bit 6 through bit 29 is 24 bits, + 2 for the shift */
-  /* Of course, That's the IBM approved bit numbering, which is not what */
-  /* anyone else uses.... The li field is in bit 2 thru 25 */ 
-  /* Used: */
-  HOWTO (IMAGE_REL_PPC_ADDR24,  /* type */
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "ADDR24",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0x07fffffc,	        /* src_mask */                             
-	 0x07fffffc,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_ADDR16 0x0004  16-bit address */
-  /* Used: */
-  HOWTO (IMAGE_REL_PPC_ADDR16,  /* type */             
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "ADDR16",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_ADDR14 0x0005 */
-  /*  16-bit address, shifted left 2 (load doubleword) */
-  /* FIXME: the mask is likely wrong, and the bit position may be as well */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */             
-	 1,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "ADDR16",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_REL24 0x0006 */
-  /*   26-bit PC-relative offset, shifted left 2 (branch relative) */
-  /* Used: */
-  HOWTO (IMAGE_REL_PPC_REL24,   /* type */
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */                   
-	 true,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "REL24",               /* name */
-	 true,	                /* partial_inplace */                      
-	 0x3fffffc,	        /* src_mask */                             
-	 0x3fffffc,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_REL14 0x0007 */
-  /*   16-bit PC-relative offset, shifted left 2 (br cond relative) */
-  /* FIXME: the mask is likely wrong, and the bit position may be as well */
-  /* FIXME: how does it know how far to shift? */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_ADDR14,  /* type */             
-	 1,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "ADDR16",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 true),                 /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_TOCREL16 0x0008 */
-  /*   16-bit offset from TOC base */
-  /* Used: */
-  HOWTO (IMAGE_REL_PPC_TOCREL16,/* type */             
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_dont, /* complain_on_overflow */
-	 ppc_toc16_reloc,       /* special_function */                     
-	 "TOCREL16",            /* name */
-	 false,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_TOCREL14 0x0009 */
-  /*   16-bit offset from TOC base, shifted left 2 (load doubleword) */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_TOCREL14,/* type */             
-	 1,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "TOCREL14",            /* name */
-	 false,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_ADDR32NB 0x000A */
-  /*   32-bit addr w/ image base */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_ADDR32NB,/* type */             
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,                     /* special_function */                     
-	 "ADDR32NB",            /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                 /* pcrel_offset */
-  
-  /* IMAGE_REL_PPC_SECREL 0x000B */
-  /*   va of containing section (as in an image sectionhdr) */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_SECREL,/* type */             
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 ppc_secrel_reloc,      /* special_function */                     
-	 "SECREL",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 true),                 /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_SECTION 0x000C */
-  /*   sectionheader number */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_SECTION,/* type */             
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 ppc_section_reloc,     /* special_function */                     
-	 "SECTION",             /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 true),                 /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_IFGLUE 0x000D */
-  /*   substitute TOC restore instruction iff symbol is glue code */
-  /* Used: */
-  HOWTO (IMAGE_REL_PPC_IFGLUE,/* type */             
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "IFGLUE",              /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_IMGLUE 0x000E */
-  /*   symbol is glue code; virtual address is TOC restore instruction */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_IMGLUE,/* type */             
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_dont, /* complain_on_overflow */
-	 ppc_imglue_reloc,      /* special_function */                     
-	 "IMGLUE",              /* name */
-	 false,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                 /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_SECREL16 0x000F */
-  /*   va of containing section (limited to 16 bits) */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_SECREL16,/* type */             
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "SECREL16",            /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 true),                 /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_REFHI             0x0010 */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_REFHI,   /* type */             
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 ppc_refhi_reloc,	/* special_function */                     
-	 "REFHI",               /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                 /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_REFLO             0x0011 */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_REFLO,   /* type */             
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 ppc_refhi_reloc,	/* special_function */                     
-	 "REFLO",               /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_PAIR              0x0012 */
-  /* Unused: */
-  HOWTO (IMAGE_REL_PPC_PAIR,    /* type */             
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 ppc_pair_reloc,        /* special_function */                     
-	 "PAIR",                /* name */
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-  /* IMAGE_REL_PPC_TOCREL16_DEFN 0x0013 */
-  /*   16-bit offset from TOC base, without causing a definition */
-  /* Used: */
-  HOWTO ( (IMAGE_REL_PPC_TOCREL16 | IMAGE_REL_PPC_TOCDEFN), /* type */ 
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,                     /* special_function */                     
-	 "TOCREL16, TOCDEFN",   /* name */
-	 false,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-};
-
-
-
-
-/* Some really cheezy macros that can be turned on to test stderr :-) */
-
-#ifdef DEBUG_RELOC
-#define UN_IMPL(x)                                           \
-{                                                            \
-   static int i;                                             \
-   if (i == 0)                                               \
-     {                                                       \
-       i = 1;                                                \
-       fprintf(stderr,_("Unimplemented Relocation -- %s\n"),x); \
-     }                                                       \
-}
-
-#define DUMP_RELOC(n,r)                              \
-{                                                    \
-   fprintf(stderr,"%s sym %d, addr %d, addend %d\n", \
-	   n, (*(r->sym_ptr_ptr))->name,             \
-	   r->address, r->addend);                   \
-}
-
-/* Given a reloc name, n, and a pointer to an internal_reloc, 
-   dump out interesting information on the contents 
-
-#define n_name		_n._n_name
-#define n_zeroes	_n._n_n._n_zeroes
-#define n_offset	_n._n_n._n_offset
-
-*/
-
-#define DUMP_RELOC2(n,r)                     \
-{                                            \
-   fprintf(stderr,"%s sym %d, r_vaddr %d %s\n", \
-	   n, r->r_symndx, r->r_vaddr,\
-	   (((r->r_type) & IMAGE_REL_PPC_TOCDEFN) == 0) \
-	   ?" ":" TOCDEFN"  );      \
-}
-
-#else
-#define UN_IMPL(x)
-#define DUMP_RELOC(n,r)
-#define DUMP_RELOC2(n,r)
-#endif
-
-
-
-/* toc construction and management routines */
-
-/* This file is compiled twice, and these variables are defined in one
-   of the compilations.  FIXME: This is confusing and weird.  Also,
-   BFD should not use global variables.  */
-extern bfd* bfd_of_toc_owner;
-extern long int global_toc_size;
-
-extern long int import_table_size;
-extern long int first_thunk_address;
-extern long int thunk_size;
-
-enum toc_type
-{
-  default_toc,
-  toc_32,
-  toc_64
-};
-
-enum ref_category
-{
-  priv,
-  pub,
-  data
-};
-
-struct list_ele
-{
-  struct list_ele *next;
-  bfd_vma addr;
-  enum ref_category cat;
-  int offset;
-  const char *name;
-};
-
-extern struct list_ele *head;
-extern struct list_ele *tail;
-
-static void record_toc
-  PARAMS ((asection *, int, enum ref_category, const char *));
-
-static void
-record_toc (toc_section, our_toc_offset, cat, name)
-     asection *toc_section;
-     int our_toc_offset;
-     enum ref_category cat;
-     const char *name;
-{
-  /* add this entry to our toc addr-offset-name list */
-  struct list_ele *t;
-  t = (struct list_ele *) bfd_malloc (sizeof (struct list_ele));
-  if (t == NULL)
-    abort ();
-  t->next = 0;
-  t->offset = our_toc_offset;
-  t->name = name;
-  t->cat = cat;
-  t->addr = toc_section->output_offset + our_toc_offset;
-
-  if (head == 0)
-    {
-      head = t;
-      tail = t;
-    }
-  else
-    {
-      tail->next = t;
-      tail = t;
-    }
-}
-
-#ifdef COFF_IMAGE_WITH_PE
-
-static boolean ppc_record_toc_entry
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, int, enum toc_type));
-static void ppc_mark_symbol_as_glue
-  PARAMS ((bfd *, int, struct internal_reloc *));
-
-/* record a toc offset against a symbol */
-static boolean
-ppc_record_toc_entry(abfd, info, sec, sym, toc_kind)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     int sym;
-     enum toc_type toc_kind;
-{
-  struct ppc_coff_link_hash_entry *h;
-  const char *name;
-
-  int *local_syms;
-
-  h = 0;
-
-  h = (struct ppc_coff_link_hash_entry *) (obj_coff_sym_hashes (abfd)[sym]);
-  if (h != 0)
-    {
-      HASH_CHECK(h);
-    }
-
-  if (h == 0) 
-    { 
-      local_syms = obj_coff_local_toc_table(abfd);
-      if (local_syms == 0)
-	{
-	  unsigned int i;
-	  /* allocate a table */
-	  local_syms = 
-	    (int *) bfd_zalloc (abfd, 
-				obj_raw_syment_count(abfd) * sizeof(int));
-	  if (local_syms == 0)
-	    return false;
-	  obj_coff_local_toc_table(abfd) = local_syms;
-	  for (i = 0; i < obj_raw_syment_count(abfd); ++i)
-	    {
-	      SET_UNALLOCATED(local_syms[i]);
-	    }
-	}
-
-      if (IS_UNALLOCATED(local_syms[sym])) 
-	{
-	  local_syms[sym] = global_toc_size;
-	  global_toc_size += 4;
-
-	  /* The size must fit in a 16bit displacment */
-	  if (global_toc_size > 65535)
-	    {
-	      (*_bfd_error_handler) (_("TOC overflow"));
-	      bfd_set_error (bfd_error_file_too_big);
-	      return false;
-	    }
-	}
-    }
-  else
-    {
-      name = h->root.root.root.string;
-
-      /* check to see if there's a toc slot allocated. If not, do it
-	 here. It will be used in relocate_section */
-      if (IS_UNALLOCATED(h->toc_offset))
-	{
-	  h->toc_offset = global_toc_size;
-	  global_toc_size += 4;
-
-	  /* The size must fit in a 16bit displacment */
-	  if (global_toc_size >= 65535)
-	    {
-	      (*_bfd_error_handler) (_("TOC overflow"));
-	      bfd_set_error (bfd_error_file_too_big);
-	      return false;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* record a toc offset against a symbol */
-static void
-ppc_mark_symbol_as_glue(abfd, sym, rel)
-     bfd *abfd;
-     int sym;
-     struct internal_reloc *rel;
-{
-  struct ppc_coff_link_hash_entry *h;
-
-  h = (struct ppc_coff_link_hash_entry *) (obj_coff_sym_hashes (abfd)[sym]);
-
-  HASH_CHECK(h);
-
-  h->symbol_is_glue = 1;
-  h->glue_insn = bfd_get_32 (abfd, (bfd_byte *) &rel->r_vaddr);
-
-  return;
-}
-
-#endif /* COFF_IMAGE_WITH_PE */
-
-
-/* Return true if this relocation should
-   appear in the output .reloc section. */
-
-static boolean in_reloc_p(abfd, howto)
-     bfd * abfd;
-     reloc_howto_type *howto;
-{
-  return 
-    (! howto->pc_relative) 
-      && (howto->type != IMAGE_REL_PPC_ADDR32NB)
-      && (howto->type != IMAGE_REL_PPC_TOCREL16)
-      && (howto->type != IMAGE_REL_PPC_IMGLUE)
-      && (howto->type != IMAGE_REL_PPC_IFGLUE) 
-      && (howto->type != IMAGE_REL_PPC_SECREL)
-      && (howto->type != IMAGE_REL_PPC_SECTION)
-      && (howto->type != IMAGE_REL_PPC_SECREL16)
-      && (howto->type != IMAGE_REL_PPC_REFHI)
-      && (howto->type != IMAGE_REL_PPC_REFLO)
-      && (howto->type != IMAGE_REL_PPC_PAIR)
-      && (howto->type != IMAGE_REL_PPC_TOCREL16_DEFN) ;
-}     
-
-#if 0
-
-/* this function is in charge of performing all the ppc PE relocations */
-/* Don't yet know if we want to do this this particular way ... (krk)  */
-/* FIXME: (it is not yet enabled) */
-
-static bfd_reloc_status_type
-pe_ppc_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	      error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* the consth relocation comes in two parts, we have to remember
-     the state between calls, in these variables */
-  static boolean part1_consth_active = false;
-  static unsigned long part1_consth_value;
-
-  unsigned long sym_value;
-  unsigned short r_type;
-  unsigned long addr = reloc_entry->address ; /*+ input_section->vma*/
-	
-  r_type = reloc_entry->howto->type;
-
-  if (output_bfd) 
-    {
-      /* Partial linking - do nothing */
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok; 
-    }
-
-  if (symbol_in != NULL
-      && bfd_is_und_section (symbol_in->section))
-    {
-      /* Keep the state machine happy in case we're called again */
-      if (r_type == IMAGE_REL_PPC_REFHI) 
-	{
-	  part1_consth_active = true;
-	  part1_consth_value  = 0;
-	}
-      return(bfd_reloc_undefined);
-    }
-  
-  if ((part1_consth_active) && (r_type != IMAGE_REL_PPC_PAIR)) 
-    {
-      part1_consth_active = false;
-      *error_message = (char *) _("Missing PAIR");
-      return(bfd_reloc_dangerous);
-    }
-
-
-  sym_value = get_symbol_value(symbol_in);
-  
-  return(bfd_reloc_ok);	
-}
-
-#endif /* 0 */
-
-/* The reloc processing routine for the optimized COFF linker.  */
-
-static boolean
-coff_ppc_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, syms, sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc *rel;
-  struct internal_reloc *relend;
-  boolean hihalf;
-  bfd_vma hihalf_val;
-  asection *toc_section = 0;
-  bfd_vma relocation;
-  reloc_howto_type *howto = 0;
-  
-  /* If we are performing a relocateable link, we don't need to do a
-     thing.  The caller will take care of adjusting the reloc
-     addresses and symbol indices.  */
-  if (info->relocateable)
-    return true;
-  
-  hihalf = false;
-  hihalf_val = 0;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      long symndx;
-      struct ppc_coff_link_hash_entry *h;
-      struct internal_syment *sym;
-      bfd_vma val;
-
-      asection *sec;
-      bfd_reloc_status_type rstat;
-      bfd_byte *loc;
-
-      unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
-      unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
-  
-      symndx = rel->r_symndx;
-      loc = contents + rel->r_vaddr - input_section->vma;
-
-      /* FIXME: check bounds on r_type */
-      howto = ppc_coff_howto_table + r_type;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	}
-      else
-	{
-	  h = (struct ppc_coff_link_hash_entry *) 
-	    (obj_coff_sym_hashes (input_bfd)[symndx]);
-	  if (h != 0) 
-	    {
-	      HASH_CHECK(h);
-	    }
-
-	  sym = syms + symndx;
-	}
-
-      if (r_type == IMAGE_REL_PPC_IMGLUE && h == 0)
-	{
-	  /* An IMGLUE reloc must have a name. Something is very wrong. */
-	  abort();
-	}
-
-      sec = NULL;
-      val = 0;
-
-      /* FIXME: PAIR unsupported in the following code */
-      if (h == NULL)
-	{
-	  if (symndx == -1)
-	    sec = bfd_abs_section_ptr;
-	  else
-	    {
-	      sec = sections[symndx];
-	      val = (sec->output_section->vma
-		     + sec->output_offset
-		     + sym->n_value);
-	      if (! obj_pe (output_bfd))
-		val -= sec->vma;
-	    }
-	}
-      else
-	{
-	  HASH_CHECK(h);
-
-	  if (h->root.root.type == bfd_link_hash_defined
-	      || h->root.root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.root.u.def.section;
-	      val = (h->root.root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	    }
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	    }
-	}
-
-      rstat = bfd_reloc_ok;
-      
-      /* Each case must do its own relocation, setting rstat appropriately */
-      switch (r_type)
-	{
-	default:
-	  (*_bfd_error_handler)
-	    (_("%s: unsupported relocation type 0x%02x"),
-	     bfd_get_filename (input_bfd), r_type);
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	case IMAGE_REL_PPC_TOCREL16:
-	  {
-	    bfd_vma our_toc_offset;
-	    int fixit;
-
-	    DUMP_RELOC2(howto->name, rel);
-
-	    if (toc_section == 0) 
-	      {
-		toc_section = bfd_get_section_by_name (bfd_of_toc_owner, 
-						       TOC_SECTION_NAME);
-
-		if ( toc_section == NULL ) 
-		  {
-		    /* There is no toc section. Something is very wrong. */
-		    abort();
-		  }
-	      }
-
-	    /* 
-	     *  Amazing bit tricks present. As we may have seen earlier, we
-	     *  use the 1 bit to tell us whether or not a toc offset has been
-	     *  allocated. Now that they've all been allocated, we will use
-	     *  the 1 bit to tell us if we've written this particular toc
-	     *  entry out.
-	     */
-	    fixit = false;
-	    if (h == 0)
-	      { /* it is a file local symbol */
-		int *local_toc_table;
-		const char *name;
-
-		sym = syms + symndx;
-		name = sym->_n._n_name;
-
-		local_toc_table = obj_coff_local_toc_table(input_bfd);
-		our_toc_offset = local_toc_table[symndx];
-
-		if (IS_WRITTEN(our_toc_offset))
-		  {
-		    /* if it has been written out, it is marked with the 
-		       1 bit. Fix up our offset, but do not write it out
-		       again.
-		     */
-		    MAKE_ADDR_AGAIN(our_toc_offset);
-		  }
-		else
-		  {
-		    /* write out the toc entry */
-		    record_toc(toc_section, 
-			       our_toc_offset, 
-			       priv, 
-			       strdup(name));
-
-		    bfd_put_32(output_bfd,
-			       val,
-			       toc_section->contents + our_toc_offset);
-
-		    MARK_AS_WRITTEN(local_toc_table[symndx]);
-		    fixit = true;
-		  }
-	      }
-	    else
-	      {
-		const char *name = h->root.root.root.string;
-		our_toc_offset = h->toc_offset;
-
-		if ((r_flags & IMAGE_REL_PPC_TOCDEFN) 
-		    == IMAGE_REL_PPC_TOCDEFN )
-		  {
-		    /* This is unbelievable cheese. Some knowledgable asm 
-		       hacker has decided to use r2 as a base for loading 
-		       a value. He/She does this by setting the tocdefn bit, 
-		       and not supplying a toc definition. The behaviour is 
-		       then to use the difference between the value of the 
-		       symbol and the actual location of the toc as the toc 
-		       index. 
-
-		       In fact, what is usually happening is, because the
-		       Import Address Table is mapped immediately following
-		       the toc, some trippy library code trying for speed on
-		       dll linkage, takes advantage of that and considers 
-		       the IAT to be part of the toc, thus saving a load.
-		    */
-
-		    our_toc_offset = val - 
-		      (toc_section->output_section->vma + 
-		       toc_section->output_offset);
-
-		    /* The size must still fit in a 16bit displacment */
-		    if (our_toc_offset >= 65535)
-		      {
-			(*_bfd_error_handler)
-			  (_("%s: Relocation for %s of %x exceeds Toc size limit"), 
-			   bfd_get_filename (input_bfd), name, our_toc_offset);
-			bfd_set_error (bfd_error_bad_value);
-			return false;
-		      }
-
-		    record_toc(toc_section, our_toc_offset, pub, strdup(name));
-		  }
-		else if (IS_WRITTEN(our_toc_offset))
-		  {
-		    /* if it has been written out, it is marked with the 
-		       1 bit. Fix up our offset, but do not write it out
-		       again.
-		     */
-		    MAKE_ADDR_AGAIN(our_toc_offset);
-		  }
-		else
-		  {
-		    record_toc(toc_section, our_toc_offset, pub, strdup(name));
-
-		    /* write out the toc entry */
-		    bfd_put_32(output_bfd,
-			       val,
-			       toc_section->contents + our_toc_offset);
-
-		    MARK_AS_WRITTEN(h->toc_offset);
-		    /* The tricky part is that this is the address that */
-		    /* needs a .reloc entry for it */
-		    fixit = true;
-		  }
-	      }
-
-	    if (fixit && info->base_file) 
-	      {
-		/* So if this is non pcrelative, and is referenced
-		   to a section or a common symbol, then it needs a reloc */
-
-		/* relocation to a symbol in a section which
-		   isn't absolute - we output the address here 
-		   to a file */
-
-		bfd_vma addr =  toc_section->output_section->vma
-		  + toc_section->output_offset + our_toc_offset;
-		    
-		if (coff_data(output_bfd)->pe)
-		  addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
-
-		fwrite (&addr, 1,4, (FILE *) info->base_file);
-	      }
-
-
-	    /* FIXME: this test is conservative */
-	    if ( (r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN &&
-		our_toc_offset > toc_section->_raw_size)
-	      {
-		(*_bfd_error_handler)
-		  (_("%s: Relocation exceeds allocated TOC (%x)"), 
-		   bfd_get_filename (input_bfd),
-		   toc_section->_raw_size);
-		bfd_set_error (bfd_error_bad_value);
-		return false;
-	      }
-
-	    /* Now we know the relocation for this toc reference */
-	    relocation =  our_toc_offset + TOC_LOAD_ADJUSTMENT;
-	    rstat = _bfd_relocate_contents (howto,
-					    input_bfd, 
-					    relocation, 
-					    loc);
-	  }
-	  break;
-	case IMAGE_REL_PPC_IFGLUE:
-	  {
-	    /* To solve this, we need to know whether or not the symbol */
-	    /* appearing on the call instruction is a glue function or not. */
-	    /* A glue function must announce itself via a IMGLUE reloc, and */
-	    /* the reloc contains the required toc restore instruction */
-	  
-	    bfd_vma x;
-	    const char *my_name;
-	    DUMP_RELOC2(howto->name, rel);
-
-	    if (h != 0)
-	      {
-		my_name = h->root.root.root.string;
-		if (h->symbol_is_glue == 1) 
-		  {
-		    x = bfd_get_32(input_bfd, loc);
-		    bfd_put_32(input_bfd, h->glue_insn, loc);
-		  }
-	      }
-	  }
-	  break;
-	case IMAGE_REL_PPC_SECREL:
-	  /* Unimplemented: codeview debugging information */
-	  /* For fast access to the header of the section 
-	     containing the item. */
-	  break;
-	case IMAGE_REL_PPC_SECTION:
-	  /* Unimplemented: codeview debugging information */
-	  /* Is used to indicate that the value should be relative
-	     to the beginning of the section that contains the
-	     symbol */
-	  break;
-	case IMAGE_REL_PPC_ABSOLUTE:
-	  {
-	    const char *my_name;
-	    if (h == 0)
-		my_name = (syms+symndx)->_n._n_name;
-	    else
-	      {
-		my_name = h->root.root.root.string;
-	      }
-
-	    fprintf(stderr, 
-		    _("Warning: unsupported reloc %s <file %s, section %s>\n"), 
-		    howto->name,
-		    bfd_get_filename(input_bfd),
-		    input_section->name);
-
-	    fprintf(stderr,"sym %ld (%s), r_vaddr %ld (%lx)\n", 
-		    rel->r_symndx, my_name, (long) rel->r_vaddr,
-		    (unsigned long) rel->r_vaddr);  
-	  }
-	  break;
-	case IMAGE_REL_PPC_IMGLUE:
-	  {
-	    /* There is nothing to do now. This reloc was noted in the first
-	       pass over the relocs, and the glue instruction extracted */
-	    const char *my_name;
-	    if (h->symbol_is_glue == 1) 
-	      break;
-	    my_name = h->root.root.root.string;
-
-	    (*_bfd_error_handler)
-	      (_("%s: Out of order IMGLUE reloc for %s"), 
-	       bfd_get_filename (input_bfd), my_name);
-	    bfd_set_error (bfd_error_bad_value);
-	    return false;
-	  }
-
-	case IMAGE_REL_PPC_ADDR32NB:
-	  {
-	    struct coff_link_hash_entry *myh = 0;
-	    const char *name = 0;
-	    DUMP_RELOC2(howto->name, rel);
-
-	    if (strncmp(".idata$2",input_section->name,8) == 0 && first_thunk_address == 0)
-	      {
-		/* set magic values */
-		int idata5offset;
-		struct coff_link_hash_entry *myh = 0;
-		myh = coff_link_hash_lookup (coff_hash_table (info),
-					     "__idata5_magic__",
-					     false, false, true);
-		first_thunk_address = myh->root.u.def.value + 
-		  sec->output_section->vma + 
-		    sec->output_offset - 
-		      pe_data(output_bfd)->pe_opthdr.ImageBase;
-		
-		idata5offset = myh->root.u.def.value;
-		myh = coff_link_hash_lookup (coff_hash_table (info),
-					     "__idata6_magic__",
-					     false, false, true);
-		
-		thunk_size = myh->root.u.def.value - idata5offset;
-		myh = coff_link_hash_lookup (coff_hash_table (info),
-					     "__idata4_magic__",
-					     false, false, true);
-		import_table_size = myh->root.u.def.value;
-	      }
-
-	    if (h == 0)
-	      { /* it is a file local symbol */
-		sym = syms + symndx;
-		name = sym->_n._n_name;
-	      }
-	    else
-	      {
-		char *target = 0;
-
-		name = h->root.root.root.string;
-		if (strcmp(".idata$2", name) == 0)
-		  target = "__idata2_magic__";
-		else if (strcmp(".idata$4", name) == 0)
-		  target = "__idata4_magic__";
-		else if (strcmp(".idata$5", name) == 0)
-		  target = "__idata5_magic__";
-
-		if (target != 0)
-		  {
-		    myh = 0;
-
-		    myh = coff_link_hash_lookup (coff_hash_table (info),
-						 target,
-						 false, false, true);
-		    if (myh == 0) 
-		      {
-			/* Missing magic cookies. Something is very wrong. */
-			abort();
-		      }
-		    
-		    val = myh->root.u.def.value + 
-		      sec->output_section->vma + sec->output_offset;
-		    if (first_thunk_address == 0)
-		      {
-			int idata5offset;
-			myh = coff_link_hash_lookup (coff_hash_table (info),
-						     "__idata5_magic__",
-						     false, false, true);
-			first_thunk_address = myh->root.u.def.value + 
-			  sec->output_section->vma + 
-			    sec->output_offset - 
-			      pe_data(output_bfd)->pe_opthdr.ImageBase;
-			
-			idata5offset = myh->root.u.def.value;
-			myh = coff_link_hash_lookup (coff_hash_table (info),
-						     "__idata6_magic__",
-						     false, false, true);
-			
-			thunk_size = myh->root.u.def.value - idata5offset;
-			myh = coff_link_hash_lookup (coff_hash_table (info),
-						     "__idata4_magic__",
-						     false, false, true);
-			import_table_size = myh->root.u.def.value;
-		      }
-		  }
-	      }
-
-	    rstat = _bfd_relocate_contents (howto,
-		      	      input_bfd, 
-			      val - 
-			      pe_data(output_bfd)->pe_opthdr.ImageBase,
-			      loc);
-	  }
-	  break;
-
-	case IMAGE_REL_PPC_REL24:
-	  DUMP_RELOC2(howto->name, rel);
-	  val -= (input_section->output_section->vma
-		  + input_section->output_offset);
-
-	  rstat = _bfd_relocate_contents (howto,
-					  input_bfd, 
-					  val, 
-					  loc);
-	  break;
-	case IMAGE_REL_PPC_ADDR16:
-	case IMAGE_REL_PPC_ADDR24:
-	case IMAGE_REL_PPC_ADDR32:
-	  DUMP_RELOC2(howto->name, rel);
-	  rstat = _bfd_relocate_contents (howto,
-					  input_bfd, 
-					  val, 
-					  loc);
-	  break;
-	}
-
-      if ( info->base_file )
-	{
-	  /* So if this is non pcrelative, and is referenced
-	     to a section or a common symbol, then it needs a reloc */
-	  if (sym && pe_data(output_bfd)->in_reloc_p(output_bfd, howto))
-	    {
-	      /* relocation to a symbol in a section which
-		 isn't absolute - we output the address here 
-		 to a file */
-	      bfd_vma addr = rel->r_vaddr 
-		- input_section->vma 
-		+ input_section->output_offset 
-		  + input_section->output_section->vma;
-
-	      if (coff_data(output_bfd)->pe)
-		{
-		  addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
-		}
-	      fwrite (&addr, 1,4, (FILE *) info->base_file);
-	    }
-	}
-
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	case bfd_reloc_ok:
-	  break;
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-	    char buf[SYMNMLEN + 1];
-
-	    if (symndx == -1)
-	      name = "*ABS*";
-	    else if (h != NULL)
-	      name = h->root.root.root.string;
-	    else if (sym == NULL)
-	      name = "*unknown*";
-	    else if (sym->_n._n_n._n_zeroes == 0
-		     && sym->_n._n_n._n_offset != 0)
-	      name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
-	    else
-	      {
-		strncpy (buf, sym->_n._n_name, SYMNMLEN);
-		buf[SYMNMLEN] = '\0';
-		name = buf;
-	      }
-
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, 
-		    (bfd_vma) 0, input_bfd,
-		    input_section, rel->r_vaddr - input_section->vma)))
-	      {
-		return false;
-	      }
-	  }
-	}
-
-    }     
-
-  return true;
-}
-
-#ifdef COFF_IMAGE_WITH_PE
-
-/* FIXME: BFD should not use global variables.  This file is compiled
-   twice, and these variables are shared.  This is confusing and
-   weird.  */
-
-long int global_toc_size = 4;
-
-bfd* bfd_of_toc_owner = 0;
-
-long int import_table_size;
-long int first_thunk_address;
-long int thunk_size;
-
-struct list_ele *head;
-struct list_ele *tail;
-
-static char *
-h1 = N_("\n\t\t\tTOC MAPPING\n\n");
-static char *
-h2 = N_(" TOC    disassembly  Comments       Name\n");
-static char *
-h3 = N_(" Offset  spelling                   (if present)\n");
-
-void
-dump_toc (vfile)
-     PTR vfile;
-{
-  FILE *file = (FILE *) vfile;
-  struct list_ele *t;
-
-  fprintf(file, _(h1));
-  fprintf(file, _(h2));
-  fprintf(file, _(h3));
-
-  for(t = head; t != 0; t=t->next)
-    {
-      const char *cat = "";
-
-      if (t->cat == priv)
-	cat = _("private       ");
-      else if (t->cat == pub)
-	cat = _("public        ");
-      else if (t->cat == data)
-	cat = _("data-in-toc   ");
-
-      if (t->offset > global_toc_size)
-	{
-	  if (t->offset <= global_toc_size + thunk_size)
-	    cat = _("IAT reference ");
-	  else
-	    {
-	      fprintf(file,
-		      _("**** global_toc_size %ld(%lx), thunk_size %ld(%lx)\n"),
-		      global_toc_size, global_toc_size, thunk_size, thunk_size);
-	      cat = _("Out of bounds!");
-	    }
-	}
-
-      fprintf(file,
-	      " %04lx    (%d)", (unsigned long) t->offset, t->offset - 32768);
-      fprintf(file,
-	      "    %s %s\n",
-	      cat, t->name);
-
-    }
-
-  fprintf(file, "\n");
-}
-
-boolean
-ppc_allocate_toc_section (info) 
-     struct bfd_link_info *info;
-{
-  asection *s;
-  bfd_byte *foo;
-  static char test_char = '1';
-
-  if ( global_toc_size == 0 ) /* FIXME: does this get me in trouble? */
-    return true;
-
-  if (bfd_of_toc_owner == 0)
-    {
-      /* No toc owner? Something is very wrong. */
-      abort();
-    }
-
-  s = bfd_get_section_by_name ( bfd_of_toc_owner , TOC_SECTION_NAME);
-  if (s == NULL) 
-    {
-      /* No toc section? Something is very wrong. */
-      abort();
-    }
-
-  foo = (bfd_byte *) bfd_alloc(bfd_of_toc_owner, global_toc_size);
-  memset(foo, test_char, global_toc_size);
-
-  s->_raw_size = s->_cooked_size = global_toc_size;
-  s->contents = foo;
-
-  return true;
-}
-
-boolean
-ppc_process_before_allocation (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  asection *sec;
-  struct internal_reloc *i, *rel;
-
-  /* here we have a bfd that is to be included on the link. We have a hook
-     to do reloc rummaging, before section sizes are nailed down. */
-
-  _bfd_coff_get_external_symbols(abfd);
-
-  /* rummage around all the relocs and map the toc */
-  sec = abfd->sections;
-
-  if (sec == 0)
-    {
-      return true;
-    }
-
-  for (; sec != 0; sec = sec->next)
-  {
-    if (sec->reloc_count == 0) 
-      continue;
-
-    /* load the relocs */
-    /* FIXME: there may be a storage leak here */
-    i=_bfd_coff_read_internal_relocs(abfd,sec,1,0,0,0);
-    
-    if (i == 0)
-      abort();
-
-    for (rel=i;rel<i+sec->reloc_count;++rel) 
-      {
-	unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
-	unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
-	boolean ok = true;
-
-	DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
-
-	switch(r_type) 
-	  {
-	  case IMAGE_REL_PPC_TOCREL16:
-	    /* if TOCDEFN is on, ignore as someone else has allocated the
-	       toc entry */
-	    if ( (r_flags & IMAGE_REL_PPC_TOCDEFN) != IMAGE_REL_PPC_TOCDEFN )
-	      ok = ppc_record_toc_entry(abfd, info, sec, 
-					rel->r_symndx, default_toc);
-	    if (!ok)
-	      return false;
-	    break;
-	  case IMAGE_REL_PPC_IMGLUE:
-	    ppc_mark_symbol_as_glue(abfd, rel->r_symndx, rel);
-	    break;
-	  default:
-	    break;
-	  }
-      }
-  }
-
-  return true;
-}
-
-#endif
-
-
-static bfd_reloc_status_type
-ppc_refhi_reloc (abfd,
-		 reloc_entry,
-		 symbol,
-		 data,
-		 input_section,
-		 output_bfd,
-		 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("REFHI");
-  DUMP_RELOC("REFHI",reloc_entry);
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_undefined;
-}
-
-#if 0
-
-static bfd_reloc_status_type
-ppc_reflo_reloc (abfd,
-		 reloc_entry,
-		 symbol,
-		 data,
-		 input_section,
-		 output_bfd,
-		 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("REFLO");
-  DUMP_RELOC("REFLO",reloc_entry);
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_undefined;
-}
-
-#endif
-
-static bfd_reloc_status_type
-ppc_pair_reloc (abfd,
-		reloc_entry,
-		symbol,
-		data,
-		input_section,
-		output_bfd,
-		error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("PAIR");
-  DUMP_RELOC("PAIR",reloc_entry);
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_undefined;
-}
-
-
-static bfd_reloc_status_type
-ppc_toc16_reloc (abfd,
-		 reloc_entry,
-		 symbol,
-		 data,
-		 input_section,
-		 output_bfd,
-		 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("TOCREL16");
-  DUMP_RELOC("TOCREL16",reloc_entry);
-
-  if (output_bfd == (bfd *) NULL)
-    {
-      return bfd_reloc_continue;
-    }
-
-  return bfd_reloc_ok;
-}
-
-#if 0
-
-/* ADDR32NB : 32 bit address relative to the virtual origin.         */
-/*            (On the alpha, this is always a linker generated thunk)*/
-/*            (i.e. 32bit addr relative to the image base)           */
-/*                                                                   */
-/*                                                                   */
-
-static bfd_reloc_status_type
-ppc_addr32nb_reloc (abfd,
-		    reloc_entry,
-		    symbol,
-		    data,
-		    input_section,
-		    output_bfd,
-		    error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("ADDR32NB");
-  DUMP_RELOC("ADDR32NB",reloc_entry);
-
-  return bfd_reloc_ok;
-}
-
-#endif
-
-static bfd_reloc_status_type
-ppc_secrel_reloc (abfd,
-		  reloc_entry,
-		  symbol,
-		  data,
-		  input_section,
-		  output_bfd,
-		  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("SECREL");
-  DUMP_RELOC("SECREL",reloc_entry);
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-ppc_section_reloc (abfd,
-		   reloc_entry,
-		   symbol,
-		   data,
-		   input_section,
-		   output_bfd,
-		   error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("SECTION");
-  DUMP_RELOC("SECTION",reloc_entry);
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-ppc_imglue_reloc (abfd,
-		  reloc_entry,
-		  symbol,
-		  data,
-		  input_section,
-		  output_bfd,
-		  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  UN_IMPL("IMGLUE");
-  DUMP_RELOC("IMGLUE",reloc_entry);
-
-  if (output_bfd == (bfd *) NULL)
-    return bfd_reloc_continue;
-
-  return bfd_reloc_ok;
-}
-
-
-
-#define MAX_RELOC_INDEX  \
-      (sizeof(ppc_coff_howto_table) / sizeof(ppc_coff_howto_table[0]) - 1)
-
-
-/* FIXME: There is a possiblity that when we read in a reloc from a file,
-          that there are some bits encoded in the upper portion of the 
-	  type field. Not yet implemented.
-*/
-static void ppc_coff_rtype2howto PARAMS ((arelent *relent,
-					  struct internal_reloc *internal));
-
-static void
-ppc_coff_rtype2howto (relent, internal)
-     arelent *relent;
-     struct internal_reloc *internal;
-{  
-
-  /* We can encode one of three things in the type field, aside from the
-     type:
-     1. IMAGE_REL_PPC_NEG - indicates the value field is a subtraction
-        value, rather than an addition value
-     2. IMAGE_REL_PPC_BRTAKEN, IMAGE_REL_PPC_BRNTAKEN - indicates that
-        the branch is expected to be taken or not.
-     3. IMAGE_REL_PPC_TOCDEFN - toc slot definition in the file
-     For now, we just strip this stuff to find the type, and ignore it other
-     than that.
-  */
-  reloc_howto_type *howto;
-  unsigned short r_type  = EXTRACT_TYPE (internal->r_type);
-  unsigned short r_flags = EXTRACT_FLAGS(internal->r_type);
-  unsigned short junk    = EXTRACT_JUNK (internal->r_type);
-
-  /* the masking process only slices off the bottom byte for r_type. */
-  if ( r_type > MAX_RELOC_INDEX ) 
-    abort();
-
-  /* check for absolute crap */
-  if ( junk != 0 )
-    abort();
-
-  switch(r_type) 
-    {
-    case IMAGE_REL_PPC_ADDR16:
-    case IMAGE_REL_PPC_REL24:
-    case IMAGE_REL_PPC_ADDR24:
-    case IMAGE_REL_PPC_ADDR32:
-    case IMAGE_REL_PPC_IFGLUE:
-    case IMAGE_REL_PPC_ADDR32NB:
-    case IMAGE_REL_PPC_SECTION:
-    case IMAGE_REL_PPC_SECREL:
-      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, internal);
-      howto = ppc_coff_howto_table + r_type;
-      break;
-    case IMAGE_REL_PPC_IMGLUE:
-      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, internal);
-      howto = ppc_coff_howto_table + r_type;
-      break;
-    case IMAGE_REL_PPC_TOCREL16:
-      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, internal);
-      if (r_flags & IMAGE_REL_PPC_TOCDEFN)
-	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16_DEFN;
-      else
-	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16;
-      break;
-    default:
-      fprintf(stderr, 
-	      _("Warning: Unsupported reloc %s [%d] used -- it may not work.\n"),
-	      ppc_coff_howto_table[r_type].name,
-	      r_type);
-      howto = ppc_coff_howto_table + r_type;      
-      break;
-    }
-  
-  relent->howto = howto;
-  
-}
-
-static reloc_howto_type *
-coff_ppc_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-  reloc_howto_type *howto;
-
-  /* We can encode one of three things in the type field, aside from the
-     type:
-     1. IMAGE_REL_PPC_NEG - indicates the value field is a subtraction
-        value, rather than an addition value
-     2. IMAGE_REL_PPC_BRTAKEN, IMAGE_REL_PPC_BRNTAKEN - indicates that
-        the branch is expected to be taken or not.
-     3. IMAGE_REL_PPC_TOCDEFN - toc slot definition in the file
-     For now, we just strip this stuff to find the type, and ignore it other
-     than that.
-  */
-
-  unsigned short r_type  = EXTRACT_TYPE (rel->r_type);
-  unsigned short r_flags = EXTRACT_FLAGS(rel->r_type);
-  unsigned short junk    = EXTRACT_JUNK (rel->r_type);
-
-  /* the masking process only slices off the bottom byte for r_type. */
-  if ( r_type > MAX_RELOC_INDEX ) 
-    abort();
-  
-  /* check for absolute crap */
-  if ( junk != 0 )
-    abort();
-    
-  switch(r_type) 
-    {
-    case IMAGE_REL_PPC_ADDR32NB:
-      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
-      *addendp -= pe_data(sec->output_section->owner)->pe_opthdr.ImageBase;
-      howto = ppc_coff_howto_table + r_type;
-      break;
-    case IMAGE_REL_PPC_TOCREL16:
-      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
-      if (r_flags & IMAGE_REL_PPC_TOCDEFN)
-	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16_DEFN;
-      else
-	howto = ppc_coff_howto_table + IMAGE_REL_PPC_TOCREL16;
-      break;
-    case IMAGE_REL_PPC_ADDR16:
-    case IMAGE_REL_PPC_REL24:
-    case IMAGE_REL_PPC_ADDR24:
-    case IMAGE_REL_PPC_ADDR32:
-    case IMAGE_REL_PPC_IFGLUE:
-    case IMAGE_REL_PPC_SECTION:
-    case IMAGE_REL_PPC_SECREL:
-      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
-      howto = ppc_coff_howto_table + r_type;
-      break;
-    case IMAGE_REL_PPC_IMGLUE:
-      DUMP_RELOC2(ppc_coff_howto_table[r_type].name, rel);
-      howto = ppc_coff_howto_table + r_type;
-      break;
-    default:
-      fprintf(stderr, 
-	      _("Warning: Unsupported reloc %s [%d] used -- it may not work.\n"),
-	      ppc_coff_howto_table[r_type].name,
-	      r_type);
-      howto = ppc_coff_howto_table + r_type;
-      break;
-    }
-  
-  return howto;
-}
-
-
-/* a cheesy little macro to make the code a little more readable */
-#define HOW2MAP(bfd_rtype,ppc_rtype)  \
- case bfd_rtype: return &ppc_coff_howto_table[ppc_rtype]
-
-static reloc_howto_type *ppc_coff_reloc_type_lookup
-PARAMS ((bfd *, bfd_reloc_code_real_type));
-
-static reloc_howto_type *
-ppc_coff_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-      HOW2MAP(BFD_RELOC_32_GOTOFF,    IMAGE_REL_PPC_IMGLUE);
-      HOW2MAP(BFD_RELOC_16_GOT_PCREL, IMAGE_REL_PPC_IFGLUE);
-      HOW2MAP(BFD_RELOC_16,           IMAGE_REL_PPC_ADDR16);
-      HOW2MAP(BFD_RELOC_PPC_B26,      IMAGE_REL_PPC_REL24);
-      HOW2MAP(BFD_RELOC_PPC_BA26,     IMAGE_REL_PPC_ADDR24);
-      HOW2MAP(BFD_RELOC_PPC_TOC16,    IMAGE_REL_PPC_TOCREL16);
-      HOW2MAP(BFD_RELOC_16_GOTOFF,    IMAGE_REL_PPC_TOCREL16_DEFN);
-      HOW2MAP(BFD_RELOC_32,           IMAGE_REL_PPC_ADDR32);
-      HOW2MAP(BFD_RELOC_RVA,          IMAGE_REL_PPC_ADDR32NB);
-    default: 
-      return NULL;
-    }
-  /*NOTREACHED*/
-}
-
-#undef HOW2MAP
-
-
-/* Tailor coffcode.h -- macro heaven. */
-
-#define RTYPE2HOWTO(cache_ptr, dst)  ppc_coff_rtype2howto (cache_ptr, dst)
-
-#ifndef COFF_IMAGE_WITH_PE
-static void ppc_coff_swap_sym_in_hook PARAMS ((bfd *, PTR, PTR));
-#endif
-
-/* We use the special COFF backend linker, with our own special touch.  */
-
-#define coff_bfd_reloc_type_lookup   ppc_coff_reloc_type_lookup
-#define coff_rtype_to_howto          coff_ppc_rtype_to_howto
-#define coff_relocate_section        coff_ppc_relocate_section
-#define coff_bfd_final_link          ppc_bfd_coff_final_link 
-
-#ifndef COFF_IMAGE_WITH_PE
-#define coff_swap_sym_in_hook        ppc_coff_swap_sym_in_hook
-#endif
-
-#define SELECT_RELOC(internal, howto) {internal.r_type=howto->type;}
-
-#define COFF_PAGE_SIZE                       0x1000
-
-#define POWERPC_LE_PE
-
-#include "coffcode.h"
-
-
-
-#ifndef COFF_IMAGE_WITH_PE
-/* FIXME:
-   What we're trying to do here is allocate a toc section (early), and attach 
-   it to the last bfd to be processed. This avoids the problem of having a toc
-   written out before all files have been processed. This code allocates
-   a toc section for every file, and records the last one seen. There are
-   at least two problems with this approach:
-   1. We allocate whole bunches of toc sections that are ignored, but at
-      at least we will not allocate a toc if no .toc is present.
-   2. It's not clear to me that being the last bfd read necessarily means
-      that you are the last bfd closed.
-   3. Doing it on a "swap in" hook depends on when the "swap in" is called,
-      and how often, etc. It's not clear to me that there isn't a hole here.
-*/
-
-static void
-ppc_coff_swap_sym_in_hook (abfd, ext1, in1)
-     bfd            *abfd;
-     PTR ext1;
-     PTR in1;
-{
-  struct internal_syment      *in = (struct internal_syment *)in1;
-
-  if (bfd_of_toc_owner != 0) /* we already have a toc, so go home */
-    return;
-
-  if (strcmp(in->_n._n_name, ".toc") == 0)
-    {
-      flagword flags;
-      register asection *s;
-
-      s = bfd_get_section_by_name ( abfd , TOC_SECTION_NAME);
-      if (s != NULL) 
-	{
-	  return;
-	}
-
-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY ;
-
-      s = bfd_make_section (abfd, TOC_SECTION_NAME);
-
-      if (s == NULL
-	  || !bfd_set_section_flags (abfd, s, flags)
-	  || !bfd_set_section_alignment (abfd, s, 2))
-	{
-	  /* FIXME: set appropriate bfd error */
-	  abort();
-	}
-
-      /* save the bfd for later allocation */
-      bfd_of_toc_owner = abfd;
-    }
-
-  return;
-}
-#endif
-
-#ifndef COFF_IMAGE_WITH_PE
-
-static boolean ppc_do_last PARAMS ((bfd *));
-static bfd *ppc_get_last PARAMS ((void));
-
-static boolean
-ppc_do_last (abfd)
-     bfd *abfd;
-{
-  if (abfd == bfd_of_toc_owner)
-    return true;
-  else
-    return false;
-}
-
-static bfd *
-ppc_get_last()
-{
-  return bfd_of_toc_owner;
-}
-
-/* this piece of machinery exists only to guarantee that the bfd that holds
-   the toc section is written last. 
-
-   This does depend on bfd_make_section attaching a new section to the
-   end of the section list for the bfd. 
-
-   This is otherwise intended to be functionally the same as 
-   cofflink.c:_bfd_coff_final_link(). It is specifically different only 
-   where the POWERPC_LE_PE macro modifies the code. It is left in as a 
-   precise form of comment. krk@cygnus.com
-*/
-#define POWERPC_LE_PE
-
-
-/* Do the final link step.  */
-
-boolean
-ppc_bfd_coff_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd_size_type symesz;
-  struct coff_final_link_info finfo;
-  boolean debug_merge_allocated;
-  asection *o;
-  struct bfd_link_order *p;
-  size_t max_sym_count;
-  size_t max_lineno_count;
-  size_t max_reloc_count;
-  size_t max_output_reloc_count;
-  size_t max_contents_size;
-  file_ptr rel_filepos;
-  unsigned int relsz;
-  file_ptr line_filepos;
-  unsigned int linesz;
-  bfd *sub;
-  bfd_byte *external_relocs = NULL;
-  char strbuf[STRING_SIZE_SIZE];
-
-  symesz = bfd_coff_symesz (abfd);
-
-  finfo.info = info;
-  finfo.output_bfd = abfd;
-  finfo.strtab = NULL;
-  finfo.section_info = NULL;
-  finfo.last_file_index = -1;
-  finfo.last_bf_index = -1;
-  finfo.internal_syms = NULL;
-  finfo.sec_ptrs = NULL;
-  finfo.sym_indices = NULL;
-  finfo.outsyms = NULL;
-  finfo.linenos = NULL;
-  finfo.contents = NULL;
-  finfo.external_relocs = NULL;
-  finfo.internal_relocs = NULL;
-  debug_merge_allocated = false;
-
-  coff_data (abfd)->link_info = info;
-
-  finfo.strtab = _bfd_stringtab_init ();
-  if (finfo.strtab == NULL)
-    goto error_return;
-
-  if (! coff_debug_merge_hash_table_init (&finfo.debug_merge))
-    goto error_return;
-  debug_merge_allocated = true;
-
-  /* Compute the file positions for all the sections.  */
-  if (! abfd->output_has_begun)
-    {
-      if (! bfd_coff_compute_section_file_positions (abfd))
-	return false;
-    }
-
-  /* Count the line numbers and relocation entries required for the
-     output file.  Set the file positions for the relocs.  */
-  rel_filepos = obj_relocbase (abfd);
-  relsz = bfd_coff_relsz (abfd);
-  max_contents_size = 0;
-  max_lineno_count = 0;
-  max_reloc_count = 0;
-
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-
-	  if (p->type == bfd_indirect_link_order)
-	    {
-	      asection *sec;
-
-	      sec = p->u.indirect.section;
-
-	      /* Mark all sections which are to be included in the
-		 link.  This will normally be every section.  We need
-		 to do this so that we can identify any sections which
-		 the linker has decided to not include.  */
-	      sec->linker_mark = true;
-
-	      if (info->strip == strip_none
-		  || info->strip == strip_some)
-		o->lineno_count += sec->lineno_count;
-
-	      if (info->relocateable)
-		o->reloc_count += sec->reloc_count;
-
-	      if (sec->_raw_size > max_contents_size)
-		max_contents_size = sec->_raw_size;
-	      if (sec->lineno_count > max_lineno_count)
-		max_lineno_count = sec->lineno_count;
-	      if (sec->reloc_count > max_reloc_count)
-		max_reloc_count = sec->reloc_count;
-	    }
-	  else if (info->relocateable
-		   && (p->type == bfd_section_reloc_link_order
-		       || p->type == bfd_symbol_reloc_link_order))
-	    ++o->reloc_count;
-	}
-      if (o->reloc_count == 0)
-	o->rel_filepos = 0;
-      else
-	{
-	  o->flags |= SEC_RELOC;
-	  o->rel_filepos = rel_filepos;
-	  rel_filepos += o->reloc_count * relsz;
-	}
-    }
-
-  /* If doing a relocateable link, allocate space for the pointers we
-     need to keep.  */
-  if (info->relocateable)
-    {
-      unsigned int i;
-
-      /* We use section_count + 1, rather than section_count, because
-         the target_index fields are 1 based.  */
-      finfo.section_info =
-	((struct coff_link_section_info *)
-	 bfd_malloc ((abfd->section_count + 1)
-		     * sizeof (struct coff_link_section_info)));
-      if (finfo.section_info == NULL)
-	goto error_return;
-      for (i = 0; i <= abfd->section_count; i++)
-	{
-	  finfo.section_info[i].relocs = NULL;
-	  finfo.section_info[i].rel_hashes = NULL;
-	}
-    }
-
-  /* We now know the size of the relocs, so we can determine the file
-     positions of the line numbers.  */
-  line_filepos = rel_filepos;
-  linesz = bfd_coff_linesz (abfd);
-  max_output_reloc_count = 0;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if (o->lineno_count == 0)
-	o->line_filepos = 0;
-      else
-	{
-	  o->line_filepos = line_filepos;
-	  line_filepos += o->lineno_count * linesz;
-	}
-
-      if (o->reloc_count != 0)
-	{
-	  /* We don't know the indices of global symbols until we have
-             written out all the local symbols.  For each section in
-             the output file, we keep an array of pointers to hash
-             table entries.  Each entry in the array corresponds to a
-             reloc.  When we find a reloc against a global symbol, we
-             set the corresponding entry in this array so that we can
-             fix up the symbol index after we have written out all the
-             local symbols.
-
-	     Because of this problem, we also keep the relocs in
-	     memory until the end of the link.  This wastes memory,
-	     but only when doing a relocateable link, which is not the
-	     common case.  */
-	  BFD_ASSERT (info->relocateable);
-	  finfo.section_info[o->target_index].relocs =
-	    ((struct internal_reloc *)
-	     bfd_malloc (o->reloc_count * sizeof (struct internal_reloc)));
-	  finfo.section_info[o->target_index].rel_hashes =
-	    ((struct coff_link_hash_entry **)
-	     bfd_malloc (o->reloc_count
-		     * sizeof (struct coff_link_hash_entry *)));
-	  if (finfo.section_info[o->target_index].relocs == NULL
-	      || finfo.section_info[o->target_index].rel_hashes == NULL)
-	    goto error_return;
-
-	  if (o->reloc_count > max_output_reloc_count)
-	    max_output_reloc_count = o->reloc_count;
-	}
-
-      /* Reset the reloc and lineno counts, so that we can use them to
-	 count the number of entries we have output so far.  */
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-    }
-
-  obj_sym_filepos (abfd) = line_filepos;
-
-  /* Figure out the largest number of symbols in an input BFD.  Take
-     the opportunity to clear the output_has_begun fields of all the
-     input BFD's.  */
-  max_sym_count = 0;
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      size_t sz;
-
-      sub->output_has_begun = false;
-      sz = obj_raw_syment_count (sub);
-      if (sz > max_sym_count)
-	max_sym_count = sz;
-    }
-
-  /* Allocate some buffers used while linking.  */
-  finfo.internal_syms = ((struct internal_syment *)
-			 bfd_malloc (max_sym_count
-				     * sizeof (struct internal_syment)));
-  finfo.sec_ptrs = (asection **) bfd_malloc (max_sym_count
-					     * sizeof (asection *));
-  finfo.sym_indices = (long *) bfd_malloc (max_sym_count * sizeof (long));
-  finfo.outsyms = ((bfd_byte *)
-		   bfd_malloc ((size_t) ((max_sym_count + 1) * symesz)));
-  finfo.linenos = (bfd_byte *) bfd_malloc (max_lineno_count
-				       * bfd_coff_linesz (abfd));
-  finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
-  finfo.external_relocs = (bfd_byte *) bfd_malloc (max_reloc_count * relsz);
-  if (! info->relocateable)
-    finfo.internal_relocs = ((struct internal_reloc *)
-			     bfd_malloc (max_reloc_count
-					 * sizeof (struct internal_reloc)));
-  if ((finfo.internal_syms == NULL && max_sym_count > 0)
-      || (finfo.sec_ptrs == NULL && max_sym_count > 0)
-      || (finfo.sym_indices == NULL && max_sym_count > 0)
-      || finfo.outsyms == NULL
-      || (finfo.linenos == NULL && max_lineno_count > 0)
-      || (finfo.contents == NULL && max_contents_size > 0)
-      || (finfo.external_relocs == NULL && max_reloc_count > 0)
-      || (! info->relocateable
-	  && finfo.internal_relocs == NULL
-	  && max_reloc_count > 0))
-    goto error_return;
-
-  /* We now know the position of everything in the file, except that
-     we don't know the size of the symbol table and therefore we don't
-     know where the string table starts.  We just build the string
-     table in memory as we go along.  We process all the relocations
-     for a single input file at once.  */
-  obj_raw_syment_count (abfd) = 0;
-
-  if (coff_backend_info (abfd)->_bfd_coff_start_final_link)
-    {
-      if (! bfd_coff_start_final_link (abfd, info))
-	goto error_return;
-    }
-
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order
-	      && (bfd_get_flavour (p->u.indirect.section->owner)
-		  == bfd_target_coff_flavour))
-	    {
-	      sub = p->u.indirect.section->owner;
-#ifdef POWERPC_LE_PE
-	      if (! sub->output_has_begun && !ppc_do_last(sub))
-#else
-	      if (! sub->output_has_begun)
-#endif
-		{
-		  if (! _bfd_coff_link_input_bfd (&finfo, sub))
-		    goto error_return;
-		  sub->output_has_begun = true;
-		}
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    {
-	      if (! _bfd_coff_reloc_link_order (abfd, &finfo, o, p))
-		goto error_return;
-	    }
-	  else
-	    {
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		goto error_return;
-	    }
-	}
-    }
-
-#ifdef POWERPC_LE_PE
-  {
-    bfd* last_one = ppc_get_last();
-    if (last_one)
-      {
-	if (! _bfd_coff_link_input_bfd (&finfo, last_one))
-	  goto error_return;
-      }
-    last_one->output_has_begun = true;
-  }
-#endif
-
-  /* Free up the buffers used by _bfd_coff_link_input_bfd.  */
-
-  coff_debug_merge_hash_table_free (&finfo.debug_merge);
-  debug_merge_allocated = false;
-
-  if (finfo.internal_syms != NULL)
-    {
-      free (finfo.internal_syms);
-      finfo.internal_syms = NULL;
-    }
-  if (finfo.sec_ptrs != NULL)
-    {
-      free (finfo.sec_ptrs);
-      finfo.sec_ptrs = NULL;
-    }
-  if (finfo.sym_indices != NULL)
-    {
-      free (finfo.sym_indices);
-      finfo.sym_indices = NULL;
-    }
-  if (finfo.linenos != NULL)
-    {
-      free (finfo.linenos);
-      finfo.linenos = NULL;
-    }
-  if (finfo.contents != NULL)
-    {
-      free (finfo.contents);
-      finfo.contents = NULL;
-    }
-  if (finfo.external_relocs != NULL)
-    {
-      free (finfo.external_relocs);
-      finfo.external_relocs = NULL;
-    }
-  if (finfo.internal_relocs != NULL)
-    {
-      free (finfo.internal_relocs);
-      finfo.internal_relocs = NULL;
-    }
-
-  /* The value of the last C_FILE symbol is supposed to be the symbol
-     index of the first external symbol.  Write it out again if
-     necessary.  */
-  if (finfo.last_file_index != -1
-      && (unsigned int) finfo.last_file.n_value != obj_raw_syment_count (abfd))
-    {
-      finfo.last_file.n_value = obj_raw_syment_count (abfd);
-      bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file,
-			     (PTR) finfo.outsyms);
-      if (bfd_seek (abfd,
-		    (obj_sym_filepos (abfd)
-		     + finfo.last_file_index * symesz),
-		    SEEK_SET) != 0
-	  || bfd_write (finfo.outsyms, symesz, 1, abfd) != symesz)
-	return false;
-    }
-
-  /* Write out the global symbols.  */
-  finfo.failed = false;
-  coff_link_hash_traverse (coff_hash_table (info), _bfd_coff_write_global_sym,
-			   (PTR) &finfo);
-  if (finfo.failed)
-    goto error_return;
-
-  /* The outsyms buffer is used by _bfd_coff_write_global_sym.  */
-  if (finfo.outsyms != NULL)
-    {
-      free (finfo.outsyms);
-      finfo.outsyms = NULL;
-    }
-
-  if (info->relocateable)
-    {
-      /* Now that we have written out all the global symbols, we know
-	 the symbol indices to use for relocs against them, and we can
-	 finally write out the relocs.  */
-      external_relocs = ((bfd_byte *)
-			 bfd_malloc (max_output_reloc_count * relsz));
-      if (external_relocs == NULL)
-	goto error_return;
-
-      for (o = abfd->sections; o != NULL; o = o->next)
-	{
-	  struct internal_reloc *irel;
-	  struct internal_reloc *irelend;
-	  struct coff_link_hash_entry **rel_hash;
-	  bfd_byte *erel;
-
-	  if (o->reloc_count == 0)
-	    continue;
-
-	  irel = finfo.section_info[o->target_index].relocs;
-	  irelend = irel + o->reloc_count;
-	  rel_hash = finfo.section_info[o->target_index].rel_hashes;
-	  erel = external_relocs;
-	  for (; irel < irelend; irel++, rel_hash++, erel += relsz)
-	    {
-	      if (*rel_hash != NULL)
-		{
-		  BFD_ASSERT ((*rel_hash)->indx >= 0);
-		  irel->r_symndx = (*rel_hash)->indx;
-		}
-	      bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel);
-	    }
-
-	  if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
-	      || bfd_write ((PTR) external_relocs, relsz, o->reloc_count,
-			    abfd) != relsz * o->reloc_count)
-	    goto error_return;
-	}
-
-      free (external_relocs);
-      external_relocs = NULL;
-    }
-
-  /* Free up the section information.  */
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
-
-      for (i = 0; i < abfd->section_count; i++)
-	{
-	  if (finfo.section_info[i].relocs != NULL)
-	    free (finfo.section_info[i].relocs);
-	  if (finfo.section_info[i].rel_hashes != NULL)
-	    free (finfo.section_info[i].rel_hashes);
-	}
-      free (finfo.section_info);
-      finfo.section_info = NULL;
-    }
-
-  /* If we have optimized stabs strings, output them.  */
-  if (coff_hash_table (info)->stab_info != NULL)
-    {
-      if (! _bfd_write_stab_strings (abfd, &coff_hash_table (info)->stab_info))
-	return false;
-    }
-
-  /* Write out the string table.  */
-  if (obj_raw_syment_count (abfd) != 0)
-    {
-      if (bfd_seek (abfd,
-		    (obj_sym_filepos (abfd)
-		     + obj_raw_syment_count (abfd) * symesz),
-		    SEEK_SET) != 0)
-	return false;
-
-#if STRING_SIZE_SIZE == 4
-      bfd_h_put_32 (abfd,
-		    _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
-		    (bfd_byte *) strbuf);
-#else
- #error Change bfd_h_put_32
-#endif
-
-      if (bfd_write (strbuf, 1, STRING_SIZE_SIZE, abfd) != STRING_SIZE_SIZE)
-	return false;
-
-      if (! _bfd_stringtab_emit (abfd, finfo.strtab))
-	return false;
-    }
-
-  _bfd_stringtab_free (finfo.strtab);
-
-  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
-     not try to write out the symbols.  */
-  bfd_get_symcount (abfd) = 0;
-
-  return true;
-
- error_return:
-  if (debug_merge_allocated)
-    coff_debug_merge_hash_table_free (&finfo.debug_merge);
-  if (finfo.strtab != NULL)
-    _bfd_stringtab_free (finfo.strtab);
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
-
-      for (i = 0; i < abfd->section_count; i++)
-	{
-	  if (finfo.section_info[i].relocs != NULL)
-	    free (finfo.section_info[i].relocs);
-	  if (finfo.section_info[i].rel_hashes != NULL)
-	    free (finfo.section_info[i].rel_hashes);
-	}
-      free (finfo.section_info);
-    }
-  if (finfo.internal_syms != NULL)
-    free (finfo.internal_syms);
-  if (finfo.sec_ptrs != NULL)
-    free (finfo.sec_ptrs);
-  if (finfo.sym_indices != NULL)
-    free (finfo.sym_indices);
-  if (finfo.outsyms != NULL)
-    free (finfo.outsyms);
-  if (finfo.linenos != NULL)
-    free (finfo.linenos);
-  if (finfo.contents != NULL)
-    free (finfo.contents);
-  if (finfo.external_relocs != NULL)
-    free (finfo.external_relocs);
-  if (finfo.internal_relocs != NULL)
-    free (finfo.internal_relocs);
-  if (external_relocs != NULL)
-    free (external_relocs);
-  return false;
-}
-#endif
-
-
-/* The transfer vectors that lead the outside world to all of the above. */
-
-#ifdef TARGET_LITTLE_SYM
-const bfd_target
-TARGET_LITTLE_SYM =
-{
-  TARGET_LITTLE_NAME,		/* name or coff-arm-little */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* FIXME: object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  
-#ifndef COFF_WITH_PE
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-#else
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
-#endif
-
-  0,				/* leading char */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen??? FIXMEmgo */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-  
-  {_bfd_dummy_target, coff_object_p, 	/* bfd_check_format */
-     bfd_generic_archive_p, /* _bfd_dummy_target */ coff_object_p },
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-     bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-  
-  BFD_JUMP_TABLE_GENERIC (coff),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-  
-  COFF_SWAP_TABLE,
-};
-#endif
-
-#ifdef TARGET_BIG_SYM
-const bfd_target
-TARGET_BIG_SYM =
-{
-  TARGET_BIG_NAME,
-  bfd_target_coff_flavour,	
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* FIXME: object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-#ifndef COFF_WITH_PE
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-#else
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC /* section flags */
-   | SEC_LINK_ONCE | SEC_LINK_DUPLICATES),
-#endif
-
-  0,				/* leading char */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen??? FIXMEmgo */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p, 	/* bfd_check_format */
-     bfd_generic_archive_p, /* _bfd_dummy_target */ coff_object_p },
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-     bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (coff),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
-
-#endif
diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c
deleted file mode 100644
index 6b4cd4429c2..00000000000
--- a/bfd/coff-rs6000.c
+++ /dev/null
@@ -1,1418 +0,0 @@
-/* BFD back-end for IBM RS/6000 "XCOFF" files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   FIXME: Can someone provide a transliteration of this name into ASCII?
-   Using the following chars caused a compiler warning on HIUX (so I replaced
-   them with octal escapes), and isn't useful without an understanding of what
-   character set it is.
-   Written by Metin G. Ozisik, Mimi Ph\373\364ng-Th\345o V\365, 
-     and John Gilmore.
-   Archive support from Damon A. Permezel.
-   Contributed by IBM Corporation and Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Internalcoff.h and coffcode.h modify themselves based on this flag.  */
-#define RS6000COFF_C 1
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "coff/rs6000.h"
-#include "libcoff.h"
-
-/* The main body of code is in coffcode.h.  */
-
-static boolean xcoff_mkobject PARAMS ((bfd *));
-static boolean xcoff_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-static boolean xcoff_is_local_label_name PARAMS ((bfd *, const char *));
-static void xcoff_rtype2howto
-  PARAMS ((arelent *, struct internal_reloc *));
-static reloc_howto_type *xcoff_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static boolean xcoff_slurp_armap PARAMS ((bfd *));
-static const bfd_target *xcoff_archive_p PARAMS ((bfd *));
-static PTR xcoff_read_ar_hdr PARAMS ((bfd *));
-static bfd *xcoff_openr_next_archived_file PARAMS ((bfd *, bfd *));
-static int xcoff_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
-static const char *normalize_filename PARAMS ((bfd *));
-static boolean xcoff_write_armap
-  PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-static boolean xcoff_write_archive_contents PARAMS ((bfd *));
-static int _bfd_xcoff_sizeof_headers PARAMS ((bfd *, boolean));
-
-/* We use our own tdata type.  Its first field is the COFF tdata type,
-   so the COFF routines are compatible.  */
-
-static boolean
-xcoff_mkobject (abfd)
-     bfd *abfd;
-{
-  coff_data_type *coff;
-
-  abfd->tdata.xcoff_obj_data =
-    ((struct xcoff_tdata *)
-     bfd_zalloc (abfd, sizeof (struct xcoff_tdata)));
-  if (abfd->tdata.xcoff_obj_data == NULL)
-    return false;
-  coff = coff_data (abfd);
-  coff->symbols = (coff_symbol_type *) NULL;
-  coff->conversion_table = (unsigned int *) NULL;
-  coff->raw_syments = (struct coff_ptr_struct *) NULL;
-  coff->relocbase = 0;
-
-  xcoff_data (abfd)->modtype = ('1' << 8) | 'L';
-
-  /* We set cputype to -1 to indicate that it has not been
-     initialized.  */
-  xcoff_data (abfd)->cputype = -1;
-
-  xcoff_data (abfd)->csects = NULL;
-  xcoff_data (abfd)->debug_indices = NULL;
-
-  return true;
-}
-
-/* Copy XCOFF data from one BFD to another.  */
-
-static boolean
-xcoff_copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  struct xcoff_tdata *ix, *ox;
-  asection *sec;
-
-  if (ibfd->xvec != obfd->xvec)
-    return true;
-  ix = xcoff_data (ibfd);
-  ox = xcoff_data (obfd);
-  ox->full_aouthdr = ix->full_aouthdr;
-  ox->toc = ix->toc;
-  if (ix->sntoc == 0)
-    ox->sntoc = 0;
-  else
-    {
-      sec = coff_section_from_bfd_index (ibfd, ix->sntoc);
-      if (sec == NULL)
-	ox->sntoc = 0;
-      else
-	ox->sntoc = sec->output_section->target_index;
-    }
-  if (ix->snentry == 0)
-    ox->snentry = 0;
-  else
-    {
-      sec = coff_section_from_bfd_index (ibfd, ix->snentry);
-      if (sec == NULL)
-	ox->snentry = 0;
-      else
-	ox->snentry = sec->output_section->target_index;
-    }
-  ox->text_align_power = ix->text_align_power;
-  ox->data_align_power = ix->data_align_power;
-  ox->modtype = ix->modtype;
-  ox->cputype = ix->cputype;
-  ox->maxdata = ix->maxdata;
-  ox->maxstack = ix->maxstack;
-  return true;
-}
-
-/* I don't think XCOFF really has a notion of local labels based on
-   name.  This will mean that ld -X doesn't actually strip anything.
-   The AIX native linker does not have a -X option, and it ignores the
-   -x option.  */
-
-static boolean
-xcoff_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return false;
-}
-
-/* The XCOFF reloc table.  Actually, XCOFF relocations specify the
-   bitsize and whether they are signed or not, along with a
-   conventional type.  This table is for the types, which are used for
-   different algorithms for putting in the reloc.  Many of these
-   relocs need special_function entries, which I have not written.  */
-
-static reloc_howto_type xcoff_howto_table[] =
-{
-  /* Standard 32 bit relocation.  */
-  HOWTO (0,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_POS",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-  /* 32 bit relocation, but store negative value.  */
-  HOWTO (1,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 -2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_NEG",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-  /* 32 bit PC relative relocation.  */
-  HOWTO (2,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 true,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_REL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* 16 bit TOC relative relocation.  */
-  HOWTO (3,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TOC",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* I don't really know what this is.  */
-  HOWTO (4,	                /* type */                                 
-	 1,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RTB",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* External TOC relative symbol.  */
-  HOWTO (5,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_GL",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Local TOC relative symbol.  */
-  HOWTO (6,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TCL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 7 },
-  
-  /* Non modifiable absolute branch.  */
-  HOWTO (8,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_BA",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0x3fffffc,	        /* src_mask */                             
-	 0x3fffffc,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 9 },
-
-  /* Non modifiable relative branch.  */
-  HOWTO (0xa,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */                   
-	 true,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_BR",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0x3fffffc,	        /* src_mask */                             
-	 0x3fffffc,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 0xb },
-
-  /* Indirect load.  */
-  HOWTO (0xc,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RL",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Load address.  */
-  HOWTO (0xd,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RLA",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 0xe },
-  
-  /* Non-relocating reference.  */
-  HOWTO (0xf,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_REF",               /* name */                                 
-	 false,	                /* partial_inplace */                      
-	 0,		        /* src_mask */                             
-	 0,     	   	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 0x10 },
-  { 0x11 },
-  
-  /* TOC relative indirect load.  */
-  HOWTO (0x12,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TRL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* TOC relative load address.  */
-  HOWTO (0x13,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TRLA",              /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable relative branch.  */
-  HOWTO (0x14,	                /* type */                                 
-	 1,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RRTBI",             /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable absolute branch.  */
-  HOWTO (0x15,	                /* type */                                 
-	 1,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RRTBA",             /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable call absolute indirect.  */
-  HOWTO (0x16,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_CAI",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable call relative.  */
-  HOWTO (0x17,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_CREL",              /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch absolute.  */
-  HOWTO (0x18,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RBA",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch absolute.  */
-  HOWTO (0x19,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RBAC",              /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch relative.  */
-  HOWTO (0x1a,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RBR",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch absolute.  */
-  HOWTO (0x1b,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RBRC",              /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false)                 /* pcrel_offset */
-};
-
-static void
-xcoff_rtype2howto (relent, internal)
-     arelent *relent;
-     struct internal_reloc *internal;
-{
-  relent->howto = xcoff_howto_table + internal->r_type;
-
-  /* The r_size field of an XCOFF reloc encodes the bitsize of the
-     relocation, as well as indicating whether it is signed or not.
-     Doublecheck that the relocation information gathered from the
-     type matches this information.  */
-  if (relent->howto->bitsize != ((unsigned int) internal->r_size & 0x1f) + 1)
-    abort ();
-#if 0
-  if ((internal->r_size & 0x80) != 0
-      ? (relent->howto->complain_on_overflow != complain_overflow_signed)
-      : (relent->howto->complain_on_overflow != complain_overflow_bitfield))
-    abort ();
-#endif
-}
-
-static reloc_howto_type *
-xcoff_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_PPC_B26:
-      return &xcoff_howto_table[0xa];
-    case BFD_RELOC_PPC_BA26:
-      return &xcoff_howto_table[8];
-    case BFD_RELOC_PPC_TOC16:
-      return &xcoff_howto_table[3];
-    case BFD_RELOC_32:
-    case BFD_RELOC_CTOR:
-      return &xcoff_howto_table[0];
-    default:
-      return NULL;
-    }
-}
-
-#define SELECT_RELOC(internal, howto)					\
-  {									\
-    internal.r_type = howto->type;					\
-    internal.r_size =							\
-      ((howto->complain_on_overflow == complain_overflow_signed		\
-	? 0x80								\
-	: 0)								\
-       | (howto->bitsize - 1));						\
-  }
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-#define COFF_LONG_FILENAMES
-
-#define RTYPE2HOWTO(cache_ptr, dst) xcoff_rtype2howto (cache_ptr, dst)
-
-#define coff_mkobject xcoff_mkobject
-#define coff_bfd_copy_private_bfd_data xcoff_copy_private_bfd_data
-#define coff_bfd_is_local_label_name xcoff_is_local_label_name
-#define coff_bfd_reloc_type_lookup xcoff_reloc_type_lookup
-#define coff_relocate_section _bfd_ppc_xcoff_relocate_section
-
-#include "coffcode.h"
-
-/* XCOFF archive support.  The original version of this code was by
-   Damon A. Permezel.  It was enhanced to permit cross support, and
-   writing archive files, by Ian Lance Taylor, Cygnus Support.
-
-   XCOFF uses its own archive format.  Everything is hooked together
-   with file offset links, so it is possible to rapidly update an
-   archive in place.  Of course, we don't do that.  An XCOFF archive
-   has a real file header, not just an ARMAG string.  The structure of
-   the file header and of each archive header appear below.
-
-   An XCOFF archive also has a member table, which is a list of
-   elements in the archive (you can get that by looking through the
-   linked list, but you have to read a lot more of the file).  The
-   member table has a normal archive header with an empty name.  It is
-   normally (and perhaps must be) the second to last entry in the
-   archive.  The member table data is almost printable ASCII.  It
-   starts with a 12 character decimal string which is the number of
-   entries in the table.  For each entry it has a 12 character decimal
-   string which is the offset in the archive of that member.  These
-   entries are followed by a series of null terminated strings which
-   are the member names for each entry.
-
-   Finally, an XCOFF archive has a global symbol table, which is what
-   we call the armap.  The global symbol table has a normal archive
-   header with an empty name.  It is normally (and perhaps must be)
-   the last entry in the archive.  The contents start with a four byte
-   binary number which is the number of entries.  This is followed by
-   a that many four byte binary numbers; each is the file offset of an
-   entry in the archive.  These numbers are followed by a series of
-   null terminated strings, which are symbol names.  */
-
-/* XCOFF archives use this as a magic string.  */
-
-#define XCOFFARMAG "<aiaff>\012"
-#define SXCOFFARMAG 8
-
-/* This terminates an XCOFF archive member name.  */
-
-#define XCOFFARFMAG "`\012"
-#define SXCOFFARFMAG 2
-
-/* XCOFF archives start with this (printable) structure.  */
-
-struct xcoff_ar_file_hdr
-{
-  /* Magic string.  */
-  char magic[SXCOFFARMAG];
-
-  /* Offset of the member table (decimal ASCII string).  */
-  char memoff[12];
-
-  /* Offset of the global symbol table (decimal ASCII string).  */
-  char symoff[12];
-
-  /* Offset of the first member in the archive (decimal ASCII string).  */
-  char firstmemoff[12];
-
-  /* Offset of the last member in the archive (decimal ASCII string).  */
-  char lastmemoff[12];
-
-  /* Offset of the first member on the free list (decimal ASCII
-     string).  */
-  char freeoff[12];
-};
-
-#define SIZEOF_AR_FILE_HDR (5 * 12 + SXCOFFARMAG)
-
-/* Each XCOFF archive member starts with this (printable) structure.  */
-
-struct xcoff_ar_hdr
-{
-  /* File size not including the header (decimal ASCII string).  */
-  char size[12];
-
-  /* File offset of next archive member (decimal ASCII string).  */
-  char nextoff[12];
-
-  /* File offset of previous archive member (decimal ASCII string).  */
-  char prevoff[12];
-
-  /* File mtime (decimal ASCII string).  */
-  char date[12];
-
-  /* File UID (decimal ASCII string).  */
-  char uid[12];
-
-  /* File GID (decimal ASCII string).  */
-  char gid[12];
-
-  /* File mode (octal ASCII string).  */
-  char mode[12];
-
-  /* Length of file name (decimal ASCII string).  */
-  char namlen[4];
-
-  /* This structure is followed by the file name.  The length of the
-     name is given in the namlen field.  If the length of the name is
-     odd, the name is followed by a null byte.  The name and optional
-     null byte are followed by XCOFFARFMAG, which is not included in
-     namlen.  The contents of the archive member follow; the number of
-     bytes is given in the size field.  */
-};
-
-#define SIZEOF_AR_HDR (7 * 12 + 4)
-
-/* We store a copy of the xcoff_ar_file_hdr in the tdata field of the
-   artdata structure.  */
-#define xcoff_ardata(abfd) \
-  ((struct xcoff_ar_file_hdr *) bfd_ardata (abfd)->tdata)
-
-/* We store a copy of the xcoff_ar_hdr in the arelt_data field of an
-   archive element.  */
-#define arch_eltdata(bfd) ((struct areltdata *) ((bfd)->arelt_data))
-#define arch_xhdr(bfd) \
-  ((struct xcoff_ar_hdr *) arch_eltdata (bfd)->arch_header)
-
-/* XCOFF archives do not have anything which corresponds to an
-   extended name table.  */
-
-#define xcoff_slurp_extended_name_table bfd_false
-#define xcoff_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
-   bfd_false)
-#define xcoff_truncate_arname bfd_dont_truncate_arname
-
-/* We can use the standard get_elt_at_index routine.  */
-
-#define xcoff_get_elt_at_index _bfd_generic_get_elt_at_index
-
-/* XCOFF archives do not have a timestamp.  */
-
-#define xcoff_update_armap_timestamp bfd_true
-
-/* Read in the armap of an XCOFF archive.  */
-
-static boolean
-xcoff_slurp_armap (abfd)
-     bfd *abfd;
-{
-  file_ptr off;
-  struct xcoff_ar_hdr hdr;
-  size_t namlen;
-  bfd_size_type sz;
-  bfd_byte *contents, *cend;
-  unsigned int c, i;
-  carsym *arsym;
-  bfd_byte *p;
-
-  if (xcoff_ardata (abfd) == NULL)
-    {
-      bfd_has_map (abfd) = false;
-      return true;
-    }
-
-  off = strtol (xcoff_ardata (abfd)->symoff, (char **) NULL, 10);
-  if (off == 0)
-    {
-      bfd_has_map (abfd) = false;
-      return true;
-    }
-
-  if (bfd_seek (abfd, off, SEEK_SET) != 0)
-    return false;
-
-  /* The symbol table starts with a normal archive header.  */
-  if (bfd_read ((PTR) &hdr, SIZEOF_AR_HDR, 1, abfd) != SIZEOF_AR_HDR)
-    return false;
-
-  /* Skip the name (normally empty).  */
-  namlen = strtol (hdr.namlen, (char **) NULL, 10);
-  if (bfd_seek (abfd, ((namlen + 1) & ~1) + SXCOFFARFMAG, SEEK_CUR) != 0)
-    return false;
-
-  /* Read in the entire symbol table.  */
-  sz = strtol (hdr.size, (char **) NULL, 10);
-  contents = (bfd_byte *) bfd_alloc (abfd, sz);
-  if (contents == NULL)
-    return false;
-  if (bfd_read ((PTR) contents, 1, sz, abfd) != sz)
-    return false;
-
-  /* The symbol table starts with a four byte count.  */
-  c = bfd_h_get_32 (abfd, contents);
-
-  if (c * 4 >= sz)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  bfd_ardata (abfd)->symdefs = ((carsym *)
-				bfd_alloc (abfd, c * sizeof (carsym)));
-  if (bfd_ardata (abfd)->symdefs == NULL)
-    return false;
-
-  /* After the count comes a list of four byte file offsets.  */
-  for (i = 0, arsym = bfd_ardata (abfd)->symdefs, p = contents + 4;
-       i < c;
-       ++i, ++arsym, p += 4)
-    arsym->file_offset = bfd_h_get_32 (abfd, p);
-
-  /* After the file offsets come null terminated symbol names.  */
-  cend = contents + sz;
-  for (i = 0, arsym = bfd_ardata (abfd)->symdefs;
-       i < c;
-       ++i, ++arsym, p += strlen ((char *) p) + 1)
-    {
-      if (p >= cend)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      arsym->name = (char *) p;
-    }
-
-  bfd_ardata (abfd)->symdef_count = c;
-  bfd_has_map (abfd) = true;
-
-  return true;
-}
-
-/* See if this is an XCOFF archive.  */
-
-static const bfd_target *
-xcoff_archive_p (abfd)
-     bfd *abfd;
-{
-  struct xcoff_ar_file_hdr hdr;
-
-  if (bfd_read ((PTR) &hdr, SIZEOF_AR_FILE_HDR, 1, abfd)
-      != SIZEOF_AR_FILE_HDR)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (strncmp (hdr.magic, XCOFFARMAG, SXCOFFARMAG) != 0)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* We are setting bfd_ardata(abfd) here, but since bfd_ardata
-     involves a cast, we can't do it as the left operand of
-     assignment.  */
-  abfd->tdata.aout_ar_data =
-    (struct artdata *) bfd_zalloc (abfd, sizeof (struct artdata));
-
-  if (bfd_ardata (abfd) == (struct artdata *) NULL)
-    return NULL;
-
-  bfd_ardata (abfd)->first_file_filepos = strtol (hdr.firstmemoff,
-						  (char **) NULL, 10);
-  bfd_ardata (abfd)->cache = NULL;
-  bfd_ardata (abfd)->archive_head = NULL;
-  bfd_ardata (abfd)->symdefs = NULL;
-  bfd_ardata (abfd)->extended_names = NULL;
-
-  bfd_ardata (abfd)->tdata = bfd_zalloc (abfd, SIZEOF_AR_FILE_HDR);
-  if (bfd_ardata (abfd)->tdata == NULL)
-    return NULL;
-
-  memcpy (bfd_ardata (abfd)->tdata, &hdr, SIZEOF_AR_FILE_HDR);
-
-  if (! xcoff_slurp_armap (abfd))
-    {
-      bfd_release (abfd, bfd_ardata (abfd));
-      abfd->tdata.aout_ar_data = (struct artdata *) NULL;
-      return NULL;
-    }
-
-  return abfd->xvec;
-}
-
-/* Read the archive header in an XCOFF archive.  */
-
-static PTR
-xcoff_read_ar_hdr (abfd)
-     bfd *abfd;
-{
-  struct xcoff_ar_hdr hdr;
-  size_t namlen;
-  struct xcoff_ar_hdr *hdrp;
-  struct areltdata *ret;
-
-  if (bfd_read ((PTR) &hdr, SIZEOF_AR_HDR, 1, abfd) != SIZEOF_AR_HDR)
-    return NULL;
-
-  namlen = strtol (hdr.namlen, (char **) NULL, 10);
-  hdrp = (struct xcoff_ar_hdr *) bfd_alloc (abfd, SIZEOF_AR_HDR + namlen + 1);
-  if (hdrp == NULL)
-    return NULL;
-  memcpy (hdrp, &hdr, SIZEOF_AR_HDR);
-  if (bfd_read ((char *) hdrp + SIZEOF_AR_HDR, 1, namlen, abfd) != namlen)
-    return NULL;
-  ((char *) hdrp)[SIZEOF_AR_HDR + namlen] = '\0';
-
-  ret = (struct areltdata *) bfd_alloc (abfd, sizeof (struct areltdata));
-  if (ret == NULL)
-    return NULL;
-  ret->arch_header = (char *) hdrp;
-  ret->parsed_size = strtol (hdr.size, (char **) NULL, 10);
-  ret->filename = (char *) hdrp + SIZEOF_AR_HDR;
-
-  /* Skip over the XCOFFARFMAG at the end of the file name.  */
-  if (bfd_seek (abfd, (namlen & 1) + SXCOFFARFMAG, SEEK_CUR) != 0)
-    return NULL;
-
-  return (PTR) ret;
-}
-
-/* Open the next element in an XCOFF archive.  */
-
-static bfd *
-xcoff_openr_next_archived_file (archive, last_file)
-     bfd *archive;
-     bfd *last_file;
-{
-  file_ptr filestart;
-
-  if (xcoff_ardata (archive) == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return NULL;
-    }
-
-  if (last_file == NULL)
-    filestart = bfd_ardata (archive)->first_file_filepos;
-  else
-    filestart = strtol (arch_xhdr (last_file)->nextoff, (char **) NULL, 10);
-
-  if (filestart == 0
-      || filestart == strtol (xcoff_ardata (archive)->memoff,
-			      (char **) NULL, 10)
-      || filestart == strtol (xcoff_ardata (archive)->symoff,
-			      (char **) NULL, 10))
-    {
-      bfd_set_error (bfd_error_no_more_archived_files);
-      return NULL;
-    }
-
-  return _bfd_get_elt_at_filepos (archive, filestart);
-}
-
-/* Stat an element in an XCOFF archive.  */
-
-static int
-xcoff_generic_stat_arch_elt (abfd, s)
-     bfd *abfd;
-     struct stat *s;
-{
-  struct xcoff_ar_hdr *hdrp;
-
-  if (abfd->arelt_data == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  hdrp = arch_xhdr (abfd);
-
-  s->st_mtime = strtol (hdrp->date, (char **) NULL, 10);
-  s->st_uid = strtol (hdrp->uid, (char **) NULL, 10);
-  s->st_gid = strtol (hdrp->gid, (char **) NULL, 10);
-  s->st_mode = strtol (hdrp->mode, (char **) NULL, 8);
-  s->st_size = arch_eltdata (abfd)->parsed_size;
-
-  return 0;
-}
-
-/* Normalize a file name for inclusion in an archive.  */
-
-static const char *
-normalize_filename (abfd)
-     bfd *abfd;
-{
-  const char *file;
-  const char *filename;
-
-  file = bfd_get_filename (abfd);
-  filename = strrchr (file, '/');
-  if (filename != NULL)
-    filename++;
-  else
-    filename = file;
-  return filename;
-}
-
-/* Write out an XCOFF armap.  */
-
-/*ARGSUSED*/
-static boolean
-xcoff_write_armap (abfd, elength, map, orl_count, stridx)
-     bfd *abfd;
-     unsigned int elength;
-     struct orl *map;
-     unsigned int orl_count;
-     int stridx;
-{
-  struct xcoff_ar_hdr hdr;
-  char *p;
-  unsigned char buf[4];
-  bfd *sub;
-  file_ptr fileoff;
-  unsigned int i;
-
-  memset (&hdr, 0, sizeof hdr);
-  sprintf (hdr.size, "%ld", (long) (4 + orl_count * 4 + stridx));
-  sprintf (hdr.nextoff, "%d", 0);
-  memcpy (hdr.prevoff, xcoff_ardata (abfd)->memoff, 12);
-  sprintf (hdr.date, "%d", 0);
-  sprintf (hdr.uid, "%d", 0);
-  sprintf (hdr.gid, "%d", 0);
-  sprintf (hdr.mode, "%d", 0);
-  sprintf (hdr.namlen, "%d", 0);
-
-  /* We need spaces, not null bytes, in the header.  */
-  for (p = (char *) &hdr; p < (char *) &hdr + SIZEOF_AR_HDR; p++)
-    if (*p == '\0')
-      *p = ' ';
-
-  if (bfd_write ((PTR) &hdr, SIZEOF_AR_HDR, 1, abfd) != SIZEOF_AR_HDR
-      || bfd_write (XCOFFARFMAG, 1, SXCOFFARFMAG, abfd) != SXCOFFARFMAG)
-    return false;
-  
-  bfd_h_put_32 (abfd, orl_count, buf);
-  if (bfd_write (buf, 1, 4, abfd) != 4)
-    return false;
-
-  sub = abfd->archive_head;
-  fileoff = SIZEOF_AR_FILE_HDR;
-  i = 0;
-  while (sub != NULL && i < orl_count)
-    {
-      size_t namlen;
-
-      while (((bfd *) (map[i]).pos) == sub)
-	{
-	  bfd_h_put_32 (abfd, fileoff, buf);
-	  if (bfd_write (buf, 1, 4, abfd) != 4)
-	    return false;
-	  ++i;
-	}
-      namlen = strlen (normalize_filename (sub));
-      namlen = (namlen + 1) &~ 1;
-      fileoff += (SIZEOF_AR_HDR
-		  + namlen
-		  + SXCOFFARFMAG
-		  + arelt_size (sub));
-      fileoff = (fileoff + 1) &~ 1;
-      sub = sub->next;
-    }
-
-  for (i = 0; i < orl_count; i++)
-    {
-      const char *name;
-      size_t namlen;
-
-      name = *map[i].name;
-      namlen = strlen (name);
-      if (bfd_write (name, 1, namlen + 1, abfd) != namlen + 1)
-	return false;
-    }
-
-  if ((stridx & 1) != 0)
-    {
-      char b;
-
-      b = '\0';
-      if (bfd_write (&b, 1, 1, abfd) != 1)
-	return false;
-    }
-
-  return true;
-}
-
-/* Write out an XCOFF archive.  We always write an entire archive,
-   rather than fussing with the freelist and so forth.  */
-
-static boolean
-xcoff_write_archive_contents (abfd)
-     bfd *abfd;
-{
-  struct xcoff_ar_file_hdr fhdr;
-  size_t count;
-  size_t total_namlen;
-  file_ptr *offsets;
-  boolean makemap;
-  boolean hasobjects;
-  file_ptr prevoff, nextoff;
-  bfd *sub;
-  unsigned int i;
-  struct xcoff_ar_hdr ahdr;
-  bfd_size_type size;
-  char *p;
-  char decbuf[13];
-
-  memset (&fhdr, 0, sizeof fhdr);
-  strncpy (fhdr.magic, XCOFFARMAG, SXCOFFARMAG);
-  sprintf (fhdr.firstmemoff, "%d", SIZEOF_AR_FILE_HDR);
-  sprintf (fhdr.freeoff, "%d", 0);
-
-  count = 0;
-  total_namlen = 0;
-  for (sub = abfd->archive_head; sub != NULL; sub = sub->next)
-    {
-      ++count;
-      total_namlen += strlen (normalize_filename (sub)) + 1;
-    }
-  offsets = (file_ptr *) bfd_alloc (abfd, count * sizeof (file_ptr));
-  if (offsets == NULL)
-    return false;
-
-  if (bfd_seek (abfd, SIZEOF_AR_FILE_HDR, SEEK_SET) != 0)
-    return false;
-
-  makemap = bfd_has_map (abfd);
-  hasobjects = false;
-  prevoff = 0;
-  nextoff = SIZEOF_AR_FILE_HDR;
-  for (sub = abfd->archive_head, i = 0; sub != NULL; sub = sub->next, i++)
-    {
-      const char *name;
-      size_t namlen;
-      struct xcoff_ar_hdr *ahdrp;
-      bfd_size_type remaining;
-
-      if (makemap && ! hasobjects)
-	{
-	  if (bfd_check_format (sub, bfd_object))
-	    hasobjects = true;
-	}
-
-      name = normalize_filename (sub);
-      namlen = strlen (name);
-
-      if (sub->arelt_data != NULL)
-	ahdrp = arch_xhdr (sub);
-      else
-	ahdrp = NULL;
-
-      if (ahdrp == NULL)
-	{
-	  struct stat s;
-
-	  memset (&ahdr, 0, sizeof ahdr);
-	  ahdrp = &ahdr;
-	  if (stat (bfd_get_filename (sub), &s) != 0)
-	    {
-	      bfd_set_error (bfd_error_system_call);
-	      return false;
-	    }
-
-	  sprintf (ahdrp->size, "%ld", (long) s.st_size);
-	  sprintf (ahdrp->date, "%ld", (long) s.st_mtime);
-	  sprintf (ahdrp->uid, "%ld", (long) s.st_uid);
-	  sprintf (ahdrp->gid, "%ld", (long) s.st_gid);
-	  sprintf (ahdrp->mode, "%o", (unsigned int) s.st_mode);
-
-	  if (sub->arelt_data == NULL)
-	    {
-	      sub->arelt_data = bfd_alloc (sub, sizeof (struct areltdata));
-	      if (sub->arelt_data == NULL)
-		return false;
-	    }
-
-	  arch_eltdata (sub)->parsed_size = s.st_size;
-	}
-
-      sprintf (ahdrp->prevoff, "%ld", (long) prevoff);
-      sprintf (ahdrp->namlen, "%ld", (long) namlen);
-
-      /* If the length of the name is odd, we write out the null byte
-         after the name as well.  */
-      namlen = (namlen + 1) &~ 1;
-
-      remaining = arelt_size (sub);
-      size = (SIZEOF_AR_HDR
-	      + namlen
-	      + SXCOFFARFMAG
-	      + remaining);
-
-      BFD_ASSERT (nextoff == bfd_tell (abfd));
-
-      offsets[i] = nextoff;
-
-      prevoff = nextoff;
-      nextoff += size + (size & 1);
-
-      sprintf (ahdrp->nextoff, "%ld", (long) nextoff);
-
-      /* We need spaces, not null bytes, in the header.  */
-      for (p = (char *) ahdrp; p < (char *) ahdrp + SIZEOF_AR_HDR; p++)
-	if (*p == '\0')
-	  *p = ' ';
-
-      if (bfd_write ((PTR) ahdrp, 1, SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR
-	  || bfd_write ((PTR) name, 1, namlen, abfd) != namlen
-	  || (bfd_write ((PTR) XCOFFARFMAG, 1, SXCOFFARFMAG, abfd)
-	      != SXCOFFARFMAG))
-	return false;
-
-      if (bfd_seek (sub, (file_ptr) 0, SEEK_SET) != 0)
-	return false;
-      while (remaining != 0)
-	{
-	  bfd_size_type amt;
-	  bfd_byte buffer[DEFAULT_BUFFERSIZE];
-
-	  amt = sizeof buffer;
-	  if (amt > remaining)
-	    amt = remaining;
-	  if (bfd_read (buffer, 1, amt, sub) != amt
-	      || bfd_write (buffer, 1, amt, abfd) != amt)
-	    return false;
-	  remaining -= amt;
-	}
-
-      if ((size & 1) != 0)
-	{
-	  bfd_byte b;
-
-	  b = '\0';
-	  if (bfd_write (&b, 1, 1, abfd) != 1)
-	    return false;
-	}
-    }
-
-  sprintf (fhdr.lastmemoff, "%ld", (long) prevoff);
-
-  /* Write out the member table.  */
-
-  BFD_ASSERT (nextoff == bfd_tell (abfd));
-  sprintf (fhdr.memoff, "%ld", (long) nextoff);
-
-  memset (&ahdr, 0, sizeof ahdr);
-  sprintf (ahdr.size, "%ld", (long) (12 + count * 12 + total_namlen));
-  sprintf (ahdr.prevoff, "%ld", (long) prevoff);
-  sprintf (ahdr.date, "%d", 0);
-  sprintf (ahdr.uid, "%d", 0);
-  sprintf (ahdr.gid, "%d", 0);
-  sprintf (ahdr.mode, "%d", 0);
-  sprintf (ahdr.namlen, "%d", 0);
-
-  size = (SIZEOF_AR_HDR
-	  + 12
-	  + count * 12
-	  + total_namlen
-	  + SXCOFFARFMAG);
-
-  prevoff = nextoff;
-  nextoff += size + (size & 1);
-
-  if (makemap && hasobjects)
-    sprintf (ahdr.nextoff, "%ld", (long) nextoff);
-  else
-    sprintf (ahdr.nextoff, "%d", 0);
-
-  /* We need spaces, not null bytes, in the header.  */
-  for (p = (char *) &ahdr; p < (char *) &ahdr + SIZEOF_AR_HDR; p++)
-    if (*p == '\0')
-      *p = ' ';
-
-  if (bfd_write ((PTR) &ahdr, 1, SIZEOF_AR_HDR, abfd) != SIZEOF_AR_HDR
-      || (bfd_write ((PTR) XCOFFARFMAG, 1, SXCOFFARFMAG, abfd)
-	  != SXCOFFARFMAG))
-    return false;
-
-  sprintf (decbuf, "%-12ld", (long) count);
-  if (bfd_write ((PTR) decbuf, 1, 12, abfd) != 12)
-    return false;
-  for (i = 0; i < count; i++)
-    {
-      sprintf (decbuf, "%-12ld", (long) offsets[i]);
-      if (bfd_write ((PTR) decbuf, 1, 12, abfd) != 12)
-	return false;
-    }
-  for (sub = abfd->archive_head; sub != NULL; sub = sub->next)
-    {
-      const char *name;
-      size_t namlen;
-
-      name = normalize_filename (sub);
-      namlen = strlen (name);
-      if (bfd_write ((PTR) name, 1, namlen + 1, abfd) != namlen + 1)
-	return false;
-    }
-  if ((size & 1) != 0)
-    {
-      bfd_byte b;
-
-      b = '\0';
-      if (bfd_write ((PTR) &b, 1, 1, abfd) != 1)
-	return false;
-    }
-
-  /* Write out the armap, if appropriate.  */
-
-  if (! makemap || ! hasobjects)
-    sprintf (fhdr.symoff, "%d", 0);
-  else
-    {
-      BFD_ASSERT (nextoff == bfd_tell (abfd));
-      sprintf (fhdr.symoff, "%ld", (long) nextoff);
-      bfd_ardata (abfd)->tdata = (PTR) &fhdr;
-      if (! _bfd_compute_and_write_armap (abfd, 0))
-	return false;
-    }
-
-  /* Write out the archive file header.  */
-
-  /* We need spaces, not null bytes, in the header.  */
-  for (p = (char *) &fhdr; p < (char *) &fhdr + SIZEOF_AR_FILE_HDR; p++)
-    if (*p == '\0')
-      *p = ' ';
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || (bfd_write ((PTR) &fhdr, SIZEOF_AR_FILE_HDR, 1, abfd) !=
-	  SIZEOF_AR_FILE_HDR))
-    return false;
-
-  return true;
-}
-
-/* We can't use the usual coff_sizeof_headers routine, because AIX
-   always uses an a.out header.  */
-
-/*ARGSUSED*/
-static int
-_bfd_xcoff_sizeof_headers (abfd, reloc)
-     bfd *abfd;
-     boolean reloc;
-{
-  int size;
-
-  size = FILHSZ;
-  if (xcoff_data (abfd)->full_aouthdr)
-    size += AOUTSZ;
-  else
-    size += SMALL_AOUTSZ;
-  size += abfd->section_count * SCNHSZ;
-  return size;
-}
-
-#define CORE_FILE_P _bfd_dummy_target
-
-#define coff_core_file_failing_command _bfd_nocore_core_file_failing_command
-#define coff_core_file_failing_signal _bfd_nocore_core_file_failing_signal
-#define coff_core_file_matches_executable_p \
-  _bfd_nocore_core_file_matches_executable_p
-
-#ifdef AIX_CORE
-#undef CORE_FILE_P
-#define CORE_FILE_P rs6000coff_core_p
-extern const bfd_target * rs6000coff_core_p ();
-extern boolean rs6000coff_get_section_contents ();
-extern boolean rs6000coff_core_file_matches_executable_p ();
-
-#undef	coff_core_file_matches_executable_p
-#define coff_core_file_matches_executable_p  \
-				     rs6000coff_core_file_matches_executable_p
-
-extern char *rs6000coff_core_file_failing_command PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_command
-#define coff_core_file_failing_command rs6000coff_core_file_failing_command
-
-extern int rs6000coff_core_file_failing_signal PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_signal
-#define coff_core_file_failing_signal rs6000coff_core_file_failing_signal
-
-#undef	coff_get_section_contents
-#define	coff_get_section_contents	rs6000coff_get_section_contents
-#endif /* AIX_CORE */
-
-#ifdef LYNX_CORE
-
-#undef CORE_FILE_P
-#define CORE_FILE_P lynx_core_file_p
-extern const bfd_target *lynx_core_file_p PARAMS ((bfd *abfd));
-
-extern boolean lynx_core_file_matches_executable_p PARAMS ((bfd *core_bfd,
-							    bfd *exec_bfd));
-#undef	coff_core_file_matches_executable_p
-#define coff_core_file_matches_executable_p lynx_core_file_matches_executable_p
-
-extern char *lynx_core_file_failing_command PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_command
-#define coff_core_file_failing_command lynx_core_file_failing_command
-
-extern int lynx_core_file_failing_signal PARAMS ((bfd *abfd));
-#undef coff_core_file_failing_signal
-#define coff_core_file_failing_signal lynx_core_file_failing_signal
-
-#endif /* LYNX_CORE */
-
-#define _bfd_xcoff_bfd_get_relocated_section_contents \
-  coff_bfd_get_relocated_section_contents
-#define _bfd_xcoff_bfd_relax_section coff_bfd_relax_section
-#define _bfd_xcoff_bfd_gc_sections coff_bfd_gc_sections
-#define _bfd_xcoff_bfd_link_split_section coff_bfd_link_split_section
-
-/* The transfer vector that leads the outside world to all of the above. */
-
-const bfd_target
-#ifdef TARGET_SYM
-  TARGET_SYM =
-#else
-  rs6000coff_vec =
-#endif
-{
-#ifdef TARGET_NAME
-  TARGET_NAME,
-#else
-  "aixcoff-rs6000",		/* name */
-#endif
-  bfd_target_coff_flavour,	
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG | DYNAMIC |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  0,				/* leading char */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen??? FIXMEmgo */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p, 	/* bfd_check_format */
-     xcoff_archive_p, CORE_FILE_P},
-  {bfd_false, coff_mkobject,		/* bfd_set_format */
-     _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-     xcoff_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (coff),
-     BFD_JUMP_TABLE_ARCHIVE (xcoff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (_bfd_xcoff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_xcoff),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-sh.c b/bfd/coff-sh.c
deleted file mode 100644
index e3d6eec00d9..00000000000
--- a/bfd/coff-sh.c
+++ /dev/null
@@ -1,2959 +0,0 @@
-/* BFD back-end for Hitachi Super-H COFF binaries.
-   Copyright 1993, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-   Written by Steve Chamberlain, <sac@cygnus.com>.
-   Relaxing code written by Ian Lance Taylor, <ian@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "coff/sh.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-/* Internal functions.  */
-static bfd_reloc_status_type sh_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static long get_symbol_value PARAMS ((asymbol *));
-static boolean sh_merge_private_data PARAMS ((bfd *, bfd *));
-static boolean sh_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean sh_relax_delete_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, int));
-static const struct sh_opcode *sh_insn_info PARAMS ((unsigned int));
-static boolean sh_align_loads
-  PARAMS ((bfd *, asection *, struct internal_reloc *, bfd_byte *, boolean *));
-static boolean sh_swap_insns
-  PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
-static boolean sh_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-static bfd_byte *sh_coff_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
-
-/* Default section alignment to 2**4.  */
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (4)
-
-/* Generate long file names.  */
-#define COFF_LONG_FILENAMES
-
-/* The supported relocations.  There are a lot of relocations defined
-   in coff/internal.h which we do not expect to ever see.  */
-static reloc_howto_type sh_coff_howtos[] =
-{
-  { 0 },
-  { 1 },
-  { 2 },
-  { 3 }, /* R_SH_PCREL8 */
-  { 4 }, /* R_SH_PCREL16 */
-  { 5 }, /* R_SH_HIGH8 */
-  { 6 }, /* R_SH_IMM24 */
-  { 7 }, /* R_SH_LOW16 */
-  { 8 },
-  { 9 }, /* R_SH_PCDISP8BY4 */
-
-  HOWTO (R_SH_PCDISP8BY2,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_pcdisp8by2",	/* name */
-	 true,			/* partial_inplace */
-	 0xff,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  { 11 }, /* R_SH_PCDISP8 */
-
-  HOWTO (R_SH_PCDISP,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_pcdisp12by2",	/* name */
-	 true,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  { 13 },
-
-  HOWTO (R_SH_IMM32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_imm32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  { 15 },
-  { 16 }, /* R_SH_IMM8 */
-  { 17 }, /* R_SH_IMM8BY2 */
-  { 18 }, /* R_SH_IMM8BY4 */
-  { 19 }, /* R_SH_IMM4 */
-  { 20 }, /* R_SH_IMM4BY2 */
-  { 21 }, /* R_SH_IMM4BY4 */
-
-  HOWTO (R_SH_PCRELIMM8BY2,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_pcrelimm8by2",	/* name */
-	 true,			/* partial_inplace */
-	 0xff,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  HOWTO (R_SH_PCRELIMM8BY4,	/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_pcrelimm8by4",	/* name */
-	 true,			/* partial_inplace */
-	 0xff,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  HOWTO (R_SH_IMM16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_imm16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_SWITCH16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_switch16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_SWITCH32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_switch32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_USES,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_uses",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_COUNT,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_count",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_ALIGN,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_align",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_CODE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_code",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_DATA,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_data",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_LABEL,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_label",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_SH_SWITCH8,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_reloc,		/* special_function */
-	 "r_switch8",		/* name */
-	 true,			/* partial_inplace */
-	 0xff,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 false)			/* pcrel_offset */
-};
-
-#define SH_COFF_HOWTO_COUNT (sizeof sh_coff_howtos / sizeof sh_coff_howtos[0])
-
-/* Check for a bad magic number.  */
-#define BADMAG(x) SHBADMAG(x)
-
-/* Customize coffcode.h (this is not currently used).  */
-#define SH 1
-
-/* FIXME: This should not be set here.  */
-#define __A_MAGIC_SET__
-
-/* Swap the r_offset field in and out.  */
-#define SWAP_IN_RELOC_OFFSET  bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
-
-/* Swap out extra information in the reloc structure.  */
-#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst)	\
-  do						\
-    {						\
-      dst->r_stuff[0] = 'S';			\
-      dst->r_stuff[1] = 'C';			\
-    }						\
-  while (0)
-
-/* Get the value of a symbol, when performing a relocation.  */
-
-static long
-get_symbol_value (symbol)       
-     asymbol *symbol;
-{                                             
-  bfd_vma relocation;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;                           
-  else 
-    relocation = (symbol->value +
-		  symbol->section->output_section->vma +
-		  symbol->section->output_offset);
-
-  return relocation;
-}
-
-/* This macro is used in coffcode.h to get the howto corresponding to
-   an internal reloc.  */
-
-#define RTYPE2HOWTO(relent, internal)		\
-  ((relent)->howto =				\
-   ((internal)->r_type < SH_COFF_HOWTO_COUNT	\
-    ? &sh_coff_howtos[(internal)->r_type]	\
-    : (reloc_howto_type *) NULL))
-
-/* This is the same as the macro in coffcode.h, except that it copies
-   r_offset into reloc_entry->addend for some relocs.  */
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
-  {                                                             \
-    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
-    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
-      coffsym = (obj_symbols (abfd)                             \
-                 + (cache_ptr->sym_ptr_ptr - symbols));         \
-    else if (ptr)                                               \
-      coffsym = coff_symbol_from (abfd, ptr);                   \
-    if (coffsym != (coff_symbol_type *) NULL                    \
-        && coffsym->native->u.syment.n_scnum == 0)              \
-      cache_ptr->addend = 0;                                    \
-    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
-             && ptr->section != (asection *) NULL)              \
-      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
-    else                                                        \
-      cache_ptr->addend = 0;                                    \
-    if ((reloc).r_type == R_SH_SWITCH8				\
-	|| (reloc).r_type == R_SH_SWITCH16			\
-	|| (reloc).r_type == R_SH_SWITCH32			\
-	|| (reloc).r_type == R_SH_USES				\
-	|| (reloc).r_type == R_SH_COUNT				\
-	|| (reloc).r_type == R_SH_ALIGN)			\
-      cache_ptr->addend = (reloc).r_offset;			\
-  }
-
-/* This is the howto function for the SH relocations.  */
-
-static bfd_reloc_status_type
-sh_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  unsigned long insn;
-  bfd_vma sym_value;
-  unsigned short r_type;
-  bfd_vma addr = reloc_entry->address;
-  bfd_byte *hit_data = addr + (bfd_byte *) data;
-
-  r_type = reloc_entry->howto->type;
-
-  if (output_bfd != NULL)
-    {
-      /* Partial linking--do nothing.  */
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* Almost all relocs have to do with relaxing.  If any work must be
-     done for them, it has been done in sh_relax_section.  */
-  if (r_type != R_SH_IMM32
-      && (r_type != R_SH_PCDISP
-	  || (symbol_in->flags & BSF_LOCAL) != 0))
-    return bfd_reloc_ok;
-
-  if (symbol_in != NULL
-      && bfd_is_und_section (symbol_in->section))
-    return bfd_reloc_undefined;
-
-  sym_value = get_symbol_value (symbol_in);
-
-  switch (r_type)
-    {
-    case R_SH_IMM32:
-      insn = bfd_get_32 (abfd, hit_data);
-      insn += sym_value + reloc_entry->addend;
-      bfd_put_32 (abfd, insn, hit_data);
-      break;
-    case R_SH_PCDISP:
-      insn = bfd_get_16 (abfd, hit_data);
-      sym_value += reloc_entry->addend;
-      sym_value -= (input_section->output_section->vma
-		    + input_section->output_offset
-		    + addr
-		    + 4);
-      sym_value += (insn & 0xfff) << 1;
-      if (insn & 0x800)
-	sym_value -= 0x1000;
-      insn = (insn & 0xf000) | (sym_value & 0xfff);
-      bfd_put_16 (abfd, insn, hit_data);
-      if (sym_value < (bfd_vma) -0x1000 || sym_value >= 0x1000)
-	return bfd_reloc_overflow;
-      break;
-    default:
-      abort ();
-      break;
-    }
-
-  return bfd_reloc_ok;
-}
-
-/* This routine checks for linking big and little endian objects
-   together.  */
-
-static boolean
-sh_merge_private_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  if (ibfd->xvec->byteorder != obfd->xvec->byteorder
-      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
-    {
-      (*_bfd_error_handler)
-	("%s: compiled for a %s endian system and target is %s endian",
-	 bfd_get_filename (ibfd),
-	 bfd_big_endian (ibfd) ? "big" : "little",
-	 bfd_big_endian (obfd) ? "big" : "little");
-
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  return true;
-}
-
-#define coff_bfd_merge_private_bfd_data sh_merge_private_data
-
-/* We can do relaxing.  */
-#define coff_bfd_relax_section sh_relax_section
-
-/* We use the special COFF backend linker.  */
-#define coff_relocate_section sh_relocate_section
-
-/* When relaxing, we need to use special code to get the relocated
-   section contents.  */
-#define coff_bfd_get_relocated_section_contents \
-  sh_coff_get_relocated_section_contents
-
-#include "coffcode.h"
-
-/* This function handles relaxing on the SH.
-
-   Function calls on the SH look like this:
-
-       movl  L1,r0
-       ...
-       jsr   @r0
-       ...
-     L1:
-       .long function
-
-   The compiler and assembler will cooperate to create R_SH_USES
-   relocs on the jsr instructions.  The r_offset field of the
-   R_SH_USES reloc is the PC relative offset to the instruction which
-   loads the register (the r_offset field is computed as though it
-   were a jump instruction, so the offset value is actually from four
-   bytes past the instruction).  The linker can use this reloc to
-   determine just which function is being called, and thus decide
-   whether it is possible to replace the jsr with a bsr.
-
-   If multiple function calls are all based on a single register load
-   (i.e., the same function is called multiple times), the compiler
-   guarantees that each function call will have an R_SH_USES reloc.
-   Therefore, if the linker is able to convert each R_SH_USES reloc
-   which refers to that address, it can safely eliminate the register
-   load.
-
-   When the assembler creates an R_SH_USES reloc, it examines it to
-   determine which address is being loaded (L1 in the above example).
-   It then counts the number of references to that address, and
-   creates an R_SH_COUNT reloc at that address.  The r_offset field of
-   the R_SH_COUNT reloc will be the number of references.  If the
-   linker is able to eliminate a register load, it can use the
-   R_SH_COUNT reloc to see whether it can also eliminate the function
-   address.
-
-   SH relaxing also handles another, unrelated, matter.  On the SH, if
-   a load or store instruction is not aligned on a four byte boundary,
-   the memory cycle interferes with the 32 bit instruction fetch,
-   causing a one cycle bubble in the pipeline.  Therefore, we try to
-   align load and store instructions on four byte boundaries if we
-   can, by swapping them with one of the adjacent instructions.  */
-
-static boolean 
-sh_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  struct internal_reloc *internal_relocs;
-  struct internal_reloc *free_relocs = NULL;
-  boolean have_code;
-  struct internal_reloc *irel, *irelend;
-  bfd_byte *contents = NULL;
-  bfd_byte *free_contents = NULL;
-
-  *again = false;
-
-  if (link_info->relocateable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0)
-    return true;
-
-  /* If this is the first time we have been called for this section,
-     initialize the cooked size.  */
-  if (sec->_cooked_size == 0)
-    sec->_cooked_size = sec->_raw_size;
-
-  internal_relocs = (_bfd_coff_read_internal_relocs
-		     (abfd, sec, link_info->keep_memory,
-		      (bfd_byte *) NULL, false,
-		      (struct internal_reloc *) NULL));
-  if (internal_relocs == NULL)
-    goto error_return;
-  if (! link_info->keep_memory)
-    free_relocs = internal_relocs;
-
-  have_code = false;
-
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma laddr, paddr, symval;
-      unsigned short insn;
-      struct internal_reloc *irelfn, *irelscan, *irelcount;
-      struct internal_syment sym;
-      bfd_signed_vma foff;
-
-      if (irel->r_type == R_SH_CODE)
-	have_code = true;
-
-      if (irel->r_type != R_SH_USES)
-	continue;
-
-      /* Get the section contents.  */
-      if (contents == NULL)
-	{
-	  if (coff_section_data (abfd, sec) != NULL
-	      && coff_section_data (abfd, sec)->contents != NULL)
-	    contents = coff_section_data (abfd, sec)->contents;
-	  else
-	    {
-	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (contents == NULL)
-		goto error_return;
-	      free_contents = contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      /* The r_offset field of the R_SH_USES reloc will point us to
-         the register load.  The 4 is because the r_offset field is
-         computed as though it were a jump offset, which are based
-         from 4 bytes after the jump instruction.  */
-      laddr = irel->r_vaddr - sec->vma + 4;
-      /* Careful to sign extend the 32-bit offset.  */
-      laddr += ((irel->r_offset & 0xffffffff) ^ 0x80000000) - 0x80000000;
-      if (laddr >= sec->_raw_size)
-	{
-	  (*_bfd_error_handler) ("%s: 0x%lx: warning: bad R_SH_USES offset",
-				 bfd_get_filename (abfd),
-				 (unsigned long) irel->r_vaddr);
-	  continue;
-	}
-      insn = bfd_get_16 (abfd, contents + laddr);
-
-      /* If the instruction is not mov.l NN,rN, we don't know what to do.  */
-      if ((insn & 0xf000) != 0xd000)
-	{
-	  ((*_bfd_error_handler)
-	   ("%s: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x",
-	    bfd_get_filename (abfd), (unsigned long) irel->r_vaddr, insn));
-	  continue;
-	}
-
-      /* Get the address from which the register is being loaded.  The
-      	 displacement in the mov.l instruction is quadrupled.  It is a
-      	 displacement from four bytes after the movl instruction, but,
-      	 before adding in the PC address, two least significant bits
-      	 of the PC are cleared.  We assume that the section is aligned
-      	 on a four byte boundary.  */
-      paddr = insn & 0xff;
-      paddr *= 4;
-      paddr += (laddr + 4) &~ 3;
-      if (paddr >= sec->_raw_size)
-	{
-	  ((*_bfd_error_handler)
-	   ("%s: 0x%lx: warning: bad R_SH_USES load offset",
-	    bfd_get_filename (abfd), (unsigned long) irel->r_vaddr));
-	  continue;
-	}
-
-      /* Get the reloc for the address from which the register is
-         being loaded.  This reloc will tell us which function is
-         actually being called.  */
-      paddr += sec->vma;
-      for (irelfn = internal_relocs; irelfn < irelend; irelfn++)
-	if (irelfn->r_vaddr == paddr
-	    && irelfn->r_type == R_SH_IMM32)
-	  break;
-      if (irelfn >= irelend)
-	{
-	  ((*_bfd_error_handler)
-	   ("%s: 0x%lx: warning: could not find expected reloc",
-	    bfd_get_filename (abfd), (unsigned long) paddr));
-	  continue;
-	}
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (! _bfd_coff_get_external_symbols (abfd))
-	goto error_return;
-      bfd_coff_swap_sym_in (abfd,
-			    ((bfd_byte *) obj_coff_external_syms (abfd)
-			     + (irelfn->r_symndx
-				* bfd_coff_symesz (abfd))),
-			    &sym);
-      if (sym.n_scnum != 0 && sym.n_scnum != sec->target_index)
-	{
-	  ((*_bfd_error_handler)
-	   ("%s: 0x%lx: warning: symbol in unexpected section",
-	    bfd_get_filename (abfd), (unsigned long) paddr));
-	  continue;
-	}
-
-      if (sym.n_sclass != C_EXT)
-	{
-	  symval = (sym.n_value
-		    - sec->vma
-		    + sec->output_section->vma
-		    + sec->output_offset);
-	}
-      else
-	{
-	  struct coff_link_hash_entry *h;
-
-	  h = obj_coff_sym_hashes (abfd)[irelfn->r_symndx];
-	  BFD_ASSERT (h != NULL);
-	  if (h->root.type != bfd_link_hash_defined
-	      && h->root.type != bfd_link_hash_defweak)
-	    {
-	      /* This appears to be a reference to an undefined
-                 symbol.  Just ignore it--it will be caught by the
-                 regular reloc processing.  */
-	      continue;
-	    }
-
-	  symval = (h->root.u.def.value
-		    + h->root.u.def.section->output_section->vma
-		    + h->root.u.def.section->output_offset);
-	}
-
-      symval += bfd_get_32 (abfd, contents + paddr - sec->vma);
-
-      /* See if this function call can be shortened.  */
-      foff = (symval
-	      - (irel->r_vaddr
-		 - sec->vma
-		 + sec->output_section->vma
-		 + sec->output_offset
-		 + 4));
-      if (foff < -0x1000 || foff >= 0x1000)
-	{
-	  /* After all that work, we can't shorten this function call.  */
-	  continue;
-	}
-
-      /* Shorten the function call.  */
-
-      /* For simplicity of coding, we are going to modify the section
-	 contents, the section relocs, and the BFD symbol table.  We
-	 must tell the rest of the code not to free up this
-	 information.  It would be possible to instead create a table
-	 of changes which have to be made, as is done in coff-mips.c;
-	 that would be more work, but would require less memory when
-	 the linker is run.  */
-
-      if (coff_section_data (abfd, sec) == NULL)
-	{
-	  sec->used_by_bfd =
-	    ((PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata)));
-	  if (sec->used_by_bfd == NULL)
-	    goto error_return;
-	}
-
-      coff_section_data (abfd, sec)->relocs = internal_relocs;
-      coff_section_data (abfd, sec)->keep_relocs = true;
-      free_relocs = NULL;
-
-      coff_section_data (abfd, sec)->contents = contents;
-      coff_section_data (abfd, sec)->keep_contents = true;
-      free_contents = NULL;
-
-      obj_coff_keep_syms (abfd) = true;
-
-      /* Replace the jsr with a bsr.  */
-
-      /* Change the R_SH_USES reloc into an R_SH_PCDISP reloc, and
-         replace the jsr with a bsr.  */
-      irel->r_type = R_SH_PCDISP;
-      irel->r_symndx = irelfn->r_symndx;
-      if (sym.n_sclass != C_EXT)
-	{
-	  /* If this needs to be changed because of future relaxing,
-             it will be handled here like other internal PCDISP
-             relocs.  */
-	  bfd_put_16 (abfd,
-		      0xb000 | ((foff >> 1) & 0xfff),
-		      contents + irel->r_vaddr - sec->vma);
-	}
-      else
-	{
-	  /* We can't fully resolve this yet, because the external
-             symbol value may be changed by future relaxing.  We let
-             the final link phase handle it.  */
-	  bfd_put_16 (abfd, 0xb000, contents + irel->r_vaddr - sec->vma);
-	}
-
-      /* See if there is another R_SH_USES reloc referring to the same
-         register load.  */
-      for (irelscan = internal_relocs; irelscan < irelend; irelscan++)
-	if (irelscan->r_type == R_SH_USES
-	    && laddr == irelscan->r_vaddr - sec->vma + 4 + irelscan->r_offset)
-	  break;
-      if (irelscan < irelend)
-	{
-	  /* Some other function call depends upon this register load,
-	     and we have not yet converted that function call.
-	     Indeed, we may never be able to convert it.  There is
-	     nothing else we can do at this point.  */
-	  continue;
-	}
-
-      /* Look for a R_SH_COUNT reloc on the location where the
-         function address is stored.  Do this before deleting any
-         bytes, to avoid confusion about the address.  */
-      for (irelcount = internal_relocs; irelcount < irelend; irelcount++)
-	if (irelcount->r_vaddr == paddr
-	    && irelcount->r_type == R_SH_COUNT)
-	  break;
-
-      /* Delete the register load.  */
-      if (! sh_relax_delete_bytes (abfd, sec, laddr, 2))
-	goto error_return;
-
-      /* That will change things, so, just in case it permits some
-         other function call to come within range, we should relax
-         again.  Note that this is not required, and it may be slow.  */
-      *again = true;
-
-      /* Now check whether we got a COUNT reloc.  */
-      if (irelcount >= irelend)
-	{
-	  ((*_bfd_error_handler)
-	   ("%s: 0x%lx: warning: could not find expected COUNT reloc",
-	    bfd_get_filename (abfd), (unsigned long) paddr));
-	  continue;
-	}
-
-      /* The number of uses is stored in the r_offset field.  We've
-         just deleted one.  */
-      if (irelcount->r_offset == 0)
-	{
-	  ((*_bfd_error_handler) ("%s: 0x%lx: warning: bad count",
-				  bfd_get_filename (abfd),
-				  (unsigned long) paddr));
-	  continue;
-	}
-
-      --irelcount->r_offset;
-
-      /* If there are no more uses, we can delete the address.  Reload
-         the address from irelfn, in case it was changed by the
-         previous call to sh_relax_delete_bytes.  */
-      if (irelcount->r_offset == 0)
-	{
-	  if (! sh_relax_delete_bytes (abfd, sec,
-				       irelfn->r_vaddr - sec->vma, 4))
-	    goto error_return;
-	}
-
-      /* We've done all we can with that function call.  */
-    }
-
-  /* Look for load and store instructions that we can align on four
-     byte boundaries.  */
-  if (have_code)
-    {
-      boolean swapped;
-
-      /* Get the section contents.  */
-      if (contents == NULL)
-	{
-	  if (coff_section_data (abfd, sec) != NULL
-	      && coff_section_data (abfd, sec)->contents != NULL)
-	    contents = coff_section_data (abfd, sec)->contents;
-	  else
-	    {
-	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (contents == NULL)
-		goto error_return;
-	      free_contents = contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      if (! sh_align_loads (abfd, sec, internal_relocs, contents, &swapped))
-	goto error_return;
-
-      if (swapped)
-	{
-	  if (coff_section_data (abfd, sec) == NULL)
-	    {
-	      sec->used_by_bfd =
-		((PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata)));
-	      if (sec->used_by_bfd == NULL)
-		goto error_return;
-	    }
-
-	  coff_section_data (abfd, sec)->relocs = internal_relocs;
-	  coff_section_data (abfd, sec)->keep_relocs = true;
-	  free_relocs = NULL;
-
-	  coff_section_data (abfd, sec)->contents = contents;
-	  coff_section_data (abfd, sec)->keep_contents = true;
-	  free_contents = NULL;
-
-	  obj_coff_keep_syms (abfd) = true;
-	}
-    }
-
-  if (free_relocs != NULL)
-    {
-      free (free_relocs);
-      free_relocs = NULL;
-    }
-
-  if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_contents);
-      else
-	{
-	  /* Cache the section contents for coff_link_input_bfd.  */
-	  if (coff_section_data (abfd, sec) == NULL)
-	    {
-	      sec->used_by_bfd =
-		((PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata)));
-	      if (sec->used_by_bfd == NULL)
-		goto error_return;
-	      coff_section_data (abfd, sec)->relocs = NULL;
-	    }
-	  coff_section_data (abfd, sec)->contents = contents;
-	}
-    }
-
-  return true;
-
- error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  return false;
-}
-
-/* Delete some bytes from a section while relaxing.  */
-
-static boolean
-sh_relax_delete_bytes (abfd, sec, addr, count)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     int count;
-{
-  bfd_byte *contents;
-  struct internal_reloc *irel, *irelend;
-  struct internal_reloc *irelalign;
-  bfd_vma toaddr;
-  bfd_byte *esym, *esymend;
-  bfd_size_type symesz;
-  struct coff_link_hash_entry **sym_hash;
-  asection *o;
-
-  contents = coff_section_data (abfd, sec)->contents;
-
-  /* The deletion must stop at the next ALIGN reloc for an aligment
-     power larger than the number of bytes we are deleting.  */
-
-  irelalign = NULL;
-  toaddr = sec->_cooked_size;
-
-  irel = coff_section_data (abfd, sec)->relocs;
-  irelend = irel + sec->reloc_count;
-  for (; irel < irelend; irel++)
-    {
-      if (irel->r_type == R_SH_ALIGN
-	  && irel->r_vaddr - sec->vma > addr
-	  && count < (1 << irel->r_offset))
-	{
-	  irelalign = irel;
-	  toaddr = irel->r_vaddr - sec->vma;
-	  break;
-	}
-    }
-
-  /* Actually delete the bytes.  */
-  memmove (contents + addr, contents + addr + count, toaddr - addr - count);
-  if (irelalign == NULL)
-    sec->_cooked_size -= count;
-  else
-    {
-      int i;
-
-#define NOP_OPCODE (0x0009)
-
-      BFD_ASSERT ((count & 1) == 0);
-      for (i = 0; i < count; i += 2)
-	bfd_put_16 (abfd, NOP_OPCODE, contents + toaddr - count + i);
-    }
-
-  /* Adjust all the relocs.  */
-  for (irel = coff_section_data (abfd, sec)->relocs; irel < irelend; irel++)
-    {
-      bfd_vma nraddr, stop;
-      bfd_vma start = 0;
-      int insn = 0;
-      struct internal_syment sym;
-      int off, adjust, oinsn;
-      bfd_signed_vma voff = 0;
-      boolean overflow;
-
-      /* Get the new reloc address.  */
-      nraddr = irel->r_vaddr - sec->vma;
-      if ((irel->r_vaddr - sec->vma > addr
-	   && irel->r_vaddr - sec->vma < toaddr)
-	  || (irel->r_type == R_SH_ALIGN
-	      && irel->r_vaddr - sec->vma == toaddr))
-	nraddr -= count;
-
-      /* See if this reloc was for the bytes we have deleted, in which
-	 case we no longer care about it.  Don't delete relocs which
-	 represent addresses, though.  */
-      if (irel->r_vaddr - sec->vma >= addr
-	  && irel->r_vaddr - sec->vma < addr + count
-	  && irel->r_type != R_SH_ALIGN
-	  && irel->r_type != R_SH_CODE
-	  && irel->r_type != R_SH_DATA
-	  && irel->r_type != R_SH_LABEL)
-	irel->r_type = R_SH_UNUSED;
-
-      /* If this is a PC relative reloc, see if the range it covers
-         includes the bytes we have deleted.  */
-      switch (irel->r_type)
-	{
-	default:
-	  break;
-
-	case R_SH_PCDISP8BY2:
-	case R_SH_PCDISP:
-	case R_SH_PCRELIMM8BY2:
-	case R_SH_PCRELIMM8BY4:
-	  start = irel->r_vaddr - sec->vma;
-	  insn = bfd_get_16 (abfd, contents + nraddr);
-	  break;
-	}
-
-      switch (irel->r_type)
-	{
-	default:
-	  start = stop = addr;
-	  break;
-
-	case R_SH_IMM32:
-	  /* If this reloc is against a symbol defined in this
-             section, and the symbol will not be adjusted below, we
-             must check the addend to see it will put the value in
-             range to be adjusted, and hence must be changed.  */
-	  bfd_coff_swap_sym_in (abfd,
-				((bfd_byte *) obj_coff_external_syms (abfd)
-				 + (irel->r_symndx
-				    * bfd_coff_symesz (abfd))),
-				&sym);
-	  if (sym.n_sclass != C_EXT
-	      && sym.n_scnum == sec->target_index
-	      && ((bfd_vma) sym.n_value <= addr
-		  || (bfd_vma) sym.n_value >= toaddr))
-	    {
-	      bfd_vma val;
-
-	      val = bfd_get_32 (abfd, contents + nraddr);
-	      val += sym.n_value;
-	      if (val > addr && val < toaddr)
-		bfd_put_32 (abfd, val - count, contents + nraddr);
-	    }
-	  start = stop = addr;
-	  break;
-
-	case R_SH_PCDISP8BY2:
-	  off = insn & 0xff;
-	  if (off & 0x80)
-	    off -= 0x100;
-	  stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
-	  break;
-
-	case R_SH_PCDISP:
-	  bfd_coff_swap_sym_in (abfd,
-				((bfd_byte *) obj_coff_external_syms (abfd)
-				 + (irel->r_symndx
-				    * bfd_coff_symesz (abfd))),
-				&sym);
-	  if (sym.n_sclass == C_EXT)
-	    start = stop = addr;
-	  else
-	    {
-	      off = insn & 0xfff;
-	      if (off & 0x800)
-		off -= 0x1000;
-	      stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
-	    }
-	  break;
-
-	case R_SH_PCRELIMM8BY2:
-	  off = insn & 0xff;
-	  stop = start + 4 + off * 2;
-	  break;
-
-	case R_SH_PCRELIMM8BY4:
-	  off = insn & 0xff;
-	  stop = (start &~ (bfd_vma) 3) + 4 + off * 4;
-	  break;
-
-	case R_SH_SWITCH8:
-	case R_SH_SWITCH16:
-	case R_SH_SWITCH32:
-	  /* These relocs types represent
-	       .word L2-L1
-	     The r_offset field holds the difference between the reloc
-	     address and L1.  That is the start of the reloc, and
-	     adding in the contents gives us the top.  We must adjust
-	     both the r_offset field and the section contents.  */
-
-	  start = irel->r_vaddr - sec->vma;
-	  stop = (bfd_vma) ((bfd_signed_vma) start - (long) irel->r_offset);
-
-	  if (start > addr
-	      && start < toaddr
-	      && (stop <= addr || stop >= toaddr))
-	    irel->r_offset += count;
-	  else if (stop > addr
-		   && stop < toaddr
-		   && (start <= addr || start >= toaddr))
-	    irel->r_offset -= count;
-
-	  start = stop;
-
-	  if (irel->r_type == R_SH_SWITCH16)
-	    voff = bfd_get_signed_16 (abfd, contents + nraddr);
-	  else if (irel->r_type == R_SH_SWITCH8)
-	    voff = bfd_get_8 (abfd, contents + nraddr);
-	  else
-	    voff = bfd_get_signed_32 (abfd, contents + nraddr);
-	  stop = (bfd_vma) ((bfd_signed_vma) start + voff);
-
-	  break;
-
-	case R_SH_USES:
-	  start = irel->r_vaddr - sec->vma;
-	  stop = (bfd_vma) ((bfd_signed_vma) start
-			    + (long) irel->r_offset
-			    + 4);
-	  break;
-	}
-
-      if (start > addr
-	  && start < toaddr
-	  && (stop <= addr || stop >= toaddr))
-	adjust = count;
-      else if (stop > addr
-	       && stop < toaddr
-	       && (start <= addr || start >= toaddr))
-	adjust = - count;
-      else
-	adjust = 0;
-
-      if (adjust != 0)
-	{
-	  oinsn = insn;
-	  overflow = false;
-	  switch (irel->r_type)
-	    {
-	    default:
-	      abort ();
-	      break;
-
-	    case R_SH_PCDISP8BY2:
-	    case R_SH_PCRELIMM8BY2:
-	      insn += adjust / 2;
-	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, contents + nraddr);
-	      break;
-
-	    case R_SH_PCDISP:
-	      insn += adjust / 2;
-	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, contents + nraddr);
-	      break;
-
-	    case R_SH_PCRELIMM8BY4:
-	      BFD_ASSERT (adjust == count || count >= 4);
-	      if (count >= 4)
-		insn += adjust / 4;
-	      else
-		{
-		  if ((irel->r_vaddr & 3) == 0)
-		    ++insn;
-		}
-	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, contents + nraddr);
-	      break;
-
-	    case R_SH_SWITCH8:
-	      voff += adjust;
-	      if (voff < 0 || voff >= 0xff)
-		overflow = true;
-	      bfd_put_8 (abfd, voff, contents + nraddr);
-	      break;
-
-	    case R_SH_SWITCH16:
-	      voff += adjust;
-	      if (voff < - 0x8000 || voff >= 0x8000)
-		overflow = true;
-	      bfd_put_signed_16 (abfd, voff, contents + nraddr);
-	      break;
-
-	    case R_SH_SWITCH32:
-	      voff += adjust;
-	      bfd_put_signed_32 (abfd, voff, contents + nraddr);
-	      break;
-
-	    case R_SH_USES:
-	      irel->r_offset += adjust;
-	      break;
-	    }
-
-	  if (overflow)
-	    {
-	      ((*_bfd_error_handler)
-	       ("%s: 0x%lx: fatal: reloc overflow while relaxing",
-		bfd_get_filename (abfd), (unsigned long) irel->r_vaddr));
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-	}
-
-      irel->r_vaddr = nraddr + sec->vma;
-    }
-
-  /* Look through all the other sections.  If there contain any IMM32
-     relocs against internal symbols which we are not going to adjust
-     below, we may need to adjust the addends.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      struct internal_reloc *internal_relocs;
-      struct internal_reloc *irelscan, *irelscanend;
-      bfd_byte *ocontents;
-
-      if (o == sec
-	  || (o->flags & SEC_RELOC) == 0
-	  || o->reloc_count == 0)
-	continue;
-
-      /* We always cache the relocs.  Perhaps, if info->keep_memory is
-         false, we should free them, if we are permitted to, when we
-         leave sh_coff_relax_section.  */
-      internal_relocs = (_bfd_coff_read_internal_relocs
-			 (abfd, o, true, (bfd_byte *) NULL, false,
-			  (struct internal_reloc *) NULL));
-      if (internal_relocs == NULL)
-	return false;
-
-      ocontents = NULL;
-      irelscanend = internal_relocs + o->reloc_count;
-      for (irelscan = internal_relocs; irelscan < irelscanend; irelscan++)
-	{
-	  struct internal_syment sym;
-
-	  if (irelscan->r_type != R_SH_IMM32)
-	    continue;
-
-	  bfd_coff_swap_sym_in (abfd,
-				((bfd_byte *) obj_coff_external_syms (abfd)
-				 + (irelscan->r_symndx
-				    * bfd_coff_symesz (abfd))),
-				&sym);
-	  if (sym.n_sclass != C_EXT
-	      && sym.n_scnum == sec->target_index
-	      && ((bfd_vma) sym.n_value <= addr
-		  || (bfd_vma) sym.n_value >= toaddr))
-	    {
-	      bfd_vma val;
-
-	      if (ocontents == NULL)
-		{
-		  if (coff_section_data (abfd, o)->contents != NULL)
-		    ocontents = coff_section_data (abfd, o)->contents;
-		  else
-		    {
-		      /* We always cache the section contents.
-                         Perhaps, if info->keep_memory is false, we
-                         should free them, if we are permitted to,
-                         when we leave sh_coff_relax_section.  */
-		      ocontents = (bfd_byte *) bfd_malloc (o->_raw_size);
-		      if (ocontents == NULL)
-			return false;
-		      if (! bfd_get_section_contents (abfd, o, ocontents,
-						      (file_ptr) 0,
-						      o->_raw_size))
-			return false;
-		      coff_section_data (abfd, o)->contents = ocontents;
-		    }
-		}
-
-	      val = bfd_get_32 (abfd, ocontents + irelscan->r_vaddr - o->vma);
-	      val += sym.n_value;
-	      if (val > addr && val < toaddr)
-		bfd_put_32 (abfd, val - count,
-			    ocontents + irelscan->r_vaddr - o->vma);
-
-	      coff_section_data (abfd, o)->keep_contents = true;
-	    }
-	}
-    }
-
-  /* Adjusting the internal symbols will not work if something has
-     already retrieved the generic symbols.  It would be possible to
-     make this work by adjusting the generic symbols at the same time.
-     However, this case should not arise in normal usage.  */
-  if (obj_symbols (abfd) != NULL
-      || obj_raw_syments (abfd) != NULL)
-    {
-      ((*_bfd_error_handler)
-       ("%s: fatal: generic symbols retrieved before relaxing",
-	bfd_get_filename (abfd)));
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  /* Adjust all the symbols.  */
-  sym_hash = obj_coff_sym_hashes (abfd);
-  symesz = bfd_coff_symesz (abfd);
-  esym = (bfd_byte *) obj_coff_external_syms (abfd);
-  esymend = esym + obj_raw_syment_count (abfd) * symesz;
-  while (esym < esymend)
-    {
-      struct internal_syment isym;
-
-      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &isym);
-
-      if (isym.n_scnum == sec->target_index
-	  && (bfd_vma) isym.n_value > addr
-	  && (bfd_vma) isym.n_value < toaddr)
-	{
-	  isym.n_value -= count;
-
-	  bfd_coff_swap_sym_out (abfd, (PTR) &isym, (PTR) esym);
-
-	  if (*sym_hash != NULL)
-	    {
-	      BFD_ASSERT ((*sym_hash)->root.type == bfd_link_hash_defined
-			  || (*sym_hash)->root.type == bfd_link_hash_defweak);
-	      BFD_ASSERT ((*sym_hash)->root.u.def.value >= addr
-			  && (*sym_hash)->root.u.def.value < toaddr);
-	      (*sym_hash)->root.u.def.value -= count;
-	    }
-	}
-
-      esym += (isym.n_numaux + 1) * symesz;
-      sym_hash += isym.n_numaux + 1;
-    }
-
-  /* See if we can move the ALIGN reloc forward.  We have adjusted
-     r_vaddr for it already.  */
-  if (irelalign != NULL)
-    {
-      bfd_vma alignto, alignaddr;
-
-      alignto = BFD_ALIGN (toaddr, 1 << irelalign->r_offset);
-      alignaddr = BFD_ALIGN (irelalign->r_vaddr - sec->vma,
-			     1 << irelalign->r_offset);
-      if (alignto != alignaddr)
-	{
-	  /* Tail recursion.  */
-	  return sh_relax_delete_bytes (abfd, sec, alignaddr,
-					alignto - alignaddr);
-	}
-    }
-
-  return true;
-}
-
-/* This is yet another version of the SH opcode table, used to rapidly
-   get information about a particular instruction.  */
-
-/* The opcode map is represented by an array of these structures.  The
-   array is indexed by the high order four bits in the instruction.  */
-
-struct sh_major_opcode
-{
-  /* A pointer to the instruction list.  This is an array which
-     contains all the instructions with this major opcode.  */
-  const struct sh_minor_opcode *minor_opcodes;
-  /* The number of elements in minor_opcodes.  */
-  unsigned short count;
-};
-
-/* This structure holds information for a set of SH opcodes.  The
-   instruction code is anded with the mask value, and the resulting
-   value is used to search the order opcode list.  */
-
-struct sh_minor_opcode
-{
-  /* The sorted opcode list.  */
-  const struct sh_opcode *opcodes;
-  /* The number of elements in opcodes.  */
-  unsigned short count;
-  /* The mask value to use when searching the opcode list.  */
-  unsigned short mask;
-};
-
-/* This structure holds information for an SH instruction.  An array
-   of these structures is sorted in order by opcode.  */
-
-struct sh_opcode
-{
-  /* The code for this instruction, after it has been anded with the
-     mask value in the sh_major_opcode structure.  */
-  unsigned short opcode;
-  /* Flags for this instruction.  */
-  unsigned short flags;
-};
-
-/* Flag which appear in the sh_opcode structure.  */
-
-/* This instruction loads a value from memory.  */
-#define LOAD (0x1)
-
-/* This instruction stores a value to memory.  */
-#define STORE (0x2)
-
-/* This instruction is a branch.  */
-#define BRANCH (0x4)
-
-/* This instruction has a delay slot.  */
-#define DELAY (0x8)
-
-/* This instruction uses the value in the register in the field at
-   mask 0x0f00 of the instruction.  */
-#define USES1 (0x10)
-
-/* This instruction uses the value in the register in the field at
-   mask 0x00f0 of the instruction.  */
-#define USES2 (0x20)
-
-/* This instruction uses the value in register 0.  */
-#define USESR0 (0x40)
-
-/* This instruction sets the value in the register in the field at
-   mask 0x0f00 of the instruction.  */
-#define SETS1 (0x80)
-
-/* This instruction sets the value in the register in the field at
-   mask 0x00f0 of the instruction.  */
-#define SETS2 (0x100)
-
-/* This instruction sets register 0.  */
-#define SETSR0 (0x200)
-
-/* This instruction sets a special register.  */
-#define SETSSP (0x400)
-
-/* This instruction uses a special register.  */
-#define USESSP (0x800)
-
-/* This instruction uses the floating point register in the field at
-   mask 0x0f00 of the instruction.  */
-#define USESF1 (0x1000)
-
-/* This instruction uses the floating point register in the field at
-   mask 0x00f0 of the instruction.  */
-#define USESF2 (0x2000)
-
-/* This instruction uses floating point register 0.  */
-#define USESF0 (0x4000)
-
-/* This instruction sets the floating point register in the field at
-   mask 0x0f00 of the instruction.  */
-#define SETSF1 (0x8000)
-
-static boolean sh_insn_uses_reg
-  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insn_uses_freg
-  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int));
-static boolean sh_insns_conflict
-  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int,
-	   const struct sh_opcode *));
-static boolean sh_load_use
-  PARAMS ((unsigned int, const struct sh_opcode *, unsigned int,
-	   const struct sh_opcode *));
-
-/* The opcode maps.  */
-
-#define MAP(a) a, sizeof a / sizeof a[0]
-
-static const struct sh_opcode sh_opcode00[] =
-{
-  { 0x0008, SETSSP },			/* clrt */
-  { 0x0009, 0 },			/* nop */
-  { 0x000b, BRANCH | DELAY | USESSP },	/* rts */
-  { 0x0018, SETSSP },			/* sett */
-  { 0x0019, SETSSP },			/* div0u */
-  { 0x001b, 0 },			/* sleep */
-  { 0x0028, SETSSP },			/* clrmac */
-  { 0x002b, BRANCH | DELAY | SETSSP },	/* rte */
-  { 0x0038, USESSP | SETSSP },		/* ldtlb */
-  { 0x0048, SETSSP },			/* clrs */
-  { 0x0058, SETSSP }			/* sets */
-};
-
-static const struct sh_opcode sh_opcode01[] =
-{
-  { 0x0002, SETS1 | USESSP },			/* stc sr,rn */
-  { 0x0003, BRANCH | DELAY | USES1 | SETSSP },	/* bsrf rn */
-  { 0x000a, SETS1 | USESSP },			/* sts mach,rn */
-  { 0x0012, SETS1 | USESSP },			/* stc gbr,rn */
-  { 0x001a, SETS1 | USESSP },			/* sts macl,rn */
-  { 0x0022, SETS1 | USESSP },			/* stc vbr,rn */
-  { 0x0023, BRANCH | DELAY | USES1 },		/* braf rn */
-  { 0x0029, SETS1 | USESSP },			/* movt rn */
-  { 0x002a, SETS1 | USESSP },			/* sts pr,rn */
-  { 0x0032, SETS1 | USESSP },			/* stc ssr,rn */
-  { 0x0042, SETS1 | USESSP },			/* stc spc,rn */
-  { 0x005a, SETS1 | USESSP },			/* sts fpul,rn */
-  { 0x006a, SETS1 | USESSP },			/* sts fpscr,rn */
-  { 0x0082, SETS1 | USESSP },			/* stc r0_bank,rn */
-  { 0x0083, LOAD | USES1 },			/* pref @rn */
-  { 0x0092, SETS1 | USESSP },			/* stc r1_bank,rn */
-  { 0x00a2, SETS1 | USESSP },			/* stc r2_bank,rn */
-  { 0x00b2, SETS1 | USESSP },			/* stc r3_bank,rn */
-  { 0x00c2, SETS1 | USESSP },			/* stc r4_bank,rn */
-  { 0x00d2, SETS1 | USESSP },			/* stc r5_bank,rn */
-  { 0x00e2, SETS1 | USESSP },			/* stc r6_bank,rn */
-  { 0x00f2, SETS1 | USESSP }			/* stc r7_bank,rn */
-};
-
-static const struct sh_opcode sh_opcode02[] =
-{
-  { 0x0004, STORE | USES1 | USES2 | USESR0 },	/* mov.b rm,@(r0,rn) */
-  { 0x0005, STORE | USES1 | USES2 | USESR0 },	/* mov.w rm,@(r0,rn) */
-  { 0x0006, STORE | USES1 | USES2 | USESR0 },	/* mov.l rm,@(r0,rn) */
-  { 0x0007, SETSSP | USES1 | USES2 },		/* mul.l rm,rn */
-  { 0x000c, LOAD | SETS1 | USES2 | USESR0 },	/* mov.b @(r0,rm),rn */
-  { 0x000d, LOAD | SETS1 | USES2 | USESR0 },	/* mov.w @(r0,rm),rn */
-  { 0x000e, LOAD | SETS1 | USES2 | USESR0 },	/* mov.l @(r0,rm),rn */
-  { 0x000f, LOAD|SETS1|SETS2|SETSSP|USES1|USES2|USESSP }, /* mac.l @rm+,@rn+ */
-};
-
-static const struct sh_minor_opcode sh_opcode0[] =
-{
-  { MAP (sh_opcode00), 0xffff },
-  { MAP (sh_opcode01), 0xf0ff },
-  { MAP (sh_opcode02), 0xf00f }
-};
-
-static const struct sh_opcode sh_opcode10[] =
-{
-  { 0x1000, STORE | USES1 | USES2 }	/* mov.l rm,@(disp,rn) */
-};
-
-static const struct sh_minor_opcode sh_opcode1[] =
-{
-  { MAP (sh_opcode10), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcode20[] =
-{
-  { 0x2000, STORE | USES1 | USES2 },		/* mov.b rm,@rn */
-  { 0x2001, STORE | USES1 | USES2 },		/* mov.w rm,@rn */
-  { 0x2002, STORE | USES1 | USES2 },		/* mov.l rm,@rn */
-  { 0x2004, STORE | SETS1 | USES1 | USES2 },	/* mov.b rm,@-rn */
-  { 0x2005, STORE | SETS1 | USES1 | USES2 },	/* mov.w rm,@-rn */
-  { 0x2006, STORE | SETS1 | USES1 | USES2 },	/* mov.l rm,@-rn */
-  { 0x2007, SETSSP | USES1 | USES2 | USESSP },	/* div0s */
-  { 0x2008, SETSSP | USES1 | USES2 },		/* tst rm,rn */
-  { 0x2009, SETS1 | USES1 | USES2 },		/* and rm,rn */
-  { 0x200a, SETS1 | USES1 | USES2 },		/* xor rm,rn */
-  { 0x200b, SETS1 | USES1 | USES2 },		/* or rm,rn */
-  { 0x200c, SETSSP | USES1 | USES2 },		/* cmp/str rm,rn */
-  { 0x200d, SETS1 | USES1 | USES2 },		/* xtrct rm,rn */
-  { 0x200e, SETSSP | USES1 | USES2 },		/* mulu.w rm,rn */
-  { 0x200f, SETSSP | USES1 | USES2 }		/* muls.w rm,rn */
-};
-
-static const struct sh_minor_opcode sh_opcode2[] =
-{
-  { MAP (sh_opcode20), 0xf00f }
-};
-
-static const struct sh_opcode sh_opcode30[] =
-{
-  { 0x3000, SETSSP | USES1 | USES2 },		/* cmp/eq rm,rn */
-  { 0x3002, SETSSP | USES1 | USES2 },		/* cmp/hs rm,rn */
-  { 0x3003, SETSSP | USES1 | USES2 },		/* cmp/ge rm,rn */
-  { 0x3004, SETSSP | USESSP | USES1 | USES2 },	/* div1 rm,rn */
-  { 0x3005, SETSSP | USES1 | USES2 },		/* dmulu.l rm,rn */
-  { 0x3006, SETSSP | USES1 | USES2 },		/* cmp/hi rm,rn */
-  { 0x3007, SETSSP | USES1 | USES2 },		/* cmp/gt rm,rn */
-  { 0x3008, SETS1 | USES1 | USES2 },		/* sub rm,rn */
-  { 0x300a, SETS1 | SETSSP | USES1 | USES2 | USESSP }, /* subc rm,rn */
-  { 0x300b, SETS1 | SETSSP | USES1 | USES2 },	/* subv rm,rn */
-  { 0x300c, SETS1 | USES1 | USES2 },		/* add rm,rn */
-  { 0x300d, SETSSP | USES1 | USES2 },		/* dmuls.l rm,rn */
-  { 0x300e, SETS1 | SETSSP | USES1 | USES2 | USESSP }, /* addc rm,rn */
-  { 0x300f, SETS1 | SETSSP | USES1 | USES2 }	/* addv rm,rn */
-};
-
-static const struct sh_minor_opcode sh_opcode3[] =
-{
-  { MAP (sh_opcode30), 0xf00f }
-};
-
-static const struct sh_opcode sh_opcode40[] =
-{
-  { 0x4000, SETS1 | SETSSP | USES1 },		/* shll rn */
-  { 0x4001, SETS1 | SETSSP | USES1 },		/* shlr rn */
-  { 0x4002, STORE | SETS1 | USES1 | USESSP },	/* sts.l mach,@-rn */
-  { 0x4003, STORE | SETS1 | USES1 | USESSP },	/* stc.l sr,@-rn */
-  { 0x4004, SETS1 | SETSSP | USES1 },		/* rotl rn */
-  { 0x4005, SETS1 | SETSSP | USES1 },		/* rotr rn */
-  { 0x4006, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,mach */
-  { 0x4007, LOAD | SETS1 | SETSSP | USES1 },	/* ldc.l @rm+,sr */
-  { 0x4008, SETS1 | USES1 },			/* shll2 rn */
-  { 0x4009, SETS1 | USES1 },			/* shlr2 rn */
-  { 0x400a, SETSSP | USES1 },			/* lds rm,mach */
-  { 0x400b, BRANCH | DELAY | USES1 },		/* jsr @rn */
-  { 0x400e, SETSSP | USES1 },			/* ldc rm,sr */
-  { 0x4010, SETS1 | SETSSP | USES1 },		/* dt rn */
-  { 0x4011, SETSSP | USES1 },			/* cmp/pz rn */
-  { 0x4012, STORE | SETS1 | USES1 | USESSP },	/* sts.l macl,@-rn */
-  { 0x4013, STORE | SETS1 | USES1 | USESSP },	/* stc.l gbr,@-rn */
-  { 0x4015, SETSSP | USES1 },			/* cmp/pl rn */
-  { 0x4016, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,macl */
-  { 0x4017, LOAD | SETS1 | SETSSP | USES1 },	/* ldc.l @rm+,gbr */
-  { 0x4018, SETS1 | USES1 },			/* shll8 rn */
-  { 0x4019, SETS1 | USES1 },			/* shlr8 rn */
-  { 0x401a, SETSSP | USES1 },			/* lds rm,macl */
-  { 0x401b, LOAD | SETSSP | USES1 },		/* tas.b @rn */
-  { 0x401e, SETSSP | USES1 },			/* ldc rm,gbr */
-  { 0x4020, SETS1 | SETSSP | USES1 },		/* shal rn */
-  { 0x4021, SETS1 | SETSSP | USES1 },		/* shar rn */
-  { 0x4022, STORE | SETS1 | USES1 | USESSP },	/* sts.l pr,@-rn */
-  { 0x4023, STORE | SETS1 | USES1 | USESSP },	/* stc.l vbr,@-rn */
-  { 0x4024, SETS1 | SETSSP | USES1 | USESSP },	/* rotcl rn */
-  { 0x4025, SETS1 | SETSSP | USES1 | USESSP },	/* rotcr rn */
-  { 0x4026, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,pr */
-  { 0x4027, LOAD | SETS1 | SETSSP | USES1 },	/* ldc.l @rm+,vbr */
-  { 0x4028, SETS1 | USES1 },			/* shll16 rn */
-  { 0x4029, SETS1 | USES1 },			/* shlr16 rn */
-  { 0x402a, SETSSP | USES1 },			/* lds rm,pr */
-  { 0x402b, BRANCH | DELAY | USES1 },		/* jmp @rn */
-  { 0x402e, SETSSP | USES1 },			/* ldc rm,vbr */
-  { 0x4033, STORE | SETS1 | USES1 | USESSP },	/* stc.l ssr,@-rn */
-  { 0x4037, LOAD | SETS1 | SETSSP | USES1 },	/* ldc.l @rm+,ssr */
-  { 0x403e, SETSSP | USES1 },			/* ldc rm,ssr */
-  { 0x4043, STORE | SETS1 | USES1 | USESSP },	/* stc.l spc,@-rn */
-  { 0x4047, LOAD | SETS1 | SETSSP | USES1 },	/* ldc.l @rm+,spc */
-  { 0x404e, SETSSP | USES1 },			/* ldc rm,spc */
-  { 0x4052, STORE | SETS1 | USES1 | USESSP },	/* sts.l fpul,@-rn */
-  { 0x4056, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,fpul */
-  { 0x405a, SETSSP | USES1 },			/* lds.l rm,fpul */
-  { 0x4062, STORE | SETS1 | USES1 | USESSP },	/* sts.l fpscr,@-rn */
-  { 0x4066, LOAD | SETS1 | SETSSP | USES1 },	/* lds.l @rm+,fpscr */
-  { 0x406a, SETSSP | USES1 }			/* lds rm,fpscr */
-};
-
-static const struct sh_opcode sh_opcode41[] =
-{
-  { 0x4083, STORE | SETS1 | USES1 | USESSP },	/* stc.l rx_bank,@-rn */
-  { 0x4087, LOAD | SETS1 | SETSSP | USES1 },	/* ldc.l @rm+,rx_bank */
-  { 0x408e, SETSSP | USES1 }			/* ldc rm,rx_bank */
-};
-
-static const struct sh_opcode sh_opcode42[] =
-{
-  { 0x400c, SETS1 | USES1 | USES2 },			/* shad rm,rn */
-  { 0x400d, SETS1 | USES1 | USES2 },			/* shld rm,rn */
-  { 0x400f, LOAD|SETS1|SETS2|SETSSP|USES1|USES2|USESSP }, /* mac.w @rm+,@rn+ */
-};
-
-static const struct sh_minor_opcode sh_opcode4[] =
-{
-  { MAP (sh_opcode40), 0xf0ff },
-  { MAP (sh_opcode41), 0xf08f },
-  { MAP (sh_opcode42), 0xf00f }
-};
-
-static const struct sh_opcode sh_opcode50[] =
-{
-  { 0x5000, LOAD | SETS1 | USES2 }	/* mov.l @(disp,rm),rn */
-};
-
-static const struct sh_minor_opcode sh_opcode5[] =
-{
-  { MAP (sh_opcode50), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcode60[] =
-{
-  { 0x6000, LOAD | SETS1 | USES2 },		/* mov.b @rm,rn */
-  { 0x6001, LOAD | SETS1 | USES2 },		/* mov.w @rm,rn */
-  { 0x6002, LOAD | SETS1 | USES2 },		/* mov.l @rm,rn */
-  { 0x6003, SETS1 | USES2 },			/* mov rm,rn */
-  { 0x6004, LOAD | SETS1 | SETS2 | USES2 },	/* mov.b @rm+,rn */
-  { 0x6005, LOAD | SETS1 | SETS2 | USES2 },	/* mov.w @rm+,rn */
-  { 0x6006, LOAD | SETS1 | SETS2 | USES2 },	/* mov.l @rm+,rn */
-  { 0x6007, SETS1 | USES2 },			/* not rm,rn */
-  { 0x6008, SETS1 | USES2 },			/* swap.b rm,rn */
-  { 0x6009, SETS1 | USES2 },			/* swap.w rm,rn */
-  { 0x600a, SETS1 | SETSSP | USES2 | USESSP },	/* negc rm,rn */
-  { 0x600b, SETS1 | USES2 },			/* neg rm,rn */
-  { 0x600c, SETS1 | USES2 },			/* extu.b rm,rn */
-  { 0x600d, SETS1 | USES2 },			/* extu.w rm,rn */
-  { 0x600e, SETS1 | USES2 },			/* exts.b rm,rn */
-  { 0x600f, SETS1 | USES2 }			/* exts.w rm,rn */
-};
-
-static const struct sh_minor_opcode sh_opcode6[] =
-{
-  { MAP (sh_opcode60), 0xf00f }
-};
-
-static const struct sh_opcode sh_opcode70[] =
-{
-  { 0x7000, SETS1 | USES1 }		/* add #imm,rn */
-};
-
-static const struct sh_minor_opcode sh_opcode7[] =
-{
-  { MAP (sh_opcode70), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcode80[] =
-{
-  { 0x8000, STORE | USES2 | USESR0 },	/* mov.b r0,@(disp,rn) */
-  { 0x8100, STORE | USES2 | USESR0 },	/* mov.w r0,@(disp,rn) */
-  { 0x8400, LOAD | SETSR0 | USES2 },	/* mov.b @(disp,rm),r0 */
-  { 0x8500, LOAD | SETSR0 | USES2 },	/* mov.w @(disp,rn),r0 */
-  { 0x8800, SETSSP | USESR0 },		/* cmp/eq #imm,r0 */
-  { 0x8900, BRANCH | USESSP },		/* bt label */
-  { 0x8b00, BRANCH | USESSP },		/* bf label */
-  { 0x8d00, BRANCH | DELAY | USESSP },	/* bt/s label */
-  { 0x8f00, BRANCH | DELAY | USESSP }	/* bf/s label */
-};
-
-static const struct sh_minor_opcode sh_opcode8[] =
-{
-  { MAP (sh_opcode80), 0xff00 }
-};
-
-static const struct sh_opcode sh_opcode90[] =
-{
-  { 0x9000, LOAD | SETS1 }	/* mov.w @(disp,pc),rn */
-};
-
-static const struct sh_minor_opcode sh_opcode9[] =
-{
-  { MAP (sh_opcode90), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcodea0[] =
-{
-  { 0xa000, BRANCH | DELAY }	/* bra label */
-};
-
-static const struct sh_minor_opcode sh_opcodea[] =
-{
-  { MAP (sh_opcodea0), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcodeb0[] =
-{
-  { 0xb000, BRANCH | DELAY }	/* bsr label */
-};
-
-static const struct sh_minor_opcode sh_opcodeb[] =
-{
-  { MAP (sh_opcodeb0), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcodec0[] =
-{
-  { 0xc000, STORE | USESR0 | USESSP },		/* mov.b r0,@(disp,gbr) */
-  { 0xc100, STORE | USESR0 | USESSP },		/* mov.w r0,@(disp,gbr) */
-  { 0xc200, STORE | USESR0 | USESSP },		/* mov.l r0,@(disp,gbr) */
-  { 0xc300, BRANCH | USESSP },			/* trapa #imm */
-  { 0xc400, LOAD | SETSR0 | USESSP },		/* mov.b @(disp,gbr),r0 */
-  { 0xc500, LOAD | SETSR0 | USESSP },		/* mov.w @(disp,gbr),r0 */
-  { 0xc600, LOAD | SETSR0 | USESSP },		/* mov.l @(disp,gbr),r0 */
-  { 0xc700, SETSR0 },				/* mova @(disp,pc),r0 */
-  { 0xc800, SETSSP | USESR0 },			/* tst #imm,r0 */
-  { 0xc900, SETSR0 | USESR0 },			/* and #imm,r0 */
-  { 0xca00, SETSR0 | USESR0 },			/* xor #imm,r0 */
-  { 0xcb00, SETSR0 | USESR0 },			/* or #imm,r0 */
-  { 0xcc00, LOAD | SETSSP | USESR0 | USESSP },	/* tst.b #imm,@(r0,gbr) */
-  { 0xcd00, LOAD | STORE | USESR0 | USESSP },	/* and.b #imm,@(r0,gbr) */
-  { 0xce00, LOAD | STORE | USESR0 | USESSP },	/* xor.b #imm,@(r0,gbr) */
-  { 0xcf00, LOAD | STORE | USESR0 | USESSP }	/* or.b #imm,@(r0,gbr) */
-};
-
-static const struct sh_minor_opcode sh_opcodec[] =
-{
-  { MAP (sh_opcodec0), 0xff00 }
-};
-
-static const struct sh_opcode sh_opcoded0[] =
-{
-  { 0xd000, LOAD | SETS1 }		/* mov.l @(disp,pc),rn */
-};
-
-static const struct sh_minor_opcode sh_opcoded[] =
-{
-  { MAP (sh_opcoded0), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcodee0[] =
-{
-  { 0xe000, SETS1 }		/* mov #imm,rn */
-};
-
-static const struct sh_minor_opcode sh_opcodee[] =
-{
-  { MAP (sh_opcodee0), 0xf000 }
-};
-
-static const struct sh_opcode sh_opcodef0[] =
-{
-  { 0xf000, SETSF1 | USESF1 | USESF2 },		/* fadd fm,fn */
-  { 0xf001, SETSF1 | USESF1 | USESF2 },		/* fsub fm,fn */
-  { 0xf002, SETSF1 | USESF1 | USESF2 },		/* fmul fm,fn */
-  { 0xf003, SETSF1 | USESF1 | USESF2 },		/* fdiv fm,fn */
-  { 0xf004, SETSSP | USESF1 | USESF2 },		/* fcmp/eq fm,fn */
-  { 0xf005, SETSSP | USESF1 | USESF2 },		/* fcmp/gt fm,fn */
-  { 0xf006, LOAD | SETSF1 | USES2 | USESR0 },	/* fmov.s @(r0,rm),fn */
-  { 0xf007, STORE | USES1 | USESF2 | USESR0 },	/* fmov.s fm,@(r0,rn) */
-  { 0xf008, LOAD | SETSF1 | USES2 },		/* fmov.s @rm,fn */
-  { 0xf009, LOAD | SETS2 | SETSF1 | USES2 },	/* fmov.s @rm+,fn */
-  { 0xf00a, STORE | USES1 | USESF2 },		/* fmov.s fm,@rn */
-  { 0xf00b, STORE | SETS1 | USES1 | USESF2 },	/* fmov.s fm,@-rn */
-  { 0xf00c, SETSF1 | USESF2 },			/* fmov fm,fn */
-  { 0xf00e, SETSF1 | USESF1 | USESF2 | USESF0 }	/* fmac f0,fm,fn */
-};
-
-static const struct sh_opcode sh_opcodef1[] =
-{
-  { 0xf00d, SETSF1 | USESSP },	/* fsts fpul,fn */
-  { 0xf01d, SETSSP | USESF1 },	/* flds fn,fpul */
-  { 0xf02d, SETSF1 | USESSP },	/* float fpul,fn */
-  { 0xf03d, SETSSP | USESF1 },	/* ftrc fn,fpul */
-  { 0xf04d, SETSF1 | USESF1 },	/* fneg fn */
-  { 0xf05d, SETSF1 | USESF1 },	/* fabs fn */
-  { 0xf06d, SETSF1 | USESF1 },	/* fsqrt fn */
-  { 0xf07d, SETSSP | USESF1 },	/* ftst/nan fn */
-  { 0xf08d, SETSF1 },		/* fldi0 fn */
-  { 0xf09d, SETSF1 }		/* fldi1 fn */
-};
-
-static const struct sh_minor_opcode sh_opcodef[] =
-{
-  { MAP (sh_opcodef0), 0xf00f },
-  { MAP (sh_opcodef1), 0xf0ff }
-};
-
-static const struct sh_major_opcode sh_opcodes[] =
-{
-  { MAP (sh_opcode0) },
-  { MAP (sh_opcode1) },
-  { MAP (sh_opcode2) },
-  { MAP (sh_opcode3) },
-  { MAP (sh_opcode4) },
-  { MAP (sh_opcode5) },
-  { MAP (sh_opcode6) },
-  { MAP (sh_opcode7) },
-  { MAP (sh_opcode8) },
-  { MAP (sh_opcode9) },
-  { MAP (sh_opcodea) },
-  { MAP (sh_opcodeb) },
-  { MAP (sh_opcodec) },
-  { MAP (sh_opcoded) },
-  { MAP (sh_opcodee) },
-  { MAP (sh_opcodef) }
-};
-
-/* Given an instruction, return a pointer to the corresponding
-   sh_opcode structure.  Return NULL if the instruction is not
-   recognized.  */
-
-static const struct sh_opcode *
-sh_insn_info (insn)
-     unsigned int insn;
-{
-  const struct sh_major_opcode *maj;
-  const struct sh_minor_opcode *min, *minend;
-
-  maj = &sh_opcodes[(insn & 0xf000) >> 12];
-  min = maj->minor_opcodes;
-  minend = min + maj->count;
-  for (; min < minend; min++)
-    {
-      unsigned int l;
-      const struct sh_opcode *op, *opend;
-
-      l = insn & min->mask;
-      op = min->opcodes;
-      opend = op + min->count;
-
-      /* Since the opcodes tables are sorted, we could use a binary
-         search here if the count were above some cutoff value.  */
-      for (; op < opend; op++)
-	if (op->opcode == l)
-	  return op;
-    }
-
-  return NULL;  
-}
-
-/* See whether an instruction uses a general purpose register.  */
-
-static boolean
-sh_insn_uses_reg (insn, op, reg)
-     unsigned int insn;
-     const struct sh_opcode *op;
-     unsigned int reg;
-{
-  unsigned int f;
-
-  f = op->flags;
-
-  if ((f & USES1) != 0
-      && ((insn & 0x0f00) >> 8) == reg)
-    return true;
-  if ((f & USES2) != 0
-      && ((insn & 0x00f0) >> 4) == reg)
-    return true;
-  if ((f & USESR0) != 0
-      && reg == 0)
-    return true;
-
-  return false;
-}
-
-/* See whether an instruction uses a floating point register.  */
-
-static boolean
-sh_insn_uses_freg (insn, op, freg)
-     unsigned int insn;
-     const struct sh_opcode *op;
-     unsigned int freg;
-{
-  unsigned int f;
-
-  f = op->flags;
-
-  /* We can't tell if this is a double-precision insn, so just play safe
-     and assume that it might be.  So not only have we test FREG against
-     itself, but also even FREG against FREG+1 - if the using insn uses
-     just the low part of a double precision value - but also an odd
-     FREG against FREG-1 -  if the setting insn sets just the low part
-     of a double precision value.
-     So what this all boils down to is that we have to ignore the lowest
-     bit of the register number.  */
-     
-  if ((f & USESF1) != 0
-      && ((insn & 0x0e00) >> 8) == (freg & 0xe))
-    return true;
-  if ((f & USESF2) != 0
-      && ((insn & 0x00e0) >> 4) == (freg & 0xe))
-    return true;
-  if ((f & USESF0) != 0
-      && freg == 0)
-    return true;
-
-  return false;
-}
-
-/* See whether instructions I1 and I2 conflict, assuming I1 comes
-   before I2.  OP1 and OP2 are the corresponding sh_opcode structures.
-   This should return true if there is a conflict, or false if the
-   instructions can be swapped safely.  */
-
-static boolean
-sh_insns_conflict (i1, op1, i2, op2)
-     unsigned int i1;
-     const struct sh_opcode *op1;
-     unsigned int i2;
-     const struct sh_opcode *op2;
-{
-  unsigned int f1, f2;
-
-  f1 = op1->flags;
-  f2 = op2->flags;
-
-  /* Load of fpscr conflicts with floating point operations.
-     FIXME: shouldn't test raw opcodes here.  */
-  if (((i1 & 0xf0ff) == 0x4066 && (i2 & 0xf000) == 0xf000)
-      || ((i2 & 0xf0ff) == 0x4066 && (i1 & 0xf000) == 0xf000))
-    return true;
-
-  if ((f1 & (BRANCH | DELAY)) != 0
-      || (f2 & (BRANCH | DELAY)) != 0)
-    return true;
-
-  if ((f1 & SETSSP) != 0 && (f2 & USESSP) != 0)
-    return true;
-  if ((f2 & SETSSP) != 0 && (f1 & USESSP) != 0)
-    return true;
-
-  if ((f1 & SETS1) != 0
-      && sh_insn_uses_reg (i2, op2, (i1 & 0x0f00) >> 8))
-    return true;
-  if ((f1 & SETS2) != 0
-      && sh_insn_uses_reg (i2, op2, (i1 & 0x00f0) >> 4))
-    return true;
-  if ((f1 & SETSR0) != 0
-      && sh_insn_uses_reg (i2, op2, 0))
-    return true;
-  if ((f1 & SETSF1) != 0
-      && sh_insn_uses_freg (i2, op2, (i1 & 0x0f00) >> 8))
-    return true;
-
-  if ((f2 & SETS1) != 0
-      && sh_insn_uses_reg (i1, op1, (i2 & 0x0f00) >> 8))
-    return true;
-  if ((f2 & SETS2) != 0
-      && sh_insn_uses_reg (i1, op1, (i2 & 0x00f0) >> 4))
-    return true;
-  if ((f2 & SETSR0) != 0
-      && sh_insn_uses_reg (i1, op1, 0))
-    return true;
-  if ((f2 & SETSF1) != 0
-      && sh_insn_uses_freg (i1, op1, (i2 & 0x0f00) >> 8))
-    return true;
-
-  /* The instructions do not conflict.  */
-  return false;
-}
-
-/* I1 is a load instruction, and I2 is some other instruction.  Return
-   true if I1 loads a register which I2 uses.  */
-
-static boolean
-sh_load_use (i1, op1, i2, op2)
-     unsigned int i1;
-     const struct sh_opcode *op1;
-     unsigned int i2;
-     const struct sh_opcode *op2;
-{
-  unsigned int f1;
-
-  f1 = op1->flags;
-
-  if ((f1 & LOAD) == 0)
-    return false;
-
-  /* If both SETS1 and SETSSP are set, that means a load to a special
-     register using postincrement addressing mode, which we don't care
-     about here.  */
-  if ((f1 & SETS1) != 0
-      && (f1 & SETSSP) == 0
-      && sh_insn_uses_reg (i2, op2, (i1 & 0x0f00) >> 8))
-    return true;
-
-  if ((f1 & SETSR0) != 0
-      && sh_insn_uses_reg (i2, op2, 0))
-    return true;
-
-  if ((f1 & SETSF1) != 0
-      && sh_insn_uses_freg (i2, op2, (i1 & 0x0f00) >> 8))
-    return true;
-
-  return false;
-}
-
-/* Try to align loads and stores within a span of memory.  This is
-   called by both the ELF and the COFF sh targets.  ABFD and SEC are
-   the BFD and section we are examining.  CONTENTS is the contents of
-   the section.  SWAP is the routine to call to swap two instructions.
-   RELOCS is a pointer to the internal relocation information, to be
-   passed to SWAP.  PLABEL is a pointer to the current label in a
-   sorted list of labels; LABEL_END is the end of the list.  START and
-   STOP are the range of memory to examine.  If a swap is made,
-   *PSWAPPED is set to true.  */
-
-boolean
-_bfd_sh_align_load_span (abfd, sec, contents, swap, relocs,
-			 plabel, label_end, start, stop, pswapped)
-     bfd *abfd;
-     asection *sec;
-     bfd_byte *contents;
-     boolean (*swap) PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
-     PTR relocs;
-     bfd_vma **plabel;
-     bfd_vma *label_end;
-     bfd_vma start;
-     bfd_vma stop;
-     boolean *pswapped;
-{
-  bfd_vma i;
-
-  /* Instructions should be aligned on 2 byte boundaries.  */
-  if ((start & 1) == 1)
-    ++start;
-
-  /* Now look through the unaligned addresses.  */
-  i = start;
-  if ((i & 2) == 0)
-    i += 2;
-  for (; i < stop; i += 4)
-    {
-      unsigned int insn;
-      const struct sh_opcode *op;
-      unsigned int prev_insn = 0;
-      const struct sh_opcode *prev_op = NULL;
-
-      insn = bfd_get_16 (abfd, contents + i);
-      op = sh_insn_info (insn);
-      if (op == NULL
-	  || (op->flags & (LOAD | STORE)) == 0)
-	continue;
-
-      /* This is a load or store which is not on a four byte boundary.  */
-
-      while (*plabel < label_end && **plabel < i)
-	++*plabel;
-
-      if (i > start)
-	{
-	  prev_insn = bfd_get_16 (abfd, contents + i - 2);
-	  prev_op = sh_insn_info (prev_insn);
-
-	  /* If the load/store instruction is in a delay slot, we
-	     can't swap.  */
-	  if (prev_op == NULL
-	      || (prev_op->flags & DELAY) != 0)
-	    continue;
-	}
-      if (i > start
-	  && (*plabel >= label_end || **plabel != i)
-	  && prev_op != NULL
-	  && (prev_op->flags & (LOAD | STORE)) == 0
-	  && ! sh_insns_conflict (prev_insn, prev_op, insn, op))
-	{
-	  boolean ok;
-
-	  /* The load/store instruction does not have a label, and
-	     there is a previous instruction; PREV_INSN is not
-	     itself a load/store instruction, and PREV_INSN and
-	     INSN do not conflict.  */
-
-	  ok = true;
-
-	  if (i >= start + 4)
-	    {
-	      unsigned int prev2_insn;
-	      const struct sh_opcode *prev2_op;
-
-	      prev2_insn = bfd_get_16 (abfd, contents + i - 4);
-	      prev2_op = sh_insn_info (prev2_insn);
-
-	      /* If the instruction before PREV_INSN has a delay
-		 slot--that is, PREV_INSN is in a delay slot--we
-		 can not swap.  */
-	      if (prev2_op == NULL
-		  || (prev2_op->flags & DELAY) != 0)
-		ok = false;
-
-	      /* If the instruction before PREV_INSN is a load,
-		 and it sets a register which INSN uses, then
-		 putting INSN immediately after PREV_INSN will
-		 cause a pipeline bubble, so there is no point to
-		 making the swap.  */
-	      if (ok
-		  && (prev2_op->flags & LOAD) != 0
-		  && sh_load_use (prev2_insn, prev2_op, insn, op))
-		ok = false;
-	    }
-
-	  if (ok)
-	    {
-	      if (! (*swap) (abfd, sec, relocs, contents, i - 2))
-		return false;
-	      *pswapped = true;
-	      continue;
-	    }
-	}
-
-      while (*plabel < label_end && **plabel < i + 2)
-	++*plabel;
-
-      if (i + 2 < stop
-	  && (*plabel >= label_end || **plabel != i + 2))
-	{
-	  unsigned int next_insn;
-	  const struct sh_opcode *next_op;
-
-	  /* There is an instruction after the load/store
-	     instruction, and it does not have a label.  */
-	  next_insn = bfd_get_16 (abfd, contents + i + 2);
-	  next_op = sh_insn_info (next_insn);
-	  if (next_op != NULL
-	      && (next_op->flags & (LOAD | STORE)) == 0
-	      && ! sh_insns_conflict (insn, op, next_insn, next_op))
-	    {
-	      boolean ok;
-
-	      /* NEXT_INSN is not itself a load/store instruction,
-		 and it does not conflict with INSN.  */
-
-	      ok = true;
-
-	      /* If PREV_INSN is a load, and it sets a register
-		 which NEXT_INSN uses, then putting NEXT_INSN
-		 immediately after PREV_INSN will cause a pipeline
-		 bubble, so there is no reason to make this swap.  */
-	      if (prev_op != NULL
-		  && (prev_op->flags & LOAD) != 0
-		  && sh_load_use (prev_insn, prev_op, next_insn, next_op))
-		ok = false;
-
-	      /* If INSN is a load, and it sets a register which
-		 the insn after NEXT_INSN uses, then doing the
-		 swap will cause a pipeline bubble, so there is no
-		 reason to make the swap.  However, if the insn
-		 after NEXT_INSN is itself a load or store
-		 instruction, then it is misaligned, so
-		 optimistically hope that it will be swapped
-		 itself, and just live with the pipeline bubble if
-		 it isn't.  */
-	      if (ok
-		  && i + 4 < stop
-		  && (op->flags & LOAD) != 0)
-		{
-		  unsigned int next2_insn;
-		  const struct sh_opcode *next2_op;
-
-		  next2_insn = bfd_get_16 (abfd, contents + i + 4);
-		  next2_op = sh_insn_info (next2_insn);
-		  if ((next2_op->flags & (LOAD | STORE)) == 0
-		      && sh_load_use (insn, op, next2_insn, next2_op))
-		    ok = false;
-		}
-
-	      if (ok)
-		{
-		  if (! (*swap) (abfd, sec, relocs, contents, i))
-		    return false;
-		  *pswapped = true;
-		  continue;
-		}
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Look for loads and stores which we can align to four byte
-   boundaries.  See the longer comment above sh_relax_section for why
-   this is desirable.  This sets *PSWAPPED if some instruction was
-   swapped.  */
-
-static boolean
-sh_align_loads (abfd, sec, internal_relocs, contents, pswapped)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *internal_relocs;
-     bfd_byte *contents;
-     boolean *pswapped;
-{
-  struct internal_reloc *irel, *irelend;
-  bfd_vma *labels = NULL;
-  bfd_vma *label, *label_end;
-
-  *pswapped = false;
-
-  irelend = internal_relocs + sec->reloc_count;
-
-  /* Get all the addresses with labels on them.  */
-  labels = (bfd_vma *) bfd_malloc (sec->reloc_count * sizeof (bfd_vma));
-  if (labels == NULL)
-    goto error_return;
-  label_end = labels;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      if (irel->r_type == R_SH_LABEL)
-	{
-	  *label_end = irel->r_vaddr - sec->vma;
-	  ++label_end;
-	}
-    }
-
-  /* Note that the assembler currently always outputs relocs in
-     address order.  If that ever changes, this code will need to sort
-     the label values and the relocs.  */
-
-  label = labels;
-
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma start, stop;
-
-      if (irel->r_type != R_SH_CODE)
-	continue;
-
-      start = irel->r_vaddr - sec->vma;
-
-      for (irel++; irel < irelend; irel++)
-	if (irel->r_type == R_SH_DATA)
-	  break;
-      if (irel < irelend)
-	stop = irel->r_vaddr - sec->vma;
-      else
-	stop = sec->_cooked_size;
-
-      if (! _bfd_sh_align_load_span (abfd, sec, contents, sh_swap_insns,
-				     (PTR) internal_relocs, &label,
-				     label_end, start, stop, pswapped))
-	goto error_return;
-    }
-
-  free (labels);
-
-  return true;
-
- error_return:
-  if (labels != NULL)
-    free (labels);
-  return false;
-}
-
-/* Swap two SH instructions.  */
-
-static boolean
-sh_swap_insns (abfd, sec, relocs, contents, addr)
-     bfd *abfd;
-     asection *sec;
-     PTR relocs;
-     bfd_byte *contents;
-     bfd_vma addr;
-{
-  struct internal_reloc *internal_relocs = (struct internal_reloc *) relocs;
-  unsigned short i1, i2;
-  struct internal_reloc *irel, *irelend;
-
-  /* Swap the instructions themselves.  */
-  i1 = bfd_get_16 (abfd, contents + addr);
-  i2 = bfd_get_16 (abfd, contents + addr + 2);
-  bfd_put_16 (abfd, i2, contents + addr);
-  bfd_put_16 (abfd, i1, contents + addr + 2);
-
-  /* Adjust all reloc addresses.  */
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      int type, add;
-
-      /* There are a few special types of relocs that we don't want to
-         adjust.  These relocs do not apply to the instruction itself,
-         but are only associated with the address.  */
-      type = irel->r_type;
-      if (type == R_SH_ALIGN
-	  || type == R_SH_CODE
-	  || type == R_SH_DATA
-	  || type == R_SH_LABEL)
-	continue;
-
-      /* If an R_SH_USES reloc points to one of the addresses being
-         swapped, we must adjust it.  It would be incorrect to do this
-         for a jump, though, since we want to execute both
-         instructions after the jump.  (We have avoided swapping
-         around a label, so the jump will not wind up executing an
-         instruction it shouldn't).  */
-      if (type == R_SH_USES)
-	{
-	  bfd_vma off;
-
-	  off = irel->r_vaddr - sec->vma + 4 + irel->r_offset;
-	  if (off == addr)
-	    irel->r_offset += 2;
-	  else if (off == addr + 2)
-	    irel->r_offset -= 2;
-	}
-
-      if (irel->r_vaddr - sec->vma == addr)
-	{
-	  irel->r_vaddr += 2;
-	  add = -2;
-	}
-      else if (irel->r_vaddr - sec->vma == addr + 2)
-	{
-	  irel->r_vaddr -= 2;
-	  add = 2;
-	}
-      else
-	add = 0;
-
-      if (add != 0)
-	{
-	  bfd_byte *loc;
-	  unsigned short insn, oinsn;
-	  boolean overflow;
-
-	  loc = contents + irel->r_vaddr - sec->vma;
-	  overflow = false;
-	  switch (type)
-	    {
-	    default:
-	      break;
-
-	    case R_SH_PCDISP8BY2:
-	    case R_SH_PCRELIMM8BY2:
-	      insn = bfd_get_16 (abfd, loc);
-	      oinsn = insn;
-	      insn += add / 2;
-	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, loc);
-	      break;
-
-	    case R_SH_PCDISP:
-	      insn = bfd_get_16 (abfd, loc);
-	      oinsn = insn;
-	      insn += add / 2;
-	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, loc);
-	      break;
-
-	    case R_SH_PCRELIMM8BY4:
-	      /* This reloc ignores the least significant 3 bits of
-                 the program counter before adding in the offset.
-                 This means that if ADDR is at an even address, the
-                 swap will not affect the offset.  If ADDR is an at an
-                 odd address, then the instruction will be crossing a
-                 four byte boundary, and must be adjusted.  */
-	      if ((addr & 3) != 0)
-		{
-		  insn = bfd_get_16 (abfd, loc);
-		  oinsn = insn;
-		  insn += add / 2;
-		  if ((oinsn & 0xff00) != (insn & 0xff00))
-		    overflow = true;
-		  bfd_put_16 (abfd, insn, loc);
-		}
-
-	      break;
-	    }
-
-	  if (overflow)
-	    {
-	      ((*_bfd_error_handler)
-	       ("%s: 0x%lx: fatal: reloc overflow while relaxing",
-		bfd_get_filename (abfd), (unsigned long) irel->r_vaddr));
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* This is a modification of _bfd_coff_generic_relocate_section, which
-   will handle SH relaxing.  */
-
-static boolean
-sh_relocate_section (output_bfd, info, input_bfd, input_section, contents,
-		     relocs, syms, sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc *rel;
-  struct internal_reloc *relend;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      long symndx;
-      struct coff_link_hash_entry *h;
-      struct internal_syment *sym;
-      bfd_vma addend;
-      bfd_vma val;
-      reloc_howto_type *howto;
-      bfd_reloc_status_type rstat;
-
-      /* Almost all relocs have to do with relaxing.  If any work must
-         be done for them, it has been done in sh_relax_section.  */
-      if (rel->r_type != R_SH_IMM32
-	  && rel->r_type != R_SH_PCDISP)
-	continue;
-
-      symndx = rel->r_symndx;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	}
-      else
-	{    
-	  if (symndx < 0
-	      || (unsigned long) symndx >= obj_raw_syment_count (input_bfd))
-	    {
-	      (*_bfd_error_handler)
-		("%s: illegal symbol index %ld in relocs",
-		 bfd_get_filename (input_bfd), symndx);
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-	  h = obj_coff_sym_hashes (input_bfd)[symndx];
-	  sym = syms + symndx;
-	}
-
-      if (sym != NULL && sym->n_scnum != 0)
-	addend = - sym->n_value;
-      else
-	addend = 0;
-
-      if (rel->r_type == R_SH_PCDISP)
-	addend -= 4;
-
-      if (rel->r_type >= SH_COFF_HOWTO_COUNT)
-	howto = NULL;
-      else
-	howto = &sh_coff_howtos[rel->r_type];
-
-      if (howto == NULL)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      val = 0;
-
-      if (h == NULL)
-	{
-	  asection *sec;
-
-	  /* There is nothing to do for an internal PCDISP reloc.  */
-	  if (rel->r_type == R_SH_PCDISP)
-	    continue;
-
-	  if (symndx == -1)
-	    {
-	      sec = bfd_abs_section_ptr;
-	      val = 0;
-	    }
-	  else
-	    {
-	      sec = sections[symndx];
-              val = (sec->output_section->vma
-		     + sec->output_offset
-		     + sym->n_value
-		     - sec->vma);
-	    }
-	}
-      else
-	{
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      asection *sec;
-
-	      sec = h->root.u.def.section;
-	      val = (h->root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	    }
-	  else if (! info->relocateable)
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	    }
-	}
-
-      rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					contents,
-					rel->r_vaddr - input_section->vma,
-					val, addend);
-
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	case bfd_reloc_ok:
-	  break;
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-	    char buf[SYMNMLEN + 1];
-
-	    if (symndx == -1)
-	      name = "*ABS*";
-	    else if (h != NULL)
-	      name = h->root.root.string;
-	    else if (sym->_n._n_n._n_zeroes == 0
-		     && sym->_n._n_n._n_offset != 0)
-	      name = obj_coff_strings (input_bfd) + sym->_n._n_n._n_offset;
-	    else
-	      {
- 		strncpy (buf, sym->_n._n_name, SYMNMLEN);
-		buf[SYMNMLEN] = '\0';
-		name = buf;
-	      }
-
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, (bfd_vma) 0, input_bfd,
-		    input_section, rel->r_vaddr - input_section->vma)))
-	      return false;
-	  }
-	}
-    }
-
-  return true;
-}
-
-/* This is a version of bfd_generic_get_relocated_section_contents
-   which uses sh_relocate_section.  */
-
-static bfd_byte *
-sh_coff_get_relocated_section_contents (output_bfd, link_info, link_order,
-					data, relocateable, symbols)
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  asection *input_section = link_order->u.indirect.section;
-  bfd *input_bfd = input_section->owner;
-  asection **sections = NULL;
-  struct internal_reloc *internal_relocs = NULL;
-  struct internal_syment *internal_syms = NULL;
-
-  /* We only need to handle the case of relaxing, or of having a
-     particular set of section contents, specially.  */
-  if (relocateable
-      || coff_section_data (input_bfd, input_section) == NULL
-      || coff_section_data (input_bfd, input_section)->contents == NULL)
-    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
-						       link_order, data,
-						       relocateable,
-						       symbols);
-
-  memcpy (data, coff_section_data (input_bfd, input_section)->contents,
-	  input_section->_raw_size);
-
-  if ((input_section->flags & SEC_RELOC) != 0
-      && input_section->reloc_count > 0)
-    {
-      bfd_size_type symesz = bfd_coff_symesz (input_bfd);
-      bfd_byte *esym, *esymend;
-      struct internal_syment *isymp;
-      asection **secpp;
-
-      if (! _bfd_coff_get_external_symbols (input_bfd))
-	goto error_return;
-
-      internal_relocs = (_bfd_coff_read_internal_relocs
-			 (input_bfd, input_section, false, (bfd_byte *) NULL,
-			  false, (struct internal_reloc *) NULL));
-      if (internal_relocs == NULL)
-	goto error_return;
-
-      internal_syms = ((struct internal_syment *)
-		       bfd_malloc (obj_raw_syment_count (input_bfd)
-				   * sizeof (struct internal_syment)));
-      if (internal_syms == NULL)
-	goto error_return;
-
-      sections = (asection **) bfd_malloc (obj_raw_syment_count (input_bfd)
-					   * sizeof (asection *));
-      if (sections == NULL)
-	goto error_return;
-
-      isymp = internal_syms;
-      secpp = sections;
-      esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
-      esymend = esym + obj_raw_syment_count (input_bfd) * symesz;
-      while (esym < esymend)
-	{
-	  bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp);
-
-	  if (isymp->n_scnum != 0)
-	    *secpp = coff_section_from_bfd_index (input_bfd, isymp->n_scnum);
-	  else
-	    {
-	      if (isymp->n_value == 0)
-		*secpp = bfd_und_section_ptr;
-	      else
-		*secpp = bfd_com_section_ptr;
-	    }
-
-	  esym += (isymp->n_numaux + 1) * symesz;
-	  secpp += isymp->n_numaux + 1;
-	  isymp += isymp->n_numaux + 1;
-	}
-
-      if (! sh_relocate_section (output_bfd, link_info, input_bfd,
-				 input_section, data, internal_relocs,
-				 internal_syms, sections))
-	goto error_return;
-
-      free (sections);
-      sections = NULL;
-      free (internal_syms);
-      internal_syms = NULL;
-      free (internal_relocs);
-      internal_relocs = NULL;
-    }
-
-  return data;
-
- error_return:
-  if (internal_relocs != NULL)
-    free (internal_relocs);
-  if (internal_syms != NULL)
-    free (internal_syms);
-  if (sections != NULL)
-    free (sections);
-  return NULL;
-}
-
-/* The target vectors.  */
-
-const bfd_target shcoff_vec =
-{
-  "coff-sh",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),
-  '_',				/* leading symbol underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-     bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-     bfd_false},
-  {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (coff),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
-
-const bfd_target shlcoff_vec =
-{
-  "coff-shl",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little endian too*/
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),
-  '_',				/* leading symbol underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-  {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-     bfd_generic_archive_p, _bfd_dummy_target},   
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-     bfd_false},
-  {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (coff),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
-
-/* Some people want versions of the SH COFF target which do not align
-   to 16 byte boundaries.  We implement that by adding a couple of new
-   target vectors.  These are just like the ones above, but they
-   change the default section alignment.  To generate them in the
-   assembler, use -small.  To use them in the linker, use -b
-   coff-sh{l}-small and -oformat coff-sh{l}-small.
-
-   Yes, this is a horrible hack.  A general solution for setting
-   section alignment in COFF is rather complex.  ELF handles this
-   correctly.  */
-
-/* Only recognize the small versions if the target was not defaulted.
-   Otherwise we won't recognize the non default endianness.  */
-
-static const bfd_target *
-coff_small_object_p (abfd)
-     bfd *abfd;
-{
-  if (abfd->target_defaulted)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  return coff_object_p (abfd);
-}
-
-/* Set the section alignment for the small versions.  */
-
-static boolean
-coff_small_new_section_hook (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  if (! coff_new_section_hook (abfd, section))
-    return false;
-
-  /* We must align to at least a four byte boundary, because longword
-     accesses must be on a four byte boundary.  */
-  if (section->alignment_power == COFF_DEFAULT_SECTION_ALIGNMENT_POWER)
-    section->alignment_power = 2;
-
-  return true;
-}
-
-/* This is copied from bfd_coff_std_swap_table so that we can change
-   the default section alignment power.  */
-
-static const bfd_coff_backend_data bfd_coff_small_swap_table =
-{
-  coff_swap_aux_in, coff_swap_sym_in, coff_swap_lineno_in,
-  coff_swap_aux_out, coff_swap_sym_out,
-  coff_swap_lineno_out, coff_swap_reloc_out,
-  coff_swap_filehdr_out, coff_swap_aouthdr_out,
-  coff_swap_scnhdr_out,
-  FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ,
-#ifdef COFF_LONG_FILENAMES
-  true,
-#else
-  false,
-#endif
-#ifdef COFF_LONG_SECTION_NAMES
-  true,
-#else
-  false,
-#endif
-  2,
-  coff_swap_filehdr_in, coff_swap_aouthdr_in, coff_swap_scnhdr_in,
-  coff_swap_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook,
-  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
-  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
-  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
-  coff_sym_is_global, coff_compute_section_file_positions,
-  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
-  coff_adjust_symndx, coff_link_add_one_symbol,
-  coff_link_output_has_begun, coff_final_link_postscript
-};
-
-#define coff_small_close_and_cleanup \
-  coff_close_and_cleanup
-#define coff_small_bfd_free_cached_info \
-  coff_bfd_free_cached_info
-#define coff_small_get_section_contents \
-  coff_get_section_contents
-#define coff_small_get_section_contents_in_window \
-  coff_get_section_contents_in_window
-
-const bfd_target shcoff_small_vec =
-{
-  "coff-sh-small",		/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),
-  '_',				/* leading symbol underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-  {_bfd_dummy_target, coff_small_object_p, /* bfd_check_format */
-     bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-     bfd_false},
-  {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (coff_small),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) &bfd_coff_small_swap_table
-};
-
-const bfd_target shlcoff_small_vec =
-{
-  "coff-shl-small",		/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little endian too*/
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),
-  '_',				/* leading symbol underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-  {_bfd_dummy_target, coff_small_object_p, /* bfd_check_format */
-     bfd_generic_archive_p, _bfd_dummy_target},   
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-     bfd_false},
-  {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-     _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (coff_small),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) &bfd_coff_small_swap_table
-};
diff --git a/bfd/coff-sparc.c b/bfd/coff-sparc.c
deleted file mode 100644
index bc2cf153843..00000000000
--- a/bfd/coff-sparc.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* BFD back-end for Sparc COFF files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/sparc.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-#define BADMAG(x) ((x).f_magic != SPARCMAGIC && (x).f_magic != LYNXCOFFMAGIC)
-
-/* The page size is a guess based on ELF.  */
-#define COFF_PAGE_SIZE 0x10000
-
-enum reloc_type
-  {
-    R_SPARC_NONE = 0,
-    R_SPARC_8,		R_SPARC_16,		R_SPARC_32, 
-    R_SPARC_DISP8,	R_SPARC_DISP16,		R_SPARC_DISP32, 
-    R_SPARC_WDISP30,	R_SPARC_WDISP22,
-    R_SPARC_HI22,	R_SPARC_22,
-    R_SPARC_13,		R_SPARC_LO10,
-    R_SPARC_GOT10,	R_SPARC_GOT13,		R_SPARC_GOT22,
-    R_SPARC_PC10,	R_SPARC_PC22,
-    R_SPARC_WPLT30,
-    R_SPARC_COPY,
-    R_SPARC_GLOB_DAT,	R_SPARC_JMP_SLOT,
-    R_SPARC_RELATIVE,
-    R_SPARC_UA32,
-    R_SPARC_max
-  };
-
-#if 0
-static CONST char *CONST reloc_type_names[] =
-{
-  "R_SPARC_NONE",
-  "R_SPARC_8",		"R_SPARC_16",		"R_SPARC_32",
-  "R_SPARC_DISP8",	"R_SPARC_DISP16",	"R_SPARC_DISP32",
-  "R_SPARC_WDISP30",	"R_SPARC_WDISP22",
-  "R_SPARC_HI22",	"R_SPARC_22",
-  "R_SPARC_13",		"R_SPARC_LO10",
-  "R_SPARC_GOT10",	"R_SPARC_GOT13",	"R_SPARC_GOT22",
-  "R_SPARC_PC10",	"R_SPARC_PC22",
-  "R_SPARC_WPLT30",
-  "R_SPARC_COPY",
-  "R_SPARC_GLOB_DAT",	"R_SPARC_JMP_SLOT",
-  "R_SPARC_RELATIVE",
-  "R_SPARC_UA32",
-};
-#endif
-
-/* This is stolen pretty directly from elf.c.  */
-static bfd_reloc_status_type
-bfd_coff_generic_reloc PARAMS ((bfd *, arelent *, asymbol *, PTR,
-				asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-bfd_coff_generic_reloc (abfd, reloc_entry, symbol, data, input_section,
-			output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  return bfd_reloc_continue;
-}
-
-static reloc_howto_type coff_sparc_howto_table[] = 
-{
-  HOWTO(R_SPARC_NONE,    0,0, 0,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_8,       0,0, 8,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_8",       false,0,0x000000ff,true),
-  HOWTO(R_SPARC_16,      0,1,16,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_16",      false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_32,      0,2,32,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_32",      false,0,0xffffffff,true),
-  HOWTO(R_SPARC_DISP8,   0,0, 8,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP8",   false,0,0x000000ff,true),
-  HOWTO(R_SPARC_DISP16,  0,1,16,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP16",  false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_DISP32,  0,2,32,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_DISP32",  false,0,0x00ffffff,true),
-  HOWTO(R_SPARC_WDISP30, 2,2,30,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP30", false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_WDISP22, 2,2,22,true, 0,complain_overflow_signed,  bfd_coff_generic_reloc,"R_SPARC_WDISP22", false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HI22,   10,2,22,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_HI22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_22,      0,2,22,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_22",      false,0,0x003fffff,true),
-  HOWTO(R_SPARC_13,      0,2,13,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_13",      false,0,0x00001fff,true),
-  HOWTO(R_SPARC_LO10,    0,2,10,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_LO10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT10,   0,2,10,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT10",   false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT13,   0,2,13,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT13",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_GOT22,  10,2,22,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_GOT22",   false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC10,    0,2,10,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC22,    0,2,22,false,0,complain_overflow_bitfield,bfd_coff_generic_reloc,"R_SPARC_PC22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WPLT30,  0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_WPLT30",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_COPY,    0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_COPY",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_GLOB_DAT,0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_JMP_SLOT,0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_RELATIVE,0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_RELATIVE",false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA32,    0,0,00,false,0,complain_overflow_dont,    bfd_coff_generic_reloc,"R_SPARC_UA32",    false,0,0x00000000,true),
-};
-
-struct coff_reloc_map {
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char coff_reloc_val;
-};
-
-static CONST struct coff_reloc_map sparc_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_SPARC_NONE, },
-  { BFD_RELOC_16, R_SPARC_16, },
-  { BFD_RELOC_8, R_SPARC_8 },
-  { BFD_RELOC_8_PCREL, R_SPARC_DISP8 },
-  { BFD_RELOC_CTOR, R_SPARC_32 }, /* @@ Assumes 32 bits.  */
-  { BFD_RELOC_32, R_SPARC_32 },
-  { BFD_RELOC_32_PCREL, R_SPARC_DISP32 },
-  { BFD_RELOC_HI22, R_SPARC_HI22 },
-  { BFD_RELOC_LO10, R_SPARC_LO10, },
-  { BFD_RELOC_32_PCREL_S2, R_SPARC_WDISP30 },
-  { BFD_RELOC_SPARC22, R_SPARC_22 },
-  { BFD_RELOC_SPARC13, R_SPARC_13 },
-  { BFD_RELOC_SPARC_GOT10, R_SPARC_GOT10 },
-  { BFD_RELOC_SPARC_GOT13, R_SPARC_GOT13 },
-  { BFD_RELOC_SPARC_GOT22, R_SPARC_GOT22 },
-  { BFD_RELOC_SPARC_PC10, R_SPARC_PC10 },
-  { BFD_RELOC_SPARC_PC22, R_SPARC_PC22 },
-  { BFD_RELOC_SPARC_WPLT30, R_SPARC_WPLT30 },
-  { BFD_RELOC_SPARC_COPY, R_SPARC_COPY },
-  { BFD_RELOC_SPARC_GLOB_DAT, R_SPARC_GLOB_DAT },
-  { BFD_RELOC_SPARC_JMP_SLOT, R_SPARC_JMP_SLOT },
-  { BFD_RELOC_SPARC_RELATIVE, R_SPARC_RELATIVE },
-  { BFD_RELOC_SPARC_WDISP22, R_SPARC_WDISP22 },
-  /*  { BFD_RELOC_SPARC_UA32, R_SPARC_UA32 }, not used?? */
-};
-
-static reloc_howto_type *
-coff_sparc_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-  for (i = 0; i < sizeof (sparc_reloc_map) / sizeof (struct coff_reloc_map); i++)
-    {
-      if (sparc_reloc_map[i].bfd_reloc_val == code)
-	return &coff_sparc_howto_table[(int) sparc_reloc_map[i].coff_reloc_val];
-    }
-  return 0;
-}
-#define coff_bfd_reloc_type_lookup	coff_sparc_reloc_type_lookup
-
-static void
-rtype2howto (cache_ptr, dst)
-     arelent *cache_ptr;
-     struct internal_reloc *dst;
-{
-  BFD_ASSERT (dst->r_type < (unsigned int) R_SPARC_max);
-  cache_ptr->howto = &coff_sparc_howto_table[dst->r_type];
-}
-
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-#define SWAP_IN_RELOC_OFFSET	bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET	bfd_h_put_32
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr) \
-  cache_ptr->addend = reloc.r_offset;
-
-/* Clear the r_spare field in relocs.  */
-#define SWAP_OUT_RELOC_EXTRA(abfd,src,dst) \
-  do { \
-       dst->r_spare[0] = 0; \
-       dst->r_spare[1] = 0; \
-     } while (0)
-
-#define __A_MAGIC_SET__
-
-/* Enable Sparc-specific hacks in coffcode.h. */
-
-#define COFF_SPARC
-
-#include "coffcode.h"
-
-const bfd_target
-#ifdef TARGET_SYM
-  TARGET_SYM =
-#else
-  sparccoff_vec =
-#endif
-{
-#ifdef TARGET_NAME
-  TARGET_NAME,
-#else
-  "coff-sparc",			/* name */
-#endif
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,	/* data byte order is big */
-  BFD_ENDIAN_BIG,	/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  '_',				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
-/* Note that we allow an object file to be treated as a core file as well. */
-    {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, coff_object_p},
-    {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-       bfd_false},
-    {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-stgo32.c b/bfd/coff-stgo32.c
deleted file mode 100644
index 21724fec0dc..00000000000
--- a/bfd/coff-stgo32.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/* BFD back-end for Intel 386 COFF files (go32 variant with a stub).
-   Copyright 1997, 1998 Free Software Foundation, Inc.
-   Written by Robert Hoehne.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file handles now also stubbed coff images. The stub is a small
-   DOS executable program before the coff image to load it in memory
-   and execute it. This is needed, because DOS cannot run coff files.
-
-   All the functions below are called by the corresponding functions
-   from coffswap.h.
-   The only thing what they do is to adjust the information stored in
-   the COFF file which are offset into the file.
-   This is needed, because DJGPP uses a very special way to load and run
-   the coff image. It loads the image in memory and assumes then, that the
-   image had no stub by using the filepointers as pointers in the coff
-   image and NOT in the file.
-
-   To be compatible with any existing executables I have fixed this
-   here and NOT in the DJGPP startup code.
- */
-
-#define TARGET_SYM		go32stubbedcoff_vec
-#define TARGET_NAME		"coff-go32-exe"
-#define TARGET_UNDERSCORE	'_'
-#define COFF_GO32_EXE
-
-#include "bfd.h"
-
-/* At first the prototypes */
-
-static void
-adjust_filehdr_in_post PARAMS ((bfd * abfd, PTR src, PTR dst));
-static void
-adjust_filehdr_out_pre PARAMS ((bfd * abfd, PTR in, PTR out));
-static void
-adjust_filehdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
-static void
-adjust_scnhdr_in_post PARAMS ((bfd * abfd, PTR ext, PTR in));
-static void
-adjust_scnhdr_out_pre PARAMS ((bfd * abfd, PTR in, PTR out));
-static void
-adjust_scnhdr_out_post PARAMS ((bfd * abfd, PTR in, PTR out));
-
-static void
-adjust_aux_in_post PARAMS ((bfd * abfd, PTR ext1, int type, int class, int indx,
-			    int numaux, PTR in1));
-static void
-adjust_aux_out_pre PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
-			    int numaux, PTR extp));
-static void
-adjust_aux_out_post PARAMS ((bfd * abfd, PTR inp, int type, int class, int indx,
-			     int numaux, PTR extp));
-
-static void
-create_go32_stub PARAMS ((bfd * abfd));
-
-/*
-   All that ..._PRE and ...POST functions are called from the corresponding
-   coff_swap... functions. The ...PRE functions are called at the beginning
-   of the function and the ...POST functions at the end of the swap routines.
- */
-
-#define COFF_ADJUST_FILEHDR_IN_POST adjust_filehdr_in_post
-#define COFF_ADJUST_FILEHDR_OUT_PRE adjust_filehdr_out_pre
-#define COFF_ADJUST_FILEHDR_OUT_POST adjust_filehdr_out_post
-
-#define COFF_ADJUST_SCNHDR_IN_POST adjust_scnhdr_in_post
-#define COFF_ADJUST_SCNHDR_OUT_PRE adjust_scnhdr_out_pre
-#define COFF_ADJUST_SCNHDR_OUT_POST adjust_scnhdr_out_post
-
-#define COFF_ADJUST_AUX_IN_POST adjust_aux_in_post
-#define COFF_ADJUST_AUX_OUT_PRE adjust_aux_out_pre
-#define COFF_ADJUST_AUX_OUT_POST adjust_aux_out_post
-
-static boolean
-  go32_stubbed_coff_bfd_copy_private_bfd_data PARAMS ((bfd * ibfd, bfd * obfd));
-
-#define coff_bfd_copy_private_bfd_data go32_stubbed_coff_bfd_copy_private_bfd_data
-
-#include "coff-i386.c"
-
-/* I hold in the usrdata the stub */
-#define bfd_coff_go32stub bfd_usrdata
-
-/* This macro is used, because I cannot assume the endianess of the
-   host system */
-#define _H(index) (bfd_h_get_16(abfd, (bfd_byte *)(header+index*2)))
-
-/* This function checks if the bfd is a stubbed coff image */
-static const bfd_target *
-go32_stubbed_coff_object_p (abfd)
-     bfd *abfd;
-{
-  unsigned char header[10];
-  char magic[8];
-  unsigned long coff_start, exe_start;
-
-  if (bfd_read (&header, 1, sizeof (header), abfd) != sizeof (header))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  if (_H (0) != 0x5a4d)		/* it is not an exe file. maybe a coff-image */
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  coff_start = (long) _H (2) * 512L;
-  if (_H (1))
-    coff_start += (long) _H (1) - 512L;
-
-  /* We can handle only a stub with a length of STUBSIZE */
-  if (coff_start != STUBSIZE)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  exe_start = _H (4) * 16;
-  if (bfd_seek (abfd, exe_start, SEEK_SET) != 0)
-    return 0;
-  if (bfd_read (&magic, 1, 8, abfd) != 8)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  if (memcmp (magic, "go32stub", 8) != 0)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
-    return 0;
-
-  /* Call the normal COFF detection routine */
-  return coff_object_p (abfd);
-}
-
-/* These bytes are a 2048-byte DOS executable, which loads the COFF
-   image into memory and then runs it. It is called 'stub' */
-
-static unsigned char stub_bytes[STUBSIZE] =
-{
-#include "go32stub.h"
-};
-
-/*
-   I have not commented each swap function below, because the
-   technique is in any function the same. For the ...in function,
-   all the pointers are adjusted by adding STUBSIZE and for the
-   ...out function, it is subtracted first and after calling the
-   standard swap function it is reset to the old value */
-
-/* This macro is used for adjusting the filepointers, which
-   is done only, if the pointer is nonzero */
-
-#define ADJUST_VAL(val,diff) \
-  if (val != 0) val += diff
-
-static void
-adjust_filehdr_in_post  (abfd, src, dst)
-     bfd *abfd;
-     PTR src;
-     PTR dst;
-{
-  FILHDR *filehdr_src = (FILHDR *) src;
-  struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
-
-  ADJUST_VAL (filehdr_dst->f_symptr, STUBSIZE);
-
-  /* Save now the stub to be used later */
-  bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
-
-  /* Since this function returns no status, I do not set here
-     any bfd_error_...
-     That means, before the use of bfd_coff_go32stub (), this value
-     should be checked if it is != NULL */
-  if (bfd_coff_go32stub (abfd) == NULL)
-    return;
-  memcpy (bfd_coff_go32stub (abfd), filehdr_src->stub, STUBSIZE);
-}
-
-static void
-adjust_filehdr_out_pre  (abfd, in, out)
-     bfd *abfd;
-     PTR in;
-     PTR out;
-{
-  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
-  FILHDR *filehdr_out = (FILHDR *) out;
-
-  /* Generate the stub */
-  create_go32_stub (abfd);
-
-  /* Copy the stub to the file header */
-  if (bfd_coff_go32stub (abfd) != NULL)
-    memcpy (filehdr_out->stub, bfd_coff_go32stub (abfd), STUBSIZE);
-  else
-    /* use the default */
-    memcpy (filehdr_out->stub, stub_bytes, STUBSIZE);
-
-  ADJUST_VAL (filehdr_in->f_symptr, -STUBSIZE);
-}
-
-static void
-adjust_filehdr_out_post  (abfd, in, out)
-     bfd *abfd;
-     PTR in;
-     PTR out;
-{
-  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
-  /* undo the above change */
-  ADJUST_VAL (filehdr_in->f_symptr, STUBSIZE);
-}
-
-static void
-adjust_scnhdr_in_post  (abfd, ext, in)
-     bfd *abfd;
-     PTR ext;
-     PTR in;
-{
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
-
-  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
-}
-
-static void
-adjust_scnhdr_out_pre  (abfd, in, out)
-     bfd *abfd;
-     PTR in;
-     PTR out;
-{
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
-
-  ADJUST_VAL (scnhdr_int->s_scnptr, -STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_relptr, -STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_lnnoptr, -STUBSIZE);
-}
-
-static void
-adjust_scnhdr_out_post (abfd, in, out)
-     bfd *abfd;
-     PTR in;
-     PTR out;
-{
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
-
-  ADJUST_VAL (scnhdr_int->s_scnptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_relptr, STUBSIZE);
-  ADJUST_VAL (scnhdr_int->s_lnnoptr, STUBSIZE);
-}
-
-static void
-adjust_aux_in_post  (abfd, ext1, type, class, indx, numaux, in1)
-     bfd *abfd;
-     PTR ext1;
-     int type;
-     int class;
-     int indx;
-     int numaux;
-     PTR in1;
-{
-  union internal_auxent *in = (union internal_auxent *) in1;
-
-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-    {
-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
-    }
-}
-
-static void
-adjust_aux_out_pre  (abfd, inp, type, class, indx, numaux, extp)
-     bfd *abfd;
-     PTR inp;
-     int type;
-     int class;
-     int indx;
-     int numaux;
-     PTR extp;
-{
-  union internal_auxent *in = (union internal_auxent *) inp;
-
-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-    {
-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, -STUBSIZE);
-    }
-}
-
-static void
-adjust_aux_out_post (abfd, inp, type, class, indx, numaux, extp)
-     bfd *abfd;
-     PTR inp;
-     int type;
-     int class;
-     int indx;
-     int numaux;
-     PTR extp;
-{
-  union internal_auxent *in = (union internal_auxent *) inp;
-
-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-    {
-      ADJUST_VAL (in->x_sym.x_fcnary.x_fcn.x_lnnoptr, STUBSIZE);
-    }
-}
-
-/*
-   That's the function, which creates the stub. There are
-   different cases from where the stub is taken.
-   At first the environment variable $(GO32STUB) is checked and then
-   $(STUB) if it was not set.
-   If it exists and points to a valid stub the stub is taken from
-   that file. This file can be also a whole executable file, because
-   the stub is computed from the exe information at the start of that
-   file.
-
-   If there was any error, the standard stub (compiled in this file)
-   is taken.
- */
-
-static void
-create_go32_stub (abfd)
-     bfd *abfd;
-{
-  /* Do it only once */
-  if (bfd_coff_go32stub (abfd) == NULL)
-    {
-      char *stub;
-      struct stat st;
-      int f;
-      unsigned char header[10];
-      char magic[8];
-      unsigned long coff_start, exe_start;
-
-      /* Check at first the environment variable $(GO32STUB) */
-      stub = getenv ("GO32STUB");
-      /* Now check the environment variable $(STUB) */
-      if (stub == NULL)
-	stub = getenv ("STUB");
-      if (stub == NULL)
-	goto stub_end;
-      if (stat (stub, &st) != 0)
-	goto stub_end;
-#ifdef O_BINARY
-      f = open (stub, O_RDONLY | O_BINARY);
-#else
-      f = open (stub, O_RDONLY);
-#endif
-      if (f < 0)
-	goto stub_end;
-      if (read (f, &header, sizeof (header)) < 0)
-	{
-	  close (f);
-	  goto stub_end;
-	}
-      if (_H (0) != 0x5a4d)	/* it is not an exe file */
-	{
-	  close (f);
-	  goto stub_end;
-	}
-      /* Compute the size of the stub (it is every thing up
-         to the beginning of the coff image) */
-      coff_start = (long) _H (2) * 512L;
-      if (_H (1))
-	coff_start += (long) _H (1) - 512L;
-
-      /* Currently there is only a fixed stub size of 2048 bytes
-         supported */
-      if (coff_start != 2048)
-	{
-	  close (f);
-	  goto stub_end;
-	}
-      exe_start = _H (4) * 16;
-      if ((unsigned long) lseek (f, exe_start, SEEK_SET) != exe_start)
-	{
-	  close (f);
-	  goto stub_end;
-	}
-      if (read (f, &magic, 8) != 8)
-	{
-	  close (f);
-	  goto stub_end;
-	}
-      if (memcmp (magic, "go32stub", 8) != 0)
-	{
-	  close (f);
-	  goto stub_end;
-	}
-      /* Now we found a correct stub (hopefully) */
-      bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, coff_start);
-      if (bfd_coff_go32stub (abfd) == NULL)
-	{
-	  close (f);
-	  return;
-	}
-      lseek (f, 0L, SEEK_SET);
-      if ((unsigned long) read (f, bfd_coff_go32stub (abfd), coff_start)
-	  != coff_start)
-	{
-	  bfd_release (abfd, bfd_coff_go32stub (abfd));
-	  bfd_coff_go32stub (abfd) = NULL;
-	}
-      close (f);
-    }
-stub_end:
-  /* There was something wrong above, so use now the standard builtin
-     stub */
-  if (bfd_coff_go32stub (abfd) == NULL)
-    {
-      bfd_coff_go32stub (abfd) = (PTR) bfd_alloc (abfd, STUBSIZE);
-      if (bfd_coff_go32stub (abfd) == NULL)
-	{
-	  return;
-	}
-
-      memcpy (bfd_coff_go32stub (abfd), stub_bytes, STUBSIZE);
-    }
-}
-
-/* If ibfd was a stubbed coff image, copy the stub from that bfd
-   to the new obfd.
- */
-
-static boolean
-go32_stubbed_coff_bfd_copy_private_bfd_data  (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  /* check if both are the same targets */
-  if (ibfd->xvec != obfd->xvec)
-    return true;
-
-  /* check if both have a valid stub */
-  if (bfd_coff_go32stub (ibfd) == NULL
-      || bfd_coff_go32stub (obfd) == NULL)
-    return true;
-
-  /* Now copy the stub */
-  memcpy (bfd_coff_go32stub (obfd), bfd_coff_go32stub (ibfd), STUBSIZE);
-
-  return true;
-}
diff --git a/bfd/coff-svm68k.c b/bfd/coff-svm68k.c
deleted file mode 100644
index 3d2a5a7d565..00000000000
--- a/bfd/coff-svm68k.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/* BFD back-end for Motorola sysv68
-   Copyright 1997 Free Software Foundation, Inc.
-   Written by Philippe De Muyter <phdm@info.ucl.ac.be>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_SYM	m68ksysvcoff_vec
-#define TARGET_NAME	"coff-m68k-sysv"
-#define STATIC_RELOCS
-#define COFF_COMMON_ADDEND
-
-#include "coff-m68k.c"
diff --git a/bfd/coff-tic30.c b/bfd/coff-tic30.c
deleted file mode 100644
index 3ff8c594036..00000000000
--- a/bfd/coff-tic30.c
+++ /dev/null
@@ -1,206 +0,0 @@
-/* BFD back-end for TMS320C30 coff binaries.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-   Contributed by Steven Haworth (steve@pm.cse.rmit.edu.au)
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "coff/tic30.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
-
-reloc_howto_type tic30_coff_howto_table[] =
-{
-  HOWTO (R_TIC30_ABS16, 2, 1, 16, false, 0, 0, NULL,
-	 "16", false, 0x0000FFFF, 0x0000FFFF, false),
-  HOWTO (R_TIC30_ABS24, 2, 2, 24, false, 8, complain_overflow_bitfield, NULL,
-	 "24", false, 0xFFFFFF00, 0xFFFFFF00, false),
-  HOWTO (R_TIC30_LDP, 18, 0, 24, false, 0, complain_overflow_bitfield, NULL,
-	 "LDP", false, 0x00FF0000, 0x000000FF, false),
-  HOWTO (R_TIC30_ABS32, 2, 2, 32, false, 0, complain_overflow_bitfield, NULL,
-	 "32", false, 0xFFFFFFFF, 0xFFFFFFFF, false),
-  HOWTO (R_TIC30_PC16, 2, 1, 16, true, 0, complain_overflow_signed, NULL,
-	 "PCREL", false, 0x0000FFFF, 0x0000FFFF, false),
-  {-1}
-};
-
-#ifndef coff_bfd_reloc_type_lookup
-#define coff_bfd_reloc_type_lookup tic30_coff_reloc_type_lookup
-
-/* For the case statement use the code values used in tc_gen_reloc to
-   map to the howto table entries that match those in both the aout
-   and coff implementations. */
-reloc_howto_type *
-tic30_coff_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_8:
-    case BFD_RELOC_TIC30_LDP:
-      return &tic30_coff_howto_table[2];
-    case BFD_RELOC_16:
-      return &tic30_coff_howto_table[0];
-    case BFD_RELOC_24:
-      return &tic30_coff_howto_table[1];
-    case BFD_RELOC_16_PCREL:
-      return &tic30_coff_howto_table[4];
-    case BFD_RELOC_32:
-      return &tic30_coff_howto_table[3];
-    default:
-      return (reloc_howto_type *) NULL;
-    }
-}
-
-#endif
-
-/* Turn a howto into a reloc number */
-
-static int
-coff_tic30_select_reloc (howto)
-     reloc_howto_type *howto;
-{
-  return howto->type;
-}
-
-#define SELECT_RELOC(x,howto) x.r_type = coff_tic30_select_reloc(howto)
-
-
-#define BADMAG(x) TIC30BADMAG(x)
-#define TIC30 1			/* Customize coffcode.h */
-#define __A_MAGIC_SET__
-
-/* Code to swap in the reloc */
-#define SWAP_IN_RELOC_OFFSET  bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
-#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) dst->r_stuff[0] = 'S'; \
-dst->r_stuff[1] = 'C';
-
-/* Code to turn a r_type into a howto ptr, uses the above howto table. */
-
-static void
-rtype2howto (internal, dst)
-     arelent *internal;
-     struct internal_reloc *dst;
-{
-  switch (dst->r_type)
-    {
-    case R_TIC30_ABS16:
-      internal->howto = &tic30_coff_howto_table[0];
-      break;
-    case R_TIC30_ABS24:
-      internal->howto = &tic30_coff_howto_table[1];
-      break;
-    case R_TIC30_ABS32:
-      internal->howto = &tic30_coff_howto_table[3];
-      break;
-    case R_TIC30_LDP:
-      internal->howto = &tic30_coff_howto_table[2];
-      break;
-    case R_TIC30_PC16:
-      internal->howto = &tic30_coff_howto_table[4];
-      break;
-    default:
-      abort ();
-      break;
-    }
-}
-
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-/* Perform any necessary magic to the addend in a reloc entry */
-
-#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
- cache_ptr->addend =  ext_reloc.r_offset;
-
-
-#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
- reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void
-reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent *relent;
-     struct internal_reloc *reloc;
-     asymbol **symbols;
-     bfd *abfd;
-     asection *section;
-{
-  relent->address = reloc->r_vaddr;
-  rtype2howto (relent, reloc);
-
-  if (reloc->r_symndx > 0)
-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
-  else
-    {
-      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
-  relent->addend = reloc->r_offset;
-  relent->address -= section->vma;
-}
-
-#include "coffcode.h"
-
-const bfd_target tic30_coff_vec =
-{
-  "coff-tic30",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  '_',				/* leading symbol underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
-
-  {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
-   bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (coff),
-  BFD_JUMP_TABLE_COPY (coff),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-  BFD_JUMP_TABLE_SYMBOLS (coff),
-  BFD_JUMP_TABLE_RELOCS (coff),
-  BFD_JUMP_TABLE_WRITE (coff),
-  BFD_JUMP_TABLE_LINK (coff),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE
-};
diff --git a/bfd/coff-tic80.c b/bfd/coff-tic80.c
deleted file mode 100644
index 043c8a01835..00000000000
--- a/bfd/coff-tic80.c
+++ /dev/null
@@ -1,759 +0,0 @@
-/* BFD back-end for Texas Instruments TMS320C80 Multimedia Video Processor (MVP).
-   Copyright 1996, 1997, 1999 Free Software Foundation, Inc.
-
-   Written by Fred Fish (fnf@cygnus.com)
-
-   There is nothing new under the sun. This file draws a lot on other
-   coff files.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "bfdlink.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/tic80.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (2)
-#define COFF_ALIGN_IN_SECTION_HEADER 1
-#define COFF_ALIGN_IN_SFLAGS 1
-
-#define GET_SCNHDR_FLAGS bfd_h_get_16
-#define PUT_SCNHDR_FLAGS bfd_h_put_16
-
-static void rtype2howto
-  PARAMS ((arelent *cache_ptr, struct internal_reloc *dst));
-static bfd_reloc_status_type ppbase_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type glob15_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type glob16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type local16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean coff_tic80_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-
-static reloc_howto_type tic80_howto_table[] =
-{
-
-  HOWTO (R_RELLONG,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "RELLONG",			/* name */
-	 true,				/* partial_inplace */
-	 0xffffffff,			/* src_mask */
-	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_MPPCR,			/* type */
-	 2,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 true,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "MPPCR",			/* name */
-	 true,				/* partial_inplace */
-	 0xffffffff,			/* src_mask */
-	 0xffffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  HOWTO (R_ABS,				/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "ABS",				/* name */
-	 true,				/* partial_inplace */
-	 0xffffffff,			/* src_mask */
-	 0xffffffff,			/* dst_mask */
-	 false),				/* pcrel_offset */
-
-  HOWTO (R_PPBASE,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 ppbase_reloc,			/* special_function */
-	 "PPBASE",			/* name */
-	 true,				/* partial_inplace */
-	 0xffffffff,			/* src_mask */
-	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPLBASE,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 ppbase_reloc,			/* special_function */
-	 "PPLBASE",			/* name */
-	 true,				/* partial_inplace */
-	 0xffffffff,			/* src_mask */
-	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PP15,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob15_reloc,			/* special_function */
-	 "PP15",			/* name */
-	 true,				/* partial_inplace */
-	 0x1ffc0,			/* src_mask */
-	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PP15W,			/* type */
-	 2,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob15_reloc,			/* special_function */
-	 "PP15W",			/* name */
-	 true,				/* partial_inplace */
-	 0x1ffc0,			/* src_mask */
-	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PP15H,			/* type */
-	 1,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob15_reloc,			/* special_function */
-	 "PP15H",			/* name */
-	 true,				/* partial_inplace */
-	 0x1ffc0,			/* src_mask */
-	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PP16B,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob16_reloc,			/* special_function */
-	 "PP16B",			/* name */
-	 true,				/* partial_inplace */
-	 0x3ffc0,			/* src_mask */
-	 0x3ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPL15,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "PPL15",			/* name */
-	 true,				/* partial_inplace */
-	 0x7fff,			/* src_mask */
-	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPL15W,			/* type */
-	 2,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "PPL15W",			/* name */
-	 true,				/* partial_inplace */
-	 0x7fff,			/* src_mask */
-	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPL15H,			/* type */
-	 1,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "PPL15H",			/* name */
-	 true,				/* partial_inplace */
-	 0x7fff,			/* src_mask */
-	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPL16B,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 local16_reloc,			/* special_function */
-	 "PPL16B",			/* name */
-	 true,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPN15,			/* type */
-	 0,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob15_reloc,			/* special_function */
-	 "PPN15",			/* name */
-	 true,				/* partial_inplace */
-	 0x1ffc0,			/* src_mask */
-	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPN15W,			/* type */
-	 2,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob15_reloc,			/* special_function */
-	 "PPN15W",			/* name */
-	 true,				/* partial_inplace */
-	 0x1ffc0,			/* src_mask */
-	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPN15H,			/* type */
-	 1,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob15_reloc,			/* special_function */
-	 "PPN15H",			/* name */
-	 true,				/* partial_inplace */
-	 0x1ffc0,			/* src_mask */
-	 0x1ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPN16B,			/* type */
-	 0,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 6,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 glob16_reloc,			/* special_function */
-	 "PPN16B",			/* name */
-	 true,				/* partial_inplace */
-	 0x3ffc0,			/* src_mask */
-	 0x3ffc0,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPLN15,			/* type */
-	 0,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "PPLN15",			/* name */
-	 true,				/* partial_inplace */
-	 0x7fff,			/* src_mask */
-	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPLN15W,			/* type */
-	 2,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "PPLN15W",			/* name */
-	 true,				/* partial_inplace */
-	 0x7fff,			/* src_mask */
-	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPLN15H,			/* type */
-	 1,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 NULL,				/* special_function */
-	 "PPLN15H",			/* name */
-	 true,				/* partial_inplace */
-	 0x7fff,			/* src_mask */
-	 0x7fff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  HOWTO (R_PPLN16B,			/* type */
-	 0,				/* rightshift */
-	 -2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 15,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 local16_reloc,			/* special_function */
-	 "PPLN16B",			/* name */
-	 true,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false)				/* pcrel_offset */
-};
-
-/* Special relocation functions, used when the output file is not
-   itself a COFF TIc80 file.  */
-
-/* This special function is used for the base address type
-   relocations.  */
-
-static bfd_reloc_status_type
-ppbase_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	      error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* FIXME.  */
-  abort ();
-}
-
-/* This special function is used for the global 15 bit relocations.  */
-
-static bfd_reloc_status_type
-glob15_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	      error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* FIXME.  */
-  abort ();
-}
-
-/* This special function is used for the global 16 bit relocations.  */
-
-static bfd_reloc_status_type
-glob16_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	      error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* FIXME.  */
-  abort ();
-}
-
-/* This special function is used for the local 16 bit relocations.  */
-
-static bfd_reloc_status_type
-local16_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	      error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* FIXME.  */
-  abort ();
-}
-
-/* Code to turn an external r_type into a pointer to an entry in the howto_table.
-   If passed an r_type we don't recognize the abort rather than silently failing
-   to generate an output file. */
-
-static void
-rtype2howto (cache_ptr, dst)
-     arelent *cache_ptr;
-     struct internal_reloc *dst;
-{
-  unsigned int i;
-
-  for (i = 0; i < sizeof tic80_howto_table / sizeof tic80_howto_table[0]; i++)
-    {
-      if (tic80_howto_table[i].type == dst->r_type)
-	{
-	  cache_ptr->howto = tic80_howto_table + i;
-	  return;
-	}
-    }
-
-  (*_bfd_error_handler) (_("Unrecognized reloc type 0x%x"),
-			 (unsigned int) dst->r_type);
-  cache_ptr->howto = tic80_howto_table + 0;
-}
-
-#define RTYPE2HOWTO(cache_ptr, dst) rtype2howto (cache_ptr, dst)
-#define coff_rtype_to_howto coff_tic80_rtype_to_howto
-
-static reloc_howto_type *
-coff_tic80_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-  arelent genrel;
-
-  if (rel -> r_symndx == -1 && addendp != NULL)
-    {
-      /* This is a TI "internal relocation", which means that the relocation
-	 amount is the amount by which the current section is being relocated
-	 in the output section. */
-      *addendp = (sec -> output_section -> vma + sec -> output_offset) - sec -> vma;
-    }
-  RTYPE2HOWTO (&genrel, rel);
-  return genrel.howto;
-}
-
-#ifndef BADMAG
-#define BADMAG(x) TIC80BADMAG(x)
-#endif
-
-#define coff_relocate_section coff_tic80_relocate_section
-
-/* We need a special relocation routine to handle the PP relocs.  Most
-   of this is a copy of _bfd_coff_generic_relocate_section.  */
-
-static boolean
-coff_tic80_relocate_section (output_bfd, info, input_bfd,
-			     input_section, contents, relocs, syms,
-			     sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc *rel;
-  struct internal_reloc *relend;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      long symndx;
-      struct coff_link_hash_entry *h;
-      struct internal_syment *sym;
-      bfd_vma addend;
-      bfd_vma val;
-      reloc_howto_type *howto;
-      bfd_reloc_status_type rstat;
-      bfd_vma addr;
-
-      symndx = rel->r_symndx;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	}
-      else
-	{    
-	  h = obj_coff_sym_hashes (input_bfd)[symndx];
-	  sym = syms + symndx;
-	}
-
-      /* COFF treats common symbols in one of two ways.  Either the
-         size of the symbol is included in the section contents, or it
-         is not.  We assume that the size is not included, and force
-         the rtype_to_howto function to adjust the addend as needed.  */
-
-      if (sym != NULL && sym->n_scnum != 0)
-	addend = - sym->n_value;
-      else
-	addend = 0;
-
-      howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
-				       sym, &addend);
-      if (howto == NULL)
-	return false;
-
-      val = 0;
-
-      if (h == NULL)
-	{
-	  asection *sec;
-
-	  if (symndx == -1)
-	    {
-	      sec = bfd_abs_section_ptr;
-	      val = 0;
-	    }
-	  else
-	    {
-	      sec = sections[symndx];
-              val = (sec->output_section->vma
-		     + sec->output_offset
-		     + sym->n_value);
-	      if (! obj_pe (output_bfd))
-		val -= sec->vma;
-	    }
-	}
-      else
-	{
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      asection *sec;
-
-	      sec = h->root.u.def.section;
-	      val = (h->root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	      }
-
-	  else if (! info->relocateable)
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	    }
-	}
-
-      addr = rel->r_vaddr - input_section->vma;
-
-      /* FIXME: This code assumes little endian, but the PP can
-         apparently be bi-endian.  I don't know if the bi-endianness
-         applies to the instruction set or just to the data.  */
-      switch (howto->type)
-	{
-	default:
-	case R_ABS:
-	case R_RELLONGX:
-	case R_PPL15:
-	case R_PPL15W:
-	case R_PPL15H:
-	case R_PPLN15:
-	case R_PPLN15W:
-	case R_PPLN15H:
-	  rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					    contents, addr, val, addend);
-	  break;
-
-	case R_PP15:
-	case R_PP15W:
-	case R_PP15H:
-	case R_PPN15:
-	case R_PPN15W:
-	case R_PPN15H:
-	  /* Offset the address so that we can use 4 byte relocations.  */
-	  rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					    contents + 2, addr, val, addend);
-	  break;
-
-	case R_PP16B:
-	case R_PPN16B:
-	  {
-	    /* The most significant bit is stored in bit 6.  */
-	    bfd_byte hold;
-
-	    hold = contents[addr + 4];
-	    contents[addr + 4] &=~ 0x20;
-	    contents[addr + 4] |= (contents[addr] >> 1) & 0x20;
-	    rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					      contents + 2, addr,
-					      val, addend);
-	    contents[addr] &=~ 0x40;
-	    contents[addr] |= (contents[addr + 4] << 1) & 0x40;
-	    contents[addr + 4] &=~ 0x20;
-	    contents[addr + 4] |= hold & 0x20;
-	    break;
-	  }
-
-	case R_PPL16B:
-	case R_PPLN16B:
-	  {
-	    /* The most significant bit is stored in bit 28.  */
-	    bfd_byte hold;
-
-	    hold = contents[addr + 1];
-	    contents[addr + 1] &=~ 0x80;
-	    contents[addr + 1] |= (contents[addr + 3] << 3) & 0x80;
-	    rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					      contents, addr,
-					      val, addend);
-	    contents[addr + 3] &= ~0x10;
-	    contents[addr + 3] |= (contents[addr + 1] >> 3) & 0x10;
-	    contents[addr + 1] &=~ 0x80;
-	    contents[addr + 1] |= hold & 0x80;
-	    break;
-	  }
-	
-	case R_PPBASE:
-	  /* Parameter RAM is from 0x1000000 to 0x1000800.  */
-	  contents[addr] &=~ 0x3;
-	  if (val >= 0x1000000 && val < 0x1000800)
-	    contents[addr] |= 0x3;
-	  else
-	    contents[addr] |= 0x2;
-	  rstat = bfd_reloc_ok;
-	  break;
-
-	case R_PPLBASE:
-	  /* Parameter RAM is from 0x1000000 to 0x1000800.  */
-	  contents[addr + 2] &= ~0xc0;
-	  if (val >= 0x1000000 && val < 0x1000800)
-	    contents[addr + 2] |= 0xc0;
-	  else
-	    contents[addr + 2] |= 0x80;
-	  rstat = bfd_reloc_ok;
-	  break;
-	}
-
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	case bfd_reloc_ok:
-	  break;
-	case bfd_reloc_outofrange:
-	  (*_bfd_error_handler)
-	    (_("%s: bad reloc address 0x%lx in section `%s'"),
-	     bfd_get_filename (input_bfd),
-	     (unsigned long) rel->r_vaddr,
-	     bfd_get_section_name (input_bfd, input_section));
-	  return false;
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-	    char buf[SYMNMLEN + 1];
-
-	    if (symndx == -1)
-	      name = "*ABS*";
-	    else if (h != NULL)
-	      name = h->root.root.string;
-	    else
-	      {
-		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
-		if (name == NULL)
-		  return false;
-	      }
-
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, (bfd_vma) 0, input_bfd,
-		    input_section, rel->r_vaddr - input_section->vma)))
-	      return false;
-	  }
-	}
-    }
-  return true;
-}
-
-#define TIC80COFF 1		/* Customize coffcode.h */
-#undef C_AUTOARG		/* Clashes with TIc80's C_UEXT */
-#undef C_LASTENT		/* Clashes with TIc80's C_STATLAB */
-#include "coffcode.h"
-
-const bfd_target 
-  tic80coff_vec =
-{
-  "coff-tic80",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little (arch supports both) */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  '_',				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-   bfd_false},
- {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE
- };
diff --git a/bfd/coff-u68k.c b/bfd/coff-u68k.c
deleted file mode 100644
index 97ea73fa9c6..00000000000
--- a/bfd/coff-u68k.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* BFD back-end for Motorola 68000 COFF binaries having underscore with name.
-   Copyright 1990, 1991, 1992 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_SYM	m68kcoffun_vec
-#define TARGET_NAME	"coff-m68k-un"
-
-#define NAMES_HAVE_UNDERSCORE
-
-/* define this to not have multiple copy of m68k_rtype2howto
-   in the executable file */
-#define ONLY_DECLARE_RELOCS
-
-/* This magic number indicates that the names have underscores.
-   Other 68k magic numbers indicate that the names do not have
-   underscores.  */
-#define BADMAG(x) ((x).f_magic != MC68KBCSMAGIC)
-
-#include "coff-m68k.c"
diff --git a/bfd/coff-w65.c b/bfd/coff-w65.c
deleted file mode 100644
index 28d68c37998..00000000000
--- a/bfd/coff-w65.c
+++ /dev/null
@@ -1,445 +0,0 @@
-/* BFD back-end for WDC 65816 COFF binaries.
-   Copyright 1995, 96, 1997 Free Software Foundation, Inc.
-   Written by Steve Chamberlain, <sac@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "coff/w65.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
-static reloc_howto_type howto_table[] =
-{
-  HOWTO (R_W65_ABS8,    0,  0, 8, false, 0, complain_overflow_bitfield, 0, "abs8", true, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_W65_ABS16,   1,  0, 16, false, 0, complain_overflow_bitfield, 0, "abs16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_W65_ABS24,   0,  2, 32, false, 0, complain_overflow_bitfield, 0, "abs24", true, 0x00ffffff, 0x00ffffff, false),
-  HOWTO (R_W65_ABS8S8,  0,  0, 8, false, 0, complain_overflow_bitfield, 0, ">abs8", true, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_W65_ABS8S16, 0,  0, 8, false, 0, complain_overflow_bitfield, 0, "^abs8", true, 0x000000ff, 0x000000ff, false),
-  HOWTO (R_W65_ABS16S8, 1,  0, 16, false, 0, complain_overflow_bitfield, 0, ">abs16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_W65_ABS16S16,1,  0, 16, false, 0, complain_overflow_bitfield, 0, "^abs16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_W65_PCR8,    0,  0, 8, false, 0, complain_overflow_bitfield, 0, "pcrel8", true, 0x000000ff, 0x000000ff, true),
-  HOWTO (R_W65_PCR16,   1,  0, 16, false, 0, complain_overflow_bitfield, 0, "pcrel16", true, 0x0000ffff, 0x0000ffff, true),
-  HOWTO (R_W65_DP,    0,  0, 8, false, 0, complain_overflow_bitfield, 0, "dp", true, 0x000000ff, 0x000000ff, false),
-
-};
-
-
-/* Turn a howto into a reloc number */
-
-#define SELECT_RELOC(x,howto) \
-  { x.r_type = select_reloc(howto); }
-
-#define BADMAG(x) (W65BADMAG(x))
-#define W65 1			/* Customize coffcode.h */
-#define __A_MAGIC_SET__
-
-
-/* Code to swap in the reloc */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
-#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
-  dst->r_stuff[0] = 'S'; \
-  dst->r_stuff[1] = 'C';
-
-
-static int
-select_reloc (howto)
-     reloc_howto_type *howto;
-{
-  return howto->type ;
-}
-
-/* Code to turn a r_type into a howto ptr, uses the above howto table
-   */
-
-static void
-rtype2howto (internal, dst)
-     arelent *internal;
-     struct internal_reloc *dst;
-{
-      internal->howto = howto_table + dst->r_type - 1;
-}
-
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-
-/* Perform any necessary magic to the addend in a reloc entry */
-
-
-#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
- cache_ptr->addend =  ext_reloc.r_offset;
-
-
-#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
- reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void
-reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent * relent;
-     struct internal_reloc *reloc;
-     asymbol ** symbols;
-     bfd * abfd;
-     asection * section;
-{
-  relent->address = reloc->r_vaddr;
-  rtype2howto (relent, reloc);
-
-  if (((int) reloc->r_symndx) > 0)
-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
-  else
-    {
-      relent->sym_ptr_ptr = (asymbol **)&(bfd_abs_symbol);
-    }
-
-
-
-  relent->addend = reloc->r_offset;
-
-  relent->address -= section->vma;
-  /*  relent->section = 0;*/
-}
-
-
-static int
-h8300_reloc16_estimate(abfd, input_section, reloc, shrink, link_info)
-     bfd *abfd;
-     asection *input_section;
-     arelent *reloc;
-     unsigned int shrink;
-     struct bfd_link_info *link_info;
-{
-  bfd_vma value;  
-  bfd_vma dot;
-  bfd_vma gap;
-
-  /* The address of the thing to be relocated will have moved back by 
-   the size of the shrink  - but we don't change reloc->address here,
-   since we need it to know where the relocation lives in the source
-   uncooked section */
-
-  /*  reloc->address -= shrink;   conceptual */
-
-  bfd_vma address = reloc->address - shrink;
-  
-
-  switch (reloc->howto->type)
-    {     
-    case R_MOV16B2:
-    case R_JMP2:
-      shrink+=2;
-      break;
-
-      /* Thing is a move one byte */
-    case R_MOV16B1:
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-
-      if (value >= 0xff00)
-	{ 
-
-	  /* Change the reloc type from 16bit, possible 8 to 8bit
-	     possible 16 */
-	  reloc->howto = reloc->howto + 1;	  
-	  /* The place to relc moves back by one */
-	  /* This will be two bytes smaller in the long run */
-	  shrink +=2 ;
-	  bfd_perform_slip(abfd, 2, input_section, address);
-	}      
-
-      break;
-      /* This is the 24 bit branch which could become an 8 bitter, 
-       the relocation points to the first byte of the insn, not the
-       actual data */
-
-    case R_JMPL1:
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-	
-      dot = input_section->output_section->vma +
-	input_section->output_offset + address;
-  
-      /* See if the address we're looking at within 127 bytes of where
-	 we are, if so then we can use a small branch rather than the
-	 jump we were going to */
-
-      gap = value - dot ;
-  
-      if (-120 < (long)gap && (long)gap < 120 )
-	{ 
-
-	  /* Change the reloc type from 24bit, possible 8 to 8bit
-	     possible 32 */
-	  reloc->howto = reloc->howto + 1;	  
-	  /* This will be two bytes smaller in the long run */
-	  shrink +=2 ;
-	  bfd_perform_slip(abfd, 2, input_section, address);
-	}
-      break;
-
-    case R_JMP1:
-
-      value = bfd_coff_reloc16_get_value(reloc, link_info, input_section);
-	
-      dot = input_section->output_section->vma +
-	input_section->output_offset + address;
-  
-      /* See if the address we're looking at within 127 bytes of where
-	 we are, if so then we can use a small branch rather than the
-	 jump we were going to */
-
-      gap = value - (dot - shrink);
-  
-
-      if (-120 < (long)gap && (long)gap < 120 )
-	{ 
-
-	  /* Change the reloc type from 16bit, possible 8 to 8bit
-	     possible 16 */
-	  reloc->howto = reloc->howto + 1;	  
-	  /* The place to relc moves back by one */
-
-	  /* This will be two bytes smaller in the long run */
-	  shrink +=2 ;
-	  bfd_perform_slip(abfd, 2, input_section, address);
-	}
-      break;
-    }
-
-  
-  return shrink;
-}
-
-
-/* First phase of a relaxing link */
-
-/* Reloc types
-   large		small
-   R_MOV16B1		R_MOV16B2	mov.b with 16bit or 8 bit address
-   R_JMP1		R_JMP2		jmp or pcrel branch
-   R_JMPL1		R_JMPL_B8	24jmp or pcrel branch
-   R_MOV24B1		R_MOV24B2	24 or 8 bit reloc for mov.b
-
-*/
-
-static void
-h8300_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
-			   dst_ptr)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     arelent *reloc;
-     bfd_byte *data;
-     unsigned int *src_ptr;
-     unsigned int *dst_ptr;
-{
-  unsigned int src_address = *src_ptr;
-  unsigned int dst_address = *dst_ptr;
-  asection *input_section = link_order->u.indirect.section;
-
-  switch (reloc->howto->type)
-    {
-    case R_W65_ABS8:
-    case R_W65_DP:
-      {
-	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						       input_section);
-	bfd_put_8 (abfd, gap, data + dst_address);
-	dst_address += 1;
-	src_address += 1;
-      }
-      break;
-
-    case R_W65_ABS8S8:
-      {
-	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						       input_section);
-	gap >>= 8;
-	bfd_put_8 (abfd, gap, data + dst_address);
-	dst_address += 1;
-	src_address += 1;
-      }
-      break;
-
-    case R_W65_ABS8S16:
-      {
-	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						       input_section);
-	gap >>=16;
-	bfd_put_8 (abfd, gap, data + dst_address);
-	dst_address += 1;
-	src_address += 1;
-      }
-      break;
-
-    case R_W65_ABS16:
-      {
-	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						       input_section);
-
-	bfd_put_16 (abfd, gap, data + dst_address);
-	dst_address += 2;
-	src_address += 2;
-      }
-      break;
-    case R_W65_ABS16S8:
-      {
-	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						       input_section);
-	gap >>= 8;
-	bfd_put_16 (abfd, gap, data + dst_address);
-	dst_address += 2;
-	src_address += 2;
-      }
-      break;
-    case R_W65_ABS16S16:
-      {
-	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						       input_section);
-	gap >>= 16;
-	bfd_put_16 (abfd, gap, data + dst_address);
-	dst_address += 2;
-	src_address += 2;
-      }
-      break;
-
-    case R_W65_ABS24:
-      {
-	unsigned int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						       input_section);
-	bfd_put_16 (abfd, gap, data + dst_address);
-	bfd_put_8 (abfd, gap>>16, data+dst_address+2);
-	dst_address += 3;
-	src_address += 3;
-      }
-      break;
-
-    case R_W65_PCR8:
-      {
-	int gap = bfd_coff_reloc16_get_value (reloc, link_info,
-					      input_section);
-	bfd_vma dot = link_order->offset 
-	  + dst_address 
-	    + link_order->u.indirect.section->output_section->vma;
-
-	gap -= dot + 1;
-	if (gap < -128 || gap > 127) {
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort();
-	}
-	bfd_put_8 (abfd, gap, data + dst_address);
-	dst_address += 1;
-	src_address += 1;
-      }
-      break;
-
-    case R_W65_PCR16:
-      {
-	bfd_vma gap = bfd_coff_reloc16_get_value (reloc, link_info,
-						  input_section);
-	bfd_vma dot = link_order->offset 
-	  + dst_address 
-	    + link_order->u.indirect.section->output_section->vma;
-
-
-	/* This wraps within the page, so ignore the relativeness, look at the
-	   high part */
-	if ((gap & 0xf0000) != (dot & 0xf0000)) {
-	  if (! ((*link_info->callbacks->reloc_overflow)
-		 (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		  reloc->howto->name, reloc->addend, input_section->owner,
-		  input_section, reloc->address)))
-	    abort();
-	}
-
-	gap -= dot + 2;
-	bfd_put_16 (abfd, gap, data + dst_address);
-	dst_address += 2;
-	src_address += 2;
-      }
-      break;
-    default:
-      printf(_("ignoring reloc %s\n"), reloc->howto->name);
-      break;
-
-    }
-  *src_ptr = src_address;
-  *dst_ptr = dst_address;
-
-}
-
-#define coff_reloc16_extra_cases h8300_reloc16_extra_cases
-#define coff_reloc16_estimate h8300_reloc16_estimate
-
-#include "coffcode.h"
-
-
-#undef coff_bfd_get_relocated_section_contents
-#undef coff_bfd_relax_section
-#define coff_bfd_get_relocated_section_contents \
-  bfd_coff_reloc16_get_relocated_section_contents
-#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
-
-
-
-bfd_target w65_vec =
-{
-  "coff-w65",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* header byte order is little */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | BFD_IS_RELAXABLE ),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  '_',				/* leading char */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
-
-  {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
-   bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-we32k.c b/bfd/coff-we32k.c
deleted file mode 100644
index 826bbe330db..00000000000
--- a/bfd/coff-we32k.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* BFD back-end for we32k COFF files.
-   Copyright (C) 1992, 93, 94, 95, 1997 Free Software Foundation, Inc.
-   Contributed by Brendan Kehoe (brendan@cs.widener.edu).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/we32k.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (3)
-
-static reloc_howto_type howto_table[] = 
-{
-    {0},
-    {1},
-    {2},
-    {3},
-    {4},
-    {5},
-  HOWTO(R_DIR32,	       0,  2, 	32, false, 0,complain_overflow_bitfield, 0, "dir32",	true, 0xffffffff,0xffffffff, false),
-    {7},
-    {010},
-    {011},
-    {012},
-    {013},
-    {014},
-    {015},
-    {016},
-  HOWTO(R_RELBYTE,	       0,  0,  	8,  false, 0, complain_overflow_bitfield, 0, "8",	true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_RELWORD,	       0,  1, 	16, false, 0, complain_overflow_bitfield, 0, "16",	true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_RELLONG,	       0,  2, 	32, false, 0, complain_overflow_bitfield, 0, "32",	true, 0xffffffff,0xffffffff, false),
-  HOWTO(R_PCRBYTE,	       0,  0, 	8,  true,  0, complain_overflow_signed, 0, "DISP8",    true, 0x000000ff,0x000000ff, false),
-  HOWTO(R_PCRWORD,	       0,  1, 	16, true,  0, complain_overflow_signed, 0, "DISP16",   true, 0x0000ffff,0x0000ffff, false),
-  HOWTO(R_PCRLONG,	       0,  2, 	32, true,  0, complain_overflow_signed, 0, "DISP32",   true, 0xffffffff,0xffffffff, false),
-};
-
-/* Turn a howto into a reloc  nunmber */
-
-#define SELECT_RELOC(x,howto) { x.r_type = howto->type; }
-#define BADMAG(x) WE32KBADMAG(x)
-#define WE32K	1
-
-#define RTYPE2HOWTO(cache_ptr, dst) \
-	    (cache_ptr)->howto = howto_table + (dst)->r_type;
-
-#include "coffcode.h"
-
-#define coff_write_armap bsd_write_armap
-
-const bfd_target we32kcoff_vec =
-{
-  "coff-we32k",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-  0,				/* leading underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-
- {_bfd_dummy_target, coff_object_p, /* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
- {bfd_false, coff_mkobject, _bfd_generic_mkarchive, /* bfd_set_format */
-   bfd_false},
- {bfd_false, coff_write_object_contents, /* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coff-z8k.c b/bfd/coff-z8k.c
deleted file mode 100644
index 04049e89c28..00000000000
--- a/bfd/coff-z8k.c
+++ /dev/null
@@ -1,280 +0,0 @@
-/* BFD back-end for Zilog Z800n COFF binaries.
-   Copyright 1992, 93, 94, 95, 1997 Free Software Foundation, Inc.
-   Contributed by Cygnus Support.
-   Written by Steve Chamberlain, <sac@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "coff/z8k.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-#define COFF_DEFAULT_SECTION_ALIGNMENT_POWER (1)
-
-static reloc_howto_type r_imm32 =
-HOWTO (R_IMM32, 0, 1, 32, false, 0,
-       complain_overflow_bitfield, 0, "r_imm32", true, 0xffffffff,
-       0xffffffff, false);
-
-static reloc_howto_type r_imm4l =
-HOWTO (R_IMM4L, 0, 1, 4, false, 0,
-       complain_overflow_bitfield, 0, "r_imm4l", true, 0xf, 0xf, false);
-
-static reloc_howto_type r_da =
-HOWTO (R_IMM16, 0, 1, 16, false, 0,
-       complain_overflow_bitfield, 0, "r_da", true, 0x0000ffff, 0x0000ffff,
-       false);
-
-static reloc_howto_type r_imm8 =
-HOWTO (R_IMM8, 0, 1, 8, false, 0,
-       complain_overflow_bitfield, 0, "r_imm8", true, 0x000000ff, 0x000000ff,
-       false);
-
-static reloc_howto_type r_jr =
-HOWTO (R_JR, 0, 1, 8, true, 0, complain_overflow_signed, 0,
-       "r_jr", true, 0, 0, true);
-
-/* Turn a howto into a reloc number */
-
-static int 
-coff_z8k_select_reloc (howto)
-     reloc_howto_type *howto;
-{
-  return howto->type;
-}
-
-#define SELECT_RELOC(x,howto) x.r_type = coff_z8k_select_reloc(howto)
-
-
-#define BADMAG(x) Z8KBADMAG(x)
-#define Z8K 1			/* Customize coffcode.h */
-#define __A_MAGIC_SET__
-
-
-
-/* Code to swap in the reloc */
-#define SWAP_IN_RELOC_OFFSET   bfd_h_get_32
-#define SWAP_OUT_RELOC_OFFSET bfd_h_put_32
-#define SWAP_OUT_RELOC_EXTRA(abfd, src, dst) \
-  dst->r_stuff[0] = 'S'; \
-  dst->r_stuff[1] = 'C';
-
-/* Code to turn a r_type into a howto ptr, uses the above howto table
-   */
-
-static void
-rtype2howto (internal, dst)
-     arelent * internal;
-     struct internal_reloc *dst;
-{
-  switch (dst->r_type)
-    {
-    default:
-      abort ();
-      break;
-    case R_IMM8:
-      internal->howto = &r_imm8;
-      break;
-     case R_IMM16:
-      internal->howto = &r_da;
-      break;
-    case R_JR:
-      internal->howto = &r_jr;
-      break;
-    case R_IMM32:
-      internal->howto = &r_imm32;
-      break;
-    case R_IMM4L:
-      internal->howto = &r_imm4l;
-      break;
-    }
-}
-
-#define RTYPE2HOWTO(internal, relocentry) rtype2howto(internal,relocentry)
-
-
-/* Perform any necessary magic to the addend in a reloc entry */
-
-
-#define CALC_ADDEND(abfd, symbol, ext_reloc, cache_ptr) \
- cache_ptr->addend =  ext_reloc.r_offset;
-
-
-#define RELOC_PROCESSING(relent,reloc,symbols,abfd,section) \
- reloc_processing(relent, reloc, symbols, abfd, section)
-
-static void 
-reloc_processing (relent, reloc, symbols, abfd, section)
-     arelent * relent;
-     struct internal_reloc *reloc;
-     asymbol ** symbols;
-     bfd * abfd;
-     asection * section;
-{
-  relent->address = reloc->r_vaddr;
-  rtype2howto (relent, reloc);
-
-  if (reloc->r_symndx > 0)
-    {
-      relent->sym_ptr_ptr = symbols + obj_convert (abfd)[reloc->r_symndx];
-    }
-  else
-    {
-      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-    }
-
-
-  relent->addend = reloc->r_offset;
-  relent->address -= section->vma;
-}
-
-static void
-extra_case (in_abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)
-     bfd *in_abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     arelent *reloc;
-     bfd_byte *data;
-     unsigned int *src_ptr;
-     unsigned int *dst_ptr;
-{
-  asection *input_section = link_order->u.indirect.section;
-
-  switch (reloc->howto->type)
-    {
-    case R_IMM8:
-      bfd_put_8 (in_abfd,
-		 bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		 data + *dst_ptr);
-      (*dst_ptr) += 1;
-      (*src_ptr) += 1;
-      break;
-
-    case R_IMM32:
-      bfd_put_32 (in_abfd,
-		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		  data + *dst_ptr);
-      (*dst_ptr) += 4;
-      (*src_ptr) += 4;
-      break;
-
-    case R_IMM4L:
-      bfd_put_8 (in_abfd,
-		 ((bfd_get_8 (in_abfd, data + *dst_ptr) & 0xf0) 
-		  | (0x0f
-		     & bfd_coff_reloc16_get_value (reloc, link_info,
-						   input_section))),
-		 data + *dst_ptr);
-      (*dst_ptr) += 1;
-      (*src_ptr) += 1;
-      break;
-
-    case R_IMM16:
-      bfd_put_16 (in_abfd,
-		  bfd_coff_reloc16_get_value (reloc, link_info, input_section),
-		  data + *dst_ptr);
-      (*dst_ptr) += 2;
-      (*src_ptr) += 2;
-      break;
-
-    case R_JR:
-      {
-	bfd_vma dst = bfd_coff_reloc16_get_value (reloc, link_info,
-						  input_section);
-	bfd_vma dot = (link_order->offset
-		       + *dst_ptr
-		       + input_section->output_section->vma);
-	int gap = dst - dot - 1;/* -1 since were in the odd byte of the
-				    word and the pc's been incremented */
-
-	if (gap & 1)
-	  abort ();
-	gap /= 2;
-	if (gap > 128 || gap < -128)
-	  {
-	    if (! ((*link_info->callbacks->reloc_overflow)
-		   (link_info, bfd_asymbol_name (*reloc->sym_ptr_ptr),
-		    reloc->howto->name, reloc->addend, input_section->owner,
-		    input_section, reloc->address)))
-	      abort ();
-	  }
-	bfd_put_8 (in_abfd, gap, data + *dst_ptr);
-	(*dst_ptr)++;
-	(*src_ptr)++;
-	break;
-      }
-    default:
-      abort ();
-    }
-}
-
-#define coff_reloc16_extra_cases extra_case
-
-#include "coffcode.h"
-
-
-#undef  coff_bfd_get_relocated_section_contents
-#undef coff_bfd_relax_section
-#define coff_bfd_get_relocated_section_contents \
-  bfd_coff_reloc16_get_relocated_section_contents
-#define coff_bfd_relax_section bfd_coff_reloc16_relax_section
-
-const bfd_target z8kcoff_vec =
-{
-  "coff-z8k",			/* name */
-  bfd_target_coff_flavour,
-  BFD_ENDIAN_BIG,		/* data byte order is big */
-  BFD_ENDIAN_BIG,		/* header byte order is big */
-
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT),
-
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  '_',				/* leading symbol underscore */
-  '/',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {_bfd_dummy_target, coff_object_p,	/* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, coff_mkobject, _bfd_generic_mkarchive,	/* bfd_set_format */
-   bfd_false},
-  {bfd_false, coff_write_object_contents,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (coff),
-     BFD_JUMP_TABLE_COPY (coff),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-     BFD_JUMP_TABLE_SYMBOLS (coff),
-     BFD_JUMP_TABLE_RELOCS (coff),
-     BFD_JUMP_TABLE_WRITE (coff),
-     BFD_JUMP_TABLE_LINK (coff),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  COFF_SWAP_TABLE,
-};
diff --git a/bfd/coffcode.h b/bfd/coffcode.h
deleted file mode 100644
index 383719c00c9..00000000000
--- a/bfd/coffcode.h
+++ /dev/null
@@ -1,4318 +0,0 @@
-/* Support for the generic parts of most COFF variants, for BFD.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-Most of this hacked by  Steve Chamberlain,
-			sac@cygnus.com
-*/
-/*
-
-SECTION
-	coff backends
-
-	BFD supports a number of different flavours of coff format.
-	The major differences between formats are the sizes and
-	alignments of fields in structures on disk, and the occasional
-	extra field.
-
-	Coff in all its varieties is implemented with a few common
-	files and a number of implementation specific files. For
-	example, The 88k bcs coff format is implemented in the file
-	@file{coff-m88k.c}. This file @code{#include}s
-	@file{coff/m88k.h} which defines the external structure of the
-	coff format for the 88k, and @file{coff/internal.h} which
-	defines the internal structure. @file{coff-m88k.c} also
-	defines the relocations used by the 88k format
-	@xref{Relocations}.
-
-	The Intel i960 processor version of coff is implemented in
-	@file{coff-i960.c}. This file has the same structure as
-	@file{coff-m88k.c}, except that it includes @file{coff/i960.h}
-	rather than @file{coff-m88k.h}.
-
-SUBSECTION
-	Porting to a new version of coff
-
-	The recommended method is to select from the existing
-	implementations the version of coff which is most like the one
-	you want to use.  For example, we'll say that i386 coff is
-	the one you select, and that your coff flavour is called foo.
-	Copy @file{i386coff.c} to @file{foocoff.c}, copy
-	@file{../include/coff/i386.h} to @file{../include/coff/foo.h},
-	and add the lines to @file{targets.c} and @file{Makefile.in}
-	so that your new back end is used. Alter the shapes of the
-	structures in @file{../include/coff/foo.h} so that they match
-	what you need. You will probably also have to add
-	@code{#ifdef}s to the code in @file{coff/internal.h} and
-	@file{coffcode.h} if your version of coff is too wild.
-
-	You can verify that your new BFD backend works quite simply by
-	building @file{objdump} from the @file{binutils} directory,
-	and making sure that its version of what's going on and your
-	host system's idea (assuming it has the pretty standard coff
-	dump utility, usually called @code{att-dump} or just
-	@code{dump}) are the same.  Then clean up your code, and send
-	what you've done to Cygnus. Then your stuff will be in the
-	next release, and you won't have to keep integrating it.
-
-SUBSECTION
-	How the coff backend works
-
-SUBSUBSECTION
-	File layout
-
-	The Coff backend is split into generic routines that are
-	applicable to any Coff target and routines that are specific
-	to a particular target.  The target-specific routines are
-	further split into ones which are basically the same for all
-	Coff targets except that they use the external symbol format
-	or use different values for certain constants.
-
-	The generic routines are in @file{coffgen.c}.  These routines
-	work for any Coff target.  They use some hooks into the target
-	specific code; the hooks are in a @code{bfd_coff_backend_data}
-	structure, one of which exists for each target.
-
-	The essentially similar target-specific routines are in
-	@file{coffcode.h}.  This header file includes executable C code.
-	The various Coff targets first include the appropriate Coff
-	header file, make any special defines that are needed, and
-	then include @file{coffcode.h}.
-
-	Some of the Coff targets then also have additional routines in
-	the target source file itself.
-
-	For example, @file{coff-i960.c} includes
-	@file{coff/internal.h} and @file{coff/i960.h}.  It then
-	defines a few constants, such as @code{I960}, and includes
-	@file{coffcode.h}.  Since the i960 has complex relocation
-	types, @file{coff-i960.c} also includes some code to
-	manipulate the i960 relocs.  This code is not in
-	@file{coffcode.h} because it would not be used by any other
-	target.
-
-SUBSUBSECTION
-	Bit twiddling
-
-	Each flavour of coff supported in BFD has its own header file
-	describing the external layout of the structures. There is also
-	an internal description of the coff layout, in
-	@file{coff/internal.h}. A major function of the
-	coff backend is swapping the bytes and twiddling the bits to
-	translate the external form of the structures into the normal
-	internal form. This is all performed in the
-	@code{bfd_swap}_@i{thing}_@i{direction} routines. Some
-	elements are different sizes between different versions of
-	coff; it is the duty of the coff version specific include file
-	to override the definitions of various packing routines in
-	@file{coffcode.h}. E.g., the size of line number entry in coff is
-	sometimes 16 bits, and sometimes 32 bits. @code{#define}ing
-	@code{PUT_LNSZ_LNNO} and @code{GET_LNSZ_LNNO} will select the
-	correct one. No doubt, some day someone will find a version of
-	coff which has a varying field size not catered to at the
-	moment. To port BFD, that person will have to add more @code{#defines}.
-	Three of the bit twiddling routines are exported to
-	@code{gdb}; @code{coff_swap_aux_in}, @code{coff_swap_sym_in}
-	and @code{coff_swap_linno_in}. @code{GDB} reads the symbol
-	table on its own, but uses BFD to fix things up.  More of the
-	bit twiddlers are exported for @code{gas};
-	@code{coff_swap_aux_out}, @code{coff_swap_sym_out},
-	@code{coff_swap_lineno_out}, @code{coff_swap_reloc_out},
-	@code{coff_swap_filehdr_out}, @code{coff_swap_aouthdr_out},
-	@code{coff_swap_scnhdr_out}. @code{Gas} currently keeps track
-	of all the symbol table and reloc drudgery itself, thereby
-	saving the internal BFD overhead, but uses BFD to swap things
-	on the way out, making cross ports much safer.  Doing so also
-	allows BFD (and thus the linker) to use the same header files
-	as @code{gas}, which makes one avenue to disaster disappear.
-
-SUBSUBSECTION
-	Symbol reading
-
-	The simple canonical form for symbols used by BFD is not rich
-	enough to keep all the information available in a coff symbol
-	table. The back end gets around this problem by keeping the original
-	symbol table around, "behind the scenes".
-
-	When a symbol table is requested (through a call to
-	@code{bfd_canonicalize_symtab}), a request gets through to
-	@code{coff_get_normalized_symtab}. This reads the symbol table from
-	the coff file and swaps all the structures inside into the
-	internal form. It also fixes up all the pointers in the table
-	(represented in the file by offsets from the first symbol in
-	the table) into physical pointers to elements in the new
-	internal table. This involves some work since the meanings of
-	fields change depending upon context: a field that is a
-	pointer to another structure in the symbol table at one moment
-	may be the size in bytes of a structure at the next.  Another
-	pass is made over the table. All symbols which mark file names
-	(<<C_FILE>> symbols) are modified so that the internal
-	string points to the value in the auxent (the real filename)
-	rather than the normal text associated with the symbol
-	(@code{".file"}).
-
-	At this time the symbol names are moved around. Coff stores
-	all symbols less than nine characters long physically
-	within the symbol table; longer strings are kept at the end of
-	the file in the string 	table. This pass moves all strings
-	into memory and replaces them with pointers to the strings.
-
-
-	The symbol table is massaged once again, this time to create
-	the canonical table used by the BFD application. Each symbol
-	is inspected in turn, and a decision made (using the
-	@code{sclass} field) about the various flags to set in the
-	@code{asymbol}.  @xref{Symbols}. The generated canonical table
-	shares strings with the hidden internal symbol table.
-
-	Any linenumbers are read from the coff file too, and attached
-	to the symbols which own the functions the linenumbers belong to.
-
-SUBSUBSECTION
-	Symbol writing
-
-	Writing a symbol to a coff file which didn't come from a coff
-	file will lose any debugging information. The @code{asymbol}
-	structure remembers the BFD from which the symbol was taken, and on
-	output the back end makes sure that the same destination target as
-	source target is present.
-
-	When the symbols have come from a coff file then all the
-	debugging information is preserved.
-
-	Symbol tables are provided for writing to the back end in a
-	vector of pointers to pointers. This allows applications like
-	the linker to accumulate and output large symbol tables
-	without having to do too much byte copying.
-
-	This function runs through the provided symbol table and
-	patches each symbol marked as a file place holder
-	(@code{C_FILE}) to point to the next file place holder in the
-	list. It also marks each @code{offset} field in the list with
-	the offset from the first symbol of the current symbol.
-
-	Another function of this procedure is to turn the canonical
-	value form of BFD into the form used by coff. Internally, BFD
-	expects symbol values to be offsets from a section base; so a
-	symbol physically at 0x120, but in a section starting at
-	0x100, would have the value 0x20. Coff expects symbols to
-	contain their final value, so symbols have their values
-	changed at this point to reflect their sum with their owning
-	section.  This transformation uses the
-	<<output_section>> field of the @code{asymbol}'s
-	@code{asection} @xref{Sections}.
-
-	o <<coff_mangle_symbols>>
-
-	This routine runs though the provided symbol table and uses
-	the offsets generated by the previous pass and the pointers
-	generated when the symbol table was read in to create the
-	structured hierachy required by coff. It changes each pointer
-	to a symbol into the index into the symbol table of the asymbol.
-
-	o <<coff_write_symbols>>
-
-	This routine runs through the symbol table and patches up the
-	symbols from their internal form into the coff way, calls the
-	bit twiddlers, and writes out the table to the file.
-
-*/
-
-/*
-INTERNAL_DEFINITION
-	coff_symbol_type
-
-DESCRIPTION
-	The hidden information for an <<asymbol>> is described in a
-	<<combined_entry_type>>:
-
-CODE_FRAGMENT
-.
-.typedef struct coff_ptr_struct
-.{
-.
-.       {* Remembers the offset from the first symbol in the file for
-.          this symbol. Generated by coff_renumber_symbols. *}
-.unsigned int offset;
-.
-.       {* Should the value of this symbol be renumbered.  Used for
-.          XCOFF C_BSTAT symbols.  Set by coff_slurp_symbol_table.  *}
-.unsigned int fix_value : 1;
-.
-.       {* Should the tag field of this symbol be renumbered.
-.          Created by coff_pointerize_aux. *}
-.unsigned int fix_tag : 1;
-.
-.       {* Should the endidx field of this symbol be renumbered.
-.          Created by coff_pointerize_aux. *}
-.unsigned int fix_end : 1;
-.
-.       {* Should the x_csect.x_scnlen field be renumbered.
-.          Created by coff_pointerize_aux. *}
-.unsigned int fix_scnlen : 1;
-.
-.       {* Fix up an XCOFF C_BINCL/C_EINCL symbol.  The value is the
-.          index into the line number entries.  Set by
-.          coff_slurp_symbol_table.  *}
-.unsigned int fix_line : 1;
-.
-.       {* The container for the symbol structure as read and translated
-.           from the file. *}
-.
-.union {
-.   union internal_auxent auxent;
-.   struct internal_syment syment;
-. } u;
-.} combined_entry_type;
-.
-.
-.{* Each canonical asymbol really looks like this: *}
-.
-.typedef struct coff_symbol_struct
-.{
-.   {* The actual symbol which the rest of BFD works with *}
-.asymbol symbol;
-.
-.   {* A pointer to the hidden information for this symbol *}
-.combined_entry_type *native;
-.
-.   {* A pointer to the linenumber information for this symbol *}
-.struct lineno_cache_entry *lineno;
-.
-.   {* Have the line numbers been relocated yet ? *}
-.boolean done_lineno;
-.} coff_symbol_type;
-
-
-*/
-
-#ifdef COFF_WITH_PE
-#include "peicode.h"
-#else
-#include "coffswap.h"
-#endif
-
-#define STRING_SIZE_SIZE (4)
-
-static long sec_to_styp_flags PARAMS ((const char *, flagword));
-static flagword styp_to_sec_flags PARAMS ((bfd *, PTR, const char *));
-static boolean coff_bad_format_hook PARAMS ((bfd *, PTR));
-static boolean coff_new_section_hook PARAMS ((bfd *, asection *));
-static boolean coff_set_arch_mach_hook PARAMS ((bfd *, PTR));
-static boolean coff_write_relocs PARAMS ((bfd *, int));
-static boolean coff_set_flags
-  PARAMS ((bfd *, unsigned int *, unsigned short *));
-static boolean coff_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean coff_compute_section_file_positions PARAMS ((bfd *));
-static boolean coff_write_object_contents PARAMS ((bfd *));
-static boolean coff_set_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static PTR buy_and_read PARAMS ((bfd *, file_ptr, int, size_t));
-static boolean coff_slurp_line_table PARAMS ((bfd *, asection *));
-static boolean coff_slurp_symbol_table PARAMS ((bfd *));
-static boolean coff_slurp_reloc_table PARAMS ((bfd *, asection *, asymbol **));
-static long coff_canonicalize_reloc
-  PARAMS ((bfd *, asection *, arelent **, asymbol **));
-#ifndef coff_mkobject_hook
-static PTR coff_mkobject_hook PARAMS ((bfd *, PTR,  PTR));
-#endif
-
-/* void warning(); */
-
-/*
- * Return a word with STYP_* (scnhdr.s_flags) flags set to represent the
- * incoming SEC_* flags.  The inverse of this function is styp_to_sec_flags().
- * NOTE: If you add to/change this routine, you should mirror the changes
- * 	in styp_to_sec_flags().
- */
-static long
-sec_to_styp_flags (sec_name, sec_flags)
-     CONST char *sec_name;
-     flagword sec_flags;
-{
-  long styp_flags = 0;
-
-  if (!strcmp (sec_name, _TEXT))
-    {
-      styp_flags = STYP_TEXT;
-    }
-  else if (!strcmp (sec_name, _DATA))
-    {
-      styp_flags = STYP_DATA;
-    }
-  else if (!strcmp (sec_name, _BSS))
-    {
-      styp_flags = STYP_BSS;
-#ifdef _COMMENT
-    }
-  else if (!strcmp (sec_name, _COMMENT))
-    {
-      styp_flags = STYP_INFO;
-#endif /* _COMMENT */
-#ifdef _LIB
-    }
-  else if (!strcmp (sec_name, _LIB))
-    {
-      styp_flags = STYP_LIB;
-#endif /* _LIB */
-#ifdef _LIT
-    }
-  else if (!strcmp (sec_name, _LIT))
-    {
-      styp_flags = STYP_LIT;
-#endif /* _LIT */
-    }
-  else if (!strcmp (sec_name, ".debug"))
-    {
-#ifdef STYP_DEBUG
-      styp_flags = STYP_DEBUG;
-#else
-      styp_flags = STYP_INFO;
-#endif
-    }
-  else if (!strncmp (sec_name, ".stab", 5))
-    {
-      styp_flags = STYP_INFO;
-    }
-#ifdef COFF_WITH_PE
-  else if (!strcmp (sec_name, ".edata"))
-    {
-      styp_flags = STYP_DATA;
-    }
-#endif
-#ifdef RS6000COFF_C
-  else if (!strcmp (sec_name, _PAD))
-    {
-      styp_flags = STYP_PAD;
-    }
-  else if (!strcmp (sec_name, _LOADER))
-    {
-      styp_flags = STYP_LOADER;
-    }
-#endif
-  /* Try and figure out what it should be */
-  else if (sec_flags & SEC_CODE)
-    {
-      styp_flags = STYP_TEXT;
-    }
-  else if (sec_flags & SEC_DATA)
-    {
-      styp_flags = STYP_DATA;
-    }
-  else if (sec_flags & SEC_READONLY)
-    {
-#ifdef STYP_LIT			/* 29k readonly text/data section */
-      styp_flags = STYP_LIT;
-#else
-      styp_flags = STYP_TEXT;
-#endif /* STYP_LIT */
-    }
-  else if (sec_flags & SEC_LOAD)
-    {
-      styp_flags = STYP_TEXT;
-    }
-  else if (sec_flags & SEC_ALLOC)
-    {
-      styp_flags = STYP_BSS;
-    }
-
-#ifdef STYP_NOLOAD
-  if ((sec_flags & (SEC_NEVER_LOAD | SEC_COFF_SHARED_LIBRARY)) != 0)
-    styp_flags |= STYP_NOLOAD;
-#endif
-
-#ifdef COFF_WITH_PE
-  if (sec_flags & SEC_LINK_ONCE)
-    styp_flags |= IMAGE_SCN_LNK_COMDAT;
-#endif
-
-  return (styp_flags);
-}
-/*
- * Return a word with SEC_* flags set to represent the incoming
- * STYP_* flags (from scnhdr.s_flags).   The inverse of this
- * function is sec_to_styp_flags().
- * NOTE: If you add to/change this routine, you should mirror the changes
- *      in sec_to_styp_flags().
- */
-static flagword
-styp_to_sec_flags (abfd, hdr, name)
-     bfd *abfd;
-     PTR hdr;
-     const char *name;
-{
-  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
-  long styp_flags = internal_s->s_flags;
-  flagword sec_flags = 0;
-
-#ifdef STYP_NOLOAD
-  if (styp_flags & STYP_NOLOAD)
-    {
-      sec_flags |= SEC_NEVER_LOAD;
-    }
-#endif /* STYP_NOLOAD */
-
-  /* For 386 COFF, at least, an unloadable text or data section is
-     actually a shared library section.  */
-  if (styp_flags & STYP_TEXT)
-    {
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
-      else
-	sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
-    }
-  else if (styp_flags & STYP_DATA)
-    {
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
-      else
-	sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
-    }
-  else if (styp_flags & STYP_BSS)
-    {
-#ifdef BSS_NOLOAD_IS_SHARED_LIBRARY
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_ALLOC | SEC_COFF_SHARED_LIBRARY;
-      else
-#endif
-	sec_flags |= SEC_ALLOC;
-    }
-  else if (styp_flags & STYP_INFO)
-    {
-      /* We mark these as SEC_DEBUGGING, but only if COFF_PAGE_SIZE is
-	 defined.  coff_compute_section_file_positions uses
-	 COFF_PAGE_SIZE to ensure that the low order bits of the
-	 section VMA and the file offset match.  If we don't know
-	 COFF_PAGE_SIZE, we can't ensure the correct correspondence,
-	 and demand page loading of the file will fail.  */
-#if defined (COFF_PAGE_SIZE) && !defined (COFF_ALIGN_IN_S_FLAGS)
-      sec_flags |= SEC_DEBUGGING;
-#endif
-    }
-  else if (styp_flags & STYP_PAD)
-    {
-      sec_flags = 0;
-    }
-  else if (strcmp (name, _TEXT) == 0)
-    {
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
-      else
-	sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
-    }
-  else if (strcmp (name, _DATA) == 0)
-    {
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
-      else
-	sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
-    }
-  else if (strcmp (name, _BSS) == 0)
-    {
-#ifdef BSS_NOLOAD_IS_SHARED_LIBRARY
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_ALLOC | SEC_COFF_SHARED_LIBRARY;
-      else
-#endif
-	sec_flags |= SEC_ALLOC;
-    }
-  else if (strcmp (name, ".debug") == 0
-#ifdef _COMMENT
-	   || strcmp (name, _COMMENT) == 0
-#endif
-	   || strncmp (name, ".stab", 5) == 0)
-    {
-#ifdef COFF_PAGE_SIZE
-      sec_flags |= SEC_DEBUGGING;
-#endif
-    }
-#ifdef _LIB
-  else if (strcmp (name, _LIB) == 0)
-    ;
-#endif
-#ifdef _LIT
-  else if (strcmp (name, _LIT) == 0)
-    {
-      sec_flags = SEC_LOAD | SEC_ALLOC | SEC_READONLY;
-    }
-#endif
-  else
-    {
-      sec_flags |= SEC_ALLOC | SEC_LOAD;
-    }
-
-#ifdef STYP_LIT			/* A29k readonly text/data section type */
-  if ((styp_flags & STYP_LIT) == STYP_LIT)
-    {
-      sec_flags = (SEC_LOAD | SEC_ALLOC | SEC_READONLY);
-    }
-#endif /* STYP_LIT */
-#ifdef STYP_OTHER_LOAD		/* Other loaded sections */
-  if (styp_flags & STYP_OTHER_LOAD)
-    {
-      sec_flags = (SEC_LOAD | SEC_ALLOC);
-    }
-#endif /* STYP_SDATA */
-
-#ifdef COFF_WITH_PE
-  if (styp_flags & IMAGE_SCN_LNK_REMOVE)
-    sec_flags |= SEC_EXCLUDE;
-
-  if (styp_flags & IMAGE_SCN_LNK_COMDAT)
-    {
-      sec_flags |= SEC_LINK_ONCE;
-
-      /* Unfortunately, the PE format stores essential information in
-         the symbol table, of all places.  We need to extract that
-         information now, so that objdump and the linker will know how
-         to handle the section without worrying about the symbols.  We
-         can't call slurp_symtab, because the linker doesn't want the
-         swapped symbols.  */
-
-      if (_bfd_coff_get_external_symbols (abfd))
-	{
-	  bfd_byte *esym, *esymend;
-
-	  esym = (bfd_byte *) obj_coff_external_syms (abfd);
-	  esymend = esym + obj_raw_syment_count (abfd) * SYMESZ;
-
-	  while (esym < esymend)
-	    {
-	      struct internal_syment isym;
-
-	      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &isym);
-
-	      if (sizeof (internal_s->s_name) > SYMNMLEN)
-		{
-		  /* This case implies that the matching symbol name
-                     will be in the string table.  */
-		  abort ();
-		}
-
-	      if (isym.n_sclass == C_STAT
-		  && isym.n_type == T_NULL
-		  && isym.n_numaux == 1)
-		{
-		  char buf[SYMNMLEN + 1];
-		  const char *symname;
-
-		  symname = _bfd_coff_internal_syment_name (abfd, &isym, buf);
-		  if (symname == NULL)
-		    abort ();
-
-		  if (strcmp (name, symname) == 0)
-		    {
-		      union internal_auxent aux;
-
-		      /* This is the section symbol.  */
-
-		      bfd_coff_swap_aux_in (abfd, (PTR) (esym + SYMESZ),
-					    isym.n_type, isym.n_sclass,
-					    0, isym.n_numaux, (PTR) &aux);
-
-		      switch (aux.x_scn.x_comdat)
-			{
-			case IMAGE_COMDAT_SELECT_NODUPLICATES:
-			  sec_flags |= SEC_LINK_DUPLICATES_ONE_ONLY;
-			  break;
-
-			default:
-			case IMAGE_COMDAT_SELECT_ANY:
-			  sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
-			  break;
-
-			case IMAGE_COMDAT_SELECT_SAME_SIZE:
-			  sec_flags |= SEC_LINK_DUPLICATES_SAME_SIZE;
-			  break;
-
-			case IMAGE_COMDAT_SELECT_EXACT_MATCH:
-			  sec_flags |= SEC_LINK_DUPLICATES_SAME_CONTENTS;
-			  break;
-
-			case IMAGE_COMDAT_SELECT_ASSOCIATIVE:
-			  /* FIXME: This is not currently implemented.  */
-			  sec_flags |= SEC_LINK_DUPLICATES_DISCARD;
-			  break;
-			}
-
-		      break;
-		    }
-		}
-
-	      esym += (isym.n_numaux + 1) * SYMESZ;
-	    }
-	}
-    }
-#endif
-
-  return (sec_flags);
-}
-
-#define	get_index(symbol)	((symbol)->udata.i)
-
-/*
-INTERNAL_DEFINITION
-	bfd_coff_backend_data
-
-CODE_FRAGMENT
-
-Special entry points for gdb to swap in coff symbol table parts:
-.typedef struct
-.{
-.  void (*_bfd_coff_swap_aux_in) PARAMS ((
-.       bfd            *abfd,
-.       PTR             ext,
-.       int             type,
-.       int             class,
-.       int             indaux,
-.       int             numaux,
-.       PTR             in));
-.
-.  void (*_bfd_coff_swap_sym_in) PARAMS ((
-.       bfd            *abfd ,
-.       PTR             ext,
-.       PTR             in));
-.
-.  void (*_bfd_coff_swap_lineno_in) PARAMS ((
-.       bfd            *abfd,
-.       PTR            ext,
-.       PTR             in));
-.
-
-Special entry points for gas to swap out coff parts:
-
-. unsigned int (*_bfd_coff_swap_aux_out) PARAMS ((
-.       bfd   	*abfd,
-.       PTR	in,
-.       int    	type,
-.       int    	class,
-.       int     indaux,
-.       int     numaux,
-.       PTR    	ext));
-.
-. unsigned int (*_bfd_coff_swap_sym_out) PARAMS ((
-.      bfd      *abfd,
-.      PTR	in,
-.      PTR	ext));
-.
-. unsigned int (*_bfd_coff_swap_lineno_out) PARAMS ((
-.      	bfd   	*abfd,
-.      	PTR	in,
-.	PTR	ext));
-.
-. unsigned int (*_bfd_coff_swap_reloc_out) PARAMS ((
-.      	bfd     *abfd,
-.     	PTR	src,
-.	PTR	dst));
-.
-. unsigned int (*_bfd_coff_swap_filehdr_out) PARAMS ((
-.      	bfd  	*abfd,
-.	PTR 	in,
-.	PTR 	out));
-.
-. unsigned int (*_bfd_coff_swap_aouthdr_out) PARAMS ((
-.      	bfd 	*abfd,
-.	PTR 	in,
-.	PTR	out));
-.
-. unsigned int (*_bfd_coff_swap_scnhdr_out) PARAMS ((
-.      	bfd  	*abfd,
-.      	PTR	in,
-.	PTR	out));
-.
-
-Special entry points for generic COFF routines to call target
-dependent COFF routines:
-
-. unsigned int _bfd_filhsz;
-. unsigned int _bfd_aoutsz;
-. unsigned int _bfd_scnhsz;
-. unsigned int _bfd_symesz;
-. unsigned int _bfd_auxesz;
-. unsigned int _bfd_relsz;
-. unsigned int _bfd_linesz;
-. boolean _bfd_coff_long_filenames;
-. boolean _bfd_coff_long_section_names;
-. unsigned int _bfd_coff_default_section_alignment_power;
-. void (*_bfd_coff_swap_filehdr_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. void (*_bfd_coff_swap_aouthdr_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. void (*_bfd_coff_swap_scnhdr_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. void (*_bfd_coff_swap_reloc_in) PARAMS ((
-.       bfd     *abfd,
-.       PTR     ext,
-.       PTR     in));
-. boolean (*_bfd_coff_bad_format_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_filehdr));
-. boolean (*_bfd_coff_set_arch_mach_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_filehdr));
-. PTR (*_bfd_coff_mkobject_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_filehdr,
-.       PTR     internal_aouthdr));
-. flagword (*_bfd_styp_to_sec_flags_hook) PARAMS ((
-.       bfd     *abfd,
-.       PTR     internal_scnhdr,
-.       const char *name));
-. void (*_bfd_set_alignment_hook) PARAMS ((
-.       bfd     *abfd,
-.       asection *sec,
-.       PTR     internal_scnhdr));
-. boolean (*_bfd_coff_slurp_symbol_table) PARAMS ((
-.       bfd     *abfd));
-. boolean (*_bfd_coff_symname_in_debug) PARAMS ((
-.       bfd     *abfd,
-.       struct internal_syment *sym));
-. boolean (*_bfd_coff_pointerize_aux_hook) PARAMS ((
-.       bfd *abfd,
-.       combined_entry_type *table_base,
-.       combined_entry_type *symbol,
-.       unsigned int indaux,
-.       combined_entry_type *aux));
-. boolean (*_bfd_coff_print_aux) PARAMS ((
-.       bfd *abfd,
-.       FILE *file,
-.       combined_entry_type *table_base,
-.       combined_entry_type *symbol,
-.       combined_entry_type *aux,
-.       unsigned int indaux));
-. void (*_bfd_coff_reloc16_extra_cases) PARAMS ((
-.       bfd     *abfd,
-.       struct bfd_link_info *link_info,
-.       struct bfd_link_order *link_order,
-.       arelent *reloc,
-.       bfd_byte *data,
-.       unsigned int *src_ptr,
-.       unsigned int *dst_ptr));
-. int (*_bfd_coff_reloc16_estimate) PARAMS ((
-.       bfd *abfd,
-.       asection *input_section,
-.       arelent *r,
-.       unsigned int shrink,
-.       struct bfd_link_info *link_info));
-. boolean (*_bfd_coff_sym_is_global) PARAMS ((
-.       bfd *abfd,
-.       struct internal_syment *));
-. boolean (*_bfd_coff_compute_section_file_positions) PARAMS ((
-.       bfd *abfd));
-. boolean (*_bfd_coff_start_final_link) PARAMS ((
-.       bfd *output_bfd,
-.       struct bfd_link_info *info));
-. boolean (*_bfd_coff_relocate_section) PARAMS ((
-.       bfd *output_bfd,
-.       struct bfd_link_info *info,
-.       bfd *input_bfd,
-.       asection *input_section,
-.       bfd_byte *contents,
-.       struct internal_reloc *relocs,
-.       struct internal_syment *syms,
-.       asection **sections));
-. reloc_howto_type *(*_bfd_coff_rtype_to_howto) PARAMS ((
-.       bfd *abfd,
-.       asection *sec,
-.       struct internal_reloc *rel,
-.       struct coff_link_hash_entry *h,
-.       struct internal_syment *sym,
-.       bfd_vma *addendp));
-. boolean (*_bfd_coff_adjust_symndx) PARAMS ((
-.       bfd *obfd,
-.       struct bfd_link_info *info,
-.       bfd *ibfd,
-.       asection *sec,
-.       struct internal_reloc *reloc,
-.       boolean *adjustedp));
-. boolean (*_bfd_coff_link_add_one_symbol) PARAMS ((
-.       struct bfd_link_info *info,
-.       bfd *abfd,
-.       const char *name,
-.       flagword flags, 
-.       asection *section,
-.       bfd_vma value,
-.       const char *string,
-.       boolean copy,
-.       boolean collect, 
-.       struct bfd_link_hash_entry **hashp));
-.
-. boolean (*_bfd_coff_link_output_has_begun) PARAMS ((
-.	bfd * abfd,
-.       struct coff_final_link_info * pfinfo));
-. boolean (*_bfd_coff_final_link_postscript) PARAMS ((
-.	bfd * abfd,
-.	struct coff_final_link_info * pfinfo));
-.
-.} bfd_coff_backend_data;
-.
-.#define coff_backend_info(abfd) ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
-.
-.#define bfd_coff_swap_aux_in(a,e,t,c,ind,num,i) \
-.        ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
-.
-.#define bfd_coff_swap_sym_in(a,e,i) \
-.        ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
-.
-.#define bfd_coff_swap_lineno_in(a,e,i) \
-.        ((coff_backend_info ( a)->_bfd_coff_swap_lineno_in) (a,e,i))
-.
-.#define bfd_coff_swap_reloc_out(abfd, i, o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_out) (abfd, i, o))
-.
-.#define bfd_coff_swap_lineno_out(abfd, i, o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
-.
-.#define bfd_coff_swap_aux_out(a,i,t,c,ind,num,o) \
-.        ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
-.
-.#define bfd_coff_swap_sym_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
-.
-.#define bfd_coff_swap_scnhdr_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_out) (abfd, i, o))
-.
-.#define bfd_coff_swap_filehdr_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_out) (abfd, i, o))
-.
-.#define bfd_coff_swap_aouthdr_out(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_out) (abfd, i, o))
-.
-.#define bfd_coff_filhsz(abfd) (coff_backend_info (abfd)->_bfd_filhsz)
-.#define bfd_coff_aoutsz(abfd) (coff_backend_info (abfd)->_bfd_aoutsz)
-.#define bfd_coff_scnhsz(abfd) (coff_backend_info (abfd)->_bfd_scnhsz)
-.#define bfd_coff_symesz(abfd) (coff_backend_info (abfd)->_bfd_symesz)
-.#define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz)
-.#define bfd_coff_relsz(abfd)  (coff_backend_info (abfd)->_bfd_relsz)
-.#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
-.#define bfd_coff_long_filenames(abfd) (coff_backend_info (abfd)->_bfd_coff_long_filenames)
-.#define bfd_coff_long_section_names(abfd) \
-.        (coff_backend_info (abfd)->_bfd_coff_long_section_names)
-.#define bfd_coff_default_section_alignment_power(abfd) \
-.	 (coff_backend_info (abfd)->_bfd_coff_default_section_alignment_power)
-.#define bfd_coff_swap_filehdr_in(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
-.
-.#define bfd_coff_swap_aouthdr_in(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_in) (abfd, i, o))
-.
-.#define bfd_coff_swap_scnhdr_in(abfd, i,o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
-.
-.#define bfd_coff_swap_reloc_in(abfd, i, o) \
-.        ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
-.
-.#define bfd_coff_bad_format_hook(abfd, filehdr) \
-.        ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
-.
-.#define bfd_coff_set_arch_mach_hook(abfd, filehdr)\
-.        ((coff_backend_info (abfd)->_bfd_coff_set_arch_mach_hook) (abfd, filehdr))
-.#define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\
-.        ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook) (abfd, filehdr, aouthdr))
-.
-.#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name)\
-.        ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook) (abfd, scnhdr, name))
-.
-.#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
-.        ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
-.
-.#define bfd_coff_slurp_symbol_table(abfd)\
-.        ((coff_backend_info (abfd)->_bfd_coff_slurp_symbol_table) (abfd))
-.
-.#define bfd_coff_symname_in_debug(abfd, sym)\
-.        ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
-.
-.#define bfd_coff_print_aux(abfd, file, base, symbol, aux, indaux)\
-.        ((coff_backend_info (abfd)->_bfd_coff_print_aux)\
-.         (abfd, file, base, symbol, aux, indaux))
-.
-.#define bfd_coff_reloc16_extra_cases(abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)\
-.        ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
-.         (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
-.
-.#define bfd_coff_reloc16_estimate(abfd, section, reloc, shrink, link_info)\
-.        ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
-.         (abfd, section, reloc, shrink, link_info))
-.
-.#define bfd_coff_sym_is_global(abfd, sym)\
-.        ((coff_backend_info (abfd)->_bfd_coff_sym_is_global)\
-.         (abfd, sym))
-.
-.#define bfd_coff_compute_section_file_positions(abfd)\
-.        ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
-.         (abfd))
-.
-.#define bfd_coff_start_final_link(obfd, info)\
-.        ((coff_backend_info (obfd)->_bfd_coff_start_final_link)\
-.         (obfd, info))
-.#define bfd_coff_relocate_section(obfd,info,ibfd,o,con,rel,isyms,secs)\
-.        ((coff_backend_info (ibfd)->_bfd_coff_relocate_section)\
-.         (obfd, info, ibfd, o, con, rel, isyms, secs))
-.#define bfd_coff_rtype_to_howto(abfd, sec, rel, h, sym, addendp)\
-.        ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
-.         (abfd, sec, rel, h, sym, addendp))
-.#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
-.        ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
-.         (obfd, info, ibfd, sec, rel, adjustedp))
-.#define bfd_coff_link_add_one_symbol(info,abfd,name,flags,section,value,string,cp,coll,hashp)\
-.        ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\
-.         (info, abfd, name, flags, section, value, string, cp, coll, hashp))
-.
-.#define bfd_coff_link_output_has_begun(a,p) \
-.        ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a,p))
-.#define bfd_coff_final_link_postscript(a,p) \
-.        ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a,p))
-.
-*/
-
-/* See whether the magic number matches.  */
-
-static boolean
-coff_bad_format_hook (abfd, filehdr)
-     bfd * abfd;
-     PTR filehdr;
-{
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-
-  if (BADMAG (*internal_f))
-    return false;
-
-  /* if the optional header is NULL or not the correct size then
-     quit; the only difference I can see between m88k dgux headers (MC88DMAGIC)
-     and Intel 960 readwrite headers (I960WRMAGIC) is that the
-     optional header is of a different size.
-
-     But the mips keeps extra stuff in it's opthdr, so dont check
-     when doing that
-     */
-
-#if defined(M88) || defined(I960)
-  if (internal_f->f_opthdr != 0 && AOUTSZ != internal_f->f_opthdr)
-    return false;
-#endif
-
-  return true;
-}
-
-/*
-   initialize a section structure with information peculiar to this
-   particular implementation of coff
-*/
-
-static boolean
-coff_new_section_hook (abfd, section)
-     bfd * abfd;
-     asection * section;
-{
-  combined_entry_type *native;
-
-  section->alignment_power = COFF_DEFAULT_SECTION_ALIGNMENT_POWER;
-
-#ifdef RS6000COFF_C
-  if (xcoff_data (abfd)->text_align_power != 0
-      && strcmp (bfd_get_section_name (abfd, section), ".text") == 0)
-    section->alignment_power = xcoff_data (abfd)->text_align_power;
-  if (xcoff_data (abfd)->data_align_power != 0
-      && strcmp (bfd_get_section_name (abfd, section), ".data") == 0)
-    section->alignment_power = xcoff_data (abfd)->data_align_power;
-#endif
-
-  /* Allocate aux records for section symbols, to store size and
-     related info.
-
-     @@ The 10 is a guess at a plausible maximum number of aux entries
-     (but shouldn't be a constant).  */
-  native = ((combined_entry_type *)
-	    bfd_zalloc (abfd, sizeof (combined_entry_type) * 10));
-  if (native == NULL)
-    return false;
-
-  /* We don't need to set up n_name, n_value, or n_scnum in the native
-     symbol information, since they'll be overriden by the BFD symbol
-     anyhow.  However, we do need to set the type and storage class,
-     in case this symbol winds up getting written out.  The value 0
-     for n_numaux is already correct.  */
-
-  native->u.syment.n_type = T_NULL;
-  native->u.syment.n_sclass = C_STAT;
-
-  coffsymbol (section->symbol)->native = native;
-
-  /* The .stab section must be aligned to 2**2 at most, because
-     otherwise there may be gaps in the section which gdb will not
-     know how to interpret.  Examining the section name is a hack, but
-     that is also how gdb locates the section.
-     We need to handle the .ctors and .dtors sections similarly, to
-     avoid introducing null words in the tables.  */
-  if (COFF_DEFAULT_SECTION_ALIGNMENT_POWER > 2
-      && (strncmp (section->name, ".stab", 5) == 0
-	  || strcmp (section->name, ".ctors") == 0
-	  || strcmp (section->name, ".dtors") == 0))
-    section->alignment_power = 2;
-
-  /* Similarly, the .stabstr section must be aligned to 2**0 at most.  */
-  if (COFF_DEFAULT_SECTION_ALIGNMENT_POWER > 0
-      && strncmp (section->name, ".stabstr", 8) == 0)
-    section->alignment_power = 0;
-
-  return true;
-}
-
-#ifdef COFF_ALIGN_IN_SECTION_HEADER
-
-/* Set the alignment of a BFD section.  */
-
-static void coff_set_alignment_hook PARAMS ((bfd *, asection *, PTR));
-
-static void
-coff_set_alignment_hook (abfd, section, scnhdr)
-     bfd * abfd;
-     asection * section;
-     PTR scnhdr;
-{
-  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
-  unsigned int i;
-
-#ifdef I960
-  /* Extract ALIGN from 2**ALIGN stored in section header */
-  for (i = 0; i < 32; i++)
-    if ((1 << i) >= hdr->s_align)
-      break;
-#endif
-#ifdef TIC80COFF
-  /* TI tools hijack bits 8-11 for the alignment */
-  i = (hdr->s_flags >> 8) & 0xF ;
-#endif
-  section->alignment_power = i;
-}
-
-#else /* ! COFF_ALIGN_IN_SECTION_HEADER */
-#ifdef COFF_WITH_PE
-
-/* a couple of macros to help setting the alignment power field */
-#define ALIGN_SET(field,x,y) \
-  if (((field) & IMAGE_SCN_ALIGN_64BYTES) == x )\
-  {\
-     section->alignment_power = y;\
-  }
-
-#define ELIFALIGN_SET(field,x,y) \
-  else if (( (field) & IMAGE_SCN_ALIGN_64BYTES) == x ) \
-  {\
-     section->alignment_power = y;\
-  }
-
-static void coff_set_alignment_hook PARAMS ((bfd *, asection *, PTR));
-
-static void
-coff_set_alignment_hook (abfd, section, scnhdr)
-     bfd * abfd;
-     asection * section;
-     PTR scnhdr;
-{
-  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
-
-  ALIGN_SET     (hdr->s_flags, IMAGE_SCN_ALIGN_64BYTES, 6)
-  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_32BYTES, 5)
-  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_16BYTES, 4)
-  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_8BYTES,  3)
-  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_4BYTES,  2)
-  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_2BYTES,  1)
-  ELIFALIGN_SET (hdr->s_flags, IMAGE_SCN_ALIGN_1BYTES,  0)
-
-#ifdef POWERPC_LE_PE
-  if (strcmp (section->name, ".idata$2") == 0)
-    {
-      section->alignment_power = 0;
-    }
-  else if (strcmp (section->name, ".idata$3") == 0)
-    {
-      section->alignment_power = 0;
-    }
-  else if (strcmp (section->name, ".idata$4") == 0)
-    {
-      section->alignment_power = 2;
-    }
-  else if (strcmp (section->name, ".idata$5") == 0)
-    {
-      section->alignment_power = 2;
-    }
-  else if (strcmp (section->name, ".idata$6") == 0)
-    {
-      section->alignment_power = 1;
-    }
-  else if (strcmp (section->name, ".reloc") == 0)
-    {
-      section->alignment_power = 1;
-    }
-  else if (strncmp (section->name, ".stab", 5) == 0)
-    {
-      section->alignment_power = 2;
-    }
-#endif
-
-#ifdef COFF_IMAGE_WITH_PE
-  /* In a PE image file, the s_paddr field holds the virtual size of a
-     section, while the s_size field holds the raw size.  */
-  if (hdr->s_paddr != 0)
-    {
-      if (coff_section_data (abfd, section) == NULL)
-	{
-	  section->used_by_bfd =
-	    (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
-	  if (section->used_by_bfd == NULL)
-	    {
-	      /* FIXME: Return error.  */
-	      abort ();
-	    }
-	}
-      if (pei_section_data (abfd, section) == NULL)
-	{
-	  coff_section_data (abfd, section)->tdata =
-	    (PTR) bfd_zalloc (abfd, sizeof (struct pei_section_tdata));
-	  if (coff_section_data (abfd, section)->tdata == NULL)
-	    {
-	      /* FIXME: Return error.  */
-	      abort ();
-	    }
-	}
-      pei_section_data (abfd, section)->virt_size = hdr->s_paddr;
-    }
-#endif
-
-}
-#undef ALIGN_SET
-#undef ELIFALIGN_SET
-
-#else /* ! COFF_WITH_PE */
-#ifdef RS6000COFF_C
-
-/* We grossly abuse this function to handle XCOFF overflow headers.
-   When we see one, we correct the reloc and line number counts in the
-   real header, and remove the section we just created.  */
-
-static void coff_set_alignment_hook PARAMS ((bfd *, asection *, PTR));
-
-static void
-coff_set_alignment_hook (abfd, section, scnhdr)
-     bfd *abfd;
-     asection *section;
-     PTR scnhdr;
-{
-  struct internal_scnhdr *hdr = (struct internal_scnhdr *) scnhdr;
-  asection *real_sec;
-  asection **ps;
-
-  if ((hdr->s_flags & STYP_OVRFLO) == 0)
-    return;
-
-  real_sec = coff_section_from_bfd_index (abfd, hdr->s_nreloc);
-  if (real_sec == NULL)
-    return;
-
-  real_sec->reloc_count = hdr->s_paddr;
-  real_sec->lineno_count = hdr->s_vaddr;
-
-  for (ps = &abfd->sections; *ps != NULL; ps = &(*ps)->next)
-    {
-      if (*ps == section)
-	{
-	  *ps = (*ps)->next;
-	  --abfd->section_count;
-	  break;
-	}
-    }
-}
-
-#else /* ! RS6000COFF_C */
-
-#define coff_set_alignment_hook \
-  ((void (*) PARAMS ((bfd *, asection *, PTR))) bfd_void)
-
-#endif /* ! RS6000COFF_C */
-#endif /* ! COFF_WITH_PE */
-#endif /* ! COFF_ALIGN_IN_SECTION_HEADER */
-
-#ifndef coff_mkobject
-
-static boolean coff_mkobject PARAMS ((bfd *));
-
-static boolean
-coff_mkobject (abfd)
-     bfd * abfd;
-{
-  coff_data_type *coff;
-
-  abfd->tdata.coff_obj_data = (struct coff_tdata *) bfd_zalloc (abfd, sizeof (coff_data_type));
-  if (abfd->tdata.coff_obj_data == 0)
-    return false;
-  coff = coff_data (abfd);
-  coff->symbols = (coff_symbol_type *) NULL;
-  coff->conversion_table = (unsigned int *) NULL;
-  coff->raw_syments = (struct coff_ptr_struct *) NULL;
-  coff->relocbase = 0;
-  coff->local_toc_sym_map = 0;
-
-/*  make_abs_section(abfd);*/
-
-  return true;
-}
-#endif
-
-/* Create the COFF backend specific information.  */
-#ifndef coff_mkobject_hook
-static PTR
-coff_mkobject_hook (abfd, filehdr, aouthdr)
-     bfd * abfd;
-     PTR filehdr;
-     PTR aouthdr;
-{
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-  coff_data_type *coff;
-
-  if (coff_mkobject (abfd) == false)
-    return NULL;
-
-  coff = coff_data (abfd);
-
-  coff->sym_filepos = internal_f->f_symptr;
-
-  /* These members communicate important constants about the symbol
-     table to GDB's symbol-reading code.  These `constants'
-     unfortunately vary among coff implementations...  */
-  coff->local_n_btmask = N_BTMASK;
-  coff->local_n_btshft = N_BTSHFT;
-  coff->local_n_tmask = N_TMASK;
-  coff->local_n_tshift = N_TSHIFT;
-  coff->local_symesz = SYMESZ;
-  coff->local_auxesz = AUXESZ;
-  coff->local_linesz = LINESZ;
-
-  obj_raw_syment_count (abfd) =
-    obj_conv_table_size (abfd) =
-      internal_f->f_nsyms;
-
-#ifdef RS6000COFF_C
-  if ((internal_f->f_flags & F_SHROBJ) != 0)
-    abfd->flags |= DYNAMIC;
-  if (aouthdr != NULL && internal_f->f_opthdr >= AOUTSZ)
-    {
-      struct internal_aouthdr *internal_a =
-	(struct internal_aouthdr *) aouthdr;
-      struct xcoff_tdata *xcoff;
-
-      xcoff = xcoff_data (abfd);
-      xcoff->full_aouthdr = true;
-      xcoff->toc = internal_a->o_toc;
-      xcoff->sntoc = internal_a->o_sntoc;
-      xcoff->snentry = internal_a->o_snentry;
-      xcoff->text_align_power = internal_a->o_algntext;
-      xcoff->data_align_power = internal_a->o_algndata;
-      xcoff->modtype = internal_a->o_modtype;
-      xcoff->cputype = internal_a->o_cputype;
-      xcoff->maxdata = internal_a->o_maxdata;
-      xcoff->maxstack = internal_a->o_maxstack;
-    }
-#endif
-
-#ifdef ARM 
-  /* Set the flags field from the COFF header read in */
-  if (! _bfd_coff_arm_set_private_flags (abfd, internal_f->f_flags))
-    coff->flags = 0;
-#endif
-  
-  return (PTR) coff;
-}
-#endif
-
-/* Determine the machine architecture and type.  FIXME: This is target
-   dependent because the magic numbers are defined in the target
-   dependent header files.  But there is no particular need for this.
-   If the magic numbers were moved to a separate file, this function
-   would be target independent and would also be much more successful
-   at linking together COFF files for different architectures.  */
-
-static boolean
-coff_set_arch_mach_hook (abfd, filehdr)
-     bfd *abfd;
-     PTR filehdr;
-{
-  long machine;
-  enum bfd_architecture arch;
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-
-  machine = 0;
-  switch (internal_f->f_magic)
-    {
-#ifdef PPCMAGIC
-    case PPCMAGIC:
-      arch = bfd_arch_powerpc;
-      machine = 0; /* what does this mean? (krk) */
-      break; 
-#endif
-#ifdef I386MAGIC
-    case I386MAGIC:
-    case I386PTXMAGIC:
-    case I386AIXMAGIC:		/* Danbury PS/2 AIX C Compiler */
-    case LYNXCOFFMAGIC:	/* shadows the m68k Lynx number below, sigh */
-      arch = bfd_arch_i386;
-      machine = 0;
-      break;
-#endif
-#ifdef A29K_MAGIC_BIG
-    case A29K_MAGIC_BIG:
-    case A29K_MAGIC_LITTLE:
-      arch = bfd_arch_a29k;
-      machine = 0;
-      break;
-#endif
-#ifdef ARMMAGIC
-    case ARMMAGIC:
-      arch = bfd_arch_arm;
-      switch (internal_f->f_flags & F_ARM_ARCHITECTURE_MASK)
-	{
-	case F_ARM_2:  machine = bfd_mach_arm_2;  break;
-	case F_ARM_3:  machine = bfd_mach_arm_3;  break;
-	default:
-	case F_ARM_4:  machine = bfd_mach_arm_4;  break;
-	case F_ARM_4T: machine = bfd_mach_arm_4T; break;
-	}
-      break;
-#endif
-#ifdef MC68MAGIC
-    case MC68MAGIC:
-    case M68MAGIC:
-#ifdef MC68KBCSMAGIC
-    case MC68KBCSMAGIC:
-#endif
-#ifdef APOLLOM68KMAGIC
-    case APOLLOM68KMAGIC:
-#endif
-#ifdef LYNXCOFFMAGIC
-    case LYNXCOFFMAGIC:
-#endif
-      arch = bfd_arch_m68k;
-      machine = bfd_mach_m68020;
-      break;
-#endif
-#ifdef MC88MAGIC
-    case MC88MAGIC:
-    case MC88DMAGIC:
-    case MC88OMAGIC:
-      arch = bfd_arch_m88k;
-      machine = 88100;
-      break;
-#endif
-#ifdef Z8KMAGIC
-    case Z8KMAGIC:
-      arch = bfd_arch_z8k;
-      switch (internal_f->f_flags & F_MACHMASK)
-	{
-	case F_Z8001:
-	  machine = bfd_mach_z8001;
-	  break;
-	case F_Z8002:
-	  machine = bfd_mach_z8002;
-	  break;
-	default:
-	  return false;
-	}
-      break;
-#endif
-#ifdef I860
-    case I860MAGIC:
-      arch = bfd_arch_i860;
-      break;
-#endif
-#ifdef I960
-#ifdef I960ROMAGIC
-    case I960ROMAGIC:
-    case I960RWMAGIC:
-      arch = bfd_arch_i960;
-      switch (F_I960TYPE & internal_f->f_flags)
-	{
-	default:
-	case F_I960CORE:
-	  machine = bfd_mach_i960_core;
-	  break;
-	case F_I960KB:
-	  machine = bfd_mach_i960_kb_sb;
-	  break;
-	case F_I960MC:
-	  machine = bfd_mach_i960_mc;
-	  break;
-	case F_I960XA:
-	  machine = bfd_mach_i960_xa;
-	  break;
-	case F_I960CA:
-	  machine = bfd_mach_i960_ca;
-	  break;
-	case F_I960KA:
-	  machine = bfd_mach_i960_ka_sa;
-	  break;
-	case F_I960JX:
-	  machine = bfd_mach_i960_jx;
-	  break;
-	case F_I960HX:
-	  machine = bfd_mach_i960_hx;
-	  break;
-	}
-      break;
-#endif
-#endif
-
-#ifdef RS6000COFF_C
-    case U802ROMAGIC:
-    case U802WRMAGIC:
-    case U802TOCMAGIC:
-      {
-	int cputype;
-
-	if (xcoff_data (abfd)->cputype != -1)
-	  cputype = xcoff_data (abfd)->cputype & 0xff;
-	else
-	  {
-	    /* We did not get a value from the a.out header.  If the
-	       file has not been stripped, we may be able to get the
-	       architecture information from the first symbol, if it
-	       is a .file symbol.  */
-	    if (obj_raw_syment_count (abfd) == 0)
-	      cputype = 0;
-	    else
-	      {
-		bfd_byte buf[SYMESZ];
-		struct internal_syment sym;
-
-		if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
-		    || bfd_read (buf, 1, SYMESZ, abfd) != SYMESZ)
-		  return false;
-		coff_swap_sym_in (abfd, (PTR) buf, (PTR) &sym);
-		if (sym.n_sclass == C_FILE)
-		  cputype = sym.n_type & 0xff;
-		else
-		  cputype = 0;
-	      }
-	  }
-
-	/* FIXME: We don't handle all cases here.  */
-	switch (cputype)
-	  {
-	  default:
-	  case 0:
-#ifdef POWERMAC
-	    /* PowerPC Macs use the same magic numbers as RS/6000
-	       (because that's how they were bootstrapped originally),
-	       but they are always PowerPC architecture.  */
-	    arch = bfd_arch_powerpc;
-	    machine = 0;
-#else
-	    arch = bfd_arch_rs6000;
-	    machine = 6000;
-#endif /* POWERMAC */
-	    break;
-
-	  case 1:
-	    arch = bfd_arch_powerpc;
-	    machine = 601;
-	    break;
-	  case 2: /* 64 bit PowerPC */
-	    arch = bfd_arch_powerpc;
-	    machine = 620;
-	    break;
-	  case 3:
-	    arch = bfd_arch_powerpc;
-	    machine = 0;
-	    break;
-	  case 4:
-	    arch = bfd_arch_rs6000;
-	    machine = 6000;
-	    break;
-	  }
-      }
-      break;
-#endif
-
-#ifdef WE32KMAGIC
-    case WE32KMAGIC:
-      arch = bfd_arch_we32k;
-      machine = 0;
-      break;
-#endif
-
-#ifdef H8300MAGIC
-    case H8300MAGIC:
-      arch = bfd_arch_h8300;
-      machine = bfd_mach_h8300;
-      /* !! FIXME this probably isn't the right place for this */
-      abfd->flags |= BFD_IS_RELAXABLE;
-      break;
-#endif
-
-#ifdef H8300HMAGIC
-    case H8300HMAGIC:
-      arch = bfd_arch_h8300;
-      machine = bfd_mach_h8300h;
-      /* !! FIXME this probably isn't the right place for this */
-      abfd->flags |= BFD_IS_RELAXABLE;
-      break;
-#endif
-
-#ifdef H8300SMAGIC
-    case H8300SMAGIC:
-      arch = bfd_arch_h8300;
-      machine = bfd_mach_h8300s;
-      /* !! FIXME this probably isn't the right place for this */
-      abfd->flags |= BFD_IS_RELAXABLE;
-      break;
-#endif
-
-#ifdef SH_ARCH_MAGIC_BIG
-    case SH_ARCH_MAGIC_BIG:
-    case SH_ARCH_MAGIC_LITTLE:
-      arch = bfd_arch_sh;
-      machine = 0;
-      break;
-#endif
-
-#ifdef H8500MAGIC
-    case H8500MAGIC:
-      arch = bfd_arch_h8500;
-      machine = 0;
-      break;
-#endif
-
-#ifdef SPARCMAGIC
-    case SPARCMAGIC:
-#ifdef LYNXCOFFMAGIC
-    case LYNXCOFFMAGIC:
-#endif
-      arch = bfd_arch_sparc;
-      machine = 0;
-      break;
-#endif
-
-#ifdef TIC30MAGIC
-    case TIC30MAGIC:
-      arch = bfd_arch_tic30;
-      break;
-#endif
-
-#ifdef TIC80_ARCH_MAGIC
-    case TIC80_ARCH_MAGIC:
-      arch = bfd_arch_tic80;
-      break;
-#endif
-
-#ifdef MCOREMAGIC
-    case MCOREMAGIC:
-      arch = bfd_arch_mcore;
-      break;
-#endif
-    default:			/* Unreadable input file type */
-      arch = bfd_arch_obscure;
-      break;
-    }
-
-  bfd_default_set_arch_mach (abfd, arch, machine);
-  return true;
-}
-
-#ifdef SYMNAME_IN_DEBUG
-
-static boolean symname_in_debug_hook
-  PARAMS ((bfd *, struct internal_syment *));
-
-static boolean
-symname_in_debug_hook (abfd, sym)
-     bfd * abfd;
-     struct internal_syment *sym;
-{
-  return SYMNAME_IN_DEBUG (sym) ? true : false;
-}
-
-#else
-
-#define symname_in_debug_hook \
-  (boolean (*) PARAMS ((bfd *, struct internal_syment *))) bfd_false
-
-#endif
-
-#ifdef RS6000COFF_C
-
-/* Handle the csect auxent of a C_EXT or C_HIDEXT symbol.  */
-
-static boolean coff_pointerize_aux_hook
-  PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
-	   unsigned int, combined_entry_type *));
-
-/*ARGSUSED*/
-static boolean
-coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
-     bfd *abfd;
-     combined_entry_type *table_base;
-     combined_entry_type *symbol;
-     unsigned int indaux;
-     combined_entry_type *aux;
-{
-  int class = symbol->u.syment.n_sclass;
-
-  if ((class == C_EXT || class == C_HIDEXT)
-      && indaux + 1 == symbol->u.syment.n_numaux)
-    {
-      if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) == XTY_LD)
-	{
-	  aux->u.auxent.x_csect.x_scnlen.p =
-	    table_base + aux->u.auxent.x_csect.x_scnlen.l;
-	  aux->fix_scnlen = 1;
-	}
-
-      /* Return true to indicate that the caller should not do any
-         further work on this auxent.  */
-      return true;
-    }
-
-  /* Return false to indicate that this auxent should be handled by
-     the caller.  */
-  return false;
-}
-
-#else
-#ifdef I960
-
-/* We don't want to pointerize bal entries.  */
-
-static boolean coff_pointerize_aux_hook
-  PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
-	   unsigned int, combined_entry_type *));
-
-/*ARGSUSED*/
-static boolean
-coff_pointerize_aux_hook (abfd, table_base, symbol, indaux, aux)
-     bfd *abfd;
-     combined_entry_type *table_base;
-     combined_entry_type *symbol;
-     unsigned int indaux;
-     combined_entry_type *aux;
-{
-  /* Return true if we don't want to pointerize this aux entry, which
-     is the case for the lastfirst aux entry for a C_LEAFPROC symbol.  */
-  return (indaux == 1
-	  && (symbol->u.syment.n_sclass == C_LEAFPROC
-	      || symbol->u.syment.n_sclass == C_LEAFSTAT
-	      || symbol->u.syment.n_sclass == C_LEAFEXT));
-}
-
-#else /* ! I960 */
-
-#define coff_pointerize_aux_hook 0
-
-#endif /* ! I960 */
-#endif /* ! RS6000COFF_C */
-
-/* Print an aux entry.  This returns true if it has printed it.  */
-
-static boolean coff_print_aux
-  PARAMS ((bfd *, FILE *, combined_entry_type *, combined_entry_type *,
-	   combined_entry_type *, unsigned int));
-
-static boolean
-coff_print_aux (abfd, file, table_base, symbol, aux, indaux)
-     bfd *abfd;
-     FILE *file;
-     combined_entry_type *table_base;
-     combined_entry_type *symbol;
-     combined_entry_type *aux;
-     unsigned int indaux;
-{
-#ifdef RS6000COFF_C
-  if ((symbol->u.syment.n_sclass == C_EXT
-       || symbol->u.syment.n_sclass == C_HIDEXT)
-      && indaux + 1 == symbol->u.syment.n_numaux)
-    {
-      /* This is a csect entry.  */
-      fprintf (file, "AUX ");
-      if (SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp) != XTY_LD)
-	{
-	  BFD_ASSERT (! aux->fix_scnlen);
-	  fprintf (file, "val %5ld", aux->u.auxent.x_csect.x_scnlen.l);
-	}
-      else
-	{
-	  fprintf (file, "indx ");
-	  if (! aux->fix_scnlen)
-	    fprintf (file, "%4ld", aux->u.auxent.x_csect.x_scnlen.l);
-	  else
-	    fprintf (file, "%4ld",
-		     (long) (aux->u.auxent.x_csect.x_scnlen.p - table_base));
-	}
-      fprintf (file,
-	       " prmhsh %ld snhsh %u typ %d algn %d clss %u stb %ld snstb %u",
-	       aux->u.auxent.x_csect.x_parmhash,
-	       (unsigned int) aux->u.auxent.x_csect.x_snhash,
-	       SMTYP_SMTYP (aux->u.auxent.x_csect.x_smtyp),
-	       SMTYP_ALIGN (aux->u.auxent.x_csect.x_smtyp),
-	       (unsigned int) aux->u.auxent.x_csect.x_smclas,
-	       aux->u.auxent.x_csect.x_stab,
-	       (unsigned int) aux->u.auxent.x_csect.x_snstab);
-      return true;
-    }
-#endif
-
-  /* Return false to indicate that no special action was taken.  */
-  return false;
-}
-
-/*
-SUBSUBSECTION
-	Writing relocations
-
-	To write relocations, the back end steps though the
-	canonical relocation table and create an
-	@code{internal_reloc}. The symbol index to use is removed from
-	the @code{offset} field in the symbol table supplied.  The
-	address comes directly from the sum of the section base
-	address and the relocation offset; the type is dug directly
-	from the howto field.  Then the @code{internal_reloc} is
-	swapped into the shape of an @code{external_reloc} and written
-	out to disk.
-
-*/
-
-#ifdef TARG_AUX
-
-static int compare_arelent_ptr PARAMS ((const PTR, const PTR));
-
-/* AUX's ld wants relocations to be sorted */
-static int
-compare_arelent_ptr (x, y)
-     const PTR x;
-     const PTR y;
-{
-  const arelent **a = (const arelent **) x;
-  const arelent **b = (const arelent **) y;
-  bfd_size_type aadr = (*a)->address;
-  bfd_size_type badr = (*b)->address;
-
-  return (aadr < badr ? -1 : badr < aadr ? 1 : 0);
-}
-
-#endif /* TARG_AUX */
-
-static boolean
-coff_write_relocs (abfd, first_undef)
-     bfd * abfd;
-     int first_undef;
-{
-  asection *s;
-
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      unsigned int i;
-      struct external_reloc dst;
-      arelent **p;
-
-#ifndef TARG_AUX
-      p = s->orelocation;
-#else
-      /* sort relocations before we write them out */
-      p = (arelent **) bfd_malloc (s->reloc_count * sizeof (arelent *));
-      if (p == NULL && s->reloc_count > 0)
-	return false;
-      memcpy (p, s->orelocation, s->reloc_count * sizeof (arelent *));
-      qsort (p, s->reloc_count, sizeof (arelent *), compare_arelent_ptr);
-#endif
-
-      if (bfd_seek (abfd, s->rel_filepos, SEEK_SET) != 0)
-	return false;
-      for (i = 0; i < s->reloc_count; i++)
-	{
-	  struct internal_reloc n;
-	  arelent *q = p[i];
-	  memset ((PTR) & n, 0, sizeof (n));
-
-	  /* Now we've renumbered the symbols we know where the
-	     undefined symbols live in the table.  Check the reloc
-	     entries for symbols who's output bfd isn't the right one.
-	     This is because the symbol was undefined (which means
-	     that all the pointers are never made to point to the same
-	     place). This is a bad thing,'cause the symbols attached
-	     to the output bfd are indexed, so that the relocation
-	     entries know which symbol index they point to.  So we
-	     have to look up the output symbol here. */
-
-	  if (q->sym_ptr_ptr[0]->the_bfd != abfd)
-	    {
-	      int i;
-	      const char *sname = q->sym_ptr_ptr[0]->name;
-	      asymbol **outsyms = abfd->outsymbols;
-	      for (i = first_undef; outsyms[i]; i++)
-		{
-		  const char *intable = outsyms[i]->name;
-		  if (strcmp (intable, sname) == 0) {
-		    /* got a hit, so repoint the reloc */
-		    q->sym_ptr_ptr = outsyms + i;
-		    break;
-		  }
-		}
-	    }
-
-	  n.r_vaddr = q->address + s->vma;
-
-#ifdef R_IHCONST
-	  /* The 29k const/consth reloc pair is a real kludge.  The consth
-	     part doesn't have a symbol; it has an offset.  So rebuilt
-	     that here.  */
-	  if (q->howto->type == R_IHCONST)
-	    n.r_symndx = q->addend;
-	  else
-#endif
-	    if (q->sym_ptr_ptr)
-	      {
-		if (q->sym_ptr_ptr == bfd_abs_section_ptr->symbol_ptr_ptr)
-		  /* This is a relocation relative to the absolute symbol.  */
-		  n.r_symndx = -1;
-		else
-		  {
-		    n.r_symndx = get_index ((*(q->sym_ptr_ptr)));
-		    /* Take notice if the symbol reloc points to a symbol
-		       we don't have in our symbol table.  What should we
-		       do for this??  */
-		    if (n.r_symndx > obj_conv_table_size (abfd))
-		      abort ();
-		  }
-	      }
-
-#ifdef SWAP_OUT_RELOC_OFFSET
-	  n.r_offset = q->addend;
-#endif
-
-#ifdef SELECT_RELOC
-	  /* Work out reloc type from what is required */
-	  SELECT_RELOC (n, q->howto);
-#else
-	  n.r_type = q->howto->type;
-#endif
-	  coff_swap_reloc_out (abfd, &n, &dst);
-	  if (bfd_write ((PTR) & dst, 1, RELSZ, abfd) != RELSZ)
-	    return false;
-	}
-
-#ifdef TARG_AUX
-      if (p != NULL)
-	free (p);
-#endif
-    }
-
-  return true;
-}
-
-/* Set flags and magic number of a coff file from architecture and machine
-   type.  Result is true if we can represent the arch&type, false if not.  */
-
-static boolean
-coff_set_flags (abfd, magicp, flagsp)
-     bfd * abfd;
-     unsigned int *magicp;
-     unsigned short *flagsp;
-{
-  switch (bfd_get_arch (abfd))
-    {
-#ifdef Z8KMAGIC
-    case bfd_arch_z8k:
-      *magicp = Z8KMAGIC;
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_z8001:
-	  *flagsp = F_Z8001;
-	  break;
-	case bfd_mach_z8002:
-	  *flagsp = F_Z8002;
-	  break;
-	default:
-	  return false;
-	}
-      return true;
-#endif
-#ifdef I960ROMAGIC
-
-    case bfd_arch_i960:
-
-      {
-	unsigned flags;
-	*magicp = I960ROMAGIC;
-	/*
-	  ((bfd_get_file_flags(abfd) & WP_TEXT) ? I960ROMAGIC :
-	  I960RWMAGIC);   FIXME???
-	  */
-	switch (bfd_get_mach (abfd))
-	  {
-	  case bfd_mach_i960_core:
-	    flags = F_I960CORE;
-	    break;
-	  case bfd_mach_i960_kb_sb:
-	    flags = F_I960KB;
-	    break;
-	  case bfd_mach_i960_mc:
-	    flags = F_I960MC;
-	    break;
-	  case bfd_mach_i960_xa:
-	    flags = F_I960XA;
-	    break;
-	  case bfd_mach_i960_ca:
-	    flags = F_I960CA;
-	    break;
-	  case bfd_mach_i960_ka_sa:
-	    flags = F_I960KA;
-	    break;
-	  case bfd_mach_i960_jx:
-	    flags = F_I960JX;
-	    break;
-	  case bfd_mach_i960_hx:
-	    flags = F_I960HX;
-	    break;
-	  default:
-	    return false;
-	  }
-	*flagsp = flags;
-	return true;
-      }
-      break;
-#endif
-
-#ifdef TIC30MAGIC
-    case bfd_arch_tic30:
-      *magicp = TIC30MAGIC;
-      return true;
-#endif
-#ifdef TIC80_ARCH_MAGIC
-    case bfd_arch_tic80:
-      *magicp = TIC80_ARCH_MAGIC;
-      return true;
-#endif
-#ifdef ARMMAGIC
-    case bfd_arch_arm:
-      * magicp = ARMMAGIC;
-      * flagsp = 0;
-      if (APCS_SET (abfd))
-	{
-	  if (APCS_26_FLAG (abfd))
-	    * flagsp |= F_APCS26;
-	  
-	  if (APCS_FLOAT_FLAG (abfd))
-	    * flagsp |= F_APCS_FLOAT;
-	  
-	  if (PIC_FLAG (abfd))
-	    * flagsp |= F_PIC_INT;
-	}
-      if (INTERWORK_SET (abfd) && INTERWORK_FLAG (abfd))
-	* flagsp |= F_INTERWORK;
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_arm_2:  * flagsp |= F_ARM_2;  break;
-	case bfd_mach_arm_2a: * flagsp |= F_ARM_2a; break;
-	case bfd_mach_arm_3:  * flagsp |= F_ARM_3;  break;
-	case bfd_mach_arm_3M: * flagsp |= F_ARM_3M; break;
-	case bfd_mach_arm_4:  * flagsp |= F_ARM_4;  break;
-	case bfd_mach_arm_4T: * flagsp |= F_ARM_4T; break;
-	}
-      return true;
-#endif
-#ifdef PPCMAGIC
-    case bfd_arch_powerpc:
-      *magicp = PPCMAGIC;
-      return true;
-      break;
-#endif
-#ifdef I386MAGIC
-    case bfd_arch_i386:
-      *magicp = I386MAGIC;
-#ifdef LYNXOS
-      /* Just overwrite the usual value if we're doing Lynx. */
-      *magicp = LYNXCOFFMAGIC;
-#endif
-      return true;
-      break;
-#endif
-#ifdef I860MAGIC
-    case bfd_arch_i860:
-      *magicp = I860MAGIC;
-      return true;
-      break;
-#endif
-#ifdef MC68MAGIC
-    case bfd_arch_m68k:
-#ifdef APOLLOM68KMAGIC
-      *magicp = APOLLO_COFF_VERSION_NUMBER;
-#else
-      /* NAMES_HAVE_UNDERSCORE may be defined by coff-u68k.c.  */
-#ifdef NAMES_HAVE_UNDERSCORE
-      *magicp = MC68KBCSMAGIC;
-#else
-      *magicp = MC68MAGIC;
-#endif
-#endif
-#ifdef LYNXOS
-      /* Just overwrite the usual value if we're doing Lynx. */
-      *magicp = LYNXCOFFMAGIC;
-#endif
-      return true;
-      break;
-#endif
-
-#ifdef MC88MAGIC
-    case bfd_arch_m88k:
-      *magicp = MC88OMAGIC;
-      return true;
-      break;
-#endif
-#ifdef H8300MAGIC
-    case bfd_arch_h8300:
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_h8300:
-	  *magicp = H8300MAGIC;
-	  return true;
-	case bfd_mach_h8300h:
-	  *magicp = H8300HMAGIC;
-	  return true;
-	case bfd_mach_h8300s:
-	  *magicp = H8300SMAGIC;
-	  return true;
-	}
-      break;
-#endif
-
-#ifdef SH_ARCH_MAGIC_BIG
-    case bfd_arch_sh:
-      if (bfd_big_endian (abfd))
-	*magicp = SH_ARCH_MAGIC_BIG;
-      else
-	*magicp = SH_ARCH_MAGIC_LITTLE;
-      return true;
-      break;
-#endif
-
-#ifdef SPARCMAGIC
-    case bfd_arch_sparc:
-      *magicp = SPARCMAGIC;
-#ifdef LYNXOS
-      /* Just overwrite the usual value if we're doing Lynx. */
-      *magicp = LYNXCOFFMAGIC;
-#endif
-      return true;
-      break;
-#endif
-
-#ifdef H8500MAGIC
-    case bfd_arch_h8500:
-      *magicp = H8500MAGIC;
-      return true;
-      break;
-#endif
-#ifdef A29K_MAGIC_BIG
-    case bfd_arch_a29k:
-      if (bfd_big_endian (abfd))
-	*magicp = A29K_MAGIC_BIG;
-      else
-	*magicp = A29K_MAGIC_LITTLE;
-      return true;
-      break;
-#endif
-
-#ifdef WE32KMAGIC
-    case bfd_arch_we32k:
-      *magicp = WE32KMAGIC;
-      return true;
-      break;
-#endif
-
-#ifdef U802TOCMAGIC
-    case bfd_arch_rs6000:
-#ifndef PPCMAGIC
-    case bfd_arch_powerpc:
-#endif
-      *magicp = U802TOCMAGIC;
-      return true;
-      break;
-#endif
-
-#ifdef MCOREMAGIC
-    case bfd_arch_mcore:
-      * magicp = MCOREMAGIC;
-      return true;
-#endif
-      
-    default:			/* Unknown architecture */
-      /* return false;  -- fall through to "return false" below, to avoid
-       "statement never reached" errors on the one below. */
-      break;
-    }
-
-  return false;
-}
-
-
-static boolean
-coff_set_arch_mach (abfd, arch, machine)
-     bfd * abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  unsigned dummy1;
-  unsigned short dummy2;
-
-  if (! bfd_default_set_arch_mach (abfd, arch, machine))
-    return false;
-
-  if (arch != bfd_arch_unknown &&
-      coff_set_flags (abfd, &dummy1, &dummy2) != true)
-    return false;		/* We can't represent this type */
-
-  return true;			/* We're easy ... */
-}
-
-
-/* Calculate the file position for each section. */
-
-#ifndef I960
-#define ALIGN_SECTIONS_IN_FILE
-#endif
-#ifdef TIC80COFF
-#undef ALIGN_SECTIONS_IN_FILE
-#endif
-
-static boolean
-coff_compute_section_file_positions (abfd)
-     bfd * abfd;
-{
-  asection *current;
-  asection *previous = (asection *) NULL;
-  file_ptr sofar = FILHSZ;
-  boolean align_adjust;
-  unsigned int count;
-#ifdef ALIGN_SECTIONS_IN_FILE
-  file_ptr old_sofar;
-#endif
-
-#ifdef RS6000COFF_C
-  /* On XCOFF, if we have symbols, set up the .debug section.  */
-  if (bfd_get_symcount (abfd) > 0)
-    {
-      bfd_size_type sz;
-      bfd_size_type i, symcount;
-      asymbol **symp;
-
-      sz = 0;
-      symcount = bfd_get_symcount (abfd);
-      for (symp = abfd->outsymbols, i = 0; i < symcount; symp++, i++)
-	{
-	  coff_symbol_type *cf;
-
-	  cf = coff_symbol_from (abfd, *symp);
-	  if (cf != NULL
-	      && cf->native != NULL
-	      && SYMNAME_IN_DEBUG (&cf->native->u.syment))
-	    {
-	      size_t len;
-
-	      len = strlen (bfd_asymbol_name (*symp));
-	      if (len > SYMNMLEN)
-		sz += len + 3;
-	    }
-	}
-      if (sz > 0)
-	{
-	  asection *dsec;
-
-	  dsec = bfd_make_section_old_way (abfd, ".debug");
-	  if (dsec == NULL)
-	    abort ();
-	  dsec->_raw_size = sz;
-	  dsec->flags |= SEC_HAS_CONTENTS;
-	}
-    }
-#endif
-
-#ifdef COFF_IMAGE_WITH_PE
-  int page_size;
-  if (coff_data (abfd)->link_info) 
-    {
-      page_size = pe_data (abfd)->pe_opthdr.FileAlignment;
-    }
-  else
-    page_size = PE_DEF_FILE_ALIGNMENT;
-#else
-#ifdef COFF_PAGE_SIZE
-  int page_size = COFF_PAGE_SIZE;
-#endif
-#endif
-
-  if (bfd_get_start_address (abfd))
-    {
-      /*  A start address may have been added to the original file. In this
-	  case it will need an optional header to record it.  */
-      abfd->flags |= EXEC_P;
-    }
-
-  if (abfd->flags & EXEC_P)
-    sofar += AOUTSZ;
-#ifdef RS6000COFF_C
-  else if (xcoff_data (abfd)->full_aouthdr)
-    sofar += AOUTSZ;
-  else
-    sofar += SMALL_AOUTSZ;
-#endif
-
-  sofar += abfd->section_count * SCNHSZ;
-
-#ifdef RS6000COFF_C
-  /* XCOFF handles overflows in the reloc and line number count fields
-     by allocating a new section header to hold the correct counts.  */
-  for (current = abfd->sections; current != NULL; current = current->next)
-    if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
-      sofar += SCNHSZ;
-#endif
-
-  align_adjust = false;
-  for (current = abfd->sections, count = 1;
-       current != (asection *) NULL;
-       current = current->next, ++count)
-    {
-#ifdef COFF_IMAGE_WITH_PE
-      /* The NT loader does not want empty section headers, so we omit
-         them.  We don't actually remove the section from the BFD,
-         although we probably should.  This matches code in
-         coff_write_object_contents.  */
-      if (current->_raw_size == 0)
-	{
-	  current->target_index = -1;
-	  --count;
-	  continue;
-	}
-#endif
-
-      current->target_index = count;
-
-      /* Only deal with sections which have contents */
-      if (!(current->flags & SEC_HAS_CONTENTS))
-	continue;
-
-      /* Align the sections in the file to the same boundary on
-	 which they are aligned in virtual memory.  I960 doesn't
-	 do this (FIXME) so we can stay in sync with Intel.  960
-	 doesn't yet page from files... */
-#ifdef ALIGN_SECTIONS_IN_FILE
-      if ((abfd->flags & EXEC_P) != 0)
-	{
-	  /* make sure this section is aligned on the right boundary - by
-	     padding the previous section up if necessary */
-
-	  old_sofar = sofar;
-	  sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
-	  if (previous != (asection *) NULL)
-	    {
-	      previous->_raw_size += sofar - old_sofar;
-	    }
-	}
-
-#endif
-
-      /* In demand paged files the low order bits of the file offset
-	 must match the low order bits of the virtual address.  */
-#ifdef COFF_PAGE_SIZE
-      if ((abfd->flags & D_PAGED) != 0
-	  && (current->flags & SEC_ALLOC) != 0)
-	sofar += (current->vma - sofar) % page_size;
-#endif
-      current->filepos = sofar;
-
-#ifdef COFF_IMAGE_WITH_PE
-      /* With PE we have to pad each section to be a multiple of its
-	 page size too, and remember both sizes.  */
-
-      if (coff_section_data (abfd, current) == NULL)
-	{
-	  current->used_by_bfd =
-	    (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
-	  if (current->used_by_bfd == NULL)
-	    return false;
-	}
-      if (pei_section_data (abfd, current) == NULL)
-	{
-	  coff_section_data (abfd, current)->tdata =
-	    (PTR) bfd_zalloc (abfd, sizeof (struct pei_section_tdata));
-	  if (coff_section_data (abfd, current)->tdata == NULL)
-	    return false;
-	}
-      if (pei_section_data (abfd, current)->virt_size == 0)
-	pei_section_data (abfd, current)->virt_size = current->_raw_size;
-
-      current->_raw_size = (current->_raw_size + page_size -1) & -page_size;
-#endif
-
-      sofar += current->_raw_size;
-
-#ifdef ALIGN_SECTIONS_IN_FILE
-      /* make sure that this section is of the right size too */
-      if ((abfd->flags & EXEC_P) == 0)
-	{
-	  bfd_size_type old_size;
-
-	  old_size = current->_raw_size;
-	  current->_raw_size = BFD_ALIGN (current->_raw_size,
-					  1 << current->alignment_power);
-	  align_adjust = current->_raw_size != old_size;
-	  sofar += current->_raw_size - old_size;
-	}
-      else
-	{
-	  old_sofar = sofar;
-	  sofar = BFD_ALIGN (sofar, 1 << current->alignment_power);
-	  align_adjust = sofar != old_sofar;
-	  current->_raw_size += sofar - old_sofar;
-	}
-#endif
-
-#ifdef COFF_IMAGE_WITH_PE
-      /* For PE we need to make sure we pad out to the aligned
-         _raw_size, in case the caller only writes out data to the
-         unaligned _raw_size.  */
-      if (pei_section_data (abfd, current)->virt_size < current->_raw_size)
-	align_adjust = true;
-#endif
-
-#ifdef _LIB
-      /* Force .lib sections to start at zero.  The vma is then
-	 incremented in coff_set_section_contents.  This is right for
-	 SVR3.2.  */
-      if (strcmp (current->name, _LIB) == 0)
-	bfd_set_section_vma (abfd, current, 0);
-#endif
-
-      previous = current;
-    }
-
-  /* It is now safe to write to the output file.  If we needed an
-     alignment adjustment for the last section, then make sure that
-     there is a byte at offset sofar.  If there are no symbols and no
-     relocs, then nothing follows the last section.  If we don't force
-     the last byte out, then the file may appear to be truncated.  */
-  if (align_adjust)
-    {
-      bfd_byte b;
-
-      b = 0;
-      if (bfd_seek (abfd, sofar - 1, SEEK_SET) != 0
-	  || bfd_write (&b, 1, 1, abfd) != 1)
-	return false;
-    }
-
-  /* Make sure the relocations are aligned.  We don't need to make
-     sure that this byte exists, because it will only matter if there
-     really are relocs.  */
-  sofar = BFD_ALIGN (sofar, 1 << COFF_DEFAULT_SECTION_ALIGNMENT_POWER);
-
-  obj_relocbase (abfd) = sofar;
-  abfd->output_has_begun = true;
-
-  return true;
-}
-
-#if 0
-
-/* This can never work, because it is called too late--after the
-   section positions have been set.  I can't figure out what it is
-   for, so I am going to disable it--Ian Taylor 20 March 1996.  */
-
-/* If .file, .text, .data, .bss symbols are missing, add them.  */
-/* @@ Should we only be adding missing symbols, or overriding the aux
-   values for existing section symbols?  */
-static boolean
-coff_add_missing_symbols (abfd)
-     bfd *abfd;
-{
-  unsigned int nsyms = bfd_get_symcount (abfd);
-  asymbol **sympp = abfd->outsymbols;
-  asymbol **sympp2;
-  unsigned int i;
-  int need_text = 1, need_data = 1, need_bss = 1, need_file = 1;
-
-  for (i = 0; i < nsyms; i++)
-    {
-      coff_symbol_type *csym = coff_symbol_from (abfd, sympp[i]);
-      CONST char *name;
-      if (csym)
-	{
-	  /* only do this if there is a coff representation of the input
-	   symbol */
-	  if (csym->native && csym->native->u.syment.n_sclass == C_FILE)
-	    {
-	      need_file = 0;
-	      continue;
-	    }
-	  name = csym->symbol.name;
-	  if (!name)
-	    continue;
-	  if (!strcmp (name, _TEXT))
-	    need_text = 0;
-#ifdef APOLLO_M68
-	  else if (!strcmp (name, ".wtext"))
-	    need_text = 0;
-#endif
-	  else if (!strcmp (name, _DATA))
-	    need_data = 0;
-	  else if (!strcmp (name, _BSS))
-	    need_bss = 0;
-	}
-    }
-  /* Now i == bfd_get_symcount (abfd).  */
-  /* @@ For now, don't deal with .file symbol.  */
-  need_file = 0;
-
-  if (!need_text && !need_data && !need_bss && !need_file)
-    return true;
-  nsyms += need_text + need_data + need_bss + need_file;
-  sympp2 = (asymbol **) bfd_alloc (abfd, nsyms * sizeof (asymbol *));
-  if (!sympp2)
-    return false;
-  memcpy (sympp2, sympp, i * sizeof (asymbol *));
-  if (need_file)
-    {
-      /* @@ Generate fake .file symbol, in sympp2[i], and increment i.  */
-      abort ();
-    }
-  if (need_text)
-    sympp2[i++] = coff_section_symbol (abfd, _TEXT);
-  if (need_data)
-    sympp2[i++] = coff_section_symbol (abfd, _DATA);
-  if (need_bss)
-    sympp2[i++] = coff_section_symbol (abfd, _BSS);
-  BFD_ASSERT (i == nsyms);
-  bfd_set_symtab (abfd, sympp2, nsyms);
-  return true;
-}
-
-#endif /* 0 */
-
-/* SUPPRESS 558 */
-/* SUPPRESS 529 */
-static boolean
-coff_write_object_contents (abfd)
-     bfd * abfd;
-{
-  asection *current;
-  boolean hasrelocs = false;
-  boolean haslinno = false;
-  file_ptr scn_base;
-  file_ptr reloc_base;
-  file_ptr lineno_base;
-  file_ptr sym_base;
-  unsigned long reloc_size = 0;
-  unsigned long lnno_size = 0;
-  boolean long_section_names;
-  asection *text_sec = NULL;
-  asection *data_sec = NULL;
-  asection *bss_sec = NULL;
-  struct internal_filehdr internal_f;
-  struct internal_aouthdr internal_a;
-#ifdef COFF_LONG_SECTION_NAMES
-  size_t string_size = STRING_SIZE_SIZE;
-#endif
-
-  bfd_set_error (bfd_error_system_call);
-
-  /* Make a pass through the symbol table to count line number entries and
-     put them into the correct asections */
-
-  lnno_size = coff_count_linenumbers (abfd) * LINESZ;
-
-  if (abfd->output_has_begun == false)
-    {
-      if (! coff_compute_section_file_positions (abfd))
-	return false;
-    }
-
-  reloc_base = obj_relocbase (abfd);
-
-  /* Work out the size of the reloc and linno areas */
-
-  for (current = abfd->sections; current != NULL; current =
-       current->next)
-    reloc_size += current->reloc_count * RELSZ;
-
-  lineno_base = reloc_base + reloc_size;
-  sym_base = lineno_base + lnno_size;
-
-  /* Indicate in each section->line_filepos its actual file address */
-  for (current = abfd->sections; current != NULL; current =
-       current->next)
-    {
-      if (current->lineno_count)
-	{
-	  current->line_filepos = lineno_base;
-	  current->moving_line_filepos = lineno_base;
-	  lineno_base += current->lineno_count * LINESZ;
-	}
-      else
-	{
-	  current->line_filepos = 0;
-	}
-      if (current->reloc_count)
-	{
-	  current->rel_filepos = reloc_base;
-	  reloc_base += current->reloc_count * RELSZ;
-	}
-      else
-	{
-	  current->rel_filepos = 0;
-	}
-    }
-
-  /* Write section headers to the file.  */
-  internal_f.f_nscns = 0;
-
-  if ((abfd->flags & EXEC_P) != 0)
-    scn_base = FILHSZ + AOUTSZ;
-  else
-    {
-      scn_base = FILHSZ;
-#ifdef RS6000COFF_C
-      if (xcoff_data (abfd)->full_aouthdr)
-	scn_base += AOUTSZ;
-      else
-	scn_base += SMALL_AOUTSZ;
-#endif
-    }
-
-  if (bfd_seek (abfd, scn_base, SEEK_SET) != 0)
-    return false;
-
-  long_section_names = false;
-  for (current = abfd->sections;
-       current != NULL;
-       current = current->next)
-    {
-      struct internal_scnhdr section;
-
-#ifdef COFF_WITH_PE
-      /* If we've got a .reloc section, remember. */
-
-#ifdef COFF_IMAGE_WITH_PE
-      if (strcmp (current->name, ".reloc") == 0)
-	{
-	  pe_data (abfd)->has_reloc_section = 1;
-	}
-#endif
-
-#endif
-      internal_f.f_nscns++;
-
-      strncpy (section.s_name, current->name, SCNNMLEN);
-
-#ifdef COFF_LONG_SECTION_NAMES
-      /* Handle long section names as in PE.  This must be compatible
-         with the code in coff_write_symbols.  */
-      {
-	size_t len;
-
-	len = strlen (current->name);
-	if (len > SCNNMLEN)
-	  {
-	    memset (section.s_name, 0, SCNNMLEN);
-	    sprintf (section.s_name, "/%lu", (unsigned long) string_size);
-	    string_size += len + 1;
-	    long_section_names = true;
-	  }
-      }
-#endif
-
-#ifdef _LIB
-      /* Always set s_vaddr of .lib to 0.  This is right for SVR3.2
-	 Ian Taylor <ian@cygnus.com>.  */
-      if (strcmp (current->name, _LIB) == 0)
-	section.s_vaddr = 0;
-      else
-#endif
-      section.s_vaddr = current->vma;
-      section.s_paddr = current->lma;
-      section.s_size =  current->_raw_size;
-
-#ifdef COFF_WITH_PE
-      section.s_paddr = 0;
-#endif
-#ifdef COFF_IMAGE_WITH_PE
-      /* Reminder: s_paddr holds the virtual size of the section.  */
-      if (coff_section_data (abfd, current) != NULL
-	  && pei_section_data (abfd, current) != NULL)
-	section.s_paddr = pei_section_data (abfd, current)->virt_size;
-      else
-	section.s_paddr = 0;
-#endif
-
-      /*
-	 If this section has no size or is unloadable then the scnptr
-	 will be 0 too
-	 */
-      if (current->_raw_size == 0 ||
-	  (current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
-	{
-	  section.s_scnptr = 0;
-	}
-      else
-	{
-	  section.s_scnptr = current->filepos;
-	}
-      section.s_relptr = current->rel_filepos;
-      section.s_lnnoptr = current->line_filepos;
-      section.s_nreloc = current->reloc_count;
-      section.s_nlnno = current->lineno_count;
-      if (current->reloc_count != 0)
-	hasrelocs = true;
-      if (current->lineno_count != 0)
-	haslinno = true;
-
-#ifdef RS6000COFF_C
-      /* Indicate the use of an XCOFF overflow section header.  */
-      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
-	{
-	  section.s_nreloc = 0xffff;
-	  section.s_nlnno = 0xffff;
-	}
-#endif
-
-      section.s_flags = sec_to_styp_flags (current->name, current->flags);
-
-      if (!strcmp (current->name, _TEXT))
-	{
-	  text_sec = current;
-	}
-      else if (!strcmp (current->name, _DATA))
-	{
-	  data_sec = current;
-	}
-      else if (!strcmp (current->name, _BSS))
-	{
-	  bss_sec = current;
-	}
-
-#ifdef I960
-      section.s_align = (current->alignment_power
-			 ? 1 << current->alignment_power
-			 : 0);
-#else
-#ifdef TIC80COFF
-      section.s_flags |= (current->alignment_power & 0xF) << 8;
-#endif
-#endif
-
-#ifdef COFF_IMAGE_WITH_PE
-      /* suppress output of the sections if they are null.  ld includes
-	 the bss and data sections even if there is no size assigned
-	 to them.  NT loader doesn't like it if these section headers are
-	 included if the sections themselves are not needed */
-      if (section.s_size == 0)
-	internal_f.f_nscns--;
-      else
-#endif
-	{
-	  SCNHDR buff;
-	  if (coff_swap_scnhdr_out (abfd, &section, &buff) == 0
-	      || bfd_write ((PTR) (&buff), 1, SCNHSZ, abfd) != SCNHSZ)
-	    return false;
-	}
-
-#ifdef COFF_WITH_PE
-      /* PE stores COMDAT section information in the symbol table.  If
-         this section is supposed to have some COMDAT info, track down
-         the symbol in the symbol table and modify it.  */
-      if ((current->flags & SEC_LINK_ONCE) != 0)
-	{
-	  unsigned int i, count;
-	  asymbol **psym;
-	  coff_symbol_type *csym = NULL;
-	  asymbol **psymsec;
-
-	  psymsec = NULL;
-	  count = bfd_get_symcount (abfd);
-	  for (i = 0, psym = abfd->outsymbols; i < count; i++, psym++)
-	    {
-	      if ((*psym)->section != current)
-		continue;
-
-	      /* Remember the location of the first symbol in this
-                 section.  */
-	      if (psymsec == NULL)
-		psymsec = psym;
-
-	      /* See if this is the section symbol.  */
-	      if (strcmp ((*psym)->name, current->name) == 0)
-		{
-		  csym = coff_symbol_from (abfd, *psym);
-		  if (csym == NULL
-		      || csym->native == NULL
-		      || csym->native->u.syment.n_numaux < 1
-		      || csym->native->u.syment.n_sclass != C_STAT
-		      || csym->native->u.syment.n_type != T_NULL)
-		    continue;
-
-		  /* Here *PSYM is the section symbol for CURRENT.  */
-
-		  break;
-		}
-	    }
-
-	  /* Did we find it?
-	     Note that we might not if we're converting the file from
-	     some other object file format.  */
-	  if (i < count)
-	    {
-	      combined_entry_type *aux;
-
-	      /* We don't touch the x_checksum field.  The
-		 x_associated field is not currently supported.  */
-
-	      aux = csym->native + 1;
-	      switch (current->flags & SEC_LINK_DUPLICATES)
-		{
-		case SEC_LINK_DUPLICATES_DISCARD:
-		  aux->u.auxent.x_scn.x_comdat = IMAGE_COMDAT_SELECT_ANY;
-		  break;
-
-		case SEC_LINK_DUPLICATES_ONE_ONLY:
-		  aux->u.auxent.x_scn.x_comdat =
-		    IMAGE_COMDAT_SELECT_NODUPLICATES;
-		  break;
-
-		case SEC_LINK_DUPLICATES_SAME_SIZE:
-		  aux->u.auxent.x_scn.x_comdat =
-		    IMAGE_COMDAT_SELECT_SAME_SIZE;
-		  break;
-
-		case SEC_LINK_DUPLICATES_SAME_CONTENTS:
-		  aux->u.auxent.x_scn.x_comdat =
-		    IMAGE_COMDAT_SELECT_EXACT_MATCH;
-		  break;
-		}
-
-	      /* The COMDAT symbol must be the first symbol from this
-                 section in the symbol table.  In order to make this
-                 work, we move the COMDAT symbol before the first
-                 symbol we found in the search above.  It's OK to
-                 rearrange the symbol table at this point, because
-                 coff_renumber_symbols is going to rearrange it
-                 further and fix up all the aux entries.  */
-	      if (psym != psymsec)
-		{
-		  asymbol *hold;
-		  asymbol **pcopy;
-
-		  hold = *psym;
-		  for (pcopy = psym; pcopy > psymsec; pcopy--)
-		    pcopy[0] = pcopy[-1];
-		  *psymsec = hold;
-		}
-	    }
-	}
-#endif /* COFF_WITH_PE */
-    }
-
-#ifdef RS6000COFF_C
-  /* XCOFF handles overflows in the reloc and line number count fields
-     by creating a new section header to hold the correct values.  */
-  for (current = abfd->sections; current != NULL; current = current->next)
-    {
-      if (current->reloc_count >= 0xffff || current->lineno_count >= 0xffff)
-	{
-	  struct internal_scnhdr scnhdr;
-	  SCNHDR buff;
-
-	  internal_f.f_nscns++;
-	  strncpy (&(scnhdr.s_name[0]), current->name, 8);
-	  scnhdr.s_paddr = current->reloc_count;
-	  scnhdr.s_vaddr = current->lineno_count;
-	  scnhdr.s_size = 0;
-	  scnhdr.s_scnptr = 0;
-	  scnhdr.s_relptr = current->rel_filepos;
-	  scnhdr.s_lnnoptr = current->line_filepos;
-	  scnhdr.s_nreloc = current->target_index;
-	  scnhdr.s_nlnno = current->target_index;
-	  scnhdr.s_flags = STYP_OVRFLO;
-	  if (coff_swap_scnhdr_out (abfd, &scnhdr, &buff) == 0
-	      || bfd_write ((PTR) &buff, 1, SCNHSZ, abfd) != SCNHSZ)
-	    return false;
-	}
-    }
-#endif
-
-  /* OK, now set up the filehdr... */
-
-  /* Don't include the internal abs section in the section count */
-
-  /*
-     We will NOT put a fucking timestamp in the header here. Every time you
-     put it back, I will come in and take it out again.  I'm sorry.  This
-     field does not belong here.  We fill it with a 0 so it compares the
-     same but is not a reasonable time. -- gnu@cygnus.com
-     */
-  internal_f.f_timdat = 0;
-
-  internal_f.f_flags = 0;
-
-  if (abfd->flags & EXEC_P)
-    internal_f.f_opthdr = AOUTSZ;
-  else
-    {
-      internal_f.f_opthdr = 0;
-#ifdef RS6000COFF_C
-      if (xcoff_data (abfd)->full_aouthdr)
-	internal_f.f_opthdr = AOUTSZ;
-      else
-	internal_f.f_opthdr = SMALL_AOUTSZ;
-#endif
-    }
-
-  if (!hasrelocs)
-    internal_f.f_flags |= F_RELFLG;
-  if (!haslinno)
-    internal_f.f_flags |= F_LNNO;
-  if (abfd->flags & EXEC_P)
-    internal_f.f_flags |= F_EXEC;
-
-  /* FIXME: this is wrong for PPC_PE! */
-  if (bfd_little_endian (abfd))
-    internal_f.f_flags |= F_AR32WR;
-  else
-    internal_f.f_flags |= F_AR32W;
-
-#ifdef TIC80_TARGET_ID
-  internal_f.f_target_id = TIC80_TARGET_ID;
-#endif
-
-  /*
-     FIXME, should do something about the other byte orders and
-     architectures.
-     */
-
-#ifdef RS6000COFF_C
-  if ((abfd->flags & DYNAMIC) != 0)
-    internal_f.f_flags |= F_SHROBJ;
-  if (bfd_get_section_by_name (abfd, _LOADER) != NULL)
-    internal_f.f_flags |= F_DYNLOAD;
-#endif
-
-  memset (&internal_a, 0, sizeof internal_a);
-
-  /* Set up architecture-dependent stuff */
-
-  {
-    unsigned int magic = 0;
-    unsigned short flags = 0;
-    coff_set_flags (abfd, &magic, &flags);
-    internal_f.f_magic = magic;
-    internal_f.f_flags |= flags;
-    /* ...and the "opt"hdr... */
-
-#ifdef A29K
-#ifdef ULTRA3			/* NYU's machine */
-    /* FIXME: This is a bogus check.  I really want to see if there
-     * is a .shbss or a .shdata section, if so then set the magic
-     * number to indicate a shared data executable.
-     */
-    if (internal_f.f_nscns >= 7)
-      internal_a.magic = SHMAGIC; /* Shared magic */
-    else
-#endif /* ULTRA3 */
-      internal_a.magic = NMAGIC; /* Assume separate i/d */
-#define __A_MAGIC_SET__
-#endif /* A29K */
-#ifdef TIC80COFF
-    internal_a.magic = TIC80_ARCH_MAGIC;
-#define __A_MAGIC_SET__
-#endif /* TIC80 */
-#ifdef I860
-    /* FIXME: What are the a.out magic numbers for the i860?  */
-    internal_a.magic = 0;
-#define __A_MAGIC_SET__
-#endif /* I860 */
-#ifdef I960
-    internal_a.magic = (magic == I960ROMAGIC ? NMAGIC : OMAGIC);
-#define __A_MAGIC_SET__
-#endif /* I960 */
-#if M88
-#define __A_MAGIC_SET__
-    internal_a.magic = PAGEMAGICBCS;
-#endif /* M88 */
-
-#if APOLLO_M68
-#define __A_MAGIC_SET__
-    internal_a.magic = APOLLO_COFF_VERSION_NUMBER;
-#endif
-
-#if defined(M68) || defined(WE32K) || defined(M68K)
-#define __A_MAGIC_SET__
-#if defined(LYNXOS)
-    internal_a.magic = LYNXCOFFMAGIC;
-#else
-#if defined(TARG_AUX)
-    internal_a.magic = (abfd->flags & D_PAGED ? PAGEMAGICPEXECPAGED :
-			abfd->flags & WP_TEXT ? PAGEMAGICPEXECSWAPPED :
-			PAGEMAGICEXECSWAPPED);
-#else
-#if defined (PAGEMAGICPEXECPAGED)
-    internal_a.magic = PAGEMAGICPEXECPAGED;
-#endif
-#endif /* TARG_AUX */
-#endif /* LYNXOS */
-#endif /* M68 || WE32K || M68K */
-
-#if defined(ARM)
-#define __A_MAGIC_SET__
-    internal_a.magic = ZMAGIC;
-#endif 
-
-#if defined(PPC_PE)
-#define __A_MAGIC_SET__
-    internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
-#endif
-
-#if defined MCORE_PE
-#define __A_MAGIC_SET__
-    internal_a.magic = IMAGE_NT_OPTIONAL_HDR_MAGIC;
-#endif 
-
-#if defined(I386)
-#define __A_MAGIC_SET__
-#if defined(LYNXOS)
-    internal_a.magic = LYNXCOFFMAGIC;
-#else  /* LYNXOS */
-    internal_a.magic = ZMAGIC;
-#endif /* LYNXOS */
-#endif /* I386 */
-
-#if defined(SPARC)
-#define __A_MAGIC_SET__
-#if defined(LYNXOS)
-    internal_a.magic = LYNXCOFFMAGIC;
-#endif /* LYNXOS */
-#endif /* SPARC */
-
-#ifdef RS6000COFF_C
-#define __A_MAGIC_SET__
-    internal_a.magic = (abfd->flags & D_PAGED) ? RS6K_AOUTHDR_ZMAGIC :
-    (abfd->flags & WP_TEXT) ? RS6K_AOUTHDR_NMAGIC :
-    RS6K_AOUTHDR_OMAGIC;
-#endif
-
-#ifndef __A_MAGIC_SET__
-#include "Your aouthdr magic number is not being set!"
-#else
-#undef __A_MAGIC_SET__
-#endif
-  }
-
-  /* FIXME: Does anybody ever set this to another value?  */
-  internal_a.vstamp = 0;
-
-  /* Now should write relocs, strings, syms */
-  obj_sym_filepos (abfd) = sym_base;
-
-  if (bfd_get_symcount (abfd) != 0)
-    {
-      int firstundef;
-#if 0
-      if (!coff_add_missing_symbols (abfd))
-	return false;
-#endif
-      if (!coff_renumber_symbols (abfd, &firstundef))
-	return false;
-      coff_mangle_symbols (abfd);
-      if (! coff_write_symbols (abfd))
-	return false;
-      if (! coff_write_linenumbers (abfd))
-	return false;
-      if (! coff_write_relocs (abfd, firstundef))
-	return false;
-    }
-#ifdef COFF_LONG_SECTION_NAMES
-  else if (long_section_names)
-    {
-      /* If we have long section names we have to write out the string
-         table even if there are no symbols.  */
-      if (! coff_write_symbols (abfd))
-	return false;
-    }
-#endif
-#ifdef COFF_IMAGE_WITH_PE
-#ifdef PPC_PE
-  else if ((abfd->flags & EXEC_P) != 0)
-    {
-      bfd_byte b;
-
-      /* PowerPC PE appears to require that all executable files be
-         rounded up to the page size.  */
-      b = 0;
-      if (bfd_seek (abfd,
-		    BFD_ALIGN (sym_base, COFF_PAGE_SIZE) - 1,
-		    SEEK_SET) != 0
-	  || bfd_write (&b, 1, 1, abfd) != 1)
-	return false;
-    }
-#endif
-#endif
-
-  /* If bfd_get_symcount (abfd) != 0, then we are not using the COFF
-     backend linker, and obj_raw_syment_count is not valid until after
-     coff_write_symbols is called.  */
-  if (obj_raw_syment_count (abfd) != 0)
-    {
-      internal_f.f_symptr = sym_base;
-#ifdef RS6000COFF_C
-      /* AIX appears to require that F_RELFLG not be set if there are
-         local symbols but no relocations.  */
-      internal_f.f_flags &=~ F_RELFLG;
-#endif
-    }
-  else
-    {
-      if (long_section_names)
-	internal_f.f_symptr = sym_base;
-      else
-	internal_f.f_symptr = 0;
-      internal_f.f_flags |= F_LSYMS;
-    }
-
-  if (text_sec)
-    {
-      internal_a.tsize = bfd_get_section_size_before_reloc (text_sec);
-      internal_a.text_start = internal_a.tsize ? text_sec->vma : 0;
-    }
-  if (data_sec)
-    {
-      internal_a.dsize = bfd_get_section_size_before_reloc (data_sec);
-      internal_a.data_start = internal_a.dsize ? data_sec->vma : 0;
-    }
-  if (bss_sec)
-    {
-      internal_a.bsize = bfd_get_section_size_before_reloc (bss_sec);
-      if (internal_a.bsize && bss_sec->vma < internal_a.data_start)
-	internal_a.data_start = bss_sec->vma;
-    }
-
-  internal_a.entry = bfd_get_start_address (abfd);
-  internal_f.f_nsyms = obj_raw_syment_count (abfd);
-
-#ifdef RS6000COFF_C
-  if (xcoff_data (abfd)->full_aouthdr)
-    {
-      bfd_vma toc;
-      asection *loader_sec;
-
-      internal_a.vstamp = 1;
-
-      internal_a.o_snentry = xcoff_data (abfd)->snentry;
-      if (internal_a.o_snentry == 0)
-	internal_a.entry = (bfd_vma) -1;
-
-      if (text_sec != NULL)
-	{
-	  internal_a.o_sntext = text_sec->target_index;
-	  internal_a.o_algntext = bfd_get_section_alignment (abfd, text_sec);
-	}
-      else
-	{
-	  internal_a.o_sntext = 0;
-	  internal_a.o_algntext = 0;
-	}
-      if (data_sec != NULL)
-	{
-	  internal_a.o_sndata = data_sec->target_index;
-	  internal_a.o_algndata = bfd_get_section_alignment (abfd, data_sec);
-	}
-      else
-	{
-	  internal_a.o_sndata = 0;
-	  internal_a.o_algndata = 0;
-	}
-      loader_sec = bfd_get_section_by_name (abfd, ".loader");
-      if (loader_sec != NULL)
-	internal_a.o_snloader = loader_sec->target_index;
-      else
-	internal_a.o_snloader = 0;
-      if (bss_sec != NULL)
-	internal_a.o_snbss = bss_sec->target_index;
-      else
-	internal_a.o_snbss = 0;
-
-      toc = xcoff_data (abfd)->toc;
-      internal_a.o_toc = toc;
-      internal_a.o_sntoc = xcoff_data (abfd)->sntoc;
-
-      internal_a.o_modtype = xcoff_data (abfd)->modtype;
-      if (xcoff_data (abfd)->cputype != -1)
-	internal_a.o_cputype = xcoff_data (abfd)->cputype;
-      else
-	{
-	  switch (bfd_get_arch (abfd))
-	    {
-	    case bfd_arch_rs6000:
-	      internal_a.o_cputype = 4;
-	      break;
-	    case bfd_arch_powerpc:
-	      if (bfd_get_mach (abfd) == 0)
-		internal_a.o_cputype = 3;
-	      else
-		internal_a.o_cputype = 1;
-	      break;
-	    default:
-	      abort ();
-	    }
-	}
-      internal_a.o_maxstack = xcoff_data (abfd)->maxstack;
-      internal_a.o_maxdata = xcoff_data (abfd)->maxdata;
-    }
-#endif
-
-  /* now write them */
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
-  {
-    char buff[FILHSZ];
-    coff_swap_filehdr_out (abfd, (PTR) & internal_f, (PTR) buff);
-    if (bfd_write ((PTR) buff, 1, FILHSZ, abfd) != FILHSZ)
-      return false;
-  }
-  if (abfd->flags & EXEC_P)
-    {
-      /* Note that peicode.h fills in a PEAOUTHDR, not an AOUTHDR. 
-	 include/coff/pe.h sets AOUTSZ == sizeof(PEAOUTHDR)) */
-      char buff[AOUTSZ];
-      coff_swap_aouthdr_out (abfd, (PTR) & internal_a, (PTR) buff);
-      if (bfd_write ((PTR) buff, 1, AOUTSZ, abfd) != AOUTSZ)
-	return false;
-    }
-#ifdef RS6000COFF_C
-  else
-    {
-      AOUTHDR buff;
-      size_t size;
-
-      /* XCOFF seems to always write at least a small a.out header.  */
-      coff_swap_aouthdr_out (abfd, (PTR) &internal_a, (PTR) &buff);
-      if (xcoff_data (abfd)->full_aouthdr)
-	size = AOUTSZ;
-      else
-	size = SMALL_AOUTSZ;
-      if (bfd_write ((PTR) &buff, 1, size, abfd) != size)
-	return false;
-    }
-#endif
-
-  return true;
-}
-
-static boolean
-coff_set_section_contents (abfd, section, location, offset, count)
-     bfd * abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (abfd->output_has_begun == false)	/* set by bfd.c handler */
-    {
-      if (! coff_compute_section_file_positions (abfd))
-	return false;
-    }
-
-#if defined(_LIB) && !defined(TARG_AUX)
-
-   /* The physical address field of a .lib section is used to hold the
-      number of shared libraries in the section.  This code counts the
-      number of sections being written, and increments the lma field
-      with the number.
-
-      I have found no documentation on the contents of this section.
-      Experimentation indicates that the section contains zero or more
-      records, each of which has the following structure:
-
-      - a (four byte) word holding the length of this record, in words,
-      - a word that always seems to be set to "2",
-      - the path to a shared library, null-terminated and then padded
-        to a whole word boundary.
-
-      bfd_assert calls have been added to alert if an attempt is made
-      to write a section which doesn't follow these assumptions.  The
-      code has been tested on ISC 4.1 by me, and on SCO by Robert Lipe
-      <robertl@arnet.com> (Thanks!).
-  
-      Gvran Uddeborg <gvran@uddeborg.pp.se> */
-
-    if (strcmp (section->name, _LIB) == 0)
-      {
-	bfd_byte *rec, *recend;
-
-	rec = (bfd_byte *) location;
-	recend = rec + count;
-	while (rec < recend)
-	  {
-	    ++section->lma;
-	    rec += bfd_get_32 (abfd, rec) * 4;
-	  }
-
-	BFD_ASSERT (rec == recend);
-      }
-
-#endif
-
-  /* Don't write out bss sections - one way to do this is to
-       see if the filepos has not been set. */
-  if (section->filepos == 0)
-    return true;
-
-  if (bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0)
-    return false;
-
-  if (count != 0)
-    {
-      return (bfd_write (location, 1, count, abfd) == count) ? true : false;
-    }
-  return true;
-}
-#if 0
-static boolean
-coff_close_and_cleanup (abfd)
-     bfd *abfd;
-{
-  if (!bfd_read_p (abfd))
-    switch (abfd->format)
-      {
-      case bfd_archive:
-	if (!_bfd_write_archive_contents (abfd))
-	  return false;
-	break;
-      case bfd_object:
-	if (!coff_write_object_contents (abfd))
-	  return false;
-	break;
-      default:
-	bfd_set_error (bfd_error_invalid_operation);
-	return false;
-      }
-
-  /* We depend on bfd_close to free all the memory on the objalloc.  */
-  return true;
-}
-
-#endif
-
-static PTR
-buy_and_read (abfd, where, seek_direction, size)
-     bfd *abfd;
-     file_ptr where;
-     int seek_direction;
-     size_t size;
-{
-  PTR area = (PTR) bfd_alloc (abfd, size);
-  if (!area)
-    return (NULL);
-  if (bfd_seek (abfd, where, seek_direction) != 0
-      || bfd_read (area, 1, size, abfd) != size)
-    return (NULL);
-  return (area);
-}				/* buy_and_read() */
-
-/*
-SUBSUBSECTION
-	Reading linenumbers
-
-	Creating the linenumber table is done by reading in the entire
-	coff linenumber table, and creating another table for internal use.
-
-	A coff linenumber table is structured so that each function
-	is marked as having a line number of 0. Each line within the
-	function is an offset from the first line in the function. The
-	base of the line number information for the table is stored in
-	the symbol associated with the function.
-
-	The information is copied from the external to the internal
-	table, and each symbol which marks a function is marked by
-	pointing its...
-
-	How does this work ?
-
-*/
-
-static boolean
-coff_slurp_line_table (abfd, asect)
-     bfd *abfd;
-     asection *asect;
-{
-  LINENO *native_lineno;
-  alent *lineno_cache;
-
-  BFD_ASSERT (asect->lineno == (alent *) NULL);
-
-  native_lineno = (LINENO *) buy_and_read (abfd,
-					   asect->line_filepos,
-					   SEEK_SET,
-					   (size_t) (LINESZ *
-						     asect->lineno_count));
-  lineno_cache =
-    (alent *) bfd_alloc (abfd, (size_t) ((asect->lineno_count + 1) * sizeof (alent)));
-  if (lineno_cache == NULL)
-    return false;
-  else
-    {
-      unsigned int counter = 0;
-      alent *cache_ptr = lineno_cache;
-      LINENO *src = native_lineno;
-
-      while (counter < asect->lineno_count)
-	{
-	  struct internal_lineno dst;
-	  coff_swap_lineno_in (abfd, src, &dst);
-	  cache_ptr->line_number = dst.l_lnno;
-
-	  if (cache_ptr->line_number == 0)
-	    {
-	      boolean warned;
-	      long symndx;
-	      coff_symbol_type *sym;
-
-	      warned = false;
-	      symndx = dst.l_addr.l_symndx;
-	      if (symndx < 0
-		  || (unsigned long) symndx >= obj_raw_syment_count (abfd))
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: warning: illegal symbol index %ld in line numbers"),
-		     bfd_get_filename (abfd), dst.l_addr.l_symndx);
-		  symndx = 0;
-		  warned = true;
-		}
-	      /* FIXME: We should not be casting between ints and
-                 pointers like this.  */
-	      sym = ((coff_symbol_type *)
-		     ((symndx + obj_raw_syments (abfd))
-		      ->u.syment._n._n_n._n_zeroes));
-	      cache_ptr->u.sym = (asymbol *) sym;
-	      if (sym->lineno != NULL && ! warned)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: warning: duplicate line number information for `%s'"),
-		     bfd_get_filename (abfd),
-		     bfd_asymbol_name (&sym->symbol));
-		}
-	      sym->lineno = cache_ptr;
-	    }
-	  else
-	    {
-	      cache_ptr->u.offset = dst.l_addr.l_paddr
-		- bfd_section_vma (abfd, asect);
-	    }			/* If no linenumber expect a symbol index */
-
-	  cache_ptr++;
-	  src++;
-	  counter++;
-	}
-      cache_ptr->line_number = 0;
-
-    }
-  asect->lineno = lineno_cache;
-  /* FIXME, free native_lineno here, or use alloca or something. */
-  return true;
-}
-
-static boolean
-coff_slurp_symbol_table (abfd)
-     bfd * abfd;
-{
-  combined_entry_type *native_symbols;
-  coff_symbol_type *cached_area;
-  unsigned int *table_ptr;
-
-  unsigned int number_of_symbols = 0;
-
-  if (obj_symbols (abfd))
-    return true;
-
-  /* Read in the symbol table */
-  if ((native_symbols = coff_get_normalized_symtab (abfd)) == NULL)
-    {
-      return (false);
-    }				/* on error */
-
-  /* Allocate enough room for all the symbols in cached form */
-  cached_area = ((coff_symbol_type *)
-		 bfd_alloc (abfd,
-			    (obj_raw_syment_count (abfd)
-			     * sizeof (coff_symbol_type))));
-
-  if (cached_area == NULL)
-    return false;
-  table_ptr = ((unsigned int *)
-	       bfd_alloc (abfd,
-			  (obj_raw_syment_count (abfd)
-			   * sizeof (unsigned int))));
-
-  if (table_ptr == NULL)
-    return false;
-  else
-    {
-      coff_symbol_type *dst = cached_area;
-      unsigned int last_native_index = obj_raw_syment_count (abfd);
-      unsigned int this_index = 0;
-      while (this_index < last_native_index)
-	{
-	  combined_entry_type *src = native_symbols + this_index;
-	  table_ptr[this_index] = number_of_symbols;
-	  dst->symbol.the_bfd = abfd;
-
-	  dst->symbol.name = (char *) (src->u.syment._n._n_n._n_offset);
-	  /* We use the native name field to point to the cached field.  */
-	  src->u.syment._n._n_n._n_zeroes = (long) dst;
-	  dst->symbol.section = coff_section_from_bfd_index (abfd,
-						     src->u.syment.n_scnum);
-	  dst->symbol.flags = 0;
-	  dst->done_lineno = false;
-
-	  switch (src->u.syment.n_sclass)
-	    {
-#ifdef I960
-	    case C_LEAFEXT:
-#if 0
-	      dst->symbol.value = src->u.syment.n_value - dst->symbol.section->vma;
-	      dst->symbol.flags = BSF_EXPORT | BSF_GLOBAL;
-	      dst->symbol.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
-#endif
-	      /* Fall through to next case */
-
-#endif
-
-	    case C_EXT:
-	    case C_WEAKEXT:
-#if defined ARM
-            case C_THUMBEXT:
-            case C_THUMBEXTFUNC:
-#endif
-#ifdef RS6000COFF_C
-	    case C_HIDEXT:
-#endif
-#ifdef C_SYSTEM
-	    case C_SYSTEM:	/* System Wide variable */
-#endif
-#ifdef COFF_WITH_PE
-            /* PE uses storage class 0x68 to denote a section symbol */
-            case C_SECTION:
-	    /* PE uses storage class 0x69 for a weak external symbol.  */
-	    case C_NT_WEAK:
-#endif
-	      if ((src->u.syment.n_scnum) == 0)
-		{
-		  if ((src->u.syment.n_value) == 0)
-		    {
-		      dst->symbol.section = bfd_und_section_ptr;
-		      dst->symbol.value = 0;
-		    }
-		  else
-		    {
-		      dst->symbol.section = bfd_com_section_ptr;
-		      dst->symbol.value = (src->u.syment.n_value);
-		    }
-		}
-	      else
-		{
-		  /* Base the value as an index from the base of the
-		     section */
-
-		  dst->symbol.flags = BSF_EXPORT | BSF_GLOBAL;
-
-#if defined COFF_WITH_PE
-		  /* PE sets the symbol to a value relative to the
-                     start of the section.  */
-		  dst->symbol.value = src->u.syment.n_value;
-#else
-		  dst->symbol.value = (src->u.syment.n_value
-				       - dst->symbol.section->vma);
-#endif
-
-		  if (ISFCN ((src->u.syment.n_type)))
-		    {
-		      /* A function ext does not go at the end of a
-			 file.  */
-		      dst->symbol.flags |= BSF_NOT_AT_END | BSF_FUNCTION;
-		    }
-		}
-
-#ifdef RS6000COFF_C
-	      /* A C_HIDEXT symbol is not global.  */
-	      if (src->u.syment.n_sclass == C_HIDEXT)
-		dst->symbol.flags = BSF_LOCAL;
-	      /* A symbol with a csect entry should not go at the end.  */
-	      if (src->u.syment.n_numaux > 0)
-		dst->symbol.flags |= BSF_NOT_AT_END;
-#endif
-
-#ifdef COFF_WITH_PE
-	      if (src->u.syment.n_sclass == C_NT_WEAK)
-		dst->symbol.flags = BSF_WEAK;
-#endif
-
-	      if (src->u.syment.n_sclass == C_WEAKEXT)
-		dst->symbol.flags = BSF_WEAK;
-
-	      break;
-
-	    case C_STAT:	/* static			 */
-#ifdef I960
-	    case C_LEAFSTAT:	/* static leaf procedure        */
-#endif
-#if defined ARM 
-            case C_THUMBSTAT:   /* Thumb static                  */
-            case C_THUMBLABEL:  /* Thumb label                   */
-            case C_THUMBSTATFUNC:/* Thumb static function        */
-#endif
-	    case C_LABEL:	/* label			 */
-	      if (src->u.syment.n_scnum == -2)
-		dst->symbol.flags = BSF_DEBUGGING;
-	      else
-		dst->symbol.flags = BSF_LOCAL;
-
-	      /* Base the value as an index from the base of the
-		 section, if there is one.  */
-	      if (dst->symbol.section)
-		{
-#if defined COFF_WITH_PE
-		  /* PE sets the symbol to a value relative to the
-                     start of the section.  */
-		  dst->symbol.value = src->u.syment.n_value;
-#else
-		  dst->symbol.value = (src->u.syment.n_value
-				       - dst->symbol.section->vma);
-#endif
-		}
-	      else
-		dst->symbol.value = src->u.syment.n_value;
-	      break;
-
-	    case C_MOS:	/* member of structure	 */
-	    case C_EOS:	/* end of structure		 */
-#ifdef NOTDEF			/* C_AUTOARG has the same value */
-#ifdef C_GLBLREG
-	    case C_GLBLREG:	/* A29k-specific storage class */
-#endif
-#endif
-	    case C_REGPARM:	/* register parameter		 */
-	    case C_REG:	/* register variable		 */
-#ifndef TIC80COFF
-#ifdef C_AUTOARG
-	    case C_AUTOARG:	/* 960-specific storage class */
-#endif
-#endif
-	    case C_TPDEF:	/* type definition		 */
-	    case C_ARG:
-	    case C_AUTO:	/* automatic variable */
-	    case C_FIELD:	/* bit field */
-	    case C_ENTAG:	/* enumeration tag		 */
-	    case C_MOE:	/* member of enumeration	 */
-	    case C_MOU:	/* member of union		 */
-	    case C_UNTAG:	/* union tag			 */
-	      dst->symbol.flags = BSF_DEBUGGING;
-	      dst->symbol.value = (src->u.syment.n_value);
-	      break;
-
-	    case C_FILE:	/* file name			 */
-	    case C_STRTAG:	/* structure tag		 */
-#ifdef RS6000COFF_C
-	    case C_GSYM:
-	    case C_LSYM:
-	    case C_PSYM:
-	    case C_RSYM:
-	    case C_RPSYM:
-	    case C_STSYM:
-	    case C_BCOMM:
-	    case C_ECOMM:
-	    case C_DECL:
-	    case C_ENTRY:
-	    case C_FUN:
-	    case C_ESTAT:
-#endif
-	      dst->symbol.flags = BSF_DEBUGGING;
-	      dst->symbol.value = (src->u.syment.n_value);
-	      break;
-
-#ifdef RS6000COFF_C
-	    case C_BINCL:	/* beginning of include file     */
-	    case C_EINCL:	/* ending of include file        */
-	      /* The value is actually a pointer into the line numbers
-                 of the file.  We locate the line number entry, and
-                 set the section to the section which contains it, and
-                 the value to the index in that section.  */
-	      {
-		asection *sec;
-
-		dst->symbol.flags = BSF_DEBUGGING;
-		for (sec = abfd->sections; sec != NULL; sec = sec->next)
-		  if (sec->line_filepos <= (file_ptr) src->u.syment.n_value
-		      && ((file_ptr) (sec->line_filepos
-				      + sec->lineno_count * LINESZ)
-			  > (file_ptr) src->u.syment.n_value))
-		    break;
-		if (sec == NULL)
-		  dst->symbol.value = 0;
-		else
-		  {
-		    dst->symbol.section = sec;
-		    dst->symbol.value = ((src->u.syment.n_value
-					  - sec->line_filepos)
-					 / LINESZ);
-		    src->fix_line = 1;
-		  }
-	      }
-	      break;
-
-	    case C_BSTAT:
-	      dst->symbol.flags = BSF_DEBUGGING;
-
-	      /* The value is actually a symbol index.  Save a pointer
-		 to the symbol instead of the index.  FIXME: This
-		 should use a union.  */
-	      src->u.syment.n_value =
-		(long) (native_symbols + src->u.syment.n_value);
-	      dst->symbol.value = src->u.syment.n_value;
-	      src->fix_value = 1;
-	      break;
-#endif
-
-	    case C_BLOCK:	/* ".bb" or ".eb"		 */
-	    case C_FCN:		/* ".bf" or ".ef"		 */
-	    case C_EFCN:	/* physical end of function	 */
-	      dst->symbol.flags = BSF_LOCAL;
-#if defined COFF_WITH_PE
-	      /* PE sets the symbol to a value relative to the start
-		 of the section.  */
-	      dst->symbol.value = src->u.syment.n_value;
-#else
-	      /* Base the value as an index from the base of the
-		 section.  */
-	      dst->symbol.value = (src->u.syment.n_value
-				   - dst->symbol.section->vma);
-#endif
-	      break;
-
-	    case C_NULL:
-	    case C_EXTDEF:	/* external definition		 */
-	    case C_ULABEL:	/* undefined label		 */
-	    case C_USTATIC:	/* undefined static		 */
-#ifndef COFF_WITH_PE
-            /* C_LINE in regular coff is 0x68.  NT has taken over this storage
-               class to represent a section symbol */
-	    case C_LINE:	/* line # reformatted as symbol table entry */
-	      /* NT uses 0x67 for a weak symbol, not C_ALIAS.  */
-	    case C_ALIAS:	/* duplicate tag		 */
-#endif
-	      /* New storage classes for TIc80 */
-#ifdef TIC80COFF
-	    case C_UEXT:	/* Tentative external definition */
-#endif
-	    case C_STATLAB:	/* Static load time label */
-	    case C_EXTLAB:	/* External load time label */
-	    case C_HIDDEN:	/* ext symbol in dmert public lib */
-	    default:
-	      (*_bfd_error_handler)
-		(_("%s: Unrecognized storage class %d for %s symbol `%s'"),
-		 bfd_get_filename (abfd), src->u.syment.n_sclass,
-		 dst->symbol.section->name, dst->symbol.name);
-	      dst->symbol.flags = BSF_DEBUGGING;
-	      dst->symbol.value = (src->u.syment.n_value);
-	      break;
-	    }
-
-/*      BFD_ASSERT(dst->symbol.flags != 0);*/
-
-	  dst->native = src;
-
-	  dst->symbol.udata.i = 0;
-	  dst->lineno = (alent *) NULL;
-	  this_index += (src->u.syment.n_numaux) + 1;
-	  dst++;
-	  number_of_symbols++;
-	}			/* walk the native symtab */
-    }				/* bfdize the native symtab */
-
-  obj_symbols (abfd) = cached_area;
-  obj_raw_syments (abfd) = native_symbols;
-
-  bfd_get_symcount (abfd) = number_of_symbols;
-  obj_convert (abfd) = table_ptr;
-  /* Slurp the line tables for each section too */
-  {
-    asection *p;
-    p = abfd->sections;
-    while (p)
-      {
-	coff_slurp_line_table (abfd, p);
-	p = p->next;
-      }
-  }
-  return true;
-}				/* coff_slurp_symbol_table() */
-
-/* Check whether a symbol is globally visible.  This is used by the
-   COFF backend linker code in cofflink.c, since a couple of targets
-   have globally visible symbols which are not class C_EXT.  This
-   function need not handle the case of n_class == C_EXT.  */
-
-#undef OTHER_GLOBAL_CLASS
-
-#ifdef I960
-#define OTHER_GLOBAL_CLASS C_LEAFEXT
-#endif
-
-#ifdef COFFARM
-#define OTHER_GLOBAL_CLASS C_THUMBEXT || syment->n_sclass == C_THUMBEXTFUNC
-#else
-#ifdef COFF_WITH_PE
-#define OTHER_GLOBAL_CLASS C_SECTION
-#endif
-#endif
-
-#ifdef OTHER_GLOBAL_CLASS
-
-static boolean coff_sym_is_global PARAMS ((bfd *, struct internal_syment *));
-
-static boolean
-coff_sym_is_global (abfd, syment)
-     bfd * abfd;
-     struct internal_syment * syment;
-{
-  return (syment->n_sclass == OTHER_GLOBAL_CLASS);
-}
-
-#undef OTHER_GLOBAL_CLASS
-
-#else /* ! defined (OTHER_GLOBAL_CLASS) */
-
-/* sym_is_global should not be defined if it has nothing to do.  */
-
-#define coff_sym_is_global 0
-
-#endif /* ! defined (OTHER_GLOBAL_CLASS) */
-
-/*
-SUBSUBSECTION
-	Reading relocations
-
-	Coff relocations are easily transformed into the internal BFD form
-	(@code{arelent}).
-
-	Reading a coff relocation table is done in the following stages:
-
-	o Read the entire coff relocation table into memory.
-
-	o Process each relocation in turn; first swap it from the
-	external to the internal form.
-
-	o Turn the symbol referenced in the relocation's symbol index
-	into a pointer into the canonical symbol table.
-	This table is the same as the one returned by a call to
-	@code{bfd_canonicalize_symtab}. The back end will call that
-	routine and save the result if a canonicalization hasn't been done.
-
-	o The reloc index is turned into a pointer to a howto
-	structure, in a back end specific way. For instance, the 386
-	and 960 use the @code{r_type} to directly produce an index
-	into a howto table vector; the 88k subtracts a number from the
-	@code{r_type} field and creates an addend field.
-
-
-*/
-
-#ifndef CALC_ADDEND
-#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)                \
-  {                                                             \
-    coff_symbol_type *coffsym = (coff_symbol_type *) NULL;      \
-    if (ptr && bfd_asymbol_bfd (ptr) != abfd)                   \
-      coffsym = (obj_symbols (abfd)                             \
-                 + (cache_ptr->sym_ptr_ptr - symbols));         \
-    else if (ptr)                                               \
-      coffsym = coff_symbol_from (abfd, ptr);                   \
-    if (coffsym != (coff_symbol_type *) NULL                    \
-        && coffsym->native->u.syment.n_scnum == 0)              \
-      cache_ptr->addend = 0;                                    \
-    else if (ptr && bfd_asymbol_bfd (ptr) == abfd               \
-             && ptr->section != (asection *) NULL)              \
-      cache_ptr->addend = - (ptr->section->vma + ptr->value);   \
-    else                                                        \
-      cache_ptr->addend = 0;                                    \
-  }
-#endif
-
-static boolean
-coff_slurp_reloc_table (abfd, asect, symbols)
-     bfd * abfd;
-     sec_ptr asect;
-     asymbol ** symbols;
-{
-  RELOC *native_relocs;
-  arelent *reloc_cache;
-  arelent *cache_ptr;
-
-  unsigned int idx;
-
-  if (asect->relocation)
-    return true;
-  if (asect->reloc_count == 0)
-    return true;
-  if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
-  if (!coff_slurp_symbol_table (abfd))
-    return false;
-  native_relocs =
-    (RELOC *) buy_and_read (abfd,
-			    asect->rel_filepos,
-			    SEEK_SET,
-			    (size_t) (RELSZ *
-				      asect->reloc_count));
-  reloc_cache = (arelent *)
-    bfd_alloc (abfd, (size_t) (asect->reloc_count * sizeof (arelent)));
-
-  if (reloc_cache == NULL)
-    return false;
-
-
-  for (idx = 0; idx < asect->reloc_count; idx++)
-    {
-      struct internal_reloc dst;
-      struct external_reloc *src;
-#ifndef RELOC_PROCESSING
-      asymbol *ptr;
-#endif
-
-      cache_ptr = reloc_cache + idx;
-      src = native_relocs + idx;
-
-      coff_swap_reloc_in (abfd, src, &dst);
-
-#ifdef RELOC_PROCESSING
-      RELOC_PROCESSING (cache_ptr, &dst, symbols, abfd, asect);
-#else
-      cache_ptr->address = dst.r_vaddr;
-
-      if (dst.r_symndx != -1)
-	{
-	  if (dst.r_symndx < 0 || dst.r_symndx >= obj_conv_table_size (abfd))
-	    {
-	      (*_bfd_error_handler)
-		(_("%s: warning: illegal symbol index %ld in relocs"),
-		 bfd_get_filename (abfd), dst.r_symndx);
-	      cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	      ptr = NULL;
-	    }
-	  else
-	    {
-	      cache_ptr->sym_ptr_ptr = (symbols
-					+ obj_convert (abfd)[dst.r_symndx]);
-	      ptr = *(cache_ptr->sym_ptr_ptr);
-	    }
-	}
-      else
-	{
-	  cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	  ptr = NULL;
-	}
-
-      /* The symbols definitions that we have read in have been
-	 relocated as if their sections started at 0. But the offsets
-	 refering to the symbols in the raw data have not been
-	 modified, so we have to have a negative addend to compensate.
-
-	 Note that symbols which used to be common must be left alone */
-
-      /* Calculate any reloc addend by looking at the symbol */
-      CALC_ADDEND (abfd, ptr, dst, cache_ptr);
-
-      cache_ptr->address -= asect->vma;
-/* !!     cache_ptr->section = (asection *) NULL;*/
-
-      /* Fill in the cache_ptr->howto field from dst.r_type */
-      RTYPE2HOWTO (cache_ptr, &dst);
-#endif	/* RELOC_PROCESSING */
-
-      if (cache_ptr->howto == NULL)
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: illegal relocation type %d at address 0x%lx"),
-	     bfd_get_filename (abfd), dst.r_type, (long) dst.r_vaddr);
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-    }
-
-  asect->relocation = reloc_cache;
-  return true;
-}
-
-#ifndef coff_rtype_to_howto
-#ifdef RTYPE2HOWTO
-
-/* Get the howto structure for a reloc.  This is only used if the file
-   including this one defines coff_relocate_section to be
-   _bfd_coff_generic_relocate_section, so it is OK if it does not
-   always work.  It is the responsibility of the including file to
-   make sure it is reasonable if it is needed.  */
-
-static reloc_howto_type *coff_rtype_to_howto
-  PARAMS ((bfd *, asection *, struct internal_reloc *,
-	   struct coff_link_hash_entry *, struct internal_syment *,
-	   bfd_vma *));
-
-/*ARGSUSED*/
-static reloc_howto_type *
-coff_rtype_to_howto (abfd, sec, rel, h, sym, addendp)
-     bfd *abfd;
-     asection *sec;
-     struct internal_reloc *rel;
-     struct coff_link_hash_entry *h;
-     struct internal_syment *sym;
-     bfd_vma *addendp;
-{
-  arelent genrel;
-
-  RTYPE2HOWTO (&genrel, rel);
-  return genrel.howto;
-}
-
-#else /* ! defined (RTYPE2HOWTO) */
-
-#define coff_rtype_to_howto NULL
-
-#endif /* ! defined (RTYPE2HOWTO) */
-#endif /* ! defined (coff_rtype_to_howto) */
-
-/* This is stupid.  This function should be a boolean predicate.  */
-static long
-coff_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd * abfd;
-     sec_ptr section;
-     arelent ** relptr;
-     asymbol ** symbols;
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count = 0;
-
-
-  if (section->flags & SEC_CONSTRUCTOR)
-    {
-      /* this section has relocs made up by us, they are not in the
-       file, so take them out of their chain and place them into
-       the data area provided */
-      arelent_chain *chain = section->constructor_chain;
-      for (count = 0; count < section->reloc_count; count++)
-	{
-	  *relptr++ = &chain->relent;
-	  chain = chain->next;
-	}
-
-    }
-  else
-    {
-      if (! coff_slurp_reloc_table (abfd, section, symbols))
-	return -1;
-
-      tblptr = section->relocation;
-
-      for (; count++ < section->reloc_count;)
-	*relptr++ = tblptr++;
-
-
-    }
-  *relptr = 0;
-  return section->reloc_count;
-}
-
-#ifdef GNU960
-file_ptr
-coff_sym_filepos (abfd)
-     bfd *abfd;
-{
-  return obj_sym_filepos (abfd);
-}
-#endif
-
-#ifndef coff_reloc16_estimate
-#define coff_reloc16_estimate dummy_reloc16_estimate
-
-static int dummy_reloc16_estimate
-  PARAMS ((bfd *, asection *, arelent *, unsigned int,
-	   struct bfd_link_info *));
-
-static int
-dummy_reloc16_estimate (abfd, input_section, reloc, shrink, link_info)
-     bfd *abfd;
-     asection *input_section;
-     arelent *reloc;
-     unsigned int shrink;
-     struct bfd_link_info *link_info;
-{
-  abort ();
-}
-
-#endif
-
-#ifndef coff_reloc16_extra_cases
-
-#define coff_reloc16_extra_cases dummy_reloc16_extra_cases
-
-/* This works even if abort is not declared in any header file.  */
-
-static void dummy_reloc16_extra_cases
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, arelent *,
-	   bfd_byte *, unsigned int *, unsigned int *));
-
-static void
-dummy_reloc16_extra_cases (abfd, link_info, link_order, reloc, data, src_ptr,
-			   dst_ptr)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     arelent *reloc;
-     bfd_byte *data;
-     unsigned int *src_ptr;
-     unsigned int *dst_ptr;
-{
-  abort ();
-}
-#endif
-
-/* If coff_relocate_section is defined, we can use the optimized COFF
-   backend linker.  Otherwise we must continue to use the old linker.  */
-#ifdef coff_relocate_section
-#ifndef coff_bfd_link_hash_table_create
-#define coff_bfd_link_hash_table_create _bfd_coff_link_hash_table_create
-#endif
-#ifndef coff_bfd_link_add_symbols
-#define coff_bfd_link_add_symbols _bfd_coff_link_add_symbols
-#endif
-#ifndef coff_bfd_final_link
-#define coff_bfd_final_link _bfd_coff_final_link
-#endif
-#else /* ! defined (coff_relocate_section) */
-#define coff_relocate_section NULL
-#ifndef coff_bfd_link_hash_table_create
-#define coff_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#endif
-#ifndef coff_bfd_link_add_symbols
-#define coff_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#endif
-#define coff_bfd_final_link _bfd_generic_final_link
-#endif /* ! defined (coff_relocate_section) */
-
-#define coff_bfd_link_split_section  _bfd_generic_link_split_section
-
-#ifndef coff_start_final_link
-#define coff_start_final_link NULL
-#endif
-
-#ifndef coff_adjust_symndx
-#define coff_adjust_symndx NULL
-#endif
-
-#ifndef coff_link_add_one_symbol
-#define coff_link_add_one_symbol _bfd_generic_link_add_one_symbol
-#endif
-
-#ifndef coff_link_output_has_begun
-
-static boolean coff_link_output_has_begun
-  PARAMS ((bfd *, struct coff_final_link_info *));
-
-static boolean
-coff_link_output_has_begun (abfd, info)
-     bfd * abfd;
-     struct coff_final_link_info * info;
-{
-  return abfd->output_has_begun;
-}
-#endif
-
-#ifndef coff_final_link_postscript
-
-static boolean coff_final_link_postscript
-  PARAMS ((bfd *, struct coff_final_link_info *));
-
-static boolean
-coff_final_link_postscript (abfd, pfinfo)
-     bfd * abfd;
-     struct coff_final_link_info * pfinfo;
-{
-  return true;
-}
-#endif
-
-#ifndef coff_SWAP_aux_in
-#define coff_SWAP_aux_in coff_swap_aux_in
-#endif
-#ifndef coff_SWAP_sym_in
-#define coff_SWAP_sym_in coff_swap_sym_in
-#endif
-#ifndef coff_SWAP_lineno_in
-#define coff_SWAP_lineno_in coff_swap_lineno_in
-#endif
-#ifndef coff_SWAP_aux_out
-#define coff_SWAP_aux_out coff_swap_aux_out
-#endif
-#ifndef coff_SWAP_sym_out
-#define coff_SWAP_sym_out coff_swap_sym_out
-#endif
-#ifndef coff_SWAP_lineno_out
-#define coff_SWAP_lineno_out coff_swap_lineno_out
-#endif
-#ifndef coff_SWAP_reloc_out
-#define coff_SWAP_reloc_out coff_swap_reloc_out
-#endif
-#ifndef coff_SWAP_filehdr_out
-#define coff_SWAP_filehdr_out coff_swap_filehdr_out
-#endif
-#ifndef coff_SWAP_aouthdr_out
-#define coff_SWAP_aouthdr_out coff_swap_aouthdr_out
-#endif
-#ifndef coff_SWAP_scnhdr_out
-#define coff_SWAP_scnhdr_out coff_swap_scnhdr_out
-#endif
-#ifndef coff_SWAP_reloc_in
-#define coff_SWAP_reloc_in coff_swap_reloc_in
-#endif
-#ifndef coff_SWAP_filehdr_in
-#define coff_SWAP_filehdr_in coff_swap_filehdr_in
-#endif
-#ifndef coff_SWAP_aouthdr_in
-#define coff_SWAP_aouthdr_in coff_swap_aouthdr_in
-#endif
-#ifndef coff_SWAP_scnhdr_in
-#define coff_SWAP_scnhdr_in coff_swap_scnhdr_in
-#endif
-
-
-
-static CONST bfd_coff_backend_data bfd_coff_std_swap_table =
-{
-  coff_SWAP_aux_in, coff_SWAP_sym_in, coff_SWAP_lineno_in,
-  coff_SWAP_aux_out, coff_SWAP_sym_out,
-  coff_SWAP_lineno_out, coff_SWAP_reloc_out,
-  coff_SWAP_filehdr_out, coff_SWAP_aouthdr_out,
-  coff_SWAP_scnhdr_out,
-  FILHSZ, AOUTSZ, SCNHSZ, SYMESZ, AUXESZ, RELSZ, LINESZ,
-#ifdef COFF_LONG_FILENAMES
-  true,
-#else
-  false,
-#endif
-#ifdef COFF_LONG_SECTION_NAMES
-  true,
-#else
-  false,
-#endif
-  COFF_DEFAULT_SECTION_ALIGNMENT_POWER,
-  coff_SWAP_filehdr_in, coff_SWAP_aouthdr_in, coff_SWAP_scnhdr_in,
-  coff_SWAP_reloc_in, coff_bad_format_hook, coff_set_arch_mach_hook,
-  coff_mkobject_hook, styp_to_sec_flags, coff_set_alignment_hook,
-  coff_slurp_symbol_table, symname_in_debug_hook, coff_pointerize_aux_hook,
-  coff_print_aux, coff_reloc16_extra_cases, coff_reloc16_estimate,
-  coff_sym_is_global, coff_compute_section_file_positions,
-  coff_start_final_link, coff_relocate_section, coff_rtype_to_howto,
-  coff_adjust_symndx, coff_link_add_one_symbol,
-  coff_link_output_has_begun, coff_final_link_postscript
-};
-
-#ifndef coff_close_and_cleanup
-#define	coff_close_and_cleanup              _bfd_generic_close_and_cleanup
-#endif
-
-#ifndef coff_bfd_free_cached_info
-#define coff_bfd_free_cached_info           _bfd_generic_bfd_free_cached_info
-#endif
-
-#ifndef coff_get_section_contents
-#define	coff_get_section_contents           _bfd_generic_get_section_contents
-#endif
-
-#ifndef coff_bfd_copy_private_symbol_data
-#define coff_bfd_copy_private_symbol_data   _bfd_generic_bfd_copy_private_symbol_data
-#endif
-
-#ifndef coff_bfd_copy_private_section_data
-#define coff_bfd_copy_private_section_data  _bfd_generic_bfd_copy_private_section_data
-#endif
-
-#ifndef coff_bfd_copy_private_bfd_data 
-#define coff_bfd_copy_private_bfd_data      _bfd_generic_bfd_copy_private_bfd_data
-#endif
-
-#ifndef coff_bfd_merge_private_bfd_data
-#define coff_bfd_merge_private_bfd_data     _bfd_generic_bfd_merge_private_bfd_data
-#endif
-
-#ifndef coff_bfd_set_private_flags
-#define coff_bfd_set_private_flags          _bfd_generic_bfd_set_private_flags
-#endif
-
-#ifndef coff_bfd_print_private_bfd_data 
-#define coff_bfd_print_private_bfd_data     _bfd_generic_bfd_print_private_bfd_data
-#endif
-
-#ifndef coff_bfd_is_local_label_name
-#define coff_bfd_is_local_label_name	    _bfd_coff_is_local_label_name
-#endif
-
-#ifndef coff_read_minisymbols
-#define coff_read_minisymbols		    _bfd_generic_read_minisymbols
-#endif
-
-#ifndef coff_minisymbol_to_symbol
-#define coff_minisymbol_to_symbol	    _bfd_generic_minisymbol_to_symbol
-#endif
-
-/* The reloc lookup routine must be supplied by each individual COFF
-   backend.  */
-#ifndef coff_bfd_reloc_type_lookup
-#define coff_bfd_reloc_type_lookup	    _bfd_norelocs_bfd_reloc_type_lookup
-#endif
-
-#ifndef coff_bfd_get_relocated_section_contents
-#define coff_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#endif
-
-#ifndef coff_bfd_relax_section
-#define coff_bfd_relax_section		    bfd_generic_relax_section
-#endif
-
-#ifndef coff_bfd_gc_sections
-#define coff_bfd_gc_sections		    bfd_generic_gc_sections
-#endif
diff --git a/bfd/coffgen.c b/bfd/coffgen.c
deleted file mode 100644
index df413833bd3..00000000000
--- a/bfd/coffgen.c
+++ /dev/null
@@ -1,2378 +0,0 @@
-/* Support for the generic parts of COFF, for BFD.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Most of this hacked by  Steve Chamberlain, sac@cygnus.com.
-   Split out of coffcode.h by Ian Taylor, ian@cygnus.com.  */
-
-/* This file contains COFF code that is not dependent on any
-   particular COFF target.  There is only one version of this file in
-   libbfd.a, so no target specific code may be put in here.  Or, to
-   put it another way,
-
-   ********** DO NOT PUT TARGET SPECIFIC CODE IN THIS FILE **********
-
-   If you need to add some target specific behaviour, add a new hook
-   function to bfd_coff_backend_data.
-
-   Some of these functions are also called by the ECOFF routines.
-   Those functions may not use any COFF specific information, such as
-   coff_data (abfd).  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-static void coff_fix_symbol_name
-  PARAMS ((bfd *, asymbol *, combined_entry_type *, bfd_size_type *,
-	   asection **, bfd_size_type *));
-static boolean coff_write_symbol
-  PARAMS ((bfd *, asymbol *, combined_entry_type *, unsigned int *,
-	   bfd_size_type *, asection **, bfd_size_type *));
-static boolean coff_write_alien_symbol
-  PARAMS ((bfd *, asymbol *, unsigned int *, bfd_size_type *,
-	   asection **, bfd_size_type *));
-static boolean coff_write_native_symbol
-  PARAMS ((bfd *, coff_symbol_type *, unsigned int *, bfd_size_type *,
-	   asection **, bfd_size_type *));
-static void coff_pointerize_aux
-  PARAMS ((bfd *, combined_entry_type *, combined_entry_type *,
-	   unsigned int, combined_entry_type *));
-static boolean make_a_section_from_file
-  PARAMS ((bfd *, struct internal_scnhdr *, unsigned int));
-static const bfd_target *coff_real_object_p
-  PARAMS ((bfd *, unsigned, struct internal_filehdr *, 
-	   struct internal_aouthdr *));
-static void fixup_symbol_value
-  PARAMS ((bfd *, coff_symbol_type *, struct internal_syment *));
-static char *build_debug_section
-  PARAMS ((bfd *));
-static char *copy_name
-  PARAMS ((bfd *, char *, int));
-
-#define STRING_SIZE_SIZE (4)
-
-/* Take a section header read from a coff file (in HOST byte order),
-   and make a BFD "section" out of it.  This is used by ECOFF.  */
-static boolean
-make_a_section_from_file (abfd, hdr, target_index)
-     bfd *abfd;
-     struct internal_scnhdr *hdr;
-     unsigned int target_index;
-{
-  asection *return_section;
-  char *name;
-
-  name = NULL;
-
-  /* Handle long section names as in PE.  */
-  if (bfd_coff_long_section_names (abfd)
-      && hdr->s_name[0] == '/')
-    {
-      char buf[SCNNMLEN];
-      long strindex;
-      char *p;
-      const char *strings;
-
-      memcpy (buf, hdr->s_name + 1, SCNNMLEN - 1);
-      buf[SCNNMLEN - 1] = '\0';
-      strindex = strtol (buf, &p, 10);
-      if (*p == '\0' && strindex >= 0)
-	{
-	  strings = _bfd_coff_read_string_table (abfd);
-	  if (strings == NULL)
-	    return false;
-	  /* FIXME: For extra safety, we should make sure that
-             strindex does not run us past the end, but right now we
-             don't know the length of the string table.  */
-	  strings += strindex;
-	  name = bfd_alloc (abfd, strlen (strings) + 1);
-	  if (name == NULL)
-	    return false;
-	  strcpy (name, strings);
-	}
-    }
-
-  if (name == NULL)
-    {
-      /* Assorted wastage to null-terminate the name, thanks AT&T! */
-      name = bfd_alloc (abfd, sizeof (hdr->s_name) + 1);
-      if (name == NULL)
-	return false;
-      strncpy (name, (char *) &hdr->s_name[0], sizeof (hdr->s_name));
-      name[sizeof (hdr->s_name)] = 0;
-    }
-
-  return_section = bfd_make_section_anyway (abfd, name);
-  if (return_section == NULL)
-    return false;
-
-  return_section->vma = hdr->s_vaddr;
-  return_section->lma = hdr->s_paddr;
-  return_section->_raw_size = hdr->s_size;
-  return_section->filepos = hdr->s_scnptr;
-  return_section->rel_filepos = hdr->s_relptr;
-  return_section->reloc_count = hdr->s_nreloc;
-
-  bfd_coff_set_alignment_hook (abfd, return_section, hdr);
-
-  return_section->line_filepos = hdr->s_lnnoptr;
-
-  return_section->lineno_count = hdr->s_nlnno;
-  return_section->userdata = NULL;
-  return_section->next = (asection *) NULL;
-  return_section->flags = bfd_coff_styp_to_sec_flags_hook (abfd, hdr, name);
-
-  return_section->target_index = target_index;
-
-  /* At least on i386-coff, the line number count for a shared library
-     section must be ignored.  */
-  if ((return_section->flags & SEC_COFF_SHARED_LIBRARY) != 0)
-    return_section->lineno_count = 0;
-
-  if (hdr->s_nreloc != 0)
-    return_section->flags |= SEC_RELOC;
-  /* FIXME: should this check 'hdr->s_size > 0' */
-  if (hdr->s_scnptr != 0)
-    return_section->flags |= SEC_HAS_CONTENTS;
-  return true;
-}
-
-/* Read in a COFF object and make it into a BFD.  This is used by
-   ECOFF as well.  */
-
-static const bfd_target *
-coff_real_object_p (abfd, nscns, internal_f, internal_a)
-     bfd *abfd;
-     unsigned nscns;
-     struct internal_filehdr *internal_f;
-     struct internal_aouthdr *internal_a;
-{
-  flagword oflags = abfd->flags;
-  bfd_vma ostart = bfd_get_start_address (abfd);
-  PTR tdata;
-  size_t readsize;		/* length of file_info */
-  unsigned int scnhsz;
-  char *external_sections;
-
-  if (!(internal_f->f_flags & F_RELFLG))
-    abfd->flags |= HAS_RELOC;
-  if ((internal_f->f_flags & F_EXEC))
-    abfd->flags |= EXEC_P;
-  if (!(internal_f->f_flags & F_LNNO))
-    abfd->flags |= HAS_LINENO;
-  if (!(internal_f->f_flags & F_LSYMS))
-    abfd->flags |= HAS_LOCALS;
-
-  /* FIXME: How can we set D_PAGED correctly?  */
-  if ((internal_f->f_flags & F_EXEC) != 0)
-    abfd->flags |= D_PAGED;
-
-  bfd_get_symcount (abfd) = internal_f->f_nsyms;
-  if (internal_f->f_nsyms)
-    abfd->flags |= HAS_SYMS;
-
-  if (internal_a != (struct internal_aouthdr *) NULL)
-    bfd_get_start_address (abfd) = internal_a->entry;
-  else
-    bfd_get_start_address (abfd) = 0;
-
-  /* Set up the tdata area.  ECOFF uses its own routine, and overrides
-     abfd->flags.  */
-  tdata = bfd_coff_mkobject_hook (abfd, (PTR) internal_f, (PTR) internal_a);
-  if (tdata == NULL)
-    return 0;
-
-  scnhsz = bfd_coff_scnhsz (abfd);
-  readsize = nscns * scnhsz;
-  external_sections = (char *) bfd_alloc (abfd, readsize);
-  if (!external_sections)
-    goto fail;
-
-  if (bfd_read ((PTR) external_sections, 1, readsize, abfd) != readsize)
-    goto fail;
-
-  /* Now copy data as required; construct all asections etc */
-  if (nscns != 0)
-    {
-      unsigned int i;
-      for (i = 0; i < nscns; i++)
-	{
-	  struct internal_scnhdr tmp;
-	  bfd_coff_swap_scnhdr_in (abfd,
-				   (PTR) (external_sections + i * scnhsz),
-				   (PTR) & tmp);
-	  if (! make_a_section_from_file (abfd, &tmp, i + 1))
-	    goto fail;
-	}
-    }
-
-  /*  make_abs_section (abfd); */
-
-  if (bfd_coff_set_arch_mach_hook (abfd, (PTR) internal_f) == false)
-    goto fail;
-
-  return abfd->xvec;
-
- fail:
-  bfd_release (abfd, tdata);
-  abfd->flags = oflags;
-  bfd_get_start_address (abfd) = ostart;
-  return (const bfd_target *) NULL;
-}
-
-/* Turn a COFF file into a BFD, but fail with bfd_error_wrong_format if it is
-   not a COFF file.  This is also used by ECOFF.  */
-
-const bfd_target *
-coff_object_p (abfd)
-     bfd *abfd;
-{
-  unsigned int filhsz;
-  unsigned int aoutsz;
-  int nscns;
-  PTR filehdr;
-  struct internal_filehdr internal_f;
-  struct internal_aouthdr internal_a;
-
-  /* figure out how much to read */
-  filhsz = bfd_coff_filhsz (abfd);
-  aoutsz = bfd_coff_aoutsz (abfd);
-
-  filehdr = bfd_alloc (abfd, filhsz);
-  if (filehdr == NULL)
-    return 0;
-  if (bfd_read (filehdr, 1, filhsz, abfd) != filhsz)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  bfd_coff_swap_filehdr_in (abfd, filehdr, &internal_f);
-  bfd_release (abfd, filehdr);
-
-  if (bfd_coff_bad_format_hook (abfd, &internal_f) == false)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  nscns = internal_f.f_nscns;
-
-  if (internal_f.f_opthdr)
-    {
-      PTR opthdr;
-
-      opthdr = bfd_alloc (abfd, aoutsz);
-      if (opthdr == NULL)
-	return 0;;
-      if (bfd_read (opthdr, 1, internal_f.f_opthdr, abfd)
-	  != internal_f.f_opthdr)
-	{
-	  return 0;
-	}
-      bfd_coff_swap_aouthdr_in (abfd, opthdr, (PTR) &internal_a);
-    }
-
-  return coff_real_object_p (abfd, nscns, &internal_f,
-			     (internal_f.f_opthdr != 0
-			      ? &internal_a
-			      : (struct internal_aouthdr *) NULL));
-}
-
-/* Get the BFD section from a COFF symbol section number.  */
-
-asection *
-coff_section_from_bfd_index (abfd, index)
-     bfd *abfd;
-     int index;
-{
-  struct sec *answer = abfd->sections;
-
-  if (index == N_ABS)
-    return bfd_abs_section_ptr;
-  if (index == N_UNDEF)
-    return bfd_und_section_ptr;
-  if (index == N_DEBUG)
-    return bfd_abs_section_ptr;
-
-  while (answer)
-    {
-      if (answer->target_index == index)
-	return answer;
-      answer = answer->next;
-    }
-
-  /* We should not reach this point, but the SCO 3.2v4 /lib/libc_s.a
-     has a bad symbol table in biglitpow.o.  */
-  return bfd_und_section_ptr;
-}
-
-/* Get the upper bound of a COFF symbol table.  */
-
-long
-coff_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  if (!bfd_coff_slurp_symbol_table (abfd))
-    return -1;
-
-  return (bfd_get_symcount (abfd) + 1) * (sizeof (coff_symbol_type *));
-}
-
-
-/* Canonicalize a COFF symbol table.  */
-
-long
-coff_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  unsigned int counter;
-  coff_symbol_type *symbase;
-  coff_symbol_type **location = (coff_symbol_type **) alocation;
-
-  if (!bfd_coff_slurp_symbol_table (abfd))
-    return -1;
-
-  symbase = obj_symbols (abfd);
-  counter = bfd_get_symcount (abfd);
-  while (counter-- > 0)
-    *location++ = symbase++;
-
-  *location = NULL;
-
-  return bfd_get_symcount (abfd);
-}
-
-/* Get the name of a symbol.  The caller must pass in a buffer of size
-   >= SYMNMLEN + 1.  */
-
-const char *
-_bfd_coff_internal_syment_name (abfd, sym, buf)
-     bfd *abfd;
-     const struct internal_syment *sym;
-     char *buf;
-{
-  /* FIXME: It's not clear this will work correctly if sizeof
-     (_n_zeroes) != 4.  */
-  if (sym->_n._n_n._n_zeroes != 0
-      || sym->_n._n_n._n_offset == 0)
-    {
-      memcpy (buf, sym->_n._n_name, SYMNMLEN);
-      buf[SYMNMLEN] = '\0';
-      return buf;
-    }
-  else
-    {
-      const char *strings;
-
-      BFD_ASSERT (sym->_n._n_n._n_offset >= STRING_SIZE_SIZE);
-      strings = obj_coff_strings (abfd);
-      if (strings == NULL)
-	{
-	  strings = _bfd_coff_read_string_table (abfd);
-	  if (strings == NULL)
-	    return NULL;
-	}
-      return strings + sym->_n._n_n._n_offset;
-    }
-}
-
-/* Read in and swap the relocs.  This returns a buffer holding the
-   relocs for section SEC in file ABFD.  If CACHE is true and
-   INTERNAL_RELOCS is NULL, the relocs read in will be saved in case
-   the function is called again.  If EXTERNAL_RELOCS is not NULL, it
-   is a buffer large enough to hold the unswapped relocs.  If
-   INTERNAL_RELOCS is not NULL, it is a buffer large enough to hold
-   the swapped relocs.  If REQUIRE_INTERNAL is true, then the return
-   value must be INTERNAL_RELOCS.  The function returns NULL on error.  */
-
-struct internal_reloc *
-_bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
-				require_internal, internal_relocs)
-     bfd *abfd;
-     asection *sec;
-     boolean cache;
-     bfd_byte *external_relocs;
-     boolean require_internal;
-     struct internal_reloc *internal_relocs;
-{
-  bfd_size_type relsz;
-  bfd_byte *free_external = NULL;
-  struct internal_reloc *free_internal = NULL;
-  bfd_byte *erel;
-  bfd_byte *erel_end;
-  struct internal_reloc *irel;
-
-  if (coff_section_data (abfd, sec) != NULL
-      && coff_section_data (abfd, sec)->relocs != NULL)
-    {
-      if (! require_internal)
-	return coff_section_data (abfd, sec)->relocs;
-      memcpy (internal_relocs, coff_section_data (abfd, sec)->relocs,
-	      sec->reloc_count * sizeof (struct internal_reloc));
-      return internal_relocs;
-    }
-
-  relsz = bfd_coff_relsz (abfd);
-
-  if (external_relocs == NULL)
-    {
-      free_external = (bfd_byte *) bfd_malloc (sec->reloc_count * relsz);
-      if (free_external == NULL && sec->reloc_count > 0)
-	goto error_return;
-      external_relocs = free_external;
-    }
-
-  if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
-      || (bfd_read (external_relocs, relsz, sec->reloc_count, abfd)
-	  != relsz * sec->reloc_count))
-    goto error_return;
-
-  if (internal_relocs == NULL)
-    {
-      free_internal = ((struct internal_reloc *)
-		       bfd_malloc (sec->reloc_count
-				   * sizeof (struct internal_reloc)));
-      if (free_internal == NULL && sec->reloc_count > 0)
-	goto error_return;
-      internal_relocs = free_internal;
-    }
-
-  /* Swap in the relocs.  */
-  erel = external_relocs;
-  erel_end = erel + relsz * sec->reloc_count;
-  irel = internal_relocs;
-  for (; erel < erel_end; erel += relsz, irel++)
-    bfd_coff_swap_reloc_in (abfd, (PTR) erel, (PTR) irel);
-
-  if (free_external != NULL)
-    {
-      free (free_external);
-      free_external = NULL;
-    }
-
-  if (cache && free_internal != NULL)
-    {
-      if (coff_section_data (abfd, sec) == NULL)
-	{
-	  sec->used_by_bfd =
-	    (PTR) bfd_zalloc (abfd,
-			      sizeof (struct coff_section_tdata));
-	  if (sec->used_by_bfd == NULL)
-	    goto error_return;
-	  coff_section_data (abfd, sec)->contents = NULL;
-	}
-      coff_section_data (abfd, sec)->relocs = free_internal;
-    }
-
-  return internal_relocs;
-
- error_return:
-  if (free_external != NULL)
-    free (free_external);
-  if (free_internal != NULL)
-    free (free_internal);
-  return NULL;
-}
-
-/* Set lineno_count for the output sections of a COFF file.  */
-
-int
-coff_count_linenumbers (abfd)
-     bfd *abfd;
-{
-  unsigned int limit = bfd_get_symcount (abfd);
-  unsigned int i;
-  int total = 0;
-  asymbol **p;
-  asection *s;
-
-  if (limit == 0)
-    {
-      /* This may be from the backend linker, in which case the
-         lineno_count in the sections is correct.  */
-      for (s = abfd->sections; s != NULL; s = s->next)
-	total += s->lineno_count;
-      return total;
-    }
-
-  for (s = abfd->sections; s != NULL; s = s->next)
-    BFD_ASSERT (s->lineno_count == 0);
-
-  for (p = abfd->outsymbols, i = 0; i < limit; i++, p++)
-    {
-      asymbol *q_maybe = *p;
-
-      if (bfd_asymbol_flavour (q_maybe) == bfd_target_coff_flavour)
-	{
-	  coff_symbol_type *q = coffsymbol (q_maybe);
-
-	  /* The AIX 4.1 compiler can sometimes generate line numbers
-             attached to debugging symbols.  We try to simply ignore
-             those here.  */
-	  if (q->lineno != NULL
-	      && q->symbol.section->owner != NULL)
-	    {
-	      /* This symbol has line numbers.  Increment the owning
-	         section's linenumber count.  */
-	      alent *l = q->lineno;
-
-	      ++q->symbol.section->output_section->lineno_count;
-	      ++total;
-	      ++l;
-	      while (l->line_number != 0)
-		{
-		  ++total;
-		  ++q->symbol.section->output_section->lineno_count;
-		  ++l;
-		}
-	    }
-	}
-    }
-
-  return total;
-}
-
-/* Takes a bfd and a symbol, returns a pointer to the coff specific
-   area of the symbol if there is one.  */
-
-/*ARGSUSED*/
-coff_symbol_type *
-coff_symbol_from (ignore_abfd, symbol)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-{
-  if (bfd_asymbol_flavour (symbol) != bfd_target_coff_flavour)
-    return (coff_symbol_type *) NULL;
-
-  if (bfd_asymbol_bfd (symbol)->tdata.coff_obj_data == (coff_data_type *) NULL)
-    return (coff_symbol_type *) NULL;
-
-  return (coff_symbol_type *) symbol;
-}
-
-static void
-fixup_symbol_value (abfd, coff_symbol_ptr, syment)
-     bfd *abfd;
-     coff_symbol_type *coff_symbol_ptr;
-     struct internal_syment *syment;
-{
-
-  /* Normalize the symbol flags */
-  if (bfd_is_com_section (coff_symbol_ptr->symbol.section))
-    {
-      /* a common symbol is undefined with a value */
-      syment->n_scnum = N_UNDEF;
-      syment->n_value = coff_symbol_ptr->symbol.value;
-    }
-  else if (coff_symbol_ptr->symbol.flags & BSF_DEBUGGING)
-    {
-      syment->n_value = coff_symbol_ptr->symbol.value;
-    }
-  else if (bfd_is_und_section (coff_symbol_ptr->symbol.section))
-    {
-      syment->n_scnum = N_UNDEF;
-      syment->n_value = 0;
-    }
-  else
-    {
-      if (coff_symbol_ptr->symbol.section)
-	{
-	  syment->n_scnum =
-	    coff_symbol_ptr->symbol.section->output_section->target_index;
-
-	  syment->n_value = (coff_symbol_ptr->symbol.value
-			     + coff_symbol_ptr->symbol.section->output_offset);
-	  if (! obj_pe (abfd))
-	    syment->n_value +=
-	      coff_symbol_ptr->symbol.section->output_section->vma;
-	}
-      else
-	{
-	  BFD_ASSERT (0);
-	  /* This can happen, but I don't know why yet (steve@cygnus.com) */
-	  syment->n_scnum = N_ABS;
-	  syment->n_value = coff_symbol_ptr->symbol.value;
-	}
-    }
-}
-
-/* Run through all the symbols in the symbol table and work out what
-   their indexes into the symbol table will be when output.
-
-   Coff requires that each C_FILE symbol points to the next one in the
-   chain, and that the last one points to the first external symbol. We
-   do that here too.  */
-
-boolean
-coff_renumber_symbols (bfd_ptr, first_undef)
-     bfd *bfd_ptr;
-     int *first_undef;
-{
-  unsigned int symbol_count = bfd_get_symcount (bfd_ptr);
-  asymbol **symbol_ptr_ptr = bfd_ptr->outsymbols;
-  unsigned int native_index = 0;
-  struct internal_syment *last_file = (struct internal_syment *) NULL;
-  unsigned int symbol_index;
-
-  /* COFF demands that undefined symbols come after all other symbols.
-     Since we don't need to impose this extra knowledge on all our
-     client programs, deal with that here.  Sort the symbol table;
-     just move the undefined symbols to the end, leaving the rest
-     alone.  The O'Reilly book says that defined global symbols come
-     at the end before the undefined symbols, so we do that here as
-     well.  */
-  /* @@ Do we have some condition we could test for, so we don't always
-     have to do this?  I don't think relocatability is quite right, but
-     I'm not certain.  [raeburn:19920508.1711EST]  */
-  {
-    asymbol **newsyms;
-    unsigned int i;
-
-    newsyms = (asymbol **) bfd_alloc (bfd_ptr,
-				      sizeof (asymbol *) * (symbol_count + 1));
-    if (!newsyms)
-      return false;
-    bfd_ptr->outsymbols = newsyms;
-    for (i = 0; i < symbol_count; i++)
-      if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) != 0
-	  || (!bfd_is_und_section (symbol_ptr_ptr[i]->section)
-	      && !bfd_is_com_section (symbol_ptr_ptr[i]->section)
-	      && ((symbol_ptr_ptr[i]->flags & BSF_FUNCTION) != 0
-		  || ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_WEAK))
-		      == 0))))
-	*newsyms++ = symbol_ptr_ptr[i];
-
-    for (i = 0; i < symbol_count; i++)
-      if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) == 0
-	  && !bfd_is_und_section (symbol_ptr_ptr[i]->section)
-	  && (bfd_is_com_section (symbol_ptr_ptr[i]->section)
-	      || ((symbol_ptr_ptr[i]->flags & BSF_FUNCTION) == 0
-		  && ((symbol_ptr_ptr[i]->flags & (BSF_GLOBAL | BSF_WEAK))
-		      != 0))))
-	*newsyms++ = symbol_ptr_ptr[i];
-
-    *first_undef = newsyms - bfd_ptr->outsymbols;
-
-    for (i = 0; i < symbol_count; i++)
-      if ((symbol_ptr_ptr[i]->flags & BSF_NOT_AT_END) == 0
-	  && bfd_is_und_section (symbol_ptr_ptr[i]->section))
-	*newsyms++ = symbol_ptr_ptr[i];
-    *newsyms = (asymbol *) NULL;
-    symbol_ptr_ptr = bfd_ptr->outsymbols;
-  }
-
-  for (symbol_index = 0; symbol_index < symbol_count; symbol_index++)
-    {
-      coff_symbol_type *coff_symbol_ptr = coff_symbol_from (bfd_ptr, symbol_ptr_ptr[symbol_index]);
-      symbol_ptr_ptr[symbol_index]->udata.i = symbol_index; 
-      if (coff_symbol_ptr && coff_symbol_ptr->native)
-	{
-	  combined_entry_type *s = coff_symbol_ptr->native;
-	  int i;
-
-	  if (s->u.syment.n_sclass == C_FILE)
-	    {
-	      if (last_file != (struct internal_syment *) NULL)
-		last_file->n_value = native_index;
-	      last_file = &(s->u.syment);
-	    }
-	  else
-	    {
-
-	      /* Modify the symbol values according to their section and
-	         type */
-
-	      fixup_symbol_value (bfd_ptr, coff_symbol_ptr, &(s->u.syment));
-	    }
-	  for (i = 0; i < s->u.syment.n_numaux + 1; i++)
-	    s[i].offset = native_index++;
-	}
-      else
-	{
-	  native_index++;
-	}
-    }
-  obj_conv_table_size (bfd_ptr) = native_index;
-
-  return true;
-}
-
-/* Run thorough the symbol table again, and fix it so that all
-   pointers to entries are changed to the entries' index in the output
-   symbol table.  */
-
-void
-coff_mangle_symbols (bfd_ptr)
-     bfd *bfd_ptr;
-{
-  unsigned int symbol_count = bfd_get_symcount (bfd_ptr);
-  asymbol **symbol_ptr_ptr = bfd_ptr->outsymbols;
-  unsigned int symbol_index;
-
-  for (symbol_index = 0; symbol_index < symbol_count; symbol_index++)
-    {
-      coff_symbol_type *coff_symbol_ptr =
-      coff_symbol_from (bfd_ptr, symbol_ptr_ptr[symbol_index]);
-
-      if (coff_symbol_ptr && coff_symbol_ptr->native)
-	{
-	  int i;
-	  combined_entry_type *s = coff_symbol_ptr->native;
-
-	  if (s->fix_value)
-	    {
-	      /* FIXME: We should use a union here.  */
-	      s->u.syment.n_value =
-		((combined_entry_type *) s->u.syment.n_value)->offset;
-	      s->fix_value = 0;
-	    }
-	  if (s->fix_line)
-	    {
-	      /* The value is the offset into the line number entries
-                 for the symbol's section.  On output, the symbol's
-                 section should be N_DEBUG.  */
-	      s->u.syment.n_value =
-		(coff_symbol_ptr->symbol.section->output_section->line_filepos
-		 + s->u.syment.n_value * bfd_coff_linesz (bfd_ptr));
-	      coff_symbol_ptr->symbol.section =
-		coff_section_from_bfd_index (bfd_ptr, N_DEBUG);
-	      BFD_ASSERT (coff_symbol_ptr->symbol.flags & BSF_DEBUGGING);
-	    }
-	  for (i = 0; i < s->u.syment.n_numaux; i++)
-	    {
-	      combined_entry_type *a = s + i + 1;
-	      if (a->fix_tag)
-		{
-		  a->u.auxent.x_sym.x_tagndx.l =
-		    a->u.auxent.x_sym.x_tagndx.p->offset;
-		  a->fix_tag = 0;
-		}
-	      if (a->fix_end)
-		{
-		  a->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l =
-		    a->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p->offset;
-		  a->fix_end = 0;
-		}
-	      if (a->fix_scnlen)
-		{
-		  a->u.auxent.x_csect.x_scnlen.l =
-		    a->u.auxent.x_csect.x_scnlen.p->offset;
-		  a->fix_scnlen = 0;
-		}
-	    }
-	}
-    }
-}
-
-static void
-coff_fix_symbol_name (abfd, symbol, native, string_size_p,
-		      debug_string_section_p, debug_string_size_p)
-     bfd *abfd;
-     asymbol *symbol;
-     combined_entry_type *native;
-     bfd_size_type *string_size_p;
-     asection **debug_string_section_p;
-     bfd_size_type *debug_string_size_p;
-{
-  unsigned int name_length;
-  union internal_auxent *auxent;
-  char *name = (char *) (symbol->name);
-
-  if (name == (char *) NULL)
-    {
-      /* coff symbols always have names, so we'll make one up */
-      symbol->name = "strange";
-      name = (char *) symbol->name;
-    }
-  name_length = strlen (name);
-
-  if (native->u.syment.n_sclass == C_FILE
-      && native->u.syment.n_numaux > 0)
-    {
-      strncpy (native->u.syment._n._n_name, ".file", SYMNMLEN);
-      auxent = &(native + 1)->u.auxent;
-
-      if (bfd_coff_long_filenames (abfd))
-	{
-	  if (name_length <= FILNMLEN)
-	    {
-	      strncpy (auxent->x_file.x_fname, name, FILNMLEN);
-	    }
-	  else
-	    {
-	      auxent->x_file.x_n.x_offset = *string_size_p + STRING_SIZE_SIZE;
-	      auxent->x_file.x_n.x_zeroes = 0;
-	      *string_size_p += name_length + 1;
-	    }
-	}
-      else
-	{
-	  strncpy (auxent->x_file.x_fname, name, FILNMLEN);
-	  if (name_length > FILNMLEN)
-	    {
-	      name[FILNMLEN] = '\0';
-	    }
-	}
-    }
-  else
-    {
-      if (name_length <= SYMNMLEN)
-	{
-	  /* This name will fit into the symbol neatly */
-	  strncpy (native->u.syment._n._n_name, symbol->name, SYMNMLEN);
-	}
-      else if (!bfd_coff_symname_in_debug (abfd, &native->u.syment))
-	{
-	  native->u.syment._n._n_n._n_offset = (*string_size_p
-						+ STRING_SIZE_SIZE);
-	  native->u.syment._n._n_n._n_zeroes = 0;
-	  *string_size_p += name_length + 1;
-	}
-      else
-	{
-	  long filepos;
-	  bfd_byte buf[2];
-
-	  /* This name should be written into the .debug section.  For
-	     some reason each name is preceded by a two byte length
-	     and also followed by a null byte.  FIXME: We assume that
-	     the .debug section has already been created, and that it
-	     is large enough.  */
-	  if (*debug_string_section_p == (asection *) NULL)
-	    *debug_string_section_p = bfd_get_section_by_name (abfd, ".debug");
-	  filepos = bfd_tell (abfd);
-	  bfd_put_16 (abfd, name_length + 1, buf);
-	  if (!bfd_set_section_contents (abfd,
-					 *debug_string_section_p,
-					 (PTR) buf,
-					 (file_ptr) *debug_string_size_p,
-					 (bfd_size_type) 2)
-	      || !bfd_set_section_contents (abfd,
-					    *debug_string_section_p,
-					    (PTR) symbol->name,
-					    ((file_ptr) *debug_string_size_p
-					     + 2),
-					    (bfd_size_type) name_length + 1))
-	    abort ();
-	  if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
-	    abort ();
-	  native->u.syment._n._n_n._n_offset = *debug_string_size_p + 2;
-	  native->u.syment._n._n_n._n_zeroes = 0;
-	  *debug_string_size_p += name_length + 3;
-	}
-    }
-}
-
-/* We need to keep track of the symbol index so that when we write out
-   the relocs we can get the index for a symbol.  This method is a
-   hack.  FIXME.  */
-
-#define set_index(symbol, idx)	((symbol)->udata.i = (idx))
-
-/* Write a symbol out to a COFF file.  */
-
-static boolean
-coff_write_symbol (abfd, symbol, native, written, string_size_p,
-		   debug_string_section_p, debug_string_size_p)
-     bfd *abfd;
-     asymbol *symbol;
-     combined_entry_type *native;
-     unsigned int *written;
-     bfd_size_type *string_size_p;
-     asection **debug_string_section_p;
-     bfd_size_type *debug_string_size_p;
-{
-  unsigned int numaux = native->u.syment.n_numaux;
-  int type = native->u.syment.n_type;
-  int class = native->u.syment.n_sclass;
-  PTR buf;
-  bfd_size_type symesz;
-
-  if (native->u.syment.n_sclass == C_FILE)
-    symbol->flags |= BSF_DEBUGGING;
-
-  if (symbol->flags & BSF_DEBUGGING
-      && bfd_is_abs_section (symbol->section))
-    {
-      native->u.syment.n_scnum = N_DEBUG;
-    }
-  else if (bfd_is_abs_section (symbol->section))
-    {
-      native->u.syment.n_scnum = N_ABS;
-    }
-  else if (bfd_is_und_section (symbol->section))
-    {
-      native->u.syment.n_scnum = N_UNDEF;
-    }
-  else
-    {
-      native->u.syment.n_scnum =
-	symbol->section->output_section->target_index;
-    }
-
-  coff_fix_symbol_name (abfd, symbol, native, string_size_p,
-			debug_string_section_p, debug_string_size_p);
-
-  symesz = bfd_coff_symesz (abfd);
-  buf = bfd_alloc (abfd, symesz);
-  if (!buf)
-    return false;
-  bfd_coff_swap_sym_out (abfd, &native->u.syment, buf);
-  if (bfd_write (buf, 1, symesz, abfd) != symesz)
-    return false;
-  bfd_release (abfd, buf);
-
-  if (native->u.syment.n_numaux > 0)
-    {
-      bfd_size_type auxesz;
-      unsigned int j;
-
-      auxesz = bfd_coff_auxesz (abfd);
-      buf = bfd_alloc (abfd, auxesz);
-      if (!buf)
-	return false;
-      for (j = 0; j < native->u.syment.n_numaux; j++)
-	{
-	  bfd_coff_swap_aux_out (abfd,
-				 &((native + j + 1)->u.auxent),
-				 type,
-				 class,
-				 j,
-				 native->u.syment.n_numaux,
-				 buf);
-	  if (bfd_write (buf, 1, auxesz, abfd) != auxesz)
-	    return false;
-	}
-      bfd_release (abfd, buf);
-    }
-
-  /* Store the index for use when we write out the relocs.  */
-  set_index (symbol, *written);
-
-  *written += numaux + 1;
-  return true;
-}
-
-/* Write out a symbol to a COFF file that does not come from a COFF
-   file originally.  This symbol may have been created by the linker,
-   or we may be linking a non COFF file to a COFF file.  */
-
-static boolean
-coff_write_alien_symbol (abfd, symbol, written, string_size_p,
-			 debug_string_section_p, debug_string_size_p)
-     bfd *abfd;
-     asymbol *symbol;
-     unsigned int *written;
-     bfd_size_type *string_size_p;
-     asection **debug_string_section_p;
-     bfd_size_type *debug_string_size_p;
-{
-  combined_entry_type *native;
-  combined_entry_type dummy;
-
-  native = &dummy;
-  native->u.syment.n_type = T_NULL;
-  native->u.syment.n_flags = 0;
-  if (bfd_is_und_section (symbol->section))
-    {
-      native->u.syment.n_scnum = N_UNDEF;
-      native->u.syment.n_value = symbol->value;
-    }
-  else if (bfd_is_com_section (symbol->section))
-    {
-      native->u.syment.n_scnum = N_UNDEF;
-      native->u.syment.n_value = symbol->value;
-    }
-  else if (symbol->flags & BSF_DEBUGGING)
-    {
-      /* There isn't much point to writing out a debugging symbol
-         unless we are prepared to convert it into COFF debugging
-         format.  So, we just ignore them.  We must clobber the symbol
-         name to keep it from being put in the string table.  */
-      symbol->name = "";
-      return true;
-    }
-  else
-    {
-      native->u.syment.n_scnum =
-	symbol->section->output_section->target_index;
-      native->u.syment.n_value = (symbol->value
-				  + symbol->section->output_offset);
-      if (! obj_pe (abfd))
-	native->u.syment.n_value += symbol->section->output_section->vma;
-
-      /* Copy the any flags from the the file header into the symbol.
-         FIXME: Why?  */
-      {
-	coff_symbol_type *c = coff_symbol_from (abfd, symbol);
-	if (c != (coff_symbol_type *) NULL)
-	  native->u.syment.n_flags = bfd_asymbol_bfd (&c->symbol)->flags;
-      }
-    }
-
-  native->u.syment.n_type = 0;
-  if (symbol->flags & BSF_LOCAL)
-    native->u.syment.n_sclass = C_STAT;
-  else if (symbol->flags & BSF_WEAK)
-    native->u.syment.n_sclass = obj_pe (abfd) ? C_NT_WEAK : C_WEAKEXT;
-  else
-    native->u.syment.n_sclass = C_EXT;
-  native->u.syment.n_numaux = 0;
-
-  return coff_write_symbol (abfd, symbol, native, written, string_size_p,
-			    debug_string_section_p, debug_string_size_p);
-}
-
-/* Write a native symbol to a COFF file.  */
-
-static boolean
-coff_write_native_symbol (abfd, symbol, written, string_size_p,
-			  debug_string_section_p, debug_string_size_p)
-     bfd *abfd;
-     coff_symbol_type *symbol;
-     unsigned int *written;
-     bfd_size_type *string_size_p;
-     asection **debug_string_section_p;
-     bfd_size_type *debug_string_size_p;
-{
-  combined_entry_type *native = symbol->native;
-  alent *lineno = symbol->lineno;
-
-  /* If this symbol has an associated line number, we must store the
-     symbol index in the line number field.  We also tag the auxent to
-     point to the right place in the lineno table.  */
-  if (lineno && !symbol->done_lineno && symbol->symbol.section->owner != NULL)
-    {
-      unsigned int count = 0;
-      lineno[count].u.offset = *written;
-      if (native->u.syment.n_numaux)
-	{
-	  union internal_auxent *a = &((native + 1)->u.auxent);
-
-	  a->x_sym.x_fcnary.x_fcn.x_lnnoptr =
-	    symbol->symbol.section->output_section->moving_line_filepos;
-	}
-
-      /* Count and relocate all other linenumbers.  */
-      count++;
-      while (lineno[count].line_number != 0)
-	{
-#if 0
-	  /* 13 april 92. sac 
-	     I've been told this, but still need proof:
-	     > The second bug is also in `bfd/coffcode.h'.  This bug
-	     > causes the linker to screw up the pc-relocations for
-	     > all the line numbers in COFF code.  This bug isn't only
-	     > specific to A29K implementations, but affects all
-	     > systems using COFF format binaries.  Note that in COFF
-	     > object files, the line number core offsets output by
-	     > the assembler are relative to the start of each
-	     > procedure, not to the start of the .text section.  This
-	     > patch relocates the line numbers relative to the
-	     > `native->u.syment.n_value' instead of the section
-	     > virtual address.
-	     > modular!olson@cs.arizona.edu (Jon Olson)
-	   */
-	  lineno[count].u.offset += native->u.syment.n_value;
-#else
-	  lineno[count].u.offset +=
-	    (symbol->symbol.section->output_section->vma
-	     + symbol->symbol.section->output_offset);
-#endif
-	  count++;
-	}
-      symbol->done_lineno = true;
-
-      symbol->symbol.section->output_section->moving_line_filepos +=
-	count * bfd_coff_linesz (abfd);
-    }
-
-  return coff_write_symbol (abfd, &(symbol->symbol), native, written,
-			    string_size_p, debug_string_section_p,
-			    debug_string_size_p);
-}
-
-/* Write out the COFF symbols.  */
-
-boolean
-coff_write_symbols (abfd)
-     bfd *abfd;
-{
-  bfd_size_type string_size;
-  asection *debug_string_section;
-  bfd_size_type debug_string_size;
-  unsigned int i;
-  unsigned int limit = bfd_get_symcount (abfd);
-  unsigned int written = 0;
-  asymbol **p;
-
-  string_size = 0;
-  debug_string_section = NULL;
-  debug_string_size = 0;
-
-  /* If this target supports long section names, they must be put into
-     the string table.  This is supported by PE.  This code must
-     handle section names just as they are handled in
-     coff_write_object_contents.  */
-  if (bfd_coff_long_section_names (abfd))
-    {
-      asection *o;
-
-      for (o = abfd->sections; o != NULL; o = o->next)
-	{
-	  size_t len;
-
-	  len = strlen (o->name);
-	  if (len > SCNNMLEN)
-	    string_size += len + 1;
-	}
-    }
-
-  /* Seek to the right place */
-  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0)
-    return false;
-
-  /* Output all the symbols we have */
-
-  written = 0;
-  for (p = abfd->outsymbols, i = 0; i < limit; i++, p++)
-    {
-      asymbol *symbol = *p;
-      coff_symbol_type *c_symbol = coff_symbol_from (abfd, symbol);
-
-      if (c_symbol == (coff_symbol_type *) NULL
-	  || c_symbol->native == (combined_entry_type *) NULL)
-	{
-	  if (!coff_write_alien_symbol (abfd, symbol, &written, &string_size,
-					&debug_string_section,
-					&debug_string_size))
-	    return false;
-	}
-      else
-	{
-	  if (!coff_write_native_symbol (abfd, c_symbol, &written,
-					 &string_size, &debug_string_section,
-					 &debug_string_size))
-	    return false;
-	}
-    }
-
-  obj_raw_syment_count (abfd) = written;
-
-  /* Now write out strings */
-
-  if (string_size != 0)
-    {
-      unsigned int size = string_size + STRING_SIZE_SIZE;
-      bfd_byte buffer[STRING_SIZE_SIZE];
-
-#if STRING_SIZE_SIZE == 4
-      bfd_h_put_32 (abfd, size, buffer);
-#else
- #error Change bfd_h_put_32
-#endif
-      if (bfd_write ((PTR) buffer, 1, sizeof (buffer), abfd) != sizeof (buffer))
-	return false;
-
-      /* Handle long section names.  This code must handle section
-	 names just as they are handled in coff_write_object_contents.  */
-      if (bfd_coff_long_section_names (abfd))
-	{
-	  asection *o;
-
-	  for (o = abfd->sections; o != NULL; o = o->next)
-	    {
-	      size_t len;
-
-	      len = strlen (o->name);
-	      if (len > SCNNMLEN)
-		{
-		  if (bfd_write (o->name, 1, len + 1, abfd) != len + 1)
-		    return false;
-		}
-	    }
-	}
-
-      for (p = abfd->outsymbols, i = 0;
-	   i < limit;
-	   i++, p++)
-	{
-	  asymbol *q = *p;
-	  size_t name_length = strlen (q->name);
-	  coff_symbol_type *c_symbol = coff_symbol_from (abfd, q);
-	  size_t maxlen;
-
-	  /* Figure out whether the symbol name should go in the string
-	     table.  Symbol names that are short enough are stored
-	     directly in the syment structure.  File names permit a
-	     different, longer, length in the syment structure.  On
-	     XCOFF, some symbol names are stored in the .debug section
-	     rather than in the string table.  */
-
-	  if (c_symbol == NULL
-	      || c_symbol->native == NULL)
-	    {
-	      /* This is not a COFF symbol, so it certainly is not a
-	         file name, nor does it go in the .debug section.  */
-	      maxlen = SYMNMLEN;
-	    }
-	  else if (bfd_coff_symname_in_debug (abfd,
-					      &c_symbol->native->u.syment))
-	    {
-	      /* This symbol name is in the XCOFF .debug section.
-	         Don't write it into the string table.  */
-	      maxlen = name_length;
-	    }
-	  else if (c_symbol->native->u.syment.n_sclass == C_FILE
-		   && c_symbol->native->u.syment.n_numaux > 0)
-	    maxlen = FILNMLEN;
-	  else
-	    maxlen = SYMNMLEN;
-
-	  if (name_length > maxlen)
-	    {
-	      if (bfd_write ((PTR) (q->name), 1, name_length + 1, abfd)
-		  != name_length + 1)
-		return false;
-	    }
-	}
-    }
-  else
-    {
-      /* We would normally not write anything here, but we'll write
-         out 4 so that any stupid coff reader which tries to read the
-         string table even when there isn't one won't croak.  */
-      unsigned int size = STRING_SIZE_SIZE;
-      bfd_byte buffer[STRING_SIZE_SIZE];
-
-#if STRING_SIZE_SIZE == 4
-      bfd_h_put_32 (abfd, size, buffer);
-#else
- #error Change bfd_h_put_32
-#endif
-      if (bfd_write ((PTR) buffer, 1, STRING_SIZE_SIZE, abfd)
-	  != STRING_SIZE_SIZE)
-	return false;
-    }
-
-  /* Make sure the .debug section was created to be the correct size.
-     We should create it ourselves on the fly, but we don't because
-     BFD won't let us write to any section until we know how large all
-     the sections are.  We could still do it by making another pass
-     over the symbols.  FIXME.  */
-  BFD_ASSERT (debug_string_size == 0
-	      || (debug_string_section != (asection *) NULL
-		  && (BFD_ALIGN (debug_string_size,
-				 1 << debug_string_section->alignment_power)
-		      == bfd_section_size (abfd, debug_string_section))));
-
-  return true;
-}
-
-boolean
-coff_write_linenumbers (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  bfd_size_type linesz;
-  PTR buff;
-
-  linesz = bfd_coff_linesz (abfd);
-  buff = bfd_alloc (abfd, linesz);
-  if (!buff)
-    return false;
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      if (s->lineno_count)
-	{
-	  asymbol **q = abfd->outsymbols;
-	  if (bfd_seek (abfd, s->line_filepos, SEEK_SET) != 0)
-	    return false;
-	  /* Find all the linenumbers in this section */
-	  while (*q)
-	    {
-	      asymbol *p = *q;
-	      if (p->section->output_section == s)
-		{
-		  alent *l =
-		  BFD_SEND (bfd_asymbol_bfd (p), _get_lineno,
-			    (bfd_asymbol_bfd (p), p));
-		  if (l)
-		    {
-		      /* Found a linenumber entry, output */
-		      struct internal_lineno out;
-		      memset ((PTR) & out, 0, sizeof (out));
-		      out.l_lnno = 0;
-		      out.l_addr.l_symndx = l->u.offset;
-		      bfd_coff_swap_lineno_out (abfd, &out, buff);
-		      if (bfd_write (buff, 1, linesz, abfd) != linesz)
-			return false;
-		      l++;
-		      while (l->line_number)
-			{
-			  out.l_lnno = l->line_number;
-			  out.l_addr.l_symndx = l->u.offset;
-			  bfd_coff_swap_lineno_out (abfd, &out, buff);
-			  if (bfd_write (buff, 1, linesz, abfd) != linesz)
-			    return false;
-			  l++;
-			}
-		    }
-		}
-	      q++;
-	    }
-	}
-    }
-  bfd_release (abfd, buff);
-  return true;
-}
-
-/*ARGSUSED */
-alent *
-coff_get_lineno (ignore_abfd, symbol)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-{
-  return coffsymbol (symbol)->lineno;
-}
-
-#if 0
-
-/* This is only called from coff_add_missing_symbols, which has been
-   disabled.  */
-
-asymbol *
-coff_section_symbol (abfd, name)
-     bfd *abfd;
-     char *name;
-{
-  asection *sec = bfd_make_section_old_way (abfd, name);
-  asymbol *sym;
-  combined_entry_type *csym;
-
-  sym = sec->symbol;
-  csym = coff_symbol_from (abfd, sym)->native;
-  /* Make sure back-end COFF stuff is there.  */
-  if (csym == 0)
-    {
-      struct foo
-	{
-	  coff_symbol_type sym;
-	  /* @@FIXME This shouldn't use a fixed size!!  */
-	  combined_entry_type e[10];
-	};
-      struct foo *f;
-      f = (struct foo *) bfd_alloc (abfd, sizeof (*f));
-      if (!f)
-	{
-	  bfd_set_error (bfd_error_no_error);
-	  return NULL;
-	}
-      memset ((char *) f, 0, sizeof (*f));
-      coff_symbol_from (abfd, sym)->native = csym = f->e;
-    }
-  csym[0].u.syment.n_sclass = C_STAT;
-  csym[0].u.syment.n_numaux = 1;
-/*  SF_SET_STATICS (sym);       @@ ??? */
-  csym[1].u.auxent.x_scn.x_scnlen = sec->_raw_size;
-  csym[1].u.auxent.x_scn.x_nreloc = sec->reloc_count;
-  csym[1].u.auxent.x_scn.x_nlinno = sec->lineno_count;
-
-  if (sec->output_section == NULL)
-    {
-      sec->output_section = sec;
-      sec->output_offset = 0;
-    }
-
-  return sym;
-}
-
-#endif /* 0 */
-
-/* This function transforms the offsets into the symbol table into
-   pointers to syments.  */
-
-static void
-coff_pointerize_aux (abfd, table_base, symbol, indaux, auxent)
-     bfd *abfd;
-     combined_entry_type *table_base;
-     combined_entry_type *symbol;
-     unsigned int indaux;
-     combined_entry_type *auxent;
-{
-  unsigned int type = symbol->u.syment.n_type;
-  unsigned int class = symbol->u.syment.n_sclass;
-
-  if (coff_backend_info (abfd)->_bfd_coff_pointerize_aux_hook)
-    {
-      if ((*coff_backend_info (abfd)->_bfd_coff_pointerize_aux_hook)
-	  (abfd, table_base, symbol, indaux, auxent))
-	return;
-    }
-
-  /* Don't bother if this is a file or a section */
-  if (class == C_STAT && type == T_NULL)
-    return;
-  if (class == C_FILE)
-    return;
-
-  /* Otherwise patch up */
-#define N_TMASK coff_data (abfd)->local_n_tmask
-#define N_BTSHFT coff_data (abfd)->local_n_btshft
-  if ((ISFCN (type) || ISTAG (class) || class == C_BLOCK || class == C_FCN)
-      && auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l > 0)
-    {
-      auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p =
-	table_base + auxent->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.l;
-      auxent->fix_end = 1;
-    }
-  /* A negative tagndx is meaningless, but the SCO 3.2v4 cc can
-     generate one, so we must be careful to ignore it.  */
-  if (auxent->u.auxent.x_sym.x_tagndx.l > 0)
-    {
-      auxent->u.auxent.x_sym.x_tagndx.p =
-	table_base + auxent->u.auxent.x_sym.x_tagndx.l;
-      auxent->fix_tag = 1;
-    }
-}
-
-/* Allocate space for the ".debug" section, and read it.
-   We did not read the debug section until now, because
-   we didn't want to go to the trouble until someone needed it. */
-
-static char *
-build_debug_section (abfd)
-     bfd *abfd;
-{
-  char *debug_section;
-  long position;
-
-  asection *sect = bfd_get_section_by_name (abfd, ".debug");
-
-  if (!sect)
-    {
-      bfd_set_error (bfd_error_no_debug_section);
-      return NULL;
-    }
-
-  debug_section = (PTR) bfd_alloc (abfd,
-				   bfd_get_section_size_before_reloc (sect));
-  if (debug_section == NULL)
-    return NULL;
-
-  /* Seek to the beginning of the `.debug' section and read it. 
-     Save the current position first; it is needed by our caller.
-     Then read debug section and reset the file pointer.  */
-
-  position = bfd_tell (abfd);
-  if (bfd_seek (abfd, sect->filepos, SEEK_SET) != 0
-      || (bfd_read (debug_section,
-		    bfd_get_section_size_before_reloc (sect), 1, abfd)
-	  != bfd_get_section_size_before_reloc (sect))
-      || bfd_seek (abfd, position, SEEK_SET) != 0)
-    return NULL;
-  return debug_section;
-}
-
-
-/* Return a pointer to a malloc'd copy of 'name'.  'name' may not be
-   \0-terminated, but will not exceed 'maxlen' characters.  The copy *will*
-   be \0-terminated.  */
-static char *
-copy_name (abfd, name, maxlen)
-     bfd *abfd;
-     char *name;
-     int maxlen;
-{
-  int len;
-  char *newname;
-
-  for (len = 0; len < maxlen; ++len)
-    {
-      if (name[len] == '\0')
-	{
-	  break;
-	}
-    }
-
-  if ((newname = (PTR) bfd_alloc (abfd, len + 1)) == NULL)
-    return (NULL);
-  strncpy (newname, name, len);
-  newname[len] = '\0';
-  return newname;
-}
-
-/* Read in the external symbols.  */
-
-boolean
-_bfd_coff_get_external_symbols (abfd)
-     bfd *abfd;
-{
-  bfd_size_type symesz;
-  size_t size;
-  PTR syms;
-
-  if (obj_coff_external_syms (abfd) != NULL)
-    return true;
-
-  symesz = bfd_coff_symesz (abfd);
-
-  size = obj_raw_syment_count (abfd) * symesz;
-
-  syms = (PTR) bfd_malloc (size);
-  if (syms == NULL && size != 0)
-    return false;
-
-  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
-      || bfd_read (syms, size, 1, abfd) != size)
-    {
-      if (syms != NULL)
-	free (syms);
-      return false;
-    }
-
-  obj_coff_external_syms (abfd) = syms;
-
-  return true;
-}
-
-/* Read in the external strings.  The strings are not loaded until
-   they are needed.  This is because we have no simple way of
-   detecting a missing string table in an archive.  */
-
-const char *
-_bfd_coff_read_string_table (abfd)
-     bfd *abfd;
-{
-  char extstrsize[STRING_SIZE_SIZE];
-  size_t strsize;
-  char *strings;
-
-  if (obj_coff_strings (abfd) != NULL)
-    return obj_coff_strings (abfd);
-
-  if (obj_sym_filepos (abfd) == 0)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return NULL;
-    }
-
-  if (bfd_seek (abfd,
-		(obj_sym_filepos (abfd)
-		 + obj_raw_syment_count (abfd) * bfd_coff_symesz (abfd)),
-		SEEK_SET) != 0)
-    return NULL;
-    
-  if (bfd_read (extstrsize, sizeof extstrsize, 1, abfd) != sizeof extstrsize)
-    {
-      if (bfd_get_error () != bfd_error_file_truncated)
-	return NULL;
-
-      /* There is no string table.  */
-      strsize = STRING_SIZE_SIZE;
-    }
-  else
-    {
-#if STRING_SIZE_SIZE == 4
-      strsize = bfd_h_get_32 (abfd, (bfd_byte *) extstrsize);
-#else
- #error Change bfd_h_get_32
-#endif
-    }
-
-  if (strsize < STRING_SIZE_SIZE)
-    {
-      (*_bfd_error_handler)
-	(_("%s: bad string table size %lu"), bfd_get_filename (abfd),
-	 (unsigned long) strsize);
-      bfd_set_error (bfd_error_bad_value);
-      return NULL;
-    }
-
-  strings = (char *) bfd_malloc (strsize);
-  if (strings == NULL)
-    return NULL;
-
-  if (bfd_read (strings + STRING_SIZE_SIZE,
-		strsize - STRING_SIZE_SIZE, 1, abfd)
-      != strsize - STRING_SIZE_SIZE)
-    {
-      free (strings);
-      return NULL;
-    }
-
-  obj_coff_strings (abfd) = strings;
-
-  return strings;
-}
-
-/* Free up the external symbols and strings read from a COFF file.  */
-
-boolean
-_bfd_coff_free_symbols (abfd)
-     bfd *abfd;
-{
-  if (obj_coff_external_syms (abfd) != NULL
-      && ! obj_coff_keep_syms (abfd))
-    {
-      free (obj_coff_external_syms (abfd));
-      obj_coff_external_syms (abfd) = NULL;
-    }
-  if (obj_coff_strings (abfd) != NULL
-      && ! obj_coff_keep_strings (abfd))
-    {
-      free (obj_coff_strings (abfd));
-      obj_coff_strings (abfd) = NULL;
-    }
-  return true;
-}
-
-/* Read a symbol table into freshly bfd_allocated memory, swap it, and
-   knit the symbol names into a normalized form.  By normalized here I
-   mean that all symbols have an n_offset pointer that points to a null-
-   terminated string.  */
-
-combined_entry_type *
-coff_get_normalized_symtab (abfd)
-     bfd *abfd;
-{
-  combined_entry_type *internal;
-  combined_entry_type *internal_ptr;
-  combined_entry_type *symbol_ptr;
-  combined_entry_type *internal_end;
-  bfd_size_type symesz;
-  char *raw_src;
-  char *raw_end;
-  const char *string_table = NULL;
-  char *debug_section = NULL;
-  unsigned long size;
-
-  if (obj_raw_syments (abfd) != NULL)
-    return obj_raw_syments (abfd);
-
-  size = obj_raw_syment_count (abfd) * sizeof (combined_entry_type);
-  internal = (combined_entry_type *) bfd_zalloc (abfd, size);
-  if (internal == NULL && size != 0)
-    return NULL;
-  internal_end = internal + obj_raw_syment_count (abfd);
-
-  if (! _bfd_coff_get_external_symbols (abfd))
-    return NULL;
-
-  raw_src = (char *) obj_coff_external_syms (abfd);
-
-  /* mark the end of the symbols */
-  symesz = bfd_coff_symesz (abfd);
-  raw_end = (char *) raw_src + obj_raw_syment_count (abfd) * symesz;
-
-  /* FIXME SOMEDAY.  A string table size of zero is very weird, but
-     probably possible.  If one shows up, it will probably kill us.  */
-
-  /* Swap all the raw entries */
-  for (internal_ptr = internal;
-       raw_src < raw_end;
-       raw_src += symesz, internal_ptr++)
-    {
-
-      unsigned int i;
-      bfd_coff_swap_sym_in (abfd, (PTR) raw_src,
-			    (PTR) & internal_ptr->u.syment);
-      symbol_ptr = internal_ptr;
-
-      for (i = 0;
-	   i < symbol_ptr->u.syment.n_numaux;
-	   i++)
-	{
-	  internal_ptr++;
-	  raw_src += symesz;
-	  bfd_coff_swap_aux_in (abfd, (PTR) raw_src,
-				symbol_ptr->u.syment.n_type,
-				symbol_ptr->u.syment.n_sclass,
-				i, symbol_ptr->u.syment.n_numaux,
-				&(internal_ptr->u.auxent));
-	  coff_pointerize_aux (abfd, internal, symbol_ptr, i,
-			       internal_ptr);
-	}
-    }
-
-  /* Free the raw symbols, but not the strings (if we have them).  */
-  obj_coff_keep_strings (abfd) = true;
-  if (! _bfd_coff_free_symbols (abfd))
-    return NULL;
-
-  for (internal_ptr = internal; internal_ptr < internal_end;
-       internal_ptr++)
-    {
-      if (internal_ptr->u.syment.n_sclass == C_FILE
-	  && internal_ptr->u.syment.n_numaux > 0)
-	{
-	  /* make a file symbol point to the name in the auxent, since
-	     the text ".file" is redundant */
-	  if ((internal_ptr + 1)->u.auxent.x_file.x_n.x_zeroes == 0)
-	    {
-	      /* the filename is a long one, point into the string table */
-	      if (string_table == NULL)
-		{
-		  string_table = _bfd_coff_read_string_table (abfd);
-		  if (string_table == NULL)
-		    return NULL;
-		}
-
-	      internal_ptr->u.syment._n._n_n._n_offset =
-		((long)
-		 (string_table
-		  + (internal_ptr + 1)->u.auxent.x_file.x_n.x_offset));
-	    }
-	  else
-	    {
-	      /* ordinary short filename, put into memory anyway */
-	      internal_ptr->u.syment._n._n_n._n_offset = (long)
-		copy_name (abfd, (internal_ptr + 1)->u.auxent.x_file.x_fname,
-			   FILNMLEN);
-	    }
-	}
-      else
-	{
-	  if (internal_ptr->u.syment._n._n_n._n_zeroes != 0)
-	    {
-	      /* This is a "short" name.  Make it long.  */
-	      unsigned long i = 0;
-	      char *newstring = NULL;
-
-	      /* find the length of this string without walking into memory
-	         that isn't ours.  */
-	      for (i = 0; i < 8; ++i)
-		{
-		  if (internal_ptr->u.syment._n._n_name[i] == '\0')
-		    {
-		      break;
-		    }		/* if end of string */
-		}		/* possible lengths of this string. */
-
-	      if ((newstring = (PTR) bfd_alloc (abfd, ++i)) == NULL)
-		return (NULL);
-	      memset (newstring, 0, i);
-	      strncpy (newstring, internal_ptr->u.syment._n._n_name, i - 1);
-	      internal_ptr->u.syment._n._n_n._n_offset = (long int) newstring;
-	      internal_ptr->u.syment._n._n_n._n_zeroes = 0;
-	    }
-	  else if (internal_ptr->u.syment._n._n_n._n_offset == 0)
-	    internal_ptr->u.syment._n._n_n._n_offset = (long int) "";
-	  else if (!bfd_coff_symname_in_debug (abfd, &internal_ptr->u.syment))
-	    {
-	      /* Long name already.  Point symbol at the string in the
-                 table.  */
-	      if (string_table == NULL)
-		{
-		  string_table = _bfd_coff_read_string_table (abfd);
-		  if (string_table == NULL)
-		    return NULL;
-		}
-	      internal_ptr->u.syment._n._n_n._n_offset =
-		((long int)
-		 (string_table
-		  + internal_ptr->u.syment._n._n_n._n_offset));
-	    }
-	  else
-	    {
-	      /* Long name in debug section.  Very similar.  */
-	      if (debug_section == NULL)
-		debug_section = build_debug_section (abfd);
-	      internal_ptr->u.syment._n._n_n._n_offset = (long int)
-		(debug_section + internal_ptr->u.syment._n._n_n._n_offset);
-	    }
-	}
-      internal_ptr += internal_ptr->u.syment.n_numaux;
-    }
-
-  obj_raw_syments (abfd) = internal;
-  BFD_ASSERT (obj_raw_syment_count (abfd)
-	      == (unsigned int) (internal_ptr - internal));
-
-  return (internal);
-}				/* coff_get_normalized_symtab() */
-
-long
-coff_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  if (bfd_get_format (abfd) != bfd_object)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-  return (asect->reloc_count + 1) * sizeof (arelent *);
-}
-
-asymbol *
-coff_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  coff_symbol_type *new = (coff_symbol_type *) bfd_alloc (abfd, sizeof (coff_symbol_type));
-  if (new == NULL)
-    return (NULL);
-  memset (new, 0, sizeof *new);
-  new->symbol.section = 0;
-  new->native = 0;
-  new->lineno = (alent *) NULL;
-  new->done_lineno = false;
-  new->symbol.the_bfd = abfd;
-  return &new->symbol;
-}
-
-/* Make a debugging symbol.  */
-
-asymbol *
-coff_bfd_make_debug_symbol (abfd, ptr, sz)
-     bfd *abfd;
-     PTR ptr;
-     unsigned long sz;
-{
-  coff_symbol_type *new = (coff_symbol_type *) bfd_alloc (abfd, sizeof (coff_symbol_type));
-  if (new == NULL)
-    return (NULL);
-  /* @@ The 10 is a guess at a plausible maximum number of aux entries
-     (but shouldn't be a constant).  */
-  new->native = (combined_entry_type *) bfd_zalloc (abfd, sizeof (combined_entry_type) * 10);
-  if (!new->native)
-    return (NULL);
-  new->symbol.section = bfd_abs_section_ptr;
-  new->symbol.flags = BSF_DEBUGGING;
-  new->lineno = (alent *) NULL;
-  new->done_lineno = false;
-  new->symbol.the_bfd = abfd;
-  return &new->symbol;
-}
-
-/*ARGSUSED */
-void
-coff_get_symbol_info (abfd, symbol, ret)
-     bfd *abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-  if (coffsymbol (symbol)->native != NULL
-      && coffsymbol (symbol)->native->fix_value)
-    {
-      combined_entry_type *psym;
-
-      psym = ((combined_entry_type *)
-	      coffsymbol (symbol)->native->u.syment.n_value);
-      ret->value = (bfd_vma) (psym - obj_raw_syments (abfd));
-    }
-}
-
-/* Return the COFF syment for a symbol.  */
-
-boolean
-bfd_coff_get_syment (abfd, symbol, psyment)
-     bfd *abfd;
-     asymbol *symbol;
-     struct internal_syment *psyment;
-{
-  coff_symbol_type *csym;
-
-  csym = coff_symbol_from (abfd, symbol);
-  if (csym == NULL || csym->native == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  *psyment = csym->native->u.syment;
-
-  if (csym->native->fix_value)
-    psyment->n_value = ((combined_entry_type *) psyment->n_value
-			- obj_raw_syments (abfd));
-
-  /* FIXME: We should handle fix_line here.  */
-
-  return true;
-}
-
-/* Return the COFF auxent for a symbol.  */
-
-boolean
-bfd_coff_get_auxent (abfd, symbol, indx, pauxent)
-     bfd *abfd;
-     asymbol *symbol;
-     int indx;
-     union internal_auxent *pauxent;
-{
-  coff_symbol_type *csym;
-  combined_entry_type *ent;
-
-  csym = coff_symbol_from (abfd, symbol);
-
-  if (csym == NULL
-      || csym->native == NULL
-      || indx >= csym->native->u.syment.n_numaux)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  ent = csym->native + indx + 1;
-
-  *pauxent = ent->u.auxent;
-
-  if (ent->fix_tag)
-    pauxent->x_sym.x_tagndx.l =
-      ((combined_entry_type *) pauxent->x_sym.x_tagndx.p
-       - obj_raw_syments (abfd));
-
-  if (ent->fix_end)
-    pauxent->x_sym.x_fcnary.x_fcn.x_endndx.l =
-      ((combined_entry_type *) pauxent->x_sym.x_fcnary.x_fcn.x_endndx.p
-       - obj_raw_syments (abfd));
-
-  if (ent->fix_scnlen)
-    pauxent->x_csect.x_scnlen.l =
-      ((combined_entry_type *) pauxent->x_csect.x_scnlen.p
-       - obj_raw_syments (abfd));
-
-  return true;
-}
-
-/* Print out information about COFF symbol.  */
-
-void
-coff_print_symbol (abfd, filep, symbol, how)
-     bfd *abfd;
-     PTR filep;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) filep;
-
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-
-    case bfd_print_symbol_more:
-      fprintf (file, "coff %s %s",
-	       coffsymbol (symbol)->native ? "n" : "g",
-	       coffsymbol (symbol)->lineno ? "l" : " ");
-      break;
-
-    case bfd_print_symbol_all:
-      if (coffsymbol (symbol)->native)
-	{
-	  unsigned long val;
-	  unsigned int aux;
-	  combined_entry_type *combined = coffsymbol (symbol)->native;
-	  combined_entry_type *root = obj_raw_syments (abfd);
-	  struct lineno_cache_entry *l = coffsymbol (symbol)->lineno;
-
-	  fprintf (file, "[%3ld]", (long) (combined - root));
-
-	  if (! combined->fix_value)
-	    val = (unsigned long) combined->u.syment.n_value;
-	  else
-	    val = ((unsigned long)
-		   ((combined_entry_type *) combined->u.syment.n_value
-		    - root));
-
-	  fprintf (file,
-		   "(sec %2d)(fl 0x%02x)(ty %3x)(scl %3d) (nx %d) 0x%08lx %s",
-		   combined->u.syment.n_scnum,
-		   combined->u.syment.n_flags,
-		   combined->u.syment.n_type,
-		   combined->u.syment.n_sclass,
-		   combined->u.syment.n_numaux,
-		   val,
-		   symbol->name);
-
-	  for (aux = 0; aux < combined->u.syment.n_numaux; aux++)
-	    {
-	      combined_entry_type *auxp = combined + aux + 1;
-	      long tagndx;
-
-	      if (auxp->fix_tag)
-		tagndx = auxp->u.auxent.x_sym.x_tagndx.p - root;
-	      else
-		tagndx = auxp->u.auxent.x_sym.x_tagndx.l;
-
-	      fprintf (file, "\n");
-
-	      if (bfd_coff_print_aux (abfd, file, root, combined, auxp, aux))
-		continue;
-
-	      switch (combined->u.syment.n_sclass)
-		{
-		case C_FILE:
-		  fprintf (file, "File ");
-		  break;
-
-		case C_STAT:
-		  if (combined->u.syment.n_type == T_NULL)
-		    /* probably a section symbol? */
-		    {
-		      fprintf (file, "AUX scnlen 0x%lx nreloc %d nlnno %d",
-			       (long) auxp->u.auxent.x_scn.x_scnlen,
-			       auxp->u.auxent.x_scn.x_nreloc,
-			       auxp->u.auxent.x_scn.x_nlinno);
-		      if (auxp->u.auxent.x_scn.x_checksum != 0
-			  || auxp->u.auxent.x_scn.x_associated != 0
-			  || auxp->u.auxent.x_scn.x_comdat != 0)
-			fprintf (file, " checksum 0x%lx assoc %d comdat %d",
-				 auxp->u.auxent.x_scn.x_checksum,
-				 auxp->u.auxent.x_scn.x_associated,
-				 auxp->u.auxent.x_scn.x_comdat);
-		      break;
-		    }
-		  /* else fall through */
-
-		default:
-		  fprintf (file, "AUX lnno %d size 0x%x tagndx %ld",
-			   auxp->u.auxent.x_sym.x_misc.x_lnsz.x_lnno,
-			   auxp->u.auxent.x_sym.x_misc.x_lnsz.x_size,
-			   tagndx);
-		  if (auxp->fix_end)
-		    fprintf (file, " endndx %ld",
-			     ((long)
-			      (auxp->u.auxent.x_sym.x_fcnary.x_fcn.x_endndx.p
-			       - root)));
-		  break;
-		}
-	    }
-
-	  if (l)
-	    {
-	      fprintf (file, "\n%s :", l->u.sym->name);
-	      l++;
-	      while (l->line_number)
-		{
-		  fprintf (file, "\n%4d : 0x%lx",
-			   l->line_number,
-			   ((unsigned long)
-			    (l->u.offset + symbol->section->vma)));
-		  l++;
-		}
-	    }
-	}
-      else
-	{
-	  bfd_print_symbol_vandf ((PTR) file, symbol);
-	  fprintf (file, " %-5s %s %s %s",
-		   symbol->section->name,
-		   coffsymbol (symbol)->native ? "n" : "g",
-		   coffsymbol (symbol)->lineno ? "l" : " ",
-		   symbol->name);
-	}
-    }
-}
-
-/* Return whether a symbol name implies a local symbol.  In COFF,
-   local symbols generally start with ``.L''.  Most targets use this
-   function for the is_local_label_name entry point, but some may
-   override it.  */
-
-boolean
-_bfd_coff_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return name[0] == '.' && name[1] == 'L';
-}
-
-/* Provided a BFD, a section and an offset into the section, calculate
-   and return the name of the source file and the line nearest to the
-   wanted location.  */
-
-/*ARGSUSED*/
-boolean
-coff_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
-			functionname_ptr, line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     CONST char **filename_ptr;
-     CONST char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  boolean found;
-  unsigned int i;
-  unsigned int line_base;
-  coff_data_type *cof = coff_data (abfd);
-  /* Run through the raw syments if available */
-  combined_entry_type *p;
-  combined_entry_type *pend;
-  alent *l;
-  struct coff_section_tdata *sec_data;
-
-  /* Before looking through the symbol table, try to use a .stab
-     section to find the information.  */
-  if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
-					     &found, filename_ptr,
-					     functionname_ptr, line_ptr,
-					     &coff_data (abfd)->line_info))
-    return false;
-  if (found)
-    return true;
-
-  *filename_ptr = 0;
-  *functionname_ptr = 0;
-  *line_ptr = 0;
-
-  /* Don't try and find line numbers in a non coff file */
-  if (abfd->xvec->flavour != bfd_target_coff_flavour)
-    return false;
-
-  if (cof == NULL)
-    return false;
-
-  /* Find the first C_FILE symbol.  */
-  p = cof->raw_syments;
-  if (!p)
-    return false;
-
-  pend = p + cof->raw_syment_count;
-  while (p < pend)
-    {
-      if (p->u.syment.n_sclass == C_FILE)
-	break;
-      p += 1 + p->u.syment.n_numaux;
-    }
-
-  if (p < pend)
-    {
-      bfd_vma sec_vma;
-      bfd_vma maxdiff;
-
-      /* Look through the C_FILE symbols to find the best one.  */
-      sec_vma = bfd_get_section_vma (abfd, section);
-      *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
-      maxdiff = (bfd_vma) 0 - (bfd_vma) 1;
-      while (1)
-	{
-	  combined_entry_type *p2;
-
-	  for (p2 = p + 1 + p->u.syment.n_numaux;
-	       p2 < pend;
-	       p2 += 1 + p2->u.syment.n_numaux)
-	    {
-	      if (p2->u.syment.n_scnum > 0
-		  && (section
-		      == coff_section_from_bfd_index (abfd,
-						      p2->u.syment.n_scnum)))
-		break;
-	      if (p2->u.syment.n_sclass == C_FILE)
-		{
-		  p2 = pend;
-		  break;
-		}
-	    }
-
-	  if (p2 < pend
-	      && offset + sec_vma >= (bfd_vma) p2->u.syment.n_value
-	      && offset + sec_vma - (bfd_vma) p2->u.syment.n_value < maxdiff)
-	    {
-	      *filename_ptr = (char *) p->u.syment._n._n_n._n_offset;
-	      maxdiff = offset + sec_vma - p2->u.syment.n_value;
-	    }
-
-	  /* Avoid endless loops on erroneous files by ensuring that
-	     we always move forward in the file.  */
-	  if (p - cof->raw_syments >= p->u.syment.n_value)
-	    break;
-
-	  p = cof->raw_syments + p->u.syment.n_value;
-	  if (p > pend || p->u.syment.n_sclass != C_FILE)
-	    break;
-	}
-    }
-
-  /* Now wander though the raw linenumbers of the section */
-  /* If we have been called on this section before, and the offset we
-     want is further down then we can prime the lookup loop.  */
-  sec_data = coff_section_data (abfd, section);
-  if (sec_data != NULL
-      && sec_data->i > 0
-      && offset >= sec_data->offset)
-    {
-      i = sec_data->i;
-      *functionname_ptr = sec_data->function;
-      line_base = sec_data->line_base;
-    }
-  else
-    {
-      i = 0;
-      line_base = 0;
-    }
-
-  if (section->lineno != NULL)
-    {
-      l = &section->lineno[i];
-
-      for (; i < section->lineno_count; i++)
-	{
-	  if (l->line_number == 0)
-	    {
-	      /* Get the symbol this line number points at */
-	      coff_symbol_type *coff = (coff_symbol_type *) (l->u.sym);
-	      if (coff->symbol.value > offset)
-		break;
-	      *functionname_ptr = coff->symbol.name;
-	      if (coff->native)
-		{
-		  combined_entry_type *s = coff->native;
-		  s = s + 1 + s->u.syment.n_numaux;
-
-		  /* In XCOFF a debugging symbol can follow the
-		     function symbol.  */
-		  if (s->u.syment.n_scnum == N_DEBUG)
-		    s = s + 1 + s->u.syment.n_numaux;
-
-		  /* S should now point to the .bf of the function.  */
-		  if (s->u.syment.n_numaux)
-		    {
-		      /* The linenumber is stored in the auxent.  */
-		      union internal_auxent *a = &((s + 1)->u.auxent);
-		      line_base = a->x_sym.x_misc.x_lnsz.x_lnno;
-		      *line_ptr = line_base;
-		    }
-		}
-	    }
-	  else
-	    {
-	      if (l->u.offset > offset)
-		break;
-	      *line_ptr = l->line_number + line_base - 1;
-	    }
-	  l++;
-	}
-    }
-
-  /* Cache the results for the next call.  */
-  if (sec_data == NULL && section->owner == abfd)
-    {
-      section->used_by_bfd =
-	((PTR) bfd_zalloc (abfd,
-			   sizeof (struct coff_section_tdata)));
-      sec_data = (struct coff_section_tdata *) section->used_by_bfd;
-    }
-  if (sec_data != NULL)
-    {
-      sec_data->offset = offset;
-      sec_data->i = i;
-      sec_data->function = *functionname_ptr;
-      sec_data->line_base = line_base;
-    }
-
-  return true;
-}
-
-int
-coff_sizeof_headers (abfd, reloc)
-     bfd *abfd;
-     boolean reloc;
-{
-  size_t size;
-
-  if (reloc == false)
-    {
-      size = bfd_coff_filhsz (abfd) + bfd_coff_aoutsz (abfd);
-    }
-  else
-    {
-      size = bfd_coff_filhsz (abfd);
-    }
-
-  size += abfd->section_count * bfd_coff_scnhsz (abfd);
-  return size;
-}
-
-/* Change the class of a coff symbol held by BFD.  */
-boolean
-bfd_coff_set_symbol_class (abfd, symbol, class)
-     bfd *         abfd;
-     asymbol *     symbol;
-     unsigned int  class;
-{
-  coff_symbol_type * csym;
-
-  csym = coff_symbol_from (abfd, symbol);
-  if (csym == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-  else if (csym->native == NULL)
-    {
-      /* This is an alien symbol which no native coff backend data.
-	 We cheat here by creating a fake native entry for it and
-	 then filling in the class.  This code is based on that in
-	 coff_write_alien_symbol().  */
-      
-      combined_entry_type * native;
-
-      native = (combined_entry_type *) bfd_alloc (abfd, sizeof (* native));
-      if (native == NULL)
-	return false;
-
-      memset (native, 0, sizeof (* native));
-      
-      native->u.syment.n_type   = T_NULL;
-      native->u.syment.n_sclass = class;
-      
-      if (bfd_is_und_section (symbol->section))
-	{
-	  native->u.syment.n_scnum = N_UNDEF;
-	  native->u.syment.n_value = symbol->value;
-	}
-      else if (bfd_is_com_section (symbol->section))
-	{
-	  native->u.syment.n_scnum = N_UNDEF;
-	  native->u.syment.n_value = symbol->value;
-	}
-      else
-	{
-	  native->u.syment.n_scnum =
-	    symbol->section->output_section->target_index;
-	  native->u.syment.n_value = (symbol->value
-				      + symbol->section->output_offset);
-	  if (! obj_pe (abfd))
-	    native->u.syment.n_value += symbol->section->output_section->vma;
-	  
-	  /* Copy the any flags from the the file header into the symbol.
-	     FIXME: Why?  */
-	  native->u.syment.n_flags = bfd_asymbol_bfd (& csym->symbol)->flags;
-	}
-      
-      csym->native = native;
-    }
-  else
-    {
-      csym->native->u.syment.n_sclass = class;
-    }
-  
-  return true;
-}
-
diff --git a/bfd/cofflink.c b/bfd/cofflink.c
deleted file mode 100644
index cf56869fe65..00000000000
--- a/bfd/cofflink.c
+++ /dev/null
@@ -1,2752 +0,0 @@
-/* COFF specific linker code.
-   Copyright 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file contains the COFF backend linker code.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-static boolean coff_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean coff_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean coff_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean coff_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
-static char *dores_com PARAMS ((char *, bfd *, int));
-static char *get_name PARAMS ((char *, char **));
-static int process_embedded_commands
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *));
-static void mark_relocs PARAMS ((struct coff_final_link_info *, bfd *));
-
-/* Create an entry in a COFF linker hash table.  */
-
-struct bfd_hash_entry *
-_bfd_coff_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct coff_link_hash_entry *ret = (struct coff_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct coff_link_hash_entry *) NULL)
-    ret = ((struct coff_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct coff_link_hash_entry)));
-  if (ret == (struct coff_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct coff_link_hash_entry *)
-	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				 table, string));
-  if (ret != (struct coff_link_hash_entry *) NULL)
-    {
-      /* Set local fields.  */
-      ret->indx = -1;
-      ret->type = T_NULL;
-      ret->class = C_NULL;
-      ret->numaux = 0;
-      ret->auxbfd = NULL;
-      ret->aux = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize a COFF linker hash table.  */
-
-boolean
-_bfd_coff_link_hash_table_init (table, abfd, newfunc)
-     struct coff_link_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  table->stab_info = NULL;
-  return _bfd_link_hash_table_init (&table->root, abfd, newfunc);
-}
-
-/* Create a COFF linker hash table.  */
-
-struct bfd_link_hash_table *
-_bfd_coff_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct coff_link_hash_table *ret;
-
-  ret = ((struct coff_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct coff_link_hash_table)));
-  if (ret == NULL)
-    return NULL;
-  if (! _bfd_coff_link_hash_table_init (ret, abfd,
-					_bfd_coff_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-  return &ret->root;
-}
-
-/* Create an entry in a COFF debug merge hash table.  */
-
-struct bfd_hash_entry *
-_bfd_coff_debug_merge_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct coff_debug_merge_hash_entry *ret =
-    (struct coff_debug_merge_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct coff_debug_merge_hash_entry *) NULL)
-    ret = ((struct coff_debug_merge_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct coff_debug_merge_hash_entry)));
-  if (ret == (struct coff_debug_merge_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct coff_debug_merge_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-  if (ret != (struct coff_debug_merge_hash_entry *) NULL)
-    {
-      /* Set local fields.  */
-      ret->types = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Given a COFF BFD, add symbols to the global hash table as
-   appropriate.  */
-
-boolean
-_bfd_coff_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      return coff_link_add_object_symbols (abfd, info);
-    case bfd_archive:
-      return (_bfd_generic_link_add_archive_symbols
-	      (abfd, info, coff_link_check_archive_element));
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-}
-
-/* Add symbols from a COFF object file.  */
-
-static boolean
-coff_link_add_object_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
-  if (! coff_link_add_symbols (abfd, info))
-    return false;
-
-  if (! info->keep_memory)
-    {
-      if (! _bfd_coff_free_symbols (abfd))
-	return false;
-    }
-  return true;
-}
-
-/* Check a single archive element to see if we need to include it in
-   the link.  *PNEEDED is set according to whether this element is
-   needed in the link or not.  This is called via
-   _bfd_generic_link_add_archive_symbols.  */
-
-static boolean
-coff_link_check_archive_element (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
-
-  if (! coff_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
-
-  if (*pneeded)
-    {
-      if (! coff_link_add_symbols (abfd, info))
-	return false;
-    }
-
-  if (! info->keep_memory || ! *pneeded)
-    {
-      if (! _bfd_coff_free_symbols (abfd))
-	return false;
-    }
-
-  return true;
-}
-
-/* Look through the symbols to see if this object file should be
-   included in the link.  */
-
-static boolean
-coff_link_check_ar_symbols (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  boolean (*sym_is_global) PARAMS ((bfd *, struct internal_syment *));
-  bfd_size_type symesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-
-  *pneeded = false;
-
-  sym_is_global = coff_backend_info (abfd)->_bfd_coff_sym_is_global;
-
-  symesz = bfd_coff_symesz (abfd);
-  esym = (bfd_byte *) obj_coff_external_syms (abfd);
-  esym_end = esym + obj_raw_syment_count (abfd) * symesz;
-  while (esym < esym_end)
-    {
-      struct internal_syment sym;
-
-      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym);
-
-      if ((sym.n_sclass == C_EXT
-	   || sym.n_sclass == C_WEAKEXT
-	   || (obj_pe (abfd) && sym.n_sclass == C_NT_WEAK)
-#ifdef C_SYSTEM
-	   || sym.n_sclass == C_SYSTEM
-#endif
-	   || (sym_is_global && (*sym_is_global) (abfd, &sym)))
-	  && (sym.n_scnum != 0 || sym.n_value != 0))
-	{
-	  const char *name;
-	  char buf[SYMNMLEN + 1];
-	  struct bfd_link_hash_entry *h;
-
-	  /* This symbol is externally visible, and is defined by this
-             object file.  */
-
-	  name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
-	  if (name == NULL)
-	    return false;
-	  h = bfd_link_hash_lookup (info->hash, name, false, false, true);
-
-	  /* We are only interested in symbols that are currently
-	     undefined.  If a symbol is currently known to be common,
-	     COFF linkers do not bring in an object file which defines
-	     it.  */
-	  if (h != (struct bfd_link_hash_entry *) NULL
-	      && h->type == bfd_link_hash_undefined)
-	    {
-	      if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-		return false;
-	      *pneeded = true;
-	      return true;
-	    }
-	}
-
-      esym += (sym.n_numaux + 1) * symesz;
-    }
-
-  /* We do not need this object file.  */
-  return true;
-}
-
-/* Add all the symbols from an object file to the hash table.  */
-
-static boolean
-coff_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  boolean (*sym_is_global) PARAMS ((bfd *, struct internal_syment *));
-  boolean keep_syms;
-  boolean default_copy;
-  bfd_size_type symcount;
-  struct coff_link_hash_entry **sym_hash;
-  bfd_size_type symesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-
-  /* Keep the symbols during this function, in case the linker needs
-     to read the generic symbols in order to report an error message.  */
-  keep_syms = obj_coff_keep_syms (abfd);
-  obj_coff_keep_syms (abfd) = true;
-
-  sym_is_global = coff_backend_info (abfd)->_bfd_coff_sym_is_global;
-
-  if (info->keep_memory)
-    default_copy = false;
-  else
-    default_copy = true;
-
-  symcount = obj_raw_syment_count (abfd);
-
-  /* We keep a list of the linker hash table entries that correspond
-     to particular symbols.  */
-  sym_hash = ((struct coff_link_hash_entry **)
-	      bfd_alloc (abfd,
-			 ((size_t) symcount
-			  * sizeof (struct coff_link_hash_entry *))));
-  if (sym_hash == NULL && symcount != 0)
-    goto error_return;
-  obj_coff_sym_hashes (abfd) = sym_hash;
-  memset (sym_hash, 0,
-	  (size_t) symcount * sizeof (struct coff_link_hash_entry *));
-
-  symesz = bfd_coff_symesz (abfd);
-  BFD_ASSERT (symesz == bfd_coff_auxesz (abfd));
-  esym = (bfd_byte *) obj_coff_external_syms (abfd);
-  esym_end = esym + symcount * symesz;
-  while (esym < esym_end)
-    {
-      struct internal_syment sym;
-      boolean copy;
-
-      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym);
-
-      if (sym.n_sclass == C_EXT
-	   || sym.n_sclass == C_WEAKEXT
-	   || (obj_pe (abfd) && sym.n_sclass == C_NT_WEAK)
-#ifdef C_SYSTEM
-	  || sym.n_sclass == C_SYSTEM
-#endif
-	  || (sym_is_global && (*sym_is_global) (abfd, &sym)))
-	{
-	  const char *name;
-	  char buf[SYMNMLEN + 1];
-	  flagword flags;
-	  asection *section;
-	  bfd_vma value;
-
-	  /* This symbol is externally visible.  */
-
-	  name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
-	  if (name == NULL)
-	    goto error_return;
-
-	  /* We must copy the name into memory if we got it from the
-             syment itself, rather than the string table.  */
-	  copy = default_copy;
-	  if (sym._n._n_n._n_zeroes != 0
-	      || sym._n._n_n._n_offset == 0)
-	    copy = true;
-
-	  value = sym.n_value;
-
-	  if (sym.n_scnum == 0)
-	    {
-	      if (value == 0)
-		{
-		  flags = 0;
-		  section = bfd_und_section_ptr;
-		}
-	      else
-		{
-		  flags = BSF_GLOBAL;
-		  section = bfd_com_section_ptr;
-		}
-	    }
-	  else
-	    {
-	      flags = BSF_EXPORT | BSF_GLOBAL;
-	      section = coff_section_from_bfd_index (abfd, sym.n_scnum);
-	      if (! obj_pe (abfd))
-		value -= section->vma;
-	    }
-
-	  if (sym.n_sclass == C_WEAKEXT
-	      || (obj_pe (abfd) && sym.n_sclass == C_NT_WEAK))
-	    flags = BSF_WEAK;
-
-	  if (! (bfd_coff_link_add_one_symbol
-		 (info, abfd, name, flags, section, value,
-		  (const char *) NULL, copy, false,
-		  (struct bfd_link_hash_entry **) sym_hash)))
-	    goto error_return;
-
-	  if (section == bfd_com_section_ptr
-	      && (*sym_hash)->root.type == bfd_link_hash_common
-	      && ((*sym_hash)->root.u.c.p->alignment_power
-		  > bfd_coff_default_section_alignment_power (abfd)))
-	    (*sym_hash)->root.u.c.p->alignment_power
-	      = bfd_coff_default_section_alignment_power (abfd);
-
-	  if (info->hash->creator->flavour == bfd_get_flavour (abfd))
-	    {
-	      if (((*sym_hash)->class == C_NULL
-		   && (*sym_hash)->type == T_NULL)
-		  || sym.n_scnum != 0
-		  || (sym.n_value != 0
-		      && (*sym_hash)->root.type != bfd_link_hash_defined
-		      && (*sym_hash)->root.type != bfd_link_hash_defweak))
-		{
-		  (*sym_hash)->class = sym.n_sclass;
-		  if (sym.n_type != T_NULL)
-		    {
-		      if ((*sym_hash)->type != T_NULL
-			  && (*sym_hash)->type != sym.n_type)
-			(*_bfd_error_handler)
-			  (_("Warning: type of symbol `%s' changed from %d to %d in %s"),
-			   name, (*sym_hash)->type, sym.n_type,
-			   bfd_get_filename (abfd));
-		      (*sym_hash)->type = sym.n_type;
-		    }
-		  (*sym_hash)->auxbfd = abfd;
-		  if (sym.n_numaux != 0)
-		    {
-		      union internal_auxent *alloc;
-		      unsigned int i;
-		      bfd_byte *eaux;
-		      union internal_auxent *iaux;
-
-		      (*sym_hash)->numaux = sym.n_numaux;
-		      alloc = ((union internal_auxent *)
-			       bfd_hash_allocate (&info->hash->table,
-						  (sym.n_numaux
-						   * sizeof (*alloc))));
-		      if (alloc == NULL)
-			goto error_return;
-		      for (i = 0, eaux = esym + symesz, iaux = alloc;
-			   i < sym.n_numaux;
-			   i++, eaux += symesz, iaux++)
-			bfd_coff_swap_aux_in (abfd, (PTR) eaux, sym.n_type,
-					      sym.n_sclass, i, sym.n_numaux,
-					      (PTR) iaux);
-		      (*sym_hash)->aux = alloc;
-		    }
-		}
-	    }
-	}
-
-      esym += (sym.n_numaux + 1) * symesz;
-      sym_hash += sym.n_numaux + 1;
-    }
-
-  /* If this is a non-traditional, non-relocateable link, try to
-     optimize the handling of any .stab/.stabstr sections.  */
-  if (! info->relocateable
-      && ! info->traditional_format
-      && info->hash->creator->flavour == bfd_get_flavour (abfd)
-      && (info->strip != strip_all && info->strip != strip_debugger))
-    {
-      asection *stab, *stabstr;
-
-      stab = bfd_get_section_by_name (abfd, ".stab");
-      if (stab != NULL)
-	{
-	  stabstr = bfd_get_section_by_name (abfd, ".stabstr");
-
-	  if (stabstr != NULL)
-	    {
-	      struct coff_link_hash_table *table;
-	      struct coff_section_tdata *secdata;
-
-	      secdata = coff_section_data (abfd, stab);
-	      if (secdata == NULL)
-		{
-		  stab->used_by_bfd =
-		    (PTR) bfd_zalloc (abfd,
-				      sizeof (struct coff_section_tdata));
-		  if (stab->used_by_bfd == NULL)
-		    goto error_return;
-		  secdata = coff_section_data (abfd, stab);
-		}
-
-	      table = coff_hash_table (info);
-
-	      if (! _bfd_link_section_stabs (abfd, &table->stab_info,
-					     stab, stabstr,
-					     &secdata->stab_info))
-		goto error_return;
-	    }
-	}
-    }
-
-  obj_coff_keep_syms (abfd) = keep_syms;
-
-  return true;
-
- error_return:
-  obj_coff_keep_syms (abfd) = keep_syms;
-  return false;
-}
-
-/* Do the final link step.  */
-
-boolean
-_bfd_coff_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd_size_type symesz;
-  struct coff_final_link_info finfo;
-  boolean debug_merge_allocated;
-  boolean long_section_names;
-  asection *o;
-  struct bfd_link_order *p;
-  size_t max_sym_count;
-  size_t max_lineno_count;
-  size_t max_reloc_count;
-  size_t max_output_reloc_count;
-  size_t max_contents_size;
-  file_ptr rel_filepos;
-  unsigned int relsz;
-  file_ptr line_filepos;
-  unsigned int linesz;
-  bfd *sub;
-  bfd_byte *external_relocs = NULL;
-  char strbuf[STRING_SIZE_SIZE];
-
-  symesz = bfd_coff_symesz (abfd);
-
-  finfo.info = info;
-  finfo.output_bfd = abfd;
-  finfo.strtab = NULL;
-  finfo.section_info = NULL;
-  finfo.last_file_index = -1;
-  finfo.last_bf_index = -1;
-  finfo.internal_syms = NULL;
-  finfo.sec_ptrs = NULL;
-  finfo.sym_indices = NULL;
-  finfo.outsyms = NULL;
-  finfo.linenos = NULL;
-  finfo.contents = NULL;
-  finfo.external_relocs = NULL;
-  finfo.internal_relocs = NULL;
-  finfo.global_to_static = false;
-  debug_merge_allocated = false;
-
-  coff_data (abfd)->link_info = info;
-
-  finfo.strtab = _bfd_stringtab_init ();
-  if (finfo.strtab == NULL)
-    goto error_return;
-
-  if (! coff_debug_merge_hash_table_init (&finfo.debug_merge))
-    goto error_return;
-  debug_merge_allocated = true;
-
-  /* Compute the file positions for all the sections.  */
-  if (! abfd->output_has_begun)
-    {
-      if (! bfd_coff_compute_section_file_positions (abfd))
-	goto error_return;
-    }
-
-  /* Count the line numbers and relocation entries required for the
-     output file.  Set the file positions for the relocs.  */
-  rel_filepos = obj_relocbase (abfd);
-  relsz = bfd_coff_relsz (abfd);
-  max_contents_size = 0;
-  max_lineno_count = 0;
-  max_reloc_count = 0;
-
-  long_section_names = false;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order)
-	    {
-	      asection *sec;
-
-	      sec = p->u.indirect.section;
-
-	      /* Mark all sections which are to be included in the
-		 link.  This will normally be every section.  We need
-		 to do this so that we can identify any sections which
-		 the linker has decided to not include.  */
-	      sec->linker_mark = true;
-
-	      if (info->strip == strip_none
-		  || info->strip == strip_some)
-		o->lineno_count += sec->lineno_count;
-
-	      if (info->relocateable)
-		o->reloc_count += sec->reloc_count;
-
-	      if (sec->_raw_size > max_contents_size)
-		max_contents_size = sec->_raw_size;
-	      if (sec->lineno_count > max_lineno_count)
-		max_lineno_count = sec->lineno_count;
-	      if (sec->reloc_count > max_reloc_count)
-		max_reloc_count = sec->reloc_count;
-	    }
-	  else if (info->relocateable
-		   && (p->type == bfd_section_reloc_link_order
-		       || p->type == bfd_symbol_reloc_link_order))
-	    ++o->reloc_count;
-	}
-      if (o->reloc_count == 0)
-	o->rel_filepos = 0;
-      else
-	{
-	  o->flags |= SEC_RELOC;
-	  o->rel_filepos = rel_filepos;
-	  rel_filepos += o->reloc_count * relsz;
-	}
-
-      if (bfd_coff_long_section_names (abfd)
-	  && strlen (o->name) > SCNNMLEN)
-	{
-	  /* This section has a long name which must go in the string
-             table.  This must correspond to the code in
-             coff_write_object_contents which puts the string index
-             into the s_name field of the section header.  That is why
-             we pass hash as false.  */
-	  if (_bfd_stringtab_add (finfo.strtab, o->name, false, false)
-	      == (bfd_size_type) -1)
-	    goto error_return;
-	  long_section_names = true;
-	}
-    }
-
-  /* If doing a relocateable link, allocate space for the pointers we
-     need to keep.  */
-  if (info->relocateable)
-    {
-      unsigned int i;
-
-      /* We use section_count + 1, rather than section_count, because
-         the target_index fields are 1 based.  */
-      finfo.section_info =
-	((struct coff_link_section_info *)
-	 bfd_malloc ((abfd->section_count + 1)
-		     * sizeof (struct coff_link_section_info)));
-      if (finfo.section_info == NULL)
-	goto error_return;
-      for (i = 0; i <= abfd->section_count; i++)
-	{
-	  finfo.section_info[i].relocs = NULL;
-	  finfo.section_info[i].rel_hashes = NULL;
-	}
-    }
-
-  /* We now know the size of the relocs, so we can determine the file
-     positions of the line numbers.  */
-  line_filepos = rel_filepos;
-  linesz = bfd_coff_linesz (abfd);
-  max_output_reloc_count = 0;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if (o->lineno_count == 0)
-	o->line_filepos = 0;
-      else
-	{
-	  o->line_filepos = line_filepos;
-	  line_filepos += o->lineno_count * linesz;
-	}
-
-      if (o->reloc_count != 0)
-	{
-	  /* We don't know the indices of global symbols until we have
-             written out all the local symbols.  For each section in
-             the output file, we keep an array of pointers to hash
-             table entries.  Each entry in the array corresponds to a
-             reloc.  When we find a reloc against a global symbol, we
-             set the corresponding entry in this array so that we can
-             fix up the symbol index after we have written out all the
-             local symbols.
-
-	     Because of this problem, we also keep the relocs in
-	     memory until the end of the link.  This wastes memory,
-	     but only when doing a relocateable link, which is not the
-	     common case.  */
-	  BFD_ASSERT (info->relocateable);
-	  finfo.section_info[o->target_index].relocs =
-	    ((struct internal_reloc *)
-	     bfd_malloc (o->reloc_count * sizeof (struct internal_reloc)));
-	  finfo.section_info[o->target_index].rel_hashes =
-	    ((struct coff_link_hash_entry **)
-	     bfd_malloc (o->reloc_count
-		     * sizeof (struct coff_link_hash_entry *)));
-	  if (finfo.section_info[o->target_index].relocs == NULL
-	      || finfo.section_info[o->target_index].rel_hashes == NULL)
-	    goto error_return;
-
-	  if (o->reloc_count > max_output_reloc_count)
-	    max_output_reloc_count = o->reloc_count;
-	}
-
-      /* Reset the reloc and lineno counts, so that we can use them to
-	 count the number of entries we have output so far.  */
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-    }
-
-  obj_sym_filepos (abfd) = line_filepos;
-
-  /* Figure out the largest number of symbols in an input BFD.  Take
-     the opportunity to clear the output_has_begun fields of all the
-     input BFD's.  */
-  max_sym_count = 0;
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      size_t sz;
-
-      sub->output_has_begun = false;
-      sz = obj_raw_syment_count (sub);
-      if (sz > max_sym_count)
-	max_sym_count = sz;
-    }
-
-  /* Allocate some buffers used while linking.  */
-  finfo.internal_syms = ((struct internal_syment *)
-			 bfd_malloc (max_sym_count
-				     * sizeof (struct internal_syment)));
-  finfo.sec_ptrs = (asection **) bfd_malloc (max_sym_count
-					     * sizeof (asection *));
-  finfo.sym_indices = (long *) bfd_malloc (max_sym_count * sizeof (long));
-  finfo.outsyms = ((bfd_byte *)
-		   bfd_malloc ((size_t) ((max_sym_count + 1) * symesz)));
-  finfo.linenos = (bfd_byte *) bfd_malloc (max_lineno_count
-				       * bfd_coff_linesz (abfd));
-  finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
-  finfo.external_relocs = (bfd_byte *) bfd_malloc (max_reloc_count * relsz);
-  if (! info->relocateable)
-    finfo.internal_relocs = ((struct internal_reloc *)
-			     bfd_malloc (max_reloc_count
-					 * sizeof (struct internal_reloc)));
-  if ((finfo.internal_syms == NULL && max_sym_count > 0)
-      || (finfo.sec_ptrs == NULL && max_sym_count > 0)
-      || (finfo.sym_indices == NULL && max_sym_count > 0)
-      || finfo.outsyms == NULL
-      || (finfo.linenos == NULL && max_lineno_count > 0)
-      || (finfo.contents == NULL && max_contents_size > 0)
-      || (finfo.external_relocs == NULL && max_reloc_count > 0)
-      || (! info->relocateable
-	  && finfo.internal_relocs == NULL
-	  && max_reloc_count > 0))
-    goto error_return;
-
-  /* We now know the position of everything in the file, except that
-     we don't know the size of the symbol table and therefore we don't
-     know where the string table starts.  We just build the string
-     table in memory as we go along.  We process all the relocations
-     for a single input file at once.  */
-  obj_raw_syment_count (abfd) = 0;
-
-  if (coff_backend_info (abfd)->_bfd_coff_start_final_link)
-    {
-      if (! bfd_coff_start_final_link (abfd, info))
-	goto error_return;
-    }
-
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order
-	      && (bfd_get_flavour (p->u.indirect.section->owner)
-		  == bfd_target_coff_flavour))
-	    {
-	      sub = p->u.indirect.section->owner;
-	      if (! bfd_coff_link_output_has_begun (sub, & finfo))
-		{
-		  if (! _bfd_coff_link_input_bfd (&finfo, sub))
-		    goto error_return;
-		  sub->output_has_begun = true;
-		}
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    {
-	      if (! _bfd_coff_reloc_link_order (abfd, &finfo, o, p))
-		goto error_return;
-	    }
-	  else
-	    {
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		goto error_return;
-	    }
-	}
-    }
-
-  if (! bfd_coff_final_link_postscript (abfd, & finfo))
-    goto error_return;
-  
-  /* Free up the buffers used by _bfd_coff_link_input_bfd.  */
-
-  coff_debug_merge_hash_table_free (&finfo.debug_merge);
-  debug_merge_allocated = false;
-
-  if (finfo.internal_syms != NULL)
-    {
-      free (finfo.internal_syms);
-      finfo.internal_syms = NULL;
-    }
-  if (finfo.sec_ptrs != NULL)
-    {
-      free (finfo.sec_ptrs);
-      finfo.sec_ptrs = NULL;
-    }
-  if (finfo.sym_indices != NULL)
-    {
-      free (finfo.sym_indices);
-      finfo.sym_indices = NULL;
-    }
-  if (finfo.linenos != NULL)
-    {
-      free (finfo.linenos);
-      finfo.linenos = NULL;
-    }
-  if (finfo.contents != NULL)
-    {
-      free (finfo.contents);
-      finfo.contents = NULL;
-    }
-  if (finfo.external_relocs != NULL)
-    {
-      free (finfo.external_relocs);
-      finfo.external_relocs = NULL;
-    }
-  if (finfo.internal_relocs != NULL)
-    {
-      free (finfo.internal_relocs);
-      finfo.internal_relocs = NULL;
-    }
-
-  /* The value of the last C_FILE symbol is supposed to be the symbol
-     index of the first external symbol.  Write it out again if
-     necessary.  */
-  if (finfo.last_file_index != -1
-      && (unsigned int) finfo.last_file.n_value != obj_raw_syment_count (abfd))
-    {
-      finfo.last_file.n_value = obj_raw_syment_count (abfd);
-      bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file,
-			     (PTR) finfo.outsyms);
-      if (bfd_seek (abfd,
-		    (obj_sym_filepos (abfd)
-		     + finfo.last_file_index * symesz),
-		    SEEK_SET) != 0
-	  || bfd_write (finfo.outsyms, symesz, 1, abfd) != symesz)
-	return false;
-    }
-
-  /* If doing task linking (ld --task-link) then make a pass through the
-     global symbols, writing out any that are defined, and making them
-     static. */
-  if (info->task_link)
-    {
-      finfo.failed = false;
-      coff_link_hash_traverse (coff_hash_table (info), _bfd_coff_write_task_globals,
-			       (PTR) &finfo);
-      if (finfo.failed)
-	goto error_return;
-    }
-
-  /* Write out the global symbols.  */
-  finfo.failed = false;
-  coff_link_hash_traverse (coff_hash_table (info), _bfd_coff_write_global_sym,
-			   (PTR) &finfo);
-  if (finfo.failed)
-    goto error_return;
-
-  /* The outsyms buffer is used by _bfd_coff_write_global_sym.  */
-  if (finfo.outsyms != NULL)
-    {
-      free (finfo.outsyms);
-      finfo.outsyms = NULL;
-    }
-
-  if (info->relocateable && max_output_reloc_count > 0)
-    {
-      /* Now that we have written out all the global symbols, we know
-	 the symbol indices to use for relocs against them, and we can
-	 finally write out the relocs.  */
-      external_relocs = ((bfd_byte *)
-			 bfd_malloc (max_output_reloc_count * relsz));
-      if (external_relocs == NULL)
-	goto error_return;
-
-      for (o = abfd->sections; o != NULL; o = o->next)
-	{
-	  struct internal_reloc *irel;
-	  struct internal_reloc *irelend;
-	  struct coff_link_hash_entry **rel_hash;
-	  bfd_byte *erel;
-
-	  if (o->reloc_count == 0)
-	    continue;
-
-	  irel = finfo.section_info[o->target_index].relocs;
-	  irelend = irel + o->reloc_count;
-	  rel_hash = finfo.section_info[o->target_index].rel_hashes;
-	  erel = external_relocs;
-	  for (; irel < irelend; irel++, rel_hash++, erel += relsz)
-	    {
-	      if (*rel_hash != NULL)
-		{
-		  BFD_ASSERT ((*rel_hash)->indx >= 0);
-		  irel->r_symndx = (*rel_hash)->indx;
-		}
-	      bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel);
-	    }
-
-	  if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
-	      || bfd_write ((PTR) external_relocs, relsz, o->reloc_count,
-			    abfd) != relsz * o->reloc_count)
-	    goto error_return;
-	}
-
-      free (external_relocs);
-      external_relocs = NULL;
-    }
-
-  /* Free up the section information.  */
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
-
-      for (i = 0; i < abfd->section_count; i++)
-	{
-	  if (finfo.section_info[i].relocs != NULL)
-	    free (finfo.section_info[i].relocs);
-	  if (finfo.section_info[i].rel_hashes != NULL)
-	    free (finfo.section_info[i].rel_hashes);
-	}
-      free (finfo.section_info);
-      finfo.section_info = NULL;
-    }
-
-  /* If we have optimized stabs strings, output them.  */
-  if (coff_hash_table (info)->stab_info != NULL)
-    {
-      if (! _bfd_write_stab_strings (abfd, &coff_hash_table (info)->stab_info))
-	return false;
-    }
-
-  /* Write out the string table.  */
-  if (obj_raw_syment_count (abfd) != 0 || long_section_names)
-    {
-      if (bfd_seek (abfd,
-		    (obj_sym_filepos (abfd)
-		     + obj_raw_syment_count (abfd) * symesz),
-		    SEEK_SET) != 0)
-	return false;
-
-#if STRING_SIZE_SIZE == 4
-      bfd_h_put_32 (abfd,
-		    _bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
-		    (bfd_byte *) strbuf);
-#else
- #error Change bfd_h_put_32
-#endif
-
-      if (bfd_write (strbuf, 1, STRING_SIZE_SIZE, abfd) != STRING_SIZE_SIZE)
-	return false;
-
-      if (! _bfd_stringtab_emit (abfd, finfo.strtab))
-	return false;
-    }
-
-  _bfd_stringtab_free (finfo.strtab);
-
-  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
-     not try to write out the symbols.  */
-  bfd_get_symcount (abfd) = 0;
-
-  return true;
-
- error_return:
-  if (debug_merge_allocated)
-    coff_debug_merge_hash_table_free (&finfo.debug_merge);
-  if (finfo.strtab != NULL)
-    _bfd_stringtab_free (finfo.strtab);
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
-
-      for (i = 0; i < abfd->section_count; i++)
-	{
-	  if (finfo.section_info[i].relocs != NULL)
-	    free (finfo.section_info[i].relocs);
-	  if (finfo.section_info[i].rel_hashes != NULL)
-	    free (finfo.section_info[i].rel_hashes);
-	}
-      free (finfo.section_info);
-    }
-  if (finfo.internal_syms != NULL)
-    free (finfo.internal_syms);
-  if (finfo.sec_ptrs != NULL)
-    free (finfo.sec_ptrs);
-  if (finfo.sym_indices != NULL)
-    free (finfo.sym_indices);
-  if (finfo.outsyms != NULL)
-    free (finfo.outsyms);
-  if (finfo.linenos != NULL)
-    free (finfo.linenos);
-  if (finfo.contents != NULL)
-    free (finfo.contents);
-  if (finfo.external_relocs != NULL)
-    free (finfo.external_relocs);
-  if (finfo.internal_relocs != NULL)
-    free (finfo.internal_relocs);
-  if (external_relocs != NULL)
-    free (external_relocs);
-  return false;
-}
-
-/* parse out a -heap <reserved>,<commit> line */
-
-static char *
-dores_com (ptr, output_bfd, heap)
-     char *ptr;
-     bfd *output_bfd;
-     int heap;
-{
-  if (coff_data(output_bfd)->pe) 
-    {
-      int val = strtoul (ptr, &ptr, 0);
-      if (heap)
-	pe_data(output_bfd)->pe_opthdr.SizeOfHeapReserve =val;
-      else
-	pe_data(output_bfd)->pe_opthdr.SizeOfStackReserve =val;
-
-      if (ptr[0] == ',') 
-	{
-	  int val = strtoul (ptr+1, &ptr, 0);
-	  if (heap)
-	    pe_data(output_bfd)->pe_opthdr.SizeOfHeapCommit =val;
-	  else
-	    pe_data(output_bfd)->pe_opthdr.SizeOfStackCommit =val;
-	}
-    }
-  return ptr;
-}
-
-static char *get_name(ptr, dst)
-char *ptr;
-char **dst;
-{
-  while (*ptr == ' ')
-    ptr++;
-  *dst = ptr;
-  while (*ptr && *ptr != ' ')
-    ptr++;
-  *ptr = 0;
-  return ptr+1;
-}
-
-/* Process any magic embedded commands in a section called .drectve */
-			
-static int
-process_embedded_commands (output_bfd, info,  abfd)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *abfd;
-{
-  asection *sec = bfd_get_section_by_name (abfd, ".drectve");
-  char *s;
-  char *e;
-  char *copy;
-  if (!sec) 
-    return 1;
-  
-  copy = bfd_malloc ((size_t) sec->_raw_size);
-  if (!copy) 
-    return 0;
-  if (! bfd_get_section_contents(abfd, sec, copy, 0, sec->_raw_size)) 
-    {
-      free (copy);
-      return 0;
-    }
-  e = copy + sec->_raw_size;
-  for (s = copy;  s < e ; ) 
-    {
-      if (s[0]!= '-') {
-	s++;
-	continue;
-      }
-      if (strncmp (s,"-attr", 5) == 0)
-	{
-	  char *name;
-	  char *attribs;
-	  asection *asec;
-
-	  int loop = 1;
-	  int had_write = 0;
-	  int had_read = 0;
-	  int had_exec= 0;
-	  int had_shared= 0;
-	  s += 5;
-	  s = get_name(s, &name);
-	  s = get_name(s, &attribs);
-	  while (loop) {
-	    switch (*attribs++) 
-	      {
-	      case 'W':
-		had_write = 1;
-		break;
-	      case 'R':
-		had_read = 1;
-		break;
-	      case 'S':
-		had_shared = 1;
-		break;
-	      case 'X':
-		had_exec = 1;
-		break;
-	      default:
-		loop = 0;
-	      }
-	  }
-	  asec = bfd_get_section_by_name (abfd, name);
-	  if (asec) {
-	    if (had_exec)
-	      asec->flags |= SEC_CODE;
-	    if (!had_write)
-	      asec->flags |= SEC_READONLY;
-	  }
-	}
-      else if (strncmp (s,"-heap", 5) == 0)
-	{
-	  s = dores_com (s+5, output_bfd, 1);
-	}
-      else if (strncmp (s,"-stack", 6) == 0)
-	{
-	  s = dores_com (s+6, output_bfd, 0);
-	}
-      else 
-	s++;
-    }
-  free (copy);
-  return 1;
-}
-
-/* Place a marker against all symbols which are used by relocations.
-   This marker can be picked up by the 'do we skip this symbol ?'
-   loop in _bfd_coff_link_input_bfd() and used to prevent skipping
-   that symbol. 
-   */
-
-static void
-mark_relocs (finfo, input_bfd)
-     struct coff_final_link_info *	finfo;
-     bfd * 				input_bfd;
-{
-  asection * a;
-
-  if ((bfd_get_file_flags (input_bfd) & HAS_SYMS) == 0)
-    return;
-  
-  for (a = input_bfd->sections; a != (asection *) NULL; a = a->next)
-    {
-      struct internal_reloc *	internal_relocs;
-      struct internal_reloc *	irel;
-      struct internal_reloc *	irelend;
-
-      
-      if ((a->flags & SEC_RELOC) == 0 || a->reloc_count  < 1)
-	continue;
-
-      /* Read in the relocs.  */
-      internal_relocs = _bfd_coff_read_internal_relocs
-	(input_bfd, a, false,
-	 finfo->external_relocs,
-	 finfo->info->relocateable,
-	 (finfo->info->relocateable
-	  ? (finfo->section_info[ a->output_section->target_index ].relocs + a->output_section->reloc_count)
-	  : finfo->internal_relocs)
-	);
-      
-      if (internal_relocs == NULL)
-	continue;
-
-      irel     = internal_relocs;
-      irelend  = irel + a->reloc_count;
-
-      /* Place a mark in the sym_indices array (whose entries have
-	 been initialised to 0) for all of the symbols that are used
-	 in the relocation table.  This will then be picked up in the
-	 skip/don't pass */
-      
-      for (; irel < irelend; irel++)
-	{
-	  finfo->sym_indices[ irel->r_symndx ] = -1;
-	}
-    }
-}
-
-/* Link an input file into the linker output file.  This function
-   handles all the sections and relocations of the input file at once.  */
-
-boolean
-_bfd_coff_link_input_bfd (finfo, input_bfd)
-     struct coff_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  boolean (*sym_is_global) PARAMS ((bfd *, struct internal_syment *));
-  boolean (*adjust_symndx) PARAMS ((bfd *, struct bfd_link_info *, bfd *,
-				    asection *, struct internal_reloc *,
-				    boolean *));
-  bfd *output_bfd;
-  const char *strings;
-  bfd_size_type syment_base;
-  unsigned int n_tmask;
-  unsigned int n_btshft;
-  boolean copy, hash;
-  bfd_size_type isymesz;
-  bfd_size_type osymesz;
-  bfd_size_type linesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-  struct internal_syment *isymp;
-  asection **secpp;
-  long *indexp;
-  unsigned long output_index;
-  bfd_byte *outsym;
-  struct coff_link_hash_entry **sym_hash;
-  asection *o;
-
-  /* Move all the symbols to the output file.  */
-
-  output_bfd = finfo->output_bfd;
-  sym_is_global = coff_backend_info (input_bfd)->_bfd_coff_sym_is_global;
-  strings = NULL;
-  syment_base = obj_raw_syment_count (output_bfd);
-  isymesz = bfd_coff_symesz (input_bfd);
-  osymesz = bfd_coff_symesz (output_bfd);
-  linesz = bfd_coff_linesz (input_bfd);
-  BFD_ASSERT (linesz == bfd_coff_linesz (output_bfd));
-
-  n_tmask = coff_data (input_bfd)->local_n_tmask;
-  n_btshft = coff_data (input_bfd)->local_n_btshft;
-
-  /* Define macros so that ISFCN, et. al., macros work correctly.  */
-#define N_TMASK n_tmask
-#define N_BTSHFT n_btshft
-
-  copy = false;
-  if (! finfo->info->keep_memory)
-    copy = true;
-  hash = true;
-  if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
-
-  if (! _bfd_coff_get_external_symbols (input_bfd))
-    return false;
-
-  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
-  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
-  isymp = finfo->internal_syms;
-  secpp = finfo->sec_ptrs;
-  indexp = finfo->sym_indices;
-  output_index = syment_base;
-  outsym = finfo->outsyms;
-
-  if (coff_data (output_bfd)->pe)
-    {
-      if (! process_embedded_commands (output_bfd, finfo->info, input_bfd))
-	return false;
-    }
-
-  /* If we are going to perform relocations and also strip/discard some symbols
-     then we must make sure that we do not strip/discard those symbols that are
-     going to be involved in the relocations */
-  if ((   finfo->info->strip   != strip_none
-       || finfo->info->discard != discard_none)
-      && finfo->info->relocateable)
-    {
-      /* mark the symbol array as 'not-used' */
-      memset (indexp, 0, obj_raw_syment_count (input_bfd) * sizeof * indexp); 
-       
-      mark_relocs (finfo, input_bfd);
-    }
-
-  while (esym < esym_end)
-    {
-      struct internal_syment isym;
-      boolean skip;
-      boolean global;
-      boolean dont_skip_symbol;
-      int add;
-
-      bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp);
-
-      /* Make a copy of *isymp so that the relocate_section function
-	 always sees the original values.  This is more reliable than
-	 always recomputing the symbol value even if we are stripping
-	 the symbol.  */
-      isym = *isymp;
-
-      if (isym.n_scnum != 0)
-	*secpp = coff_section_from_bfd_index (input_bfd, isym.n_scnum);
-      else
-	{
-	  if (isym.n_value == 0)
-	    *secpp = bfd_und_section_ptr;
-	  else
-	    *secpp = bfd_com_section_ptr;
-	}
-
-      /* Extract the flag indicating if this symbol is used by a
-         relocation.  */
-      if ((finfo->info->strip != strip_none
-	   || finfo->info->discard != discard_none)
-	  && finfo->info->relocateable)
-	dont_skip_symbol = *indexp;
-      else
-	dont_skip_symbol = false;
-      
-      *indexp = -1;
-
-      skip = false;
-      global = false;
-      add = 1 + isym.n_numaux;
-
-      /* If we are stripping all symbols, we want to skip this one.  */
-      if (finfo->info->strip == strip_all && ! dont_skip_symbol)
-	skip = true;
-
-      if (! skip)
-	{
-	  if (isym.n_sclass == C_EXT
-	      || isym.n_sclass == C_WEAKEXT
-	      || (obj_pe (input_bfd) && isym.n_sclass == C_NT_WEAK)
-#ifdef C_SYSTEM
-	      || isym.n_sclass == C_SYSTEM
-#endif
-	      || (sym_is_global && (*sym_is_global) (input_bfd, &isym)))
-	    {
-	      /* This is a global symbol.  Global symbols come at the
-		 end of the symbol table, so skip them for now.
-		 Locally defined function symbols, however, are an
-		 exception, and are not moved to the end.  */
-	      global = true;
-	      if (! ISFCN (isym.n_type) || isym.n_scnum == 0)
-		skip = true;
-	    }
-	  else
-	    {
-	      /* This is a local symbol.  Skip it if we are discarding
-                 local symbols.  */
-	      if (finfo->info->discard == discard_all && ! dont_skip_symbol)
-		skip = true;
-	    }
-	}
-
-      /* If we stripping debugging symbols, and this is a debugging
-         symbol, then skip it.  FIXME: gas sets the section to N_ABS
-         for some types of debugging symbols; I don't know if this is
-         a bug or not.  In any case, we handle it here.  */
-      if (! skip
-	  && finfo->info->strip == strip_debugger
-	  && ! dont_skip_symbol
-	  && (isym.n_scnum == N_DEBUG
-	      || (isym.n_scnum == N_ABS
-		  && (isym.n_sclass == C_AUTO
-		      || isym.n_sclass == C_REG
-		      || isym.n_sclass == C_MOS
-		      || isym.n_sclass == C_MOE
-		      || isym.n_sclass == C_MOU
-		      || isym.n_sclass == C_ARG
-		      || isym.n_sclass == C_REGPARM
-		      || isym.n_sclass == C_FIELD
-		      || isym.n_sclass == C_EOS))))
-	skip = true;
-
-      /* If some symbols are stripped based on the name, work out the
-	 name and decide whether to skip this symbol.  */
-      if (! skip
-	  && (finfo->info->strip == strip_some
-	      || finfo->info->discard == discard_l))
-	{
-	  const char *name;
-	  char buf[SYMNMLEN + 1];
-
-	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
-	  if (name == NULL)
-	    return false;
-
-	  if (! dont_skip_symbol
-	      && ((finfo->info->strip == strip_some
-		   && (bfd_hash_lookup (finfo->info->keep_hash, name, false,
-				    false) == NULL))
-		   || (! global
-		       && finfo->info->discard == discard_l
-		       && bfd_is_local_label_name (input_bfd, name))))
-	    skip = true;
-	}
-
-      /* If this is an enum, struct, or union tag, see if we have
-         already output an identical type.  */
-      if (! skip
-	  && (finfo->output_bfd->flags & BFD_TRADITIONAL_FORMAT) == 0
-	  && (isym.n_sclass == C_ENTAG
-	      || isym.n_sclass == C_STRTAG
-	      || isym.n_sclass == C_UNTAG)
-	  && isym.n_numaux == 1)
-	{
-	  const char *name;
-	  char buf[SYMNMLEN + 1];
-	  struct coff_debug_merge_hash_entry *mh;
-	  struct coff_debug_merge_type *mt;
-	  union internal_auxent aux;
-	  struct coff_debug_merge_element **epp;
-	  bfd_byte *esl, *eslend;
-	  struct internal_syment *islp;
-
-	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
-	  if (name == NULL)
-	    return false;
-
-	  /* Ignore fake names invented by compiler; treat them all as
-             the same name.  */
-	  if (*name == '~' || *name == '.' || *name == '$'
-	      || (*name == bfd_get_symbol_leading_char (input_bfd)
-		  && (name[1] == '~' || name[1] == '.' || name[1] == '$')))
-	    name = "";
-
-	  mh = coff_debug_merge_hash_lookup (&finfo->debug_merge, name,
-					     true, true);
-	  if (mh == NULL)
-	    return false;
-
-	  /* Allocate memory to hold type information.  If this turns
-             out to be a duplicate, we pass this address to
-             bfd_release.  */
-	  mt = ((struct coff_debug_merge_type *)
-		bfd_alloc (input_bfd,
-			   sizeof (struct coff_debug_merge_type)));
-	  if (mt == NULL)
-	    return false;
-	  mt->class = isym.n_sclass;
-
-	  /* Pick up the aux entry, which points to the end of the tag
-             entries.  */
-	  bfd_coff_swap_aux_in (input_bfd, (PTR) (esym + isymesz),
-				isym.n_type, isym.n_sclass, 0, isym.n_numaux,
-				(PTR) &aux);
-
-	  /* Gather the elements.  */
-	  epp = &mt->elements;
-	  mt->elements = NULL;
-	  islp = isymp + 2;
-	  esl = esym + 2 * isymesz;
-	  eslend = ((bfd_byte *) obj_coff_external_syms (input_bfd)
-		    + aux.x_sym.x_fcnary.x_fcn.x_endndx.l * isymesz);
-	  while (esl < eslend)
-	    {
-	      const char *elename;
-	      char elebuf[SYMNMLEN + 1];
-	      char *copy;
-
-	      bfd_coff_swap_sym_in (input_bfd, (PTR) esl, (PTR) islp);
-
-	      *epp = ((struct coff_debug_merge_element *)
-		      bfd_alloc (input_bfd,
-				 sizeof (struct coff_debug_merge_element)));
-	      if (*epp == NULL)
-		return false;
-
-	      elename = _bfd_coff_internal_syment_name (input_bfd, islp,
-							elebuf);
-	      if (elename == NULL)
-		return false;
-
-	      copy = (char *) bfd_alloc (input_bfd, strlen (elename) + 1);
-	      if (copy == NULL)
-		return false;
-	      strcpy (copy, elename);
-
-	      (*epp)->name = copy;
-	      (*epp)->type = islp->n_type;
-	      (*epp)->tagndx = 0;
-	      if (islp->n_numaux >= 1
-		  && islp->n_type != T_NULL
-		  && islp->n_sclass != C_EOS)
-		{
-		  union internal_auxent eleaux;
-		  long indx;
-
-		  bfd_coff_swap_aux_in (input_bfd, (PTR) (esl + isymesz),
-					islp->n_type, islp->n_sclass, 0,
-					islp->n_numaux, (PTR) &eleaux);
-		  indx = eleaux.x_sym.x_tagndx.l;
-
-		  /* FIXME: If this tagndx entry refers to a symbol
-		     defined later in this file, we just ignore it.
-		     Handling this correctly would be tedious, and may
-		     not be required.  */
-
-		  if (indx > 0
-		      && (indx
-			  < ((esym -
-			      (bfd_byte *) obj_coff_external_syms (input_bfd))
-			     / (long) isymesz)))
-		    {
-		      (*epp)->tagndx = finfo->sym_indices[indx];
-		      if ((*epp)->tagndx < 0)
-			(*epp)->tagndx = 0;
-		    }
-		}
-	      epp = &(*epp)->next;
-	      *epp = NULL;
-
-	      esl += (islp->n_numaux + 1) * isymesz;
-	      islp += islp->n_numaux + 1;
-	    }
-
-	  /* See if we already have a definition which matches this
-             type.  We always output the type if it has no elements,
-             for simplicity.  */
-	  if (mt->elements == NULL)
-	    bfd_release (input_bfd, (PTR) mt);
-	  else
-	    {
-	      struct coff_debug_merge_type *mtl;
-
-	      for (mtl = mh->types; mtl != NULL; mtl = mtl->next)
-		{
-		  struct coff_debug_merge_element *me, *mel;
-
-		  if (mtl->class != mt->class)
-		    continue;
-
-		  for (me = mt->elements, mel = mtl->elements;
-		       me != NULL && mel != NULL;
-		       me = me->next, mel = mel->next)
-		    {
-		      if (strcmp (me->name, mel->name) != 0
-			  || me->type != mel->type
-			  || me->tagndx != mel->tagndx)
-			break;
-		    }
-
-		  if (me == NULL && mel == NULL)
-		    break;
-		}
-
-	      if (mtl == NULL || (bfd_size_type) mtl->indx >= syment_base)
-		{
-		  /* This is the first definition of this type.  */
-		  mt->indx = output_index;
-		  mt->next = mh->types;
-		  mh->types = mt;
-		}
-	      else
-		{
-		  /* This is a redefinition which can be merged.  */
-		  bfd_release (input_bfd, (PTR) mt);
-		  *indexp = mtl->indx;
-		  add = (eslend - esym) / isymesz;
-		  skip = true;
-		}
-	    }
-	}
-
-      /* We now know whether we are to skip this symbol or not.  */
-      if (! skip)
-	{
-	  /* Adjust the symbol in order to output it.  */
-
-	  if (isym._n._n_n._n_zeroes == 0
-	      && isym._n._n_n._n_offset != 0)
-	    {
-	      const char *name;
-	      bfd_size_type indx;
-
-	      /* This symbol has a long name.  Enter it in the string
-		 table we are building.  Note that we do not check
-		 bfd_coff_symname_in_debug.  That is only true for
-		 XCOFF, and XCOFF requires different linking code
-		 anyhow.  */
-	      name = _bfd_coff_internal_syment_name (input_bfd, &isym,
-						     (char *) NULL);
-	      if (name == NULL)
-		return false;
-	      indx = _bfd_stringtab_add (finfo->strtab, name, hash, copy);
-	      if (indx == (bfd_size_type) -1)
-		return false;
-	      isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
-	    }
-
-	  if (isym.n_scnum > 0)
-	    {
-	      isym.n_scnum = (*secpp)->output_section->target_index;
-	      isym.n_value += (*secpp)->output_offset;
-	      if (! obj_pe (input_bfd))
-		isym.n_value -= (*secpp)->vma;
-	      if (! obj_pe (finfo->output_bfd))
-		isym.n_value += (*secpp)->output_section->vma;
-	    }
-
-	  /* The value of a C_FILE symbol is the symbol index of the
-	     next C_FILE symbol.  The value of the last C_FILE symbol
-	     is the symbol index to the first external symbol
-	     (actually, coff_renumber_symbols does not get this
-	     right--it just sets the value of the last C_FILE symbol
-	     to zero--and nobody has ever complained about it).  We
-	     try to get this right, below, just before we write the
-	     symbols out, but in the general case we may have to write
-	     the symbol out twice.  */
-	  if (isym.n_sclass == C_FILE)
-	    {
-	      if (finfo->last_file_index != -1
-		  && finfo->last_file.n_value != (long) output_index)
-		{
-		  /* We must correct the value of the last C_FILE entry.  */
-		  finfo->last_file.n_value = output_index;
-		  if ((bfd_size_type) finfo->last_file_index >= syment_base)
-		    {
-		      /* The last C_FILE symbol is in this input file.  */
-		      bfd_coff_swap_sym_out (output_bfd,
-					     (PTR) &finfo->last_file,
-					     (PTR) (finfo->outsyms
-						    + ((finfo->last_file_index
-							- syment_base)
-						       * osymesz)));
-		    }
-		  else
-		    {
-		      /* We have already written out the last C_FILE
-			 symbol.  We need to write it out again.  We
-			 borrow *outsym temporarily.  */
-		      bfd_coff_swap_sym_out (output_bfd,
-					     (PTR) &finfo->last_file,
-					     (PTR) outsym);
-		      if (bfd_seek (output_bfd,
-				    (obj_sym_filepos (output_bfd)
-				     + finfo->last_file_index * osymesz),
-				    SEEK_SET) != 0
-			  || (bfd_write (outsym, osymesz, 1, output_bfd)
-			      != osymesz))
-			return false;
-		    }
-		}
-
-	      finfo->last_file_index = output_index;
-	      finfo->last_file = isym;
-	    }
-
-	  /* If doing task linking, convert normal global function symbols to
-	     static functions. */
-
-	  if (finfo->info->task_link
-	      && (isym.n_sclass == C_EXT
-		  || isym.n_sclass == C_WEAKEXT
-		  || (obj_pe (input_bfd) && isym.n_sclass == C_NT_WEAK)))
-	    isym.n_sclass = C_STAT;
-
-	  /* Output the symbol.  */
-
-	  bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym);
-
-	  *indexp = output_index;
-
-	  if (global)
-	    {
-	      long indx;
-	      struct coff_link_hash_entry *h;
-
-	      indx = ((esym - (bfd_byte *) obj_coff_external_syms (input_bfd))
-		      / isymesz);
-	      h = obj_coff_sym_hashes (input_bfd)[indx];
-	      if (h == NULL)
-		{
-		  /* This can happen if there were errors earlier in
-                     the link.  */
-		  bfd_set_error (bfd_error_bad_value);
-		  return false;
-		}
-	      h->indx = output_index;
-	    }
-
-	  output_index += add;
-	  outsym += add * osymesz;
-	}
-
-      esym += add * isymesz;
-      isymp += add;
-      ++secpp;
-      ++indexp;
-      for (--add; add > 0; --add)
-	{
-	  *secpp++ = NULL;
-	  *indexp++ = -1;
-	}
-    }
-
-  /* Fix up the aux entries.  This must be done in a separate pass,
-     because we don't know the correct symbol indices until we have
-     already decided which symbols we are going to keep.  */
-
-  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
-  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
-  isymp = finfo->internal_syms;
-  indexp = finfo->sym_indices;
-  sym_hash = obj_coff_sym_hashes (input_bfd);
-  outsym = finfo->outsyms;
-  while (esym < esym_end)
-    {
-      int add;
-
-      add = 1 + isymp->n_numaux;
-
-      if ((*indexp < 0
-	   || (bfd_size_type) *indexp < syment_base)
-	  && (*sym_hash == NULL
-	      || (*sym_hash)->auxbfd != input_bfd))
-	esym += add * isymesz;
-      else
-	{
-	  struct coff_link_hash_entry *h;
-	  int i;
-
-	  h = NULL;
-	  if (*indexp < 0)
-	    {
-	      h = *sym_hash;
-
-	      /* The m68k-motorola-sysv assembler will sometimes
-                 generate two symbols with the same name, but only one
-                 will have aux entries.  */
-	      BFD_ASSERT (isymp->n_numaux == 0
-			  || h->numaux == isymp->n_numaux);
-	    }
-
-	  esym += isymesz;
-
-	  if (h == NULL)
-	    outsym += osymesz;
-
-	  /* Handle the aux entries.  This handling is based on
-	     coff_pointerize_aux.  I don't know if it always correct.  */
-	  for (i = 0; i < isymp->n_numaux && esym < esym_end; i++)
-	    {
-	      union internal_auxent aux;
-	      union internal_auxent *auxp;
-
-	      if (h != NULL)
-		auxp = h->aux + i;
-	      else
-		{
-		  bfd_coff_swap_aux_in (input_bfd, (PTR) esym, isymp->n_type,
-					isymp->n_sclass, i, isymp->n_numaux,
-					(PTR) &aux);
-		  auxp = &aux;
-		}
-
-	      if (isymp->n_sclass == C_FILE)
-		{
-		  /* If this is a long filename, we must put it in the
-		     string table.  */
-		  if (auxp->x_file.x_n.x_zeroes == 0
-		      && auxp->x_file.x_n.x_offset != 0)
-		    {
-		      const char *filename;
-		      bfd_size_type indx;
-
-		      BFD_ASSERT (auxp->x_file.x_n.x_offset
-				  >= STRING_SIZE_SIZE);
-		      if (strings == NULL)
-			{
-			  strings = _bfd_coff_read_string_table (input_bfd);
-			  if (strings == NULL)
-			    return false;
-			}
-		      filename = strings + auxp->x_file.x_n.x_offset;
-		      indx = _bfd_stringtab_add (finfo->strtab, filename,
-						 hash, copy);
-		      if (indx == (bfd_size_type) -1)
-			return false;
-		      auxp->x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
-		    }
-		}
-	      else if (isymp->n_sclass != C_STAT || isymp->n_type != T_NULL)
-		{
-		  unsigned long indx;
-
-		  if (ISFCN (isymp->n_type)
-		      || ISTAG (isymp->n_sclass)
-		      || isymp->n_sclass == C_BLOCK
-		      || isymp->n_sclass == C_FCN)
-		    {
-		      indx = auxp->x_sym.x_fcnary.x_fcn.x_endndx.l;
-		      if (indx > 0
-			  && indx < obj_raw_syment_count (input_bfd))
-			{
-			  /* We look forward through the symbol for
-                             the index of the next symbol we are going
-                             to include.  I don't know if this is
-                             entirely right.  */
-			  while ((finfo->sym_indices[indx] < 0
-				  || ((bfd_size_type) finfo->sym_indices[indx]
-				      < syment_base))
-				 && indx < obj_raw_syment_count (input_bfd))
-			    ++indx;
-			  if (indx >= obj_raw_syment_count (input_bfd))
-			    indx = output_index;
-			  else
-			    indx = finfo->sym_indices[indx];
-			  auxp->x_sym.x_fcnary.x_fcn.x_endndx.l = indx;
-			}
-		    }
-
-		  indx = auxp->x_sym.x_tagndx.l;
-		  if (indx > 0 && indx < obj_raw_syment_count (input_bfd))
-		    {
-		      long symindx;
-
-		      symindx = finfo->sym_indices[indx];
-		      if (symindx < 0)
-			auxp->x_sym.x_tagndx.l = 0;
-		      else
-			auxp->x_sym.x_tagndx.l = symindx;
-		    }
-
-		  /* The .bf symbols are supposed to be linked through
-		     the endndx field.  We need to carry this list
-		     across object files.  */
-		  if (i == 0
-		      && h == NULL
-		      && isymp->n_sclass == C_FCN
-		      && (isymp->_n._n_n._n_zeroes != 0
-			  || isymp->_n._n_n._n_offset == 0)
-		      && isymp->_n._n_name[0] == '.'
-		      && isymp->_n._n_name[1] == 'b'
-		      && isymp->_n._n_name[2] == 'f'
-		      && isymp->_n._n_name[3] == '\0')
-		    {
-		      if (finfo->last_bf_index != -1)
-			{
-			  finfo->last_bf.x_sym.x_fcnary.x_fcn.x_endndx.l =
-			    *indexp;
-
-			  if ((bfd_size_type) finfo->last_bf_index
-			      >= syment_base)
-			    {
-			      PTR auxout;
-
-			      /* The last .bf symbol is in this input
-				 file.  This will only happen if the
-				 assembler did not set up the .bf
-				 endndx symbols correctly.  */
-			      auxout = (PTR) (finfo->outsyms
-					      + ((finfo->last_bf_index
-						  - syment_base)
-						 * osymesz));
-			      bfd_coff_swap_aux_out (output_bfd,
-						     (PTR) &finfo->last_bf,
-						     isymp->n_type,
-						     isymp->n_sclass,
-						     0, isymp->n_numaux,
-						     auxout);
-			    }
-			  else
-			    {
-			      /* We have already written out the last
-                                 .bf aux entry.  We need to write it
-                                 out again.  We borrow *outsym
-                                 temporarily.  FIXME: This case should
-                                 be made faster.  */
-			      bfd_coff_swap_aux_out (output_bfd,
-						     (PTR) &finfo->last_bf,
-						     isymp->n_type,
-						     isymp->n_sclass,
-						     0, isymp->n_numaux,
-						     (PTR) outsym);
-			      if (bfd_seek (output_bfd,
-					    (obj_sym_filepos (output_bfd)
-					     + finfo->last_bf_index * osymesz),
-					    SEEK_SET) != 0
-				  || bfd_write (outsym, osymesz, 1,
-						output_bfd) != osymesz)
-				return false;
-			    }
-			}
-
-		      if (auxp->x_sym.x_fcnary.x_fcn.x_endndx.l != 0)
-			finfo->last_bf_index = -1;
-		      else
-			{
-			  /* The endndx field of this aux entry must
-                             be updated with the symbol number of the
-                             next .bf symbol.  */
-			  finfo->last_bf = *auxp;
-			  finfo->last_bf_index = (((outsym - finfo->outsyms)
-						   / osymesz)
-						  + syment_base);
-			}
-		    }
-		}
-
-	      if (h == NULL)
-		{
-		  bfd_coff_swap_aux_out (output_bfd, (PTR) auxp, isymp->n_type,
-					 isymp->n_sclass, i, isymp->n_numaux,
-					 (PTR) outsym);
-		  outsym += osymesz;
-		}
-
-	      esym += isymesz;
-	    }
-	}
-
-      indexp += add;
-      isymp += add;
-      sym_hash += add;
-    }
-
-  /* Relocate the line numbers, unless we are stripping them.  */
-  if (finfo->info->strip == strip_none
-      || finfo->info->strip == strip_some)
-    {
-      for (o = input_bfd->sections; o != NULL; o = o->next)
-	{
-	  bfd_vma offset;
-	  bfd_byte *eline;
-	  bfd_byte *elineend;
-
-	  /* FIXME: If SEC_HAS_CONTENTS is not for the section, then
-	     build_link_order in ldwrite.c will not have created a
-	     link order, which means that we will not have seen this
-	     input section in _bfd_coff_final_link, which means that
-	     we will not have allocated space for the line numbers of
-	     this section.  I don't think line numbers can be
-	     meaningful for a section which does not have
-	     SEC_HAS_CONTENTS set, but, if they do, this must be
-	     changed.  */
-	  if (o->lineno_count == 0
-	      || (o->output_section->flags & SEC_HAS_CONTENTS) == 0)
-	    continue;
-
-	  if (bfd_seek (input_bfd, o->line_filepos, SEEK_SET) != 0
-	      || bfd_read (finfo->linenos, linesz, o->lineno_count,
-			   input_bfd) != linesz * o->lineno_count)
-	    return false;
-
-	  offset = o->output_section->vma + o->output_offset - o->vma;
-	  eline = finfo->linenos;
-	  elineend = eline + linesz * o->lineno_count;
-	  for (; eline < elineend; eline += linesz)
-	    {
-	      struct internal_lineno iline;
-
-	      bfd_coff_swap_lineno_in (input_bfd, (PTR) eline, (PTR) &iline);
-
-	      if (iline.l_lnno != 0)
-		iline.l_addr.l_paddr += offset;
-	      else if (iline.l_addr.l_symndx >= 0
-		       && ((unsigned long) iline.l_addr.l_symndx
-			   < obj_raw_syment_count (input_bfd)))
-		{
-		  long indx;
-
-		  indx = finfo->sym_indices[iline.l_addr.l_symndx];
-
-		  if (indx < 0)
-		    {
-		      /* These line numbers are attached to a symbol
-			 which we are stripping.  We should really
-			 just discard the line numbers, but that would
-			 be a pain because we have already counted
-			 them.  */
-		      indx = 0;
-		    }
-		  else
-		    {
-		      struct internal_syment is;
-		      union internal_auxent ia;
-
-		      /* Fix up the lnnoptr field in the aux entry of
-			 the symbol.  It turns out that we can't do
-			 this when we modify the symbol aux entries,
-			 because gas sometimes screws up the lnnoptr
-			 field and makes it an offset from the start
-			 of the line numbers rather than an absolute
-			 file index.  */
-		      bfd_coff_swap_sym_in (output_bfd,
-					    (PTR) (finfo->outsyms
-						   + ((indx - syment_base)
-						      * osymesz)),
-					    (PTR) &is);
-		      if ((ISFCN (is.n_type)
-			   || is.n_sclass == C_BLOCK)
-			  && is.n_numaux >= 1)
-			{
-			  PTR auxptr;
-
-			  auxptr = (PTR) (finfo->outsyms
-					  + ((indx - syment_base + 1)
-					     * osymesz));
-			  bfd_coff_swap_aux_in (output_bfd, auxptr,
-						is.n_type, is.n_sclass,
-						0, is.n_numaux, (PTR) &ia);
-			  ia.x_sym.x_fcnary.x_fcn.x_lnnoptr =
-			    (o->output_section->line_filepos
-			     + o->output_section->lineno_count * linesz
-			     + eline - finfo->linenos);
-			  bfd_coff_swap_aux_out (output_bfd, (PTR) &ia,
-						 is.n_type, is.n_sclass, 0,
-						 is.n_numaux, auxptr);
-			}
-		    }
-
-		  iline.l_addr.l_symndx = indx;
-		}
-
-	      bfd_coff_swap_lineno_out (output_bfd, (PTR) &iline, (PTR) eline);
-	    }
-
-	  if (bfd_seek (output_bfd,
-			(o->output_section->line_filepos
-			 + o->output_section->lineno_count * linesz),
-			SEEK_SET) != 0
-	      || bfd_write (finfo->linenos, linesz, o->lineno_count,
-			    output_bfd) != linesz * o->lineno_count)
-	    return false;
-
-	  o->output_section->lineno_count += o->lineno_count;
-	}
-    }
-
-  /* If we swapped out a C_FILE symbol, guess that the next C_FILE
-     symbol will be the first symbol in the next input file.  In the
-     normal case, this will save us from writing out the C_FILE symbol
-     again.  */
-  if (finfo->last_file_index != -1
-      && (bfd_size_type) finfo->last_file_index >= syment_base)
-    {
-      finfo->last_file.n_value = output_index;
-      bfd_coff_swap_sym_out (output_bfd, (PTR) &finfo->last_file,
-			     (PTR) (finfo->outsyms
- 				    + ((finfo->last_file_index - syment_base)
- 				       * osymesz)));
-    }
-
-  /* Write the modified symbols to the output file.  */
-  if (outsym > finfo->outsyms)
-    {
-      if (bfd_seek (output_bfd,
-		    obj_sym_filepos (output_bfd) + syment_base * osymesz,
-		    SEEK_SET) != 0
-	  || (bfd_write (finfo->outsyms, outsym - finfo->outsyms, 1,
-			output_bfd)
-	      != (bfd_size_type) (outsym - finfo->outsyms)))
-	return false;
-
-      BFD_ASSERT ((obj_raw_syment_count (output_bfd)
-		   + (outsym - finfo->outsyms) / osymesz)
-		  == output_index);
-
-      obj_raw_syment_count (output_bfd) = output_index;
-    }
-
-  /* Relocate the contents of each section.  */
-  adjust_symndx = coff_backend_info (input_bfd)->_bfd_coff_adjust_symndx;
-  for (o = input_bfd->sections; o != NULL; o = o->next)
-    {
-      bfd_byte *contents;
-      struct coff_section_tdata *secdata;
-
-      if (! o->linker_mark)
-	{
-	  /* This section was omitted from the link.  */
-	  continue;
-	}
-
-      if ((o->flags & SEC_HAS_CONTENTS) == 0
-	  || (o->_raw_size == 0 && (o->flags & SEC_RELOC) == 0))
-	{
-	  if ((o->flags & SEC_RELOC) != 0
-	      && o->reloc_count != 0)
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: relocs in section `%s', but it has no contents"),
-		bfd_get_filename (input_bfd),
-		bfd_get_section_name (input_bfd, o)));
-	      bfd_set_error (bfd_error_no_contents);
-	      return false;
-	    }
-
-	  continue;
-	}
-
-      secdata = coff_section_data (input_bfd, o);
-      if (secdata != NULL && secdata->contents != NULL)
-	contents = secdata->contents;
-      else
-	{
-	  if (! bfd_get_section_contents (input_bfd, o, finfo->contents,
-					  (file_ptr) 0, o->_raw_size))
-	    return false;
-	  contents = finfo->contents;
-	}
-
-      if ((o->flags & SEC_RELOC) != 0)
-	{
-	  int target_index;
-	  struct internal_reloc *internal_relocs;
-	  struct internal_reloc *irel;
-
-	  /* Read in the relocs.  */
-	  target_index = o->output_section->target_index;
-	  internal_relocs = (_bfd_coff_read_internal_relocs
-			     (input_bfd, o, false, finfo->external_relocs,
-			      finfo->info->relocateable,
-			      (finfo->info->relocateable
-			       ? (finfo->section_info[target_index].relocs
-				  + o->output_section->reloc_count)
-			       : finfo->internal_relocs)));
-	  if (internal_relocs == NULL)
-	    return false;
-
-	  /* Call processor specific code to relocate the section
-             contents.  */
-	  if (! bfd_coff_relocate_section (output_bfd, finfo->info,
-					   input_bfd, o,
-					   contents,
-					   internal_relocs,
-					   finfo->internal_syms,
-					   finfo->sec_ptrs))
-	    return false;
-
-	  if (finfo->info->relocateable)
-	    {
-	      bfd_vma offset;
-	      struct internal_reloc *irelend;
-	      struct coff_link_hash_entry **rel_hash;
-
-	      offset = o->output_section->vma + o->output_offset - o->vma;
-	      irel = internal_relocs;
-	      irelend = irel + o->reloc_count;
-	      rel_hash = (finfo->section_info[target_index].rel_hashes
-			  + o->output_section->reloc_count);
-	      for (; irel < irelend; irel++, rel_hash++)
-		{
-		  struct coff_link_hash_entry *h;
-		  boolean adjusted;
-
-		  *rel_hash = NULL;
-
-		  /* Adjust the reloc address and symbol index.  */
-
-		  irel->r_vaddr += offset;
-
-		  if (irel->r_symndx == -1)
-		    continue;
-
-		  if (adjust_symndx)
-		    {
-		      if (! (*adjust_symndx) (output_bfd, finfo->info,
-					      input_bfd, o, irel,
-					      &adjusted))
-			return false;
-		      if (adjusted)
-			continue;
-		    }
-
-		  h = obj_coff_sym_hashes (input_bfd)[irel->r_symndx];
-		  if (h != NULL)
-		    {
-		      /* This is a global symbol.  */
-		      if (h->indx >= 0)
-			irel->r_symndx = h->indx;
-		      else
-			{
-			  /* This symbol is being written at the end
-			     of the file, and we do not yet know the
-			     symbol index.  We save the pointer to the
-			     hash table entry in the rel_hash list.
-			     We set the indx field to -2 to indicate
-			     that this symbol must not be stripped.  */
-			  *rel_hash = h;
-			  h->indx = -2;
-			}
-		    }
-		  else
-		    {
-		      long indx;
-
-		      indx = finfo->sym_indices[irel->r_symndx];
-		      if (indx != -1)
-			irel->r_symndx = indx;
-		      else
-			{
-			  struct internal_syment *is;
-			  const char *name;
-			  char buf[SYMNMLEN + 1];
-
-			  /* This reloc is against a symbol we are
-                             stripping.  This should have been handled
-			     by the 'dont_skip_symbol' code in the while
-			     loop at the top of this function. */
-			  
-			  is = finfo->internal_syms + irel->r_symndx;
-
-			  name = (_bfd_coff_internal_syment_name
-				  (input_bfd, is, buf));
-			  if (name == NULL)
-			    return false;
-
-			  if (! ((*finfo->info->callbacks->unattached_reloc)
-				 (finfo->info, name, input_bfd, o,
-				  irel->r_vaddr)))
-			    return false;
-			}
-		    }
-		}
-
-	      o->output_section->reloc_count += o->reloc_count;
-	    }
-	}
-
-      /* Write out the modified section contents.  */
-      if (secdata == NULL || secdata->stab_info == NULL)
-	{
-	  if (! bfd_set_section_contents (output_bfd, o->output_section,
-					  contents, o->output_offset,
-					  (o->_cooked_size != 0
-					   ? o->_cooked_size
-					   : o->_raw_size)))
-	    return false;
-	}
-      else
-	{
-	  if (! (_bfd_write_section_stabs
-		 (output_bfd, &coff_hash_table (finfo->info)->stab_info,
-		  o, &secdata->stab_info, contents)))
-	    return false;
-	}
-    }
-
-  if (! finfo->info->keep_memory)
-    {
-      if (! _bfd_coff_free_symbols (input_bfd))
-	return false;
-    }
-
-  return true;
-}
-
-/* Write out a global symbol.  Called via coff_link_hash_traverse.  */
-
-boolean
-_bfd_coff_write_global_sym (h, data)
-     struct coff_link_hash_entry *h;
-     PTR data;
-{
-  struct coff_final_link_info *finfo = (struct coff_final_link_info *) data;
-  bfd *output_bfd;
-  struct internal_syment isym;
-  bfd_size_type symesz;
-  unsigned int i;
-
-  output_bfd = finfo->output_bfd;
-
-  if (h->indx >= 0)
-    return true;
-
-  if (h->indx != -2
-      && (finfo->info->strip == strip_all
-	  || (finfo->info->strip == strip_some
-	      && (bfd_hash_lookup (finfo->info->keep_hash,
-				   h->root.root.string, false, false)
-		  == NULL))))
-    return true;
-
-  switch (h->root.type)
-    {
-    default:
-    case bfd_link_hash_new:
-      abort ();
-      return false;
-
-    case bfd_link_hash_undefined:
-    case bfd_link_hash_undefweak:
-      isym.n_scnum = N_UNDEF;
-      isym.n_value = 0;
-      break;
-
-    case bfd_link_hash_defined:
-    case bfd_link_hash_defweak:
-      {
-	asection *sec;
-
-	sec = h->root.u.def.section->output_section;
-	if (bfd_is_abs_section (sec))
-	  isym.n_scnum = N_ABS;
-	else
-	  isym.n_scnum = sec->target_index;
-	isym.n_value = (h->root.u.def.value
-			+ h->root.u.def.section->output_offset);
-	if (! obj_pe (finfo->output_bfd))
-	  isym.n_value += sec->vma;
-      }
-      break;
-
-    case bfd_link_hash_common:
-      isym.n_scnum = N_UNDEF;
-      isym.n_value = h->root.u.c.size;
-      break;
-
-    case bfd_link_hash_indirect:
-    case bfd_link_hash_warning:
-      /* Just ignore these.  They can't be handled anyhow.  */
-      return true;
-    }
-
-  if (strlen (h->root.root.string) <= SYMNMLEN)
-    strncpy (isym._n._n_name, h->root.root.string, SYMNMLEN);
-  else
-    {
-      boolean hash;
-      bfd_size_type indx;
-
-      hash = true;
-      if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-	hash = false;
-      indx = _bfd_stringtab_add (finfo->strtab, h->root.root.string, hash,
-				 false);
-      if (indx == (bfd_size_type) -1)
-	{
-	  finfo->failed = true;
-	  return false;
-	}
-      isym._n._n_n._n_zeroes = 0;
-      isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
-    }
-
-  isym.n_sclass = h->class;
-  isym.n_type = h->type;
-
-  if (isym.n_sclass == C_NULL)
-    isym.n_sclass = C_EXT;
-
-  /* If doing task linking and this is the pass where we convert
-     defined globals to statics, then do that conversion now.  If the
-     symbol is not being converted, just ignore it and it will be
-     output during a later pass. */
-  if (finfo->global_to_static)
-    {
-      if (isym.n_sclass != C_EXT
-	  && isym.n_sclass != C_WEAKEXT
-	  && (! obj_pe (output_bfd) || isym.n_sclass != C_NT_WEAK))
-	{
-	  return true;
-	}
-      isym.n_sclass = C_STAT;
-    }
-
-  isym.n_numaux = h->numaux;
-  
-  bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) finfo->outsyms);
-
-  symesz = bfd_coff_symesz (output_bfd);
-
-  if (bfd_seek (output_bfd,
-		(obj_sym_filepos (output_bfd)
-		 + obj_raw_syment_count (output_bfd) * symesz),
-		SEEK_SET) != 0
-      || bfd_write (finfo->outsyms, symesz, 1, output_bfd) != symesz)
-    {
-      finfo->failed = true;
-      return false;
-    }
-
-  h->indx = obj_raw_syment_count (output_bfd);
-
-  ++obj_raw_syment_count (output_bfd);
-
-  /* Write out any associated aux entries.  There normally will be
-     none.  If there are any, I have no idea how to modify them.  */
-  for (i = 0; i < isym.n_numaux; i++)
-    {
-      bfd_coff_swap_aux_out (output_bfd, (PTR) (h->aux + i), isym.n_type,
-			     isym.n_sclass, i, isym.n_numaux,
-			     (PTR) finfo->outsyms);
-      if (bfd_write (finfo->outsyms, symesz, 1, output_bfd) != symesz)
-	{
-	  finfo->failed = true;
-	  return false;
-	}
-      ++obj_raw_syment_count (output_bfd);
-    }
-
-  return true;
-}
-
-/* Write out task global symbols, converting them to statics.  Called
-   via coff_link_hash_traverse.  Calls bfd_coff_write_global_sym to do
-   the dirty work, if the symbol we are processing needs conversion. */
-
-boolean
-_bfd_coff_write_task_globals (h, data)
-     struct coff_link_hash_entry *h;
-     PTR data;
-{
-  struct coff_final_link_info *finfo = (struct coff_final_link_info *) data;
-  boolean rtnval = true;
-  boolean save_global_to_static;
-
-  if (h->indx < 0)
-    {
-      switch (h->root.type)
-	{
-	case bfd_link_hash_defined:
-	case bfd_link_hash_defweak:
-	  save_global_to_static = finfo->global_to_static;
-	  finfo->global_to_static = true;
-	  rtnval = _bfd_coff_write_global_sym (h, data);
-	  finfo->global_to_static = save_global_to_static;
-	  break;
-	default:
-	  break;
-	}
-    }
-  return (rtnval);
-}
-
-/* Handle a link order which is supposed to generate a reloc.  */
-
-boolean
-_bfd_coff_reloc_link_order (output_bfd, finfo, output_section, link_order)
-     bfd *output_bfd;
-     struct coff_final_link_info *finfo;
-     asection *output_section;
-     struct bfd_link_order *link_order;
-{
-  reloc_howto_type *howto;
-  struct internal_reloc *irel;
-  struct coff_link_hash_entry **rel_hash_ptr;
-
-  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
-  if (howto == NULL)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  if (link_order->u.reloc.p->addend != 0)
-    {
-      bfd_size_type size;
-      bfd_byte *buf;
-      bfd_reloc_status_type rstat;
-      boolean ok;
-
-      size = bfd_get_reloc_size (howto);
-      buf = (bfd_byte *) bfd_zmalloc (size);
-      if (buf == NULL)
-	return false;
-
-      rstat = _bfd_relocate_contents (howto, output_bfd,
-				      link_order->u.reloc.p->addend, buf);
-      switch (rstat)
-	{
-	case bfd_reloc_ok:
-	  break;
-	default:
-	case bfd_reloc_outofrange:
-	  abort ();
-	case bfd_reloc_overflow:
-	  if (! ((*finfo->info->callbacks->reloc_overflow)
-		 (finfo->info,
-		  (link_order->type == bfd_section_reloc_link_order
-		   ? bfd_section_name (output_bfd,
-				       link_order->u.reloc.p->u.section)
-		   : link_order->u.reloc.p->u.name),
-		  howto->name, link_order->u.reloc.p->addend,
-		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
-	    {
-	      free (buf);
-	      return false;
-	    }
-	  break;
-	}
-      ok = bfd_set_section_contents (output_bfd, output_section, (PTR) buf,
-				     (file_ptr) link_order->offset, size);
-      free (buf);
-      if (! ok)
-	return false;
-    }
-
-  /* Store the reloc information in the right place.  It will get
-     swapped and written out at the end of the final_link routine.  */
-
-  irel = (finfo->section_info[output_section->target_index].relocs
-	  + output_section->reloc_count);
-  rel_hash_ptr = (finfo->section_info[output_section->target_index].rel_hashes
-		  + output_section->reloc_count);
-
-  memset (irel, 0, sizeof (struct internal_reloc));
-  *rel_hash_ptr = NULL;
-
-  irel->r_vaddr = output_section->vma + link_order->offset;
-
-  if (link_order->type == bfd_section_reloc_link_order)
-    {
-      /* We need to somehow locate a symbol in the right section.  The
-         symbol must either have a value of zero, or we must adjust
-         the addend by the value of the symbol.  FIXME: Write this
-         when we need it.  The old linker couldn't handle this anyhow.  */
-      abort ();
-      *rel_hash_ptr = NULL;
-      irel->r_symndx = 0;
-    }
-  else
-    {
-      struct coff_link_hash_entry *h;
-
-      h = ((struct coff_link_hash_entry *)
-	   bfd_wrapped_link_hash_lookup (output_bfd, finfo->info,
-					 link_order->u.reloc.p->u.name,
-					 false, false, true));
-      if (h != NULL)
-	{
-	  if (h->indx >= 0)
-	    irel->r_symndx = h->indx;
-	  else
-	    {
-	      /* Set the index to -2 to force this symbol to get
-		 written out.  */
-	      h->indx = -2;
-	      *rel_hash_ptr = h;
-	      irel->r_symndx = 0;
-	    }
-	}
-      else
-	{
-	  if (! ((*finfo->info->callbacks->unattached_reloc)
-		 (finfo->info, link_order->u.reloc.p->u.name, (bfd *) NULL,
-		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
-	  irel->r_symndx = 0;
-	}
-    }
-
-  /* FIXME: Is this always right?  */
-  irel->r_type = howto->type;
-
-  /* r_size is only used on the RS/6000, which needs its own linker
-     routines anyhow.  r_extern is only used for ECOFF.  */
-
-  /* FIXME: What is the right value for r_offset?  Is zero OK?  */
-
-  ++output_section->reloc_count;
-
-  return true;
-}
-
-/* A basic reloc handling routine which may be used by processors with
-   simple relocs.  */
-
-boolean
-_bfd_coff_generic_relocate_section (output_bfd, info, input_bfd,
-				    input_section, contents, relocs, syms,
-				    sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc *rel;
-  struct internal_reloc *relend;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      long symndx;
-      struct coff_link_hash_entry *h;
-      struct internal_syment *sym;
-      bfd_vma addend;
-      bfd_vma val;
-      reloc_howto_type *howto;
-      bfd_reloc_status_type rstat;
-
-      symndx = rel->r_symndx;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	}
-      else
-	{    
-	  h = obj_coff_sym_hashes (input_bfd)[symndx];
-	  sym = syms + symndx;
-	}
-
-      /* COFF treats common symbols in one of two ways.  Either the
-         size of the symbol is included in the section contents, or it
-         is not.  We assume that the size is not included, and force
-         the rtype_to_howto function to adjust the addend as needed.  */
-
-      if (sym != NULL && sym->n_scnum != 0)
-	addend = - sym->n_value;
-      else
-	addend = 0;
-
-
-      howto = bfd_coff_rtype_to_howto (input_bfd, input_section, rel, h,
-				       sym, &addend);
-      if (howto == NULL)
-	return false;
-
-      /* If we are doing a relocateable link, then we can just ignore
-         a PC relative reloc that is pcrel_offset.  It will already
-         have the correct value.  If this is not a relocateable link,
-         then we should ignore the symbol value.  */
-      if (howto->pc_relative && howto->pcrel_offset)
-	{
-	  if (info->relocateable)
-	    continue;
-	  if (sym != NULL && sym->n_scnum != 0)
-	    addend += sym->n_value;
-	}
-
-      val = 0;
-
-      if (h == NULL)
-	{
-	  asection *sec;
-
-	  if (symndx == -1)
-	    {
-	      sec = bfd_abs_section_ptr;
-	      val = 0;
-	    }
-	  else
-	    {
-	      sec = sections[symndx];
-              val = (sec->output_section->vma
-		     + sec->output_offset
-		     + sym->n_value);
-	      if (! obj_pe (input_bfd))
-		val -= sec->vma;
-	    }
-	}
-      else
-	{
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      asection *sec;
-
-	      sec = h->root.u.def.section;
-	      val = (h->root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	      }
-
-	  else if (! info->relocateable)
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-	    }
-	}
-
-      if (info->base_file)
-	{
-	  /* Emit a reloc if the backend thinks it needs it. */
-	  if (sym && pe_data (output_bfd)->in_reloc_p (output_bfd, howto))
-	    {
-	      /* Relocation to a symbol in a section which isn't
-		 absolute.  We output the address here to a file.
-		 This file is then read by dlltool when generating the
-		 reloc section.  Note that the base file is not
-		 portable between systems.  We write out a long here,
-		 and dlltool reads in a long.  */
-	      long addr = (rel->r_vaddr 
-			   - input_section->vma 
-			   + input_section->output_offset 
-			   + input_section->output_section->vma);
-	      if (coff_data (output_bfd)->pe)
-		addr -= pe_data(output_bfd)->pe_opthdr.ImageBase;
-	      if (fwrite (&addr, 1, sizeof (long), (FILE *) info->base_file)
-		  != sizeof (long))
-		{
-		  bfd_set_error (bfd_error_system_call);
-		  return false;
-		}
-	    }
-	}
-  
-      rstat = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					contents,
-					rel->r_vaddr - input_section->vma,
-					val, addend);
-
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	case bfd_reloc_ok:
-	  break;
-	case bfd_reloc_outofrange:
-	  (*_bfd_error_handler)
-	    (_("%s: bad reloc address 0x%lx in section `%s'"),
-	     bfd_get_filename (input_bfd),
-	     (unsigned long) rel->r_vaddr,
-	     bfd_get_section_name (input_bfd, input_section));
-	  return false;
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-	    char buf[SYMNMLEN + 1];
-
-	    if (symndx == -1)
-	      name = "*ABS*";
-	    else if (h != NULL)
-	      name = h->root.root.string;
-	    else
-	      {
-		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
-		if (name == NULL)
-		  return false;
-	      }
-
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, (bfd_vma) 0, input_bfd,
-		    input_section, rel->r_vaddr - input_section->vma)))
-	      return false;
-	  }
-	}
-    }
-  return true;
-}
-
diff --git a/bfd/coffswap.h b/bfd/coffswap.h
deleted file mode 100644
index ae30a5d966f..00000000000
--- a/bfd/coffswap.h
+++ /dev/null
@@ -1,908 +0,0 @@
-/* Generic COFF swapping routines, for BFD.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file contains routines used to swap COFF data.  It is a header
-   file because the details of swapping depend on the details of the
-   structures used by each COFF implementation.  This is included by
-   coffcode.h, as well as by the ECOFF backend.
-
-   Any file which uses this must first include "coff/internal.h" and
-   "coff/CPU.h".  The functions will then be correct for that CPU.  */
-
-#ifndef IMAGE_BASE
-#define IMAGE_BASE 0
-#endif
-
-#define PUTWORD bfd_h_put_32
-#define PUTHALF bfd_h_put_16
-#define	PUTBYTE bfd_h_put_8
-
-#ifndef GET_FCN_LNNOPTR
-#define GET_FCN_LNNOPTR(abfd, ext)  bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
-#endif
-
-#ifndef GET_FCN_ENDNDX
-#define GET_FCN_ENDNDX(abfd, ext)  bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_endndx)
-#endif
-
-#ifndef PUT_FCN_LNNOPTR
-#define PUT_FCN_LNNOPTR(abfd, in, ext)  PUTWORD(abfd,  in, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
-#endif
-#ifndef PUT_FCN_ENDNDX
-#define PUT_FCN_ENDNDX(abfd, in, ext) PUTWORD(abfd, in, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_endndx)
-#endif
-#ifndef GET_LNSZ_LNNO
-#define GET_LNSZ_LNNO(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_lnno)
-#endif
-#ifndef GET_LNSZ_SIZE
-#define GET_LNSZ_SIZE(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_size)
-#endif
-#ifndef PUT_LNSZ_LNNO
-#define PUT_LNSZ_LNNO(abfd, in, ext) bfd_h_put_16(abfd, in, (bfd_byte *)ext->x_sym.x_misc.x_lnsz.x_lnno)
-#endif
-#ifndef PUT_LNSZ_SIZE
-#define PUT_LNSZ_SIZE(abfd, in, ext) bfd_h_put_16(abfd, in, (bfd_byte*) ext->x_sym.x_misc.x_lnsz.x_size)
-#endif
-#ifndef GET_SCN_SCNLEN
-#define GET_SCN_SCNLEN(abfd,  ext) bfd_h_get_32(abfd, (bfd_byte *) ext->x_scn.x_scnlen)
-#endif
-#ifndef GET_SCN_NRELOC
-#define GET_SCN_NRELOC(abfd,  ext) bfd_h_get_16(abfd, (bfd_byte *)ext->x_scn.x_nreloc)
-#endif
-#ifndef GET_SCN_NLINNO
-#define GET_SCN_NLINNO(abfd, ext)  bfd_h_get_16(abfd, (bfd_byte *)ext->x_scn.x_nlinno)
-#endif
-#ifndef PUT_SCN_SCNLEN
-#define PUT_SCN_SCNLEN(abfd,in, ext) bfd_h_put_32(abfd, in, (bfd_byte *) ext->x_scn.x_scnlen)
-#endif
-#ifndef PUT_SCN_NRELOC
-#define PUT_SCN_NRELOC(abfd,in, ext) bfd_h_put_16(abfd, in, (bfd_byte *)ext->x_scn.x_nreloc)
-#endif
-#ifndef PUT_SCN_NLINNO
-#define PUT_SCN_NLINNO(abfd,in, ext)  bfd_h_put_16(abfd,in, (bfd_byte  *) ext->x_scn.x_nlinno)
-#endif
-#ifndef GET_LINENO_LNNO
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) (ext->l_lnno));
-#endif
-#ifndef PUT_LINENO_LNNO
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_16(abfd,val,  (bfd_byte *) (ext->l_lnno));
-#endif
-
-/* The f_symptr field in the filehdr is sometimes 64 bits.  */
-#ifndef GET_FILEHDR_SYMPTR
-#define GET_FILEHDR_SYMPTR bfd_h_get_32
-#endif
-#ifndef PUT_FILEHDR_SYMPTR
-#define PUT_FILEHDR_SYMPTR bfd_h_put_32
-#endif
-
-/* Some fields in the aouthdr are sometimes 64 bits.  */
-#ifndef GET_AOUTHDR_TSIZE
-#define GET_AOUTHDR_TSIZE bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_TSIZE
-#define PUT_AOUTHDR_TSIZE bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_DSIZE
-#define GET_AOUTHDR_DSIZE bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_DSIZE
-#define PUT_AOUTHDR_DSIZE bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_BSIZE
-#define GET_AOUTHDR_BSIZE bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_BSIZE
-#define PUT_AOUTHDR_BSIZE bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_ENTRY
-#define GET_AOUTHDR_ENTRY bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_ENTRY
-#define PUT_AOUTHDR_ENTRY bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_TEXT_START
-#define GET_AOUTHDR_TEXT_START bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_TEXT_START
-#define PUT_AOUTHDR_TEXT_START bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_DATA_START
-#define GET_AOUTHDR_DATA_START bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_DATA_START
-#define PUT_AOUTHDR_DATA_START bfd_h_put_32
-#endif
-
-/* Some fields in the scnhdr are sometimes 64 bits.  */
-#ifndef GET_SCNHDR_PADDR
-#define GET_SCNHDR_PADDR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_PADDR
-#define PUT_SCNHDR_PADDR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_VADDR
-#define GET_SCNHDR_VADDR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_VADDR
-#define PUT_SCNHDR_VADDR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_SIZE
-#define GET_SCNHDR_SIZE bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_SIZE
-#define PUT_SCNHDR_SIZE bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_SCNPTR
-#define GET_SCNHDR_SCNPTR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_SCNPTR
-#define PUT_SCNHDR_SCNPTR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_RELPTR
-#define GET_SCNHDR_RELPTR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_RELPTR
-#define PUT_SCNHDR_RELPTR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_LNNOPTR
-#define GET_SCNHDR_LNNOPTR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_LNNOPTR
-#define PUT_SCNHDR_LNNOPTR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_NRELOC
-#define GET_SCNHDR_NRELOC bfd_h_get_16
-#endif
-#ifndef PUT_SCNHDR_NRELOC
-#define PUT_SCNHDR_NRELOC bfd_h_put_16
-#endif
-#ifndef GET_SCNHDR_NLNNO
-#define GET_SCNHDR_NLNNO bfd_h_get_16
-#endif
-#ifndef PUT_SCNHDR_NLNNO
-#define PUT_SCNHDR_NLNNO bfd_h_put_16
-#endif
-#ifndef GET_SCNHDR_FLAGS
-#define GET_SCNHDR_FLAGS bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_FLAGS
-#define PUT_SCNHDR_FLAGS bfd_h_put_32
-#endif
-
-
-static void coff_swap_aouthdr_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_aouthdr_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_scnhdr_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_scnhdr_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_filehdr_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_filehdr_out PARAMS ((bfd *, PTR, PTR));
-#ifndef NO_COFF_RELOCS
-static void coff_swap_reloc_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_reloc_out PARAMS ((bfd *, PTR, PTR));
-#endif /* NO_COFF_RELOCS */
-#ifndef NO_COFF_SYMBOLS
-static void coff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_sym_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_aux_in PARAMS ((bfd *, PTR, int, int, int, int, PTR));
-static unsigned int coff_swap_aux_out PARAMS ((bfd *, PTR, int, int, int, int, PTR));
-#endif /* NO_COFF_SYMBOLS */
-#ifndef NO_COFF_LINENOS
-static void coff_swap_lineno_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_lineno_out PARAMS ((bfd *, PTR, PTR));
-#endif /* NO_COFF_LINENOS */
-
-#ifndef NO_COFF_RELOCS
-
-static void
-coff_swap_reloc_in (abfd, src, dst)
-     bfd *abfd;
-     PTR src;
-     PTR dst;
-{
-  RELOC *reloc_src = (RELOC *) src;
-  struct internal_reloc *reloc_dst = (struct internal_reloc *) dst;
-
-  reloc_dst->r_vaddr = bfd_h_get_32(abfd, (bfd_byte *)reloc_src->r_vaddr);
-  reloc_dst->r_symndx = bfd_h_get_signed_32(abfd, (bfd_byte *) reloc_src->r_symndx);
-
-#ifdef RS6000COFF_C
-  reloc_dst->r_type = bfd_h_get_8(abfd, reloc_src->r_type);
-  reloc_dst->r_size = bfd_h_get_8(abfd, reloc_src->r_size);
-#else
-  reloc_dst->r_type = bfd_h_get_16(abfd, (bfd_byte *) reloc_src->r_type);
-#endif
-
-#ifdef SWAP_IN_RELOC_OFFSET
-  reloc_dst->r_offset = SWAP_IN_RELOC_OFFSET(abfd,
-					     (bfd_byte *) reloc_src->r_offset);
-#endif
-}
-
-static unsigned int
-coff_swap_reloc_out (abfd, src, dst)
-     bfd       *abfd;
-     PTR	src;
-     PTR	dst;
-{
-  struct internal_reloc *reloc_src = (struct internal_reloc *)src;
-  struct external_reloc *reloc_dst = (struct external_reloc *)dst;
-  bfd_h_put_32(abfd, reloc_src->r_vaddr, (bfd_byte *) reloc_dst->r_vaddr);
-  bfd_h_put_32(abfd, reloc_src->r_symndx, (bfd_byte *) reloc_dst->r_symndx);
-
-#ifdef RS6000COFF_C
-  bfd_h_put_8 (abfd, reloc_src->r_type, (bfd_byte *) reloc_dst->r_type);
-  bfd_h_put_8 (abfd, reloc_src->r_size, (bfd_byte *) reloc_dst->r_size);
-#else
-  bfd_h_put_16(abfd, reloc_src->r_type, (bfd_byte *)
-	       reloc_dst->r_type);
-#endif
-
-#ifdef SWAP_OUT_RELOC_OFFSET
-  SWAP_OUT_RELOC_OFFSET(abfd,
-			reloc_src->r_offset,
-			(bfd_byte *) reloc_dst->r_offset);
-#endif
-#ifdef SWAP_OUT_RELOC_EXTRA
-  SWAP_OUT_RELOC_EXTRA(abfd,reloc_src, reloc_dst);
-#endif
-
-  return RELSZ;
-}
-
-#endif /* NO_COFF_RELOCS */
-
-static void
-coff_swap_filehdr_in (abfd, src, dst)
-     bfd            *abfd;
-     PTR	     src;
-     PTR	     dst;
-{
-  FILHDR *filehdr_src = (FILHDR *) src;
-  struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
-#ifdef COFF_ADJUST_FILEHDR_IN_PRE
-  COFF_ADJUST_FILEHDR_IN_PRE (abfd, src, dst);
-#endif
-  filehdr_dst->f_magic = bfd_h_get_16(abfd, (bfd_byte *) filehdr_src->f_magic);
-  filehdr_dst->f_nscns = bfd_h_get_16(abfd, (bfd_byte *)filehdr_src-> f_nscns);
-  filehdr_dst->f_timdat = bfd_h_get_32(abfd, (bfd_byte *)filehdr_src-> f_timdat);
-  filehdr_dst->f_symptr =
-    GET_FILEHDR_SYMPTR (abfd, (bfd_byte *) filehdr_src->f_symptr);
-  filehdr_dst->f_nsyms = bfd_h_get_32(abfd, (bfd_byte *)filehdr_src-> f_nsyms);
-  filehdr_dst->f_opthdr = bfd_h_get_16(abfd, (bfd_byte *)filehdr_src-> f_opthdr);
-  filehdr_dst->f_flags = bfd_h_get_16(abfd, (bfd_byte *)filehdr_src-> f_flags);
-#ifdef TIC80_TARGET_ID
-  filehdr_dst->f_target_id = bfd_h_get_16(abfd, (bfd_byte *)filehdr_src-> f_target_id);
-#endif
-
-#ifdef COFF_ADJUST_FILEHDR_IN_POST
-  COFF_ADJUST_FILEHDR_IN_POST (abfd, src, dst);
-#endif
-}
-
-static  unsigned int
-coff_swap_filehdr_out (abfd, in, out)
-     bfd       *abfd;
-     PTR	in;
-     PTR	out;
-{
-  struct internal_filehdr *filehdr_in = (struct internal_filehdr *)in;
-  FILHDR *filehdr_out = (FILHDR *)out;
-
-#ifdef COFF_ADJUST_FILEHDR_OUT_PRE
-  COFF_ADJUST_FILEHDR_OUT_PRE (abfd, in, out);
-#endif
-  bfd_h_put_16(abfd, filehdr_in->f_magic, (bfd_byte *) filehdr_out->f_magic);
-  bfd_h_put_16(abfd, filehdr_in->f_nscns, (bfd_byte *) filehdr_out->f_nscns);
-  bfd_h_put_32(abfd, filehdr_in->f_timdat, (bfd_byte *) filehdr_out->f_timdat);
-  PUT_FILEHDR_SYMPTR (abfd, (bfd_vma) filehdr_in->f_symptr,
-		      (bfd_byte *) filehdr_out->f_symptr);
-  bfd_h_put_32(abfd, filehdr_in->f_nsyms, (bfd_byte *) filehdr_out->f_nsyms);
-  bfd_h_put_16(abfd, filehdr_in->f_opthdr, (bfd_byte *) filehdr_out->f_opthdr);
-  bfd_h_put_16(abfd, filehdr_in->f_flags, (bfd_byte *) filehdr_out->f_flags);
-#ifdef TIC80_TARGET_ID
-  bfd_h_put_16(abfd, filehdr_in->f_target_id, (bfd_byte *) filehdr_out->f_target_id);
-#endif
-
-#ifdef COFF_ADJUST_FILEHDR_OUT_POST
-  COFF_ADJUST_FILEHDR_OUT_POST (abfd, in, out);
-#endif
-  return FILHSZ;
-}
-
-
-#ifndef NO_COFF_SYMBOLS
-
-static void
-coff_swap_sym_in (abfd, ext1, in1)
-     bfd            *abfd;
-     PTR ext1;
-     PTR in1;
-{
-  SYMENT *ext = (SYMENT *)ext1;
-  struct internal_syment      *in = (struct internal_syment *)in1;
-
-  if( ext->e.e_name[0] == 0) {
-    in->_n._n_n._n_zeroes = 0;
-    in->_n._n_n._n_offset = bfd_h_get_32(abfd, (bfd_byte *) ext->e.e.e_offset);
-  }
-  else {
-#if SYMNMLEN != E_SYMNMLEN
-   -> Error, we need to cope with truncating or extending SYMNMLEN!;
-#else
-    memcpy(in->_n._n_name, ext->e.e_name, SYMNMLEN);
-#endif
-  }
-  in->n_value = bfd_h_get_32(abfd, (bfd_byte *) ext->e_value); 
-  in->n_scnum = bfd_h_get_16(abfd, (bfd_byte *) ext->e_scnum);
-  if (sizeof(ext->e_type) == 2){
-    in->n_type = bfd_h_get_16(abfd, (bfd_byte *) ext->e_type);
-  }
-  else {
-    in->n_type = bfd_h_get_32(abfd, (bfd_byte *) ext->e_type);
-  }
-  in->n_sclass = bfd_h_get_8(abfd, ext->e_sclass);
-  in->n_numaux = bfd_h_get_8(abfd, ext->e_numaux);
-}
-
-static unsigned int
-coff_swap_sym_out (abfd, inp, extp)
-     bfd       *abfd;
-     PTR	inp;
-     PTR	extp;
-{
-  struct internal_syment *in = (struct internal_syment *)inp;
-  SYMENT *ext =(SYMENT *)extp;
-  if(in->_n._n_name[0] == 0) {
-    bfd_h_put_32(abfd, 0, (bfd_byte *) ext->e.e.e_zeroes);
-    bfd_h_put_32(abfd, in->_n._n_n._n_offset, (bfd_byte *)  ext->e.e.e_offset);
-  }
-  else {
-#if SYMNMLEN != E_SYMNMLEN
-    -> Error, we need to cope with truncating or extending SYMNMLEN!;
-#else
-    memcpy(ext->e.e_name, in->_n._n_name, SYMNMLEN);
-#endif
-  }
-  bfd_h_put_32(abfd,  in->n_value , (bfd_byte *) ext->e_value);
-  bfd_h_put_16(abfd,  in->n_scnum , (bfd_byte *) ext->e_scnum);
-  if (sizeof(ext->e_type) == 2)
-      {
-	bfd_h_put_16(abfd,  in->n_type , (bfd_byte *) ext->e_type);
-      }
-  else
-      {
-	bfd_h_put_32(abfd,  in->n_type , (bfd_byte *) ext->e_type);
-      }
-  bfd_h_put_8(abfd,  in->n_sclass , ext->e_sclass);
-  bfd_h_put_8(abfd,  in->n_numaux , ext->e_numaux);
-  return SYMESZ;
-}
-
-static void
-coff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
-     bfd            *abfd;
-     PTR 	      ext1;
-     int             type;
-     int             class;
-     int	      indx;
-     int	      numaux;
-     PTR 	      in1;
-{
-  AUXENT    *ext = (AUXENT *)ext1;
-  union internal_auxent *in = (union internal_auxent *)in1;
-
-#ifdef COFF_ADJUST_AUX_IN_PRE
-  COFF_ADJUST_AUX_IN_PRE (abfd, ext1, type, class, indx, numaux, in1);
-#endif
-  switch (class) {
-    case C_FILE:
-      if (ext->x_file.x_fname[0] == 0) {
-	  in->x_file.x_n.x_zeroes = 0;
-	  in->x_file.x_n.x_offset = 
-	   bfd_h_get_32(abfd, (bfd_byte *) ext->x_file.x_n.x_offset);
-	} else {
-#if FILNMLEN != E_FILNMLEN
-	    -> Error, we need to cope with truncating or extending FILNMLEN!;
-#else
-	    memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN);
-#endif
-	  }
-      goto end;
-
-      /* RS/6000 "csect" auxents */
-#ifdef RS6000COFF_C
-    case C_EXT:
-    case C_HIDEXT:
-      if (indx + 1 == numaux)
-	{
-	  in->x_csect.x_scnlen.l = bfd_h_get_32 (abfd, ext->x_csect.x_scnlen);
-	  in->x_csect.x_parmhash = bfd_h_get_32 (abfd,
-						 ext->x_csect.x_parmhash);
-	  in->x_csect.x_snhash   = bfd_h_get_16 (abfd, ext->x_csect.x_snhash);
-	  /* We don't have to hack bitfields in x_smtyp because it's
-	     defined by shifts-and-ands, which are equivalent on all
-	     byte orders.  */
-	  in->x_csect.x_smtyp    = bfd_h_get_8  (abfd, ext->x_csect.x_smtyp);
-	  in->x_csect.x_smclas   = bfd_h_get_8  (abfd, ext->x_csect.x_smclas);
-	  in->x_csect.x_stab     = bfd_h_get_32 (abfd, ext->x_csect.x_stab);
-	  in->x_csect.x_snstab   = bfd_h_get_16 (abfd, ext->x_csect.x_snstab);
-	  goto end;
-	}
-      break;
-#endif
-
-    case C_STAT:
-#ifdef C_LEAFSTAT
-    case C_LEAFSTAT:
-#endif
-    case C_HIDDEN:
-      if (type == T_NULL) {
-	  in->x_scn.x_scnlen = GET_SCN_SCNLEN(abfd, ext);
-	  in->x_scn.x_nreloc = GET_SCN_NRELOC(abfd, ext);
-	  in->x_scn.x_nlinno = GET_SCN_NLINNO(abfd, ext);
-
-	  /* PE defines some extra fields; we zero them out for
-             safety.  */
-	  in->x_scn.x_checksum = 0;
-	  in->x_scn.x_associated = 0;
-	  in->x_scn.x_comdat = 0;
-
-	  goto end;
-	}
-      break;
-    }
-
-  in->x_sym.x_tagndx.l = bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_tagndx);
-#ifndef NO_TVNDX
-  in->x_sym.x_tvndx = bfd_h_get_16(abfd, (bfd_byte *) ext->x_sym.x_tvndx);
-#endif
-
-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-    {
-      in->x_sym.x_fcnary.x_fcn.x_lnnoptr = GET_FCN_LNNOPTR (abfd, ext);
-      in->x_sym.x_fcnary.x_fcn.x_endndx.l = GET_FCN_ENDNDX (abfd, ext);
-    }
-  else
-    {
-#if DIMNUM != E_DIMNUM
- #error we need to cope with truncating or extending DIMNUM
-#endif
-      in->x_sym.x_fcnary.x_ary.x_dimen[0] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
-      in->x_sym.x_fcnary.x_ary.x_dimen[1] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
-      in->x_sym.x_fcnary.x_ary.x_dimen[2] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
-      in->x_sym.x_fcnary.x_ary.x_dimen[3] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
-    }
-
-  if (ISFCN(type)) {
-    in->x_sym.x_misc.x_fsize = bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_misc.x_fsize);
-  }
-  else {
-    in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO(abfd, ext);
-    in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE(abfd, ext);
-  }
-
-end: ;
-  /* the semicolon is because MSVC doesn't like labels at
-     end of block. */
-
-#ifdef COFF_ADJUST_AUX_IN_POST
-  COFF_ADJUST_AUX_IN_POST (abfd, ext1, type, class, indx, numaux, in1);
-#endif
-}
-
-static unsigned int
-coff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
-     bfd   *abfd;
-     PTR 	inp;
-     int   type;
-     int   class;
-     int   indx;
-     int   numaux;
-     PTR	extp;
-{
-  union internal_auxent *in = (union internal_auxent *)inp;
-  AUXENT *ext = (AUXENT *)extp;
-
-#ifdef COFF_ADJUST_AUX_OUT_PRE
-  COFF_ADJUST_AUX_OUT_PRE (abfd, inp, type, class, indx, numaux, extp);
-#endif
-  memset((PTR)ext, 0, AUXESZ);
-  switch (class) {
-  case C_FILE:
-    if (in->x_file.x_fname[0] == 0) {
-      PUTWORD(abfd, 0, (bfd_byte *) ext->x_file.x_n.x_zeroes);
-      PUTWORD(abfd,
-	      in->x_file.x_n.x_offset,
-	      (bfd_byte *) ext->x_file.x_n.x_offset);
-    }
-    else {
-#if FILNMLEN != E_FILNMLEN
-      -> Error, we need to cope with truncating or extending FILNMLEN!;
-#else
-      memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN);
-#endif
-    }
-    goto end;
-
-#ifdef RS6000COFF_C
-  /* RS/6000 "csect" auxents */
-  case C_EXT:
-  case C_HIDEXT:
-    if (indx + 1 == numaux)
-      {
-	PUTWORD (abfd, in->x_csect.x_scnlen.l,	ext->x_csect.x_scnlen);
-	PUTWORD (abfd, in->x_csect.x_parmhash,	ext->x_csect.x_parmhash);
-	PUTHALF (abfd, in->x_csect.x_snhash,	ext->x_csect.x_snhash);
-	/* We don't have to hack bitfields in x_smtyp because it's
-	   defined by shifts-and-ands, which are equivalent on all
-	   byte orders.  */
-	PUTBYTE (abfd, in->x_csect.x_smtyp,	ext->x_csect.x_smtyp);
-	PUTBYTE (abfd, in->x_csect.x_smclas,	ext->x_csect.x_smclas);
-	PUTWORD (abfd, in->x_csect.x_stab,	ext->x_csect.x_stab);
-	PUTHALF (abfd, in->x_csect.x_snstab,	ext->x_csect.x_snstab);
-	goto end;
-      }
-    break;
-#endif
-
-  case C_STAT:
-#ifdef C_LEAFSTAT
-  case C_LEAFSTAT:
-#endif
-  case C_HIDDEN:
-    if (type == T_NULL) {
-      PUT_SCN_SCNLEN(abfd, in->x_scn.x_scnlen, ext);
-      PUT_SCN_NRELOC(abfd, in->x_scn.x_nreloc, ext);
-      PUT_SCN_NLINNO(abfd, in->x_scn.x_nlinno, ext);
-      goto end;
-    }
-    break;
-  }
-
-  PUTWORD(abfd, in->x_sym.x_tagndx.l, (bfd_byte *) ext->x_sym.x_tagndx);
-#ifndef NO_TVNDX
-  bfd_h_put_16(abfd, in->x_sym.x_tvndx , (bfd_byte *) ext->x_sym.x_tvndx);
-#endif
-
-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-    {
-      PUT_FCN_LNNOPTR(abfd,  in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext);
-      PUT_FCN_ENDNDX(abfd,  in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
-    }
-  else
-    {
-#if DIMNUM != E_DIMNUM
- #error we need to cope with truncating or extending DIMNUM
-#endif
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[0],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[1],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[2],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[3],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
-    }
-
-  if (ISFCN (type))
-    PUTWORD (abfd, in->x_sym.x_misc.x_fsize,
-	     (bfd_byte *)  ext->x_sym.x_misc.x_fsize);
-  else
-    {
-      PUT_LNSZ_LNNO (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
-      PUT_LNSZ_SIZE (abfd, in->x_sym.x_misc.x_lnsz.x_size, ext);
-    }
-
-end:
-#ifdef COFF_ADJUST_AUX_OUT_POST
-  COFF_ADJUST_AUX_OUT_POST (abfd, inp, type, class, indx, numaux, extp);
-#endif
-  return AUXESZ;
-}
-
-#endif /* NO_COFF_SYMBOLS */
-
-#ifndef NO_COFF_LINENOS
-
-static void
-coff_swap_lineno_in (abfd, ext1, in1)
-     bfd            *abfd;
-     PTR ext1;
-     PTR in1;
-{
-  LINENO *ext = (LINENO *)ext1;
-  struct internal_lineno      *in = (struct internal_lineno *)in1;
-
-  in->l_addr.l_symndx = bfd_h_get_32(abfd, (bfd_byte *) ext->l_addr.l_symndx);
-  in->l_lnno = GET_LINENO_LNNO(abfd, ext);
-}
-
-static unsigned int
-coff_swap_lineno_out (abfd, inp, outp)
-     bfd       *abfd;
-     PTR	inp;
-     PTR	outp;
-{
-  struct internal_lineno *in = (struct internal_lineno *)inp;
-  struct external_lineno *ext = (struct external_lineno *)outp;
-  PUTWORD(abfd, in->l_addr.l_symndx, (bfd_byte *)
-	  ext->l_addr.l_symndx);
-
-  PUT_LINENO_LNNO (abfd, in->l_lnno, ext);
-  return LINESZ;
-}
-
-#endif /* NO_COFF_LINENOS */
-
-static void
-coff_swap_aouthdr_in (abfd, aouthdr_ext1, aouthdr_int1)
-     bfd            *abfd;
-     PTR aouthdr_ext1;
-     PTR aouthdr_int1;
-{
-  AOUTHDR        *aouthdr_ext = (AOUTHDR *) aouthdr_ext1;
-  struct internal_aouthdr *aouthdr_int = (struct internal_aouthdr *)aouthdr_int1;
-
-  aouthdr_int->magic = bfd_h_get_16(abfd, (bfd_byte *) aouthdr_ext->magic);
-  aouthdr_int->vstamp = bfd_h_get_16(abfd, (bfd_byte *) aouthdr_ext->vstamp);
-  aouthdr_int->tsize =
-    GET_AOUTHDR_TSIZE (abfd, (bfd_byte *) aouthdr_ext->tsize);
-  aouthdr_int->dsize =
-    GET_AOUTHDR_DSIZE (abfd, (bfd_byte *) aouthdr_ext->dsize);
-  aouthdr_int->bsize =
-    GET_AOUTHDR_BSIZE (abfd, (bfd_byte *) aouthdr_ext->bsize);
-  aouthdr_int->entry =
-    GET_AOUTHDR_ENTRY (abfd, (bfd_byte *) aouthdr_ext->entry);
-  aouthdr_int->text_start =
-    GET_AOUTHDR_TEXT_START (abfd, (bfd_byte *) aouthdr_ext->text_start);
-  aouthdr_int->data_start =
-    GET_AOUTHDR_DATA_START (abfd, (bfd_byte *) aouthdr_ext->data_start);
-
-#ifdef I960
-  aouthdr_int->tagentries = bfd_h_get_32(abfd, (bfd_byte *) aouthdr_ext->tagentries);
-#endif
-
-#ifdef APOLLO_M68
-  bfd_h_put_32(abfd, aouthdr_int->o_inlib, (bfd_byte *) aouthdr_ext->o_inlib);
-  bfd_h_put_32(abfd, aouthdr_int->o_sri, (bfd_byte *) aouthdr_ext->o_sri);
-  bfd_h_put_32(abfd, aouthdr_int->vid[0], (bfd_byte *) aouthdr_ext->vid);
-  bfd_h_put_32(abfd, aouthdr_int->vid[1], (bfd_byte *) aouthdr_ext->vid + 4);
-#endif
-
-
-#ifdef RS6000COFF_C
-  aouthdr_int->o_toc = bfd_h_get_32(abfd, aouthdr_ext->o_toc);
-  aouthdr_int->o_snentry = bfd_h_get_16(abfd, aouthdr_ext->o_snentry);
-  aouthdr_int->o_sntext = bfd_h_get_16(abfd, aouthdr_ext->o_sntext);
-  aouthdr_int->o_sndata = bfd_h_get_16(abfd, aouthdr_ext->o_sndata);
-  aouthdr_int->o_sntoc = bfd_h_get_16(abfd, aouthdr_ext->o_sntoc);
-  aouthdr_int->o_snloader = bfd_h_get_16(abfd, aouthdr_ext->o_snloader);
-  aouthdr_int->o_snbss = bfd_h_get_16(abfd, aouthdr_ext->o_snbss);
-  aouthdr_int->o_algntext = bfd_h_get_16(abfd, aouthdr_ext->o_algntext);
-  aouthdr_int->o_algndata = bfd_h_get_16(abfd, aouthdr_ext->o_algndata);
-  aouthdr_int->o_modtype = bfd_h_get_16(abfd, aouthdr_ext->o_modtype);
-  aouthdr_int->o_cputype = bfd_h_get_16(abfd, aouthdr_ext->o_cputype);
-  aouthdr_int->o_maxstack = bfd_h_get_32(abfd, aouthdr_ext->o_maxstack);
-  aouthdr_int->o_maxdata = bfd_h_get_32(abfd, aouthdr_ext->o_maxdata);
-#endif
-
-#ifdef MIPSECOFF
-  aouthdr_int->bss_start = bfd_h_get_32(abfd, aouthdr_ext->bss_start);
-  aouthdr_int->gp_value = bfd_h_get_32(abfd, aouthdr_ext->gp_value);
-  aouthdr_int->gprmask = bfd_h_get_32(abfd, aouthdr_ext->gprmask);
-  aouthdr_int->cprmask[0] = bfd_h_get_32(abfd, aouthdr_ext->cprmask[0]);
-  aouthdr_int->cprmask[1] = bfd_h_get_32(abfd, aouthdr_ext->cprmask[1]);
-  aouthdr_int->cprmask[2] = bfd_h_get_32(abfd, aouthdr_ext->cprmask[2]);
-  aouthdr_int->cprmask[3] = bfd_h_get_32(abfd, aouthdr_ext->cprmask[3]);
-#endif
-
-#ifdef ALPHAECOFF
-  aouthdr_int->bss_start = bfd_h_get_64(abfd, aouthdr_ext->bss_start);
-  aouthdr_int->gp_value = bfd_h_get_64(abfd, aouthdr_ext->gp_value);
-  aouthdr_int->gprmask = bfd_h_get_32(abfd, aouthdr_ext->gprmask);
-  aouthdr_int->fprmask = bfd_h_get_32(abfd, aouthdr_ext->fprmask);
-#endif
-}
-
-static unsigned int
-coff_swap_aouthdr_out (abfd, in, out)
-     bfd       *abfd;
-     PTR	in;
-     PTR	out;
-{
-  struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *)in;
-  AOUTHDR *aouthdr_out = (AOUTHDR *)out;
-
-  bfd_h_put_16(abfd, aouthdr_in->magic, (bfd_byte *) aouthdr_out->magic);
-  bfd_h_put_16(abfd, aouthdr_in->vstamp, (bfd_byte *) aouthdr_out->vstamp);
-  PUT_AOUTHDR_TSIZE (abfd, aouthdr_in->tsize, (bfd_byte *) aouthdr_out->tsize);
-  PUT_AOUTHDR_DSIZE (abfd, aouthdr_in->dsize, (bfd_byte *) aouthdr_out->dsize);
-  PUT_AOUTHDR_BSIZE (abfd, aouthdr_in->bsize, (bfd_byte *) aouthdr_out->bsize);
-  PUT_AOUTHDR_ENTRY (abfd, aouthdr_in->entry, (bfd_byte *) aouthdr_out->entry);
-  PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
-			  (bfd_byte *) aouthdr_out->text_start);
-  PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
-			  (bfd_byte *) aouthdr_out->data_start);
-
-#ifdef I960
-  bfd_h_put_32(abfd, aouthdr_in->tagentries, (bfd_byte *) aouthdr_out->tagentries);
-#endif
-
-#ifdef RS6000COFF_C
-  bfd_h_put_32 (abfd, aouthdr_in->o_toc, aouthdr_out->o_toc);
-  bfd_h_put_16 (abfd, aouthdr_in->o_snentry, aouthdr_out->o_snentry);
-  bfd_h_put_16 (abfd, aouthdr_in->o_sntext, aouthdr_out->o_sntext);
-  bfd_h_put_16 (abfd, aouthdr_in->o_sndata, aouthdr_out->o_sndata);
-  bfd_h_put_16 (abfd, aouthdr_in->o_sntoc, aouthdr_out->o_sntoc);
-  bfd_h_put_16 (abfd, aouthdr_in->o_snloader, aouthdr_out->o_snloader);
-  bfd_h_put_16 (abfd, aouthdr_in->o_snbss, aouthdr_out->o_snbss);
-  bfd_h_put_16 (abfd, aouthdr_in->o_algntext, aouthdr_out->o_algntext);
-  bfd_h_put_16 (abfd, aouthdr_in->o_algndata, aouthdr_out->o_algndata);
-  bfd_h_put_16 (abfd, aouthdr_in->o_modtype, aouthdr_out->o_modtype);
-  bfd_h_put_16 (abfd, aouthdr_in->o_cputype, aouthdr_out->o_cputype);
-  bfd_h_put_32 (abfd, aouthdr_in->o_maxstack, aouthdr_out->o_maxstack);
-  bfd_h_put_32 (abfd, aouthdr_in->o_maxdata, aouthdr_out->o_maxdata);
-  memset (aouthdr_out->o_resv2, 0, sizeof aouthdr_out->o_resv2);
-#endif
-
-#ifdef MIPSECOFF
-  bfd_h_put_32(abfd, aouthdr_in->bss_start, (bfd_byte *) aouthdr_out->bss_start);
-  bfd_h_put_32(abfd, aouthdr_in->gp_value, (bfd_byte *) aouthdr_out->gp_value);
-  bfd_h_put_32(abfd, aouthdr_in->gprmask, (bfd_byte *) aouthdr_out->gprmask);
-  bfd_h_put_32(abfd, aouthdr_in->cprmask[0], (bfd_byte *) aouthdr_out->cprmask[0]);
-  bfd_h_put_32(abfd, aouthdr_in->cprmask[1], (bfd_byte *) aouthdr_out->cprmask[1]);
-  bfd_h_put_32(abfd, aouthdr_in->cprmask[2], (bfd_byte *) aouthdr_out->cprmask[2]);
-  bfd_h_put_32(abfd, aouthdr_in->cprmask[3], (bfd_byte *) aouthdr_out->cprmask[3]);
-#endif
-
-#ifdef ALPHAECOFF
-  /* FIXME: What does bldrev mean?  */
-  bfd_h_put_16(abfd, (bfd_vma) 2, (bfd_byte *) aouthdr_out->bldrev);
-  bfd_h_put_16(abfd, (bfd_vma) 0, (bfd_byte *) aouthdr_out->padding);
-  bfd_h_put_64(abfd, aouthdr_in->bss_start, (bfd_byte *) aouthdr_out->bss_start);
-  bfd_h_put_64(abfd, aouthdr_in->gp_value, (bfd_byte *) aouthdr_out->gp_value);
-  bfd_h_put_32(abfd, aouthdr_in->gprmask, (bfd_byte *) aouthdr_out->gprmask);
-  bfd_h_put_32(abfd, aouthdr_in->fprmask, (bfd_byte *) aouthdr_out->fprmask);
-#endif
-
-  return AOUTSZ;
-}
-
-static void
-coff_swap_scnhdr_in (abfd, ext, in)
-     bfd            *abfd;
-     PTR	     ext;
-     PTR	     in;
-{
-  SCNHDR *scnhdr_ext = (SCNHDR *) ext;
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
-
-#ifdef COFF_ADJUST_SCNHDR_IN_PRE
-  COFF_ADJUST_SCNHDR_IN_PRE (abfd, ext, in);
-#endif
-  memcpy(scnhdr_int->s_name, scnhdr_ext->s_name, sizeof(scnhdr_int->s_name));
-  scnhdr_int->s_vaddr =
-    GET_SCNHDR_VADDR (abfd, (bfd_byte *) scnhdr_ext->s_vaddr);
-  scnhdr_int->s_paddr =
-    GET_SCNHDR_PADDR (abfd, (bfd_byte *) scnhdr_ext->s_paddr);
-  scnhdr_int->s_size =
-    GET_SCNHDR_SIZE (abfd, (bfd_byte *) scnhdr_ext->s_size);
-
-  scnhdr_int->s_scnptr =
-    GET_SCNHDR_SCNPTR (abfd, (bfd_byte *) scnhdr_ext->s_scnptr);
-  scnhdr_int->s_relptr =
-    GET_SCNHDR_RELPTR (abfd, (bfd_byte *) scnhdr_ext->s_relptr);
-  scnhdr_int->s_lnnoptr =
-    GET_SCNHDR_LNNOPTR (abfd, (bfd_byte *) scnhdr_ext->s_lnnoptr);
-  scnhdr_int->s_flags =
-    GET_SCNHDR_FLAGS (abfd, (bfd_byte *) scnhdr_ext->s_flags);
-  scnhdr_int->s_nreloc =
-    GET_SCNHDR_NRELOC (abfd, (bfd_byte *) scnhdr_ext->s_nreloc);
-  scnhdr_int->s_nlnno =
-    GET_SCNHDR_NLNNO (abfd, (bfd_byte *) scnhdr_ext->s_nlnno);
-#ifdef I960
-  scnhdr_int->s_align =
-    GET_SCNHDR_ALIGN (abfd, (bfd_byte *) scnhdr_ext->s_align);
-#endif
-#ifdef COFF_ADJUST_SCNHDR_IN_POST
-  COFF_ADJUST_SCNHDR_IN_POST (abfd, ext, in);
-#endif
-}
-
-static unsigned int
-coff_swap_scnhdr_out (abfd, in, out)
-     bfd       *abfd;
-     PTR	in;
-     PTR	out;
-{
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *)in;
-  SCNHDR *scnhdr_ext = (SCNHDR *)out;
-  unsigned int ret = SCNHSZ;
-
-#ifdef COFF_ADJUST_SCNHDR_OUT_PRE
-  COFF_ADJUST_SCNHDR_OUT_PRE (abfd, in, out);
-#endif
-  memcpy(scnhdr_ext->s_name, scnhdr_int->s_name, sizeof(scnhdr_int->s_name));
-
-  PUT_SCNHDR_VADDR (abfd, scnhdr_int->s_vaddr,
-		    (bfd_byte *) scnhdr_ext->s_vaddr);
-
-
-  PUT_SCNHDR_PADDR (abfd, scnhdr_int->s_paddr,
-		    (bfd_byte *) scnhdr_ext->s_paddr);
-  PUT_SCNHDR_SIZE (abfd, scnhdr_int->s_size,
-		   (bfd_byte *) scnhdr_ext->s_size);
-
-  PUT_SCNHDR_SCNPTR (abfd, scnhdr_int->s_scnptr,
-		     (bfd_byte *) scnhdr_ext->s_scnptr);
-  PUT_SCNHDR_RELPTR (abfd, scnhdr_int->s_relptr,
-		     (bfd_byte *) scnhdr_ext->s_relptr);
-  PUT_SCNHDR_LNNOPTR (abfd, scnhdr_int->s_lnnoptr,
-		      (bfd_byte *) scnhdr_ext->s_lnnoptr);
-  PUT_SCNHDR_FLAGS (abfd, scnhdr_int->s_flags,
-		    (bfd_byte *) scnhdr_ext->s_flags);
-#if defined(M88)
-  PUTWORD(abfd, scnhdr_int->s_nlnno, (bfd_byte *) scnhdr_ext->s_nlnno);
-  PUTWORD(abfd, scnhdr_int->s_nreloc, (bfd_byte *) scnhdr_ext->s_nreloc);
-#else
-  if (scnhdr_int->s_nlnno <= 0xffff)
-    PUTHALF(abfd, scnhdr_int->s_nlnno, (bfd_byte *) scnhdr_ext->s_nlnno);
-  else
-    {
-      char buf[sizeof (scnhdr_int->s_name) + 1];
-
-      memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
-      buf[sizeof (scnhdr_int->s_name)] = '\0';
-      (*_bfd_error_handler)
-	(_("%s: warning: %s: line number overflow: 0x%lx > 0xffff"),
-	 bfd_get_filename (abfd),
-	 buf, scnhdr_int->s_nlnno);
-      PUTHALF (abfd, 0xffff, (bfd_byte *) scnhdr_ext->s_nlnno);
-    }
-  if (scnhdr_int->s_nreloc <= 0xffff)
-    PUTHALF(abfd, scnhdr_int->s_nreloc, (bfd_byte *) scnhdr_ext->s_nreloc);
-  else
-    {
-      char buf[sizeof (scnhdr_int->s_name) + 1];
-
-      memcpy (buf, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
-      buf[sizeof (scnhdr_int->s_name)] = '\0';
-      (*_bfd_error_handler) (_("%s: %s: reloc overflow: 0x%lx > 0xffff"),
-			     bfd_get_filename (abfd),
-			     buf, scnhdr_int->s_nreloc);
-      bfd_set_error (bfd_error_file_truncated);
-      PUTHALF (abfd, 0xffff, (bfd_byte *) scnhdr_ext->s_nreloc);
-      ret = 0;
-    }
-#endif
-
-#ifdef I960
-  PUT_SCNHDR_ALIGN (abfd, scnhdr_int->s_align, (bfd_byte *) scnhdr_ext->s_align);
-#endif
-#ifdef COFF_ADJUST_SCNHDR_OUT_POST
-  COFF_ADJUST_SCNHDR_OUT_POST (abfd, in, out);
-#endif
-  return ret;
-}
diff --git a/bfd/config.bfd b/bfd/config.bfd
deleted file mode 100644
index 449ae915b1d..00000000000
--- a/bfd/config.bfd
+++ /dev/null
@@ -1,719 +0,0 @@
-# config.bfd
-# Convert a canonical host type into a BFD host type.
-# Set shell variable targ to canonical target name, and run
-# using ``. config.bfd''.
-# Sets the following shell variables:
-#  targ_defvec		Default vector for this target
-#  targ_selvecs		Vectors to build for this target
-#  targ_archs		Architectures for this target
-#  targ_cflags		$(CFLAGS) for this target (FIXME: pretty bogus)
-#  targ_underscore	Whether underscores are used: yes or no
-
-# Part of this file is processed by targmatch.sed to generate the
-# targmatch.h file.  The #ifdef and #endif lines that appear below are
-# copied directly into targmatch.h.
-
-# The binutils c++filt program wants to know whether underscores are
-# stripped or not.  That is why we set targ_underscore.  c++filt uses
-# this information to choose a default.  This information is
-# duplicated in the symbol_leading_char field of the BFD target
-# vector, but c++filt does not deal with object files and is not
-# linked against libbfd.a.  It is not terribly important that c++filt
-# get this right; it is just convenient.
-
-targ_defvec=
-targ_selvecs=
-targ_cflags=
-targ_underscore=no
-
-targ_cpu=`echo $targ | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-case "${targ_cpu}" in
-alpha*) targ_archs=bfd_alpha_arch ;;
-arm*)	targ_archs=bfd_arm_arch ;;
-strongarm*) targ_archs=bfd_arm_arch ;;
-thumb*)	targ_archs=bfd_arm_arch ;;
-c30*)	targ_archs=bfd_tic30_arch ;;
-hppa*)	targ_archs=bfd_hppa_arch ;;
-i[3456]86) targ_archs=bfd_i386_arch ;;
-m68*)	targ_archs=bfd_m68k_arch ;;
-m88*)	targ_archs=bfd_m88k_arch ;;
-mips*)	targ_archs=bfd_mips_arch ;;
-powerpc*) targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
-rs6000)	targ_archs="bfd_rs6000_arch bfd_powerpc_arch" ;;
-sparc*) targ_archs=bfd_sparc_arch ;;
-v850*)	targ_archs=bfd_v850_arch ;;
-z8k*)	targ_archs=bfd_z8k_arch ;;
-*)	targ_archs=bfd_${targ_cpu}_arch ;;
-esac
-
-
-# WHEN ADDING ENTRIES TO THIS MATRIX:
-#  Make sure that the left side always has two dashes.  Otherwise you
-#  can get spurious matches.  Even for unambiguous cases, do this as a
-#  convention, else the table becomes a real mess to understand and maintain.
-
-case "${targ}" in
-# START OF targmatch.h
-#ifdef BFD64
-  alpha*-*-netbsd*)
-    targ_defvec=bfd_elf64_alpha_vec
-    targ_selvecs=ecoffalpha_little_vec
-    ;;
-  alpha*-*-netware*)
-    targ_defvec=ecoffalpha_little_vec
-    targ_selvecs=nlm32_alpha_vec
-    ;;
-  alpha*-*-linuxecoff*)
-    targ_defvec=ecoffalpha_little_vec
-    targ_selvecs=bfd_elf64_alpha_vec
-    ;;
-  alpha*-*-linux-gnu* | alpha*-*-elf*)
-    targ_defvec=bfd_elf64_alpha_vec
-    targ_selvecs=ecoffalpha_little_vec
-    ;;
-  alpha*-*-*vms*)
-    targ_defvec=vms_alpha_vec
-    ;;
-  alpha*-*-*)
-    targ_defvec=ecoffalpha_little_vec
-    ;;
-#endif /* BFD64 */
-
-  arc-*-elf*)
-    targ_defvec=bfd_elf32_littlearc_vec
-    targ_selvecs=bfd_elf32_bigarc_vec
-    ;;
-
-  arm-*-riscix*)
-    targ_defvec=riscix_vec
-    ;;
-  arm-epoc-pe*)
-    targ_defvec=arm_epoc_pe_little_vec
-    targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
-    targ_underscore=no
-    ;;
-  arm-*-pe*)
-    targ_defvec=armpe_little_vec
-    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
-    targ_underscore=yes
-    ;;
-  arm-*-aout | armel-*-aout)	
-    targ_defvec=aout_arm_little_vec
-    targ_selvecs=aout_arm_big_vec
-    ;;
-  armeb-*-aout)
-    targ_defvec=aout_arm_big_vec
-    targ_selvecs=aout_arm_little_vec
-    ;;
-  arm-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
-    targ_underscore=yes
-    ;;
-  arm-*-elf | arm*-*-linux-gnu)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  arm-*-oabi)
-    targ_defvec=bfd_elf32_littlearm_oabi_vec
-    targ_selvecs=bfd_elf32_bigarm_oabi_vec
-    ;;
-
-  thumb-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
-    targ_underscore=yes
-    ;;
-  thumb-*-oabi)
-    targ_defvec=bfd_elf32_littlearm_oabi_vec
-    targ_selvecs=bfd_elf32_bigarm_oabi_vec
-    ;;
-  thumb-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  thumb-epoc-pe*)
-    targ_defvec=arm_epoc_pe_little_vec
-    targ_selvecs="arm_epoc_pe_little_vec arm_epoc_pe_big_vec arm_epoc_pei_little_vec arm_epoc_pei_big_vec"
-    targ_underscore=no
-    ;;
-  thumb-*-pe*)
-    targ_defvec=armpe_little_vec
-    targ_selvecs="armpe_little_vec armpe_big_vec armpei_little_vec armpei_big_vec"
-    targ_underscore=yes
-    ;;
-  strongarm-*-elf)
-    targ_defvec=bfd_elf32_littlearm_vec
-    targ_selvecs=bfd_elf32_bigarm_vec
-    ;;
-  strongarm-*-coff)
-    targ_defvec=armcoff_little_vec
-    targ_selvecs=armcoff_big_vec
-    targ_underscore=yes
-    ;;
-
-  a29k-*-ebmon* | a29k-*-udi* | a29k-*-coff* | a29k-*-sym1* | \
-  a29k-*-vxworks* | a29k-*-sysv*)
-    targ_defvec=a29kcoff_big_vec
-    targ_selvecs=sunos_big_vec
-    targ_underscore=yes
-    ;;
-  a29k-*-aout* | a29k-*-bsd* | a29k-*-vsta*)
-    targ_defvec=sunos_big_vec
-    targ_underscore=yes
-    ;;
-
-  c30-*-*aout* | tic30-*-*aout*)
-    targ_defvec=tic30_aout_vec
-    ;;
-  c30-*-*coff* | tic30-*-*coff*)
-    targ_defvec=tic30_coff_vec
-    ;;
-
-  d10v-*-*)
-    targ_defvec=bfd_elf32_d10v_vec
-    ;;
-
-  d30v-*-*)
-    targ_defvec=bfd_elf32_d30v_vec
-    ;;
-
-  fr30-*-elf)
-    targ_defvec=bfd_elf32_fr30_vec
-    ;;
-
-
-  h8300*-*-*)
-    targ_defvec=h8300coff_vec
-    targ_underscore=yes
-    ;;
-
-  h8500-*-*)
-    targ_defvec=h8500coff_vec
-    targ_underscore=yes
-    ;;
-
-  hppa*-*-*elf* | hppa*-*-lites* | hppa*-*-sysv4* | hppa*-*-rtems*)
-    targ_defvec=bfd_elf32_hppa_vec
-    ;;
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) || defined (HOST_HPPAMPEIX)
-  hppa*-*-bsd*)
-    targ_defvec=som_vec
-    targ_selvecs=bfd_elf32_hppa_vec
-    ;;
-  hppa*-*-hpux* | hppa*-*-hiux* | hppa*-*-mpeix*)
-    targ_defvec=som_vec
-    ;;
-  hppa*-*-osf*)
-    targ_defvec=som_vec
-    targ_selvecs=bfd_elf32_hppa_vec
-    ;;
-#endif /* defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) */
-
-  i[3456]86-*-sco3.2v5*coff)
-    targ_defvec=i386coff_vec
-    targ_selvecs=bfd_elf32_i386_vec
-    ;;
-  i[3456]86-*-sysv4* | i[3456]86-*-unixware | i[3456]86-*-solaris2* | \
-  i[3456]86-*-elf | i[3456]86-*-sco3.2v5* | i[3456]86-*-freebsdelf* | \
-  i[3456]86-*-dgux* | i[3456]86-*-sysv5*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=i386coff_vec
-    ;;
-  i[3456]86-*-msdosdjgpp* | i[3456]*-*-go32* | i[3456]86-go32-rtems* )
-    targ_defvec=go32coff_vec
-    targ_selvecs="go32stubbedcoff_vec i386aout_vec"
-    ;;
-  i[3456]86-*-sysv* | i[3456]86-*-isc* | i[3456]86-*-sco* | i[3456]86-*-coff | \
-  i[3456]86-*-aix* | i[3456]86*-*-rtems*)
-    targ_defvec=i386coff_vec
-    ;;
-  i[3456]86-sequent-bsd*)
-    targ_defvec=i386dynix_vec
-    targ_underscore=yes
-    ;;
-  i[3456]86-*-bsd*)
-    targ_defvec=i386bsd_vec
-    targ_underscore=yes
-    ;;
-  i[3456]86-*-freebsd*)
-    targ_defvec=i386freebsd_vec
-    targ_selvecs=i386bsd_vec
-    targ_underscore=yes
-    ;;
-  i[3456]86-*-netbsd* | i[3456]86-*-openbsd*)
-    targ_defvec=i386netbsd_vec
-    targ_selvecs=i386bsd_vec
-    targ_underscore=yes
-    ;;
-  i[3456]86-*-netware*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="nlm32_i386_vec i386coff_vec i386aout_vec"
-    ;;
-  i[3456]86-*-linux*aout*)
-    targ_defvec=i386linux_vec
-    targ_selvecs=bfd_elf32_i386_vec
-    targ_underscore=yes
-    ;;
-  i[3456]86-*-linux-gnu*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs=i386linux_vec
-    ;;
-  i[3456]86-*-lynxos*)
-    targ_defvec=i386lynx_coff_vec
-    targ_selvecs=i386lynx_aout_vec
-    ;;
-  i[3456]86-*-gnu*)
-    targ_defvec=bfd_elf32_i386_vec
-    ;;
-  i[3456]86-*-mach* | i[3456]86-*-osf1mk*)
-    targ_defvec=i386mach3_vec
-    targ_cflags=-DSTAT_FOR_EXEC
-    targ_underscore=yes
-    ;;
-  i[3456]86-*-os9k)
-    targ_defvec=i386os9k_vec
-    ;;
-  i[3456]86-*-msdos*)
-    targ_defvec=i386aout_vec
-    targ_selvecs=i386msdos_vec
-    ;;
-  i[3456]86-*-moss*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="i386msdos_vec i386aout_vec"
-    ;;
-  i[3456]86-*-beospe*)
-    targ_defvec=i386pe_vec
-    targ_selvecs="i386pe_vec i386pei_vec"
-    ;;
-  i[3456]86-*-beoself* | i[3456]86-*-beos*)
-    targ_defvec=bfd_elf32_i386_vec
-    targ_selvecs="i386pe_vec i386pei_vec"
-    ;;
-  i[3456]86-*-mingw32* | i[3456]86-*-cygwin* | i[3456]86-*-winnt | i[3456]86-*-pe)
-    targ_defvec=i386pe_vec
-    targ_selvecs="i386pe_vec i386pei_vec"
-    ;;
-  i[3456]86-none-*)
-    targ_defvec=i386coff_vec
-    ;;
-  i[3456]86-*-aout* | i[3456]86*-*-vsta*)
-    targ_defvec=i386aout_vec
-    ;;
-
-  i860-*-mach3* | i860-*-osf1* | i860-*-coff*)
-    targ_defvec=i860coff_vec
-    ;;
-  i860-*-sysv4* | i860-*-elf*)
-    targ_defvec=bfd_elf32_i860_vec
-    ;;
-
-  i960-*-vxworks4* | i960-*-vxworks5.0)
-    targ_defvec=b_out_vec_little_host
-    targ_selvecs="b_out_vec_big_host icoff_little_vec icoff_big_vec ieee_vec"
-    targ_underscore=yes
-    ;;
-  i960-*-vxworks5.* | i960-*-coff* | i960-*-sysv* | i960-*-rtems*)
-    targ_defvec=icoff_little_vec
-    targ_selvecs="icoff_big_vec b_out_vec_little_host b_out_vec_big_host ieee_vec"
-    targ_underscore=yes
-    ;;
-  i960-*-vxworks* | i960-*-aout* | i960-*-bout* | i960-*-nindy*)
-    targ_defvec=b_out_vec_little_host
-    targ_selvecs="b_out_vec_big_host icoff_little_vec icoff_big_vec ieee_vec"
-    targ_underscore=yes
-    ;;
-
-  m32r-*-*)
-    targ_defvec=bfd_elf32_m32r_vec
-    ;;
-
-  m68*-apollo-*)
-    targ_defvec=apollocoff_vec
-    ;;
-  m68*-bull-sysv*)
-    targ_defvec=m68kcoffun_vec
-    targ_underscore=yes
-    ;;
-  m68*-motorola-sysv*)
-    targ_defvec=m68ksysvcoff_vec
-    ;;
-  m68*-hp-bsd*)
-    targ_defvec=hp300bsd_vec
-    targ_underscore=yes
-    ;;
-  m68*-*-aout*)
-    targ_defvec=aout0_big_vec
-    # We include cisco_core_vec here, rather than making a separate cisco
-    # configuration, so that cisco-core.c gets routinely tested at
-    # least for compilation.
-    targ_selvecs="cisco_core_vec ieee_vec"
-    targ_underscore=yes
-    ;;
-  m68*-*-elf* | m68*-*-sysv4*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs="m68kcoff_vec ieee_vec"
-    ;;
-  m68*-*-coff* | m68*-*-sysv* | m68*-*-rtems*)
-    targ_defvec=m68kcoff_vec
-    targ_selvecs="m68kcoff_vec versados_vec ieee_vec"
-    ;;
-  m68*-*-hpux*)
-    targ_defvec=hp300hpux_vec
-    targ_underscore=yes
-    ;;
-  m68*-*-linux*aout*)
-    targ_defvec=m68klinux_vec
-    targ_selvecs=bfd_elf32_m68k_vec
-    targ_underscore=yes
-    ;;
-  m68*-*-linux-gnu*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs=m68klinux_vec
-    ;;
-  m68*-*-gnu*)
-    targ_defvec=bfd_elf32_m68k_vec
-    # targ_selvecs=m68kmach3_vec
-    # targ_cflags=-DSTAT_FOR_EXEC
-    ;;
-  m68*-*-lynxos*)
-    targ_defvec=m68klynx_coff_vec
-    targ_selvecs=m68klynx_aout_vec
-    ;;
-  m68*-hp*-netbsd*)
-    targ_defvec=m68k4knetbsd_vec
-    targ_selvecs="m68knetbsd_vec hp300bsd_vec sunos_big_vec"
-    targ_underscore=yes
-    ;;
-  m68*-*-netbsd* | m68*-*-openbsd*)
-    targ_defvec=m68knetbsd_vec
-    targ_selvecs="m68k4knetbsd_vec hp300bsd_vec sunos_big_vec"
-    targ_underscore=yes
-    ;;
-  m68*-*-sunos* | m68*-*-os68k* | m68*-*-vxworks* | m68*-netx-* | \
-  m68*-*-bsd* | m68*-*-vsta*)
-    targ_defvec=sunos_big_vec
-    targ_underscore=yes
-    ;;
-  m68*-ericsson-*)
-    targ_defvec=sunos_big_vec
-    targ_selvecs="m68kcoff_vec versados_vec tekhex_vec"
-    targ_underscore=yes
-    ;;
-  m68*-cbm-*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs=m68kcoff_vec
-    ;;
-  m68*-apple-aux*)
-    targ_defvec=m68kaux_coff_vec
-    ;;
-  m68*-*-psos*)
-    targ_defvec=bfd_elf32_m68k_vec
-    targ_selvecs=ieee_vec
-    targ_underscore=yes
-    ;;
-
-  m88*-harris-cxux* | m88*-*-dgux* | m88*-*-sysv4*)
-    targ_defvec=bfd_elf32_m88k_vec
-    targ_selvecs=m88kbcs_vec
-    ;;
-  m88*-*-mach3*)
-    targ_defvec=m88kmach3_vec
-    targ_cflags=-DSTAT_FOR_EXEC
-    ;;
-  m88*-*-*)
-    targ_defvec=m88kbcs_vec
-    targ_underscore=yes
-    ;;
-
-  mcore-*-elf)
-    targ_defvec=bfd_elf32_mcore_big_vec
-    targ_selvecs="bfd_elf32_mcore_big_vec bfd_elf32_mcore_little_vec"
-    ;;
-  mcore-*-pe)
-    targ_defvec=mcore_pe_big_vec
-    targ_selvecs="mcore_pe_big_vec mcore_pe_little_vec mcore_pei_big_vec mcore_pei_little_vec"
-    ;;
-
-  mips*-big-*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
-    ;;
-  mips-dec-netbsd* | mips*el*-*-netbsd*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs="bfd_elf32_bigmips_vec ecoff_little_vec ecoff_big_vec"
-    ;;
- mips*-*-netbsd*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
-    ;;
-  mips*-dec-bsd*)
-    targ_defvec=aout_mips_little_vec
-    targ_underscore=yes
-    ;;
-  mips*-dec-mach3*)
-    targ_defvec=aout_mips_little_vec
-    targ_cflags=-DSTAT_FOR_EXEC
-    ;;
-  mips*-dec-* | mips*el-*-ecoff*)
-    targ_defvec=ecoff_little_vec
-    targ_selvecs=ecoff_big_vec
-    ;;
-  mips*-*-ecoff*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
-    ;;
-  mips*-*-irix6*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
-    ;;
-  mips*-*-irix5*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
-    ;;
-  mips*-sgi-* | mips*-*-bsd*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
-    ;;
-  mips*-*-lnews*)
-    targ_defvec=ecoff_biglittle_vec
-    targ_selvecs="ecoff_little_vec ecoff_big_vec"
-    ;;
-  mips*-*-mach3*)
-    targ_defvec=aout_mips_little_vec
-    targ_cflags=-DSTAT_FOR_EXEC
-    ;;
-  mips*-*-sysv4*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec ecoff_big_vec ecoff_little_vec"
-    ;;
-  mips*-*-sysv* | mips*-*-riscos*)
-    targ_defvec=ecoff_big_vec
-    targ_selvecs=ecoff_little_vec
-    ;;
-  mips*el-*-elf* | mips*el-*-vxworks*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
-    ;;
-  mips*-*-elf* | mips*-*-rtems* | mips*-*-vxworks*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
-    ;;
-  mips*-*-none)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec"
-    ;;
-  mips*el*-*-linux-gnu* | mips*el*-*-openbsd*)
-    targ_defvec=bfd_elf32_littlemips_vec
-    targ_selvecs="bfd_elf32_bigmips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_little_vec ecoff_big_vec"
-    ;;
-  mips*-*-linux-gnu* | mips*-*-openbsd*)
-    targ_defvec=bfd_elf32_bigmips_vec
-    targ_selvecs="bfd_elf32_littlemips_vec bfd_elf64_bigmips_vec bfd_elf64_littlemips_vec ecoff_big_vec ecoff_little_vec"
-    ;;
-
-  mn10200-*-*)
-    targ_defvec=bfd_elf32_mn10200_vec
-    ;;
-
-  mn10300-*-*)
-    targ_defvec=bfd_elf32_mn10300_vec
-    ;;
-
-  ns32k-pc532-mach* | ns32k-pc532-ux*)
-    targ_defvec=pc532machaout_vec
-    targ_underscore=yes
-    ;;
-  ns32k-*-netbsd* | ns32k-*-lites* | ns32k-*-openbsd*)
-    targ_defvec=pc532netbsd_vec
-    targ_underscore=yes
-    ;;
-
-  powerpc-*-aix* | powerpc-*-beos*)
-    targ_defvec=rs6000coff_vec
-    ;;
-  powerpc-*-*bsd* | powerpc-*-elf* | powerpc-*-sysv4* | powerpc-*-eabi* | \
-  powerpc-*-solaris2* | powerpc-*-linux-gnu* | powerpc-*-rtems* | \
-  powerpc-*-vxworks*)
-    targ_defvec=bfd_elf32_powerpc_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpcle_vec ppcboot_vec"
-    ;;
-  powerpc-*-macos* | powerpc-*-mpw*)
-    targ_defvec=pmac_xcoff_vec
-    ;;
-  powerpc-*-netware*)
-    targ_defvec=bfd_elf32_powerpc_vec
-    targ_selvecs="nlm32_powerpc_vec rs6000coff_vec"
-    ;;
-  powerpcle-*-elf* | powerpcle-*-sysv4* | powerpcle-*-eabi* | \
-  powerpcle-*-solaris2* | powerpcle-*-linux-gnu* | powerpcle-*-vxworks*)
-    targ_defvec=bfd_elf32_powerpcle_vec
-    targ_selvecs="rs6000coff_vec bfd_elf32_powerpc_vec ppcboot_vec"
-    ;;
-
-  powerpcle-*-pe | powerpcle-*-winnt* | powerpcle-*-cygwin*)
-    targ_defvec=bfd_powerpcle_pe_vec
-    targ_selvecs="bfd_powerpcle_pei_vec bfd_powerpc_pei_vec bfd_powerpcle_pe_vec bfd_powerpc_pe_vec"
-    ;;
-
-  rs6000-*-*)
-    targ_defvec=rs6000coff_vec
-    ;;
-
-  sh-*-elf*)
-    targ_defvec=bfd_elf32_sh_vec
-    targ_selvecs="bfd_elf32_shl_vec shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
-    targ_underscore=yes
-    ;;
-  sh-*-* | sh-*-rtems*)
-    targ_defvec=shcoff_vec
-    targ_selvecs="shcoff_vec shlcoff_vec shcoff_small_vec shlcoff_small_vec"
-    targ_underscore=yes
-    ;;
-
-  sparclet-*-aout*)
-    targ_defvec=sunos_big_vec
-    targ_selvecs=sparcle_aout_vec
-    targ_underscore=yes
-    ;;
-  sparc86x-*-aout*)
-    targ_defvec=sunos_big_vec
-    targ_underscore=yes
-    ;;
-  sparclite-*-elf* | sparc86x-*-elf*)
-    targ_defvec=bfd_elf32_sparc_vec
-    ;;
-  sparc-*-linux*aout*)
-    targ_defvec=sparclinux_vec
-    targ_selvecs="bfd_elf32_sparc_vec sunos_big_vec"
-    targ_underscore=yes
-    ;;
-  sparc-*-linux-gnu*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs="sparclinux_vec sunos_big_vec"
-    ;;
-  sparc-*-lynxos*)
-    targ_defvec=sparclynx_coff_vec
-    targ_selvecs=sparclynx_aout_vec
-    ;;
-  sparc-*-netbsd* | sparc-*-openbsd*)
-    targ_defvec=sparcnetbsd_vec
-    targ_underscore=yes
-    ;;
-  sparc-*-elf* | sparc-*-solaris2*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs=sunos_big_vec
-    ;;
-  sparc-*-sysv4*)
-    targ_defvec=bfd_elf32_sparc_vec
-    ;;
-  sparc-*-netware*)
-    targ_defvec=bfd_elf32_sparc_vec
-    targ_selvecs="nlm32_sparc_vec sunos_big_vec"
-    ;;
-#ifdef BFD64
-  sparc64-*-aout*)
-    targ_defvec=sunos_big_vec
-    targ_underscore=yes
-    ;;
-  sparc64-*-linux-gnu*)
-    targ_defvec=bfd_elf64_sparc_vec
-    targ_selvecs="bfd_elf32_sparc_vec sparclinux_vec sunos_big_vec"
-    ;;
-  sparc64-*-elf*)
-    targ_defvec=bfd_elf64_sparc_vec
-    targ_selvecs=bfd_elf32_sparc_vec
-    ;;    
-#endif /* BFD64 */
-  sparc*-*-coff*)
-    targ_defvec=sparccoff_vec
-    ;;
-  sparc*-*-* | sparc*-*-rtems*)
-    targ_defvec=sunos_big_vec
-    targ_underscore=yes
-    ;;
-
-#if HAVE_host_aout_vec
-  tahoe-*-*)
-    targ_defvec=host_aout_vec
-    targ_underscore=yes
-    ;;
-#endif
-
-  tic80*-*-*)
-    targ_defvec=tic80coff_vec
-    targ_underscore=yes
-    ;;
-
-
-  v850-*-*)
-    targ_defvec=bfd_elf32_v850_vec
-    ;;
-  v850e-*-*)
-    targ_defvec=bfd_elf32_v850_vec
-    ;;
-  v850ea-*-*)
-    targ_defvec=bfd_elf32_v850_vec
-    ;;
-#if HAVE_host_aout_vec
-  vax-*-bsd* | vax-*-ultrix*)
-    targ_defvec=host_aout_vec
-    targ_underscore=yes
-    ;;
-#endif
-
-  vax*-*-*vms*)
-    targ_defvec=vms_vax_vec
-    ;;
-
-  we32k-*-*)
-    targ_defvec=we32kcoff_vec
-    ;;
-
-  w65-*-*)
-    targ_defvec=w65_vec
-    ;;
-
-  z8k*-*-*)
-    targ_defvec=z8kcoff_vec
-    targ_underscore=yes
-    ;;
-
-  *-*-ieee*)
-    targ_defvec=ieee_vec
-    ;;
-
-  *-adobe-*)
-    targ_defvec=a_out_adobe_vec
-    targ_underscore=yes
-    ;;
-
-  *-sony-*)
-    targ_defvec=newsos3_vec
-    targ_underscore=yes
-    ;;
-
-  *-tandem-*)
-    targ_defvec=m68kcoff_vec
-    targ_selvecs=ieee_vec
-    ;;
-# END OF targmatch.h
-  *)
-    echo 1>&2 "*** BFD does not support target ${targ}."
-    echo 1>&2 "*** Look in bfd/config.bfd for supported targets."
-    exit 1
-    ;;
-esac
-
-# If we support any ELF target, then automatically add support for the
-# generic ELF targets.  This permits an objdump with some ELF support
-# to be used on an arbitrary ELF file for anything other than
-# relocation information.
-case "${targ_defvec} ${targ_selvecs}" in
-  *bfd_elf64*)
-    targ_selvecs="${targ_selvecs} bfd_elf64_little_generic_vec bfd_elf64_big_generic_vec bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec"
-    ;;
-  *bfd_elf32*)
-    targ_selvecs="${targ_selvecs} bfd_elf32_little_generic_vec bfd_elf32_big_generic_vec"
-    ;;
-esac
diff --git a/bfd/config.in b/bfd/config.in
deleted file mode 100644
index 51fa45b6928..00000000000
--- a/bfd/config.in
+++ /dev/null
@@ -1,234 +0,0 @@
-/* config.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to empty if the keyword does not work.  */
-#undef const
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you have a working `mmap' system call.  */
-#undef HAVE_MMAP
-
-/* Define as __inline if that's what the C compiler calls it.  */
-#undef inline
-
-/* Define to `long' if <sys/types.h> doesn't define.  */
-#undef off_t
-
-/* Define if you need to in order for stat and other things to work.  */
-#undef _POSIX_SOURCE
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* Define if you can safely include both <sys/time.h> and <time.h>.  */
-#undef TIME_WITH_SYS_TIME
-
-/* Define if you have the __argz_count function.  */
-#undef HAVE___ARGZ_COUNT
-
-/* Define if you have the __argz_next function.  */
-#undef HAVE___ARGZ_NEXT
-
-/* Define if you have the __argz_stringify function.  */
-#undef HAVE___ARGZ_STRINGIFY
-
-/* Define if you have the dcgettext function.  */
-#undef HAVE_DCGETTEXT
-
-/* Define if you have the fcntl function.  */
-#undef HAVE_FCNTL
-
-/* Define if you have the fdopen function.  */
-#undef HAVE_FDOPEN
-
-/* Define if you have the getcwd function.  */
-#undef HAVE_GETCWD
-
-/* Define if you have the getpagesize function.  */
-#undef HAVE_GETPAGESIZE
-
-/* Define if you have the madvise function.  */
-#undef HAVE_MADVISE
-
-/* Define if you have the mprotect function.  */
-#undef HAVE_MPROTECT
-
-/* Define if you have the munmap function.  */
-#undef HAVE_MUNMAP
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the setenv function.  */
-#undef HAVE_SETENV
-
-/* Define if you have the setitimer function.  */
-#undef HAVE_SETITIMER
-
-/* Define if you have the setlocale function.  */
-#undef HAVE_SETLOCALE
-
-/* Define if you have the stpcpy function.  */
-#undef HAVE_STPCPY
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strchr function.  */
-#undef HAVE_STRCHR
-
-/* Define if you have the sysconf function.  */
-#undef HAVE_SYSCONF
-
-/* Define if you have the <argz.h> header file.  */
-#undef HAVE_ARGZ_H
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <locale.h> header file.  */
-#undef HAVE_LOCALE_H
-
-/* Define if you have the <malloc.h> header file.  */
-#undef HAVE_MALLOC_H
-
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <nl_types.h> header file.  */
-#undef HAVE_NL_TYPES_H
-
-/* Define if you have the <stddef.h> header file.  */
-#undef HAVE_STDDEF_H
-
-/* Define if you have the <stdlib.h> header file.  */
-#undef HAVE_STDLIB_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <strings.h> header file.  */
-#undef HAVE_STRINGS_H
-
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/file.h> header file.  */
-#undef HAVE_SYS_FILE_H
-
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <sys/param.h> header file.  */
-#undef HAVE_SYS_PARAM_H
-
-/* Define if you have the <sys/procfs.h> header file.  */
-#undef HAVE_SYS_PROCFS_H
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <time.h> header file.  */
-#undef HAVE_TIME_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <values.h> header file.  */
-#undef HAVE_VALUES_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Version number of package */
-#undef VERSION
-
-/* Define if you have the stpcpy function */
-#undef HAVE_STPCPY
-
-/* Define if your locale.h file contains LC_MESSAGES. */
-#undef HAVE_LC_MESSAGES
-
-/* Define to 1 if NLS is requested */
-#undef ENABLE_NLS
-
-/* Define as 1 if you have gettext and don't want to use GNU gettext. */
-#undef HAVE_GETTEXT
-
-/* Use b modifier when opening binary files? */
-#undef USE_BINARY_FOPEN
-
-/* Define if strstr is not declared in system header files. */
-#undef NEED_DECLARATION_STRSTR
-
-/* Define if malloc is not declared in system header files. */
-#undef NEED_DECLARATION_MALLOC
-
-/* Define if realloc is not declared in system header files. */
-#undef NEED_DECLARATION_REALLOC
-
-/* Define if free is not declared in system header files. */
-#undef NEED_DECLARATION_FREE
-
-/* Define if getenv is not declared in system header files. */
-#undef NEED_DECLARATION_GETENV
-
-/* Define if <sys/procfs.h> has prstatus_t. */
-#undef HAVE_PRSTATUS_T
-
-/* Define if <sys/procfs.h> has prstatus_t.pr_who. */
-#undef HAVE_PRSTATUS_T_PR_WHO
-
-/* Define if <sys/procfs.h> has pstatus_t. */
-#undef HAVE_PSTATUS_T
-
-/* Define if <sys/procfs.h> has prpsinfo_t. */
-#undef HAVE_PRPSINFO_T
-
-/* Define if <sys/procfs.h> has psinfo_t. */
-#undef HAVE_PSINFO_T
-
-/* Define if <sys/procfs.h> has lwpstatus_t. */
-#undef HAVE_LWPSTATUS_T
-
-/* Define if <sys/procfs.h> has lwpstatus_t.pr_context. */
-#undef HAVE_LWPSTATUS_T_PR_CONTEXT
-
-/* Define if <sys/procfs.h> has lwpstatus_t.pr_reg. */
-#undef HAVE_LWPSTATUS_T_PR_REG
-
-/* Name of host specific header file to include in trad-core.c. */
-#undef TRAD_HEADER
-
-/* Use mmap if it's available? */
-#undef USE_MMAP
-
diff --git a/bfd/configure b/bfd/configure
deleted file mode 100755
index f6ca66fae69..00000000000
--- a/bfd/configure
+++ /dev/null
@@ -1,5987 +0,0 @@
-#! /bin/sh
-
-# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.13 
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
-#
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-
-# Defaults:
-ac_help=
-ac_default_prefix=/usr/local
-# Any additions from configure.in:
-ac_help="$ac_help
-  --enable-shared[=PKGS]  build shared libraries [default=no]"
-ac_help="$ac_help
-  --enable-static[=PKGS]  build static libraries [default=yes]"
-ac_help="$ac_help
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
-ac_help="$ac_help
-  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)"
-ac_help="$ac_help
-  --enable-targets        alternative target configurations"
-ac_help="$ac_help
-  --enable-commonbfdlib   build shared BFD/opcodes/libiberty library"
-ac_help="$ac_help
-  --with-mmap             try using mmap for BFD input files if available"
-ac_help="$ac_help
-  --enable-maintainer-mode enable make rules and dependencies not useful
-                          (and sometimes confusing) to the casual installer"
-ac_help="$ac_help
-  --disable-nls           do not use Native Language Support"
-ac_help="$ac_help
-  --with-included-gettext use the GNU gettext library included here"
-
-# Initialize some variables set by options.
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-build=NONE
-cache_file=./config.cache
-exec_prefix=NONE
-host=NONE
-no_create=
-nonopt=NONE
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-target=NONE
-verbose=
-x_includes=NONE
-x_libraries=NONE
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-# Initialize some other variables.
-subdirs=
-MFLAGS= MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-# Maximum number of lines to put in a shell here document.
-ac_max_here_lines=12
-
-ac_prev=
-for ac_option
-do
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  case "$ac_option" in
-  -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) ac_optarg= ;;
-  esac
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case "$ac_option" in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir="$ac_optarg" ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build="$ac_optarg" ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file="$ac_optarg" ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir="$ac_optarg" ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    eval "enable_${ac_feature}=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; }
-    fi
-    ac_feature=`echo $ac_feature| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_${ac_feature}='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix="$ac_optarg" ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he)
-    # Omit some internal or obsolete options to make the list less imposing.
-    # This message is too long to be a string in the A/UX 3.1 sh.
-    cat << EOF
-Usage: configure [options] [host]
-Options: [defaults in brackets after descriptions]
-Configuration:
-  --cache-file=FILE       cache test results in FILE
-  --help                  print this message
-  --no-create             do not create output files
-  --quiet, --silent       do not print \`checking...' messages
-  --version               print the version of autoconf that created configure
-Directory and file names:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-                          [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-                          [same as prefix]
-  --bindir=DIR            user executables in DIR [EPREFIX/bin]
-  --sbindir=DIR           system admin executables in DIR [EPREFIX/sbin]
-  --libexecdir=DIR        program executables in DIR [EPREFIX/libexec]
-  --datadir=DIR           read-only architecture-independent data in DIR
-                          [PREFIX/share]
-  --sysconfdir=DIR        read-only single-machine data in DIR [PREFIX/etc]
-  --sharedstatedir=DIR    modifiable architecture-independent data in DIR
-                          [PREFIX/com]
-  --localstatedir=DIR     modifiable single-machine data in DIR [PREFIX/var]
-  --libdir=DIR            object code libraries in DIR [EPREFIX/lib]
-  --includedir=DIR        C header files in DIR [PREFIX/include]
-  --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
-  --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
-  --srcdir=DIR            find the sources in DIR [configure dir or ..]
-  --program-prefix=PREFIX prepend PREFIX to installed program names
-  --program-suffix=SUFFIX append SUFFIX to installed program names
-  --program-transform-name=PROGRAM
-                          run sed PROGRAM on installed program names
-EOF
-    cat << EOF
-Host type:
-  --build=BUILD           configure for building on BUILD [BUILD=HOST]
-  --host=HOST             configure for HOST [guessed]
-  --target=TARGET         configure for TARGET [TARGET=HOST]
-Features and packages:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --x-includes=DIR        X include files are in DIR
-  --x-libraries=DIR       X library files are in DIR
-EOF
-    if test -n "$ac_help"; then
-      echo "--enable and --with options recognized:$ac_help"
-    fi
-    exit 0 ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host="$ac_optarg" ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir="$ac_optarg" ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir="$ac_optarg" ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir="$ac_optarg" ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir="$ac_optarg" ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir="$ac_optarg" ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir="$ac_optarg" ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir="$ac_optarg" ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix="$ac_optarg" ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix="$ac_optarg" ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix="$ac_optarg" ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name="$ac_optarg" ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir="$ac_optarg" ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir="$ac_optarg" ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site="$ac_optarg" ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir="$ac_optarg" ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir="$ac_optarg" ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target="$ac_optarg" ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers)
-    echo "configure generated by autoconf version 2.13"
-    exit 0 ;;
-
-  -with-* | --with-*)
-    ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case "$ac_option" in
-      *=*) ;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_${ac_package}='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`echo $ac_option|sed -e 's/-*without-//'`
-    # Reject names that are not valid shell variable names.
-    if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then
-      { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; }
-    fi
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    eval "with_${ac_package}=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes="$ac_optarg" ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries="$ac_optarg" ;;
-
-  -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
-    ;;
-
-  *)
-    if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
-      echo "configure: warning: $ac_option: invalid host type" 1>&2
-    fi
-    if test "x$nonopt" != xNONE; then
-      { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; }
-    fi
-    nonopt="$ac_option"
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; }
-fi
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-# File descriptor usage:
-# 0 standard input
-# 1 file creation
-# 2 errors and warnings
-# 3 some systems may open it to /dev/tty
-# 4 used on the Kubota Titan
-# 6 checking for... messages and results
-# 5 compiler messages saved in config.log
-if test "$silent" = yes; then
-  exec 6>/dev/null
-else
-  exec 6>&1
-fi
-exec 5>./config.log
-
-echo "\
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-" 1>&5
-
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Also quote any args containing shell metacharacters.
-ac_configure_args=
-for ac_arg
-do
-  case "$ac_arg" in
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c) ;;
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
-  *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?]*)
-  ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-  *) ac_configure_args="$ac_configure_args $ac_arg" ;;
-  esac
-done
-
-# NLS nuisances.
-# Only set these to C if already set.  These must not be set unconditionally
-# because not all systems understand e.g. LANG=C (notably SCO).
-# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
-# Non-C LC_CTYPE values break the ctype check.
-if test "${LANG+set}"   = set; then LANG=C;   export LANG;   fi
-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
-if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
-if test "${LC_CTYPE+set}"    = set; then LC_CTYPE=C;    export LC_CTYPE;    fi
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo > confdefs.h
-
-# A filename unique to this package, relative to the directory that
-# configure is in, which we can look for to find out if srcdir is correct.
-ac_unique_file=libbfd.c
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_prog=$0
-  ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'`
-  test "x$ac_confdir" = "x$ac_prog" && ac_confdir=.
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; }
-  else
-    { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; }
-  fi
-fi
-srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'`
-
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    echo "loading site script $ac_site_file"
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  echo "loading cache $cache_file"
-  . $cache_file
-else
-  echo "creating cache $cache_file"
-  > $cache_file
-fi
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-ac_exeext=
-ac_objext=o
-if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-  # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-  if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then
-    ac_n= ac_c='
-' ac_t='	'
-  else
-    ac_n=-n ac_c= ac_t=
-  fi
-else
-  ac_n= ac_c='\c' ac_t=
-fi
-
-
-
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; }
-fi
-ac_config_guess=$ac_aux_dir/config.guess
-ac_config_sub=$ac_aux_dir/config.sub
-ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
-
-
-# Do some error checking and defaulting for the host and target type.
-# The inputs are:
-#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
-#
-# The rules are:
-# 1. You are not allowed to specify --host, --target, and nonopt at the
-#    same time.
-# 2. Host defaults to nonopt.
-# 3. If nonopt is not specified, then host defaults to the current host,
-#    as determined by config.guess.
-# 4. Target and build default to nonopt.
-# 5. If nonopt is not specified, then target and build default to host.
-
-# The aliases save the names the user supplied, while $host etc.
-# will get canonicalized.
-case $host---$target---$nonopt in
-NONE---*---* | *---NONE---* | *---*---NONE) ;;
-*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
-esac
-
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:594: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking target system type""... $ac_c" 1>&6
-echo "configure:615: checking target system type" >&5
-
-target_alias=$target
-case "$target_alias" in
-NONE)
-  case $nonopt in
-  NONE) target_alias=$host_alias ;;
-  *) target_alias=$nonopt ;;
-  esac ;;
-esac
-
-target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
-target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$target" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:633: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
-test "$host_alias" != "$target_alias" &&
-  test "$program_prefix$program_suffix$program_transform_name" = \
-    NONENONEs,x,x, &&
-  program_prefix=${target_alias}-
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:658: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:688: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:739: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:771: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 782 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:813: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:818: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:827: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:846: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-echo $ac_n "checking for POSIXized ISC""... $ac_c" 1>&6
-echo "configure:878: checking for POSIXized ISC" >&5
-if test -d /etc/conf/kconfig.d &&
-  grep _POSIX_VERSION /usr/include/sys/unistd.h >/dev/null 2>&1
-then
-  echo "$ac_t""yes" 1>&6
-  ISC=yes # If later tests want to check for ISC.
-  cat >> confdefs.h <<\EOF
-#define _POSIX_SOURCE 1
-EOF
-
-  if test "$GCC" = yes; then
-    CC="$CC -posix"
-  else
-    CC="$CC -Xp"
-  fi
-else
-  echo "$ac_t""no" 1>&6
-  ISC=
-fi
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:911: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:964: checking whether build environment is sane" >&5
-# Just in case
-sleep 1
-echo timestamp > conftestfile
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
-   fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { echo "configure: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" 1>&2; exit 1; }
-   fi
-
-   test "$2" = conftestfile
-   )
-then
-   # Ok.
-   :
-else
-   { echo "configure: error: newly created file is older than distributed files!
-Check your system clock" 1>&2; exit 1; }
-fi
-rm -f conftest*
-echo "$ac_t""yes" 1>&6
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1021: checking whether ${MAKE-make} sets \${MAKE}" >&5
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftestmake <<\EOF
-all:
-	@echo 'ac_maketemp="${MAKE}"'
-EOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftestmake
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  SET_MAKE=
-else
-  echo "$ac_t""no" 1>&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-
-PACKAGE=bfd
-
-VERSION=2.9.4
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
-fi
-cat >> confdefs.h <<EOF
-#define PACKAGE "$PACKAGE"
-EOF
-
-cat >> confdefs.h <<EOF
-#define VERSION "$VERSION"
-EOF
-
-
-
-missing_dir=`cd $ac_aux_dir && pwd`
-echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:1067: checking for working aclocal" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$ac_t""found" 1>&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:1080: checking for working autoconf" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$ac_t""found" 1>&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:1093: checking for working automake" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$ac_t""found" 1>&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:1106: checking for working autoheader" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$ac_t""found" 1>&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$ac_t""missing" 1>&6
-fi
-
-echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:1119: checking for working makeinfo" >&5
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$ac_t""found" 1>&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$ac_t""missing" 1>&6
-fi
-
-
-
-if test $host != $build; then
-  ac_tool_prefix=${host_alias}-
-else
-  ac_tool_prefix=
-fi
-
-# Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1142: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AR="${ac_tool_prefix}ar"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AR" && ac_cv_prog_AR="ar"
-fi
-fi
-AR="$ac_cv_prog_AR"
-if test -n "$AR"; then
-  echo "$ac_t""$AR" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-
-# Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1174: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_RANLIB"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1206: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  RANLIB=":"
-fi
-fi
-
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_shared=yes ;;
-no) enable_shared=no ;;
-*)
-  enable_shared=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_shared=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_shared=no
-fi
-
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-case "$enableval" in
-yes) enable_static=yes ;;
-no) enable_static=no ;;
-*)
-  enable_static=no
-  # Look at the argument we got.  We use all the common list separators.
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
-  for pkg in $enableval; do
-    if test "X$pkg" = "X$p"; then
-      enable_static=yes
-    fi
-  done
-  IFS="$ac_save_ifs"
-  ;;
-esac
-else
-  enable_static=yes
-fi
-
-# Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1289: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_RANLIB="ranlib"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":"
-fi
-fi
-RANLIB="$ac_cv_prog_RANLIB"
-if test -n "$RANLIB"; then
-  echo "$ac_t""$RANLIB" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi
-
-
-ac_prog=ld
-if test "$ac_cv_prog_gcc" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1329: checking for ld used by GCC" >&5
-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
-  case "$ac_prog" in
-  # Accept absolute paths.
-  /* | [A-Za-z]:\\*)
-    test -z "$LD" && LD="$ac_prog"
-    ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1347: checking for GNU ld" >&5
-else
-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1350: checking for non-GNU ld" >&5
-fi
-if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -z "$LD"; then
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog"; then
-      ac_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
-	test "$with_gnu_ld" != no && break
-      else
-        test "$with_gnu_ld" != yes && break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-else
-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$ac_cv_path_LD"
-if test -n "$LD"; then
-  echo "$ac_t""$LD" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-
-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1386: checking if the linker ($LD) is GNU ld" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
-  ac_cv_prog_gnu_ld=yes
-else
-  ac_cv_prog_gnu_ld=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
-
-
-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1402: checking for BSD-compatible nm" >&5
-if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  ac_cv_path_NM="$NM"
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in /usr/ucb /usr/ccs/bin $PATH /bin; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/nm; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -B"
-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
-        ac_cv_path_NM="$ac_dir/nm -p"
-      else
-        ac_cv_path_NM="$ac_dir/nm"
-      fi
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
-fi
-fi
-
-NM="$ac_cv_path_NM"
-echo "$ac_t""$NM" 1>&6
-
-
-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1437: checking whether ln -s works" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  rm -f conftestdata
-if ln -s X conftestdata 2>/dev/null
-then
-  rm -f conftestdata
-  ac_cv_prog_LN_S="ln -s"
-else
-  ac_cv_prog_LN_S=ln
-fi
-fi
-LN_S="$ac_cv_prog_LN_S"
-if test "$ac_cv_prog_LN_S" = "ln -s"; then
-  echo "$ac_t""yes" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Check for any special flags to pass to ltconfig.
-libtool_flags=
-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
-test "$silent" = yes && libtool_flags="$libtool_flags --silent"
-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case "$host" in
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 1473 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  CFLAGS="$CFLAGS -belf"
-  ;;
-
-*-*-cygwin*)
-  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
-set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1499: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_DLLTOOL"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "dlltool", so it can be a program name with args.
-set dummy dlltool; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1531: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$DLLTOOL"; then
-  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_DLLTOOL="dlltool"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_DLLTOOL" && ac_cv_prog_DLLTOOL="false"
-fi
-fi
-DLLTOOL="$ac_cv_prog_DLLTOOL"
-if test -n "$DLLTOOL"; then
-  echo "$ac_t""$DLLTOOL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  DLLTOOL="false"
-fi
-fi
-
-# Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
-set dummy ${ac_tool_prefix}as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1566: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="${ac_tool_prefix}as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-if test -z "$ac_cv_prog_AS"; then
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "as", so it can be a program name with args.
-set dummy as; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1598: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$AS"; then
-  ac_cv_prog_AS="$AS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_AS="as"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_prog_AS" && ac_cv_prog_AS="false"
-fi
-fi
-AS="$ac_cv_prog_AS"
-if test -n "$AS"; then
-  echo "$ac_t""$AS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-  AS="false"
-fi
-fi
-
-
-  ;;
-
-esac
-
-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
-LD="$LD" NM="$NM" RANLIB="$RANLIB" LN_S="$LN_S" \
-DLLTOOL="$DLLTOOL" AS="$AS" \
-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
-
-# Redirect the config.log output again, so that the ltconfig log is not
-# clobbered by the next message.
-exec 5>>./config.log
-
-
-# Check whether --enable-64-bit-bfd or --disable-64-bit-bfd was given.
-if test "${enable_64_bit_bfd+set}" = set; then
-  enableval="$enable_64_bit_bfd"
-  case "${enableval}" in
-  yes)  want64=true  ;;
-  no)   want64=false ;;
-  *)    { echo "configure: error: bad value ${enableval} for 64-bit-bfd option" 1>&2; exit 1; } ;;
-esac
-else
-  want64=false
-fi
-# Check whether --enable-targets or --disable-targets was given.
-if test "${enable_targets+set}" = set; then
-  enableval="$enable_targets"
-  case "${enableval}" in
-  yes | "") { echo "configure: error: enable-targets option must specify target names or 'all'" 1>&2; exit 1; }
-            ;;
-  no)       enable_targets= ;;
-  *)        enable_targets=$enableval ;;
-esac
-fi
-# Check whether --enable-commonbfdlib or --disable-commonbfdlib was given.
-if test "${enable_commonbfdlib+set}" = set; then
-  enableval="$enable_commonbfdlib"
-  case "${enableval}" in
-  yes) commonbfdlib=true ;;
-  no)  commonbfdlib=false ;;
-  *)   { echo "configure: error: bad value ${enableval} for BFD commonbfdlib option" 1>&2; exit 1; } ;;
-esac
-fi
-# Check whether --with-mmap or --without-mmap was given.
-if test "${with_mmap+set}" = set; then
-  withval="$with_mmap"
-  case "${withval}" in
-  yes)  want_mmap=true ;;
-  no)   want_mmap=false ;;
-  *)    { echo "configure: error: bad value ${withval} for BFD with-mmap option" 1>&2; exit 1; } ;;
-esac
-else
-  want_mmap=false
-fi
-
-
-
-
-
-if test -z "$target" ; then
-    { echo "configure: error: Unrecognized target system type; please check config.sub." 1>&2; exit 1; }
-fi
-if test "$program_transform_name" = s,x,x,; then
-  program_transform_name=
-else
-  # Double any \ or $.  echo might interpret backslashes.
-  cat <<\EOF_SED > conftestsed
-s,\\,\\\\,g; s,\$,$$,g
-EOF_SED
-  program_transform_name="`echo $program_transform_name|sed -f conftestsed`"
-  rm -f conftestsed
-fi
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,${program_prefix},; $program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$\$,${program_suffix},; $program_transform_name"
-
-# sed with no file args requires a program.
-test "$program_transform_name" = "" && program_transform_name="s,x,x,"
-
-
-echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:1718: checking whether to enable maintainer-specific portions of Makefiles" >&5
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi
-
-  echo "$ac_t""$USE_MAINTAINER_MODE" 1>&6
-  
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-  MAINT=$MAINTAINER_MODE_TRUE
-  
-
-echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
-echo "configure:1741: checking for Cygwin environment" >&5
-if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1746 "configure"
-#include "confdefs.h"
-
-int main() {
-
-#ifndef __CYGWIN__
-#define __CYGWIN__ __CYGWIN32__
-#endif
-return __CYGWIN__;
-; return 0; }
-EOF
-if { (eval echo configure:1757: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_cygwin=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_cygwin=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_cygwin" 1>&6
-CYGWIN=
-test "$ac_cv_cygwin" = yes && CYGWIN=yes
-echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6
-echo "configure:1774: checking for mingw32 environment" >&5
-if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 1779 "configure"
-#include "confdefs.h"
-
-int main() {
-return __MINGW32__;
-; return 0; }
-EOF
-if { (eval echo configure:1786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_mingw32=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_mingw32=no
-fi
-rm -f conftest*
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_mingw32" 1>&6
-MINGW32=
-test "$ac_cv_mingw32" = yes && MINGW32=yes
-
-
-echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
-echo "configure:1805: checking for executable suffix" >&5
-if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$CYGWIN" = yes || test "$MINGW32" = yes; then
-  ac_cv_exeext=.exe
-else
-  rm -f conftest*
-  echo 'int main () { return 0; }' > conftest.$ac_ext
-  ac_cv_exeext=
-  if { (eval echo configure:1815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
-    for file in conftest.*; do
-      case $file in
-      *.c | *.o | *.obj | *.ilk | *.pdb) ;;
-      *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
-      esac
-    done
-  else
-    { echo "configure: error: installation or configuration problem: compiler cannot create executables." 1>&2; exit 1; }
-  fi
-  rm -f conftest*
-  test x"${ac_cv_exeext}" = x && ac_cv_exeext=no
-fi
-fi
-
-EXEEXT=""
-test x"${ac_cv_exeext}" != xno && EXEEXT=${ac_cv_exeext}
-echo "$ac_t""${ac_cv_exeext}" 1>&6
-ac_exeext=$EXEEXT
-
-
-host64=false
-target64=false
-
-# host stuff:
-
-# Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1844: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="gcc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1874: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_prog_rejected=no
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-	continue
-      fi
-      ac_cv_prog_CC="cc"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# -gt 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    set dummy "$ac_dir/$ac_word" "$@"
-    shift
-    ac_cv_prog_CC="$@"
-  fi
-fi
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-  if test -z "$CC"; then
-    case "`uname -s`" in
-    *win32* | *WIN32*)
-      # Extract the first word of "cl", so it can be a program name with args.
-set dummy cl; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1925: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_CC="cl"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-CC="$ac_cv_prog_CC"
-if test -n "$CC"; then
-  echo "$ac_t""$CC" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
- ;;
-    esac
-  fi
-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1957: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-cat > conftest.$ac_ext << EOF
-
-#line 1968 "configure"
-#include "confdefs.h"
-
-main(){return(0);}
-EOF
-if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  ac_cv_prog_cc_works=yes
-  # If we can't run a trivial program, we are probably using a cross compiler.
-  if (./conftest; exit) 2>/dev/null; then
-    ac_cv_prog_cc_cross=no
-  else
-    ac_cv_prog_cc_cross=yes
-  fi
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  ac_cv_prog_cc_works=no
-fi
-rm -fr conftest*
-ac_ext=c
-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
-if test $ac_cv_prog_cc_works = no; then
-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
-fi
-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1999: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
-cross_compiling=$ac_cv_prog_cc_cross
-
-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2004: checking whether we are using GNU C" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.c <<EOF
-#ifdef __GNUC__
-  yes;
-#endif
-EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2013: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-  ac_cv_prog_gcc=yes
-else
-  ac_cv_prog_gcc=no
-fi
-fi
-
-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
-
-if test $ac_cv_prog_gcc = yes; then
-  GCC=yes
-else
-  GCC=
-fi
-
-ac_test_CFLAGS="${CFLAGS+set}"
-ac_save_CFLAGS="$CFLAGS"
-CFLAGS=
-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2032: checking whether ${CC-cc} accepts -g" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  echo 'void f(){}' > conftest.c
-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
-  ac_cv_prog_cc_g=yes
-else
-  ac_cv_prog_cc_g=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS="$ac_save_CFLAGS"
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-
-
-ALL_LINGUAS=
-echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2066: checking how to run the C preprocessor" >&5
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    # This must be in double quotes, not single quotes, because CPP may get
-  # substituted into the Makefile and "${CC-cc}" will confuse make.
-  CPP="${CC-cc} -E"
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp.
-  cat > conftest.$ac_ext <<EOF
-#line 2081 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -E -traditional-cpp"
-  cat > conftest.$ac_ext <<EOF
-#line 2098 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP="${CC-cc} -nologo -E"
-  cat > conftest.$ac_ext <<EOF
-#line 2115 "configure"
-#include "confdefs.h"
-#include <assert.h>
-Syntax Error
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  :
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CPP=/lib/cpp
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-fi
-rm -f conftest*
-  ac_cv_prog_CPP="$CPP"
-fi
-  CPP="$ac_cv_prog_CPP"
-else
-  ac_cv_prog_CPP="$CPP"
-fi
-echo "$ac_t""$CPP" 1>&6
-
-echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:2146: checking for ANSI C header files" >&5
-if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2151 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  ac_cv_header_stdc=yes
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2176 "configure"
-#include "confdefs.h"
-#include <string.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "memchr" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-cat > conftest.$ac_ext <<EOF
-#line 2194 "configure"
-#include "confdefs.h"
-#include <stdlib.h>
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "free" >/dev/null 2>&1; then
-  :
-else
-  rm -rf conftest*
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-if test "$cross_compiling" = yes; then
-  :
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2215 "configure"
-#include "confdefs.h"
-#include <ctype.h>
-#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int main () { int i; for (i = 0; i < 256; i++)
-if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
-exit (0); }
-
-EOF
-if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  :
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_header_stdc=no
-fi
-rm -fr conftest*
-fi
-
-fi
-fi
-
-echo "$ac_t""$ac_cv_header_stdc" 1>&6
-if test $ac_cv_header_stdc = yes; then
-  cat >> confdefs.h <<\EOF
-#define STDC_HEADERS 1
-EOF
-
-fi
-
-echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:2250: checking for working const" >&5
-if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2255 "configure"
-#include "confdefs.h"
-
-int main() {
-
-/* Ultrix mips cc rejects this.  */
-typedef int charset[2]; const charset x;
-/* SunOS 4.1.1 cc rejects this.  */
-char const *const *ccp;
-char **p;
-/* NEC SVR4.0.2 mips cc rejects this.  */
-struct point {int x, y;};
-static struct point const zero = {0,0};
-/* AIX XL C 1.02.0.0 rejects this.
-   It does not let you subtract one const X* pointer from another in an arm
-   of an if-expression whose if-part is not a constant expression */
-const char *g = "string";
-ccp = &g + (g ? g-g : 0);
-/* HPUX 7.0 cc rejects these. */
-++ccp;
-p = (char**) ccp;
-ccp = (char const *const *) p;
-{ /* SCO 3.2v4 cc rejects this.  */
-  char *t;
-  char const *s = 0 ? (char *) 0 : (char const *) 0;
-
-  *t++ = 0;
-}
-{ /* Someone thinks the Sun supposedly-ANSI compiler will reject this.  */
-  int x[] = {25, 17};
-  const int *foo = &x[0];
-  ++foo;
-}
-{ /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
-  typedef const int *iptr;
-  iptr p = 0;
-  ++p;
-}
-{ /* AIX XL C 1.02.0.0 rejects this saying
-     "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
-  struct s { int j; const int *ap[3]; };
-  struct s *b; b->j = 5;
-}
-{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
-  const int foo = 10;
-}
-
-; return 0; }
-EOF
-if { (eval echo configure:2304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_const=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_c_const=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_const" 1>&6
-if test $ac_cv_c_const = no; then
-  cat >> confdefs.h <<\EOF
-#define const 
-EOF
-
-fi
-
-echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:2325: checking for inline" >&5
-if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_cv_c_inline=no
-for ac_kw in inline __inline__ __inline; do
-  cat > conftest.$ac_ext <<EOF
-#line 2332 "configure"
-#include "confdefs.h"
-
-int main() {
-} $ac_kw foo() {
-; return 0; }
-EOF
-if { (eval echo configure:2339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_c_inline=$ac_kw; break
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-fi
-rm -f conftest*
-done
-
-fi
-
-echo "$ac_t""$ac_cv_c_inline" 1>&6
-case "$ac_cv_c_inline" in
-  inline | yes) ;;
-  no) cat >> confdefs.h <<\EOF
-#define inline 
-EOF
- ;;
-  *)  cat >> confdefs.h <<EOF
-#define inline $ac_cv_c_inline
-EOF
- ;;
-esac
-
-echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:2365: checking for off_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2370 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])off_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_off_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_off_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_off_t" 1>&6
-if test $ac_cv_type_off_t = no; then
-  cat >> confdefs.h <<\EOF
-#define off_t long
-EOF
-
-fi
-
-echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:2398: checking for size_t" >&5
-if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2403 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if STDC_HEADERS
-#include <stdlib.h>
-#include <stddef.h>
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_type_size_t=yes
-else
-  rm -rf conftest*
-  ac_cv_type_size_t=no
-fi
-rm -f conftest*
-
-fi
-echo "$ac_t""$ac_cv_type_size_t" 1>&6
-if test $ac_cv_type_size_t = no; then
-  cat >> confdefs.h <<\EOF
-#define size_t unsigned
-EOF
-
-fi
-
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments.  Useless!
-echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:2433: checking for working alloca.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2438 "configure"
-#include "confdefs.h"
-#include <alloca.h>
-int main() {
-char *p = alloca(2 * sizeof(int));
-; return 0; }
-EOF
-if { (eval echo configure:2445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_header_alloca_h=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_alloca_h=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_alloca_h" 1>&6
-if test $ac_cv_header_alloca_h = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA_H 1
-EOF
-
-fi
-
-echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:2466: checking for alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2471 "configure"
-#include "confdefs.h"
-
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-#  include <malloc.h>
-#  define alloca _alloca
-# else
-#  if HAVE_ALLOCA_H
-#   include <alloca.h>
-#  else
-#   ifdef _AIX
- #pragma alloca
-#   else
-#    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
-#    endif
-#   endif
-#  endif
-# endif
-#endif
-
-int main() {
-char *p = (char *) alloca(1);
-; return 0; }
-EOF
-if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  ac_cv_func_alloca_works=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_func_alloca_works=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_func_alloca_works" 1>&6
-if test $ac_cv_func_alloca_works = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_ALLOCA 1
-EOF
-
-fi
-
-if test $ac_cv_func_alloca_works = no; then
-  # The SVR3 libPW and SVR4 libucb both contain incompatible functions
-  # that cause trouble.  Some versions do not even contain alloca or
-  # contain a buggy version.  If you still want to use their alloca,
-  # use ar to extract alloca.o from them instead of compiling alloca.c.
-  ALLOCA=alloca.${ac_objext}
-  cat >> confdefs.h <<\EOF
-#define C_ALLOCA 1
-EOF
-
-
-echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:2531: checking whether alloca needs Cray hooks" >&5
-if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2536 "configure"
-#include "confdefs.h"
-#if defined(CRAY) && ! defined(CRAY2)
-webecray
-#else
-wenotbecray
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  egrep "webecray" >/dev/null 2>&1; then
-  rm -rf conftest*
-  ac_cv_os_cray=yes
-else
-  rm -rf conftest*
-  ac_cv_os_cray=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$ac_cv_os_cray" 1>&6
-if test $ac_cv_os_cray = yes; then
-for ac_func in _getb67 GETB67 getb67; do
-  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2561: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2566 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  cat >> confdefs.h <<EOF
-#define CRAY_STACKSEG_END $ac_func
-EOF
-
-  break
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-done
-fi
-
-echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:2616: checking stack direction for C alloca" >&5
-if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_c_stack_direction=0
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2624 "configure"
-#include "confdefs.h"
-find_stack_direction ()
-{
-  static char *addr = 0;
-  auto char dummy;
-  if (addr == 0)
-    {
-      addr = &dummy;
-      return find_stack_direction ();
-    }
-  else
-    return (&dummy > addr) ? 1 : -1;
-}
-main ()
-{
-  exit (find_stack_direction() < 0);
-}
-EOF
-if { (eval echo configure:2643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_c_stack_direction=1
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_c_stack_direction=-1
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_c_stack_direction" 1>&6
-cat >> confdefs.h <<EOF
-#define STACK_DIRECTION $ac_cv_c_stack_direction
-EOF
-
-fi
-
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2668: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2673 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in getpagesize
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2707: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2712 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:2735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:2760: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2768 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the filesystem buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propogated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-#ifdef __cplusplus
-extern "C" { void *malloc(unsigned); }
-#else
-char *malloc();
-#endif
-
-int
-main()
-{
-	char *data, *data2, *data3;
-	int i, pagesize;
-	int fd;
-
-	pagesize = getpagesize();
-
-	/*
-	 * First, make a file with some known garbage in it.
-	 */
-	data = malloc(pagesize);
-	if (!data)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		*(data + i) = rand();
-	umask(0);
-	fd = creat("conftestmmap", 0600);
-	if (fd < 0)
-		exit(1);
-	if (write(fd, data, pagesize) != pagesize)
-		exit(1);
-	close(fd);
-
-	/*
-	 * Next, try to mmap the file at a fixed address which
-	 * already has something else allocated at it.  If we can,
-	 * also make sure that we see the same garbage.
-	 */
-	fd = open("conftestmmap", O_RDWR);
-	if (fd < 0)
-		exit(1);
-	data2 = malloc(2 * pagesize);
-	if (!data2)
-		exit(1);
-	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data2 + i))
-			exit(1);
-
-	/*
-	 * Finally, make sure that changes to the mapped area
-	 * do not percolate back to the file as seen by read().
-	 * (This is a bug on some variants of i386 svr4.0.)
-	 */
-	for (i = 0; i < pagesize; ++i)
-		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
-	if (!data3)
-		exit(1);
-	if (read(fd, data3, pagesize) != pagesize)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data3 + i))
-			exit(1);
-	close(fd);
-	unlink("conftestmmap");
-	exit(0);
-}
-
-EOF
-if { (eval echo configure:2908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-
-                              
-   for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:2936: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2941 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-   for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:2976: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 2981 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-   if test "${ac_cv_func_stpcpy+set}" != "set"; then
-     for ac_func in stpcpy
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3033: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3038 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-   fi
-   if test "${ac_cv_func_stpcpy}" = "yes"; then
-     cat >> confdefs.h <<\EOF
-#define HAVE_STPCPY 1
-EOF
-
-   fi
-
-   if test $ac_cv_header_locale_h = yes; then
-    echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6
-echo "configure:3095: checking for LC_MESSAGES" >&5
-if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3100 "configure"
-#include "confdefs.h"
-#include <locale.h>
-int main() {
-return LC_MESSAGES
-; return 0; }
-EOF
-if { (eval echo configure:3107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  am_cv_val_LC_MESSAGES=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  am_cv_val_LC_MESSAGES=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$am_cv_val_LC_MESSAGES" 1>&6
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      cat >> confdefs.h <<\EOF
-#define HAVE_LC_MESSAGES 1
-EOF
-
-    fi
-  fi
-   echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6
-echo "configure:3128: checking whether NLS is requested" >&5
-        # Check whether --enable-nls or --disable-nls was given.
-if test "${enable_nls+set}" = set; then
-  enableval="$enable_nls"
-  USE_NLS=$enableval
-else
-  USE_NLS=yes
-fi
-
-    echo "$ac_t""$USE_NLS" 1>&6
-    
-
-    USE_INCLUDED_LIBINTL=no
-
-        if test "$USE_NLS" = "yes"; then
-      cat >> confdefs.h <<\EOF
-#define ENABLE_NLS 1
-EOF
-
-      echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6
-echo "configure:3148: checking whether included gettext is requested" >&5
-      # Check whether --with-included-gettext or --without-included-gettext was given.
-if test "${with_included_gettext+set}" = set; then
-  withval="$with_included_gettext"
-  nls_cv_force_use_gnu_gettext=$withval
-else
-  nls_cv_force_use_gnu_gettext=no
-fi
-
-      echo "$ac_t""$nls_cv_force_use_gnu_gettext" 1>&6
-
-      nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
-      if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
-                        		nls_cv_header_intl=
-	nls_cv_header_libgt=
-	CATOBJEXT=NONE
-
-	ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libintl.h""... $ac_c" 1>&6
-echo "configure:3167: checking for libintl.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3172 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6
-echo "configure:3194: checking for gettext in libc" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3199 "configure"
-#include "confdefs.h"
-#include <libintl.h>
-int main() {
-return (int) gettext ("")
-; return 0; }
-EOF
-if { (eval echo configure:3206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  gt_cv_func_gettext_libc=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  gt_cv_func_gettext_libc=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6
-
-	   if test "$gt_cv_func_gettext_libc" != "yes"; then
-	     echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6
-echo "configure:3222: checking for bindtextdomain in -lintl" >&5
-ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lintl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 3230 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char bindtextdomain();
-
-int main() {
-bindtextdomain()
-; return 0; }
-EOF
-if { (eval echo configure:3241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6
-echo "configure:3257: checking for gettext in libintl" >&5
-if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3262 "configure"
-#include "confdefs.h"
-
-int main() {
-return (int) gettext ("")
-; return 0; }
-EOF
-if { (eval echo configure:3269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  gt_cv_func_gettext_libintl=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  gt_cv_func_gettext_libintl=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$gt_cv_func_gettext_libintl" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-	   fi
-
-	   if test "$gt_cv_func_gettext_libc" = "yes" \
-	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
-	      cat >> confdefs.h <<\EOF
-#define HAVE_GETTEXT 1
-EOF
-
-	      # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3297: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-	      if test "$MSGFMT" != "no"; then
-		for ac_func in dcgettext
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3331: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3336 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:3359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-		# Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3386: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GMSGFMT" in
-  /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-		# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3422: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
-  echo "$ac_t""$XGETTEXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-		cat > conftest.$ac_ext <<EOF
-#line 3454 "configure"
-#include "confdefs.h"
-
-int main() {
-extern int _nl_msg_cat_cntr;
-			       return _nl_msg_cat_cntr
-; return 0; }
-EOF
-if { (eval echo configure:3462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  CATOBJEXT=.gmo
-		   DATADIRNAME=share
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  CATOBJEXT=.mo
-		   DATADIRNAME=lib
-fi
-rm -f conftest*
-		INSTOBJEXT=.mo
-	      fi
-	    fi
-	
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-
-	        
-        if test "$CATOBJEXT" = "NONE"; then
-	  	  	  nls_cv_use_gnu_gettext=yes
-        fi
-      fi
-
-      if test "$nls_cv_use_gnu_gettext" = "yes"; then
-                INTLOBJS="\$(GETTOBJS)"
-        # Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3494: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$MSGFMT" in
-  /*)
-  ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then
-	ac_cv_path_MSGFMT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt"
-  ;;
-esac
-fi
-MSGFMT="$ac_cv_path_MSGFMT"
-if test -n "$MSGFMT"; then
-  echo "$ac_t""$MSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-        # Extract the first word of "gmsgfmt", so it can be a program name with args.
-set dummy gmsgfmt; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3528: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$GMSGFMT" in
-  /*)
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path.
-  ;;
-  ?:/*)			 
-  ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a dos path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do 
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_path_GMSGFMT="$ac_dir/$ac_word"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT"
-  ;;
-esac
-fi
-GMSGFMT="$ac_cv_path_GMSGFMT"
-if test -n "$GMSGFMT"; then
-  echo "$ac_t""$GMSGFMT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-        # Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3564: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  case "$XGETTEXT" in
-  /*)
-  ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path.
-  ;;
-  *)
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
-  for ac_dir in $PATH; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then
-	ac_cv_path_XGETTEXT="$ac_dir/$ac_word"
-	break
-      fi
-    fi
-  done
-  IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":"
-  ;;
-esac
-fi
-XGETTEXT="$ac_cv_path_XGETTEXT"
-if test -n "$XGETTEXT"; then
-  echo "$ac_t""$XGETTEXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-        
-	USE_INCLUDED_LIBINTL=yes
-        CATOBJEXT=.gmo
-        INSTOBJEXT=.mo
-        DATADIRNAME=share
-	INTLDEPS='$(top_builddir)/../intl/libintl.a'
-	INTLLIBS=$INTLDEPS
-	LIBS=`echo $LIBS | sed -e 's/-lintl//'`
-        nls_cv_header_intl=libintl.h
-        nls_cv_header_libgt=libgettext.h
-      fi
-
-            if test "$XGETTEXT" != ":"; then
-			if $XGETTEXT --omit-header /dev/null 2> /dev/null; then
-	  : ;
-	else
-	  echo "$ac_t""found xgettext programs is not GNU xgettext; ignore it" 1>&6
-	  XGETTEXT=":"
-	fi
-      fi
-
-      # We need to process the po/ directory.
-      POSUB=po
-    else
-      DATADIRNAME=share
-      nls_cv_header_intl=libintl.h
-      nls_cv_header_libgt=libgettext.h
-    fi
-
-    # If this is used in GNU gettext we have to set USE_NLS to `yes'
-    # because some of the sources are only built for this goal.
-    if test "$PACKAGE" = gettext; then
-      USE_NLS=yes
-      USE_INCLUDED_LIBINTL=yes
-    fi
-
-                for lang in $ALL_LINGUAS; do
-      GMOFILES="$GMOFILES $lang.gmo"
-      POFILES="$POFILES $lang.po"
-    done
-
-        
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
-   if test "x$CATOBJEXT" != "x"; then
-     if test "x$ALL_LINGUAS" = "x"; then
-       LINGUAS=
-     else
-       echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6
-echo "configure:3654: checking for catalogs to be installed" >&5
-       NEW_LINGUAS=
-       for lang in ${LINGUAS=$ALL_LINGUAS}; do
-         case "$ALL_LINGUAS" in
-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
-         esac
-       done
-       LINGUAS=$NEW_LINGUAS
-       echo "$ac_t""$LINGUAS" 1>&6
-     fi
-
-          if test -n "$LINGUAS"; then
-       for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done
-     fi
-   fi
-
-            if test $ac_cv_header_locale_h = yes; then
-     INCLUDE_LOCALE_H="#include <locale.h>"
-   else
-     INCLUDE_LOCALE_H="\
-/* The system does not provide the header <locale.h>.  Take care yourself.  */"
-   fi
-   
-
-            if test -f $srcdir/po2tbl.sed.in; then
-      if test "$CATOBJEXT" = ".cat"; then
-	 ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6
-echo "configure:3682: checking for linux/version.h" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3687 "configure"
-#include "confdefs.h"
-#include <linux/version.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  msgformat=linux
-else
-  echo "$ac_t""no" 1>&6
-msgformat=xopen
-fi
-
-
-	          	 sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed
-      fi
-            sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \
-	 $srcdir/po2tbl.sed.in > po2tbl.sed
-   fi
-
-            if test "$PACKAGE" = "gettext"; then
-     GT_NO="#NO#"
-     GT_YES=
-   else
-     GT_NO=
-     GT_YES="#YES#"
-   fi
-   
-   
-
-   MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs"
-   
-
-      l=
-   
-
-            if test -d $srcdir/po; then
-      test -d po || mkdir po
-      if test "x$srcdir" != "x."; then
-	 if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then
-	    posrcprefix="$srcdir/"
-	 else
-	    posrcprefix="../$srcdir/"
-	 fi
-      else
-	 posrcprefix="../"
-      fi
-      rm -f po/POTFILES
-      sed -e "/^#/d" -e "/^\$/d" -e "s,.*,	$posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
-	 < $srcdir/po/POTFILES.in > po/POTFILES
-   fi
-  
-
-# Permit host specific settings.
-. ${srcdir}/configure.host
-
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# ./install, which can be erroneously created by make from ./install.sh.
-echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3770: checking for a BSD compatible install" >&5
-if test -z "$INSTALL"; then
-if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-    IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
-  for ac_dir in $PATH; do
-    # Account for people who put trailing slashes in PATH elements.
-    case "$ac_dir/" in
-    /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
-    *)
-      # OSF1 and SCO ODT 3.0 have their own names for install.
-      # Don't use installbsd from OSF since it installs stuff as root
-      # by default.
-      for ac_prog in ginstall scoinst install; do
-        if test -f $ac_dir/$ac_prog; then
-	  if test $ac_prog = install &&
-            grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  else
-	    ac_cv_path_install="$ac_dir/$ac_prog -c"
-	    break 2
-	  fi
-	fi
-      done
-      ;;
-    esac
-  done
-  IFS="$ac_save_IFS"
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL="$ac_cv_path_install"
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL="$ac_install_sh"
-  fi
-fi
-echo "$ac_t""$INSTALL" 1>&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-
-BFD_HOST_64BIT_LONG=0
-BFD_HOST_64_BIT_DEFINED=0
-BFD_HOST_64_BIT=
-BFD_HOST_U_64_BIT=
-if test "x${HOST_64BIT_TYPE}" = "xlong"; then
-  BFD_HOST_64BIT_LONG=1
-elif test "x${HOST_64BIT_TYPE}" != "x"; then
-  BFD_HOST_64_BIT_DEFINED=1
-  BFD_HOST_64_BIT=${HOST_64BIT_TYPE}
-  BFD_HOST_U_64_BIT=${HOST_U_64BIT_TYPE}
-fi
-
-
-
-
-
-# Put a plausible default for CC_FOR_BUILD in Makefile.
-if test -z "$CC_FOR_BUILD"; then
-  if test "x$cross_compiling" = "xno"; then
-    CC_FOR_BUILD='$(CC)'
-  else
-    CC_FOR_BUILD=gcc
-  fi
-fi
-
-# Also set EXEEXT_FOR_BUILD.
-if test "x$cross_compiling" = "xno"; then
-  EXEEXT_FOR_BUILD='$(EXEEXT)'
-else
-  echo $ac_n "checking for build system executable suffix""... $ac_c" 1>&6
-echo "configure:3853: checking for build system executable suffix" >&5
-if eval "test \"`echo '$''{'bfd_cv_build_exeext'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > ac_c_test.c << 'EOF'
-int main() {
-/* Nothing needed here */
-}
-EOF
-    ${CC_FOR_BUILD} -o ac_c_test am_c_test.c 1>&5 2>&5
-    bfd_cv_build_exeext=`echo ac_c_test.* | grep -v ac_c_test.c | sed -e s/ac_c_test//`
-    rm -f ac_c_test*
-    test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no
-fi
-
-echo "$ac_t""$bfd_cv_build_exeext" 1>&6
-  EXEEXT_FOR_BUILD=""
-  test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext}
-fi
-
-
-for ac_hdr in stddef.h string.h strings.h stdlib.h time.h unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3878: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3883 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_hdr in fcntl.h sys/file.h sys/time.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3918: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3923 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3955: checking whether time.h and sys/time.h may both be included" >&5
-if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3960 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/time.h>
-#include <time.h>
-int main() {
-struct tm *tp;
-; return 0; }
-EOF
-if { (eval echo configure:3969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  ac_cv_header_time=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  ac_cv_header_time=no
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$ac_cv_header_time" 1>&6
-if test $ac_cv_header_time = yes; then
-  cat >> confdefs.h <<\EOF
-#define TIME_WITH_SYS_TIME 1
-EOF
-
-fi
-
-ac_header_dirent=no
-for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6
-echo "configure:3994: checking for $ac_hdr that defines DIR" >&5
-if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 3999 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <$ac_hdr>
-int main() {
-DIR *dirp = 0;
-; return 0; }
-EOF
-if { (eval echo configure:4007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_dirent_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- ac_header_dirent=$ac_hdr; break
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
-if test $ac_header_dirent = dirent.h; then
-echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6
-echo "configure:4032: checking for opendir in -ldir" >&5
-ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-ldir  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4040 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:4051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -ldir"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-else
-echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6
-echo "configure:4073: checking for opendir in -lx" >&5
-ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lx  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 4081 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char opendir();
-
-int main() {
-opendir()
-; return 0; }
-EOF
-if { (eval echo configure:4092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  LIBS="$LIBS -lx"
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-fi
-
-for ac_func in fcntl getpagesize setitimer sysconf fdopen
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4117: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4122 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:4145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-
-
-case "${host}" in
-*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows)
-  cat >> confdefs.h <<\EOF
-#define USE_BINARY_FOPEN 1
-EOF
- ;;
-esac
-
-echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6
-echo "configure:4180: checking whether strstr must be declared" >&5
-if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4185 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-int main() {
-char *(*pfn) = (char *(*)) strstr
-; return 0; }
-EOF
-if { (eval echo configure:4206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_decl_needed_strstr=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_decl_needed_strstr=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$bfd_cv_decl_needed_strstr" 1>&6
-if test $bfd_cv_decl_needed_strstr = yes; then
-  cat >> confdefs.h <<\EOF
-#define NEED_DECLARATION_STRSTR 1
-EOF
-
-fi
-
-echo $ac_n "checking whether malloc must be declared""... $ac_c" 1>&6
-echo "configure:4227: checking whether malloc must be declared" >&5
-if eval "test \"`echo '$''{'bfd_cv_decl_needed_malloc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4232 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-int main() {
-char *(*pfn) = (char *(*)) malloc
-; return 0; }
-EOF
-if { (eval echo configure:4253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_decl_needed_malloc=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_decl_needed_malloc=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$bfd_cv_decl_needed_malloc" 1>&6
-if test $bfd_cv_decl_needed_malloc = yes; then
-  cat >> confdefs.h <<\EOF
-#define NEED_DECLARATION_MALLOC 1
-EOF
-
-fi
-
-echo $ac_n "checking whether realloc must be declared""... $ac_c" 1>&6
-echo "configure:4274: checking whether realloc must be declared" >&5
-if eval "test \"`echo '$''{'bfd_cv_decl_needed_realloc'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4279 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-int main() {
-char *(*pfn) = (char *(*)) realloc
-; return 0; }
-EOF
-if { (eval echo configure:4300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_decl_needed_realloc=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_decl_needed_realloc=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$bfd_cv_decl_needed_realloc" 1>&6
-if test $bfd_cv_decl_needed_realloc = yes; then
-  cat >> confdefs.h <<\EOF
-#define NEED_DECLARATION_REALLOC 1
-EOF
-
-fi
-
-echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6
-echo "configure:4321: checking whether free must be declared" >&5
-if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4326 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-int main() {
-char *(*pfn) = (char *(*)) free
-; return 0; }
-EOF
-if { (eval echo configure:4347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_decl_needed_free=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_decl_needed_free=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$bfd_cv_decl_needed_free" 1>&6
-if test $bfd_cv_decl_needed_free = yes; then
-  cat >> confdefs.h <<\EOF
-#define NEED_DECLARATION_FREE 1
-EOF
-
-fi
-
-echo $ac_n "checking whether getenv must be declared""... $ac_c" 1>&6
-echo "configure:4368: checking whether getenv must be declared" >&5
-if eval "test \"`echo '$''{'bfd_cv_decl_needed_getenv'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4373 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#endif
-#endif
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-int main() {
-char *(*pfn) = (char *(*)) getenv
-; return 0; }
-EOF
-if { (eval echo configure:4394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_decl_needed_getenv=no
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_decl_needed_getenv=yes
-fi
-rm -f conftest*
-fi
-
-echo "$ac_t""$bfd_cv_decl_needed_getenv" 1>&6
-if test $bfd_cv_decl_needed_getenv = yes; then
-  cat >> confdefs.h <<\EOF
-#define NEED_DECLARATION_GETENV 1
-EOF
-
-fi
-
-
-# If we are configured native, pick a core file support file.
-COREFILE=
-COREFLAG=
-TRAD_HEADER=
-if test "${target}" = "${host}"; then
-  case "${host}" in
-  alpha*-*-linux-gnu*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/alphalinux.h"'
-	;;
-  alpha*-*-netbsd*)	COREFILE=netbsd-core.lo ;;
-  alpha*-*-*)		COREFILE=osf-core.lo ;;
-  arm-*-riscix)		COREFILE=trad-core.lo ;;
-  hppa*-*-hpux*)	COREFILE=hpux-core.lo ;;
-  hppa*-*-hiux*)	COREFILE=hpux-core.lo ;;
-  hppa*-*-mpeix*)	COREFILE=hpux-core.lo ;;
-  hppa*-*-bsd*)		COREFILE="hpux-core.lo hppabsd-core.lo"
-			COREFLAG="-DHPUX_CORE -DHPPABSD_CORE" ;;
-  i[3456]86-sequent-bsd*)
-	COREFILE=trad-core.lo;
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
-  i[3456]86-sequent-sysv4*) ;;
-  i[3456]86-sequent-sysv*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
-  i[3456]86-*-bsd* | i[3456]86-*-freebsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386bsd.h"'
-	;;
-  i[3456]86-*-netbsd* | i[3456]86-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  i[3456]86-esix-sysv3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/esix.h"'
-	;;
-  i[3456]86-*-sco3.2v5*)
-	COREFILE=sco5-core.lo
-	;;
-  i[3456]86-*-sco* | i[3456]86-*-isc*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386sco.h"'
-	;;
-  i[3456]86-*-mach3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386mach3.h"'
-	;;
-  i[3456]86-*-linux-gnu*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386linux.h"'
-	;;
-  i[3456]86-*-isc*)	COREFILE=trad-core.lo ;;
-  i[3456]86-*-aix*)	COREFILE=aix386-core.lo ;;
-  i860-*-mach3* | i860-*-osf1*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i860mach3.h"'
-	;;
-  mips-dec-bsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/mipsbsd.h"'
-	;;
-  mips-dec-mach3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/mipsmach3.h"'
-	;;
-  mips-*-netbsd* | mips*-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  mips-dec-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/decstation.h"'
-	;;
-  mips-sgi-irix4*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix5*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix6*)	COREFILE=irix-core.lo ;;
-  mips-*-mach3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/mipsmach3.h"'
-	;;
-  mips-*-sysv4*)	;;
-  mips-*-sysv* | mips-*-riscos*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/riscos.h"'
-	;;
-  mips-sony-bsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/news-mips.h"'
-	;;
-  m68*-bull*-sysv*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/dpx2.h"'
-	;;
-  m68*-hp-hpux*)	COREFILE=hpux-core.lo ;;
-  m68*-hp-bsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/hp300bsd.h"'
-	;;
-  m68*-*-linux-gnu*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/m68klinux.h"'
-	;;
-  m68*-motorola-sysv*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/delta68.h"'
-	;;
-  m68*-sony-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/news.h"'
-	;;
-  m68*-*-netbsd* | m68*-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  m68*-apple-aux*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/m68kaux.h"'
-	;;
-  m88*-*-sysv4*)	;;
-  m88*-motorola-sysv*)	COREFILE=ptrace-core.lo ;;
-  m88*-*-mach3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/m88kmach3.h"'
-	;;
-  ns32k-pc532-mach)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/pc532mach.h"'
-	;;
-  ns32k-*-netbsd* | ns32k-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  rs6000-*-lynx*)	COREFILE=lynx-core.lo ;;
-  rs6000-*-aix4*)	COREFILE=rs6000-core.lo ;;
-  rs6000-*-*)		COREFILE=rs6000-core.lo ;;
-  powerpc-*-*bsd*)	COREFILE=netbsd-core.lo ;;
-  powerpc-*-aix4*)	COREFILE=rs6000-core.lo ;;
-  powerpc-*-aix*)	COREFILE=rs6000-core.lo ;;
-  powerpc-*-beos*)	;;
-  powerpc-*-netbsd*)	COREFILE=netbsd-core.lo ;;
-  sparc-*-netbsd* | sparc-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  tahoe-*-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/tahoe.h"'
-	;;
-  vax-*-ultrix2*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
-  vax-*-ultrix*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
-  vax-*-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxbsd.h"'
-	;;
-  esac
-
-  case "$COREFILE" in
-  aix386-core.lo)	COREFLAG=-DAIX386_CORE ;;
-  hppabsd-core.lo)	COREFLAG=-DHPPABSD_CORE ;;
-  hpux-core.lo)		COREFLAG=-DHPUX_CORE ;;
-  irix-core.lo)		COREFLAG=-DIRIX_CORE ;;
-  lynx-core.lo)		COREFLAG=-DLYNX_CORE ;;
-  netbsd-core.lo)	COREFLAG=-DNETBSD_CORE ;;
-  osf-core.lo)		COREFLAG=-DOSF_CORE ;;
-  ptrace-core.lo)	COREFLAG=-DPTRACE_CORE ;;
-  rs6000-core.lo)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
-  sco5-core.lo)		COREFLAG="$COREFLAG -DSCO5_CORE" ;;
-  trad-core.lo)		COREFLAG="$COREFLAG -DTRAD_CORE" ;;
-  esac
-
-  # ELF corefile support has several flavors, but all of
-  # them use something called <sys/procfs.h>
-  for ac_hdr in sys/procfs.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4595: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4600 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-  if test "$ac_cv_header_sys_procfs_h" = yes; then
-    echo $ac_n "checking for prstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4633: checking for prstatus_t in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prstatus_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4638 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-prstatus_t avar
-; return 0; }
-EOF
-if { (eval echo configure:4645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_prstatus_t=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_prstatus_t=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_prstatus_t = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_PRSTATUS_T 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_prstatus_t" 1>&6
-
-    echo $ac_n "checking for prstatus_t.pr_who in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4667: checking for prstatus_t.pr_who in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4672 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-prstatus_t avar; void* aref = (void*) &avar.pr_who
-; return 0; }
-EOF
-if { (eval echo configure:4679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_PRSTATUS_T_PR_WHO 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_prstatus_t_pr_who" 1>&6
-
-    echo $ac_n "checking for pstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4701: checking for pstatus_t in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_pstatus_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4706 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-pstatus_t avar
-; return 0; }
-EOF
-if { (eval echo configure:4713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_pstatus_t=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_pstatus_t=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_pstatus_t = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_PSTATUS_T 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_pstatus_t" 1>&6
-
-    echo $ac_n "checking for prpsinfo_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4735: checking for prpsinfo_t in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_prpsinfo_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4740 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-prpsinfo_t avar
-; return 0; }
-EOF
-if { (eval echo configure:4747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_prpsinfo_t=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_prpsinfo_t=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_prpsinfo_t = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_PRPSINFO_T 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_prpsinfo_t" 1>&6
-
-    echo $ac_n "checking for psinfo_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4769: checking for psinfo_t in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_psinfo_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4774 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-psinfo_t avar
-; return 0; }
-EOF
-if { (eval echo configure:4781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_psinfo_t=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_psinfo_t=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_psinfo_t = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_PSINFO_T 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_psinfo_t" 1>&6
-
-    echo $ac_n "checking for lwpstatus_t in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4803: checking for lwpstatus_t in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_lwpstatus_t'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4808 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-lwpstatus_t avar
-; return 0; }
-EOF
-if { (eval echo configure:4815: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_lwpstatus_t=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_lwpstatus_t=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_lwpstatus_t = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_LWPSTATUS_T 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_lwpstatus_t" 1>&6
-
-    echo $ac_n "checking for lwpstatus_t.pr_context in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4837: checking for lwpstatus_t.pr_context in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4842 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-lwpstatus_t avar; void* aref = (void*) &avar.pr_context
-; return 0; }
-EOF
-if { (eval echo configure:4849: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_LWPSTATUS_T_PR_CONTEXT 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_context" 1>&6
-
-    echo $ac_n "checking for lwpstatus_t.pr_reg in sys/procfs.h""... $ac_c" 1>&6
-echo "configure:4871: checking for lwpstatus_t.pr_reg in sys/procfs.h" >&5
- if eval "test \"`echo '$''{'bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 4876 "configure"
-#include "confdefs.h"
-#include <sys/procfs.h>
-int main() {
-lwpstatus_t avar; void* aref = (void*) &avar.pr_reg
-; return 0; }
-EOF
-if { (eval echo configure:4883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg=no
-   
-fi
-rm -f conftest*
-fi
-
- if test $bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg = yes; then
-   cat >> confdefs.h <<\EOF
-#define HAVE_LWPSTATUS_T_PR_REG 1
-EOF
-
- fi
- echo "$ac_t""$bfd_cv_have_sys_procfs_type_member_lwpstatus_t_pr_reg" 1>&6
-
-  fi
-fi
-
-
-cat >> confdefs.h <<EOF
-#define TRAD_HEADER $TRAD_HEADER
-EOF
-
-
-# Horrible hacks to build DLLs on Windows.
-WIN32LDFLAGS=
-WIN32LIBADD=
-case "${host}" in
-*-*-cygwin*)
-  if test "$enable_shared" = "yes"; then
-    WIN32LDFLAGS="-no-undefined"
-    WIN32LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
-  fi
-  ;;
-esac
-
-
-
-# target stuff:
-
-# Canonicalize the secondary target names.
-if test -n "$enable_targets" ; then
-    for targ in `echo $enable_targets | sed 's/,/ /g'`
-    do
-	result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ 2>/dev/null`
-	if test -n "$result" ; then
-	    canon_targets="$canon_targets $result"
-	else
-	    # Allow targets that config.sub doesn't recognize, like "all".
-	    canon_targets="$canon_targets $targ"
-	fi
-    done
-fi
-
-all_targets=false
-defvec=
-selvecs=
-selarchs=
-TDEFINES=
-for targ in $target $canon_targets
-do
-    if test "x$targ" = "xall"; then
-        all_targets=true
-    else
-	. $srcdir/config.bfd
-	if test "x$targ" = "x$target"; then
-	    defvec=$targ_defvec
-	fi
-	selvecs="$selvecs $targ_defvec $targ_selvecs"
-	selarchs="$selarchs $targ_archs"
-	TDEFINES="$TDEFINES $targ_cflags"
-    fi
-done
-
-
-# This processing still needs to be done if we're to decide properly whether
-# 64-bit support needs to be compiled in.  Currently, it will be included if
-# the default or any other explicitly requested target requires it; it
-# will not be included on a 32-bit host if no 64-bit target is requested, and
-# no "--with-64-bit-bfd" option is given, even if "--with-targets=all" is
-# used.
-
-# uniq the default and selected vectors in all the configured targets.
-f=""
-for i in $selvecs ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-selvecs="$f"
-
-
-# uniq the architectures in all the configured targets.
-f=""
-for i in $selarchs ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-selarchs="$f"
-
-# Target backend .o files.
-tb=
-
-elf="elf.lo elflink.lo dwarf2.lo dwarf1.lo"
-
-for vec in $selvecs
-do
-    case "$vec" in
-    # This list is alphabetized to make it easy to compare
-    # with the two vector lists in targets.c.
-    a29kcoff_big_vec)		tb="$tb coff-a29k.lo cofflink.lo" ;;
-    a_out_adobe_vec)		tb="$tb aout-adobe.lo aout32.lo" ;;
-    armcoff_little_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armcoff_big_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armpe_little_vec)		tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
-    armpe_big_vec)		tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
-    armpei_little_vec)		tb="$tb pei-arm.lo cofflink.lo " ;;
-    armpei_big_vec)		tb="$tb pei-arm.lo cofflink.lo " ;;
-    arm_epoc_pe_little_vec)	tb="$tb epoc-pe-arm.lo cofflink.lo " ;;
-    arm_epoc_pe_big_vec)	tb="$tb epoc-pe-arm.lo cofflink.lo " ;;
-    arm_epoc_pei_little_vec)	tb="$tb epoc-pei-arm.lo cofflink.lo " ;;
-    arm_epoc_pei_big_vec)	tb="$tb epoc-pei-arm.lo cofflink.lo " ;;
-    aout0_big_vec)		tb="$tb aout0.lo aout32.lo" ;;
-    aout_arm_big_vec)		tb="$tb aout-arm.lo aout32.lo" ;;
-    aout_arm_little_vec)	tb="$tb aout-arm.lo aout32.lo" ;;
-    aout_mips_big_vec)		tb="$tb mipsbsd.lo aout32.lo" ;;
-    aout_mips_little_vec)	tb="$tb mipsbsd.lo aout32.lo" ;;
-    apollocoff_vec)		tb="$tb coff-apollo.lo" ;;
-    b_out_vec_big_host)		tb="$tb bout.lo aout32.lo" ;;
-    b_out_vec_little_host)	tb="$tb bout.lo aout32.lo" ;;
-    bfd_elf64_alpha_vec)	tb="$tb elf64-alpha.lo elf64.lo $elf"
-				target64=true ;;
-    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearm_vec)	tb="$tb elfarm-nabi.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearm_oabi_vec) tb="$tb elfarm-oabi.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_vec)	tb="$tb elfarm-nabi.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_oabi_vec)	tb="$tb elfarm-oabi.lo elf32.lo $elf" ;;
-    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf64_bigmips_vec) 	tb="$tb elf64-mips.lo elf64.lo elf32-mips.lo elf32.lo $elf ecofflink.lo"
-				target64=true ;;
-    bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
-    bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
-    bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf32.lo $elf" ;;
-    bfd_elf32_i860_vec)		tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elf32-mips.lo elf32.lo $elf ecofflink.lo"
-				target64=true ;;
-    bfd_elf32_m32r_vec)		tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
-    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_big_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-    bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elf32.lo $elf" ;;
-    bfd_elf32_v850_vec)		tb="$tb elf32-v850.lo elf32.lo $elf" ;;
-    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.lo elf64.lo $elf"
-				target64=true ;;
-    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"
-				target64=true ;;
-    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elf64.lo $elf"
-				target64=true ;;
-    cisco_core_vec)		tb="$tb cisco-core.lo" ;;
-    demo_64_vec)		tb="$tb demo64.lo aout64.lo"
-				target64=true ;;
-    ecoff_big_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_little_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_biglittle_vec)	tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoffalpha_little_vec)	tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"
-				target64=true ;;
-    go32coff_vec)		tb="$tb coff-go32.lo cofflink.lo" ;;
-    go32stubbedcoff_vec)	tb="$tb coff-stgo32.lo cofflink.lo" ;;
-    h8300coff_vec)		tb="$tb coff-h8300.lo reloc16.lo" ;;
-    h8500coff_vec)		tb="$tb coff-h8500.lo reloc16.lo" ;;
-    host_aout_vec)		tb="$tb host-aout.lo aout32.lo" ;;
-    hp300bsd_vec)		tb="$tb hp300bsd.lo aout32.lo" ;;
-    hp300hpux_vec)		tb="$tb hp300hpux.lo aout32.lo" ;;
-    i386aout_vec)		tb="$tb i386aout.lo aout32.lo" ;;
-    i386bsd_vec)		tb="$tb i386bsd.lo aout32.lo" ;;
-    i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
-    i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
-    i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
-    i386msdos_vec)		tb="$tb i386msdos.lo" ;;
-    i386pe_vec)			tb="$tb pe-i386.lo cofflink.lo " ;;
-    i386pei_vec)		tb="$tb pei-i386.lo cofflink.lo" ;;
-    i386linux_vec)		tb="$tb i386linux.lo aout32.lo" ;;
-    i386lynx_aout_vec)		tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
-    i386lynx_coff_vec)		tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
-    i386mach3_vec)		tb="$tb i386mach3.lo aout32.lo" ;;
-    i386netbsd_vec)		tb="$tb i386netbsd.lo aout32.lo" ;;
-    i386os9k_vec)		tb="$tb i386os9k.lo aout32.lo" ;;
-    i860coff_vec)		tb="$tb coff-i860.lo cofflink.lo" ;;
-    icoff_big_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    icoff_little_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    ieee_vec)			tb="$tb ieee.lo" ;;
-    m68kcoff_vec)		tb="$tb coff-m68k.lo cofflink.lo" ;;
-    m68kcoffun_vec)		tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
-    m68klinux_vec)		tb="$tb m68klinux.lo aout32.lo" ;;
-    m68klynx_aout_vec)		tb="$tb m68klynx.lo lynx-core.lo aout32.lo" ;;
-    m68klynx_coff_vec)		tb="$tb cf-m68klynx.lo coff-m68k.lo cofflink.lo lynx-core.lo" ;;
-    m68knetbsd_vec)		tb="$tb m68knetbsd.lo aout32.lo" ;;
-    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.lo aout32.lo" ;;
-    m68kaux_coff_vec)		tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
-    m68ksysvcoff_vec)		tb="$tb coff-svm68k.lo cofflink.lo" ;;
-    m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
-    mcore_pe_big_vec)		tb="$tb pe-mcore.lo cofflink.lo" ;;
-    mcore_pe_little_vec)	tb="$tb pe-mcore.lo cofflink.lo" ;;
-    mcore_pei_big_vec)		tb="$tb pei-mcore.lo cofflink.lo" ;;
-    mcore_pei_little_vec)	tb="$tb pei-mcore.lo cofflink.lo" ;;
-    newsos3_vec)		tb="$tb newsos3.lo aout32.lo" ;;
-    nlm32_i386_vec)		tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
-    nlm32_sparc_vec)		tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
-    nlm32_alpha_vec)		tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"
-				target64=true ;;
-    riscix_vec)			tb="$tb aout32.lo riscix.lo" ;;
-    nlm32_powerpc_vec)		tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
-    pc532netbsd_vec)		tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
-    pc532machaout_vec)		tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
-    pmac_xcoff_vec)		tb="$tb coff-pmac.lo xcofflink.lo" ;;
-    rs6000coff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
-    bfd_powerpc_pe_vec)         tb="$tb pe-ppc.lo cofflink.lo" ;;  
-    bfd_powerpcle_pe_vec)       tb="$tb pe-ppc.lo cofflink.lo" ;;  
-    bfd_powerpc_pei_vec)        tb="$tb pei-ppc.lo cofflink.lo" ;;
-    bfd_powerpcle_pei_vec)      tb="$tb pei-ppc.lo cofflink.lo" ;;
-    ppcboot_vec)		tb="$tb ppcboot.lo" ;;
-    shcoff_vec)			tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    som_vec)			tb="$tb som.lo" ;;
-    sparcle_aout_vec)		tb="$tb aout-sparcle.lo aout32.lo" ;;
-    sparclinux_vec)		tb="$tb sparclinux.lo aout32.lo" ;;
-    sparclynx_aout_vec)		tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
-    sparclynx_coff_vec)		tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
-    sparcnetbsd_vec)		tb="$tb sparcnetbsd.lo aout32.lo" ;;
-    sparccoff_vec)		tb="$tb coff-sparc.lo" ;;
-    srec_vec)			tb="$tb srec.lo" ;;
-    sunos_big_vec)		tb="$tb sunos.lo aout32.lo" ;;
-    symbolsrec_vec)		tb="$tb srec.lo" ;;
-    tekhex_vec)			tb="$tb tekhex.lo" ;;
-    tic30_aout_vec)		tb="$tb aout-tic30.lo" ;;
-    tic30_coff_vec)		tb="$tb coff-tic30.lo" ;;
-    tic80coff_vec)		tb="$tb coff-tic80.lo cofflink.lo" ;;
-    versados_vec)		tb="$tb versados.lo" ;;
-    vms_alpha_vec)		tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo"
- 				target64=true ;;
-    vms_vax_vec)		tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo" ;;
-    w65_vec)			tb="$tb coff-w65.lo reloc16.lo" ;;
-    we32kcoff_vec)		tb="$tb coff-we32k.lo" ;;
-    z8kcoff_vec)		tb="$tb coff-z8k.lo reloc16.lo" ;;
-
-    "")			;;
-    *) { echo "configure: error: *** unknown target vector $vec" 1>&2; exit 1; } ;;
-    esac
-done
-
-# Target architecture .o files.
-# A couple of CPUs use shorter file names to avoid problems on DOS
-# filesystems.
-ta=`echo $selarchs | sed -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`
-
-# Weed out duplicate .o files.
-f=""
-for i in $tb ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-tb="$f"
-
-f=""
-for i in $ta ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-ta="$f"
-
-bfd_backends="$tb"
-bfd_machines="$ta"
-
-if test x${all_targets} = xtrue ; then
-  bfd_backends="${bfd_backends}"' $(ALL_BACKENDS)'
-  bfd_machines="${bfd_machines}"' $(ALL_MACHINES)'
-  selvecs=
-  havevecs=
-  selarchs=
-else	# all_targets is true
-  # Only set these if they will be nonempty, for the clever echo.
-  havevecs=
-  test -n "$selvecs" &&
-    havevecs=`echo $selvecs | sed -e 's/^/-DHAVE_/' -e 's/ \(.\)/ -DHAVE_\1/g'`
-  test -n "$selvecs" &&
-    selvecs=`echo $selvecs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
-  test -n "$selarchs" &&
-    selarchs=`echo $selarchs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
-fi	# all_targets is true
-
-case ${host64}-${target64}-${want64} in
-  *true*)
-    wordsize=64
-    all_backends='$(BFD64_BACKENDS) $(BFD32_BACKENDS)'
-    if test -z "$GCC" && test "$BFD_HOST_64BIT_LONG" = "0" && test "$BFD_HOST_64_BIT_DEFINED" = "0"; then
-      echo "configure: warning: You have requested a 64 bit BFD configuration, but" 1>&2
-      echo "configure: warning: your compiler may not have a 64 bit integral type" 1>&2
-    fi
-    ;;
-  false-false-false)
-    wordsize=32
-    all_backends='$(BFD32_BACKENDS)'
-    ;;
-esac
-
-
-
-
-
-
-tdefaults=""
-test -n "${defvec}" && tdefaults="${tdefaults} -DDEFAULT_VECTOR=${defvec}"
-test -n "${selvecs}" && tdefaults="${tdefaults} -DSELECT_VECS='${selvecs}'"
-test -n "${selarchs}" && tdefaults="${tdefaults} -DSELECT_ARCHITECTURES='${selarchs}'"
-test -n "${havevecs}" && tdefaults="${tdefaults} ${havevecs}"
-
-
-for ac_hdr in unistd.h
-do
-ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5239: checking for $ac_hdr" >&5
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5244 "configure"
-#include "confdefs.h"
-#include <$ac_hdr>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5249: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_hdr 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-for ac_func in getpagesize
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5278: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5283 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:5331: checking for working mmap" >&5
-if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test "$cross_compiling" = yes; then
-  ac_cv_func_mmap_fixed_mapped=no
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5339 "configure"
-#include "confdefs.h"
-
-/* Thanks to Mike Haertel and Jim Avera for this test.
-   Here is a matrix of mmap possibilities:
-	mmap private not fixed
-	mmap private fixed at somewhere currently unmapped
-	mmap private fixed at somewhere already mapped
-	mmap shared not fixed
-	mmap shared fixed at somewhere currently unmapped
-	mmap shared fixed at somewhere already mapped
-   For private mappings, we should verify that changes cannot be read()
-   back from the file, nor mmap's back from the file at a different
-   address.  (There have been systems where private was not correctly
-   implemented like the infamous i386 svr4.0, and systems where the
-   VM page cache was not coherent with the filesystem buffer cache
-   like early versions of FreeBSD and possibly contemporary NetBSD.)
-   For shared mappings, we should conversely verify that changes get
-   propogated back to all the places they're supposed to be.
-
-   Grep wants private fixed already mapped.
-   The main things grep needs to know about mmap are:
-   * does it exist and is it safe to write into the mmap'd area
-   * how to use it (BSD variants)  */
-#include <sys/types.h>
-#include <fcntl.h>
-#include <sys/mman.h>
-
-/* This mess was copied from the GNU getpagesize.h.  */
-#ifndef HAVE_GETPAGESIZE
-# ifdef HAVE_UNISTD_H
-#  include <unistd.h>
-# endif
-
-/* Assume that all systems that can run configure have sys/param.h.  */
-# ifndef HAVE_SYS_PARAM_H
-#  define HAVE_SYS_PARAM_H 1
-# endif
-
-# ifdef _SC_PAGESIZE
-#  define getpagesize() sysconf(_SC_PAGESIZE)
-# else /* no _SC_PAGESIZE */
-#  ifdef HAVE_SYS_PARAM_H
-#   include <sys/param.h>
-#   ifdef EXEC_PAGESIZE
-#    define getpagesize() EXEC_PAGESIZE
-#   else /* no EXEC_PAGESIZE */
-#    ifdef NBPG
-#     define getpagesize() NBPG * CLSIZE
-#     ifndef CLSIZE
-#      define CLSIZE 1
-#     endif /* no CLSIZE */
-#    else /* no NBPG */
-#     ifdef NBPC
-#      define getpagesize() NBPC
-#     else /* no NBPC */
-#      ifdef PAGESIZE
-#       define getpagesize() PAGESIZE
-#      endif /* PAGESIZE */
-#     endif /* no NBPC */
-#    endif /* no NBPG */
-#   endif /* no EXEC_PAGESIZE */
-#  else /* no HAVE_SYS_PARAM_H */
-#   define getpagesize() 8192	/* punt totally */
-#  endif /* no HAVE_SYS_PARAM_H */
-# endif /* no _SC_PAGESIZE */
-
-#endif /* no HAVE_GETPAGESIZE */
-
-#ifdef __cplusplus
-extern "C" { void *malloc(unsigned); }
-#else
-char *malloc();
-#endif
-
-int
-main()
-{
-	char *data, *data2, *data3;
-	int i, pagesize;
-	int fd;
-
-	pagesize = getpagesize();
-
-	/*
-	 * First, make a file with some known garbage in it.
-	 */
-	data = malloc(pagesize);
-	if (!data)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		*(data + i) = rand();
-	umask(0);
-	fd = creat("conftestmmap", 0600);
-	if (fd < 0)
-		exit(1);
-	if (write(fd, data, pagesize) != pagesize)
-		exit(1);
-	close(fd);
-
-	/*
-	 * Next, try to mmap the file at a fixed address which
-	 * already has something else allocated at it.  If we can,
-	 * also make sure that we see the same garbage.
-	 */
-	fd = open("conftestmmap", O_RDWR);
-	if (fd < 0)
-		exit(1);
-	data2 = malloc(2 * pagesize);
-	if (!data2)
-		exit(1);
-	data2 += (pagesize - ((int) data2 & (pagesize - 1))) & (pagesize - 1);
-	if (data2 != mmap(data2, pagesize, PROT_READ | PROT_WRITE,
-	    MAP_PRIVATE | MAP_FIXED, fd, 0L))
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data2 + i))
-			exit(1);
-
-	/*
-	 * Finally, make sure that changes to the mapped area
-	 * do not percolate back to the file as seen by read().
-	 * (This is a bug on some variants of i386 svr4.0.)
-	 */
-	for (i = 0; i < pagesize; ++i)
-		*(data2 + i) = *(data2 + i) + 1;
-	data3 = malloc(pagesize);
-	if (!data3)
-		exit(1);
-	if (read(fd, data3, pagesize) != pagesize)
-		exit(1);
-	for (i = 0; i < pagesize; ++i)
-		if (*(data + i) != *(data3 + i))
-			exit(1);
-	close(fd);
-	unlink("conftestmmap");
-	exit(0);
-}
-
-EOF
-if { (eval echo configure:5479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
-then
-  ac_cv_func_mmap_fixed_mapped=yes
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -fr conftest*
-  ac_cv_func_mmap_fixed_mapped=no
-fi
-rm -fr conftest*
-fi
-
-fi
-
-echo "$ac_t""$ac_cv_func_mmap_fixed_mapped" 1>&6
-if test $ac_cv_func_mmap_fixed_mapped = yes; then
-  cat >> confdefs.h <<\EOF
-#define HAVE_MMAP 1
-EOF
-
-fi
-
-for ac_func in madvise mprotect
-do
-echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5504: checking for $ac_func" >&5
-if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  cat > conftest.$ac_ext <<EOF
-#line 5509 "configure"
-#include "confdefs.h"
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $ac_func();
-
-int main() {
-
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-$ac_func();
-#endif
-
-; return 0; }
-EOF
-if { (eval echo configure:5532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_func_$ac_func=no"
-fi
-rm -f conftest*
-fi
-
-if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_func 1
-EOF
- 
-else
-  echo "$ac_t""no" 1>&6
-fi
-done
-
-case ${want_mmap}+${ac_cv_func_mmap_fixed_mapped} in
-  true+yes )  cat >> confdefs.h <<\EOF
-#define USE_MMAP 1
-EOF
- ;;
-esac
-
-rm -f doc/config.status
-trap '' 1 2 15
-cat > confcache <<\EOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs.  It is not useful on other systems.
-# If it contains results you don't want to keep, you may remove or edit it.
-#
-# By default, configure uses ./config.cache as the cache file,
-# creating it if it does not exist already.  You can give configure
-# the --cache-file=FILE option to use a different cache file; that is
-# what configure does when it calls configure scripts in
-# subdirectories, so they share the cache.
-# Giving --cache-file=/dev/null disables caching, for debugging configure.
-# config.status only pays attention to the cache file if you give it the
-# --recheck option to rerun configure.
-#
-EOF
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-(set) 2>&1 |
-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-  *ac_space=\ *)
-    # `set' does not quote correctly, so add quotes (double-quote substitution
-    # turns \\\\ into \\, and sed turns \\ into \).
-    sed -n \
-      -e "s/'/'\\\\''/g" \
-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
-    ;;
-  *)
-    # `set' quotes correctly as required by POSIX, so do not add quotes.
-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
-    ;;
-  esac >> confcache
-if cmp -s $cache_file confcache; then
-  :
-else
-  if test -w $cache_file; then
-    echo "updating cache $cache_file"
-    cat confcache > $cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# Any assignment to VPATH causes Sun make to only execute
-# the first set of double-colon rules, so remove it if not needed.
-# If there is a colon in the path, we need to keep it.
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[ 	]*VPATH[ 	]*=[^:]*$/d'
-fi
-
-trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15
-
-DEFS=-DHAVE_CONFIG_H
-
-# Without the "./", some shells look in PATH for config.status.
-: ${CONFIG_STATUS=./config.status}
-
-echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
-cat > $CONFIG_STATUS <<EOF
-#! /bin/sh
-# Generated automatically by configure.
-# Run this file to recreate the current configuration.
-# This directory was configured as follows,
-# on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-#
-# $0 $ac_configure_args
-#
-# Compiler output produced by configure, useful for debugging
-# configure, is in ./config.log if it exists.
-
-ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]"
-for ac_option
-do
-  case "\$ac_option" in
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
-    exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-  -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
-    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-    exit 0 ;;
-  -help | --help | --hel | --he | --h)
-    echo "\$ac_cs_usage"; exit 0 ;;
-  *) echo "\$ac_cs_usage"; exit 1 ;;
-  esac
-done
-
-ac_given_srcdir=$srcdir
-ac_given_INSTALL="$INSTALL"
-
-trap 'rm -fr `echo "Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in config.h:config.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-# Protect against being on the right side of a sed subst in config.status.
-sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
- s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
-$ac_vpsub
-$extrasub
-s%@SHELL@%$SHELL%g
-s%@CFLAGS@%$CFLAGS%g
-s%@CPPFLAGS@%$CPPFLAGS%g
-s%@CXXFLAGS@%$CXXFLAGS%g
-s%@FFLAGS@%$FFLAGS%g
-s%@DEFS@%$DEFS%g
-s%@LDFLAGS@%$LDFLAGS%g
-s%@LIBS@%$LIBS%g
-s%@exec_prefix@%$exec_prefix%g
-s%@prefix@%$prefix%g
-s%@program_transform_name@%$program_transform_name%g
-s%@bindir@%$bindir%g
-s%@sbindir@%$sbindir%g
-s%@libexecdir@%$libexecdir%g
-s%@datadir@%$datadir%g
-s%@sysconfdir@%$sysconfdir%g
-s%@sharedstatedir@%$sharedstatedir%g
-s%@localstatedir@%$localstatedir%g
-s%@libdir@%$libdir%g
-s%@includedir@%$includedir%g
-s%@oldincludedir@%$oldincludedir%g
-s%@infodir@%$infodir%g
-s%@mandir@%$mandir%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@target@%$target%g
-s%@target_alias@%$target_alias%g
-s%@target_cpu@%$target_cpu%g
-s%@target_vendor@%$target_vendor%g
-s%@target_os@%$target_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
-s%@CC@%$CC%g
-s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
-s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
-s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@PACKAGE@%$PACKAGE%g
-s%@VERSION@%$VERSION%g
-s%@ACLOCAL@%$ACLOCAL%g
-s%@AUTOCONF@%$AUTOCONF%g
-s%@AUTOMAKE@%$AUTOMAKE%g
-s%@AUTOHEADER@%$AUTOHEADER%g
-s%@MAKEINFO@%$MAKEINFO%g
-s%@SET_MAKE@%$SET_MAKE%g
-s%@AR@%$AR%g
-s%@RANLIB@%$RANLIB%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
-s%@LN_S@%$LN_S%g
-s%@LIBTOOL@%$LIBTOOL%g
-s%@DLLTOOL@%$DLLTOOL%g
-s%@AS@%$AS%g
-s%@MAINTAINER_MODE_TRUE@%$MAINTAINER_MODE_TRUE%g
-s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g
-s%@MAINT@%$MAINT%g
-s%@EXEEXT@%$EXEEXT%g
-s%@CPP@%$CPP%g
-s%@ALLOCA@%$ALLOCA%g
-s%@USE_NLS@%$USE_NLS%g
-s%@MSGFMT@%$MSGFMT%g
-s%@GMSGFMT@%$GMSGFMT%g
-s%@XGETTEXT@%$XGETTEXT%g
-s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
-s%@CATALOGS@%$CATALOGS%g
-s%@CATOBJEXT@%$CATOBJEXT%g
-s%@DATADIRNAME@%$DATADIRNAME%g
-s%@GMOFILES@%$GMOFILES%g
-s%@INSTOBJEXT@%$INSTOBJEXT%g
-s%@INTLDEPS@%$INTLDEPS%g
-s%@INTLLIBS@%$INTLLIBS%g
-s%@INTLOBJS@%$INTLOBJS%g
-s%@POFILES@%$POFILES%g
-s%@POSUB@%$POSUB%g
-s%@INCLUDE_LOCALE_H@%$INCLUDE_LOCALE_H%g
-s%@GT_NO@%$GT_NO%g
-s%@GT_YES@%$GT_YES%g
-s%@MKINSTALLDIRS@%$MKINSTALLDIRS%g
-s%@l@%$l%g
-s%@HDEFINES@%$HDEFINES%g
-s%@BFD_HOST_64BIT_LONG@%$BFD_HOST_64BIT_LONG%g
-s%@BFD_HOST_64_BIT_DEFINED@%$BFD_HOST_64_BIT_DEFINED%g
-s%@BFD_HOST_64_BIT@%$BFD_HOST_64_BIT%g
-s%@BFD_HOST_U_64_BIT@%$BFD_HOST_U_64_BIT%g
-s%@CC_FOR_BUILD@%$CC_FOR_BUILD%g
-s%@EXEEXT_FOR_BUILD@%$EXEEXT_FOR_BUILD%g
-s%@COREFILE@%$COREFILE%g
-s%@COREFLAG@%$COREFLAG%g
-s%@WIN32LDFLAGS@%$WIN32LDFLAGS%g
-s%@WIN32LIBADD@%$WIN32LIBADD%g
-s%@TDEFINES@%$TDEFINES%g
-s%@wordsize@%$wordsize%g
-s%@all_backends@%$all_backends%g
-s%@bfd_backends@%$bfd_backends%g
-s%@bfd_machines@%$bfd_machines%g
-s%@tdefaults@%$tdefaults%g
-
-CEOF
-EOF
-
-cat >> $CONFIG_STATUS <<\EOF
-
-# Split the substitutions into bite-sized pieces for seds with
-# small command number limits, like on Digital OSF/1 and HP-UX.
-ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
-ac_file=1 # Number of current file.
-ac_beg=1 # First line for current file.
-ac_end=$ac_max_sed_cmds # Line after last line for current file.
-ac_more_lines=:
-ac_sed_cmds=""
-while $ac_more_lines; do
-  if test $ac_beg -gt 1; then
-    sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
-  else
-    sed "${ac_end}q" conftest.subs > conftest.s$ac_file
-  fi
-  if test ! -s conftest.s$ac_file; then
-    ac_more_lines=false
-    rm -f conftest.s$ac_file
-  else
-    if test -z "$ac_sed_cmds"; then
-      ac_sed_cmds="sed -f conftest.s$ac_file"
-    else
-      ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
-    fi
-    ac_file=`expr $ac_file + 1`
-    ac_beg=$ac_end
-    ac_end=`expr $ac_end + $ac_max_sed_cmds`
-  fi
-done
-if test -z "$ac_sed_cmds"; then
-  ac_sed_cmds=cat
-fi
-EOF
-
-cat >> $CONFIG_STATUS <<EOF
-
-CONFIG_FILES=\${CONFIG_FILES-"Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in"}
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
-
-  # Remove last slash and all that follows it.  Not all systems have dirname.
-  ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-  if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-    # The file is in a subdirectory.
-    test ! -d "$ac_dir" && mkdir "$ac_dir"
-    ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`"
-    # A "../" for each directory in $ac_dir_suffix.
-    ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'`
-  else
-    ac_dir_suffix= ac_dots=
-  fi
-
-  case "$ac_given_srcdir" in
-  .)  srcdir=.
-      if test -z "$ac_dots"; then top_srcdir=.
-      else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;;
-  /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;;
-  *) # Relative path.
-    srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix"
-    top_srcdir="$ac_dots$ac_given_srcdir" ;;
-  esac
-
-  case "$ac_given_INSTALL" in
-  [/$]*) INSTALL="$ac_given_INSTALL" ;;
-  *) INSTALL="$ac_dots$ac_given_INSTALL" ;;
-  esac
-
-  echo creating "$ac_file"
-  rm -f "$ac_file"
-  configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
-  case "$ac_file" in
-  *Makefile*) ac_comsub="1i\\
-# $configure_input" ;;
-  *) ac_comsub= ;;
-  esac
-
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  sed -e "$ac_comsub
-s%@configure_input@%$configure_input%g
-s%@srcdir@%$srcdir%g
-s%@top_srcdir@%$top_srcdir%g
-s%@INSTALL@%$INSTALL%g
-" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
-fi; done
-rm -f conftest.s*
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s%^\([ 	]*\)#\([ 	]*define[ 	][ 	]*\)'
-ac_dB='\([ 	][ 	]*\)[^ 	]*%\1#\2'
-ac_dC='\3'
-ac_dD='%g'
-# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE".
-ac_uA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_uB='\([ 	]\)%\1#\2define\3'
-ac_uC=' '
-ac_uD='\4%g'
-# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_eA='s%^\([ 	]*\)#\([ 	]*\)undef\([ 	][ 	]*\)'
-ac_eB='$%\1#\2define\3'
-ac_eC=' '
-ac_eD='%g'
-
-if test "${CONFIG_HEADERS+set}" != set; then
-EOF
-cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="config.h:config.in"
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-fi
-for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case "$ac_file" in
-  *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
-       ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
-  *) ac_file_in="${ac_file}.in" ;;
-  esac
-
-  echo creating $ac_file
-
-  rm -f conftest.frag conftest.in conftest.out
-  ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
-  cat $ac_file_inputs > conftest.in
-
-EOF
-
-# Transform confdefs.h into a sed script conftest.vals that substitutes
-# the proper values into config.h.in to produce config.h.  And first:
-# Protect against being on the right side of a sed subst in config.status.
-# Protect against being in an unquoted here document in config.status.
-rm -f conftest.vals
-cat > conftest.hdr <<\EOF
-s/[\\&%]/\\&/g
-s%[\\$`]%\\&%g
-s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
-s%ac_d%ac_u%gp
-s%ac_u%ac_e%gp
-EOF
-sed -n -f conftest.hdr confdefs.h > conftest.vals
-rm -f conftest.hdr
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >> conftest.vals <<\EOF
-s%^[ 	]*#[ 	]*undef[ 	][ 	]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */%
-EOF
-
-# Break up conftest.vals because some shells have a limit on
-# the size of here documents, and old seds have small limits too.
-
-rm -f conftest.tail
-while :
-do
-  ac_lines=`grep -c . conftest.vals`
-  # grep -c gives empty output for an empty file on some AIX systems.
-  if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi
-  # Write a limited-size here document to conftest.frag.
-  echo '  cat > conftest.frag <<CEOF' >> $CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS
-  echo 'CEOF
-  sed -f conftest.frag conftest.in > conftest.out
-  rm -f conftest.in
-  mv conftest.out conftest.in
-' >> $CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail
-  rm -f conftest.vals
-  mv conftest.tail conftest.vals
-done
-rm -f conftest.vals
-
-cat >> $CONFIG_STATUS <<\EOF
-  rm -f conftest.frag conftest.h
-  echo "/* $ac_file.  Generated automatically by configure.  */" > conftest.h
-  cat conftest.in >> conftest.h
-  rm -f conftest.in
-  if cmp -s $ac_file conftest.h 2>/dev/null; then
-    echo "$ac_file is unchanged"
-    rm -f conftest.h
-  else
-    # Remove last slash and all that follows it.  Not all systems have dirname.
-      ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
-      if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
-      # The file is in a subdirectory.
-      test ! -d "$ac_dir" && mkdir "$ac_dir"
-    fi
-    rm -f $ac_file
-    mv conftest.h $ac_file
-  fi
-fi; done
-
-EOF
-cat >> $CONFIG_STATUS <<EOF
-
-
-EOF
-cat >> $CONFIG_STATUS <<\EOF
-test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
-sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile
-exit 0
-EOF
-chmod +x $CONFIG_STATUS
-rm -fr confdefs* $ac_clean_files
-test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
-
diff --git a/bfd/configure.bat b/bfd/configure.bat
deleted file mode 100644
index 78fe79e9112..00000000000
--- a/bfd/configure.bat
+++ /dev/null
@@ -1,18 +0,0 @@
-@echo off

-if "%1" == "h8/300" goto h8300

-

-echo Configuring bfd for go32

-update hosts\go32.h sysdep.h

-update Makefile.dos Makefile

-echo s/@WORDSIZE@/32/g>config.sed

-sed -e s/^/s\/@VERSION@\// -e s/$/\/g/g version >>config.sed

-sed -f config.sed < bfd-in2.h > bfd.h2

-update bfd.h2 bfd.h

-goto exit

-

-:h8300

-echo Configuring bfd for H8/300

-update hosts\h-go32.h sysdep.h

-update Makefile.dos Makefile

-

-:exit

diff --git a/bfd/configure.com b/bfd/configure.com
deleted file mode 100644
index 929977ce8f1..00000000000
--- a/bfd/configure.com
+++ /dev/null
@@ -1,215 +0,0 @@
-$!
-$! This file configures the bfd library for use with openVMS (Alpha and Vax)
-$!
-$! We do not use the configure script, since we do not have /bin/sh
-$! to execute it.
-$!
-$! Written by Klaus K"ampf (kkaempf@rmi.de)
-$!
-$arch_indx = 1 + ((f$getsyi("CPU").ge.128).and.1)      ! vax==1, alpha==2
-$arch = f$element(arch_indx,"|","|VAX|Alpha|")
-$!
-$if arch .eqs. "Alpha"
-$then
-$ write sys$output "Configuring for Alpha target"
-$ target = "alpha"
-$!
-$! copy bfd-in2.h to bfd.h, replacing @ macros
-$!
-$ edit/tpu/nojournal/nosection/nodisplay/command=sys$input -
-        []bfd-in2.h /output=[]bfd.h
-$DECK
-!
-!  Copy file, changing lines with macros (@@)
-!
-!
-   vfile := CREATE_BUFFER("vfile", "CONFIGURE.IN");
-   rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile));
-   match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-     POSITION(BEGINNING_OF(match_pos));
-     ERASE(match_pos);
-     vers := CURRENT_LINE-")";
-   ELSE;
-     vers := "unknown";
-   ENDIF;
-
-   file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name"));
-   rang := CREATE_RANGE(BEGINNING_OF(file), END_OF(file));
-
-   match_pos := SEARCH_QUIETLY('@VERSION@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT(vers);
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@wordsize@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('64');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_64BIT_LONG@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('0');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT_DEFINED@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('__DECC');
-      SPLIT_LINE;
-      COPY_TEXT('#include <ints.h>');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('int64');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_U_64_BIT@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('uint64');
-   ENDIF;
-   WRITE_FILE(file, GET_INFO(COMMAND_LINE, "output_file"));
-   QUIT
-$  EOD
-$
-$else
-$
-$ write sys$output "Configuring for Vax target"
-$ target = "vax"
-$!
-$! copy bfd-in2.h to bfd.h, replacing @ macros
-$!
-$ edit/tpu/nojournal/nosection/nodisplay/command=sys$input -
-        []bfd-in2.h /output=[]bfd.h
-$DECK
-!
-!  Copy file, changing lines with macros (@@)
-!
-!
-   vfile := CREATE_BUFFER("vfile", "CONFIGURE.IN");
-   rang := CREATE_RANGE(BEGINNING_OF(vfile), END_OF(vfile));
-   match_pos := SEARCH_QUIETLY('AM_INIT_AUTOMAKE(bfd, ', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-     POSITION(BEGINNING_OF(match_pos));
-     ERASE(match_pos);
-     vers := CURRENT_LINE-")";
-   ELSE;
-     vers := "unknown";
-   ENDIF;
-
-   file := CREATE_BUFFER("file", GET_INFO(COMMAND_LINE, "file_name"));
-   rang := CREATE_RANGE(BEGINNING_OF(file), END_OF(file));
-
-   match_pos := SEARCH_QUIETLY('@VERSION@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT(vers);
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@wordsize@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('32');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_64BIT_LONG@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('0');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT_DEFINED@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('__DECC');
-      SPLIT_LINE;
-      COPY_TEXT('#include <ints.h>');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_64_BIT@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('int64');
-   ENDIF;
-   match_pos := SEARCH_QUIETLY('@BFD_HOST_U_64_BIT@', FORWARD, EXACT, rang);
-   IF match_pos <> 0 THEN;
-      POSITION(BEGINNING_OF(match_pos));
-      ERASE(match_pos);
-      COPY_TEXT('uint64');
-   ENDIF;
-   WRITE_FILE(file, GET_INFO(COMMAND_LINE, "output_file"));
-   QUIT
-$  EOD
-$endif
-$
-$ write sys$output "Generated `bfd.h' from `bfd-in2.h'."
-$!
-$!
-$! create targmatch.h
-$!
-$ open/write tfile []targmatch.h
-$ write tfile "{ """ + target + "-*-*vms*""" + ","
-$ write tfile "#if defined (SELECT_VECS)"
-$ write tfile "SELECT_VECS"
-$ write tfile "#else"
-$ write tfile "UNSUPPORTED_TARGET"
-$ write tfile "#endif"
-$ write tfile "},"
-$ close tfile
-$ write sys$output "Generated `targmatch.h'"
-$!
-$!
-$! create config.h
-$!
-$ create []config.h
-/* config.h-vms.  Generated by hand by Klaus Kämpf, kkaempf@didymus.rmi.de.  */
-/* config.in.  Generated automatically from configure.in by autoheader.  */
-/* Whether malloc must be declared even if <stdlib.h> is included.  */
-/* #undef NEED_DECLARATION_MALLOC */
-/* Whether free must be declared even if <stdlib.h> is included.  */
-/* #undef NEED_DECLARATION_FREE */
-/* Define if you have a working `mmap' system call.  */
-/* #define HAVE_MMAP 1 */
-/* Do we need to use the b modifier when opening binary files?  */
-/* #undef USE_BINARY_FOPEN */
-/* Name of host specific header file to include in trad-core.c.  */
-/* #undef TRAD_HEADER */
-/* Define only if <sys/procfs.h> is available *and* it defines prstatus_t.  */
-/* #undef HAVE_SYS_PROCFS_H */
-/* Do we really want to use mmap if it's available?  */
-/* #undef USE_MMAP */
-/* Define if you have the fcntl function.  */
-#define HAVE_FCNTL 1
-/* Define if you have the getpagesize function.  */
-#define HAVE_GETPAGESIZE 1
-/* Define if you have the madvise function.  */
-#define HAVE_MADVISE 1
-/* Define if you have the mprotect function.  */
-#define HAVE_MPROTECT 1
-/* Define if you have the <fcntl.h> header file.  */
-#define HAVE_FCNTL_H 1
-/* Define if you have the <stddef.h> header file.  */
-#define HAVE_STDDEF_H 1
-/* Define if you have the <stdlib.h> header file.  */
-#define HAVE_STDLIB_H 1
-/* Define if you have the <string.h> header file.  */
-#define HAVE_STRING_H 1
-/* Define if you have the <strings.h> header file.  */
-#define HAVE_STRINGS_H 1
-/* Define if you have the <sys/file.h> header file.  */
-#define HAVE_SYS_FILE_H 1
-/* Define if you have the <time.h> header file.  */
-#define HAVE_TIME_H 1
-/* Define if you have the <unistd.h> header file.  */
-#define HAVE_UNISTD_H 1
-$!
-$ write sys$output "Generated `config.h'"
-
diff --git a/bfd/configure.host b/bfd/configure.host
deleted file mode 100644
index ef7048be13c..00000000000
--- a/bfd/configure.host
+++ /dev/null
@@ -1,70 +0,0 @@
-# This file is a shell script that overrides some of the tools and
-# flags used on a host specific basis.
-
-# Since the "bfd/hosts" directory is shared by the bfd, opcodes, and
-# binutils directories (at least), the index to it is also shared.
-# This is that index.  Each configure.in file should source this file
-# in its per-host part.
-
-# This sets the following shell variables:
-#  HDEFINES		host specific compiler options
-#  host64		set to true if 64 bit types are as fast as 32 bit
-#  HOST_64BIT_TYPE	host 64 bit type
-#  HOST_U_64BIT_TYPE	unsigned 64 bit type (not needed if 64BIT_TYPE is long)
-
-HDEFINES=
-host64=false
-HOST_64BIT_TYPE=
-HOST_U_64BIT_TYPE=
-
-case "${host}" in
-
-alpha*-*-*)		host64=true; HOST_64BIT_TYPE=long ;;
-
-hppa*-*-hpux*)		HDEFINES=-DHOST_HPPAHPUX ;;
-hppa*-*-hiux*)		HDEFINES=-DHOST_HPPAHPUX ;;
-hppa*-*-mpeix*)		HDEFINES=-DHOST_HPPAMPEIX ;;
-hppa*-*-bsd*)		HDEFINES=-DHOST_HPPABSD ;;
-hppa*-*-osf*)		HDEFINES=-DHOST_HPPAOSF ;;
-
-i[3456]86-sequent-bsd*)	HDEFINES=-Dshared=genshared ;;
-i[3456]86-sequent-sysv4*) ;;
-i[3456]86-sequent-sysv*)	HDEFINES=-Dshared=genshared ;;
-
-mips*-dec-netbsd*)	;;
-mips*-*-openbsd*)	;;
-mips*-dec-*)		HDEFINES="-G 4"	;;
-mips*-sgi-irix3*)	HDEFINES="-G 4" ;;
-mips*-sgi-irix4*)	HDEFINES="-G 4" ;;
-mips*-sgi-irix6*)	host64=true
-			HOST_64BIT_TYPE="long long";
-			HOST_U_64BIT_TYPE="unsigned long long";
-			;;
-mips*-*-sysv4*)		;;
-mips*-*-sysv*)		HDEFINES="-G 4" ;;
-mips*-*-riscos*)	HDEFINES="-G 4" ;;
-
-m68*-hp-hpux*)		HDEFINES=-DHOST_HP300HPUX ;;
-
-*-*-solaris*)		HOST_64BIT_TYPE="long long"
-			HOST_U_64BIT_TYPE="unsigned long long"
-			;;
-
-*-*-windows*)
-			HOST_64BIT_TYPE=__int64
-			HOST_U_64BIT_TYPE="unsigned __int64"
-# The following krock is necessary because we can't run the build compiler
-# (MSVC) on the configure host, so we have to explicitly set the values here.
-# Note that this file is never run through autoconf, so we can't use any
-# autoconf macros here.  Because of this, we have to muck with autoconf
-# variables explicitly.
-			ac_cv_func_mmap_fixed_mapped=no
-			ac_cv_header_time=no
-			ac_cv_func_getpagesize=no
-			ac_cv_func_madvise=no
-			ac_cv_func_mprotect=no
-			ac_cv_header_sys_file_h=no
-			ac_cv_header_sys_time_h=no
-			ac_cv_header_unistd_h=no
-			;;
-esac
diff --git a/bfd/configure.in b/bfd/configure.in
deleted file mode 100644
index 3a3e36f1b66..00000000000
--- a/bfd/configure.in
+++ /dev/null
@@ -1,648 +0,0 @@
-dnl Process this file with autoconf to produce a configure script.
-dnl
-
-AC_PREREQ(2.13)
-AC_INIT(libbfd.c)
-
-AC_CANONICAL_SYSTEM
-AC_ISC_POSIX
-
-AM_INIT_AUTOMAKE(bfd, 2.9.4)
-
-dnl These must be called before AM_PROG_LIBTOOL, because it may want
-dnl to call AC_CHECK_PROG.
-AC_CHECK_TOOL(AR, ar)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-
-dnl Default to a non shared library.  This may be overridden by the
-dnl configure option --enable-shared.
-AM_DISABLE_SHARED
-
-AM_PROG_LIBTOOL
-
-AC_ARG_ENABLE(64-bit-bfd,
-[  --enable-64-bit-bfd     64-bit support (on hosts with narrower word sizes)],
-[case "${enableval}" in
-  yes)  want64=true  ;;
-  no)   want64=false ;;
-  *)    AC_MSG_ERROR(bad value ${enableval} for 64-bit-bfd option) ;;
-esac],[want64=false])dnl
-AC_ARG_ENABLE(targets,
-[  --enable-targets        alternative target configurations],
-[case "${enableval}" in
-  yes | "") AC_ERROR(enable-targets option must specify target names or 'all')
-            ;;
-  no)       enable_targets= ;;
-  *)        enable_targets=$enableval ;;
-esac])dnl
-AC_ARG_ENABLE(commonbfdlib,
-[  --enable-commonbfdlib   build shared BFD/opcodes/libiberty library],
-[case "${enableval}" in
-  yes) commonbfdlib=true ;;
-  no)  commonbfdlib=false ;;
-  *)   AC_MSG_ERROR([bad value ${enableval} for BFD commonbfdlib option]) ;;
-esac])dnl
-AC_ARG_WITH(mmap,
-[  --with-mmap             try using mmap for BFD input files if available],
-[case "${withval}" in
-  yes)  want_mmap=true ;;
-  no)   want_mmap=false ;;
-  *)    AC_MSG_ERROR(bad value ${withval} for BFD with-mmap option) ;;
-esac],[want_mmap=false])dnl
-
-AM_CONFIG_HEADER(config.h:config.in)
-
-if test -z "$target" ; then
-    AC_MSG_ERROR(Unrecognized target system type; please check config.sub.)
-fi
-AC_ARG_PROGRAM
-
-AM_MAINTAINER_MODE
-AC_EXEEXT
-
-host64=false
-target64=false
-
-# host stuff:
-
-AC_PROG_CC
-
-ALL_LINGUAS=
-CY_GNU_GETTEXT
-
-# Permit host specific settings.
-. ${srcdir}/configure.host
-
-AC_SUBST(HDEFINES)
-AC_PROG_INSTALL
-
-BFD_HOST_64BIT_LONG=0
-BFD_HOST_64_BIT_DEFINED=0
-BFD_HOST_64_BIT=
-BFD_HOST_U_64_BIT=
-if test "x${HOST_64BIT_TYPE}" = "xlong"; then
-  BFD_HOST_64BIT_LONG=1
-elif test "x${HOST_64BIT_TYPE}" != "x"; then
-  BFD_HOST_64_BIT_DEFINED=1
-  BFD_HOST_64_BIT=${HOST_64BIT_TYPE}
-  BFD_HOST_U_64_BIT=${HOST_U_64BIT_TYPE}
-fi
-AC_SUBST(BFD_HOST_64BIT_LONG)
-AC_SUBST(BFD_HOST_64_BIT_DEFINED)
-AC_SUBST(BFD_HOST_64_BIT)
-AC_SUBST(BFD_HOST_U_64_BIT)
-
-BFD_CC_FOR_BUILD
-
-AC_CHECK_HEADERS(stddef.h string.h strings.h stdlib.h time.h unistd.h)
-AC_CHECK_HEADERS(fcntl.h sys/file.h sys/time.h)
-AC_HEADER_TIME
-AC_HEADER_DIRENT
-AC_CHECK_FUNCS(fcntl getpagesize setitimer sysconf fdopen)
-
-BFD_BINARY_FOPEN
-
-BFD_NEED_DECLARATION(strstr)
-BFD_NEED_DECLARATION(malloc)
-BFD_NEED_DECLARATION(realloc)
-BFD_NEED_DECLARATION(free)
-BFD_NEED_DECLARATION(getenv)
-
-# If we are configured native, pick a core file support file.
-COREFILE=
-COREFLAG=
-TRAD_HEADER=
-if test "${target}" = "${host}"; then
-  case "${host}" in
-  alpha*-*-linux-gnu*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/alphalinux.h"'
-	;;
-  alpha*-*-netbsd*)	COREFILE=netbsd-core.lo ;;
-  alpha*-*-*)		COREFILE=osf-core.lo ;;
-  arm-*-riscix)		COREFILE=trad-core.lo ;;
-  hppa*-*-hpux*)	COREFILE=hpux-core.lo ;;
-  hppa*-*-hiux*)	COREFILE=hpux-core.lo ;;
-  hppa*-*-mpeix*)	COREFILE=hpux-core.lo ;;
-  hppa*-*-bsd*)		COREFILE="hpux-core.lo hppabsd-core.lo"
-			COREFLAG="-DHPUX_CORE -DHPPABSD_CORE" ;;
-changequote(,)dnl
-  i[3456]86-sequent-bsd*)
-changequote([,])dnl
-	COREFILE=trad-core.lo;
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
-changequote(,)dnl
-  i[3456]86-sequent-sysv4*) ;;
-  i[3456]86-sequent-sysv*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/symmetry.h"'
-	;;
-changequote(,)dnl
-  i[3456]86-*-bsd* | i[3456]86-*-freebsd*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386bsd.h"'
-	;;
-changequote(,)dnl
-  i[3456]86-*-netbsd* | i[3456]86-*-openbsd*)
-changequote([,])dnl
-	COREFILE=netbsd-core.lo
-	;;
-changequote(,)dnl
-  i[3456]86-esix-sysv3*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/esix.h"'
-	;;
-changequote(,)dnl
-  i[3456]86-*-sco3.2v5*)
-changequote([,])dnl
-	COREFILE=sco5-core.lo
-	;;
-changequote(,)dnl
-  i[3456]86-*-sco* | i[3456]86-*-isc*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386sco.h"'
-	;;
-changequote(,)dnl
-  i[3456]86-*-mach3*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386mach3.h"'
-	;;
-changequote(,)dnl
-  i[3456]86-*-linux-gnu*)
-changequote([,])dnl
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i386linux.h"'
-	;;
-changequote(,)dnl
-  i[3456]86-*-isc*)	COREFILE=trad-core.lo ;;
-  i[3456]86-*-aix*)	COREFILE=aix386-core.lo ;;
-changequote([,])dnl
-  i860-*-mach3* | i860-*-osf1*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/i860mach3.h"'
-	;;
-  mips-dec-bsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/mipsbsd.h"'
-	;;
-  mips-dec-mach3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/mipsmach3.h"'
-	;;
-  mips-*-netbsd* | mips*-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  mips-dec-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/decstation.h"'
-	;;
-  mips-sgi-irix4*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix5*)	COREFILE=irix-core.lo ;;
-  mips-sgi-irix6*)	COREFILE=irix-core.lo ;;
-  mips-*-mach3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/mipsmach3.h"'
-	;;
-  mips-*-sysv4*)	;;
-  mips-*-sysv* | mips-*-riscos*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/riscos.h"'
-	;;
-  mips-sony-bsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/news-mips.h"'
-	;;
-  m68*-bull*-sysv*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/dpx2.h"'
-	;;
-  m68*-hp-hpux*)	COREFILE=hpux-core.lo ;;
-  m68*-hp-bsd*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/hp300bsd.h"'
-	;;
-  m68*-*-linux-gnu*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/m68klinux.h"'
-	;;
-  m68*-motorola-sysv*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/delta68.h"'
-	;;
-  m68*-sony-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/news.h"'
-	;;
-  m68*-*-netbsd* | m68*-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  m68*-apple-aux*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/m68kaux.h"'
-	;;
-  m88*-*-sysv4*)	;;
-  m88*-motorola-sysv*)	COREFILE=ptrace-core.lo ;;
-  m88*-*-mach3*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/m88kmach3.h"'
-	;;
-  ns32k-pc532-mach)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/pc532mach.h"'
-	;;
-  ns32k-*-netbsd* | ns32k-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  rs6000-*-lynx*)	COREFILE=lynx-core.lo ;;
-  rs6000-*-aix4*)	COREFILE=rs6000-core.lo ;;
-  rs6000-*-*)		COREFILE=rs6000-core.lo ;;
-  powerpc-*-*bsd*)	COREFILE=netbsd-core.lo ;;
-  powerpc-*-aix4*)	COREFILE=rs6000-core.lo ;;
-  powerpc-*-aix*)	COREFILE=rs6000-core.lo ;;
-  powerpc-*-beos*)	;;
-  powerpc-*-netbsd*)	COREFILE=netbsd-core.lo ;;
-  sparc-*-netbsd* | sparc-*-openbsd*)
-	COREFILE=netbsd-core.lo
-	;;
-  tahoe-*-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/tahoe.h"'
-	;;
-  vax-*-ultrix2*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
-  vax-*-ultrix*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxult2.h"'
-	;;
-  vax-*-*)
-	COREFILE=trad-core.lo
-	TRAD_HEADER='"hosts/vaxbsd.h"'
-	;;
-  esac
-
-  case "$COREFILE" in
-  aix386-core.lo)	COREFLAG=-DAIX386_CORE ;;
-  hppabsd-core.lo)	COREFLAG=-DHPPABSD_CORE ;;
-  hpux-core.lo)		COREFLAG=-DHPUX_CORE ;;
-  irix-core.lo)		COREFLAG=-DIRIX_CORE ;;
-  lynx-core.lo)		COREFLAG=-DLYNX_CORE ;;
-  netbsd-core.lo)	COREFLAG=-DNETBSD_CORE ;;
-  osf-core.lo)		COREFLAG=-DOSF_CORE ;;
-  ptrace-core.lo)	COREFLAG=-DPTRACE_CORE ;;
-  rs6000-core.lo)	COREFLAG="$COREFLAG -DAIX_CORE" ;;
-  sco5-core.lo)		COREFLAG="$COREFLAG -DSCO5_CORE" ;;
-  trad-core.lo)		COREFLAG="$COREFLAG -DTRAD_CORE" ;;
-  esac
-
-  # ELF corefile support has several flavors, but all of
-  # them use something called <sys/procfs.h>
-  AC_CHECK_HEADERS(sys/procfs.h)
-  if test "$ac_cv_header_sys_procfs_h" = yes; then
-    BFD_HAVE_SYS_PROCFS_TYPE(prstatus_t)
-    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(prstatus_t, pr_who)
-    BFD_HAVE_SYS_PROCFS_TYPE(pstatus_t)
-    BFD_HAVE_SYS_PROCFS_TYPE(prpsinfo_t)
-    BFD_HAVE_SYS_PROCFS_TYPE(psinfo_t)
-    BFD_HAVE_SYS_PROCFS_TYPE(lwpstatus_t)
-    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(lwpstatus_t, pr_context)
-    BFD_HAVE_SYS_PROCFS_TYPE_MEMBER(lwpstatus_t, pr_reg)
-  fi
-fi
-AC_SUBST(COREFILE)
-AC_SUBST(COREFLAG)
-AC_DEFINE_UNQUOTED(TRAD_HEADER, $TRAD_HEADER,
-  [Name of host specific header file to include in trad-core.c.])
-
-# Horrible hacks to build DLLs on Windows.
-WIN32LDFLAGS=
-WIN32LIBADD=
-case "${host}" in
-*-*-cygwin*)
-  if test "$enable_shared" = "yes"; then
-    WIN32LDFLAGS="-no-undefined"
-    WIN32LIBADD="-L`pwd`/../libiberty -liberty -L`pwd`/../intl -lintl -lcygwin -lkernel32"
-  fi
-  ;;
-esac
-AC_SUBST(WIN32LDFLAGS)
-AC_SUBST(WIN32LIBADD)
-
-# target stuff:
-
-# Canonicalize the secondary target names.
-if test -n "$enable_targets" ; then
-    for targ in `echo $enable_targets | sed 's/,/ /g'`
-    do
-	result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ 2>/dev/null`
-	if test -n "$result" ; then
-	    canon_targets="$canon_targets $result"
-	else
-	    # Allow targets that config.sub doesn't recognize, like "all".
-	    canon_targets="$canon_targets $targ"
-	fi
-    done
-fi
-
-all_targets=false
-defvec=
-selvecs=
-selarchs=
-TDEFINES=
-for targ in $target $canon_targets
-do
-    if test "x$targ" = "xall"; then
-        all_targets=true
-    else
-	. $srcdir/config.bfd
-	if test "x$targ" = "x$target"; then
-	    defvec=$targ_defvec
-	fi
-	selvecs="$selvecs $targ_defvec $targ_selvecs"
-	selarchs="$selarchs $targ_archs"
-	TDEFINES="$TDEFINES $targ_cflags"
-    fi
-done
-AC_SUBST(TDEFINES)
-
-# This processing still needs to be done if we're to decide properly whether
-# 64-bit support needs to be compiled in.  Currently, it will be included if
-# the default or any other explicitly requested target requires it; it
-# will not be included on a 32-bit host if no 64-bit target is requested, and
-# no "--with-64-bit-bfd" option is given, even if "--with-targets=all" is
-# used.
-
-# uniq the default and selected vectors in all the configured targets.
-f=""
-for i in $selvecs ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-selvecs="$f"
-
-
-# uniq the architectures in all the configured targets.
-f=""
-for i in $selarchs ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-selarchs="$f"
-
-# Target backend .o files.
-tb=
-
-elf="elf.lo elflink.lo dwarf2.lo dwarf1.lo"
-
-for vec in $selvecs
-do
-    case "$vec" in
-    # This list is alphabetized to make it easy to compare
-    # with the two vector lists in targets.c.
-    a29kcoff_big_vec)		tb="$tb coff-a29k.lo cofflink.lo" ;;
-    a_out_adobe_vec)		tb="$tb aout-adobe.lo aout32.lo" ;;
-    armcoff_little_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armcoff_big_vec)		tb="$tb coff-arm.lo cofflink.lo " ;;
-    armpe_little_vec)		tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
-    armpe_big_vec)		tb="$tb pe-arm.lo coff-arm.lo cofflink.lo " ;;
-    armpei_little_vec)		tb="$tb pei-arm.lo cofflink.lo " ;;
-    armpei_big_vec)		tb="$tb pei-arm.lo cofflink.lo " ;;
-    arm_epoc_pe_little_vec)	tb="$tb epoc-pe-arm.lo cofflink.lo " ;;
-    arm_epoc_pe_big_vec)	tb="$tb epoc-pe-arm.lo cofflink.lo " ;;
-    arm_epoc_pei_little_vec)	tb="$tb epoc-pei-arm.lo cofflink.lo " ;;
-    arm_epoc_pei_big_vec)	tb="$tb epoc-pei-arm.lo cofflink.lo " ;;
-    aout0_big_vec)		tb="$tb aout0.lo aout32.lo" ;;
-    aout_arm_big_vec)		tb="$tb aout-arm.lo aout32.lo" ;;
-    aout_arm_little_vec)	tb="$tb aout-arm.lo aout32.lo" ;;
-    aout_mips_big_vec)		tb="$tb mipsbsd.lo aout32.lo" ;;
-    aout_mips_little_vec)	tb="$tb mipsbsd.lo aout32.lo" ;;
-    apollocoff_vec)		tb="$tb coff-apollo.lo" ;;
-    b_out_vec_big_host)		tb="$tb bout.lo aout32.lo" ;;
-    b_out_vec_little_host)	tb="$tb bout.lo aout32.lo" ;;
-    bfd_elf64_alpha_vec)	tb="$tb elf64-alpha.lo elf64.lo $elf"
-				target64=true ;;
-    bfd_elf32_littlearc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearm_vec)	tb="$tb elfarm-nabi.lo elf32.lo $elf" ;;
-    bfd_elf32_littlearm_oabi_vec) tb="$tb elfarm-oabi.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarc_vec)	tb="$tb elf32-arc.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_vec)	tb="$tb elfarm-nabi.lo elf32.lo $elf" ;;
-    bfd_elf32_bigarm_oabi_vec)	tb="$tb elfarm-oabi.lo elf32.lo $elf" ;;
-    bfd_elf32_big_generic_vec) 	tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_bigmips_vec) 	tb="$tb elf32-mips.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf64_bigmips_vec) 	tb="$tb elf64-mips.lo elf64.lo elf32-mips.lo elf32.lo $elf ecofflink.lo"
-				target64=true ;;
-    bfd_elf32_d10v_vec)		tb="$tb elf32-d10v.lo elf32.lo $elf" ;;
-    bfd_elf32_d30v_vec)		tb="$tb elf32-d30v.lo elf32.lo $elf" ;;
-    bfd_elf32_fr30_vec)		tb="$tb elf32-fr30.lo elf32.lo $elf" ;;
-    bfd_elf32_hppa_vec)		tb="$tb elf32-hppa.lo elf32.lo $elf" ;;
-    bfd_elf32_i386_vec)		tb="$tb elf32-i386.lo elf32.lo $elf" ;;
-    bfd_elf32_i860_vec)		tb="$tb elf32-i860.lo elf32.lo $elf" ;;
-    bfd_elf32_little_generic_vec) tb="$tb elf32-gen.lo elf32.lo $elf" ;;
-    bfd_elf32_littlemips_vec) 	tb="$tb elf32-mips.lo elf32.lo $elf ecofflink.lo" ;;
-    bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elf32-mips.lo elf32.lo $elf ecofflink.lo"
-				target64=true ;;
-    bfd_elf32_m32r_vec)		tb="$tb elf32-m32r.lo elf32.lo $elf" ;;
-    bfd_elf32_m68k_vec)		tb="$tb elf32-m68k.lo elf32.lo $elf" ;;
-    bfd_elf32_m88k_vec)		tb="$tb elf32-m88k.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_big_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mcore_little_vec)	tb="$tb elf32-mcore.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10200_vec)	tb="$tb elf-m10200.lo elf32.lo $elf" ;;
-    bfd_elf32_mn10300_vec)	tb="$tb elf-m10300.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpc_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-    bfd_elf32_powerpcle_vec)	tb="$tb elf32-ppc.lo elf32.lo $elf" ;;
-    bfd_elf32_sh_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_shl_vec)		tb="$tb elf32-sh.lo elf32.lo $elf coff-sh.lo" ;;
-    bfd_elf32_sparc_vec)	tb="$tb elf32-sparc.lo elf32.lo $elf" ;;
-    bfd_elf32_v850_vec)		tb="$tb elf32-v850.lo elf32.lo $elf" ;;
-    bfd_elf64_big_generic_vec) 	tb="$tb elf64-gen.lo elf64.lo $elf"
-				target64=true ;;
-    bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"
-				target64=true ;;
-    bfd_elf64_sparc_vec)	tb="$tb elf64-sparc.lo elf64.lo $elf"
-				target64=true ;;
-    cisco_core_vec)		tb="$tb cisco-core.lo" ;;
-    demo_64_vec)		tb="$tb demo64.lo aout64.lo"
-				target64=true ;;
-    ecoff_big_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_little_vec)		tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoff_biglittle_vec)	tb="$tb coff-mips.lo ecoff.lo ecofflink.lo" ;;
-    ecoffalpha_little_vec)	tb="$tb coff-alpha.lo ecoff.lo ecofflink.lo"
-				target64=true ;;
-    go32coff_vec)		tb="$tb coff-go32.lo cofflink.lo" ;;
-    go32stubbedcoff_vec)	tb="$tb coff-stgo32.lo cofflink.lo" ;;
-    h8300coff_vec)		tb="$tb coff-h8300.lo reloc16.lo" ;;
-    h8500coff_vec)		tb="$tb coff-h8500.lo reloc16.lo" ;;
-    host_aout_vec)		tb="$tb host-aout.lo aout32.lo" ;;
-    hp300bsd_vec)		tb="$tb hp300bsd.lo aout32.lo" ;;
-    hp300hpux_vec)		tb="$tb hp300hpux.lo aout32.lo" ;;
-    i386aout_vec)		tb="$tb i386aout.lo aout32.lo" ;;
-    i386bsd_vec)		tb="$tb i386bsd.lo aout32.lo" ;;
-    i386coff_vec)		tb="$tb coff-i386.lo cofflink.lo" ;;
-    i386dynix_vec)		tb="$tb i386dynix.lo aout32.lo" ;;
-    i386freebsd_vec)		tb="$tb i386freebsd.lo aout32.lo" ;;
-    i386msdos_vec)		tb="$tb i386msdos.lo" ;;
-    i386pe_vec)			tb="$tb pe-i386.lo cofflink.lo " ;;
-    i386pei_vec)		tb="$tb pei-i386.lo cofflink.lo" ;;
-    i386linux_vec)		tb="$tb i386linux.lo aout32.lo" ;;
-    i386lynx_aout_vec)		tb="$tb i386lynx.lo lynx-core.lo aout32.lo" ;;
-    i386lynx_coff_vec)		tb="$tb cf-i386lynx.lo cofflink.lo lynx-core.lo" ;;
-    i386mach3_vec)		tb="$tb i386mach3.lo aout32.lo" ;;
-    i386netbsd_vec)		tb="$tb i386netbsd.lo aout32.lo" ;;
-    i386os9k_vec)		tb="$tb i386os9k.lo aout32.lo" ;;
-    i860coff_vec)		tb="$tb coff-i860.lo cofflink.lo" ;;
-    icoff_big_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    icoff_little_vec)		tb="$tb coff-i960.lo cofflink.lo" ;;
-    ieee_vec)			tb="$tb ieee.lo" ;;
-    m68kcoff_vec)		tb="$tb coff-m68k.lo cofflink.lo" ;;
-    m68kcoffun_vec)		tb="$tb coff-u68k.lo coff-m68k.lo cofflink.lo" ;;
-    m68klinux_vec)		tb="$tb m68klinux.lo aout32.lo" ;;
-    m68klynx_aout_vec)		tb="$tb m68klynx.lo lynx-core.lo aout32.lo" ;;
-    m68klynx_coff_vec)		tb="$tb cf-m68klynx.lo coff-m68k.lo cofflink.lo lynx-core.lo" ;;
-    m68knetbsd_vec)		tb="$tb m68knetbsd.lo aout32.lo" ;;
-    m68k4knetbsd_vec)		tb="$tb m68k4knetbsd.lo aout32.lo" ;;
-    m68kaux_coff_vec)		tb="$tb coff-aux.lo coff-m68k.lo cofflink.lo" ;;
-    m68ksysvcoff_vec)		tb="$tb coff-svm68k.lo cofflink.lo" ;;
-    m88kbcs_vec)		tb="$tb coff-m88k.lo" ;;
-    mcore_pe_big_vec)		tb="$tb pe-mcore.lo cofflink.lo" ;;
-    mcore_pe_little_vec)	tb="$tb pe-mcore.lo cofflink.lo" ;;
-    mcore_pei_big_vec)		tb="$tb pei-mcore.lo cofflink.lo" ;;
-    mcore_pei_little_vec)	tb="$tb pei-mcore.lo cofflink.lo" ;;
-    newsos3_vec)		tb="$tb newsos3.lo aout32.lo" ;;
-    nlm32_i386_vec)		tb="$tb nlm32-i386.lo nlm32.lo nlm.lo" ;;
-    nlm32_sparc_vec)		tb="$tb nlm32-sparc.lo nlm32.lo nlm.lo" ;;
-    nlm32_alpha_vec)		tb="$tb nlm32-alpha.lo nlm32.lo nlm.lo"
-				target64=true ;;
-    riscix_vec)			tb="$tb aout32.lo riscix.lo" ;;
-    nlm32_powerpc_vec)		tb="$tb nlm32-ppc.lo nlm32.lo nlm.lo" ;;
-    pc532netbsd_vec)		tb="$tb ns32knetbsd.lo aout-ns32k.lo" ;;
-    pc532machaout_vec)		tb="$tb pc532-mach.lo aout-ns32k.lo" ;;
-    pmac_xcoff_vec)		tb="$tb coff-pmac.lo xcofflink.lo" ;;
-    rs6000coff_vec)		tb="$tb coff-rs6000.lo xcofflink.lo" ;;
-    bfd_powerpc_pe_vec)         tb="$tb pe-ppc.lo cofflink.lo" ;;  
-    bfd_powerpcle_pe_vec)       tb="$tb pe-ppc.lo cofflink.lo" ;;  
-    bfd_powerpc_pei_vec)        tb="$tb pei-ppc.lo cofflink.lo" ;;
-    bfd_powerpcle_pei_vec)      tb="$tb pei-ppc.lo cofflink.lo" ;;
-    ppcboot_vec)		tb="$tb ppcboot.lo" ;;
-    shcoff_vec)			tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    shlcoff_small_vec)		tb="$tb coff-sh.lo cofflink.lo" ;;
-    som_vec)			tb="$tb som.lo" ;;
-    sparcle_aout_vec)		tb="$tb aout-sparcle.lo aout32.lo" ;;
-    sparclinux_vec)		tb="$tb sparclinux.lo aout32.lo" ;;
-    sparclynx_aout_vec)		tb="$tb sparclynx.lo lynx-core.lo aout32.lo" ;;
-    sparclynx_coff_vec)		tb="$tb cf-sparclynx.lo lynx-core.lo" ;;
-    sparcnetbsd_vec)		tb="$tb sparcnetbsd.lo aout32.lo" ;;
-    sparccoff_vec)		tb="$tb coff-sparc.lo" ;;
-    srec_vec)			tb="$tb srec.lo" ;;
-    sunos_big_vec)		tb="$tb sunos.lo aout32.lo" ;;
-    symbolsrec_vec)		tb="$tb srec.lo" ;;
-    tekhex_vec)			tb="$tb tekhex.lo" ;;
-    tic30_aout_vec)		tb="$tb aout-tic30.lo" ;;
-    tic30_coff_vec)		tb="$tb coff-tic30.lo" ;;
-    tic80coff_vec)		tb="$tb coff-tic80.lo cofflink.lo" ;;
-    versados_vec)		tb="$tb versados.lo" ;;
-    vms_alpha_vec)		tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo"
- 				target64=true ;;
-    vms_vax_vec)		tb="$tb vms.lo vms-hdr.lo vms-gsd.lo vms-tir.lo vms-misc.lo" ;;
-    w65_vec)			tb="$tb coff-w65.lo reloc16.lo" ;;
-    we32kcoff_vec)		tb="$tb coff-we32k.lo" ;;
-    z8kcoff_vec)		tb="$tb coff-z8k.lo reloc16.lo" ;;
-
-    "")			;;
-    *) AC_MSG_ERROR(*** unknown target vector $vec) ;;
-    esac
-done
-
-# Target architecture .o files.
-# A couple of CPUs use shorter file names to avoid problems on DOS
-# filesystems.
-ta=`echo $selarchs | sed -e s/bfd_/cpu-/g -e s/_arch/.lo/g -e s/mn10200/m10200/ -e s/mn10300/m10300/`
-
-# Weed out duplicate .o files.
-f=""
-for i in $tb ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-tb="$f"
-
-f=""
-for i in $ta ; do
-    case " $f " in
-    *" $i "*) ;;
-    *) f="$f $i" ;;
-    esac
-done
-ta="$f"
-
-bfd_backends="$tb"
-bfd_machines="$ta"
-
-if test x${all_targets} = xtrue ; then
-  bfd_backends="${bfd_backends}"' $(ALL_BACKENDS)'
-  bfd_machines="${bfd_machines}"' $(ALL_MACHINES)'
-  selvecs=
-  havevecs=
-  selarchs=
-else	# all_targets is true
-  # Only set these if they will be nonempty, for the clever echo.
-  havevecs=
-  test -n "$selvecs" &&
-    havevecs=`echo $selvecs | sed -e 's/^/-DHAVE_/' -e 's/ \(.\)/ -DHAVE_\1/g'`
-  test -n "$selvecs" &&
-    selvecs=`echo $selvecs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
-  test -n "$selarchs" &&
-    selarchs=`echo $selarchs | sed -e 's/^/\&/' -e 's/ \(.\)/,\&\1/g'`
-fi	# all_targets is true
-
-case ${host64}-${target64}-${want64} in
-  *true*)
-    wordsize=64
-    all_backends='$(BFD64_BACKENDS) $(BFD32_BACKENDS)'
-    if test -z "$GCC" && test "$BFD_HOST_64BIT_LONG" = "0" && test "$BFD_HOST_64_BIT_DEFINED" = "0"; then
-      AC_MSG_WARN([You have requested a 64 bit BFD configuration, but])
-      AC_MSG_WARN([your compiler may not have a 64 bit integral type])
-    fi
-    ;;
-  false-false-false)
-    wordsize=32
-    all_backends='$(BFD32_BACKENDS)'
-    ;;
-esac
-
-AC_SUBST(wordsize)
-AC_SUBST(all_backends)
-AC_SUBST(bfd_backends)
-AC_SUBST(bfd_machines)
-
-tdefaults=""
-test -n "${defvec}" && tdefaults="${tdefaults} -DDEFAULT_VECTOR=${defvec}"
-test -n "${selvecs}" && tdefaults="${tdefaults} -DSELECT_VECS='${selvecs}'"
-test -n "${selarchs}" && tdefaults="${tdefaults} -DSELECT_ARCHITECTURES='${selarchs}'"
-test -n "${havevecs}" && tdefaults="${tdefaults} ${havevecs}"
-AC_SUBST(tdefaults)
-
-dnl AC_CHECK_HEADERS(sys/mman.h)
-AC_FUNC_MMAP
-AC_CHECK_FUNCS(madvise mprotect)
-case ${want_mmap}+${ac_cv_func_mmap_fixed_mapped} in
-  true+yes )  AC_DEFINE(USE_MMAP, 1, [Use mmap if it's available?]) ;;
-esac
-
-rm -f doc/config.status
-AC_OUTPUT(Makefile doc/Makefile bfd-in3.h:bfd-in2.h po/Makefile.in:po/Make-in,
-[sed -e '/POTFILES =/r po/POTFILES' po/Makefile.in > po/Makefile])
diff --git a/bfd/corefile.c b/bfd/corefile.c
deleted file mode 100644
index 212f519ce8a..00000000000
--- a/bfd/corefile.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/* Core file generic interface routines for BFD.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	Core files
-
-DESCRIPTION
-	These are functions pertaining to core files.
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-
-/*
-FUNCTION
-	bfd_core_file_failing_command
-
-SYNOPSIS
-	CONST char *bfd_core_file_failing_command(bfd *abfd);
-
-DESCRIPTION
-	Return a read-only string explaining which program was running
-	when it failed and produced the core file @var{abfd}.
-
-*/
-
-CONST char *
-bfd_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  if (abfd->format != bfd_core) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return NULL;
-  }
-  return BFD_SEND (abfd, _core_file_failing_command, (abfd));
-}
-
-/*
-FUNCTION
-	bfd_core_file_failing_signal
-
-SYNOPSIS
-	int bfd_core_file_failing_signal(bfd *abfd);
-
-DESCRIPTION
-	Returns the signal number which caused the core dump which
-	generated the file the BFD @var{abfd} is attached to.
-*/
-
-int
-bfd_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  if (abfd->format != bfd_core) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return 0;
-  }
-  return BFD_SEND (abfd, _core_file_failing_signal, (abfd));
-}
-
-
-/*
-FUNCTION
-	core_file_matches_executable_p
-
-SYNOPSIS
-	boolean core_file_matches_executable_p
-		(bfd *core_bfd, bfd *exec_bfd);
-
-DESCRIPTION
-	Return <<true>> if the core file attached to @var{core_bfd}
-	was generated by a run of the executable file attached to
-	@var{exec_bfd}, <<false>> otherwise.
-*/
-boolean
-core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-    if ((core_bfd->format != bfd_core) || (exec_bfd->format != bfd_object)) {
-	    bfd_set_error (bfd_error_wrong_format);
-	    return false;
-	}
-
-    return BFD_SEND (core_bfd, _core_file_matches_executable_p,
-		     (core_bfd, exec_bfd));
-}
diff --git a/bfd/cpu-a29k.c b/bfd/cpu-a29k.c
deleted file mode 100644
index 5bd25a47720..00000000000
--- a/bfd/cpu-a29k.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* BFD support for the AMD 29000 architecture.
-   Copyright 1992 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_a29k_arch =
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_a29k,
-    0,	/* only 1 machine */
-    "a29k",
-    "a29k",
-    4,
-    true, /* the one and only */
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
-  };
diff --git a/bfd/cpu-alpha.c b/bfd/cpu-alpha.c
deleted file mode 100644
index b89900be3b7..00000000000
--- a/bfd/cpu-alpha.c
+++ /dev/null
@@ -1,51 +0,0 @@
-/* BFD support for the Alpha architecture.
-   Copyright 1992 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT) \
-  {							\
-    BITS_WORD, /* bits in a word */			\
-    BITS_ADDR, /* bits in an address */			\
-    8,	/* 8 bits in a byte */				\
-    bfd_arch_alpha,					\
-    NUMBER,						\
-    "alpha",						\
-    PRINT,						\
-    3,							\
-    DEFAULT,						\
-    bfd_default_compatible, 				\
-    bfd_default_scan,					\
-    NEXT,						\
-  }
-
-#define NN(index) (&arch_info_struct[index])
-
-/* These exist only so that we can resonably disassemble PALcode.  */
-static const bfd_arch_info_type arch_info_struct[] = 
-{
-  N (64, 64, bfd_mach_alpha_ev4, "alpha:ev4", false, NN(1)),
-  N (64, 64, bfd_mach_alpha_ev5, "alpha:ev5", false, NN(2)),
-  N (64, 64, bfd_mach_alpha_ev6, "alpha:ev6", false, 0),
-};
-
-const bfd_arch_info_type bfd_alpha_arch =
-  N (64, 64, 0, "alpha", true, NN(0));
diff --git a/bfd/cpu-arc.c b/bfd/cpu-arc.c
deleted file mode 100644
index bce59d4c99f..00000000000
--- a/bfd/cpu-arc.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* BFD support for the ARC processor
-   Copyright 1994, 1995, 1997 Free Software Foundation, Inc.
-   Contributed by Doug Evans (dje@cygnus.com).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define ARC(mach, print_name, default_p, next) \
-{					\
-    32,	/* 32 bits in a word */		\
-    32,	/* 32 bits in an address */	\
-    8,	/* 8 bits in a byte */		\
-    bfd_arch_arc,			\
-    mach,				\
-    "arc",				\
-    print_name,				\
-    4, /* section alignment power */	\
-    default_p,				\
-    bfd_default_compatible, 		\
-    bfd_default_scan,			\
-    next,				\
-  }
-
-#if 0 /* ??? Not currently needed, but keep in for future reference.  */
-static const bfd_arch_info_type arch_info_struct[] =
-{
-  ARC (bfd_mach_arc_foo, "arc-foo", false, &arch_info_struct[1]),
-  ARC (bfd_mach_arc_bar, "arc-bar", false, 0),
-};
-#endif
-
-const bfd_arch_info_type bfd_arc_arch =
-  ARC (bfd_mach_arc_base, "arc-base", true, 0 /*&arch_info_struct[0]*/);
-
-/* Utility routines.  */
-
-/* Given cpu type NAME, return its bfd_mach_arc_xxx value.
-   Returns -1 if not found.  */
-
-int
-arc_get_mach (name)
-     char *name;
-{
-  const bfd_arch_info_type *p;
-
-  for (p = &bfd_arc_arch; p != NULL; p = p->next)
-    {
-      /* +4: skip over "arc-" */
-      if (strcmp (name, p->printable_name + 4) == 0)
-	return p->mach;
-    }
-  return -1;
-}
diff --git a/bfd/cpu-arm.c b/bfd/cpu-arm.c
deleted file mode 100644
index d999c0ff247..00000000000
--- a/bfd/cpu-arm.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* BFD support for the ARM processor
-   Copyright 1994, 95, 1997 Free Software Foundation, Inc.
-   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-static const bfd_arch_info_type *compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-static boolean scan PARAMS ((const struct bfd_arch_info *, const char *));
-
-/* This routine is provided two arch_infos and works out which ARM
-   machine which would be compatible with both and returns a pointer
-   to its info structure */
-
-static const bfd_arch_info_type *
-compatible (a,b)
-     const bfd_arch_info_type * a;
-     const bfd_arch_info_type * b;
-{
-  /* If a & b are for different architecture we can do nothing */
-  if (a->arch != b->arch)
-      return NULL;
-
-  /* If a & b are for the same machine then all is well */
-  if (a->mach == b->mach)
-    return a;
-
-  /* Otherwise if either a or b is the 'default' machine then
-     it can be polymorphed into the other */
-  if (a->the_default)
-    return b;
-  
-  if (b->the_default)
-    return a;
-
-  /* So far all newer ARM architecture cores are supersets of previous cores */
-  if (a->mach < b->mach)
-    return b;
-  else if (a->mach > b->mach)
-    return a;
-
-  /* Never reached! */
-  return NULL;
-}
-
-static struct
-{
-  enum bfd_architecture arch;
-  char *                name;
-}
-processors[] =
-{
-  { bfd_mach_arm_2,  "arm2"     },
-  { bfd_mach_arm_2a, "arm250"   },
-  { bfd_mach_arm_2a, "arm3"     },
-  { bfd_mach_arm_3,  "arm6"     },
-  { bfd_mach_arm_3,  "arm60"    },
-  { bfd_mach_arm_3,  "arm600"   },
-  { bfd_mach_arm_3,  "arm610"   },
-  { bfd_mach_arm_3,  "arm7"     },
-  { bfd_mach_arm_3,  "arm710"   },
-  { bfd_mach_arm_3,  "arm7500"  },
-  { bfd_mach_arm_3,  "arm7d"    },
-  { bfd_mach_arm_3,  "arm7di"   },
-  { bfd_mach_arm_3M, "arm7dm"   },
-  { bfd_mach_arm_3M, "arm7dmi"  },
-  { bfd_mach_arm_4,  "arm8"     },
-  { bfd_mach_arm_4,  "arm810"   },
-  { bfd_mach_arm_4,  "sa1"      },
-  { bfd_mach_arm_4T, "arm7tdmi" }
-};
-
-static boolean 
-scan (info, string)
-     const struct bfd_arch_info * info;
-     const char * string;
-{
-  int  i;
-
-  /* First test for an exact match */
-  if (strcasecmp (string, info->printable_name) == 0)
-    return true;
-
-  /* Next check for a processor name instead of an Architecture name */
-  for (i = sizeof (processors) / sizeof (processors[0]); i--;)
-    {
-      if (strcasecmp (string, processors[ i ].name) == 0)
-	break;
-    }
-
-  if (i != -1 && info->arch == processors[ i ].arch)
-    return true;
-
-  /* Finally check for the default architecture */
-  if (strcasecmp (string, "arm") == 0)
-    return info->the_default;
-  
-  return false;
-}
-
-
-#define N(number, print, default, next)  \
-{  32, 32, 8, bfd_arch_arm, number, "arm", print, 4, default, compatible, scan, next }
-
-static const bfd_arch_info_type arch_info_struct[] =
-{ 
-  N( bfd_mach_arm_2,  "armv2",  false, & arch_info_struct[1] ),
-  N( bfd_mach_arm_2a, "armv2a", false, & arch_info_struct[2] ),
-  N( bfd_mach_arm_3,  "armv3",  false, & arch_info_struct[3] ),
-  N( bfd_mach_arm_3M, "armv3m", false, & arch_info_struct[4] ),
-  N( bfd_mach_arm_4,  "armv4",  false, & arch_info_struct[5] ),
-  N( bfd_mach_arm_4T, "armv4t", false, NULL )
-};
-
-const bfd_arch_info_type bfd_arm_arch =
-  N( 0, "arm", true, & arch_info_struct[0] );
diff --git a/bfd/cpu-d10v.c b/bfd/cpu-d10v.c
deleted file mode 100644
index a1ff088bdbc..00000000000
--- a/bfd/cpu-d10v.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* BFD support for the D10V processor
-   Copyright 1996 Free Software Foundation, Inc.
-   Contributed by Martin Hunt (hunt@cygnus.com).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_d10v_arch = 
-{					
-    16,	/* 16 bits in a word */		
-    16,	/* 16 bits in an address */	
-    8,	/* 8 bits in a byte */		
-    bfd_arch_d10v,
-    0,		
-    "d10v",				
-    "d10v",				
-    4, /* section alignment power */	
-    true,				
-    bfd_default_compatible, 		
-    bfd_default_scan,			
-    0,				
-};
-
diff --git a/bfd/cpu-d30v.c b/bfd/cpu-d30v.c
deleted file mode 100644
index 6eadfee271a..00000000000
--- a/bfd/cpu-d30v.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* BFD support for the Mitsubishi D30V processor
-   Copyright 1997 Free Software Foundation, Inc.
-   Contributed by Martin Hunt (hunt@cygnus.com).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_d30v_arch =
-{
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_d30v,
-    0,
-    "d30v",
-    "d30v",
-    4, /* section alignment power */
-    true,
-    bfd_default_compatible,
-    bfd_default_scan,
-    0,
-};
diff --git a/bfd/cpu-fr30.c b/bfd/cpu-fr30.c
deleted file mode 100644
index 33208f89bbb..00000000000
--- a/bfd/cpu-fr30.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* BFD support for the FR30 processor.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_fr30_arch =
-{
-  32,				/* bits per word */
-  32,				/* bits per address */
-  8,				/* bits per byte */
-  bfd_arch_fr30,		/* architecture */
-  bfd_mach_fr30,		/* machine */
-  "fr30",			/* architecture name */
-  "fr30",			/* printable name */
-  4,				/* section align power */
-  true,				/* the default ? */
-  bfd_default_compatible,	/* architecture comparison fn */
-  bfd_default_scan,		/* string to architecture convert fn */
-  NULL				/* next in list */
-};
diff --git a/bfd/cpu-h8300.c b/bfd/cpu-h8300.c
deleted file mode 100644
index 567b7df9de2..00000000000
--- a/bfd/cpu-h8300.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* BFD library support routines for the Hitachi H8/300 architecture.
-   Copyright (C) 1990, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-int bfd_default_scan_num_mach ();
-
-static boolean
-h8300_scan (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (*string != 'h' && *string != 'H')
-    return false;
-
-  string++;
-  if (*string != '8')
-    return false;
-
-  string++;
-  if (*string == '/')
-    string++;
-
-  if (*string != '3')
-    return false;
-  string++;
-  if (*string != '0')
-    return false;
-  string++;
-  if (*string != '0')
-    return false;
-  string++;
-  if (*string == '-')
-    string++;
-  if (*string == 'h' || *string == 'H')
-    {
-      return (info->mach == bfd_mach_h8300h);
-    }
-  else if (*string == 's' || *string == 'S')
-    {
-      return (info->mach == bfd_mach_h8300s);
-    }
-  else
-    {
-      return info->mach == bfd_mach_h8300;
-    }
-}
-
-
-/* This routine is provided two arch_infos and works out the 
-   machine which would be compatible with both and returns a pointer
-   to its info structure */
-
-static const bfd_arch_info_type *
-compatible (in, out)
-     const bfd_arch_info_type * in;
-     const bfd_arch_info_type * out;
-{
-  /* It's really not a good idea to mix and match modes.  */
-  if (in->mach != out->mach)
-    return 0;
-  else
-    return in;
-}
-
-static const bfd_arch_info_type h8300_info_struct =
-{
-  16,				/* 16 bits in a word */
-  16,				/* 16 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_h8300,
-  bfd_mach_h8300,
-  "h8300",			/* arch_name  */
-  "h8300",			/* printable name */
-  1,
-  true,				/* the default machine */
-  compatible,
-  h8300_scan,
-/*    local_bfd_reloc_type_lookup, */
-  0,
-};
-
-static const bfd_arch_info_type h8300h_info_struct =
-{
-  32,				/* 32 bits in a word */
-  32,				/* 32 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_h8300,
-  bfd_mach_h8300h,
-  "h8300h",			/* arch_name  */
-  "h8300h",			/* printable name */
-  1,
-  false,			/* the default machine */
-  compatible,
-  h8300_scan,
-/*    local_bfd_reloc_type_lookup, */
-  &h8300_info_struct,
-};
-
-const bfd_arch_info_type bfd_h8300_arch =
-{
-  32,				/* 32 bits in a word */
-  32,				/* 32 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_h8300,
-  bfd_mach_h8300s,
-  "h8300s",			/* arch_name  */
-  "h8300s",			/* printable name */
-  1,
-  false,			/* the default machine */
-  compatible,
-  h8300_scan,
-/*    local_bfd_reloc_type_lookup, */
-  &h8300h_info_struct,
-};
diff --git a/bfd/cpu-h8500.c b/bfd/cpu-h8500.c
deleted file mode 100644
index e4abfd17807..00000000000
--- a/bfd/cpu-h8500.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/* BFD library support routines for the H8/500 architecture.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#if 0
-
-/* 
-Relocations for the Z8K
-
-*/
-static bfd_reloc_status_type 
-howto16_callback (abfd, reloc_entry, symbol_in, data,
-		  ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_16(abfd, (bfd_byte *)data + addr);
-
-  HOWTO_PREPARE(relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_16(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
-}
-
-
-static bfd_reloc_status_type 
-howto8_callback (abfd, reloc_entry, symbol_in, data,
-		 ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-
-  HOWTO_PREPARE(relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
-}
-
-
-static bfd_reloc_status_type 
-howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data,
-		      ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
-  HOWTO_PREPARE(relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type 
-howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
-		       ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
-  HOWTO_PREPARE(relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
-  return bfd_reloc_ok;
-}
-
-
-
-static reloc_howto_type howto_16
-  = NEWHOWTO(howto16_callback,"abs16",1,false,false);
-static reloc_howto_type howto_8
-  = NEWHOWTO(howto8_callback,"abs8",0,false,false);
-
-static reloc_howto_type howto_8_FFnn
-  = NEWHOWTO(howto8_FFnn_callback,"ff00+abs8",0,false,false);
-
-static reloc_howto_type howto_8_pcrel
-  = NEWHOWTO(howto8_pcrel_callback,"pcrel8",0,false,true);
-
-
-static reloc_howto_type *
-local_bfd_reloc_type_lookup (arch, code)
-     const struct bfd_arch_info *arch;
-     bfd_reloc_code_real_type code;
-{
-  switch (code) {
-  case BFD_RELOC_16:
-    return &howto_16;
-  case BFD_RELOC_8_FFnn:
-    return &howto_8_FFnn;
-  case BFD_RELOC_8:
-    return &howto_8;
-  case BFD_RELOC_8_PCREL:
-    return &howto_8_pcrel;
-  }
-  return (reloc_howto_type *)NULL;
-}
-#endif
-
-int bfd_default_scan_num_mach();
-
-static boolean 
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcmp(string,"h8/500") == 0) return true;
-  if (strcmp(string,"H8/500") == 0) return true;
-  if (strcmp(string,"h8500") == 0) return true;
-  if (strcmp(string,"H8500") == 0) return true;
-  return false;
-}
-
-
-#if 0 /* not used currently */
-/* This routine is provided two arch_infos and returns whether
-   they'd be compatible */
-
-static const bfd_arch_info_type *
-compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  if (a->arch != b->arch || a->mach != b->mach)
-   return NULL;
-  return a;
-}
-#endif
-
-const bfd_arch_info_type bfd_h8500_arch =
-{
-  16,				/* 16 bits in a word */
-  24,				/* 24 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_h8500,
-  0,				/* only 1 machine */
-  "h8500",			/* arch_name  */
-  "h8500",			/* printable name */
-  1,
-  true,				/* the default machine */
-  bfd_default_compatible,
-  scan_mach,
-  0,
-};
diff --git a/bfd/cpu-hppa.c b/bfd/cpu-hppa.c
deleted file mode 100644
index 5d26a92ad99..00000000000
--- a/bfd/cpu-hppa.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* BFD support for the HP Precision Architecture architecture.
-   Copyright 1992 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-static const bfd_arch_info_type bfd_hppa10_arch =
-{
-  32,				/* 32 bits in a word */
-  32,				/* 32 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_hppa,
-  10,				/* By convention PA1.0 = 10 */
-  "hppa",
-  "hppa1.0",
-  3,
-  true,				/* Unless we use 1.1 specific features */
-  bfd_default_compatible, 
-  bfd_default_scan ,
-  0,
-};
-
-/* PA2.0 in narrow mode */
-static const bfd_arch_info_type bfd_hppa20_arch =
-{
-  32,				/* 32 bits in a word */
-  32,				/* 32 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_hppa,
-  20,				/* By convention PA1.0 = 10 */
-  "hppa",
-  "hppa2.0",
-  3,
-  false,			/* Unless we use 1.1 specific features */
-  bfd_default_compatible, 
-  bfd_default_scan ,
-  &bfd_hppa10_arch,
-};
-
-const bfd_arch_info_type bfd_hppa_arch =
-{
-  32,				/* 32 bits in a word */
-  32,				/* 32 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_hppa,
-  11,				/* By convention PA1.1 = 11 */
-  "hppa",
-  "hppa1.1",
-  3,
-  false,			/* 1.1 specific features used */
-  bfd_default_compatible, 
-  bfd_default_scan ,
-  &bfd_hppa20_arch,
-};
diff --git a/bfd/cpu-i386.c b/bfd/cpu-i386.c
deleted file mode 100644
index f5b9b181d18..00000000000
--- a/bfd/cpu-i386.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* BFD support for the Intel 386 architecture.
-   Copyright 1992, 94, 95, 1996 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_i386_arch_intel_syntax =
-{
-  32,	/* 32 bits in a word */
-  32,	/* 32 bits in an address */
-  8,	/* 8 bits in a byte */
-  bfd_arch_i386,
-  bfd_mach_i386_i386_intel_syntax,
-  "i386:intel",
-  "i386:intel",
-  3,
-  true,
-  bfd_default_compatible, 
-  bfd_default_scan ,
-  0,
-};
-static const bfd_arch_info_type i8086_arch =
-{
-  32,	/* 32 bits in a word */
-  32,	/* 32 bits in an address (well, not really) */
-  8,	/* 8 bits in a byte */
-  bfd_arch_i386,
-  bfd_mach_i386_i8086,
-  "i8086",
-  "i8086",
-  3,
-  false,
-  bfd_default_compatible, 
-  bfd_default_scan ,
-  &bfd_i386_arch_intel_syntax,
-};
-
-const bfd_arch_info_type bfd_i386_arch =
-{
-  32,	/* 32 bits in a word */
-  32,	/* 32 bits in an address */
-  8,	/* 8 bits in a byte */
-  bfd_arch_i386,
-  bfd_mach_i386_i386,
-  "i386",
-  "i386",
-  3,
-  true,
-  bfd_default_compatible, 
-  bfd_default_scan ,
-  &i8086_arch,
-};
-
diff --git a/bfd/cpu-i860.c b/bfd/cpu-i860.c
deleted file mode 100644
index 57c867cdb2c..00000000000
--- a/bfd/cpu-i860.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* BFD support for the Intel 860 architecture.
-   Copyright 1992, 1995 Free Software Foundation, Inc.
-   Created mostly by substituting "860" for "386" in cpu-i386.c
-   Harry Dolan <dolan@ssd.intel.com>, October 1995
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_i860_arch =
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_i860,
-    0,	/* only 1 machine */
-    "i860",
-    "i860",
-    3,
-    true, /* the one and only */
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
-  };
diff --git a/bfd/cpu-i960.c b/bfd/cpu-i960.c
deleted file mode 100644
index 7fb2c7ebc5c..00000000000
--- a/bfd/cpu-i960.c
+++ /dev/null
@@ -1,166 +0,0 @@
-/* BFD library support routines for the i960 architecture.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-
-/* This routine is provided a string, and tries to work out if it
-   could possibly refer to the i960 machine pointed at in the
-   info_struct pointer */
-
-static boolean
-scan_960_mach (ap, string)
-     const bfd_arch_info_type *ap;
-     const char *string;
-{
-  unsigned long machine;
-
-  /* Look for the string i960, or somesuch at the front of the string  */
-
-  if (strncmp("i960",string,4) == 0) {
-    string+=4;
-  }
-  else {
-    /* no match, can be us */
-    return false;
-  }
-  if (string[0] == 0) {
-    /* i960 on it's own means core to us*/
-    if (ap->mach == bfd_mach_i960_core) return true;
-    return false;
-  }
-
-  if (string[0] != ':') {
-    return false;
-  }
-  string++;
-  if (string[0] == '\0')
-    return false;
-  if (string[0] == 'c' && string[1] == 'o' && string[2] == 'r' &&
-      string[3] == 'e' && string[4] == '\0')
-    machine = bfd_mach_i960_core;
-  else if (strcmp (string, "ka_sa") == 0)
-    machine = bfd_mach_i960_ka_sa;
-  else if (strcmp (string, "kb_sb") == 0)
-    machine = bfd_mach_i960_kb_sb;
-  else if (string[1] == '\0' || string[2] != '\0') /* rest are 2-char */
-    return false;
-  else if (string[0] == 'k' && string[1] == 'b')
-    machine = bfd_mach_i960_kb_sb;
-  else if (string[0] == 's' && string[1] == 'b')
-    machine = bfd_mach_i960_kb_sb;
-  else if (string[0] == 'm' && string[1] == 'c')
-    machine = bfd_mach_i960_mc;
-  else if (string[0] == 'x' && string[1] == 'a')
-    machine = bfd_mach_i960_xa;
-  else if (string[0] == 'c' && string[1] == 'a')
-    machine = bfd_mach_i960_ca;
-  else if (string[0] == 'k' && string[1] == 'a')
-    machine = bfd_mach_i960_ka_sa;
-  else if (string[0] == 's' && string[1] == 'a')
-    machine = bfd_mach_i960_ka_sa;
-  else if (string[0] == 'j' && string[1] == 'x')
-    machine = bfd_mach_i960_jx;
-  else if (string[0] == 'h' && string[1] == 'x')
-    machine = bfd_mach_i960_hx;
-  else
-    return false;
-  if (machine == ap->mach)   return true;
-  return false;
-}
-
-
-
-/* This routine is provided two arch_infos and works out the i960
-   machine which would be compatible with both and returns a pointer
-   to its info structure */
-
-static const bfd_arch_info_type *
-compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-
-  /* The i960 has distinct subspecies which may not interbreed:
-	CORE CA          
-	CORE KA KB MC XA
-	CORE HX JX
-     Any architecture on the same line is compatible, the one on
-     the right is the least restrictive.  
-     
-     We represent this information in an array, each machine to a side */
-
-#define ERROR	0
-#define CORE	bfd_mach_i960_core  /*1*/  
-#define KA 	bfd_mach_i960_ka_sa /*2*/ 
-#define KB 	bfd_mach_i960_kb_sb /*3*/
-#define MC 	bfd_mach_i960_mc    /*4*/
-#define XA 	bfd_mach_i960_xa    /*5*/
-#define CA 	bfd_mach_i960_ca    /*6*/
-#define JX	bfd_mach_i960_jx    /*7*/
-#define HX	bfd_mach_i960_hx    /*8*/
-#define MAX_ARCH ((int)HX)
-
-  static CONST unsigned long matrix[MAX_ARCH+1][MAX_ARCH+1] = 
-    {
-      { ERROR,	CORE,	KA,	KB,	MC,	XA,	CA,	JX,	HX },
-      { CORE,	CORE,	KA,	KB,	MC,	XA,	CA,	JX,	HX },
-      { KA,	KA,	KA,	KB,	MC,	XA,	ERROR,	ERROR,	ERROR},
-      { KB,	KB,	KB,	KB,	MC,	XA,	ERROR, 	ERROR,	ERROR},
-      { MC,	MC,	MC,	MC,	MC,	XA,	ERROR,	ERROR,	ERROR},
-      { XA,	XA,	XA,	XA,	XA,	XA,	ERROR,	ERROR,	ERROR},
-      { CA,	CA,	ERROR,	ERROR,	ERROR,	ERROR,	CA,	ERROR,	ERROR},
-      { JX,	JX,	ERROR,	ERROR,	ERROR,	ERROR,	ERROR,  JX,	HX },
-      { HX,	HX,	ERROR,	ERROR,	ERROR,	ERROR,	ERROR,	HX,	HX },
-    };
-
-
-  if (a->arch != b->arch || matrix[a->mach][b->mach] == ERROR) 
-    {
-    return NULL;
-    }
-  else 
-    {
-    return (a->mach  ==  matrix[a->mach][b->mach]) ?  a : b;
-    }
-}
-
-
-
-int bfd_default_scan_num_mach();
-#define N(a,b,d,n) \
-{ 32, 32, 8,bfd_arch_i960,a,"i960",b,3,d,compatible,scan_960_mach,n,}
-
-static const bfd_arch_info_type arch_info_struct[] = 
-{ 
-  N(bfd_mach_i960_ka_sa,"i960:ka_sa",false, &arch_info_struct[1]),
-  N(bfd_mach_i960_kb_sb,"i960:kb_sb",false, &arch_info_struct[2]),
-  N(bfd_mach_i960_mc,   "i960:mc",   false, &arch_info_struct[3]),
-  N(bfd_mach_i960_xa,   "i960:xa",   false, &arch_info_struct[4]),
-  N(bfd_mach_i960_ca,   "i960:ca",   false, &arch_info_struct[5]),
-  N(bfd_mach_i960_jx,   "i960:jx",   false, &arch_info_struct[6]),
-  N(bfd_mach_i960_hx,	"i960:hx",   false, 0),
-};
-
-const bfd_arch_info_type bfd_i960_arch =
-  N(bfd_mach_i960_core, "i960:core", true, &arch_info_struct[0]);
diff --git a/bfd/cpu-m10200.c b/bfd/cpu-m10200.c
deleted file mode 100644
index 3f8a678beec..00000000000
--- a/bfd/cpu-m10200.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* BFD support for the Matsushita 10200 processor
-   Copyright 1996, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_mn10200_arch =
-  {
-    16, /* 16 bits in a word */
-    24, /* 16 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_mn10200,
-    200,
-    "mn10200",
-    "mn10200",
-    2,
-    true, /* the one and only */
-    bfd_default_compatible,
-    bfd_default_scan ,
-    0,
-  };
diff --git a/bfd/cpu-m10300.c b/bfd/cpu-m10300.c
deleted file mode 100644
index 5aa0bfe9c88..00000000000
--- a/bfd/cpu-m10300.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* BFD support for the Matsushita 10300 processor
-   Copyright 1996, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define NEXT NULL
-
-const bfd_arch_info_type bfd_mn10300_arch =
-  {
-    32, /* 16 bits in a word */
-    32, /* 16 bits in an address */
-    8,  /* 8 bits in a byte */
-    bfd_arch_mn10300,
-    300,
-    "mn10300",
-    "mn10300",
-    2,
-    true, /* the one and only */
-    bfd_default_compatible,
-    bfd_default_scan ,
-    NEXT,
-  };
-
diff --git a/bfd/cpu-m32r.c b/bfd/cpu-m32r.c
deleted file mode 100644
index bd3cc31963d..00000000000
--- a/bfd/cpu-m32r.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* BFD support for the M32R processor.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define N(number, print, default, next)  \
-{  32, 32, 8, bfd_arch_m32r, number, "m32r", print, 4, default, \
-     bfd_default_compatible, bfd_default_scan, next }
-
-#define NEXT NULL
-
-
-const bfd_arch_info_type bfd_m32r_arch =
-  N (bfd_mach_m32r, "m32r", true, NEXT);
diff --git a/bfd/cpu-m68k.c b/bfd/cpu-m68k.c
deleted file mode 100644
index 184182d695e..00000000000
--- a/bfd/cpu-m68k.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* BFD library support routines for architectures.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 97, 1998
-   Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define N(name, print,d,next)  \
-{  32, 32, 8, bfd_arch_m68k, name, "m68k",print,2,d,bfd_default_compatible,bfd_default_scan, next, }
-
-static const bfd_arch_info_type arch_info_struct[] =
-{ 
-  N(bfd_mach_m68000, "m68k:68000", false, &arch_info_struct[1]),
-  N(bfd_mach_m68008, "m68k:68008", false, &arch_info_struct[2]),
-  N(bfd_mach_m68010, "m68k:68010", false, &arch_info_struct[3]),
-  N(bfd_mach_m68020, "m68k:68020", false, &arch_info_struct[4]),
-  N(bfd_mach_m68030, "m68k:68030", false, &arch_info_struct[5]),
-  N(bfd_mach_m68040, "m68k:68040", false, &arch_info_struct[6]),
-  N(bfd_mach_cpu32,  "m68k:cpu32", false, &arch_info_struct[7]),
-  N(bfd_mach_m68060, "m68k:68060", false, 0),
-};
-
-const bfd_arch_info_type bfd_m68k_arch =
-  N(0, "m68k", true, &arch_info_struct[0]);
diff --git a/bfd/cpu-m88k.c b/bfd/cpu-m88k.c
deleted file mode 100644
index c3716c5a394..00000000000
--- a/bfd/cpu-m88k.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* bfd back-end for m88k support
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-
-
-
-const bfd_arch_info_type bfd_m88k_arch =
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_m88k,
-    88100,	/* only 1 machine */
-    "m88k",
-    "m88k:88100",
-    3,
-    true, /* the one and only */
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
-  };
diff --git a/bfd/cpu-mcore.c b/bfd/cpu-mcore.c
deleted file mode 100644
index 7dbfe1b5dac..00000000000
--- a/bfd/cpu-mcore.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* BFD library support routines for Motorolla's MCore architecture
-   Copyright (C) 1993, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_mcore_arch =
-{
-  32,		  		/* 32 bits in a word */
-  32,		  		/* 32 bits in an address */
-  8,		  		/* 8 bits in a byte */
-  bfd_arch_mcore, 		/* Architecture */
-  0,		  		/* Machine number - 0 for now */
-  "MCore",	  		/* Architecture name */
-  "MCore",	  		/* Printable name */
-  3,		  		/* Section align power */
-  true,		  		/* Is this the default architecture ? */
-  bfd_default_compatible,	/* Architecture comparison function */
-  bfd_default_scan,	   	/* String to architecture conversion */
-  NULL			   	/* Next in list */
-};
diff --git a/bfd/cpu-mips.c b/bfd/cpu-mips.c
deleted file mode 100644
index a933b8cd10b..00000000000
--- a/bfd/cpu-mips.c
+++ /dev/null
@@ -1,88 +0,0 @@
-/* bfd back-end for mips support
-   Copyright (C) 1990, 91-97, 1998 Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define N(BITS_WORD, BITS_ADDR, NUMBER, PRINT, DEFAULT, NEXT)		\
-  {							\
-    BITS_WORD, /*  bits in a word */			\
-    BITS_ADDR, /* bits in an address */			\
-    8,	/* 8 bits in a byte */				\
-    bfd_arch_mips,					\
-    NUMBER,						\
-    "mips",						\
-    PRINT,						\
-    3,							\
-    DEFAULT,						\
-    bfd_default_compatible, 				\
-    bfd_default_scan,					\
-    NEXT,						\
-  }
-
-enum {
-I_mips3000, 
-I_mips3900, 
-I_mips4000, 
-I_mips4010, 
-I_mips4100, 
-I_mips4111,
-I_mips4300, 
-I_mips4400, 
-I_mips4600, 
-I_mips4650, 
-I_mips5000, 
-I_mips6000, 
-I_mips8000, 
-I_mips10000,
-I_mips16
-};
-
-
-#define NN(index) (&arch_info_struct[(index)+1])
-
-static const bfd_arch_info_type arch_info_struct[] = 
-{
-  N (32, 32, bfd_mach_mips3000, "mips:3000", false, NN(I_mips3000)),
-  N (32, 32, bfd_mach_mips3900, "mips:3900", false, NN(I_mips3900)),
-  N (64, 64, bfd_mach_mips4000, "mips:4000", false, NN(I_mips4000)),
-  N (64, 64, bfd_mach_mips4010, "mips:4010", false, NN(I_mips4010)),
-  N (64, 64, bfd_mach_mips4100, "mips:4100", false, NN(I_mips4100)),
-  N (64, 64, bfd_mach_mips4111, "mips:4111", false, NN(I_mips4111)),
-  N (64, 64, bfd_mach_mips4300, "mips:4300", false, NN(I_mips4300)),
-  N (64, 64, bfd_mach_mips4400, "mips:4400", false, NN(I_mips4400)),
-  N (64, 64, bfd_mach_mips4600, "mips:4600", false, NN(I_mips4600)),
-  N (64, 64, bfd_mach_mips4650, "mips:4650", false, NN(I_mips4650)),
-  N (64, 64, bfd_mach_mips5000, "mips:5000", false, NN(I_mips5000)),
-  N (32, 32, bfd_mach_mips6000, "mips:6000", false, NN(I_mips6000)),
-  N (64, 64, bfd_mach_mips8000, "mips:8000", false, NN(I_mips8000)),
-  N (64, 64, bfd_mach_mips10000, "mips:10000", false, NN(I_mips10000)),
-
-
-  N (64, 64, bfd_mach_mips16,   "mips:16",   false, 0),
-};
-
-/* The default architecture is mips:3000, but with a machine number of
-   zero.  This lets the linker distinguish between a default setting
-   of mips, and an explicit setting of mips:3000.  */
-
-const bfd_arch_info_type bfd_mips_arch =
-N (32, 32, 0, "mips", true, &arch_info_struct[0]);
diff --git a/bfd/cpu-ns32k.c b/bfd/cpu-ns32k.c
deleted file mode 100644
index 1b0a18d5c52..00000000000
--- a/bfd/cpu-ns32k.c
+++ /dev/null
@@ -1,846 +0,0 @@
-/* BFD support for the ns32k architecture.
-   Copyright (C) 1990, 91, 94, 95, 96, 1998 Free Software Foundation, Inc.
-   Almost totally rewritten by Ian Dall from initial work
-   by Andrew Cagney.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "ns32k.h"
-
-#define N(machine, printable, d, next)  \
-{  32, 32, 8, bfd_arch_ns32k, machine, "ns32k",printable,3,d,bfd_default_compatible,bfd_default_scan, next, }
-
-static const bfd_arch_info_type arch_info_struct[] =
-{ 
-  N(32532,"ns32k:32532",true, 0), /* the word ns32k will match this too */
-};
-
-const bfd_arch_info_type bfd_ns32k_arch =
-  N(32032,"ns32k:32032",false, &arch_info_struct[0]);
-
-static long
-ns32k_sign_extend(value, bits)
-     int value;
-     int bits;
-{
-  value = value & ((1 << bits) - 1);
-  return (value & (1 << (bits-1))
-	  ? value | (~((1 << bits) - 1))
-	  : value);
-}
-
-long
-_bfd_ns32k_get_displacement(buffer, offset, size)
-     bfd_byte *buffer;
-     long offset;
-     long size;
-{
-  long value;
-  buffer += offset;
-  switch (size)
-    {
-    case 1:
-      value = ns32k_sign_extend (*buffer, 7);
-      break;
-    case 2:
-      value = ns32k_sign_extend(*buffer++, 6);
-      value = (value << 8) | (0xff & *buffer);
-      break;
-    case 4:
-      value = ns32k_sign_extend(*buffer++, 6);
-      value = (value << 8) | (0xff & *buffer++);
-      value = (value << 8) | (0xff & *buffer++);
-      value = (value << 8) | (0xff & *buffer);
-      break;
-    default:
-      abort ();
-      return 0;
-    }
-  return value;
-}
-
-int
-_bfd_ns32k_put_displacement(value, buffer, offset, size)
-     long value;
-     bfd_byte *buffer;
-     long offset;
-     long size;
-{
-  buffer += offset;
-  switch (size)
-    {
-    case 1:
-      if (value < -64 || value > 63)
-	return -1;
-      value&=0x7f;
-      *buffer++=value;
-      break;
-    case 2:
-      if (value < -8192 || value > 8191)
-	return -1;
-      value&=0x3fff;
-      value|=0x8000;
-      *buffer++=(value>>8);
-      *buffer++=value;
-      break;
-    case 4:
-      if (value < -0x1f000000 || value >= 0x20000000)
-	return -1;
-      value|=0xc0000000;
-      *buffer++=(value>>24);
-      *buffer++=(value>>16);
-      *buffer++=(value>>8);
-      *buffer++=value;
-      break;
-    default:
-      return -1;
-  }
-  return 0;
-}
-
-long
-_bfd_ns32k_get_immediate (buffer, offset, size)
-     bfd_byte *buffer;
-     long offset;
-     long size;
-{
-  long value = 0;
-  buffer += offset;
-  switch (size)
-    {
-    case 4:
-      value = (value << 8) | (*buffer++ & 0xff);
-    case 3:
-      value = (value << 8) | (*buffer++ & 0xff);
-    case 2:
-      value = (value << 8) | (*buffer++ & 0xff);
-    case 1:
-      value = (value << 8) | (*buffer++ & 0xff);
-    }
-  return value;
-}
-
-int
-_bfd_ns32k_put_immediate (value, buffer, offset, size)
-     long value;
-     bfd_byte *buffer;
-     long offset;
-     long size;
-{
-  buffer += offset + size - 1;
-  switch (size)
-    {
-    case 4:
-      *buffer-- = (value & 0xff); value >>= 8;
-    case 3:
-      *buffer-- = (value & 0xff); value >>= 8;
-    case 2:
-      *buffer-- = (value & 0xff); value >>= 8;
-    case 1:
-      *buffer-- = (value & 0xff); value >>= 8;
-    }
-  return 0;
-}
-
-/* This is just like the standard perform_relocation except we
- * use get_data and put_data which know about the ns32k
- * storage methods.
- * This is probably a lot more complicated than it needs to be!
- */
-static bfd_reloc_status_type
-do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd,
-		error_message, get_data, put_data)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-     long (*get_data)();
-     int (*put_data)();
-{
-  int overflow = 0;
-  bfd_vma relocation;
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  bfd_size_type addr = reloc_entry->address;
-  bfd_vma output_base = 0;
-  reloc_howto_type *howto = reloc_entry->howto;
-  asection *reloc_target_output_section;
-
-  if ((symbol->section == &bfd_abs_section)
-      && output_bfd != (bfd *) NULL)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* If we are not producing relocateable output, return an error if
-     the symbol is not defined.  An undefined weak symbol is
-     considered to have a value of zero (SVR4 ABI, p. 4-27).  */
-  if (symbol->section == &bfd_und_section
-      && (symbol->flags & BSF_WEAK) == 0
-      && output_bfd == (bfd *) NULL)
-    flag = bfd_reloc_undefined;
-
-
-  /* Is the address of the relocation really within the section?  */
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Work out which section the relocation is targetted at and the
-     initial relocation command value.  */
-
-  /* Get symbol value.  (Common symbols are special.)  */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-
-  reloc_target_output_section = symbol->section->output_section;
-
-  /* Convert input-section-relative symbol value to absolute.  */
-  if (output_bfd && howto->partial_inplace == false)
-    output_base = 0;
-  else
-    output_base = reloc_target_output_section->vma;
-
-  relocation += output_base + symbol->section->output_offset;
-
-  /* Add in supplied addend.  */
-  relocation += reloc_entry->addend;
-
-  /* Here the variable relocation holds the final address of the
-     symbol we are relocating against, plus any addend.  */
-
-  if (howto->pc_relative == true)
-    {
-      /* This is a PC relative relocation.  We want to set RELOCATION
-	 to the distance between the address of the symbol and the
-	 location.  RELOCATION is already the address of the symbol.
-
-	 We start by subtracting the address of the section containing
-	 the location.
-
-	 If pcrel_offset is set, we must further subtract the position
-	 of the location within the section.  Some targets arrange for
-	 the addend to be the negative of the position of the location
-	 within the section; for example, i386-aout does this.  For
-	 i386-aout, pcrel_offset is false.  Some other targets do not
-	 include the position of the location; for example, m88kbcs,
-	 or ELF.  For those targets, pcrel_offset is true.
-
-	 If we are producing relocateable output, then we must ensure
-	 that this reloc will be correctly computed when the final
-	 relocation is done.  If pcrel_offset is false we want to wind
-	 up with the negative of the location within the section,
-	 which means we must adjust the existing addend by the change
-	 in the location within the section.  If pcrel_offset is true
-	 we do not want to adjust the existing addend at all.
-
-	 FIXME: This seems logical to me, but for the case of
-	 producing relocateable output it is not what the code
-	 actually does.  I don't want to change it, because it seems
-	 far too likely that something will break.  */
-
-      relocation -=
-	input_section->output_section->vma + input_section->output_offset;
-
-      if (howto->pcrel_offset == true)
-	relocation -= reloc_entry->address;
-    }
-
-  if (output_bfd != (bfd *) NULL)
-    {
-      if (howto->partial_inplace == false)
-	{
-	  /* This is a partial relocation, and we want to apply the relocation
-	     to the reloc entry rather than the raw data. Modify the reloc
-	     inplace to reflect what we now know.  */
-	  reloc_entry->addend = relocation;
-	  reloc_entry->address += input_section->output_offset;
-	  return flag;
-	}
-      else
-	{
-	  /* This is a partial relocation, but inplace, so modify the
-	     reloc record a bit.
-
-	     If we've relocated with a symbol with a section, change
-	     into a ref to the section belonging to the symbol.  */
-
-	  reloc_entry->address += input_section->output_offset;
-
-	  /* WTF?? */
-	  if (abfd->xvec->flavour == bfd_target_coff_flavour
-	      && strcmp (abfd->xvec->name, "aixcoff-rs6000") != 0)
-	    {
-#if 1
-	      /* For m68k-coff, the addend was being subtracted twice during
-		 relocation with -r.  Removing the line below this comment
-		 fixes that problem; see PR 2953.
-
-However, Ian wrote the following, regarding removing the line below,
-which explains why it is still enabled:  --djm
-
-If you put a patch like that into BFD you need to check all the COFF
-linkers.  I am fairly certain that patch will break coff-i386 (e.g.,
-SCO); see coff_i386_reloc in coff-i386.c where I worked around the
-problem in a different way.  There may very well be a reason that the
-code works as it does.
-
-Hmmm.  The first obvious point is that bfd_perform_relocation should
-not have any tests that depend upon the flavour.  It's seem like
-entirely the wrong place for such a thing.  The second obvious point
-is that the current code ignores the reloc addend when producing
-relocateable output for COFF.  That's peculiar.  In fact, I really
-have no idea what the point of the line you want to remove is.
-
-A typical COFF reloc subtracts the old value of the symbol and adds in
-the new value to the location in the object file (if it's a pc
-relative reloc it adds the difference between the symbol value and the
-location).  When relocating we need to preserve that property.
-
-BFD handles this by setting the addend to the negative of the old
-value of the symbol.  Unfortunately it handles common symbols in a
-non-standard way (it doesn't subtract the old value) but that's a
-different story (we can't change it without losing backward
-compatibility with old object files) (coff-i386 does subtract the old
-value, to be compatible with existing coff-i386 targets, like SCO).
-
-So everything works fine when not producing relocateable output.  When
-we are producing relocateable output, logically we should do exactly
-what we do when not producing relocateable output.  Therefore, your
-patch is correct.  In fact, it should probably always just set
-reloc_entry->addend to 0 for all cases, since it is, in fact, going to
-add the value into the object file.  This won't hurt the COFF code,
-which doesn't use the addend; I'm not sure what it will do to other
-formats (the thing to check for would be whether any formats both use
-the addend and set partial_inplace).
-
-When I wanted to make coff-i386 produce relocateable output, I ran
-into the problem that you are running into: I wanted to remove that
-line.  Rather than risk it, I made the coff-i386 relocs use a special
-function; it's coff_i386_reloc in coff-i386.c.  The function
-specifically adds the addend field into the object file, knowing that
-bfd_perform_relocation is not going to.  If you remove that line, then
-coff-i386.c will wind up adding the addend field in twice.  It's
-trivial to fix; it just needs to be done.
-
-The problem with removing the line is just that it may break some
-working code.  With BFD it's hard to be sure of anything.  The right
-way to deal with this is simply to build and test at least all the
-supported COFF targets.  It should be straightforward if time and disk
-space consuming.  For each target:
-    1) build the linker
-    2) generate some executable, and link it using -r (I would
-       probably use paranoia.o and link against newlib/libc.a, which
-       for all the supported targets would be available in
-       /usr/cygnus/progressive/H-host/target/lib/libc.a).
-    3) make the change to reloc.c
-    4) rebuild the linker
-    5) repeat step 2
-    6) if the resulting object files are the same, you have at least
-       made it no worse
-    7) if they are different you have to figure out which version is
-       right
-*/
-	      relocation -= reloc_entry->addend;
-#endif
-	      reloc_entry->addend = 0;
-	    }
-	  else
-	    {
-	      reloc_entry->addend = relocation;
-	    }
-	}
-    }
-  else
-    {
-      reloc_entry->addend = 0;
-    }
-
-  /* FIXME: This overflow checking is incomplete, because the value
-     might have overflowed before we get here.  For a correct check we
-     need to compute the value in a size larger than bitsize, but we
-     can't reasonably do that for a reloc the same size as a host
-     machine word.
-     FIXME: We should also do overflow checking on the result after
-     adding in the value contained in the object file.  */
-  if (howto->complain_on_overflow != complain_overflow_dont)
-    {
-      bfd_vma check;
-
-      /* Get the value that will be used for the relocation, but
-	 starting at bit position zero.  */
-      if (howto->rightshift > howto->bitpos)
-	check = relocation >> (howto->rightshift - howto->bitpos);
-      else
-	check = relocation << (howto->bitpos - howto->rightshift);
-      switch (howto->complain_on_overflow)
-	{
-	case complain_overflow_signed:
-	  {
-	    /* Assumes two's complement.  */
-	    bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
-	    bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
-
-	    /* The above right shift is incorrect for a signed value.
-	       Fix it up by forcing on the upper bits.  */
-	    if (howto->rightshift > howto->bitpos
-		&& (bfd_signed_vma) relocation < 0)
-	      check |= ((bfd_vma) - 1
-			& ~((bfd_vma) - 1
-			    >> (howto->rightshift - howto->bitpos)));
-	    if ((bfd_signed_vma) check > reloc_signed_max
-		|| (bfd_signed_vma) check < reloc_signed_min)
-	      flag = bfd_reloc_overflow;
-	  }
-	  break;
-	case complain_overflow_unsigned:
-	  {
-	    /* Assumes two's complement.  This expression avoids
-	       overflow if howto->bitsize is the number of bits in
-	       bfd_vma.  */
-	    bfd_vma reloc_unsigned_max =
-	    (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
-
-	    if ((bfd_vma) check > reloc_unsigned_max)
-	      flag = bfd_reloc_overflow;
-	  }
-	  break;
-	case complain_overflow_bitfield:
-	  {
-	    /* Assumes two's complement.  This expression avoids
-	       overflow if howto->bitsize is the number of bits in
-	       bfd_vma.  */
-	    bfd_vma reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
-
-	    if (((bfd_vma) check & ~reloc_bits) != 0
-		&& ((bfd_vma) check & ~reloc_bits) != (-1 & ~reloc_bits))
-	      {
-		/* The above right shift is incorrect for a signed
-		   value.  See if turning on the upper bits fixes the
-		   overflow.  */
-		if (howto->rightshift > howto->bitpos
-		    && (bfd_signed_vma) relocation < 0)
-		  {
-		    check |= ((bfd_vma) - 1
-			      & ~((bfd_vma) - 1
-				  >> (howto->rightshift - howto->bitpos)));
-		    if (((bfd_vma) check & ~reloc_bits) != (-1 & ~reloc_bits))
-		      flag = bfd_reloc_overflow;
-		  }
-		else
-		  flag = bfd_reloc_overflow;
-	      }
-	  }
-	  break;
-	default:
-	  abort ();
-	}
-    }
-
-  /*
-    Either we are relocating all the way, or we don't want to apply
-    the relocation to the reloc entry (probably because there isn't
-    any room in the output format to describe addends to relocs)
-    */
-
-  /* The cast to bfd_vma avoids a bug in the Alpha OSF/1 C compiler
-     (OSF version 1.3, compiler version 3.11).  It miscompiles the
-     following program:
-
-     struct str
-     {
-       unsigned int i0;
-     } s = { 0 };
-
-     int
-     main ()
-     {
-       unsigned long x;
-
-       x = 0x100000000;
-       x <<= (unsigned long) s.i0;
-       if (x == 0)
-	 printf ("failed\n");
-       else
-	 printf ("succeeded (%lx)\n", x);
-     }
-     */
-
-  relocation >>= (bfd_vma) howto->rightshift;
-
-  /* Shift everything up to where it's going to be used */
-
-  relocation <<= (bfd_vma) howto->bitpos;
-
-  /* Wait for the day when all have the mask in them */
-
-  /* What we do:
-     i instruction to be left alone
-     o offset within instruction
-     r relocation offset to apply
-     S src mask
-     D dst mask
-     N ~dst mask
-     A part 1
-     B part 2
-     R result
-
-     Do this:
-     i i i i i o o o o o        from bfd_get<size>
-     and           S S S S S    to get the size offset we want
-     +   r r r r r r r r r r  to get the final value to place
-     and           D D D D D  to chop to right size
-     -----------------------
-     A A A A A
-     And this:
-     ...   i i i i i o o o o o  from bfd_get<size>
-     and   N N N N N            get instruction
-     -----------------------
-     ...   B B B B B
-
-     And then:
-     B B B B B
-     or              A A A A A
-     -----------------------
-     R R R R R R R R R R        put into bfd_put<size>
-     */
-
-#define DOIT(x) \
-  x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) +  relocation) & howto->dst_mask))
-
-  switch (howto->size)
-    {
-    case 0:
-      {
-	char x = get_data (data, addr, 1);
-	DOIT (x);
-	overflow = put_data(x, data, addr, 1);
-      }
-      break;
-
-    case 1:
-      if (relocation)
-	{
-	  short x = get_data (data, addr, 2);
-	  DOIT (x);
-	  overflow = put_data(x, (unsigned char *) data, addr, 2);
-	}
-      break;
-    case 2:
-      if (relocation)
-	{
-	  long x = get_data (data, addr, 4);
-	  DOIT (x);
-	  overflow = put_data(x, data, addr, 4);
-	}
-      break;
-    case -2:
-      {
-	long  x = get_data(data, addr, 4);
-	relocation = -relocation;
-	DOIT(x);
-	overflow = put_data(x, data , addr, 4);
-      }
-      break;
-
-    case 3:
-      /* Do nothing */
-      break;
-
-    case 4:
-#ifdef BFD64
-      if (relocation)
-	{
-	  bfd_vma x = get_data (data, addr, 8);
-	  DOIT (x);
-	  overflow = put_data(x, data, addr, 8);
-	}
-#else
-      abort ();
-#endif
-      break;
-    default:
-      return bfd_reloc_other;
-    }
-  if ((howto->complain_on_overflow != complain_overflow_dont) && overflow)
-    return bfd_reloc_overflow;
-
-  return flag;
-}
-
-/* Relocate a given location using a given value and howto.  */
-
-bfd_reloc_status_type
-_bfd_do_ns32k_reloc_contents ( howto, input_bfd, relocation, location,
-			      get_data, put_data)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd_vma relocation;
-     bfd_byte *location;
-     long (*get_data)();
-     int (*put_data)();
-{
-  int size;
-  bfd_vma x;
-  boolean overflow;
-
-  /* If the size is negative, negate RELOCATION.  This isn't very
-     general.  */
-  if (howto->size < 0)
-    relocation = -relocation;
-
-  /* Get the value we are going to relocate.  */
-  size = bfd_get_reloc_size (howto);
-  switch (size)
-    {
-    default:
-    case 0:
-      abort ();
-    case 1:
-    case 2:
-    case 4:
-#ifdef BFD64
-    case 8:
-#endif
-      x = get_data (location, 0, size);
-      break;
-    }
-
-  /* Check for overflow.  FIXME: We may drop bits during the addition
-     which we don't check for.  We must either check at every single
-     operation, which would be tedious, or we must do the computations
-     in a type larger than bfd_vma, which would be inefficient.  */
-  overflow = false;
-  if (howto->complain_on_overflow != complain_overflow_dont)
-    {
-      bfd_vma check;
-      bfd_signed_vma signed_check;
-      bfd_vma add;
-      bfd_signed_vma signed_add;
-
-      if (howto->rightshift == 0)
-	{
-	  check = relocation;
-	  signed_check = (bfd_signed_vma) relocation;
-	}
-      else
-	{
-	  /* Drop unwanted bits from the value we are relocating to.  */
-	  check = relocation >> howto->rightshift;
-
-	  /* If this is a signed value, the rightshift just dropped
-	     leading 1 bits (assuming twos complement).  */
-	  if ((bfd_signed_vma) relocation >= 0)
-	    signed_check = check;
-	  else
-	    signed_check = (check
-			    | ((bfd_vma) - 1
-			       & ~((bfd_vma) - 1 >> howto->rightshift)));
-	}
-
-      /* Get the value from the object file.  */
-      add = x & howto->src_mask;
-
-      /* Get the value from the object file with an appropriate sign.
-	 The expression involving howto->src_mask isolates the upper
-	 bit of src_mask.  If that bit is set in the value we are
-	 adding, it is negative, and we subtract out that number times
-	 two.  If src_mask includes the highest possible bit, then we
-	 can not get the upper bit, but that does not matter since
-	 signed_add needs no adjustment to become negative in that
-	 case.  */
-      signed_add = add;
-      if ((add & (((~howto->src_mask) >> 1) & howto->src_mask)) != 0)
-	signed_add -= (((~howto->src_mask) >> 1) & howto->src_mask) << 1;
-
-      /* Add the value from the object file, shifted so that it is a
-	 straight number.  */
-      if (howto->bitpos == 0)
-	{
-	  check += add;
-	  signed_check += signed_add;
-	}
-      else
-	{
-	  check += add >> howto->bitpos;
-
-	  /* For the signed case we use ADD, rather than SIGNED_ADD,
-	     to avoid warnings from SVR4 cc.  This is OK since we
-	     explictly handle the sign bits.  */
-	  if (signed_add >= 0)
-	    signed_check += add >> howto->bitpos;
-	  else
-	    signed_check += ((add >> howto->bitpos)
-			     | ((bfd_vma) - 1
-				& ~((bfd_vma) - 1 >> howto->bitpos)));
-	}
-
-      switch (howto->complain_on_overflow)
-	{
-	case complain_overflow_signed:
-	  {
-	    /* Assumes two's complement.  */
-	    bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
-	    bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
-
-	    if (signed_check > reloc_signed_max
-		|| signed_check < reloc_signed_min)
-	      overflow = true;
-	  }
-	  break;
-	case complain_overflow_unsigned:
-	  {
-	    /* Assumes two's complement.  This expression avoids
-	       overflow if howto->bitsize is the number of bits in
-	       bfd_vma.  */
-	    bfd_vma reloc_unsigned_max =
-	    (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
-
-	    if (check > reloc_unsigned_max)
-	      overflow = true;
-	  }
-	  break;
-	case complain_overflow_bitfield:
-	  {
-	    /* Assumes two's complement.  This expression avoids
-	       overflow if howto->bitsize is the number of bits in
-	       bfd_vma.  */
-	    bfd_vma reloc_bits = (((1 << (howto->bitsize - 1)) - 1) << 1) | 1;
-
-	    if ((check & ~reloc_bits) != 0
-		&& (((bfd_vma) signed_check & ~reloc_bits)
-		    != (-1 & ~reloc_bits)))
-	      overflow = true;
-	  }
-	  break;
-	default:
-	  abort ();
-	}
-    }
-
-  /* Put RELOCATION in the right bits.  */
-  relocation >>= (bfd_vma) howto->rightshift;
-  relocation <<= (bfd_vma) howto->bitpos;
-
-  /* Add RELOCATION to the right bits of X.  */
-  x = ((x & ~howto->dst_mask)
-       | (((x & howto->src_mask) + relocation) & howto->dst_mask));
-
-  /* Put the relocated value back in the object file.  */
-  switch (size)
-    {
-    default:
-    case 0:
-      abort ();
-    case 1:
-    case 2:
-    case 4:
-#ifdef BFD64
-    case 8:
-#endif
-      put_data(x, location, 0, size);
-      break;
-    }
-
-  return overflow ? bfd_reloc_overflow : bfd_reloc_ok;
-}
-
-bfd_reloc_status_type
-_bfd_ns32k_reloc_disp (abfd, reloc_entry, symbol, data, input_section,
-		       output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
-			 output_bfd, error_message,
-			 _bfd_ns32k_get_displacement,
-			 _bfd_ns32k_put_displacement);
-}
-
-bfd_reloc_status_type
-_bfd_ns32k_reloc_imm (abfd, reloc_entry, symbol, data, input_section,
-		      output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return do_ns32k_reloc (abfd, reloc_entry, symbol, data, input_section,
-			 output_bfd, error_message, _bfd_ns32k_get_immediate,
-			 _bfd_ns32k_put_immediate);
-}
-
-bfd_reloc_status_type
-_bfd_ns32k_final_link_relocate (howto, input_bfd, input_section, contents,
-				address, value, addend)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma address;
-     bfd_vma value;
-     bfd_vma addend;
-{
-  bfd_vma relocation;
-
-  /* Sanity check the address.  */
-  if (address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* This function assumes that we are dealing with a basic relocation
-     against a symbol.  We want to compute the value of the symbol to
-     relocate to.  This is just VALUE, the value of the symbol, plus
-     ADDEND, any addend associated with the reloc.  */
-  relocation = value + addend;
-
-  /* If the relocation is PC relative, we want to set RELOCATION to
-     the distance between the symbol (currently in RELOCATION) and the
-     location we are relocating.  Some targets (e.g., i386-aout)
-     arrange for the contents of the section to be the negative of the
-     offset of the location within the section; for such targets
-     pcrel_offset is false.  Other targets (e.g., m88kbcs or ELF)
-     simply leave the contents of the section as zero; for such
-     targets pcrel_offset is true.  If pcrel_offset is false we do not
-     need to subtract out the offset of the location within the
-     section (which is just ADDRESS).  */
-  if (howto->pc_relative)
-    {
-      relocation -= (input_section->output_section->vma
-		     + input_section->output_offset);
-      if (howto->pcrel_offset)
-	relocation -= address;
-    }
-
-  return _bfd_ns32k_relocate_contents (howto, input_bfd, relocation,
-				       contents + address);
-}
diff --git a/bfd/cpu-powerpc.c b/bfd/cpu-powerpc.c
deleted file mode 100644
index 11f0f80af5a..00000000000
--- a/bfd/cpu-powerpc.c
+++ /dev/null
@@ -1,124 +0,0 @@
-/* BFD PowerPC CPU definition
-   Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
-   Contributed by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/* The common PowerPC architecture is compatible with the RS/6000.  */
-
-static const bfd_arch_info_type *powerpc_compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-
-static const bfd_arch_info_type *
-powerpc_compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  BFD_ASSERT (a->arch == bfd_arch_powerpc);
-  switch (b->arch)
-    {
-    default:
-      return NULL;
-    case bfd_arch_powerpc:
-      return bfd_default_compatible (a, b);
-    case bfd_arch_rs6000:
-      if (a->mach == 0)
-	return a;
-      return NULL;
-    }
-  /*NOTREACHED*/
-}
-
-static const bfd_arch_info_type arch_info_struct[] =
-{
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_powerpc,
-    603, /* for the mpc603 */
-    "powerpc",
-    "powerpc:603",
-    3,
-    false, /* not the default */
-    powerpc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[1]
-  },
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_powerpc,
-    604, /* for the mpc604 */
-    "powerpc",
-    "powerpc:604",
-    3,
-    false, /* not the default */
-    powerpc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[2]
-  },
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_powerpc,
-    403, /* for the 403 */
-    "powerpc",
-    "powerpc:403",
-    3,
-    false, /* not the default */
-    powerpc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[3]
-  },
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_powerpc,
-    601, /* for the mpc601 */
-    "powerpc",
-    "powerpc:601",
-    3,
-    false, /* not the default */
-    powerpc_compatible, 
-    bfd_default_scan,
-    0
-  }
-};
-
-const bfd_arch_info_type bfd_powerpc_arch =
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_powerpc,
-    0, /* for the POWER/PowerPC common architecture */
-    "powerpc",
-    "powerpc:common",
-    3,
-    true, /* the default */
-    powerpc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[0]
-  };
diff --git a/bfd/cpu-rs6000.c b/bfd/cpu-rs6000.c
deleted file mode 100644
index 9852ae9a053..00000000000
--- a/bfd/cpu-rs6000.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* BFD back-end for rs6000 support
-   Copyright (C) 1990, 1991 Free Software Foundation, Inc.
-   FIXME: Can someone provide a transliteration of this name into ASCII?
-   Using the following chars caused a compiler warning on HIUX (so I replaced
-   them with octal escapes), and isn't useful without an understanding of what
-   character set it is.
-   Written by Mimi Ph\373\364ng-Th\345o V\365 of IBM
-   and John Gilmore of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/* The RS/6000 architecture is compatible with the PowerPC common
-   architecture.  */
-
-static const bfd_arch_info_type *rs6000_compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-
-static const bfd_arch_info_type *
-rs6000_compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  BFD_ASSERT (a->arch == bfd_arch_rs6000);
-  switch (b->arch)
-    {
-    default:
-      return NULL;
-    case bfd_arch_rs6000:
-      return bfd_default_compatible (a, b);
-    case bfd_arch_powerpc:
-      if (b->mach == 0)
-	return b;
-      return NULL;
-    }
-  /*NOTREACHED*/
-}
-
-const bfd_arch_info_type bfd_rs6000_arch =
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_rs6000,
-    6000,	/* only 1 machine */
-    "rs6000",
-    "rs6000:6000",
-    3,
-    true, /* the one and only */
-    rs6000_compatible,
-    bfd_default_scan,
-    0,
-  };
diff --git a/bfd/cpu-sh.c b/bfd/cpu-sh.c
deleted file mode 100644
index 44adf9217ff..00000000000
--- a/bfd/cpu-sh.c
+++ /dev/null
@@ -1,102 +0,0 @@
-/* BFD library support routines for the Hitachi-SH architecture.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-
-static boolean 
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcasecmp (info->printable_name, string) == 0)
-    return true;
-  return false;
-}
-
-
-#if 0
-/* This routine is provided two arch_infos and returns whether
-   they'd be compatible */
-
-static const bfd_arch_info_type *
-compatible (a,b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  if (a->arch != b->arch || a->mach != b->mach)
-   return NULL;
-  return a;
-}
-#endif
-
-#define SH_NEXT &arch_info_struct[0]
-#define SH3_NEXT &arch_info_struct[1]
-#define SH3E_NEXT NULL
-
-static const bfd_arch_info_type arch_info_struct[] = 
-{
-  {
-    32,				/* 32 bits in a word */
-    32,				/* 32 bits in an address */
-    8,				/* 8 bits in a byte */
-    bfd_arch_sh,
-    bfd_mach_sh3,
-    "sh",			/* arch_name  */
-    "sh3",			/* printable name */
-    1,
-    false,			/* not the default */
-    bfd_default_compatible,
-    scan_mach,
-    SH3_NEXT
-  },
-  {
-    32,				/* 32 bits in a word */
-    32,				/* 32 bits in an address */
-    8,				/* 8 bits in a byte */
-    bfd_arch_sh,
-    bfd_mach_sh3e,
-    "sh",			/* arch_name  */
-    "sh3e",			/* printable name */
-    1,
-    false,			/* not the default */
-    bfd_default_compatible,
-    scan_mach,
-    SH3E_NEXT
-  },
-};
-
-const bfd_arch_info_type bfd_sh_arch =
-{
-  32,				/* 32 bits in a word */
-  32,				/* 32 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_sh,
-  bfd_mach_sh,
-  "sh",				/* arch_name  */
-  "sh",				/* printable name */
-  1,
-  true,				/* the default machine */
-  bfd_default_compatible,
-  scan_mach,
-  SH_NEXT
-};
diff --git a/bfd/cpu-sparc.c b/bfd/cpu-sparc.c
deleted file mode 100644
index 234bd92bd29..00000000000
--- a/bfd/cpu-sparc.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/* BFD support for the SPARC architecture.
-   Copyright (C) 1992, 94, 95, 96, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/* Don't mix 32 bit and 64 bit files.  */
-
-static const bfd_arch_info_type *sparc_compatible
-  PARAMS ((const bfd_arch_info_type *, const bfd_arch_info_type *));
-
-static const bfd_arch_info_type *
-sparc_compatible (a, b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  if (a->bits_per_word != b->bits_per_word)
-    return NULL;
-
-  return bfd_default_compatible (a, b);
-}
-
-static const bfd_arch_info_type arch_info_struct[] =
-{
-  {
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc_sparclet,
-    "sparc",
-    "sparc:sparclet",
-    3,
-    false,
-    sparc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[1],
-  },
-  {
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc_sparclite,
-    "sparc",
-    "sparc:sparclite",
-    3,
-    false,
-    sparc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[2],
-  },
-  {
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc_v8plus,
-    "sparc",
-    "sparc:v8plus",
-    3,
-    false,
-    sparc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[3],
-  },
-  {
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc_v8plusa,
-    "sparc",
-    "sparc:v8plusa",
-    3,
-    false,
-    sparc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[4],
-  },
-  {
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc_sparclite_le,
-    "sparc",
-    "sparc:sparclite_le",
-    3,
-    false,
-    sparc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[5],
-  },
-  {
-    64,	/* bits in a word */
-    64,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc_v9,
-    "sparc",
-    "sparc:v9",
-    3,
-    false,
-    sparc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[6],
-  },
-  {
-    64,	/* bits in a word */
-    64,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc_v9a,
-    "sparc",
-    "sparc:v9a",
-    3,
-    false,
-    sparc_compatible, 
-    bfd_default_scan,
-    0,
-  }
-};
-
-const bfd_arch_info_type bfd_sparc_arch =
-  {
-    32,	/* bits in a word */
-    32,	/* bits in an address */
-    8,	/* bits in a byte */
-    bfd_arch_sparc,
-    bfd_mach_sparc,
-    "sparc",
-    "sparc",
-    3,
-    true, /* the default */
-    sparc_compatible, 
-    bfd_default_scan,
-    &arch_info_struct[0],
-  };
diff --git a/bfd/cpu-tic30.c b/bfd/cpu-tic30.c
deleted file mode 100644
index dd723f7b4a5..00000000000
--- a/bfd/cpu-tic30.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* BFD support for the Texas Instruments TMS320C30 architecture.
-   Copyright 1998 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_tic30_arch =
-{
-  32,				/* 32 bits in a word */
-  32,				/* 32 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_tic30,
-  0,				/* only 1 machine */
-  "tic30",
-  "tms320c30",
-  2,
-  true,				/* the one and only */
-  bfd_default_compatible,
-  bfd_default_scan,
-  0,
-};
diff --git a/bfd/cpu-tic80.c b/bfd/cpu-tic80.c
deleted file mode 100644
index 302866ece9d..00000000000
--- a/bfd/cpu-tic80.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* bfd back-end for TI TMS320C80 (MVP) support
-   Copyright (C) 1996, 1999 Free Software Foundation, Inc.
-   Written by Fred Fish at Cygnus support (fnf@cygnus.com)
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_tic80_arch =
-  {
-    32,				/* 32 bits in a word */
-    32,				/* 32 bits in an address */
-    8,				/* 8 bits in a byte */
-    bfd_arch_tic80,		/* bfd_architecture enum */
-    0,				/* only 1 machine */
-    "tic80",			/* architecture name */
-    "tic80",			/* printable name */
-    2,				/* section alignment power */
-    true,			/* default machine for architecture */
-    bfd_default_compatible,
-    bfd_default_scan ,
-    NULL,				/* Pointer to next in chain */
-  };
diff --git a/bfd/cpu-v850.c b/bfd/cpu-v850.c
deleted file mode 100644
index 539413de022..00000000000
--- a/bfd/cpu-v850.c
+++ /dev/null
@@ -1,103 +0,0 @@
-/* BFD support for the NEC V850 processor
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include <ctype.h>
-
-static boolean 
-scan (info, string)
-     const struct bfd_arch_info * info;
-     const char * string;
-{
-  const char *ptr_src;
-  const char *ptr_tst;
-  unsigned long number;
-  enum bfd_architecture arch;
-
-  /* First test for an exact match */
-  if (strcasecmp (string, info->printable_name) == 0)
-    return true;
-
-  /* See how much of the supplied string matches with the
-     architecture, eg the string m68k:68020 would match the m68k entry
-     up to the :, then we get left with the machine number */
-
-  for (ptr_src = string, ptr_tst = info->arch_name; 
-       *ptr_src && *ptr_tst;
-       ptr_src++, ptr_tst++) 
-    {
-      if (*ptr_src != *ptr_tst) break;
-    }
-
-  /* Chewed up as much of the architecture as will match, skip any
-     colons */
-  if (*ptr_src == ':')
-    ptr_src++;
-  
-  if (*ptr_src == 0)
-    {
-      /* nothing more, then only keep this one if it is the default
-	 machine for this architecture */
-      return info->the_default;
-    }
-
-  number = 0;
-  while (isdigit ((unsigned char) *ptr_src))
-    {
-      number = number * 10 + * ptr_src  - '0';
-      ptr_src++;
-    }
-
-  switch (number) 
-    {
-    case bfd_mach_v850e:  arch = bfd_arch_v850; break;
-    case bfd_mach_v850ea: arch = bfd_arch_v850; break;
-    default:  
-      return false;
-    }
-
-  if (arch != info->arch) 
-    return false;
-
-  if (number != info->mach)
-    return false;
-
-  return true;
-}
-
-#define N(number, print, default, next)  \
-{  32, 32, 8, bfd_arch_v850, number, "v850", print, 2, default, \
-     bfd_default_compatible, scan, next }
-
-#define NEXT NULL
-
-static const bfd_arch_info_type arch_info_struct[] = 
-{
-  N (bfd_mach_v850e,  "v850e",  false, &arch_info_struct[1]),
-  N (bfd_mach_v850ea, "v850ea", false, NULL)
-};
-
-#undef NEXT
-#define NEXT &arch_info_struct[0]
-
-const bfd_arch_info_type bfd_v850_arch =
-  N (bfd_mach_v850, "v850", true, NEXT);
diff --git a/bfd/cpu-vax.c b/bfd/cpu-vax.c
deleted file mode 100644
index bdc6d39e451..00000000000
--- a/bfd/cpu-vax.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* bfd back-end for vax support
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_vax_arch =
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_vax,
-    0,	/* only 1 machine */
-    "vax",
-    "vax",
-    3,
-    true, /* the one and only */
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
-  };
diff --git a/bfd/cpu-w65.c b/bfd/cpu-w65.c
deleted file mode 100644
index c0bbf045219..00000000000
--- a/bfd/cpu-w65.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* BFD library support routines for the WDC 65816 architecture.
-   Copyright (C) 1995 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as publiw65ed by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You w65ould have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-
-int bfd_default_scan_num_mach();
-
-static boolean 
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcmp(string,"w65") == 0) return true;
-  if (strcmp(string,"w65816") == 0) return true;
-  return false;
-}
-
-
-
-const bfd_arch_info_type bfd_w65_arch =
-{
-  16,				/* 16 bits in a word */
-  24,				/* 24 bits in an address */
-  8,				/* 8 bits in a byte */
-  bfd_arch_w65,
-  0,				/* only 1 machine */
-  "w65",			/* arch_name  */
-  "w65",			/* printable name */
-  1,
-  true,				/* the default machine */
-  bfd_default_compatible,
-  scan_mach,
-  0,
-};
diff --git a/bfd/cpu-we32k.c b/bfd/cpu-we32k.c
deleted file mode 100644
index a38cbc1268b..00000000000
--- a/bfd/cpu-we32k.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* bfd back-end for we32k support
-   Copyright (C) 1992 Free Software Foundation, Inc.
-   Contributed by Brendan Kehoe (brendan@cs.widener.edu).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-const bfd_arch_info_type bfd_we32k_arch =
-  {
-    32,	/* 32 bits in a word */
-    32,	/* 32 bits in an address */
-    8,	/* 8 bits in a byte */
-    bfd_arch_we32k,
-    32000,	/* only 1 machine */
-    "we32k",
-    "we32k:32000",
-    3,
-    true, /* the one and only */
-    bfd_default_compatible, 
-    bfd_default_scan ,
-    0,
-  };
diff --git a/bfd/cpu-z8k.c b/bfd/cpu-z8k.c
deleted file mode 100644
index 5cce8eb0689..00000000000
--- a/bfd/cpu-z8k.c
+++ /dev/null
@@ -1,198 +0,0 @@
-/* BFD library support routines for the Z800n architecture.
-   Copyright (C) 1992 Free Software Foundation, Inc.
-   Hacked by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-
-#if 0				/* not used currently */
-/*
-Relocations for the Z8K
-
-*/
-static bfd_reloc_status_type
-howto16_callback (abfd, reloc_entry, symbol_in, data,
-		  ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
-
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_16 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-
-static bfd_reloc_status_type
-howto8_callback (abfd, reloc_entry, symbol_in, data,
-		 ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
-
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-
-static bfd_reloc_status_type
-howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data,
-		      ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-
-  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
-  abort ();
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
-		       ignore_input_section, ignore_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol_in;
-     PTR data;
-     asection *ignore_input_section;
-     bfd *ignore_bfd;
-{
-  long relocation = 0;
-  bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8 (abfd, (bfd_byte *) data + addr);
-  abort ();
-  HOWTO_PREPARE (relocation, symbol_in);
-
-  x = (x + relocation + reloc_entry->addend);
-
-  bfd_put_8 (abfd, x, (bfd_byte *) data + addr);
-  return bfd_reloc_ok;
-}
-
-
-
-static reloc_howto_type howto_16
-= NEWHOWTO (howto16_callback, "abs16", 1, false, false);
-static reloc_howto_type howto_8
-= NEWHOWTO (howto8_callback, "abs8", 0, false, false);
-
-static reloc_howto_type howto_8_FFnn
-= NEWHOWTO (howto8_FFnn_callback, "ff00+abs8", 0, false, false);
-
-static reloc_howto_type howto_8_pcrel
-= NEWHOWTO (howto8_pcrel_callback, "pcrel8", 0, false, true);
-
-
-static reloc_howto_type *
-local_bfd_reloc_type_lookup (arch, code)
-     const struct bfd_arch_info *arch;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_16:
-      return &howto_16;
-    case BFD_RELOC_8_FFnn:
-      return &howto_8_FFnn;
-    case BFD_RELOC_8:
-      return &howto_8;
-    case BFD_RELOC_8_PCREL:
-      return &howto_8_pcrel;
-    default:
-      return (reloc_howto_type *) NULL;
-    }
-}
-#endif
-
-int bfd_default_scan_num_mach ();
-
-static boolean
-scan_mach (info, string)
-     const struct bfd_arch_info *info;
-     const char *string;
-{
-  if (strcmp (string, "z8001") == 0 || strcmp (string, "z8k") == 0)
-    {
-      return bfd_mach_z8001 == info->mach;
-    }
-  if (strcmp (string, "z8002") == 0)
-    {
-      return bfd_mach_z8002 == info->mach;
-    }
-  return false;
-}
-
-
-/* This routine is provided two arch_infos and returns whether
-   they'd be compatible */
-
-static const bfd_arch_info_type *
-compatible (a, b)
-     const bfd_arch_info_type *a;
-     const bfd_arch_info_type *b;
-{
-  if (a->arch != b->arch || a->mach != b->mach)
-    return NULL;
-  return a;
-}
-
-
-static const bfd_arch_info_type arch_info_struct[] =
-{
-  {32, 32, 8, bfd_arch_z8k, bfd_mach_z8001, "z8k", "z8001", 1, false, compatible, scan_mach, 0,},
-};
-
-const bfd_arch_info_type bfd_z8k_arch =
-{
-  32, 16, 8, bfd_arch_z8k, bfd_mach_z8002, "z8k", "z8002", 1, true, compatible, scan_mach, &arch_info_struct[0],
-};
diff --git a/bfd/demo64.c b/bfd/demo64.c
deleted file mode 100644
index c91381d46e9..00000000000
--- a/bfd/demo64.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/* BFD backend for demonstration 64-bit a.out binaries.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define ARCH_SIZE 64
-#define MY(OP) CAT(demo_64_,OP)
-#define TARGETNAME  "demo64"
-#include "aoutf1.h"
diff --git a/bfd/dep-in.sed b/bfd/dep-in.sed
deleted file mode 100644
index 444dde0c019..00000000000
--- a/bfd/dep-in.sed
+++ /dev/null
@@ -1,26 +0,0 @@
-:loop
-/\\$/N
-s/\\\n */ /g
-t loop
-
-s!\.o:!.lo:!
-s! @BFD_H@!!g
-s!@INCDIR@!$(INCDIR)!g
-s!@SRCDIR@/!!g
-s!hosts/[^ ]*\.h ! !g
-s/ sysdep.h//g
-s! \.\./bfd/sysdep.h!!g
-s/ libbfd.h//g
-s/ config.h//g
-s! \$(INCDIR)/fopen-[^ ]*\.h!!g
-s! \$(INCDIR)/ansidecl\.h!!g
-
-s/\\\n */ /g
-
-s/ *$//
-s/  */ /g
-s/ *:/:/g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
-  /g
diff --git a/bfd/doc/ChangeLog b/bfd/doc/ChangeLog
deleted file mode 100644
index 9e8207ac570..00000000000
--- a/bfd/doc/ChangeLog
+++ /dev/null
@@ -1,390 +0,0 @@
-Thu Feb  4 23:21:36 1999  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in: Rebuild with current autoconf/automake.
-
-Thu Jul 23 09:36:44 1998  Nick Clifton  <nickc@cygnus.com>
-
-	* bfdint.texi (BFD ELF processor required): Add paragraph
-	describing the necessity to create "include/elf/CPU.h".
-
-Thu May  7 14:45:43 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (chew.o): Add -I options for intl srcdir and
-	objdir.
-	* Makefile.in: Rebuild.
-
-Mon Apr 27 20:19:24 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* bfdint.texi: New file.
-	* Makefile.am (noinst_TEXINFOS): New variable.
-	* Makefile.in: Rebuild.
-
-Mon Apr 13 16:48:56 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in: Rebuild.
-
-Mon Apr  6 14:06:55 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (STAGESTUFF): Remove variable.
-	(CLEANFILES): Don't remove $(STAGESTUFF).
-	(DISTCLEANFILES, MAINTAINERCLEANFILES): New variables.
-	* Makefile.in: Rebuild.
-
-Fri Mar 27 16:25:25 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* chew.c (skip_white_and_starts): Remove unused declaration.
-	(skip_white_and_stars): Add casts to avoid warnings.
-	(skip_trailing_newlines, paramstuff, courierize): Likewise.
-	(bulletize, do_fancy_stuff, iscommand): Likewise.
-	(kill_bogus_lines, nextword, main): Likewise.
-	(manglecomments): Comment out.
-	(outputdots, kill_bogus_lines): Remove unused local variables.
-	(perform, compile): Likewise.
-	(courierize): Fully parenthesize expression.
-	(copy_past_newline): Declare return value.
-	(print): Change printf format string.
-	(main): Call usage for an unrecognized option.
-
-Fri Feb 13 14:37:14 1998  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (AUTOMAKE_OPTIONS): Define.
-	* Makefile.in: Rebuild.
-
-Mon Jan 26 15:38:36 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* doc.str (bodytext): Don't output @* at the end.
-	* chew.c (kill_bogus_lines): Make sure that a period at the
-	beginning is recognized.
-	(indent): Don't put indentation at the end.
-	(copy_past_newline): Expand tabs.
-	* Makefile.am (s-reloc, s-syms): Depend on doc.str.
-	* Makefile.in: Rebuild.
-
-Wed Oct  1 14:41:28 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (libbfd.h): Don't use cpu-h8300.c, cpu-i960.c, or
-	elfcode.h as input files; they don't contribute anything.
-	* Makefile.in: Rebuild.
-
-Fri Aug 15 04:55:15 1997  Doug Evans  <dje@canuck.cygnus.com>
-
-	* Makefile.am (libbfd.h, libcoff.h): Invoke $(MKDOC) as ./$(MKDOC).
-	* Makefile.in: Rebuild.
-
-Fri Aug  1 12:59:58 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am (CC_FOR_BUILD): Don't set explicitly.
-	* Makefile.in: Rebuild.
-
-Thu Jul 31 20:00:12 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.am: New file, based on old Makefile.in.
-	* Makefile.in: Now built with automake.
-
-Tue Jul 22 14:44:00 1997  Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE>
-
-	* Makefile.in: Change stamp-* files to s-* files.  Use bfdt.texi
-	rather than bfd.texi.
- 	(DOCFILES): Change bfd.texi to bfdt.texi.
-	* bfd.texinfo: Include bfdt.texi, not bfd.texi.
-
-Mon Jun 16 15:33:15 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (CC, CFLAGS): Substitute from configure script.
-	From Jeff Makey <jeff@cts.com>.
-
-Tue Apr 15 12:37:41 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (install-info): Use mkinstalldirs to build
-	$(infodir).
-
-Tue Apr  8 12:49:46 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (install-info): Permit info files to be in srcdir.
-	(stamp-*): Add a stamp-X target for each X.texi target.
-	(*.texi): Just depend upon stamp-X.
-	(clean): Remove stamp-*.
-	(distclean): Depend upon mostlyclean.  Remove stamp-*.  Don't
-	remove $(DOCFILES).
-
-Mon Apr  7 15:23:26 1997  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (distclean): Don't remove *.info files.
-
-Thu Feb 13 20:50:02 1997  Klaus Kaempf  (kkaempf@progis.de)
-
-	* makefile.vms: New file.
-
-Tue Jun 18 18:32:28 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	* chew.c (kill_bogus_lines): Reset sl when not at the start of a
-	line.  From Uwe Ohse <uwe@tirka.gun.de>.
-
-Tue Jan 30 14:10:46 1996  Ian Lance Taylor  <ian@cygnus.com>
-
-	From Ronald F. Guilmette <rfg@monkeys.com>:
-	* Makefile.in (libbfd.h): Depend upon proto.str.
-	(libcoff.h, bfd.h): Likewise.
-
-Fri Nov  3 14:46:48 1995  Fred Fish  <fnf@cygnus.com>
-
-	* Makefile.in (SRCDOC, SRCPROT, core.texi, bfd.h):  Use corefile.c, 
-	renamed from core.c.
-
-Wed Nov  1 14:28:23 1995  Manfred Hollstein KS/EF4A 60/1F/110 #40283  <manfred@lts.sel.alcatel.de>
-
-	* chew.c: Include <ctype.h>.
-
-Fri Oct  6 16:23:34 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	Mon Sep 25 22:49:32 1995  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
-
-	* Makefile.in (Makefile): Only remake this Makefile.
-
-Wed Oct  4 15:51:05 1995  Ken Raeburn  <raeburn@cygnus.com>
-
-	* chew.c: Include <stdio.h>.
-
-Tue Sep 12 18:14:50 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (maintainer-clean): New target.
-
-Thu Aug 31 12:18:43 1995  Ian Lance Taylor  <ian@cygnus.com>
-
-	* Makefile.in (bfd.h): Add additional #endif at end of bfd.h if
-	__cplusplus is defined.
-
-Tue Nov 29 16:13:34 1994  Doug Evans  <dje@canuck.cygnus.com>
-
-	* chew.c (write_buffer): New argument `f', all callers changed.
-	(stdout, stderr, print, drop, idrop): New forth words.
-	* proto.str (COMMENT): New command.
-	* doc.str (COMMENT): Likewise.
-
-Mon Sep 12 11:44:17 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
-
-	* Makefile.in (DOCFILES): Remove ctor.texi.
-	(IPROTOS): Remove ctor.ip.
-	(SRCIPROT): Remove $(srcdir)/../ctor.c.
-	(ctor.texi): Remove target.
-	(libbfd.h): Remove dependency on $(srcdir)/../ctor.c.  Remove
-	$(MKDOC) run on $(srcdir)/../ctor.c.
-	* bfd.texinfo (Constructors): Remove section.
-
-Fri Sep  2 13:33:44 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* chew.c: Include assert.h.  Added prototypes for most functions.
-	Changed most uses of int to long.  Do bounds checking on the
-	stacks.  Added comment at the beginning documenting most of the
-	intrinsics.  Lots of whitespace changes.  Re-ordered some
-	functions.
-	(die, check_range, icheck_range): New functions.
-	(strip_trailing_newlines, print_stack_level): New functions.
-	(translatecomments): Don't insert tab before "/*".
-	(iscommand): Minimum command length is now 4.
-	(nextword): Handle some \-sequences.
-	(push_addr): Deleted.
-	(main): Add new intrinsics strip_trailing_newlines and
-	print_stack_level.  Complain at end if stack contains more than
-	one element, or less.
-	(remchar): Make sure the string is not empty before chopping off a
-	character.
-
-	* doc.str, proto.str: Handle new commands SENUM, ENUM, ENUMX,
-	ENUMEQ, ENUMEQX, ENUMDOC.
-
-Wed Jan 12 18:37:12 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* bfd.texinfo: Added Linker Functions node.
-	* doc/Makefile.in (DOCFILES): Added linker.texi.
-	(SRCDOC): Added linker.c.
-	(linker.texi): New target.
-
-Tue Jan  4 10:52:56 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* chew.c: Don't rely on a correct declaration of exit.
-	(chew_exit): New function which just calls exit.
-	(main): Use it.
-
-Mon Jan  3 11:40:40 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* bfd.texinfo: Added Hash Tables node.
-	* Makefile.in (DOCFILES): Added hash.texi.
-	(SRCDOC): Added hash.c.
-	(hash.texi): New target.
-
-Thu Dec 30 16:57:04 1993  Ken Raeburn  (raeburn@cujo.cygnus.com)
-
-	* Makefile.in: Delete all references to seclet.c, since it's just
-	been deleted.  Don't mention hash.c, linker.c, or genlink.h yet,
-	since they don't contain documentation yet (hint, hint!).
-
-Fri Nov  5 10:58:53 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* bfd.texinfo: Small cleanups.
-
-Fri Nov 19 03:46:11 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* Makefile.in (archures.texi): Depends on $(MKDOC).
-
-Tue Aug 10 14:22:39 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* bfd.texinfo (BFD back end): Don't include elfcode.texi, since
-	it's empty now and that triggers a makeinfo bug.
-
-Mon Aug  9 16:27:30 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* bfd.texinfo (BFD back end): New section on ELF, includes
-	elf.texi and elfcode.texi.
-	* Makefile.in (DOCFILES): Include elf.texi, elfcode.texi.
-	(SRCDOC): Include elfcode.h, elf.c.
-	(elf.texi, elfcode.texi): New intermediate targets.
-
-Thu Jun 24 13:48:13 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
-
-	* Makefile.in (.c.o, chew.o): Put CFLAGS last.
-	* bfdsumm.texi: New file, broken out of bfd.texinfo, to share
-	with ld.texinfo.
-
-Mon Jun 14 12:07:07 1993  david d `zoo' zuhn  (zoo at rtl.cygnus.com)
-
-	* Makefile.in (install-info): remove parentdir cruft, 
-
-Wed Jun  9 16:00:32 1993  Jim Kingdon  (kingdon@cygnus.com)
-
-	* Makefile.in (mostlyclean): Remove chew.o.
-
-Tue May 25 14:46:58 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* Makefile.in (libbfd.h): Use elfcode.h, not elf32.c.
-
-Mon May 24 15:50:07 1993  Ken Raeburn  (raeburn@cygnus.com)
-
-	* chew.c (compile): Add a couple of missing casts.
-
-Wed May 12 14:45:14 1993  Ian Lance Taylor  (ian@cygnus.com)
-
-	* Makefile.in (CC_FOR_BUILD): New variable, define to be $(CC).
-	(chew.o, $(MKDOC)): Build using CC_FOR_BUILD rather than CC, since
-	it must run on the build machine.
-
-Tue Apr  6 22:38:10 1993  John Gilmore  (gnu@cygnus.com)
-
-	* Makefile.in (chew):  Don't compile from .c to executable in a
-	single step; it puts a temporary .o filename into the executable,
-	which makes multi-stage comparisons fail.  Compile chew.c to
-	chew.o, and link that, which makes identical executables every time.
-
-Wed Mar 24 17:26:29 1993  david d `zoo' zuhn  (zoo at poseidon.cygnus.com)
-
-	* Makefile.in: fix typo (bfd.texinfo not bfd.texino)
-
-Fri Mar 19 01:13:00 1993  Ken Raeburn  (raeburn@kr-pc.cygnus.com)
-
-	* bfd.texinfo: Since BFD version number has been bumped, do same
-	to "version number" on title page, and elsewhere.  Should be
-	fixed to extract real version number.
-
-Tue Mar 16 12:15:13 1993  Per Bothner  (bothner@rtl.cygnus.com)
-
-	* Makefile.in:  Add *clean rules.
-
-Mon Jan 11 18:43:56 1993  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
-
-	* Makefile.in (libbfd.h): Removed duplicate init.c and libbfd.c.
-	Added seclet.c.
-	(bfd.h): Added dependency on bfd.c and seclet.c.  Added seclet.c
-	to build.
-
-Thu Dec 17 19:35:43 1992  david d `zoo' zuhn  (zoo at cirdan.cygnus.com)
-
-	* Makefile.in: added dvi target, define and use $(TEXI2DVI)
-
-Thu Dec  3 17:42:48 1992  Ken Raeburn  (raeburn@cambridge.cygnus.com)
-
-	* Makefile.in (TEXIDIR): New variable.
-	(bfd.dvi): Look for bfd.texinfo in $(srcdir).  Generate index.
-
-	* bfd.texinfo: Minor doc fixes.
-
-Thu Nov  5 03:13:55 1992  John Gilmore  (gnu@cygnus.com)
-
-	Cleanup:  Replace all uses of EXFUN in the BFD sources, with PARAMS.
-
- 	* doc/chew.c (exfunstuff):  Eliminate.
-	(paramstuff):  Replace exfunstuff with function to generate PARAMS.
-	* doc/proto.str:  Use paramstuff rather than exfunstuff.
-
-Mon Aug 17 12:40:32 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* chew.c: various patches provided by Howard Chu.
-
-Fri Jun 19 18:59:54 1992  John Gilmore  (gnu at cygnus.com)
-
-	* Makefile.in (libbfd.h):  Add elf.c as a source of prototypes.
-
-Mon May 11 18:55:59 1992  John Gilmore  (gnu at cygnus.com)
-
-	* chew.c:  exit() should be declared by config files, not by
-	portable source code.  Its type could be int or void function.	
-
-Mon May  4 13:45:57 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* Makefile.in: another CFLAGS correction.
-
-Tue Apr 28 10:21:32 1992  K. Richard Pixley  (rich@rtl.cygnus.com)
-
-	* Makefile.in: Do the CFLAGS thing.
-
-Fri Apr 10 22:34:52 1992  Fred Fish  (fnf@cygnus.com)
-
-	* Makefile.in (MINUS_G):  Add macro and default to -g.
-
-Fri Mar  6 18:53:18 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
-
-	* chew.c: now has -w switch turn on warnings
-
-Wed Feb 26 18:04:40 1992  K. Richard Pixley  (rich@cygnus.com)
-
-	* Makefile.in, configure.in: removed traces of namesubdir,
-	  -subdirs, $(subdir), $(unsubdir), some rcs triggers.  Forced
-	  copyrights to '92, changed some from Cygnus to FSF.
-
-Tue Dec 10 22:11:05 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
-
-	* Makefile.in: build chew into the current directory.  Complete
-	  the MKDOC macro transition.
-
-Tue Dec 10 08:26:28 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* chew.c: don't core dump when can't open file
-	* Makefile.in: get proto.str from the right place when built in
-	odd directories
-
-Tue Dec 10 04:07:25 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
-
-	* Makefile.in: infodir belongs in datadir.
-
-Sat Dec  7 17:01:23 1991  Steve Chamberlain  (sac at rtl.cygnus.com)
-
-	* chew.c: Much modified
-	* proto.str, doc.str: New files for extracting to product
-	prototypes and documents respectively.
-
-
-Fri Dec  6 22:57:12 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
-
-	* Makefile.in: added standards.text support, host/site/target
-	  inclusion hooks, install using INSTALL_DATA rather than cp,
-	  don't echo on install.
-
-Thu Dec  5 22:46:17 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
-
-	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
-	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
-	  and mandir now keyed off datadir by default.
-
-
-Local Variables:
-version-control: never
-End:
diff --git a/bfd/doc/Makefile.am b/bfd/doc/Makefile.am
deleted file mode 100644
index 0d5268e9608..00000000000
--- a/bfd/doc/Makefile.am
+++ /dev/null
@@ -1,250 +0,0 @@
-## Process this file with automake to generate Makefile.in
-
-AUTOMAKE_OPTIONS = cygnus
-
-DOCFILES = aoutx.texi  archive.texi archures.texi \
-	bfdt.texi  cache.texi coffcode.texi \
-	core.texi elf.texi elfcode.texi  format.texi  libbfd.texi  \
-	opncls.texi  reloc.texi  section.texi  \
-	syms.texi  targets.texi init.texi hash.texi linker.texi
-
-PROTOS = archive.p archures.p bfd.p \
-	 core.p format.p \
-	libbfd.p opncls.p reloc.p \
-	section.p syms.p targets.p  \
-	format.p  core.p init.p
-
-IPROTOS = cache.ip libbfd.ip reloc.ip init.ip archures.ip coffcode.ip
-
-# SRCDOC, SRCPROT, SRCIPROT only used to sidestep Sun Make bug in interaction 
-# between VPATH and suffix rules.  If you use GNU Make, perhaps other Makes,
-# you don't need these three:
-SRCDOC = $(srcdir)/../aoutx.h  $(srcdir)/../archive.c \
-	$(srcdir)/../archures.c $(srcdir)/../bfd.c \
-	$(srcdir)/../cache.c $(srcdir)/../coffcode.h \
-	$(srcdir)/../corefile.c $(srcdir)/../elf.c \
-	$(srcdir)/../elfcode.h  $(srcdir)/../format.c \
-	$(srcdir)/../libbfd.c $(srcdir)/../opncls.c \
-	$(srcdir)/../reloc.c  $(srcdir)/../section.c \
-	$(srcdir)/../syms.c  $(srcdir)/../targets.c \
-	$(srcdir)/../hash.c $(srcdir)/../linker.c
-
-SRCPROT = $(srcdir)/../archive.c $(srcdir)/../archures.c \
-	$(srcdir)/../bfd.c $(srcdir)/../coffcode.h $(srcdir)/../corefile.c \
-	$(srcdir)/../format.c $(srcdir)/../libbfd.c \
-	$(srcdir)/../opncls.c $(srcdir)/../reloc.c \
-	$(srcdir)/../section.c $(srcdir)/../syms.c \
-	$(srcdir)/../targets.c $(srcdir)/../init.c
-
-SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \
-	$(srcdir)/../reloc.c $(srcdir)/../cpu-h8300.c \
-	$(srcdir)/../cpu-i960.c $(srcdir)/../archures.c \
-	$(srcdir)/../init.c
-
-TEXIDIR = $(srcdir)/../../texinfo/fsf
-
-info_TEXINFOS = bfd.texinfo
-
-MKDOC = chew$(EXEEXT_FOR_BUILD)
-
-$(MKDOC): chew.o
-	$(CC_FOR_BUILD) -o $(MKDOC) chew.o $(LOADLIBES) $(LDFLAGS)
-
-chew.o: chew.c
-	$(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-
-protos: libbfd.h libcoff.h bfd.h
-
-bfd.info bfd.dvi: $(DOCFILES) bfdsumm.texi bfd.texinfo
-
-# We can't replace these rules with an implicit rule, because
-# makes without VPATH support couldn't find the .h files in `..'.
-
-# We use s-XXX targets so that we can distribute the info files,
-# and permit people to rebuild them, without requiring the makeinfo
-# program.  If somebody tries to rebuild info, but none of the .texi
-# files have changed, then this Makefile will build chew, and will
-# build all of the stamp files, but will not actually have to rebuild
-# bfd.info.
-
-s-aoutx: $(MKDOC) $(srcdir)/../aoutx.h $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../aoutx.h >aoutx.tmp
-	$(srcdir)/../../move-if-change aoutx.tmp aoutx.texi
-	touch s-aoutx
-aoutx.texi: s-aoutx
-
-s-archive: $(MKDOC) $(srcdir)/../archive.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../archive.c >archive.tmp
-	$(srcdir)/../../move-if-change archive.tmp archive.texi
-	touch s-archive
-archive.texi: s-archive
-
-s-archures: $(MKDOC) $(srcdir)/../archures.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../archures.c >archures.tmp
-	$(srcdir)/../../move-if-change archures.tmp archures.texi
-	touch s-archures
-archures.texi: s-archures
-
-# We use bfdt.texi, rather than bfd.texi, to avoid conflicting with
-# bfd.texinfo on an 8.3 filesystem.
-s-bfd: $(MKDOC) $(srcdir)/../bfd.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp
-	$(srcdir)/../../move-if-change bfd.tmp bfdt.texi
-	touch s-bfd
-bfdt.texi: s-bfd
-
-s-cache: $(MKDOC) $(srcdir)/../cache.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../cache.c >cache.tmp
-	$(srcdir)/../../move-if-change cache.tmp cache.texi
-	touch s-cache
-cache.texi: s-cache
-
-s-coffcode: $(MKDOC) $(srcdir)/../coffcode.h $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../coffcode.h >coffcode.tmp
-	$(srcdir)/../../move-if-change coffcode.tmp coffcode.texi
-	touch s-coffcode
-coffcode.texi: s-coffcode
-
-s-core: $(MKDOC) $(srcdir)/../corefile.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../corefile.c >core.tmp
-	$(srcdir)/../../move-if-change core.tmp core.texi
-	touch s-core
-core.texi: s-core
-
-s-elf: $(MKDOC) $(srcdir)/../elf.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elf.c >elf.tmp
-	$(srcdir)/../../move-if-change elf.tmp elf.texi
-	touch s-elf
-elf.texi: s-elf
-
-s-elfcode: $(MKDOC) $(srcdir)/../elfcode.h $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elfcode.h >elfcode.tmp
-	$(srcdir)/../../move-if-change elfcode.tmp elfcode.texi
-	touch s-elfcode
-elfcode.texi: s-elfcode
-
-s-format: $(MKDOC) $(srcdir)/../format.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../format.c >format.tmp
-	$(srcdir)/../../move-if-change format.tmp format.texi
-	touch s-format
-format.texi: s-format
-
-s-libbfd: $(MKDOC) $(srcdir)/../libbfd.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../libbfd.c >libbfd.tmp
-	$(srcdir)/../../move-if-change libbfd.tmp libbfd.texi
-	touch s-libbfd
-libbfd.texi: s-libbfd
-
-s-opncls: $(MKDOC) $(srcdir)/../opncls.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str  <$(srcdir)/../opncls.c >opncls.tmp
-	$(srcdir)/../../move-if-change opncls.tmp opncls.texi
-	touch s-opncls
-opncls.texi: s-opncls
-
-s-reloc: $(MKDOC) $(srcdir)/../reloc.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../reloc.c >reloc.tmp
-	$(srcdir)/../../move-if-change reloc.tmp reloc.texi
-	touch s-reloc
-reloc.texi: s-reloc
-
-s-section: $(MKDOC) $(srcdir)/../section.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../section.c >section.tmp
-	$(srcdir)/../../move-if-change section.tmp section.texi
-	touch s-section
-section.texi: s-section
-
-s-syms: $(MKDOC) $(srcdir)/../syms.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../syms.c >syms.tmp
-	$(srcdir)/../../move-if-change syms.tmp syms.texi
-	touch s-syms
-syms.texi: s-syms
-
-s-targets: $(MKDOC) $(srcdir)/../targets.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../targets.c >targets.tmp
-	$(srcdir)/../../move-if-change targets.tmp targets.texi
-	touch s-targets
-targets.texi: s-targets
-
-s-init: $(MKDOC) $(srcdir)/../init.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../init.c >init.tmp
-	$(srcdir)/../../move-if-change init.tmp init.texi
-	touch s-init
-init.texi: s-init
-
-s-hash: $(MKDOC) $(srcdir)/../hash.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../hash.c >hash.tmp
-	$(srcdir)/../../move-if-change hash.tmp hash.texi
-	touch s-hash
-hash.texi: s-hash
-
-s-linker: $(MKDOC) $(srcdir)/../linker.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../linker.c >linker.tmp
-	$(srcdir)/../../move-if-change linker.tmp linker.texi
-	touch s-linker
-linker.texi: s-linker
-
-libbfd.h: $(srcdir)/../libbfd-in.h	\
-	$(srcdir)/../init.c		\
-	$(srcdir)/../libbfd.c		\
-	$(srcdir)/../cache.c		\
-	$(srcdir)/../reloc.c		\
-	$(srcdir)/../archures.c		\
-	$(srcdir)/proto.str		\
-	$(MKDOC)
-	cat $(srcdir)/../libbfd-in.h >libbfd.h 
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../init.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../libbfd.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../cache.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../reloc.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../archures.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../elf.c >>libbfd.h
-
-libcoff.h: $(srcdir)/../libcoff-in.h	\
-	$(srcdir)/../coffcode.h		\
-	$(srcdir)/proto.str		\
-	$(MKDOC)
-	cat $(srcdir)/../libcoff-in.h >libcoff.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../coffcode.h >>libcoff.h
-
-bfd.h: $(srcdir)/../bfd-in.h 		\
-	$(srcdir)/../init.c 		\
-	$(srcdir)/../opncls.c 		\
-	$(srcdir)/../libbfd.c 		\
-	$(srcdir)/../section.c 		\
-	$(srcdir)/../archures.c		\
-	$(srcdir)/../reloc.c		\
-	$(srcdir)/../syms.c		\
-	$(srcdir)/../bfd.c		\
-	$(srcdir)/../archive.c		\
-	$(srcdir)/../corefile.c		\
-	$(srcdir)/../targets.c		\
-	$(srcdir)/../format.c		\
-	$(srcdir)/proto.str		\
-	$(MKDOC)
-	cat $(srcdir)/../bfd-in.h >bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../init.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../opncls.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../libbfd.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../section.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../archures.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../reloc.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../syms.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../bfd.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../archive.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../corefile.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../targets.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../format.c >>bfd.h	
-	echo "#ifdef __cplusplus" >>bfd.h
-	echo "}" >>bfd.h
-	echo "#endif" >>bfd.h
-	echo "#endif" >>bfd.h
-
-noinst_TEXINFOS = bfdint.texi
-
-MOSTLYCLEANFILES = $(MKDOC) *.o
-
-CLEANFILES = s-* *.p *.ip
-
-DISTCLEANFILES = bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log
-
-MAINTAINERCLEANFILES = $(DOCFILES)
diff --git a/bfd/doc/Makefile.in b/bfd/doc/Makefile.in
deleted file mode 100644
index 6295c1002ee..00000000000
--- a/bfd/doc/Makefile.in
+++ /dev/null
@@ -1,600 +0,0 @@
-# Makefile.in generated automatically by automake 1.4 from Makefile.am
-
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-SHELL = @SHELL@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-bindir = @bindir@
-sbindir = @sbindir@
-libexecdir = @libexecdir@
-datadir = @datadir@
-sysconfdir = @sysconfdir@
-sharedstatedir = @sharedstatedir@
-localstatedir = @localstatedir@
-libdir = @libdir@
-infodir = @infodir@
-mandir = @mandir@
-includedir = @includedir@
-oldincludedir = /usr/include
-
-DESTDIR =
-
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-
-top_builddir = ..
-
-ACLOCAL = @ACLOCAL@
-AUTOCONF = @AUTOCONF@
-AUTOMAKE = @AUTOMAKE@
-AUTOHEADER = @AUTOHEADER@
-
-INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-transform = @program_transform_name@
-
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_alias = @build_alias@
-build_triplet = @build@
-host_alias = @host_alias@
-host_triplet = @host@
-target_alias = @target_alias@
-target_triplet = @target@
-AR = @AR@
-AS = @AS@
-BFD_HOST_64BIT_LONG = @BFD_HOST_64BIT_LONG@
-BFD_HOST_64_BIT = @BFD_HOST_64_BIT@
-BFD_HOST_64_BIT_DEFINED = @BFD_HOST_64_BIT_DEFINED@
-BFD_HOST_U_64_BIT = @BFD_HOST_U_64_BIT@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CC_FOR_BUILD = @CC_FOR_BUILD@
-COREFILE = @COREFILE@
-COREFLAG = @COREFLAG@
-DATADIRNAME = @DATADIRNAME@
-DLLTOOL = @DLLTOOL@
-EXEEXT = @EXEEXT@
-EXEEXT_FOR_BUILD = @EXEEXT_FOR_BUILD@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-GT_NO = @GT_NO@
-GT_YES = @GT_YES@
-HDEFINES = @HDEFINES@
-INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@
-INSTOBJEXT = @INSTOBJEXT@
-INTLDEPS = @INTLDEPS@
-INTLLIBS = @INTLLIBS@
-INTLOBJS = @INTLOBJS@
-LD = @LD@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-MAINT = @MAINT@
-MAKEINFO = @MAKEINFO@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-MSGFMT = @MSGFMT@
-NM = @NM@
-PACKAGE = @PACKAGE@
-POFILES = @POFILES@
-POSUB = @POSUB@
-RANLIB = @RANLIB@
-TDEFINES = @TDEFINES@
-USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
-USE_NLS = @USE_NLS@
-USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
-VERSION = @VERSION@
-WIN32LDFLAGS = @WIN32LDFLAGS@
-WIN32LIBADD = @WIN32LIBADD@
-all_backends = @all_backends@
-bfd_backends = @bfd_backends@
-bfd_machines = @bfd_machines@
-l = @l@
-tdefaults = @tdefaults@
-wordsize = @wordsize@
-
-AUTOMAKE_OPTIONS = cygnus
-
-DOCFILES = aoutx.texi  archive.texi archures.texi \
-	bfdt.texi  cache.texi coffcode.texi \
-	core.texi elf.texi elfcode.texi  format.texi  libbfd.texi  \
-	opncls.texi  reloc.texi  section.texi  \
-	syms.texi  targets.texi init.texi hash.texi linker.texi
-
-
-PROTOS = archive.p archures.p bfd.p \
-	 core.p format.p \
-	libbfd.p opncls.p reloc.p \
-	section.p syms.p targets.p  \
-	format.p  core.p init.p
-
-
-IPROTOS = cache.ip libbfd.ip reloc.ip init.ip archures.ip coffcode.ip
-
-# SRCDOC, SRCPROT, SRCIPROT only used to sidestep Sun Make bug in interaction 
-# between VPATH and suffix rules.  If you use GNU Make, perhaps other Makes,
-# you don't need these three:
-SRCDOC = $(srcdir)/../aoutx.h  $(srcdir)/../archive.c \
-	$(srcdir)/../archures.c $(srcdir)/../bfd.c \
-	$(srcdir)/../cache.c $(srcdir)/../coffcode.h \
-	$(srcdir)/../corefile.c $(srcdir)/../elf.c \
-	$(srcdir)/../elfcode.h  $(srcdir)/../format.c \
-	$(srcdir)/../libbfd.c $(srcdir)/../opncls.c \
-	$(srcdir)/../reloc.c  $(srcdir)/../section.c \
-	$(srcdir)/../syms.c  $(srcdir)/../targets.c \
-	$(srcdir)/../hash.c $(srcdir)/../linker.c
-
-
-SRCPROT = $(srcdir)/../archive.c $(srcdir)/../archures.c \
-	$(srcdir)/../bfd.c $(srcdir)/../coffcode.h $(srcdir)/../corefile.c \
-	$(srcdir)/../format.c $(srcdir)/../libbfd.c \
-	$(srcdir)/../opncls.c $(srcdir)/../reloc.c \
-	$(srcdir)/../section.c $(srcdir)/../syms.c \
-	$(srcdir)/../targets.c $(srcdir)/../init.c
-
-
-SRCIPROT = $(srcdir)/../cache.c $(srcdir)/../libbfd.c \
-	$(srcdir)/../reloc.c $(srcdir)/../cpu-h8300.c \
-	$(srcdir)/../cpu-i960.c $(srcdir)/../archures.c \
-	$(srcdir)/../init.c
-
-
-TEXIDIR = $(srcdir)/../../texinfo/fsf
-
-info_TEXINFOS = bfd.texinfo
-
-MKDOC = chew$(EXEEXT_FOR_BUILD)
-
-noinst_TEXINFOS = bfdint.texi
-
-MOSTLYCLEANFILES = $(MKDOC) *.o
-
-CLEANFILES = s-* *.p *.ip
-
-DISTCLEANFILES = bfd.?? bfd.??? bfd.h libbfd.h libcoff.h texput.log
-
-MAINTAINERCLEANFILES = $(DOCFILES)
-mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-TEXI2DVI = `if test -f $(top_srcdir)/../texinfo/util/texi2dvi; then echo $(top_srcdir)/../texinfo/util/texi2dvi; else echo texi2dvi; fi`
-TEXINFO_TEX = $(top_srcdir)/../texinfo/texinfo.tex
-INFO_DEPS = bfd.info
-DVIS = bfd.dvi
-TEXINFOS = bfd.texinfo
-DIST_COMMON =  ChangeLog Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = tar
-GZIP_ENV = --best
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .dvi .info .ps .texi .texinfo .txi
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --cygnus doc/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-bfd.info: bfd.texinfo
-bfd.dvi: bfd.texinfo
-
-
-DVIPS = dvips
-
-.texi.info:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
-
-.texi.dvi:
-	TEXINPUTS=$(top_srcdir)/../texinfo/texinfo.tex:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.texi:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
-
-.texinfo.info:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
-
-.texinfo:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
-
-.texinfo.dvi:
-	TEXINPUTS=$(top_srcdir)/../texinfo/texinfo.tex:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi.info:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
-
-.txi.dvi:
-	TEXINPUTS=$(top_srcdir)/../texinfo/texinfo.tex:$$TEXINPUTS \
-	  MAKEINFO='$(MAKEINFO) -I $(srcdir)' $(TEXI2DVI) $<
-
-.txi:
-	@rm -f $@ $@-[0-9] $@-[0-9][0-9]
-	$(MAKEINFO) -I $(srcdir) $<
-.dvi.ps:
-	$(DVIPS) $< -o $@
-
-install-info-am: $(INFO_DEPS)
-	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(infodir)
-	@list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  for ifile in `cd $$d && echo $$file $$file-[0-9] $$file-[0-9][0-9]`; do \
-	    if test -f $$d/$$ifile; then \
-	      echo " $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile"; \
-	      $(INSTALL_DATA) $$d/$$ifile $(DESTDIR)$(infodir)/$$ifile; \
-	    else : ; fi; \
-	  done; \
-	done
-	@$(POST_INSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  list='$(INFO_DEPS)'; \
-	  for file in $$list; do \
-	    echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file";\
-	    install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/$$file || :;\
-	  done; \
-	else : ; fi
-
-uninstall-info:
-	$(PRE_UNINSTALL)
-	@if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
-	  ii=yes; \
-	else ii=; fi; \
-	list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  test -z "$ii" \
-	    || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \
-	done
-	@$(NORMAL_UNINSTALL)
-	list='$(INFO_DEPS)'; \
-	for file in $$list; do \
-	  (cd $(DESTDIR)$(infodir) && rm -f $$file $$file-[0-9] $$file-[0-9][0-9]); \
-	done
-
-dist-info: $(INFO_DEPS)
-	list='$(INFO_DEPS)'; \
-	for base in $$list; do \
-	  if test -f $$base; then d=.; else d=$(srcdir); fi; \
-	  for file in `cd $$d && eval echo $$base*`; do \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file; \
-	  done; \
-	done
-
-mostlyclean-aminfo:
-	-rm -f bfd.aux bfd.cp bfd.cps bfd.dvi bfd.fn bfd.fns bfd.ky bfd.kys \
-	  bfd.ps bfd.log bfd.pg bfd.toc bfd.tp bfd.tps bfd.vr bfd.vrs \
-	  bfd.op bfd.tr bfd.cv bfd.cn
-
-clean-aminfo:
-
-distclean-aminfo:
-
-maintainer-clean-aminfo:
-	for i in $(INFO_DEPS); do \
-	  rm -f $$i; \
-	  if test "`echo $$i-[0-9]*`" != "$$i-[0-9]*"; then \
-	    rm -f $$i-[0-9]*; \
-	  fi; \
-	done
-clean-info: mostlyclean-aminfo
-tags: TAGS
-TAGS:
-
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = doc
-
-distdir: $(DISTFILES)
-	@for file in $(DISTFILES); do \
-	  if test -f $$file; then d=.; else d=$(srcdir); fi; \
-	  if test -d $$d/$$file; then \
-	    cp -pr $$/$$file $(distdir)/$$file; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) top_distdir="$(top_distdir)" distdir="$(distdir)" dist-info
-info-am: $(INFO_DEPS)
-info: info-am
-dvi-am: $(DVIS)
-dvi: dvi-am
-check-am:
-check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-info-am: 
-install-info: install-info-am
-install-exec-am:
-install-exec: install-exec-am
-
-install-data-am:
-install-data: install-data-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-am
-uninstall-am:
-uninstall: uninstall-am
-all-am: Makefile
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-
-
-mostlyclean-generic:
-	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-rm -f Makefile $(CONFIG_CLEAN_FILES)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
-	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
-
-maintainer-clean-generic:
-	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-mostlyclean-am:  mostlyclean-aminfo mostlyclean-generic
-
-mostlyclean: mostlyclean-am
-
-clean-am:  clean-aminfo clean-generic mostlyclean-am
-
-clean: clean-am
-
-distclean-am:  distclean-aminfo distclean-generic clean-am
-	-rm -f libtool
-
-distclean: distclean-am
-
-maintainer-clean-am:  maintainer-clean-aminfo maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-
-maintainer-clean: maintainer-clean-am
-
-.PHONY: install-info-am uninstall-info mostlyclean-aminfo \
-distclean-aminfo clean-aminfo maintainer-clean-aminfo tags distdir \
-info-am info dvi-am dvi check check-am installcheck-am installcheck \
-install-info-am install-info install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
-
-
-$(MKDOC): chew.o
-	$(CC_FOR_BUILD) -o $(MKDOC) chew.o $(LOADLIBES) $(LDFLAGS)
-
-chew.o: chew.c
-	$(CC_FOR_BUILD) -c -I.. -I$(srcdir)/.. -I$(srcdir)/../../include -I$(srcdir)/../../intl -I../../intl $(H_CFLAGS) $(CFLAGS) $(srcdir)/chew.c
-
-protos: libbfd.h libcoff.h bfd.h
-
-bfd.info bfd.dvi: $(DOCFILES) bfdsumm.texi bfd.texinfo
-
-# We can't replace these rules with an implicit rule, because
-# makes without VPATH support couldn't find the .h files in `..'.
-
-# We use s-XXX targets so that we can distribute the info files,
-# and permit people to rebuild them, without requiring the makeinfo
-# program.  If somebody tries to rebuild info, but none of the .texi
-# files have changed, then this Makefile will build chew, and will
-# build all of the stamp files, but will not actually have to rebuild
-# bfd.info.
-
-s-aoutx: $(MKDOC) $(srcdir)/../aoutx.h $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../aoutx.h >aoutx.tmp
-	$(srcdir)/../../move-if-change aoutx.tmp aoutx.texi
-	touch s-aoutx
-aoutx.texi: s-aoutx
-
-s-archive: $(MKDOC) $(srcdir)/../archive.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../archive.c >archive.tmp
-	$(srcdir)/../../move-if-change archive.tmp archive.texi
-	touch s-archive
-archive.texi: s-archive
-
-s-archures: $(MKDOC) $(srcdir)/../archures.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../archures.c >archures.tmp
-	$(srcdir)/../../move-if-change archures.tmp archures.texi
-	touch s-archures
-archures.texi: s-archures
-
-# We use bfdt.texi, rather than bfd.texi, to avoid conflicting with
-# bfd.texinfo on an 8.3 filesystem.
-s-bfd: $(MKDOC) $(srcdir)/../bfd.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../bfd.c >bfd.tmp
-	$(srcdir)/../../move-if-change bfd.tmp bfdt.texi
-	touch s-bfd
-bfdt.texi: s-bfd
-
-s-cache: $(MKDOC) $(srcdir)/../cache.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../cache.c >cache.tmp
-	$(srcdir)/../../move-if-change cache.tmp cache.texi
-	touch s-cache
-cache.texi: s-cache
-
-s-coffcode: $(MKDOC) $(srcdir)/../coffcode.h $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../coffcode.h >coffcode.tmp
-	$(srcdir)/../../move-if-change coffcode.tmp coffcode.texi
-	touch s-coffcode
-coffcode.texi: s-coffcode
-
-s-core: $(MKDOC) $(srcdir)/../corefile.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../corefile.c >core.tmp
-	$(srcdir)/../../move-if-change core.tmp core.texi
-	touch s-core
-core.texi: s-core
-
-s-elf: $(MKDOC) $(srcdir)/../elf.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elf.c >elf.tmp
-	$(srcdir)/../../move-if-change elf.tmp elf.texi
-	touch s-elf
-elf.texi: s-elf
-
-s-elfcode: $(MKDOC) $(srcdir)/../elfcode.h $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../elfcode.h >elfcode.tmp
-	$(srcdir)/../../move-if-change elfcode.tmp elfcode.texi
-	touch s-elfcode
-elfcode.texi: s-elfcode
-
-s-format: $(MKDOC) $(srcdir)/../format.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../format.c >format.tmp
-	$(srcdir)/../../move-if-change format.tmp format.texi
-	touch s-format
-format.texi: s-format
-
-s-libbfd: $(MKDOC) $(srcdir)/../libbfd.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str < $(srcdir)/../libbfd.c >libbfd.tmp
-	$(srcdir)/../../move-if-change libbfd.tmp libbfd.texi
-	touch s-libbfd
-libbfd.texi: s-libbfd
-
-s-opncls: $(MKDOC) $(srcdir)/../opncls.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str  <$(srcdir)/../opncls.c >opncls.tmp
-	$(srcdir)/../../move-if-change opncls.tmp opncls.texi
-	touch s-opncls
-opncls.texi: s-opncls
-
-s-reloc: $(MKDOC) $(srcdir)/../reloc.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../reloc.c >reloc.tmp
-	$(srcdir)/../../move-if-change reloc.tmp reloc.texi
-	touch s-reloc
-reloc.texi: s-reloc
-
-s-section: $(MKDOC) $(srcdir)/../section.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../section.c >section.tmp
-	$(srcdir)/../../move-if-change section.tmp section.texi
-	touch s-section
-section.texi: s-section
-
-s-syms: $(MKDOC) $(srcdir)/../syms.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../syms.c >syms.tmp
-	$(srcdir)/../../move-if-change syms.tmp syms.texi
-	touch s-syms
-syms.texi: s-syms
-
-s-targets: $(MKDOC) $(srcdir)/../targets.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../targets.c >targets.tmp
-	$(srcdir)/../../move-if-change targets.tmp targets.texi
-	touch s-targets
-targets.texi: s-targets
-
-s-init: $(MKDOC) $(srcdir)/../init.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../init.c >init.tmp
-	$(srcdir)/../../move-if-change init.tmp init.texi
-	touch s-init
-init.texi: s-init
-
-s-hash: $(MKDOC) $(srcdir)/../hash.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../hash.c >hash.tmp
-	$(srcdir)/../../move-if-change hash.tmp hash.texi
-	touch s-hash
-hash.texi: s-hash
-
-s-linker: $(MKDOC) $(srcdir)/../linker.c $(srcdir)/doc.str
-	./$(MKDOC) -f $(srcdir)/doc.str <$(srcdir)/../linker.c >linker.tmp
-	$(srcdir)/../../move-if-change linker.tmp linker.texi
-	touch s-linker
-linker.texi: s-linker
-
-libbfd.h: $(srcdir)/../libbfd-in.h	\
-	$(srcdir)/../init.c		\
-	$(srcdir)/../libbfd.c		\
-	$(srcdir)/../cache.c		\
-	$(srcdir)/../reloc.c		\
-	$(srcdir)/../archures.c		\
-	$(srcdir)/proto.str		\
-	$(MKDOC)
-	cat $(srcdir)/../libbfd-in.h >libbfd.h 
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../init.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../libbfd.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../cache.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../reloc.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../archures.c >>libbfd.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../elf.c >>libbfd.h
-
-libcoff.h: $(srcdir)/../libcoff-in.h	\
-	$(srcdir)/../coffcode.h		\
-	$(srcdir)/proto.str		\
-	$(MKDOC)
-	cat $(srcdir)/../libcoff-in.h >libcoff.h
-	./$(MKDOC) -i -f $(srcdir)/proto.str  < $(srcdir)/../coffcode.h >>libcoff.h
-
-bfd.h: $(srcdir)/../bfd-in.h 		\
-	$(srcdir)/../init.c 		\
-	$(srcdir)/../opncls.c 		\
-	$(srcdir)/../libbfd.c 		\
-	$(srcdir)/../section.c 		\
-	$(srcdir)/../archures.c		\
-	$(srcdir)/../reloc.c		\
-	$(srcdir)/../syms.c		\
-	$(srcdir)/../bfd.c		\
-	$(srcdir)/../archive.c		\
-	$(srcdir)/../corefile.c		\
-	$(srcdir)/../targets.c		\
-	$(srcdir)/../format.c		\
-	$(srcdir)/proto.str		\
-	$(MKDOC)
-	cat $(srcdir)/../bfd-in.h >bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../init.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../opncls.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../libbfd.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../section.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../archures.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../reloc.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../syms.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../bfd.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../archive.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../corefile.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../targets.c >>bfd.h
-	./$(MKDOC) -f $(srcdir)/proto.str<$(srcdir)/../format.c >>bfd.h	
-	echo "#ifdef __cplusplus" >>bfd.h
-	echo "}" >>bfd.h
-	echo "#endif" >>bfd.h
-	echo "#endif" >>bfd.h
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
deleted file mode 100644
index eadf87cc345..00000000000
--- a/bfd/doc/bfd.texinfo
+++ /dev/null
@@ -1,348 +0,0 @@
-\input texinfo.tex
-@setfilename bfd.info
-@c $Id$
-@tex
-% NOTE LOCAL KLUGE TO AVOID TOO MUCH WHITESPACE
-\global\long\def\example{%
-\begingroup
-\let\aboveenvbreak=\par
-\let\afterenvbreak=\par
-\parskip=0pt
-\lisp}
-\global\long\def\Eexample{%
-\Elisp
-\endgroup
-\vskip -\parskip% to cancel out effect of following \par
-}
-@end tex
-@synindex fn cp
-
-@ifinfo
-@format
-START-INFO-DIR-ENTRY
-* Bfd: (bfd).                   The Binary File Descriptor library.
-END-INFO-DIR-ENTRY
-@end format
-@end ifinfo
-
-@ifinfo
-This file documents the BFD library.
-
-Copyright (C) 1991 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-@ignore
-Permission is granted to process this file through Tex and print the
-results, provided the printed document carries copying permission
-notice identical to this one except for the removal of this paragraph
-(this paragraph not being relevant to the printed manual).
-
-@end ignore
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, subject to the terms
-of the GNU General Public License, which includes the provision that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions.
-@end ifinfo
-@iftex
-@c@finalout
-@setchapternewpage on
-@c@setchapternewpage odd
-@settitle LIB BFD, the Binary File Descriptor Library
-@titlepage
-@title{libbfd}
-@subtitle{The Binary File Descriptor Library}
-@sp 1
-@subtitle First Edition---BFD version < 3.0
-@subtitle April 1991
-@author {Steve Chamberlain}
-@author {Cygnus Support}
-@page
-
-@tex
-\def\$#1${{#1}}  % Kluge: collect RCS revision info without $...$
-\xdef\manvers{\$Revision$}  % For use in headers, footers too
-{\parskip=0pt
-\hfill Cygnus Support\par
-\hfill sac\@cygnus.com\par
-\hfill {\it BFD}, \manvers\par
-\hfill \TeX{}info \texinfoversion\par
-}
-\global\parindent=0pt % Steve likes it this way
-@end tex
-
-@vskip 0pt plus 1filll
-Copyright @copyright{} 1991 Free Software Foundation, Inc.
-
-Permission is granted to make and distribute verbatim copies of
-this manual provided the copyright notice and this permission notice
-are preserved on all copies.
-
-Permission is granted to copy and distribute modified versions of this
-manual under the conditions for verbatim copying, subject to the terms
-of the GNU General Public License, which includes the provision that the
-entire resulting derived work is distributed under the terms of a
-permission notice identical to this one.
-
-Permission is granted to copy and distribute translations of this manual
-into another language, under the above conditions for modified versions.
-@end titlepage
-@end iftex
-
-@node Top, Overview, (dir), (dir)
-@ifinfo
-This file documents the binary file descriptor library libbfd.
-@end ifinfo
-
-@menu
-* Overview::			Overview of BFD
-* BFD front end::		BFD front end
-* BFD back ends::		BFD back ends
-* Index::			Index
-@end menu
-
-@node Overview, BFD front end, Top, Top
-@chapter Introduction
-@cindex BFD
-@cindex what is it?
-BFD is a package which allows applications to use the
-same routines to operate on object files whatever the object file
-format.  A new object file format can be supported simply by
-creating a new BFD back end and adding it to the library.
-
-BFD is split into two parts: the front end, and the back ends (one for
-each object file format).
-@itemize @bullet
-@item The front end of BFD provides the interface to the user. It manages
-memory and various canonical data structures. The front end also
-decides which back end to use and when to call back end routines.
-@item The back ends provide BFD its view of the real world. Each back
-end provides a set of calls which the BFD front end can use to maintain
-its canonical form. The back ends also may keep around information for
-their own use, for greater efficiency.
-@end itemize
-@menu
-* History::			History
-* How It Works::		How It Works
-* What BFD Version 2 Can Do::	What BFD Version 2 Can Do
-@end menu
-
-@node History, How It Works, Overview, Overview
-@section History
-
-One spur behind BFD was the desire, on the part of the GNU 960 team at
-Intel Oregon, for interoperability of applications on their COFF and
-b.out file formats.  Cygnus was providing GNU support for the team, and
-was contracted to provide the required functionality.
-
-The name came from a conversation David Wallace was having with Richard
-Stallman about the library: RMS said that it would be quite hard---David
-said ``BFD''.  Stallman was right, but the name stuck.
-
-At the same time, Ready Systems wanted much the same thing, but for
-different object file formats: IEEE-695, Oasys, Srecords, a.out and 68k
-coff.
-
-BFD was first implemented by members of Cygnus Support; Steve
-Chamberlain (@code{sac@@cygnus.com}), John Gilmore
-(@code{gnu@@cygnus.com}), K.  Richard Pixley (@code{rich@@cygnus.com})
-and David Henkel-Wallace (@code{gumby@@cygnus.com}).
-
-
-
-@node How It Works, What BFD Version 2 Can Do, History, Overview
-@section How To Use BFD
-
-To use the library, include @file{bfd.h} and link with @file{libbfd.a}.	
-
-BFD provides a common interface to the parts of an object file
-for a calling application. 
-
-When an application sucessfully opens a target file (object, archive, or
-whatever), a pointer to an internal structure is returned. This pointer
-points to a structure called @code{bfd}, described in
-@file{bfd.h}.  Our convention is to call this pointer a BFD, and
-instances of it within code @code{abfd}.  All operations on
-the target object file are applied as methods to the BFD.  The mapping is
-defined within @code{bfd.h} in a set of macros, all beginning
-with @samp{bfd_} to reduce namespace pollution.
-
-For example, this sequence does what you would probably expect:
-return the number of sections in an object file attached to a BFD
-@code{abfd}. 
-
-@lisp
-@c @cartouche
-#include "bfd.h"
-
-unsigned int number_of_sections(abfd)
-bfd *abfd;
-@{
-  return bfd_count_sections(abfd);
-@}
-@c @end cartouche
-@end lisp
-
-The abstraction used within BFD is that an object file has:
-
-@itemize @bullet
-@item
-a header,
-@item
-a number of sections containing raw data (@pxref{Sections}),
-@item
-a set of relocations (@pxref{Relocations}), and
-@item
-some symbol information (@pxref{Symbols}).
-@end itemize
-@noindent
-Also, BFDs opened for archives have the additional attribute of an index
-and contain subordinate BFDs. This approach is fine for a.out and coff,
-but loses efficiency when applied to formats such as S-records and
-IEEE-695.
-
-@node What BFD Version 2 Can Do,  , How It Works, Overview
-@section What BFD Version 2 Can Do
-@include bfdsumm.texi
-
-@node BFD front end, BFD back ends, Overview, Top
-@chapter BFD front end
-@include bfdt.texi
-
-@menu
-* Memory Usage::
-* Initialization::
-* Sections::
-* Symbols::
-* Archives::
-* Formats::
-* Relocations::
-* Core Files::
-* Targets::
-* Architectures::
-* Opening and Closing::
-* Internal::
-* File Caching::
-* Linker Functions::
-* Hash Tables::
-@end menu
-
-@node Memory Usage, Initialization, BFD front end, BFD front end
-@section Memory usage
-BFD keeps all of its internal structures in obstacks. There is one obstack
-per open BFD file, into which the current state is stored. When a BFD is
-closed, the obstack is deleted, and so everything which has been
-allocated by BFD for the closing file is thrown away.
-
-BFD does not free anything created by an application, but pointers into
-@code{bfd} structures become invalid on a @code{bfd_close}; for example,
-after a @code{bfd_close} the vector passed to
-@code{bfd_canonicalize_symtab} is still around, since it has been
-allocated by the application, but the data that it pointed to are
-lost.
-
-The general rule is to not close a BFD until all operations dependent
-upon data from the BFD have been completed, or all the data from within
-the file has been copied. To help with the management of memory, there
-is a function (@code{bfd_alloc_size}) which returns the number of bytes
-in obstacks associated with the supplied BFD. This could be used to
-select the greediest open BFD, close it to reclaim the memory, perform
-some operation and reopen the BFD again, to get a fresh copy of the data
-structures.
-
-@node Initialization, Sections, Memory Usage, BFD front end
-@include  init.texi
-
-@node Sections, Symbols, Initialization, BFD front end
-@include  section.texi
-
-@node Symbols, Archives, Sections, BFD front end
-@include  syms.texi
-
-@node Archives, Formats, Symbols, BFD front end
-@include  archive.texi
-
-@node Formats, Relocations, Archives, BFD front end
-@include  format.texi
-
-@node Relocations, Core Files, Formats, BFD front end
-@include  reloc.texi
-
-@node Core Files, Targets, Relocations, BFD front end
-@include  core.texi
-
-@node Targets, Architectures, Core Files, BFD front end
-@include  targets.texi
-
-@node Architectures, Opening and Closing, Targets, BFD front end
-@include  archures.texi
-
-@node Opening and Closing, Internal, Architectures, BFD front end
-@include  opncls.texi
-
-@node Internal, File Caching, Opening and Closing, BFD front end
-@include  libbfd.texi
-
-@node File Caching, Linker Functions, Internal, BFD front end
-@include  cache.texi
-
-@node Linker Functions, Hash Tables, File Caching, BFD front end
-@include  linker.texi
-
-@node Hash Tables, , Linker Functions, BFD front end
-@include  hash.texi
-
-@node BFD back ends, Index, BFD front end, Top
-@chapter BFD back ends
-@menu
-* What to Put Where::
-* aout ::	a.out backends
-* coff ::	coff backends
-* elf  ::	elf backends
-@ignore
-* oasys ::	oasys backends
-* ieee ::	ieee backend
-* srecord ::	s-record backend
-@end ignore
-@end menu
-@node What to Put Where, aout, BFD back ends, BFD back ends
-All of BFD lives in one directory.
-
-@node aout, coff, What to Put Where, BFD back ends
-@include  aoutx.texi
-
-@node coff, elf, aout, BFD back ends
-@include  coffcode.texi
-
-@node elf,  , coff, BFD back ends
-@include  elf.texi
-@c Leave this out until the file has some actual contents...
-@c @include  elfcode.texi
-
-@node Index,  , BFD back ends , Top
-@unnumbered Index
-@printindex cp
-
-@tex
-% I think something like @colophon should be in texinfo.  In the
-% meantime:
-\long\def\colophon{\hbox to0pt{}\vfill
-\centerline{The body of this manual is set in}
-\centerline{\fontname\tenrm,}
-\centerline{with headings in {\bf\fontname\tenbf}}
-\centerline{and examples in {\tt\fontname\tentt}.}
-\centerline{{\it\fontname\tenit\/} and}
-\centerline{{\sl\fontname\tensl\/}}
-\centerline{are used for emphasis.}\vfill}
-\page\colophon
-% Blame: doc@cygnus.com, 28mar91.
-@end tex
-
-@contents
-@bye
diff --git a/bfd/doc/bfdint.texi b/bfd/doc/bfdint.texi
deleted file mode 100644
index eb09b34a9d2..00000000000
--- a/bfd/doc/bfdint.texi
+++ /dev/null
@@ -1,1885 +0,0 @@
-\input texinfo
-@setfilename bfdint.info
-
-@settitle BFD Internals
-@iftex
-@titlepage
-@title{BFD Internals}
-@author{Ian Lance Taylor}
-@author{Cygnus Solutions}
-@page
-@end iftex
-
-@node Top
-@top BFD Internals
-@raisesections
-@cindex bfd internals
-
-This document describes some BFD internal information which may be
-helpful when working on BFD.  It is very incomplete.
-
-This document is not updated regularly, and may be out of date.  It was
-last modified on $Date$.
-
-The initial version of this document was written by Ian Lance Taylor
-@email{ian@@cygnus.com}.
-
-@menu
-* BFD overview::		BFD overview
-* BFD guidelines::		BFD programming guidelines
-* BFD target vector::		BFD target vector
-* BFD generated files::		BFD generated files
-* BFD multiple compilations::	Files compiled multiple times in BFD
-* BFD relocation handling::	BFD relocation handling
-* BFD ELF support::		BFD ELF support
-* BFD glossary::		Glossary
-* Index::			Index
-@end menu
-
-@node BFD overview
-@section BFD overview
-
-BFD is a library which provides a single interface to read and write
-object files, executables, archive files, and core files in any format.
-
-@menu
-* BFD library interfaces::	BFD library interfaces
-* BFD library users::		BFD library users
-* BFD view::			The BFD view of a file
-* BFD blindness::		BFD loses information
-@end menu
-
-@node BFD library interfaces
-@subsection BFD library interfaces
-
-One way to look at the BFD library is to divide it into four parts by
-type of interface.
-
-The first interface is the set of generic functions which programs using
-the BFD library will call.  These generic function normally translate
-directly or indirectly into calls to routines which are specific to a
-particular object file format.  Many of these generic functions are
-actually defined as macros in @file{bfd.h}.  These functions comprise
-the official BFD interface.
-
-The second interface is the set of functions which appear in the target
-vectors.  This is the bulk of the code in BFD.  A target vector is a set
-of function pointers specific to a particular object file format.  The
-target vector is used to implement the generic BFD functions.  These
-functions are always called through the target vector, and are never
-called directly.  The target vector is described in detail in @ref{BFD
-target vector}.  The set of functions which appear in a particular
-target vector is often referred to as a BFD backend.
-
-The third interface is a set of oddball functions which are typically
-specific to a particular object file format, are not generic functions,
-and are called from outside of the BFD library.  These are used as hooks
-by the linker and the assembler when a particular object file format
-requires some action which the BFD generic interface does not provide.
-These functions are typically declared in @file{bfd.h}, but in many
-cases they are only provided when BFD is configured with support for a
-particular object file format.  These functions live in a grey area, and
-are not really part of the official BFD interface.
-
-The fourth interface is the set of BFD support functions which are
-called by the other BFD functions.  These manage issues like memory
-allocation, error handling, file access, hash tables, swapping, and the
-like.  These functions are never called from outside of the BFD library.
-
-@node BFD library users
-@subsection BFD library users
-
-Another way to look at the BFD library is to divide it into three parts
-by the manner in which it is used.
-
-The first use is to read an object file.  The object file readers are
-programs like @samp{gdb}, @samp{nm}, @samp{objdump}, and @samp{objcopy}.
-These programs use BFD to view an object file in a generic form.  The
-official BFD interface is normally fully adequate for these programs.
-
-The second use is to write an object file.  The object file writers are
-programs like @samp{gas} and @samp{objcopy}.  These programs use BFD to
-create an object file.  The official BFD interface is normally adequate
-for these programs, but for some object file formats the assembler needs
-some additional hooks in order to set particular flags or other
-information.  The official BFD interface includes functions to copy
-private information from one object file to another, and these functions
-are used by @samp{objcopy} to avoid information loss.
-
-The third use is to link object files.  There is only one object file
-linker, @samp{ld}.  Originally, @samp{ld} was an object file reader and
-an object file writer, and it did the link operation using the generic
-BFD structures.  However, this turned out to be too slow and too memory
-intensive.
-
-The official BFD linker functions were written to permit specific BFD
-backends to perform the link without translating through the generic
-structures, in the normal case where all the input files and output file
-have the same object file format.  Not all of the backends currently
-implement the new interface, and there are default linking functions
-within BFD which use the generic structures and which work with all
-backends.
-
-For several object file formats the linker needs additional hooks which
-are not provided by the official BFD interface, particularly for dynamic
-linking support.  These functions are typically called from the linker
-emulation template.
-
-@node BFD view
-@subsection The BFD view of a file
-
-BFD uses generic structures to manage information.  It translates data
-into the generic form when reading files, and out of the generic form
-when writing files.
-
-BFD describes a file as a pointer to the @samp{bfd} type.  A @samp{bfd}
-is composed of the following elements.  The BFD information can be
-displayed using the @samp{objdump} program with various options.
-
-@table @asis
-@item general information
-The object file format, a few general flags, the start address.
-@item architecture
-The architecture, including both a general processor type (m68k, MIPS
-etc.) and a specific machine number (m68000, R4000, etc.).
-@item sections
-A list of sections.
-@item symbols
-A symbol table.
-@end table
-
-BFD represents a section as a pointer to the @samp{asection} type.  Each
-section has a name and a size.  Most sections also have an associated
-block of data, known as the section contents.  Sections also have
-associated flags, a virtual memory address, a load memory address, a
-required alignment, a list of relocations, and other miscellaneous
-information.
-
-BFD represents a relocation as a pointer to the @samp{arelent} type.  A
-relocation describes an action which the linker must take to modify the
-section contents.  Relocations have a symbol, an address, an addend, and
-a pointer to a howto structure which describes how to perform the
-relocation.  For more information, see @ref{BFD relocation handling}.
-
-BFD represents a symbol as a pointer to the @samp{asymbol} type.  A
-symbol has a name, a pointer to a section, an offset within that
-section, and some flags.
-
-Archive files do not have any sections or symbols.  Instead, BFD
-represents an archive file as a file which contains a list of
-@samp{bfd}s.  BFD also provides access to the archive symbol map, as a
-list of symbol names.  BFD provides a function to return the @samp{bfd}
-within the archive which corresponds to a particular entry in the
-archive symbol map.
-
-@node BFD blindness
-@subsection BFD loses information
-
-Most object file formats have information which BFD can not represent in
-its generic form, at least as currently defined.
-
-There is often explicit information which BFD can not represent.  For
-example, the COFF version stamp, or the ELF program segments.  BFD
-provides special hooks to handle this information when copying,
-printing, or linking an object file.  The BFD support for a particular
-object file format will normally store this information in private data
-and handle it using the special hooks.
-
-In some cases there is also implicit information which BFD can not
-represent.  For example, the MIPS processor distinguishes small and
-large symbols, and requires that all small symbls be within 32K of the
-GP register.  This means that the MIPS assembler must be able to mark
-variables as either small or large, and the MIPS linker must know to put
-small symbols within range of the GP register.  Since BFD can not
-represent this information, this means that the assembler and linker
-must have information that is specific to a particular object file
-format which is outside of the BFD library.
-
-This loss of information indicates areas where the BFD paradigm breaks
-down.  It is not actually possible to represent the myriad differences
-among object file formats using a single generic interface, at least not
-in the manner which BFD does it today.
-
-Nevertheless, the BFD library does greatly simplify the task of dealing
-with object files, and particular problems caused by information loss
-can normally be solved using some sort of relatively constrained hook
-into the library.
-
-
-
-@node BFD guidelines
-@section BFD programming guidelines
-@cindex bfd programming guidelines
-@cindex programming guidelines for bfd
-@cindex guidelines, bfd programming
-
-There is a lot of poorly written and confusing code in BFD.  New BFD
-code should be written to a higher standard.  Merely because some BFD
-code is written in a particular manner does not mean that you should
-emulate it.
-
-Here are some general BFD programming guidelines:
-
-@itemize @bullet
-@item
-Follow the GNU coding standards.
-
-@item
-Avoid global variables.  We ideally want BFD to be fully reentrant, so
-that it can be used in multiple threads.  All uses of global or static
-variables interfere with that.  Initialized constant variables are OK,
-and they should be explicitly marked with const.  Instead of global
-variables, use data attached to a BFD or to a linker hash table.
-
-@item
-All externally visible functions should have names which start with
-@samp{bfd_}.  All such functions should be declared in some header file,
-typically @file{bfd.h}.  See, for example, the various declarations near
-the end of @file{bfd-in.h}, which mostly declare functions required by
-specific linker emulations.
-
-@item
-All functions which need to be visible from one file to another within
-BFD, but should not be visible outside of BFD, should start with
-@samp{_bfd_}.  Although external names beginning with @samp{_} are
-prohibited by the ANSI standard, in practice this usage will always
-work, and it is required by the GNU coding standards.
-
-@item
-Always remember that people can compile using @samp{--enable-targets} to
-build several, or all, targets at once.  It must be possible to link
-together the files for all targets.
-
-@item
-BFD code should compile with few or no warnings using @samp{gcc -Wall}.
-Some warnings are OK, like the absence of certain function declarations
-which may or may not be declared in system header files.  Warnings about
-ambiguous expressions and the like should always be fixed.
-@end itemize
-
-@node BFD target vector
-@section BFD target vector
-@cindex bfd target vector
-@cindex target vector in bfd
-
-BFD supports multiple object file formats by using the @dfn{target
-vector}.  This is simply a set of function pointers which implement
-behaviour that is specific to a particular object file format.
-
-In this section I list all of the entries in the target vector and
-describe what they do.
-
-@menu
-* BFD target vector miscellaneous::	Miscellaneous constants
-* BFD target vector swap::		Swapping functions
-* BFD target vector format::		Format type dependent functions
-* BFD_JUMP_TABLE macros::		BFD_JUMP_TABLE macros
-* BFD target vector generic::		Generic functions
-* BFD target vector copy::		Copy functions
-* BFD target vector core::		Core file support functions
-* BFD target vector archive::		Archive functions
-* BFD target vector symbols::		Symbol table functions
-* BFD target vector relocs::		Relocation support
-* BFD target vector write::		Output functions
-* BFD target vector link::		Linker functions
-* BFD target vector dynamic::		Dynamic linking information functions
-@end menu
-
-@node BFD target vector miscellaneous
-@subsection Miscellaneous constants
-
-The target vector starts with a set of constants.
-
-@table @samp
-@item name
-The name of the target vector.  This is an arbitrary string.  This is
-how the target vector is named in command line options for tools which
-use BFD, such as the @samp{-oformat} linker option.
-
-@item flavour
-A general description of the type of target.  The following flavours are
-currently defined:
-
-@table @samp
-@item bfd_target_unknown_flavour
-Undefined or unknown.
-@item bfd_target_aout_flavour
-a.out.
-@item bfd_target_coff_flavour
-COFF.
-@item bfd_target_ecoff_flavour
-ECOFF.
-@item bfd_target_elf_flavour
-ELF.
-@item bfd_target_ieee_flavour
-IEEE-695.
-@item bfd_target_nlm_flavour
-NLM.
-@item bfd_target_oasys_flavour
-OASYS.
-@item bfd_target_tekhex_flavour
-Tektronix hex format.
-@item bfd_target_srec_flavour
-Motorola S-record format.
-@item bfd_target_ihex_flavour
-Intel hex format.
-@item bfd_target_som_flavour
-SOM (used on HP/UX).
-@item bfd_target_os9k_flavour
-os9000.
-@item bfd_target_versados_flavour
-VERSAdos.
-@item bfd_target_msdos_flavour
-MS-DOS.
-@item bfd_target_evax_flavour
-openVMS.
-@end table
-
-@item byteorder
-The byte order of data in the object file.  One of
-@samp{BFD_ENDIAN_BIG}, @samp{BFD_ENDIAN_LITTLE}, or
-@samp{BFD_ENDIAN_UNKNOWN}.  The latter would be used for a format such
-as S-records which do not record the architecture of the data.
-
-@item header_byteorder
-The byte order of header information in the object file.  Normally the
-same as the @samp{byteorder} field, but there are certain cases where it
-may be different.
-
-@item object_flags
-Flags which may appear in the @samp{flags} field of a BFD with this
-format.
-
-@item section_flags
-Flags which may appear in the @samp{flags} field of a section within a
-BFD with this format.
-
-@item symbol_leading_char
-A character which the C compiler normally puts before a symbol.  For
-example, an a.out compiler will typically generate the symbol
-@samp{_foo} for a function named @samp{foo} in the C source, in which
-case this field would be @samp{_}.  If there is no such character, this
-field will be @samp{0}.
-
-@item ar_pad_char
-The padding character to use at the end of an archive name.  Normally
-@samp{/}.
-
-@item ar_max_namelen
-The maximum length of a short name in an archive.  Normally @samp{14}.
-
-@item backend_data
-A pointer to constant backend data.  This is used by backends to store
-whatever additional information they need to distinguish similar target
-vectors which use the same sets of functions.
-@end table
-
-@node BFD target vector swap
-@subsection Swapping functions
-
-Every target vector has fuction pointers used for swapping information
-in and out of the target representation.  There are two sets of
-functions: one for data information, and one for header information.
-Each set has three sizes: 64-bit, 32-bit, and 16-bit.  Each size has
-three actual functions: put, get unsigned, and get signed.
-
-These 18 functions are used to convert data between the host and target
-representations.
-
-@node BFD target vector format
-@subsection Format type dependent functions
-
-Every target vector has three arrays of function pointers which are
-indexed by the BFD format type.  The BFD format types are as follows:
-
-@table @samp
-@item bfd_unknown
-Unknown format.  Not used for anything useful.
-@item bfd_object
-Object file.
-@item bfd_archive
-Archive file.
-@item bfd_core
-Core file.
-@end table
-
-The three arrays of function pointers are as follows:
-
-@table @samp
-@item bfd_check_format
-Check whether the BFD is of a particular format (object file, archive
-file, or core file) corresponding to this target vector.  This is called
-by the @samp{bfd_check_format} function when examining an existing BFD.
-If the BFD matches the desired format, this function will initialize any
-format specific information such as the @samp{tdata} field of the BFD.
-This function must be called before any other BFD target vector function
-on a file opened for reading.
-
-@item bfd_set_format
-Set the format of a BFD which was created for output.  This is called by
-the @samp{bfd_set_format} function after creating the BFD with a
-function such as @samp{bfd_openw}.  This function will initialize format
-specific information required to write out an object file or whatever of
-the given format.  This function must be called before any other BFD
-target vector function on a file opened for writing.
-
-@item bfd_write_contents
-Write out the contents of the BFD in the given format.  This is called
-by @samp{bfd_close} function for a BFD opened for writing.  This really
-should not be an array selected by format type, as the
-@samp{bfd_set_format} function provides all the required information.
-In fact, BFD will fail if a different format is used when calling
-through the @samp{bfd_set_format} and the @samp{bfd_write_contents}
-arrays; fortunately, since @samp{bfd_close} gets it right, this is a
-difficult error to make.
-@end table
-
-@node BFD_JUMP_TABLE macros
-@subsection @samp{BFD_JUMP_TABLE} macros
-@cindex @samp{BFD_JUMP_TABLE}
-
-Most target vectors are defined using @samp{BFD_JUMP_TABLE} macros.
-These macros take a single argument, which is a prefix applied to a set
-of functions.  The macros are then used to initialize the fields in the
-target vector.
-
-For example, the @samp{BFD_JUMP_TABLE_RELOCS} macro defines three
-functions: @samp{_get_reloc_upper_bound}, @samp{_canonicalize_reloc},
-and @samp{_bfd_reloc_type_lookup}.  A reference like
-@samp{BFD_JUMP_TABLE_RELOCS (foo)} will expand into three functions
-prefixed with @samp{foo}: @samp{foo_get_reloc_upper_found}, etc.  The
-@samp{BFD_JUMP_TABLE_RELOCS} macro will be placed such that those three
-functions initialize the appropriate fields in the BFD target vector.
-
-This is done because it turns out that many different target vectors can
-share certain classes of functions.  For example, archives are similar
-on most platforms, so most target vectors can use the same archive
-functions.  Those target vectors all use @samp{BFD_JUMP_TABLE_ARCHIVE}
-with the same argument, calling a set of functions which is defined in
-@file{archive.c}.
-
-Each of the @samp{BFD_JUMP_TABLE} macros is mentioned below along with
-the description of the function pointers which it defines.  The function
-pointers will be described using the name without the prefix which the
-@samp{BFD_JUMP_TABLE} macro defines.  This name is normally the same as
-the name of the field in the target vector structure.  Any differences
-will be noted.
-
-@node BFD target vector generic
-@subsection Generic functions
-@cindex @samp{BFD_JUMP_TABLE_GENERIC}
-
-The @samp{BFD_JUMP_TABLE_GENERIC} macro is used for some catch all
-functions which don't easily fit into other categories.
-
-@table @samp
-@item _close_and_cleanup
-Free any target specific information associated with the BFD.  This is
-called when any BFD is closed (the @samp{bfd_write_contents} function
-mentioned earlier is only called for a BFD opened for writing).  Most
-targets use @samp{bfd_alloc} to allocate all target specific
-information, and therefore don't have to do anything in this function.
-This function pointer is typically set to
-@samp{_bfd_generic_close_and_cleanup}, which simply returns true.
-
-@item _bfd_free_cached_info
-Free any cached information associated with the BFD which can be
-recreated later if necessary.  This is used to reduce the memory
-consumption required by programs using BFD.  This is normally called via
-the @samp{bfd_free_cached_info} macro.  It is used by the default
-archive routines when computing the archive map.  Most targets do not
-do anything special for this entry point, and just set it to
-@samp{_bfd_generic_free_cached_info}, which simply returns true.
-
-@item _new_section_hook
-This is called from @samp{bfd_make_section_anyway} whenever a new
-section is created.  Most targets use it to initialize section specific
-information.  This function is called whether or not the section
-corresponds to an actual section in an actual BFD.
-
-@item _get_section_contents
-Get the contents of a section.  This is called from
-@samp{bfd_get_section_contents}.  Most targets set this to
-@samp{_bfd_generic_get_section_contents}, which does a @samp{bfd_seek}
-based on the section's @samp{filepos} field and a @samp{bfd_read}.  The
-corresponding field in the target vector is named
-@samp{_bfd_get_section_contents}.
-
-@item _get_section_contents_in_window
-Set a @samp{bfd_window} to hold the contents of a section.  This is
-called from @samp{bfd_get_section_contents_in_window}.  The
-@samp{bfd_window} idea never really caught on, and I don't think this is
-ever called.  Pretty much all targets implement this as
-@samp{bfd_generic_get_section_contents_in_window}, which uses
-@samp{bfd_get_section_contents} to do the right thing.  The
-corresponding field in the target vector is named
-@samp{_bfd_get_section_contents_in_window}.
-@end table
-
-@node BFD target vector copy
-@subsection Copy functions
-@cindex @samp{BFD_JUMP_TABLE_COPY}
-
-The @samp{BFD_JUMP_TABLE_COPY} macro is used for functions which are
-called when copying BFDs, and for a couple of functions which deal with
-internal BFD information.
-
-@table @samp
-@item _bfd_copy_private_bfd_data
-This is called when copying a BFD, via @samp{bfd_copy_private_bfd_data}.
-If the input and output BFDs have the same format, this will copy any
-private information over.  This is called after all the section contents
-have been written to the output file.  Only a few targets do anything in
-this function.
-
-@item _bfd_merge_private_bfd_data
-This is called when linking, via @samp{bfd_merge_private_bfd_data}.  It
-gives the backend linker code a chance to set any special flags in the
-output file based on the contents of the input file.  Only a few targets
-do anything in this function.
-
-@item _bfd_copy_private_section_data
-This is similar to @samp{_bfd_copy_private_bfd_data}, but it is called
-for each section, via @samp{bfd_copy_private_section_data}.  This
-function is called before any section contents have been written.  Only
-a few targets do anything in this function.
-
-@item _bfd_copy_private_symbol_data
-This is called via @samp{bfd_copy_private_symbol_data}, but I don't
-think anything actually calls it.  If it were defined, it could be used
-to copy private symbol data from one BFD to another.  However, most BFDs
-store extra symbol information by allocating space which is larger than
-the @samp{asymbol} structure and storing private information in the
-extra space.  Since @samp{objcopy} and other programs copy symbol
-information by copying pointers to @samp{asymbol} structures, the
-private symbol information is automatically copied as well.  Most
-targets do not do anything in this function.
-
-@item _bfd_set_private_flags
-This is called via @samp{bfd_set_private_flags}.  It is basically a hook
-for the assembler to set magic information.  For example, the PowerPC
-ELF assembler uses it to set flags which appear in the e_flags field of
-the ELF header.  Most targets do not do anything in this function.
-
-@item _bfd_print_private_bfd_data
-This is called by @samp{objdump} when the @samp{-p} option is used.  It
-is called via @samp{bfd_print_private_data}.  It prints any interesting
-information about the BFD which can not be otherwise represented by BFD
-and thus can not be printed by @samp{objdump}.  Most targets do not do
-anything in this function.
-@end table
-
-@node BFD target vector core
-@subsection Core file support functions
-@cindex @samp{BFD_JUMP_TABLE_CORE}
-
-The @samp{BFD_JUMP_TABLE_CORE} macro is used for functions which deal
-with core files.  Obviously, these functions only do something
-interesting for targets which have core file support.
-
-@table @samp
-@item _core_file_failing_command
-Given a core file, this returns the command which was run to produce the
-core file.
-
-@item _core_file_failing_signal
-Given a core file, this returns the signal number which produced the
-core file.
-
-@item _core_file_matches_executable_p
-Given a core file and a BFD for an executable, this returns whether the
-core file was generated by the executable.
-@end table
-
-@node BFD target vector archive
-@subsection Archive functions
-@cindex @samp{BFD_JUMP_TABLE_ARCHIVE}
-
-The @samp{BFD_JUMP_TABLE_ARCHIVE} macro is used for functions which deal
-with archive files.  Most targets use COFF style archive files
-(including ELF targets), and these use @samp{_bfd_archive_coff} as the
-argument to @samp{BFD_JUMP_TABLE_ARCHIVE}.  Some targets use BSD/a.out
-style archives, and these use @samp{_bfd_archive_bsd}.  (The main
-difference between BSD and COFF archives is the format of the archive
-symbol table).  Targets with no archive support use
-@samp{_bfd_noarchive}.  Finally, a few targets have unusual archive
-handling.
-
-@table @samp
-@item _slurp_armap
-Read in the archive symbol table, storing it in private BFD data.  This
-is normally called from the archive @samp{check_format} routine.  The
-corresponding field in the target vector is named
-@samp{_bfd_slurp_armap}.
-
-@item _slurp_extended_name_table
-Read in the extended name table from the archive, if there is one,
-storing it in private BFD data.  This is normally called from the
-archive @samp{check_format} routine.  The corresponding field in the
-target vector is named @samp{_bfd_slurp_extended_name_table}.
-
-@item construct_extended_name_table
-Build and return an extended name table if one is needed to write out
-the archive.  This also adjusts the archive headers to refer to the
-extended name table appropriately.  This is normally called from the
-archive @samp{write_contents} routine.  The corresponding field in the
-target vector is named @samp{_bfd_construct_extended_name_table}.
-
-@item _truncate_arname
-This copies a file name into an archive header, truncating it as
-required.  It is normally called from the archive @samp{write_contents}
-routine.  This function is more interesting in targets which do not
-support extended name tables, but I think the GNU @samp{ar} program
-always uses extended name tables anyhow.  The corresponding field in the
-target vector is named @samp{_bfd_truncate_arname}.
-
-@item _write_armap
-Write out the archive symbol table using calls to @samp{bfd_write}.
-This is normally called from the archive @samp{write_contents} routine.
-The corresponding field in the target vector is named @samp{write_armap}
-(no leading underscore).
-
-@item _read_ar_hdr
-Read and parse an archive header.  This handles expanding the archive
-header name into the real file name using the extended name table.  This
-is called by routines which read the archive symbol table or the archive
-itself.  The corresponding field in the target vector is named
-@samp{_bfd_read_ar_hdr_fn}.
-
-@item _openr_next_archived_file
-Given an archive and a BFD representing a file stored within the
-archive, return a BFD for the next file in the archive.  This is called
-via @samp{bfd_openr_next_archived_file}.  The corresponding field in the
-target vector is named @samp{openr_next_archived_file} (no leading
-underscore).
-
-@item _get_elt_at_index
-Given an archive and an index, return a BFD for the file in the archive
-corresponding to that entry in the archive symbol table.  This is called
-via @samp{bfd_get_elt_at_index}.  The corresponding field in the target
-vector is named @samp{_bfd_get_elt_at_index}.
-
-@item _generic_stat_arch_elt
-Do a stat on an element of an archive, returning information read from
-the archive header (modification time, uid, gid, file mode, size).  This
-is called via @samp{bfd_stat_arch_elt}.  The corresponding field in the
-target vector is named @samp{_bfd_stat_arch_elt}.
-
-@item _update_armap_timestamp
-After the entire contents of an archive have been written out, update
-the timestamp of the archive symbol table to be newer than that of the
-file.  This is required for a.out style archives.  This is normally
-called by the archive @samp{write_contents} routine.  The corresponding
-field in the target vector is named @samp{_bfd_update_armap_timestamp}.
-@end table
-
-@node BFD target vector symbols
-@subsection Symbol table functions
-@cindex @samp{BFD_JUMP_TABLE_SYMBOLS}
-
-The @samp{BFD_JUMP_TABLE_SYMBOLS} macro is used for functions which deal
-with symbols.
-
-@table @samp
-@item _get_symtab_upper_bound
-Return a sensible upper bound on the amount of memory which will be
-required to read the symbol table.  In practice most targets return the
-amount of memory required to hold @samp{asymbol} pointers for all the
-symbols plus a trailing @samp{NULL} entry, and store the actual symbol
-information in BFD private data.  This is called via
-@samp{bfd_get_symtab_upper_bound}.  The corresponding field in the
-target vector is named @samp{_bfd_get_symtab_upper_bound}.
-
-@item _get_symtab
-Read in the symbol table.  This is called via
-@samp{bfd_canonicalize_symtab}.  The corresponding field in the target
-vector is named @samp{_bfd_canonicalize_symtab}.
-
-@item _make_empty_symbol
-Create an empty symbol for the BFD.  This is needed because most targets
-store extra information with each symbol by allocating a structure
-larger than an @samp{asymbol} and storing the extra information at the
-end.  This function will allocate the right amount of memory, and return
-what looks like a pointer to an empty @samp{asymbol}.  This is called
-via @samp{bfd_make_empty_symbol}.  The corresponding field in the target
-vector is named @samp{_bfd_make_empty_symbol}.
-
-@item _print_symbol
-Print information about the symbol.  This is called via
-@samp{bfd_print_symbol}.  One of the arguments indicates what sort of
-information should be printed:
-
-@table @samp
-@item bfd_print_symbol_name
-Just print the symbol name.
-@item bfd_print_symbol_more
-Print the symbol name and some interesting flags.  I don't think
-anything actually uses this.
-@item bfd_print_symbol_all
-Print all information about the symbol.  This is used by @samp{objdump}
-when run with the @samp{-t} option.
-@end table
-The corresponding field in the target vector is named
-@samp{_bfd_print_symbol}.
-
-@item _get_symbol_info
-Return a standard set of information about the symbol.  This is called
-via @samp{bfd_symbol_info}.  The corresponding field in the target
-vector is named @samp{_bfd_get_symbol_info}.
-
-@item _bfd_is_local_label_name
-Return whether the given string would normally represent the name of a
-local label.  This is called via @samp{bfd_is_local_label} and
-@samp{bfd_is_local_label_name}.  Local labels are normally discarded by
-the assembler.  In the linker, this defines the difference between the
-@samp{-x} and @samp{-X} options.
-
-@item _get_lineno
-Return line number information for a symbol.  This is only meaningful
-for a COFF target.  This is called when writing out COFF line numbers.
-
-@item _find_nearest_line
-Given an address within a section, use the debugging information to find
-the matching file name, function name, and line number, if any.  This is
-called via @samp{bfd_find_nearest_line}.  The corresponding field in the
-target vector is named @samp{_bfd_find_nearest_line}.
-
-@item _bfd_make_debug_symbol
-Make a debugging symbol.  This is only meaningful for a COFF target,
-where it simply returns a symbol which will be placed in the
-@samp{N_DEBUG} section when it is written out.  This is called via
-@samp{bfd_make_debug_symbol}.
-
-@item _read_minisymbols
-Minisymbols are used to reduce the memory requirements of programs like
-@samp{nm}.  A minisymbol is a cookie pointing to internal symbol
-information which the caller can use to extract complete symbol
-information.  This permits BFD to not convert all the symbols into
-generic form, but to instead convert them one at a time.  This is called
-via @samp{bfd_read_minisymbols}.  Most targets do not implement this,
-and just use generic support which is based on using standard
-@samp{asymbol} structures.
-
-@item _minisymbol_to_symbol
-Convert a minisymbol to a standard @samp{asymbol}.  This is called via
-@samp{bfd_minisymbol_to_symbol}.
-@end table
-
-@node BFD target vector relocs
-@subsection Relocation support
-@cindex @samp{BFD_JUMP_TABLE_RELOCS}
-
-The @samp{BFD_JUMP_TABLE_RELOCS} macro is used for functions which deal
-with relocations.
-
-@table @samp
-@item _get_reloc_upper_bound
-Return a sensible upper bound on the amount of memory which will be
-required to read the relocations for a section.  In practice most
-targets return the amount of memory required to hold @samp{arelent}
-pointers for all the relocations plus a trailing @samp{NULL} entry, and
-store the actual relocation information in BFD private data.  This is
-called via @samp{bfd_get_reloc_upper_bound}.
-
-@item _canonicalize_reloc
-Return the relocation information for a section.  This is called via
-@samp{bfd_canonicalize_reloc}.  The corresponding field in the target
-vector is named @samp{_bfd_canonicalize_reloc}.
-
-@item _bfd_reloc_type_lookup
-Given a relocation code, return the corresponding howto structure
-(@pxref{BFD relocation codes}).  This is called via
-@samp{bfd_reloc_type_lookup}.  The corresponding field in the target
-vector is named @samp{reloc_type_lookup}.
-@end table
-
-@node BFD target vector write
-@subsection Output functions
-@cindex @samp{BFD_JUMP_TABLE_WRITE}
-
-The @samp{BFD_JUMP_TABLE_WRITE} macro is used for functions which deal
-with writing out a BFD.
-
-@table @samp
-@item _set_arch_mach
-Set the architecture and machine number for a BFD.  This is called via
-@samp{bfd_set_arch_mach}.  Most targets implement this by calling
-@samp{bfd_default_set_arch_mach}.  The corresponding field in the target
-vector is named @samp{_bfd_set_arch_mach}.
-
-@item _set_section_contents
-Write out the contents of a section.  This is called via
-@samp{bfd_set_section_contents}.  The corresponding field in the target
-vector is named @samp{_bfd_set_section_contents}.
-@end table
-
-@node BFD target vector link
-@subsection Linker functions
-@cindex @samp{BFD_JUMP_TABLE_LINK}
-
-The @samp{BFD_JUMP_TABLE_LINK} macro is used for functions called by the
-linker.
-
-@table @samp
-@item _sizeof_headers
-Return the size of the header information required for a BFD.  This is
-used to implement the @samp{SIZEOF_HEADERS} linker script function.  It
-is normally used to align the first section at an efficient position on
-the page.  This is called via @samp{bfd_sizeof_headers}.  The
-corresponding field in the target vector is named
-@samp{_bfd_sizeof_headers}.
-
-@item _bfd_get_relocated_section_contents
-Read the contents of a section and apply the relocation information.
-This handles both a final link and a relocateable link; in the latter
-case, it adjust the relocation information as well.  This is called via
-@samp{bfd_get_relocated_section_contents}.  Most targets implement it by
-calling @samp{bfd_generic_get_relocated_section_contents}.
-
-@item _bfd_relax_section
-Try to use relaxation to shrink the size of a section.  This is called
-by the linker when the @samp{-relax} option is used.  This is called via
-@samp{bfd_relax_section}.  Most targets do not support any sort of
-relaxation.
-
-@item _bfd_link_hash_table_create
-Create the symbol hash table to use for the linker.  This linker hook
-permits the backend to control the size and information of the elements
-in the linker symbol hash table.  This is called via
-@samp{bfd_link_hash_table_create}.
-
-@item _bfd_link_add_symbols
-Given an object file or an archive, add all symbols into the linker
-symbol hash table.  Use callbacks to the linker to include archive
-elements in the link.  This is called via @samp{bfd_link_add_symbols}.
-
-@item _bfd_final_link
-Finish the linking process.  The linker calls this hook after all of the
-input files have been read, when it is ready to finish the link and
-generate the output file.  This is called via @samp{bfd_final_link}.
-
-@item _bfd_link_split_section
-I don't know what this is for.  Nothing seems to call it.  The only
-non-trivial definition is in @file{som.c}.
-@end table
-
-@node BFD target vector dynamic
-@subsection Dynamic linking information functions
-@cindex @samp{BFD_JUMP_TABLE_DYNAMIC}
-
-The @samp{BFD_JUMP_TABLE_DYNAMIC} macro is used for functions which read
-dynamic linking information.
-
-@table @samp
-@item _get_dynamic_symtab_upper_bound
-Return a sensible upper bound on the amount of memory which will be
-required to read the dynamic symbol table.  In practice most targets
-return the amount of memory required to hold @samp{asymbol} pointers for
-all the symbols plus a trailing @samp{NULL} entry, and store the actual
-symbol information in BFD private data.  This is called via
-@samp{bfd_get_dynamic_symtab_upper_bound}.  The corresponding field in
-the target vector is named @samp{_bfd_get_dynamic_symtab_upper_bound}.
-
-@item _canonicalize_dynamic_symtab
-Read the dynamic symbol table.  This is called via
-@samp{bfd_canonicalize_dynamic_symtab}.  The corresponding field in the
-target vector is named @samp{_bfd_canonicalize_dynamic_symtab}.
-
-@item _get_dynamic_reloc_upper_bound
-Return a sensible upper bound on the amount of memory which will be
-required to read the dynamic relocations.  In practice most targets
-return the amount of memory required to hold @samp{arelent} pointers for
-all the relocations plus a trailing @samp{NULL} entry, and store the
-actual relocation information in BFD private data.  This is called via
-@samp{bfd_get_dynamic_reloc_upper_bound}.  The corresponding field in
-the target vector is named @samp{_bfd_get_dynamic_reloc_upper_bound}.
-
-@item _canonicalize_dynamic_reloc
-Read the dynamic relocations.  This is called via
-@samp{bfd_canonicalize_dynamic_reloc}.  The corresponding field in the
-target vector is named @samp{_bfd_canonicalize_dynamic_reloc}.
-@end table
-
-@node BFD generated files
-@section BFD generated files
-@cindex generated files in bfd
-@cindex bfd generated files
-
-BFD contains several automatically generated files.  This section
-describes them.  Some files are created at configure time, when you
-configure BFD.  Some files are created at make time, when you build
-time.  Some files are automatically rebuilt at make time, but only if
-you configure with the @samp{--enable-maintainer-mode} option.  Some
-files live in the object directory---the directory from which you run
-configure---and some live in the source directory.  All files that live
-in the source directory are checked into the CVS repository.
-
-@table @file
-@item bfd.h
-@cindex @file{bfd.h}
-@cindex @file{bfd-in3.h}
-Lives in the object directory.  Created at make time from
-@file{bfd-in2.h} via @file{bfd-in3.h}.  @file{bfd-in3.h} is created at
-configure time from @file{bfd-in2.h}.  There are automatic dependencies
-to rebuild @file{bfd-in3.h} and hence @file{bfd.h} if @file{bfd-in2.h}
-changes, so you can normally ignore @file{bfd-in3.h}, and just think
-about @file{bfd-in2.h} and @file{bfd.h}.
-
-@file{bfd.h} is built by replacing a few strings in @file{bfd-in2.h}.
-To see them, search for @samp{@@} in @file{bfd-in2.h}.  They mainly
-control whether BFD is built for a 32 bit target or a 64 bit target.
-
-@item bfd-in2.h
-@cindex @file{bfd-in2.h}
-Lives in the source directory.  Created from @file{bfd-in.h} and several
-other BFD source files.  If you configure with the
-@samp{--enable-maintainer-mode} option, @file{bfd-in2.h} is rebuilt
-automatically when a source file changes.
-
-@item elf32-target.h
-@itemx elf64-target.h
-@cindex @file{elf32-target.h}
-@cindex @file{elf64-target.h}
-Live in the object directory.  Created from @file{elfxx-target.h}.
-These files are versions of @file{elfxx-target.h} customized for either
-a 32 bit ELF target or a 64 bit ELF target.
-
-@item libbfd.h
-@cindex @file{libbfd.h}
-Lives in the source directory.  Created from @file{libbfd-in.h} and
-several other BFD source files.  If you configure with the
-@samp{--enable-maintainer-mode} option, @file{libbfd.h} is rebuilt
-automatically when a source file changes.
-
-@item libcoff.h
-@cindex @file{libcoff.h}
-Lives in the source directory.  Created from @file{libcoff-in.h} and
-@file{coffcode.h}.  If you configure with the
-@samp{--enable-maintainer-mode} option, @file{libcoff.h} is rebuilt
-automatically when a source file changes.
-
-@item targmatch.h
-@cindex @file{targmatch.h}
-Lives in the object directory.  Created at make time from
-@file{config.bfd}.  This file is used to map configuration triplets into
-BFD target vector variable names at run time.
-@end table
-
-@node BFD multiple compilations
-@section Files compiled multiple times in BFD
-Several files in BFD are compiled multiple times.  By this I mean that
-there are header files which contain function definitions.  These header
-files are included by other files, and thus the functions are compiled
-once per file which includes them.
-
-Preprocessor macros are used to control the compilation, so that each
-time the files are compiled the resulting functions are slightly
-different.  Naturally, if they weren't different, there would be no
-reason to compile them multiple times.
-
-This is a not a particularly good programming technique, and future BFD
-work should avoid it.
-
-@itemize @bullet
-@item
-Since this technique is rarely used, even experienced C programmers find
-it confusing.
-
-@item
-It is difficult to debug programs which use BFD, since there is no way
-to describe which version of a particular function you are looking at.
-
-@item
-Programs which use BFD wind up incorporating two or more slightly
-different versions of the same function, which wastes space in the
-executable.
-
-@item
-This technique is never required nor is it especially efficient.  It is
-always possible to use statically initialized structures holding
-function pointers and magic constants instead.
-@end itemize
-
-The following is a list of the files which are compiled multiple times.
-
-@table @file
-@item aout-target.h
-@cindex @file{aout-target.h}
-Describes a few functions and the target vector for a.out targets.  This
-is used by individual a.out targets with different definitions of
-@samp{N_TXTADDR} and similar a.out macros.
-
-@item aoutf1.h
-@cindex @file{aoutf1.h}
-Implements standard SunOS a.out files.  In principle it supports 64 bit
-a.out targets based on the preprocessor macro @samp{ARCH_SIZE}, but
-since all known a.out targets are 32 bits, this code may or may not
-work.  This file is only included by a few other files, and it is
-difficult to justify its existence.
-
-@item aoutx.h
-@cindex @file{aoutx.h}
-Implements basic a.out support routines.  This file can be compiled for
-either 32 or 64 bit support.  Since all known a.out targets are 32 bits,
-the 64 bit support may or may not work.  I believe the original
-intention was that this file would only be included by @samp{aout32.c}
-and @samp{aout64.c}, and that other a.out targets would simply refer to
-the functions it defined.  Unfortunately, some other a.out targets
-started including it directly, leading to a somewhat confused state of
-affairs.
-
-@item coffcode.h
-@cindex @file{coffcode.h}
-Implements basic COFF support routines.  This file is included by every
-COFF target.  It implements code which handles COFF magic numbers as
-well as various hook functions called by the generic COFF functions in
-@file{coffgen.c}.  This file is controlled by a number of different
-macros, and more are added regularly.
-
-@item coffswap.h
-@cindex @file{coffswap.h}
-Implements COFF swapping routines.  This file is included by
-@file{coffcode.h}, and thus by every COFF target.  It implements the
-routines which swap COFF structures between internal and external
-format.  The main control for this file is the external structure
-definitions in the files in the @file{include/coff} directory.  A COFF
-target file will include one of those files before including
-@file{coffcode.h} and thus @file{coffswap.h}.  There are a few other
-macros which affect @file{coffswap.h} as well, mostly describing whether
-certain fields are present in the external structures.
-
-@item ecoffswap.h
-@cindex @file{ecoffswap.h}
-Implements ECOFF swapping routines.  This is like @file{coffswap.h}, but
-for ECOFF.  It is included by the ECOFF target files (of which there are
-only two).  The control is the preprocessor macro @samp{ECOFF_32} or
-@samp{ECOFF_64}.
-
-@item elfcode.h
-@cindex @file{elfcode.h}
-Implements ELF functions that use external structure definitions.  This
-file is included by two other files: @file{elf32.c} and @file{elf64.c}.
-It is controlled by the @samp{ARCH_SIZE} macro which is defined to be
-@samp{32} or @samp{64} before including it.  The @samp{NAME} macro is
-used internally to give the functions different names for the two target
-sizes.
-
-@item elfcore.h
-@cindex @file{elfcore.h}
-Like @file{elfcode.h}, but for functions that are specific to ELF core
-files.  This is included only by @file{elfcode.h}.
-
-@item elflink.h
-@cindex @file{elflink.h}
-Like @file{elfcode.h}, but for functions used by the ELF linker.  This
-is included only by @file{elfcode.h}.
-
-@item elfxx-target.h
-@cindex @file{elfxx-target.h}
-This file is the source for the generated files @file{elf32-target.h}
-and @file{elf64-target.h}, one of which is included by every ELF target.
-It defines the ELF target vector.
-
-@item freebsd.h
-@cindex @file{freebsd.h}
-Presumably intended to be included by all FreeBSD targets, but in fact
-there is only one such target, @samp{i386-freebsd}.  This defines a
-function used to set the right magic number for FreeBSD, as well as
-various macros, and includes @file{aout-target.h}.
-
-@item netbsd.h
-@cindex @file{netbsd.h}
-Like @file{freebsd.h}, except that there are several files which include
-it.
-
-@item nlm-target.h
-@cindex @file{nlm-target.h}
-Defines the target vector for a standard NLM target.
-
-@item nlmcode.h
-@cindex @file{nlmcode.h}
-Like @file{elfcode.h}, but for NLM targets.  This is only included by
-@file{nlm32.c} and @file{nlm64.c}, both of which define the macro
-@samp{ARCH_SIZE} to an appropriate value.  There are no 64 bit NLM
-targets anyhow, so this is sort of useless.
-
-@item nlmswap.h
-@cindex @file{nlmswap.h}
-Like @file{coffswap.h}, but for NLM targets.  This is included by each
-NLM target, but I think it winds up compiling to the exact same code for
-every target, and as such is fairly useless.
-
-@item peicode.h
-@cindex @file{peicode.h}
-Provides swapping routines and other hooks for PE targets.
-@file{coffcode.h} will include this rather than @file{coffswap.h} for a
-PE target.  This defines PE specific versions of the COFF swapping
-routines, and also defines some macros which control @file{coffcode.h}
-itself.
-@end table
-
-@node BFD relocation handling
-@section BFD relocation handling
-@cindex bfd relocation handling
-@cindex relocations in bfd
-
-The handling of relocations is one of the more confusing aspects of BFD.
-Relocation handling has been implemented in various different ways, all
-somewhat incompatible, none perfect.
-
-@menu
-* BFD relocation concepts::	BFD relocation concepts
-* BFD relocation functions::	BFD relocation functions
-* BFD relocation codes::	BFD relocation codes
-* BFD relocation future::	BFD relocation future
-@end menu
-
-@node BFD relocation concepts
-@subsection BFD relocation concepts
-
-A relocation is an action which the linker must take when linking.  It
-describes a change to the contents of a section.  The change is normally
-based on the final value of one or more symbols.  Relocations are
-created by the assembler when it creates an object file.
-
-Most relocations are simple.  A typical simple relocation is to set 32
-bits at a given offset in a section to the value of a symbol.  This type
-of relocation would be generated for code like @code{int *p = &i;} where
-@samp{p} and @samp{i} are global variables.  A relocation for the symbol
-@samp{i} would be generated such that the linker would initialize the
-area of memory which holds the value of @samp{p} to the value of the
-symbol @samp{i}.
-
-Slightly more complex relocations may include an addend, which is a
-constant to add to the symbol value before using it.  In some cases a
-relocation will require adding the symbol value to the existing contents
-of the section in the object file.  In others the relocation will simply
-replace the contents of the section with the symbol value.  Some
-relocations are PC relative, so that the value to be stored in the
-section is the difference between the value of a symbol and the final
-address of the section contents.
-
-In general, relocations can be arbitrarily complex.  For example,
-relocations used in dynamic linking systems often require the linker to
-allocate space in a different section and use the offset within that
-section as the value to store.  In the IEEE object file format,
-relocations may involve arbitrary expressions.
-
-When doing a relocateable link, the linker may or may not have to do
-anything with a relocation, depending upon the definition of the
-relocation.  Simple relocations generally do not require any special
-action.
-
-@node BFD relocation functions
-@subsection BFD relocation functions
-
-In BFD, each section has an array of @samp{arelent} structures.  Each
-structure has a pointer to a symbol, an address within the section, an
-addend, and a pointer to a @samp{reloc_howto_struct} structure.  The
-howto structure has a bunch of fields describing the reloc, including a
-type field.  The type field is specific to the object file format
-backend; none of the generic code in BFD examines it.
-
-Originally, the function @samp{bfd_perform_relocation} was supposed to
-handle all relocations.  In theory, many relocations would be simple
-enough to be described by the fields in the howto structure.  For those
-that weren't, the howto structure included a @samp{special_function}
-field to use as an escape.
-
-While this seems plausible, a look at @samp{bfd_perform_relocation}
-shows that it failed.  The function has odd special cases.  Some of the
-fields in the howto structure, such as @samp{pcrel_offset}, were not
-adequately documented.
-
-The linker uses @samp{bfd_perform_relocation} to do all relocations when
-the input and output file have different formats (e.g., when generating
-S-records).  The generic linker code, which is used by all targets which
-do not define their own special purpose linker, uses
-@samp{bfd_get_relocated_section_contents}, which for most targets turns
-into a call to @samp{bfd_generic_get_relocated_section_contents}, which
-calls @samp{bfd_perform_relocation}.  So @samp{bfd_perform_relocation}
-is still widely used, which makes it difficult to change, since it is
-difficult to test all possible cases.
-
-The assembler used @samp{bfd_perform_relocation} for a while.  This
-turned out to be the wrong thing to do, since
-@samp{bfd_perform_relocation} was written to handle relocations on an
-existing object file, while the assembler needed to create relocations
-in a new object file.  The assembler was changed to use the new function
-@samp{bfd_install_relocation} instead, and @samp{bfd_install_relocation}
-was created as a copy of @samp{bfd_perform_relocation}.
-
-Unfortunately, the work did not progress any farther, so
-@samp{bfd_install_relocation} remains a simple copy of
-@samp{bfd_perform_relocation}, with all the odd special cases and
-confusing code.  This again is difficult to change, because again any
-change can affect any assembler target, and so is difficult to test.
-
-The new linker, when using the same object file format for all input
-files and the output file, does not convert relocations into
-@samp{arelent} structures, so it can not use
-@samp{bfd_perform_relocation} at all.  Instead, users of the new linker
-are expected to write a @samp{relocate_section} function which will
-handle relocations in a target specific fashion.
-
-There are two helper functions for target specific relocation:
-@samp{_bfd_final_link_relocate} and @samp{_bfd_relocate_contents}.
-These functions use a howto structure, but they @emph{do not} use the
-@samp{special_function} field.  Since the functions are normally called
-from target specific code, the @samp{special_function} field adds
-little; any relocations which require special handling can be handled
-without calling those functions.
-
-So, if you want to add a new target, or add a new relocation to an
-existing target, you need to do the following:
-
-@itemize @bullet
-@item
-Make sure you clearly understand what the contents of the section should
-look like after assembly, after a relocateable link, and after a final
-link.  Make sure you clearly understand the operations the linker must
-perform during a relocateable link and during a final link.
-
-@item
-Write a howto structure for the relocation.  The howto structure is
-flexible enough to represent any relocation which should be handled by
-setting a contiguous bitfield in the destination to the value of a
-symbol, possibly with an addend, possibly adding the symbol value to the
-value already present in the destination.
-
-@item
-Change the assembler to generate your relocation.  The assembler will
-call @samp{bfd_install_relocation}, so your howto structure has to be
-able to handle that.  You may need to set the @samp{special_function}
-field to handle assembly correctly.  Be careful to ensure that any code
-you write to handle the assembler will also work correctly when doing a
-relocateable link.  For example, see @samp{bfd_elf_generic_reloc}.
-
-@item
-Test the assembler.  Consider the cases of relocation against an
-undefined symbol, a common symbol, a symbol defined in the object file
-in the same section, and a symbol defined in the object file in a
-different section.  These cases may not all be applicable for your
-reloc.
-
-@item
-If your target uses the new linker, which is recommended, add any
-required handling to the target specific relocation function.  In simple
-cases this will just involve a call to @samp{_bfd_final_link_relocate}
-or @samp{_bfd_relocate_contents}, depending upon the definition of the
-relocation and whether the link is relocateable or not.
-
-@item
-Test the linker.  Test the case of a final link.  If the relocation can
-overflow, use a linker script to force an overflow and make sure the
-error is reported correctly.  Test a relocateable link, whether the
-symbol is defined or undefined in the relocateable output.  For both the
-final and relocateable link, test the case when the symbol is a common
-symbol, when the symbol looked like a common symbol but became a defined
-symbol, when the symbol is defined in a different object file, and when
-the symbol is defined in the same object file.
-
-@item
-In order for linking to another object file format, such as S-records,
-to work correctly, @samp{bfd_perform_relocation} has to do the right
-thing for the relocation.  You may need to set the
-@samp{special_function} field to handle this correctly.  Test this by
-doing a link in which the output object file format is S-records.
-
-@item
-Using the linker to generate relocateable output in a different object
-file format is impossible in the general case, so you generally don't
-have to worry about that.  Linking input files of different object file
-formats together is quite unusual, but if you're really dedicated you
-may want to consider testing this case, both when the output object file
-format is the same as your format, and when it is different.
-@end itemize
-
-@node BFD relocation codes
-@subsection BFD relocation codes
-
-BFD has another way of describing relocations besides the howto
-structures described above: the enum @samp{bfd_reloc_code_real_type}.
-
-Every known relocation type can be described as a value in this
-enumeration.  The enumeration contains many target specific relocations,
-but where two or more targets have the same relocation, a single code is
-used.  For example, the single value @samp{BFD_RELOC_32} is used for all
-simple 32 bit relocation types.
-
-The main purpose of this relocation code is to give the assembler some
-mechanism to create @samp{arelent} structures.  In order for the
-assembler to create an @samp{arelent} structure, it has to be able to
-obtain a howto structure.  The function @samp{bfd_reloc_type_lookup},
-which simply calls the target vector entry point
-@samp{reloc_type_lookup}, takes a relocation code and returns a howto
-structure.
-
-The function @samp{bfd_get_reloc_code_name} returns the name of a
-relocation code.  This is mainly used in error messages.
-
-Using both howto structures and relocation codes can be somewhat
-confusing.  There are many processor specific relocation codes.
-However, the relocation is only fully defined by the howto structure.
-The same relocation code will map to different howto structures in
-different object file formats.  For example, the addend handling may be
-different.
-
-Most of the relocation codes are not really general.  The assembler can
-not use them without already understanding what sorts of relocations can
-be used for a particular target.  It might be possible to replace the
-relocation codes with something simpler.
-
-@node BFD relocation future
-@subsection BFD relocation future
-
-Clearly the current BFD relocation support is in bad shape.  A
-wholescale rewrite would be very difficult, because it would require
-thorough testing of every BFD target.  So some sort of incremental
-change is required.
-
-My vague thoughts on this would involve defining a new, clearly defined,
-howto structure.  Some mechanism would be used to determine which type
-of howto structure was being used by a particular format.
-
-The new howto structure would clearly define the relocation behaviour in
-the case of an assembly, a relocateable link, and a final link.  At
-least one special function would be defined as an escape, and it might
-make sense to define more.
-
-One or more generic functions similar to @samp{bfd_perform_relocation}
-would be written to handle the new howto structure.
-
-This should make it possible to write a generic version of the relocate
-section functions used by the new linker.  The target specific code
-would provide some mechanism (a function pointer or an initial
-conversion) to convert target specific relocations into howto
-structures.
-
-Ideally it would be possible to use this generic relocate section
-function for the generic linker as well.  That is, it would replace the
-@samp{bfd_generic_get_relocated_section_contents} function which is
-currently normally used.
-
-For the special case of ELF dynamic linking, more consideration needs to
-be given to writing ELF specific but ELF target generic code to handle
-special relocation types such as GOT and PLT.
-
-@node BFD ELF support
-@section BFD ELF support
-@cindex elf support in bfd
-@cindex bfd elf support
-
-The ELF object file format is defined in two parts: a generic ABI and a
-processor specific supplement.  The ELF support in BFD is split in a
-similar fashion.  The processor specific support is largely kept within
-a single file.  The generic support is provided by several other files.
-The processor specific support provides a set of function pointers and
-constants used by the generic support.
-
-@menu
-* BFD ELF sections and segments::	ELF sections and segments
-* BFD ELF generic support::		BFD ELF generic support
-* BFD ELF processor specific support::	BFD ELF processor specific support
-* BFD ELF core files::			BFD ELF core files
-* BFD ELF future::			BFD ELF future
-@end menu
-
-@node BFD ELF sections and segments
-@subsection ELF sections and segments
-
-The ELF ABI permits a file to have either sections or segments or both.
-Relocateable object files conventionally have only sections.
-Executables conventionally have both.  Core files conventionally have
-only program segments.
-
-ELF sections are similar to sections in other object file formats: they
-have a name, a VMA, file contents, flags, and other miscellaneous
-information.  ELF relocations are stored in sections of a particular
-type; BFD automatically converts these sections into internal relocation
-information.
-
-ELF program segments are intended for fast interpretation by a system
-loader.  They have a type, a VMA, an LMA, file contents, and a couple of
-other fields.  When an ELF executable is run on a Unix system, the
-system loader will examine the program segments to decide how to load
-it.  The loader will ignore the section information.  Loadable program
-segments (type @samp{PT_LOAD}) are directly loaded into memory.  Other
-program segments are interpreted by the loader, and generally provide
-dynamic linking information.
-
-When an ELF file has both program segments and sections, an ELF program
-segment may encompass one or more ELF sections, in the sense that the
-portion of the file which corresponds to the program segment may include
-the portions of the file corresponding to one or more sections.  When
-there is more than one section in a loadable program segment, the
-relative positions of the section contents in the file must correspond
-to the relative positions they should hold when the program segment is
-loaded.  This requirement should be obvious if you consider that the
-system loader will load an entire program segment at a time.
-
-On a system which supports dynamic paging, such as any native Unix
-system, the contents of a loadable program segment must be at the same
-offset in the file as in memory, modulo the memory page size used on the
-system.  This is because the system loader will map the file into memory
-starting at the start of a page.  The system loader can easily remap
-entire pages to the correct load address.  However, if the contents of
-the file were not correctly aligned within the page, the system loader
-would have to shift the contents around within the page, which is too
-expensive.  For example, if the LMA of a loadable program segment is
-@samp{0x40080} and the page size is @samp{0x1000}, then the position of
-the segment contents within the file must equal @samp{0x80} modulo
-@samp{0x1000}.
-
-BFD has only a single set of sections.  It does not provide any generic
-way to examine both sections and segments.  When BFD is used to open an
-object file or executable, the BFD sections will represent ELF sections.
-When BFD is used to open a core file, the BFD sections will represent
-ELF program segments.
-
-When BFD is used to examine an object file or executable, any program
-segments will be read to set the LMA of the sections.  This is because
-ELF sections only have a VMA, while ELF program segments have both a VMA
-and an LMA.  Any program segments will be copied by the
-@samp{copy_private} entry points.  They will be printed by the
-@samp{print_private} entry point.  Otherwise, the program segments are
-ignored.  In particular, programs which use BFD currently have no direct
-access to the program segments.
-
-When BFD is used to create an executable, the program segments will be
-created automatically based on the section information.  This is done in
-the function @samp{assign_file_positions_for_segments} in @file{elf.c}.
-This function has been tweaked many times, and probably still has
-problems that arise in particular cases.
-
-There is a hook which may be used to explicitly define the program
-segments when creating an executable: the @samp{bfd_record_phdr}
-function in @file{bfd.c}.  If this function is called, BFD will not
-create program segments itself, but will only create the program
-segments specified by the caller.  The linker uses this function to
-implement the @samp{PHDRS} linker script command.
-
-@node BFD ELF generic support
-@subsection BFD ELF generic support
-
-In general, functions which do not read external data from the ELF file
-are found in @file{elf.c}.  They operate on the internal forms of the
-ELF structures, which are defined in @file{include/elf/internal.h}.  The
-internal structures are defined in terms of @samp{bfd_vma}, and so may
-be used for both 32 bit and 64 bit ELF targets.
-
-The file @file{elfcode.h} contains functions which operate on the
-external data.  @file{elfcode.h} is compiled twice, once via
-@file{elf32.c} with @samp{ARCH_SIZE} defined as @samp{32}, and once via
-@file{elf64.c} with @samp{ARCH_SIZE} defined as @samp{64}.
-@file{elfcode.h} includes functions to swap the ELF structures in and
-out of external form, as well as a few more complex functions.
-
-Linker support is found in @file{elflink.c} and @file{elflink.h}.  The
-latter file is compiled twice, for both 32 and 64 bit support.  The
-linker support is only used if the processor specific file defines
-@samp{elf_backend_relocate_section}, which is required to relocate the
-section contents.  If that macro is not defined, the generic linker code
-is used, and relocations are handled via @samp{bfd_perform_relocation}.
-
-The core file support is in @file{elfcore.h}, which is compiled twice,
-for both 32 and 64 bit support.  The more interesting cases of core file
-support only work on a native system which has the @file{sys/procfs.h}
-header file.  Without that file, the core file support does little more
-than read the ELF program segments as BFD sections.
-
-The BFD internal header file @file{elf-bfd.h} is used for communication
-among these files and the processor specific files.
-
-The default entries for the BFD ELF target vector are found mainly in
-@file{elf.c}.  Some functions are found in @file{elfcode.h}.
-
-The processor specific files may override particular entries in the
-target vector, but most do not, with one exception: the
-@samp{bfd_reloc_type_lookup} entry point is always processor specific.
-
-@node BFD ELF processor specific support
-@subsection BFD ELF processor specific support
-
-By convention, the processor specific support for a particular processor
-will be found in @file{elf@var{nn}-@var{cpu}.c}, where @var{nn} is
-either 32 or 64, and @var{cpu} is the name of the processor.
-
-@menu
-* BFD ELF processor required::	Required processor specific support
-* BFD ELF processor linker::	Processor specific linker support
-* BFD ELF processor other::	Other processor specific support options
-@end menu
-
-@node BFD ELF processor required
-@subsubsection Required processor specific support
-
-When writing a @file{elf@var{nn}-@var{cpu}.c} file, you must do the
-following:
-
-@itemize @bullet
-@item
-Define either @samp{TARGET_BIG_SYM} or @samp{TARGET_LITTLE_SYM}, or
-both, to a unique C name to use for the target vector.  This name should
-appear in the list of target vectors in @file{targets.c}, and will also
-have to appear in @file{config.bfd} and @file{configure.in}.  Define
-@samp{TARGET_BIG_SYM} for a big-endian processor,
-@samp{TARGET_LITTLE_SYM} for a little-endian processor, and define both
-for a bi-endian processor.
-@item
-Define either @samp{TARGET_BIG_NAME} or @samp{TARGET_LITTLE_NAME}, or
-both, to a string used as the name of the target vector.  This is the
-name which a user of the BFD tool would use to specify the object file
-format.  It would normally appear in a linker emulation parameters
-file.
-@item
-Define @samp{ELF_ARCH} to the BFD architecture (an element of the
-@samp{bfd_architecture} enum, typically @samp{bfd_arch_@var{cpu}}).
-@item
-Define @samp{ELF_MACHINE_CODE} to the magic number which should appear
-in the @samp{e_machine} field of the ELF header.  As of this writing,
-these magic numbers are assigned by SCO; if you want to get a magic
-number for a particular processor, try sending a note to
-@email{registry@@sco.com}.  In the BFD sources, the magic numbers are
-found in @file{include/elf/common.h}; they have names beginning with
-@samp{EM_}.
-@item
-Define @samp{ELF_MAXPAGESIZE} to the maximum size of a virtual page in
-memory.  This can normally be found at the start of chapter 5 in the
-processor specific supplement.  For a processor which will only be used
-in an embedded system, or which has no memory management hardware, this
-can simply be @samp{1}.
-@item
-If the format should use @samp{Rel} rather than @samp{Rela} relocations,
-define @samp{USE_REL}.  This is normally defined in chapter 4 of the
-processor specific supplement.
-
-In the absence of a supplement, it's easier to work with @samp{Rela}
-relocations.  @samp{Rela} relocations will require more space in object
-files (but not in executables, except when using dynamic linking).
-However, this is outweighed by the simplicity of addend handling when
-using @samp{Rela} relocations.  With @samp{Rel} relocations, the addend
-must be stored in the section contents, which makes relocateable links
-more complex.
-
-For example, consider C code like @code{i = a[1000];} where @samp{a} is
-a global array.  The instructions which load the value of @samp{a[1000]}
-will most likely use a relocation which refers to the symbol
-representing @samp{a}, with an addend that gives the offset from the
-start of @samp{a} to element @samp{1000}.  When using @samp{Rel}
-relocations, that addend must be stored in the instructions themselves.
-If you are adding support for a RISC chip which uses two or more
-instructions to load an address, then the addend may not fit in a single
-instruction, and will have to be somehow split among the instructions.
-This makes linking awkward, particularly when doing a relocateable link
-in which the addend may have to be updated.  It can be done---the MIPS
-ELF support does it---but it should be avoided when possible.
-
-It is possible, though somewhat awkward, to support both @samp{Rel} and
-@samp{Rela} relocations for a single target; @file{elf64-mips.c} does it
-by overriding the relocation reading and writing routines.
-@item
-Define howto structures for all the relocation types.
-@item
-Define a @samp{bfd_reloc_type_lookup} routine.  This must be named
-@samp{bfd_elf@var{nn}_bfd_reloc_type_lookup}, and may be either a
-function or a macro.  It must translate a BFD relocation code into a
-howto structure.  This is normally a table lookup or a simple switch.
-@item
-If using @samp{Rel} relocations, define @samp{elf_info_to_howto_rel}.
-If using @samp{Rela} relocations, define @samp{elf_info_to_howto}.
-Either way, this is a macro defined as the name of a function which
-takes an @samp{arelent} and a @samp{Rel} or @samp{Rela} structure, and
-sets the @samp{howto} field of the @samp{arelent} based on the
-@samp{Rel} or @samp{Rela} structure.  This is normally uses
-@samp{ELF@var{nn}_R_TYPE} to get the ELF relocation type and uses it as
-an index into a table of howto structures.
-@end itemize
-
-You must also add the magic number for this processor to the
-@samp{prep_headers} function in @file{elf.c}.
-
-You must also create a header file in the @file{include/elf} directory
-called @file{@var{cpu}.h}.  This file should define any target specific 
-information which may be needed outside of the BFD code.  In particular
-it should use the @samp{START_RELOC_NUMBERS}, @samp{RELOC_NUMBER},
-@samp{FAKE_RELOC}, @samp{EMPTY_RELOC} and @samp{END_RELOC_NUMBERS}
-macros to create a table mapping the number used to indentify a
-relocation to a name describing that relocation.
-
-@node BFD ELF processor linker
-@subsubsection Processor specific linker support
-
-The linker will be much more efficient if you define a relocate section
-function.  This will permit BFD to use the ELF specific linker support.
-
-If you do not define a relocate section function, BFD must use the
-generic linker support, which requires converting all symbols and
-relocations into BFD @samp{asymbol} and @samp{arelent} structures.  In
-this case, relocations will be handled by calling
-@samp{bfd_perform_relocation}, which will use the howto structures you
-have defined.  @xref{BFD relocation handling}.
-
-In order to support linking into a different object file format, such as
-S-records, @samp{bfd_perform_relocation} must work correctly with your
-howto structures, so you can't skip that step.  However, if you define
-the relocate section function, then in the normal case of linking into
-an ELF file the linker will not need to convert symbols and relocations,
-and will be much more efficient.
-
-To use a relocation section function, define the macro
-@samp{elf_backend_relocate_section} as the name of a function which will
-take the contents of a section, as well as relocation, symbol, and other
-information, and modify the section contents according to the relocation
-information.  In simple cases, this is little more than a loop over the
-relocations which computes the value of each relocation and calls
-@samp{_bfd_final_link_relocate}.  The function must check for a
-relocateable link, and in that case normally needs to do nothing other
-than adjust the addend for relocations against a section symbol.
-
-The complex cases generally have to do with dynamic linker support.  GOT
-and PLT relocations must be handled specially, and the linker normally
-arranges to set up the GOT and PLT sections while handling relocations.
-When generating a shared library, random relocations must normally be
-copied into the shared library, or converted to RELATIVE relocations
-when possible.
-
-@node BFD ELF processor other
-@subsubsection Other processor specific support options
-
-There are many other macros which may be defined in
-@file{elf@var{nn}-@var{cpu}.c}.  These macros may be found in
-@file{elfxx-target.h}.
-
-Macros may be used to override some of the generic ELF target vector
-functions.
-
-Several processor specific hook functions which may be defined as
-macros.  These functions are found as function pointers in the
-@samp{elf_backend_data} structure defined in @file{elf-bfd.h}.  In
-general, a hook function is set by defining a macro
-@samp{elf_backend_@var{name}}.
-
-There are a few processor specific constants which may also be defined.
-These are again found in the @samp{elf_backend_data} structure.
-
-I will not define the various functions and constants here; see the
-comments in @file{elf-bfd.h}.
-
-Normally any odd characteristic of a particular ELF processor is handled
-via a hook function.  For example, the special @samp{SHN_MIPS_SCOMMON}
-section number found in MIPS ELF is handled via the hooks
-@samp{section_from_bfd_section}, @samp{symbol_processing},
-@samp{add_symbol_hook}, and @samp{output_symbol_hook}.
-
-Dynamic linking support, which involves processor specific relocations
-requiring special handling, is also implemented via hook functions.
-
-@node BFD ELF core files
-@subsection BFD ELF core files
-@cindex elf core files
-
-On native ELF Unix systems, core files are generated without any
-sections.  Instead, they only have program segments.
-
-When BFD is used to read an ELF core file, the BFD sections will
-actually represent program segments.  Since ELF program segments do not
-have names, BFD will invent names like @samp{segment@var{n}} where
-@var{n} is a number.
-
-A single ELF program segment may include both an initialized part and an
-uninitialized part.  The size of the initialized part is given by the
-@samp{p_filesz} field.  The total size of the segment is given by the
-@samp{p_memsz} field.  If @samp{p_memsz} is larger than @samp{p_filesz},
-then the extra space is uninitialized, or, more precisely, initialized
-to zero.
-
-BFD will represent such a program segment as two different sections.
-The first, named @samp{segment@var{n}a}, will represent the initialized
-part of the program segment.  The second, named @samp{segment@var{n}b},
-will represent the uninitialized part.
-
-ELF core files store special information such as register values in
-program segments with the type @samp{PT_NOTE}.  BFD will attempt to
-interpret the information in these segments, and will create additional
-sections holding the information.  Some of this interpretation requires
-information found in the host header file @file{sys/procfs.h}, and so
-will only work when BFD is built on a native system.
-
-BFD does not currently provide any way to create an ELF core file.  In
-general, BFD does not provide a way to create core files.  The way to
-implement this would be to write @samp{bfd_set_format} and
-@samp{bfd_write_contents} routines for the @samp{bfd_core} type; see
-@ref{BFD target vector format}.
-
-@node BFD ELF future
-@subsection BFD ELF future
-
-The current dynamic linking support has too much code duplication.
-While each processor has particular differences, much of the dynamic
-linking support is quite similar for each processor.  The GOT and PLT
-are handled in fairly similar ways, the details of -Bsymbolic linking
-are generally similar, etc.  This code should be reworked to use more
-generic functions, eliminating the duplication.
-
-Similarly, the relocation handling has too much duplication.  Many of
-the @samp{reloc_type_lookup} and @samp{info_to_howto} functions are
-quite similar.  The relocate section functions are also often quite
-similar, both in the standard linker handling and the dynamic linker
-handling.  Many of the COFF processor specific backends share a single
-relocate section function (@samp{_bfd_coff_generic_relocate_section}),
-and it should be possible to do something like this for the ELF targets
-as well.
-
-The appearance of the processor specific magic number in
-@samp{prep_headers} in @file{elf.c} is somewhat bogus.  It should be
-possible to add support for a new processor without changing the generic
-support.
-
-The processor function hooks and constants are ad hoc and need better
-documentation.
-
-When a linker script uses @samp{SIZEOF_HEADERS}, the ELF backend must
-guess at the number of program segments which will be required, in
-@samp{get_program_header_size}.  This is because the linker calls
-@samp{bfd_sizeof_headers} before it knows all the section addresses and
-sizes.  The ELF backend may later discover, when creating program
-segments, that more program segments are required.  This is currently
-reported as an error in @samp{assign_file_positions_for_segments}.
-
-In practice this makes it difficult to use @samp{SIZEOF_HEADERS} except
-with a carefully defined linker script.  Unfortunately,
-@samp{SIZEOF_HEADERS} is required for fast program loading on a native
-system, since it permits the initial code section to appear on the same
-page as the program segments, saving a page read when the program starts
-running.  Fortunately, native systems permit careful definition of the
-linker script.  Still, ideally it would be possible to use relaxation to
-compute the number of program segments.
-
-@node BFD glossary
-@section BFD glossary
-@cindex glossary for bfd
-@cindex bfd glossary
-
-This is a short glossary of some BFD terms.
-
-@table @asis
-@item a.out
-The a.out object file format.  The original Unix object file format.
-Still used on SunOS, though not Solaris.  Supports only three sections.
-
-@item archive
-A collection of object files produced and manipulated by the @samp{ar}
-program.
-
-@item backend
-The implementation within BFD of a particular object file format.  The
-set of functions which appear in a particular target vector.
-
-@item BFD
-The BFD library itself.  Also, each object file, archive, or exectable
-opened by the BFD library has the type @samp{bfd *}, and is sometimes
-referred to as a bfd.
-
-@item COFF
-The Common Object File Format.  Used on Unix SVR3.  Used by some
-embedded targets, although ELF is normally better.
-
-@item DLL
-A shared library on Windows.
-
-@item dynamic linker
-When a program linked against a shared library is run, the dynamic
-linker will locate the appropriate shared library and arrange to somehow
-include it in the running image.
-
-@item dynamic object
-Another name for an ELF shared library.
-
-@item ECOFF
-The Extended Common Object File Format.  Used on Alpha Digital Unix
-(formerly OSF/1), as well as Ultrix and Irix 4.  A variant of COFF.
-
-@item ELF
-The Executable and Linking Format.  The object file format used on most
-modern Unix systems, including GNU/Linux, Solaris, Irix, and SVR4.  Also
-used on many embedded systems.
-
-@item executable
-A program, with instructions and symbols, and perhaps dynamic linking
-information.  Normally produced by a linker.
-
-@item LMA
-Load Memory Address.  This is the address at which a section will be
-loaded.  Compare with VMA, below.
-
-@item NLM
-NetWare Loadable Module.  Used to describe the format of an object which
-be loaded into NetWare, which is some kind of PC based network server
-program.
-
-@item object file
-A binary file including machine instructions, symbols, and relocation
-information.  Normally produced by an assembler.
-
-@item object file format
-The format of an object file.  Typically object files and executables
-for a particular system are in the same format, although executables
-will not contain any relocation information.
-
-@item PE
-The Portable Executable format.  This is the object file format used for
-Windows (specifically, Win32) object files.  It is based closely on
-COFF, but has a few significant differences.
-
-@item PEI
-The Portable Executable Image format.  This is the object file format
-used for Windows (specifically, Win32) executables.  It is very similar
-to PE, but includes some additional header information.
-
-@item relocations
-Information used by the linker to adjust section contents.  Also called
-relocs.
-
-@item section
-Object files and executable are composed of sections.  Sections have
-optional data and optional relocation information.
-
-@item shared library
-A library of functions which may be used by many executables without
-actually being linked into each executable.  There are several different
-implementations of shared libraries, each having slightly different
-features.
-
-@item symbol
-Each object file and executable may have a list of symbols, often
-referred to as the symbol table.  A symbol is basically a name and an
-address.  There may also be some additional information like the type of
-symbol, although the type of a symbol is normally something simple like
-function or object, and should be confused with the more complex C
-notion of type.  Typically every global function and variable in a C
-program will have an associated symbol.
-
-@item target vector
-A set of functions which implement support for a particular object file
-format.  The @samp{bfd_target} structure.
-
-@item Win32
-The current Windows API, implemented by Windows 95 and later and Windows
-NT 3.51 and later, but not by Windows 3.1.
-
-@item XCOFF
-The eXtended Common Object File Format.  Used on AIX.  A variant of
-COFF, with a completely different symbol table implementation.
-
-@item VMA
-Virtual Memory Address.  This is the address a section will have when
-an executable is run.  Compare with LMA, above.
-@end table
-
-@node Index
-@unnumberedsec Index
-@printindex cp
-
-@contents
-@bye
diff --git a/bfd/doc/bfdsumm.texi b/bfd/doc/bfdsumm.texi
deleted file mode 100644
index 844531aff8c..00000000000
--- a/bfd/doc/bfdsumm.texi
+++ /dev/null
@@ -1,148 +0,0 @@
-@c This summary of BFD is shared by the BFD and LD docs.
-When an object file is opened, BFD subroutines automatically determine
-the format of the input object file.  They then build a descriptor in
-memory with pointers to routines that will be used to access elements of
-the object file's data structures.
-
-As different information from the the object files is required,
-BFD reads from different sections of the file and processes them.
-For example, a very common operation for the linker is processing symbol
-tables.  Each BFD back end provides a routine for converting
-between the object file's representation of symbols and an internal
-canonical format. When the linker asks for the symbol table of an object
-file, it calls through a memory pointer to the routine from the
-relevant BFD back end which reads and converts the table into a canonical
-form.  The linker then operates upon the canonical form. When the link is
-finished and the linker writes the output file's symbol table,
-another BFD back end routine is called to take the newly
-created symbol table and convert it into the chosen output format.
-
-@menu
-* BFD information loss::	Information Loss
-* Canonical format::		The BFD	canonical object-file format 
-@end menu
-
-@node BFD information loss
-@subsection Information Loss
-
-@emph{Information can be lost during output.} The output formats
-supported by BFD do not provide identical facilities, and
-information which can be described in one form has nowhere to go in
-another format. One example of this is alignment information in
-@code{b.out}. There is nowhere in an @code{a.out} format file to store
-alignment information on the contained data, so when a file is linked
-from @code{b.out} and an @code{a.out} image is produced, alignment
-information will not propagate to the output file. (The linker will
-still use the alignment information internally, so the link is performed
-correctly).
-
-Another example is COFF section names. COFF files may contain an
-unlimited number of sections, each one with a textual section name. If
-the target of the link is a format which does not have many sections (e.g.,
-@code{a.out}) or has sections without names (e.g., the Oasys format), the
-link cannot be done simply. You can circumvent this problem by
-describing the desired input-to-output section mapping with the linker command
-language.
-
-@emph{Information can be lost during canonicalization.} The BFD
-internal canonical form of the external formats is not exhaustive; there
-are structures in input formats for which there is no direct
-representation internally.  This means that the BFD back ends
-cannot maintain all possible data richness through the transformation
-between external to internal and back to external formats.
-
-This limitation is only a problem when an application reads one
-format and writes another.  Each BFD back end is responsible for
-maintaining as much data as possible, and the internal BFD
-canonical form has structures which are opaque to the BFD core,
-and exported only to the back ends. When a file is read in one format,
-the canonical form is generated for BFD and the application. At the
-same time, the back end saves away any information which may otherwise
-be lost. If the data is then written back in the same format, the back
-end routine will be able to use the canonical form provided by the
-BFD core as well as the information it prepared earlier.  Since
-there is a great deal of commonality between back ends,
-there is no information lost when
-linking or copying big endian COFF to little endian COFF, or @code{a.out} to
-@code{b.out}.  When a mixture of formats is linked, the information is
-only lost from the files whose format differs from the destination.
-
-@node Canonical format
-@subsection The BFD canonical object-file format
-
-The greatest potential for loss of information occurs when there is the least
-overlap between the information provided by the source format, that
-stored by the canonical format, and that needed by the
-destination format. A brief description of the canonical form may help
-you understand which kinds of data you can count on preserving across
-conversions.
-@cindex BFD canonical format
-@cindex internal object-file format
-
-@table @emph
-@item files
-Information stored on a per-file basis includes target machine
-architecture, particular implementation format type, a demand pageable
-bit, and a write protected bit.  Information like Unix magic numbers is
-not stored here---only the magic numbers' meaning, so a @code{ZMAGIC}
-file would have both the demand pageable bit and the write protected
-text bit set.  The byte order of the target is stored on a per-file
-basis, so that big- and little-endian object files may be used with one
-another.
-
-@item sections
-Each section in the input file contains the name of the section, the
-section's original address in the object file, size and alignment
-information, various flags, and pointers into other BFD data
-structures.
-
-@item symbols
-Each symbol contains a pointer to the information for the object file
-which originally defined it, its name, its value, and various flag
-bits.  When a BFD back end reads in a symbol table, it relocates all
-symbols to make them relative to the base of the section where they were
-defined.  Doing this ensures that each symbol points to its containing
-section.  Each symbol also has a varying amount of hidden private data
-for the BFD back end.  Since the symbol points to the original file, the
-private data format for that symbol is accessible.  @code{ld} can
-operate on a collection of symbols of wildly different formats without
-problems.
-
-Normal global and simple local symbols are maintained on output, so an
-output file (no matter its format) will retain symbols pointing to
-functions and to global, static, and common variables.  Some symbol
-information is not worth retaining; in @code{a.out}, type information is
-stored in the symbol table as long symbol names.  This information would
-be useless to most COFF debuggers; the linker has command line switches
-to allow users to throw it away.
-
-There is one word of type information within the symbol, so if the
-format supports symbol type information within symbols (for example, COFF,
-IEEE, Oasys) and the type is simple enough to fit within one word
-(nearly everything but aggregates), the information will be preserved.
-
-@item relocation level
-Each canonical BFD relocation record contains a pointer to the symbol to
-relocate to, the offset of the data to relocate, the section the data
-is in, and a pointer to a relocation type descriptor. Relocation is
-performed by passing messages through the relocation type
-descriptor and the symbol pointer. Therefore, relocations can be performed
-on output data using a relocation method that is only available in one of the
-input formats. For instance, Oasys provides a byte relocation format.
-A relocation record requesting this relocation type would point
-indirectly to a routine to perform this, so the relocation may be
-performed on a byte being written to a 68k COFF file, even though 68k COFF
-has no such relocation type.
-
-@item line numbers
-Object formats can contain, for debugging purposes, some form of mapping
-between symbols, source line numbers, and addresses in the output file.
-These addresses have to be relocated along with the symbol information.
-Each symbol with an associated list of line number records points to the
-first record of the list.  The head of a line number list consists of a
-pointer to the symbol, which allows finding out the address of the
-function whose line number is being described. The rest of the list is
-made up of pairs: offsets into the section and line numbers. Any format
-which can simply derive this information can pass it successfully
-between formats (COFF, IEEE and Oasys).
-@end table
diff --git a/bfd/doc/chew.c b/bfd/doc/chew.c
deleted file mode 100644
index eba69c2bb1d..00000000000
--- a/bfd/doc/chew.c
+++ /dev/null
@@ -1,1579 +0,0 @@
-/* chew
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1998
-   Free Software Foundation, Inc.
-   Contributed by steve chamberlain @cygnus
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Yet another way of extracting documentation from source.
-   No, I haven't finished it yet, but I hope you people like it better
-   than the old way
-  
-   sac
-
-   Basically, this is a sort of string forth, maybe we should call it
-   struth?
-
-   You define new words thus:
-   : <newword> <oldwords> ;
-
-*/
-
-/* Primitives provided by the program:
-
-   Two stacks are provided, a string stack and an integer stack.
-
-   Internal state variables:
-	internal_wanted - indicates whether `-i' was passed
-	internal_mode - user-settable
-
-   Commands:
-	push_text
-	! - pop top of integer stack for address, pop next for value; store
-	@ - treat value on integer stack as the address of an integer; push
-		that integer on the integer stack after popping the "address"
-	hello - print "hello\n" to stdout
-	stdout - put stdout marker on TOS
-	stderr - put stderr marker on TOS
-	print - print TOS-1 on TOS (eg: "hello\n" stdout print)
-	skip_past_newline
-	catstr - fn icatstr
-	copy_past_newline - append input, up to and including newline into TOS
-	dup - fn other_dup
-	drop - discard TOS
-	idrop - ditto
-	remchar - delete last character from TOS
-	get_stuff_in_command
-	do_fancy_stuff - translate <<foo>> to @code{foo} in TOS
-	bulletize - if "o" lines found, prepend @itemize @bullet to TOS
-		and @item to each "o" line; append @end itemize
-	courierize - put @example around . and | lines, translate {* *} { }
-	exit - fn chew_exit
-	swap
-	outputdots - strip out lines without leading dots
-	paramstuff - convert full declaration into "PARAMS" form if not already
-	maybecatstr - do catstr if internal_mode == internal_wanted, discard
-		value in any case
-	translatecomments - turn {* and *} into comment delimiters
-	kill_bogus_lines - get rid of extra newlines
-	indent
-	internalmode - pop from integer stack, set `internalmode' to that value
-	print_stack_level - print current stack depth to stderr
-	strip_trailing_newlines - go ahead, guess...
-	[quoted string] - push string onto string stack
-	[word starting with digit] - push atol(str) onto integer stack
-
-   A command must be all upper-case, and alone on a line.
-
-   Foo.  */
-
-
-#include <ansidecl.h>
-#include "sysdep.h"
-#include <assert.h>
-#include <stdio.h>
-#include <ctype.h>
-
-#define DEF_SIZE 5000
-#define STACK 50
-
-int internal_wanted;
-int internal_mode;
-
-int warning;
-
-/* Here is a string type ... */
-
-typedef struct buffer 
-{
-  char *ptr;
-  unsigned long write_idx;
-  unsigned long size;
-} string_type;
-
-
-#ifdef __STDC__
-static void init_string_with_size (string_type *, unsigned int);
-static void init_string (string_type *);
-static int find (string_type *, char *);
-static void write_buffer (string_type *, FILE *);
-static void delete_string (string_type *);
-static char *addr (string_type *, unsigned int);
-static char at (string_type *, unsigned int);
-static void catchar (string_type *, int);
-static void overwrite_string (string_type *, string_type *);
-static void catbuf (string_type *, char *, unsigned int);
-static void cattext (string_type *, char *);
-static void catstr (string_type *, string_type *);
-#endif
-
-
-static void DEFUN(init_string_with_size,(buffer, size),
-	   string_type *buffer AND
-	   unsigned int size )
-{
-    buffer->write_idx = 0;
-    buffer->size = size;
-    buffer->ptr = malloc(size);
-}
-
-static void DEFUN(init_string,(buffer),
-	   string_type *buffer)
-{
-    init_string_with_size(buffer, DEF_SIZE);
-
-}
-
-static int DEFUN(find, (str, what),
-	  string_type *str AND
-	  char *what)
-{
-    unsigned int i;
-    char *p;
-    p = what;
-    for (i = 0; i < str->write_idx && *p; i++) 
-    {
-	if (*p == str->ptr[i])
-	 p++;
-	else
-	 p = what;
-    }
-    return (*p == 0);
-    
-}
-
-static void DEFUN(write_buffer,(buffer, f),
-	   string_type *buffer AND
-	   FILE *f)
-{
-    fwrite(buffer->ptr, buffer->write_idx, 1, f);
-}
-
-
-static void DEFUN(delete_string,(buffer),
-	   string_type *buffer)
-{
-    free(buffer->ptr);
-}
-
-
-static char *DEFUN(addr, (buffer, idx),
-	    string_type *buffer AND
-	    unsigned int idx)
-{
-    return buffer->ptr + idx;
-}
-
-static char DEFUN(at,(buffer, pos),
-	   string_type *buffer AND
-	   unsigned int pos) 
-{
-  if (pos >= buffer->write_idx) 
-    return 0;
-  return buffer->ptr[pos];
-}
-
-static void DEFUN(catchar,(buffer, ch), 
-	   string_type *buffer AND
-	   int ch)
-{
-  if (buffer->write_idx == buffer->size) 
-    {
-      buffer->size *=2;
-      buffer->ptr = realloc(buffer->ptr, buffer->size);
-    }
-
-  buffer->ptr[buffer->write_idx ++ ] = ch;
-}
-
-
-static void DEFUN(overwrite_string,(dst,   src),
-	   string_type *dst AND
-	   string_type *src)
-{
-    free(dst->ptr);
-    dst->size = src->size;
-    dst->write_idx = src->write_idx;
-    dst->ptr = src->ptr;
-}
-
-static void DEFUN(catbuf,(buffer, buf, len),
-	   string_type *buffer AND
-	   char *buf AND
-	   unsigned int len)
-{
-  if (buffer->write_idx + len >= buffer->size)
-    {
-      while (buffer->write_idx + len >= buffer->size)
-	buffer->size *= 2;
-      buffer->ptr = realloc (buffer->ptr, buffer->size);
-    }
-  memcpy (buffer->ptr + buffer->write_idx, buf, len);
-  buffer->write_idx += len;
-}
-
-static void DEFUN(cattext,(buffer, string),
-	   string_type *buffer AND
-	   char *string)
-{
-  catbuf (buffer, string, (unsigned int) strlen (string));
-}
-
-static void DEFUN(catstr,(dst, src),
-	   string_type *dst AND
-	   string_type *src)
-{
-  catbuf (dst, src->ptr, src->write_idx);
-}
-
-
-static unsigned int 
-DEFUN(skip_white_and_stars,(src, idx),
-      string_type *src AND
-      unsigned int idx)
-{
-  char c;
-  while ((c = at(src,idx)),
-	 isspace ((unsigned char) c)
-	 || (c == '*'
-	     /* Don't skip past end-of-comment or star as first
-		character on its line.  */
-	     && at(src,idx +1) != '/'
-	     && at(src,idx -1) != '\n')) 
-    idx++;
-  return idx;
-}
-
-/***********************************************************************/
-
-
-string_type stack[STACK];
-string_type *tos;
-
-unsigned int idx = 0; /* Pos in input buffer */
-string_type *ptr; /* and the buffer */
-typedef void (*stinst_type)();
-stinst_type *pc;
-stinst_type sstack[STACK];
-stinst_type *ssp = &sstack[0];
-long istack[STACK];
-long *isp = &istack[0];
-
-typedef int *word_type;
-
-
-
-struct dict_struct
-{
-    char *word;
-    struct dict_struct *next;
-    stinst_type *code;
-    int code_length;
-    int code_end;
-    int var;
-    
-};
-typedef struct dict_struct dict_type;
-#define WORD(x) static void x()
-
-static void
-die (msg)
-     char *msg;
-{
-  fprintf (stderr, "%s\n", msg);
-  exit (1);
-}
-
-static void
-check_range ()
-{
-  if (tos < stack)
-    die ("underflow in string stack");
-  if (tos >= stack + STACK)
-    die ("overflow in string stack");
-}
-
-static void
-icheck_range ()
-{
-  if (isp < istack)
-    die ("underflow in integer stack");
-  if (isp >= istack + STACK)
-    die ("overflow in integer stack");
-}
-
-#ifdef __STDC__
-static void exec (dict_type *);
-static void call (void);
-static void remchar (void), strip_trailing_newlines (void), push_number (void);
-static void push_text (void);
-static void remove_noncomments (string_type *, string_type *);
-static void print_stack_level (void);
-static void paramstuff (void), translatecomments (void);
-static void outputdots (void), courierize (void), bulletize (void);
-static void do_fancy_stuff (void);
-static int iscommand (string_type *, unsigned int);
-static int copy_past_newline (string_type *, unsigned int, string_type *);
-static void icopy_past_newline (void), kill_bogus_lines (void), indent (void);
-static void get_stuff_in_command (void), swap (void), other_dup (void);
-static void drop (void), idrop (void);
-static void icatstr (void), skip_past_newline (void), internalmode (void);
-static void maybecatstr (void);
-static char *nextword (char *, char **);
-dict_type *lookup_word (char *);
-static void perform (void);
-dict_type *newentry (char *);
-unsigned int add_to_definition (dict_type *, stinst_type);
-void add_intrinsic (char *, void (*)());
-void add_var (char *);
-void compile (char *);
-static void bang (void);
-static void atsign (void);
-static void hello (void);
-static void stdout_ (void);
-static void stderr_ (void);
-static void print (void);
-static void read_in (string_type *, FILE *);
-static void usage (void);
-static void chew_exit (void);
-#endif
-
-static void DEFUN(exec,(word),
-		  dict_type *word)
-{
-  pc = word->code;
-  while (*pc) 
-    (*pc)();
-}
-WORD(call)
-{
-    stinst_type *oldpc = pc;
-    dict_type *e;
-    e =  (dict_type *)(pc [1]);
-    exec(e);
-    pc = oldpc + 2;
-    
-}
-
-WORD(remchar)
-{
-  if (tos->write_idx)
-    tos->write_idx--;    
-  pc++;
-}
-
-static void
-strip_trailing_newlines ()
-{
-  while ((isspace ((unsigned char) at (tos, tos->write_idx - 1))
-	  || at (tos, tos->write_idx - 1) == '\n')
-	 && tos->write_idx > 0)
-    tos->write_idx--;
-  pc++;
-}
-
-WORD(push_number)
-{
-    isp++;
-    icheck_range ();
-    pc++;
-    *isp = (long)(*pc);
-    pc++;
-}
-
-WORD(push_text)
-{
-    tos++;
-    check_range ();
-    init_string(tos);
-    pc++;
-    cattext(tos,*((char **)pc));
-    pc++;
-    
-}
-
-
-/* This function removes everything not inside comments starting on
-   the first char of the line from the  string, also when copying
-   comments, removes blank space and leading *'s.
-   Blank lines are turned into one blank line.  */
-
-static void 
-DEFUN(remove_noncomments,(src,dst),
-	   string_type *src AND
-	   string_type *dst)
-{
-    unsigned int idx = 0;
-    
-    while (at(src,idx)) 
-    {
-	/* Now see if we have a comment at the start of the line */
-	if (at(src,idx) == '\n' 
-	    && at(src,idx+1) ==  '/' 
-	    && at(src,idx+2) == '*') 
-	{
-	    idx+=3;
-	    
-	    idx = skip_white_and_stars(src,idx);
-
-	    /* Remove leading dot */
-	    if (at(src, idx) == '.')
-	     idx++;
-	    
-	    /* Copy to the end of the line, or till the end of the
-	       comment */
-	    while (at(src, idx))
-	    {
-		if (at(src, idx) == '\n') 
-		{
-		    /* end of line, echo and scrape of leading blanks  */
-		    if (at(src,idx +1) == '\n')
-		     catchar(dst,'\n');
-		    catchar(dst,'\n');
-		    idx++;
-		    idx =   skip_white_and_stars(src, idx);
-		}
-		else if (at(src, idx) == '*' && at(src,idx+1) == '/') 
-		{
-		    idx +=2 ;
-		    cattext(dst,"\nENDDD\n");
-		    break;
-		}
-		else 
-		{
-		    catchar(dst, at(src, idx));
-		    idx++;
-		}
-	    }
-	}
-	else idx++;
-    }
-}
-
-static void
-print_stack_level ()
-{
-  fprintf (stderr, "current string stack depth = %d, ", tos - stack);
-  fprintf (stderr, "current integer stack depth = %d\n", isp - istack);
-  pc++;
-}
-
-/* turn:
-     foobar name(stuff);
-   into:
-     foobar
-     name PARAMS ((stuff));
-   and a blank line.
- */
-
-static void
-DEFUN_VOID(paramstuff)
-{
-    unsigned int openp;
-    unsigned int fname;
-    unsigned int idx;
-    string_type out;
-    init_string(&out);
-    
-
-    /* make sure that it's not already param'd or proto'd */
-    if(find(tos,"PARAMS") || find(tos,"PROTO") || !find(tos,"(")) {
-	    catstr(&out,tos);
-	}
-    else 
-    {
-	/* Find the open paren */
-	for (openp = 0; at(tos, openp) != '('  && at(tos,openp); openp++)
-	 ;
-
-	fname = openp;
-	/* Step back to the fname */
-	fname--;
-	while (fname && isspace((unsigned char) at(tos, fname)))
-	 fname --;
-	while (fname
-	       && !isspace((unsigned char) at(tos,fname))
-	       && at(tos,fname) != '*')
-	 fname--;
-
-	fname++;
-	
-	for (idx = 0; idx < fname; idx++) 	/* Output type */
-	{
-	    catchar(&out, at(tos,idx));
-	}
-    
-        cattext(&out, "\n");	/* Insert a newline between type and fnname */
-
-	for (idx = fname; idx < openp; idx++) 		/* Output fnname */
-	{
-	    catchar(&out, at(tos,idx));
-	}
-
-	cattext(&out," PARAMS (");
-
-	while (at(tos,idx) && at(tos,idx) !=';') 
-	{
-	    catchar(&out, at(tos, idx));
-	    idx++;
-	}
-	cattext(&out,");\n\n");
-    }
-    overwrite_string(tos, &out);    
-    pc++;
-    
-}
-
-
-
-/* turn {*
-   and *} into comments */
-
-WORD(translatecomments)
-{
-    unsigned int idx = 0;
-    string_type out;
-    init_string(&out);
-    
-    while (at(tos, idx)) 
-    {
-	if (at(tos,idx) == '{' && at(tos,idx+1) =='*') 
-	{
-	    cattext(&out,"/*");
-	    idx+=2;
-	}
-	else if (at(tos,idx) == '*' && at(tos,idx+1) =='}') 
-	{
-	    cattext(&out,"*/");
-	    idx+=2;
-	}
-	else  
-	{
-	    catchar(&out, at(tos, idx));
-	    idx++;
-	}
-    }
-
-
-    overwrite_string(tos, &out);
-    
-    pc++;
-    
-}
-
-#if 0
-
-/* This is not currently used.  */
-
-/* turn everything not starting with a . into a comment */
-
-WORD(manglecomments)
-{
-    unsigned int idx = 0;
-    string_type out;
-    init_string(&out);
-    
-    while (at(tos, idx)) 
-    {
-	if (at(tos,idx) == '\n' && at(tos,idx+1) =='*') 
-	{
-	    cattext(&out,"	/*");
-	    idx+=2;
-	}
-	else if (at(tos,idx) == '*' && at(tos,idx+1) =='}') 
-	{
-	    cattext(&out,"*/");
-	    idx+=2;
-	}
-	else  
-	{
-	    catchar(&out, at(tos, idx));
-	    idx++;
-	}
-    }
-
-
-    overwrite_string(tos, &out);
-    
-    pc++;
-    
-}
-
-#endif
-
-/* Mod tos so that only lines with leading dots remain */
-static void
-DEFUN_VOID(outputdots)
-{
-    unsigned int idx = 0;
-    string_type out;
-    init_string(&out);
-    
-    while (at(tos, idx)) 
-    {
-	if (at(tos, idx) == '\n' && at(tos, idx+1) == '.') 
-	{
-	  char c;
-	  idx += 2;
-	    
-	    while ((c = at(tos, idx)) && c != '\n')
-	    {
-	      if (c == '{' && at(tos,idx+1) =='*') 
-		{
-		    cattext(&out," /*");
-		    idx+=2;
-		}
-	      else if (c == '*' && at(tos,idx+1) =='}') 
-		{
-		    cattext(&out,"*/");
-		    idx+=2;
-		}
-	      else
-		{
-		    catchar(&out, c);
-		    idx++;
-		}
-	    }
-	    catchar(&out,'\n');
-	}
-	else 
-	{
-	    idx++;
-	}
-    }	
-
-    overwrite_string(tos, &out);
-    pc++;
-    
-}
-
-/* Find lines starting with . and | and put example around them on tos */
-WORD(courierize)
-{
-    string_type out;
-    unsigned int idx = 0;
-    int command = 0;
-    
-    init_string(&out);
-    
-    while (at(tos, idx)) 
-    {
-	if (at(tos, idx) == '\n' 
-	    && (at(tos, idx +1 ) == '.'
-		|| at(tos,idx+1) == '|')) 
-	{
-	    cattext(&out,"\n@example\n");
-	    do 
-	    {
-		idx += 2;
-		
-		while (at(tos, idx) && at(tos, idx)!='\n')
-		{
-		    if (at(tos,idx)=='{' && at(tos,idx+1) =='*') 
-		    {
-			cattext(&out," /*");
-			idx+=2;
-		    }
-		    else if (at(tos,idx)=='*' && at(tos,idx+1) =='}') 
-		    {
-			cattext(&out,"*/");
-			idx+=2;
-		    }
-	            else if (at(tos,idx) == '{' && !command)
-		    {
-			cattext(&out,"@{");
-			idx++;
-		    }
-	            else if (at(tos,idx) == '}' && !command)
-		    {
-			cattext(&out,"@}");
-			idx++;
-		    }
-		    else 
-		    {
-			if (at(tos,idx) == '@')
-			    command = 1;
-			else if (isspace((unsigned char) at(tos,idx))
-				 || at(tos,idx) == '}')
-			    command = 0;
-			catchar(&out, at(tos, idx));
-			idx++;
-		    }
-		    
-		}
-		catchar(&out,'\n');
-	    }  
-	    while (at(tos, idx) == '\n' 
-		   && ((at(tos, idx+1) == '.')
-		       || (at(tos,idx+1) == '|')))
-	      ;
-	    cattext(&out,"@end example");
-	}
-	else 
-	{    
-	    catchar(&out, at(tos, idx));
-	    idx++;
-	}
-    }    
-
-    overwrite_string(tos, &out);
-    pc++;
-
-    
-}
-
-/* Finds any lines starting with "o ", if there are any, then turns
-   on @itemize @bullet, and @items each of them. Then ends with @end
-   itemize, inplace at TOS*/
-
-
-WORD(bulletize)
-{
-    unsigned int idx = 0;
-    int on = 0;
-    string_type out;
-    init_string(&out);
-    
-    while (at(tos, idx)) {
-	if (at(tos, idx) == '@' &&
-	    at(tos, idx+1) == '*') 
-	{
-	  cattext(&out,"*");
-	  idx+=2;
-	}
-	
-	else
-	    if (at(tos, idx) == '\n' &&
-		at(tos, idx+1) == 'o' &&
-		isspace((unsigned char) at(tos, idx +2)))
-	    {
-		if (!on) 
-		{
-		    cattext(&out,"\n@itemize @bullet\n");
-		    on = 1;
-		    
-		}
-		cattext(&out,"\n@item\n");
-		idx+=3;
-	    }
-	    else 
-	    {
-		catchar(&out, at(tos, idx));
-		if (on && at(tos, idx) == '\n' &&
-		    at(tos, idx+1) == '\n' &&
-		    at(tos, idx+2) != 'o')
-		{
-		    cattext(&out, "@end itemize");
-		    on = 0;
-		}
-		idx++;
-		
-	    }
-	}
-    if (on) 
-    {
-	cattext(&out,"@end itemize\n");
-    }	
-
-    delete_string(tos);
-    *tos = out;
-    pc++;
-    
-}
-
-/* Turn <<foo>> into @code{foo} in place at TOS*/
-   
-
-WORD(do_fancy_stuff)
-{
-    unsigned int idx = 0;
-    string_type out;
-    init_string(&out);
-    while (at(tos, idx)) 
-    {
-	if (at(tos, idx) == '<' 
-	    && at(tos, idx+1) == '<'
-	    && !isspace((unsigned char) at(tos,idx + 2))) 
-	{
-	    /* This qualifies as a << startup */
-	    idx +=2;
-	    cattext(&out,"@code{");
-	    while(at(tos,idx) &&
-		  at(tos,idx) != '>' )
-	    {
-		catchar(&out, at(tos, idx));
-		idx++;
-		
-	    }
-	    cattext(&out,"}");
-	    idx+=2;
-	}
-	else 
-	{
-	    catchar(&out, at(tos, idx));
-	    idx++;
-	}
-    }
-    delete_string(tos);
-    *tos = out;
-    pc++;
-    
-}
-/* A command is all upper case,and alone on a line */
-static int 
-DEFUN( iscommand,(ptr, idx),
-      string_type *ptr AND
-      unsigned int idx)
-{
-    unsigned int len = 0;
-    while (at(ptr,idx)) {
-	    if (isupper((unsigned char) at(ptr,idx)) || at(ptr,idx) == ' ' ||
-		at(ptr,idx) == '_') 
-	    {
-	     len++;
-	     idx++;
-	 }
-	    else if(at(ptr,idx) == '\n')
-	    {
-		if (len > 3) return 1;
-		return 0;
-	    }
-	    else return 0;
-	}
-    return 0;
-
-}
-
-
-static int
-DEFUN(copy_past_newline,(ptr, idx, dst),
-      string_type *ptr AND
-      unsigned int idx AND
-      string_type *dst)
-{
-    int column = 0;
-
-    while (at(ptr, idx) && at(ptr, idx) != '\n') 
-    {
-	if (at (ptr, idx) == '\t')
-	  {
-	    /* Expand tabs.  Neither makeinfo nor TeX can cope well with
-	       them.  */
-	    do
-	      catchar (dst, ' ');
-	    while (++column & 7);
-	  }
-	else
-	  {
-	    catchar(dst, at(ptr, idx));
-	    column++;
-	  }
-	idx++;
-	
-    }    
-    catchar(dst, at(ptr, idx));
-    idx++;
-    return idx;
-
-}
-
-WORD(icopy_past_newline)
-{
-    tos++;
-    check_range ();
-    init_string(tos);
-    idx = copy_past_newline(ptr, idx, tos);
-    pc++;	
-}
-
-/* indent
-   Take the string at the top of the stack, do some prettying */
-
-
-WORD(kill_bogus_lines)
-{
-    int sl ;
-    
-    int idx = 0;
-    int c;
-    int dot = 0    ;
-    
-    string_type out;    
-    init_string(&out);
-    /* Drop leading nl */
-    while (at(tos,idx) == '\n')
-    {
-	idx++;
-    }
-    c = idx;
-    
-    /* If the first char is a '.' prepend a newline so that it is
-       recognized properly later.  */
-    if (at (tos, idx) == '.')
-      catchar (&out, '\n');
-
-    /* Find the last char */
-    while (at(tos,idx))
-    {
-	idx++;
-    }
-    
-    /* find the last non white before the nl */
-    idx--;
-    
-    while (idx && isspace((unsigned char) at(tos,idx)))
-     idx--;
-    idx++;
-    
-    /* Copy buffer upto last char, but blank lines before and after
-       dots don't count */
-    sl = 1;
-
-    while (c < idx)
-    {
-	if (at(tos,c) == '\n' 
-	    && at(tos,c+1) == '\n'
-	    && at(tos,c+2) == '.') 
-	{
-	    /* Ignore two newlines before a dot*/
-	    c++;
-	}
-	else if (at(tos,c) == '.' && sl)
-	{
-	    /* remember that this line started with a dot */
-	    dot=2;
-	}
-	else if (at(tos,c) == '\n' 
-		 && at(tos,c+1) == '\n'
-		 && dot)
-	{
-	    c++;
-	    /* Ignore two newlines when last line was dot */
-	}
-
-	catchar(&out, at(tos,c));
-	if (at(tos,c) == '\n')
-	{
-	    sl = 1;
-	    
-	    if (dot == 2)dot=1;else dot = 0;
-	}
-	else
-	  sl = 0;
-	
-	c++;	
-
-    }
-    
-    /* Append nl*/
-    catchar(&out, '\n');
-    pc++;
-    delete_string(tos);
-    *tos = out;
-    
-    
-}
-
-WORD(indent)
-{
-    string_type out;
-    int tab = 0;
-    int idx = 0;
-    int ol =0;
-    init_string(&out);
-    while (at(tos,idx)) {
-	    switch (at(tos,idx)) 
-	    {
-	      case '\n':
-		cattext(&out,"\n");
-		idx++;
-		if (tab && at(tos,idx))
-		{
-		    cattext(&out,"    ");
-		}
-		ol = 0;
-		break;
-	      case '(':
-		tab++;
-		if (ol == 0)
-		    cattext(&out,"   ");
-		idx++;
-		cattext(&out,"(");
-		ol = 1;
-		break;
-	      case ')':
-		tab--;
-		cattext(&out,")");
-		idx++;
-		ol=1;
-		
-		break;
-	      default:
-		catchar(&out,at(tos,idx));
-		ol=1;
-		
-		idx++;
-		break;
-	    }
-	}	
-
-    pc++;
-    delete_string(tos);
-    *tos = out;
-
-}
-
-
-WORD(get_stuff_in_command)
-{
-    tos++;
-    check_range ();
-    init_string(tos);
-
-    while (at(ptr, idx)) {
-	    if (iscommand(ptr, idx))  break;
-	    idx =   copy_past_newline(ptr, idx, tos);
-	}
-    pc++;    
-}
-
-WORD(swap)
-{
-    string_type t;
-    
-    t = tos[0];
-    tos[0] = tos[-1];
-    tos[-1] =t; 
-    pc++;
-    
-}
-
-WORD(other_dup)
-{
-    tos++;
-    check_range ();
-    init_string(tos);
-    catstr(tos, tos-1);
-    pc++;
-}
-
-WORD(drop)
-{
-  tos--;
-  check_range ();
-  pc++;
-}
-
-WORD(idrop)
-{
-  isp--;
-  icheck_range ();
-  pc++;
-}
-
-WORD(icatstr)
-{
-    tos--;
-    check_range ();
-    catstr(tos, tos+1);
-    delete_string(tos+1);
-    pc++;
-}
-
-WORD(skip_past_newline)
-{
-    while (at(ptr,idx) 
-	   && at(ptr,idx) != '\n')
-     idx++;
-    idx++;
-    pc++;
-}
-
-
-WORD(internalmode)
-{
-    internal_mode = *(isp);
-    isp--;
-    icheck_range ();
-    pc++;
-}
-
-WORD(maybecatstr)
-{
-    if (internal_wanted == internal_mode) 
-    {
-	catstr(tos-1, tos);
-    }
-    delete_string(tos);
-    tos--;
-    check_range ();
-    pc++;
-}
-
-char *
-DEFUN(nextword,(string, word),
-      char *string AND
-      char **word)
-{
-    char *word_start;
-    int idx;
-    char *dst;
-    char *src;
-    
-    int length = 0;
-    
-    while (isspace((unsigned char) *string) || *string == '-') {
-	    if (*string == '-') 
-	    {
-		while (*string && *string != '\n') 
-		 string++;
-		
-	    }
-	    else {
-		    string++;
-		}
-	}
-    if (!*string) return 0;
-    
-    word_start = string;
-    if (*string == '"') 
-      {
-	do
-	  {
-	    string++;
-	    length++;
-	    if (*string == '\\')
-	      {
-		string += 2;
-		length += 2;
-	      }
-	  }
-	while (*string != '"');
-      }
-    else     
-      {
-	while (!isspace((unsigned char) *string)) 
-	{
-	    string++;
-	    length++;
-	
-	}
-    }
-    
-    *word = malloc(length + 1);
-
-    dst = *word;
-    src = word_start;
-
-
-    for (idx= 0; idx < length; idx++) 
-      {
-	if (src[idx] == '\\')
-	  switch (src[idx+1])
-	    {
-	    case 'n':
-	      *dst++ = '\n';
-	      idx++;
-	      break;
-	    case '"':
-	    case '\\':
-	      *dst++ = src[idx+1];
-	      idx++;
-	      break;
-	    default:
-	      *dst++ = '\\';
-	      break;
-	    }
-	else
-	  *dst++ = src[idx];
-    }
-    *dst++ = 0;
-
-
-
-
-
-    if(*string)    
-     return string + 1;
-    else 
-     return 0;
-    
-}
-dict_type *root;
-dict_type *
-DEFUN(lookup_word,(word),
-      char *word)
-{
-  dict_type *ptr = root;
-  while (ptr) {
-      if (strcmp(ptr->word, word) == 0) return ptr;
-      ptr = ptr->next;
-	    
-    }
-  if (warning)
-   fprintf(stderr,"Can't find %s\n",word);
-  return 0;
-    
-    
-}
-
-static void DEFUN_VOID(perform)
-{
-  tos = stack;
-    
-  while (at(ptr, idx)) {
-      /* It's worth looking through the command list */
-      if (iscommand(ptr, idx))
-      {
-	char *next;
-	dict_type *word ;
-		
-	(void)		nextword(addr(ptr, idx), &next);
-
-
-	word = lookup_word(next);
-
-
-		
-
-	if (word) 
-	{
-	  exec(word);
-	}
-	else
-	{
-	  if (warning)
-	   fprintf(stderr,"warning, %s is not recognised\n",  next);
-	  skip_past_newline();
-	}
-		
-      }
-      else skip_past_newline();
-
-    }
-}
-
-dict_type *
-DEFUN(newentry,(word),
-      char *word)
-{
-    dict_type *new = (dict_type *)malloc(sizeof(dict_type));
-    new->word = word;
-    new->next = root;
-    root = new;
-    new->code = (stinst_type *)malloc(sizeof(stinst_type ));
-    new->code_length = 1;
-    new->code_end = 0;
-    return new;
-    
-}
-
-
-unsigned int
-DEFUN(add_to_definition,(entry, word), 
-      dict_type *entry AND
-      stinst_type word)
-{
-    if (entry->code_end == entry->code_length) 
-    {
-	entry->code_length += 2;
-	entry->code =
-	 (stinst_type *) realloc((char *)(entry->code),
-			       entry->code_length *sizeof(word_type));
-    }
-    entry->code[entry->code_end] = word;
-    
-return     entry->code_end++;  
-}
-
-
-
-
-
-
-
-void
-DEFUN(add_intrinsic,(name, func),
-      char *name AND
-      void (*func)())
-{
-    dict_type *new = newentry(name);
-    add_to_definition(new, func);
-    add_to_definition(new, 0);
-}
-
-void
-DEFUN(add_var,(name),
-      char *name)
-{
-    dict_type *new = newentry(name);
-    add_to_definition(new, push_number);
-    add_to_definition(new, (stinst_type)(&(new->var)));
-    add_to_definition(new,0);
-}
-
-
-void 
-DEFUN(compile, (string), 
-      char *string)
-{
-    /* add words to the dictionary */
-    char *word;
-    string = nextword(string, &word);
-    while (string && *string && word[0]) 
-    {
-	if (strcmp(word,"var")==0) 
-	{
- string=nextword(string, &word);
-	  
-	  add_var(word);
- string=nextword(string, &word);
-	}
-else	
-	    
-	if (word[0] == ':')
-	{
-	    dict_type *ptr;
-	    /* Compile a word and add to dictionary */
-	    string = nextword(string, &word);
-	    
-	    ptr = newentry(word);
-	    string = nextword(string, &word);
-	    while (word[0] != ';' ) 
-	    {
-		 switch (word[0]) 
-		 {
-		   case '"':
-		     /* got a string, embed magic push string
-			function */
-		     add_to_definition(ptr, push_text);
-		     add_to_definition(ptr, (stinst_type)(word+1));
-		     break;
-		   case '0':
-		   case '1':
-		   case '2':
-		   case '3':
-		   case '4':
-		   case '5':
-		   case '6':
-		   case '7':
-		   case '8':
-		   case '9':
-		     /* Got a number, embedd the magic push number
-			function */
-		     add_to_definition(ptr, push_number);
-		     add_to_definition(ptr, (stinst_type)atol(word));
-		     break;
-		   default:
-		     add_to_definition(ptr, call);
-		     add_to_definition(ptr, (stinst_type)lookup_word(word));
-		 }
-
-		string = nextword(string, &word);		     
-	    }
-	    add_to_definition(ptr,0);
-	    string = nextword(string, &word);
-	}
-	else 
-	{
-	    fprintf(stderr,"syntax error at %s\n",string-1);
-	}	    
-    }
-
-}
-
- 
-static void DEFUN_VOID(bang)
-{
-  *(long *)((isp[0])) = isp[-1];
-  isp-=2;
-  icheck_range ();
-  pc++;
-}
-
-WORD(atsign)
-{
-    isp[0] = *(long *)(isp[0]);
-    pc++;
-}
-
-WORD(hello)
-{
-  printf("hello\n");
-  pc++;    
-}
-
-WORD(stdout_)
-{
-  isp++;
-  icheck_range ();
-  *isp = 1;
-  pc++;
-}
-
-WORD(stderr_)
-{
-  isp++;
-  icheck_range ();
-  *isp = 2;
-  pc++;
-}
-
-WORD(print)
-{
-  if (*isp == 1)
-    write_buffer (tos, stdout);
-  else if (*isp == 2)
-    write_buffer (tos, stderr);
-  else
-    fprintf (stderr, "print: illegal print destination `%ld'\n", *isp);
-  isp--;
-  tos--;
-  icheck_range ();
-  check_range ();
-  pc++;
-}
-
-
-static void DEFUN(read_in, (str, file), 
-	   string_type *str AND
-		  FILE *file)
-{
-    char buff[10000];    
-    unsigned int r;
-    do 
-    {
-	r = fread(buff, 1, sizeof(buff), file);
-	catbuf(str, buff, r);
-    }
-    while (r);
-    buff[0] = 0;
-    
-    catbuf(str, buff,1);
-}
-
-
-static void DEFUN_VOID(usage)
-{
-    fprintf(stderr,"usage: -[d|i|g] <file >file\n");
-    exit(33);    
-}
-
-/* There is no reliable way to declare exit.  Sometimes it returns
-   int, and sometimes it returns void.  Sometimes it changes between
-   OS releases.  Trying to get it declared correctly in the hosts file
-   is a pointless waste of time.  */
-
-static void
-chew_exit ()
-{
-  exit (0);
-}
-
-int DEFUN(main,(ac,av),
-int ac AND
-char *av[])
-{
-  unsigned int i;
-  string_type buffer;
-  string_type pptr;
-
-  init_string(&buffer);
-  init_string(&pptr);
-  init_string(stack+0);
-  tos=stack+1;
-  ptr = &pptr;
-    
-  add_intrinsic("push_text", push_text);
-  add_intrinsic("!", bang);
-  add_intrinsic("@", atsign);
-  add_intrinsic("hello",hello);    
-  add_intrinsic("stdout",stdout_);    
-  add_intrinsic("stderr",stderr_);    
-  add_intrinsic("print",print);    
-  add_intrinsic("skip_past_newline", skip_past_newline );
-  add_intrinsic("catstr", icatstr );
-  add_intrinsic("copy_past_newline", icopy_past_newline );
-  add_intrinsic("dup", other_dup );
-  add_intrinsic("drop", drop);
-  add_intrinsic("idrop", idrop);
-  add_intrinsic("remchar", remchar );
-  add_intrinsic("get_stuff_in_command", get_stuff_in_command );
-  add_intrinsic("do_fancy_stuff", do_fancy_stuff );
-  add_intrinsic("bulletize", bulletize );
-  add_intrinsic("courierize", courierize );
-  /* If the following line gives an error, exit() is not declared in the
-     ../hosts/foo.h file for this host.  Fix it there, not here!  */
-  /* No, don't fix it anywhere; see comment on chew_exit--Ian Taylor.  */
-  add_intrinsic("exit", chew_exit );
-  add_intrinsic("swap", swap );
-  add_intrinsic("outputdots", outputdots );
-  add_intrinsic("paramstuff", paramstuff );
-  add_intrinsic("maybecatstr", maybecatstr );
-  add_intrinsic("translatecomments", translatecomments );
-  add_intrinsic("kill_bogus_lines", kill_bogus_lines);
-  add_intrinsic("indent", indent);
-  add_intrinsic("internalmode", internalmode);
-  add_intrinsic("print_stack_level", print_stack_level);
-  add_intrinsic("strip_trailing_newlines", strip_trailing_newlines);
-    
-  /* Put a nl at the start */
-  catchar(&buffer,'\n');
-
-  read_in(&buffer, stdin); 
-  remove_noncomments(&buffer, ptr);
-  for (i= 1; i < (unsigned int) ac; i++) 
-  {
-    if (av[i][0] == '-')
-    {
-      if (av[i][1] == 'f')
-      {
-	string_type b;
-	FILE *f;
-	init_string(&b);
-
-	f  = fopen(av[i+1],"r");
-	if (!f) 
-	{
-	  fprintf(stderr,"Can't open the input file %s\n",av[i+1]);
-	  return 33;
-	}
-
-	read_in(&b, f);
-	compile(b.ptr);
-	perform();	
-      }
-      else if (av[i][1] == 'i') 
-      {
-	internal_wanted = 1;
-      }
-      else if (av[i][1] == 'w') 
-      {
-	warning = 1;
-      }
-      else
-	usage ();
-    }
-  }      
-  write_buffer(stack+0, stdout);
-  if (tos != stack)
-    {
-      fprintf (stderr, "finishing with current stack level %d\n", tos - stack);
-      return 1;
-    }
-  return 0;
-}
diff --git a/bfd/doc/doc.str b/bfd/doc/doc.str
deleted file mode 100644
index 7a276fe59e6..00000000000
--- a/bfd/doc/doc.str
+++ /dev/null
@@ -1,158 +0,0 @@
-: DOCDD
-	skip_past_newline
-	get_stuff_in_command kill_bogus_lines catstr
-	;
-
-: ENDDD
-	skip_past_newline
-	;
-
-: EXAMPLE
-	skip_past_newline	
-	get_stuff_in_command kill_bogus_lines do_fancy_stuff translatecomments 
-	courierize catstr
-
-	;
-
-: INODE 
-	"@node " catstr skip_past_newline copy_past_newline catstr 
-	;
-
-: CODE_FRAGMENT
-	EXAMPLE 
-	;
-
-: COMMENT
-	skip_past_newline
-	get_stuff_in_command
-	drop
-	;
-
-: SYNOPSIS
-	skip_past_newline
-	"@strong{Synopsis}\n" catstr
-	"@example\n" catstr
-	get_stuff_in_command  
-	kill_bogus_lines
-	indent
-	catstr
-	"@end example\n" catstr
-
-	;
-
-: func
-	"@findex "	- a
-	skip_past_newline
-	copy_past_newline
-	dup		- a x x 
-	"@subsubsection @code{" - a x x b 
-	swap
-	remchar
-	"}\n" - a x b x c
-	catstr 	catstr 	catstr 	catstr 	catstr 
-	;
-
-: FUNCTION
-	"@findex "	- a
-	skip_past_newline
-	copy_past_newline
-	dup		- a x x 
-	"@subsubsection @code{" - a x x b 
-	swap
-	remchar
-	"}\n" - a x b x c
-	catstr 	catstr 	catstr 	catstr 	catstr 
-	;
-
-: bodytext
-	get_stuff_in_command 
-	bulletize
-	kill_bogus_lines
-	do_fancy_stuff
-	courierize
-	catstr
-	"\n" catstr
-	;
-
-: asection
-	skip_past_newline
-	catstr
-	copy_past_newline 	
-	do_fancy_stuff catstr 	
-	bodytext	
-	;
-
-: SECTION 
-	"@section " asection  ;
-
-: SUBSECTION
-	"@subsection " asection  ;
-
-: SUBSUBSECTION
-	"@subsubsection " asection  ;
-
-: subhead
-	skip_past_newline
-	bodytext
-	;
-
-
-
-	
-: DESCRIPTION 
-	"@strong{Description}@*\n" catstr subhead ;
-
-: RETURNS
-	"@strong{Returns}@*\n" catstr subhead ;
-
-: INTERNAL_FUNCTION
-	func ;
-
-
-: INTERNAL_DEFINITION 
-	func ;
-
-
-: INTERNAL
-	func ;
-
-: TYPEDEF
-	FUNCTION ;
-
-: SENUM
-	skip_past_newline
-	"Here are the possible values for @code{enum "
-	copy_past_newline remchar catstr
-	"}:\n\n" catstr catstr
-	;
-: ENUM
-	skip_past_newline
-	"@deffn {} "
-	copy_past_newline catstr catstr
-	;
-: ENUMX
-	skip_past_newline
-	"@deffnx {} "
-	copy_past_newline catstr
-	catstr
-	;
-: ENUMEQ
-	skip_past_newline
-	"@deffn {} "
-	copy_past_newline catstr catstr
-	skip_past_newline
-	;
-: ENUMEQX
-	skip_past_newline
-	"@deffnx {} "
-	copy_past_newline catstr
-	catstr
-	skip_past_newline
-	;
-: ENUMDOC
-	skip_past_newline
-	get_stuff_in_command
-	strip_trailing_newlines
-	catstr
-	"\n@end deffn\n" catstr
-	;
diff --git a/bfd/doc/makefile.vms b/bfd/doc/makefile.vms
deleted file mode 100644
index a0857c0caaf..00000000000
--- a/bfd/doc/makefile.vms
+++ /dev/null
@@ -1,5 +0,0 @@
-CFLAGS = /noopt/include=([],[-],[-.-.include])
-LDFLAGS = /nomap
-LDLIBS = ,sys$$library:vaxcrtl.olb/lib
-
-all: chew.exe
diff --git a/bfd/doc/proto.str b/bfd/doc/proto.str
deleted file mode 100644
index 8431c16bd57..00000000000
--- a/bfd/doc/proto.str
+++ /dev/null
@@ -1,135 +0,0 @@
-
-: SYNOPSIS
-	skip_past_newline
-	get_stuff_in_command	
-	paramstuff
-	indent
-	maybecatstr
-;
-
-: ignore
-	skip_past_newline 
-	get_stuff_in_command
-	outputdots
-	maybecatstr
-	;
-
-: CODE_FRAGMENT
-	ignore ;
-
-: external
-	0 internalmode ignore ;
-
-: internal 
-	1 internalmode ignore ;
-
-- input stack { a b } output b if internal, a if external
-: ifinternal
-	"" swap 1 internalmode maybecatstr
-	swap
-	"" swap 0 internalmode maybecatstr
-	catstr
-	;
-
-- Put note in output string, regardless of internal mode.
-: COMMENT
-	skip_past_newline
-	get_stuff_in_command
-	translatecomments
-	catstr
-	;
-
-- SENUM    enum-type-name
-- ENUM     enum-name
-- ENUMX    addl-enum-name
-- ENUMDOC  doc for preceding enums
-- ENDSENUM max-enum-name
-
-: make_enum_header
-	dup
-	"enum " swap catstr
-	" {\n" catstr
-	swap "  _dummy_first_" swap catstr catstr
-	",\n" catstr
-	;
-: make_string_table_header
-	dup
-	"#ifdef _BFD_MAKE_TABLE_" swap catstr swap
-	"\n\nstatic const char *const " swap catstr catstr
-	"_names[] = { \"@@uninitialized@@\",\n" catstr
-	;
-: SENUM
-	skip_past_newline
-	copy_past_newline
-	remchar
-	dup
-	make_enum_header
-	swap
-	make_string_table_header
-	ifinternal
-	catstr
-	get_stuff_in_command catstr
-	translatecomments ;
-: ENDSENUM
-	skip_past_newline
-	copy_past_newline strip_trailing_newlines
-	dup
-	"  " swap catstr " };\n" catstr	swap
-	" \"@@overflow: " swap catstr "@@\",\n};\n#endif\n\n" catstr
-	ifinternal
-	catstr
-	;
-: make_enumerator
-	"  " swap catstr
-	",\n" catstr
-	;
-: make_enumerator_string
-	"  \"" swap catstr
-	"\",\n" catstr
-	;
-: ENUM
-	skip_past_newline
-	copy_past_newline
-	remchar
-	dup
-	make_enumerator
-	swap
-	make_enumerator_string
-	ifinternal
-	;
-: ENUMX ENUM catstr ;
-: ENUMEQ
-	skip_past_newline
-	"#define "
-	copy_past_newline remchar
-	catstr
-	" "
-	catstr
-	copy_past_newline
-	catstr
-	"" swap 0 internalmode maybecatstr
-	;
-: ENUMEQX ENUMEQ catstr ;
-: ENUMDOC
-	skip_past_newline
-	get_stuff_in_command
-	strip_trailing_newlines
-	"\n{* " swap catstr " *}\n" catstr
-	translatecomments
-	- discard it if we're doing internal mode
-	"" swap 0 internalmode maybecatstr
-	swap
-	catstr catstr
-	;
-: ENDDD external ;
-: SECTION ignore ;
-: SUBSECTION ignore ;
-: SUBSUBSECTION ignore ;
-: INTERNAL_DEFINITION internal ;
-: DESCRIPTION ignore ;
-: FUNCTION external ;
-: RETURNS ignore ;
-: TYPEDEF external ;
-: INTERNAL_FUNCTION internal ;
-: INTERNAL internal ;
-: INODE ignore ;
diff --git a/bfd/dwarf1.c b/bfd/dwarf1.c
deleted file mode 100644
index cbcc26b0035..00000000000
--- a/bfd/dwarf1.c
+++ /dev/null
@@ -1,576 +0,0 @@
-/* DWARF 1 find nearest line (_bfd_dwarf1_find_nearest_line).
-   Copyright 1998 Free Software Foundation, Inc.
-
-Written by Gavin Romig-Koch of Cygnus Solutions (gavin@cygnus.com).  
-
-This file is part of BFD.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libiberty.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/dwarf.h"
-
-/* dwarf1_debug is the starting point for all dwarf1 info. */
-
-struct dwarf1_debug {
-
-  /* The bfd we are working with. */
-  bfd* abfd;
-
-  /* List of already parsed compilation units. */
-  struct dwarf1_unit* lastUnit;
-
-  /* The buffer for the .debug section. 
-     Zero indicates that the .debug section failed to load. */
-  char* debug_section;
-
-  /* Pointer to the end of the .debug_info section memory buffer. */
-  char* debug_section_end;
-
-  /* The buffer for the .line section. */
-  char* line_section;
-
-  /* End of that buffer. */
-  char* line_section_end;
-
-  /* The current or next unread die within the .debug section. */
-  char* currentDie;
-};
-
-/* One dwarf1_unit for each parsed compilation unit die. */
-
-struct dwarf1_unit {
-  /* Linked starting from stash->lastUnit. */
-  struct dwarf1_unit* prev;
-
-  /* Name of the compilation unit. */
-  char* name;
-
-  /* The highest and lowest address used in the compilation unit. */
-  unsigned long low_pc;
-  unsigned long high_pc;
-
-  /* Does this unit have a statement list? */
-  int has_stmt_list;
-
-  /* If any, the offset of the line number table in the .line section. */
-  unsigned long stmt_list_offset;
-
-  /* If non-zero, a pointer to the first child of this unit. */
-  char* first_child;
-
-  /* How many line entries? */
-  unsigned long line_count;
-
-  /* The decoded line number table (line_count entries). */
-  struct linenumber* linenumber_table;
-
-  /* The list of functions in this unit. */
-  struct dwarf1_func* func_list;
-};
-
-
-
-/* One dwarf1_func for each parsed function die.  */
-
-struct dwarf1_func {
-  /* Linked starting from aUnit->func_list. */
-  struct dwarf1_func* prev;
-  
-  /* Name of function. */
-  char* name;
-  
-  /* The highest and lowest address used in the compilation unit. */
-  unsigned long low_pc;
-  unsigned long high_pc;
-};
-
-
-/* Used to return info about a parsed die. */
-struct die_info {
-  unsigned long length;
-  unsigned long sibling;
-  unsigned long low_pc;
-  unsigned long high_pc;
-  unsigned long stmt_list_offset;
-  
-  char* name; 
-  
-  int has_stmt_list;
-
-  unsigned short tag;
-};
-
-
-/* Parsed line number information. */
-struct linenumber {
-  /* First address in the line. */
-  unsigned long addr;
-
-  /* The line number. */
-  unsigned long linenumber;
-};
-
-
-/* Find the form of an attr, from the attr field. */
-#define FORM_FROM_ATTR(attr)	((attr) & 0xF)	/* Implicitly specified */
-
-
-/* Return a newly allocated dwarf1_unit.  It should be cleared and
-   then attached into the 'stash' at 'stash->lastUnit'. */
-
-static struct dwarf1_unit*
-alloc_dwarf1_unit (stash)
-  struct dwarf1_debug* stash;
-{
-  struct dwarf1_unit* x = 
-    (struct dwarf1_unit*) bfd_alloc (stash->abfd, 
-				       sizeof (struct dwarf1_unit));
-  x->prev = stash->lastUnit;
-  stash->lastUnit = x;
-
-  return x;
-}
-
-/* Return a newly allocated dwarf1_func.  It must be cleared and
-   attached into 'aUnit' at 'aUnit->func_list'. */
-
-static struct dwarf1_func*
-alloc_dwarf1_func (stash, aUnit)
-     struct dwarf1_debug* stash;
-     struct dwarf1_unit* aUnit;
-{
-  struct dwarf1_func* x = 
-    (struct dwarf1_func*) bfd_alloc (stash->abfd, 
-				  sizeof (struct dwarf1_func));
-  x->prev = aUnit->func_list;
-  aUnit->func_list = x;
-  
-  return x;
-}
-
-/* parse_die - parse a Dwarf1 die.
-   Parse the die starting at 'aDiePtr' into 'aDieInfo'.
-   'abfd' must be the bfd from which the section that 'aDiePtr'
-   points to was pulled from. 
-
-   Return false if the die is invalidly formatted; true otherwise. */
-
-static boolean
-parse_die (abfd, aDieInfo, aDiePtr)
-     bfd* abfd;
-     struct die_info* aDieInfo;
-     char*            aDiePtr;
-{
-  char* this_die = aDiePtr;
-  char* xptr = this_die;
-
-  memset (aDieInfo,0,sizeof(*aDieInfo));
-
-  /* First comes the length. */
-  aDieInfo->length = bfd_get_32 (abfd, xptr);
-  xptr += 4;
-  if (aDieInfo->length < 6)
-    {
-      /* Just padding bytes. */
-      aDieInfo->tag = TAG_padding;
-      return true;
-    }
-
-  /* Then the tag. */
-  aDieInfo->tag = bfd_get_16 (abfd, xptr);
-  xptr += 2;
-      
-  /* Then the attributes. */
-  while (xptr < (this_die + aDieInfo->length))
-    {
-      unsigned short attr;
-      
-      /* Parse the attribute based on its form.  This section 
-         must handle all dwarf1 forms, but need only handle the
-	 actual attributes that we care about. */
-
-      attr = bfd_get_16 (abfd, xptr);
-      xptr += 2;
-      
-      switch (FORM_FROM_ATTR (attr))
-	{
-	case FORM_DATA2:
-	  xptr += 2;
-	  break;
-	case FORM_DATA4:
-	case FORM_REF:
-	  if (attr == AT_sibling)
-	    aDieInfo->sibling = bfd_get_32 (abfd, xptr);
-	  else if (attr == AT_stmt_list)
-	    {
-	      aDieInfo->stmt_list_offset = bfd_get_32 (abfd, xptr);
-	      aDieInfo->has_stmt_list = 1;
-	    }
-	  xptr += 4;
-	  break;
-	case FORM_DATA8:
-	  xptr += 8;
-	  break;
-	case FORM_ADDR:
-	  if (attr == AT_low_pc)
-	    aDieInfo->low_pc = bfd_get_32 (abfd, xptr);
-	  else if (attr == AT_high_pc)
-	    aDieInfo->high_pc = bfd_get_32 (abfd, xptr);
-	  xptr += 4;
-	  break;
-	case FORM_BLOCK2:
-	  xptr += 2 + bfd_get_16 (abfd, xptr);
-	  break;
-	case FORM_BLOCK4:
-	  xptr += 4 + bfd_get_32 (abfd, xptr);
-	  break;
-	case FORM_STRING:
-	  if (attr == AT_name)
-	    aDieInfo->name = xptr;
-	  xptr += strlen (xptr) + 1;
-	  break;
-	}
-    }
-
-  return true;
-}
-
-/* Parse a dwarf1 line number table for 'aUnit->stmt_list_offset'
-   into 'aUnit->linenumber_table'.  Return false if an error 
-   occurs; true otherwise. */
-  
-static boolean
-parse_line_table (stash, aUnit)
-  struct dwarf1_debug* stash;
-  struct dwarf1_unit* aUnit;
-{
-  char* xptr;
-
-  /* Load the ".line" section from the bfd if we haven't already. */ 
-  if (stash->line_section == 0)
-    {
-      asection *msec;
-      unsigned long size;
-      
-      msec = bfd_get_section_by_name (stash->abfd, ".line");
-      if (! msec)
-	return false;
-	  
-      size = bfd_get_section_size_before_reloc (msec);
-      stash->line_section = (unsigned char*) bfd_alloc (stash->abfd, size);
-      
-      if (! stash->line_section)
-	return false;
-
-      if (! bfd_get_section_contents (stash->abfd, msec, stash->line_section, 0, size))
-	{
-	  stash->line_section = 0;
-	  return false;
-	}
-
-      stash->line_section_end = stash->line_section + size;
-    }
-
-  xptr = stash->line_section + aUnit->stmt_list_offset;
-  if (xptr < stash->line_section_end)
-    {
-      int eachLine;
-
-      char* tblend;
-      unsigned long base;
-
-      /* First comes the length. */
-      tblend = bfd_get_32 (stash->abfd, xptr) + xptr;
-      xptr += 4;
-
-      /* Then the base address for each address in the table. */
-      base = bfd_get_32 (stash->abfd, xptr);
-      xptr += 4;
-
-      /* How many line entrys?
-	 10 = 4 (line number) + 2 (pos in line) + 4 (address in line) */
-      aUnit->line_count = (tblend - xptr) / 10;
-
-      /* Allocate an array for the entries. */
-      aUnit->linenumber_table = (struct linenumber*)
-	bfd_alloc (stash->abfd, 
-		   sizeof (struct linenumber) * aUnit->line_count);
-	
-      for (eachLine = 0; eachLine < aUnit->line_count; eachLine++)
-	{
-	  /* A line number. */
-	  aUnit->linenumber_table[eachLine].linenumber
-	    = bfd_get_32 (stash->abfd, xptr);
-	  xptr += 4;
-
-	  /* Skip the position within the line. */
-	  xptr += 2;
-
-	  /* And finally the address. */
-	  aUnit->linenumber_table[eachLine].addr 
-	    = base + bfd_get_32 (stash->abfd, xptr);
-	  xptr += 4;
-	}
-    }
-
-  return true;
-}
-
-/* Parse each function die in a compilation unit 'aUnit'.
-   The first child die of 'aUnit' should be in 'aUnit->first_child',
-   the result is placed in 'aUnit->func_list'.
-   Return false if error; true otherwise. */
-
-static boolean
-parse_functions_in_unit (stash, aUnit)
-     struct dwarf1_debug* stash;
-     struct dwarf1_unit* aUnit;
-{
-  char* eachDie;
-
-  if (aUnit->first_child)
-    for (eachDie = aUnit->first_child;
-	 eachDie < stash->debug_section_end;
-	 )
-      {
-	struct die_info eachDieInfo;
-	
-	if (! parse_die (stash->abfd, &eachDieInfo, eachDie))
-	  return false;
-	
-	if (eachDieInfo.tag == TAG_global_subroutine
-	    || eachDieInfo.tag == TAG_subroutine
-	    || eachDieInfo.tag == TAG_inlined_subroutine
-	    || eachDieInfo.tag == TAG_entry_point)
-	  {
-	    struct dwarf1_func* aFunc = alloc_dwarf1_func (stash,aUnit);
-	    
-	    aFunc->name = eachDieInfo.name;
-	    aFunc->low_pc = eachDieInfo.low_pc;
-	    aFunc->high_pc = eachDieInfo.high_pc;
-	  }
-	
-	/* Move to next sibling, if none, end loop */
-	if (eachDieInfo.sibling)
-	  eachDie = stash->debug_section + eachDieInfo.sibling;
-	else
-	  break;
-      }
-  
-  return true;
-}
-
-/* Find the nearest line to 'addr' in 'aUnit'.
-   Return whether we found the line (or a function) without error. */
-
-static boolean
-dwarf1_unit_find_nearest_line (stash, aUnit, addr, 
-		       filename_ptr, functionname_ptr,
-		       linenumber_ptr)
-  struct dwarf1_debug* stash;
-  struct dwarf1_unit* aUnit;
-  unsigned long addr;
-  const char **filename_ptr;
-  const char **functionname_ptr;
-  unsigned int *linenumber_ptr;
-{
-  int line_p = false;
-  int func_p = false;
-
-  if (aUnit->low_pc <= addr && addr < aUnit->high_pc)
-    {
-      if (aUnit->has_stmt_list)
-	{
-	  int i;
-	  struct dwarf1_func* eachFunc;
-
-	  if (! aUnit->linenumber_table)
-	    {
-	      if (! parse_line_table (stash, aUnit))
-		return false;
-	    }
-
-	  if (! aUnit->func_list)
-	    {
-	      if (! parse_functions_in_unit (stash, aUnit))
-		return false;
-	    }
-
-	  for (i = 0; i < aUnit->line_count; i++)
-	    {
-	      if (aUnit->linenumber_table[i].addr <= addr
-		  && addr < aUnit->linenumber_table[i+1].addr)
-		{
-		  *filename_ptr = aUnit->name;
-		  *linenumber_ptr = aUnit->linenumber_table[i].linenumber;
-		  line_p = true;
-		  break;
-		}
-	    }
-
-	  for (eachFunc = aUnit->func_list; 
-	       eachFunc; 
-	       eachFunc = eachFunc->prev)
-	    {
-	      if (eachFunc->low_pc <= addr
-		  && addr < eachFunc->high_pc)
-		{
-		  *functionname_ptr = eachFunc->name;
-		  func_p = true;
-		  break;
-		}
-	    }
-	}
-    }
-
-  return line_p || func_p;
-}
-
-
-
-
-/* The DWARF 1 version of find_nearest line.
-   Return true if the line is found without error. */
-
-boolean
-_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
-                              filename_ptr, functionname_ptr, linenumber_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *linenumber_ptr;
-{
-  struct dwarf1_debug *stash = elf_tdata (abfd)->dwarf1_find_line_info;
-
-  struct dwarf1_unit* eachUnit;
-
-  /* What address are we looking for? */
-  bfd_vma addr = offset + section->vma;
-
-  *filename_ptr = NULL;
-  *functionname_ptr = NULL;
-  *linenumber_ptr = 0;
-  
-
-  if (! stash)
-    {
-      asection *msec;
-      unsigned long size;
-      
-      stash = elf_tdata (abfd)->dwarf1_find_line_info =
-	(struct dwarf1_debug*) bfd_zalloc (abfd, sizeof (struct dwarf1_debug));
-      
-      if (! stash)
-	return false;
-      
-      msec = bfd_get_section_by_name (abfd, ".debug");
-      if (! msec)
-	{
-	  /* No dwarf1 info.  Note that at this point the stash
-	     has been allocated, but contains zeros, this lets
-	     future calls to this function fail quicker. */
-	  return false;
-	}
-
-      size = bfd_get_section_size_before_reloc (msec);
-      stash->debug_section = (unsigned char*) bfd_alloc (abfd, size);
-      
-      if (! stash->debug_section)
-	return false;
-
-      if (! bfd_get_section_contents (abfd, msec, stash->debug_section, 0, size))
-	{
-	  stash->debug_section = 0;
-	  return false;
-	}
-
-      stash->debug_section_end = stash->debug_section + size;
-      stash->currentDie = stash->debug_section;
-      stash->abfd = abfd;
-    }
-
-  /* A null debug_section indicates that there was no dwarf1 info
-     or that an error occured while setting up the stash. */
-
-  if (! stash->debug_section)
-    return false;
-  
-
-  /* Look at the previously parsed units to see if any contain
-     the addr. */
-  for (eachUnit = stash->lastUnit; eachUnit; eachUnit = eachUnit->prev)
-    {
-      if (eachUnit->low_pc <= addr && addr < eachUnit->high_pc)
-	return dwarf1_unit_find_nearest_line (stash, eachUnit, addr,
-					      filename_ptr, 
-					      functionname_ptr, 
-					      linenumber_ptr);
-    }
-
-  while (stash->currentDie < stash->debug_section_end)
-    {
-      struct die_info aDieInfo;
-
-      if (! parse_die (stash->abfd, &aDieInfo, stash->currentDie))
-	return false;
-      
-      if (aDieInfo.tag == TAG_compile_unit)
-	{
-	  struct dwarf1_unit* aUnit
-	    = alloc_dwarf1_unit (stash);
-	  
-	  aUnit->name = aDieInfo.name;
-	  aUnit->low_pc = aDieInfo.low_pc;
-	  aUnit->high_pc = aDieInfo.high_pc;
-	  aUnit->has_stmt_list = aDieInfo.has_stmt_list;
-	  aUnit->stmt_list_offset = aDieInfo.stmt_list_offset;
-	  
-	  /* A die has a child if it's followed by a die that is
-	     not it's sibling. */
-	  if (aDieInfo.sibling 
-	      && stash->currentDie + aDieInfo.length 
-                    < stash->debug_section_end
-	      && stash->currentDie + aDieInfo.length 
-	            != stash->debug_section + aDieInfo.sibling)
-	    aUnit->first_child = stash->currentDie + aDieInfo.length;
-	  else
-	    aUnit->first_child = 0;
-
-	  if (aUnit->low_pc <= addr && addr < aUnit->high_pc)
-	    return dwarf1_unit_find_nearest_line (stash, aUnit, addr, 
-						  filename_ptr, 
-						  functionname_ptr, 
-						  linenumber_ptr);
-	}
-      
-      if (aDieInfo.sibling != 0)
-	stash->currentDie = stash->debug_section + aDieInfo.sibling;
-      else
-	stash->currentDie += aDieInfo.length;
-    }
-
-  return false;
-}
-
-
-/* EOF */
diff --git a/bfd/dwarf2.c b/bfd/dwarf2.c
deleted file mode 100644
index 385bf821b6e..00000000000
--- a/bfd/dwarf2.c
+++ /dev/null
@@ -1,1466 +0,0 @@
-/* DWARF 2 support.
-   Copyright 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   Adapted from gdb/dwarf2read.c by Gavin Koch of Cygnus Solutions
-   (gavin@cygnus.com).
-
-   From the dwarf2read.c header:
-   Adapted by Gary Funck (gary@intrepid.com), Intrepid Technology,
-   Inc.  with support from Florida State University (under contract
-   with the Ada Joint Program Office), and Silicon Graphics, Inc.
-   Initial contribution by Brent Benson, Harris Computer Systems, Inc.,
-   based on Fred Fish's (Cygnus Support) implementation of DWARF 1
-   support in dwarfread.c
-
-This file is part of BFD.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or (at
-your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libiberty.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/dwarf2.h"
-
-/* The data in the .debug_line statement prologue looks like this.  */
-struct line_head
-  {
-    unsigned int total_length;
-    unsigned short version;
-    unsigned int prologue_length;
-    unsigned char minimum_instruction_length;
-    unsigned char default_is_stmt;
-    int line_base;
-    unsigned char line_range;
-    unsigned char opcode_base;
-    unsigned char *standard_opcode_lengths;
-  };
-
-/* Attributes have a name and a value */
-struct attribute
-  {
-    enum dwarf_attribute name;
-    enum dwarf_form form;
-    union
-      {
-	char *str;
-	struct dwarf_block *blk;
-	unsigned int unsnd;
-	int snd;
-	bfd_vma addr;
-      }
-    u;
-  };
-
-/* Get at parts of an attribute structure */
-
-#define DW_STRING(attr)    ((attr)->u.str)
-#define DW_UNSND(attr)     ((attr)->u.unsnd)
-#define DW_BLOCK(attr)     ((attr)->u.blk)
-#define DW_SND(attr)       ((attr)->u.snd)
-#define DW_ADDR(attr)	   ((attr)->u.addr)
-
-/* Blocks are a bunch of untyped bytes. */
-struct dwarf_block
-  {
-    unsigned int size;
-    char *data;
-  };
-
-
-struct dwarf2_debug {
-
-  /* A list of all previously read comp_units. */
-  struct comp_unit* all_comp_units;
-
-  /* The next unread compilation unit within the .debug_info section.
-     Zero indicates that the .debug_info section has not been loaded
-     into a buffer yet.*/
-  char* info_ptr;
-
-  /* Pointer to the end of the .debug_info section memory buffer. */
-  char* info_ptr_end;
-
-  /* Pointer to the .debug_abbrev section loaded into memory. */
-  char* dwarf_abbrev_buffer;
-
-  /* Length of the loaded .debug_abbrev section. */
-  unsigned long dwarf_abbrev_size;
-};
-
-
-
-/* A minimal decoding of DWARF2 compilation units.  We only decode
-   what's needed to get to the line number information. */
-
-struct comp_unit {
-
-  /* Chain the previously read compilation units. */
-  struct comp_unit* next_unit;
-
-  /* Keep the bdf convenient (for memory allocation). */
-  bfd* abfd;
-
-  /* The lowest and higest addresses contained in this compilation
-     unit as specified in the compilation unit header. */
-  bfd_vma low;
-  bfd_vma high;
-
-  /* The DW_AT_name attribute (for error messages). */
-  char* name;
-
-  /* The abbrev hash table. */
-  struct abbrev_info** abbrevs;
-
-  /* Note that an error was found by comp_unit_find_nearest_line. */
-  int error;
-
-  /* The DW_AT_comp_dir attribute */
-  char* comp_dir;
-
-  /* True if there is a line number table associated with this comp. unit. */
-  int stmtlist;
-  
-  /* The offset into .debug_line of the line number table. */
-  unsigned long line_offset;
-
-  /* Pointer to the first child die for the comp unit. */
-  char *first_child_die_ptr;
-
-  /* The end of the comp unit. */
-  char *end_ptr;
-
-  /* The decoded line number, NULL if not yet decoded. */
-  struct line_info_table* line_table;
-
-  /* A list of the functions found in this comp. unit. */
-  struct funcinfo* function_table; 
-
-  /* Address size for this unit - from unit header */
-  unsigned char addr_size;
-};
-
-
-
-/* VERBATIM 
-   The following function up to the END VERBATIM mark are 
-   copied directly from dwarf2read.c. */
-
-/* read dwarf information from a buffer */
-
-static unsigned int
-read_1_byte (abfd, buf)
-     bfd *abfd;
-     char *buf;
-{
-  return bfd_get_8 (abfd, (bfd_byte *) buf);
-}
-
-static int
-read_1_signed_byte (abfd, buf)
-     bfd *abfd;
-     char *buf;
-{
-  return bfd_get_signed_8 (abfd, (bfd_byte *) buf);
-}
-
-static unsigned int
-read_2_bytes (abfd, buf)
-     bfd *abfd;
-     char *buf;
-{
-  return bfd_get_16 (abfd, (bfd_byte *) buf);
-}
-
-#if 0
-
-/* This is not used.  */
-
-static int
-read_2_signed_bytes (abfd, buf)
-     bfd *abfd;
-     char *buf;
-{
-  return bfd_get_signed_16 (abfd, (bfd_byte *) buf);
-}
-
-#endif
-
-static unsigned int
-read_4_bytes (abfd, buf)
-     bfd *abfd;
-     char *buf;
-{
-  return bfd_get_32 (abfd, (bfd_byte *) buf);
-}
-
-#if 0
-
-/* This is not used.  */
-
-static int
-read_4_signed_bytes (abfd, buf)
-     bfd *abfd;
-     char *buf;
-{
-  return bfd_get_signed_32 (abfd, (bfd_byte *) buf);
-}
-
-#endif
-
-static unsigned int
-read_8_bytes (abfd, buf)
-     bfd *abfd;
-     char *buf;
-{
-  return bfd_get_64 (abfd, (bfd_byte *) buf);
-}
-
-static char *
-read_n_bytes (abfd, buf, size)
-     bfd * abfd;
-     char *buf;
-     unsigned int size;
-{
-  /* If the size of a host char is 8 bits, we can return a pointer
-     to the buffer, otherwise we have to copy the data to a buffer
-     allocated on the temporary obstack.  */
-  return buf;
-}
-
-static char *
-read_string (abfd, buf, bytes_read_ptr)
-     bfd *abfd;
-     char *buf;
-     unsigned int *bytes_read_ptr;
-{
-  /* If the size of a host char is 8 bits, we can return a pointer
-     to the string, otherwise we have to copy the string to a buffer
-     allocated on the temporary obstack.  */
-  if (*buf == '\0')
-    {
-      *bytes_read_ptr = 1;
-      return NULL;
-    }
-  *bytes_read_ptr = strlen (buf) + 1;
-  return buf;
-}
-
-static unsigned int
-read_unsigned_leb128 (abfd, buf, bytes_read_ptr)
-     bfd *abfd;
-     char *buf;
-     unsigned int *bytes_read_ptr;
-{
-  unsigned int  result;
-  unsigned int  num_read;
-  int           shift;
-  unsigned char byte;
-
-  result   = 0;
-  shift    = 0;
-  num_read = 0;
-  
-  do
-    {
-      byte = bfd_get_8 (abfd, (bfd_byte *) buf);
-      buf ++;
-      num_read ++;
-      result |= ((byte & 0x7f) << shift);
-      shift += 7;
-    }
-  while (byte & 0x80);
-  
-  * bytes_read_ptr = num_read;
-  
-  return result;
-}
-
-static int
-read_signed_leb128 (abfd, buf, bytes_read_ptr)
-     bfd * abfd;
-     char * buf;
-     unsigned int * bytes_read_ptr;
-{
-  int           result;
-  int           shift;
-  int           num_read;
-  unsigned char byte;
-
-  result = 0;
-  shift = 0;
-  num_read = 0;
-
-  do
-    {
-      byte = bfd_get_8 (abfd, (bfd_byte *) buf);
-      buf ++;
-      num_read ++;
-      result |= ((byte & 0x7f) << shift);
-      shift += 7;
-    }
-  while (byte & 0x80);
-  
-  if ((shift < 32) && (byte & 0x40))
-    result |= -(1 << shift);
-
-  * bytes_read_ptr = num_read;
-  
-  return result;
-}
-
-/* END VERBATIM */
-
-static bfd_vma
-read_address (unit, buf)
-     struct comp_unit* unit;
-     char *buf;
-{
-  bfd_vma retval = 0;
-
-  if (unit->addr_size == 4)
-    {
-      retval = bfd_get_32 (unit->abfd, (bfd_byte *) buf);
-    } else {
-      retval = bfd_get_64 (unit->abfd, (bfd_byte *) buf);
-    }
-  return retval;
-}
-
-
-
-
-
-/* This data structure holds the information of an abbrev. */
-struct abbrev_info
-  {
-    unsigned int number;	/* number identifying abbrev */
-    enum dwarf_tag tag;		/* dwarf tag */
-    int has_children;		/* boolean */
-    unsigned int num_attrs;	/* number of attributes */
-    struct attr_abbrev *attrs;	/* an array of attribute descriptions */
-    struct abbrev_info *next;	/* next in chain */
-  };
-
-struct attr_abbrev
-  {
-    enum dwarf_attribute name;
-    enum dwarf_form form;
-  };
-
-#ifndef ABBREV_HASH_SIZE
-#define ABBREV_HASH_SIZE 121
-#endif
-#ifndef ATTR_ALLOC_CHUNK
-#define ATTR_ALLOC_CHUNK 4
-#endif
-
-/* Lookup an abbrev_info structure in the abbrev hash table.  */
-
-static struct abbrev_info *
-lookup_abbrev (number,abbrevs)
-     unsigned int number;
-     struct abbrev_info **abbrevs;
-{
-  unsigned int hash_number;
-  struct abbrev_info *abbrev;
-
-  hash_number = number % ABBREV_HASH_SIZE;
-  abbrev = abbrevs[hash_number];
-
-  while (abbrev)
-    {
-      if (abbrev->number == number)
-	return abbrev;
-      else
-	abbrev = abbrev->next;
-    }
-  return NULL;
-}
-
-/* In DWARF version 2, the description of the debugging information is
-   stored in a separate .debug_abbrev section.  Before we read any
-   dies from a section we read in all abbreviations and install them
-   in a hash table.  */
-
-static struct abbrev_info**
-read_abbrevs (abfd, offset)
-     bfd * abfd;
-     unsigned int offset;
-{
-  struct abbrev_info **abbrevs;
-  char *abbrev_ptr;
-  struct abbrev_info *cur_abbrev;
-  unsigned int abbrev_number, bytes_read, abbrev_name;
-  unsigned int abbrev_form, hash_number;
-  struct dwarf2_debug *stash;
-
-  stash = elf_tdata(abfd)->dwarf2_find_line_info;
-
-  if (! stash->dwarf_abbrev_buffer)
-    {
-      asection *msec;
-
-      msec = bfd_get_section_by_name (abfd, ".debug_abbrev");
-      if (! msec)
-	{
-	  (*_bfd_error_handler) (_("Dwarf Error: Can't find .debug_abbrev section."));
-	  bfd_set_error (bfd_error_bad_value);
-	  return 0;
-	}
-      
-      stash->dwarf_abbrev_size = bfd_get_section_size_before_reloc (msec);
-      stash->dwarf_abbrev_buffer = (unsigned char*) bfd_alloc (abfd, stash->dwarf_abbrev_size);
-      if (! stash->dwarf_abbrev_buffer)
-	  return 0;
-      
-      if (! bfd_get_section_contents (abfd, msec, 
-				      stash->dwarf_abbrev_buffer, 0,
-				      stash->dwarf_abbrev_size))
-	return 0;
-    }
-
-  if (offset > stash->dwarf_abbrev_size)
-    {
-      (*_bfd_error_handler) (_("Dwarf Error: Abbrev offset (%u) bigger than abbrev size (%u)."), 
-			     offset, stash->dwarf_abbrev_size );
-      bfd_set_error (bfd_error_bad_value);
-      return 0;
-    }
-
-  abbrevs = (struct abbrev_info**) bfd_zalloc (abfd, sizeof(struct abbrev_info*) * ABBREV_HASH_SIZE);
-
-  abbrev_ptr = stash->dwarf_abbrev_buffer + offset;
-  abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
-  abbrev_ptr += bytes_read;
-
-  /* loop until we reach an abbrev number of 0 */
-  while (abbrev_number)
-    {
-      cur_abbrev = (struct abbrev_info*)bfd_zalloc (abfd, sizeof (struct abbrev_info));
-
-      /* read in abbrev header */
-      cur_abbrev->number = abbrev_number;
-      cur_abbrev->tag = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
-      abbrev_ptr += bytes_read;
-      cur_abbrev->has_children = read_1_byte (abfd, abbrev_ptr);
-      abbrev_ptr += 1;
-
-      /* now read in declarations */
-      abbrev_name = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
-      abbrev_ptr += bytes_read;
-      abbrev_form = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
-      abbrev_ptr += bytes_read;
-      while (abbrev_name)
-	{
-	  if ((cur_abbrev->num_attrs % ATTR_ALLOC_CHUNK) == 0)
-	    {
-	      cur_abbrev->attrs = (struct attr_abbrev *)
-		bfd_realloc (cur_abbrev->attrs,
-			     (cur_abbrev->num_attrs + ATTR_ALLOC_CHUNK)
-			     * sizeof (struct attr_abbrev));
-	      if (! cur_abbrev->attrs)
-		return 0;
-	    }
-	  cur_abbrev->attrs[cur_abbrev->num_attrs].name = abbrev_name;
-	  cur_abbrev->attrs[cur_abbrev->num_attrs++].form = abbrev_form;
-	  abbrev_name = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
-	  abbrev_ptr += bytes_read;
-	  abbrev_form = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
-	  abbrev_ptr += bytes_read;
-	}
-
-      hash_number = abbrev_number % ABBREV_HASH_SIZE;
-      cur_abbrev->next = abbrevs[hash_number];
-      abbrevs[hash_number] = cur_abbrev;
-
-      /* Get next abbreviation.
-         Under Irix6 the abbreviations for a compilation unit are not
-	 always properly terminated with an abbrev number of 0.
-	 Exit loop if we encounter an abbreviation which we have
-	 already read (which means we are about to read the abbreviations
-	 for the next compile unit) or if the end of the abbreviation
-	 table is reached.  */
-      if ((unsigned int) (abbrev_ptr - stash->dwarf_abbrev_buffer)
-	    >= stash->dwarf_abbrev_size)
-	break;
-      abbrev_number = read_unsigned_leb128 (abfd, abbrev_ptr, &bytes_read);
-      abbrev_ptr += bytes_read;
-      if (lookup_abbrev (abbrev_number,abbrevs) != NULL)
-	break;
-    }
-
-  return abbrevs;
-}
-
-/* Read an attribute described by an abbreviated attribute.  */
-
-static char *
-read_attribute (attr, abbrev, unit, info_ptr)
-     struct attribute   *attr;
-     struct attr_abbrev *abbrev;
-     struct comp_unit   *unit;
-     char               *info_ptr;
-{
-  bfd *abfd = unit->abfd;
-  unsigned int bytes_read;
-  struct dwarf_block *blk;
-
-  attr->name = abbrev->name;
-  attr->form = abbrev->form;
-  switch (abbrev->form)
-    {
-    case DW_FORM_addr:
-    case DW_FORM_ref_addr:
-      DW_ADDR (attr) = read_address (unit, info_ptr);
-      info_ptr += unit->addr_size;
-      break;
-    case DW_FORM_block2:
-      blk = (struct dwarf_block *) bfd_alloc (abfd, sizeof (struct dwarf_block));
-      blk->size = read_2_bytes (abfd, info_ptr);
-      info_ptr += 2;
-      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
-      info_ptr += blk->size;
-      DW_BLOCK (attr) = blk;
-      break;
-    case DW_FORM_block4:
-      blk = (struct dwarf_block *) bfd_alloc (abfd, sizeof (struct dwarf_block));
-      blk->size = read_4_bytes (abfd, info_ptr);
-      info_ptr += 4;
-      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
-      info_ptr += blk->size;
-      DW_BLOCK (attr) = blk;
-      break;
-    case DW_FORM_data2:
-      DW_UNSND (attr) = read_2_bytes (abfd, info_ptr);
-      info_ptr += 2;
-      break;
-    case DW_FORM_data4:
-      DW_UNSND (attr) = read_4_bytes (abfd, info_ptr);
-      info_ptr += 4;
-      break;
-    case DW_FORM_data8:
-      DW_UNSND (attr) = read_8_bytes (abfd, info_ptr);
-      info_ptr += 8;
-      break;
-    case DW_FORM_string:
-      DW_STRING (attr) = read_string (abfd, info_ptr, &bytes_read);
-      info_ptr += bytes_read;
-      break;
-    case DW_FORM_block:
-      blk = (struct dwarf_block *) bfd_alloc (abfd, sizeof (struct dwarf_block));
-      blk->size = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
-      info_ptr += bytes_read;
-      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
-      info_ptr += blk->size;
-      DW_BLOCK (attr) = blk;
-      break;
-    case DW_FORM_block1:
-      blk = (struct dwarf_block *) bfd_alloc (abfd, sizeof (struct dwarf_block));
-      blk->size = read_1_byte (abfd, info_ptr);
-      info_ptr += 1;
-      blk->data = read_n_bytes (abfd, info_ptr, blk->size);
-      info_ptr += blk->size;
-      DW_BLOCK (attr) = blk;
-      break;
-    case DW_FORM_data1:
-      DW_UNSND (attr) = read_1_byte (abfd, info_ptr);
-      info_ptr += 1;
-      break;
-    case DW_FORM_flag:
-      DW_UNSND (attr) = read_1_byte (abfd, info_ptr);
-      info_ptr += 1;
-      break;
-    case DW_FORM_sdata:
-      DW_SND (attr) = read_signed_leb128 (abfd, info_ptr, &bytes_read);
-      info_ptr += bytes_read;
-      break;
-    case DW_FORM_udata:
-      DW_UNSND (attr) = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
-      info_ptr += bytes_read;
-      break;
-    case DW_FORM_ref1:
-      DW_UNSND (attr) = read_1_byte (abfd, info_ptr);
-      info_ptr += 1;
-      break;
-    case DW_FORM_ref2:
-      DW_UNSND (attr) = read_2_bytes (abfd, info_ptr);
-      info_ptr += 2;
-      break;
-    case DW_FORM_ref4:
-      DW_UNSND (attr) = read_4_bytes (abfd, info_ptr);
-      info_ptr += 4;
-      break;
-    case DW_FORM_ref_udata:
-      DW_UNSND (attr) = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
-      info_ptr += bytes_read;
-      break;
-    case DW_FORM_strp:
-    case DW_FORM_indirect:
-    default:
-      (*_bfd_error_handler) (_("Dwarf Error: Invalid or unhandled FORM value: %d."),
-			     abbrev->form);
-      bfd_set_error (bfd_error_bad_value);
-    }
-  return info_ptr;
-}
-
-
-/* Source line information table routines. */
-
-#define FILE_ALLOC_CHUNK 5
-#define DIR_ALLOC_CHUNK 5
-
-struct line_info {
-  struct line_info* prev_line;
-
-  bfd_vma address;
-  char* filename;
-  unsigned int line;
-  unsigned int column;
-};
-
-struct fileinfo {
-  char *name;
-  unsigned int dir;
-  unsigned int time;
-  unsigned int size;
-};
-
-struct line_info_table {
-  bfd* abfd;
-
-  unsigned int num_files;
-  unsigned int num_dirs;
-
-  char* comp_dir;
-  char** dirs;
-  struct fileinfo* files;
-  struct line_info* last_line;
-};
-
-static void 
-add_line_info (table, address, filename, line, column)
-     struct line_info_table* table;
-     bfd_vma address;
-     char* filename;
-     unsigned int line;
-     unsigned int column;
-{
-  struct line_info* info = (struct line_info*)
-    bfd_alloc (table->abfd, sizeof (struct line_info));
-
-  info->prev_line = table->last_line;
-  table->last_line = info;
-
-  info->address = address;
-  info->filename = filename;
-  info->line = line;
-  info->column = column;
-}
-
-static char* 
-concat_filename (table, file)
-     struct line_info_table* table;
-     unsigned int file;
-{
-  char* filename = table->files[file - 1].name;
-  if (*filename == '/')
-    return filename;
-
-  else
-    {
-      char* dirname = (table->files[file - 1].dir
-		       ? table->dirs[table->files[file - 1].dir - 1]
-		       : table->comp_dir);
-      return (char*) concat (dirname, "/", filename, NULL);
-    }
-}
-
-/* Decode the line number information for UNIT. */
-
-static struct line_info_table*
-decode_line_info (unit)
-     struct comp_unit *unit;
-{
-  bfd *abfd = unit->abfd;
-
-  static char* dwarf_line_buffer = 0;
-
-  struct line_info_table* table;
-
-  char *line_ptr;
-  char *line_end;
-  struct line_head lh;
-  unsigned int i, bytes_read;
-  char *cur_file, *cur_dir;
-  unsigned char op_code, extended_op, adj_opcode;
-
-  if (! dwarf_line_buffer)
-    {
-      asection *msec;
-      unsigned long size;
-
-      msec = bfd_get_section_by_name (abfd, ".debug_line");
-      if (! msec)
-	{
-	  (*_bfd_error_handler) (_("Dwarf Error: Can't find .debug_line section."));
-	  bfd_set_error (bfd_error_bad_value);
-	  return 0;
-	}
-      
-      size = bfd_get_section_size_before_reloc (msec);
-      dwarf_line_buffer = (unsigned char*) bfd_alloc (abfd, size);
-      if (! dwarf_line_buffer)
-	return 0;
-
-      if (! bfd_get_section_contents (abfd, msec, 
-				      dwarf_line_buffer, 0,
-				      size))
-	return 0;
-
-      /* FIXME: We ought to apply the relocs against this section before
-	 we process it.... */
-    }
-
-  table = (struct line_info_table*) bfd_alloc (abfd, 
-					       sizeof (struct line_info_table));
-  table->abfd = abfd;
-  table->comp_dir = unit->comp_dir;
-
-  table->num_files = 0;
-  table->files = NULL;
-
-  table->num_dirs = 0;
-  table->dirs = NULL;
-
-  line_ptr = dwarf_line_buffer + unit->line_offset;
-
-  /* read in the prologue */
-  lh.total_length = read_4_bytes (abfd, line_ptr);
-  line_ptr += 4;
-  line_end = line_ptr + lh.total_length;
-  lh.version = read_2_bytes (abfd, line_ptr);
-  line_ptr += 2;
-  lh.prologue_length = read_4_bytes (abfd, line_ptr);
-  line_ptr += 4;
-  lh.minimum_instruction_length = read_1_byte (abfd, line_ptr);
-  line_ptr += 1;
-  lh.default_is_stmt = read_1_byte (abfd, line_ptr);
-  line_ptr += 1;
-  lh.line_base = read_1_signed_byte (abfd, line_ptr);
-  line_ptr += 1;
-  lh.line_range = read_1_byte (abfd, line_ptr);
-  line_ptr += 1;
-  lh.opcode_base = read_1_byte (abfd, line_ptr);
-  line_ptr += 1;
-  lh.standard_opcode_lengths = (unsigned char *)
-    bfd_alloc (abfd, lh.opcode_base * sizeof (unsigned char));
-
-  lh.standard_opcode_lengths[0] = 1;
-  for (i = 1; i < lh.opcode_base; ++i)
-    {
-      lh.standard_opcode_lengths[i] = read_1_byte (abfd, line_ptr);
-      line_ptr += 1;
-    }
-
-  /* Read directory table  */
-  while ((cur_dir = read_string (abfd, line_ptr, &bytes_read)) != NULL)
-    {
-      line_ptr += bytes_read;
-      if ((table->num_dirs % DIR_ALLOC_CHUNK) == 0)
-	{
-	  table->dirs = (char **)
-	    bfd_realloc (table->dirs,
-			 (table->num_dirs + DIR_ALLOC_CHUNK) * sizeof (char *));
-	  if (! table->dirs)
-	    return 0;
-	}
-      table->dirs[table->num_dirs++] = cur_dir;
-    }
-  line_ptr += bytes_read;
-
-  /* Read file name table */
-  while ((cur_file = read_string (abfd, line_ptr, &bytes_read)) != NULL)
-    {
-      line_ptr += bytes_read;
-      if ((table->num_files % FILE_ALLOC_CHUNK) == 0)
-	{
-	  table->files = (struct fileinfo *)
-	    bfd_realloc (table->files,
-			 (table->num_files + FILE_ALLOC_CHUNK)
-			 * sizeof (struct fileinfo));
-	  if (! table->files)
-	    return 0;
-	}
-      table->files[table->num_files].name = cur_file;
-      table->files[table->num_files].dir =
-	read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-      line_ptr += bytes_read;
-      table->files[table->num_files].time =
-	read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-      line_ptr += bytes_read;
-      table->files[table->num_files].size =
-	read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-      line_ptr += bytes_read;
-      table->num_files++;
-    }
-  line_ptr += bytes_read;
-
-  /* Read the statement sequences until there's nothing left.  */
-  while (line_ptr < line_end)
-    {
-      /* state machine registers  */
-      bfd_vma address = 0;
-      char* filename = concat_filename (table, 1);
-      unsigned int line = 1;
-      unsigned int column = 0;
-      int is_stmt = lh.default_is_stmt;
-      int basic_block = 0;
-      int end_sequence = 0;
-
-      /* Decode the table. */
-      while (! end_sequence)
-	{
-	  op_code = read_1_byte (abfd, line_ptr);
-	  line_ptr += 1;
-	  switch (op_code)
-	    {
-	    case DW_LNS_extended_op:
-	      line_ptr += 1;	/* ignore length */
-	      extended_op = read_1_byte (abfd, line_ptr);
-	      line_ptr += 1;
-	      switch (extended_op)
-		{
-		case DW_LNE_end_sequence:
-		  end_sequence = 1;
-		  add_line_info (table, address, filename, line, column);
-		  break;
-		case DW_LNE_set_address:
-		  address = read_address (unit, line_ptr);
-		  line_ptr += unit->addr_size;
-		  break;
-		case DW_LNE_define_file:
-		  cur_file = read_string (abfd, line_ptr, &bytes_read);
-		  line_ptr += bytes_read;
-		  if ((table->num_files % FILE_ALLOC_CHUNK) == 0)
-		    {
-		      table->files = (struct fileinfo *)
-			bfd_realloc (table->files,
-				     (table->num_files + FILE_ALLOC_CHUNK)
-				     * sizeof (struct fileinfo));
-		      if (! table->files)
-			return 0;
-		    }
-		  table->files[table->num_files].name = cur_file;
-		  table->files[table->num_files].dir =
-		    read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-		  line_ptr += bytes_read;
-		  table->files[table->num_files].time =
-		    read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-		  line_ptr += bytes_read;
-		  table->files[table->num_files].size =
-		    read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-		  line_ptr += bytes_read;
-		  table->num_files++;
-		  break;
-		default:
-		  (*_bfd_error_handler) (_("Dwarf Error: mangled line number section."));
-		  bfd_set_error (bfd_error_bad_value);
-		  return 0;
-		}
-	      break;
-	    case DW_LNS_copy:
-	      add_line_info (table, address, filename, line, column);
-	      basic_block = 0;
-	      break;
-	    case DW_LNS_advance_pc:
-	      address += lh.minimum_instruction_length
-		* read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-	      line_ptr += bytes_read;
-	      break;
-	    case DW_LNS_advance_line:
-	      line += read_signed_leb128 (abfd, line_ptr, &bytes_read);
-	      line_ptr += bytes_read;
-	      break;
-	    case DW_LNS_set_file:
-	      {
-		unsigned int file;
-
-		/* The file and directory tables are 0 based, the references
-		   are 1 based.  */
-		file = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-		line_ptr += bytes_read;
-		filename = concat_filename (table, file);
-		break;
-	      }
-	    case DW_LNS_set_column:
-	      column = read_unsigned_leb128 (abfd, line_ptr, &bytes_read);
-	      line_ptr += bytes_read;
-	      break;
-	    case DW_LNS_negate_stmt:
-	      is_stmt = (!is_stmt);
-	      break;
-	    case DW_LNS_set_basic_block:
-	      basic_block = 1;
-	      break;
-	    case DW_LNS_const_add_pc:
-	      address += (255 - lh.opcode_base) / lh.line_range;
-	      break;
-	    case DW_LNS_fixed_advance_pc:
-	      address += read_2_bytes (abfd, line_ptr);
-	      line_ptr += 2;
-	      break;
-	    default:		/* special operand */
-	      adj_opcode = op_code - lh.opcode_base;
-	      address += (adj_opcode / lh.line_range)
-		* lh.minimum_instruction_length;
-	      line += lh.line_base + (adj_opcode % lh.line_range);
-	      /* append row to matrix using current values */
-	      add_line_info (table, address, filename, line, column);
-	      basic_block = 1;
-	    }
-	}
-    }
-
-  return table;
-}
-
-
-/* If ADDR is within TABLE set the output parameters and return true,
-   otherwise return false.  The output parameters, FILENAME_PTR and
-   LINENUMBER_PTR, are pointers to the objects to be filled in. */
-
-static boolean
-lookup_address_in_line_info_table (table, 
-				   addr,
-				   filename_ptr, 
-				   linenumber_ptr)
-     struct line_info_table* table;
-     bfd_vma addr;
-     const char **filename_ptr;
-     unsigned int *linenumber_ptr;
-{
-  struct line_info* each_line;
-  struct line_info* next_line;
-  
-  for (next_line = 0, each_line = table->last_line;
-       each_line;
-       next_line = each_line, each_line = each_line->prev_line)
-    {
-      if (addr >= each_line->address
-	  && (next_line == 0
-	      || addr < next_line->address)) 
-	{
-	  *filename_ptr = each_line->filename;
-	  *linenumber_ptr = each_line->line;
-	  return true;
-	}
-    }
-  
-  return false;
-}
-  
-
-
-
-/* Function table functions. */
-
-struct funcinfo {
-  struct funcinfo *prev_func;
-
-  char* name;
-  bfd_vma low;
-  bfd_vma high;
-};
-
-
-/* If ADDR is within TABLE, set FUNCTIONNAME_PTR, and return true. */
-
-static boolean
-lookup_address_in_function_table (table, 
-				  addr,
-				  functionname_ptr)
-     struct funcinfo* table;
-     bfd_vma addr;
-     const char **functionname_ptr;
-{
-  struct funcinfo* each_func;
-
-  for (each_func = table;
-       each_func;
-       each_func = each_func->prev_func)
-    {
-      if (addr >= each_func->low && addr < each_func->high)
-	{
-	  *functionname_ptr = each_func->name;
-	  return true;
-	}
-    }
-  
-  return false;
-}
-
-
-
-
-/* DWARF2 Compilation unit functions. */
-
-
-/* Scan over each die in a comp. unit looking for functions to add
-   to the function table. */
-
-static boolean
-scan_unit_for_functions (unit)
-     struct comp_unit *unit;
-{
-  bfd *abfd = unit->abfd;
-  char *info_ptr = unit->first_child_die_ptr;
-  int nesting_level = 1;
-
-  while (nesting_level)
-    {
-      unsigned int abbrev_number, bytes_read, i;
-      struct abbrev_info *abbrev;
-      struct attribute attr;
-      struct funcinfo *func;
-      char* name = 0;
-
-      abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
-      info_ptr += bytes_read;
-
-      if (! abbrev_number)
-	{
-	  nesting_level--;
-	  continue;
-	}
-      
-      abbrev = lookup_abbrev (abbrev_number,unit->abbrevs);
-      if (! abbrev)
-	{
-	  (*_bfd_error_handler) (_("Dwarf Error: Could not find abbrev number %d."), 
-			     abbrev_number);
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      
-      if (abbrev->tag == DW_TAG_subprogram)
-	{
-	  func = (struct funcinfo*) bfd_zalloc (abfd, sizeof (struct funcinfo));
-	  func->prev_func = unit->function_table;
-	  unit->function_table = func;
-	}
-      else
-	func = NULL;
-  
-      for (i = 0; i < abbrev->num_attrs; ++i)
-	{
-	  info_ptr = read_attribute (&attr, &abbrev->attrs[i], unit, info_ptr);
-	  
-	  if (func)
-	    {
-	      switch (attr.name)
-		{
-		case DW_AT_name:
-		  
-		  name = DW_STRING (&attr);
-
-		  /* Prefer DW_AT_MIPS_linkage_name over DW_AT_name.  */
-		  if (func->name == NULL)
-		    func->name = DW_STRING (&attr);
-		  break;
-		  
-		case DW_AT_MIPS_linkage_name:
-		  func->name = DW_STRING (&attr);
-		  break;
-
-		case DW_AT_low_pc:
-		  func->low = DW_ADDR (&attr);
-		  break;
-
-		case DW_AT_high_pc:
-		  func->high = DW_ADDR (&attr);
-		  break;
-
-		default:
-		  break;
-		}
-	    }
-	  else
-	    {
-	      switch (attr.name)
-		{
-		case DW_AT_name:
-		  name = DW_STRING (&attr);
-		  break;
-		  
-		default:
-		  break;
-		}
-	    }
-	}
-
-      if (abbrev->has_children)
-	nesting_level++;
-    }
-
-  return true;
-}
-
-
-
-
-
-
-/* Parse a DWARF2 compilation unit starting at INFO_PTR.  This includes
-   the compilation unit header that proceeds the DIE's, but does not
-   include the length field that preceeds each compilation unit header.
-   END_PTR points one past the end of this comp unit.
-
-   This routine does not read the whole compilation unit; only enough
-   to get to the line number information for the compilation unit.  */
-
-static struct comp_unit *
-parse_comp_unit (abfd, info_ptr, end_ptr)
-     bfd* abfd;
-     char* info_ptr;
-     char* end_ptr;
-{
-  struct comp_unit* unit;
-
-  unsigned short version;
-  unsigned int abbrev_offset;
-  unsigned char addr_size;
-  struct abbrev_info** abbrevs;
-
-  unsigned int abbrev_number, bytes_read, i;
-  struct abbrev_info *abbrev;
-  struct attribute attr;
-
-  version = read_2_bytes (abfd, info_ptr);
-  info_ptr += 2;
-  abbrev_offset = read_4_bytes (abfd, info_ptr);
-  info_ptr += 4;
-  addr_size = read_1_byte (abfd, info_ptr);
-  info_ptr += 1;
-
-  if (version != 2)
-    {
-      (*_bfd_error_handler) (_("Dwarf Error: found dwarf version '%hu', this reader only handles version 2 information."), version );
-      bfd_set_error (bfd_error_bad_value);
-      return 0;
-    }
-
-  if (addr_size > sizeof (bfd_vma))
-    {
-      (*_bfd_error_handler) (_("Dwarf Error: found address size '%u', this reader can not handle sizes greater than '%u'."),
-			 addr_size,
-			 sizeof (bfd_vma));
-      bfd_set_error (bfd_error_bad_value);
-      return 0;
-    }
-
-  if (addr_size != 4 && addr_size != 8)
-    {
-      (*_bfd_error_handler) ("Dwarf Error: found address size '%u', this reader can only handle address sizes '4' and '8'.", addr_size );
-      bfd_set_error (bfd_error_bad_value);
-      return 0;
-    }
-
-  /* Read the abbrevs for this compilation unit into a table */
-  abbrevs = read_abbrevs (abfd, abbrev_offset);
-  if (! abbrevs)
-      return 0;
-
-  abbrev_number = read_unsigned_leb128 (abfd, info_ptr, &bytes_read);
-  info_ptr += bytes_read;
-  if (! abbrev_number)
-    {
-      (*_bfd_error_handler) (_("Dwarf Error: Bad abbrev number: %d."),
-			 abbrev_number);
-      bfd_set_error (bfd_error_bad_value);
-      return 0;
-    }
-
-  abbrev = lookup_abbrev (abbrev_number, abbrevs);
-  if (! abbrev)
-    {
-      (*_bfd_error_handler) (_("Dwarf Error: Could not find abbrev number %d."),
-			 abbrev_number);
-      bfd_set_error (bfd_error_bad_value);
-      return 0;
-    }
-  
-  unit = (struct comp_unit*) bfd_zalloc (abfd, sizeof (struct comp_unit));
-  unit->abfd = abfd;
-  unit->addr_size = addr_size; 
-  unit->abbrevs = abbrevs;
-  unit->end_ptr = end_ptr;
-
-  for (i = 0; i < abbrev->num_attrs; ++i)
-    {
-      info_ptr = read_attribute (&attr, &abbrev->attrs[i], unit, info_ptr);
-
-      /* Store the data if it is of an attribute we want to keep in a
-	 partial symbol table.  */
-      switch (attr.name)
-	{
-	case DW_AT_stmt_list:
-	  unit->stmtlist = 1;
-	  unit->line_offset = DW_UNSND (&attr);
-	  break;
-
-	case DW_AT_name:
-	  unit->name = DW_STRING (&attr);
-	  break;
-
-	case DW_AT_low_pc:
-	  unit->low = DW_ADDR (&attr);
-	  break;
-
-	case DW_AT_high_pc:
-	  unit->high = DW_ADDR (&attr);
-	  break;
-
-	case DW_AT_comp_dir:
-	  {
-	    char* comp_dir = DW_STRING (&attr);
-	    if (comp_dir)
-	      {
-		/* Irix 6.2 native cc prepends <machine>.: to the compilation
-		   directory, get rid of it.  */
-		char *cp = (char*) strchr (comp_dir, ':');
-
-		if (cp && cp != comp_dir && cp[-1] == '.' && cp[1] == '/')
-		  comp_dir = cp + 1;
-	      }
-	    unit->comp_dir = comp_dir;
-	    break;
-	  }
-
-	default:
-	  break;
-	}
-    }
-
-  unit->first_child_die_ptr = info_ptr;
-  return unit;
-}
-
-
-
-
-
-/* Return true if UNIT contains the address given by ADDR. */
-
-static boolean
-comp_unit_contains_address (unit, addr)
-     struct comp_unit* unit;
-     bfd_vma addr;
-{
-  return ! unit->error
-    && (addr >= unit->low && addr <= unit->high);
-}
-
-
-/* If UNIT contains ADDR, set the output parameters to the values for
-   the line containing ADDR.  The output parameters, FILENAME_PTR,
-   FUNCTIONNAME_PTR, and LINENUMBER_PTR, are pointers to the objects
-   to be filled in.  
-
-   Return true of UNIT contains ADDR, and no errors were encountered;
-   false otherwise.  */
-
-static boolean
-comp_unit_find_nearest_line (unit, addr,
-			     filename_ptr, functionname_ptr, linenumber_ptr)
-     struct comp_unit* unit;
-     bfd_vma addr;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *linenumber_ptr;
-{
-  boolean line_p;
-  boolean func_p;
-  
-  if (unit->error)
-    return false;
-
-  if (! unit->line_table)
-    {
-      if (! unit->stmtlist)
-	{
-	  unit->error = 1;
-	  return false;
-	}
-  
-      unit->line_table = decode_line_info (unit);
-
-      if (! unit->line_table)
-	{
-	  unit->error = 1;
-	  return false;
-	}
-      
-      if (! scan_unit_for_functions (unit))
-	{
-	  unit->error = 1;
-	  return false;
-	}
-    }
-
-  line_p = lookup_address_in_line_info_table (unit->line_table,
-					      addr,
-					      filename_ptr, 
-					      linenumber_ptr);
-  func_p = lookup_address_in_function_table (unit->function_table, 
-					     addr,
-					     functionname_ptr);
-  return line_p || func_p;
-}
-
-/* The DWARF2 version of find_nearest line.
-   Return true if the line is found without error. */
-
-boolean
-_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
-			  filename_ptr, functionname_ptr, linenumber_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *linenumber_ptr;
-{
-  /* Read each compilation unit from the section .debug_info, and check
-     to see if it contains the address we are searching for.  If yes,
-     lookup the address, and return the line number info.  If no, go
-     on to the next compilation unit.  
-
-     We keep a list of all the previously read compilation units, and
-     a pointer to the next un-read compilation unit.  Check the 
-     previously read units before reading more.
-     */
-
-  struct dwarf2_debug *stash = elf_tdata (abfd)->dwarf2_find_line_info;
-
-  /* What address are we looking for? */
-  bfd_vma addr = offset + section->vma;
-
-  struct comp_unit* each;
-  
-  *filename_ptr = NULL;
-  *functionname_ptr = NULL;
-  *linenumber_ptr = 0;
-
-  if (! stash)
-    {
-      asection *msec;
-      unsigned long size;
-      
-      stash = elf_tdata (abfd)->dwarf2_find_line_info =
-	(struct dwarf2_debug*) bfd_zalloc (abfd, sizeof (struct dwarf2_debug));
-      
-      if (! stash)
-	return false;
-      
-      msec = bfd_get_section_by_name (abfd, ".debug_info");
-      if (! msec)
-	{
-	  /* No dwarf2 info.  Note that at this point the stash
-	     has been allocated, but contains zeros, this lets
-	     future calls to this function fail quicker. */
-	  return false;
-	}
-
-      size = bfd_get_section_size_before_reloc (msec);
-      if (size == 0)
-	return false;
-      
-      stash->info_ptr = (char *) bfd_alloc (abfd, size);
-      
-      if (! stash->info_ptr)
-	return false;
-
-      if (! bfd_get_section_contents (abfd, msec, stash->info_ptr, 0, size))
-	{
-	  stash->info_ptr = 0;
-	  return false;
-	}
-
-      stash->info_ptr_end = stash->info_ptr + size;
-
-      /* FIXME:  There is a problem with the contents of the .debug_info section.
-	 The 'low' and 'high' addresses of the comp_units are computed by relocs
-	 against symbols in the .text segment.  We need these addresses in
-	 order to determine the nearest line number, and so we have to resolve
-	 the relocs.  There is a similar problem when the .debug_line section is
-	 processed as well.
-	 
-	 Unfortunately getting hold of the reloc information is hard... */
-    }
-  
-  /* A null info_ptr indicates that there is no dwarf2 info 
-     (or that an error occured while setting up the stash). */
-
-  if (! stash->info_ptr)
-    return false;
-
-  /* Check the previously read comp. units first. */
-
-  for (each = stash->all_comp_units; each; each = each->next_unit)
-    {
-      if (comp_unit_contains_address (each, addr))
-	return comp_unit_find_nearest_line (each, addr,
-					    filename_ptr, 
-					    functionname_ptr, 
-					    linenumber_ptr);
-    }
-
-  /* Read each remaining comp. units checking each as they are read. */
-  while (stash->info_ptr < stash->info_ptr_end)
-    {
-      struct comp_unit* each;
-      unsigned int length;
-
-      length = read_4_bytes (abfd, stash->info_ptr);
-      stash->info_ptr += 4;
-
-      if (length > 0)
-        {
-	  each = parse_comp_unit (abfd, stash->info_ptr, 
-				  stash->info_ptr + length);
-	  stash->info_ptr += length;
-
-	  if (each)
-	    {
-	      each->next_unit = stash->all_comp_units;
-	      stash->all_comp_units = each;
-
-	      if (comp_unit_contains_address (each, addr))
-		return comp_unit_find_nearest_line (each, addr,
-						    filename_ptr, 
-						    functionname_ptr, 
-						    linenumber_ptr);
-	    }
-	}
-    }
-
-  return false;
-}
-
-/* end of file */
diff --git a/bfd/ecoff.c b/bfd/ecoff.c
deleted file mode 100644
index d5c6f85a717..00000000000
--- a/bfd/ecoff.c
+++ /dev/null
@@ -1,4825 +0,0 @@
-/* Generic ECOFF (Extended-COFF) routines.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Original version by Per Bothner.
-   Full support added by Ian Lance Taylor, ian@cygnus.com.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "aout/ar.h"
-#include "aout/ranlib.h"
-#include "aout/stab_gnu.h"
-
-/* FIXME: We need the definitions of N_SET[ADTB], but aout64.h defines
-   some other stuff which we don't want and which conflicts with stuff
-   we do want.  */
-#include "libaout.h"
-#include "aout/aout64.h"
-#undef N_ABS
-#undef exec_hdr
-#undef obj_sym_filepos
-
-#include "coff/internal.h"
-#include "coff/sym.h"
-#include "coff/symconst.h"
-#include "coff/ecoff.h"
-#include "libcoff.h"
-#include "libecoff.h"
-
-/* Prototypes for static functions.  */
-
-static int ecoff_get_magic PARAMS ((bfd *abfd));
-static long ecoff_sec_to_styp_flags PARAMS ((const char *name,
-					     flagword flags));
-static boolean ecoff_slurp_symbolic_header PARAMS ((bfd *abfd));
-static boolean ecoff_set_symbol_info PARAMS ((bfd *abfd, SYMR *ecoff_sym,
-					   asymbol *asym, int ext, int weak));
-static void ecoff_emit_aggregate PARAMS ((bfd *abfd, FDR *fdr,
-					  char *string,
-					  RNDXR *rndx, long isym,
-					  const char *which));
-static char *ecoff_type_to_string PARAMS ((bfd *abfd, FDR *fdr,
-					   unsigned int indx));
-static boolean ecoff_slurp_reloc_table PARAMS ((bfd *abfd, asection *section,
-						asymbol **symbols));
-static int ecoff_sort_hdrs PARAMS ((const PTR, const PTR));
-static boolean ecoff_compute_section_file_positions PARAMS ((bfd *abfd));
-static bfd_size_type ecoff_compute_reloc_file_positions PARAMS ((bfd *abfd));
-static boolean ecoff_get_extr PARAMS ((asymbol *, EXTR *));
-static void ecoff_set_index PARAMS ((asymbol *, bfd_size_type));
-static unsigned int ecoff_armap_hash PARAMS ((CONST char *s,
-					      unsigned int *rehash,
-					      unsigned int size,
-					      unsigned int hlog));
-
-/* This stuff is somewhat copied from coffcode.h.  */
-
-static asection bfd_debug_section = { "*DEBUG*" };
-
-/* Create an ECOFF object.  */
-
-boolean
-_bfd_ecoff_mkobject (abfd)
-     bfd *abfd;
-{
-  abfd->tdata.ecoff_obj_data = ((struct ecoff_tdata *)
-				bfd_zalloc (abfd, sizeof (ecoff_data_type)));
-  if (abfd->tdata.ecoff_obj_data == NULL)
-    return false;
-
-  return true;
-}
-
-/* This is a hook called by coff_real_object_p to create any backend
-   specific information.  */
-
-PTR
-_bfd_ecoff_mkobject_hook (abfd, filehdr, aouthdr)
-     bfd *abfd;
-     PTR filehdr;
-     PTR aouthdr;
-{
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-  struct internal_aouthdr *internal_a = (struct internal_aouthdr *) aouthdr;
-  ecoff_data_type *ecoff;
-
-  if (_bfd_ecoff_mkobject (abfd) == false)
-    return NULL;
-
-  ecoff = ecoff_data (abfd);
-  ecoff->gp_size = 8;
-  ecoff->sym_filepos = internal_f->f_symptr;
-
-  if (internal_a != (struct internal_aouthdr *) NULL)
-    {
-      int i;
-
-      ecoff->text_start = internal_a->text_start;
-      ecoff->text_end = internal_a->text_start + internal_a->tsize;
-      ecoff->gp = internal_a->gp_value;
-      ecoff->gprmask = internal_a->gprmask;
-      for (i = 0; i < 4; i++)
-	ecoff->cprmask[i] = internal_a->cprmask[i];
-      ecoff->fprmask = internal_a->fprmask;
-      if (internal_a->magic == ECOFF_AOUT_ZMAGIC)
-	abfd->flags |= D_PAGED;
-      else
-	abfd->flags &=~ D_PAGED;
-    }
-
-  /* It turns out that no special action is required by the MIPS or
-     Alpha ECOFF backends.  They have different information in the
-     a.out header, but we just copy it all (e.g., gprmask, cprmask and
-     fprmask) and let the swapping routines ensure that only relevant
-     information is written out.  */
-
-  return (PTR) ecoff;
-}
-
-/* Initialize a new section.  */
-
-boolean
-_bfd_ecoff_new_section_hook (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  section->alignment_power = 4;
-
-  if (strcmp (section->name, _TEXT) == 0
-      || strcmp (section->name, _INIT) == 0
-      || strcmp (section->name, _FINI) == 0)
-    section->flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
-  else if (strcmp (section->name, _DATA) == 0
-	   || strcmp (section->name, _SDATA) == 0)
-    section->flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
-  else if (strcmp (section->name, _RDATA) == 0
-	   || strcmp (section->name, _LIT8) == 0
-	   || strcmp (section->name, _LIT4) == 0
-	   || strcmp (section->name, _RCONST) == 0
-	   || strcmp (section->name, _PDATA) == 0)
-    section->flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC | SEC_READONLY;
-  else if (strcmp (section->name, _BSS) == 0
-	   || strcmp (section->name, _SBSS) == 0)
-    section->flags |= SEC_ALLOC;
-  else if (strcmp (section->name, _LIB) == 0)
-    {
-      /* An Irix 4 shared libary.  */
-      section->flags |= SEC_COFF_SHARED_LIBRARY;
-    }
-
-  /* Probably any other section name is SEC_NEVER_LOAD, but I'm
-     uncertain about .init on some systems and I don't know how shared
-     libraries work.  */
-
-  return true;
-}
-
-/* Determine the machine architecture and type.  This is called from
-   the generic COFF routines.  It is the inverse of ecoff_get_magic,
-   below.  This could be an ECOFF backend routine, with one version
-   for each target, but there aren't all that many ECOFF targets.  */
-
-boolean
-_bfd_ecoff_set_arch_mach_hook (abfd, filehdr)
-     bfd *abfd;
-     PTR filehdr;
-{
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-  enum bfd_architecture arch;
-  unsigned long mach;
-
-  switch (internal_f->f_magic)
-    {
-    case MIPS_MAGIC_1:
-    case MIPS_MAGIC_LITTLE:
-    case MIPS_MAGIC_BIG:
-      arch = bfd_arch_mips;
-      mach = 3000;
-      break;
-
-    case MIPS_MAGIC_LITTLE2:
-    case MIPS_MAGIC_BIG2:
-      /* MIPS ISA level 2: the r6000 */
-      arch = bfd_arch_mips;
-      mach = 6000;
-      break;
-
-    case MIPS_MAGIC_LITTLE3:
-    case MIPS_MAGIC_BIG3:
-      /* MIPS ISA level 3: the r4000 */
-      arch = bfd_arch_mips;
-      mach = 4000;
-      break;
-
-    case ALPHA_MAGIC:
-      arch = bfd_arch_alpha;
-      mach = 0;
-      break;
-
-    default:
-      arch = bfd_arch_obscure;
-      mach = 0;
-      break;
-    }
-
-  return bfd_default_set_arch_mach (abfd, arch, mach);
-}
-
-/* Get the magic number to use based on the architecture and machine.
-   This is the inverse of _bfd_ecoff_set_arch_mach_hook, above.  */
-
-static int
-ecoff_get_magic (abfd)
-     bfd *abfd;
-{
-  int big, little;
-
-  switch (bfd_get_arch (abfd))
-    {
-    case bfd_arch_mips:
-      switch (bfd_get_mach (abfd))
-	{
-	default:
-	case 0:
-	case 3000:
-	  big = MIPS_MAGIC_BIG;
-	  little = MIPS_MAGIC_LITTLE;
-	  break;
-
-	case 6000:
-	  big = MIPS_MAGIC_BIG2;
-	  little = MIPS_MAGIC_LITTLE2;
-	  break;
-
-	case 4000:
-	  big = MIPS_MAGIC_BIG3;
-	  little = MIPS_MAGIC_LITTLE3;
-	  break;
-	}
-
-      return bfd_big_endian (abfd) ? big : little;
-
-    case bfd_arch_alpha:
-      return ALPHA_MAGIC;
-
-    default:
-      abort ();
-      return 0;
-    }
-}
-
-/* Get the section s_flags to use for a section.  */
-
-static long
-ecoff_sec_to_styp_flags (name, flags)
-     const char *name;
-     flagword flags;
-{
-  long styp;
-
-  styp = 0;
-
-  if (strcmp (name, _TEXT) == 0)
-    styp = STYP_TEXT;
-  else if (strcmp (name, _DATA) == 0)
-    styp = STYP_DATA;
-  else if (strcmp (name, _SDATA) == 0)
-    styp = STYP_SDATA;
-  else if (strcmp (name, _RDATA) == 0)
-    styp = STYP_RDATA;
-  else if (strcmp (name, _LITA) == 0)
-    styp = STYP_LITA;
-  else if (strcmp (name, _LIT8) == 0)
-    styp = STYP_LIT8;
-  else if (strcmp (name, _LIT4) == 0)
-    styp = STYP_LIT4;
-  else if (strcmp (name, _BSS) == 0)
-    styp = STYP_BSS;
-  else if (strcmp (name, _SBSS) == 0)
-    styp = STYP_SBSS;
-  else if (strcmp (name, _INIT) == 0)
-    styp = STYP_ECOFF_INIT;
-  else if (strcmp (name, _FINI) == 0)
-    styp = STYP_ECOFF_FINI;
-  else if (strcmp (name, _PDATA) == 0)
-    styp = STYP_PDATA;
-  else if (strcmp (name, _XDATA) == 0)
-    styp = STYP_XDATA;
-  else if (strcmp (name, _LIB) == 0)
-    styp = STYP_ECOFF_LIB;
-  else if (strcmp (name, _GOT) == 0)
-    styp = STYP_GOT;
-  else if (strcmp (name, _HASH) == 0)
-    styp = STYP_HASH;
-  else if (strcmp (name, _DYNAMIC) == 0)
-    styp = STYP_DYNAMIC;
-  else if (strcmp (name, _LIBLIST) == 0)
-    styp = STYP_LIBLIST;
-  else if (strcmp (name, _RELDYN) == 0)
-    styp = STYP_RELDYN;
-  else if (strcmp (name, _CONFLIC) == 0)
-    styp = STYP_CONFLIC;
-  else if (strcmp (name, _DYNSTR) == 0)
-    styp = STYP_DYNSTR;
-  else if (strcmp (name, _DYNSYM) == 0)
-    styp = STYP_DYNSYM;
-  else if (strcmp (name, _COMMENT) == 0)
-    {
-      styp = STYP_COMMENT;
-      flags &=~ SEC_NEVER_LOAD;
-    }
-  else if (strcmp (name, _RCONST) == 0)
-    styp = STYP_RCONST;
-  else if (flags & SEC_CODE) 
-    styp = STYP_TEXT;
-  else if (flags & SEC_DATA) 
-    styp = STYP_DATA;
-  else if (flags & SEC_READONLY)
-    styp = STYP_RDATA;
-  else if (flags & SEC_LOAD)
-    styp = STYP_REG;
-  else
-    styp = STYP_BSS;
-
-  if (flags & SEC_NEVER_LOAD)
-    styp |= STYP_NOLOAD;
-
-  return styp;
-}
-
-/* Get the BFD flags to use for a section.  */
-
-/*ARGSUSED*/
-flagword
-_bfd_ecoff_styp_to_sec_flags (abfd, hdr, name)
-     bfd *abfd;
-     PTR hdr;
-     const char *name;
-{
-  struct internal_scnhdr *internal_s = (struct internal_scnhdr *) hdr;
-  long styp_flags = internal_s->s_flags;
-  flagword sec_flags=0;
-
-  if (styp_flags & STYP_NOLOAD)
-    sec_flags |= SEC_NEVER_LOAD;
-
-  /* For 386 COFF, at least, an unloadable text or data section is
-     actually a shared library section.  */
-  if ((styp_flags & STYP_TEXT)
-      || (styp_flags & STYP_ECOFF_INIT)
-      || (styp_flags & STYP_ECOFF_FINI)
-      || (styp_flags & STYP_DYNAMIC)
-      || (styp_flags & STYP_LIBLIST)
-      || (styp_flags & STYP_RELDYN)
-      || styp_flags == STYP_CONFLIC
-      || (styp_flags & STYP_DYNSTR)
-      || (styp_flags & STYP_DYNSYM)
-      || (styp_flags & STYP_HASH))
-    {
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_CODE | SEC_COFF_SHARED_LIBRARY;
-      else
-	sec_flags |= SEC_CODE | SEC_LOAD | SEC_ALLOC;
-    }
-  else if ((styp_flags & STYP_DATA)
-	   || (styp_flags & STYP_RDATA)
-	   || (styp_flags & STYP_SDATA)
-	   || styp_flags == STYP_PDATA
-	   || styp_flags == STYP_XDATA
-	   || (styp_flags & STYP_GOT)
-	   || styp_flags == STYP_RCONST)
-    {
-      if (sec_flags & SEC_NEVER_LOAD)
-	sec_flags |= SEC_DATA | SEC_COFF_SHARED_LIBRARY;
-      else
-	sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC;
-      if ((styp_flags & STYP_RDATA)
-	  || styp_flags == STYP_PDATA
-	  || styp_flags == STYP_RCONST)
-	sec_flags |= SEC_READONLY;
-    }
-  else if ((styp_flags & STYP_BSS)
-	   || (styp_flags & STYP_SBSS))
-    {
-      sec_flags |= SEC_ALLOC;
-    }
-  else if ((styp_flags & STYP_INFO) || styp_flags == STYP_COMMENT)
-    {
-      sec_flags |= SEC_NEVER_LOAD;
-    }
-  else if ((styp_flags & STYP_LITA)
-	   || (styp_flags & STYP_LIT8)
-	   || (styp_flags & STYP_LIT4))
-    {
-      sec_flags |= SEC_DATA | SEC_LOAD | SEC_ALLOC | SEC_READONLY;
-    }
-  else if (styp_flags & STYP_ECOFF_LIB)
-    {
-      sec_flags |= SEC_COFF_SHARED_LIBRARY;
-    }
-  else
-    {
-      sec_flags |= SEC_ALLOC | SEC_LOAD;
-    }
-
-  return sec_flags;
-}
-
-/* Read in the symbolic header for an ECOFF object file.  */
-
-static boolean
-ecoff_slurp_symbolic_header (abfd)
-     bfd *abfd;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  bfd_size_type external_hdr_size;
-  PTR raw = NULL;
-  HDRR *internal_symhdr;
-
-  /* See if we've already read it in.  */
-  if (ecoff_data (abfd)->debug_info.symbolic_header.magic == 
-      backend->debug_swap.sym_magic)
-    return true;
-
-  /* See whether there is a symbolic header.  */
-  if (ecoff_data (abfd)->sym_filepos == 0)
-    {
-      bfd_get_symcount (abfd) = 0;
-      return true;
-    }
-
-  /* At this point bfd_get_symcount (abfd) holds the number of symbols
-     as read from the file header, but on ECOFF this is always the
-     size of the symbolic information header.  It would be cleaner to
-     handle this when we first read the file in coffgen.c.  */
-  external_hdr_size = backend->debug_swap.external_hdr_size;
-  if (bfd_get_symcount (abfd) != external_hdr_size)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  /* Read the symbolic information header.  */
-  raw = (PTR) bfd_malloc ((size_t) external_hdr_size);
-  if (raw == NULL)
-    goto error_return;
-
-  if (bfd_seek (abfd, ecoff_data (abfd)->sym_filepos, SEEK_SET) == -1
-      || (bfd_read (raw, external_hdr_size, 1, abfd)
-	  != external_hdr_size))
-    goto error_return;
-  internal_symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
-  (*backend->debug_swap.swap_hdr_in) (abfd, raw, internal_symhdr);
-
-  if (internal_symhdr->magic != backend->debug_swap.sym_magic)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      goto error_return;
-    }
-
-  /* Now we can get the correct number of symbols.  */
-  bfd_get_symcount (abfd) = (internal_symhdr->isymMax
-			     + internal_symhdr->iextMax);
-
-  if (raw != NULL)
-    free (raw);
-  return true;
- error_return:
-  if (raw != NULL)
-    free (raw);
-  return false;
-}
-
-/* Read in and swap the important symbolic information for an ECOFF
-   object file.  This is called by gdb via the read_debug_info entry
-   point in the backend structure.  */
-
-/*ARGSUSED*/
-boolean
-_bfd_ecoff_slurp_symbolic_info (abfd, ignore, debug)
-     bfd *abfd;
-     asection *ignore;
-     struct ecoff_debug_info *debug;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  HDRR *internal_symhdr;
-  bfd_size_type raw_base;
-  bfd_size_type raw_size;
-  PTR raw;
-  bfd_size_type external_fdr_size;
-  char *fraw_src;
-  char *fraw_end;
-  struct fdr *fdr_ptr;
-  bfd_size_type raw_end;
-  bfd_size_type cb_end;
-
-  BFD_ASSERT (debug == &ecoff_data (abfd)->debug_info);
-
-  /* Check whether we've already gotten it, and whether there's any to
-     get.  */
-  if (ecoff_data (abfd)->raw_syments != (PTR) NULL)
-    return true;
-  if (ecoff_data (abfd)->sym_filepos == 0)
-    {
-      bfd_get_symcount (abfd) = 0;
-      return true;
-    }
-
-  if (! ecoff_slurp_symbolic_header (abfd))
-    return false;
-
-  internal_symhdr = &debug->symbolic_header;
-
-  /* Read all the symbolic information at once.  */
-  raw_base = (ecoff_data (abfd)->sym_filepos
-	      + backend->debug_swap.external_hdr_size);
-
-  /* Alpha ecoff makes the determination of raw_size difficult. It has
-     an undocumented debug data section between the symhdr and the first
-     documented section. And the ordering of the sections varies between
-     statically and dynamically linked executables.
-     If bfd supports SEEK_END someday, this code could be simplified.  */
-
-  raw_end = 0;
-
-#define UPDATE_RAW_END(start, count, size) \
-  cb_end = internal_symhdr->start + internal_symhdr->count * (size); \
-  if (cb_end > raw_end) \
-    raw_end = cb_end
-
-  UPDATE_RAW_END (cbLineOffset, cbLine, sizeof (unsigned char));
-  UPDATE_RAW_END (cbDnOffset, idnMax, backend->debug_swap.external_dnr_size);
-  UPDATE_RAW_END (cbPdOffset, ipdMax, backend->debug_swap.external_pdr_size);
-  UPDATE_RAW_END (cbSymOffset, isymMax, backend->debug_swap.external_sym_size);
-  UPDATE_RAW_END (cbOptOffset, ioptMax, backend->debug_swap.external_opt_size);
-  UPDATE_RAW_END (cbAuxOffset, iauxMax, sizeof (union aux_ext));
-  UPDATE_RAW_END (cbSsOffset, issMax, sizeof (char));
-  UPDATE_RAW_END (cbSsExtOffset, issExtMax, sizeof (char));
-  UPDATE_RAW_END (cbFdOffset, ifdMax, backend->debug_swap.external_fdr_size);
-  UPDATE_RAW_END (cbRfdOffset, crfd, backend->debug_swap.external_rfd_size);
-  UPDATE_RAW_END (cbExtOffset, iextMax, backend->debug_swap.external_ext_size);
-
-#undef UPDATE_RAW_END
-
-  raw_size = raw_end - raw_base;
-  if (raw_size == 0)
-    {
-      ecoff_data (abfd)->sym_filepos = 0;
-      return true;
-    }
-  raw = (PTR) bfd_alloc (abfd, raw_size);
-  if (raw == NULL)
-    return false;
-  if (bfd_seek (abfd,
-		(ecoff_data (abfd)->sym_filepos
-		 + backend->debug_swap.external_hdr_size),
-		SEEK_SET) != 0
-      || bfd_read (raw, raw_size, 1, abfd) != raw_size)
-    {
-      bfd_release (abfd, raw);
-      return false;
-    }
-
-  ecoff_data (abfd)->raw_syments = raw;
-
-  /* Get pointers for the numeric offsets in the HDRR structure.  */
-#define FIX(off1, off2, type) \
-  if (internal_symhdr->off1 == 0) \
-    debug->off2 = (type) NULL; \
-  else \
-    debug->off2 = (type) ((char *) raw \
-			  + (internal_symhdr->off1 \
-			     - raw_base))
-  FIX (cbLineOffset, line, unsigned char *);
-  FIX (cbDnOffset, external_dnr, PTR);
-  FIX (cbPdOffset, external_pdr, PTR);
-  FIX (cbSymOffset, external_sym, PTR);
-  FIX (cbOptOffset, external_opt, PTR);
-  FIX (cbAuxOffset, external_aux, union aux_ext *);
-  FIX (cbSsOffset, ss, char *);
-  FIX (cbSsExtOffset, ssext, char *);
-  FIX (cbFdOffset, external_fdr, PTR);
-  FIX (cbRfdOffset, external_rfd, PTR);
-  FIX (cbExtOffset, external_ext, PTR);
-#undef FIX
-
-  /* I don't want to always swap all the data, because it will just
-     waste time and most programs will never look at it.  The only
-     time the linker needs most of the debugging information swapped
-     is when linking big-endian and little-endian MIPS object files
-     together, which is not a common occurrence.
-
-     We need to look at the fdr to deal with a lot of information in
-     the symbols, so we swap them here.  */
-  debug->fdr = (struct fdr *) bfd_alloc (abfd,
-					 (internal_symhdr->ifdMax *
-					  sizeof (struct fdr)));
-  if (debug->fdr == NULL)
-    return false;
-  external_fdr_size = backend->debug_swap.external_fdr_size;
-  fdr_ptr = debug->fdr;
-  fraw_src = (char *) debug->external_fdr;
-  fraw_end = fraw_src + internal_symhdr->ifdMax * external_fdr_size;
-  for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
-    (*backend->debug_swap.swap_fdr_in) (abfd, (PTR) fraw_src, fdr_ptr);
-
-  return true;
-}
-
-/* ECOFF symbol table routines.  The ECOFF symbol table is described
-   in gcc/mips-tfile.c.  */
-
-/* ECOFF uses two common sections.  One is the usual one, and the
-   other is for small objects.  All the small objects are kept
-   together, and then referenced via the gp pointer, which yields
-   faster assembler code.  This is what we use for the small common
-   section.  */
-static asection ecoff_scom_section;
-static asymbol ecoff_scom_symbol;
-static asymbol *ecoff_scom_symbol_ptr;
-
-/* Create an empty symbol.  */
-
-asymbol *
-_bfd_ecoff_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  ecoff_symbol_type *new;
-
-  new = (ecoff_symbol_type *) bfd_alloc (abfd, sizeof (ecoff_symbol_type));
-  if (new == (ecoff_symbol_type *) NULL)
-    return (asymbol *) NULL;
-  memset ((PTR) new, 0, sizeof *new);
-  new->symbol.section = (asection *) NULL;
-  new->fdr = (FDR *) NULL;
-  new->local = false;
-  new->native = NULL;
-  new->symbol.the_bfd = abfd;
-  return &new->symbol;
-}
-
-/* Set the BFD flags and section for an ECOFF symbol.  */
-
-static boolean
-ecoff_set_symbol_info (abfd, ecoff_sym, asym, ext, weak)
-     bfd *abfd;
-     SYMR *ecoff_sym;
-     asymbol *asym;
-     int ext;
-     int weak;
-{
-  asym->the_bfd = abfd;
-  asym->value = ecoff_sym->value;
-  asym->section = &bfd_debug_section;
-  asym->udata.i = 0;
-
-  /* Most symbol types are just for debugging.  */
-  switch (ecoff_sym->st)
-    {
-    case stGlobal:
-    case stStatic:
-    case stLabel:
-    case stProc:
-    case stStaticProc:
-      break;
-    case stNil:
-      if (ECOFF_IS_STAB (ecoff_sym))
-	{
-	  asym->flags = BSF_DEBUGGING;
-	  return true;
-	}
-      break;
-    default:
-      asym->flags = BSF_DEBUGGING;
-      return true;
-    }
-
-  if (weak)
-    asym->flags = BSF_EXPORT | BSF_WEAK;
-  else if (ext)
-    asym->flags = BSF_EXPORT | BSF_GLOBAL;
-  else
-    {
-      asym->flags = BSF_LOCAL;
-      /* Normally, a local stProc symbol will have a corresponding
-         external symbol.  We mark the local symbol as a debugging
-         symbol, in order to prevent nm from printing both out.
-         Similarly, we mark stLabel and stabs symbols as debugging
-         symbols.  In both cases, we do want to set the value
-         correctly based on the symbol class.  */
-      if (ecoff_sym->st == stProc
-	  || ecoff_sym->st == stLabel
-	  || ECOFF_IS_STAB (ecoff_sym))
-	asym->flags |= BSF_DEBUGGING;
-    }
-  switch (ecoff_sym->sc)
-    {
-    case scNil:
-      /* Used for compiler generated labels.  Leave them in the
-	 debugging section, and mark them as local.  If BSF_DEBUGGING
-	 is set, then nm does not display them for some reason.  If no
-	 flags are set then the linker whines about them.  */
-      asym->flags = BSF_LOCAL;
-      break;
-    case scText:
-      asym->section = bfd_make_section_old_way (abfd, ".text");
-      asym->value -= asym->section->vma;
-      break;
-    case scData:
-      asym->section = bfd_make_section_old_way (abfd, ".data");
-      asym->value -= asym->section->vma;
-      break;
-    case scBss:
-      asym->section = bfd_make_section_old_way (abfd, ".bss");
-      asym->value -= asym->section->vma;
-      break;
-    case scRegister:
-      asym->flags = BSF_DEBUGGING;
-      break;
-    case scAbs:
-      asym->section = bfd_abs_section_ptr;
-      break;
-    case scUndefined:
-      asym->section = bfd_und_section_ptr;
-      asym->flags = 0;
-      asym->value = 0;
-      break;
-    case scCdbLocal:
-    case scBits:
-    case scCdbSystem:
-    case scRegImage:
-    case scInfo:
-    case scUserStruct:
-      asym->flags = BSF_DEBUGGING;
-      break;
-    case scSData:
-      asym->section = bfd_make_section_old_way (abfd, ".sdata");
-      asym->value -= asym->section->vma;
-      break;
-    case scSBss:
-      asym->section = bfd_make_section_old_way (abfd, ".sbss");
-      asym->value -= asym->section->vma;
-      break;
-    case scRData:
-      asym->section = bfd_make_section_old_way (abfd, ".rdata");
-      asym->value -= asym->section->vma;
-      break;
-    case scVar:
-      asym->flags = BSF_DEBUGGING;
-      break;
-    case scCommon:
-      if (asym->value > ecoff_data (abfd)->gp_size)
-	{
-	  asym->section = bfd_com_section_ptr;
-	  asym->flags = 0;
-	  break;
-	}
-      /* Fall through.  */
-    case scSCommon:
-      if (ecoff_scom_section.name == NULL)
-	{
-	  /* Initialize the small common section.  */
-	  ecoff_scom_section.name = SCOMMON;
-	  ecoff_scom_section.flags = SEC_IS_COMMON;
-	  ecoff_scom_section.output_section = &ecoff_scom_section;
-	  ecoff_scom_section.symbol = &ecoff_scom_symbol;
-	  ecoff_scom_section.symbol_ptr_ptr = &ecoff_scom_symbol_ptr;
-	  ecoff_scom_symbol.name = SCOMMON;
-	  ecoff_scom_symbol.flags = BSF_SECTION_SYM;
-	  ecoff_scom_symbol.section = &ecoff_scom_section;
-	  ecoff_scom_symbol_ptr = &ecoff_scom_symbol;
-	}
-      asym->section = &ecoff_scom_section;
-      asym->flags = 0;
-      break;
-    case scVarRegister:
-    case scVariant:
-      asym->flags = BSF_DEBUGGING;
-      break;
-    case scSUndefined:
-      asym->section = bfd_und_section_ptr;
-      asym->flags = 0;
-      asym->value = 0;
-      break;
-    case scInit:
-      asym->section = bfd_make_section_old_way (abfd, ".init");
-      asym->value -= asym->section->vma;
-      break;
-    case scBasedVar:
-    case scXData:
-    case scPData:
-      asym->flags = BSF_DEBUGGING;
-      break;
-    case scFini:
-      asym->section = bfd_make_section_old_way (abfd, ".fini");
-      asym->value -= asym->section->vma;
-      break;
-    case scRConst:
-      asym->section = bfd_make_section_old_way (abfd, ".rconst");
-      asym->value -= asym->section->vma;
-      break;
-    default:
-      break;
-    }
-
-  /* Look for special constructors symbols and make relocation entries
-     in a special construction section.  These are produced by the
-     -fgnu-linker argument to g++.  */
-  if (ECOFF_IS_STAB (ecoff_sym))
-    {
-      switch (ECOFF_UNMARK_STAB (ecoff_sym->index))
-	{
-	default:
-	  break;
-
-	case N_SETA:
-	case N_SETT:
-	case N_SETD:
-	case N_SETB:
-	  {
-	    /* This code is no longer needed.  It used to be used to
-	       make the linker handle set symbols, but they are now
-	       handled in the add_symbols routine instead.  */
-#if 0
-	    const char *name;
-	    asection *section;
-	    arelent_chain *reloc_chain;
-	    unsigned int bitsize;
-
-	    /* Get a section with the same name as the symbol (usually
-	       __CTOR_LIST__ or __DTOR_LIST__).  FIXME: gcc uses the
-	       name ___CTOR_LIST (three underscores).  We need
-	       __CTOR_LIST (two underscores), since ECOFF doesn't use
-	       a leading underscore.  This should be handled by gcc,
-	       but instead we do it here.  Actually, this should all
-	       be done differently anyhow.  */
-	    name = bfd_asymbol_name (asym);
-	    if (name[0] == '_' && name[1] == '_' && name[2] == '_')
-	      {
-		++name;
-		asym->name = name;
-	      }
-	    section = bfd_get_section_by_name (abfd, name);
-	    if (section == (asection *) NULL)
-	      {
-		char *copy;
-
-		copy = (char *) bfd_alloc (abfd, strlen (name) + 1);
-		if (!copy)
-		  return false;
-		strcpy (copy, name);
-		section = bfd_make_section (abfd, copy);
-	      }
-
-	    /* Build a reloc pointing to this constructor.  */
-	    reloc_chain =
-	      (arelent_chain *) bfd_alloc (abfd, sizeof (arelent_chain));
-	    if (!reloc_chain)
-	      return false;
-	    reloc_chain->relent.sym_ptr_ptr =
-	      bfd_get_section (asym)->symbol_ptr_ptr;
-	    reloc_chain->relent.address = section->_raw_size;
-	    reloc_chain->relent.addend = asym->value;
-	    reloc_chain->relent.howto =
-	      ecoff_backend (abfd)->constructor_reloc;
-
-	    /* Set up the constructor section to hold the reloc.  */
-	    section->flags = SEC_CONSTRUCTOR;
-	    ++section->reloc_count;
-
-	    /* Constructor sections must be rounded to a boundary
-	       based on the bitsize.  These are not real sections--
-	       they are handled specially by the linker--so the ECOFF
-	       16 byte alignment restriction does not apply.  */
-	    bitsize = ecoff_backend (abfd)->constructor_bitsize;
-	    section->alignment_power = 1;
-	    while ((1 << section->alignment_power) < bitsize / 8)
-	      ++section->alignment_power;
-
-	    reloc_chain->next = section->constructor_chain;
-	    section->constructor_chain = reloc_chain;
-	    section->_raw_size += bitsize / 8;
-
-#endif /* 0 */
-
-	    /* Mark the symbol as a constructor.  */
-	    asym->flags |= BSF_CONSTRUCTOR;
-	  }
-	  break;
-	}
-    }
-  return true;
-}
-
-/* Read an ECOFF symbol table.  */
-
-boolean
-_bfd_ecoff_slurp_symbol_table (abfd)
-     bfd *abfd;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  const bfd_size_type external_ext_size
-    = backend->debug_swap.external_ext_size;
-  const bfd_size_type external_sym_size
-    = backend->debug_swap.external_sym_size;
-  void (* const swap_ext_in) PARAMS ((bfd *, PTR, EXTR *))
-    = backend->debug_swap.swap_ext_in;
-  void (* const swap_sym_in) PARAMS ((bfd *, PTR, SYMR *))
-    = backend->debug_swap.swap_sym_in;
-  bfd_size_type internal_size;
-  ecoff_symbol_type *internal;
-  ecoff_symbol_type *internal_ptr;
-  char *eraw_src;
-  char *eraw_end;
-  FDR *fdr_ptr;
-  FDR *fdr_end;
-
-  /* If we've already read in the symbol table, do nothing.  */
-  if (ecoff_data (abfd)->canonical_symbols != NULL)
-    return true;
-
-  /* Get the symbolic information.  */
-  if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL,
-					&ecoff_data (abfd)->debug_info))
-    return false;
-  if (bfd_get_symcount (abfd) == 0)
-    return true;
-
-  internal_size = bfd_get_symcount (abfd) * sizeof (ecoff_symbol_type);
-  internal = (ecoff_symbol_type *) bfd_alloc (abfd, internal_size);
-  if (internal == NULL)
-    return false;
-
-  internal_ptr = internal;
-  eraw_src = (char *) ecoff_data (abfd)->debug_info.external_ext;
-  eraw_end = (eraw_src
-	      + (ecoff_data (abfd)->debug_info.symbolic_header.iextMax
-		 * external_ext_size));
-  for (; eraw_src < eraw_end; eraw_src += external_ext_size, internal_ptr++)
-    {
-      EXTR internal_esym;
-
-      (*swap_ext_in) (abfd, (PTR) eraw_src, &internal_esym);
-      internal_ptr->symbol.name = (ecoff_data (abfd)->debug_info.ssext
-				   + internal_esym.asym.iss);
-      if (!ecoff_set_symbol_info (abfd, &internal_esym.asym,
-				  &internal_ptr->symbol, 1,
-				  internal_esym.weakext))
-	return false;
-      /* The alpha uses a negative ifd field for section symbols.  */
-      if (internal_esym.ifd >= 0)
-	internal_ptr->fdr = (ecoff_data (abfd)->debug_info.fdr
-			     + internal_esym.ifd);
-      else
-	internal_ptr->fdr = NULL;
-      internal_ptr->local = false;
-      internal_ptr->native = (PTR) eraw_src;
-    }
-
-  /* The local symbols must be accessed via the fdr's, because the
-     string and aux indices are relative to the fdr information.  */
-  fdr_ptr = ecoff_data (abfd)->debug_info.fdr;
-  fdr_end = fdr_ptr + ecoff_data (abfd)->debug_info.symbolic_header.ifdMax;
-  for (; fdr_ptr < fdr_end; fdr_ptr++)
-    {
-      char *lraw_src;
-      char *lraw_end;
-
-      lraw_src = ((char *) ecoff_data (abfd)->debug_info.external_sym
-		  + fdr_ptr->isymBase * external_sym_size);
-      lraw_end = lraw_src + fdr_ptr->csym * external_sym_size;
-      for (;
-	   lraw_src < lraw_end;
-	   lraw_src += external_sym_size, internal_ptr++)
-	{
-	  SYMR internal_sym;
-
-	  (*swap_sym_in) (abfd, (PTR) lraw_src, &internal_sym);
-	  internal_ptr->symbol.name = (ecoff_data (abfd)->debug_info.ss
-				       + fdr_ptr->issBase
-				       + internal_sym.iss);
-	  if (!ecoff_set_symbol_info (abfd, &internal_sym,
-				      &internal_ptr->symbol, 0, 0))
-	    return false;
-	  internal_ptr->fdr = fdr_ptr;
-	  internal_ptr->local = true;
-	  internal_ptr->native = (PTR) lraw_src;
-	}
-    }
-
-  ecoff_data (abfd)->canonical_symbols = internal;
-
-  return true;
-}
-
-/* Return the amount of space needed for the canonical symbols.  */
-
-long
-_bfd_ecoff_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL,
-					&ecoff_data (abfd)->debug_info))
-    return -1;
-
-  if (bfd_get_symcount (abfd) == 0)
-    return 0;
-
-  return (bfd_get_symcount (abfd) + 1) * (sizeof (ecoff_symbol_type *));
-}
-
-/* Get the canonical symbols.  */
-
-long
-_bfd_ecoff_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  unsigned int counter = 0;
-  ecoff_symbol_type *symbase;
-  ecoff_symbol_type **location = (ecoff_symbol_type **) alocation;
-
-  if (_bfd_ecoff_slurp_symbol_table (abfd) == false)
-    return -1;
-  if (bfd_get_symcount (abfd) == 0)
-    return 0;
-
-  symbase = ecoff_data (abfd)->canonical_symbols;
-  while (counter < bfd_get_symcount (abfd))
-    {
-      *(location++) = symbase++;
-      counter++;
-    }
-  *location++ = (ecoff_symbol_type *) NULL;
-  return bfd_get_symcount (abfd);
-}
-
-/* Turn ECOFF type information into a printable string.
-   ecoff_emit_aggregate and ecoff_type_to_string are from
-   gcc/mips-tdump.c, with swapping added and used_ptr removed.  */
-
-/* Write aggregate information to a string.  */
-
-static void
-ecoff_emit_aggregate (abfd, fdr, string, rndx, isym, which)
-     bfd *abfd;
-     FDR *fdr;
-     char *string;
-     RNDXR *rndx;
-     long isym;
-     const char *which;
-{
-  const struct ecoff_debug_swap * const debug_swap =
-    &ecoff_backend (abfd)->debug_swap;
-  struct ecoff_debug_info * const debug_info = &ecoff_data (abfd)->debug_info;
-  unsigned int ifd = rndx->rfd;
-  unsigned int indx = rndx->index;
-  const char *name;
-  
-  if (ifd == 0xfff)
-    ifd = isym;
-
-  /* An ifd of -1 is an opaque type.  An escaped index of 0 is a
-     struct return type of a procedure compiled without -g.  */
-  if (ifd == 0xffffffff
-      || (rndx->rfd == 0xfff && indx == 0))
-    name = "<undefined>";
-  else if (indx == indexNil)
-    name = "<no name>";
-  else
-    {
-      SYMR sym;
-
-      if (debug_info->external_rfd == NULL)
-	fdr = debug_info->fdr + ifd;
-      else
-	{
-	  RFDT rfd;
-
-	  (*debug_swap->swap_rfd_in) (abfd,
-				      ((char *) debug_info->external_rfd
-				       + ((fdr->rfdBase + ifd)
-					  * debug_swap->external_rfd_size)),
-				      &rfd);
-	  fdr = debug_info->fdr + rfd;
-	}
-
-      indx += fdr->isymBase;
-
-      (*debug_swap->swap_sym_in) (abfd,
-				  ((char *) debug_info->external_sym
-				   + indx * debug_swap->external_sym_size),
-				  &sym);
-
-      name = debug_info->ss + fdr->issBase + sym.iss;
-    }
-
-  sprintf (string,
-	   "%s %s { ifd = %u, index = %lu }",
-	   which, name, ifd,
-	   ((long) indx
-	    + debug_info->symbolic_header.iextMax));
-}
-
-/* Convert the type information to string format.  */
-
-static char *
-ecoff_type_to_string (abfd, fdr, indx)
-     bfd *abfd;
-     FDR *fdr;
-     unsigned int indx;
-{
-  union aux_ext *aux_ptr;
-  int bigendian;
-  AUXU u;
-  struct qual {
-    unsigned int  type;
-    int  low_bound;
-    int  high_bound;
-    int  stride;
-  } qualifiers[7];
-  unsigned int basic_type;
-  int i;
-  char buffer1[1024];
-  static char buffer2[1024];
-  char *p1 = buffer1;
-  char *p2 = buffer2;
-  RNDXR rndx;
-
-  aux_ptr = ecoff_data (abfd)->debug_info.external_aux + fdr->iauxBase;
-  bigendian = fdr->fBigendian;
-
-  for (i = 0; i < 7; i++)
-    {
-      qualifiers[i].low_bound = 0;
-      qualifiers[i].high_bound = 0;
-      qualifiers[i].stride = 0;
-    }
-
-  if (AUX_GET_ISYM (bigendian, &aux_ptr[indx]) == (bfd_vma) -1)
-    return "-1 (no type)";
-  _bfd_ecoff_swap_tir_in (bigendian, &aux_ptr[indx++].a_ti, &u.ti);
-
-  basic_type = u.ti.bt;
-  qualifiers[0].type = u.ti.tq0;
-  qualifiers[1].type = u.ti.tq1;
-  qualifiers[2].type = u.ti.tq2;
-  qualifiers[3].type = u.ti.tq3;
-  qualifiers[4].type = u.ti.tq4;
-  qualifiers[5].type = u.ti.tq5;
-  qualifiers[6].type = tqNil;
-
-  /*
-   * Go get the basic type.
-   */
-  switch (basic_type)
-    {
-    case btNil:			/* undefined */
-      strcpy (p1, "nil");
-      break;
-
-    case btAdr:			/* address - integer same size as pointer */
-      strcpy (p1, "address");
-      break;
-
-    case btChar:		/* character */
-      strcpy (p1, "char");
-      break;
-
-    case btUChar:		/* unsigned character */
-      strcpy (p1, "unsigned char");
-      break;
-
-    case btShort:		/* short */
-      strcpy (p1, "short");
-      break;
-
-    case btUShort:		/* unsigned short */
-      strcpy (p1, "unsigned short");
-      break;
-
-    case btInt:			/* int */
-      strcpy (p1, "int");
-      break;
-
-    case btUInt:		/* unsigned int */
-      strcpy (p1, "unsigned int");
-      break;
-
-    case btLong:		/* long */
-      strcpy (p1, "long");
-      break;
-
-    case btULong:		/* unsigned long */
-      strcpy (p1, "unsigned long");
-      break;
-
-    case btFloat:		/* float (real) */
-      strcpy (p1, "float");
-      break;
-
-    case btDouble:		/* Double (real) */
-      strcpy (p1, "double");
-      break;
-
-      /* Structures add 1-2 aux words:
-	 1st word is [ST_RFDESCAPE, offset] pointer to struct def;
-	 2nd word is file index if 1st word rfd is ST_RFDESCAPE.  */
-
-    case btStruct:		/* Structure (Record) */
-      _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx);
-      ecoff_emit_aggregate (abfd, fdr, p1, &rndx,
-			    (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]),
-			    "struct");
-      indx++;			/* skip aux words */
-      break;
-
-      /* Unions add 1-2 aux words:
-	 1st word is [ST_RFDESCAPE, offset] pointer to union def;
-	 2nd word is file index if 1st word rfd is ST_RFDESCAPE.  */
-
-    case btUnion:		/* Union */
-      _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx);
-      ecoff_emit_aggregate (abfd, fdr, p1, &rndx,
-			    (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]),
-			    "union");
-      indx++;			/* skip aux words */
-      break;
-
-      /* Enumerations add 1-2 aux words:
-	 1st word is [ST_RFDESCAPE, offset] pointer to enum def;
-	 2nd word is file index if 1st word rfd is ST_RFDESCAPE.  */
-
-    case btEnum:		/* Enumeration */
-      _bfd_ecoff_swap_rndx_in (bigendian, &aux_ptr[indx].a_rndx, &rndx);
-      ecoff_emit_aggregate (abfd, fdr, p1, &rndx,
-			    (long) AUX_GET_ISYM (bigendian, &aux_ptr[indx+1]),
-			    "enum");
-      indx++;			/* skip aux words */
-      break;
-
-    case btTypedef:		/* defined via a typedef, isymRef points */
-      strcpy (p1, "typedef");
-      break;
-
-    case btRange:		/* subrange of int */
-      strcpy (p1, "subrange");
-      break;
-
-    case btSet:			/* pascal sets */
-      strcpy (p1, "set");
-      break;
-
-    case btComplex:		/* fortran complex */
-      strcpy (p1, "complex");
-      break;
-
-    case btDComplex:		/* fortran double complex */
-      strcpy (p1, "double complex");
-      break;
-
-    case btIndirect:		/* forward or unnamed typedef */
-      strcpy (p1, "forward/unamed typedef");
-      break;
-
-    case btFixedDec:		/* Fixed Decimal */
-      strcpy (p1, "fixed decimal");
-      break;
-
-    case btFloatDec:		/* Float Decimal */
-      strcpy (p1, "float decimal");
-      break;
-
-    case btString:		/* Varying Length Character String */
-      strcpy (p1, "string");
-      break;
-
-    case btBit:			/* Aligned Bit String */
-      strcpy (p1, "bit");
-      break;
-
-    case btPicture:		/* Picture */
-      strcpy (p1, "picture");
-      break;
-
-    case btVoid:		/* Void */
-      strcpy (p1, "void");
-      break;
-
-    default:
-      sprintf (p1, _("Unknown basic type %d"), (int) basic_type);
-      break;
-    }
-
-  p1 += strlen (buffer1);
-
-  /*
-   * If this is a bitfield, get the bitsize.
-   */
-  if (u.ti.fBitfield)
-    {
-      int bitsize;
-
-      bitsize = AUX_GET_WIDTH (bigendian, &aux_ptr[indx++]);
-      sprintf (p1, " : %d", bitsize);
-      p1 += strlen (buffer1);
-    }
-
-
-  /*
-   * Deal with any qualifiers.
-   */
-  if (qualifiers[0].type != tqNil)
-    {
-      /*
-       * Snarf up any array bounds in the correct order.  Arrays
-       * store 5 successive words in the aux. table:
-       *	word 0	RNDXR to type of the bounds (ie, int)
-       *	word 1	Current file descriptor index
-       *	word 2	low bound
-       *	word 3	high bound (or -1 if [])
-       *	word 4	stride size in bits
-       */
-      for (i = 0; i < 7; i++)
-	{
-	  if (qualifiers[i].type == tqArray)
-	    {
-	      qualifiers[i].low_bound =
-		AUX_GET_DNLOW (bigendian, &aux_ptr[indx+2]);
-	      qualifiers[i].high_bound =
-		AUX_GET_DNHIGH (bigendian, &aux_ptr[indx+3]);
-	      qualifiers[i].stride =
-		AUX_GET_WIDTH (bigendian, &aux_ptr[indx+4]);
-	      indx += 5;
-	    }
-	}
-
-      /*
-       * Now print out the qualifiers.
-       */
-      for (i = 0; i < 6; i++)
-	{
-	  switch (qualifiers[i].type)
-	    {
-	    case tqNil:
-	    case tqMax:
-	      break;
-
-	    case tqPtr:
-	      strcpy (p2, "ptr to ");
-	      p2 += sizeof ("ptr to ")-1;
-	      break;
-
-	    case tqVol:
-	      strcpy (p2, "volatile ");
-	      p2 += sizeof ("volatile ")-1;
-	      break;
-
-	    case tqFar:
-	      strcpy (p2, "far ");
-	      p2 += sizeof ("far ")-1;
-	      break;
-
-	    case tqProc:
-	      strcpy (p2, "func. ret. ");
-	      p2 += sizeof ("func. ret. ");
-	      break;
-
-	    case tqArray:
-	      {
-		int first_array = i;
-		int j;
-
-		/* Print array bounds reversed (ie, in the order the C
-		   programmer writes them).  C is such a fun language.... */
-
-		while (i < 5 && qualifiers[i+1].type == tqArray)
-		  i++;
-
-		for (j = i; j >= first_array; j--)
-		  {
-		    strcpy (p2, "array [");
-		    p2 += sizeof ("array [")-1;
-		    if (qualifiers[j].low_bound != 0)
-		      sprintf (p2,
-			       "%ld:%ld {%ld bits}",
-			       (long) qualifiers[j].low_bound,
-			       (long) qualifiers[j].high_bound,
-			       (long) qualifiers[j].stride);
-
-		    else if (qualifiers[j].high_bound != -1)
-		      sprintf (p2,
-			       "%ld {%ld bits}",
-			       (long) (qualifiers[j].high_bound + 1),
-			       (long) (qualifiers[j].stride));
-
-		    else
-		      sprintf (p2, " {%ld bits}", (long) (qualifiers[j].stride));
-
-		    p2 += strlen (p2);
-		    strcpy (p2, "] of ");
-		    p2 += sizeof ("] of ")-1;
-		  }
-	      }
-	      break;
-	    }
-	}
-    }
-
-  strcpy (p2, buffer1);
-  return buffer2;
-}
-
-/* Return information about ECOFF symbol SYMBOL in RET.  */
-
-/*ARGSUSED*/
-void
-_bfd_ecoff_get_symbol_info (abfd, symbol, ret)
-     bfd *abfd;			/* Ignored.  */
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-/* Return whether this is a local label.  */
-
-/*ARGSUSED*/
-boolean
-_bfd_ecoff_bfd_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return name[0] == '$';
-}
-
-/* Print information about an ECOFF symbol.  */
-
-void
-_bfd_ecoff_print_symbol (abfd, filep, symbol, how)
-     bfd *abfd;
-     PTR filep;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  const struct ecoff_debug_swap * const debug_swap
-    = &ecoff_backend (abfd)->debug_swap;
-  FILE *file = (FILE *)filep;
-
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-    case bfd_print_symbol_more:
-      if (ecoffsymbol (symbol)->local)
-	{
-	  SYMR ecoff_sym;
-	
-	  (*debug_swap->swap_sym_in) (abfd, ecoffsymbol (symbol)->native,
-				      &ecoff_sym);
-	  fprintf (file, "ecoff local ");
-	  fprintf_vma (file, (bfd_vma) ecoff_sym.value);
-	  fprintf (file, " %x %x", (unsigned) ecoff_sym.st,
-		   (unsigned) ecoff_sym.sc);
-	}
-      else
-	{
-	  EXTR ecoff_ext;
-
-	  (*debug_swap->swap_ext_in) (abfd, ecoffsymbol (symbol)->native,
-				      &ecoff_ext);
-	  fprintf (file, "ecoff extern ");
-	  fprintf_vma (file, (bfd_vma) ecoff_ext.asym.value);
-	  fprintf (file, " %x %x", (unsigned) ecoff_ext.asym.st,
-		   (unsigned) ecoff_ext.asym.sc);
-	}
-      break;
-    case bfd_print_symbol_all:
-      /* Print out the symbols in a reasonable way */
-      {
-	char type;
-	int pos;
-	EXTR ecoff_ext;
-	char jmptbl;
-	char cobol_main;
-	char weakext;
-
-	if (ecoffsymbol (symbol)->local)
-	  {
-	    (*debug_swap->swap_sym_in) (abfd, ecoffsymbol (symbol)->native,
-					&ecoff_ext.asym);
-	    type = 'l';
-	    pos = ((((char *) ecoffsymbol (symbol)->native
-		     - (char *) ecoff_data (abfd)->debug_info.external_sym)
-		    / debug_swap->external_sym_size)
-		   + ecoff_data (abfd)->debug_info.symbolic_header.iextMax);
-	    jmptbl = ' ';
-	    cobol_main = ' ';
-	    weakext = ' ';
-	  }
-	else
-	  {
-	    (*debug_swap->swap_ext_in) (abfd, ecoffsymbol (symbol)->native,
-					&ecoff_ext);
-	    type = 'e';
-	    pos = (((char *) ecoffsymbol (symbol)->native
-		    - (char *) ecoff_data (abfd)->debug_info.external_ext)
-		   / debug_swap->external_ext_size);
-	    jmptbl = ecoff_ext.jmptbl ? 'j' : ' ';
-	    cobol_main = ecoff_ext.cobol_main ? 'c' : ' ';
-	    weakext = ecoff_ext.weakext ? 'w' : ' ';
-	  }
-
-	fprintf (file, "[%3d] %c ",
-		 pos, type);
-	fprintf_vma (file, (bfd_vma) ecoff_ext.asym.value);
-	fprintf (file, " st %x sc %x indx %x %c%c%c %s",
-		 (unsigned) ecoff_ext.asym.st,
-		 (unsigned) ecoff_ext.asym.sc,
-		 (unsigned) ecoff_ext.asym.index,
-		 jmptbl, cobol_main, weakext,
-		 symbol->name);
-
-	if (ecoffsymbol (symbol)->fdr != NULL
-	    && ecoff_ext.asym.index != indexNil)
-	  {
-	    FDR *fdr;
-	    unsigned int indx;
-	    int bigendian;
-	    bfd_size_type sym_base;
-	    union aux_ext *aux_base;
-
-	    fdr = ecoffsymbol (symbol)->fdr;
-	    indx = ecoff_ext.asym.index;
-
-	    /* sym_base is used to map the fdr relative indices which
-	       appear in the file to the position number which we are
-	       using.  */
-	    sym_base = fdr->isymBase;
-	    if (ecoffsymbol (symbol)->local)
-	      sym_base +=
-		ecoff_data (abfd)->debug_info.symbolic_header.iextMax;
-
-	    /* aux_base is the start of the aux entries for this file;
-	       asym.index is an offset from this.  */
-	    aux_base = (ecoff_data (abfd)->debug_info.external_aux
-			+ fdr->iauxBase);
-
-	    /* The aux entries are stored in host byte order; the
-	       order is indicated by a bit in the fdr.  */
-	    bigendian = fdr->fBigendian;
-
-	    /* This switch is basically from gcc/mips-tdump.c  */
-	    switch (ecoff_ext.asym.st)
-	      {
-	      case stNil:
-	      case stLabel:
-		break;
-
-	      case stFile:
-	      case stBlock:
-		fprintf (file, _("\n      End+1 symbol: %ld"),
-			 (long) (indx + sym_base));
-		break;
-
-	      case stEnd:
-		if (ecoff_ext.asym.sc == scText
-		    || ecoff_ext.asym.sc == scInfo)
-		  fprintf (file, _("\n      First symbol: %ld"),
-			   (long) (indx + sym_base));
-		else
-		  fprintf (file, _("\n      First symbol: %ld"), 
-			   ((long)
-			    (AUX_GET_ISYM (bigendian,
-					   &aux_base[ecoff_ext.asym.index])
-			     + sym_base)));
-		break;
-
-	      case stProc:
-	      case stStaticProc:
-		if (ECOFF_IS_STAB (&ecoff_ext.asym))
-		  ;
-		else if (ecoffsymbol (symbol)->local)
-		  fprintf (file, _("\n      End+1 symbol: %-7ld   Type:  %s"),
-			   ((long)
-			    (AUX_GET_ISYM (bigendian,
-					   &aux_base[ecoff_ext.asym.index])
-			     + sym_base)),
-			   ecoff_type_to_string (abfd, fdr, indx + 1));
-		else
-		  fprintf (file, _("\n      Local symbol: %ld"),
-			   ((long) indx
-			    + (long) sym_base
-			    + (ecoff_data (abfd)
-			       ->debug_info.symbolic_header.iextMax)));
-		break;
-
-	      case stStruct:
-		fprintf (file, _("\n      struct; End+1 symbol: %ld"),
-			 (long) (indx + sym_base));
-		break;
-
-	      case stUnion:
-		fprintf (file, _("\n      union; End+1 symbol: %ld"),
-			 (long) (indx + sym_base));
-		break;
-
-	      case stEnum:
-		fprintf (file, _("\n      enum; End+1 symbol: %ld"),
-			 (long) (indx + sym_base));
-		break;
-
-	      default:
-		if (! ECOFF_IS_STAB (&ecoff_ext.asym))
-		  fprintf (file, _("\n      Type: %s"),
-			   ecoff_type_to_string (abfd, fdr, indx));
-		break;
-	      }
-	  }
-      }
-      break;
-    }
-}
-
-/* Read in the relocs for a section.  */
-
-static boolean
-ecoff_slurp_reloc_table (abfd, section, symbols)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  arelent *internal_relocs;
-  bfd_size_type external_reloc_size;
-  bfd_size_type external_relocs_size;
-  char *external_relocs;
-  arelent *rptr;
-  unsigned int i;
-
-  if (section->relocation != (arelent *) NULL
-      || section->reloc_count == 0
-      || (section->flags & SEC_CONSTRUCTOR) != 0)
-    return true;
-
-  if (_bfd_ecoff_slurp_symbol_table (abfd) == false)
-    return false;
-  
-  internal_relocs = (arelent *) bfd_alloc (abfd,
-					   (sizeof (arelent)
-					    * section->reloc_count));
-  external_reloc_size = backend->external_reloc_size;
-  external_relocs_size = external_reloc_size * section->reloc_count;
-  external_relocs = (char *) bfd_alloc (abfd, external_relocs_size);
-  if (internal_relocs == (arelent *) NULL
-      || external_relocs == (char *) NULL)
-    return false;
-  if (bfd_seek (abfd, section->rel_filepos, SEEK_SET) != 0)
-    return false;
-  if (bfd_read (external_relocs, 1, external_relocs_size, abfd)
-      != external_relocs_size)
-    return false;
-
-  for (i = 0, rptr = internal_relocs; i < section->reloc_count; i++, rptr++)
-    {
-      struct internal_reloc intern;
-
-      (*backend->swap_reloc_in) (abfd,
-				 external_relocs + i * external_reloc_size,
-				 &intern);
-
-      if (intern.r_extern)
-	{
-	  /* r_symndx is an index into the external symbols.  */
-	  BFD_ASSERT (intern.r_symndx >= 0
-		      && (intern.r_symndx
-			  < (ecoff_data (abfd)
-			     ->debug_info.symbolic_header.iextMax)));
-	  rptr->sym_ptr_ptr = symbols + intern.r_symndx;
-	  rptr->addend = 0;
-	}
-      else if (intern.r_symndx == RELOC_SECTION_NONE
-	       || intern.r_symndx == RELOC_SECTION_ABS)
-	{
-	  rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	  rptr->addend = 0;
-	}
-      else
-	{
-	  CONST char *sec_name;
-	  asection *sec;
-
-	  /* r_symndx is a section key.  */
-	  switch (intern.r_symndx)
-	    {
-	    case RELOC_SECTION_TEXT:  sec_name = ".text";  break;
-	    case RELOC_SECTION_RDATA: sec_name = ".rdata"; break;
-	    case RELOC_SECTION_DATA:  sec_name = ".data";  break;
-	    case RELOC_SECTION_SDATA: sec_name = ".sdata"; break;
-	    case RELOC_SECTION_SBSS:  sec_name = ".sbss";  break;
-	    case RELOC_SECTION_BSS:   sec_name = ".bss";   break;
-	    case RELOC_SECTION_INIT:  sec_name = ".init";  break;
-	    case RELOC_SECTION_LIT8:  sec_name = ".lit8";  break;
-	    case RELOC_SECTION_LIT4:  sec_name = ".lit4";  break;
-	    case RELOC_SECTION_XDATA: sec_name = ".xdata"; break;
-	    case RELOC_SECTION_PDATA: sec_name = ".pdata"; break;
-	    case RELOC_SECTION_FINI:  sec_name = ".fini"; break;
-	    case RELOC_SECTION_LITA:  sec_name = ".lita";  break;
-	    case RELOC_SECTION_RCONST: sec_name = ".rconst"; break;
-	    default: abort ();
-	    }
-
-	  sec = bfd_get_section_by_name (abfd, sec_name);
-	  if (sec == (asection *) NULL)
-	    abort ();
-	  rptr->sym_ptr_ptr = sec->symbol_ptr_ptr;
-
-	  rptr->addend = - bfd_get_section_vma (abfd, sec);
-	}
-
-      rptr->address = intern.r_vaddr - bfd_get_section_vma (abfd, section);
-
-      /* Let the backend select the howto field and do any other
-	 required processing.  */
-      (*backend->adjust_reloc_in) (abfd, &intern, rptr);
-    }
-
-  bfd_release (abfd, external_relocs);
-
-  section->relocation = internal_relocs;
-
-  return true;
-}
-
-/* Get a canonical list of relocs.  */
-
-long
-_bfd_ecoff_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd *abfd;
-     asection *section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  unsigned int count;
-
-  if (section->flags & SEC_CONSTRUCTOR) 
-    {
-      arelent_chain *chain;
-
-      /* This section has relocs made up by us, not the file, so take
-	 them out of their chain and place them into the data area
-	 provided.  */
-      for (count = 0, chain = section->constructor_chain;
-	   count < section->reloc_count;
-	   count++, chain = chain->next)
-	*relptr++ = &chain->relent;
-    }
-  else
-    { 
-      arelent *tblptr;
-
-      if (ecoff_slurp_reloc_table (abfd, section, symbols) == false)
-	return -1;
-
-      tblptr = section->relocation;
-
-      for (count = 0; count < section->reloc_count; count++)
-	*relptr++ = tblptr++;
-    }
-
-  *relptr = (arelent *) NULL;
-
-  return section->reloc_count;
-}
-
-/* Provided a BFD, a section and an offset into the section, calculate
-   and return the name of the source file and the line nearest to the
-   wanted location.  */
-
-/*ARGSUSED*/
-boolean
-_bfd_ecoff_find_nearest_line (abfd, section, ignore_symbols, offset,
-			      filename_ptr, functionname_ptr, retline_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **ignore_symbols;
-     bfd_vma offset;
-     CONST char **filename_ptr;
-     CONST char **functionname_ptr;
-     unsigned int *retline_ptr;
-{
-  const struct ecoff_debug_swap * const debug_swap
-    = &ecoff_backend (abfd)->debug_swap;
-  struct ecoff_debug_info * const debug_info = &ecoff_data (abfd)->debug_info;
-  struct ecoff_find_line *line_info;
-
-  /* Make sure we have the FDR's.  */
-  if (! _bfd_ecoff_slurp_symbolic_info (abfd, (asection *) NULL, debug_info)
-      || bfd_get_symcount (abfd) == 0)
-    return false;
-
-  if (ecoff_data (abfd)->find_line_info == NULL)
-    {
-      ecoff_data (abfd)->find_line_info =
-	((struct ecoff_find_line *)
-	 bfd_zalloc (abfd, sizeof (struct ecoff_find_line)));
-      if (ecoff_data (abfd)->find_line_info == NULL)
-	return false;
-    }
-  line_info = ecoff_data (abfd)->find_line_info;
-
-  return _bfd_ecoff_locate_line (abfd, section, offset, debug_info,
-				 debug_swap, line_info, filename_ptr,
-				 functionname_ptr, retline_ptr);
-}
-
-/* Copy private BFD data.  This is called by objcopy and strip.  We
-   use it to copy the ECOFF debugging information from one BFD to the
-   other.  It would be theoretically possible to represent the ECOFF
-   debugging information in the symbol table.  However, it would be a
-   lot of work, and there would be little gain (gas, gdb, and ld
-   already access the ECOFF debugging information via the
-   ecoff_debug_info structure, and that structure would have to be
-   retained in order to support ECOFF debugging in MIPS ELF).
-
-   The debugging information for the ECOFF external symbols comes from
-   the symbol table, so this function only handles the other debugging
-   information.  */
-
-boolean
-_bfd_ecoff_bfd_copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  struct ecoff_debug_info *iinfo = &ecoff_data (ibfd)->debug_info;
-  struct ecoff_debug_info *oinfo = &ecoff_data (obfd)->debug_info;
-  register int i;
-  asymbol **sym_ptr_ptr;
-  size_t c;
-  boolean local;
-
-  /* We only want to copy information over if both BFD's use ECOFF
-     format.  */
-  if (bfd_get_flavour (ibfd) != bfd_target_ecoff_flavour
-      || bfd_get_flavour (obfd) != bfd_target_ecoff_flavour)
-    return true;
-
-  /* Copy the GP value and the register masks.  */
-  ecoff_data (obfd)->gp = ecoff_data (ibfd)->gp;
-  ecoff_data (obfd)->gprmask = ecoff_data (ibfd)->gprmask;
-  ecoff_data (obfd)->fprmask = ecoff_data (ibfd)->fprmask;
-  for (i = 0; i < 3; i++)
-    ecoff_data (obfd)->cprmask[i] = ecoff_data (ibfd)->cprmask[i];
-
-  /* Copy the version stamp.  */
-  oinfo->symbolic_header.vstamp = iinfo->symbolic_header.vstamp;
-
-  /* If there are no symbols, don't copy any debugging information.  */
-  c = bfd_get_symcount (obfd);
-  sym_ptr_ptr = bfd_get_outsymbols (obfd);
-  if (c == 0 || sym_ptr_ptr == (asymbol **) NULL)
-    return true;
-
-  /* See if there are any local symbols.  */
-  local = false;
-  for (; c > 0; c--, sym_ptr_ptr++)
-    {
-      if (ecoffsymbol (*sym_ptr_ptr)->local)
-	{
-	  local = true;
-	  break;
-	}
-    }
-
-  if (local)
-    {
-      /* There are some local symbols.  We just bring over all the
-	 debugging information.  FIXME: This is not quite the right
-	 thing to do.  If the user has asked us to discard all
-	 debugging information, then we are probably going to wind up
-	 keeping it because there will probably be some local symbol
-	 which objcopy did not discard.  We should actually break
-	 apart the debugging information and only keep that which
-	 applies to the symbols we want to keep.  */
-      oinfo->symbolic_header.ilineMax = iinfo->symbolic_header.ilineMax;
-      oinfo->symbolic_header.cbLine = iinfo->symbolic_header.cbLine;
-      oinfo->line = iinfo->line;
-
-      oinfo->symbolic_header.idnMax = iinfo->symbolic_header.idnMax;
-      oinfo->external_dnr = iinfo->external_dnr;
-
-      oinfo->symbolic_header.ipdMax = iinfo->symbolic_header.ipdMax;
-      oinfo->external_pdr = iinfo->external_pdr;
-
-      oinfo->symbolic_header.isymMax = iinfo->symbolic_header.isymMax;
-      oinfo->external_sym = iinfo->external_sym;
-
-      oinfo->symbolic_header.ioptMax = iinfo->symbolic_header.ioptMax;
-      oinfo->external_opt = iinfo->external_opt;
-
-      oinfo->symbolic_header.iauxMax = iinfo->symbolic_header.iauxMax;
-      oinfo->external_aux = iinfo->external_aux;
-
-      oinfo->symbolic_header.issMax = iinfo->symbolic_header.issMax;
-      oinfo->ss = iinfo->ss;
-
-      oinfo->symbolic_header.ifdMax = iinfo->symbolic_header.ifdMax;
-      oinfo->external_fdr = iinfo->external_fdr;
-
-      oinfo->symbolic_header.crfd = iinfo->symbolic_header.crfd;
-      oinfo->external_rfd = iinfo->external_rfd;
-    }
-  else
-    {
-      /* We are discarding all the local symbol information.  Look
-	 through the external symbols and remove all references to FDR
-	 or aux information.  */
-      c = bfd_get_symcount (obfd);
-      sym_ptr_ptr = bfd_get_outsymbols (obfd);
-      for (; c > 0; c--, sym_ptr_ptr++)
-	{
-	  EXTR esym;
-
-	  (*(ecoff_backend (obfd)->debug_swap.swap_ext_in))
-	    (obfd, ecoffsymbol (*sym_ptr_ptr)->native, &esym);
-	  esym.ifd = ifdNil;
-	  esym.asym.index = indexNil;
-	  (*(ecoff_backend (obfd)->debug_swap.swap_ext_out))
-	    (obfd, &esym, ecoffsymbol (*sym_ptr_ptr)->native);
-	}
-    }
-
-  return true;
-}
-
-/* Set the architecture.  The supported architecture is stored in the
-   backend pointer.  We always set the architecture anyhow, since many
-   callers ignore the return value.  */
-
-boolean
-_bfd_ecoff_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  bfd_default_set_arch_mach (abfd, arch, machine);
-  return arch == ecoff_backend (abfd)->arch;
-}
-
-/* Get the size of the section headers.  */
-
-/*ARGSUSED*/
-int
-_bfd_ecoff_sizeof_headers (abfd, reloc)
-     bfd *abfd;
-     boolean reloc;
-{
-  asection *current;
-  int c;
-  int ret;
-
-  c = 0;
-  for (current = abfd->sections;
-       current != (asection *)NULL; 
-       current = current->next) 
-    ++c;
-
-  ret = (bfd_coff_filhsz (abfd)
-	 + bfd_coff_aoutsz (abfd)
-	 + c * bfd_coff_scnhsz (abfd));
-  return BFD_ALIGN (ret, 16);
-}
-
-/* Get the contents of a section.  */
-
-boolean
-_bfd_ecoff_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  return _bfd_generic_get_section_contents (abfd, section, location,
-					    offset, count);
-}
-
-/* Sort sections by VMA, but put SEC_ALLOC sections first.  This is
-   called via qsort.  */
-
-static int
-ecoff_sort_hdrs (arg1, arg2)
-     const PTR arg1;
-     const PTR arg2;
-{
-  const asection *hdr1 = *(const asection **) arg1;
-  const asection *hdr2 = *(const asection **) arg2;
-
-  if ((hdr1->flags & SEC_ALLOC) != 0)
-    {
-      if ((hdr2->flags & SEC_ALLOC) == 0)
-	return -1;
-    }
-  else
-    {
-      if ((hdr2->flags & SEC_ALLOC) != 0)
-	return 1;
-    }
-  if (hdr1->vma < hdr2->vma)
-    return -1;
-  else if (hdr1->vma > hdr2->vma)
-    return 1;
-  else
-    return 0;
-}
-
-/* Calculate the file position for each section, and set
-   reloc_filepos.  */
-
-static boolean
-ecoff_compute_section_file_positions (abfd)
-     bfd *abfd;
-{
-  file_ptr sofar, file_sofar;
-  asection **sorted_hdrs;
-  asection *current;
-  unsigned int i;
-  file_ptr old_sofar;
-  boolean rdata_in_text;
-  boolean first_data, first_nonalloc;
-  const bfd_vma round = ecoff_backend (abfd)->round;
-
-  sofar = _bfd_ecoff_sizeof_headers (abfd, false);
-  file_sofar = sofar;
-
-  /* Sort the sections by VMA.  */
-  sorted_hdrs = (asection **) bfd_malloc (abfd->section_count
-					  * sizeof (asection *));
-  if (sorted_hdrs == NULL)
-    return false;
-  for (current = abfd->sections, i = 0;
-       current != NULL;
-       current = current->next, i++)
-    sorted_hdrs[i] = current;
-  BFD_ASSERT (i == abfd->section_count);
-
-  qsort (sorted_hdrs, abfd->section_count, sizeof (asection *),
-	 ecoff_sort_hdrs);
-
-  /* Some versions of the OSF linker put the .rdata section in the
-     text segment, and some do not.  */
-  rdata_in_text = ecoff_backend (abfd)->rdata_in_text;
-  if (rdata_in_text)
-    {
-      for (i = 0; i < abfd->section_count; i++)
-	{
-	  current = sorted_hdrs[i];
-	  if (strcmp (current->name, _RDATA) == 0)
-	    break;
-	  if ((current->flags & SEC_CODE) == 0
-	      && strcmp (current->name, _PDATA) != 0
-	      && strcmp (current->name, _RCONST) != 0)
-	    {
-	      rdata_in_text = false;
-	      break;
-	    }
-	}
-    }
-  ecoff_data (abfd)->rdata_in_text = rdata_in_text;
-
-  first_data = true;
-  first_nonalloc = true;
-  for (i = 0; i < abfd->section_count; i++)
-    {
-      unsigned int alignment_power;
-
-      current = sorted_hdrs[i];
-
-      /* For the Alpha ECOFF .pdata section the lnnoptr field is
-	 supposed to indicate the number of .pdata entries that are
-	 really in the section.  Each entry is 8 bytes.  We store this
-	 away in line_filepos before increasing the section size.  */
-      if (strcmp (current->name, _PDATA) == 0)
-	current->line_filepos = current->_raw_size / 8;
-
-      alignment_power = current->alignment_power;
-
-      /* On Ultrix, the data sections in an executable file must be
-	 aligned to a page boundary within the file.  This does not
-	 affect the section size, though.  FIXME: Does this work for
-	 other platforms?  It requires some modification for the
-	 Alpha, because .rdata on the Alpha goes with the text, not
-	 the data.  */
-      if ((abfd->flags & EXEC_P) != 0
-	  && (abfd->flags & D_PAGED) != 0
-	  && ! first_data
-	  && (current->flags & SEC_CODE) == 0
-	  && (! rdata_in_text
-	      || strcmp (current->name, _RDATA) != 0)
-	  && strcmp (current->name, _PDATA) != 0
-	  && strcmp (current->name, _RCONST) != 0)
-	{
-	  sofar = (sofar + round - 1) &~ (round - 1);
-	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
-	  first_data = false;
-	}
-      else if (strcmp (current->name, _LIB) == 0)
-	{
-	  /* On Irix 4, the location of contents of the .lib section
-	     from a shared library section is also rounded up to a
-	     page boundary.  */
-
-	  sofar = (sofar + round - 1) &~ (round - 1);
-	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
-	}
-      else if (first_nonalloc
-	       && (current->flags & SEC_ALLOC) == 0
-	       && (abfd->flags & D_PAGED) != 0)
-	{
-	  /* Skip up to the next page for an unallocated section, such
-             as the .comment section on the Alpha.  This leaves room
-             for the .bss section.  */
-	  first_nonalloc = false;
-	  sofar = (sofar + round - 1) &~ (round - 1);
-	  file_sofar = (file_sofar + round - 1) &~ (round - 1);
-	}
-
-      /* Align the sections in the file to the same boundary on
-	 which they are aligned in virtual memory.  */
-      sofar = BFD_ALIGN (sofar, 1 << alignment_power);
-      if ((current->flags & SEC_HAS_CONTENTS) != 0)
-	file_sofar = BFD_ALIGN (file_sofar, 1 << alignment_power);
-
-      if ((abfd->flags & D_PAGED) != 0
-	  && (current->flags & SEC_ALLOC) != 0)
-	{
-	  sofar += (current->vma - sofar) % round;
-	  if ((current->flags & SEC_HAS_CONTENTS) != 0)
-	    file_sofar += (current->vma - file_sofar) % round;
-	}
-
-      if ((current->flags & (SEC_HAS_CONTENTS | SEC_LOAD)) != 0)
-	current->filepos = file_sofar;
-
-      sofar += current->_raw_size;
-      if ((current->flags & SEC_HAS_CONTENTS) != 0)
-	file_sofar += current->_raw_size;
-
-      /* make sure that this section is of the right size too */
-      old_sofar = sofar;
-      sofar = BFD_ALIGN (sofar, 1 << alignment_power);
-      if ((current->flags & SEC_HAS_CONTENTS) != 0)
-	file_sofar = BFD_ALIGN (file_sofar, 1 << alignment_power);
-      current->_raw_size += sofar - old_sofar;
-    }
-
-  free (sorted_hdrs);
-  sorted_hdrs = NULL;
-
-  ecoff_data (abfd)->reloc_filepos = file_sofar;
-
-  return true;
-}
-
-/* Determine the location of the relocs for all the sections in the
-   output file, as well as the location of the symbolic debugging
-   information.  */
-
-static bfd_size_type
-ecoff_compute_reloc_file_positions (abfd)
-     bfd *abfd;
-{
-  const bfd_size_type external_reloc_size =
-    ecoff_backend (abfd)->external_reloc_size;
-  file_ptr reloc_base;
-  bfd_size_type reloc_size;
-  asection *current;
-  file_ptr sym_base;
-
-  if (! abfd->output_has_begun)
-    {
-      if (! ecoff_compute_section_file_positions (abfd))
-	abort ();
-      abfd->output_has_begun = true;
-    }
-  
-  reloc_base = ecoff_data (abfd)->reloc_filepos;
-
-  reloc_size = 0;
-  for (current = abfd->sections;
-       current != (asection *)NULL; 
-       current = current->next) 
-    {
-      if (current->reloc_count == 0)
-	current->rel_filepos = 0;
-      else
-	{
-	  bfd_size_type relsize;
-
-	  current->rel_filepos = reloc_base;
-	  relsize = current->reloc_count * external_reloc_size;
-	  reloc_size += relsize;
-	  reloc_base += relsize;
-	}
-    }
-
-  sym_base = ecoff_data (abfd)->reloc_filepos + reloc_size;
-
-  /* At least on Ultrix, the symbol table of an executable file must
-     be aligned to a page boundary.  FIXME: Is this true on other
-     platforms?  */
-  if ((abfd->flags & EXEC_P) != 0
-      && (abfd->flags & D_PAGED) != 0)
-    sym_base = ((sym_base + ecoff_backend (abfd)->round - 1)
-		&~ (ecoff_backend (abfd)->round - 1));
-
-  ecoff_data (abfd)->sym_filepos = sym_base;
-
-  return reloc_size;
-}
-
-/* Set the contents of a section.  */
-
-boolean
-_bfd_ecoff_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  /* This must be done first, because bfd_set_section_contents is
-     going to set output_has_begun to true.  */
-  if (abfd->output_has_begun == false)
-    {
-      if (! ecoff_compute_section_file_positions (abfd))
-	return false;
-    }
-
-  /* Handle the .lib section specially so that Irix 4 shared libraries
-     work out.  See coff_set_section_contents in coffcode.h.  */
-  if (strcmp (section->name, _LIB) == 0)
-    {
-      bfd_byte *rec, *recend;
-
-      rec = (bfd_byte *) location;
-      recend = rec + count;
-      while (rec < recend)
-	{
-	  ++section->lma;
-	  rec += bfd_get_32 (abfd, rec) * 4;
-	}
-
-      BFD_ASSERT (rec == recend);
-    }
-
-  if (count == 0)
-    return true;
-
-  if (bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0
-      || bfd_write (location, 1, count, abfd) != count)
-    return false;
-
-  return true;
-}
-
-/* Get the GP value for an ECOFF file.  This is a hook used by
-   nlmconv.  */
-
-bfd_vma
-bfd_ecoff_get_gp_value (abfd)
-     bfd *abfd;
-{
-  if (bfd_get_flavour (abfd) != bfd_target_ecoff_flavour
-      || bfd_get_format (abfd) != bfd_object)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return 0;
-    }
-  
-  return ecoff_data (abfd)->gp;
-}
-
-/* Set the GP value for an ECOFF file.  This is a hook used by the
-   assembler.  */
-
-boolean
-bfd_ecoff_set_gp_value (abfd, gp_value)
-     bfd *abfd;
-     bfd_vma gp_value;
-{
-  if (bfd_get_flavour (abfd) != bfd_target_ecoff_flavour
-      || bfd_get_format (abfd) != bfd_object)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  ecoff_data (abfd)->gp = gp_value;
-
-  return true;
-}
-
-/* Set the register masks for an ECOFF file.  This is a hook used by
-   the assembler.  */
-
-boolean
-bfd_ecoff_set_regmasks (abfd, gprmask, fprmask, cprmask)
-     bfd *abfd;
-     unsigned long gprmask;
-     unsigned long fprmask;
-     unsigned long *cprmask;
-{
-  ecoff_data_type *tdata;
-
-  if (bfd_get_flavour (abfd) != bfd_target_ecoff_flavour
-      || bfd_get_format (abfd) != bfd_object)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  tdata = ecoff_data (abfd);
-  tdata->gprmask = gprmask;
-  tdata->fprmask = fprmask;
-  if (cprmask != (unsigned long *) NULL)
-    {
-      register int i;
-
-      for (i = 0; i < 3; i++)
-	tdata->cprmask[i] = cprmask[i];
-    }
-
-  return true;
-}
-
-/* Get ECOFF EXTR information for an external symbol.  This function
-   is passed to bfd_ecoff_debug_externals.  */
-
-static boolean
-ecoff_get_extr (sym, esym)
-     asymbol *sym;
-     EXTR *esym;
-{
-  ecoff_symbol_type *ecoff_sym_ptr;
-  bfd *input_bfd;
-
-  if (bfd_asymbol_flavour (sym) != bfd_target_ecoff_flavour
-      || ecoffsymbol (sym)->native == NULL)
-    {
-      /* Don't include debugging, local, or section symbols.  */
-      if ((sym->flags & BSF_DEBUGGING) != 0
-	  || (sym->flags & BSF_LOCAL) != 0
-	  || (sym->flags & BSF_SECTION_SYM) != 0)
-	return false;
-
-      esym->jmptbl = 0;
-      esym->cobol_main = 0;
-      esym->weakext = (sym->flags & BSF_WEAK) != 0;
-      esym->reserved = 0;
-      esym->ifd = ifdNil;
-      /* FIXME: we can do better than this for st and sc.  */
-      esym->asym.st = stGlobal;
-      esym->asym.sc = scAbs;
-      esym->asym.reserved = 0;
-      esym->asym.index = indexNil;
-      return true;
-    }
-
-  ecoff_sym_ptr = ecoffsymbol (sym);
-
-  if (ecoff_sym_ptr->local)
-    return false;
-
-  input_bfd = bfd_asymbol_bfd (sym);
-  (*(ecoff_backend (input_bfd)->debug_swap.swap_ext_in))
-    (input_bfd, ecoff_sym_ptr->native, esym);
-
-  /* If the symbol was defined by the linker, then esym will be
-     undefined but sym will not be.  Get a better class for such a
-     symbol.  */
-  if ((esym->asym.sc == scUndefined
-       || esym->asym.sc == scSUndefined)
-      && ! bfd_is_und_section (bfd_get_section (sym)))
-    esym->asym.sc = scAbs;
-
-  /* Adjust the FDR index for the symbol by that used for the input
-     BFD.  */
-  if (esym->ifd != -1)
-    {
-      struct ecoff_debug_info *input_debug;
-
-      input_debug = &ecoff_data (input_bfd)->debug_info;
-      BFD_ASSERT (esym->ifd < input_debug->symbolic_header.ifdMax);
-      if (input_debug->ifdmap != (RFDT *) NULL)
-	esym->ifd = input_debug->ifdmap[esym->ifd];
-    }
-
-  return true;
-}
-
-/* Set the external symbol index.  This routine is passed to
-   bfd_ecoff_debug_externals.  */
-
-static void
-ecoff_set_index (sym, indx)
-     asymbol *sym;
-     bfd_size_type indx;
-{
-  ecoff_set_sym_index (sym, indx);
-}
-
-/* Write out an ECOFF file.  */
-
-boolean
-_bfd_ecoff_write_object_contents (abfd)
-     bfd *abfd;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  const bfd_vma round = backend->round;
-  const bfd_size_type filhsz = bfd_coff_filhsz (abfd);
-  const bfd_size_type aoutsz = bfd_coff_aoutsz (abfd);
-  const bfd_size_type scnhsz = bfd_coff_scnhsz (abfd);
-  const bfd_size_type external_hdr_size
-    = backend->debug_swap.external_hdr_size;
-  const bfd_size_type external_reloc_size = backend->external_reloc_size;
-  void (* const adjust_reloc_out) PARAMS ((bfd *,
-					   const arelent *,
-					   struct internal_reloc *))
-    = backend->adjust_reloc_out;
-  void (* const swap_reloc_out) PARAMS ((bfd *,
-					 const struct internal_reloc *,
-					 PTR))
-    = backend->swap_reloc_out;
-  struct ecoff_debug_info * const debug = &ecoff_data (abfd)->debug_info;
-  HDRR * const symhdr = &debug->symbolic_header;
-  asection *current;
-  unsigned int count;
-  bfd_size_type reloc_size;
-  bfd_size_type text_size;
-  bfd_vma text_start;
-  boolean set_text_start;
-  bfd_size_type data_size;
-  bfd_vma data_start;
-  boolean set_data_start;
-  bfd_size_type bss_size;
-  PTR buff = NULL;
-  PTR reloc_buff = NULL;
-  struct internal_filehdr internal_f;
-  struct internal_aouthdr internal_a;
-  int i;
-
-  /* Determine where the sections and relocs will go in the output
-     file.  */
-  reloc_size = ecoff_compute_reloc_file_positions (abfd);
-
-  count = 1;
-  for (current = abfd->sections;
-       current != (asection *)NULL; 
-       current = current->next) 
-    {
-      current->target_index = count;
-      ++count;
-    }
-
-  if ((abfd->flags & D_PAGED) != 0)
-    text_size = _bfd_ecoff_sizeof_headers (abfd, false);
-  else
-    text_size = 0;
-  text_start = 0;
-  set_text_start = false;
-  data_size = 0;
-  data_start = 0;
-  set_data_start = false;
-  bss_size = 0;
-
-  /* Write section headers to the file.  */
-
-  /* Allocate buff big enough to hold a section header,
-     file header, or a.out header.  */
-  {
-    bfd_size_type siz;
-    siz = scnhsz;
-    if (siz < filhsz)
-      siz = filhsz;
-    if (siz < aoutsz)
-      siz = aoutsz;
-    buff = (PTR) bfd_malloc ((size_t) siz);
-    if (buff == NULL)
-      goto error_return;
-  }
-
-  internal_f.f_nscns = 0;
-  if (bfd_seek (abfd, (file_ptr) (filhsz + aoutsz), SEEK_SET) != 0)
-    goto error_return;
-  for (current = abfd->sections;
-       current != (asection *) NULL;
-       current = current->next)
-    {
-      struct internal_scnhdr section;
-      bfd_vma vma;
-
-      ++internal_f.f_nscns;
-
-      strncpy (section.s_name, current->name, sizeof section.s_name);
-
-      /* This seems to be correct for Irix 4 shared libraries.  */
-      vma = bfd_get_section_vma (abfd, current);
-      if (strcmp (current->name, _LIB) == 0)
-	section.s_vaddr = 0;
-      else
-	section.s_vaddr = vma;
-
-      section.s_paddr = current->lma;
-      section.s_size = bfd_get_section_size_before_reloc (current);
-
-      /* If this section is unloadable then the scnptr will be 0.  */
-      if ((current->flags & (SEC_LOAD | SEC_HAS_CONTENTS)) == 0)
-	section.s_scnptr = 0;
-      else
-	section.s_scnptr = current->filepos;
-      section.s_relptr = current->rel_filepos;
-
-      /* FIXME: the lnnoptr of the .sbss or .sdata section of an
-	 object file produced by the assembler is supposed to point to
-	 information about how much room is required by objects of
-	 various different sizes.  I think this only matters if we
-	 want the linker to compute the best size to use, or
-	 something.  I don't know what happens if the information is
-	 not present.  */
-      if (strcmp (current->name, _PDATA) != 0)
-	section.s_lnnoptr = 0;
-      else
-	{
-	  /* The Alpha ECOFF .pdata section uses the lnnoptr field to
-	     hold the number of entries in the section (each entry is
-	     8 bytes).  We stored this in the line_filepos field in
-	     ecoff_compute_section_file_positions.  */
-	  section.s_lnnoptr = current->line_filepos;
-	}
-
-      section.s_nreloc = current->reloc_count;
-      section.s_nlnno = 0;
-      section.s_flags = ecoff_sec_to_styp_flags (current->name,
-						 current->flags);
-
-      if (bfd_coff_swap_scnhdr_out (abfd, (PTR) &section, buff) == 0
-	  || bfd_write (buff, 1, scnhsz, abfd) != scnhsz)
-	goto error_return;
-
-      if ((section.s_flags & STYP_TEXT) != 0
-	  || ((section.s_flags & STYP_RDATA) != 0
-	      && ecoff_data (abfd)->rdata_in_text)
-	  || section.s_flags == STYP_PDATA
-	  || (section.s_flags & STYP_DYNAMIC) != 0
-	  || (section.s_flags & STYP_LIBLIST) != 0
-	  || (section.s_flags & STYP_RELDYN) != 0
-	  || section.s_flags == STYP_CONFLIC
-	  || (section.s_flags & STYP_DYNSTR) != 0
-	  || (section.s_flags & STYP_DYNSYM) != 0
-	  || (section.s_flags & STYP_HASH) != 0
-	  || (section.s_flags & STYP_ECOFF_INIT) != 0
-	  || (section.s_flags & STYP_ECOFF_FINI) != 0
-	  || section.s_flags == STYP_RCONST)
-	{
-	  text_size += bfd_get_section_size_before_reloc (current);
-	  if (! set_text_start || text_start > vma)
-	    {
-	      text_start = vma;
-	      set_text_start = true;
-	    }
-	}
-      else if ((section.s_flags & STYP_RDATA) != 0
-	       || (section.s_flags & STYP_DATA) != 0
-	       || (section.s_flags & STYP_LITA) != 0
-	       || (section.s_flags & STYP_LIT8) != 0
-	       || (section.s_flags & STYP_LIT4) != 0
-	       || (section.s_flags & STYP_SDATA) != 0
-	       || section.s_flags == STYP_XDATA
-	       || (section.s_flags & STYP_GOT) != 0)
-	{
-	  data_size += bfd_get_section_size_before_reloc (current);
-	  if (! set_data_start || data_start > vma)
-	    {
-	      data_start = vma;
-	      set_data_start = true;
-	    }
-	}
-      else if ((section.s_flags & STYP_BSS) != 0
-	       || (section.s_flags & STYP_SBSS) != 0)
-	bss_size += bfd_get_section_size_before_reloc (current);
-      else if (section.s_flags == 0
-	       || (section.s_flags & STYP_ECOFF_LIB) != 0
-	       || section.s_flags == STYP_COMMENT)
-	/* Do nothing */ ;
-      else
-	abort ();
-    }	
-
-  /* Set up the file header.  */
-
-  internal_f.f_magic = ecoff_get_magic (abfd);
-
-  /* We will NOT put a fucking timestamp in the header here. Every
-     time you put it back, I will come in and take it out again.  I'm
-     sorry.  This field does not belong here.  We fill it with a 0 so
-     it compares the same but is not a reasonable time. --
-     gnu@cygnus.com.  */
-  internal_f.f_timdat = 0;
-
-  if (bfd_get_symcount (abfd) != 0)
-    {
-      /* The ECOFF f_nsyms field is not actually the number of
-	 symbols, it's the size of symbolic information header.  */
-      internal_f.f_nsyms = external_hdr_size;
-      internal_f.f_symptr = ecoff_data (abfd)->sym_filepos;
-    }
-  else
-    {
-      internal_f.f_nsyms = 0;
-      internal_f.f_symptr = 0;
-    }
-
-  internal_f.f_opthdr = aoutsz;
-
-  internal_f.f_flags = F_LNNO;
-  if (reloc_size == 0)
-    internal_f.f_flags |= F_RELFLG;
-  if (bfd_get_symcount (abfd) == 0)
-    internal_f.f_flags |= F_LSYMS;
-  if (abfd->flags & EXEC_P)
-    internal_f.f_flags |= F_EXEC;
-
-  if (bfd_little_endian (abfd))
-    internal_f.f_flags |= F_AR32WR;
-  else
-    internal_f.f_flags |= F_AR32W;
-
-  /* Set up the ``optional'' header.  */
-  if ((abfd->flags & D_PAGED) != 0)
-    internal_a.magic = ECOFF_AOUT_ZMAGIC;
-  else
-    internal_a.magic = ECOFF_AOUT_OMAGIC;
-
-  /* FIXME: Is this really correct?  */
-  internal_a.vstamp = symhdr->vstamp;
-
-  /* At least on Ultrix, these have to be rounded to page boundaries.
-     FIXME: Is this true on other platforms?  */
-  if ((abfd->flags & D_PAGED) != 0)
-    {
-      internal_a.tsize = (text_size + round - 1) &~ (round - 1);
-      internal_a.text_start = text_start &~ (round - 1);
-      internal_a.dsize = (data_size + round - 1) &~ (round - 1);
-      internal_a.data_start = data_start &~ (round - 1);
-    }
-  else
-    {
-      internal_a.tsize = text_size;
-      internal_a.text_start = text_start;
-      internal_a.dsize = data_size;
-      internal_a.data_start = data_start;
-    }
-
-  /* On Ultrix, the initial portions of the .sbss and .bss segments
-     are at the end of the data section.  The bsize field in the
-     optional header records how many bss bytes are required beyond
-     those in the data section.  The value is not rounded to a page
-     boundary.  */
-  if (bss_size < internal_a.dsize - data_size)
-    bss_size = 0;
-  else
-    bss_size -= internal_a.dsize - data_size;
-  internal_a.bsize = bss_size;
-  internal_a.bss_start = internal_a.data_start + internal_a.dsize;
-
-  internal_a.entry = bfd_get_start_address (abfd);
-
-  internal_a.gp_value = ecoff_data (abfd)->gp;
-
-  internal_a.gprmask = ecoff_data (abfd)->gprmask;
-  internal_a.fprmask = ecoff_data (abfd)->fprmask;
-  for (i = 0; i < 4; i++)
-    internal_a.cprmask[i] = ecoff_data (abfd)->cprmask[i];
-
-  /* Let the backend adjust the headers if necessary.  */
-  if (backend->adjust_headers)
-    {
-      if (! (*backend->adjust_headers) (abfd, &internal_f, &internal_a))
-	goto error_return;
-    }
-
-  /* Write out the file header and the optional header.  */
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    goto error_return;
-
-  bfd_coff_swap_filehdr_out (abfd, (PTR) &internal_f, buff);
-  if (bfd_write (buff, 1, filhsz, abfd) != filhsz)
-    goto error_return;
-
-  bfd_coff_swap_aouthdr_out (abfd, (PTR) &internal_a, buff);
-  if (bfd_write (buff, 1, aoutsz, abfd) != aoutsz)
-    goto error_return;
-
-  /* Build the external symbol information.  This must be done before
-     writing out the relocs so that we know the symbol indices.  We
-     don't do this if this BFD was created by the backend linker,
-     since it will have already handled the symbols and relocs.  */
-  if (! ecoff_data (abfd)->linker)
-    {
-      symhdr->iextMax = 0;
-      symhdr->issExtMax = 0;
-      debug->external_ext = debug->external_ext_end = NULL;
-      debug->ssext = debug->ssext_end = NULL;
-      if (bfd_ecoff_debug_externals (abfd, debug, &backend->debug_swap,
-				     (((abfd->flags & EXEC_P) == 0)
-				      ? true : false),
-				     ecoff_get_extr, ecoff_set_index)
-	  == false)
-	goto error_return;
-
-      /* Write out the relocs.  */
-      for (current = abfd->sections;
-	   current != (asection *) NULL;
-	   current = current->next)
-	{
-	  arelent **reloc_ptr_ptr;
-	  arelent **reloc_end;
-	  char *out_ptr;
-
-	  if (current->reloc_count == 0)
-	    continue;
-
-	  reloc_buff =
-	    bfd_alloc (abfd, current->reloc_count * external_reloc_size);
-	  if (reloc_buff == NULL)
-	    goto error_return;
-
-	  reloc_ptr_ptr = current->orelocation;
-	  reloc_end = reloc_ptr_ptr + current->reloc_count;
-	  out_ptr = (char *) reloc_buff;
-	  for (;
-	       reloc_ptr_ptr < reloc_end;
-	       reloc_ptr_ptr++, out_ptr += external_reloc_size)
-	    {
-	      arelent *reloc;
-	      asymbol *sym;
-	      struct internal_reloc in;
-	  
-	      memset ((PTR) &in, 0, sizeof in);
-
-	      reloc = *reloc_ptr_ptr;
-	      sym = *reloc->sym_ptr_ptr;
-
-	      in.r_vaddr = (reloc->address
-			    + bfd_get_section_vma (abfd, current));
-	      in.r_type = reloc->howto->type;
-
-	      if ((sym->flags & BSF_SECTION_SYM) == 0)
-		{
-		  in.r_symndx = ecoff_get_sym_index (*reloc->sym_ptr_ptr);
-		  in.r_extern = 1;
-		}
-	      else
-		{
-		  CONST char *name;
-
-		  name = bfd_get_section_name (abfd, bfd_get_section (sym));
-		  if (strcmp (name, ".text") == 0)
-		    in.r_symndx = RELOC_SECTION_TEXT;
-		  else if (strcmp (name, ".rdata") == 0)
-		    in.r_symndx = RELOC_SECTION_RDATA;
-		  else if (strcmp (name, ".data") == 0)
-		    in.r_symndx = RELOC_SECTION_DATA;
-		  else if (strcmp (name, ".sdata") == 0)
-		    in.r_symndx = RELOC_SECTION_SDATA;
-		  else if (strcmp (name, ".sbss") == 0)
-		    in.r_symndx = RELOC_SECTION_SBSS;
-		  else if (strcmp (name, ".bss") == 0)
-		    in.r_symndx = RELOC_SECTION_BSS;
-		  else if (strcmp (name, ".init") == 0)
-		    in.r_symndx = RELOC_SECTION_INIT;
-		  else if (strcmp (name, ".lit8") == 0)
-		    in.r_symndx = RELOC_SECTION_LIT8;
-		  else if (strcmp (name, ".lit4") == 0)
-		    in.r_symndx = RELOC_SECTION_LIT4;
-		  else if (strcmp (name, ".xdata") == 0)
-		    in.r_symndx = RELOC_SECTION_XDATA;
-		  else if (strcmp (name, ".pdata") == 0)
-		    in.r_symndx = RELOC_SECTION_PDATA;
-		  else if (strcmp (name, ".fini") == 0)
-		    in.r_symndx = RELOC_SECTION_FINI;
-		  else if (strcmp (name, ".lita") == 0)
-		    in.r_symndx = RELOC_SECTION_LITA;
-		  else if (strcmp (name, "*ABS*") == 0)
-		    in.r_symndx = RELOC_SECTION_ABS;
-		  else if (strcmp (name, ".rconst") == 0)
-		    in.r_symndx = RELOC_SECTION_RCONST;
-		  else
-		    abort ();
-		  in.r_extern = 0;
-		}
-
-	      (*adjust_reloc_out) (abfd, reloc, &in);
-
-	      (*swap_reloc_out) (abfd, &in, (PTR) out_ptr);
-	    }
-
-	  if (bfd_seek (abfd, current->rel_filepos, SEEK_SET) != 0)
-	    goto error_return;
-	  if (bfd_write (reloc_buff,
-			 external_reloc_size, current->reloc_count, abfd)
-	      != external_reloc_size * current->reloc_count)
-	    goto error_return;
-	  bfd_release (abfd, reloc_buff);
-	  reloc_buff = NULL;
-	}
-
-      /* Write out the symbolic debugging information.  */
-      if (bfd_get_symcount (abfd) > 0)
-	{
-	  /* Write out the debugging information.  */
-	  if (bfd_ecoff_write_debug (abfd, debug, &backend->debug_swap,
-				     ecoff_data (abfd)->sym_filepos)
-	      == false)
-	    goto error_return;
-	}
-    }
-
-  /* The .bss section of a demand paged executable must receive an
-     entire page.  If there are symbols, the symbols will start on the
-     next page.  If there are no symbols, we must fill out the page by
-     hand.  */
-  if (bfd_get_symcount (abfd) == 0
-      && (abfd->flags & EXEC_P) != 0
-      && (abfd->flags & D_PAGED) != 0)
-    {
-      char c;
-
-      if (bfd_seek (abfd, (file_ptr) ecoff_data (abfd)->sym_filepos - 1,
-		    SEEK_SET) != 0)
-	goto error_return;
-      if (bfd_read (&c, 1, 1, abfd) == 0)
-	c = 0;
-      if (bfd_seek (abfd, (file_ptr) ecoff_data (abfd)->sym_filepos - 1,
-		    SEEK_SET) != 0)
-	goto error_return;
-      if (bfd_write (&c, 1, 1, abfd) != 1)
-	goto error_return;
-    }
-
-  if (reloc_buff != NULL)
-    bfd_release (abfd, reloc_buff);
-  if (buff != NULL)
-    free (buff);
-  return true;
- error_return:
-  if (reloc_buff != NULL)
-    bfd_release (abfd, reloc_buff);
-  if (buff != NULL)
-    free (buff);
-  return false;
-}
-
-/* Archive handling.  ECOFF uses what appears to be a unique type of
-   archive header (armap).  The byte ordering of the armap and the
-   contents are encoded in the name of the armap itself.  At least for
-   now, we only support archives with the same byte ordering in the
-   armap and the contents.
-
-   The first four bytes in the armap are the number of symbol
-   definitions.  This is always a power of two.
-
-   This is followed by the symbol definitions.  Each symbol definition
-   occupies 8 bytes.  The first four bytes are the offset from the
-   start of the armap strings to the null-terminated string naming
-   this symbol.  The second four bytes are the file offset to the
-   archive member which defines this symbol.  If the second four bytes
-   are 0, then this is not actually a symbol definition, and it should
-   be ignored.
-
-   The symbols are hashed into the armap with a closed hashing scheme.
-   See the functions below for the details of the algorithm.
-
-   After the symbol definitions comes four bytes holding the size of
-   the string table, followed by the string table itself.  */
-
-/* The name of an archive headers looks like this:
-   __________E[BL]E[BL]_ (with a trailing space).
-   The trailing space is changed to an X if the archive is changed to
-   indicate that the armap is out of date.
-
-   The Alpha seems to use ________64E[BL]E[BL]_.  */
-
-#define ARMAP_BIG_ENDIAN 'B'
-#define ARMAP_LITTLE_ENDIAN 'L'
-#define ARMAP_MARKER 'E'
-#define ARMAP_START_LENGTH 10
-#define ARMAP_HEADER_MARKER_INDEX 10
-#define ARMAP_HEADER_ENDIAN_INDEX 11
-#define ARMAP_OBJECT_MARKER_INDEX 12
-#define ARMAP_OBJECT_ENDIAN_INDEX 13
-#define ARMAP_END_INDEX 14
-#define ARMAP_END "_ "
-
-/* This is a magic number used in the hashing algorithm.  */
-#define ARMAP_HASH_MAGIC 0x9dd68ab5
-
-/* This returns the hash value to use for a string.  It also sets
-   *REHASH to the rehash adjustment if the first slot is taken.  SIZE
-   is the number of entries in the hash table, and HLOG is the log
-   base 2 of SIZE.  */
-
-static unsigned int
-ecoff_armap_hash (s, rehash, size, hlog)
-     CONST char *s;
-     unsigned int *rehash;
-     unsigned int size;
-     unsigned int hlog;
-{
-  unsigned int hash;
-
-  if (hlog == 0)
-    return 0;
-  hash = *s++;
-  while (*s != '\0')
-    hash = ((hash >> 27) | (hash << 5)) + *s++;
-  hash *= ARMAP_HASH_MAGIC;
-  *rehash = (hash & (size - 1)) | 1;
-  return hash >> (32 - hlog);
-}
-
-/* Read in the armap.  */
-
-boolean
-_bfd_ecoff_slurp_armap (abfd)
-     bfd *abfd;
-{
-  char nextname[17];
-  unsigned int i;
-  struct areltdata *mapdata;
-  bfd_size_type parsed_size;
-  char *raw_armap;
-  struct artdata *ardata;
-  unsigned int count;
-  char *raw_ptr;
-  struct symdef *symdef_ptr;
-  char *stringbase;
-  
-  /* Get the name of the first element.  */
-  i = bfd_read ((PTR) nextname, 1, 16, abfd);
-  if (i == 0)
-      return true;
-  if (i != 16)
-      return false;
-
-  if (bfd_seek (abfd, (file_ptr) -16, SEEK_CUR) != 0)
-    return false;
-
-  /* Irix 4.0.5F apparently can use either an ECOFF armap or a
-     standard COFF armap.  We could move the ECOFF armap stuff into
-     bfd_slurp_armap, but that seems inappropriate since no other
-     target uses this format.  Instead, we check directly for a COFF
-     armap.  */
-  if (strncmp (nextname, "/               ", 16) == 0)
-    return bfd_slurp_armap (abfd);
-
-  /* See if the first element is an armap.  */
-  if (strncmp (nextname, ecoff_backend (abfd)->armap_start,
-	       ARMAP_START_LENGTH) != 0
-      || nextname[ARMAP_HEADER_MARKER_INDEX] != ARMAP_MARKER
-      || (nextname[ARMAP_HEADER_ENDIAN_INDEX] != ARMAP_BIG_ENDIAN
-	  && nextname[ARMAP_HEADER_ENDIAN_INDEX] != ARMAP_LITTLE_ENDIAN)
-      || nextname[ARMAP_OBJECT_MARKER_INDEX] != ARMAP_MARKER
-      || (nextname[ARMAP_OBJECT_ENDIAN_INDEX] != ARMAP_BIG_ENDIAN
-	  && nextname[ARMAP_OBJECT_ENDIAN_INDEX] != ARMAP_LITTLE_ENDIAN)
-      || strncmp (nextname + ARMAP_END_INDEX,
-		  ARMAP_END, sizeof ARMAP_END - 1) != 0)
-    {
-      bfd_has_map (abfd) = false;
-      return true;
-    }
-
-  /* Make sure we have the right byte ordering.  */
-  if (((nextname[ARMAP_HEADER_ENDIAN_INDEX] == ARMAP_BIG_ENDIAN)
-       ^ (bfd_header_big_endian (abfd)))
-      || ((nextname[ARMAP_OBJECT_ENDIAN_INDEX] == ARMAP_BIG_ENDIAN)
-	  ^ (bfd_big_endian (abfd))))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  /* Read in the armap.  */
-  ardata = bfd_ardata (abfd);
-  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
-  if (mapdata == (struct areltdata *) NULL)
-    return false;
-  parsed_size = mapdata->parsed_size;
-  bfd_release (abfd, (PTR) mapdata);
-    
-  raw_armap = (char *) bfd_alloc (abfd, parsed_size);
-  if (raw_armap == (char *) NULL)
-    return false;
-    
-  if (bfd_read ((PTR) raw_armap, 1, parsed_size, abfd) != parsed_size)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_malformed_archive);
-      bfd_release (abfd, (PTR) raw_armap);
-      return false;
-    }
-    
-  ardata->tdata = (PTR) raw_armap;
-
-  count = bfd_h_get_32 (abfd, (PTR) raw_armap);
-
-  ardata->symdef_count = 0;
-  ardata->cache = (struct ar_cache *) NULL;
-
-  /* This code used to overlay the symdefs over the raw archive data,
-     but that doesn't work on a 64 bit host.  */
-
-  stringbase = raw_armap + count * 8 + 8;
-
-#ifdef CHECK_ARMAP_HASH
-  {
-    unsigned int hlog;
-
-    /* Double check that I have the hashing algorithm right by making
-       sure that every symbol can be looked up successfully.  */
-    hlog = 0;
-    for (i = 1; i < count; i <<= 1)
-      hlog++;
-    BFD_ASSERT (i == count);
-
-    raw_ptr = raw_armap + 4;
-    for (i = 0; i < count; i++, raw_ptr += 8)
-      {
-	unsigned int name_offset, file_offset;
-	unsigned int hash, rehash, srch;
-      
-	name_offset = bfd_h_get_32 (abfd, (PTR) raw_ptr);
-	file_offset = bfd_h_get_32 (abfd, (PTR) (raw_ptr + 4));
-	if (file_offset == 0)
-	  continue;
-	hash = ecoff_armap_hash (stringbase + name_offset, &rehash, count,
-				 hlog);
-	if (hash == i)
-	  continue;
-
-	/* See if we can rehash to this location.  */
-	for (srch = (hash + rehash) & (count - 1);
-	     srch != hash && srch != i;
-	     srch = (srch + rehash) & (count - 1))
-	  BFD_ASSERT (bfd_h_get_32 (abfd, (PTR) (raw_armap + 8 + srch * 8))
-		      != 0);
-	BFD_ASSERT (srch == i);
-      }
-  }
-
-#endif /* CHECK_ARMAP_HASH */
-
-  raw_ptr = raw_armap + 4;
-  for (i = 0; i < count; i++, raw_ptr += 8)
-    if (bfd_h_get_32 (abfd, (PTR) (raw_ptr + 4)) != 0)
-      ++ardata->symdef_count;
-
-  symdef_ptr = ((struct symdef *)
-		bfd_alloc (abfd,
-			   ardata->symdef_count * sizeof (struct symdef)));
-  if (!symdef_ptr)
-    return false;
-
-  ardata->symdefs = (carsym *) symdef_ptr;
-
-  raw_ptr = raw_armap + 4;
-  for (i = 0; i < count; i++, raw_ptr += 8)
-    {
-      unsigned int name_offset, file_offset;
-
-      file_offset = bfd_h_get_32 (abfd, (PTR) (raw_ptr + 4));
-      if (file_offset == 0)
-	continue;
-      name_offset = bfd_h_get_32 (abfd, (PTR) raw_ptr);
-      symdef_ptr->s.name = stringbase + name_offset;
-      symdef_ptr->file_offset = file_offset;
-      ++symdef_ptr;
-    }
-
-  ardata->first_file_filepos = bfd_tell (abfd);
-  /* Pad to an even boundary.  */
-  ardata->first_file_filepos += ardata->first_file_filepos % 2;
-
-  bfd_has_map (abfd) = true;
-
-  return true;
-}
-
-/* Write out an armap.  */
-
-boolean
-_bfd_ecoff_write_armap (abfd, elength, map, orl_count, stridx)
-     bfd *abfd;
-     unsigned int elength;
-     struct orl *map;
-     unsigned int orl_count;
-     int stridx;
-{
-  unsigned int hashsize, hashlog;
-  unsigned int symdefsize;
-  int padit;
-  unsigned int stringsize;
-  unsigned int mapsize;
-  file_ptr firstreal;
-  struct ar_hdr hdr;
-  struct stat statbuf;
-  unsigned int i;
-  bfd_byte temp[4];
-  bfd_byte *hashtable;
-  bfd *current;
-  bfd *last_elt;
-
-  /* Ultrix appears to use as a hash table size the least power of two
-     greater than twice the number of entries.  */
-  for (hashlog = 0; ((unsigned int) 1 << hashlog) <= 2 * orl_count; hashlog++)
-    ;
-  hashsize = 1 << hashlog;
-
-  symdefsize = hashsize * 8;
-  padit = stridx % 2;
-  stringsize = stridx + padit;
-
-  /* Include 8 bytes to store symdefsize and stringsize in output. */
-  mapsize = symdefsize + stringsize + 8;
-
-  firstreal = SARMAG + sizeof (struct ar_hdr) + mapsize + elength;
-
-  memset ((PTR) &hdr, 0, sizeof hdr);
-
-  /* Work out the ECOFF armap name.  */
-  strcpy (hdr.ar_name, ecoff_backend (abfd)->armap_start);
-  hdr.ar_name[ARMAP_HEADER_MARKER_INDEX] = ARMAP_MARKER;
-  hdr.ar_name[ARMAP_HEADER_ENDIAN_INDEX] =
-    (bfd_header_big_endian (abfd)
-     ? ARMAP_BIG_ENDIAN
-     : ARMAP_LITTLE_ENDIAN);
-  hdr.ar_name[ARMAP_OBJECT_MARKER_INDEX] = ARMAP_MARKER;
-  hdr.ar_name[ARMAP_OBJECT_ENDIAN_INDEX] =
-    bfd_big_endian (abfd) ? ARMAP_BIG_ENDIAN : ARMAP_LITTLE_ENDIAN;
-  memcpy (hdr.ar_name + ARMAP_END_INDEX, ARMAP_END, sizeof ARMAP_END - 1);
-
-  /* Write the timestamp of the archive header to be just a little bit
-     later than the timestamp of the file, otherwise the linker will
-     complain that the index is out of date.  Actually, the Ultrix
-     linker just checks the archive name; the GNU linker may check the
-     date.  */
-  stat (abfd->filename, &statbuf);
-  sprintf (hdr.ar_date, "%ld", (long) (statbuf.st_mtime + 60));
-
-  /* The DECstation uses zeroes for the uid, gid and mode of the
-     armap.  */
-  hdr.ar_uid[0] = '0';
-  hdr.ar_gid[0] = '0';
-  hdr.ar_mode[0] = '0';
-
-  sprintf (hdr.ar_size, "%-10d", (int) mapsize);
-
-  hdr.ar_fmag[0] = '`';
-  hdr.ar_fmag[1] = '\012';
-
-  /* Turn all null bytes in the header into spaces.  */
-  for (i = 0; i < sizeof (struct ar_hdr); i++)
-   if (((char *)(&hdr))[i] == '\0')
-     (((char *)(&hdr))[i]) = ' ';
-
-  if (bfd_write ((PTR) &hdr, 1, sizeof (struct ar_hdr), abfd)
-      != sizeof (struct ar_hdr))
-    return false;
-
-  bfd_h_put_32 (abfd, (bfd_vma) hashsize, temp);
-  if (bfd_write ((PTR) temp, 1, 4, abfd) != 4)
-    return false;
-  
-  hashtable = (bfd_byte *) bfd_zalloc (abfd, symdefsize);
-  if (!hashtable)
-    return false;
-
-  current = abfd->archive_head;
-  last_elt = current;
-  for (i = 0; i < orl_count; i++)
-    {
-      unsigned int hash, rehash;
-
-      /* Advance firstreal to the file position of this archive
-	 element.  */
-      if (((bfd *) map[i].pos) != last_elt)
-	{
-	  do
-	    {
-	      firstreal += arelt_size (current) + sizeof (struct ar_hdr);
-	      firstreal += firstreal % 2;
-	      current = current->next;
-	    }
-	  while (current != (bfd *) map[i].pos);
-	}
-
-      last_elt = current;
-
-      hash = ecoff_armap_hash (*map[i].name, &rehash, hashsize, hashlog);
-      if (bfd_h_get_32 (abfd, (PTR) (hashtable + (hash * 8) + 4)) != 0)
-	{
-	  unsigned int srch;
-
-	  /* The desired slot is already taken.  */
-	  for (srch = (hash + rehash) & (hashsize - 1);
-	       srch != hash;
-	       srch = (srch + rehash) & (hashsize - 1))
-	    if (bfd_h_get_32 (abfd, (PTR) (hashtable + (srch * 8) + 4)) == 0)
-	      break;
-
-	  BFD_ASSERT (srch != hash);
-
-	  hash = srch;
-	}
-	
-      bfd_h_put_32 (abfd, (bfd_vma) map[i].namidx,
-		    (PTR) (hashtable + hash * 8));
-      bfd_h_put_32 (abfd, (bfd_vma) firstreal,
-		    (PTR) (hashtable + hash * 8 + 4));
-    }
-
-  if (bfd_write ((PTR) hashtable, 1, symdefsize, abfd) != symdefsize)
-    return false;
-
-  bfd_release (abfd, hashtable);
-
-  /* Now write the strings.  */
-  bfd_h_put_32 (abfd, (bfd_vma) stringsize, temp);
-  if (bfd_write ((PTR) temp, 1, 4, abfd) != 4)
-    return false;
-  for (i = 0; i < orl_count; i++)
-    {
-      bfd_size_type len;
-
-      len = strlen (*map[i].name) + 1;
-      if (bfd_write ((PTR) (*map[i].name), 1, len, abfd) != len)
-	return false;
-    }
-
-  /* The spec sez this should be a newline.  But in order to be
-     bug-compatible for DECstation ar we use a null.  */
-  if (padit)
-    {
-      if (bfd_write ("", 1, 1, abfd) != 1)
-	return false;
-    }
-
-  return true;
-}
-
-/* See whether this BFD is an archive.  If it is, read in the armap
-   and the extended name table.  */
-
-const bfd_target *
-_bfd_ecoff_archive_p (abfd)
-     bfd *abfd;
-{
-  struct artdata *tdata_hold;
-  char armag[SARMAG + 1];
-
-  tdata_hold = abfd->tdata.aout_ar_data;
-
-  if (bfd_read ((PTR) armag, 1, SARMAG, abfd) != SARMAG)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return (const bfd_target *) NULL;
-    }
-
-  if (strncmp (armag, ARMAG, SARMAG) != 0)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* We are setting bfd_ardata(abfd) here, but since bfd_ardata
-     involves a cast, we can't do it as the left operand of
-     assignment.  */
-  abfd->tdata.aout_ar_data =
-    (struct artdata *) bfd_zalloc (abfd, sizeof (struct artdata));
-
-  if (bfd_ardata (abfd) == (struct artdata *) NULL)
-    {
-      abfd->tdata.aout_ar_data = tdata_hold;
-      return (const bfd_target *) NULL;
-    }
-
-  bfd_ardata (abfd)->first_file_filepos = SARMAG;
-  bfd_ardata (abfd)->cache = NULL;
-  bfd_ardata (abfd)->archive_head = NULL;
-  bfd_ardata (abfd)->symdefs = NULL;
-  bfd_ardata (abfd)->extended_names = NULL;
-  bfd_ardata (abfd)->tdata = NULL;
-  
-  if (_bfd_ecoff_slurp_armap (abfd) == false
-      || _bfd_ecoff_slurp_extended_name_table (abfd) == false)
-    {
-      bfd_release (abfd, bfd_ardata (abfd));
-      abfd->tdata.aout_ar_data = tdata_hold;
-      return (const bfd_target *) NULL;
-    }
-  
-  if (bfd_has_map (abfd))
-    {
-      bfd *first;
-
-      /* This archive has a map, so we may presume that the contents
-	 are object files.  Make sure that if the first file in the
-	 archive can be recognized as an object file, it is for this
-	 target.  If not, assume that this is the wrong format.  If
-	 the first file is not an object file, somebody is doing
-	 something weird, and we permit it so that ar -t will work.  */
-
-      first = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
-      if (first != NULL)
-	{
-	  boolean fail;
-
-	  first->target_defaulted = false;
-	  fail = false;
-	  if (bfd_check_format (first, bfd_object)
-	      && first->xvec != abfd->xvec)
-	    {
-	      (void) bfd_close (first);
-	      bfd_release (abfd, bfd_ardata (abfd));
-	      abfd->tdata.aout_ar_data = tdata_hold;
-	      bfd_set_error (bfd_error_wrong_format);
-	      return NULL;
-	    }
-
-	  /* We ought to close first here, but we can't, because we
-             have no way to remove it from the archive cache.  FIXME.  */
-	}
-    }
-
-  return abfd->xvec;
-}
-
-/* ECOFF linker code.  */
-
-static struct bfd_hash_entry *ecoff_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *entry,
-	   struct bfd_hash_table *table,
-	   const char *string));
-static boolean ecoff_link_add_archive_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean ecoff_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean ecoff_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean ecoff_link_add_externals
-  PARAMS ((bfd *, struct bfd_link_info *, PTR, char *));
-
-/* Routine to create an entry in an ECOFF link hash table.  */
-
-static struct bfd_hash_entry *
-ecoff_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct ecoff_link_hash_entry *ret = (struct ecoff_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct ecoff_link_hash_entry *) NULL)
-    ret = ((struct ecoff_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct ecoff_link_hash_entry)));
-  if (ret == (struct ecoff_link_hash_entry *) NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct ecoff_link_hash_entry *)
-	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				 table, string));
-
-  if (ret)
-    {
-      /* Set local fields.  */
-      ret->indx = -1;
-      ret->abfd = NULL;
-      ret->written = 0;
-      ret->small = 0;
-    }
-  memset ((PTR) &ret->esym, 0, sizeof ret->esym);
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create an ECOFF link hash table.  */
-
-struct bfd_link_hash_table *
-_bfd_ecoff_bfd_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct ecoff_link_hash_table *ret;
-
-  ret = ((struct ecoff_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct ecoff_link_hash_table)));
-  if (ret == NULL)
-    return NULL;
-  if (! _bfd_link_hash_table_init (&ret->root, abfd,
-				   ecoff_link_hash_newfunc))
-    {
-      free (ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-  return &ret->root;
-}
-
-/* Look up an entry in an ECOFF link hash table.  */
-
-#define ecoff_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct ecoff_link_hash_entry *) \
-   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy), (follow)))
-
-/* Traverse an ECOFF link hash table.  */
-
-#define ecoff_link_hash_traverse(table, func, info)			\
-  (bfd_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the ECOFF link hash table from the info structure.  This is
-   just a cast.  */
-
-#define ecoff_hash_table(p) ((struct ecoff_link_hash_table *) ((p)->hash))
-
-/* Given an ECOFF BFD, add symbols to the global hash table as
-   appropriate.  */
-
-boolean
-_bfd_ecoff_bfd_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      return ecoff_link_add_object_symbols (abfd, info);
-    case bfd_archive:
-      return ecoff_link_add_archive_symbols (abfd, info);
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-}
-
-/* Add the symbols from an archive file to the global hash table.
-   This looks through the undefined symbols, looks each one up in the
-   archive hash table, and adds any associated object file.  We do not
-   use _bfd_generic_link_add_archive_symbols because ECOFF archives
-   already have a hash table, so there is no reason to construct
-   another one.  */
-
-static boolean
-ecoff_link_add_archive_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  const bfd_byte *raw_armap;
-  struct bfd_link_hash_entry **pundef;
-  unsigned int armap_count;
-  unsigned int armap_log;
-  unsigned int i;
-  const bfd_byte *hashtable;
-  const char *stringbase;
-
-  if (! bfd_has_map (abfd))
-    {
-      /* An empty archive is a special case.  */
-      if (bfd_openr_next_archived_file (abfd, (bfd *) NULL) == NULL)
-	return true;
-      bfd_set_error (bfd_error_no_armap);
-      return false;
-    }
-
-  /* If we don't have any raw data for this archive, as can happen on
-     Irix 4.0.5F, we call the generic routine.
-     FIXME: We should be more clever about this, since someday tdata
-     may get to something for a generic archive.  */
-  raw_armap = (const bfd_byte *) bfd_ardata (abfd)->tdata;
-  if (raw_armap == (bfd_byte *) NULL)
-    return (_bfd_generic_link_add_archive_symbols
-	    (abfd, info, ecoff_link_check_archive_element));
-
-  armap_count = bfd_h_get_32 (abfd, raw_armap);
-
-  armap_log = 0;
-  for (i = 1; i < armap_count; i <<= 1)
-    armap_log++;
-  BFD_ASSERT (i == armap_count);
-
-  hashtable = raw_armap + 4;
-  stringbase = (const char *) raw_armap + armap_count * 8 + 8;
-
-  /* Look through the list of undefined symbols.  */
-  pundef = &info->hash->undefs;
-  while (*pundef != (struct bfd_link_hash_entry *) NULL)
-    {
-      struct bfd_link_hash_entry *h;
-      unsigned int hash, rehash;
-      unsigned int file_offset;
-      const char *name;
-      bfd *element;
-
-      h = *pundef;
-
-      /* When a symbol is defined, it is not necessarily removed from
-	 the list.  */
-      if (h->type != bfd_link_hash_undefined
-	  && h->type != bfd_link_hash_common)
-	{
-	  /* Remove this entry from the list, for general cleanliness
-	     and because we are going to look through the list again
-	     if we search any more libraries.  We can't remove the
-	     entry if it is the tail, because that would lose any
-	     entries we add to the list later on.  */
-	  if (*pundef != info->hash->undefs_tail)
-	    *pundef = (*pundef)->next;
-	  else
-	    pundef = &(*pundef)->next;
-	  continue;
-	}
-
-      /* Native ECOFF linkers do not pull in archive elements merely
-	 to satisfy common definitions, so neither do we.  We leave
-	 them on the list, though, in case we are linking against some
-	 other object format.  */
-      if (h->type != bfd_link_hash_undefined)
-	{
-	  pundef = &(*pundef)->next;
-	  continue;
-	}
-
-      /* Look for this symbol in the archive hash table.  */
-      hash = ecoff_armap_hash (h->root.string, &rehash, armap_count,
-			       armap_log);
-
-      file_offset = bfd_h_get_32 (abfd, hashtable + (hash * 8) + 4);
-      if (file_offset == 0)
-	{
-	  /* Nothing in this slot.  */
-	  pundef = &(*pundef)->next;
-	  continue;
-	}
-
-      name = stringbase + bfd_h_get_32 (abfd, hashtable + (hash * 8));
-      if (name[0] != h->root.string[0]
-	  || strcmp (name, h->root.string) != 0)
-	{
-	  unsigned int srch;
-	  boolean found;
-
-	  /* That was the wrong symbol.  Try rehashing.  */
-	  found = false;
-	  for (srch = (hash + rehash) & (armap_count - 1);
-	       srch != hash;
-	       srch = (srch + rehash) & (armap_count - 1))
-	    {
-	      file_offset = bfd_h_get_32 (abfd, hashtable + (srch * 8) + 4);
-	      if (file_offset == 0)
-		break;
-	      name = stringbase + bfd_h_get_32 (abfd, hashtable + (srch * 8));
-	      if (name[0] == h->root.string[0]
-		  && strcmp (name, h->root.string) == 0)
-		{
-		  found = true;
-		  break;
-		}
-	    }
-
-	  if (! found)
-	    {
-	      pundef = &(*pundef)->next;
-	      continue;
-	    }
-
-	  hash = srch;
-	}
-
-      element = (*backend->get_elt_at_filepos) (abfd, file_offset);
-      if (element == (bfd *) NULL)
-	return false;
-
-      if (! bfd_check_format (element, bfd_object))
-	return false;
-
-      /* Unlike the generic linker, we know that this element provides
-	 a definition for an undefined symbol and we know that we want
-	 to include it.  We don't need to check anything.  */
-      if (! (*info->callbacks->add_archive_element) (info, element, name))
-	return false;
-      if (! ecoff_link_add_object_symbols (element, info))
-	return false;
-
-      pundef = &(*pundef)->next;
-    }
-
-  return true;
-}
-
-/* This is called if we used _bfd_generic_link_add_archive_symbols
-   because we were not dealing with an ECOFF archive.  */
-
-static boolean
-ecoff_link_check_archive_element (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  void (* const swap_ext_in) PARAMS ((bfd *, PTR, EXTR *))
-    = backend->debug_swap.swap_ext_in;
-  HDRR *symhdr;
-  bfd_size_type external_ext_size;
-  PTR external_ext = NULL;
-  size_t esize;
-  char *ssext = NULL;
-  char *ext_ptr;
-  char *ext_end;
-
-  *pneeded = false;
-
-  if (! ecoff_slurp_symbolic_header (abfd))
-    goto error_return;
-
-  /* If there are no symbols, we don't want it.  */
-  if (bfd_get_symcount (abfd) == 0)
-    goto successful_return;
-
-  symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
-
-  /* Read in the external symbols and external strings.  */
-  external_ext_size = backend->debug_swap.external_ext_size;
-  esize = symhdr->iextMax * external_ext_size;
-  external_ext = (PTR) bfd_malloc (esize);
-  if (external_ext == NULL && esize != 0)
-    goto error_return;
-
-  if (bfd_seek (abfd, symhdr->cbExtOffset, SEEK_SET) != 0
-      || bfd_read (external_ext, 1, esize, abfd) != esize)
-    goto error_return;
-
-  ssext = (char *) bfd_malloc (symhdr->issExtMax);
-  if (ssext == NULL && symhdr->issExtMax != 0)
-    goto error_return;
-
-  if (bfd_seek (abfd, symhdr->cbSsExtOffset, SEEK_SET) != 0
-      || (bfd_read (ssext, 1, symhdr->issExtMax, abfd) !=
-	  (bfd_size_type) symhdr->issExtMax))
-    goto error_return;
-
-  /* Look through the external symbols to see if they define some
-     symbol that is currently undefined.  */
-  ext_ptr = (char *) external_ext;
-  ext_end = ext_ptr + esize;
-  for (; ext_ptr < ext_end; ext_ptr += external_ext_size)
-    {
-      EXTR esym;
-      boolean def;
-      const char *name;
-      struct bfd_link_hash_entry *h;
-
-      (*swap_ext_in) (abfd, (PTR) ext_ptr, &esym);
-
-      /* See if this symbol defines something.  */
-      if (esym.asym.st != stGlobal
-	  && esym.asym.st != stLabel
-	  && esym.asym.st != stProc)
-	continue;
-
-      switch (esym.asym.sc)
-	{
-	case scText:
-	case scData:
-	case scBss:
-	case scAbs:
-	case scSData:
-	case scSBss:
-	case scRData:
-	case scCommon:
-	case scSCommon:
-	case scInit:
-	case scFini:
-	case scRConst:
-	  def = true;
-	  break;
-	default:
-	  def = false;
-	  break;
-	}
-
-      if (! def)
-	continue;
-
-      name = ssext + esym.asym.iss;
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
-
-      /* Unlike the generic linker, we do not pull in elements because
-	 of common symbols.  */
-      if (h == (struct bfd_link_hash_entry *) NULL
-	  || h->type != bfd_link_hash_undefined)
-	continue;
-
-      /* Include this element.  */
-      if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-	goto error_return;
-      if (! ecoff_link_add_externals (abfd, info, external_ext, ssext))
-	goto error_return;
-
-      *pneeded = true;
-      goto successful_return;
-    }
-
- successful_return:
-  if (external_ext != NULL)
-    free (external_ext);
-  if (ssext != NULL)
-    free (ssext);
-  return true;
- error_return:
-  if (external_ext != NULL)
-    free (external_ext);
-  if (ssext != NULL)
-    free (ssext);
-  return false;
-}
-
-/* Add symbols from an ECOFF object file to the global linker hash
-   table.  */
-
-static boolean
-ecoff_link_add_object_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  HDRR *symhdr;
-  bfd_size_type external_ext_size;
-  PTR external_ext = NULL;
-  size_t esize;
-  char *ssext = NULL;
-  boolean result;
-
-  if (! ecoff_slurp_symbolic_header (abfd))
-    return false;
-
-  /* If there are no symbols, we don't want it.  */
-  if (bfd_get_symcount (abfd) == 0)
-    return true;
-
-  symhdr = &ecoff_data (abfd)->debug_info.symbolic_header;
-
-  /* Read in the external symbols and external strings.  */
-  external_ext_size = ecoff_backend (abfd)->debug_swap.external_ext_size;
-  esize = symhdr->iextMax * external_ext_size;
-  external_ext = (PTR) bfd_malloc (esize);
-  if (external_ext == NULL && esize != 0)
-    goto error_return;
-
-  if (bfd_seek (abfd, symhdr->cbExtOffset, SEEK_SET) != 0
-      || bfd_read (external_ext, 1, esize, abfd) != esize)
-    goto error_return;
-
-  ssext = (char *) bfd_malloc (symhdr->issExtMax);
-  if (ssext == NULL && symhdr->issExtMax != 0)
-    goto error_return;
-
-  if (bfd_seek (abfd, symhdr->cbSsExtOffset, SEEK_SET) != 0
-      || (bfd_read (ssext, 1, symhdr->issExtMax, abfd)
-	  != (bfd_size_type) symhdr->issExtMax))
-    goto error_return;
-
-  result = ecoff_link_add_externals (abfd, info, external_ext, ssext);
-
-  if (ssext != NULL)
-    free (ssext);
-  if (external_ext != NULL)
-    free (external_ext);
-  return result;
-
- error_return:
-  if (ssext != NULL)
-    free (ssext);
-  if (external_ext != NULL)
-    free (external_ext);
-  return false;
-}
-
-/* Add the external symbols of an object file to the global linker
-   hash table.  The external symbols and strings we are passed are
-   just allocated on the stack, and will be discarded.  We must
-   explicitly save any information we may need later on in the link.
-   We do not want to read the external symbol information again.  */
-
-static boolean
-ecoff_link_add_externals (abfd, info, external_ext, ssext)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     PTR external_ext;
-     char *ssext;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  void (* const swap_ext_in) PARAMS ((bfd *, PTR, EXTR *))
-    = backend->debug_swap.swap_ext_in;
-  bfd_size_type external_ext_size = backend->debug_swap.external_ext_size;
-  unsigned long ext_count;
-  struct ecoff_link_hash_entry **sym_hash;
-  char *ext_ptr;
-  char *ext_end;
-
-  ext_count = ecoff_data (abfd)->debug_info.symbolic_header.iextMax;
-
-  sym_hash = ((struct ecoff_link_hash_entry **)
-	      bfd_alloc (abfd,
-			 ext_count * sizeof (struct bfd_link_hash_entry *)));
-  if (!sym_hash)
-    return false;
-  ecoff_data (abfd)->sym_hashes = sym_hash;
-
-  ext_ptr = (char *) external_ext;
-  ext_end = ext_ptr + ext_count * external_ext_size;
-  for (; ext_ptr < ext_end; ext_ptr += external_ext_size, sym_hash++)
-    {
-      EXTR esym;
-      boolean skip;
-      bfd_vma value;
-      asection *section;
-      const char *name;
-      struct ecoff_link_hash_entry *h;
-
-      *sym_hash = NULL;
-
-      (*swap_ext_in) (abfd, (PTR) ext_ptr, &esym);
-
-      /* Skip debugging symbols.  */
-      skip = false;
-      switch (esym.asym.st)
-	{
-	case stGlobal:
-	case stStatic:
-	case stLabel:
-	case stProc:
-	case stStaticProc:
-	  break;
-	default:
-	  skip = true;
-	  break;
-	}
-
-      if (skip)
-	continue;
-
-      /* Get the information for this symbol.  */
-      value = esym.asym.value;
-      switch (esym.asym.sc)
-	{
-	default:
-	case scNil:
-	case scRegister:
-	case scCdbLocal:
-	case scBits:
-	case scCdbSystem:
-	case scRegImage:
-	case scInfo:
-	case scUserStruct:
-	case scVar:
-	case scVarRegister:
-	case scVariant:
-	case scBasedVar:
-	case scXData:
-	case scPData:
-	  section = NULL;
-	  break;
-	case scText:
-	  section = bfd_make_section_old_way (abfd, ".text");
-	  value -= section->vma;
-	  break;
-	case scData:
-	  section = bfd_make_section_old_way (abfd, ".data");
-	  value -= section->vma;
-	  break;
-	case scBss:
-	  section = bfd_make_section_old_way (abfd, ".bss");
-	  value -= section->vma;
-	  break;
-	case scAbs:
-	  section = bfd_abs_section_ptr;
-	  break;
-	case scUndefined:
-	  section = bfd_und_section_ptr;
-	  break;
-	case scSData:
-	  section = bfd_make_section_old_way (abfd, ".sdata");
-	  value -= section->vma;
-	  break;
-	case scSBss:
-	  section = bfd_make_section_old_way (abfd, ".sbss");
-	  value -= section->vma;
-	  break;
-	case scRData:
-	  section = bfd_make_section_old_way (abfd, ".rdata");
-	  value -= section->vma;
-	  break;
-	case scCommon:
-	  if (value > ecoff_data (abfd)->gp_size)
-	    {
-	      section = bfd_com_section_ptr;
-	      break;
-	    }
-	  /* Fall through.  */
-	case scSCommon:
-	  if (ecoff_scom_section.name == NULL)
-	    {
-	      /* Initialize the small common section.  */
-	      ecoff_scom_section.name = SCOMMON;
-	      ecoff_scom_section.flags = SEC_IS_COMMON;
-	      ecoff_scom_section.output_section = &ecoff_scom_section;
-	      ecoff_scom_section.symbol = &ecoff_scom_symbol;
-	      ecoff_scom_section.symbol_ptr_ptr = &ecoff_scom_symbol_ptr;
-	      ecoff_scom_symbol.name = SCOMMON;
-	      ecoff_scom_symbol.flags = BSF_SECTION_SYM;
-	      ecoff_scom_symbol.section = &ecoff_scom_section;
-	      ecoff_scom_symbol_ptr = &ecoff_scom_symbol;
-	    }
-	  section = &ecoff_scom_section;
-	  break;
-	case scSUndefined:
-	  section = bfd_und_section_ptr;
-	  break;
-	case scInit:
-	  section = bfd_make_section_old_way (abfd, ".init");
-	  value -= section->vma;
-	  break;
-	case scFini:
-	  section = bfd_make_section_old_way (abfd, ".fini");
-	  value -= section->vma;
-	  break;
-	case scRConst:
-	  section = bfd_make_section_old_way (abfd, ".rconst");
-	  value -= section->vma;
-	  break;
-	}
-
-      if (section == (asection *) NULL)
-	continue;
-
-      name = ssext + esym.asym.iss;
-
-      h = NULL;
-      if (! (_bfd_generic_link_add_one_symbol
-	     (info, abfd, name,
-	      esym.weakext ? BSF_WEAK : BSF_GLOBAL,
-	      section, value, (const char *) NULL, true, true,
-	      (struct bfd_link_hash_entry **) &h)))
-	return false;
-
-      *sym_hash = h;
-
-      /* If we are building an ECOFF hash table, save the external
-	 symbol information.  */
-      if (info->hash->creator->flavour == bfd_get_flavour (abfd))
-	{
-	  if (h->abfd == (bfd *) NULL
-	      || (! bfd_is_und_section (section)
-		  && (! bfd_is_com_section (section)
-		      || (h->root.type != bfd_link_hash_defined
-			  && h->root.type != bfd_link_hash_defweak))))
-	    {
-	      h->abfd = abfd;
-	      h->esym = esym;
-	    }
-
-	  /* Remember whether this symbol was small undefined.  */
-	  if (esym.asym.sc == scSUndefined)
-	    h->small = 1;
-
-	  /* If this symbol was ever small undefined, it needs to wind
-	     up in a GP relative section.  We can't control the
-	     section of a defined symbol, but we can control the
-	     section of a common symbol.  This case is actually needed
-	     on Ultrix 4.2 to handle the symbol cred in -lckrb.  */
-	  if (h->small
-	      && h->root.type == bfd_link_hash_common
-	      && strcmp (h->root.u.c.p->section->name, SCOMMON) != 0)
-	    {
-	      h->root.u.c.p->section = bfd_make_section_old_way (abfd,
-								 SCOMMON);
-	      h->root.u.c.p->section->flags = SEC_ALLOC;
-	      if (h->esym.asym.sc == scCommon)
-		h->esym.asym.sc = scSCommon;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* ECOFF final link routines.  */
-
-static boolean ecoff_final_link_debug_accumulate
-  PARAMS ((bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *,
-	   PTR handle));
-static boolean ecoff_link_write_external
-  PARAMS ((struct ecoff_link_hash_entry *, PTR));
-static boolean ecoff_indirect_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-static boolean ecoff_reloc_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-
-/* Structure used to pass information to ecoff_link_write_external.  */
-
-struct extsym_info
-{
-  bfd *abfd;
-  struct bfd_link_info *info;
-};
-
-/* ECOFF final link routine.  This looks through all the input BFDs
-   and gathers together all the debugging information, and then
-   processes all the link order information.  This may cause it to
-   close and reopen some input BFDs; I'll see how bad this is.  */
-
-boolean
-_bfd_ecoff_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  const struct ecoff_backend_data * const backend = ecoff_backend (abfd);
-  struct ecoff_debug_info * const debug = &ecoff_data (abfd)->debug_info;
-  HDRR *symhdr;
-  PTR handle;
-  register bfd *input_bfd;
-  asection *o;
-  struct bfd_link_order *p;
-  struct extsym_info einfo;
-
-  /* We accumulate the debugging information counts in the symbolic
-     header.  */
-  symhdr = &debug->symbolic_header;
-  symhdr->vstamp = 0;
-  symhdr->ilineMax = 0;
-  symhdr->cbLine = 0;
-  symhdr->idnMax = 0;
-  symhdr->ipdMax = 0;
-  symhdr->isymMax = 0;
-  symhdr->ioptMax = 0;
-  symhdr->iauxMax = 0;
-  symhdr->issMax = 0;
-  symhdr->issExtMax = 0;
-  symhdr->ifdMax = 0;
-  symhdr->crfd = 0;
-  symhdr->iextMax = 0;
-
-  /* We accumulate the debugging information itself in the debug_info
-     structure.  */
-  debug->line = NULL;
-  debug->external_dnr = NULL;
-  debug->external_pdr = NULL;
-  debug->external_sym = NULL;
-  debug->external_opt = NULL;
-  debug->external_aux = NULL;
-  debug->ss = NULL;
-  debug->ssext = debug->ssext_end = NULL;
-  debug->external_fdr = NULL;
-  debug->external_rfd = NULL;
-  debug->external_ext = debug->external_ext_end = NULL;
-
-  handle = bfd_ecoff_debug_init (abfd, debug, &backend->debug_swap, info);
-  if (handle == (PTR) NULL)
-    return false;
-
-  /* Accumulate the debugging symbols from each input BFD.  */
-  for (input_bfd = info->input_bfds;
-       input_bfd != (bfd *) NULL;
-       input_bfd = input_bfd->link_next)
-    {
-      boolean ret;
-
-      if (bfd_get_flavour (input_bfd) == bfd_target_ecoff_flavour)
-	{
-	  /* Abitrarily set the symbolic header vstamp to the vstamp
-	     of the first object file in the link.  */
-	  if (symhdr->vstamp == 0)
-	    symhdr->vstamp
-	      = ecoff_data (input_bfd)->debug_info.symbolic_header.vstamp;
-	  ret = ecoff_final_link_debug_accumulate (abfd, input_bfd, info,
-						   handle);
-	}
-      else
-	ret = bfd_ecoff_debug_accumulate_other (handle, abfd,
-						debug, &backend->debug_swap,
-						input_bfd, info);
-      if (! ret)
-	return false;
-
-      /* Combine the register masks.  */
-      ecoff_data (abfd)->gprmask |= ecoff_data (input_bfd)->gprmask;
-      ecoff_data (abfd)->fprmask |= ecoff_data (input_bfd)->fprmask;
-      ecoff_data (abfd)->cprmask[0] |= ecoff_data (input_bfd)->cprmask[0];
-      ecoff_data (abfd)->cprmask[1] |= ecoff_data (input_bfd)->cprmask[1];
-      ecoff_data (abfd)->cprmask[2] |= ecoff_data (input_bfd)->cprmask[2];
-      ecoff_data (abfd)->cprmask[3] |= ecoff_data (input_bfd)->cprmask[3];
-    }
-
-  /* Write out the external symbols.  */
-  einfo.abfd = abfd;
-  einfo.info = info;
-  ecoff_link_hash_traverse (ecoff_hash_table (info),
-			    ecoff_link_write_external,
-			    (PTR) &einfo);
-
-  if (info->relocateable)
-    {
-      /* We need to make a pass over the link_orders to count up the
-	 number of relocations we will need to output, so that we know
-	 how much space they will take up.  */
-      for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-	{
-	  o->reloc_count = 0;
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    if (p->type == bfd_indirect_link_order)
-	      o->reloc_count += p->u.indirect.section->reloc_count;
-	    else if (p->type == bfd_section_reloc_link_order
-		     || p->type == bfd_symbol_reloc_link_order)
-	      ++o->reloc_count;
-	}
-    }
-
-  /* Compute the reloc and symbol file positions.  */
-  ecoff_compute_reloc_file_positions (abfd);
-
-  /* Write out the debugging information.  */
-  if (! bfd_ecoff_write_accumulated_debug (handle, abfd, debug,
-					   &backend->debug_swap, info,
-					   ecoff_data (abfd)->sym_filepos))
-    return false;
-
-  bfd_ecoff_debug_free (handle, abfd, debug, &backend->debug_swap, info);
-
-  if (info->relocateable)
-    {
-      /* Now reset the reloc_count field of the sections in the output
-	 BFD to 0, so that we can use them to keep track of how many
-	 relocs we have output thus far.  */
-      for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-	o->reloc_count = 0;
-    }
-
-  /* Get a value for the GP register.  */
-  if (ecoff_data (abfd)->gp == 0)
-    {
-      struct bfd_link_hash_entry *h;
-
-      h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
-      if (h != (struct bfd_link_hash_entry *) NULL
-	  && h->type == bfd_link_hash_defined)
-	ecoff_data (abfd)->gp = (h->u.def.value
-				 + h->u.def.section->output_section->vma
-				 + h->u.def.section->output_offset);
-      else if (info->relocateable)
-	{
-	  bfd_vma lo;
-
-	  /* Make up a value.  */
-	  lo = (bfd_vma) -1;
-	  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-	    {
-	      if (o->vma < lo
-		  && (strcmp (o->name, _SBSS) == 0
-		      || strcmp (o->name, _SDATA) == 0
-		      || strcmp (o->name, _LIT4) == 0
-		      || strcmp (o->name, _LIT8) == 0
-		      || strcmp (o->name, _LITA) == 0))
-		lo = o->vma;
-	    }
-	  ecoff_data (abfd)->gp = lo + 0x8000;
-	}
-      else
-	{
-	  /* If the relocate_section function needs to do a reloc
-	     involving the GP value, it should make a reloc_dangerous
-	     callback to warn that GP is not defined.  */
-	}
-    }
-
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    {
-      for (p = o->link_order_head;
-	   p != (struct bfd_link_order *) NULL;
-	   p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order
-	      && (bfd_get_flavour (p->u.indirect.section->owner)
-		  == bfd_target_ecoff_flavour))
-	    {
-	      if (! ecoff_indirect_link_order (abfd, info, o, p))
-		return false;
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    {
-	      if (! ecoff_reloc_link_order (abfd, info, o, p))
-		return false;
-	    }
-	  else
-	    {
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		return false;
-	    }
-	}
-    }
-
-  bfd_get_symcount (abfd) = symhdr->iextMax + symhdr->isymMax;
-
-  ecoff_data (abfd)->linker = true;
-
-  return true;
-}
-
-/* Accumulate the debugging information for an input BFD into the
-   output BFD.  This must read in the symbolic information of the
-   input BFD.  */
-
-static boolean
-ecoff_final_link_debug_accumulate (output_bfd, input_bfd, info, handle)
-     bfd *output_bfd;
-     bfd *input_bfd;
-     struct bfd_link_info *info;
-     PTR handle;
-{
-  struct ecoff_debug_info * const debug = &ecoff_data (input_bfd)->debug_info;
-  const struct ecoff_debug_swap * const swap =
-    &ecoff_backend (input_bfd)->debug_swap;
-  HDRR *symhdr = &debug->symbolic_header;
-  boolean ret;
-
-#define READ(ptr, offset, count, size, type)				\
-  if (symhdr->count == 0)						\
-    debug->ptr = NULL;							\
-  else									\
-    {									\
-      debug->ptr = (type) bfd_malloc ((size_t) (size * symhdr->count));	\
-      if (debug->ptr == NULL)						\
-	{								\
-          ret = false;							\
-          goto return_something;					\
-	}								\
-      if ((bfd_seek (input_bfd, (file_ptr) symhdr->offset, SEEK_SET)	\
-	   != 0)							\
-	  || (bfd_read (debug->ptr, size, symhdr->count,		\
-			input_bfd) != size * symhdr->count))		\
-	{								\
-          ret = false;							\
-          goto return_something;					\
-	}								\
-    }
-
-  /* If raw_syments is not NULL, then the data was already by read by
-     _bfd_ecoff_slurp_symbolic_info.  */
-  if (ecoff_data (input_bfd)->raw_syments == NULL)
-    {
-      READ (line, cbLineOffset, cbLine, sizeof (unsigned char),
-	    unsigned char *);
-      READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, PTR);
-      READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, PTR);
-      READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, PTR);
-      READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, PTR);
-      READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
-	    union aux_ext *);
-      READ (ss, cbSsOffset, issMax, sizeof (char), char *);
-      READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, PTR);
-      READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, PTR);
-    }
-#undef READ
-
-  /* We do not read the external strings or the external symbols.  */
-
-  ret = (bfd_ecoff_debug_accumulate
-	 (handle, output_bfd, &ecoff_data (output_bfd)->debug_info,
-	  &ecoff_backend (output_bfd)->debug_swap,
-	  input_bfd, debug, swap, info));
-
- return_something:
-  if (ecoff_data (input_bfd)->raw_syments == NULL)
-    {
-      if (debug->line != NULL)
-	free (debug->line);
-      if (debug->external_dnr != NULL)
-	free (debug->external_dnr);
-      if (debug->external_pdr != NULL)
-	free (debug->external_pdr);
-      if (debug->external_sym != NULL)
-	free (debug->external_sym);
-      if (debug->external_opt != NULL)
-	free (debug->external_opt);
-      if (debug->external_aux != NULL)
-	free (debug->external_aux);
-      if (debug->ss != NULL)
-	free (debug->ss);
-      if (debug->external_fdr != NULL)
-	free (debug->external_fdr);
-      if (debug->external_rfd != NULL)
-	free (debug->external_rfd);
-
-      /* Make sure we don't accidentally follow one of these pointers
-	 into freed memory.  */
-      debug->line = NULL;
-      debug->external_dnr = NULL;
-      debug->external_pdr = NULL;
-      debug->external_sym = NULL;
-      debug->external_opt = NULL;
-      debug->external_aux = NULL;
-      debug->ss = NULL;
-      debug->external_fdr = NULL;
-      debug->external_rfd = NULL;
-    }
-
-  return ret;
-}
-
-/* Put out information for an external symbol.  These come only from
-   the hash table.  */
-
-static boolean
-ecoff_link_write_external (h, data)
-     struct ecoff_link_hash_entry *h;
-     PTR data;
-{
-  struct extsym_info *einfo = (struct extsym_info *) data;
-  bfd *output_bfd = einfo->abfd;
-  boolean strip;
-
-  /* We need to check if this symbol is being stripped. */
-  if (h->root.type == bfd_link_hash_undefined
-      || h->root.type == bfd_link_hash_undefweak)
-    strip = false;
-  else if (einfo->info->strip == strip_all
-	   || (einfo->info->strip == strip_some
-	       && bfd_hash_lookup (einfo->info->keep_hash,
-				   h->root.root.string,
-				   false, false) == NULL))
-    strip = true;
-  else
-    strip = false;
-
-  if (strip || h->written)
-    return true;
-
-  if (h->abfd == (bfd *) NULL)
-    {
-      h->esym.jmptbl = 0;
-      h->esym.cobol_main = 0;
-      h->esym.weakext = 0;
-      h->esym.reserved = 0;
-      h->esym.ifd = ifdNil;
-      h->esym.asym.value = 0;
-      h->esym.asym.st = stGlobal;
-
-      if (h->root.type != bfd_link_hash_defined
-	  && h->root.type != bfd_link_hash_defweak)
-	h->esym.asym.sc = scAbs;
-      else
-	{
-	  asection *output_section;
-	  const char *name;
-
-	  output_section = h->root.u.def.section->output_section;
-	  name = bfd_section_name (output_section->owner, output_section);
-	
-	  if (strcmp (name, _TEXT) == 0)
-	    h->esym.asym.sc = scText;
-	  else if (strcmp (name, _DATA) == 0)
-	    h->esym.asym.sc = scData;
-	  else if (strcmp (name, _SDATA) == 0)
-	    h->esym.asym.sc = scSData;
-	  else if (strcmp (name, _RDATA) == 0)
-	    h->esym.asym.sc = scRData;
-	  else if (strcmp (name, _BSS) == 0)
-	    h->esym.asym.sc = scBss;
-	  else if (strcmp (name, _SBSS) == 0)
-	    h->esym.asym.sc = scSBss;
-	  else if (strcmp (name, _INIT) == 0)
-	    h->esym.asym.sc = scInit;
-	  else if (strcmp (name, _FINI) == 0)
-	    h->esym.asym.sc = scFini;
-	  else if (strcmp (name, _PDATA) == 0)
-	    h->esym.asym.sc = scPData;
-	  else if (strcmp (name, _XDATA) == 0)
-	    h->esym.asym.sc = scXData;
-	  else if (strcmp (name, _RCONST) == 0)
-	    h->esym.asym.sc = scRConst;
-	  else
-	    h->esym.asym.sc = scAbs;
-	}
-
-      h->esym.asym.reserved = 0;
-      h->esym.asym.index = indexNil;
-    }
-  else if (h->esym.ifd != -1)
-    {
-      struct ecoff_debug_info *debug;
-
-      /* Adjust the FDR index for the symbol by that used for the
-	 input BFD.  */
-      debug = &ecoff_data (h->abfd)->debug_info;
-      BFD_ASSERT (h->esym.ifd >= 0
-		  && h->esym.ifd < debug->symbolic_header.ifdMax);
-      h->esym.ifd = debug->ifdmap[h->esym.ifd];
-    }
-
-  switch (h->root.type)
-    {
-    default:
-    case bfd_link_hash_new:
-      abort ();
-    case bfd_link_hash_undefined:
-    case bfd_link_hash_undefweak:
-      if (h->esym.asym.sc != scUndefined
-	  && h->esym.asym.sc != scSUndefined)
-	h->esym.asym.sc = scUndefined;
-      break;
-    case bfd_link_hash_defined:
-    case bfd_link_hash_defweak:
-      if (h->esym.asym.sc == scUndefined
-	  || h->esym.asym.sc == scSUndefined)
-	h->esym.asym.sc = scAbs;
-      else if (h->esym.asym.sc == scCommon)
-	h->esym.asym.sc = scBss;
-      else if (h->esym.asym.sc == scSCommon)
-	h->esym.asym.sc = scSBss;
-      h->esym.asym.value = (h->root.u.def.value
-			    + h->root.u.def.section->output_section->vma
-			    + h->root.u.def.section->output_offset);
-      break;
-    case bfd_link_hash_common:
-      if (h->esym.asym.sc != scCommon
-	  && h->esym.asym.sc != scSCommon)
-	h->esym.asym.sc = scCommon;
-      h->esym.asym.value = h->root.u.c.size;
-      break;
-    case bfd_link_hash_indirect:
-    case bfd_link_hash_warning:
-      /* FIXME: Ignore these for now.  The circumstances under which
-	 they should be written out are not clear to me.  */
-      return true;
-    }
-
-  /* bfd_ecoff_debug_one_external uses iextMax to keep track of the
-     symbol number.  */
-  h->indx = ecoff_data (output_bfd)->debug_info.symbolic_header.iextMax;
-  h->written = 1;
-
-  return (bfd_ecoff_debug_one_external
-	  (output_bfd, &ecoff_data (output_bfd)->debug_info,
-	   &ecoff_backend (output_bfd)->debug_swap, h->root.root.string,
-	   &h->esym));
-}
-
-/* Relocate and write an ECOFF section into an ECOFF output file.  */
-
-static boolean
-ecoff_indirect_link_order (output_bfd, info, output_section, link_order)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     asection *output_section;
-     struct bfd_link_order *link_order;
-{
-  asection *input_section;
-  bfd *input_bfd;
-  struct ecoff_section_tdata *section_tdata;
-  bfd_size_type raw_size;
-  bfd_size_type cooked_size;
-  bfd_byte *contents = NULL;
-  bfd_size_type external_reloc_size;
-  bfd_size_type external_relocs_size;
-  PTR external_relocs = NULL;
-
-  BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
-
-  if (link_order->size == 0)
-    return true;
-
-  input_section = link_order->u.indirect.section;
-  input_bfd = input_section->owner;
-  section_tdata = ecoff_section_data (input_bfd, input_section);
-
-  raw_size = input_section->_raw_size;
-  cooked_size = input_section->_cooked_size;
-  if (cooked_size == 0)
-    cooked_size = raw_size;
-
-  BFD_ASSERT (input_section->output_section == output_section);
-  BFD_ASSERT (input_section->output_offset == link_order->offset);
-  BFD_ASSERT (cooked_size == link_order->size);
-
-  /* Get the section contents.  We allocate memory for the larger of
-     the size before relocating and the size after relocating.  */
-  contents = (bfd_byte *) bfd_malloc (raw_size >= cooked_size
-				      ? (size_t) raw_size
-				      : (size_t) cooked_size);
-  if (contents == NULL && raw_size != 0)
-    goto error_return;
-
-  /* If we are relaxing, the contents may have already been read into
-     memory, in which case we copy them into our new buffer.  We don't
-     simply reuse the old buffer in case cooked_size > raw_size.  */
-  if (section_tdata != (struct ecoff_section_tdata *) NULL
-      && section_tdata->contents != (bfd_byte *) NULL)
-    memcpy (contents, section_tdata->contents, (size_t) raw_size);
-  else
-    {
-      if (! bfd_get_section_contents (input_bfd, input_section,
-				      (PTR) contents,
-				      (file_ptr) 0, raw_size))
-	goto error_return;
-    }
-
-  /* Get the relocs.  If we are relaxing MIPS code, they will already
-     have been read in.  Otherwise, we read them in now.  */
-  external_reloc_size = ecoff_backend (input_bfd)->external_reloc_size;
-  external_relocs_size = external_reloc_size * input_section->reloc_count;
-
-  if (section_tdata != (struct ecoff_section_tdata *) NULL
-      && section_tdata->external_relocs != NULL)
-    external_relocs = section_tdata->external_relocs;
-  else
-    {
-      external_relocs = (PTR) bfd_malloc ((size_t) external_relocs_size);
-      if (external_relocs == NULL && external_relocs_size != 0)
-	goto error_return;
-
-      if (bfd_seek (input_bfd, input_section->rel_filepos, SEEK_SET) != 0
-	  || (bfd_read (external_relocs, 1, external_relocs_size, input_bfd)
-	      != external_relocs_size))
-	goto error_return;
-    }
-
-  /* Relocate the section contents.  */
-  if (! ((*ecoff_backend (input_bfd)->relocate_section)
-	 (output_bfd, info, input_bfd, input_section, contents,
-	  external_relocs)))
-    goto error_return;
-
-  /* Write out the relocated section.  */
-  if (! bfd_set_section_contents (output_bfd,
-				  output_section,
-				  (PTR) contents,
-				  input_section->output_offset,
-				  cooked_size))
-    goto error_return;
-
-  /* If we are producing relocateable output, the relocs were
-     modified, and we write them out now.  We use the reloc_count
-     field of output_section to keep track of the number of relocs we
-     have output so far.  */
-  if (info->relocateable)
-    {
-      if (bfd_seek (output_bfd,
-		    (output_section->rel_filepos +
-		     output_section->reloc_count * external_reloc_size),
-		    SEEK_SET) != 0
-	  || (bfd_write (external_relocs, 1, external_relocs_size, output_bfd)
-	      != external_relocs_size))
-	goto error_return;
-      output_section->reloc_count += input_section->reloc_count;
-    }
-
-  if (contents != NULL)
-    free (contents);
-  if (external_relocs != NULL && section_tdata == NULL)
-    free (external_relocs);
-  return true;
-
- error_return:
-  if (contents != NULL)
-    free (contents);
-  if (external_relocs != NULL && section_tdata == NULL)
-    free (external_relocs);
-  return false;
-}
-
-/* Generate a reloc when linking an ECOFF file.  This is a reloc
-   requested by the linker, and does come from any input file.  This
-   is used to build constructor and destructor tables when linking
-   with -Ur.  */
-
-static boolean
-ecoff_reloc_link_order (output_bfd, info, output_section, link_order)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     asection *output_section;
-     struct bfd_link_order *link_order;
-{
-  enum bfd_link_order_type type;
-  asection *section;
-  bfd_vma addend;
-  arelent rel;
-  struct internal_reloc in;
-  bfd_size_type external_reloc_size;
-  bfd_byte *rbuf;
-  boolean ok;
-
-  type = link_order->type;
-  section = NULL;
-  addend = link_order->u.reloc.p->addend;
-
-  /* We set up an arelent to pass to the backend adjust_reloc_out
-     routine.  */
-  rel.address = link_order->offset;
-
-  rel.howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
-  if (rel.howto == 0)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  if (type == bfd_section_reloc_link_order)
-    {
-      section = link_order->u.reloc.p->u.section;
-      rel.sym_ptr_ptr = section->symbol_ptr_ptr;
-    }
-  else
-    {
-      struct bfd_link_hash_entry *h;
-
-      /* Treat a reloc against a defined symbol as though it were
-         actually against the section.  */
-      h = bfd_wrapped_link_hash_lookup (output_bfd, info,
-					link_order->u.reloc.p->u.name,
-					false, false, false);
-      if (h != NULL
-	  && (h->type == bfd_link_hash_defined
-	      || h->type == bfd_link_hash_defweak))
-	{
-	  type = bfd_section_reloc_link_order;
-	  section = h->u.def.section->output_section;
-	  /* It seems that we ought to add the symbol value to the
-             addend here, but in practice it has already been added
-             because it was passed to constructor_callback.  */
-	  addend += section->vma + h->u.def.section->output_offset;
-	}
-      else
-	{
-	  /* We can't set up a reloc against a symbol correctly,
-	     because we have no asymbol structure.  Currently no
-	     adjust_reloc_out routine cares.  */
-	  rel.sym_ptr_ptr = (asymbol **) NULL;
-	}
-    }
-
-  /* All ECOFF relocs are in-place.  Put the addend into the object
-     file.  */
-
-  BFD_ASSERT (rel.howto->partial_inplace);
-  if (addend != 0)
-    {
-      bfd_size_type size;
-      bfd_reloc_status_type rstat;
-      bfd_byte *buf;
-      boolean ok;
-
-      size = bfd_get_reloc_size (rel.howto);
-      buf = (bfd_byte *) bfd_zmalloc (size);
-      if (buf == (bfd_byte *) NULL)
-	return false;
-      rstat = _bfd_relocate_contents (rel.howto, output_bfd, addend, buf);
-      switch (rstat)
-	{
-	case bfd_reloc_ok:
-	  break;
-	default:
-	case bfd_reloc_outofrange:
-	  abort ();
-	case bfd_reloc_overflow:
-	  if (! ((*info->callbacks->reloc_overflow)
-		 (info,
-		  (link_order->type == bfd_section_reloc_link_order
-		   ? bfd_section_name (output_bfd, section)
-		   : link_order->u.reloc.p->u.name),
-		  rel.howto->name, addend, (bfd *) NULL,
-		  (asection *) NULL, (bfd_vma) 0)))
-	    {
-	      free (buf);
-	      return false;
-	    }
-	  break;
-	}
-      ok = bfd_set_section_contents (output_bfd, output_section, (PTR) buf,
-				     (file_ptr) link_order->offset, size);
-      free (buf);
-      if (! ok)
-	return false;
-    }
-
-  rel.addend = 0;
-
-  /* Move the information into a internal_reloc structure.  */
-  in.r_vaddr = (rel.address
-		+ bfd_get_section_vma (output_bfd, output_section));
-  in.r_type = rel.howto->type;
-
-  if (type == bfd_symbol_reloc_link_order)
-    {
-      struct ecoff_link_hash_entry *h;
-
-      h = ((struct ecoff_link_hash_entry *)
-	   bfd_wrapped_link_hash_lookup (output_bfd, info,
-					 link_order->u.reloc.p->u.name,
-					 false, false, true));
-      if (h != (struct ecoff_link_hash_entry *) NULL
-	  && h->indx != -1)
-	in.r_symndx = h->indx;
-      else
-	{
-	  if (! ((*info->callbacks->unattached_reloc)
-		 (info, link_order->u.reloc.p->u.name, (bfd *) NULL,
-		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
-	  in.r_symndx = 0;
-	}
-      in.r_extern = 1;
-    }
-  else
-    {
-      CONST char *name;
-
-      name = bfd_get_section_name (output_bfd, section);
-      if (strcmp (name, ".text") == 0)
-	in.r_symndx = RELOC_SECTION_TEXT;
-      else if (strcmp (name, ".rdata") == 0)
-	in.r_symndx = RELOC_SECTION_RDATA;
-      else if (strcmp (name, ".data") == 0)
-	in.r_symndx = RELOC_SECTION_DATA;
-      else if (strcmp (name, ".sdata") == 0)
-	in.r_symndx = RELOC_SECTION_SDATA;
-      else if (strcmp (name, ".sbss") == 0)
-	in.r_symndx = RELOC_SECTION_SBSS;
-      else if (strcmp (name, ".bss") == 0)
-	in.r_symndx = RELOC_SECTION_BSS;
-      else if (strcmp (name, ".init") == 0)
-	in.r_symndx = RELOC_SECTION_INIT;
-      else if (strcmp (name, ".lit8") == 0)
-	in.r_symndx = RELOC_SECTION_LIT8;
-      else if (strcmp (name, ".lit4") == 0)
-	in.r_symndx = RELOC_SECTION_LIT4;
-      else if (strcmp (name, ".xdata") == 0)
-	in.r_symndx = RELOC_SECTION_XDATA;
-      else if (strcmp (name, ".pdata") == 0)
-	in.r_symndx = RELOC_SECTION_PDATA;
-      else if (strcmp (name, ".fini") == 0)
-	in.r_symndx = RELOC_SECTION_FINI;
-      else if (strcmp (name, ".lita") == 0)
-	in.r_symndx = RELOC_SECTION_LITA;
-      else if (strcmp (name, "*ABS*") == 0)
-	in.r_symndx = RELOC_SECTION_ABS;
-      else if (strcmp (name, ".rconst") == 0)
-	in.r_symndx = RELOC_SECTION_RCONST;
-      else
-	abort ();
-      in.r_extern = 0;
-    }
-
-  /* Let the BFD backend adjust the reloc.  */
-  (*ecoff_backend (output_bfd)->adjust_reloc_out) (output_bfd, &rel, &in);
-
-  /* Get some memory and swap out the reloc.  */
-  external_reloc_size = ecoff_backend (output_bfd)->external_reloc_size;
-  rbuf = (bfd_byte *) bfd_malloc ((size_t) external_reloc_size);
-  if (rbuf == (bfd_byte *) NULL)
-    return false;
-
-  (*ecoff_backend (output_bfd)->swap_reloc_out) (output_bfd, &in, (PTR) rbuf);
-
-  ok = (bfd_seek (output_bfd,
-		  (output_section->rel_filepos +
-		   output_section->reloc_count * external_reloc_size),
-		  SEEK_SET) == 0
-	&& (bfd_write ((PTR) rbuf, 1, external_reloc_size, output_bfd)
-	    == external_reloc_size));
-
-  if (ok)
-    ++output_section->reloc_count;
-
-  free (rbuf);
-
-  return ok;
-}
diff --git a/bfd/ecofflink.c b/bfd/ecofflink.c
deleted file mode 100644
index a120a2be7c5..00000000000
--- a/bfd/ecofflink.c
+++ /dev/null
@@ -1,2499 +0,0 @@
-/* Routines to link ECOFF debugging information.
-   Copyright 1993, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support, <ian@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "objalloc.h"
-#include "aout/stab_gnu.h"
-#include "coff/internal.h"
-#include "coff/sym.h"
-#include "coff/symconst.h"
-#include "coff/ecoff.h"
-#include "libcoff.h"
-#include "libecoff.h"
-
-static boolean ecoff_add_bytes PARAMS ((char **buf, char **bufend,
-					size_t need));
-static struct bfd_hash_entry *string_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
-	   const char *));
-static void ecoff_align_debug PARAMS ((bfd *abfd,
-				       struct ecoff_debug_info *debug,
-				       const struct ecoff_debug_swap *swap));
-static boolean ecoff_write_symhdr PARAMS ((bfd *, struct ecoff_debug_info *,
-					   const struct ecoff_debug_swap *,
-					   file_ptr where));
-static int cmp_fdrtab_entry PARAMS ((const PTR, const PTR));
-static boolean mk_fdrtab PARAMS ((bfd *,
-				  struct ecoff_debug_info * const,
-				  const struct ecoff_debug_swap * const,
-				  struct ecoff_find_line *));
-static long fdrtab_lookup PARAMS ((struct ecoff_find_line *, bfd_vma));
-static boolean lookup_line
-  PARAMS ((bfd *, struct ecoff_debug_info * const,
-	   const struct ecoff_debug_swap * const, struct ecoff_find_line *));
-
-/* Routines to swap auxiliary information in and out.  I am assuming
-   that the auxiliary information format is always going to be target
-   independent.  */
-
-/* Swap in a type information record.
-   BIGEND says whether AUX symbols are big-endian or little-endian; this
-   info comes from the file header record (fh-fBigendian).  */
-
-void
-_bfd_ecoff_swap_tir_in (bigend, ext_copy, intern)
-     int bigend;
-     const struct tir_ext *ext_copy;
-     TIR *intern;
-{
-  struct tir_ext ext[1];
-
-  *ext = *ext_copy;		/* Make it reasonable to do in-place.  */
-  
-  /* now the fun stuff... */
-  if (bigend) {
-    intern->fBitfield   = 0 != (ext->t_bits1[0] & TIR_BITS1_FBITFIELD_BIG);
-    intern->continued   = 0 != (ext->t_bits1[0] & TIR_BITS1_CONTINUED_BIG);
-    intern->bt          = (ext->t_bits1[0] & TIR_BITS1_BT_BIG)
-			>>		    TIR_BITS1_BT_SH_BIG;
-    intern->tq4         = (ext->t_tq45[0] & TIR_BITS_TQ4_BIG)
-			>>		    TIR_BITS_TQ4_SH_BIG;
-    intern->tq5         = (ext->t_tq45[0] & TIR_BITS_TQ5_BIG)
-			>>		    TIR_BITS_TQ5_SH_BIG;
-    intern->tq0         = (ext->t_tq01[0] & TIR_BITS_TQ0_BIG)
-			>>		    TIR_BITS_TQ0_SH_BIG;
-    intern->tq1         = (ext->t_tq01[0] & TIR_BITS_TQ1_BIG)
-			>>		    TIR_BITS_TQ1_SH_BIG;
-    intern->tq2         = (ext->t_tq23[0] & TIR_BITS_TQ2_BIG)
-			>>		    TIR_BITS_TQ2_SH_BIG;
-    intern->tq3         = (ext->t_tq23[0] & TIR_BITS_TQ3_BIG)
-			>>		    TIR_BITS_TQ3_SH_BIG;
-  } else {
-    intern->fBitfield   = 0 != (ext->t_bits1[0] & TIR_BITS1_FBITFIELD_LITTLE);
-    intern->continued   = 0 != (ext->t_bits1[0] & TIR_BITS1_CONTINUED_LITTLE);
-    intern->bt          = (ext->t_bits1[0] & TIR_BITS1_BT_LITTLE)
-			>>		    TIR_BITS1_BT_SH_LITTLE;
-    intern->tq4         = (ext->t_tq45[0] & TIR_BITS_TQ4_LITTLE)
-			>>		    TIR_BITS_TQ4_SH_LITTLE;
-    intern->tq5         = (ext->t_tq45[0] & TIR_BITS_TQ5_LITTLE)
-			>>		    TIR_BITS_TQ5_SH_LITTLE;
-    intern->tq0         = (ext->t_tq01[0] & TIR_BITS_TQ0_LITTLE)
-			>>		    TIR_BITS_TQ0_SH_LITTLE;
-    intern->tq1         = (ext->t_tq01[0] & TIR_BITS_TQ1_LITTLE)
-			>>		    TIR_BITS_TQ1_SH_LITTLE;
-    intern->tq2         = (ext->t_tq23[0] & TIR_BITS_TQ2_LITTLE)
-			>>		    TIR_BITS_TQ2_SH_LITTLE;
-    intern->tq3         = (ext->t_tq23[0] & TIR_BITS_TQ3_LITTLE)
-			>>		    TIR_BITS_TQ3_SH_LITTLE;
-  }
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out a type information record.
-   BIGEND says whether AUX symbols are big-endian or little-endian; this
-   info comes from the file header record (fh-fBigendian).  */
-
-void
-_bfd_ecoff_swap_tir_out (bigend, intern_copy, ext)
-     int bigend;
-     const TIR *intern_copy;
-     struct tir_ext *ext;
-{
-  TIR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-  
-  /* now the fun stuff... */
-  if (bigend) {
-    ext->t_bits1[0] = ((intern->fBitfield ? TIR_BITS1_FBITFIELD_BIG : 0)
-		       | (intern->continued ? TIR_BITS1_CONTINUED_BIG : 0)
-		       | ((intern->bt << TIR_BITS1_BT_SH_BIG)
-			  & TIR_BITS1_BT_BIG));
-    ext->t_tq45[0] = (((intern->tq4 << TIR_BITS_TQ4_SH_BIG)
-		       & TIR_BITS_TQ4_BIG)
-		      | ((intern->tq5 << TIR_BITS_TQ5_SH_BIG)
-			 & TIR_BITS_TQ5_BIG));
-    ext->t_tq01[0] = (((intern->tq0 << TIR_BITS_TQ0_SH_BIG)
-		       & TIR_BITS_TQ0_BIG)
-		      | ((intern->tq1 << TIR_BITS_TQ1_SH_BIG)
-			 & TIR_BITS_TQ1_BIG));
-    ext->t_tq23[0] = (((intern->tq2 << TIR_BITS_TQ2_SH_BIG)
-		       & TIR_BITS_TQ2_BIG)
-		      | ((intern->tq3 << TIR_BITS_TQ3_SH_BIG)
-			 & TIR_BITS_TQ3_BIG));
-  } else {
-    ext->t_bits1[0] = ((intern->fBitfield ? TIR_BITS1_FBITFIELD_LITTLE : 0)
-		       | (intern->continued ? TIR_BITS1_CONTINUED_LITTLE : 0)
-		       | ((intern->bt << TIR_BITS1_BT_SH_LITTLE)
-			  & TIR_BITS1_BT_LITTLE));
-    ext->t_tq45[0] = (((intern->tq4 << TIR_BITS_TQ4_SH_LITTLE)
-		       & TIR_BITS_TQ4_LITTLE)
-		      | ((intern->tq5 << TIR_BITS_TQ5_SH_LITTLE)
-			 & TIR_BITS_TQ5_LITTLE));
-    ext->t_tq01[0] = (((intern->tq0 << TIR_BITS_TQ0_SH_LITTLE)
-		       & TIR_BITS_TQ0_LITTLE)
-		      | ((intern->tq1 << TIR_BITS_TQ1_SH_LITTLE)
-			 & TIR_BITS_TQ1_LITTLE));
-    ext->t_tq23[0] = (((intern->tq2 << TIR_BITS_TQ2_SH_LITTLE)
-		       & TIR_BITS_TQ2_LITTLE)
-		      | ((intern->tq3 << TIR_BITS_TQ3_SH_LITTLE)
-			 & TIR_BITS_TQ3_LITTLE));
-  }
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap in a relative symbol record.  BIGEND says whether it is in
-   big-endian or little-endian format.*/
-
-void
-_bfd_ecoff_swap_rndx_in (bigend, ext_copy, intern)
-     int bigend;
-     const struct rndx_ext *ext_copy;
-     RNDXR *intern;
-{
-  struct rndx_ext ext[1];
-
-  *ext = *ext_copy;		/* Make it reasonable to do in-place.  */
-  
-  /* now the fun stuff... */
-  if (bigend) {
-    intern->rfd   = (ext->r_bits[0] << RNDX_BITS0_RFD_SH_LEFT_BIG)
-		  | ((ext->r_bits[1] & RNDX_BITS1_RFD_BIG)
-		    		    >> RNDX_BITS1_RFD_SH_BIG);
-    intern->index = ((ext->r_bits[1] & RNDX_BITS1_INDEX_BIG)
-		    		    << RNDX_BITS1_INDEX_SH_LEFT_BIG)
-		  | (ext->r_bits[2] << RNDX_BITS2_INDEX_SH_LEFT_BIG)
-		  | (ext->r_bits[3] << RNDX_BITS3_INDEX_SH_LEFT_BIG);
-  } else {
-    intern->rfd   = (ext->r_bits[0] << RNDX_BITS0_RFD_SH_LEFT_LITTLE)
-		  | ((ext->r_bits[1] & RNDX_BITS1_RFD_LITTLE)
-		    		    << RNDX_BITS1_RFD_SH_LEFT_LITTLE);
-    intern->index = ((ext->r_bits[1] & RNDX_BITS1_INDEX_LITTLE)
-		    		    >> RNDX_BITS1_INDEX_SH_LITTLE)
-		  | (ext->r_bits[2] << RNDX_BITS2_INDEX_SH_LEFT_LITTLE)
-		  | ((unsigned int) ext->r_bits[3]
-		     << RNDX_BITS3_INDEX_SH_LEFT_LITTLE);
-  }
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out a relative symbol record.  BIGEND says whether it is in
-   big-endian or little-endian format.*/
-
-void
-_bfd_ecoff_swap_rndx_out (bigend, intern_copy, ext)
-     int bigend;
-     const RNDXR *intern_copy;
-     struct rndx_ext *ext;
-{
-  RNDXR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-  
-  /* now the fun stuff... */
-  if (bigend) {
-    ext->r_bits[0] = intern->rfd >> RNDX_BITS0_RFD_SH_LEFT_BIG;
-    ext->r_bits[1] = (((intern->rfd << RNDX_BITS1_RFD_SH_BIG)
-		       & RNDX_BITS1_RFD_BIG)
-		      | ((intern->index >> RNDX_BITS1_INDEX_SH_LEFT_BIG)
-			 & RNDX_BITS1_INDEX_BIG));
-    ext->r_bits[2] = intern->index >> RNDX_BITS2_INDEX_SH_LEFT_BIG;
-    ext->r_bits[3] = intern->index >> RNDX_BITS3_INDEX_SH_LEFT_BIG;
-  } else {
-    ext->r_bits[0] = intern->rfd >> RNDX_BITS0_RFD_SH_LEFT_LITTLE;
-    ext->r_bits[1] = (((intern->rfd >> RNDX_BITS1_RFD_SH_LEFT_LITTLE)
-		       & RNDX_BITS1_RFD_LITTLE)
-		      | ((intern->index << RNDX_BITS1_INDEX_SH_LITTLE)
-			 & RNDX_BITS1_INDEX_LITTLE));
-    ext->r_bits[2] = intern->index >> RNDX_BITS2_INDEX_SH_LEFT_LITTLE;
-    ext->r_bits[3] = intern->index >> RNDX_BITS3_INDEX_SH_LEFT_LITTLE;
-  }
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* The minimum amount of data to allocate.  */
-#define ALLOC_SIZE (4064)
-
-/* Add bytes to a buffer.  Return success.  */
-
-static boolean
-ecoff_add_bytes (buf, bufend, need)
-     char **buf;
-     char **bufend;
-     size_t need;
-{
-  size_t have;
-  size_t want;
-  char *newbuf;
-
-  have = *bufend - *buf;
-  if (have > need)
-    want = ALLOC_SIZE;
-  else
-    {
-      want = need - have;
-      if (want < ALLOC_SIZE)
-	want = ALLOC_SIZE;
-    }
-  newbuf = (char *) bfd_realloc (*buf, have + want);
-  if (newbuf == NULL)
-    return false;
-  *buf = newbuf;
-  *bufend = *buf + have + want;
-  return true;
-}
-
-/* We keep a hash table which maps strings to numbers.  We use it to
-   map FDR names to indices in the output file, and to map local
-   strings when combining stabs debugging information.  */
-
-struct string_hash_entry
-{
-  struct bfd_hash_entry root;
-  /* FDR index or string table offset.  */
-  long val;
-  /* Next entry in string table.  */
-  struct string_hash_entry *next;
-};
-
-struct string_hash_table
-{
-  struct bfd_hash_table table;
-};
-
-/* Routine to create an entry in a string hash table.  */
-
-static struct bfd_hash_entry *
-string_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct string_hash_entry *ret = (struct string_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct string_hash_entry *) NULL)
-    ret = ((struct string_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct string_hash_entry)));
-  if (ret == (struct string_hash_entry *) NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct string_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
-  if (ret)
-    {
-      /* Initialize the local fields.  */
-      ret->val = -1;
-      ret->next = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Look up an entry in an string hash table.  */
-
-#define string_hash_lookup(t, string, create, copy) \
-  ((struct string_hash_entry *) \
-   bfd_hash_lookup (&(t)->table, (string), (create), (copy)))
-
-/* We can't afford to read in all the debugging information when we do
-   a link.  Instead, we build a list of these structures to show how
-   different parts of the input file map to the output file.  */
-
-struct shuffle
-{
-  /* The next entry in this linked list.  */
-  struct shuffle *next;
-  /* The length of the information.  */
-  unsigned long size;
-  /* Whether this information comes from a file or not.  */
-  boolean filep;
-  union
-    {
-      struct
-	{
-	  /* The BFD the data comes from.  */
-	  bfd *input_bfd;
-	  /* The offset within input_bfd.  */
-	  file_ptr offset;
-	} file;
-      /* The data to be written out.  */
-      PTR memory;
-    } u;
-};
-
-/* This structure holds information across calls to
-   bfd_ecoff_debug_accumulate.  */
-
-struct accumulate
-{
-  /* The FDR hash table.  */
-  struct string_hash_table fdr_hash;
-  /* The strings hash table.  */
-  struct string_hash_table str_hash;
-  /* Linked lists describing how to shuffle the input debug
-     information into the output file.  We keep a pointer to both the
-     head and the tail.  */
-  struct shuffle *line;
-  struct shuffle *line_end;
-  struct shuffle *pdr;
-  struct shuffle *pdr_end;
-  struct shuffle *sym;
-  struct shuffle *sym_end;
-  struct shuffle *opt;
-  struct shuffle *opt_end;
-  struct shuffle *aux;
-  struct shuffle *aux_end;
-  struct shuffle *ss;
-  struct shuffle *ss_end;
-  struct string_hash_entry *ss_hash;
-  struct string_hash_entry *ss_hash_end;
-  struct shuffle *fdr;
-  struct shuffle *fdr_end;
-  struct shuffle *rfd;
-  struct shuffle *rfd_end;
-  /* The size of the largest file shuffle.  */
-  unsigned long largest_file_shuffle;
-  /* An objalloc for debugging information.  */
-  struct objalloc *memory;
-};
-
-/* Add a file entry to a shuffle list.  */
-
-static boolean add_file_shuffle PARAMS ((struct accumulate *,
-				      struct shuffle **,
-				      struct shuffle **, bfd *, file_ptr,
-				      unsigned long));
-
-static boolean
-add_file_shuffle (ainfo, head, tail, input_bfd, offset, size)
-     struct accumulate *ainfo;
-     struct shuffle **head;
-     struct shuffle **tail;
-     bfd *input_bfd;
-     file_ptr offset;
-     unsigned long size;
-{
-  struct shuffle *n;
-
-  if (*tail != (struct shuffle *) NULL
-      && (*tail)->filep
-      && (*tail)->u.file.input_bfd == input_bfd
-      && (*tail)->u.file.offset + (*tail)->size == (unsigned long) offset)
-    {
-      /* Just merge this entry onto the existing one.  */
-      (*tail)->size += size;
-      if ((*tail)->size > ainfo->largest_file_shuffle)
-	ainfo->largest_file_shuffle = (*tail)->size;
-      return true;
-    }
-
-  n = (struct shuffle *) objalloc_alloc (ainfo->memory,
-					 sizeof (struct shuffle));
-  if (!n)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  n->next = NULL;
-  n->size = size;
-  n->filep = true;
-  n->u.file.input_bfd = input_bfd;
-  n->u.file.offset = offset;
-  if (*head == (struct shuffle *) NULL)
-    *head = n;
-  if (*tail != (struct shuffle *) NULL)
-    (*tail)->next = n;
-  *tail = n;
-  if (size > ainfo->largest_file_shuffle)
-    ainfo->largest_file_shuffle = size;
-  return true;
-}
-
-/* Add a memory entry to a shuffle list.  */
-
-static boolean add_memory_shuffle PARAMS ((struct accumulate *,
-					   struct shuffle **head,
-					   struct shuffle **tail,
-					   bfd_byte *data, unsigned long size));
-
-static boolean
-add_memory_shuffle (ainfo, head, tail, data, size)
-     struct accumulate *ainfo;
-     struct shuffle **head;
-     struct shuffle **tail;
-     bfd_byte *data;
-     unsigned long size;
-{
-  struct shuffle *n;
-     
-  n = (struct shuffle *) objalloc_alloc (ainfo->memory,
-					 sizeof (struct shuffle));
-  if (!n)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  n->next = NULL;
-  n->size = size;
-  n->filep = false;
-  n->u.memory = (PTR) data;
-  if (*head == (struct shuffle *) NULL)
-    *head = n;
-  if (*tail != (struct shuffle *) NULL)
-    (*tail)->next = n;
-  *tail = n;
-  return true;
-}
-
-/* Initialize the FDR hash table.  This returns a handle which is then
-   passed in to bfd_ecoff_debug_accumulate, et. al.  */
-
-/*ARGSUSED*/
-PTR
-bfd_ecoff_debug_init (output_bfd, output_debug, output_swap, info)
-     bfd *output_bfd;
-     struct ecoff_debug_info *output_debug;
-     const struct ecoff_debug_swap *output_swap;
-     struct bfd_link_info *info;
-{
-  struct accumulate *ainfo;
-
-  ainfo = (struct accumulate *) bfd_malloc (sizeof (struct accumulate));
-  if (!ainfo)
-    return NULL;
-  if (! bfd_hash_table_init_n (&ainfo->fdr_hash.table, string_hash_newfunc,
-			       1021))
-    return NULL;
-
-  ainfo->line = NULL;
-  ainfo->line_end = NULL;
-  ainfo->pdr = NULL;
-  ainfo->pdr_end = NULL;
-  ainfo->sym = NULL;
-  ainfo->sym_end = NULL;
-  ainfo->opt = NULL;
-  ainfo->opt_end = NULL;
-  ainfo->aux = NULL;
-  ainfo->aux_end = NULL;
-  ainfo->ss = NULL;
-  ainfo->ss_end = NULL;
-  ainfo->ss_hash = NULL;
-  ainfo->ss_hash_end = NULL;
-  ainfo->fdr = NULL;
-  ainfo->fdr_end = NULL;
-  ainfo->rfd = NULL;
-  ainfo->rfd_end = NULL;
-
-  ainfo->largest_file_shuffle = 0;
-
-  if (! info->relocateable)
-    {
-      if (! bfd_hash_table_init (&ainfo->str_hash.table, string_hash_newfunc))
-	return NULL;
-
-      /* The first entry in the string table is the empty string.  */
-      output_debug->symbolic_header.issMax = 1;
-    }
-
-  ainfo->memory = objalloc_create ();
-  if (ainfo->memory == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
-
-  return (PTR) ainfo;
-}
-
-/* Free the accumulated debugging information.  */
-
-/*ARGSUSED*/
-void
-bfd_ecoff_debug_free (handle, output_bfd, output_debug, output_swap, info)
-     PTR handle;
-     bfd *output_bfd;
-     struct ecoff_debug_info *output_debug;
-     const struct ecoff_debug_swap *output_swap;
-     struct bfd_link_info *info;
-{
-  struct accumulate *ainfo = (struct accumulate *) handle;
-  
-  bfd_hash_table_free (&ainfo->fdr_hash.table);
-
-  if (! info->relocateable)
-    bfd_hash_table_free (&ainfo->str_hash.table);
-
-  objalloc_free (ainfo->memory);
-
-  free (ainfo);
-}
-
-/* Accumulate the debugging information from INPUT_BFD into
-   OUTPUT_BFD.  The INPUT_DEBUG argument points to some ECOFF
-   debugging information which we want to link into the information
-   pointed to by the OUTPUT_DEBUG argument.  OUTPUT_SWAP and
-   INPUT_SWAP point to the swapping information needed.  INFO is the
-   linker information structure.  HANDLE is returned by
-   bfd_ecoff_debug_init.  */
-
-/*ARGSUSED*/
-boolean
-bfd_ecoff_debug_accumulate (handle, output_bfd, output_debug, output_swap,
-			    input_bfd, input_debug, input_swap,
-			    info)
-     PTR handle;
-     bfd *output_bfd;
-     struct ecoff_debug_info *output_debug;
-     const struct ecoff_debug_swap *output_swap;
-     bfd *input_bfd;
-     struct ecoff_debug_info *input_debug;
-     const struct ecoff_debug_swap *input_swap;
-     struct bfd_link_info *info;
-{
-  struct accumulate *ainfo = (struct accumulate *) handle;
-  void (* const swap_sym_in) PARAMS ((bfd *, PTR, SYMR *))
-    = input_swap->swap_sym_in;
-  void (* const swap_rfd_in) PARAMS ((bfd *, PTR, RFDT *))
-    = input_swap->swap_rfd_in;
-  void (* const swap_sym_out) PARAMS ((bfd *, const SYMR *, PTR))
-    = output_swap->swap_sym_out;
-  void (* const swap_fdr_out) PARAMS ((bfd *, const FDR *, PTR))
-    = output_swap->swap_fdr_out;
-  void (* const swap_rfd_out) PARAMS ((bfd *, const RFDT *, PTR))
-    = output_swap->swap_rfd_out;
-  bfd_size_type external_pdr_size = output_swap->external_pdr_size;
-  bfd_size_type external_sym_size = output_swap->external_sym_size;
-  bfd_size_type external_opt_size = output_swap->external_opt_size;
-  bfd_size_type external_fdr_size = output_swap->external_fdr_size;
-  bfd_size_type external_rfd_size = output_swap->external_rfd_size;
-  HDRR * const output_symhdr = &output_debug->symbolic_header;
-  HDRR * const input_symhdr = &input_debug->symbolic_header;
-  bfd_vma section_adjust[scMax];
-  asection *sec;
-  bfd_byte *fdr_start;
-  bfd_byte *fdr_ptr;
-  bfd_byte *fdr_end;
-  bfd_size_type fdr_add;
-  unsigned int copied;
-  RFDT i;
-  unsigned long sz;
-  bfd_byte *rfd_out;
-  bfd_byte *rfd_in;
-  bfd_byte *rfd_end;
-  long newrfdbase = 0;
-  long oldrfdbase = 0;
-  bfd_byte *fdr_out;
-
-  /* Use section_adjust to hold the value to add to a symbol in a
-     particular section.  */
-  memset ((PTR) section_adjust, 0, sizeof section_adjust);
-
-#define SET(name, indx) \
-  sec = bfd_get_section_by_name (input_bfd, name); \
-  if (sec != NULL) \
-    section_adjust[indx] = (sec->output_section->vma \
-			    + sec->output_offset \
-			    - sec->vma);
-
-  SET (".text", scText);
-  SET (".data", scData);
-  SET (".bss", scBss);
-  SET (".sdata", scSData);
-  SET (".sbss", scSBss);
-  /* scRdata section may be either .rdata or .rodata.  */
-  SET (".rdata", scRData);
-  SET (".rodata", scRData);
-  SET (".init", scInit);
-  SET (".fini", scFini);
-  SET (".rconst", scRConst);
-
-#undef SET
-
-  /* Find all the debugging information based on the FDR's.  We need
-     to handle them whether they are swapped or not.  */
-  if (input_debug->fdr != (FDR *) NULL)
-    {
-      fdr_start = (bfd_byte *) input_debug->fdr;
-      fdr_add = sizeof (FDR);
-    }
-  else
-    {
-      fdr_start = (bfd_byte *) input_debug->external_fdr;
-      fdr_add = input_swap->external_fdr_size;
-    }
-  fdr_end = fdr_start + input_symhdr->ifdMax * fdr_add;
-
-  input_debug->ifdmap = (RFDT *) bfd_alloc (input_bfd,
-					    (input_symhdr->ifdMax
-					     * sizeof (RFDT)));
-
-  sz = (input_symhdr->crfd + input_symhdr->ifdMax) * external_rfd_size;
-  rfd_out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
-  if (!input_debug->ifdmap || !rfd_out)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  if (!add_memory_shuffle (ainfo, &ainfo->rfd, &ainfo->rfd_end, rfd_out, sz))
-    return false;
-
-  copied = 0;
-
-  /* Look through the FDR's to see which ones we are going to include
-     in the final output.  We do not want duplicate FDR information
-     for header files, because ECOFF debugging is often very large.
-     When we find an FDR with no line information which can be merged,
-     we look it up in a hash table to ensure that we only include it
-     once.  We keep a table mapping FDR numbers to the final number
-     they get with the BFD, so that we can refer to it when we write
-     out the external symbols.  */
-  for (fdr_ptr = fdr_start, i = 0;
-       fdr_ptr < fdr_end;
-       fdr_ptr += fdr_add, i++, rfd_out += external_rfd_size)
-    {
-      FDR fdr;
-
-      if (input_debug->fdr != (FDR *) NULL)
-	fdr = *(FDR *) fdr_ptr;
-      else
-	(*input_swap->swap_fdr_in) (input_bfd, (PTR) fdr_ptr, &fdr);
-
-      /* See if this FDR can be merged with an existing one.  */
-      if (fdr.cbLine == 0 && fdr.rss != -1 && fdr.fMerge)
-	{
-	  const char *name;
-	  char *lookup;
-	  struct string_hash_entry *fh;
-
-	  /* We look up a string formed from the file name and the
-	     number of symbols and aux entries.  Sometimes an include
-	     file will conditionally define a typedef or something
-	     based on the order of include files.  Using the number of
-	     symbols and aux entries as a hash reduces the chance that
-	     we will merge symbol information that should not be
-	     merged.  */
-	  name = input_debug->ss + fdr.issBase + fdr.rss;
-
-	  lookup = (char *) bfd_malloc (strlen (name) + 20);
-	  if (lookup == NULL)
-	    return false;
-	  sprintf (lookup, "%s %lx %lx", name, fdr.csym, fdr.caux);
-
-	  fh = string_hash_lookup (&ainfo->fdr_hash, lookup, true, true);
-	  free (lookup);
-	  if (fh == (struct string_hash_entry *) NULL)
-	    return false;
-
-	  if (fh->val != -1)
-	    {
-	      input_debug->ifdmap[i] = fh->val;
-	      (*swap_rfd_out) (output_bfd, input_debug->ifdmap + i,
-			       (PTR) rfd_out);
-
-	      /* Don't copy this FDR.  */
-	      continue;
-	    }
-
-	  fh->val = output_symhdr->ifdMax + copied;
-	}
-
-      input_debug->ifdmap[i] = output_symhdr->ifdMax + copied;
-      (*swap_rfd_out) (output_bfd, input_debug->ifdmap + i, (PTR) rfd_out);
-      ++copied;
-    }
-
-  newrfdbase = output_symhdr->crfd;
-  output_symhdr->crfd += input_symhdr->ifdMax;
-
-  /* Copy over any existing RFD's.  RFD's are only created by the
-     linker, so this will only happen for input files which are the
-     result of a partial link.  */
-  rfd_in = (bfd_byte *) input_debug->external_rfd;
-  rfd_end = rfd_in + input_symhdr->crfd * input_swap->external_rfd_size;
-  for (;
-       rfd_in < rfd_end;
-       rfd_in += input_swap->external_rfd_size)
-    {
-      RFDT rfd;
-
-      (*swap_rfd_in) (input_bfd, (PTR) rfd_in, &rfd);
-      BFD_ASSERT (rfd >= 0 && rfd < input_symhdr->ifdMax);
-      rfd = input_debug->ifdmap[rfd];
-      (*swap_rfd_out) (output_bfd, &rfd, (PTR) rfd_out);
-      rfd_out += external_rfd_size;
-    }
-
-  oldrfdbase = output_symhdr->crfd;
-  output_symhdr->crfd += input_symhdr->crfd;
-
-  /* Look through the FDR's and copy over all associated debugging
-     information.  */
-  sz = copied * external_fdr_size;
-  fdr_out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
-  if (!fdr_out)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  if (!add_memory_shuffle (ainfo, &ainfo->fdr, &ainfo->fdr_end, fdr_out, sz))
-    return false;
-  for (fdr_ptr = fdr_start, i = 0;
-       fdr_ptr < fdr_end;
-       fdr_ptr += fdr_add, i++)
-    {
-      FDR fdr;
-      bfd_vma fdr_adr;
-      bfd_byte *sym_out;
-      bfd_byte *lraw_src;
-      bfd_byte *lraw_end;
-      boolean fgotfilename;
-
-      if (input_debug->ifdmap[i] < output_symhdr->ifdMax)
-	{
-	  /* We are not copying this FDR.  */
-	  continue;
-	}
-
-      if (input_debug->fdr != (FDR *) NULL)
-	fdr = *(FDR *) fdr_ptr;
-      else
-	(*input_swap->swap_fdr_in) (input_bfd, (PTR) fdr_ptr, &fdr);
-
-      fdr_adr = fdr.adr;
-
-      /* Adjust the FDR address for any changes that may have been
-	 made by relaxing.  */
-      if (input_debug->adjust != (struct ecoff_value_adjust *) NULL)
-	{
-	  struct ecoff_value_adjust *adjust;
-
-	  for (adjust = input_debug->adjust;
-	       adjust != (struct ecoff_value_adjust *) NULL;
-	       adjust = adjust->next)
-	    if (fdr_adr >= adjust->start
-		&& fdr_adr < adjust->end)
-	      fdr.adr += adjust->adjust;
-	}
-
-      /* FIXME: It is conceivable that this FDR points to the .init or
-	 .fini section, in which case this will not do the right
-	 thing.  */
-      fdr.adr += section_adjust[scText];
-
-      /* Swap in the local symbols, adjust their values, and swap them
-	 out again.  */
-      fgotfilename = false;
-      sz = fdr.csym * external_sym_size;
-      sym_out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
-      if (!sym_out)
-	{
-	  bfd_set_error (bfd_error_no_memory);
-	  return false;
-	}
-      if (!add_memory_shuffle (ainfo, &ainfo->sym, &ainfo->sym_end, sym_out,
-			       sz))
-	return false;
-      lraw_src = ((bfd_byte *) input_debug->external_sym
-		  + fdr.isymBase * input_swap->external_sym_size);
-      lraw_end = lraw_src + fdr.csym * input_swap->external_sym_size;
-      for (;  lraw_src < lraw_end;  lraw_src += input_swap->external_sym_size)
-	{
-	  SYMR internal_sym;
-
-	  (*swap_sym_in) (input_bfd, (PTR) lraw_src, &internal_sym);
-
-	  BFD_ASSERT (internal_sym.sc != scCommon
-		      && internal_sym.sc != scSCommon);
-
-	  /* Adjust the symbol value if appropriate.  */
-	  switch (internal_sym.st)
-	    {
-	    case stNil:
-	      if (ECOFF_IS_STAB (&internal_sym))
-		break;
-	      /* Fall through.  */
-	    case stGlobal:
-	    case stStatic:
-	    case stLabel:
-	    case stProc:
-	    case stStaticProc:
-	      if (input_debug->adjust != (struct ecoff_value_adjust *) NULL)
-		{
-		  bfd_vma value;
-		  struct ecoff_value_adjust *adjust;
-
-		  value = internal_sym.value;
-		  for (adjust = input_debug->adjust;
-		       adjust != (struct ecoff_value_adjust *) NULL;
-		       adjust = adjust->next)
-		    if (value >= adjust->start
-			&& value < adjust->end)
-		      internal_sym.value += adjust->adjust;
-		}
-	      internal_sym.value += section_adjust[internal_sym.sc];
-	      break;
-
-	    default:
-	      break;
-	    }
-
-	  /* If we are doing a final link, we hash all the strings in
-	     the local symbol table together.  This reduces the amount
-	     of space required by debugging information.  We don't do
-	     this when performing a relocateable link because it would
-	     prevent us from easily merging different FDR's.  */
-	  if (! info->relocateable)
-	    {
-	      boolean ffilename;
-	      const char *name;
-
-	      if (! fgotfilename && internal_sym.iss == fdr.rss)
-		ffilename = true;
-	      else
-		ffilename = false;
-
-	      /* Hash the name into the string table.  */
-	      name = input_debug->ss + fdr.issBase + internal_sym.iss;
-	      if (*name == '\0')
-		internal_sym.iss = 0;
-	      else
-		{
-		  struct string_hash_entry *sh;
-
-		  sh = string_hash_lookup (&ainfo->str_hash, name, true, true);
-		  if (sh == (struct string_hash_entry *) NULL)
-		    return false;
-		  if (sh->val == -1)
-		    {
-		      sh->val = output_symhdr->issMax;
-		      output_symhdr->issMax += strlen (name) + 1;
-		      if (ainfo->ss_hash == (struct string_hash_entry *) NULL)
-			ainfo->ss_hash = sh;
-		      if (ainfo->ss_hash_end
-			  != (struct string_hash_entry *) NULL)
-			ainfo->ss_hash_end->next = sh;
-		      ainfo->ss_hash_end = sh;
-		    }
-		  internal_sym.iss = sh->val;
-		}
-
-	      if (ffilename)
-		{
-		  fdr.rss = internal_sym.iss;
-		  fgotfilename = true;
-		}
-	    }
-
-	  (*swap_sym_out) (output_bfd, &internal_sym, sym_out);
-	  sym_out += external_sym_size;
-	}
-
-      fdr.isymBase = output_symhdr->isymMax;
-      output_symhdr->isymMax += fdr.csym;
-
-      /* Copy the information that does not need swapping.  */
-
-      /* FIXME: If we are relaxing, we need to adjust the line
-	 numbers.  Frankly, forget it.  Anybody using stabs debugging
-	 information will not use this line number information, and
-	 stabs are adjusted correctly.  */
-      if (fdr.cbLine > 0)
-	{
-	  if (!add_file_shuffle (ainfo, &ainfo->line, &ainfo->line_end,
-				 input_bfd,
-				 input_symhdr->cbLineOffset + fdr.cbLineOffset,
-				 fdr.cbLine))
-	    return false;
-	  fdr.ilineBase = output_symhdr->ilineMax;
-	  fdr.cbLineOffset = output_symhdr->cbLine;
-	  output_symhdr->ilineMax += fdr.cline;
-	  output_symhdr->cbLine += fdr.cbLine;
-	}
-      if (fdr.caux > 0)
-	{
-	  if (!add_file_shuffle (ainfo, &ainfo->aux, &ainfo->aux_end,
-				 input_bfd,
-				 (input_symhdr->cbAuxOffset
-				  + fdr.iauxBase * sizeof (union aux_ext)),
-				 fdr.caux * sizeof (union aux_ext)))
-	    return false;
-	  fdr.iauxBase = output_symhdr->iauxMax;
-	  output_symhdr->iauxMax += fdr.caux;
-	}
-      if (! info->relocateable)
-	{
-
-	  /* When are are hashing strings, we lie about the number of
-	     strings attached to each FDR.  We need to set cbSs
-	     because some versions of dbx apparently use it to decide
-	     how much of the string table to read in.  */
-	  fdr.issBase = 0;
-	  fdr.cbSs = output_symhdr->issMax;
-	}
-      else if (fdr.cbSs > 0)
-	{
-	  if (!add_file_shuffle (ainfo, &ainfo->ss, &ainfo->ss_end,
-				 input_bfd,
-				 input_symhdr->cbSsOffset + fdr.issBase,
-				 fdr.cbSs))
-	    return false;
-	  fdr.issBase = output_symhdr->issMax;
-	  output_symhdr->issMax += fdr.cbSs;
-	}
-
-      if ((output_bfd->xvec->header_byteorder
-	   == input_bfd->xvec->header_byteorder)
-	  && input_debug->adjust == (struct ecoff_value_adjust *) NULL)
-	{
-	  /* The two BFD's have the same endianness, and we don't have
-	     to adjust the PDR addresses, so simply copying the
-	     information will suffice.  */
-	  BFD_ASSERT (external_pdr_size == input_swap->external_pdr_size);
-	  if (fdr.cpd > 0)
-	    {
-	      if (!add_file_shuffle (ainfo, &ainfo->pdr, &ainfo->pdr_end,
-				     input_bfd,
-				     (input_symhdr->cbPdOffset
-				      + fdr.ipdFirst * external_pdr_size),
-				     fdr.cpd * external_pdr_size))
-		return false;
-	    }
-	  BFD_ASSERT (external_opt_size == input_swap->external_opt_size);
-	  if (fdr.copt > 0)
-	    {
-	      if (!add_file_shuffle (ainfo, &ainfo->opt, &ainfo->opt_end,
-				     input_bfd,
-				     (input_symhdr->cbOptOffset
-				      + fdr.ioptBase * external_opt_size),
-				     fdr.copt * external_opt_size))
-		return false;
-	    }
-	}
-      else
-	{
-	  bfd_size_type outsz, insz;
-	  bfd_byte *in;
-	  bfd_byte *end;
-	  bfd_byte *out;
-
-	  /* The two BFD's have different endianness, so we must swap
-	     everything in and out.  This code would always work, but
-	     it would be unnecessarily slow in the normal case.  */
-	  outsz = external_pdr_size;
-	  insz = input_swap->external_pdr_size;
-	  in = ((bfd_byte *) input_debug->external_pdr
-		+ fdr.ipdFirst * insz);
-	  end = in + fdr.cpd * insz;
-	  sz = fdr.cpd * outsz;
-	  out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
-	  if (!out)
-	    {
-	      bfd_set_error (bfd_error_no_memory);
-	      return false;
-	    }
-	  if (!add_memory_shuffle (ainfo, &ainfo->pdr, &ainfo->pdr_end, out,
-				   sz))
-	    return false;
-	  for (; in < end; in += insz, out += outsz)
-	    {
-	      PDR pdr;
-
-	      (*input_swap->swap_pdr_in) (input_bfd, (PTR) in, &pdr);
-
-	      /* If we have been relaxing, we may have to adjust the
-		 address.  */
-	      if (input_debug->adjust != (struct ecoff_value_adjust *) NULL)
-		{
-		  bfd_vma adr;
-		  struct ecoff_value_adjust *adjust;
-
-		  adr = fdr_adr + pdr.adr;
-		  for (adjust = input_debug->adjust;
-		       adjust != (struct ecoff_value_adjust *) NULL;
-		       adjust = adjust->next)
-		    if (adr >= adjust->start
-			&& adr < adjust->end)
-		      pdr.adr += adjust->adjust;
-		}
-
-	      (*output_swap->swap_pdr_out) (output_bfd, &pdr, (PTR) out);
-	    }
-
-	  /* Swap over the optimization information.  */
-	  outsz = external_opt_size;
-	  insz = input_swap->external_opt_size;
-	  in = ((bfd_byte *) input_debug->external_opt
-		+ fdr.ioptBase * insz);
-	  end = in + fdr.copt * insz;
-	  sz = fdr.copt * outsz;
-	  out = (bfd_byte *) objalloc_alloc (ainfo->memory, sz);
-	  if (!out)
-	    {
-	      bfd_set_error (bfd_error_no_memory);
-	      return false;
-	    }
-	  if (!add_memory_shuffle (ainfo, &ainfo->opt, &ainfo->opt_end, out,
-				   sz))
-	    return false;
-	  for (; in < end; in += insz, out += outsz)
-	    {
-	      OPTR opt;
-
-	      (*input_swap->swap_opt_in) (input_bfd, (PTR) in, &opt);
-	      (*output_swap->swap_opt_out) (output_bfd, &opt, (PTR) out);
-	    }
-	}
-
-      fdr.ipdFirst = output_symhdr->ipdMax;
-      output_symhdr->ipdMax += fdr.cpd;
-      fdr.ioptBase = output_symhdr->ioptMax;
-      output_symhdr->ioptMax += fdr.copt;
-
-      if (fdr.crfd <= 0)
-	{
-	  /* Point this FDR at the table of RFD's we created.  */
-	  fdr.rfdBase = newrfdbase;
-	  fdr.crfd = input_symhdr->ifdMax;
-	}
-      else
-	{
-	  /* Point this FDR at the remapped RFD's.  */
-	  fdr.rfdBase += oldrfdbase;
-	}
-
-      (*swap_fdr_out) (output_bfd, &fdr, fdr_out);
-      fdr_out += external_fdr_size;
-      ++output_symhdr->ifdMax;
-    }
-
-  return true;
-}
-
-/* Add a string to the debugging information we are accumulating.
-   Return the offset from the fdr string base.  */
-
-static long ecoff_add_string PARAMS ((struct accumulate *,
-				      struct bfd_link_info *,
-				      struct ecoff_debug_info *,
-				      FDR *fdr, const char *string));
-
-static long
-ecoff_add_string (ainfo, info, debug, fdr, string)
-     struct accumulate *ainfo;
-     struct bfd_link_info *info;
-     struct ecoff_debug_info *debug;
-     FDR *fdr;
-     const char *string;
-{
-  HDRR *symhdr;
-  size_t len;
-  bfd_size_type ret;
-
-  symhdr = &debug->symbolic_header;
-  len = strlen (string);
-  if (info->relocateable)
-    {
-      if (!add_memory_shuffle (ainfo, &ainfo->ss, &ainfo->ss_end, (PTR) string,
-			       len + 1))
-	return -1;
-      ret = symhdr->issMax;
-      symhdr->issMax += len + 1;
-      fdr->cbSs += len + 1;
-    }
-  else
-    {
-      struct string_hash_entry *sh;
-
-      sh = string_hash_lookup (&ainfo->str_hash, string, true, true);
-      if (sh == (struct string_hash_entry *) NULL)
-	return -1;
-      if (sh->val == -1)
-	{
-	  sh->val = symhdr->issMax;
-	  symhdr->issMax += len + 1;
-	  if (ainfo->ss_hash == (struct string_hash_entry *) NULL)
-	    ainfo->ss_hash = sh;
-	  if (ainfo->ss_hash_end
-	      != (struct string_hash_entry *) NULL)
-	    ainfo->ss_hash_end->next = sh;
-	  ainfo->ss_hash_end = sh;
-	}
-      ret = sh->val;
-    }
-
-  return ret;
-}
-
-/* Add debugging information from a non-ECOFF file.  */
-
-boolean
-bfd_ecoff_debug_accumulate_other (handle, output_bfd, output_debug,
-				  output_swap, input_bfd, info)
-     PTR handle;
-     bfd *output_bfd;
-     struct ecoff_debug_info *output_debug;
-     const struct ecoff_debug_swap *output_swap;
-     bfd *input_bfd;
-     struct bfd_link_info *info;
-{
-  struct accumulate *ainfo = (struct accumulate *) handle;
-  void (* const swap_sym_out) PARAMS ((bfd *, const SYMR *, PTR))
-    = output_swap->swap_sym_out;
-  HDRR *output_symhdr = &output_debug->symbolic_header;
-  FDR fdr;
-  asection *sec;
-  asymbol **symbols;
-  asymbol **sym_ptr;
-  asymbol **sym_end;
-  long symsize;
-  long symcount;
-  PTR external_fdr;
-
-  memset ((PTR) &fdr, 0, sizeof fdr);
-
-  sec = bfd_get_section_by_name (input_bfd, ".text");
-  if (sec != NULL)
-    fdr.adr = sec->output_section->vma + sec->output_offset;
-  else
-    {
-      /* FIXME: What about .init or .fini?  */
-      fdr.adr = 0;
-    }
-
-  fdr.issBase = output_symhdr->issMax;
-  fdr.cbSs = 0;
-  fdr.rss = ecoff_add_string (ainfo, info, output_debug, &fdr,
-			      bfd_get_filename (input_bfd));
-  if (fdr.rss == -1)
-    return false;
-  fdr.isymBase = output_symhdr->isymMax;
-
-  /* Get the local symbols from the input BFD.  */
-  symsize = bfd_get_symtab_upper_bound (input_bfd);
-  if (symsize < 0)
-    return false;
-  symbols = (asymbol **) bfd_alloc (output_bfd, symsize);
-  if (symbols == (asymbol **) NULL)
-    return false;
-  symcount = bfd_canonicalize_symtab (input_bfd, symbols);
-  if (symcount < 0)
-    return false;
-  sym_end = symbols + symcount;
-
-  /* Handle the local symbols.  Any external symbols are handled
-     separately.  */
-  fdr.csym = 0;
-  for (sym_ptr = symbols; sym_ptr != sym_end; sym_ptr++)
-    {
-      SYMR internal_sym;
-      PTR external_sym;
-
-      if (((*sym_ptr)->flags & BSF_EXPORT) != 0)
-	continue;
-      memset ((PTR) &internal_sym, 0, sizeof internal_sym);
-      internal_sym.iss = ecoff_add_string (ainfo, info, output_debug, &fdr,
-					   (*sym_ptr)->name);
-
-      if (internal_sym.iss == -1)
-	return false;
-      if (bfd_is_com_section ((*sym_ptr)->section)
-	  || bfd_is_und_section ((*sym_ptr)->section))
-	internal_sym.value = (*sym_ptr)->value;
-      else
-	internal_sym.value = ((*sym_ptr)->value
-			      + (*sym_ptr)->section->output_offset
-			      + (*sym_ptr)->section->output_section->vma);
-      internal_sym.st = stNil;
-      internal_sym.sc = scUndefined;
-      internal_sym.index = indexNil;
-
-      external_sym = (PTR) objalloc_alloc (ainfo->memory,
-					   output_swap->external_sym_size);
-      if (!external_sym)
-	{
-	  bfd_set_error (bfd_error_no_memory);
-	  return false;
-	}
-      (*swap_sym_out) (output_bfd, &internal_sym, external_sym);
-      add_memory_shuffle (ainfo, &ainfo->sym, &ainfo->sym_end,
-			  external_sym, output_swap->external_sym_size);
-      ++fdr.csym;
-      ++output_symhdr->isymMax;
-    }
-
-  bfd_release (output_bfd, (PTR) symbols);
-
-  /* Leave everything else in the FDR zeroed out.  This will cause
-     the lang field to be langC.  The fBigendian field will
-     indicate little endian format, but it doesn't matter because
-     it only applies to aux fields and there are none.  */
-  external_fdr = (PTR) objalloc_alloc (ainfo->memory,
-				       output_swap->external_fdr_size);
-  if (!external_fdr)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  (*output_swap->swap_fdr_out) (output_bfd, &fdr, external_fdr);
-  add_memory_shuffle (ainfo, &ainfo->fdr, &ainfo->fdr_end,
-		      external_fdr, output_swap->external_fdr_size);
-
-  ++output_symhdr->ifdMax;
-
-  return true;
-}
-
-/* Set up ECOFF debugging information for the external symbols.
-   FIXME: This is done using a memory buffer, but it should be
-   probably be changed to use a shuffle structure.  The assembler uses
-   this interface, so that must be changed to do something else.  */
-
-boolean
-bfd_ecoff_debug_externals (abfd, debug, swap, relocateable, get_extr,
-			   set_index)
-     bfd *abfd;
-     struct ecoff_debug_info *debug;
-     const struct ecoff_debug_swap *swap;
-     boolean relocateable;
-     boolean (*get_extr) PARAMS ((asymbol *, EXTR *));
-     void (*set_index) PARAMS ((asymbol *, bfd_size_type));
-{
-  HDRR * const symhdr = &debug->symbolic_header;
-  asymbol **sym_ptr_ptr;
-  size_t c;
-
-  sym_ptr_ptr = bfd_get_outsymbols (abfd);
-  if (sym_ptr_ptr == NULL)
-    return true;
-
-  for (c = bfd_get_symcount (abfd); c > 0; c--, sym_ptr_ptr++)
-    {
-      asymbol *sym_ptr;
-      EXTR esym;
-
-      sym_ptr = *sym_ptr_ptr;
-
-      /* Get the external symbol information.  */
-      if ((*get_extr) (sym_ptr, &esym) == false)
-	continue;
-
-      /* If we're producing an executable, move common symbols into
-	 bss.  */
-      if (relocateable == false)
-	{
-	  if (esym.asym.sc == scCommon)
-	    esym.asym.sc = scBss;
-	  else if (esym.asym.sc == scSCommon)
-	    esym.asym.sc = scSBss;
-	}
-
-      if (bfd_is_com_section (sym_ptr->section)
-	  || bfd_is_und_section (sym_ptr->section)
-	  || sym_ptr->section->output_section == (asection *) NULL)
-	{
-	  /* FIXME: gas does not keep the value of a small undefined
-	     symbol in the symbol itself, because of relocation
-	     problems.  */
-	  if (esym.asym.sc != scSUndefined
-	      || esym.asym.value == 0
-	      || sym_ptr->value != 0)
-	    esym.asym.value = sym_ptr->value;
-	}
-      else
-	esym.asym.value = (sym_ptr->value
-			   + sym_ptr->section->output_offset
-			   + sym_ptr->section->output_section->vma);
-
-      if (set_index)
-	(*set_index) (sym_ptr, (bfd_size_type) symhdr->iextMax);
-
-      if (! bfd_ecoff_debug_one_external (abfd, debug, swap,
-					  sym_ptr->name, &esym))
-	return false;
-    }
-
-  return true;
-}
-
-/* Add a single external symbol to the debugging information.  */
-
-boolean
-bfd_ecoff_debug_one_external (abfd, debug, swap, name, esym)
-     bfd *abfd;
-     struct ecoff_debug_info *debug;
-     const struct ecoff_debug_swap *swap;
-     const char *name;
-     EXTR *esym;
-{
-  const bfd_size_type external_ext_size = swap->external_ext_size;
-  void (* const swap_ext_out) PARAMS ((bfd *, const EXTR *, PTR))
-    = swap->swap_ext_out;
-  HDRR * const symhdr = &debug->symbolic_header;
-  size_t namelen;
-
-  namelen = strlen (name);
-
-  if ((size_t) (debug->ssext_end - debug->ssext)
-      < symhdr->issExtMax + namelen + 1)
-    {
-      if (ecoff_add_bytes ((char **) &debug->ssext,
-			   (char **) &debug->ssext_end,
-			   symhdr->issExtMax + namelen + 1)
-	  == false)
-	return false;
-    }
-  if ((size_t) ((char *) debug->external_ext_end
-		- (char *) debug->external_ext)
-      < (symhdr->iextMax + 1) * external_ext_size)
-    {
-      if (ecoff_add_bytes ((char **) &debug->external_ext,
-			   (char **) &debug->external_ext_end,
-			   (symhdr->iextMax + 1) * external_ext_size)
-	  == false)
-	return false;
-    }
-
-  esym->asym.iss = symhdr->issExtMax;
-
-  (*swap_ext_out) (abfd, esym,
-		   ((char *) debug->external_ext
-		    + symhdr->iextMax * swap->external_ext_size));
-
-  ++symhdr->iextMax;
-
-  strcpy (debug->ssext + symhdr->issExtMax, name);
-  symhdr->issExtMax += namelen + 1;
-
-  return true;
-}
-
-/* Align the ECOFF debugging information.  */
-
-/*ARGSUSED*/
-static void
-ecoff_align_debug (abfd, debug, swap)
-     bfd *abfd;
-     struct ecoff_debug_info *debug;
-     const struct ecoff_debug_swap *swap;
-{
-  HDRR * const symhdr = &debug->symbolic_header;
-  bfd_size_type debug_align, aux_align, rfd_align;
-  size_t add;
-
-  /* Adjust the counts so that structures are aligned.  */
-  debug_align = swap->debug_align;
-  aux_align = debug_align / sizeof (union aux_ext);
-  rfd_align = debug_align / swap->external_rfd_size;
-
-  add = debug_align - (symhdr->cbLine & (debug_align - 1));
-  if (add != debug_align)
-    {
-      if (debug->line != (unsigned char *) NULL)
-	memset ((PTR) (debug->line + symhdr->cbLine), 0, add);
-      symhdr->cbLine += add;
-    }
-
-  add = debug_align - (symhdr->issMax & (debug_align - 1));
-  if (add != debug_align)
-    {
-      if (debug->ss != (char *) NULL)
-	memset ((PTR) (debug->ss + symhdr->issMax), 0, add);
-      symhdr->issMax += add;
-    }
-
-  add = debug_align - (symhdr->issExtMax & (debug_align - 1));
-  if (add != debug_align)
-    {
-      if (debug->ssext != (char *) NULL)
-	memset ((PTR) (debug->ssext + symhdr->issExtMax), 0, add);
-      symhdr->issExtMax += add;
-    }
-
-  add = aux_align - (symhdr->iauxMax & (aux_align - 1));
-  if (add != aux_align)
-    {
-      if (debug->external_aux != (union aux_ext *) NULL)
-	memset ((PTR) (debug->external_aux + symhdr->iauxMax), 0,
-		add * sizeof (union aux_ext));
-      symhdr->iauxMax += add;
-    }
-
-  add = rfd_align - (symhdr->crfd & (rfd_align - 1));
-  if (add != rfd_align)
-    {
-      if (debug->external_rfd != (PTR) NULL)
-	memset ((PTR) ((char *) debug->external_rfd
-		       + symhdr->crfd * swap->external_rfd_size),
-		0, (size_t) (add * swap->external_rfd_size));
-      symhdr->crfd += add;
-    }
-}
-
-/* Return the size required by the ECOFF debugging information.  */
-
-bfd_size_type
-bfd_ecoff_debug_size (abfd, debug, swap)
-     bfd *abfd;
-     struct ecoff_debug_info *debug;
-     const struct ecoff_debug_swap *swap;
-{
-  bfd_size_type tot;
-
-  ecoff_align_debug (abfd, debug, swap);
-  tot = swap->external_hdr_size;
-
-#define ADD(count, size) \
-  tot += debug->symbolic_header.count * size
-
-  ADD (cbLine, sizeof (unsigned char));
-  ADD (idnMax, swap->external_dnr_size);
-  ADD (ipdMax, swap->external_pdr_size);
-  ADD (isymMax, swap->external_sym_size);
-  ADD (ioptMax, swap->external_opt_size);
-  ADD (iauxMax, sizeof (union aux_ext));
-  ADD (issMax, sizeof (char));
-  ADD (issExtMax, sizeof (char));
-  ADD (ifdMax, swap->external_fdr_size);
-  ADD (crfd, swap->external_rfd_size);
-  ADD (iextMax, swap->external_ext_size);
-
-#undef ADD
-
-  return tot;
-}
-
-/* Write out the ECOFF symbolic header, given the file position it is
-   going to be placed at.  This assumes that the counts are set
-   correctly.  */
-
-static boolean
-ecoff_write_symhdr (abfd, debug, swap, where)
-     bfd *abfd;
-     struct ecoff_debug_info *debug;
-     const struct ecoff_debug_swap *swap;
-     file_ptr where;
-{
-  HDRR * const symhdr = &debug->symbolic_header;
-  char *buff = NULL;
-
-  ecoff_align_debug (abfd, debug, swap);
-
-  /* Go to the right location in the file.  */
-  if (bfd_seek (abfd, where, SEEK_SET) != 0)
-    return false;
-
-  where += swap->external_hdr_size;
-
-  symhdr->magic = swap->sym_magic;
-
-  /* Fill in the file offsets.  */
-#define SET(offset, count, size) \
-  if (symhdr->count == 0) \
-    symhdr->offset = 0; \
-  else \
-    { \
-      symhdr->offset = where; \
-      where += symhdr->count * size; \
-    }
-
-  SET (cbLineOffset, cbLine, sizeof (unsigned char));
-  SET (cbDnOffset, idnMax, swap->external_dnr_size);
-  SET (cbPdOffset, ipdMax, swap->external_pdr_size);
-  SET (cbSymOffset, isymMax, swap->external_sym_size);
-  SET (cbOptOffset, ioptMax, swap->external_opt_size);
-  SET (cbAuxOffset, iauxMax, sizeof (union aux_ext));
-  SET (cbSsOffset, issMax, sizeof (char));
-  SET (cbSsExtOffset, issExtMax, sizeof (char));
-  SET (cbFdOffset, ifdMax, swap->external_fdr_size);
-  SET (cbRfdOffset, crfd, swap->external_rfd_size);
-  SET (cbExtOffset, iextMax, swap->external_ext_size);
-#undef SET
-
-  buff = (PTR) bfd_malloc ((size_t) swap->external_hdr_size);
-  if (buff == NULL && swap->external_hdr_size != 0)
-    goto error_return;
-
-  (*swap->swap_hdr_out) (abfd, symhdr, buff);
-  if (bfd_write (buff, 1, swap->external_hdr_size, abfd)
-      != swap->external_hdr_size)
-    goto error_return;
-
-  if (buff != NULL)
-    free (buff);
-  return true;
- error_return:
-  if (buff != NULL)
-    free (buff);
-  return false;
-}
-
-/* Write out the ECOFF debugging information.  This function assumes
-   that the information (the pointers and counts) in *DEBUG have been
-   set correctly.  WHERE is the position in the file to write the
-   information to.  This function fills in the file offsets in the
-   symbolic header.  */
-
-boolean
-bfd_ecoff_write_debug (abfd, debug, swap, where)
-     bfd *abfd;
-     struct ecoff_debug_info *debug;
-     const struct ecoff_debug_swap *swap;
-     file_ptr where;
-{
-  HDRR * const symhdr = &debug->symbolic_header;
-
-  if (! ecoff_write_symhdr (abfd, debug, swap, where))
-    return false;
-
-#define WRITE(ptr, count, size, offset) \
-  BFD_ASSERT (symhdr->offset == 0 \
-	      || (bfd_vma) bfd_tell (abfd) == symhdr->offset); \
-  if (bfd_write ((PTR) debug->ptr, size, symhdr->count, abfd) \
-      != size * symhdr->count) \
-    return false;
-
-  WRITE (line, cbLine, sizeof (unsigned char), cbLineOffset);
-  WRITE (external_dnr, idnMax, swap->external_dnr_size, cbDnOffset);
-  WRITE (external_pdr, ipdMax, swap->external_pdr_size, cbPdOffset);
-  WRITE (external_sym, isymMax, swap->external_sym_size, cbSymOffset);
-  WRITE (external_opt, ioptMax, swap->external_opt_size, cbOptOffset);
-  WRITE (external_aux, iauxMax, sizeof (union aux_ext), cbAuxOffset);
-  WRITE (ss, issMax, sizeof (char), cbSsOffset);
-  WRITE (ssext, issExtMax, sizeof (char), cbSsExtOffset);
-  WRITE (external_fdr, ifdMax, swap->external_fdr_size, cbFdOffset);
-  WRITE (external_rfd, crfd, swap->external_rfd_size, cbRfdOffset);
-  WRITE (external_ext, iextMax, swap->external_ext_size, cbExtOffset);
-#undef WRITE
-
-  return true;
-}
-
-/* Write out a shuffle list.  */
-
-static boolean ecoff_write_shuffle PARAMS ((bfd *,
-					    const struct ecoff_debug_swap *,
-					    struct shuffle *, PTR space));
-
-static boolean
-ecoff_write_shuffle (abfd, swap, shuffle, space)
-     bfd *abfd;
-     const struct ecoff_debug_swap *swap;
-     struct shuffle *shuffle;
-     PTR space;
-{
-  register struct shuffle *l;
-  unsigned long total;
-
-  total = 0;
-  for (l = shuffle; l != (struct shuffle *) NULL; l = l->next)
-    {
-      if (! l->filep)
-	{
-	  if (bfd_write (l->u.memory, 1, l->size, abfd) != l->size)
-	    return false;
-	}
-      else
-	{
-	  if (bfd_seek (l->u.file.input_bfd, l->u.file.offset, SEEK_SET) != 0
-	      || bfd_read (space, 1, l->size, l->u.file.input_bfd) != l->size
-	      || bfd_write (space, 1, l->size, abfd) != l->size)
-	    return false;
-	}
-      total += l->size;
-    }
-
-  if ((total & (swap->debug_align - 1)) != 0)
-    {
-      unsigned int i;
-      bfd_byte *s;
-
-      i = swap->debug_align - (total & (swap->debug_align - 1));
-      s = (bfd_byte *) bfd_malloc (i);
-      if (s == NULL && i != 0)
-	return false;
-
-      memset ((PTR) s, 0, i);
-      if (bfd_write ((PTR) s, 1, i, abfd) != i)
-	{
-	  free (s);
-	  return false;
-	}
-      free (s);
-    }
-
-  return true;
-}
-
-/* Write out debugging information using accumulated linker
-   information.  */
-
-boolean
-bfd_ecoff_write_accumulated_debug (handle, abfd, debug, swap, info, where)
-     PTR handle;
-     bfd *abfd;
-     struct ecoff_debug_info *debug;
-     const struct ecoff_debug_swap *swap;
-     struct bfd_link_info *info;
-     file_ptr where;
-{
-  struct accumulate *ainfo = (struct accumulate *) handle;
-  PTR space = NULL;
-
-  if (! ecoff_write_symhdr (abfd, debug, swap, where))
-    goto error_return;
-
-  space = (PTR) bfd_malloc (ainfo->largest_file_shuffle);
-  if (space == NULL && ainfo->largest_file_shuffle != 0)
-    goto error_return;
-
-  if (! ecoff_write_shuffle (abfd, swap, ainfo->line, space)
-      || ! ecoff_write_shuffle (abfd, swap, ainfo->pdr, space)
-      || ! ecoff_write_shuffle (abfd, swap, ainfo->sym, space)
-      || ! ecoff_write_shuffle (abfd, swap, ainfo->opt, space)
-      || ! ecoff_write_shuffle (abfd, swap, ainfo->aux, space))
-    goto error_return;
-
-  /* The string table is written out from the hash table if this is a
-     final link.  */
-  if (info->relocateable)
-    {
-      BFD_ASSERT (ainfo->ss_hash == (struct string_hash_entry *) NULL);
-      if (! ecoff_write_shuffle (abfd, swap, ainfo->ss, space))
-	goto error_return;
-    }
-  else
-    {
-      unsigned long total;
-      bfd_byte null;
-      struct string_hash_entry *sh;
-
-      BFD_ASSERT (ainfo->ss == (struct shuffle *) NULL);
-      null = 0;
-      if (bfd_write ((PTR) &null, 1, 1, abfd) != 1)
-	goto error_return;
-      total = 1;
-      BFD_ASSERT (ainfo->ss_hash == NULL || ainfo->ss_hash->val == 1);
-      for (sh = ainfo->ss_hash;
-	   sh != (struct string_hash_entry *) NULL;
-	   sh = sh->next)
-	{
-	  size_t len;
-
-	  len = strlen (sh->root.string);
-	  if (bfd_write ((PTR) sh->root.string, 1, len + 1, abfd) != len + 1)
-	    goto error_return;
-	  total += len + 1;
-	}
-
-      if ((total & (swap->debug_align - 1)) != 0)
-	{
-	  unsigned int i;
-	  bfd_byte *s;
-
-	  i = swap->debug_align - (total & (swap->debug_align - 1));
-	  s = (bfd_byte *) bfd_malloc (i);
-	  if (s == NULL && i != 0)
-	    goto error_return;
-	  memset ((PTR) s, 0, i);
-	  if (bfd_write ((PTR) s, 1, i, abfd) != i)
-	    {
-	      free (s);
-	      goto error_return;
-	    }
-	  free (s);
-	}
-    }
-
-  /* The external strings and symbol are not converted over to using
-     shuffles.  FIXME: They probably should be.  */
-  if (bfd_write (debug->ssext, 1, debug->symbolic_header.issExtMax, abfd)
-      != (bfd_size_type) debug->symbolic_header.issExtMax)
-    goto error_return;
-  if ((debug->symbolic_header.issExtMax & (swap->debug_align - 1)) != 0)
-    {
-      unsigned int i;
-      bfd_byte *s;
-
-      i = (swap->debug_align
-	   - (debug->symbolic_header.issExtMax & (swap->debug_align - 1)));
-      s = (bfd_byte *) bfd_malloc (i);
-      if (s == NULL && i != 0)
-	goto error_return;
-      memset ((PTR) s, 0, i);
-      if (bfd_write ((PTR) s, 1, i, abfd) != i)
-	{
-	  free (s);
-	  goto error_return;
-	}
-      free (s);
-    }
-
-  if (! ecoff_write_shuffle (abfd, swap, ainfo->fdr, space)
-      || ! ecoff_write_shuffle (abfd, swap, ainfo->rfd, space))
-    goto error_return;
-
-  BFD_ASSERT (debug->symbolic_header.cbExtOffset == 0
-	      || (debug->symbolic_header.cbExtOffset
-		  == (bfd_vma) bfd_tell (abfd)));
-
-  if (bfd_write (debug->external_ext, swap->external_ext_size,
-		 debug->symbolic_header.iextMax, abfd)
-      != debug->symbolic_header.iextMax * swap->external_ext_size)
-    goto error_return;
-
-  if (space != NULL)
-    free (space);
-  return true;
-
- error_return:
-  if (space != NULL)
-    free (space);
-  return false;
-}
-
-/* Handle the find_nearest_line function for both ECOFF and MIPS ELF
-   files.  */
-
-/* Compare FDR entries.  This is called via qsort.  */
-
-static int
-cmp_fdrtab_entry (leftp, rightp)
-     const PTR leftp;
-     const PTR rightp;
-{
-  const struct ecoff_fdrtab_entry *lp =
-    (const struct ecoff_fdrtab_entry *) leftp;
-  const struct ecoff_fdrtab_entry *rp =
-    (const struct ecoff_fdrtab_entry *) rightp;
-
-  if (lp->base_addr < rp->base_addr)
-    return -1;
-  if (lp->base_addr > rp->base_addr)
-    return 1;
-  return 0;
-}
-
-/* Each file descriptor (FDR) has a memory address, to simplify
-   looking up an FDR by address, we build a table covering all FDRs
-   that have a least one procedure descriptor in them.  The final
-   table will be sorted by address so we can look it up via binary
-   search.  */
-
-static boolean
-mk_fdrtab (abfd, debug_info, debug_swap, line_info)
-     bfd *abfd;
-     struct ecoff_debug_info * const debug_info;
-     const struct ecoff_debug_swap * const debug_swap;
-     struct ecoff_find_line *line_info;
-{
-  struct ecoff_fdrtab_entry *tab;
-  FDR *fdr_ptr;
-  FDR *fdr_start;
-  FDR *fdr_end;
-  boolean stabs;
-  long len;
-
-  fdr_start = debug_info->fdr;
-  fdr_end = fdr_start + debug_info->symbolic_header.ifdMax;
-
-  /* First, let's see how long the table needs to be: */
-  for (len = 0, fdr_ptr = fdr_start; fdr_ptr < fdr_end; fdr_ptr++)
-    {
-      if (fdr_ptr->cpd == 0)	/* skip FDRs that have no PDRs */
-	continue;
-      ++len;
-    }
-
-  /* Now, create and fill in the table: */
-
-  line_info->fdrtab = ((struct ecoff_fdrtab_entry*)
-		       bfd_zalloc (abfd,
-				   len * sizeof (struct ecoff_fdrtab_entry)));
-  if (line_info->fdrtab == NULL)
-    return false;
-  line_info->fdrtab_len = len;
-
-  tab = line_info->fdrtab;
-  for (fdr_ptr = fdr_start; fdr_ptr < fdr_end; fdr_ptr++)
-    {
-      if (fdr_ptr->cpd == 0)
-	continue;
-
-      /* Check whether this file has stabs debugging information.  In
-	 a file with stabs debugging information, the second local
-	 symbol is named @stabs.  */
-      stabs = false;
-      if (fdr_ptr->csym >= 2)
-	{
-	  char *sym_ptr;
-	  SYMR sym;
-
-	  sym_ptr = ((char *) debug_info->external_sym
-		     + (fdr_ptr->isymBase + 1)*debug_swap->external_sym_size);
-	  (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
-	  if (strcmp (debug_info->ss + fdr_ptr->issBase + sym.iss,
-		      STABS_SYMBOL) == 0)
-	    stabs = true;
-	}
-
-      if (!stabs)
-	{
-	  bfd_size_type external_pdr_size;
-	  char *pdr_ptr;
-	  PDR pdr;
-
-	  external_pdr_size = debug_swap->external_pdr_size;
-
-	  pdr_ptr = ((char *) debug_info->external_pdr
-		     + fdr_ptr->ipdFirst * external_pdr_size);
-	  (*debug_swap->swap_pdr_in) (abfd, (PTR) pdr_ptr, &pdr);
-	  /* The address of the first PDR is the offset of that
-	     procedure relative to the beginning of file FDR.  */
-	  tab->base_addr = fdr_ptr->adr - pdr.adr;
-	}
-      else
-	{
-	  /* XXX I don't know about stabs, so this is a guess
-	     (davidm@cs.arizona.edu): */
-	  tab->base_addr = fdr_ptr->adr;
-	}
-      tab->fdr = fdr_ptr;
-      ++tab;
-    }
-
-  /* Finally, the table is sorted in increasing memory-address order.
-     The table is mostly sorted already, but there are cases (e.g.,
-     static functions in include files), where this does not hold.
-     Use "odump -PFv" to verify...  */
-  qsort ((PTR) line_info->fdrtab, len,
-	 sizeof (struct ecoff_fdrtab_entry), cmp_fdrtab_entry);
-
-  return true;
-}
-
-/* Return index of first FDR that covers to OFFSET.  */
-
-static long
-fdrtab_lookup (line_info, offset)
-     struct ecoff_find_line *line_info;
-     bfd_vma offset;
-{
-  long low, high, len;
-  long mid = -1;
-  struct ecoff_fdrtab_entry *tab;
-
-  len = line_info->fdrtab_len;
-  if (len == 0)
-    return -1;
-
-  tab = line_info->fdrtab;
-  for (low = 0, high = len - 1 ; low != high ;)
-    {
-      mid = (high + low) / 2;
-      if (offset >= tab[mid].base_addr && offset < tab[mid + 1].base_addr)
-	goto find_min;
-
-      if (tab[mid].base_addr > offset)
-	high = mid;
-      else
-	low = mid + 1;
-    }
-  ++mid;
-
-  /* last entry is catch-all for all higher addresses: */
-  if (offset < tab[mid].base_addr)
-    return -1;
-
- find_min:
-
-  while (mid > 0 && tab[mid - 1].base_addr == tab[mid].base_addr)
-    --mid;
-
-  return mid;
-}
-
-/* Look up a line given an address, storing the information in
-   LINE_INFO->cache.  */
-
-static boolean
-lookup_line (abfd, debug_info, debug_swap, line_info)
-     bfd *abfd;
-     struct ecoff_debug_info * const debug_info;
-     const struct ecoff_debug_swap * const debug_swap;
-     struct ecoff_find_line *line_info;
-{
-  struct ecoff_fdrtab_entry *tab;
-  bfd_vma offset;
-  boolean stabs;
-  FDR *fdr_ptr;
-  int i;
-  
-  offset = line_info->cache.start;
-     
-  /* Build FDR table (sorted by object file's base-address) if we
-     don't have it already.  */
-  if (line_info->fdrtab == NULL
-      && !mk_fdrtab (abfd, debug_info, debug_swap, line_info))
-    return false;
-
-  tab = line_info->fdrtab;
-
-  /* find first FDR for address OFFSET */
-  i = fdrtab_lookup (line_info, offset);
-  if (i < 0)
-    return false;		/* no FDR, no fun... */
-  fdr_ptr = tab[i].fdr;
-
-  /* Check whether this file has stabs debugging information.  In a
-     file with stabs debugging information, the second local symbol is
-     named @stabs.  */
-  stabs = false;
-  if (fdr_ptr->csym >= 2)
-    {
-      char *sym_ptr;
-      SYMR sym;
-
-      sym_ptr = ((char *) debug_info->external_sym
-		 + (fdr_ptr->isymBase + 1) * debug_swap->external_sym_size);
-      (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
-      if (strcmp (debug_info->ss + fdr_ptr->issBase + sym.iss,
-		  STABS_SYMBOL) == 0)
-	stabs = true;
-    }
-
-  if (!stabs)
-    {
-      bfd_size_type external_pdr_size;
-      char *pdr_ptr;
-      char *best_pdr = NULL;
-      FDR *best_fdr;
-      bfd_vma best_dist = ~0;
-      PDR pdr;
-      unsigned char *line_ptr;
-      unsigned char *line_end;
-      int lineno;
-      /* This file uses ECOFF debugging information.  Each FDR has a
-         list of procedure descriptors (PDR).  The address in the FDR
-         is the absolute address of the first procedure.  The address
-         in the first PDR gives the offset of that procedure relative
-         to the object file's base-address.  The addresses in
-         subsequent PDRs specify each procedure's address relative to
-         the object file's base-address.  To make things more juicy,
-         whenever the PROF bit in the PDR is set, the real entry point
-         of the procedure may be 16 bytes below what would normally be
-         the procedure's entry point.  Instead, DEC came up with a
-         wicked scheme to create profiled libraries "on the fly":
-         instead of shipping a regular and a profiled version of each
-         library, they insert 16 bytes of unused space in front of
-         each procedure and set the "prof" bit in the PDR to indicate
-         that there is a gap there (this is done automagically by "as"
-         when option "-pg" is specified).  Thus, normally, you link
-         against such a library and, except for lots of 16 byte gaps
-         between functions, things will behave as usual.  However,
-         when invoking "ld" with option "-pg", it will fill those gaps
-         with code that calls mcount().  It then moves the function's
-         entry point down by 16 bytes, and out pops a binary that has
-         all functions profiled.
-
-         NOTE: Neither FDRs nor PDRs are strictly sorted in memory
-               order.  For example, when including header-files that
-               define functions, the FDRs follow behind the including
-               file, even though their code may have been generated at
-               a lower address.  File coff-alpha.c from libbfd
-               illustrates this (use "odump -PFv" to look at a file's
-               FDR/PDR).  Similarly, PDRs are sometimes out of order
-               as well.  An example of this is OSF/1 v3.0 libc's
-               malloc.c.  I'm not sure why this happens, but it could
-               be due to optimizations that reorder a function's
-               position within an object-file.
-        
-         Strategy:
-         
-         On the first call to this function, we build a table of FDRs
-         that is sorted by the base-address of the object-file the FDR
-         is referring to.  Notice that each object-file may contain
-         code from multiple source files (e.g., due to code defined in
-         include files).  Thus, for any given base-address, there may
-         be multiple FDRs (but this case is, fortunately, uncommon).
-         lookup(addr) guarantees to return the first FDR that applies
-         to address ADDR.  Thus, after invoking lookup(), we have a
-         list of FDRs that may contain the PDR for ADDR.  Next, we
-         walk through the PDRs of these FDRs and locate the one that
-         is closest to ADDR (i.e., for which the difference between
-         ADDR and the PDR's entry point is positive and minimal).
-         Once, the right FDR and PDR are located, we simply walk
-         through the line-number table to lookup the line-number that
-         best matches ADDR.  Obviously, things could be sped up by
-         keeping a sorted list of PDRs instead of a sorted list of
-         FDRs.  However, this would increase space requirements
-         considerably, which is undesirable.  */
-      external_pdr_size = debug_swap->external_pdr_size;
-
-      /* Make offset relative to object file's start-address: */
-      offset -= tab[i].base_addr;
-      /* Search FDR list starting at tab[i] for the PDR that best matches
-         OFFSET.  Normally, the FDR list is only one entry long.  */
-      best_fdr = NULL;
-      do
-	{
-	  bfd_vma dist, min_dist = 0;
-	  char *pdr_hold;
-	  char *pdr_end;
-	  
-	  fdr_ptr = tab[i].fdr;
-	  
-	  pdr_ptr = ((char *) debug_info->external_pdr
-		     + fdr_ptr->ipdFirst * external_pdr_size);
-	  pdr_end = pdr_ptr + fdr_ptr->cpd * external_pdr_size;
-	  (*debug_swap->swap_pdr_in) (abfd, (PTR) pdr_ptr, &pdr);
-	  /* Find PDR that is closest to OFFSET.  If pdr.prof is set,
-	     the procedure entry-point *may* be 0x10 below pdr.adr.  We
-	     simply pretend that pdr.prof *implies* a lower entry-point.
-	     This is safe because it just means that may identify 4 NOPs
-	     in front of the function as belonging to the function.  */
-	  for (pdr_hold = NULL;
-	       pdr_ptr < pdr_end;
-	       (pdr_ptr += external_pdr_size,
-		(*debug_swap->swap_pdr_in) (abfd, (PTR) pdr_ptr, &pdr)))
-	    {
-	      if (offset >= (pdr.adr - 0x10 * pdr.prof))
-		{
-		  dist = offset - (pdr.adr - 0x10 * pdr.prof);
-		  if (!pdr_hold || dist < min_dist)
-		    {
-		      min_dist = dist;
-		      pdr_hold = pdr_ptr;
-		    }
-		}
-	    }
-	  
-	  if (!best_pdr || min_dist < best_dist)
-	    {
-	      best_dist = min_dist;
-	      best_fdr = fdr_ptr;
-	      best_pdr = pdr_hold;
-	    }
-	  /* continue looping until base_addr of next entry is different: */
-	}
-      while (++i < line_info->fdrtab_len
-	     && tab[i].base_addr == tab[i - 1].base_addr);
-
-      if (!best_fdr || !best_pdr)
-	return false;			/* shouldn't happen... */
-
-      /* phew, finally we got something that we can hold onto: */
-      fdr_ptr = best_fdr;
-      pdr_ptr = best_pdr;
-      (*debug_swap->swap_pdr_in) (abfd, (PTR) pdr_ptr, &pdr);
-      /* Now we can look for the actual line number.  The line numbers
-         are stored in a very funky format, which I won't try to
-         describe.  The search is bounded by the end of the FDRs line
-         number entries.  */
-      line_end = debug_info->line + fdr_ptr->cbLineOffset + fdr_ptr->cbLine;
-
-      /* Make offset relative to procedure entry: */
-      offset -= pdr.adr - 0x10 * pdr.prof;
-      lineno = pdr.lnLow;
-      line_ptr = debug_info->line + fdr_ptr->cbLineOffset + pdr.cbLineOffset;
-      while (line_ptr < line_end)
-	{
-	  int delta;
-	  unsigned int count;
-
-	  delta = *line_ptr >> 4;
-	  if (delta >= 0x8)
-	    delta -= 0x10;
-	  count = (*line_ptr & 0xf) + 1;
-	  ++line_ptr;
-	  if (delta == -8)
-	    {
-	      delta = (((line_ptr[0]) & 0xff) << 8) + ((line_ptr[1]) & 0xff);
-	      if (delta >= 0x8000)
-		delta -= 0x10000;
-	      line_ptr += 2;
-	    }
-	  lineno += delta;
-	  if (offset < count * 4)
-	    {
-	      line_info->cache.stop += count * 4 - offset;
-	      break;
-	    }
-	  offset -= count * 4;
-	}
-
-      /* If fdr_ptr->rss is -1, then this file does not have full
-         symbols, at least according to gdb/mipsread.c.  */
-      if (fdr_ptr->rss == -1)
-	{
-	  line_info->cache.filename = NULL;
-	  if (pdr.isym == -1)
-	    line_info->cache.functionname = NULL;
-	  else
-	    {
-	      EXTR proc_ext;
-
-	      (*debug_swap->swap_ext_in)
-		(abfd,
-		 ((char *) debug_info->external_ext
-		  + pdr.isym * debug_swap->external_ext_size),
-		 &proc_ext);
-	      line_info->cache.functionname = (debug_info->ssext
-					       + proc_ext.asym.iss);
-	    }
-	}
-      else
-	{
-	  SYMR proc_sym;
-
-	  line_info->cache.filename = (debug_info->ss
-				       + fdr_ptr->issBase
-				       + fdr_ptr->rss);
-	  (*debug_swap->swap_sym_in)
-	    (abfd,
-	     ((char *) debug_info->external_sym
-	      + ((fdr_ptr->isymBase + pdr.isym)
-		 * debug_swap->external_sym_size)),
-	     &proc_sym);
-	  line_info->cache.functionname = (debug_info->ss
-					   + fdr_ptr->issBase
-					   + proc_sym.iss);
-	}
-      if (lineno == ilineNil)
-	lineno = 0;
-      line_info->cache.line_num = lineno;
-    }
-  else
-    {
-      bfd_size_type external_sym_size;
-      const char *directory_name;
-      const char *main_file_name;
-      const char *current_file_name;
-      const char *function_name;
-      const char *line_file_name;
-      bfd_vma low_func_vma;
-      bfd_vma low_line_vma;
-      boolean past_line;
-      boolean past_fn;
-      char *sym_ptr, *sym_ptr_end;
-      size_t len, funclen;
-      char *buffer = NULL;
-
-      /* This file uses stabs debugging information.  When gcc is not
-	 optimizing, it will put the line number information before
-	 the function name stabs entry.  When gcc is optimizing, it
-	 will put the stabs entry for all the function first, followed
-	 by the line number information.  (This appears to happen
-	 because of the two output files used by the -mgpopt switch,
-	 which is implied by -O).  This means that we must keep
-	 looking through the symbols until we find both a line number
-	 and a function name which are beyond the address we want.  */
-
-      line_info->cache.filename = NULL;
-      line_info->cache.functionname = NULL;
-      line_info->cache.line_num = 0;
-
-      directory_name = NULL;
-      main_file_name = NULL;
-      current_file_name = NULL;
-      function_name = NULL;
-      line_file_name = NULL;
-      low_func_vma = 0;
-      low_line_vma = 0;
-      past_line = false;
-      past_fn = false;
-
-      external_sym_size = debug_swap->external_sym_size;
-
-      sym_ptr = ((char *) debug_info->external_sym
-		 + (fdr_ptr->isymBase + 2) * external_sym_size);
-      sym_ptr_end = sym_ptr + (fdr_ptr->csym - 2) * external_sym_size;
-      for (;
-	   sym_ptr < sym_ptr_end && (! past_line || ! past_fn);
-	   sym_ptr += external_sym_size)
-	{
-	  SYMR sym;
-
-	  (*debug_swap->swap_sym_in) (abfd, sym_ptr, &sym);
-
-	  if (ECOFF_IS_STAB (&sym))
-	    {
-	      switch (ECOFF_UNMARK_STAB (sym.index))
-		{
-		case N_SO:
-		  main_file_name = current_file_name =
-		    debug_info->ss + fdr_ptr->issBase + sym.iss;
-
-		  /* Check the next symbol to see if it is also an
-                     N_SO symbol.  */
-		  if (sym_ptr + external_sym_size < sym_ptr_end)
-		    {
-		      SYMR nextsym;
-
-		      (*debug_swap->swap_sym_in) (abfd,
-						  sym_ptr + external_sym_size,
-						  &nextsym);
-		      if (ECOFF_IS_STAB (&nextsym)
-			  && ECOFF_UNMARK_STAB (nextsym.index) == N_SO)
-			{
- 			  directory_name = current_file_name;
-			  main_file_name = current_file_name =
-			    debug_info->ss + fdr_ptr->issBase + nextsym.iss;
-			  sym_ptr += external_sym_size;
-			}
-		    }
-		  break;
-
-		case N_SOL:
-		  current_file_name =
-		    debug_info->ss + fdr_ptr->issBase + sym.iss;
-		  break;
-
-		case N_FUN:
-		  if (sym.value > offset)
-		    past_fn = true;
-		  else if (sym.value >= low_func_vma)
-		    {
-		      low_func_vma = sym.value;
-		      function_name =
-			debug_info->ss + fdr_ptr->issBase + sym.iss;
-		    }
-		  break;
-		}
-	    }
-	  else if (sym.st == stLabel && sym.index != indexNil)
-	    {
-	      if (sym.value > offset)
-		past_line = true;
-	      else if (sym.value >= low_line_vma)
-		{
-		  low_line_vma = sym.value;
-		  line_file_name = current_file_name;
-		  line_info->cache.line_num = sym.index;
-		}
-	    }
-	}
-
-      if (line_info->cache.line_num != 0)
-	main_file_name = line_file_name;
-
-      /* We need to remove the stuff after the colon in the function
-         name.  We also need to put the directory name and the file
-         name together.  */
-      if (function_name == NULL)
-	len = funclen = 0;
-      else
-	len = funclen = strlen (function_name) + 1;
-
-      if (main_file_name != NULL
-	  && directory_name != NULL
-	  && main_file_name[0] != '/')
-	len += strlen (directory_name) + strlen (main_file_name) + 1;
-
-      if (len != 0)
-	{
-	  if (line_info->find_buffer != NULL)
-	    free (line_info->find_buffer);
-	  buffer = (char *) bfd_malloc (len);
-	  if (buffer == NULL)
-	    return false;
-	  line_info->find_buffer = buffer;
-	}
-
-      if (function_name != NULL)
-	{
-	  char *colon;
-
-	  strcpy (buffer, function_name);
-	  colon = strchr (buffer, ':');
-	  if (colon != NULL)
-	    *colon = '\0';
-	  line_info->cache.functionname = buffer;
-	}
-
-      if (main_file_name != NULL)
-	{
-	  if (directory_name == NULL || main_file_name[0] == '/')
-	    line_info->cache.filename = main_file_name;
-	  else
-	    {
-	      sprintf (buffer + funclen, "%s%s", directory_name,
-		       main_file_name);
-	      line_info->cache.filename = buffer + funclen;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Do the work of find_nearest_line.  */
-
-boolean
-_bfd_ecoff_locate_line (abfd, section, offset, debug_info, debug_swap,
-			line_info, filename_ptr, functionname_ptr, retline_ptr)
-     bfd *abfd;
-     asection *section;
-     bfd_vma offset;
-     struct ecoff_debug_info * const debug_info;
-     const struct ecoff_debug_swap * const debug_swap;
-     struct ecoff_find_line *line_info;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *retline_ptr;
-{
-  offset += section->vma;
-
-  if (line_info->cache.sect == NULL
-      || line_info->cache.sect != section
-      || offset < line_info->cache.start
-      || offset >= line_info->cache.stop)
-    {
-      line_info->cache.sect = section;
-      line_info->cache.start = offset;
-      line_info->cache.stop = offset;
-      if (! lookup_line (abfd, debug_info, debug_swap, line_info))
-	{
-	  line_info->cache.sect = NULL;
-	  return false;
-	}
-    }
-
-  *filename_ptr = line_info->cache.filename;
-  *functionname_ptr = line_info->cache.functionname;
-  *retline_ptr = line_info->cache.line_num;
-
-  return true;
-}
-
-/* These routines copy symbolic information into a memory buffer.
-
-   FIXME: The whole point of the shuffle code is to avoid storing
-   everything in memory, since the linker is such a memory hog.  This
-   code makes that effort useless.  It is only called by the MIPS ELF
-   code when generating a shared library, so it is not that big a
-   deal, but it should be fixed eventually.  */
-
-/* Collect a shuffle into a memory buffer.  */
-
-static boolean ecoff_collect_shuffle PARAMS ((struct shuffle *, bfd_byte *));
-
-static boolean
-ecoff_collect_shuffle (l, buff)
-     struct shuffle *l;
-     bfd_byte *buff;
-{
-  unsigned long total;
-
-  total = 0;
-  for (; l != (struct shuffle *) NULL; l = l->next)
-    {
-      if (! l->filep)
-	memcpy (buff, l->u.memory, l->size);
-      else
-	{
-	  if (bfd_seek (l->u.file.input_bfd, l->u.file.offset, SEEK_SET) != 0
-	      || bfd_read (buff, 1, l->size, l->u.file.input_bfd) != l->size)
-	    return false;
-	}
-      total += l->size;
-      buff += l->size;
-    }
-
-  return true;
-}
-
-/* Copy PDR information into a memory buffer.  */
-
-boolean
-_bfd_ecoff_get_accumulated_pdr (handle, buff)
-     PTR handle;
-     bfd_byte *buff;
-{
-  struct accumulate *ainfo = (struct accumulate *) handle;
-
-  return ecoff_collect_shuffle (ainfo->pdr, buff);
-}
-
-/* Copy symbol information into a memory buffer.  */
-
-boolean
-_bfd_ecoff_get_accumulated_sym (handle, buff)
-     PTR handle;
-     bfd_byte *buff;
-{
-  struct accumulate *ainfo = (struct accumulate *) handle;
-
-  return ecoff_collect_shuffle (ainfo->sym, buff);
-}
-
-/* Copy the string table into a memory buffer.  */
-
-boolean
-_bfd_ecoff_get_accumulated_ss (handle, buff)
-     PTR handle;
-     bfd_byte *buff;
-{
-  struct accumulate *ainfo = (struct accumulate *) handle;
-  struct string_hash_entry *sh;
-  unsigned long total;
-
-  /* The string table is written out from the hash table if this is a
-     final link.  */
-  BFD_ASSERT (ainfo->ss == (struct shuffle *) NULL);
-  *buff++ = '\0';
-  total = 1;
-  BFD_ASSERT (ainfo->ss_hash == NULL || ainfo->ss_hash->val == 1);
-  for (sh = ainfo->ss_hash;
-       sh != (struct string_hash_entry *) NULL;
-       sh = sh->next)
-    {
-      size_t len;
-
-      len = strlen (sh->root.string);
-      memcpy (buff, (PTR) sh->root.string, len + 1);
-      total += len + 1;
-      buff += len + 1;
-    }
-
-  return true;
-}
diff --git a/bfd/ecoffswap.h b/bfd/ecoffswap.h
deleted file mode 100644
index 0d28d16883e..00000000000
--- a/bfd/ecoffswap.h
+++ /dev/null
@@ -1,853 +0,0 @@
-/* Generic ECOFF swapping routines, for BFD.
-   Copyright 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* NOTE: This is a header file, but it contains executable routines.
-   This is done this way because these routines are substantially
-   similar, but are not identical, for all ECOFF targets.
-
-   These are routines to swap the ECOFF symbolic information in and
-   out.  The routines are defined statically.  You can set breakpoints
-   on them in gdb by naming the including source file; e.g.,
-   'coff-mips.c':ecoff_swap_hdr_in.
-
-   Before including this header file, one of ECOFF_32 or ECOFF_64 must
-   be defined.  These are checked when swapping information that
-   depends upon the target size.  This code works for 32 bit and 64
-   bit ECOFF, but may need to be generalized in the future.
-
-   Some header file which defines the external forms of these
-   structures must also be included before including this header file.
-   Currently this is either coff/mips.h or coff/alpha.h.
-
-   If the symbol TEST is defined when this file is compiled, a
-   comparison is made to ensure that, in fact, the output is
-   bit-for-bit the same as the input.  Of course, this symbol should
-   only be defined when deliberately testing the code on a machine
-   with the proper byte sex and such.  */
-
-#ifdef ECOFF_32
-#define ecoff_get_off bfd_h_get_32
-#define ecoff_put_off bfd_h_put_32
-#endif
-#ifdef ECOFF_64
-#define ecoff_get_off bfd_h_get_64
-#define ecoff_put_off bfd_h_put_64
-#endif
-
-/* ECOFF auxiliary information swapping routines.  These are the same
-   for all ECOFF targets, so they are defined in ecofflink.c.  */
-
-extern void _bfd_ecoff_swap_tir_in
-  PARAMS ((int, const struct tir_ext *, TIR *));
-extern void _bfd_ecoff_swap_tir_out
-  PARAMS ((int, const TIR *, struct tir_ext *));
-extern void _bfd_ecoff_swap_rndx_in
-  PARAMS ((int, const struct rndx_ext *, RNDXR *));
-extern void _bfd_ecoff_swap_rndx_out
-  PARAMS ((int, const RNDXR *, struct rndx_ext *));
-
-/* Prototypes for functions defined in this file.  */
-
-static void ecoff_swap_hdr_in PARAMS ((bfd *, PTR, HDRR *));
-static void ecoff_swap_hdr_out PARAMS ((bfd *, const HDRR *, PTR));
-static void ecoff_swap_fdr_in PARAMS ((bfd *, PTR, FDR *));
-static void ecoff_swap_fdr_out PARAMS ((bfd *, const FDR *, PTR));
-static void ecoff_swap_pdr_in PARAMS ((bfd *, PTR, PDR *));
-static void ecoff_swap_pdr_out PARAMS ((bfd *, const PDR *, PTR));
-static void ecoff_swap_sym_in PARAMS ((bfd *, PTR, SYMR *));
-static void ecoff_swap_sym_out PARAMS ((bfd *, const SYMR *, PTR));
-static void ecoff_swap_ext_in PARAMS ((bfd *, PTR, EXTR *));
-static void ecoff_swap_ext_out PARAMS ((bfd *, const EXTR *, PTR));
-static void ecoff_swap_rfd_in PARAMS ((bfd *, PTR, RFDT *));
-static void ecoff_swap_rfd_out PARAMS ((bfd *, const RFDT *, PTR));
-static void ecoff_swap_opt_in PARAMS ((bfd *, PTR, OPTR *));
-static void ecoff_swap_opt_out PARAMS ((bfd *, const OPTR *, PTR));
-static void ecoff_swap_dnr_in PARAMS ((bfd *, PTR, DNR *));
-static void ecoff_swap_dnr_out PARAMS ((bfd *, const DNR *, PTR));
-
-/* Swap in the symbolic header.  */
-
-static void
-ecoff_swap_hdr_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     HDRR *intern;
-{
-  struct hdr_ext ext[1];
-
-  *ext = *(struct hdr_ext *) ext_copy;
-
-  intern->magic         = bfd_h_get_signed_16 (abfd, (bfd_byte *)ext->h_magic);
-  intern->vstamp        = bfd_h_get_signed_16 (abfd, (bfd_byte *)ext->h_vstamp);
-  intern->ilineMax      = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_ilineMax);
-  intern->cbLine        = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbLine);
-  intern->cbLineOffset  = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbLineOffset);
-  intern->idnMax        = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_idnMax);
-  intern->cbDnOffset    = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbDnOffset);
-  intern->ipdMax        = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_ipdMax);
-  intern->cbPdOffset    = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbPdOffset);
-  intern->isymMax       = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_isymMax);
-  intern->cbSymOffset   = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbSymOffset);
-  intern->ioptMax       = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_ioptMax);
-  intern->cbOptOffset   = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbOptOffset);
-  intern->iauxMax       = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_iauxMax);
-  intern->cbAuxOffset   = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbAuxOffset);
-  intern->issMax        = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_issMax);
-  intern->cbSsOffset    = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbSsOffset);
-  intern->issExtMax     = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_issExtMax);
-  intern->cbSsExtOffset = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbSsExtOffset);
-  intern->ifdMax        = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_ifdMax);
-  intern->cbFdOffset    = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbFdOffset);
-  intern->crfd          = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_crfd);
-  intern->cbRfdOffset   = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbRfdOffset);
-  intern->iextMax       = bfd_h_get_32 (abfd, (bfd_byte *)ext->h_iextMax);
-  intern->cbExtOffset   = ecoff_get_off (abfd, (bfd_byte *)ext->h_cbExtOffset);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out the symbolic header.  */
-
-static void
-ecoff_swap_hdr_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const HDRR *intern_copy;
-     PTR ext_ptr;
-{
-  struct hdr_ext *ext = (struct hdr_ext *) ext_ptr;
-  HDRR intern[1];
-
-  *intern = *intern_copy;
-
-  bfd_h_put_signed_16 (abfd, intern->magic, (bfd_byte *)ext->h_magic);
-  bfd_h_put_signed_16 (abfd, intern->vstamp, (bfd_byte *)ext->h_vstamp);
-  bfd_h_put_32 (abfd, intern->ilineMax, (bfd_byte *)ext->h_ilineMax);
-  ecoff_put_off (abfd, intern->cbLine, (bfd_byte *)ext->h_cbLine);
-  ecoff_put_off (abfd, intern->cbLineOffset, (bfd_byte *)ext->h_cbLineOffset);
-  bfd_h_put_32 (abfd, intern->idnMax, (bfd_byte *)ext->h_idnMax);
-  ecoff_put_off (abfd, intern->cbDnOffset, (bfd_byte *)ext->h_cbDnOffset);
-  bfd_h_put_32 (abfd, intern->ipdMax, (bfd_byte *)ext->h_ipdMax);
-  ecoff_put_off (abfd, intern->cbPdOffset, (bfd_byte *)ext->h_cbPdOffset);
-  bfd_h_put_32 (abfd, intern->isymMax, (bfd_byte *)ext->h_isymMax);
-  ecoff_put_off (abfd, intern->cbSymOffset, (bfd_byte *)ext->h_cbSymOffset);
-  bfd_h_put_32 (abfd, intern->ioptMax, (bfd_byte *)ext->h_ioptMax);
-  ecoff_put_off (abfd, intern->cbOptOffset, (bfd_byte *)ext->h_cbOptOffset);
-  bfd_h_put_32 (abfd, intern->iauxMax, (bfd_byte *)ext->h_iauxMax);
-  ecoff_put_off (abfd, intern->cbAuxOffset, (bfd_byte *)ext->h_cbAuxOffset);
-  bfd_h_put_32 (abfd, intern->issMax, (bfd_byte *)ext->h_issMax);
-  ecoff_put_off (abfd, intern->cbSsOffset, (bfd_byte *)ext->h_cbSsOffset);
-  bfd_h_put_32 (abfd, intern->issExtMax, (bfd_byte *)ext->h_issExtMax);
-  ecoff_put_off (abfd, intern->cbSsExtOffset, (bfd_byte *)ext->h_cbSsExtOffset);
-  bfd_h_put_32 (abfd, intern->ifdMax, (bfd_byte *)ext->h_ifdMax);
-  ecoff_put_off (abfd, intern->cbFdOffset, (bfd_byte *)ext->h_cbFdOffset);
-  bfd_h_put_32 (abfd, intern->crfd, (bfd_byte *)ext->h_crfd);
-  ecoff_put_off (abfd, intern->cbRfdOffset, (bfd_byte *)ext->h_cbRfdOffset);
-  bfd_h_put_32 (abfd, intern->iextMax, (bfd_byte *)ext->h_iextMax);
-  ecoff_put_off (abfd, intern->cbExtOffset, (bfd_byte *)ext->h_cbExtOffset);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap in the file descriptor record.  */
-
-static void
-ecoff_swap_fdr_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     FDR *intern;
-{
-  struct fdr_ext ext[1];
-
-  *ext = *(struct fdr_ext *) ext_copy;
-  
-  intern->adr           = ecoff_get_off (abfd, (bfd_byte *)ext->f_adr);
-  intern->rss           = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_rss);
-#ifdef ECOFF_64
-  if (intern->rss == 0xffffffff)
-    intern->rss = -1;
-#endif
-  intern->issBase       = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_issBase);
-  intern->cbSs          = ecoff_get_off (abfd, (bfd_byte *)ext->f_cbSs);
-  intern->isymBase      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_isymBase);
-  intern->csym          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_csym);
-  intern->ilineBase     = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_ilineBase);
-  intern->cline         = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_cline);
-  intern->ioptBase      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_ioptBase);
-  intern->copt          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_copt);
-#ifdef ECOFF_32
-  intern->ipdFirst      = bfd_h_get_16 (abfd, (bfd_byte *)ext->f_ipdFirst);
-  intern->cpd           = bfd_h_get_16 (abfd, (bfd_byte *)ext->f_cpd);
-#endif
-#ifdef ECOFF_64
-  intern->ipdFirst      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_ipdFirst);
-  intern->cpd           = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_cpd);
-#endif
-  intern->iauxBase      = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_iauxBase);
-  intern->caux          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_caux);
-  intern->rfdBase       = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_rfdBase);
-  intern->crfd          = bfd_h_get_32 (abfd, (bfd_byte *)ext->f_crfd);
-
-  /* now the fun stuff... */
-  if (bfd_header_big_endian (abfd)) {
-    intern->lang        = (ext->f_bits1[0] & FDR_BITS1_LANG_BIG)
-					>> FDR_BITS1_LANG_SH_BIG;
-    intern->fMerge      = 0 != (ext->f_bits1[0] & FDR_BITS1_FMERGE_BIG);
-    intern->fReadin     = 0 != (ext->f_bits1[0] & FDR_BITS1_FREADIN_BIG);
-    intern->fBigendian  = 0 != (ext->f_bits1[0] & FDR_BITS1_FBIGENDIAN_BIG);
-    intern->glevel      = (ext->f_bits2[0] & FDR_BITS2_GLEVEL_BIG)
-					>> FDR_BITS2_GLEVEL_SH_BIG;
-  } else {
-    intern->lang        = (ext->f_bits1[0] & FDR_BITS1_LANG_LITTLE)
-					>> FDR_BITS1_LANG_SH_LITTLE;
-    intern->fMerge      = 0 != (ext->f_bits1[0] & FDR_BITS1_FMERGE_LITTLE);
-    intern->fReadin     = 0 != (ext->f_bits1[0] & FDR_BITS1_FREADIN_LITTLE);
-    intern->fBigendian  = 0 != (ext->f_bits1[0] & FDR_BITS1_FBIGENDIAN_LITTLE);
-    intern->glevel      = (ext->f_bits2[0] & FDR_BITS2_GLEVEL_LITTLE)
-					>> FDR_BITS2_GLEVEL_SH_LITTLE;
-  }
-  intern->reserved = 0;
-
-  intern->cbLineOffset  = ecoff_get_off (abfd, (bfd_byte *)ext->f_cbLineOffset);
-  intern->cbLine        = ecoff_get_off (abfd, (bfd_byte *)ext->f_cbLine);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out the file descriptor record.  */
-
-static void
-ecoff_swap_fdr_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const FDR *intern_copy;
-     PTR ext_ptr;
-{
-  struct fdr_ext *ext = (struct fdr_ext *) ext_ptr;
-  FDR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-  
-  ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->f_adr);
-  bfd_h_put_32 (abfd, intern->rss, (bfd_byte *)ext->f_rss);
-  bfd_h_put_32 (abfd, intern->issBase, (bfd_byte *)ext->f_issBase);
-  ecoff_put_off (abfd, intern->cbSs, (bfd_byte *)ext->f_cbSs);
-  bfd_h_put_32 (abfd, intern->isymBase, (bfd_byte *)ext->f_isymBase);
-  bfd_h_put_32 (abfd, intern->csym, (bfd_byte *)ext->f_csym);
-  bfd_h_put_32 (abfd, intern->ilineBase, (bfd_byte *)ext->f_ilineBase);
-  bfd_h_put_32 (abfd, intern->cline, (bfd_byte *)ext->f_cline);
-  bfd_h_put_32 (abfd, intern->ioptBase, (bfd_byte *)ext->f_ioptBase);
-  bfd_h_put_32 (abfd, intern->copt, (bfd_byte *)ext->f_copt);
-#ifdef ECOFF_32
-  bfd_h_put_16 (abfd, intern->ipdFirst, (bfd_byte *)ext->f_ipdFirst);
-  bfd_h_put_16 (abfd, intern->cpd, (bfd_byte *)ext->f_cpd);
-#endif
-#ifdef ECOFF_64
-  bfd_h_put_32 (abfd, intern->ipdFirst, (bfd_byte *)ext->f_ipdFirst);
-  bfd_h_put_32 (abfd, intern->cpd, (bfd_byte *)ext->f_cpd);
-#endif
-  bfd_h_put_32 (abfd, intern->iauxBase, (bfd_byte *)ext->f_iauxBase);
-  bfd_h_put_32 (abfd, intern->caux, (bfd_byte *)ext->f_caux);
-  bfd_h_put_32 (abfd, intern->rfdBase, (bfd_byte *)ext->f_rfdBase);
-  bfd_h_put_32 (abfd, intern->crfd, (bfd_byte *)ext->f_crfd);
-
-  /* now the fun stuff... */
-  if (bfd_header_big_endian (abfd)) {
-    ext->f_bits1[0] = (((intern->lang << FDR_BITS1_LANG_SH_BIG)
-			& FDR_BITS1_LANG_BIG)
-		       | (intern->fMerge ? FDR_BITS1_FMERGE_BIG : 0)
-		       | (intern->fReadin ? FDR_BITS1_FREADIN_BIG : 0)
-		       | (intern->fBigendian ? FDR_BITS1_FBIGENDIAN_BIG : 0));
-    ext->f_bits2[0] = ((intern->glevel << FDR_BITS2_GLEVEL_SH_BIG)
-		       & FDR_BITS2_GLEVEL_BIG);
-    ext->f_bits2[1] = 0;
-    ext->f_bits2[2] = 0;
-  } else {
-    ext->f_bits1[0] = (((intern->lang << FDR_BITS1_LANG_SH_LITTLE)
-			& FDR_BITS1_LANG_LITTLE)
-		       | (intern->fMerge ? FDR_BITS1_FMERGE_LITTLE : 0)
-		       | (intern->fReadin ? FDR_BITS1_FREADIN_LITTLE : 0)
-		       | (intern->fBigendian ? FDR_BITS1_FBIGENDIAN_LITTLE : 0));
-    ext->f_bits2[0] = ((intern->glevel << FDR_BITS2_GLEVEL_SH_LITTLE)
-		       & FDR_BITS2_GLEVEL_LITTLE);
-    ext->f_bits2[1] = 0;
-    ext->f_bits2[2] = 0;
-  }
-
-  ecoff_put_off (abfd, intern->cbLineOffset, (bfd_byte *)ext->f_cbLineOffset);
-  ecoff_put_off (abfd, intern->cbLine, (bfd_byte *)ext->f_cbLine);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-#ifndef MPW_C
-
-/* Swap in the procedure descriptor record.  */
-
-static void
-ecoff_swap_pdr_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     PDR *intern;
-{
-  struct pdr_ext ext[1];
-
-  *ext = *(struct pdr_ext *) ext_copy;
-
-  memset ((PTR) intern, 0, sizeof (*intern));
-
-  intern->adr           = ecoff_get_off (abfd, (bfd_byte *)ext->p_adr);
-  intern->isym          = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_isym);
-  intern->iline         = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_iline);
-  intern->regmask       = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_regmask);
-  intern->regoffset     = bfd_h_get_signed_32 (abfd,
-					       (bfd_byte *)ext->p_regoffset);
-  intern->iopt          = bfd_h_get_signed_32 (abfd, (bfd_byte *)ext->p_iopt);
-  intern->fregmask      = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_fregmask);
-  intern->fregoffset    = bfd_h_get_signed_32 (abfd,
-					       (bfd_byte *)ext->p_fregoffset);
-  intern->frameoffset   = bfd_h_get_signed_32 (abfd,
-					       (bfd_byte *)ext->p_frameoffset);
-  intern->framereg      = bfd_h_get_16 (abfd, (bfd_byte *)ext->p_framereg);
-  intern->pcreg         = bfd_h_get_16 (abfd, (bfd_byte *)ext->p_pcreg);
-  intern->lnLow         = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_lnLow);
-  intern->lnHigh        = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_lnHigh);
-  intern->cbLineOffset  = ecoff_get_off (abfd, (bfd_byte *)ext->p_cbLineOffset);
-
-#ifdef ECOFF_64
-  intern->gp_prologue = bfd_h_get_8 (abfd, (bfd_byte *) ext->p_gp_prologue);
-  if (bfd_header_big_endian (abfd))
-    {
-      intern->gp_used = 0 != (ext->p_bits1[0] & PDR_BITS1_GP_USED_BIG);
-      intern->reg_frame = 0 != (ext->p_bits1[0] & PDR_BITS1_REG_FRAME_BIG);
-      intern->prof = 0 != (ext->p_bits1[0] & PDR_BITS1_PROF_BIG);
-      intern->reserved = (((ext->p_bits1[0] & PDR_BITS1_RESERVED_BIG)
-			   << PDR_BITS1_RESERVED_SH_LEFT_BIG)
-			  | ((ext->p_bits2[0] & PDR_BITS2_RESERVED_BIG)
-			     >> PDR_BITS2_RESERVED_SH_BIG));
-    }
-  else
-    {
-      intern->gp_used = 0 != (ext->p_bits1[0] & PDR_BITS1_GP_USED_LITTLE);
-      intern->reg_frame = 0 != (ext->p_bits1[0] & PDR_BITS1_REG_FRAME_LITTLE);
-      intern->prof = 0 != (ext->p_bits1[0] & PDR_BITS1_PROF_LITTLE);
-      intern->reserved = (((ext->p_bits1[0] & PDR_BITS1_RESERVED_LITTLE)
-			   >> PDR_BITS1_RESERVED_SH_LITTLE)
-			  | ((ext->p_bits2[0] & PDR_BITS2_RESERVED_LITTLE)
-			     << PDR_BITS2_RESERVED_SH_LEFT_LITTLE));
-    }
-  intern->localoff = bfd_h_get_8 (abfd, (bfd_byte *) ext->p_localoff);
-#endif  
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out the procedure descriptor record.  */
-
-static void
-ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const PDR *intern_copy;
-     PTR ext_ptr;
-{
-  struct pdr_ext *ext = (struct pdr_ext *) ext_ptr;
-  PDR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-  
-  ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->p_adr);
-  bfd_h_put_32 (abfd, intern->isym, (bfd_byte *)ext->p_isym);
-  bfd_h_put_32 (abfd, intern->iline, (bfd_byte *)ext->p_iline);
-  bfd_h_put_32 (abfd, intern->regmask, (bfd_byte *)ext->p_regmask);
-  bfd_h_put_32 (abfd, intern->regoffset, (bfd_byte *)ext->p_regoffset);
-  bfd_h_put_32 (abfd, intern->iopt, (bfd_byte *)ext->p_iopt);
-  bfd_h_put_32 (abfd, intern->fregmask, (bfd_byte *)ext->p_fregmask);
-  bfd_h_put_32 (abfd, intern->fregoffset, (bfd_byte *)ext->p_fregoffset);
-  bfd_h_put_32 (abfd, intern->frameoffset, (bfd_byte *)ext->p_frameoffset);
-  bfd_h_put_16 (abfd, intern->framereg, (bfd_byte *)ext->p_framereg);
-  bfd_h_put_16 (abfd, intern->pcreg, (bfd_byte *)ext->p_pcreg);
-  bfd_h_put_32 (abfd, intern->lnLow, (bfd_byte *)ext->p_lnLow);
-  bfd_h_put_32 (abfd, intern->lnHigh, (bfd_byte *)ext->p_lnHigh);
-  ecoff_put_off (abfd, intern->cbLineOffset, (bfd_byte *)ext->p_cbLineOffset);
-
-#ifdef ECOFF_64
-  bfd_h_put_8 (abfd, intern->gp_prologue, (bfd_byte *) ext->p_gp_prologue);
-  if (bfd_header_big_endian (abfd))
-    {
-      ext->p_bits1[0] = ((intern->gp_used ? PDR_BITS1_GP_USED_BIG : 0)
-			 | (intern->reg_frame ? PDR_BITS1_REG_FRAME_BIG : 0)
-			 | (intern->prof ? PDR_BITS1_PROF_BIG : 0)
-			 | ((intern->reserved
-			     >> PDR_BITS1_RESERVED_SH_LEFT_BIG)
-			    & PDR_BITS1_RESERVED_BIG));
-      ext->p_bits2[0] = ((intern->reserved << PDR_BITS2_RESERVED_SH_BIG)
-			 & PDR_BITS2_RESERVED_BIG);
-    }
-  else
-    {
-      ext->p_bits1[0] = ((intern->gp_used ? PDR_BITS1_GP_USED_LITTLE : 0)
-			 | (intern->reg_frame ? PDR_BITS1_REG_FRAME_LITTLE : 0)
-			 | (intern->prof ? PDR_BITS1_PROF_LITTLE : 0)
-			 | ((intern->reserved << PDR_BITS1_RESERVED_SH_LITTLE)
-			    & PDR_BITS1_RESERVED_LITTLE));
-      ext->p_bits2[0] = ((intern->reserved >>
-			  PDR_BITS2_RESERVED_SH_LEFT_LITTLE)
-			 & PDR_BITS2_RESERVED_LITTLE);
-    }
-  bfd_h_put_8 (abfd, intern->localoff, (bfd_byte *) ext->p_localoff);
-#endif  
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-#else /* MPW_C */
-/* Same routines, but with ECOFF_64 code removed, so ^&%$#&! MPW C doesn't
-   corrupt itself and then freak out. */
-/* Swap in the procedure descriptor record.  */
-
-static void
-ecoff_swap_pdr_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     PDR *intern;
-{
-  struct pdr_ext ext[1];
-
-  *ext = *(struct pdr_ext *) ext_copy;
-  
-  intern->adr           = ecoff_get_off (abfd, (bfd_byte *)ext->p_adr);
-  intern->isym          = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_isym);
-  intern->iline         = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_iline);
-  intern->regmask       = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_regmask);
-  intern->regoffset     = bfd_h_get_signed_32 (abfd,
-					       (bfd_byte *)ext->p_regoffset);
-  intern->iopt          = bfd_h_get_signed_32 (abfd, (bfd_byte *)ext->p_iopt);
-  intern->fregmask      = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_fregmask);
-  intern->fregoffset    = bfd_h_get_signed_32 (abfd,
-					       (bfd_byte *)ext->p_fregoffset);
-  intern->frameoffset   = bfd_h_get_signed_32 (abfd,
-					       (bfd_byte *)ext->p_frameoffset);
-  intern->framereg      = bfd_h_get_16 (abfd, (bfd_byte *)ext->p_framereg);
-  intern->pcreg         = bfd_h_get_16 (abfd, (bfd_byte *)ext->p_pcreg);
-  intern->lnLow         = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_lnLow);
-  intern->lnHigh        = bfd_h_get_32 (abfd, (bfd_byte *)ext->p_lnHigh);
-  intern->cbLineOffset  = ecoff_get_off (abfd, (bfd_byte *)ext->p_cbLineOffset);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out the procedure descriptor record.  */
-
-static void
-ecoff_swap_pdr_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const PDR *intern_copy;
-     PTR ext_ptr;
-{
-  struct pdr_ext *ext = (struct pdr_ext *) ext_ptr;
-  PDR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-  
-  ecoff_put_off (abfd, intern->adr, (bfd_byte *)ext->p_adr);
-  bfd_h_put_32 (abfd, intern->isym, (bfd_byte *)ext->p_isym);
-  bfd_h_put_32 (abfd, intern->iline, (bfd_byte *)ext->p_iline);
-  bfd_h_put_32 (abfd, intern->regmask, (bfd_byte *)ext->p_regmask);
-  bfd_h_put_32 (abfd, intern->regoffset, (bfd_byte *)ext->p_regoffset);
-  bfd_h_put_32 (abfd, intern->iopt, (bfd_byte *)ext->p_iopt);
-  bfd_h_put_32 (abfd, intern->fregmask, (bfd_byte *)ext->p_fregmask);
-  bfd_h_put_32 (abfd, intern->fregoffset, (bfd_byte *)ext->p_fregoffset);
-  bfd_h_put_32 (abfd, intern->frameoffset, (bfd_byte *)ext->p_frameoffset);
-  bfd_h_put_16 (abfd, intern->framereg, (bfd_byte *)ext->p_framereg);
-  bfd_h_put_16 (abfd, intern->pcreg, (bfd_byte *)ext->p_pcreg);
-  bfd_h_put_32 (abfd, intern->lnLow, (bfd_byte *)ext->p_lnLow);
-  bfd_h_put_32 (abfd, intern->lnHigh, (bfd_byte *)ext->p_lnHigh);
-  ecoff_put_off (abfd, intern->cbLineOffset, (bfd_byte *)ext->p_cbLineOffset);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-#endif /* MPW_C */
-
-/* Swap in a symbol record.  */
-
-static void
-ecoff_swap_sym_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     SYMR *intern;
-{
-  struct sym_ext ext[1];
-
-  *ext = *(struct sym_ext *) ext_copy;
-  
-  intern->iss           = bfd_h_get_32 (abfd, (bfd_byte *)ext->s_iss);
-  intern->value         = ecoff_get_off (abfd, (bfd_byte *)ext->s_value);
-
-  /* now the fun stuff... */
-  if (bfd_header_big_endian (abfd)) {
-    intern->st          =  (ext->s_bits1[0] & SYM_BITS1_ST_BIG)
-					   >> SYM_BITS1_ST_SH_BIG;
-    intern->sc          = ((ext->s_bits1[0] & SYM_BITS1_SC_BIG)
-					   << SYM_BITS1_SC_SH_LEFT_BIG)
-			| ((ext->s_bits2[0] & SYM_BITS2_SC_BIG)
-					   >> SYM_BITS2_SC_SH_BIG);
-    intern->reserved    = 0 != (ext->s_bits2[0] & SYM_BITS2_RESERVED_BIG);
-    intern->index       = ((ext->s_bits2[0] & SYM_BITS2_INDEX_BIG)
-					   << SYM_BITS2_INDEX_SH_LEFT_BIG)
-			| (ext->s_bits3[0] << SYM_BITS3_INDEX_SH_LEFT_BIG)
-			| (ext->s_bits4[0] << SYM_BITS4_INDEX_SH_LEFT_BIG);
-  } else {
-    intern->st          =  (ext->s_bits1[0] & SYM_BITS1_ST_LITTLE)
-					   >> SYM_BITS1_ST_SH_LITTLE;
-    intern->sc          = ((ext->s_bits1[0] & SYM_BITS1_SC_LITTLE)
-					   >> SYM_BITS1_SC_SH_LITTLE)
-			| ((ext->s_bits2[0] & SYM_BITS2_SC_LITTLE)
-					   << SYM_BITS2_SC_SH_LEFT_LITTLE);
-    intern->reserved    = 0 != (ext->s_bits2[0] & SYM_BITS2_RESERVED_LITTLE);
-    intern->index       = ((ext->s_bits2[0] & SYM_BITS2_INDEX_LITTLE)
-					   >> SYM_BITS2_INDEX_SH_LITTLE)
-			| (ext->s_bits3[0] << SYM_BITS3_INDEX_SH_LEFT_LITTLE)
-			| ((unsigned int) ext->s_bits4[0]
-			   << SYM_BITS4_INDEX_SH_LEFT_LITTLE);
-  }
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out a symbol record.  */
-
-static void
-ecoff_swap_sym_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const SYMR *intern_copy;
-     PTR ext_ptr;
-{
-  struct sym_ext *ext = (struct sym_ext *) ext_ptr;
-  SYMR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-  
-  bfd_h_put_32 (abfd, intern->iss, (bfd_byte *)ext->s_iss);
-  ecoff_put_off (abfd, intern->value, (bfd_byte *)ext->s_value);
-
-  /* now the fun stuff... */
-  if (bfd_header_big_endian (abfd)) {
-    ext->s_bits1[0] = (((intern->st << SYM_BITS1_ST_SH_BIG)
-			& SYM_BITS1_ST_BIG)
-		       | ((intern->sc >> SYM_BITS1_SC_SH_LEFT_BIG)
-			  & SYM_BITS1_SC_BIG));
-    ext->s_bits2[0] = (((intern->sc << SYM_BITS2_SC_SH_BIG)
-			& SYM_BITS2_SC_BIG)
-		       | (intern->reserved ? SYM_BITS2_RESERVED_BIG : 0)
-		       | ((intern->index >> SYM_BITS2_INDEX_SH_LEFT_BIG)
-			  & SYM_BITS2_INDEX_BIG));
-    ext->s_bits3[0] = (intern->index >> SYM_BITS3_INDEX_SH_LEFT_BIG) & 0xff;
-    ext->s_bits4[0] = (intern->index >> SYM_BITS4_INDEX_SH_LEFT_BIG) & 0xff;
-  } else {
-    ext->s_bits1[0] = (((intern->st << SYM_BITS1_ST_SH_LITTLE)
-			& SYM_BITS1_ST_LITTLE)
-		       | ((intern->sc << SYM_BITS1_SC_SH_LITTLE)
-			  & SYM_BITS1_SC_LITTLE));
-    ext->s_bits2[0] = (((intern->sc >> SYM_BITS2_SC_SH_LEFT_LITTLE)
-			& SYM_BITS2_SC_LITTLE)
-		       | (intern->reserved ? SYM_BITS2_RESERVED_LITTLE : 0)
-		       | ((intern->index << SYM_BITS2_INDEX_SH_LITTLE)
-			  & SYM_BITS2_INDEX_LITTLE));
-    ext->s_bits3[0] = (intern->index >> SYM_BITS3_INDEX_SH_LEFT_LITTLE) & 0xff;
-    ext->s_bits4[0] = (intern->index >> SYM_BITS4_INDEX_SH_LEFT_LITTLE) & 0xff;
-  }
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap in an external symbol record.  */
-
-static void
-ecoff_swap_ext_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     EXTR *intern;
-{
-  struct ext_ext ext[1];
-
-  *ext = *(struct ext_ext *) ext_copy;
-  
-  /* now the fun stuff... */
-  if (bfd_header_big_endian (abfd)) {
-    intern->jmptbl      = 0 != (ext->es_bits1[0] & EXT_BITS1_JMPTBL_BIG);
-    intern->cobol_main  = 0 != (ext->es_bits1[0] & EXT_BITS1_COBOL_MAIN_BIG);
-    intern->weakext     = 0 != (ext->es_bits1[0] & EXT_BITS1_WEAKEXT_BIG);
-  } else {
-    intern->jmptbl      = 0 != (ext->es_bits1[0] & EXT_BITS1_JMPTBL_LITTLE);
-    intern->cobol_main  = 0 != (ext->es_bits1[0] & EXT_BITS1_COBOL_MAIN_LITTLE);
-    intern->weakext     = 0 != (ext->es_bits1[0] & EXT_BITS1_WEAKEXT_LITTLE);
-  }
-  intern->reserved = 0;
-
-#ifdef ECOFF_32
-  intern->ifd           = bfd_h_get_signed_16 (abfd, (bfd_byte *)ext->es_ifd);
-#endif
-#ifdef ECOFF_64
-  intern->ifd           = bfd_h_get_signed_32 (abfd, (bfd_byte *)ext->es_ifd);
-#endif
-
-  ecoff_swap_sym_in (abfd, &ext->es_asym, &intern->asym);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out an external symbol record.  */
-
-static void
-ecoff_swap_ext_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const EXTR *intern_copy;
-     PTR ext_ptr;
-{
-  struct ext_ext *ext = (struct ext_ext *) ext_ptr;
-  EXTR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-  
-  /* now the fun stuff... */
-  if (bfd_header_big_endian (abfd)) {
-    ext->es_bits1[0] = ((intern->jmptbl ? EXT_BITS1_JMPTBL_BIG : 0)
-			| (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_BIG : 0)
-			| (intern->weakext ? EXT_BITS1_WEAKEXT_BIG : 0));
-    ext->es_bits2[0] = 0;
-#ifdef ECOFF_64
-    ext->es_bits2[1] = 0;
-    ext->es_bits2[2] = 0;
-#endif
-  } else {
-    ext->es_bits1[0] = ((intern->jmptbl ? EXT_BITS1_JMPTBL_LITTLE : 0)
-			| (intern->cobol_main ? EXT_BITS1_COBOL_MAIN_LITTLE : 0)
-			| (intern->weakext ? EXT_BITS1_WEAKEXT_LITTLE : 0));
-    ext->es_bits2[0] = 0;
-#ifdef ECOFF_64
-    ext->es_bits2[1] = 0;
-    ext->es_bits2[2] = 0;
-#endif
-  }
-
-#ifdef ECOFF_32
-  bfd_h_put_signed_16 (abfd, intern->ifd, (bfd_byte *)ext->es_ifd);
-#endif
-#ifdef ECOFF_64
-  bfd_h_put_signed_32 (abfd, intern->ifd, (bfd_byte *)ext->es_ifd);
-#endif
-
-  ecoff_swap_sym_out (abfd, &intern->asym, &ext->es_asym);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap in a relative file descriptor.  */
-
-static void
-ecoff_swap_rfd_in (abfd, ext_ptr, intern)
-     bfd *abfd;
-     PTR ext_ptr;
-     RFDT *intern;
-{
-  struct rfd_ext *ext = (struct rfd_ext *) ext_ptr;
-
-  *intern = bfd_h_get_32 (abfd, (bfd_byte *)ext->rfd);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out a relative file descriptor.  */
-
-static void
-ecoff_swap_rfd_out (abfd, intern, ext_ptr)
-     bfd *abfd;
-     const RFDT *intern;
-     PTR ext_ptr;
-{
-  struct rfd_ext *ext = (struct rfd_ext *) ext_ptr;
-
-  bfd_h_put_32 (abfd, *intern, (bfd_byte *)ext->rfd);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap in an optimization symbol.  */
-
-static void
-ecoff_swap_opt_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     OPTR *intern;
-{
-  struct opt_ext ext[1];
-
-  *ext = *(struct opt_ext *) ext_copy;
-
-  if (bfd_header_big_endian (abfd))
-    {
-      intern->ot = ext->o_bits1[0];
-      intern->value = (((unsigned int) ext->o_bits2[0]
-			<< OPT_BITS2_VALUE_SH_LEFT_BIG)
-		       | ((unsigned int) ext->o_bits3[0]
-			  << OPT_BITS2_VALUE_SH_LEFT_BIG)
-		       | ((unsigned int) ext->o_bits4[0]
-			  << OPT_BITS2_VALUE_SH_LEFT_BIG));
-    }
-  else
-    {
-      intern->ot = ext->o_bits1[0];
-      intern->value = ((ext->o_bits2[0] << OPT_BITS2_VALUE_SH_LEFT_LITTLE)
-		       | (ext->o_bits3[0] << OPT_BITS2_VALUE_SH_LEFT_LITTLE)
-		       | (ext->o_bits4[0] << OPT_BITS2_VALUE_SH_LEFT_LITTLE));
-    }
-
-  _bfd_ecoff_swap_rndx_in (bfd_header_big_endian (abfd),
-			   &ext->o_rndx, &intern->rndx);
-
-  intern->offset = bfd_h_get_32 (abfd, (bfd_byte *) ext->o_offset);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out an optimization symbol.  */
-
-static void
-ecoff_swap_opt_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const OPTR *intern_copy;
-     PTR ext_ptr;
-{
-  struct opt_ext *ext = (struct opt_ext *) ext_ptr;
-  OPTR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-
-  if (bfd_header_big_endian (abfd))
-    {
-      ext->o_bits1[0] = intern->ot;
-      ext->o_bits2[0] = intern->value >> OPT_BITS2_VALUE_SH_LEFT_BIG;
-      ext->o_bits3[0] = intern->value >> OPT_BITS3_VALUE_SH_LEFT_BIG;
-      ext->o_bits4[0] = intern->value >> OPT_BITS4_VALUE_SH_LEFT_BIG;
-    }
-  else
-    {
-      ext->o_bits1[0] = intern->ot;
-      ext->o_bits2[0] = intern->value >> OPT_BITS2_VALUE_SH_LEFT_LITTLE;
-      ext->o_bits3[0] = intern->value >> OPT_BITS3_VALUE_SH_LEFT_LITTLE;
-      ext->o_bits4[0] = intern->value >> OPT_BITS4_VALUE_SH_LEFT_LITTLE;
-    }
-
-  _bfd_ecoff_swap_rndx_out (bfd_header_big_endian (abfd),
-			    &intern->rndx, &ext->o_rndx);
-
-  bfd_h_put_32 (abfd, intern->value, (bfd_byte *) ext->o_offset);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap in a dense number.  */
-
-static void
-ecoff_swap_dnr_in (abfd, ext_copy, intern)
-     bfd *abfd;
-     PTR ext_copy;
-     DNR *intern;
-{
-  struct dnr_ext ext[1];
-
-  *ext = *(struct dnr_ext *) ext_copy;
-
-  intern->rfd = bfd_h_get_32 (abfd, (bfd_byte *) ext->d_rfd);
-  intern->index = bfd_h_get_32 (abfd, (bfd_byte *) ext->d_index);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
-
-/* Swap out a dense number.  */
-
-static void
-ecoff_swap_dnr_out (abfd, intern_copy, ext_ptr)
-     bfd *abfd;
-     const DNR *intern_copy;
-     PTR ext_ptr;
-{
-  struct dnr_ext *ext = (struct dnr_ext *) ext_ptr;
-  DNR intern[1];
-
-  *intern = *intern_copy;	/* Make it reasonable to do in-place.  */
-
-  bfd_h_put_32 (abfd, intern->rfd, (bfd_byte *) ext->d_rfd);
-  bfd_h_put_32 (abfd, intern->index, (bfd_byte *) ext->d_index);
-
-#ifdef TEST
-  if (memcmp ((char *)ext, (char *)intern, sizeof (*intern)) != 0)
-    abort();
-#endif
-}
diff --git a/bfd/elf-bfd.h b/bfd/elf-bfd.h
deleted file mode 100644
index 82ffe2add97..00000000000
--- a/bfd/elf-bfd.h
+++ /dev/null
@@ -1,1114 +0,0 @@
-/* BFD back-end data structures for ELF files.
-   Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _LIBELF_H_
-#define _LIBELF_H_ 1
-
-#include "elf/common.h"
-#include "elf/internal.h"
-#include "elf/external.h"
-#include "bfdlink.h"
-
-/* If size isn't specified as 64 or 32, NAME macro should fail.  */
-#ifndef NAME
-#if ARCH_SIZE==64
-#define NAME(x,y) CAT4(x,64,_,y)
-#endif
-#if ARCH_SIZE==32
-#define NAME(x,y) CAT4(x,32,_,y)
-#endif
-#endif
-
-#ifndef NAME
-#define NAME(x,y) CAT4(x,NOSIZE,_,y)
-#endif
-
-#define ElfNAME(X)	NAME(Elf,X)
-#define elfNAME(X)	NAME(elf,X)
-
-/* Information held for an ELF symbol.  The first field is the
-   corresponding asymbol.  Every symbol is an ELF file is actually a
-   pointer to this structure, although it is often handled as a
-   pointer to an asymbol.  */
-
-typedef struct
-{
-  /* The BFD symbol.  */
-  asymbol symbol;
-  /* ELF symbol information.  */
-  Elf_Internal_Sym internal_elf_sym;
-  /* Backend specific information.  */
-  union
-    {
-      unsigned int hppa_arg_reloc;
-      PTR mips_extr;
-      PTR any;
-    }
-  tc_data;
-
-  /* Version information.  This is from an Elf_Internal_Versym
-     structure in a SHT_GNU_versym section.  It is zero if there is no
-     version information.  */
-  unsigned short version;
-
-} elf_symbol_type;
-
-/* ELF linker hash table entries.  */
-
-struct elf_link_hash_entry
-{
-  struct bfd_link_hash_entry root;
-
-  /* Symbol index in output file.  This is initialized to -1.  It is
-     set to -2 if the symbol is used by a reloc.  */
-  long indx;
-
-  /* Symbol size.  */
-  bfd_size_type size;
-
-  /* Symbol index as a dynamic symbol.  Initialized to -1, and remains
-     -1 if this is not a dynamic symbol.  */
-  long dynindx;
-
-  /* String table index in .dynstr if this is a dynamic symbol.  */
-  unsigned long dynstr_index;
-
-  /* If this is a weak defined symbol from a dynamic object, this
-     field points to a defined symbol with the same value, if there is
-     one.  Otherwise it is NULL.  */
-  struct elf_link_hash_entry *weakdef;
-
-  /* If this symbol requires an entry in the global offset table, the
-     processor specific backend uses this field to track usage and
-     final offset.  We use a union and two names primarily to document
-     the intent of any particular piece of code.  The field should be
-     used as a count until size_dynamic_sections, at which point the
-     contents of the .got is fixed.  Afterward, if this field is -1,
-     then the symbol does not require a global offset table entry.  */
-  union
-    {
-      bfd_signed_vma refcount;
-      bfd_vma offset;
-    } got;
-
-  /* Same, but tracks a procedure linkage table entry.  */
-  union
-    {
-      bfd_signed_vma refcount;
-      bfd_vma offset;
-    } plt;
-
-  /* If this symbol is used in the linker created sections, the processor
-     specific backend uses this field to map the field into the offset
-     from the beginning of the section.  */
-  struct elf_linker_section_pointers *linker_section_pointer;
-
-  /* Version information.  */
-  union
-  {
-    /* This field is used for a symbol which is not defined in a
-       regular object.  It points to the version information read in
-       from the dynamic object.  */
-    Elf_Internal_Verdef *verdef;
-    /* This field is used for a symbol which is defined in a regular
-       object.  It is set up in size_dynamic_sections.  It points to
-       the version information we should write out for this symbol.  */
-    struct bfd_elf_version_tree *vertree;
-  } verinfo;
-
-  /* Virtual table entry use information.  This array is nominally of size
-     size/sizeof(target_void_pointer), though we have to be able to assume
-     and track a size while the symbol is still undefined.  It is indexed
-     via offset/sizeof(target_void_pointer).  */
-  size_t vtable_entries_size;
-  boolean *vtable_entries_used;
-
-  /* Virtual table derivation info.  */
-  struct elf_link_hash_entry *vtable_parent;
-
-  /* Symbol type (STT_NOTYPE, STT_OBJECT, etc.).  */
-  char type;
-
-  /* Symbol st_other value.  */
-  unsigned char other;
-
-  /* Hash value of the name computed using the ELF hash function.  */
-  unsigned long elf_hash_value;
-
-  /* Some flags; legal values follow.  */
-  unsigned short elf_link_hash_flags;
-  /* Symbol is referenced by a non-shared object.  */
-#define ELF_LINK_HASH_REF_REGULAR 01
-  /* Symbol is defined by a non-shared object.  */
-#define ELF_LINK_HASH_DEF_REGULAR 02
-  /* Symbol is referenced by a shared object.  */
-#define ELF_LINK_HASH_REF_DYNAMIC 04
-  /* Symbol is defined by a shared object.  */
-#define ELF_LINK_HASH_DEF_DYNAMIC 010
-  /* Symbol has a non-weak reference from a non-shared object.  */
-#define ELF_LINK_HASH_REF_REGULAR_NONWEAK 020
-  /* Dynamic symbol has been adjustd.  */
-#define ELF_LINK_HASH_DYNAMIC_ADJUSTED 040
-  /* Symbol needs a copy reloc.  */
-#define ELF_LINK_HASH_NEEDS_COPY 0100
-  /* Symbol needs a procedure linkage table entry.  */
-#define ELF_LINK_HASH_NEEDS_PLT 0200
-  /* Symbol appears in a non-ELF input file.  */
-#define ELF_LINK_NON_ELF 0400
-  /* Symbol should be marked as hidden in the version information.  */
-#define ELF_LINK_HIDDEN 01000
-  /* Symbol was forced to local scope due to a version script file.  */
-#define ELF_LINK_FORCED_LOCAL 02000
-  /* Symbol was marked during garbage collection.  */
-#define ELF_LINK_HASH_MARK 04000
-};
-
-/* ELF linker hash table.  */
-
-struct elf_link_hash_table
-{
-  struct bfd_link_hash_table root;
-  /* Whether we have created the special dynamic sections required
-     when linking against or generating a shared object.  */
-  boolean dynamic_sections_created;
-  /* The BFD used to hold special sections created by the linker.
-     This will be the first BFD found which requires these sections to
-     be created.  */
-  bfd *dynobj;
-  /* The number of symbols found in the link which must be put into
-     the .dynsym section.  */
-  bfd_size_type dynsymcount;
-  /* The string table of dynamic symbols, which becomes the .dynstr
-     section.  */
-  struct bfd_strtab_hash *dynstr;
-  /* The number of buckets in the hash table in the .hash section.
-     This is based on the number of dynamic symbols.  */
-  bfd_size_type bucketcount;
-  /* A linked list of DT_NEEDED names found in dynamic objects
-     included in the link.  */
-  struct bfd_link_needed_list *needed;
-  /* The _GLOBAL_OFFSET_TABLE_ symbol.  */
-  struct elf_link_hash_entry *hgot;
-  /* A pointer to information used to link stabs in sections.  */
-  PTR stab_info;
-};
-
-/* Look up an entry in an ELF linker hash table.  */
-
-#define elf_link_hash_lookup(table, string, create, copy, follow)	\
-  ((struct elf_link_hash_entry *)					\
-   bfd_link_hash_lookup (&(table)->root, (string), (create),		\
-			 (copy), (follow)))
-
-/* Traverse an ELF linker hash table.  */
-
-#define elf_link_hash_traverse(table, func, info)			\
-  (bfd_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the ELF linker hash table from a link_info structure.  */
-
-#define elf_hash_table(p) ((struct elf_link_hash_table *) ((p)->hash))
-
-/* Constant information held for an ELF backend.  */
-
-struct elf_size_info {
-  unsigned char sizeof_ehdr, sizeof_phdr, sizeof_shdr;
-  unsigned char sizeof_rel, sizeof_rela, sizeof_sym, sizeof_dyn, sizeof_note;
-
-  unsigned char arch_size, file_align;
-  unsigned char elfclass, ev_current;
-  int (*write_out_phdrs) PARAMS ((bfd *, const Elf_Internal_Phdr *, int));
-  boolean (*write_shdrs_and_ehdr) PARAMS ((bfd *));
-  void (*write_relocs) PARAMS ((bfd *, asection *, PTR));
-  void (*swap_symbol_out) PARAMS ((bfd *, const Elf_Internal_Sym *, PTR));
-  boolean (*slurp_reloc_table)
-    PARAMS ((bfd *, asection *, asymbol **, boolean));
-  long (*slurp_symbol_table) PARAMS ((bfd *, asymbol **, boolean));
-  void (*swap_dyn_in) PARAMS ((bfd *, const PTR, Elf_Internal_Dyn *));
-};
-
-#define elf_symbol_from(ABFD,S) \
-	(((S)->the_bfd->xvec->flavour == bfd_target_elf_flavour \
-	  && (S)->the_bfd->tdata.elf_obj_data != 0) \
-	 ? (elf_symbol_type *) (S) \
-	 : 0)
-
-struct elf_backend_data
-{
-  /* Whether the backend uses REL or RELA relocations.  FIXME: some
-     ELF backends use both.  When we need to support one, this whole
-     approach will need to be changed.  */
-  int use_rela_p;
-
-  /* The architecture for this backend.  */
-  enum bfd_architecture arch;
-
-  /* The ELF machine code (EM_xxxx) for this backend.  */
-  int elf_machine_code;
-
-  /* The maximum page size for this backend.  */
-  bfd_vma maxpagesize;
-
-  /* This is true if the linker should act like collect and gather
-     global constructors and destructors by name.  This is true for
-     MIPS ELF because the Irix 5 tools can not handle the .init
-     section.  */
-  boolean collect;
-
-  /* This is true if the linker should ignore changes to the type of a
-     symbol.  This is true for MIPS ELF because some Irix 5 objects
-     record undefined functions as STT_OBJECT although the definitions
-     are STT_FUNC.  */
-  boolean type_change_ok;
-
-  /* A function to translate an ELF RELA relocation to a BFD arelent
-     structure.  */
-  void (*elf_info_to_howto) PARAMS ((bfd *, arelent *,
-				     Elf_Internal_Rela *));
-
-  /* A function to translate an ELF REL relocation to a BFD arelent
-     structure.  */
-  void (*elf_info_to_howto_rel) PARAMS ((bfd *, arelent *,
-					 Elf_Internal_Rel *));
-
-  /* A function to determine whether a symbol is global when
-     partitioning the symbol table into local and global symbols.
-     This should be NULL for most targets, in which case the correct
-     thing will be done.  MIPS ELF, at least on the Irix 5, has
-     special requirements.  */
-  boolean (*elf_backend_sym_is_global) PARAMS ((bfd *, asymbol *));
-
-  /* The remaining functions are hooks which are called only if they
-     are not NULL.  */
-
-  /* A function to permit a backend specific check on whether a
-     particular BFD format is relevant for an object file, and to
-     permit the backend to set any global information it wishes.  When
-     this is called elf_elfheader is set, but anything else should be
-     used with caution.  If this returns false, the check_format
-     routine will return a bfd_error_wrong_format error.  */
-  boolean (*elf_backend_object_p) PARAMS ((bfd *));
-
-  /* A function to do additional symbol processing when reading the
-     ELF symbol table.  This is where any processor-specific special
-     section indices are handled.  */
-  void (*elf_backend_symbol_processing) PARAMS ((bfd *, asymbol *));
-
-  /* A function to do additional symbol processing after reading the
-     entire ELF symbol table.  */
-  boolean (*elf_backend_symbol_table_processing) PARAMS ((bfd *,
-							  elf_symbol_type *,
-							  unsigned int));
-
-   /* A function to set the type of the info field.  Processor-specific
-     types should be handled here. */
-  int (*elf_backend_get_symbol_type) PARAMS (( Elf_Internal_Sym *, int)); 
- 
-  /* A function to do additional processing on the ELF section header
-     just before writing it out.  This is used to set the flags and
-     type fields for some sections, or to actually write out data for
-     unusual sections.  */
-  boolean (*elf_backend_section_processing) PARAMS ((bfd *,
-						     Elf32_Internal_Shdr *));
-
-  /* A function to handle unusual section types when creating BFD
-     sections from ELF sections.  */
-  boolean (*elf_backend_section_from_shdr) PARAMS ((bfd *,
-						    Elf32_Internal_Shdr *,
-						    char *));
-
-  /* A function to set up the ELF section header for a BFD section in
-     preparation for writing it out.  This is where the flags and type
-     fields are set for unusual sections.  */
-  boolean (*elf_backend_fake_sections) PARAMS ((bfd *, Elf32_Internal_Shdr *,
-						asection *));
-
-  /* A function to get the ELF section index for a BFD section.  If
-     this returns true, the section was found.  If it is a normal ELF
-     section, *RETVAL should be left unchanged.  If it is not a normal
-     ELF section *RETVAL should be set to the SHN_xxxx index.  */
-  boolean (*elf_backend_section_from_bfd_section)
-    PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *, int *retval));
-
-  /* If this field is not NULL, it is called by the add_symbols phase
-     of a link just before adding a symbol to the global linker hash
-     table.  It may modify any of the fields as it wishes.  If *NAME
-     is set to NULL, the symbol will be skipped rather than being
-     added to the hash table.  This function is responsible for
-     handling all processor dependent symbol bindings and section
-     indices, and must set at least *FLAGS and *SEC for each processor
-     dependent case; failure to do so will cause a link error.  */
-  boolean (*elf_add_symbol_hook)
-    PARAMS ((bfd *abfd, struct bfd_link_info *info,
-	     const Elf_Internal_Sym *, const char **name,
-	     flagword *flags, asection **sec, bfd_vma *value));
-
-  /* If this field is not NULL, it is called by the elf_link_output_sym
-     phase of a link for each symbol which will appear in the object file.  */
-  boolean (*elf_backend_link_output_symbol_hook)
-    PARAMS ((bfd *, struct bfd_link_info *info, const char *,
-	     Elf_Internal_Sym *, asection *));
-
-  /* The CREATE_DYNAMIC_SECTIONS function is called by the ELF backend
-     linker the first time it encounters a dynamic object in the link.
-     This function must create any sections required for dynamic
-     linking.  The ABFD argument is a dynamic object.  The .interp,
-     .dynamic, .dynsym, .dynstr, and .hash functions have already been
-     created, and this function may modify the section flags if
-     desired.  This function will normally create the .got and .plt
-     sections, but different backends have different requirements.  */
-  boolean (*elf_backend_create_dynamic_sections)
-    PARAMS ((bfd *abfd, struct bfd_link_info *info));
-
-  /* The CHECK_RELOCS function is called by the add_symbols phase of
-     the ELF backend linker.  It is called once for each section with
-     relocs of an object file, just after the symbols for the object
-     file have been added to the global linker hash table.  The
-     function must look through the relocs and do any special handling
-     required.  This generally means allocating space in the global
-     offset table, and perhaps allocating space for a reloc.  The
-     relocs are always passed as Rela structures; if the section
-     actually uses Rel structures, the r_addend field will always be
-     zero.  */
-  boolean (*check_relocs)
-    PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *o,
-	     const Elf_Internal_Rela *relocs));
-
-  /* The ADJUST_DYNAMIC_SYMBOL function is called by the ELF backend
-     linker for every symbol which is defined by a dynamic object and
-     referenced by a regular object.  This is called after all the
-     input files have been seen, but before the SIZE_DYNAMIC_SECTIONS
-     function has been called.  The hash table entry should be
-     bfd_link_hash_defined ore bfd_link_hash_defweak, and it should be
-     defined in a section from a dynamic object.  Dynamic object
-     sections are not included in the final link, and this function is
-     responsible for changing the value to something which the rest of
-     the link can deal with.  This will normally involve adding an
-     entry to the .plt or .got or some such section, and setting the
-     symbol to point to that.  */
-  boolean (*elf_backend_adjust_dynamic_symbol)
-    PARAMS ((struct bfd_link_info *info, struct elf_link_hash_entry *h));
-
-  /* The ALWAYS_SIZE_SECTIONS function is called by the backend linker
-     after all the linker input files have been seen but before the
-     section sizes have been set.  This is called after
-     ADJUST_DYNAMIC_SYMBOL, but before SIZE_DYNAMIC_SECTIONS.  */
-  boolean (*elf_backend_always_size_sections)
-    PARAMS ((bfd *output_bfd, struct bfd_link_info *info));
-
-  /* The SIZE_DYNAMIC_SECTIONS function is called by the ELF backend
-     linker after all the linker input files have been seen but before
-     the sections sizes have been set.  This is called after
-     ADJUST_DYNAMIC_SYMBOL has been called on all appropriate symbols.
-     It is only called when linking against a dynamic object.  It must
-     set the sizes of the dynamic sections, and may fill in their
-     contents as well.  The generic ELF linker can handle the .dynsym,
-     .dynstr and .hash sections.  This function must handle the
-     .interp section and any sections created by the
-     CREATE_DYNAMIC_SECTIONS entry point.  */
-  boolean (*elf_backend_size_dynamic_sections)
-    PARAMS ((bfd *output_bfd, struct bfd_link_info *info));
-
-  /* The RELOCATE_SECTION function is called by the ELF backend linker
-     to handle the relocations for a section.
-
-     The relocs are always passed as Rela structures; if the section
-     actually uses Rel structures, the r_addend field will always be
-     zero.
-
-     This function is responsible for adjust the section contents as
-     necessary, and (if using Rela relocs and generating a
-     relocateable output file) adjusting the reloc addend as
-     necessary.
-
-     This function does not have to worry about setting the reloc
-     address or the reloc symbol index.
-
-     LOCAL_SYMS is a pointer to the swapped in local symbols.
-
-     LOCAL_SECTIONS is an array giving the section in the input file
-     corresponding to the st_shndx field of each local symbol.
-
-     The global hash table entry for the global symbols can be found
-     via elf_sym_hashes (input_bfd).
-
-     When generating relocateable output, this function must handle
-     STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
-     going to be the section symbol corresponding to the output
-     section, which means that the addend must be adjusted
-     accordingly.  */
-  boolean (*elf_backend_relocate_section)
-    PARAMS ((bfd *output_bfd, struct bfd_link_info *info,
-	     bfd *input_bfd, asection *input_section, bfd_byte *contents,
-	     Elf_Internal_Rela *relocs, Elf_Internal_Sym *local_syms,
-	     asection **local_sections));
-
-  /* The FINISH_DYNAMIC_SYMBOL function is called by the ELF backend
-     linker just before it writes a symbol out to the .dynsym section.
-     The processor backend may make any required adjustment to the
-     symbol.  It may also take the opportunity to set contents of the
-     dynamic sections.  Note that FINISH_DYNAMIC_SYMBOL is called on
-     all .dynsym symbols, while ADJUST_DYNAMIC_SYMBOL is only called
-     on those symbols which are defined by a dynamic object.  */
-  boolean (*elf_backend_finish_dynamic_symbol)
-    PARAMS ((bfd *output_bfd, struct bfd_link_info *info,
-	     struct elf_link_hash_entry *h, Elf_Internal_Sym *sym));
-
-  /* The FINISH_DYNAMIC_SECTIONS function is called by the ELF backend
-     linker just before it writes all the dynamic sections out to the
-     output file.  The FINISH_DYNAMIC_SYMBOL will have been called on
-     all dynamic symbols.  */
-  boolean (*elf_backend_finish_dynamic_sections)
-    PARAMS ((bfd *output_bfd, struct bfd_link_info *info));
-
-  /* A function to do any beginning processing needed for the ELF file
-     before building the ELF headers and computing file positions.  */
-  void (*elf_backend_begin_write_processing)
-    PARAMS ((bfd *, struct bfd_link_info *));
-
-  /* A function to do any final processing needed for the ELF file
-     before writing it out.  The LINKER argument is true if this BFD
-     was created by the ELF backend linker.  */
-  void (*elf_backend_final_write_processing)
-    PARAMS ((bfd *, boolean linker));
-
-  /* This function is called by get_program_header_size.  It should
-     return the number of additional program segments which this BFD
-     will need.  It should return -1 on error.  */
-  int (*elf_backend_additional_program_headers) PARAMS ((bfd *));
-
-  /* This function is called to modify an existing segment map in a
-     backend specific fashion.  */
-  boolean (*elf_backend_modify_segment_map) PARAMS ((bfd *));
-
-  /* This function is called during section gc to discover the section a
-     particular relocation refers to.  It need not be defined for hosts
-     that have no queer relocation types.  */
-  asection * (*gc_mark_hook)
-    PARAMS ((bfd *abfd, struct bfd_link_info *, Elf_Internal_Rela *,
-	     struct elf_link_hash_entry *h, Elf_Internal_Sym *));
-
-  /* This function, if defined, is called during the sweep phase of gc
-     in order that a backend might update any data structures it might
-     be maintaining.  */
-  boolean (*gc_sweep_hook)
-    PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *o,
-	     const Elf_Internal_Rela *relocs));
-
-  /* The swapping table to use when dealing with ECOFF information.
-     Used for the MIPS ELF .mdebug section.  */
-  const struct ecoff_debug_swap *elf_backend_ecoff_debug_swap;
-
-  /* Alternate EM_xxxx machine codes for this backend.  */
-  int elf_machine_alt1;
-  int elf_machine_alt2;
-
-  const struct elf_size_info *s;
-
-  /* offset of the _GLOBAL_OFFSET_TABLE_ symbol from the start of the
-     .got section */
-  bfd_vma got_symbol_offset;
-
-  /* The size in bytes of the headers for the GOT and PLT.  This includes
-     the so-called reserved entries on some systems.  */
-  bfd_vma got_header_size;
-  bfd_vma plt_header_size;
-
-  unsigned want_got_plt : 1;
-  unsigned plt_readonly : 1;
-  unsigned want_plt_sym : 1;
-  unsigned plt_not_loaded : 1;
-  unsigned plt_alignment : 4;
-  unsigned can_gc_sections : 1;
-};
-
-/* Information stored for each BFD section in an ELF file.  This
-   structure is allocated by elf_new_section_hook.  */
-
-struct bfd_elf_section_data
-{
-  /* The ELF header for this section.  */
-  Elf_Internal_Shdr this_hdr;
-  /* The ELF header for the reloc section associated with this
-     section, if any.  */
-  Elf_Internal_Shdr rel_hdr;
-  /* If there is a second reloc section associated with this section,
-     as can happen on Irix 6, this field points to the header.  */
-  Elf_Internal_Shdr *rel_hdr2;
-  /* The ELF section number of this section.  Only used for an output
-     file.  */
-  int this_idx;
-  /* The ELF section number of the reloc section associated with this
-     section, if any.  Only used for an output file.  */
-  int rel_idx;
-  /* Used by the backend linker to store the symbol hash table entries
-     associated with relocs against global symbols.  */
-  struct elf_link_hash_entry **rel_hashes;
-  /* A pointer to the swapped relocs.  If the section uses REL relocs,
-     rather than RELA, all the r_addend fields will be zero.  This
-     pointer may be NULL.  It is used by the backend linker.  */
-  Elf_Internal_Rela *relocs;
-  /* Used by the backend linker when generating a shared library to
-     record the dynamic symbol index for a section symbol
-     corresponding to this section.  */
-  long dynindx;
-  /* A pointer used for .stab linking optimizations.  */
-  PTR stab_info;
-  /* A pointer available for the processor specific ELF backend.  */
-  PTR tdata;
-};
-
-#define elf_section_data(sec)  ((struct bfd_elf_section_data*)sec->used_by_bfd)
-
-#define get_elf_backend_data(abfd) \
-  ((struct elf_backend_data *) (abfd)->xvec->backend_data)
-
-/* Enumeration to specify the special section.  */
-typedef enum elf_linker_section_enum
-{
-  LINKER_SECTION_UNKNOWN,		/* not used */
-  LINKER_SECTION_GOT,			/* .got section for global offset pointers */
-  LINKER_SECTION_PLT,			/* .plt section for generated procedure stubs */
-  LINKER_SECTION_SDATA,			/* .sdata/.sbss section for PowerPC */
-  LINKER_SECTION_SDATA2,		/* .sdata2/.sbss2 section for PowerPC */
-  LINKER_SECTION_MAX			/* # of linker sections */
-} elf_linker_section_enum_t;
-
-/* Sections created by the linker.  */
-
-typedef struct elf_linker_section
-{
-  char *name;				/* name of the section */
-  char *rel_name;			/* name of the associated .rel{,a}. section */
-  char *bss_name;			/* name of a related .bss section */
-  char *sym_name;			/* name of symbol to reference this section */
-  asection *section;			/* pointer to the section */
-  asection *bss_section;		/* pointer to the bss section associated with this */
-  asection *rel_section;		/* pointer to the relocations needed for this section */
-  struct elf_link_hash_entry *sym_hash;	/* pointer to the created symbol hash value */
-  bfd_vma initial_size;			/* initial size before any linker generated allocations */
-  bfd_vma sym_offset;			/* offset of symbol from beginning of section */
-  bfd_vma hole_size;			/* size of reserved address hole in allocation */
-  bfd_vma hole_offset;			/* current offset for the hole */
-  bfd_vma max_hole_offset;		/* maximum offset for the hole */
-  elf_linker_section_enum_t which;	/* which section this is */
-  boolean hole_written_p;		/* whether the hole has been initialized */
-  unsigned int alignment;		/* alignment for the section */
-  flagword flags;			/* flags to use to create the section */
-} elf_linker_section_t;
-
-/* Linked list of allocated pointer entries.  This hangs off of the symbol lists, and
-   provides allows us to return different pointers, based on different addend's.  */
-
-typedef struct elf_linker_section_pointers
-{
-  struct elf_linker_section_pointers *next;	/* next allocated pointer for this symbol */
-  bfd_vma offset;				/* offset of pointer from beginning of section */
-  bfd_signed_vma addend;			/* addend used */
-  elf_linker_section_enum_t which;		/* which linker section this is */
-  boolean written_address_p;			/* whether address was written yet */
-} elf_linker_section_pointers_t;
-
-/* Some private data is stashed away for future use using the tdata pointer
-   in the bfd structure.  */
-
-struct elf_obj_tdata
-{
-  Elf_Internal_Ehdr elf_header[1];	/* Actual data, but ref like ptr */
-  Elf_Internal_Shdr **elf_sect_ptr;
-  Elf_Internal_Phdr *phdr;
-  struct elf_segment_map *segment_map;
-  struct bfd_strtab_hash *strtab_ptr;
-  int num_locals;
-  int num_globals;
-  asymbol **section_syms;		/* STT_SECTION symbols for each section */
-  Elf_Internal_Shdr symtab_hdr;
-  Elf_Internal_Shdr shstrtab_hdr;
-  Elf_Internal_Shdr strtab_hdr;
-  Elf_Internal_Shdr dynsymtab_hdr;
-  Elf_Internal_Shdr dynstrtab_hdr;
-  Elf_Internal_Shdr dynversym_hdr;
-  Elf_Internal_Shdr dynverref_hdr;
-  Elf_Internal_Shdr dynverdef_hdr;
-  unsigned int symtab_section, shstrtab_section;
-  unsigned int strtab_section, dynsymtab_section;
-  unsigned int dynversym_section, dynverdef_section, dynverref_section;
-  file_ptr next_file_pos;
-#if 0
-  /* we don't need these inside bfd anymore, and I think
-     these weren't used outside bfd. */
-  void *prstatus;			/* The raw /proc prstatus structure */
-  void *prpsinfo;			/* The raw /proc prpsinfo structure */
-#endif
-  bfd_vma gp;				/* The gp value (MIPS only, for now) */
-  unsigned int gp_size;			/* The gp size (MIPS only, for now) */
-
-  /* Information grabbed from an elf core file. */
-  int core_signal;
-  int core_pid;
-  int core_lwpid;
-  char* core_program;
-  char* core_command;
-
-  /* This is set to true if the object was created by the backend
-     linker.  */
-  boolean linker;
-
-  /* A mapping from external symbols to entries in the linker hash
-     table, used when linking.  This is indexed by the symbol index
-     minus the sh_info field of the symbol table header.  */
-  struct elf_link_hash_entry **sym_hashes;
-
-  /* A mapping from local symbols to offsets into the global offset
-     table, used when linking.  This is indexed by the symbol index.
-     Like for the globals, we use a union and two names primarily to
-     document the intent of any particular piece of code.  The field
-     should be used as a count until size_dynamic_sections, at which
-     point the contents of the .got is fixed.  Afterward, if an entry
-     is -1, then the symbol does not require a global offset table entry. */
-  union
-    {
-      bfd_signed_vma *refcounts;
-      bfd_vma *offsets;
-    } local_got;
-
-  /* A mapping from local symbols to offsets into the various linker
-     sections added.  This is index by the symbol index.  */
-  elf_linker_section_pointers_t **linker_section_pointers;
-
-  /* The linker ELF emulation code needs to let the backend ELF linker
-     know what filename should be used for a dynamic object if the
-     dynamic object is found using a search.  The emulation code then
-     sometimes needs to know what name was actually used.  Until the
-     file has been added to the linker symbol table, this field holds
-     the name the linker wants.  After it has been added, it holds the
-     name actually used, which will be the DT_SONAME entry if there is
-     one.  */
-  const char *dt_name;
-
-  /* Irix 5 often screws up the symbol table, sorting local symbols
-     after global symbols.  This flag is set if the symbol table in
-     this BFD appears to be screwed up.  If it is, we ignore the
-     sh_info field in the symbol table header, and always read all the
-     symbols.  */
-  boolean bad_symtab;
-
-  /* Records the result of `get_program_header_size'.  */
-  bfd_size_type program_header_size;
-
-  /* Used by find_nearest_line entry point.  */
-  PTR line_info;
-
-  /* Used by MIPS ELF find_nearest_line entry point.  The structure
-     could be included directly in this one, but there's no point to
-     wasting the memory just for the infrequently called
-     find_nearest_line.  */
-  struct mips_elf_find_line *find_line_info;
-
-  /* A place to stash dwarf1 info for this bfd. */
-  struct dwarf1_debug *dwarf1_find_line_info;
-
-  /* A place to stash dwarf2 info for this bfd. */
-  struct dwarf2_debug *dwarf2_find_line_info;
-
-  /* An array of stub sections indexed by symbol number, used by the
-     MIPS ELF linker.  FIXME: We should figure out some way to only
-     include this field for a MIPS ELF target.  */
-  asection **local_stubs;
-
-  /* Used to determine if the e_flags field has been initialized */
-  boolean flags_init;
-
-  /* Number of symbol version definitions we are about to emit.  */
-  unsigned int cverdefs;
-
-  /* Number of symbol version references we are about to emit.  */
-  unsigned int cverrefs;
-
-  /* Symbol version definitions in external objects.  */
-  Elf_Internal_Verdef *verdef;
-
-  /* Symbol version references to external objects.  */
-  Elf_Internal_Verneed *verref;
-
-  /* Linker sections that we are interested in.  */
-  struct elf_linker_section *linker_section[ (int)LINKER_SECTION_MAX ];
-};
-
-#define elf_tdata(bfd)		((bfd) -> tdata.elf_obj_data)
-#define elf_elfheader(bfd)	(elf_tdata(bfd) -> elf_header)
-#define elf_elfsections(bfd)	(elf_tdata(bfd) -> elf_sect_ptr)
-#define elf_shstrtab(bfd)	(elf_tdata(bfd) -> strtab_ptr)
-#define elf_onesymtab(bfd)	(elf_tdata(bfd) -> symtab_section)
-#define elf_dynsymtab(bfd)	(elf_tdata(bfd) -> dynsymtab_section)
-#define elf_dynversym(bfd)	(elf_tdata(bfd) -> dynversym_section)
-#define elf_dynverdef(bfd)	(elf_tdata(bfd) -> dynverdef_section)
-#define elf_dynverref(bfd)	(elf_tdata(bfd) -> dynverref_section)
-#define elf_num_locals(bfd)	(elf_tdata(bfd) -> num_locals)
-#define elf_num_globals(bfd)	(elf_tdata(bfd) -> num_globals)
-#define elf_section_syms(bfd)	(elf_tdata(bfd) -> section_syms)
-#define core_prpsinfo(bfd)	(elf_tdata(bfd) -> prpsinfo)
-#define core_prstatus(bfd)	(elf_tdata(bfd) -> prstatus)
-#define elf_gp(bfd)		(elf_tdata(bfd) -> gp)
-#define elf_gp_size(bfd)	(elf_tdata(bfd) -> gp_size)
-#define elf_sym_hashes(bfd)	(elf_tdata(bfd) -> sym_hashes)
-#define elf_local_got_refcounts(bfd) (elf_tdata(bfd) -> local_got.refcounts)
-#define elf_local_got_offsets(bfd) (elf_tdata(bfd) -> local_got.offsets)
-#define elf_local_ptr_offsets(bfd) (elf_tdata(bfd) -> linker_section_pointers)
-#define elf_dt_name(bfd)	(elf_tdata(bfd) -> dt_name)
-#define elf_bad_symtab(bfd)	(elf_tdata(bfd) -> bad_symtab)
-#define elf_flags_init(bfd)	(elf_tdata(bfd) -> flags_init)
-#define elf_linker_section(bfd,n) (elf_tdata(bfd) -> linker_section[(int)n])
-
-extern void _bfd_elf_swap_verdef_in
-  PARAMS ((bfd *, const Elf_External_Verdef *, Elf_Internal_Verdef *));
-extern void _bfd_elf_swap_verdef_out
-  PARAMS ((bfd *, const Elf_Internal_Verdef *, Elf_External_Verdef *));
-extern void _bfd_elf_swap_verdaux_in
-  PARAMS ((bfd *, const Elf_External_Verdaux *, Elf_Internal_Verdaux *));
-extern void _bfd_elf_swap_verdaux_out
-  PARAMS ((bfd *, const Elf_Internal_Verdaux *, Elf_External_Verdaux *));
-extern void _bfd_elf_swap_verneed_in
-  PARAMS ((bfd *, const Elf_External_Verneed *, Elf_Internal_Verneed *));
-extern void _bfd_elf_swap_verneed_out
-  PARAMS ((bfd *, const Elf_Internal_Verneed *, Elf_External_Verneed *));
-extern void _bfd_elf_swap_vernaux_in
-  PARAMS ((bfd *, const Elf_External_Vernaux *, Elf_Internal_Vernaux *));
-extern void _bfd_elf_swap_vernaux_out
-  PARAMS ((bfd *, const Elf_Internal_Vernaux *, Elf_External_Vernaux *));
-extern void _bfd_elf_swap_versym_in
-  PARAMS ((bfd *, const Elf_External_Versym *, Elf_Internal_Versym *));
-extern void _bfd_elf_swap_versym_out
-  PARAMS ((bfd *, const Elf_Internal_Versym *, Elf_External_Versym *));
-
-extern int _bfd_elf_section_from_bfd_section PARAMS ((bfd *, asection *));
-extern char *bfd_elf_string_from_elf_section
-  PARAMS ((bfd *, unsigned, unsigned));
-extern char *bfd_elf_get_str_section PARAMS ((bfd *, unsigned));
-
-extern boolean _bfd_elf_print_private_bfd_data PARAMS ((bfd *, PTR));
-extern void bfd_elf_print_symbol PARAMS ((bfd *, PTR, asymbol *,
-					  bfd_print_symbol_type));
-#define elf_string_from_elf_strtab(abfd,strindex) \
-     bfd_elf_string_from_elf_section(abfd,elf_elfheader(abfd)->e_shstrndx,strindex)
-
-#define bfd_elf32_print_symbol	bfd_elf_print_symbol
-#define bfd_elf64_print_symbol	bfd_elf_print_symbol
-
-extern unsigned long bfd_elf_hash PARAMS ((CONST unsigned char *));
-
-extern bfd_reloc_status_type bfd_elf_generic_reloc PARAMS ((bfd *,
-							    arelent *,
-							    asymbol *,
-							    PTR,
-							    asection *,
-							    bfd *,
-							    char **));
-extern boolean bfd_elf_mkobject PARAMS ((bfd *));
-extern boolean bfd_elf_mkcorefile PARAMS ((bfd *));
-extern Elf_Internal_Shdr *bfd_elf_find_section PARAMS ((bfd *, char *));
-extern boolean _bfd_elf_make_section_from_shdr
-  PARAMS ((bfd *abfd, Elf_Internal_Shdr *hdr, const char *name));
-extern struct bfd_hash_entry *_bfd_elf_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern struct bfd_link_hash_table *_bfd_elf_link_hash_table_create
-  PARAMS ((bfd *));
-extern boolean _bfd_elf_link_hash_table_init
-  PARAMS ((struct elf_link_hash_table *, bfd *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-extern boolean _bfd_elf_slurp_version_tables PARAMS ((bfd *));
-
-extern boolean _bfd_elf_copy_private_symbol_data
-  PARAMS ((bfd *, asymbol *, bfd *, asymbol *));
-extern boolean _bfd_elf_copy_private_section_data
-  PARAMS ((bfd *, asection *, bfd *, asection *));
-extern boolean _bfd_elf_write_object_contents PARAMS ((bfd *));
-extern boolean _bfd_elf_write_corefile_contents PARAMS ((bfd *));
-extern boolean _bfd_elf_set_section_contents PARAMS ((bfd *, sec_ptr, PTR,
-						       file_ptr,
-						       bfd_size_type));
-extern long _bfd_elf_get_symtab_upper_bound PARAMS ((bfd *));
-extern long _bfd_elf_get_symtab PARAMS ((bfd *, asymbol **));
-extern long _bfd_elf_get_dynamic_symtab_upper_bound PARAMS ((bfd *));
-extern long _bfd_elf_canonicalize_dynamic_symtab PARAMS ((bfd *, asymbol **));
-extern long _bfd_elf_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-extern long _bfd_elf_canonicalize_reloc PARAMS ((bfd *, sec_ptr,
-						  arelent **, asymbol **));
-extern long _bfd_elf_get_dynamic_reloc_upper_bound PARAMS ((bfd *));
-extern long _bfd_elf_canonicalize_dynamic_reloc PARAMS ((bfd *, arelent **,
-							 asymbol **));
-extern asymbol *_bfd_elf_make_empty_symbol PARAMS ((bfd *));
-extern void _bfd_elf_get_symbol_info PARAMS ((bfd *, asymbol *,
-					       symbol_info *));
-extern boolean _bfd_elf_is_local_label_name PARAMS ((bfd *, const char *));
-extern alent *_bfd_elf_get_lineno PARAMS ((bfd *, asymbol *));
-extern boolean _bfd_elf_set_arch_mach PARAMS ((bfd *, enum bfd_architecture,
-						unsigned long));
-extern boolean _bfd_elf_find_nearest_line PARAMS ((bfd *, asection *,
-						    asymbol **,
-						    bfd_vma, CONST char **,
-						    CONST char **,
-						    unsigned int *));
-#define _bfd_elf_read_minisymbols _bfd_generic_read_minisymbols
-#define _bfd_elf_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-extern int _bfd_elf_sizeof_headers PARAMS ((bfd *, boolean));
-extern boolean _bfd_elf_new_section_hook PARAMS ((bfd *, asection *));
-
-/* If the target doesn't have reloc handling written yet:  */
-extern void _bfd_elf_no_info_to_howto PARAMS ((bfd *, arelent *,
-					       Elf_Internal_Rela *));
-
-extern boolean bfd_section_from_shdr PARAMS ((bfd *, unsigned int shindex));
-extern boolean bfd_section_from_phdr PARAMS ((bfd *, Elf_Internal_Phdr *, int));
-
-extern int _bfd_elf_symbol_from_bfd_symbol PARAMS ((bfd *, asymbol **));
-
-asection *bfd_section_from_elf_index PARAMS ((bfd *, unsigned int));
-boolean _bfd_elf_create_dynamic_sections PARAMS ((bfd *,
-						  struct bfd_link_info *));
-struct bfd_strtab_hash *_bfd_elf_stringtab_init PARAMS ((void));
-boolean
-_bfd_elf_link_record_dynamic_symbol PARAMS ((struct bfd_link_info *,
-					     struct elf_link_hash_entry *));
-boolean
-_bfd_elf_compute_section_file_positions PARAMS ((bfd *,
-						 struct bfd_link_info *));
-void _bfd_elf_assign_file_positions_for_relocs PARAMS ((bfd *));
-file_ptr _bfd_elf_assign_file_position_for_section PARAMS ((Elf_Internal_Shdr *,
-							    file_ptr,
-							    boolean));
-
-extern boolean _bfd_elf_validate_reloc PARAMS ((bfd *, arelent *));
-
-boolean _bfd_elf_create_dynamic_sections PARAMS ((bfd *,
-						  struct bfd_link_info *));
-boolean _bfd_elf_create_got_section PARAMS ((bfd *,
-					     struct bfd_link_info *));
-
-elf_linker_section_t *_bfd_elf_create_linker_section
-  PARAMS ((bfd *abfd,
-	   struct bfd_link_info *info,
-	   enum elf_linker_section_enum,
-	   elf_linker_section_t *defaults));
-
-elf_linker_section_pointers_t *_bfd_elf_find_pointer_linker_section
-  PARAMS ((elf_linker_section_pointers_t *linker_pointers,
-	   bfd_signed_vma addend,
-	   elf_linker_section_enum_t which));
-
-boolean bfd_elf32_create_pointer_linker_section
-  PARAMS ((bfd *abfd,
-	   struct bfd_link_info *info,
-	   elf_linker_section_t *lsect,
-	   struct elf_link_hash_entry *h,
-	   const Elf32_Internal_Rela *rel));
-
-bfd_vma bfd_elf32_finish_pointer_linker_section
-  PARAMS ((bfd *output_abfd,
-	   bfd *input_bfd,
-	   struct bfd_link_info *info,
-	   elf_linker_section_t *lsect,
-	   struct elf_link_hash_entry *h,
-	   bfd_vma relocation,
-	   const Elf32_Internal_Rela *rel,
-	   int relative_reloc));
-
-boolean bfd_elf64_create_pointer_linker_section
-  PARAMS ((bfd *abfd,
-	   struct bfd_link_info *info,
-	   elf_linker_section_t *lsect,
-	   struct elf_link_hash_entry *h,
-	   const Elf64_Internal_Rela *rel));
-
-bfd_vma bfd_elf64_finish_pointer_linker_section
-  PARAMS ((bfd *output_abfd,
-	   bfd *input_bfd,
-	   struct bfd_link_info *info,
-	   elf_linker_section_t *lsect,
-	   struct elf_link_hash_entry *h,
-	   bfd_vma relocation,
-	   const Elf64_Internal_Rela *rel,
-	   int relative_reloc));
-
-boolean _bfd_elf_make_linker_section_rela
-  PARAMS ((bfd *dynobj,
-	   elf_linker_section_t *lsect,
-	   int alignment));
-
-boolean _bfd_elfcore_section_from_phdr
-  PARAMS ((bfd *, Elf_Internal_Phdr *, int));
-
-extern const bfd_target *bfd_elf32_object_p PARAMS ((bfd *));
-extern const bfd_target *bfd_elf32_core_file_p PARAMS ((bfd *));
-extern char *bfd_elf32_core_file_failing_command PARAMS ((bfd *));
-extern int bfd_elf32_core_file_failing_signal PARAMS ((bfd *));
-extern boolean bfd_elf32_core_file_matches_executable_p PARAMS ((bfd *,
-								 bfd *));
-
-extern boolean bfd_elf32_bfd_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf32_bfd_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-extern void bfd_elf32_swap_symbol_in
-  PARAMS ((bfd *, const Elf32_External_Sym *, Elf_Internal_Sym *));
-extern void bfd_elf32_swap_symbol_out
-  PARAMS ((bfd *, const Elf_Internal_Sym *, PTR));
-extern void bfd_elf32_swap_reloc_in
-  PARAMS ((bfd *, const Elf32_External_Rel *, Elf_Internal_Rel *));
-extern void bfd_elf32_swap_reloc_out
-  PARAMS ((bfd *, const Elf_Internal_Rel *, Elf32_External_Rel *));
-extern void bfd_elf32_swap_reloca_in
-  PARAMS ((bfd *, const Elf32_External_Rela *, Elf_Internal_Rela *));
-extern void bfd_elf32_swap_reloca_out
-  PARAMS ((bfd *, const Elf_Internal_Rela *, Elf32_External_Rela *));
-extern void bfd_elf32_swap_phdr_in
-  PARAMS ((bfd *, const Elf32_External_Phdr *, Elf_Internal_Phdr *));
-extern void bfd_elf32_swap_phdr_out
-  PARAMS ((bfd *, const Elf_Internal_Phdr *, Elf32_External_Phdr *));
-extern void bfd_elf32_swap_dyn_in
-  PARAMS ((bfd *, const PTR, Elf_Internal_Dyn *));
-extern void bfd_elf32_swap_dyn_out
-  PARAMS ((bfd *, const Elf_Internal_Dyn *, Elf32_External_Dyn *));
-extern long bfd_elf32_slurp_symbol_table
-  PARAMS ((bfd *, asymbol **, boolean));
-extern boolean bfd_elf32_write_shdrs_and_ehdr PARAMS ((bfd *));
-extern int bfd_elf32_write_out_phdrs
-  PARAMS ((bfd *, const Elf_Internal_Phdr *, int));
-extern boolean bfd_elf32_add_dynamic_entry
-  PARAMS ((struct bfd_link_info *, bfd_vma, bfd_vma));
-extern boolean bfd_elf32_link_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern Elf_Internal_Rela *_bfd_elf32_link_read_relocs
-  PARAMS ((bfd *, asection *, PTR, Elf_Internal_Rela *, boolean));
-
-extern const bfd_target *bfd_elf64_object_p PARAMS ((bfd *));
-extern const bfd_target *bfd_elf64_core_file_p PARAMS ((bfd *));
-extern char *bfd_elf64_core_file_failing_command PARAMS ((bfd *));
-extern int bfd_elf64_core_file_failing_signal PARAMS ((bfd *));
-extern boolean bfd_elf64_core_file_matches_executable_p PARAMS ((bfd *,
-								 bfd *));
-extern boolean bfd_elf64_bfd_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean bfd_elf64_bfd_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-extern void bfd_elf64_swap_symbol_in
-  PARAMS ((bfd *, const Elf64_External_Sym *, Elf_Internal_Sym *));
-extern void bfd_elf64_swap_symbol_out
-  PARAMS ((bfd *, const Elf_Internal_Sym *, PTR));
-extern void bfd_elf64_swap_reloc_in
-  PARAMS ((bfd *, const Elf64_External_Rel *, Elf_Internal_Rel *));
-extern void bfd_elf64_swap_reloc_out
-  PARAMS ((bfd *, const Elf_Internal_Rel *, Elf64_External_Rel *));
-extern void bfd_elf64_swap_reloca_in
-  PARAMS ((bfd *, const Elf64_External_Rela *, Elf_Internal_Rela *));
-extern void bfd_elf64_swap_reloca_out
-  PARAMS ((bfd *, const Elf_Internal_Rela *, Elf64_External_Rela *));
-extern void bfd_elf64_swap_phdr_in
-  PARAMS ((bfd *, const Elf64_External_Phdr *, Elf_Internal_Phdr *));
-extern void bfd_elf64_swap_phdr_out
-  PARAMS ((bfd *, const Elf_Internal_Phdr *, Elf64_External_Phdr *));
-extern void bfd_elf64_swap_dyn_in
-  PARAMS ((bfd *, const PTR, Elf_Internal_Dyn *));
-extern void bfd_elf64_swap_dyn_out
-  PARAMS ((bfd *, const Elf_Internal_Dyn *, Elf64_External_Dyn *));
-extern long bfd_elf64_slurp_symbol_table
-  PARAMS ((bfd *, asymbol **, boolean));
-extern boolean bfd_elf64_write_shdrs_and_ehdr PARAMS ((bfd *));
-extern int bfd_elf64_write_out_phdrs
-  PARAMS ((bfd *, const Elf_Internal_Phdr *, int));
-extern boolean bfd_elf64_add_dynamic_entry
-  PARAMS ((struct bfd_link_info *, bfd_vma, bfd_vma));
-extern boolean bfd_elf64_link_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern Elf_Internal_Rela *_bfd_elf64_link_read_relocs
-  PARAMS ((bfd *, asection *, PTR, Elf_Internal_Rela *, boolean));
-
-#define bfd_elf32_link_record_dynamic_symbol _bfd_elf_link_record_dynamic_symbol
-#define bfd_elf64_link_record_dynamic_symbol _bfd_elf_link_record_dynamic_symbol
-
-extern boolean _bfd_elf_close_and_cleanup PARAMS ((bfd *));
-extern bfd_reloc_status_type _bfd_elf_rel_vtable_reloc_fn
-  PARAMS ((bfd *, arelent *, struct symbol_cache_entry *, PTR,
-           asection *, bfd *, char **));
-
-boolean _bfd_elf32_gc_sections
-  PARAMS ((bfd *abfd, struct bfd_link_info *info));
-boolean _bfd_elf32_gc_common_finalize_got_offsets
-  PARAMS ((bfd *abfd, struct bfd_link_info *info));
-boolean _bfd_elf32_gc_common_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-boolean _bfd_elf32_gc_record_vtinherit
-  PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
-boolean _bfd_elf32_gc_record_vtentry
-  PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
-
-boolean _bfd_elf64_gc_sections
-  PARAMS ((bfd *abfd, struct bfd_link_info *info));
-boolean _bfd_elf64_gc_common_finalize_got_offsets
-  PARAMS ((bfd *abfd, struct bfd_link_info *info));
-boolean _bfd_elf64_gc_common_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-boolean _bfd_elf64_gc_record_vtinherit
-  PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
-boolean _bfd_elf64_gc_record_vtentry
-  PARAMS ((bfd *, asection *, struct elf_link_hash_entry *, bfd_vma));
-
-/* MIPS ELF specific routines.  */
-
-extern boolean _bfd_mips_elf_object_p PARAMS ((bfd *));
-extern boolean _bfd_mips_elf_section_from_shdr
-  PARAMS ((bfd *, Elf_Internal_Shdr *, const char *));
-extern boolean _bfd_mips_elf_fake_sections
-  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *));
-extern boolean _bfd_mips_elf_section_from_bfd_section
-  PARAMS ((bfd *, Elf_Internal_Shdr *, asection *, int *));
-extern boolean _bfd_mips_elf_section_processing
-  PARAMS ((bfd *, Elf_Internal_Shdr *));
-extern void _bfd_mips_elf_symbol_processing PARAMS ((bfd *, asymbol *));
-extern boolean _bfd_mips_elf_read_ecoff_info
-  PARAMS ((bfd *, asection *, struct ecoff_debug_info *));
-extern void _bfd_mips_elf_final_write_processing PARAMS ((bfd *, boolean));
-extern bfd_reloc_status_type _bfd_mips_elf_hi16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-extern bfd_reloc_status_type _bfd_mips_elf_lo16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-extern bfd_reloc_status_type _bfd_mips_elf_gprel16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-extern bfd_reloc_status_type _bfd_mips_elf_got16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-extern bfd_reloc_status_type _bfd_mips_elf_gprel32_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-extern boolean _bfd_mips_elf_set_private_flags PARAMS ((bfd *, flagword));
-extern boolean _bfd_mips_elf_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-extern boolean _bfd_mips_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-extern boolean _bfd_mips_elf_find_nearest_line
-  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
-	   const char **, unsigned int *));
-extern boolean _bfd_mips_elf_set_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-
-#endif /* _LIBELF_H_ */
diff --git a/bfd/elf-m10200.c b/bfd/elf-m10200.c
deleted file mode 100644
index 53d193d8704..00000000000
--- a/bfd/elf-m10200.c
+++ /dev/null
@@ -1,1525 +0,0 @@
-/* Matsushita 10200 specific support for 32-bit ELF
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void mn10200_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static boolean mn10200_elf_relax_delete_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean mn10200_elf_symbol_address_p
-  PARAMS ((bfd *, asection *, Elf32_External_Sym *, bfd_vma));
-
-/* We have to use RELA instructions since md_apply_fix3 in the assembler
-   does absolutely nothing.  */
-#define USE_RELA
-
-enum reloc_type
-{
-  R_MN10200_NONE = 0,
-  R_MN10200_32,
-  R_MN10200_16,
-  R_MN10200_8,
-  R_MN10200_24,
-  R_MN10200_PCREL8,
-  R_MN10200_PCREL16,
-  R_MN10200_PCREL24,
-  R_MN10200_MAX
-};
-
-static reloc_howto_type elf_mn10200_howto_table[] =
-{
-  /* Dummy relocation.  Does nothing.  */
-  HOWTO (R_MN10200_NONE,
-	 0,
-	 2,
-	 16,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_NONE",
-	 false,
-	 0,
-	 0,
-	 false),
-  /* Standard 32 bit reloc.  */
-  HOWTO (R_MN10200_32,
-	 0,
-	 2,
-	 32,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_32",
-	 false,
-	 0xffffffff,
-	 0xffffffff,
-	 false),
-  /* Standard 16 bit reloc.  */
-  HOWTO (R_MN10200_16,
-	 0,
-	 1,
-	 16,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_16",
-	 false,
-	 0xffff,
-	 0xffff,
-	 false),
-  /* Standard 8 bit reloc.  */
-  HOWTO (R_MN10200_8,
-	 0,
-	 0,
-	 8,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_8",
-	 false,
-	 0xff,
-	 0xff,
-	 false),
-  /* Standard 24 bit reloc.  */
-  HOWTO (R_MN10200_24,
-	 0,
-	 2,
-	 24,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_24",
-	 false,
-	 0xffffff,
-	 0xffffff,
-	 false),
-  /* Simple 8 pc-relative reloc.  */
-  HOWTO (R_MN10200_PCREL8,
-	 0,
-	 0,
-	 8,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_PCREL8",
-	 false,
-	 0xff,
-	 0xff,
-	 true),
-  /* Simple 16 pc-relative reloc.  */
-  HOWTO (R_MN10200_PCREL16,
-	 0,
-	 1,
-	 16,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_PCREL16",
-	 false,
-	 0xffff,
-	 0xffff,
-	 true),
-  /* Simple 32bit pc-relative reloc with a 1 byte adjustment
-     to get the pc-relative offset correct.  */
-  HOWTO (R_MN10200_PCREL24,
-	 0,
-	 2,
-	 24,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10200_PCREL24",
-	 false,
-	 0xffffff,
-	 0xffffff,
-	 true),
-};
-
-struct mn10200_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static const struct mn10200_reloc_map mn10200_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_MN10200_NONE, },
-  { BFD_RELOC_32, R_MN10200_32, },
-  { BFD_RELOC_16, R_MN10200_16, },
-  { BFD_RELOC_8, R_MN10200_8, },
-  { BFD_RELOC_24, R_MN10200_24, },
-  { BFD_RELOC_8_PCREL, R_MN10200_PCREL8, },
-  { BFD_RELOC_16_PCREL, R_MN10200_PCREL16, },
-  { BFD_RELOC_24_PCREL, R_MN10200_PCREL24, },
-};
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (mn10200_reloc_map) / sizeof (struct mn10200_reloc_map);
-       i++)
-    {
-      if (mn10200_reloc_map[i].bfd_reloc_val == code)
-	return &elf_mn10200_howto_table[mn10200_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Set the howto pointer for an MN10200 ELF reloc.  */
-
-static void
-mn10200_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_MN10200_MAX);
-  cache_ptr->howto = &elf_mn10200_howto_table[r_type];
-}
-
-/* Perform a relocation as part of a final link.  */
-static bfd_reloc_status_type
-mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
-				 input_section, contents, offset, value,
-				 addend, info, sym_sec, is_local)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd *output_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma offset;
-     bfd_vma value;
-     bfd_vma addend;
-     struct bfd_link_info *info;
-     asection *sym_sec;
-     int is_local;
-{
-  unsigned long r_type = howto->type;
-  bfd_byte *hit_data = contents + offset;
-
-  switch (r_type)
-    {
-
-    case R_MN10200_NONE:
-      return bfd_reloc_ok;
-
-    case R_MN10200_32:
-      value += addend;
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10200_16:
-      value += addend;
-
-      if ((long)value > 0x7fff || (long)value < -0x8000)
-	return bfd_reloc_overflow;
-
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10200_8:
-      value += addend;
-
-      if ((long)value > 0x7f || (long)value < -0x80)
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10200_24:
-      value += addend;
-
-      if ((long)value > 0x7fffff || (long)value < -0x800000)
-	return bfd_reloc_overflow;
-
-      value &= 0xffffff;
-      value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10200_PCREL8:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= (offset + 1);
-      value += addend;
-
-      if ((long)value > 0xff || (long)value < -0x100)
-        return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10200_PCREL16:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= (offset + 2);
-      value += addend;
-
-      if ((long)value > 0xffff || (long)value < -0x10000)
-        return bfd_reloc_overflow;
-
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10200_PCREL24:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= (offset + 3);
-      value += addend;
-
-      if ((long)value > 0xffffff || (long)value < -0x1000000)
-        return bfd_reloc_overflow;
-
-      value &= 0xffffff;
-      value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    default:
-      return bfd_reloc_notsupported;
-    }
-}
-
-
-/* Relocate an MN10200 ELF section.  */
-static boolean
-mn10200_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			      contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  Elf_Internal_Rela *rel, *relend;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      struct elf_link_hash_entry *h;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      r_type = ELF32_R_TYPE (rel->r_info);
-      howto = elf_mn10200_howto_table + r_type;
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-             anything, unless the reloc is against a section symbol,
-             in which case we have to adjust according to where the
-             section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      r = mn10200_elf_final_link_relocate (howto, input_bfd, output_bfd,
-					   input_section,
-					   contents, rel->r_offset,
-					   relocation, rel->r_addend,
-					   info, sec, h == NULL);
-
-      if (r != bfd_reloc_ok)
-	{
-	  const char *name;
-	  const char *msg = (const char *)0;
-
-	  if (h != NULL)
-	    name = h->root.root.string;
-	  else
-	    {
-	      name = (bfd_elf_string_from_elf_section
-		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
-	      if (name == NULL || *name == '\0')
-		name = bfd_section_name (input_bfd, sec);
-	    }
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      if (! ((*info->callbacks->reloc_overflow)
-		     (info, name, howto->name, (bfd_vma) 0,
-		      input_bfd, input_section, rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_undefined:
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, name, input_bfd, input_section,
-		      rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_outofrange:
-	      msg = _("internal error: out of range error");
-	      goto common_error;
-
-	    case bfd_reloc_notsupported:
-	      msg = _("internal error: unsupported relocation error");
-	      goto common_error;
-
-	    case bfd_reloc_dangerous:
-	      msg = _("internal error: dangerous error");
-	      goto common_error;
-
-	    default:
-	      msg = _("internal error: unknown error");
-	      /* fall through */
-
-	    common_error:
-	      if (!((*info->callbacks->warning)
-		    (info, msg, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* This function handles relaxing for the mn10200.
-
-   There's quite a few relaxing opportunites available on the mn10200:
-
-	* jsr:24 -> jsr:16 					   2 bytes
-
-	* jmp:24 -> jmp:16					   2 bytes
-	* jmp:16 -> bra:8					   1 byte
-
-		* If the previous instruction is a conditional branch
-		around the jump/bra, we may be able to reverse its condition
-		and change its target to the jump's target.  The jump/bra
-		can then be deleted.				   2 bytes
-
-	* mov abs24 -> mov abs16	2 byte savings
-
-	* Most instructions which accept imm24 can relax to imm16  2 bytes
-	- Most instructions which accept imm16 can relax to imm8   1 byte
-
-	* Most instructions which accept d24 can relax to d16	   2 bytes
-	- Most instructions which accept d16 can relax to d8	   1 byte
-
-	abs24, imm24, d24 all look the same at the reloc level.  It
-	might make the code simpler if we had different relocs for
-	the various relaxable operand types.
-   
-	We don't handle imm16->imm8 or d16->d8 as they're very rare
-	and somewhat more difficult to support.  */
-
-static boolean 
-mn10200_elf_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *internal_relocs;
-  Elf_Internal_Rela *free_relocs = NULL;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *contents = NULL;
-  bfd_byte *free_contents = NULL;
-  Elf32_External_Sym *extsyms = NULL;
-  Elf32_External_Sym *free_extsyms = NULL;
-
-  /* Assume nothing changes.  */
-  *again = false;
-
-  /* We don't have to do anything for a relocateable link, if
-     this section does not have relocs, or if this is not a
-     code section.  */
-  if (link_info->relocateable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0
-      || (sec->flags & SEC_CODE) == 0)
-    return true;
-
-  /* If this is the first time we have been called for this section,
-     initialize the cooked size.  */
-  if (sec->_cooked_size == 0)
-    sec->_cooked_size = sec->_raw_size;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-
-  /* Get a copy of the native relocations.  */
-  internal_relocs = (_bfd_elf32_link_read_relocs
-		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-		      link_info->keep_memory));
-  if (internal_relocs == NULL)
-    goto error_return;
-  if (! link_info->keep_memory)
-    free_relocs = internal_relocs;
-
-  /* Walk through them looking for relaxing opportunities.  */
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma symval;
-
-      /* If this isn't something that can be relaxed, then ignore
-	 this reloc.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_NONE
-	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_8
-	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_MAX)
-	continue;
-
-      /* Get the section contents if we haven't done so already.  */
-      if (contents == NULL)
-	{
-	  /* Get cached copy if it exists.  */
-	  if (elf_section_data (sec)->this_hdr.contents != NULL)
-	    contents = elf_section_data (sec)->this_hdr.contents;
-	  else
-	    {
-	      /* Go get them off disk.  */
-	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (contents == NULL)
-		goto error_return;
-	      free_contents = contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      /* Read this BFD's symbols if we haven't done so already.  */
-      if (extsyms == NULL)
-	{
-	  /* Get cached copy if it exists.  */
-	  if (symtab_hdr->contents != NULL)
-	    extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-	  else
-	    {
-	      /* Go get them off disk.  */
-	      extsyms = ((Elf32_External_Sym *)
-			 bfd_malloc (symtab_hdr->sh_size));
-	      if (extsyms == NULL)
-		goto error_return;
-	      free_extsyms = extsyms;
-	      if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-		  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
-		      != symtab_hdr->sh_size))
-		goto error_return;
-	    }
-	}
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-	{
-	  Elf_Internal_Sym isym;
-	  asection *sym_sec;
-
-	  /* A local symbol.  */
-	  bfd_elf32_swap_symbol_in (abfd,
-				    extsyms + ELF32_R_SYM (irel->r_info),
-				    &isym);
-
-	  sym_sec = bfd_section_from_elf_index (abfd, isym.st_shndx);
-	  symval = (isym.st_value
-		    + sym_sec->output_section->vma
-		    + sym_sec->output_offset);
-	}
-      else
-	{
-	  unsigned long indx;
-	  struct elf_link_hash_entry *h;
-
-	  /* An external symbol.  */
-	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
-	  h = elf_sym_hashes (abfd)[indx];
-	  BFD_ASSERT (h != NULL);
-	  if (h->root.type != bfd_link_hash_defined
-	      && h->root.type != bfd_link_hash_defweak)
-	    {
-	      /* This appears to be a reference to an undefined
-                 symbol.  Just ignore it--it will be caught by the
-                 regular reloc processing.  */
-	      continue;
-	    }
-
-	  symval = (h->root.u.def.value
-		    + h->root.u.def.section->output_section->vma
-		    + h->root.u.def.section->output_offset);
-	}
-
-      /* For simplicity of coding, we are going to modify the section
-	 contents, the section relocs, and the BFD symbol table.  We
-	 must tell the rest of the code not to free up this
-	 information.  It would be possible to instead create a table
-	 of changes which have to be made, as is done in coff-mips.c;
-	 that would be more work, but would require less memory when
-	 the linker is run.  */
-
-
-      /* Try to turn a 24bit pc-relative branch/call into a 16bit pc-relative
-	 branch/call.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_PCREL24)
-	{
-	  bfd_vma value = symval;
-
-	  /* Deal with pc-relative gunk.  */
-	  value -= (sec->output_section->vma + sec->output_offset);
-	  value -= (irel->r_offset + 3);
-	  value += irel->r_addend;
-
-	  /* See if the value will fit in 16 bits, note the high value is
-	     0x7fff + 2 as the target will be two bytes closer if we are
-	     able to relax.  */
-	  if ((long)value < 0x8001 && (long)value > -0x8000)
-	    {
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      if (code != 0xe0 && code != 0xe1)
-		continue;
-
-	      /* Note that we've changed the relocs, section contents, etc.  */
-	      elf_section_data (sec)->relocs = internal_relocs;
-	      free_relocs = NULL;
-
-	      elf_section_data (sec)->this_hdr.contents = contents;
-	      free_contents = NULL;
-
-	      symtab_hdr->contents = (bfd_byte *) extsyms;
-	      free_extsyms = NULL;
-
-	      /* Fix the opcode.  */
-	      if (code == 0xe0)
-		bfd_put_8 (abfd, 0xfc, contents + irel->r_offset - 2);
-	      else if (code == 0xe1)
-		bfd_put_8 (abfd, 0xfd, contents + irel->r_offset - 2);
-
-	      /* Fix the relocation's type.  */
-	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					   R_MN10200_PCREL16);
-
-	      /* The opcode got shorter too, so we have to fix the offset.  */
-	      irel->r_offset -= 1;
-
-	      /* Delete two bytes of data.  */
-	      if (!mn10200_elf_relax_delete_bytes (abfd, sec,
-						   irel->r_offset + 1, 2))
-		goto error_return;
-
-	      /* That will change things, so, we should relax again.
-		 Note that this is not required, and it may be slow.  */
-	      *again = true;
-	    }
-	}
-
-      /* Try to turn a 16bit pc-relative branch into a 8bit pc-relative
-	 branch.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_PCREL16)
-	{
-	  bfd_vma value = symval;
-
-	  /* Deal with pc-relative gunk.  */
-	  value -= (sec->output_section->vma + sec->output_offset);
-	  value -= (irel->r_offset + 2);
-	  value += irel->r_addend;
-
-	  /* See if the value will fit in 8 bits, note the high value is
-	     0x7f + 1 as the target will be one bytes closer if we are
-	     able to relax.  */
-	  if ((long)value < 0x80 && (long)value > -0x80)
-	    {
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      if (code != 0xfc)
-		continue;
-
-	      /* Note that we've changed the relocs, section contents, etc.  */
-	      elf_section_data (sec)->relocs = internal_relocs;
-	      free_relocs = NULL;
-
-	      elf_section_data (sec)->this_hdr.contents = contents;
-	      free_contents = NULL;
-
-	      symtab_hdr->contents = (bfd_byte *) extsyms;
-	      free_extsyms = NULL;
-
-	      /* Fix the opcode.  */
-	      bfd_put_8 (abfd, 0xea, contents + irel->r_offset - 1);
-
-	      /* Fix the relocation's type.  */
-	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					   R_MN10200_PCREL8);
-
-	      /* Delete one byte of data.  */
-	      if (!mn10200_elf_relax_delete_bytes (abfd, sec,
-						   irel->r_offset + 1, 1))
-		goto error_return;
-
-	      /* That will change things, so, we should relax again.
-		 Note that this is not required, and it may be slow.  */
-	      *again = true;
-	    }
-	}
-
-      /* Try to eliminate an unconditional 8 bit pc-relative branch
-	 which immediately follows a conditional 8 bit pc-relative
-	 branch around the unconditional branch.
-
-	    original:		new:
-	    bCC lab1		bCC' lab2
-	    bra lab2
-	   lab1:	       lab1:
-
-
-	 This happens when the bCC can't reach lab2 at assembly time,
-	 but due to other relaxations it can reach at link time.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_PCREL8)
-	{
-	  Elf_Internal_Rela *nrel;
-	  bfd_vma value = symval;
-	  unsigned char code;
-
-	  /* Deal with pc-relative gunk.  */
-	  value -= (sec->output_section->vma + sec->output_offset);
-	  value -= (irel->r_offset + 1);
-	  value += irel->r_addend;
-
-	  /* Do nothing if this reloc is the last byte in the section.  */
-	  if (irel->r_offset == sec->_cooked_size)
-	    continue;
-
-	  /* See if the next instruction is an unconditional pc-relative
-	     branch, more often than not this test will fail, so we
-	     test it first to speed things up.  */
-	  code = bfd_get_8 (abfd, contents + irel->r_offset + 1);
-	  if (code != 0xea)
-	    continue;
-
-	  /* Also make sure the next relocation applies to the next
-	     instruction and that it's a pc-relative 8 bit branch.  */
-	  nrel = irel + 1;
-	  if (nrel == irelend
-	      || irel->r_offset + 2 != nrel->r_offset
-	      || ELF32_R_TYPE (nrel->r_info) != (int) R_MN10200_PCREL8)
-	    continue;
-
-	  /* Make sure our destination immediately follows the
-	     unconditional branch.  */
-	  if (symval != (sec->output_section->vma + sec->output_offset
-			 + irel->r_offset + 3))
-	    continue;
-
-	  /* Now make sure we are a conditional branch.  This may not
-	     be necessary, but why take the chance. 
-
-	     Note these checks assume that R_MN10200_PCREL8 relocs
-	     only occur on bCC and bCCx insns.  If they occured
-	     elsewhere, we'd need to know the start of this insn
-	     for this check to be accurate.  */
-	  code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-	  if (code != 0xe0 && code != 0xe1 && code != 0xe2
-	      && code != 0xe3 && code != 0xe4 && code != 0xe5
-	      && code != 0xe6 && code != 0xe7 && code != 0xe8
-	      && code != 0xe9 && code != 0xec && code != 0xed
-	      && code != 0xee && code != 0xef && code != 0xfc
-	      && code != 0xfd && code != 0xfe && code != 0xff)
-	    continue;
-
-	  /* We also have to be sure there is no symbol/label
-	     at the unconditional branch.  */
-	  if (mn10200_elf_symbol_address_p (abfd, sec, extsyms,
-					    irel->r_offset + 1))
-	    continue;
-
-	  /* Note that we've changed the relocs, section contents, etc.  */
-	  elf_section_data (sec)->relocs = internal_relocs;
-	  free_relocs = NULL;
-
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	  free_contents = NULL;
-
-	  symtab_hdr->contents = (bfd_byte *) extsyms;
-	  free_extsyms = NULL;
-
-	  /* Reverse the condition of the first branch.  */
-	  switch (code)
-	    {
-	      case 0xfc:
-		code = 0xfd;
-		break;
-	      case 0xfd:
-		code = 0xfc;
-		break;
-	      case 0xfe:
-		code = 0xff;
-		break;
-	      case 0xff:
-		code = 0xfe;
-		break;
-	      case 0xe8:
-		code = 0xe9;
-		break;
-	      case 0xe9:
-		code = 0xe8;
-		break;
-	      case 0xe0:
-		code = 0xe2;
-		break;
-	      case 0xe2:
-		code = 0xe0;
-		break;
-	      case 0xe3:
-		code = 0xe1;
-		break;
-	      case 0xe1:
-		code = 0xe3;
-		break;
-	      case 0xe4:
-		code = 0xe6;
-		break;
-	      case 0xe6:
-		code = 0xe4;
-		break;
-	      case 0xe7:
-		code = 0xe5;
-		break;
-	      case 0xe5:
-		code = 0xe7;
-		break;
-	      case 0xec:
-		code = 0xed;
-		break;
-	      case 0xed:
-		code = 0xec;
-		break;
-	      case 0xee:
-		code = 0xef;
-		break;
-	      case 0xef:
-		code = 0xee;
-		break;
-	    }
-	  bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
-	  
-	  /* Set the reloc type and symbol for the first branch
-	     from the second branch.  */
-	  irel->r_info = nrel->r_info;
-
-	  /* Make the reloc for the second branch a null reloc.  */
-	  nrel->r_info = ELF32_R_INFO (ELF32_R_SYM (nrel->r_info),
-				       R_MN10200_NONE);
-
-	  /* Delete two bytes of data.  */
-	  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
-					       irel->r_offset + 1, 2))
-	    goto error_return;
-
-	  /* That will change things, so, we should relax again.
-	     Note that this is not required, and it may be slow.  */
-	  *again = true;
-	}
-
-      /* Try to turn a 24bit immediate, displacement or absolute address
-	 into a 16bit immediate, displacement or absolute address.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10200_24)
-	{
-	  bfd_vma value = symval;
-
-	  /* See if the value will fit in 16 bits. 
-	     We allow any 16bit match here.  We prune those we can't
-	     handle below.  */
-	  if ((long)value < 0x7fff && (long)value > -0x8000)
-	    {
-	      unsigned char code;
-
-	      /* All insns which have 24bit operands are 5 bytes long,
-		 the first byte will always be 0xf4, but we double check
-		 it just in case.  */
-
-	      /* Get the first opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
-
-	      if (code != 0xf4)
-		continue;
-
-	      /* Get the second opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      switch (code & 0xfc)
-		{
-		/* mov imm24,dn -> mov imm16,dn */
-		case 0x70:
-		  /* Not safe if the high bit is on as relaxing may
-		     move the value out of high mem and thus not fit
-		     in a signed 16bit value.  */
-		  if (value & 0x8000)
-		    continue;
-
-		  /* Note that we've changed the reldection contents, etc.  */
-		  elf_section_data (sec)->relocs = internal_relocs;
-		  free_relocs = NULL;
-
-		  elf_section_data (sec)->this_hdr.contents = contents;
-		  free_contents = NULL;
-
-		  symtab_hdr->contents = (bfd_byte *) extsyms;
-		  free_extsyms = NULL;
-
-		  /* Fix the opcode.  */
-		  bfd_put_8 (abfd, 0xf8 + (code & 0x03),
-			     contents + irel->r_offset - 2);
-
-		  /* Fix the relocation's type.  */
-		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					       R_MN10200_16);
-
-		  /* The opcode got shorter too, so we have to fix the
-		     offset.  */
-		  irel->r_offset -= 1;
-
-		  /* Delete two bytes of data.  */
-		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
-						       irel->r_offset + 1, 2))
-		    goto error_return;
-
-		  /* That will change things, so, we should relax again.
-		     Note that this is not required, and it may be slow.  */
-		  *again = true;
-		  break;
-
-		/* mov imm24,an -> mov imm16,an 
-		   cmp imm24,an -> cmp imm16,an
-		   mov (abs24),dn -> mov (abs16),dn
-		   mov dn,(abs24) -> mov dn,(abs16)
-		   movb dn,(abs24) -> movb dn,(abs16)
-		   movbu (abs24),dn -> movbu (abs16),dn */
-		case 0x74:
-		case 0x7c:
-		case 0xc0:
-		case 0x40:
-		case 0x44:
-		case 0xc8:
-		  /* Note that we've changed the reldection contents, etc.  */
-		  elf_section_data (sec)->relocs = internal_relocs;
-		  free_relocs = NULL;
-
-		  elf_section_data (sec)->this_hdr.contents = contents;
-		  free_contents = NULL;
-
-		  symtab_hdr->contents = (bfd_byte *) extsyms;
-		  free_extsyms = NULL;
-
-		  if ((code & 0xfc) == 0x74)
-		    code = 0xdc + (code & 0x03);
-		  else if ((code & 0xfc) == 0x7c)
-		    code = 0xec + (code & 0x03);
-		  else if ((code & 0xfc) == 0xc0)
-		    code = 0xc8 + (code & 0x03);
-		  else if ((code & 0xfc) == 0x40)
-		    code = 0xc0 + (code & 0x03);
-		  else if ((code & 0xfc) == 0x44)
-		    code = 0xc4 + (code & 0x03);
-		  else if ((code & 0xfc) == 0xc8)
-		    code = 0xcc + (code & 0x03);
-
-		  /* Fix the opcode.  */
-		  bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
-
-		  /* Fix the relocation's type.  */
-		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					       R_MN10200_16);
-
-		  /* The opcode got shorter too, so we have to fix the
-		     offset.  */
-		  irel->r_offset -= 1;
-
-		  /* Delete two bytes of data.  */
-		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
-						       irel->r_offset + 1, 2))
-		    goto error_return;
-
-		  /* That will change things, so, we should relax again.
-		     Note that this is not required, and it may be slow.  */
-		  *again = true;
-		  break;
-
-		/* cmp imm24,dn -> cmp imm16,dn
-		   mov (abs24),an -> mov (abs16),an
-		   mov an,(abs24) -> mov an,(abs16)
-		   add imm24,dn -> add imm16,dn
-		   add imm24,an -> add imm16,an
-		   sub imm24,dn -> sub imm16,dn
-		   sub imm24,an -> sub imm16,an 
-		   And all d24->d16 in memory ops.  */
-		case 0x78:
-		case 0xd0:
-		case 0x50:
-		case 0x60:
-		case 0x64:
-		case 0x68:
-		case 0x6c:
-		case 0x80:
-		case 0xf0:
-		case 0x00:
-		case 0x10:
-		case 0xb0:
-		case 0x30:
-		case 0xa0:
-		case 0x20:
-		case 0x90:
-		  /* Not safe if the high bit is on as relaxing may
-		     move the value out of high mem and thus not fit
-		     in a signed 16bit value.  */
-		  if (((code & 0xfc) == 0x78
-			|| (code & 0xfc) == 0x60
-			|| (code & 0xfc) == 0x64
-			|| (code & 0xfc) == 0x68
-			|| (code & 0xfc) == 0x6c
-			|| (code & 0xfc) == 0x80
-			|| (code & 0xfc) == 0xf0
-			|| (code & 0xfc) == 0x00
-			|| (code & 0xfc) == 0x10
-			|| (code & 0xfc) == 0xb0
-			|| (code & 0xfc) == 0x30
-			|| (code & 0xfc) == 0xa0
-			|| (code & 0xfc) == 0x20
-			|| (code & 0xfc) == 0x90)
-		       && (value & 0x8000) != 0)
-		    continue;
-
-		  /* Note that we've changed the reldection contents, etc.  */
-		  elf_section_data (sec)->relocs = internal_relocs;
-		  free_relocs = NULL;
-
-		  elf_section_data (sec)->this_hdr.contents = contents;
-		  free_contents = NULL;
-
-		  symtab_hdr->contents = (bfd_byte *) extsyms;
-		  free_extsyms = NULL;
-
-		  /* Fix the opcode.  */
-		  bfd_put_8 (abfd, 0xf7, contents + irel->r_offset - 2);
-
-		  if ((code & 0xfc) == 0x78)
-		    code = 0x48 + (code & 0x03);
-		  else if ((code & 0xfc) == 0xd0)
-		    code = 0x30 + (code & 0x03);
-		  else if ((code & 0xfc) == 0x50)
-		    code = 0x20 + (code & 0x03);
-		  else if ((code & 0xfc) == 0x60)
-		    code = 0x18 + (code & 0x03);
-		  else if ((code & 0xfc) == 0x64)
-		    code = 0x08 + (code & 0x03);
-		  else if ((code & 0xfc) == 0x68)
-		    code = 0x1c + (code & 0x03);
-		  else if ((code & 0xfc) == 0x6c)
-		    code = 0x0c + (code & 0x03);
-		  else if ((code & 0xfc) == 0x80)
-		    code = 0xc0 + (code & 0x07);
-		  else if ((code & 0xfc) == 0xf0)
-		    code = 0xb0 + (code & 0x07);
-		  else if ((code & 0xfc) == 0x00)
-		    code = 0x80 + (code & 0x07);
-		  else if ((code & 0xfc) == 0x10)
-		    code = 0xa0 + (code & 0x07);
-		  else if ((code & 0xfc) == 0xb0)
-		    code = 0x70 + (code & 0x07);
-		  else if ((code & 0xfc) == 0x30)
-		    code = 0x60 + (code & 0x07);
-		  else if ((code & 0xfc) == 0xa0)
-		    code = 0xd0 + (code & 0x07);
-		  else if ((code & 0xfc) == 0x20)
-		    code = 0x90 + (code & 0x07);
-		  else if ((code & 0xfc) == 0x90)
-		    code = 0x50 + (code & 0x07);
-
-		  bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
-
-		  /* Fix the relocation's type.  */
-		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					       R_MN10200_16);
-
-		  /* Delete one bytes of data.  */
-		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
-						       irel->r_offset + 2, 1))
-		    goto error_return;
-
-		  /* That will change things, so, we should relax again.
-		     Note that this is not required, and it may be slow.  */
-		  *again = true;
-		  break;
-
-		/* movb (abs24),dn ->movbu (abs16),dn extxb bn */
-		case 0xc4:
-		  /* Note that we've changed the reldection contents, etc.  */
-		  elf_section_data (sec)->relocs = internal_relocs;
-		  free_relocs = NULL;
-
-		  elf_section_data (sec)->this_hdr.contents = contents;
-		  free_contents = NULL;
-
-		  symtab_hdr->contents = (bfd_byte *) extsyms;
-		  free_extsyms = NULL;
-
-		  bfd_put_8 (abfd, 0xcc + (code & 0x03),
-			     contents + irel->r_offset - 2);
-
-		  bfd_put_8 (abfd, 0xb8 + (code & 0x03),
-			     contents + irel->r_offset - 1);
-
-		  /* Fix the relocation's type.  */
-		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					       R_MN10200_16);
-
-		  /* The reloc will be applied one byte in front of its
-		     current location.  */
-		  irel->r_offset -= 1;
-
-		  /* Delete one bytes of data.  */
-		  if (!mn10200_elf_relax_delete_bytes (abfd, sec,
-						       irel->r_offset + 2, 1))
-		    goto error_return;
-
-		  /* That will change things, so, we should relax again.
-		     Note that this is not required, and it may be slow.  */
-		  *again = true;
-		  break;
-		}
-	    }
-	}
-    }
-
-  if (free_relocs != NULL)
-    {
-      free (free_relocs);
-      free_relocs = NULL;
-    }
-
-  if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_contents);
-      else
-	{
-	  /* Cache the section contents for elf_link_input_bfd.  */
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	}
-      free_contents = NULL;
-    }
-
-  if (free_extsyms != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_extsyms);
-      else
-	{
-	  /* Cache the symbols for elf_link_input_bfd.  */
-	  symtab_hdr->contents = extsyms;
-	}
-      free_extsyms = NULL;
-    }
-
-  return true;
-
- error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-  return false;
-}
-
-/* Delete some bytes from a section while relaxing.  */
-
-static boolean
-mn10200_elf_relax_delete_bytes (abfd, sec, addr, count)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     int count;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf32_External_Sym *extsyms;
-  int shndx, index;
-  bfd_byte *contents;
-  Elf_Internal_Rela *irel, *irelend;
-  Elf_Internal_Rela *irelalign;
-  bfd_vma toaddr;
-  Elf32_External_Sym *esym, *esymend;
-  struct elf_link_hash_entry *sym_hash;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-
-  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-  contents = elf_section_data (sec)->this_hdr.contents;
-
-  /* The deletion must stop at the next ALIGN reloc for an aligment
-     power larger than the number of bytes we are deleting.  */
-
-  irelalign = NULL;
-  toaddr = sec->_cooked_size;
-
-  irel = elf_section_data (sec)->relocs;
-  irelend = irel + sec->reloc_count;
-
-  /* Actually delete the bytes.  */
-  memmove (contents + addr, contents + addr + count, toaddr - addr - count);
-  sec->_cooked_size -= count;
-
-  /* Adjust all the relocs.  */
-  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
-    {
-      /* Get the new reloc address.  */
-      if ((irel->r_offset > addr
-	   && irel->r_offset < toaddr))
-	irel->r_offset -= count;
-    }
-
-  /* Adjust the local symbols defined in this section.  */
-  esym = extsyms;
-  esymend = esym + symtab_hdr->sh_info;
-  for (; esym < esymend; esym++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-
-      if (isym.st_shndx == shndx
-	  && isym.st_value > addr
-	  && isym.st_value < toaddr)
-	{
-	  isym.st_value -= count;
-	  bfd_elf32_swap_symbol_out (abfd, &isym, esym);
-	}
-    }
-
-  /* Now adjust the global symbols defined in this section.  */
-  esym = extsyms + symtab_hdr->sh_info;
-  esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
-  for (index = 0; esym < esymend; esym++, index++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-      sym_hash = elf_sym_hashes (abfd)[index];
-      if (isym.st_shndx == shndx
-	  && ((sym_hash)->root.type == bfd_link_hash_defined
-	      || (sym_hash)->root.type == bfd_link_hash_defweak)
-	  && (sym_hash)->root.u.def.section == sec
-	  && (sym_hash)->root.u.def.value > addr
-	  && (sym_hash)->root.u.def.value < toaddr)
-	{
-	  (sym_hash)->root.u.def.value -= count;
-	}
-    }
-
-  return true;
-}
-
-/* Return true if a symbol exists at the given address, else return
-   false.  */
-static boolean
-mn10200_elf_symbol_address_p (abfd, sec, extsyms, addr)
-     bfd *abfd;
-     asection *sec;
-     Elf32_External_Sym *extsyms;
-     bfd_vma addr;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  int shndx;
-  Elf32_External_Sym *esym, *esymend;
-  struct elf_link_hash_entry **sym_hash, **sym_hash_end;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-  /* Examine all the symbols.  */
-  esym = extsyms;
-  esymend = esym + symtab_hdr->sh_info;
-  for (; esym < esymend; esym++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-
-      if (isym.st_shndx == shndx
-	  && isym.st_value == addr)
-	return true;
-    }
-
-  sym_hash = elf_sym_hashes (abfd);
-  sym_hash_end = (sym_hash
-		  + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
-		     - symtab_hdr->sh_info));
-  for (; sym_hash < sym_hash_end; sym_hash++)
-    {
-      if (((*sym_hash)->root.type == bfd_link_hash_defined
-	   || (*sym_hash)->root.type == bfd_link_hash_defweak)
-	  && (*sym_hash)->root.u.def.section == sec
-	  && (*sym_hash)->root.u.def.value == addr)
-	return true;
-    }
-  return false;
-}
-
-/* This is a version of bfd_generic_get_relocated_section_contents
-   which uses mn10200_elf_relocate_section.  */
-
-static bfd_byte *
-mn10200_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
-					    data, relocateable, symbols)
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  asection *input_section = link_order->u.indirect.section;
-  bfd *input_bfd = input_section->owner;
-  asection **sections = NULL;
-  Elf_Internal_Rela *internal_relocs = NULL;
-  Elf32_External_Sym *external_syms = NULL;
-  Elf_Internal_Sym *internal_syms = NULL;
-
-  /* We only need to handle the case of relaxing, or of having a
-     particular set of section contents, specially.  */
-  if (relocateable
-      || elf_section_data (input_section)->this_hdr.contents == NULL)
-    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
-						       link_order, data,
-						       relocateable,
-						       symbols);
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
-	  input_section->_raw_size);
-
-  if ((input_section->flags & SEC_RELOC) != 0
-      && input_section->reloc_count > 0)
-    {
-      Elf_Internal_Sym *isymp;
-      asection **secpp;
-      Elf32_External_Sym *esym, *esymend;
-
-      if (symtab_hdr->contents != NULL)
-	external_syms = (Elf32_External_Sym *) symtab_hdr->contents;
-      else
-	{
-	  external_syms = ((Elf32_External_Sym *)
-			   bfd_malloc (symtab_hdr->sh_info
-				       * sizeof (Elf32_External_Sym)));
-	  if (external_syms == NULL && symtab_hdr->sh_info > 0)
-	    goto error_return;
-	  if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-	      || (bfd_read (external_syms, sizeof (Elf32_External_Sym),
-			    symtab_hdr->sh_info, input_bfd)
-		  != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym))))
-	    goto error_return;
-	}
-
-      internal_relocs = (_bfd_elf32_link_read_relocs
-			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
-      if (internal_relocs == NULL)
-	goto error_return;
-
-      internal_syms = ((Elf_Internal_Sym *)
-		       bfd_malloc (symtab_hdr->sh_info
-				   * sizeof (Elf_Internal_Sym)));
-      if (internal_syms == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      sections = (asection **) bfd_malloc (symtab_hdr->sh_info
-					   * sizeof (asection *));
-      if (sections == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      isymp = internal_syms;
-      secpp = sections;
-      esym = external_syms;
-      esymend = esym + symtab_hdr->sh_info;
-      for (; esym < esymend; ++esym, ++isymp, ++secpp)
-	{
-	  asection *isec;
-
-	  bfd_elf32_swap_symbol_in (input_bfd, esym, isymp);
-
-	  if (isymp->st_shndx == SHN_UNDEF)
-	    isec = bfd_und_section_ptr;
-	  else if (isymp->st_shndx > 0 && isymp->st_shndx < SHN_LORESERVE)
-	    isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
-	  else if (isymp->st_shndx == SHN_ABS)
-	    isec = bfd_abs_section_ptr;
-	  else if (isymp->st_shndx == SHN_COMMON)
-	    isec = bfd_com_section_ptr;
-	  else
-	    {
-	      /* Who knows?  */
-	      isec = NULL;
-	    }
-
-	  *secpp = isec;
-	}
-
-      if (! mn10200_elf_relocate_section (output_bfd, link_info, input_bfd,
-				     input_section, data, internal_relocs,
-				     internal_syms, sections))
-	goto error_return;
-
-      if (sections != NULL)
-	free (sections);
-      sections = NULL;
-      if (internal_syms != NULL)
-	free (internal_syms);
-      internal_syms = NULL;
-      if (external_syms != NULL && symtab_hdr->contents == NULL)
-	free (external_syms);
-      external_syms = NULL;
-      if (internal_relocs != elf_section_data (input_section)->relocs)
-	free (internal_relocs);
-      internal_relocs = NULL;
-    }
-
-  return data;
-
- error_return:
-  if (internal_relocs != NULL
-      && internal_relocs != elf_section_data (input_section)->relocs)
-    free (internal_relocs);
-  if (external_syms != NULL && symtab_hdr->contents == NULL)
-    free (external_syms);
-  if (internal_syms != NULL)
-    free (internal_syms);
-  if (sections != NULL)
-    free (sections);
-  return NULL;
-}
-
-
-#define TARGET_LITTLE_SYM	bfd_elf32_mn10200_vec
-#define TARGET_LITTLE_NAME	"elf32-mn10200"
-#define ELF_ARCH		bfd_arch_mn10200
-#define ELF_MACHINE_CODE	EM_CYGNUS_MN10200
-#define ELF_MAXPAGESIZE		0x1000
-
-#define elf_info_to_howto	mn10200_info_to_howto
-#define elf_info_to_howto_rel	0
-#define elf_backend_relocate_section mn10200_elf_relocate_section
-#define bfd_elf32_bfd_relax_section	mn10200_elf_relax_section
-#define bfd_elf32_bfd_get_relocated_section_contents \
-				mn10200_elf_get_relocated_section_contents
-
-#define elf_symbol_leading_char '_'
-
-#include "elf32-target.h"
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
deleted file mode 100644
index 9ba09a88d61..00000000000
--- a/bfd/elf-m10300.c
+++ /dev/null
@@ -1,2821 +0,0 @@
-/* Matsushita 10300 specific support for 32-bit ELF
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/mn10300.h"
-
-struct elf32_mn10300_link_hash_entry
-{
-  /* The basic elf link hash table entry.  */
-  struct elf_link_hash_entry root;
-
-  /* For function symbols, the number of times this function is
-     called directly (ie by name).  */
-  unsigned int direct_calls;
-
-  /* For function symbols, the size of this function's stack
-     (if <= 255 bytes).  We stuff this into "call" instructions
-     to this target when it's valid and profitable to do so.
-
-     This does not include stack allocated by movm!  */
-  unsigned char stack_size;
-
-  /* For function symbols, arguments (if any) for movm instruction
-     in the prologue.  We stuff this value into "call" instructions
-     to the target when it's valid and profitable to do so.  */
-  unsigned char movm_args;
-
-  /* For funtion symbols, the amount of stack space that would be allocated
-     by the movm instruction.  This is redundant with movm_args, but we
-     add it to the hash table to avoid computing it over and over.  */
-  unsigned char movm_stack_size;
-
-/* When set, convert all "call" instructions to this target into "calls"
-   instructions.  */
-#define MN10300_CONVERT_CALL_TO_CALLS 0x1
-
-/* Used to mark functions which have had redundant parts of their
-   prologue deleted.  */
-#define MN10300_DELETED_PROLOGUE_BYTES 0x2
-  unsigned char flags;
-};
-
-/* We derive a hash table from the main elf linker hash table so
-   we can store state variables and a secondary hash table without
-   resorting to global variables.  */
-struct elf32_mn10300_link_hash_table
-{
-  /* The main hash table.  */
-  struct elf_link_hash_table root;
-
-  /* A hash table for static functions.  We could derive a new hash table
-     instead of using the full elf32_mn10300_link_hash_table if we wanted
-     to save some memory.  */
-  struct elf32_mn10300_link_hash_table *static_hash_table;
-
-  /* Random linker state flags.  */
-#define MN10300_HASH_ENTRIES_INITIALIZED 0x1
-  char flags;
-};
-
-/* For MN10300 linker hash table.  */
-
-/* Get the MN10300 ELF linker hash table from a link_info structure.  */
-
-#define elf32_mn10300_hash_table(p) \
-  ((struct elf32_mn10300_link_hash_table *) ((p)->hash))
-
-#define elf32_mn10300_link_hash_traverse(table, func, info)		\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-static struct bfd_hash_entry *elf32_mn10300_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *elf32_mn10300_link_hash_table_create
-  PARAMS ((bfd *));
-
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void mn10300_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static boolean mn10300_elf_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
-static asection *mn10300_elf_gc_mark_hook
-  PARAMS ((bfd *, struct bfd_link_info *info, Elf_Internal_Rela *,
-	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean mn10300_elf_relax_delete_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean mn10300_elf_symbol_address_p
-  PARAMS ((bfd *, asection *, Elf32_External_Sym *, bfd_vma));
-static boolean elf32_mn10300_finish_hash_table_entry
-  PARAMS ((struct bfd_hash_entry *, PTR));
-static void compute_function_info
-  PARAMS ((bfd *, struct elf32_mn10300_link_hash_entry *,
-	   bfd_vma, unsigned char *));
-
-/* We have to use RELA instructions since md_apply_fix3 in the assembler
-   does absolutely nothing.  */
-#define USE_RELA
-
-
-static reloc_howto_type elf_mn10300_howto_table[] =
-{
-  /* Dummy relocation.  Does nothing.  */
-  HOWTO (R_MN10300_NONE,
-	 0,
-	 2,
-	 16,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_NONE",
-	 false,
-	 0,
-	 0,
-	 false),
-  /* Standard 32 bit reloc.  */
-  HOWTO (R_MN10300_32,
-	 0,
-	 2,
-	 32,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_32",
-	 false,
-	 0xffffffff,
-	 0xffffffff,
-	 false),
-  /* Standard 16 bit reloc.  */
-  HOWTO (R_MN10300_16,
-	 0,
-	 1,
-	 16,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_16",
-	 false,
-	 0xffff,
-	 0xffff,
-	 false),
-  /* Standard 8 bit reloc.  */
-  HOWTO (R_MN10300_8,
-	 0,
-	 0,
-	 8,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_8",
-	 false,
-	 0xff,
-	 0xff,
-	 false),
-  /* Standard 32bit pc-relative reloc.  */
-  HOWTO (R_MN10300_PCREL32,
-	 0,
-	 2,
-	 32,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_PCREL32",
-	 false,
-	 0xffffffff,
-	 0xffffffff,
-	 true),
-  /* Standard 16bit pc-relative reloc.  */
-  HOWTO (R_MN10300_PCREL16,
-	 0,
-	 1,
-	 16,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_PCREL16",
-	 false,
-	 0xffff,
-	 0xffff,
-	 true),
-  /* Standard 8 pc-relative reloc.  */
-  HOWTO (R_MN10300_PCREL8,
-	 0,
-	 0,
-	 8,
-	 true,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_PCREL8",
-	 false,
-	 0xff,
-	 0xff,
-	 true),
-
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_MN10300_GNU_VTINHERIT, /* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "R_MN10300_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_MN10300_GNU_VTENTRY,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "R_MN10300_GNU_VTENTRY", /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Standard 24 bit reloc.  */
-  HOWTO (R_MN10300_24,
-	 0,
-	 2,
-	 24,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 bfd_elf_generic_reloc,
-	 "R_MN10300_24",
-	 false,
-	 0xffffff,
-	 0xffffff,
-	 false),
-
-};
-
-struct mn10300_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static const struct mn10300_reloc_map mn10300_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_MN10300_NONE, },
-  { BFD_RELOC_32, R_MN10300_32, },
-  { BFD_RELOC_16, R_MN10300_16, },
-  { BFD_RELOC_8, R_MN10300_8, },
-  { BFD_RELOC_32_PCREL, R_MN10300_PCREL32, },
-  { BFD_RELOC_16_PCREL, R_MN10300_PCREL16, },
-  { BFD_RELOC_8_PCREL, R_MN10300_PCREL8, },
-  { BFD_RELOC_24, R_MN10300_24, },
-  { BFD_RELOC_VTABLE_INHERIT, R_MN10300_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY, R_MN10300_GNU_VTENTRY },
-};
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (mn10300_reloc_map) / sizeof (struct mn10300_reloc_map);
-       i++)
-    {
-      if (mn10300_reloc_map[i].bfd_reloc_val == code)
-	return &elf_mn10300_howto_table[mn10300_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Set the howto pointer for an MN10300 ELF reloc.  */
-
-static void
-mn10300_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_MN10300_MAX);
-  cache_ptr->howto = &elf_mn10300_howto_table[r_type];
-}
-
-/* Look through the relocs for a section during the first phase.
-   Since we don't do .gots or .plts, we just need to consider the
-   virtual table relocs for gc.  */
-
-static boolean
-mn10300_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-
-  if (info->relocateable)
-    return true;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      struct elf_link_hash_entry *h;
-      unsigned long r_symndx;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	/* This relocation describes the C++ object vtable hierarchy.
-	   Reconstruct it for later use during GC.  */
-	case R_MN10300_GNU_VTINHERIT:
-	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
-	  break;
-
-	/* This relocation describes which C++ vtable entries are actually
-	   used.  Record for later use during GC.  */
-	case R_MN10300_GNU_VTENTRY:
-	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
-	  break;
-	}
-    }
-
-  return true;
-}
-
-/* Return the section that should be marked against GC for a given
-   relocation.  */
-
-static asection *
-mn10300_elf_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     Elf_Internal_Rela *rel;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_MN10300_GNU_VTINHERIT:
-	case R_MN10300_GNU_VTENTRY:
-	  break;
-
-	default:
-	  switch (h->root.type)
-	    {
-	    case bfd_link_hash_defined:
-	    case bfd_link_hash_defweak:
-	      return h->root.u.def.section;
-
-	    case bfd_link_hash_common:
-	      return h->root.u.c.p->section;
-	    }
-	}
-    }
-  else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-		&& sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
-
-  return NULL;
-}
-
-/* Perform a relocation as part of a final link.  */
-static bfd_reloc_status_type
-mn10300_elf_final_link_relocate (howto, input_bfd, output_bfd,
-				 input_section, contents, offset, value,
-				 addend, info, sym_sec, is_local)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd *output_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma offset;
-     bfd_vma value;
-     bfd_vma addend;
-     struct bfd_link_info *info;
-     asection *sym_sec;
-     int is_local;
-{
-  unsigned long r_type = howto->type;
-  bfd_byte *hit_data = contents + offset;
-
-  switch (r_type)
-    {
-    case R_MN10300_NONE:
-      return bfd_reloc_ok;
-
-    case R_MN10300_32:
-      value += addend;
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_24:
-      value += addend;
-
-      if ((long)value > 0x7fffff || (long)value < -0x800000)
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value & 0xff, hit_data);
-      bfd_put_8 (input_bfd, (value >> 8) & 0xff, hit_data + 1);
-      bfd_put_8 (input_bfd, (value >> 16) & 0xff, hit_data + 2);
-      return bfd_reloc_ok;
-
-    case R_MN10300_16:
-      value += addend;
-
-      if ((long)value > 0x7fff || (long)value < -0x8000)
-	return bfd_reloc_overflow;
-
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_8:
-      value += addend;
-
-      if ((long)value > 0x7f || (long)value < -0x80)
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_PCREL8:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= offset;
-      value += addend;
-
-      if ((long)value > 0xff || (long)value < -0x100)
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_PCREL16:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= offset;
-      value += addend;
-
-      if ((long)value > 0xffff || (long)value < -0x10000)
-	return bfd_reloc_overflow;
-
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_PCREL32:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= offset;
-      value += addend;
-
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_MN10300_GNU_VTINHERIT:
-    case R_MN10300_GNU_VTENTRY:
-      return bfd_reloc_ok;
-
-    default:
-      return bfd_reloc_notsupported;
-    }
-}
-
-
-/* Relocate an MN10300 ELF section.  */
-static boolean
-mn10300_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			      contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf32_mn10300_link_hash_entry **sym_hashes;
-  Elf_Internal_Rela *rel, *relend;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = (struct elf32_mn10300_link_hash_entry **)
-		 (elf_sym_hashes (input_bfd));
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      struct elf32_mn10300_link_hash_entry *h;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      r_type = ELF32_R_TYPE (rel->r_info);
-      howto = elf_mn10300_howto_table + r_type;
-
-      /* Just skip the vtable gc relocs.  */
-      if (r_type == R_MN10300_GNU_VTINHERIT
-	  || r_type == R_MN10300_GNU_VTENTRY)
-	continue;
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf32_mn10300_link_hash_entry *) h->root.root.u.i.link;
-	  if (h->root.root.type == bfd_link_hash_defined
-	      || h->root.root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.root.u.def.section;
-	      relocation = (h->root.root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-	    }
-	  else if (h->root.root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      r = mn10300_elf_final_link_relocate (howto, input_bfd, output_bfd,
-					   input_section,
-					   contents, rel->r_offset,
-					   relocation, rel->r_addend,
-					   info, sec, h == NULL);
-
-      if (r != bfd_reloc_ok)
-	{
-	  const char *name;
-	  const char *msg = (const char *)0;
-
-	  if (h != NULL)
-	    name = h->root.root.root.string;
-	  else
-	    {
-	      name = (bfd_elf_string_from_elf_section
-		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
-	      if (name == NULL || *name == '\0')
-		name = bfd_section_name (input_bfd, sec);
-	    }
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      if (! ((*info->callbacks->reloc_overflow)
-		     (info, name, howto->name, (bfd_vma) 0,
-		      input_bfd, input_section, rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_undefined:
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, name, input_bfd, input_section,
-		      rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_outofrange:
-	      msg = _("internal error: out of range error");
-	      goto common_error;
-
-	    case bfd_reloc_notsupported:
-	      msg = _("internal error: unsupported relocation error");
-	      goto common_error;
-
-	    case bfd_reloc_dangerous:
-	      msg = _("internal error: dangerous error");
-	      goto common_error;
-
-	    default:
-	      msg = _("internal error: unknown error");
-	      /* fall through */
-
-	    common_error:
-	      if (!((*info->callbacks->warning)
-		    (info, msg, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Finish initializing one hash table entry.  */
-static boolean
-elf32_mn10300_finish_hash_table_entry (gen_entry, in_args)
-     struct bfd_hash_entry *gen_entry;
-     PTR in_args;
-{
-  struct elf32_mn10300_link_hash_entry *entry;
-  unsigned int byte_count = 0;
-
-  entry = (struct elf32_mn10300_link_hash_entry *)gen_entry;
-
-  /* If we already know we want to convert "call" to "calls" for calls
-     to this symbol, then return now.  */
-  if (entry->flags == MN10300_CONVERT_CALL_TO_CALLS)
-    return true;
-
-  /* If there are no named calls to this symbol, or there's nothing we
-     can move from the function itself into the "call" instruction, then
-     note that all "call" instructions should be converted into "calls"
-     instructions and return.  */
-  if (entry->direct_calls == 0
-      || (entry->stack_size == 0 && entry->movm_args == 0))
-    {
-      /* Make a note that we should convert "call" instructions to "calls"
-	 instructions for calls to this symbol.  */
-      entry->flags |= MN10300_CONVERT_CALL_TO_CALLS;
-      return true;
-    }
-
-  /* We may be able to move some instructions from the function itself into
-     the "call" instruction.  Count how many bytes we might be able to
-     eliminate in the function itself.  */
-
-  /* A movm instruction is two bytes.  */
-  if (entry->movm_args)
-    byte_count += 2;
-
-  /* Count the insn to allocate stack space too.  */
-  if (entry->stack_size > 0 && entry->stack_size <= 128)
-    byte_count += 3;
-  else if (entry->stack_size > 0 && entry->stack_size < 256)
-    byte_count += 4;
-
-  /* If using "call" will result in larger code, then turn all
-     the associated "call" instructions into "calls" instrutions.  */
-  if (byte_count < entry->direct_calls)
-    entry->flags |= MN10300_CONVERT_CALL_TO_CALLS;
-
-  /* This routine never fails.  */
-  return true;
-}
-
-/* This function handles relaxing for the mn10300.
-
-   There's quite a few relaxing opportunites available on the mn10300:
-
-	* calls:32 -> calls:16 					   2 bytes
-	* call:32  -> call:16					   2 bytes
-
-	* call:32 -> calls:32					   1 byte
-	* call:16 -> calls:16					   1 byte
-		* These are done anytime using "calls" would result
-		in smaller code, or when necessary to preserve the
-		meaning of the program.
-
-	* call:32						   varies
-	* call:16
-		* In some circumstances we can move instructions
-		from a function prologue into a "call" instruction.
-		This is only done if the resulting code is no larger
-		than the original code.
-
-
-	* jmp:32 -> jmp:16					   2 bytes
-	* jmp:16 -> bra:8					   1 byte
-
-		* If the previous instruction is a conditional branch
-		around the jump/bra, we may be able to reverse its condition
-		and change its target to the jump's target.  The jump/bra
-		can then be deleted.				   2 bytes
-
-	* mov abs32 -> mov abs16				   1 or 2 bytes
-
-	* Most instructions which accept imm32 can relax to imm16  1 or 2 bytes
-	- Most instructions which accept imm16 can relax to imm8   1 or 2 bytes
-
-	* Most instructions which accept d32 can relax to d16	   1 or 2 bytes
-	- Most instructions which accept d16 can relax to d8	   1 or 2 bytes
-
-	We don't handle imm16->imm8 or d16->d8 as they're very rare
-	and somewhat more difficult to support.  */
-
-static boolean
-mn10300_elf_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *internal_relocs = NULL;
-  Elf_Internal_Rela *free_relocs = NULL;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *contents = NULL;
-  bfd_byte *free_contents = NULL;
-  Elf32_External_Sym *extsyms = NULL;
-  Elf32_External_Sym *free_extsyms = NULL;
-  struct elf32_mn10300_link_hash_table *hash_table;
-
-  /* Assume nothing changes.  */
-  *again = false;
-
-  /* We need a pointer to the mn10300 specific hash table.  */
-  hash_table = elf32_mn10300_hash_table (link_info);
-
-  /* Initialize fields in each hash table entry the first time through.  */
-  if ((hash_table->flags & MN10300_HASH_ENTRIES_INITIALIZED) == 0)
-    {
-      bfd *input_bfd;
-
-      /* Iterate over all the input bfds.  */
-      for (input_bfd = link_info->input_bfds;
-	   input_bfd != NULL;
-	   input_bfd = input_bfd->link_next)
-	{
-	  asection *section;
-
-	  /* We're going to need all the symbols for each bfd.  */
-	  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-          /* Get cached copy if it exists.  */
-          if (symtab_hdr->contents != NULL)
-            extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-          else
-            {
-              /* Go get them off disk.  */
-              extsyms = ((Elf32_External_Sym *)
-                         bfd_malloc (symtab_hdr->sh_size));
-              if (extsyms == NULL)
-                goto error_return;
-              free_extsyms = extsyms;
-              if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-                  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, input_bfd)
-                      != symtab_hdr->sh_size))
-                goto error_return;
-            }
-
-	  /* Iterate over each section in this bfd.  */
-	  for (section = input_bfd->sections;
-	       section != NULL;
-	       section = section->next)
-	    {
-	      struct elf32_mn10300_link_hash_entry *hash;
-	      Elf_Internal_Sym *sym;
-	      asection *sym_sec;
-	      const char *sym_name;
-	      char *new_name;
-	      Elf_Internal_Shdr *hdr;
-
-	      /* Get cached copy of section contents if it exists.  */
-	      if (elf_section_data (section)->this_hdr.contents != NULL)
-		contents = elf_section_data (section)->this_hdr.contents;
-	      else if (section->_raw_size != 0)
-		{
-		  /* Go get them off disk.  */
-		  contents = (bfd_byte *)bfd_malloc (section->_raw_size);
-		  if (contents == NULL)
-		    goto error_return;
-		  free_contents = contents;
-
-		  if (!bfd_get_section_contents (input_bfd, section,
-						 contents, (file_ptr) 0,
-						 section->_raw_size))
-		    goto error_return;
-		}
-	      else
-		{
-		  contents = NULL;
-		  free_contents = NULL;
-		}
-
-	      /* If there aren't any relocs, then there's nothing to do.  */
-	      if ((section->flags & SEC_RELOC) != 0
-		  && section->reloc_count != 0)
-		{
-
-		  /* Get a copy of the native relocations.  */
-		  internal_relocs = (_bfd_elf32_link_read_relocs
-				     (input_bfd, section, (PTR) NULL,
-				      (Elf_Internal_Rela *) NULL,
-				      link_info->keep_memory));
-		  if (internal_relocs == NULL)
-		    goto error_return;
-		  if (! link_info->keep_memory)
-		    free_relocs = internal_relocs;
-
-		  /* Now examine each relocation.  */
-		  irel = internal_relocs;
-		  irelend = irel + section->reloc_count;
-		  for (; irel < irelend; irel++)
-		    {
-		      long r_type;
-		      unsigned long r_index;
-		      unsigned char code;
-
-		      r_type = ELF32_R_TYPE (irel->r_info);
-		      r_index = ELF32_R_SYM (irel->r_info);
-
-		      if (r_type < 0 || r_type >= (int)R_MN10300_MAX)
-			goto error_return;
-
-		      /* We need the name and hash table entry of the target
-			 symbol!  */
-		      hash = NULL;
-		      sym = NULL;
-		      sym_sec = NULL;
-
-		      if (r_index < symtab_hdr->sh_info)
-			{
-			  /* A local symbol.  */
-			  Elf_Internal_Sym isym;
-
-			  bfd_elf32_swap_symbol_in (input_bfd,
-						    extsyms + r_index, &isym);
-
-			  if (isym.st_shndx == SHN_UNDEF)
-			    sym_sec = bfd_und_section_ptr;
-			  else if (isym.st_shndx > 0
-				   && isym.st_shndx < SHN_LORESERVE)
-			    sym_sec
-			      = bfd_section_from_elf_index (input_bfd,
-							    isym.st_shndx);
-			  else if (isym.st_shndx == SHN_ABS)
-			    sym_sec = bfd_abs_section_ptr;
-			  else if (isym.st_shndx == SHN_COMMON)
-			    sym_sec = bfd_com_section_ptr;
-
-			  sym_name = bfd_elf_string_from_elf_section (input_bfd,
-							   symtab_hdr->sh_link,
-							   isym.st_name);
-
-			  /* If it isn't a function, then we don't care
-			     about it.  */
-			  if (r_index < symtab_hdr->sh_info
-			      && ELF_ST_TYPE (isym.st_info) != STT_FUNC)
-			    continue;
-
-			  /* Tack on an ID so we can uniquely identify this
-			     local symbol in the global hash table.  */
-			  new_name = bfd_malloc (strlen (sym_name) + 10);
-			  if (new_name == 0)
-			    goto error_return;
-
-			  sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
-			  sym_name = new_name;
-
-			  hash = (struct elf32_mn10300_link_hash_entry *)
-				   elf_link_hash_lookup (&hash_table->static_hash_table->root,
-						         sym_name, true,
-						         true, false);
-			  free (new_name);
-			}
-		      else
-			{
-			  r_index -= symtab_hdr->sh_info;
-			  hash = (struct elf32_mn10300_link_hash_entry *)
-				   elf_sym_hashes (input_bfd)[r_index];
-			}
-
-		      /* If this is not a "call" instruction, then we
-			 should convert "call" instructions to "calls"
-			 instructions.  */
-		      code = bfd_get_8 (input_bfd,
-					contents + irel->r_offset - 1);
-		      if (code != 0xdd && code != 0xcd)
-			hash->flags |= MN10300_CONVERT_CALL_TO_CALLS;
-
-		      /* If this is a jump/call, then bump the direct_calls
-			 counter.  Else force "call" to "calls" conversions.  */
-		      if (r_type == R_MN10300_PCREL32
-			  || r_type == R_MN10300_PCREL16)
-			hash->direct_calls++;
-		      else
-			hash->flags |= MN10300_CONVERT_CALL_TO_CALLS;
-		    }
-		}
-
-	      /* Now look at the actual contents to get the stack size,
-		 and a list of what registers were saved in the prologue
-		 (ie movm_args).  */
-	      if ((section->flags & SEC_CODE) != 0)
-		{
-
-		  Elf32_External_Sym *esym, *esymend;
-		  int idx, shndx;
-
-		  shndx = _bfd_elf_section_from_bfd_section (input_bfd,
-							     section);
-
-
-		  /* Look at each function defined in this section and
-		     update info for that function.  */
-		  esym = extsyms;
-		  esymend = esym + symtab_hdr->sh_info;
-		  for (; esym < esymend; esym++)
-		    {
-		      Elf_Internal_Sym isym;
-
-		      bfd_elf32_swap_symbol_in (input_bfd, esym, &isym);
-		      if (isym.st_shndx == shndx
-			  && ELF_ST_TYPE (isym.st_info) == STT_FUNC)
-			{
-			  if (isym.st_shndx == SHN_UNDEF)
-			    sym_sec = bfd_und_section_ptr;
-			  else if (isym.st_shndx > 0
-				   && isym.st_shndx < SHN_LORESERVE)
-			    sym_sec
-			      = bfd_section_from_elf_index (input_bfd,
-							    isym.st_shndx);
-			  else if (isym.st_shndx == SHN_ABS)
-			    sym_sec = bfd_abs_section_ptr;
-			  else if (isym.st_shndx == SHN_COMMON)
-			    sym_sec = bfd_com_section_ptr;
-
-			  sym_name = bfd_elf_string_from_elf_section (input_bfd,
-							symtab_hdr->sh_link,
-							isym.st_name);
-
-			  /* Tack on an ID so we can uniquely identify this
-			     local symbol in the global hash table.  */
-			  new_name = bfd_malloc (strlen (sym_name) + 10);
-			  if (new_name == 0)
-			    goto error_return;
-
-			  sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
-			  sym_name = new_name;
-
-			  hash = (struct elf32_mn10300_link_hash_entry *)
-				    elf_link_hash_lookup (&hash_table->static_hash_table->root,
-						          sym_name, true,
-						          true, false);
-			  free (new_name);
-			  compute_function_info (input_bfd, hash,
-					         isym.st_value, contents);
-			}
-		    }
-
-		  esym = extsyms + symtab_hdr->sh_info;
-		  esymend = extsyms + (symtab_hdr->sh_size
-				       / sizeof (Elf32_External_Sym));
-		  for (idx = 0; esym < esymend; esym++, idx++)
-		    {
-		      Elf_Internal_Sym isym;
-
-		      bfd_elf32_swap_symbol_in (input_bfd, esym, &isym);
-		      hash = (struct elf32_mn10300_link_hash_entry *)
-			       elf_sym_hashes (input_bfd)[idx];
-		      if (isym.st_shndx == shndx
-			  && ELF_ST_TYPE (isym.st_info) == STT_FUNC
-			  && (hash)->root.root.u.def.section == section
-			  && ((hash)->root.root.type == bfd_link_hash_defined
-			      || (hash)->root.root.type == bfd_link_hash_defweak))
-			compute_function_info (input_bfd, hash,
-					       (hash)->root.root.u.def.value,
-					       contents);
-		    }
-		}
-
-	      /* Cache or free any memory we allocated for the relocs.  */
-	      if (free_relocs != NULL)
-		{
-		  free (free_relocs);
-		  free_relocs = NULL;
-		}
-
-	      /* Cache or free any memory we allocated for the contents.  */
-	      if (free_contents != NULL)
-		{
-		  if (! link_info->keep_memory)
-		    free (free_contents);
-		  else
-		    {
-		      /* Cache the section contents for elf_link_input_bfd.  */
-		      elf_section_data (section)->this_hdr.contents = contents;
-		    }
-		  free_contents = NULL;
-		}
-	    }
-
-	  /* Cache or free any memory we allocated for the symbols.  */
-	  if (free_extsyms != NULL)
-	    {
-	      if (! link_info->keep_memory)
-		free (free_extsyms);
-	      else
-		{
-		  /* Cache the symbols for elf_link_input_bfd.  */
-		  symtab_hdr->contents = extsyms;
-		}
-	      free_extsyms = NULL;
-	    }
-	}
-
-      /* Now iterate on each symbol in the hash table and perform
-	 the final initialization steps on each.  */
-      elf32_mn10300_link_hash_traverse (hash_table,
-					elf32_mn10300_finish_hash_table_entry,
-					NULL);
-      elf32_mn10300_link_hash_traverse (hash_table->static_hash_table,
-					elf32_mn10300_finish_hash_table_entry,
-					NULL);
-
-      /* All entries in the hash table are fully initialized.  */
-      hash_table->flags |= MN10300_HASH_ENTRIES_INITIALIZED;
-
-      /* Now that everything has been initialized, go through each
-	 code section and delete any prologue insns which will be
-	 redundant because their operations will be performed by
-	 a "call" instruction.  */
-      for (input_bfd = link_info->input_bfds;
-	   input_bfd != NULL;
-	   input_bfd = input_bfd->link_next)
-	{
-	  asection *section;
-
-	  /* We're going to need all the symbols for each bfd.  */
-	  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-          /* Get cached copy if it exists.  */
-          if (symtab_hdr->contents != NULL)
-            extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-          else
-            {
-              /* Go get them off disk.  */
-              extsyms = ((Elf32_External_Sym *)
-                         bfd_malloc (symtab_hdr->sh_size));
-              if (extsyms == NULL)
-                goto error_return;
-              free_extsyms = extsyms;
-              if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-                  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, input_bfd)
-                      != symtab_hdr->sh_size))
-                goto error_return;
-            }
-
-	  /* Walk over each section in this bfd.  */
-	  for (section = input_bfd->sections;
-	       section != NULL;
-	       section = section->next)
-	    {
-	      int shndx;
-	      Elf32_External_Sym *esym, *esymend;
-	      int idx;
-
-	      /* Skip non-code sections and empty sections.  */
-	      if ((section->flags & SEC_CODE) == 0 || section->_raw_size == 0)
-		continue;
-
-	      if (section->reloc_count != 0)
-		{
-                  /* Get a copy of the native relocations.  */
-                  internal_relocs = (_bfd_elf32_link_read_relocs
-                                     (input_bfd, section, (PTR) NULL,
-                                      (Elf_Internal_Rela *) NULL,
-                                      link_info->keep_memory));
-                  if (internal_relocs == NULL)
-                    goto error_return;
-                  if (! link_info->keep_memory)
-                    free_relocs = internal_relocs;
-		}
-
-	      /* Get cached copy of section contents if it exists.  */
-	      if (elf_section_data (section)->this_hdr.contents != NULL)
-		contents = elf_section_data (section)->this_hdr.contents;
-	      else
-		{
-		  /* Go get them off disk.  */
-		  contents = (bfd_byte *)bfd_malloc (section->_raw_size);
-		  if (contents == NULL)
-		    goto error_return;
-		  free_contents = contents;
-
-		  if (!bfd_get_section_contents (input_bfd, section,
-						 contents, (file_ptr) 0,
-						 section->_raw_size))
-		    goto error_return;
-		}
-
-
-	      shndx = _bfd_elf_section_from_bfd_section (input_bfd, section);
-
-	      /* Now look for any function in this section which needs
-		 insns deleted from its prologue.  */
-	      esym = extsyms;
-	      esymend = esym + symtab_hdr->sh_info;
-	      for (; esym < esymend; esym++)
-		{
-		  Elf_Internal_Sym isym;
-		  struct elf32_mn10300_link_hash_entry *sym_hash;
-		  asection *sym_sec;
-		  const char *sym_name;
-		  Elf_Internal_Shdr *hdr;
-		  char *new_name;
-
-		  bfd_elf32_swap_symbol_in (input_bfd, esym, &isym);
-
-		  if (isym.st_shndx != shndx)
-		    continue;
-
-		  if (isym.st_shndx == SHN_UNDEF)
-		    sym_sec = bfd_und_section_ptr;
-		  else if (isym.st_shndx > 0 && isym.st_shndx < SHN_LORESERVE)
-		    sym_sec
-		      = bfd_section_from_elf_index (input_bfd, isym.st_shndx);
-		  else if (isym.st_shndx == SHN_ABS)
-		    sym_sec = bfd_abs_section_ptr;
-		  else if (isym.st_shndx == SHN_COMMON)
-		    sym_sec = bfd_com_section_ptr;
-
-		  sym_name = bfd_elf_string_from_elf_section (input_bfd,
-							symtab_hdr->sh_link,
-							isym.st_name);
-
-		  /* Tack on an ID so we can uniquely identify this
-		     local symbol in the global hash table.  */
-		  new_name = bfd_malloc (strlen (sym_name) + 10);
-		  if (new_name == 0)
-		    goto error_return;
-		  sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
-		  sym_name = new_name;
-
-		  sym_hash = (struct elf32_mn10300_link_hash_entry *)
-			    elf_link_hash_lookup (&hash_table->static_hash_table->root,
-					          sym_name, false,
-					          false, false);
-
-		  free (new_name);
-		  if (sym_hash == NULL)
-		    continue;
-
-		  if (! ((sym_hash)->flags & MN10300_CONVERT_CALL_TO_CALLS)
-		      && ! ((sym_hash)->flags & MN10300_DELETED_PROLOGUE_BYTES))
-		    {
-		      int bytes = 0;
-
-		      /* Note that we've changed things.  */
-		      elf_section_data (section)->relocs = internal_relocs;
-		      free_relocs = NULL;
-
-		      elf_section_data (section)->this_hdr.contents = contents;
-		      free_contents = NULL;
-
-		      symtab_hdr->contents = (bfd_byte *)extsyms;
-		      free_extsyms = NULL;
-
-		      /* Count how many bytes we're going to delete.  */
-		      if (sym_hash->movm_args)
-			bytes += 2;
-
-		      if (sym_hash->stack_size && sym_hash->stack_size <= 128)
-			bytes += 3;
-		      else if (sym_hash->stack_size
-			       && sym_hash->stack_size < 256)
-			bytes += 4;
-
-		      /* Note that we've deleted prologue bytes for this
-			 function.  */
-		      sym_hash->flags |= MN10300_DELETED_PROLOGUE_BYTES;
-
-		      /* Actually delete the bytes.  */
-		      if (!mn10300_elf_relax_delete_bytes (input_bfd,
-							   section,
-							   isym.st_value,
-							   bytes))
-			goto error_return;
-
-		      /* Something changed.  Not strictly necessary, but
-			 may lead to more relaxing opportunities.  */
-		      *again = true;
-		    }
-		}
-
-	      /* Look for any global functions in this section which
-		 need insns deleted from their prologues.  */
-	      esym = extsyms + symtab_hdr->sh_info;
-	      esymend = extsyms + (symtab_hdr->sh_size
-				   / sizeof (Elf32_External_Sym));
-	      for (idx = 0; esym < esymend; esym++, idx++)
-		{
-		  Elf_Internal_Sym isym;
-		  struct elf32_mn10300_link_hash_entry *sym_hash;
-
-		  bfd_elf32_swap_symbol_in (input_bfd, esym, &isym);
-		  sym_hash = (struct elf32_mn10300_link_hash_entry *)
-			       (elf_sym_hashes (input_bfd)[idx]);
-		  if (isym.st_shndx == shndx
-		      && (sym_hash)->root.root.u.def.section == section
-		      && ! ((sym_hash)->flags & MN10300_CONVERT_CALL_TO_CALLS)
-		      && ! ((sym_hash)->flags & MN10300_DELETED_PROLOGUE_BYTES))
-		    {
-		      int bytes = 0;
-
-		      /* Note that we've changed things.  */
-		      elf_section_data (section)->relocs = internal_relocs;
-		      free_relocs = NULL;
-
-		      elf_section_data (section)->this_hdr.contents = contents;
-		      free_contents = NULL;
-
-		      symtab_hdr->contents = (bfd_byte *)extsyms;
-		      free_extsyms = NULL;
-
-		      /* Count how many bytes we're going to delete.  */
-		      if (sym_hash->movm_args)
-			bytes += 2;
-
-		      if (sym_hash->stack_size && sym_hash->stack_size <= 128)
-			bytes += 3;
-		      else if (sym_hash->stack_size
-			       && sym_hash->stack_size < 256)
-			bytes += 4;
-
-		      /* Note that we've deleted prologue bytes for this
-			 function.  */
-		      sym_hash->flags |= MN10300_DELETED_PROLOGUE_BYTES;
-
-		      /* Actually delete the bytes.  */
-		      if (!mn10300_elf_relax_delete_bytes (input_bfd,
-							   section,
-							   (sym_hash)->root.root.u.def.value,
-							   bytes))
-			goto error_return;
-
-		      /* Something changed.  Not strictly necessary, but
-			 may lead to more relaxing opportunities.  */
-		      *again = true;
-		    }
-		}
-
-	      /* Cache or free any memory we allocated for the relocs.  */
-	      if (free_relocs != NULL)
-		{
-		  free (free_relocs);
-		  free_relocs = NULL;
-		}
-
-	      /* Cache or free any memory we allocated for the contents.  */
-	      if (free_contents != NULL)
-		{
-		  if (! link_info->keep_memory)
-		    free (free_contents);
-		  else
-		    {
-		      /* Cache the section contents for elf_link_input_bfd.  */
-		      elf_section_data (section)->this_hdr.contents = contents;
-		    }
-		  free_contents = NULL;
-		}
-	    }
-
-	  /* Cache or free any memory we allocated for the symbols.  */
-	  if (free_extsyms != NULL)
-	    {
-	      if (! link_info->keep_memory)
-		free (free_extsyms);
-	      else
-		{
-		  /* Cache the symbols for elf_link_input_bfd.  */
-		  symtab_hdr->contents = extsyms;
-		}
-	      free_extsyms = NULL;
-	    }
-	}
-    }
-
-
-  /* (Re)initialize for the basic instruction shortening/relaxing pass.  */
-  contents = NULL;
-  extsyms = NULL;
-  internal_relocs = NULL;
-  free_relocs = NULL;
-  free_contents = NULL;
-  free_extsyms = NULL;
-
-  /* We don't have to do anything for a relocateable link, if
-     this section does not have relocs, or if this is not a
-     code section.  */
-  if (link_info->relocateable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0
-      || (sec->flags & SEC_CODE) == 0)
-    return true;
-
-  /* If this is the first time we have been called for this section,
-     initialize the cooked size.  */
-  if (sec->_cooked_size == 0)
-    sec->_cooked_size = sec->_raw_size;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-
-  /* Get a copy of the native relocations.  */
-  internal_relocs = (_bfd_elf32_link_read_relocs
-		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-		      link_info->keep_memory));
-  if (internal_relocs == NULL)
-    goto error_return;
-  if (! link_info->keep_memory)
-    free_relocs = internal_relocs;
-
-  /* Walk through them looking for relaxing opportunities.  */
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma symval;
-      struct elf32_mn10300_link_hash_entry *h = NULL;
-
-      /* If this isn't something that can be relaxed, then ignore
-	 this reloc.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_NONE
-	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_8
-	  || ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_MAX)
-	continue;
-
-      /* Get the section contents if we haven't done so already.  */
-      if (contents == NULL)
-	{
-	  /* Get cached copy if it exists.  */
-	  if (elf_section_data (sec)->this_hdr.contents != NULL)
-	    contents = elf_section_data (sec)->this_hdr.contents;
-	  else
-	    {
-	      /* Go get them off disk.  */
-	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (contents == NULL)
-		goto error_return;
-	      free_contents = contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      /* Read this BFD's symbols if we haven't done so already.  */
-      if (extsyms == NULL)
-	{
-	  /* Get cached copy if it exists.  */
-	  if (symtab_hdr->contents != NULL)
-	    extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-	  else
-	    {
-	      /* Go get them off disk.  */
-	      extsyms = ((Elf32_External_Sym *)
-			 bfd_malloc (symtab_hdr->sh_size));
-	      if (extsyms == NULL)
-		goto error_return;
-	      free_extsyms = extsyms;
-	      if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-		  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
-		      != symtab_hdr->sh_size))
-		goto error_return;
-	    }
-	}
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-	{
-	  Elf_Internal_Sym isym;
-	  asection *sym_sec;
-	  Elf_Internal_Shdr *hdr;
-	  const char *sym_name;
-	  char *new_name;
-
-	  /* A local symbol.  */
-	  bfd_elf32_swap_symbol_in (abfd,
-				    extsyms + ELF32_R_SYM (irel->r_info),
-				    &isym);
-
-	  if (isym.st_shndx == SHN_UNDEF)
-	    sym_sec = bfd_und_section_ptr;
-	  else if (isym.st_shndx > 0 && isym.st_shndx < SHN_LORESERVE)
-	    sym_sec = bfd_section_from_elf_index (abfd, isym.st_shndx);
-	  else if (isym.st_shndx == SHN_ABS)
-	    sym_sec = bfd_abs_section_ptr;
-	  else if (isym.st_shndx == SHN_COMMON)
-	    sym_sec = bfd_com_section_ptr;
-
-	  symval = (isym.st_value
-		    + sym_sec->output_section->vma
-		    + sym_sec->output_offset);
-	  sym_name = bfd_elf_string_from_elf_section (abfd,
-						      symtab_hdr->sh_link,
-						      isym.st_name);
-
-	  /* Tack on an ID so we can uniquely identify this
-	     local symbol in the global hash table.  */
-	  new_name = bfd_malloc (strlen (sym_name) + 10);
-	  if (new_name == 0)
-	    goto error_return;
-	  sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
-	  sym_name = new_name;
-
-	  h = (struct elf32_mn10300_link_hash_entry *)
-		elf_link_hash_lookup (&hash_table->static_hash_table->root,
-				      sym_name, false, false, false);
-	  free (new_name);
-	}
-      else
-	{
-	  unsigned long indx;
-
-	  /* An external symbol.  */
-	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
-	  h = (struct elf32_mn10300_link_hash_entry *)
-		(elf_sym_hashes (abfd)[indx]);
-	  BFD_ASSERT (h != NULL);
-	  if (h->root.root.type != bfd_link_hash_defined
-	      && h->root.root.type != bfd_link_hash_defweak)
-	    {
-	      /* This appears to be a reference to an undefined
- 		symbol.  Just ignore it--it will be caught by the
- 		regular reloc processing.  */
-	      continue;
-	    }
-
-	  symval = (h->root.root.u.def.value
-		    + h->root.root.u.def.section->output_section->vma
-		    + h->root.root.u.def.section->output_offset);
-	}
-
-      /* For simplicity of coding, we are going to modify the section
-	 contents, the section relocs, and the BFD symbol table.  We
-	 must tell the rest of the code not to free up this
-	 information.  It would be possible to instead create a table
-	 of changes which have to be made, as is done in coff-mips.c;
-	 that would be more work, but would require less memory when
-	 the linker is run.  */
-
-      /* Try to turn a 32bit pc-relative branch/call into a 16bit pc-relative
-	 branch/call, also deal with "call" -> "calls" conversions and
-	 insertion of prologue data into "call" instructions.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PCREL32)
-	{
-	  bfd_vma value = symval;
-
-	  /* If we've got a "call" instruction that needs to be turned
-	     into a "calls" instruction, do so now.  It saves a byte.  */
-	  if (h && (h->flags & MN10300_CONVERT_CALL_TO_CALLS))
-	    {
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      /* Make sure we're working with a "call" instruction!  */
-	      if (code == 0xdd)
-		{
-		  /* Note that we've changed the relocs, section contents,
-		     etc.  */
-		  elf_section_data (sec)->relocs = internal_relocs;
-		  free_relocs = NULL;
-
-		  elf_section_data (sec)->this_hdr.contents = contents;
-		  free_contents = NULL;
-
-		  symtab_hdr->contents = (bfd_byte *) extsyms;
-		  free_extsyms = NULL;
-
-		  /* Fix the opcode.  */
-		  bfd_put_8 (abfd, 0xfc, contents + irel->r_offset - 1);
-		  bfd_put_8 (abfd, 0xff, contents + irel->r_offset);
-
-		  /* Fix irel->r_offset and irel->r_addend.  */
-		  irel->r_offset += 1;
-		  irel->r_addend += 1;
-
-		  /* Delete one byte of data.  */
-		  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-						       irel->r_offset + 3, 1))
-		    goto error_return;
-
-		  /* That will change things, so, we should relax again.
-		     Note that this is not required, and it may be slow.  */
-		  *again = true;
-		}
-	    }
-	  else if (h)
-	    {
-	      /* We've got a "call" instruction which needs some data
-		 from target function filled in.  */
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      /* Insert data from the target function into the "call"
-		 instruction if needed.  */
-	      if (code == 0xdd)
-		{
-		  bfd_put_8 (abfd, h->movm_args, contents + irel->r_offset + 4);
-		  bfd_put_8 (abfd, h->stack_size + h->movm_stack_size,
-			     contents + irel->r_offset + 5);
-		}
-	    }
-
-	  /* Deal with pc-relative gunk.  */
-	  value -= (sec->output_section->vma + sec->output_offset);
-	  value -= irel->r_offset;
-	  value += irel->r_addend;
-
-	  /* See if the value will fit in 16 bits, note the high value is
-	     0x7fff + 2 as the target will be two bytes closer if we are
-	     able to relax.  */
-	  if ((long)value < 0x8001 && (long)value > -0x8000)
-	    {
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      if (code != 0xdc && code != 0xdd && code != 0xff)
-		continue;
-
-	      /* Note that we've changed the relocs, section contents, etc.  */
-	      elf_section_data (sec)->relocs = internal_relocs;
-	      free_relocs = NULL;
-
-	      elf_section_data (sec)->this_hdr.contents = contents;
-	      free_contents = NULL;
-
-	      symtab_hdr->contents = (bfd_byte *) extsyms;
-	      free_extsyms = NULL;
-
-	      /* Fix the opcode.  */
-	      if (code == 0xdc)
-		bfd_put_8 (abfd, 0xcc, contents + irel->r_offset - 1);
-	      else if (code == 0xdd)
-		bfd_put_8 (abfd, 0xcd, contents + irel->r_offset - 1);
-	      else if (code == 0xff)
-		bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
-
-	      /* Fix the relocation's type.  */
-	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					   R_MN10300_PCREL16);
-
-	      /* Delete two bytes of data.  */
-	      if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-						   irel->r_offset + 1, 2))
-		goto error_return;
-
-	      /* That will change things, so, we should relax again.
-		 Note that this is not required, and it may be slow.  */
-	      *again = true;
-	    }
-	}
-
-      /* Try to turn a 16bit pc-relative branch into a 8bit pc-relative
-	 branch.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PCREL16)
-	{
-	  bfd_vma value = symval;
-
-	  /* If we've got a "call" instruction that needs to be turned
-	     into a "calls" instruction, do so now.  It saves a byte.  */
-	  if (h && (h->flags & MN10300_CONVERT_CALL_TO_CALLS))
-	    {
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      /* Make sure we're working with a "call" instruction!  */
-	      if (code == 0xcd)
-		{
-		  /* Note that we've changed the relocs, section contents,
-		     etc.  */
-		  elf_section_data (sec)->relocs = internal_relocs;
-		  free_relocs = NULL;
-
-		  elf_section_data (sec)->this_hdr.contents = contents;
-		  free_contents = NULL;
-
-		  symtab_hdr->contents = (bfd_byte *) extsyms;
-		  free_extsyms = NULL;
-
-		  /* Fix the opcode.  */
-		  bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 1);
-		  bfd_put_8 (abfd, 0xff, contents + irel->r_offset);
-
-		  /* Fix irel->r_offset and irel->r_addend.  */
-		  irel->r_offset += 1;
-		  irel->r_addend += 1;
-
-		  /* Delete one byte of data.  */
-		  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-						       irel->r_offset + 1, 1))
-		    goto error_return;
-
-		  /* That will change things, so, we should relax again.
-		     Note that this is not required, and it may be slow.  */
-		  *again = true;
-		}
-	    }
-	  else if (h)
-	    {
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      /* Insert data from the target function into the "call"
-		 instruction if needed.  */
-	      if (code == 0xcd)
-		{
-		  bfd_put_8 (abfd, h->movm_args, contents + irel->r_offset + 2);
-		  bfd_put_8 (abfd, h->stack_size + h->movm_stack_size,
-			     contents + irel->r_offset + 3);
-		}
-	    }
-
-	  /* Deal with pc-relative gunk.  */
-	  value -= (sec->output_section->vma + sec->output_offset);
-	  value -= irel->r_offset;
-	  value += irel->r_addend;
-
-	  /* See if the value will fit in 8 bits, note the high value is
-	     0x7f + 1 as the target will be one bytes closer if we are
-	     able to relax.  */
-	  if ((long)value < 0x80 && (long)value > -0x80)
-	    {
-	      unsigned char code;
-
-	      /* Get the opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      if (code != 0xcc)
-		continue;
-
-	      /* Note that we've changed the relocs, section contents, etc.  */
-	      elf_section_data (sec)->relocs = internal_relocs;
-	      free_relocs = NULL;
-
-	      elf_section_data (sec)->this_hdr.contents = contents;
-	      free_contents = NULL;
-
-	      symtab_hdr->contents = (bfd_byte *) extsyms;
-	      free_extsyms = NULL;
-
-	      /* Fix the opcode.  */
-	      bfd_put_8 (abfd, 0xca, contents + irel->r_offset - 1);
-
-	      /* Fix the relocation's type.  */
-	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-					   R_MN10300_PCREL8);
-
-	      /* Delete one byte of data.  */
-	      if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-						   irel->r_offset + 1, 1))
-		goto error_return;
-
-	      /* That will change things, so, we should relax again.
-		 Note that this is not required, and it may be slow.  */
-	      *again = true;
-	    }
-	}
-
-      /* Try to eliminate an unconditional 8 bit pc-relative branch
-	 which immediately follows a conditional 8 bit pc-relative
-	 branch around the unconditional branch.
-
-	    original:		new:
-	    bCC lab1		bCC' lab2
-	    bra lab2
-	   lab1:	       lab1:
-
-
-	 This happens when the bCC can't reach lab2 at assembly time,
-	 but due to other relaxations it can reach at link time.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_PCREL8)
-	{
-	  Elf_Internal_Rela *nrel;
-	  bfd_vma value = symval;
-	  unsigned char code;
-
-	  /* Deal with pc-relative gunk.  */
-	  value -= (sec->output_section->vma + sec->output_offset);
-	  value -= irel->r_offset;
-	  value += irel->r_addend;
-
-	  /* Do nothing if this reloc is the last byte in the section.  */
-	  if (irel->r_offset == sec->_cooked_size)
-	    continue;
-
-	  /* See if the next instruction is an unconditional pc-relative
-	     branch, more often than not this test will fail, so we
-	     test it first to speed things up.  */
-	  code = bfd_get_8 (abfd, contents + irel->r_offset + 1);
-	  if (code != 0xca)
-	    continue;
-
-	  /* Also make sure the next relocation applies to the next
-	     instruction and that it's a pc-relative 8 bit branch.  */
-	  nrel = irel + 1;
-	  if (nrel == irelend
-	      || irel->r_offset + 2 != nrel->r_offset
-	      || ELF32_R_TYPE (nrel->r_info) != (int) R_MN10300_PCREL8)
-	    continue;
-
-	  /* Make sure our destination immediately follows the
-	     unconditional branch.  */
-	  if (symval != (sec->output_section->vma + sec->output_offset
-			 + irel->r_offset + 3))
-	    continue;
-
-	  /* Now make sure we are a conditional branch.  This may not
-	     be necessary, but why take the chance.
-
-	     Note these checks assume that R_MN10300_PCREL8 relocs
-	     only occur on bCC and bCCx insns.  If they occured
-	     elsewhere, we'd need to know the start of this insn
-	     for this check to be accurate.  */
-	  code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-	  if (code != 0xc0 && code != 0xc1 && code != 0xc2
-	      && code != 0xc3 && code != 0xc4 && code != 0xc5
-	      && code != 0xc6 && code != 0xc7 && code != 0xc8
-	      && code != 0xc9 && code != 0xe8 && code != 0xe9
-	      && code != 0xea && code != 0xeb)
-	    continue;
-
-	  /* We also have to be sure there is no symbol/label
-	     at the unconditional branch.  */
-	  if (mn10300_elf_symbol_address_p (abfd, sec, extsyms,
-					    irel->r_offset + 1))
-	    continue;
-
-	  /* Note that we've changed the relocs, section contents, etc.  */
-	  elf_section_data (sec)->relocs = internal_relocs;
-	  free_relocs = NULL;
-
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	  free_contents = NULL;
-
-	  symtab_hdr->contents = (bfd_byte *) extsyms;
-	  free_extsyms = NULL;
-
-	  /* Reverse the condition of the first branch.  */
-	  switch (code)
-	    {
-	      case 0xc8:
-		code = 0xc9;
-		break;
-	      case 0xc9:
-		code = 0xc8;
-		break;
-	      case 0xc0:
-		code = 0xc2;
-		break;
-	      case 0xc2:
-		code = 0xc0;
-		break;
-	      case 0xc3:
-		code = 0xc1;
-		break;
-	      case 0xc1:
-		code = 0xc3;
-		break;
-	      case 0xc4:
-		code = 0xc6;
-		break;
-	      case 0xc6:
-		code = 0xc4;
-		break;
-	      case 0xc7:
-		code = 0xc5;
-		break;
-	      case 0xc5:
-		code = 0xc7;
-		break;
-	      case 0xe8:
-		code = 0xe9;
-		break;
-	      case 0x9d:
-		code = 0xe8;
-		break;
-	      case 0xea:
-		code = 0xeb;
-		break;
-	      case 0xeb:
-		code = 0xea;
-		break;
-	    }
-	  bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
-
-	  /* Set the reloc type and symbol for the first branch
-	     from the second branch.  */
-	  irel->r_info = nrel->r_info;
-
-	  /* Make the reloc for the second branch a null reloc.  */
-	  nrel->r_info = ELF32_R_INFO (ELF32_R_SYM (nrel->r_info),
-				       R_MN10300_NONE);
-
-	  /* Delete two bytes of data.  */
-	  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-					       irel->r_offset + 1, 2))
-	    goto error_return;
-
-	  /* That will change things, so, we should relax again.
-	     Note that this is not required, and it may be slow.  */
-	  *again = true;
-	}
-
-
-      /* Try to turn a 32bit immediate, displacement or absolute address
-	 into a 16bit immediate, displacement or absolute address.  */
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_MN10300_32)
-	{
-	  bfd_vma value = symval;
-	  value += irel->r_addend;
-
-
-	  /* See if the value will fit in 16 bits.
-	     We allow any 16bit match here.  We prune those we can't
-	     handle below.  */
-	  if ((long)value < 0x7fff && (long)value > -0x8000)
-	    {
-	      unsigned char code;
-
-	      /* Most insns which have 32bit operands are 6 bytes long;
-		 exceptions are pcrel insns and bit insns.
-
-		 We handle pcrel insns above.  We don't bother trying
-		 to handle the bit insns here.
-
-		 The first byte of the remaining insns will be 0xfc.  */
-
-	      /* Get the first opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 2);
-
-	      if (code != 0xfc)
-		continue;
-
-	      /* Get the second opcode.  */
-	      code = bfd_get_8 (abfd, contents + irel->r_offset - 1);
-
-	      if ((code & 0xf0) < 0x80)
-		switch (code & 0xf0)
-		  {
-		  /* mov (d32,am),dn   -> mov (d32,am),dn
-		     mov dm,(d32,am)   -> mov dn,(d32,am)
-		     mov (d32,am),an   -> mov (d32,am),an
-		     mov dm,(d32,am)   -> mov dn,(d32,am)
-		     movbu (d32,am),dn -> movbu (d32,am),dn
-		     movbu dm,(d32,am) -> movbu dn,(d32,am)
-		     movhu (d32,am),dn -> movhu (d32,am),dn
-		     movhu dm,(d32,am) -> movhu dn,(d32,am) */
-		  case 0x00:
-		  case 0x10:
-		  case 0x20:
-		  case 0x30:
-		  case 0x40:
-		  case 0x50:
-		  case 0x60:
-		  case 0x70:
-		    /* Not safe if the high bit is on as relaxing may
-		       move the value out of high mem and thus not fit
-		       in a signed 16bit value.  */
-		    if (code == 0xcc
-			&& (value & 0x8000))
-		      continue;
-
-		    /* Note that we've changed the relocation contents, etc.  */
-		    elf_section_data (sec)->relocs = internal_relocs;
-		    free_relocs = NULL;
-
-		    elf_section_data (sec)->this_hdr.contents = contents;
-		    free_contents = NULL;
-
-		    symtab_hdr->contents = (bfd_byte *) extsyms;
-		    free_extsyms = NULL;
-
-		    /* Fix the opcode.  */
-		    bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
-		    bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
-
-		    /* Fix the relocation's type.  */
-		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-						 R_MN10300_16);
-
-		    /* Delete two bytes of data.  */
-		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-							 irel->r_offset + 2, 2))
-		      goto error_return;
-
-		    /* That will change things, so, we should relax again.
-		       Note that this is not required, and it may be slow.  */
-		    *again = true;
-		    break;
-		  }
-	      else if ((code & 0xf0) == 0x80
-		       || (code & 0xf0) == 0x90)
-		switch (code & 0xf3)
-		  {
-		  /* mov dn,(abs32)   -> mov dn,(abs16)
-		     movbu dn,(abs32) -> movbu dn,(abs16)
-		     movhu dn,(abs32) -> movhu dn,(abs16)  */
-		  case 0x81:
-		  case 0x82:
-		  case 0x83:
-		    /* Note that we've changed the relocation contents, etc.  */
-		    elf_section_data (sec)->relocs = internal_relocs;
-		    free_relocs = NULL;
-
-		    elf_section_data (sec)->this_hdr.contents = contents;
-		    free_contents = NULL;
-
-		    symtab_hdr->contents = (bfd_byte *) extsyms;
-		    free_extsyms = NULL;
-
-		    if ((code & 0xf3) == 0x81)
-		      code = 0x01 + (code & 0x0c);
-		    else if ((code & 0xf3) == 0x82)
-		      code = 0x02 + (code & 0x0c);
-		    else if ((code & 0xf3) == 0x83)
-		      code = 0x03 + (code & 0x0c);
-		    else
-		      abort ();
-
-		    /* Fix the opcode.  */
-		    bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
-
-		    /* Fix the relocation's type.  */
-		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-						 R_MN10300_16);
-
-		    /* The opcode got shorter too, so we have to fix the
-		       addend and offset too!  */
-		    irel->r_offset -= 1;
-
-		    /* Delete three bytes of data.  */
-		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-							 irel->r_offset + 1, 3))
-		      goto error_return;
-
-		    /* That will change things, so, we should relax again.
-		       Note that this is not required, and it may be slow.  */
-		    *again = true;
-		    break;
-
-		  /* mov am,(abs32)    -> mov am,(abs16)
-		     mov am,(d32,sp)   -> mov am,(d16,sp)
-		     mov dm,(d32,sp)   -> mov dm,(d32,sp)
-		     movbu dm,(d32,sp) -> movbu dm,(d32,sp)
-		     movhu dm,(d32,sp) -> movhu dm,(d32,sp) */
-		  case 0x80:
-		  case 0x90:
-		  case 0x91:
-		  case 0x92:
-		  case 0x93:
-		    /* Note that we've changed the relocation contents, etc.  */
-		    elf_section_data (sec)->relocs = internal_relocs;
-		    free_relocs = NULL;
-
-		    elf_section_data (sec)->this_hdr.contents = contents;
-		    free_contents = NULL;
-
-		    symtab_hdr->contents = (bfd_byte *) extsyms;
-		    free_extsyms = NULL;
-
-		    /* Fix the opcode.  */
-		    bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
-		    bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
-
-		    /* Fix the relocation's type.  */
-		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-						 R_MN10300_16);
-
-		    /* Delete two bytes of data.  */
-		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-							 irel->r_offset + 2, 2))
-		      goto error_return;
-
-		    /* That will change things, so, we should relax again.
-		       Note that this is not required, and it may be slow.  */
-		    *again = true;
-		    break;
-		  }
-	      else if ((code & 0xf0) < 0xf0)
-		switch (code & 0xfc)
-		  {
-		  /* mov imm32,dn     -> mov imm16,dn
-		     mov imm32,an     -> mov imm16,an
-		     mov (abs32),dn   -> mov (abs16),dn
-		     movbu (abs32),dn -> movbu (abs16),dn
-		     movhu (abs32),dn -> movhu (abs16),dn  */
-		  case 0xcc:
-		  case 0xdc:
-		  case 0xa4:
-		  case 0xa8:
-		  case 0xac:
-		    /* Not safe if the high bit is on as relaxing may
-		       move the value out of high mem and thus not fit
-		       in a signed 16bit value.  */
-		    if (code == 0xcc
-			&& (value & 0x8000))
-		      continue;
-
-		    /* Note that we've changed the relocation contents, etc.  */
-		    elf_section_data (sec)->relocs = internal_relocs;
-		    free_relocs = NULL;
-
-		    elf_section_data (sec)->this_hdr.contents = contents;
-		    free_contents = NULL;
-
-		    symtab_hdr->contents = (bfd_byte *) extsyms;
-		    free_extsyms = NULL;
-
-		    if ((code & 0xfc) == 0xcc)
-		      code = 0x2c + (code & 0x03);
-		    else if ((code & 0xfc) == 0xdc)
-		      code = 0x24 + (code & 0x03);
-		    else if ((code & 0xfc) == 0xa4)
-		      code = 0x30 + (code & 0x03);
-		    else if ((code & 0xfc) == 0xa8)
-		      code = 0x34 + (code & 0x03);
-		    else if ((code & 0xfc) == 0xac)
-		      code = 0x38 + (code & 0x03);
-		    else
-		      abort ();
-
-		    /* Fix the opcode.  */
-		    bfd_put_8 (abfd, code, contents + irel->r_offset - 2);
-
-		    /* Fix the relocation's type.  */
-		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-						 R_MN10300_16);
-
-		    /* The opcode got shorter too, so we have to fix the
-		       addend and offset too!  */
-		    irel->r_offset -= 1;
-
-		    /* Delete three bytes of data.  */
-		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-							 irel->r_offset + 1, 3))
-		      goto error_return;
-
-		    /* That will change things, so, we should relax again.
-		       Note that this is not required, and it may be slow.  */
-		    *again = true;
-		    break;
-
-		  /* mov (abs32),an    -> mov (abs16),an
-		     mov (d32,sp),an   -> mov (d32,sp),an
-		     mov (d32,sp),dn   -> mov (d32,sp),dn
-		     movbu (d32,sp),dn -> movbu (d32,sp),dn
-		     movhu (d32,sp),dn -> movhu (d32,sp),dn
-		     add imm32,dn      -> add imm16,dn
-		     cmp imm32,dn      -> cmp imm16,dn
-		     add imm32,an      -> add imm16,an
-		     cmp imm32,an      -> cmp imm16,an
-		     and imm32,dn      -> and imm32,dn
-		     or imm32,dn       -> or imm32,dn
-		     xor imm32,dn      -> xor imm32,dn
-		     btst imm32,dn     -> btst imm32,dn */
-
-		  case 0xa0:
-		  case 0xb0:
-		  case 0xb1:
-		  case 0xb2:
-		  case 0xb3:
-		  case 0xc0:
-		  case 0xc8:
-
-		  case 0xd0:
-		  case 0xd8:
-		  case 0xe0:
-		  case 0xe1:
-		  case 0xe2:
-		  case 0xe3:
-		    /* Note that we've changed the relocation contents, etc.  */
-		    elf_section_data (sec)->relocs = internal_relocs;
-		    free_relocs = NULL;
-
-		    elf_section_data (sec)->this_hdr.contents = contents;
-		    free_contents = NULL;
-
-		    symtab_hdr->contents = (bfd_byte *) extsyms;
-		    free_extsyms = NULL;
-
-		    /* Fix the opcode.  */
-		    bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
-		    bfd_put_8 (abfd, code, contents + irel->r_offset - 1);
-
-		    /* Fix the relocation's type.  */
-		    irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-						 R_MN10300_16);
-
-		    /* Delete two bytes of data.  */
-		    if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-							 irel->r_offset + 2, 2))
-		      goto error_return;
-
-		    /* That will change things, so, we should relax again.
-		       Note that this is not required, and it may be slow.  */
-		    *again = true;
-		    break;
-		  }
-	      else if (code == 0xfe)
-		{
-		  /* add imm32,sp -> add imm16,sp  */
-
-		  /* Note that we've changed the relocation contents, etc.  */
-		  elf_section_data (sec)->relocs = internal_relocs;
-		  free_relocs = NULL;
-
-		  elf_section_data (sec)->this_hdr.contents = contents;
-		  free_contents = NULL;
-
-		  symtab_hdr->contents = (bfd_byte *) extsyms;
-		  free_extsyms = NULL;
-
-		  /* Fix the opcode.  */
-		  bfd_put_8 (abfd, 0xfa, contents + irel->r_offset - 2);
-		  bfd_put_8 (abfd, 0xfe, contents + irel->r_offset - 1);
-
-		  /* Fix the relocation's type.  */
-		  irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-						 R_MN10300_16);
-
-		  /* Delete two bytes of data.  */
-		  if (!mn10300_elf_relax_delete_bytes (abfd, sec,
-						       irel->r_offset + 2, 2))
-		    goto error_return;
-
-		  /* That will change things, so, we should relax again.
-		     Note that this is not required, and it may be slow.  */
-		  *again = true;
-		  break;
-		}
-	    }
-	}
-    }
-
-  if (free_relocs != NULL)
-    {
-      free (free_relocs);
-      free_relocs = NULL;
-    }
-
-  if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_contents);
-      else
-	{
-	  /* Cache the section contents for elf_link_input_bfd.  */
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	}
-      free_contents = NULL;
-    }
-
-  if (free_extsyms != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_extsyms);
-      else
-	{
-	  /* Cache the symbols for elf_link_input_bfd.  */
-	  symtab_hdr->contents = extsyms;
-	}
-      free_extsyms = NULL;
-    }
-
-  return true;
-
- error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-  return false;
-}
-
-/* Compute the stack size and movm arguments for the function
-   referred to by HASH at address ADDR in section with
-   contents CONTENTS, store the information in the hash table.  */
-static void
-compute_function_info (abfd, hash, addr, contents)
-     bfd *abfd;
-     struct elf32_mn10300_link_hash_entry *hash;
-     bfd_vma addr;
-     unsigned char *contents;
-{
-  unsigned char byte1, byte2;
-  /* We only care about a very small subset of the possible prologue
-     sequences here.  Basically we look for:
-
-     movm [d2,d3,a2,a3],sp (optional)
-     add <size>,sp (optional, and only for sizes which fit in an unsigned
-		    8 bit number)
-
-     If we find anything else, we quit.  */
-
-  /* Look for movm [regs],sp */
-  byte1 = bfd_get_8 (abfd, contents + addr);
-  byte2 = bfd_get_8 (abfd, contents + addr + 1);
-
-  if (byte1 == 0xcf)
-    {
-      hash->movm_args = byte2;
-      addr += 2;
-      byte1 = bfd_get_8 (abfd, contents + addr);
-      byte2 = bfd_get_8 (abfd, contents + addr + 1);
-    }
-
-  /* Now figure out how much stack space will be allocated by the movm
-     instruction.  We need this kept separate from the funtion's normal
-     stack space.  */
-  if (hash->movm_args)
-    {
-      /* Space for d2.  */
-      if (hash->movm_args & 0x80)
-	hash->movm_stack_size += 4;
-
-      /* Space for d3.  */
-      if (hash->movm_args & 0x40)
-	hash->movm_stack_size += 4;
-
-      /* Space for a2.  */
-      if (hash->movm_args & 0x20)
-	hash->movm_stack_size += 4;
-
-      /* Space for a3.  */
-      if (hash->movm_args & 0x10)
-	hash->movm_stack_size += 4;
-
-      /* "other" space.  d0, d1, a0, a1, mdr, lir, lar, 4 byte pad.  */
-      if (hash->movm_args & 0x08)
-	hash->movm_stack_size += 8 * 4;
-
-    }
-
-  /* Now look for the two stack adjustment variants.  */
-  if (byte1 == 0xf8 && byte2 == 0xfe)
-    {
-      int temp = bfd_get_8 (abfd, contents + addr + 2);
-      temp = ((temp & 0xff) ^ (~0x7f)) + 0x80;
-
-      hash->stack_size = -temp;
-    }
-  else if (byte1 == 0xfa && byte2 == 0xfe)
-    {
-      int temp = bfd_get_16 (abfd, contents + addr + 2);
-      temp = ((temp & 0xffff) ^ (~0x7fff)) + 0x8000;
-      temp = -temp;
-
-      if (temp < 255)
-	hash->stack_size = temp;
-    }
-
-  /* If the total stack to be allocated by the call instruction is more
-     than 255 bytes, then we can't remove the stack adjustment by using
-     "call" (we might still be able to remove the "movm" instruction.  */
-  if (hash->stack_size + hash->movm_stack_size > 255)
-    hash->stack_size = 0;
-
-  return;
-}
-
-/* Delete some bytes from a section while relaxing.  */
-
-static boolean
-mn10300_elf_relax_delete_bytes (abfd, sec, addr, count)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     int count;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf32_External_Sym *extsyms;
-  int shndx, index;
-  bfd_byte *contents;
-  Elf_Internal_Rela *irel, *irelend;
-  Elf_Internal_Rela *irelalign;
-  bfd_vma toaddr;
-  Elf32_External_Sym *esym, *esymend;
-  struct elf32_mn10300_link_hash_entry *sym_hash;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-
-  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-  contents = elf_section_data (sec)->this_hdr.contents;
-
-  /* The deletion must stop at the next ALIGN reloc for an aligment
-     power larger than the number of bytes we are deleting.  */
-
-  irelalign = NULL;
-  toaddr = sec->_cooked_size;
-
-  irel = elf_section_data (sec)->relocs;
-  irelend = irel + sec->reloc_count;
-
-  /* Actually delete the bytes.  */
-  memmove (contents + addr, contents + addr + count, toaddr - addr - count);
-  sec->_cooked_size -= count;
-
-  /* Adjust all the relocs.  */
-  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
-    {
-      /* Get the new reloc address.  */
-      if ((irel->r_offset > addr
-	   && irel->r_offset < toaddr))
-	irel->r_offset -= count;
-    }
-
-  /* Adjust the local symbols defined in this section.  */
-  esym = extsyms;
-  esymend = esym + symtab_hdr->sh_info;
-  for (; esym < esymend; esym++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-
-      if (isym.st_shndx == shndx
-	  && isym.st_value > addr
-	  && isym.st_value < toaddr)
-	{
-	  isym.st_value -= count;
-	  bfd_elf32_swap_symbol_out (abfd, &isym, esym);
-	}
-    }
-
-  /* Now adjust the global symbols defined in this section.  */
-  esym = extsyms + symtab_hdr->sh_info;
-  esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
-  for (index = 0; esym < esymend; esym++, index++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-      sym_hash = (struct elf32_mn10300_link_hash_entry *)
-		   (elf_sym_hashes (abfd)[index]);
-      if (isym.st_shndx == shndx
-	  && ((sym_hash)->root.root.type == bfd_link_hash_defined
-	      || (sym_hash)->root.root.type == bfd_link_hash_defweak)
-	  && (sym_hash)->root.root.u.def.section == sec
-	  && (sym_hash)->root.root.u.def.value > addr
-	  && (sym_hash)->root.root.u.def.value < toaddr)
-	{
-	  (sym_hash)->root.root.u.def.value -= count;
-	}
-    }
-
-  return true;
-}
-
-/* Return true if a symbol exists at the given address, else return
-   false.  */
-static boolean
-mn10300_elf_symbol_address_p (abfd, sec, extsyms, addr)
-     bfd *abfd;
-     asection *sec;
-     Elf32_External_Sym *extsyms;
-     bfd_vma addr;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  int shndx;
-  Elf32_External_Sym *esym, *esymend;
-  struct elf32_mn10300_link_hash_entry **sym_hash, **sym_hash_end;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-  /* Examine all the symbols.  */
-  esym = extsyms;
-  esymend = esym + symtab_hdr->sh_info;
-  for (; esym < esymend; esym++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-
-      if (isym.st_shndx == shndx
-	  && isym.st_value == addr)
-	return true;
-    }
-
-  sym_hash = (struct elf32_mn10300_link_hash_entry **)(elf_sym_hashes (abfd));
-  sym_hash_end = (sym_hash
-		  + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym)
-		     - symtab_hdr->sh_info));
-  for (; sym_hash < sym_hash_end; sym_hash++)
-    {
-      if (((*sym_hash)->root.root.type == bfd_link_hash_defined
-	   || (*sym_hash)->root.root.type == bfd_link_hash_defweak)
-	  && (*sym_hash)->root.root.u.def.section == sec
-	  && (*sym_hash)->root.root.u.def.value == addr)
-	return true;
-    }
-  return false;
-}
-
-/* This is a version of bfd_generic_get_relocated_section_contents
-   which uses mn10300_elf_relocate_section.  */
-
-static bfd_byte *
-mn10300_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
-					    data, relocateable, symbols)
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  asection *input_section = link_order->u.indirect.section;
-  bfd *input_bfd = input_section->owner;
-  asection **sections = NULL;
-  Elf_Internal_Rela *internal_relocs = NULL;
-  Elf32_External_Sym *external_syms = NULL;
-  Elf_Internal_Sym *internal_syms = NULL;
-
-  /* We only need to handle the case of relaxing, or of having a
-     particular set of section contents, specially.  */
-  if (relocateable
-      || elf_section_data (input_section)->this_hdr.contents == NULL)
-    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
-						       link_order, data,
-						       relocateable,
-						       symbols);
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
-	  input_section->_raw_size);
-
-  if ((input_section->flags & SEC_RELOC) != 0
-      && input_section->reloc_count > 0)
-    {
-      Elf_Internal_Sym *isymp;
-      asection **secpp;
-      Elf32_External_Sym *esym, *esymend;
-
-      if (symtab_hdr->contents != NULL)
-	external_syms = (Elf32_External_Sym *) symtab_hdr->contents;
-      else
-	{
-	  external_syms = ((Elf32_External_Sym *)
-			   bfd_malloc (symtab_hdr->sh_info
-				       * sizeof (Elf32_External_Sym)));
-	  if (external_syms == NULL && symtab_hdr->sh_info > 0)
-	    goto error_return;
-	  if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-	      || (bfd_read (external_syms, sizeof (Elf32_External_Sym),
-			    symtab_hdr->sh_info, input_bfd)
-		  != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym))))
-	    goto error_return;
-	}
-
-      internal_relocs = (_bfd_elf32_link_read_relocs
-			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
-      if (internal_relocs == NULL)
-	goto error_return;
-
-      internal_syms = ((Elf_Internal_Sym *)
-		       bfd_malloc (symtab_hdr->sh_info
-				   * sizeof (Elf_Internal_Sym)));
-      if (internal_syms == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      sections = (asection **) bfd_malloc (symtab_hdr->sh_info
-					   * sizeof (asection *));
-      if (sections == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      isymp = internal_syms;
-      secpp = sections;
-      esym = external_syms;
-      esymend = esym + symtab_hdr->sh_info;
-      for (; esym < esymend; ++esym, ++isymp, ++secpp)
-	{
-	  asection *isec;
-
-	  bfd_elf32_swap_symbol_in (input_bfd, esym, isymp);
-
-	  if (isymp->st_shndx == SHN_UNDEF)
-	    isec = bfd_und_section_ptr;
-	  else if (isymp->st_shndx > 0 && isymp->st_shndx < SHN_LORESERVE)
-	    isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
-	  else if (isymp->st_shndx == SHN_ABS)
-	    isec = bfd_abs_section_ptr;
-	  else if (isymp->st_shndx == SHN_COMMON)
-	    isec = bfd_com_section_ptr;
-	  else
-	    {
-	      /* Who knows?  */
-	      isec = NULL;
-	    }
-
-	  *secpp = isec;
-	}
-
-      if (! mn10300_elf_relocate_section (output_bfd, link_info, input_bfd,
-				     input_section, data, internal_relocs,
-				     internal_syms, sections))
-	goto error_return;
-
-      if (sections != NULL)
-	free (sections);
-      sections = NULL;
-      if (internal_syms != NULL)
-	free (internal_syms);
-      internal_syms = NULL;
-      if (external_syms != NULL && symtab_hdr->contents == NULL)
-	free (external_syms);
-      external_syms = NULL;
-      if (internal_relocs != elf_section_data (input_section)->relocs)
-	free (internal_relocs);
-      internal_relocs = NULL;
-    }
-
-  return data;
-
- error_return:
-  if (internal_relocs != NULL
-      && internal_relocs != elf_section_data (input_section)->relocs)
-    free (internal_relocs);
-  if (external_syms != NULL && symtab_hdr->contents == NULL)
-    free (external_syms);
-  if (internal_syms != NULL)
-    free (internal_syms);
-  if (sections != NULL)
-    free (sections);
-  return NULL;
-}
-
-/* Assorted hash table functions.  */
-
-/* Initialize an entry in the link hash table.  */
-
-/* Create an entry in an MN10300 ELF linker hash table.  */
-
-static struct bfd_hash_entry *
-elf32_mn10300_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct elf32_mn10300_link_hash_entry *ret =
-    (struct elf32_mn10300_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct elf32_mn10300_link_hash_entry *) NULL)
-    ret = ((struct elf32_mn10300_link_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct elf32_mn10300_link_hash_entry)));
-  if (ret == (struct elf32_mn10300_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct elf32_mn10300_link_hash_entry *)
-	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				     table, string));
-  if (ret != (struct elf32_mn10300_link_hash_entry *) NULL)
-    {
-      ret->direct_calls = 0;
-      ret->stack_size = 0;
-      ret->movm_stack_size = 0;
-      ret->flags = 0;
-      ret->movm_args = 0;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create an mn10300 ELF linker hash table.  */
-
-static struct bfd_link_hash_table *
-elf32_mn10300_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct elf32_mn10300_link_hash_table *ret;
-
-  ret = ((struct elf32_mn10300_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct elf32_mn10300_link_hash_table)));
-  if (ret == (struct elf32_mn10300_link_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
-				       elf32_mn10300_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  ret->flags = 0;
-  ret->static_hash_table
-    = ((struct elf32_mn10300_link_hash_table *)
-       bfd_alloc (abfd, sizeof (struct elf_link_hash_table)));
-  if (ret->static_hash_table == NULL)
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  if (! _bfd_elf_link_hash_table_init (&ret->static_hash_table->root, abfd,
-				       elf32_mn10300_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret->static_hash_table);
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-  return &ret->root.root;
-}
-
-static int
-elf_mn10300_mach (flags)
-     flagword flags;
-{
-  switch (flags & EF_MN10300_MACH)
-    {
-      case E_MN10300_MACH_MN10300:
-      default:
-        return bfd_mach_mn10300;
-
-    }
-}
-
-/* The final processing done just before writing out a MN10300 ELF object
-   file.  This gets the MN10300 architecture right based on the machine
-   number.  */
-
-/*ARGSUSED*/
-void
-_bfd_mn10300_elf_final_write_processing (abfd, linker)
-     bfd *abfd;
-     boolean linker;
-{
-  unsigned long val;
-  unsigned int i;
-  Elf_Internal_Shdr **hdrpp;
-  const char *name;
-  asection *sec;
-
-  switch (bfd_get_mach (abfd))
-    {
-      default:
-      case bfd_mach_mn10300:
-	val = E_MN10300_MACH_MN10300;
-	break;
-
-    }
-
-  elf_elfheader (abfd)->e_flags &= ~ (EF_MN10300_MACH);
-  elf_elfheader (abfd)->e_flags |= val;
-}
-
-boolean
-_bfd_mn10300_elf_object_p (abfd)
-     bfd *abfd;
-{
-  bfd_default_set_arch_mach (abfd, bfd_arch_mn10300,
-                             elf_mn10300_mach (elf_elfheader (abfd)->e_flags));
-  return true;
-}
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-
-boolean
-_bfd_mn10300_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
-      && bfd_get_mach (obfd) < bfd_get_mach (ibfd))
-    {
-      if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
-                               bfd_get_mach (ibfd)))
-        return false;
-    }
-
-  return true;
-}
-
-
-#define TARGET_LITTLE_SYM	bfd_elf32_mn10300_vec
-#define TARGET_LITTLE_NAME	"elf32-mn10300"
-#define ELF_ARCH		bfd_arch_mn10300
-#define ELF_MACHINE_CODE	EM_CYGNUS_MN10300
-#define ELF_MAXPAGESIZE		0x1000
-
-#define elf_info_to_howto		mn10300_info_to_howto
-#define elf_info_to_howto_rel		0
-#define elf_backend_can_gc_sections	1
-#define elf_backend_check_relocs	mn10300_elf_check_relocs
-#define elf_backend_gc_mark_hook	mn10300_elf_gc_mark_hook
-#define elf_backend_relocate_section	mn10300_elf_relocate_section
-#define bfd_elf32_bfd_relax_section	mn10300_elf_relax_section
-#define bfd_elf32_bfd_get_relocated_section_contents \
-				mn10300_elf_get_relocated_section_contents
-#define bfd_elf32_bfd_link_hash_table_create \
-				elf32_mn10300_link_hash_table_create
-
-#define elf_symbol_leading_char '_'
-
-/* So we can set bits in e_flags.  */
-#define elf_backend_final_write_processing \
-                                        _bfd_mn10300_elf_final_write_processing
-#define elf_backend_object_p            _bfd_mn10300_elf_object_p
-
-#define bfd_elf32_bfd_merge_private_bfd_data \
-                                        _bfd_mn10300_elf_merge_private_bfd_data
-
-
-#include "elf32-target.h"
diff --git a/bfd/elf.c b/bfd/elf.c
deleted file mode 100644
index ab010d46f4b..00000000000
--- a/bfd/elf.c
+++ /dev/null
@@ -1,5250 +0,0 @@
-/* ELF executable support for BFD.
-   Copyright 1993, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-
-SECTION
-	ELF backends
-
-	BFD support for ELF formats is being worked on.
-	Currently, the best supported back ends are for sparc and i386
-	(running svr4 or Solaris 2).
-
-	Documentation of the internals of the support code still needs
-	to be written.  The code is changing quickly enough that we
-	haven't bothered yet.
- */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#define ARCH_SIZE 0
-#include "elf-bfd.h"
-
-static INLINE struct elf_segment_map *make_mapping
-  PARAMS ((bfd *, asection **, unsigned int, unsigned int, boolean));
-static boolean map_sections_to_segments PARAMS ((bfd *));
-static int elf_sort_sections PARAMS ((const PTR, const PTR));
-static boolean assign_file_positions_for_segments PARAMS ((bfd *));
-static boolean assign_file_positions_except_relocs PARAMS ((bfd *));
-static boolean prep_headers PARAMS ((bfd *));
-static boolean swap_out_syms PARAMS ((bfd *, struct bfd_strtab_hash **, int));
-static boolean copy_private_bfd_data PARAMS ((bfd *, bfd *));
-static char *elf_read PARAMS ((bfd *, long, unsigned int));
-static void elf_fake_sections PARAMS ((bfd *, asection *, PTR));
-static boolean assign_section_numbers PARAMS ((bfd *));
-static INLINE int sym_is_global PARAMS ((bfd *, asymbol *));
-static boolean elf_map_symbols PARAMS ((bfd *));
-static bfd_size_type get_program_header_size PARAMS ((bfd *));
-
-/* Swap version information in and out.  The version information is
-   currently size independent.  If that ever changes, this code will
-   need to move into elfcode.h.  */
-
-/* Swap in a Verdef structure.  */
-
-void
-_bfd_elf_swap_verdef_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Verdef *src;
-     Elf_Internal_Verdef *dst;
-{
-  dst->vd_version = bfd_h_get_16 (abfd, src->vd_version);
-  dst->vd_flags   = bfd_h_get_16 (abfd, src->vd_flags);
-  dst->vd_ndx     = bfd_h_get_16 (abfd, src->vd_ndx);
-  dst->vd_cnt     = bfd_h_get_16 (abfd, src->vd_cnt);
-  dst->vd_hash    = bfd_h_get_32 (abfd, src->vd_hash);
-  dst->vd_aux     = bfd_h_get_32 (abfd, src->vd_aux);
-  dst->vd_next    = bfd_h_get_32 (abfd, src->vd_next);
-}
-
-/* Swap out a Verdef structure.  */
-
-void
-_bfd_elf_swap_verdef_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Verdef *src;
-     Elf_External_Verdef *dst;
-{
-  bfd_h_put_16 (abfd, src->vd_version, dst->vd_version);
-  bfd_h_put_16 (abfd, src->vd_flags, dst->vd_flags);
-  bfd_h_put_16 (abfd, src->vd_ndx, dst->vd_ndx);
-  bfd_h_put_16 (abfd, src->vd_cnt, dst->vd_cnt);
-  bfd_h_put_32 (abfd, src->vd_hash, dst->vd_hash);
-  bfd_h_put_32 (abfd, src->vd_aux, dst->vd_aux);
-  bfd_h_put_32 (abfd, src->vd_next, dst->vd_next);
-}
-
-/* Swap in a Verdaux structure.  */
-
-void
-_bfd_elf_swap_verdaux_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Verdaux *src;
-     Elf_Internal_Verdaux *dst;
-{
-  dst->vda_name = bfd_h_get_32 (abfd, src->vda_name);
-  dst->vda_next = bfd_h_get_32 (abfd, src->vda_next);
-}
-
-/* Swap out a Verdaux structure.  */
-
-void
-_bfd_elf_swap_verdaux_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Verdaux *src;
-     Elf_External_Verdaux *dst;
-{
-  bfd_h_put_32 (abfd, src->vda_name, dst->vda_name);
-  bfd_h_put_32 (abfd, src->vda_next, dst->vda_next);
-}
-
-/* Swap in a Verneed structure.  */
-
-void
-_bfd_elf_swap_verneed_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Verneed *src;
-     Elf_Internal_Verneed *dst;
-{
-  dst->vn_version = bfd_h_get_16 (abfd, src->vn_version);
-  dst->vn_cnt     = bfd_h_get_16 (abfd, src->vn_cnt);
-  dst->vn_file    = bfd_h_get_32 (abfd, src->vn_file);
-  dst->vn_aux     = bfd_h_get_32 (abfd, src->vn_aux);
-  dst->vn_next    = bfd_h_get_32 (abfd, src->vn_next);
-}
-
-/* Swap out a Verneed structure.  */
-
-void
-_bfd_elf_swap_verneed_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Verneed *src;
-     Elf_External_Verneed *dst;
-{
-  bfd_h_put_16 (abfd, src->vn_version, dst->vn_version);
-  bfd_h_put_16 (abfd, src->vn_cnt, dst->vn_cnt);
-  bfd_h_put_32 (abfd, src->vn_file, dst->vn_file);
-  bfd_h_put_32 (abfd, src->vn_aux, dst->vn_aux);
-  bfd_h_put_32 (abfd, src->vn_next, dst->vn_next);
-}
-
-/* Swap in a Vernaux structure.  */
-
-void
-_bfd_elf_swap_vernaux_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Vernaux *src;
-     Elf_Internal_Vernaux *dst;
-{
-  dst->vna_hash  = bfd_h_get_32 (abfd, src->vna_hash);
-  dst->vna_flags = bfd_h_get_16 (abfd, src->vna_flags);
-  dst->vna_other = bfd_h_get_16 (abfd, src->vna_other);
-  dst->vna_name  = bfd_h_get_32 (abfd, src->vna_name);
-  dst->vna_next  = bfd_h_get_32 (abfd, src->vna_next);
-}
-
-/* Swap out a Vernaux structure.  */
-
-void
-_bfd_elf_swap_vernaux_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Vernaux *src;
-     Elf_External_Vernaux *dst;
-{
-  bfd_h_put_32 (abfd, src->vna_hash, dst->vna_hash);
-  bfd_h_put_16 (abfd, src->vna_flags, dst->vna_flags);
-  bfd_h_put_16 (abfd, src->vna_other, dst->vna_other);
-  bfd_h_put_32 (abfd, src->vna_name, dst->vna_name);
-  bfd_h_put_32 (abfd, src->vna_next, dst->vna_next);
-}
-
-/* Swap in a Versym structure.  */
-
-void
-_bfd_elf_swap_versym_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Versym *src;
-     Elf_Internal_Versym *dst;
-{
-  dst->vs_vers = bfd_h_get_16 (abfd, src->vs_vers);
-}
-
-/* Swap out a Versym structure.  */
-
-void
-_bfd_elf_swap_versym_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Versym *src;
-     Elf_External_Versym *dst;
-{
-  bfd_h_put_16 (abfd, src->vs_vers, dst->vs_vers);
-}
-
-/* Standard ELF hash function.  Do not change this function; you will
-   cause invalid hash tables to be generated.  */
-unsigned long
-bfd_elf_hash (name)
-     CONST unsigned char *name;
-{
-  unsigned long h = 0;
-  unsigned long g;
-  int ch;
-
-  while ((ch = *name++) != '\0')
-    {
-      h = (h << 4) + ch;
-      if ((g = (h & 0xf0000000)) != 0)
-	{
-	  h ^= g >> 24;
-	  /* The ELF ABI says `h &= ~g', but this is equivalent in
-	     this case and on some machines one insn instead of two.  */
-	  h ^= g;
-	}
-    }
-  return h;
-}
-
-/* Read a specified number of bytes at a specified offset in an ELF
-   file, into a newly allocated buffer, and return a pointer to the
-   buffer. */
-
-static char *
-elf_read (abfd, offset, size)
-     bfd * abfd;
-     long offset;
-     unsigned int size;
-{
-  char *buf;
-
-  if ((buf = bfd_alloc (abfd, size)) == NULL)
-    return NULL;
-  if (bfd_seek (abfd, offset, SEEK_SET) == -1)
-    return NULL;
-  if (bfd_read ((PTR) buf, size, 1, abfd) != size)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_file_truncated);
-      return NULL;
-    }
-  return buf;
-}
-
-boolean
-bfd_elf_mkobject (abfd)
-     bfd * abfd;
-{
-  /* this just does initialization */
-  /* coff_mkobject zalloc's space for tdata.coff_obj_data ... */
-  elf_tdata (abfd) = (struct elf_obj_tdata *)
-    bfd_zalloc (abfd, sizeof (struct elf_obj_tdata));
-  if (elf_tdata (abfd) == 0)
-    return false;
-  /* since everything is done at close time, do we need any
-     initialization? */
-
-  return true;
-}
-
-boolean
-bfd_elf_mkcorefile (abfd)
-     bfd * abfd;
-{
-  /* I think this can be done just like an object file. */
-  return bfd_elf_mkobject (abfd);
-}
-
-char *
-bfd_elf_get_str_section (abfd, shindex)
-     bfd * abfd;
-     unsigned int shindex;
-{
-  Elf_Internal_Shdr **i_shdrp;
-  char *shstrtab = NULL;
-  unsigned int offset;
-  unsigned int shstrtabsize;
-
-  i_shdrp = elf_elfsections (abfd);
-  if (i_shdrp == 0 || i_shdrp[shindex] == 0)
-    return 0;
-
-  shstrtab = (char *) i_shdrp[shindex]->contents;
-  if (shstrtab == NULL)
-    {
-      /* No cached one, attempt to read, and cache what we read. */
-      offset = i_shdrp[shindex]->sh_offset;
-      shstrtabsize = i_shdrp[shindex]->sh_size;
-      shstrtab = elf_read (abfd, offset, shstrtabsize);
-      i_shdrp[shindex]->contents = (PTR) shstrtab;
-    }
-  return shstrtab;
-}
-
-char *
-bfd_elf_string_from_elf_section (abfd, shindex, strindex)
-     bfd * abfd;
-     unsigned int shindex;
-     unsigned int strindex;
-{
-  Elf_Internal_Shdr *hdr;
-
-  if (strindex == 0)
-    return "";
-
-  hdr = elf_elfsections (abfd)[shindex];
-
-  if (hdr->contents == NULL
-      && bfd_elf_get_str_section (abfd, shindex) == NULL)
-    return NULL;
-
-  if (strindex >= hdr->sh_size)
-    {
-      (*_bfd_error_handler)
-	(_("%s: invalid string offset %u >= %lu for section `%s'"),
-	 bfd_get_filename (abfd), strindex, (unsigned long) hdr->sh_size,
-	 ((shindex == elf_elfheader(abfd)->e_shstrndx
-	   && strindex == hdr->sh_name)
-	  ? ".shstrtab"
-	  : elf_string_from_elf_strtab (abfd, hdr->sh_name)));
-      return "";
-    }
-
-  return ((char *) hdr->contents) + strindex;
-}
-
-/* Make a BFD section from an ELF section.  We store a pointer to the
-   BFD section in the bfd_section field of the header.  */
-
-boolean
-_bfd_elf_make_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-     const char *name;
-{
-  asection *newsect;
-  flagword flags;
-
-  if (hdr->bfd_section != NULL)
-    {
-      BFD_ASSERT (strcmp (name,
-			  bfd_get_section_name (abfd, hdr->bfd_section)) == 0);
-      return true;
-    }
-
-  newsect = bfd_make_section_anyway (abfd, name);
-  if (newsect == NULL)
-    return false;
-
-  newsect->filepos = hdr->sh_offset;
-
-  if (! bfd_set_section_vma (abfd, newsect, hdr->sh_addr)
-      || ! bfd_set_section_size (abfd, newsect, hdr->sh_size)
-      || ! bfd_set_section_alignment (abfd, newsect,
-				      bfd_log2 (hdr->sh_addralign)))
-    return false;
-
-  flags = SEC_NO_FLAGS;
-  if (hdr->sh_type != SHT_NOBITS)
-    flags |= SEC_HAS_CONTENTS;
-  if ((hdr->sh_flags & SHF_ALLOC) != 0)
-    {
-      flags |= SEC_ALLOC;
-      if (hdr->sh_type != SHT_NOBITS)
-	flags |= SEC_LOAD;
-    }
-  if ((hdr->sh_flags & SHF_WRITE) == 0)
-    flags |= SEC_READONLY;
-  if ((hdr->sh_flags & SHF_EXECINSTR) != 0)
-    flags |= SEC_CODE;
-  else if ((flags & SEC_LOAD) != 0)
-    flags |= SEC_DATA;
-
-  /* The debugging sections appear to be recognized only by name, not
-     any sort of flag.  */
-  if (strncmp (name, ".debug", sizeof ".debug" - 1) == 0
-      || strncmp (name, ".line", sizeof ".line" - 1) == 0
-      || strncmp (name, ".stab", sizeof ".stab" - 1) == 0)
-    flags |= SEC_DEBUGGING;
-
-  /* As a GNU extension, if the name begins with .gnu.linkonce, we
-     only link a single copy of the section.  This is used to support
-     g++.  g++ will emit each template expansion in its own section.
-     The symbols will be defined as weak, so that multiple definitions
-     are permitted.  The GNU linker extension is to actually discard
-     all but one of the sections.  */
-  if (strncmp (name, ".gnu.linkonce", sizeof ".gnu.linkonce" - 1) == 0)
-    flags |= SEC_LINK_ONCE | SEC_LINK_DUPLICATES_DISCARD;
-
-  if (! bfd_set_section_flags (abfd, newsect, flags))
-    return false;
-
-  if ((flags & SEC_ALLOC) != 0)
-    {
-      Elf_Internal_Phdr *phdr;
-      unsigned int i;
-
-      /* Look through the phdrs to see if we need to adjust the lma.
-         If all the p_paddr fields are zero, we ignore them, since
-         some ELF linkers produce such output.  */
-      phdr = elf_tdata (abfd)->phdr;
-      for (i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++)
-	{
-	  if (phdr->p_paddr != 0)
-	    break;
-	}
-      if (i < elf_elfheader (abfd)->e_phnum)
-	{
-	  phdr = elf_tdata (abfd)->phdr;
-	  for (i = 0; i < elf_elfheader (abfd)->e_phnum; i++, phdr++)
-	    {
-	      if (phdr->p_type == PT_LOAD
-		  && phdr->p_vaddr != phdr->p_paddr
-		  && phdr->p_vaddr <= hdr->sh_addr
-		  && (phdr->p_vaddr + phdr->p_memsz
-		      >= hdr->sh_addr + hdr->sh_size)
-		  && ((flags & SEC_LOAD) == 0
-		      || (phdr->p_offset <= (bfd_vma) hdr->sh_offset
-			  && (phdr->p_offset + phdr->p_filesz
-			      >= hdr->sh_offset + hdr->sh_size))))
-		{
-		  newsect->lma += phdr->p_paddr - phdr->p_vaddr;
-		  break;
-		}
-	    }
-	}
-    }
-
-  hdr->bfd_section = newsect;
-  elf_section_data (newsect)->this_hdr = *hdr;
-
-  return true;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_elf_find_section
-
-SYNOPSIS
-	struct elf_internal_shdr *bfd_elf_find_section (bfd *abfd, char *name);
-
-DESCRIPTION
-	Helper functions for GDB to locate the string tables.
-	Since BFD hides string tables from callers, GDB needs to use an
-	internal hook to find them.  Sun's .stabstr, in particular,
-	isn't even pointed to by the .stab section, so ordinary
-	mechanisms wouldn't work to find it, even if we had some.
-*/
-
-struct elf_internal_shdr *
-bfd_elf_find_section (abfd, name)
-     bfd * abfd;
-     char *name;
-{
-  Elf_Internal_Shdr **i_shdrp;
-  char *shstrtab;
-  unsigned int max;
-  unsigned int i;
-
-  i_shdrp = elf_elfsections (abfd);
-  if (i_shdrp != NULL)
-    {
-      shstrtab = bfd_elf_get_str_section
-	(abfd, elf_elfheader (abfd)->e_shstrndx);
-      if (shstrtab != NULL)
-	{
-	  max = elf_elfheader (abfd)->e_shnum;
-	  for (i = 1; i < max; i++)
-	    if (!strcmp (&shstrtab[i_shdrp[i]->sh_name], name))
-	      return i_shdrp[i];
-	}
-    }
-  return 0;
-}
-
-const char *const bfd_elf_section_type_names[] = {
-  "SHT_NULL", "SHT_PROGBITS", "SHT_SYMTAB", "SHT_STRTAB",
-  "SHT_RELA", "SHT_HASH", "SHT_DYNAMIC", "SHT_NOTE",
-  "SHT_NOBITS", "SHT_REL", "SHT_SHLIB", "SHT_DYNSYM",
-};
-
-/* ELF relocs are against symbols.  If we are producing relocateable
-   output, and the reloc is against an external symbol, and nothing
-   has given us any additional addend, the resulting reloc will also
-   be against the same symbol.  In such a case, we don't want to
-   change anything about the way the reloc is handled, since it will
-   all be done at final link time.  Rather than put special case code
-   into bfd_perform_relocation, all the reloc types use this howto
-   function.  It just short circuits the reloc if producing
-   relocateable output against an external symbol.  */
-
-/*ARGSUSED*/
-bfd_reloc_status_type
-bfd_elf_generic_reloc (abfd,
-		       reloc_entry,
-		       symbol,
-		       data,
-		       input_section,
-		       output_bfd,
-		       error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! reloc_entry->howto->partial_inplace
-	  || reloc_entry->addend == 0))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  return bfd_reloc_continue;
-}
-
-/* Print out the program headers.  */
-
-boolean
-_bfd_elf_print_private_bfd_data (abfd, farg)
-     bfd *abfd;
-     PTR farg;
-{
-  FILE *f = (FILE *) farg;
-  Elf_Internal_Phdr *p;
-  asection *s;
-  bfd_byte *dynbuf = NULL;
-
-  p = elf_tdata (abfd)->phdr;
-  if (p != NULL)
-    {
-      unsigned int i, c;
-
-      fprintf (f, _("\nProgram Header:\n"));
-      c = elf_elfheader (abfd)->e_phnum;
-      for (i = 0; i < c; i++, p++)
-	{
-	  const char *s;
-	  char buf[20];
-
-	  switch (p->p_type)
-	    {
-	    case PT_NULL: s = "NULL"; break;
-	    case PT_LOAD: s = "LOAD"; break;
-	    case PT_DYNAMIC: s = "DYNAMIC"; break;
-	    case PT_INTERP: s = "INTERP"; break;
-	    case PT_NOTE: s = "NOTE"; break;
-	    case PT_SHLIB: s = "SHLIB"; break;
-	    case PT_PHDR: s = "PHDR"; break;
-	    default: sprintf (buf, "0x%lx", p->p_type); s = buf; break;
-	    }
-	  fprintf (f, "%8s off    0x", s);
-	  fprintf_vma (f, p->p_offset);
-	  fprintf (f, " vaddr 0x");
-	  fprintf_vma (f, p->p_vaddr);
-	  fprintf (f, " paddr 0x");
-	  fprintf_vma (f, p->p_paddr);
-	  fprintf (f, " align 2**%u\n", bfd_log2 (p->p_align));
-	  fprintf (f, "         filesz 0x");
-	  fprintf_vma (f, p->p_filesz);
-	  fprintf (f, " memsz 0x");
-	  fprintf_vma (f, p->p_memsz);
-	  fprintf (f, " flags %c%c%c",
-		   (p->p_flags & PF_R) != 0 ? 'r' : '-',
-		   (p->p_flags & PF_W) != 0 ? 'w' : '-',
-		   (p->p_flags & PF_X) != 0 ? 'x' : '-');
-	  if ((p->p_flags &~ (PF_R | PF_W | PF_X)) != 0)
-	    fprintf (f, " %lx", p->p_flags &~ (PF_R | PF_W | PF_X));
-	  fprintf (f, "\n");
-	}
-    }
-
-  s = bfd_get_section_by_name (abfd, ".dynamic");
-  if (s != NULL)
-    {
-      int elfsec;
-      unsigned long link;
-      bfd_byte *extdyn, *extdynend;
-      size_t extdynsize;
-      void (*swap_dyn_in) PARAMS ((bfd *, const PTR, Elf_Internal_Dyn *));
-
-      fprintf (f, _("\nDynamic Section:\n"));
-
-      dynbuf = (bfd_byte *) bfd_malloc (s->_raw_size);
-      if (dynbuf == NULL)
-	goto error_return;
-      if (! bfd_get_section_contents (abfd, s, (PTR) dynbuf, (file_ptr) 0,
-				      s->_raw_size))
-	goto error_return;
-
-      elfsec = _bfd_elf_section_from_bfd_section (abfd, s);
-      if (elfsec == -1)
-	goto error_return;
-      link = elf_elfsections (abfd)[elfsec]->sh_link;
-
-      extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn;
-      swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in;
-
-      extdyn = dynbuf;
-      extdynend = extdyn + s->_raw_size;
-      for (; extdyn < extdynend; extdyn += extdynsize)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  char ab[20];
-	  boolean stringp;
-
-	  (*swap_dyn_in) (abfd, (PTR) extdyn, &dyn);
-
-	  if (dyn.d_tag == DT_NULL)
-	    break;
-
-	  stringp = false;
-	  switch (dyn.d_tag)
-	    {
-	    default:
-	      sprintf (ab, "0x%lx", (unsigned long) dyn.d_tag);
-	      name = ab;
-	      break;
-
-	    case DT_NEEDED: name = "NEEDED"; stringp = true; break;
-	    case DT_PLTRELSZ: name = "PLTRELSZ"; break;
-	    case DT_PLTGOT: name = "PLTGOT"; break;
-	    case DT_HASH: name = "HASH"; break;
-	    case DT_STRTAB: name = "STRTAB"; break;
-	    case DT_SYMTAB: name = "SYMTAB"; break;
-	    case DT_RELA: name = "RELA"; break;
-	    case DT_RELASZ: name = "RELASZ"; break;
-	    case DT_RELAENT: name = "RELAENT"; break;
-	    case DT_STRSZ: name = "STRSZ"; break;
-	    case DT_SYMENT: name = "SYMENT"; break;
-	    case DT_INIT: name = "INIT"; break;
-	    case DT_FINI: name = "FINI"; break;
-	    case DT_SONAME: name = "SONAME"; stringp = true; break;
-	    case DT_RPATH: name = "RPATH"; stringp = true; break;
-	    case DT_SYMBOLIC: name = "SYMBOLIC"; break;
-	    case DT_REL: name = "REL"; break;
-	    case DT_RELSZ: name = "RELSZ"; break;
-	    case DT_RELENT: name = "RELENT"; break;
-	    case DT_PLTREL: name = "PLTREL"; break;
-	    case DT_DEBUG: name = "DEBUG"; break;
-	    case DT_TEXTREL: name = "TEXTREL"; break;
-	    case DT_JMPREL: name = "JMPREL"; break;
-	    case DT_AUXILIARY: name = "AUXILIARY"; stringp = true; break;
-	    case DT_FILTER: name = "FILTER"; stringp = true; break;
-	    case DT_VERSYM: name = "VERSYM"; break;
-	    case DT_VERDEF: name = "VERDEF"; break;
-	    case DT_VERDEFNUM: name = "VERDEFNUM"; break;
-	    case DT_VERNEED: name = "VERNEED"; break;
-	    case DT_VERNEEDNUM: name = "VERNEEDNUM"; break;
-	    }
-
-	  fprintf (f, "  %-11s ", name);
-	  if (! stringp)
-	    fprintf (f, "0x%lx", (unsigned long) dyn.d_un.d_val);
-	  else
-	    {
-	      const char *string;
-
-	      string = bfd_elf_string_from_elf_section (abfd, link,
-							dyn.d_un.d_val);
-	      if (string == NULL)
-		goto error_return;
-	      fprintf (f, "%s", string);
-	    }
-	  fprintf (f, "\n");
-	}
-
-      free (dynbuf);
-      dynbuf = NULL;
-    }
-
-  if ((elf_dynverdef (abfd) != 0 && elf_tdata (abfd)->verdef == NULL)
-      || (elf_dynverref (abfd) != 0 && elf_tdata (abfd)->verref == NULL))
-    {
-      if (! _bfd_elf_slurp_version_tables (abfd))
-	return false;
-    }
-
-  if (elf_dynverdef (abfd) != 0)
-    {
-      Elf_Internal_Verdef *t;
-
-      fprintf (f, _("\nVersion definitions:\n"));
-      for (t = elf_tdata (abfd)->verdef; t != NULL; t = t->vd_nextdef)
-	{
-	  fprintf (f, "%d 0x%2.2x 0x%8.8lx %s\n", t->vd_ndx,
-		   t->vd_flags, t->vd_hash, t->vd_nodename);
-	  if (t->vd_auxptr->vda_nextptr != NULL)
-	    {
-	      Elf_Internal_Verdaux *a;
-
-	      fprintf (f, "\t");
-	      for (a = t->vd_auxptr->vda_nextptr;
-		   a != NULL;
-		   a = a->vda_nextptr)
-		fprintf (f, "%s ", a->vda_nodename);
-	      fprintf (f, "\n");
-	    }
-	}
-    }
-
-  if (elf_dynverref (abfd) != 0)
-    {
-      Elf_Internal_Verneed *t;
-
-      fprintf (f, _("\nVersion References:\n"));
-      for (t = elf_tdata (abfd)->verref; t != NULL; t = t->vn_nextref)
-	{
-	  Elf_Internal_Vernaux *a;
-
-	  fprintf (f, _("  required from %s:\n"), t->vn_filename);
-	  for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
-	    fprintf (f, "    0x%8.8lx 0x%2.2x %2.2d %s\n", a->vna_hash,
-		     a->vna_flags, a->vna_other, a->vna_nodename);
-	}
-    }
-
-  return true;
-
- error_return:
-  if (dynbuf != NULL)
-    free (dynbuf);
-  return false;
-}
-
-/* Display ELF-specific fields of a symbol.  */
-
-void
-bfd_elf_print_symbol (abfd, filep, symbol, how)
-     bfd *abfd;
-     PTR filep;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) filep;
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-    case bfd_print_symbol_more:
-      fprintf (file, "elf ");
-      fprintf_vma (file, symbol->value);
-      fprintf (file, " %lx", (long) symbol->flags);
-      break;
-    case bfd_print_symbol_all:
-      {
-	CONST char *section_name;
-	section_name = symbol->section ? symbol->section->name : "(*none*)";
-	bfd_print_symbol_vandf ((PTR) file, symbol);
-	fprintf (file, " %s\t", section_name);
-	/* Print the "other" value for a symbol.  For common symbols,
-	   we've already printed the size; now print the alignment.
-	   For other symbols, we have no specified alignment, and
-	   we've printed the address; now print the size.  */
-	fprintf_vma (file,
-		     (bfd_is_com_section (symbol->section)
-		      ? ((elf_symbol_type *) symbol)->internal_elf_sym.st_value
-		      : ((elf_symbol_type *) symbol)->internal_elf_sym.st_size));
-
-	/* If we have version information, print it.  */
-	if (elf_tdata (abfd)->dynversym_section != 0
-	    && (elf_tdata (abfd)->dynverdef_section != 0
-		|| elf_tdata (abfd)->dynverref_section != 0))
-	  {
-	    unsigned int vernum;
-	    const char *version_string;
-
-	    vernum = ((elf_symbol_type *) symbol)->version & VERSYM_VERSION;
-
-	    if (vernum == 0)
-	      version_string = "";
-	    else if (vernum == 1)
-	      version_string = "Base";
-	    else if (vernum <= elf_tdata (abfd)->cverdefs)
-	      version_string =
-		elf_tdata (abfd)->verdef[vernum - 1].vd_nodename;
-	    else
-	      {
-		Elf_Internal_Verneed *t;
-
-		version_string = "";
-		for (t = elf_tdata (abfd)->verref;
-		     t != NULL;
-		     t = t->vn_nextref)
-		  {
-		    Elf_Internal_Vernaux *a;
-
-		    for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
-		      {
-			if (a->vna_other == vernum)
-			  {
-			    version_string = a->vna_nodename;
-			    break;
-			  }
-		      }
-		  }
-	      }
-
-	    if ((((elf_symbol_type *) symbol)->version & VERSYM_HIDDEN) == 0)
-	      fprintf (file, "  %-11s", version_string);
-	    else
-	      {
-		int i;
-
-		fprintf (file, " (%s)", version_string);
-		for (i = 10 - strlen (version_string); i > 0; --i)
-		  putc (' ', file);
-	      }
-	  }
-
-	/* If the st_other field is not zero, print it.  */
-	if (((elf_symbol_type *) symbol)->internal_elf_sym.st_other != 0)
-	  fprintf (file, " 0x%02x",
-		   ((unsigned int)
-		    ((elf_symbol_type *) symbol)->internal_elf_sym.st_other));
-
-	fprintf (file, " %s", symbol->name);
-      }
-      break;
-    }
-}
-
-/* Create an entry in an ELF linker hash table.  */
-
-struct bfd_hash_entry *
-_bfd_elf_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct elf_link_hash_entry *ret = (struct elf_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct elf_link_hash_entry *) NULL)
-    ret = ((struct elf_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct elf_link_hash_entry)));
-  if (ret == (struct elf_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct elf_link_hash_entry *)
-	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				 table, string));
-  if (ret != (struct elf_link_hash_entry *) NULL)
-    {
-      /* Set local fields.  */
-      ret->indx = -1;
-      ret->size = 0;
-      ret->dynindx = -1;
-      ret->dynstr_index = 0;
-      ret->weakdef = NULL;
-      ret->got.offset = (bfd_vma) -1;
-      ret->plt.offset = (bfd_vma) -1;
-      ret->linker_section_pointer = (elf_linker_section_pointers_t *)0;
-      ret->verinfo.verdef = NULL;
-      ret->vtable_entries_used = NULL;
-      ret->vtable_entries_size = 0;
-      ret->vtable_parent = NULL;
-      ret->type = STT_NOTYPE;
-      ret->other = 0;
-      /* Assume that we have been called by a non-ELF symbol reader.
-         This flag is then reset by the code which reads an ELF input
-         file.  This ensures that a symbol created by a non-ELF symbol
-         reader will have the flag set correctly.  */
-      ret->elf_link_hash_flags = ELF_LINK_NON_ELF;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize an ELF linker hash table.  */
-
-boolean
-_bfd_elf_link_hash_table_init (table, abfd, newfunc)
-     struct elf_link_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  table->dynamic_sections_created = false;
-  table->dynobj = NULL;
-  /* The first dynamic symbol is a dummy.  */
-  table->dynsymcount = 1;
-  table->dynstr = NULL;
-  table->bucketcount = 0;
-  table->needed = NULL;
-  table->hgot = NULL;
-  table->stab_info = NULL;
-  return _bfd_link_hash_table_init (&table->root, abfd, newfunc);
-}
-
-/* Create an ELF linker hash table.  */
-
-struct bfd_link_hash_table *
-_bfd_elf_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct elf_link_hash_table *ret;
-
-  ret = ((struct elf_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct elf_link_hash_table)));
-  if (ret == (struct elf_link_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_elf_link_hash_table_init (ret, abfd, _bfd_elf_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  return &ret->root;
-}
-
-/* This is a hook for the ELF emulation code in the generic linker to
-   tell the backend linker what file name to use for the DT_NEEDED
-   entry for a dynamic object.  The generic linker passes name as an
-   empty string to indicate that no DT_NEEDED entry should be made.  */
-
-void
-bfd_elf_set_dt_needed_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
-      && bfd_get_format (abfd) == bfd_object)
-    elf_dt_name (abfd) = name;
-}
-
-/* Get the list of DT_NEEDED entries for a link.  This is a hook for
-   the linker ELF emulation code.  */
-
-struct bfd_link_needed_list *
-bfd_elf_get_needed_list (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  if (info->hash->creator->flavour != bfd_target_elf_flavour)
-    return NULL;
-  return elf_hash_table (info)->needed;
-}
-
-/* Get the name actually used for a dynamic object for a link.  This
-   is the SONAME entry if there is one.  Otherwise, it is the string
-   passed to bfd_elf_set_dt_needed_name, or it is the filename.  */
-
-const char *
-bfd_elf_get_dt_soname (abfd)
-     bfd *abfd;
-{
-  if (bfd_get_flavour (abfd) == bfd_target_elf_flavour
-      && bfd_get_format (abfd) == bfd_object)
-    return elf_dt_name (abfd);
-  return NULL;
-}
-
-/* Get the list of DT_NEEDED entries from a BFD.  This is a hook for
-   the ELF linker emulation code.  */
-
-boolean
-bfd_elf_get_bfd_needed_list (abfd, pneeded)
-     bfd *abfd;
-     struct bfd_link_needed_list **pneeded;
-{
-  asection *s;
-  bfd_byte *dynbuf = NULL;
-  int elfsec;
-  unsigned long link;
-  bfd_byte *extdyn, *extdynend;
-  size_t extdynsize;
-  void (*swap_dyn_in) PARAMS ((bfd *, const PTR, Elf_Internal_Dyn *));
-
-  *pneeded = NULL;
-
-  if (bfd_get_flavour (abfd) != bfd_target_elf_flavour
-      || bfd_get_format (abfd) != bfd_object)
-    return true;
-
-  s = bfd_get_section_by_name (abfd, ".dynamic");
-  if (s == NULL || s->_raw_size == 0)
-    return true;
-
-  dynbuf = (bfd_byte *) bfd_malloc (s->_raw_size);
-  if (dynbuf == NULL)
-    goto error_return;
-
-  if (! bfd_get_section_contents (abfd, s, (PTR) dynbuf, (file_ptr) 0,
-				  s->_raw_size))
-    goto error_return;
-
-  elfsec = _bfd_elf_section_from_bfd_section (abfd, s);
-  if (elfsec == -1)
-    goto error_return;
-
-  link = elf_elfsections (abfd)[elfsec]->sh_link;
-
-  extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn;
-  swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in;
-
-  extdyn = dynbuf;
-  extdynend = extdyn + s->_raw_size;
-  for (; extdyn < extdynend; extdyn += extdynsize)
-    {
-      Elf_Internal_Dyn dyn;
-
-      (*swap_dyn_in) (abfd, (PTR) extdyn, &dyn);
-
-      if (dyn.d_tag == DT_NULL)
-	break;
-
-      if (dyn.d_tag == DT_NEEDED)
-	{
-	  const char *string;
-	  struct bfd_link_needed_list *l;
-
-	  string = bfd_elf_string_from_elf_section (abfd, link,
-						    dyn.d_un.d_val);
-	  if (string == NULL)
-	    goto error_return;
-
-	  l = (struct bfd_link_needed_list *) bfd_alloc (abfd, sizeof *l);
-	  if (l == NULL)
-	    goto error_return;
-
-	  l->by = abfd;
-	  l->name = string;
-	  l->next = *pneeded;
-	  *pneeded = l;
-	}
-    }
-
-  free (dynbuf);
-
-  return true;
-
- error_return:
-  if (dynbuf != NULL)
-    free (dynbuf);
-  return false;
-}
-
-/* Allocate an ELF string table--force the first byte to be zero.  */
-
-struct bfd_strtab_hash *
-_bfd_elf_stringtab_init ()
-{
-  struct bfd_strtab_hash *ret;
-
-  ret = _bfd_stringtab_init ();
-  if (ret != NULL)
-    {
-      bfd_size_type loc;
-
-      loc = _bfd_stringtab_add (ret, "", true, false);
-      BFD_ASSERT (loc == 0 || loc == (bfd_size_type) -1);
-      if (loc == (bfd_size_type) -1)
-	{
-	  _bfd_stringtab_free (ret);
-	  ret = NULL;
-	}
-    }
-  return ret;
-}
-
-/* ELF .o/exec file reading */
-
-/* Create a new bfd section from an ELF section header. */
-
-boolean
-bfd_section_from_shdr (abfd, shindex)
-     bfd *abfd;
-     unsigned int shindex;
-{
-  Elf_Internal_Shdr *hdr = elf_elfsections (abfd)[shindex];
-  Elf_Internal_Ehdr *ehdr = elf_elfheader (abfd);
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  char *name;
-
-  name = elf_string_from_elf_strtab (abfd, hdr->sh_name);
-
-  switch (hdr->sh_type)
-    {
-    case SHT_NULL:
-      /* Inactive section. Throw it away.  */
-      return true;
-
-    case SHT_PROGBITS:	/* Normal section with contents.  */
-    case SHT_DYNAMIC:	/* Dynamic linking information.  */
-    case SHT_NOBITS:	/* .bss section.  */
-    case SHT_HASH:	/* .hash section.  */
-    case SHT_NOTE:	/* .note section.  */
-      return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
-
-    case SHT_SYMTAB:		/* A symbol table */
-      if (elf_onesymtab (abfd) == shindex)
-	return true;
-
-      BFD_ASSERT (hdr->sh_entsize == bed->s->sizeof_sym);
-      BFD_ASSERT (elf_onesymtab (abfd) == 0);
-      elf_onesymtab (abfd) = shindex;
-      elf_tdata (abfd)->symtab_hdr = *hdr;
-      elf_elfsections (abfd)[shindex] = hdr = &elf_tdata (abfd)->symtab_hdr;
-      abfd->flags |= HAS_SYMS;
-
-      /* Sometimes a shared object will map in the symbol table.  If
-         SHF_ALLOC is set, and this is a shared object, then we also
-         treat this section as a BFD section.  We can not base the
-         decision purely on SHF_ALLOC, because that flag is sometimes
-         set in a relocateable object file, which would confuse the
-         linker.  */
-      if ((hdr->sh_flags & SHF_ALLOC) != 0
-	  && (abfd->flags & DYNAMIC) != 0
-	  && ! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-	return false;
-
-      return true;
-
-    case SHT_DYNSYM:		/* A dynamic symbol table */
-      if (elf_dynsymtab (abfd) == shindex)
-	return true;
-
-      BFD_ASSERT (hdr->sh_entsize == bed->s->sizeof_sym);
-      BFD_ASSERT (elf_dynsymtab (abfd) == 0);
-      elf_dynsymtab (abfd) = shindex;
-      elf_tdata (abfd)->dynsymtab_hdr = *hdr;
-      elf_elfsections (abfd)[shindex] = hdr = &elf_tdata (abfd)->dynsymtab_hdr;
-      abfd->flags |= HAS_SYMS;
-
-      /* Besides being a symbol table, we also treat this as a regular
-	 section, so that objcopy can handle it.  */
-      return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
-
-    case SHT_STRTAB:		/* A string table */
-      if (hdr->bfd_section != NULL)
-	return true;
-      if (ehdr->e_shstrndx == shindex)
-	{
-	  elf_tdata (abfd)->shstrtab_hdr = *hdr;
-	  elf_elfsections (abfd)[shindex] = &elf_tdata (abfd)->shstrtab_hdr;
-	  return true;
-	}
-      {
-	unsigned int i;
-
-	for (i = 1; i < ehdr->e_shnum; i++)
-	  {
-	    Elf_Internal_Shdr *hdr2 = elf_elfsections (abfd)[i];
-	    if (hdr2->sh_link == shindex)
-	      {
-		if (! bfd_section_from_shdr (abfd, i))
-		  return false;
-		if (elf_onesymtab (abfd) == i)
-		  {
-		    elf_tdata (abfd)->strtab_hdr = *hdr;
-		    elf_elfsections (abfd)[shindex] =
-		      &elf_tdata (abfd)->strtab_hdr;
-		    return true;
-		  }
-		if (elf_dynsymtab (abfd) == i)
-		  {
-		    elf_tdata (abfd)->dynstrtab_hdr = *hdr;
-		    elf_elfsections (abfd)[shindex] = hdr =
-		      &elf_tdata (abfd)->dynstrtab_hdr;
-		    /* We also treat this as a regular section, so
-		       that objcopy can handle it.  */
-		    break;
-		  }
-#if 0 /* Not handling other string tables specially right now.  */
-		hdr2 = elf_elfsections (abfd)[i];	/* in case it moved */
-		/* We have a strtab for some random other section.  */
-		newsect = (asection *) hdr2->bfd_section;
-		if (!newsect)
-		  break;
-		hdr->bfd_section = newsect;
-		hdr2 = &elf_section_data (newsect)->str_hdr;
-		*hdr2 = *hdr;
-		elf_elfsections (abfd)[shindex] = hdr2;
-#endif
-	      }
-	  }
-      }
-
-      return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
-
-    case SHT_REL:
-    case SHT_RELA:
-      /* *These* do a lot of work -- but build no sections!  */
-      {
-	asection *target_sect;
-	Elf_Internal_Shdr *hdr2;
-
-	/* For some incomprehensible reason Oracle distributes
-	   libraries for Solaris in which some of the objects have
-	   bogus sh_link fields.  It would be nice if we could just
-	   reject them, but, unfortunately, some people need to use
-	   them.  We scan through the section headers; if we find only
-	   one suitable symbol table, we clobber the sh_link to point
-	   to it.  I hope this doesn't break anything.  */
-	if (elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_SYMTAB
-	    && elf_elfsections (abfd)[hdr->sh_link]->sh_type != SHT_DYNSYM)
-	  {
-	    int scan;
-	    int found;
-
-	    found = 0;
-	    for (scan = 1; scan < ehdr->e_shnum; scan++)
-	      {
-		if (elf_elfsections (abfd)[scan]->sh_type == SHT_SYMTAB
-		    || elf_elfsections (abfd)[scan]->sh_type == SHT_DYNSYM)
-		  {
-		    if (found != 0)
-		      {
-			found = 0;
-			break;
-		      }
-		    found = scan;
-		  }
-	      }
-	    if (found != 0)
-	      hdr->sh_link = found;
-	  }
-
-	/* Get the symbol table.  */
-	if (elf_elfsections (abfd)[hdr->sh_link]->sh_type == SHT_SYMTAB
-	    && ! bfd_section_from_shdr (abfd, hdr->sh_link))
-	  return false;
-
-	/* If this reloc section does not use the main symbol table we
-	   don't treat it as a reloc section.  BFD can't adequately
-	   represent such a section, so at least for now, we don't
-	   try.  We just present it as a normal section.  */
-	if (hdr->sh_link != elf_onesymtab (abfd))
-	  return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
-
-	if (! bfd_section_from_shdr (abfd, hdr->sh_info))
-	  return false;
-	target_sect = bfd_section_from_elf_index (abfd, hdr->sh_info);
-	if (target_sect == NULL)
-	  return false;
-
-	if ((target_sect->flags & SEC_RELOC) == 0
-	    || target_sect->reloc_count == 0)
-	  hdr2 = &elf_section_data (target_sect)->rel_hdr;
-	else
-	  {
-	    BFD_ASSERT (elf_section_data (target_sect)->rel_hdr2 == NULL);
-	    hdr2 = (Elf_Internal_Shdr *) bfd_alloc (abfd, sizeof (*hdr2));
-	    elf_section_data (target_sect)->rel_hdr2 = hdr2;
-	  }
-	*hdr2 = *hdr;
-	elf_elfsections (abfd)[shindex] = hdr2;
-	target_sect->reloc_count += hdr->sh_size / hdr->sh_entsize;
-	target_sect->flags |= SEC_RELOC;
-	target_sect->relocation = NULL;
-	target_sect->rel_filepos = hdr->sh_offset;
-	abfd->flags |= HAS_RELOC;
-	return true;
-      }
-      break;
-
-    case SHT_GNU_verdef:
-      elf_dynverdef (abfd) = shindex;
-      elf_tdata (abfd)->dynverdef_hdr = *hdr;
-      return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
-      break;
-
-    case SHT_GNU_versym:
-      elf_dynversym (abfd) = shindex;
-      elf_tdata (abfd)->dynversym_hdr = *hdr;
-      return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
-      break;
-
-    case SHT_GNU_verneed:
-      elf_dynverref (abfd) = shindex;
-      elf_tdata (abfd)->dynverref_hdr = *hdr;
-      return _bfd_elf_make_section_from_shdr (abfd, hdr, name);
-      break;
-
-    case SHT_SHLIB:
-      return true;
-
-    default:
-      /* Check for any processor-specific section types.  */
-      {
-	if (bed->elf_backend_section_from_shdr)
-	  (*bed->elf_backend_section_from_shdr) (abfd, hdr, name);
-      }
-      break;
-    }
-
-  return true;
-}
-
-/* Given an ELF section number, retrieve the corresponding BFD
-   section.  */
-
-asection *
-bfd_section_from_elf_index (abfd, index)
-     bfd *abfd;
-     unsigned int index;
-{
-  BFD_ASSERT (index > 0 && index < SHN_LORESERVE);
-  if (index >= elf_elfheader (abfd)->e_shnum)
-    return NULL;
-  return elf_elfsections (abfd)[index]->bfd_section;
-}
-
-boolean
-_bfd_elf_new_section_hook (abfd, sec)
-     bfd *abfd;
-     asection *sec;
-{
-  struct bfd_elf_section_data *sdata;
-
-  sdata = (struct bfd_elf_section_data *) bfd_alloc (abfd, sizeof (*sdata));
-  if (!sdata)
-    return false;
-  sec->used_by_bfd = (PTR) sdata;
-  memset (sdata, 0, sizeof (*sdata));
-  return true;
-}
-
-/* Create a new bfd section from an ELF program header.
-
-   Since program segments have no names, we generate a synthetic name
-   of the form segment<NUM>, where NUM is generally the index in the
-   program header table.  For segments that are split (see below) we
-   generate the names segment<NUM>a and segment<NUM>b.
-
-   Note that some program segments may have a file size that is different than
-   (less than) the memory size.  All this means is that at execution the
-   system must allocate the amount of memory specified by the memory size,
-   but only initialize it with the first "file size" bytes read from the
-   file.  This would occur for example, with program segments consisting
-   of combined data+bss.
-
-   To handle the above situation, this routine generates TWO bfd sections
-   for the single program segment.  The first has the length specified by
-   the file size of the segment, and the second has the length specified
-   by the difference between the two sizes.  In effect, the segment is split
-   into it's initialized and uninitialized parts.
-
- */
-
-boolean
-bfd_section_from_phdr (abfd, hdr, index)
-     bfd *abfd;
-     Elf_Internal_Phdr *hdr;
-     int index;
-{
-  asection *newsect;
-  char *name;
-  char namebuf[64];
-  int split;
-
-  split = ((hdr->p_memsz > 0)
-	    && (hdr->p_filesz > 0)
-	    && (hdr->p_memsz > hdr->p_filesz));
-  sprintf (namebuf, split ? "segment%da" : "segment%d", index);
-  name = bfd_alloc (abfd, strlen (namebuf) + 1);
-  if (!name)
-    return false;
-  strcpy (name, namebuf);
-  newsect = bfd_make_section (abfd, name);
-  if (newsect == NULL)
-    return false;
-  newsect->vma = hdr->p_vaddr;
-  newsect->lma = hdr->p_paddr;
-  newsect->_raw_size = hdr->p_filesz;
-  newsect->filepos = hdr->p_offset;
-  newsect->flags |= SEC_HAS_CONTENTS;
-  if (hdr->p_type == PT_LOAD)
-    {
-      newsect->flags |= SEC_ALLOC;
-      newsect->flags |= SEC_LOAD;
-      if (hdr->p_flags & PF_X)
-	{
-	  /* FIXME: all we known is that it has execute PERMISSION,
-	     may be data. */
-	  newsect->flags |= SEC_CODE;
-	}
-    }
-  if (!(hdr->p_flags & PF_W))
-    {
-      newsect->flags |= SEC_READONLY;
-    }
-
-  if (split)
-    {
-      sprintf (namebuf, "segment%db", index);
-      name = bfd_alloc (abfd, strlen (namebuf) + 1);
-      if (!name)
-	return false;
-      strcpy (name, namebuf);
-      newsect = bfd_make_section (abfd, name);
-      if (newsect == NULL)
-	return false;
-      newsect->vma = hdr->p_vaddr + hdr->p_filesz;
-      newsect->lma = hdr->p_paddr + hdr->p_filesz;
-      newsect->_raw_size = hdr->p_memsz - hdr->p_filesz;
-      if (hdr->p_type == PT_LOAD)
-	{
-	  newsect->flags |= SEC_ALLOC;
-	  if (hdr->p_flags & PF_X)
-	    newsect->flags |= SEC_CODE;
-	}
-      if (!(hdr->p_flags & PF_W))
-	newsect->flags |= SEC_READONLY;
-    }
-
-  return true;
-}
-
-/* Set up an ELF internal section header for a section.  */
-
-/*ARGSUSED*/
-static void
-elf_fake_sections (abfd, asect, failedptrarg)
-     bfd *abfd;
-     asection *asect;
-     PTR failedptrarg;
-{
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  boolean *failedptr = (boolean *) failedptrarg;
-  Elf_Internal_Shdr *this_hdr;
-
-  if (*failedptr)
-    {
-      /* We already failed; just get out of the bfd_map_over_sections
-         loop.  */
-      return;
-    }
-
-  this_hdr = &elf_section_data (asect)->this_hdr;
-
-  this_hdr->sh_name = (unsigned long) _bfd_stringtab_add (elf_shstrtab (abfd),
-							  asect->name,
-							  true, false);
-  if (this_hdr->sh_name == (unsigned long) -1)
-    {
-      *failedptr = true;
-      return;
-    }
-
-  this_hdr->sh_flags = 0;
-
-  if ((asect->flags & SEC_ALLOC) != 0
-      || asect->user_set_vma)
-    this_hdr->sh_addr = asect->vma;
-  else
-    this_hdr->sh_addr = 0;
-
-  this_hdr->sh_offset = 0;
-  this_hdr->sh_size = asect->_raw_size;
-  this_hdr->sh_link = 0;
-  this_hdr->sh_addralign = 1 << asect->alignment_power;
-  /* The sh_entsize and sh_info fields may have been set already by
-     copy_private_section_data.  */
-
-  this_hdr->bfd_section = asect;
-  this_hdr->contents = NULL;
-
-  /* FIXME: This should not be based on section names.  */
-  if (strcmp (asect->name, ".dynstr") == 0)
-    this_hdr->sh_type = SHT_STRTAB;
-  else if (strcmp (asect->name, ".hash") == 0)
-    {
-      this_hdr->sh_type = SHT_HASH;
-      this_hdr->sh_entsize = bed->s->arch_size / 8;
-    }
-  else if (strcmp (asect->name, ".dynsym") == 0)
-    {
-      this_hdr->sh_type = SHT_DYNSYM;
-      this_hdr->sh_entsize = bed->s->sizeof_sym;
-    }
-  else if (strcmp (asect->name, ".dynamic") == 0)
-    {
-      this_hdr->sh_type = SHT_DYNAMIC;
-      this_hdr->sh_entsize = bed->s->sizeof_dyn;
-    }
-  else if (strncmp (asect->name, ".rela", 5) == 0
-	   && get_elf_backend_data (abfd)->use_rela_p)
-    {
-      this_hdr->sh_type = SHT_RELA;
-      this_hdr->sh_entsize = bed->s->sizeof_rela;
-    }
-  else if (strncmp (asect->name, ".rel", 4) == 0
-	   && ! get_elf_backend_data (abfd)->use_rela_p)
-    {
-      this_hdr->sh_type = SHT_REL;
-      this_hdr->sh_entsize = bed->s->sizeof_rel;
-    }
-  else if (strncmp (asect->name, ".note", 5) == 0)
-    this_hdr->sh_type = SHT_NOTE;
-  else if (strncmp (asect->name, ".stab", 5) == 0
-	   && strcmp (asect->name + strlen (asect->name) - 3, "str") == 0)
-    this_hdr->sh_type = SHT_STRTAB;
-  else if (strcmp (asect->name, ".gnu.version") == 0)
-    {
-      this_hdr->sh_type = SHT_GNU_versym;
-      this_hdr->sh_entsize = sizeof (Elf_External_Versym);
-    }
-  else if (strcmp (asect->name, ".gnu.version_d") == 0)
-    {
-      this_hdr->sh_type = SHT_GNU_verdef;
-      this_hdr->sh_entsize = 0;
-      /* objcopy or strip will copy over sh_info, but may not set
-         cverdefs.  The linker will set cverdefs, but sh_info will be
-         zero.  */
-      if (this_hdr->sh_info == 0)
-	this_hdr->sh_info = elf_tdata (abfd)->cverdefs;
-      else
-	BFD_ASSERT (elf_tdata (abfd)->cverdefs == 0
-		    || this_hdr->sh_info == elf_tdata (abfd)->cverdefs);
-    }
-  else if (strcmp (asect->name, ".gnu.version_r") == 0)
-    {
-      this_hdr->sh_type = SHT_GNU_verneed;
-      this_hdr->sh_entsize = 0;
-      /* objcopy or strip will copy over sh_info, but may not set
-         cverrefs.  The linker will set cverrefs, but sh_info will be
-         zero.  */
-      if (this_hdr->sh_info == 0)
-	this_hdr->sh_info = elf_tdata (abfd)->cverrefs;
-      else
-	BFD_ASSERT (elf_tdata (abfd)->cverrefs == 0
-		    || this_hdr->sh_info == elf_tdata (abfd)->cverrefs);
-    }
-  else if ((asect->flags & SEC_ALLOC) != 0
-	   && (asect->flags & SEC_LOAD) != 0)
-    this_hdr->sh_type = SHT_PROGBITS;
-  else if ((asect->flags & SEC_ALLOC) != 0
-	   && ((asect->flags & SEC_LOAD) == 0))
-    this_hdr->sh_type = SHT_NOBITS;
-  else
-    {
-      /* Who knows?  */
-      this_hdr->sh_type = SHT_PROGBITS;
-    }
-
-  if ((asect->flags & SEC_ALLOC) != 0)
-    this_hdr->sh_flags |= SHF_ALLOC;
-  if ((asect->flags & SEC_READONLY) == 0)
-    this_hdr->sh_flags |= SHF_WRITE;
-  if ((asect->flags & SEC_CODE) != 0)
-    this_hdr->sh_flags |= SHF_EXECINSTR;
-
-  /* Check for processor-specific section types.  */
-  {
-    struct elf_backend_data *bed = get_elf_backend_data (abfd);
-
-    if (bed->elf_backend_fake_sections)
-      (*bed->elf_backend_fake_sections) (abfd, this_hdr, asect);
-  }
-
-  /* If the section has relocs, set up a section header for the
-     SHT_REL[A] section.  */
-  if ((asect->flags & SEC_RELOC) != 0)
-    {
-      Elf_Internal_Shdr *rela_hdr;
-      int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
-      char *name;
-
-      rela_hdr = &elf_section_data (asect)->rel_hdr;
-      name = bfd_alloc (abfd, sizeof ".rela" + strlen (asect->name));
-      if (name == NULL)
-	{
-	  *failedptr = true;
-	  return;
-	}
-      sprintf (name, "%s%s", use_rela_p ? ".rela" : ".rel", asect->name);
-      rela_hdr->sh_name =
-	(unsigned int) _bfd_stringtab_add (elf_shstrtab (abfd), name,
-					   true, false);
-      if (rela_hdr->sh_name == (unsigned int) -1)
-	{
-	  *failedptr = true;
-	  return;
-	}
-      rela_hdr->sh_type = use_rela_p ? SHT_RELA : SHT_REL;
-      rela_hdr->sh_entsize = (use_rela_p
-			      ? bed->s->sizeof_rela
-			      : bed->s->sizeof_rel);
-      rela_hdr->sh_addralign = bed->s->file_align;
-      rela_hdr->sh_flags = 0;
-      rela_hdr->sh_addr = 0;
-      rela_hdr->sh_size = 0;
-      rela_hdr->sh_offset = 0;
-    }
-}
-
-/* Assign all ELF section numbers.  The dummy first section is handled here
-   too.  The link/info pointers for the standard section types are filled
-   in here too, while we're at it.  */
-
-static boolean
-assign_section_numbers (abfd)
-     bfd *abfd;
-{
-  struct elf_obj_tdata *t = elf_tdata (abfd);
-  asection *sec;
-  unsigned int section_number;
-  Elf_Internal_Shdr **i_shdrp;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-
-  section_number = 1;
-
-  for (sec = abfd->sections; sec; sec = sec->next)
-    {
-      struct bfd_elf_section_data *d = elf_section_data (sec);
-
-      d->this_idx = section_number++;
-      if ((sec->flags & SEC_RELOC) == 0)
-	d->rel_idx = 0;
-      else
-	d->rel_idx = section_number++;
-    }
-
-  t->shstrtab_section = section_number++;
-  elf_elfheader (abfd)->e_shstrndx = t->shstrtab_section;
-  t->shstrtab_hdr.sh_size = _bfd_stringtab_size (elf_shstrtab (abfd));
-
-  if (bfd_get_symcount (abfd) > 0)
-    {
-      t->symtab_section = section_number++;
-      t->strtab_section = section_number++;
-    }
-
-  elf_elfheader (abfd)->e_shnum = section_number;
-
-  /* Set up the list of section header pointers, in agreement with the
-     indices.  */
-  i_shdrp = ((Elf_Internal_Shdr **)
-	     bfd_alloc (abfd, section_number * sizeof (Elf_Internal_Shdr *)));
-  if (i_shdrp == NULL)
-    return false;
-
-  i_shdrp[0] = ((Elf_Internal_Shdr *)
-		bfd_alloc (abfd, sizeof (Elf_Internal_Shdr)));
-  if (i_shdrp[0] == NULL)
-    {
-      bfd_release (abfd, i_shdrp);
-      return false;
-    }
-  memset (i_shdrp[0], 0, sizeof (Elf_Internal_Shdr));
-
-  elf_elfsections (abfd) = i_shdrp;
-
-  i_shdrp[t->shstrtab_section] = &t->shstrtab_hdr;
-  if (bfd_get_symcount (abfd) > 0)
-    {
-      i_shdrp[t->symtab_section] = &t->symtab_hdr;
-      i_shdrp[t->strtab_section] = &t->strtab_hdr;
-      t->symtab_hdr.sh_link = t->strtab_section;
-    }
-  for (sec = abfd->sections; sec; sec = sec->next)
-    {
-      struct bfd_elf_section_data *d = elf_section_data (sec);
-      asection *s;
-      const char *name;
-
-      i_shdrp[d->this_idx] = &d->this_hdr;
-      if (d->rel_idx != 0)
-	i_shdrp[d->rel_idx] = &d->rel_hdr;
-
-      /* Fill in the sh_link and sh_info fields while we're at it.  */
-
-      /* sh_link of a reloc section is the section index of the symbol
-	 table.  sh_info is the section index of the section to which
-	 the relocation entries apply.  */
-      if (d->rel_idx != 0)
-	{
-	  d->rel_hdr.sh_link = t->symtab_section;
-	  d->rel_hdr.sh_info = d->this_idx;
-	}
-
-      switch (d->this_hdr.sh_type)
-	{
-	case SHT_REL:
-	case SHT_RELA:
-	  /* A reloc section which we are treating as a normal BFD
-	     section.  sh_link is the section index of the symbol
-	     table.  sh_info is the section index of the section to
-	     which the relocation entries apply.  We assume that an
-	     allocated reloc section uses the dynamic symbol table.
-	     FIXME: How can we be sure?  */
-	  s = bfd_get_section_by_name (abfd, ".dynsym");
-	  if (s != NULL)
-	    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
-
-	  /* We look up the section the relocs apply to by name.  */
-	  name = sec->name;
-	  if (d->this_hdr.sh_type == SHT_REL)
-	    name += 4;
-	  else
-	    name += 5;
-	  s = bfd_get_section_by_name (abfd, name);
-	  if (s != NULL)
-	    d->this_hdr.sh_info = elf_section_data (s)->this_idx;
-	  break;
-
-	case SHT_STRTAB:
-	  /* We assume that a section named .stab*str is a stabs
-	     string section.  We look for a section with the same name
-	     but without the trailing ``str'', and set its sh_link
-	     field to point to this section.  */
-	  if (strncmp (sec->name, ".stab", sizeof ".stab" - 1) == 0
-	      && strcmp (sec->name + strlen (sec->name) - 3, "str") == 0)
-	    {
-	      size_t len;
-	      char *alc;
-
-	      len = strlen (sec->name);
-	      alc = (char *) bfd_malloc (len - 2);
-	      if (alc == NULL)
-		return false;
-	      strncpy (alc, sec->name, len - 3);
-	      alc[len - 3] = '\0';
-	      s = bfd_get_section_by_name (abfd, alc);
-	      free (alc);
-	      if (s != NULL)
-		{
-		  elf_section_data (s)->this_hdr.sh_link = d->this_idx;
-
-		  /* This is a .stab section.  */
-		  elf_section_data (s)->this_hdr.sh_entsize =
-		    4 + 2 * (bed->s->arch_size / 8);
-		}
-	    }
-	  break;
-
-	case SHT_DYNAMIC:
-	case SHT_DYNSYM:
-	case SHT_GNU_verneed:
-	case SHT_GNU_verdef:
-	  /* sh_link is the section header index of the string table
-	     used for the dynamic entries, or the symbol table, or the
-	     version strings.  */
-	  s = bfd_get_section_by_name (abfd, ".dynstr");
-	  if (s != NULL)
-	    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
-	  break;
-
-	case SHT_HASH:
-	case SHT_GNU_versym:
-	  /* sh_link is the section header index of the symbol table
-	     this hash table or version table is for.  */
-	  s = bfd_get_section_by_name (abfd, ".dynsym");
-	  if (s != NULL)
-	    d->this_hdr.sh_link = elf_section_data (s)->this_idx;
-	  break;
-	}
-    }
-
-  return true;
-}
-
-/* Map symbol from it's internal number to the external number, moving
-   all local symbols to be at the head of the list.  */
-
-static INLINE int
-sym_is_global (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
-{
-  /* If the backend has a special mapping, use it.  */
-  if (get_elf_backend_data (abfd)->elf_backend_sym_is_global)
-    return ((*get_elf_backend_data (abfd)->elf_backend_sym_is_global)
-	    (abfd, sym));
-
-  return ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0
-	  || bfd_is_und_section (bfd_get_section (sym))
-	  || bfd_is_com_section (bfd_get_section (sym)));
-}
-
-static boolean
-elf_map_symbols (abfd)
-     bfd *abfd;
-{
-  int symcount = bfd_get_symcount (abfd);
-  asymbol **syms = bfd_get_outsymbols (abfd);
-  asymbol **sect_syms;
-  int num_locals = 0;
-  int num_globals = 0;
-  int num_locals2 = 0;
-  int num_globals2 = 0;
-  int max_index = 0;
-  int num_sections = 0;
-  int idx;
-  asection *asect;
-  asymbol **new_syms;
-  asymbol *sym;
-
-#ifdef DEBUG
-  fprintf (stderr, "elf_map_symbols\n");
-  fflush (stderr);
-#endif
-
-  /* Add a section symbol for each BFD section.  FIXME: Is this really
-     necessary?  */
-  for (asect = abfd->sections; asect; asect = asect->next)
-    {
-      if (max_index < asect->index)
-	max_index = asect->index;
-    }
-
-  max_index++;
-  sect_syms = (asymbol **) bfd_zalloc (abfd, max_index * sizeof (asymbol *));
-  if (sect_syms == NULL)
-    return false;
-  elf_section_syms (abfd) = sect_syms;
-
-  for (idx = 0; idx < symcount; idx++)
-    {
-      sym = syms[idx];
-      
-      if ((sym->flags & BSF_SECTION_SYM) != 0
-	  && sym->value == 0)
-	{
-	  asection *sec;
-
-	  sec = sym->section;
-
-	  if (sec->owner != NULL)
-	    {
-	      if (sec->owner != abfd)
-		{
-		  if (sec->output_offset != 0)
-		    continue;
-		  
-		  sec = sec->output_section;
-
-		  /* Empty sections in the input files may have had a section
-		     symbol created for them.  (See the comment near the end of
-		     _bfd_generic_link_output_symbols in linker.c).  If the linker
-		     script discards such sections then we will reach this point.
-		     Since we know that we cannot avoid this case, we detect it
-		     and skip the abort and the assignment to the sect_syms array.
-		     To reproduce this particular case try running the linker
-		     testsuite test ld-scripts/weak.exp for an ELF port that uses
-		     the generic linker.  */
-		  if (sec->owner == NULL)
-		    continue;
-
-		  BFD_ASSERT (sec->owner == abfd);
-		}
-	      sect_syms[sec->index] = syms[idx];
-	    }
-	}
-    }
-
-  for (asect = abfd->sections; asect; asect = asect->next)
-    {
-      if (sect_syms[asect->index] != NULL)
-	continue;
-
-      sym = bfd_make_empty_symbol (abfd);
-      if (sym == NULL)
-	return false;
-      sym->the_bfd = abfd;
-      sym->name = asect->name;
-      sym->value = 0;
-      /* Set the flags to 0 to indicate that this one was newly added.  */
-      sym->flags = 0;
-      sym->section = asect;
-      sect_syms[asect->index] = sym;
-      num_sections++;
-#ifdef DEBUG
-      fprintf (stderr,
- _("creating section symbol, name = %s, value = 0x%.8lx, index = %d, section = 0x%.8lx\n"),
-	       asect->name, (long) asect->vma, asect->index, (long) asect);
-#endif
-    }
-
-  /* Classify all of the symbols.  */
-  for (idx = 0; idx < symcount; idx++)
-    {
-      if (!sym_is_global (abfd, syms[idx]))
-	num_locals++;
-      else
-	num_globals++;
-    }
-  for (asect = abfd->sections; asect; asect = asect->next)
-    {
-      if (sect_syms[asect->index] != NULL
-	  && sect_syms[asect->index]->flags == 0)
-	{
-	  sect_syms[asect->index]->flags = BSF_SECTION_SYM;
-	  if (!sym_is_global (abfd, sect_syms[asect->index]))
-	    num_locals++;
-	  else
-	    num_globals++;
-	  sect_syms[asect->index]->flags = 0;
-	}
-    }
-
-  /* Now sort the symbols so the local symbols are first.  */
-  new_syms = ((asymbol **)
-	      bfd_alloc (abfd,
-			 (num_locals + num_globals) * sizeof (asymbol *)));
-  if (new_syms == NULL)
-    return false;
-
-  for (idx = 0; idx < symcount; idx++)
-    {
-      asymbol *sym = syms[idx];
-      int i;
-
-      if (!sym_is_global (abfd, sym))
-	i = num_locals2++;
-      else
-	i = num_locals + num_globals2++;
-      new_syms[i] = sym;
-      sym->udata.i = i + 1;
-    }
-  for (asect = abfd->sections; asect; asect = asect->next)
-    {
-      if (sect_syms[asect->index] != NULL
-	  && sect_syms[asect->index]->flags == 0)
-	{
-	  asymbol *sym = sect_syms[asect->index];
-	  int i;
-
-	  sym->flags = BSF_SECTION_SYM;
-	  if (!sym_is_global (abfd, sym))
-	    i = num_locals2++;
-	  else
-	    i = num_locals + num_globals2++;
-	  new_syms[i] = sym;
-	  sym->udata.i = i + 1;
-	}
-    }
-
-  bfd_set_symtab (abfd, new_syms, num_locals + num_globals);
-
-  elf_num_locals (abfd) = num_locals;
-  elf_num_globals (abfd) = num_globals;
-  return true;
-}
-
-/* Align to the maximum file alignment that could be required for any
-   ELF data structure.  */
-
-static INLINE file_ptr align_file_position PARAMS ((file_ptr, int));
-static INLINE file_ptr
-align_file_position (off, align)
-     file_ptr off;
-     int align;
-{
-  return (off + align - 1) & ~(align - 1);
-}
-
-/* Assign a file position to a section, optionally aligning to the
-   required section alignment.  */
-
-INLINE file_ptr
-_bfd_elf_assign_file_position_for_section (i_shdrp, offset, align)
-     Elf_Internal_Shdr *i_shdrp;
-     file_ptr offset;
-     boolean align;
-{
-  if (align)
-    {
-      unsigned int al;
-
-      al = i_shdrp->sh_addralign;
-      if (al > 1)
-	offset = BFD_ALIGN (offset, al);
-    }
-  i_shdrp->sh_offset = offset;
-  if (i_shdrp->bfd_section != NULL)
-    i_shdrp->bfd_section->filepos = offset;
-  if (i_shdrp->sh_type != SHT_NOBITS)
-    offset += i_shdrp->sh_size;
-  return offset;
-}
-
-/* Compute the file positions we are going to put the sections at, and
-   otherwise prepare to begin writing out the ELF file.  If LINK_INFO
-   is not NULL, this is being called by the ELF backend linker.  */
-
-boolean
-_bfd_elf_compute_section_file_positions (abfd, link_info)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-{
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  boolean failed;
-  struct bfd_strtab_hash *strtab;
-  Elf_Internal_Shdr *shstrtab_hdr;
-
-  if (abfd->output_has_begun)
-    return true;
-
-  /* Do any elf backend specific processing first.  */
-  if (bed->elf_backend_begin_write_processing)
-    (*bed->elf_backend_begin_write_processing) (abfd, link_info);
-
-  if (! prep_headers (abfd))
-    return false;
-
-  failed = false;
-  bfd_map_over_sections (abfd, elf_fake_sections, &failed);
-  if (failed)
-    return false;
-
-  if (!assign_section_numbers (abfd))
-    return false;
-
-  /* The backend linker builds symbol table information itself.  */
-  if (link_info == NULL && bfd_get_symcount (abfd) > 0)
-    {
-      /* Non-zero if doing a relocatable link.  */
-      int relocatable_p = ! (abfd->flags & (EXEC_P | DYNAMIC));
-
-      if (! swap_out_syms (abfd, &strtab, relocatable_p))
-	return false;
-    }
-
-  shstrtab_hdr = &elf_tdata (abfd)->shstrtab_hdr;
-  /* sh_name was set in prep_headers.  */
-  shstrtab_hdr->sh_type = SHT_STRTAB;
-  shstrtab_hdr->sh_flags = 0;
-  shstrtab_hdr->sh_addr = 0;
-  shstrtab_hdr->sh_size = _bfd_stringtab_size (elf_shstrtab (abfd));
-  shstrtab_hdr->sh_entsize = 0;
-  shstrtab_hdr->sh_link = 0;
-  shstrtab_hdr->sh_info = 0;
-  /* sh_offset is set in assign_file_positions_except_relocs.  */
-  shstrtab_hdr->sh_addralign = 1;
-
-  if (!assign_file_positions_except_relocs (abfd))
-    return false;
-
-  if (link_info == NULL && bfd_get_symcount (abfd) > 0)
-    {
-      file_ptr off;
-      Elf_Internal_Shdr *hdr;
-
-      off = elf_tdata (abfd)->next_file_pos;
-
-      hdr = &elf_tdata (abfd)->symtab_hdr;
-      off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
-
-      hdr = &elf_tdata (abfd)->strtab_hdr;
-      off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
-
-      elf_tdata (abfd)->next_file_pos = off;
-
-      /* Now that we know where the .strtab section goes, write it
-         out.  */
-      if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
-	  || ! _bfd_stringtab_emit (abfd, strtab))
-	return false;
-      _bfd_stringtab_free (strtab);
-    }
-
-  abfd->output_has_begun = true;
-
-  return true;
-}
-
-/* Create a mapping from a set of sections to a program segment.  */
-
-static INLINE struct elf_segment_map *
-make_mapping (abfd, sections, from, to, phdr)
-     bfd *abfd;
-     asection **sections;
-     unsigned int from;
-     unsigned int to;
-     boolean phdr;
-{
-  struct elf_segment_map *m;
-  unsigned int i;
-  asection **hdrpp;
-
-  m = ((struct elf_segment_map *)
-       bfd_zalloc (abfd,
-		   (sizeof (struct elf_segment_map)
-		    + (to - from - 1) * sizeof (asection *))));
-  if (m == NULL)
-    return NULL;
-  m->next = NULL;
-  m->p_type = PT_LOAD;
-  for (i = from, hdrpp = sections + from; i < to; i++, hdrpp++)
-    m->sections[i - from] = *hdrpp;
-  m->count = to - from;
-
-  if (from == 0 && phdr)
-    {
-      /* Include the headers in the first PT_LOAD segment.  */
-      m->includes_filehdr = 1;
-      m->includes_phdrs = 1;
-    }
-
-  return m;
-}
-
-/* Set up a mapping from BFD sections to program segments.  */
-
-static boolean
-map_sections_to_segments (abfd)
-     bfd *abfd;
-{
-  asection **sections = NULL;
-  asection *s;
-  unsigned int i;
-  unsigned int count;
-  struct elf_segment_map *mfirst;
-  struct elf_segment_map **pm;
-  struct elf_segment_map *m;
-  asection *last_hdr;
-  unsigned int phdr_index;
-  bfd_vma maxpagesize;
-  asection **hdrpp;
-  boolean phdr_in_segment = true;
-  boolean writable;
-  asection *dynsec;
-
-  if (elf_tdata (abfd)->segment_map != NULL)
-    return true;
-
-  if (bfd_count_sections (abfd) == 0)
-    return true;
-
-  /* Select the allocated sections, and sort them.  */
-
-  sections = (asection **) bfd_malloc (bfd_count_sections (abfd)
-				       * sizeof (asection *));
-  if (sections == NULL)
-    goto error_return;
-
-  i = 0;
-  for (s = abfd->sections; s != NULL; s = s->next)
-    {
-      if ((s->flags & SEC_ALLOC) != 0)
-	{
-	  sections[i] = s;
-	  ++i;
-	}
-    }
-  BFD_ASSERT (i <= bfd_count_sections (abfd));
-  count = i;
-
-  qsort (sections, (size_t) count, sizeof (asection *), elf_sort_sections);
-
-  /* Build the mapping.  */
-
-  mfirst = NULL;
-  pm = &mfirst;
-
-  /* If we have a .interp section, then create a PT_PHDR segment for
-     the program headers and a PT_INTERP segment for the .interp
-     section.  */
-  s = bfd_get_section_by_name (abfd, ".interp");
-  if (s != NULL && (s->flags & SEC_LOAD) != 0)
-    {
-      m = ((struct elf_segment_map *)
-	   bfd_zalloc (abfd, sizeof (struct elf_segment_map)));
-      if (m == NULL)
-	goto error_return;
-      m->next = NULL;
-      m->p_type = PT_PHDR;
-      /* FIXME: UnixWare and Solaris set PF_X, Irix 5 does not.  */
-      m->p_flags = PF_R | PF_X;
-      m->p_flags_valid = 1;
-      m->includes_phdrs = 1;
-
-      *pm = m;
-      pm = &m->next;
-
-      m = ((struct elf_segment_map *)
-	   bfd_zalloc (abfd, sizeof (struct elf_segment_map)));
-      if (m == NULL)
-	goto error_return;
-      m->next = NULL;
-      m->p_type = PT_INTERP;
-      m->count = 1;
-      m->sections[0] = s;
-
-      *pm = m;
-      pm = &m->next;
-    }
-
-  /* Look through the sections.  We put sections in the same program
-     segment when the start of the second section can be placed within
-     a few bytes of the end of the first section.  */
-  last_hdr = NULL;
-  phdr_index = 0;
-  maxpagesize = get_elf_backend_data (abfd)->maxpagesize;
-  writable = false;
-  dynsec = bfd_get_section_by_name (abfd, ".dynamic");
-  if (dynsec != NULL
-      && (dynsec->flags & SEC_LOAD) == 0)
-    dynsec = NULL;
-
-  /* Deal with -Ttext or something similar such that the first section
-     is not adjacent to the program headers.  This is an
-     approximation, since at this point we don't know exactly how many
-     program headers we will need.  */
-  if (count > 0)
-    {
-      bfd_size_type phdr_size;
-
-      phdr_size = elf_tdata (abfd)->program_header_size;
-      if (phdr_size == 0)
-	phdr_size = get_elf_backend_data (abfd)->s->sizeof_phdr;
-      if ((abfd->flags & D_PAGED) == 0
-	  || sections[0]->lma < phdr_size
-	  || sections[0]->lma % maxpagesize < phdr_size % maxpagesize)
-	phdr_in_segment = false;
-    }
-
-  for (i = 0, hdrpp = sections; i < count; i++, hdrpp++)
-    {
-      asection *hdr;
-      boolean new_segment;
-
-      hdr = *hdrpp;
-
-      /* See if this section and the last one will fit in the same
-         segment.  */
-
-      if (last_hdr == NULL)
-	{
-	  /* If we don't have a segment yet, then we don't need a new
-	     one (we build the last one after this loop).  */
-	  new_segment = false;
-	}
-      else if (last_hdr->lma - last_hdr->vma != hdr->lma - hdr->vma)
-	{
-	  /* If this section has a different relation between the
-             virtual address and the load address, then we need a new
-             segment.  */
-	  new_segment = true;
-	}
-      else if (BFD_ALIGN (last_hdr->lma + last_hdr->_raw_size, maxpagesize)
-	       < BFD_ALIGN (hdr->lma, maxpagesize))
-	{
-	  /* If putting this section in this segment would force us to
-             skip a page in the segment, then we need a new segment.  */
-	  new_segment = true;
-	}
-      else if ((last_hdr->flags & SEC_LOAD) == 0
-	       && (hdr->flags & SEC_LOAD) != 0)
-	{
-	  /* We don't want to put a loadable section after a
-             nonloadable section in the same segment.  */
-	  new_segment = true;
-	}
-      else if ((abfd->flags & D_PAGED) == 0)
-	{
-	  /* If the file is not demand paged, which means that we
-             don't require the sections to be correctly aligned in the
-             file, then there is no other reason for a new segment.  */
-	  new_segment = false;
-	}
-      else if (! writable
-	       && (hdr->flags & SEC_READONLY) == 0
-	       && (BFD_ALIGN (last_hdr->lma + last_hdr->_raw_size, maxpagesize)
-		   == hdr->lma))
-	{
-	  /* We don't want to put a writable section in a read only
-             segment, unless they are on the same page in memory
-             anyhow.  We already know that the last section does not
-             bring us past the current section on the page, so the
-             only case in which the new section is not on the same
-             page as the previous section is when the previous section
-             ends precisely on a page boundary.  */
-	  new_segment = true;
-	}
-      else
-	{
-	  /* Otherwise, we can use the same segment.  */
-	  new_segment = false;
-	}
-
-      if (! new_segment)
-	{
-	  if ((hdr->flags & SEC_READONLY) == 0)
-	    writable = true;
-	  last_hdr = hdr;
-	  continue;
-	}
-
-      /* We need a new program segment.  We must create a new program
-         header holding all the sections from phdr_index until hdr.  */
-
-      m = make_mapping (abfd, sections, phdr_index, i, phdr_in_segment);
-      if (m == NULL)
-	goto error_return;
-
-      *pm = m;
-      pm = &m->next;
-
-      if ((hdr->flags & SEC_READONLY) == 0)
-	writable = true;
-      else
-	writable = false;
-
-      last_hdr = hdr;
-      phdr_index = i;
-      phdr_in_segment = false;
-    }
-
-  /* Create a final PT_LOAD program segment.  */
-  if (last_hdr != NULL)
-    {
-      m = make_mapping (abfd, sections, phdr_index, i, phdr_in_segment);
-      if (m == NULL)
-	goto error_return;
-
-      *pm = m;
-      pm = &m->next;
-    }
-
-  /* If there is a .dynamic section, throw in a PT_DYNAMIC segment.  */
-  if (dynsec != NULL)
-    {
-      m = ((struct elf_segment_map *)
-	   bfd_zalloc (abfd, sizeof (struct elf_segment_map)));
-      if (m == NULL)
-	goto error_return;
-      m->next = NULL;
-      m->p_type = PT_DYNAMIC;
-      m->count = 1;
-      m->sections[0] = dynsec;
-
-      *pm = m;
-      pm = &m->next;
-    }
-
-  /* For each loadable .note section, add a PT_NOTE segment.  We don't
-     use bfd_get_section_by_name, because if we link together
-     nonloadable .note sections and loadable .note sections, we will
-     generate two .note sections in the output file.  FIXME: Using
-     names for section types is bogus anyhow.  */
-  for (s = abfd->sections; s != NULL; s = s->next)
-    {
-      if ((s->flags & SEC_LOAD) != 0
-	  && strncmp (s->name, ".note", 5) == 0)
-	{
-	  m = ((struct elf_segment_map *)
-	       bfd_zalloc (abfd, sizeof (struct elf_segment_map)));
-	  if (m == NULL)
-	    goto error_return;
-	  m->next = NULL;
-	  m->p_type = PT_NOTE;
-	  m->count = 1;
-	  m->sections[0] = s;
-
-	  *pm = m;
-	  pm = &m->next;
-	}
-    }
-
-  free (sections);
-  sections = NULL;
-
-  elf_tdata (abfd)->segment_map = mfirst;
-  return true;
-
- error_return:
-  if (sections != NULL)
-    free (sections);
-  return false;
-}
-
-/* Sort sections by address.  */
-
-static int
-elf_sort_sections (arg1, arg2)
-     const PTR arg1;
-     const PTR arg2;
-{
-  const asection *sec1 = *(const asection **) arg1;
-  const asection *sec2 = *(const asection **) arg2;
-
-  /* Sort by LMA first, since this is the address used to
-     place the section into a segment.  */
-  if (sec1->lma < sec2->lma)
-    return -1;
-  else if (sec1->lma > sec2->lma)
-    return 1;
-
-  /* Then sort by VMA.  Normally the LMA and the VMA will be
-     the same, and this will do nothing.  */
-  if (sec1->vma < sec2->vma)
-    return -1;
-  else if (sec1->vma > sec2->vma)
-    return 1;
-
-  /* Put !SEC_LOAD sections after SEC_LOAD ones.  */
-
-#define TOEND(x) (((x)->flags & SEC_LOAD) == 0)
-
-  if (TOEND (sec1))
-    {
-      if (TOEND (sec2))
-	return sec1->target_index - sec2->target_index;
-      else
-	return 1;
-    }
-
-  if (TOEND (sec2))
-    return -1;
-
-#undef TOEND
-
-  /* Sort by size, to put zero sized sections before others at the
-     same address.  */
-
-  if (sec1->_raw_size < sec2->_raw_size)
-    return -1;
-  if (sec1->_raw_size > sec2->_raw_size)
-    return 1;
-
-  return sec1->target_index - sec2->target_index;
-}
-
-/* Assign file positions to the sections based on the mapping from
-   sections to segments.  This function also sets up some fields in
-   the file header, and writes out the program headers.  */
-
-static boolean
-assign_file_positions_for_segments (abfd)
-     bfd *abfd;
-{
-  const struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  unsigned int count;
-  struct elf_segment_map *m;
-  unsigned int alloc;
-  Elf_Internal_Phdr *phdrs;
-  file_ptr off, voff;
-  bfd_vma filehdr_vaddr, filehdr_paddr;
-  bfd_vma phdrs_vaddr, phdrs_paddr;
-  Elf_Internal_Phdr *p;
-
-  if (elf_tdata (abfd)->segment_map == NULL)
-    {
-      if (! map_sections_to_segments (abfd))
-	return false;
-    }
-
-  if (bed->elf_backend_modify_segment_map)
-    {
-      if (! (*bed->elf_backend_modify_segment_map) (abfd))
-	return false;
-    }
-
-  count = 0;
-  for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
-    ++count;
-
-  elf_elfheader (abfd)->e_phoff = bed->s->sizeof_ehdr;
-  elf_elfheader (abfd)->e_phentsize = bed->s->sizeof_phdr;
-  elf_elfheader (abfd)->e_phnum = count;
-
-  if (count == 0)
-    return true;
-
-  /* If we already counted the number of program segments, make sure
-     that we allocated enough space.  This happens when SIZEOF_HEADERS
-     is used in a linker script.  */
-  alloc = elf_tdata (abfd)->program_header_size / bed->s->sizeof_phdr;
-  if (alloc != 0 && count > alloc)
-    {
-      ((*_bfd_error_handler)
-       (_("%s: Not enough room for program headers (allocated %u, need %u)"),
-	bfd_get_filename (abfd), alloc, count));
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  if (alloc == 0)
-    alloc = count;
-
-  phdrs = ((Elf_Internal_Phdr *)
-	   bfd_alloc (abfd, alloc * sizeof (Elf_Internal_Phdr)));
-  if (phdrs == NULL)
-    return false;
-
-  off = bed->s->sizeof_ehdr;
-  off += alloc * bed->s->sizeof_phdr;
-
-  filehdr_vaddr = 0;
-  filehdr_paddr = 0;
-  phdrs_vaddr = 0;
-  phdrs_paddr = 0;
-
-  for (m = elf_tdata (abfd)->segment_map, p = phdrs;
-       m != NULL;
-       m = m->next, p++)
-    {
-      unsigned int i;
-      asection **secpp;
-
-      /* If elf_segment_map is not from map_sections_to_segments, the
-         sections may not be correctly ordered.  */
-      if (m->count > 0)
-	qsort (m->sections, (size_t) m->count, sizeof (asection *),
-	       elf_sort_sections);
-
-      p->p_type = m->p_type;
-
-      if (m->p_flags_valid)
-	p->p_flags = m->p_flags;
-      else
-	p->p_flags = 0;
-
-      if (p->p_type == PT_LOAD
-	  && m->count > 0
-	  && (m->sections[0]->flags & SEC_ALLOC) != 0)
-	{
-	  if ((abfd->flags & D_PAGED) != 0)
-	    off += (m->sections[0]->vma - off) % bed->maxpagesize;
-	  else
-	    {
-	      bfd_size_type align;
-
-	      align = 0;
-	      for (i = 0, secpp = m->sections; i < m->count; i++, secpp++)
-		{
-		  bfd_size_type secalign;
-
-		  secalign = bfd_get_section_alignment (abfd, *secpp);
-		  if (secalign > align)
-		    align = secalign;
-		}
-
-	      off += (m->sections[0]->vma - off) % (1 << align);
-	    }
-	}
-
-      if (m->count == 0)
-	p->p_vaddr = 0;
-      else
-	p->p_vaddr = m->sections[0]->vma;
-
-      if (m->p_paddr_valid)
-	p->p_paddr = m->p_paddr;
-      else if (m->count == 0)
-	p->p_paddr = 0;
-      else
-	p->p_paddr = m->sections[0]->lma;
-
-      if (p->p_type == PT_LOAD
-	  && (abfd->flags & D_PAGED) != 0)
-	p->p_align = bed->maxpagesize;
-      else if (m->count == 0)
-	p->p_align = bed->s->file_align;
-      else
-	p->p_align = 0;
-
-      p->p_offset = 0;
-      p->p_filesz = 0;
-      p->p_memsz = 0;
-
-      if (m->includes_filehdr)
-	{
-	  if (! m->p_flags_valid)
-	    p->p_flags |= PF_R;
-	  p->p_offset = 0;
-	  p->p_filesz = bed->s->sizeof_ehdr;
-	  p->p_memsz = bed->s->sizeof_ehdr;
-	  if (m->count > 0)
-	    {
-	      BFD_ASSERT (p->p_type == PT_LOAD);
-
-	      if (p->p_vaddr < (bfd_vma) off)
-		{
-		  _bfd_error_handler (_("%s: Not enough room for program headers, try linking with -N"),
-				      bfd_get_filename (abfd));
-		  bfd_set_error (bfd_error_bad_value);
-		  return false;
-		}
-
-	      p->p_vaddr -= off;
-	      if (! m->p_paddr_valid)
-		p->p_paddr -= off;
-	    }
-	  if (p->p_type == PT_LOAD)
-	    {
-	      filehdr_vaddr = p->p_vaddr;
-	      filehdr_paddr = p->p_paddr;
-	    }
-	}
-
-      if (m->includes_phdrs)
-	{
-	  if (! m->p_flags_valid)
-	    p->p_flags |= PF_R;
-
-	  if (m->includes_filehdr)
-	    {
-	      if (p->p_type == PT_LOAD)
-		{
-		  phdrs_vaddr = p->p_vaddr + bed->s->sizeof_ehdr;
-		  phdrs_paddr = p->p_paddr + bed->s->sizeof_ehdr;
-		}
-	    }
-	  else
-	    {
-	      p->p_offset = bed->s->sizeof_ehdr;
-
-	      if (m->count > 0)
-		{
-		  BFD_ASSERT (p->p_type == PT_LOAD);
-		  p->p_vaddr -= off - p->p_offset;
-		  if (! m->p_paddr_valid)
-		    p->p_paddr -= off - p->p_offset;
-		}
-
-	      if (p->p_type == PT_LOAD)
-		{
-		  phdrs_vaddr = p->p_vaddr;
-		  phdrs_paddr = p->p_paddr;
-		}
-	      else
-		phdrs_vaddr = bed->maxpagesize + bed->s->sizeof_ehdr;
-	    }
-
-	  p->p_filesz += alloc * bed->s->sizeof_phdr;
-	  p->p_memsz += alloc * bed->s->sizeof_phdr;
-	}
-
-      if (p->p_type == PT_LOAD
-	  || (p->p_type == PT_NOTE && bfd_get_format (abfd) == bfd_core))
-	{
-	  if (! m->includes_filehdr && ! m->includes_phdrs)
-	    p->p_offset = off;
-	  else
-	    {
-	      file_ptr adjust;
-
-	      adjust = off - (p->p_offset + p->p_filesz);
-	      p->p_filesz += adjust;
-	      p->p_memsz += adjust;
-	    }
-	}
-
-      voff = off;
-
-      for (i = 0, secpp = m->sections; i < m->count; i++, secpp++)
-	{
-	  asection *sec;
-	  flagword flags;
-	  bfd_size_type align;
-
-	  sec = *secpp;
-	  flags = sec->flags;
-	  align = 1 << bfd_get_section_alignment (abfd, sec);
-
-	  /* The section may have artificial alignment forced by a
-	     link script.  Notice this case by the gap between the
-	     cumulative phdr vma and the section's vma.  */
-	  if (p->p_vaddr + p->p_memsz < sec->vma)
-	    {
-	      bfd_vma adjust = sec->vma - (p->p_vaddr + p->p_memsz);
-
-	      p->p_memsz += adjust;
-	      off += adjust;
-	      voff += adjust;
-	      if ((flags & SEC_LOAD) != 0)
-		p->p_filesz += adjust;
-	    }
-
-	  if (p->p_type == PT_LOAD)
-	    {
-	      bfd_signed_vma adjust;
-
-	      if ((flags & SEC_LOAD) != 0)
-		{
-		  adjust = sec->lma - (p->p_paddr + p->p_memsz);
-		  if (adjust < 0)
-		    adjust = 0;
-		}
-	      else if ((flags & SEC_ALLOC) != 0)
-		{
-		  /* The section VMA must equal the file position
-		     modulo the page size.  FIXME: I'm not sure if
-		     this adjustment is really necessary.  We used to
-		     not have the SEC_LOAD case just above, and then
-		     this was necessary, but now I'm not sure.  */
-		  if ((abfd->flags & D_PAGED) != 0)
-		    adjust = (sec->vma - voff) % bed->maxpagesize;
-		  else
-		    adjust = (sec->vma - voff) % align;
-		}
-	      else
-		adjust = 0;
-
-	      if (adjust != 0)
-		{
-		  if (i == 0)
-		    {
-		      (* _bfd_error_handler)
-			(_("Error: First section in segment (%s) starts at 0x%x"),
-			 bfd_section_name (abfd, sec), sec->lma);
-		      (* _bfd_error_handler)
-			(_("       whereas segment starts at 0x%x"),
-			 p->p_paddr);
-
-		      return false;
-		    }
-		  p->p_memsz += adjust;
-		  off += adjust;
-		  voff += adjust;
-		  if ((flags & SEC_LOAD) != 0)
-		    p->p_filesz += adjust;
-		}
-
-	      sec->filepos = off;
-
-	      /* We check SEC_HAS_CONTENTS here because if NOLOAD is
-                 used in a linker script we may have a section with
-                 SEC_LOAD clear but which is supposed to have
-                 contents.  */
-	      if ((flags & SEC_LOAD) != 0
-		  || (flags & SEC_HAS_CONTENTS) != 0)
-		off += sec->_raw_size;
-
-	      if ((flags & SEC_ALLOC) != 0)
-		voff += sec->_raw_size;
-	    }
-
-	  if (p->p_type == PT_NOTE && bfd_get_format (abfd) == bfd_core)
-	    {
-	      if (i == 0)	/* the actual "note" segment */
-		{		/* this one actually contains everything. */
-		  sec->filepos = off;
-		  p->p_filesz = sec->_raw_size;
-		  off += sec->_raw_size;
-		  voff = off;
-		}
-	      else	/* fake sections -- don't need to be written */
-		{
-		  sec->filepos = 0;
-		  sec->_raw_size = 0;
-		  flags = sec->flags = 0;	/* no contents */
-		}
-	      p->p_memsz = 0;
-	      p->p_align = 1;
-	    }
-	  else
-	    {
-	      p->p_memsz += sec->_raw_size;
-
-	      if ((flags & SEC_LOAD) != 0)
-		p->p_filesz += sec->_raw_size;
-
-	      if (align > p->p_align
-		  && (p->p_type != PT_LOAD || (abfd->flags & D_PAGED) == 0))
-		p->p_align = align;
-	    }
-
-	  if (! m->p_flags_valid)
-	    {
-	      p->p_flags |= PF_R;
-	      if ((flags & SEC_CODE) != 0)
-		p->p_flags |= PF_X;
-	      if ((flags & SEC_READONLY) == 0)
-		p->p_flags |= PF_W;
-	    }
-	}
-    }
-
-  /* Now that we have set the section file positions, we can set up
-     the file positions for the non PT_LOAD segments.  */
-  for (m = elf_tdata (abfd)->segment_map, p = phdrs;
-       m != NULL;
-       m = m->next, p++)
-    {
-      if (p->p_type != PT_LOAD && m->count > 0)
-	{
-	  BFD_ASSERT (! m->includes_filehdr && ! m->includes_phdrs);
-	  p->p_offset = m->sections[0]->filepos;
-	}
-      if (m->count == 0)
-	{
-	  if (m->includes_filehdr)
-	    {
-	      p->p_vaddr = filehdr_vaddr;
-	      if (! m->p_paddr_valid)
-		p->p_paddr = filehdr_paddr;
-	    }
-	  else if (m->includes_phdrs)
-	    {
-	      p->p_vaddr = phdrs_vaddr;
-	      if (! m->p_paddr_valid)
-		p->p_paddr = phdrs_paddr;
-	    }
-	}
-    }
-
-  /* Clear out any program headers we allocated but did not use.  */
-  for (; count < alloc; count++, p++)
-    {
-      memset (p, 0, sizeof *p);
-      p->p_type = PT_NULL;
-    }
-
-  elf_tdata (abfd)->phdr = phdrs;
-
-  elf_tdata (abfd)->next_file_pos = off;
-
-  /* Write out the program headers.  */
-  if (bfd_seek (abfd, bed->s->sizeof_ehdr, SEEK_SET) != 0
-      || bed->s->write_out_phdrs (abfd, phdrs, alloc) != 0)
-    return false;
-
-  return true;
-}
-
-/* Get the size of the program header.
-
-   If this is called by the linker before any of the section VMA's are set, it
-   can't calculate the correct value for a strange memory layout.  This only
-   happens when SIZEOF_HEADERS is used in a linker script.  In this case,
-   SORTED_HDRS is NULL and we assume the normal scenario of one text and one
-   data segment (exclusive of .interp and .dynamic).
-
-   ??? User written scripts must either not use SIZEOF_HEADERS, or assume there
-   will be two segments.  */
-
-static bfd_size_type
-get_program_header_size (abfd)
-     bfd *abfd;
-{
-  size_t segs;
-  asection *s;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-
-  /* We can't return a different result each time we're called.  */
-  if (elf_tdata (abfd)->program_header_size != 0)
-    return elf_tdata (abfd)->program_header_size;
-
-  if (elf_tdata (abfd)->segment_map != NULL)
-    {
-      struct elf_segment_map *m;
-
-      segs = 0;
-      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
-	++segs;
-      elf_tdata (abfd)->program_header_size = segs * bed->s->sizeof_phdr;
-      return elf_tdata (abfd)->program_header_size;
-    }
-
-  /* Assume we will need exactly two PT_LOAD segments: one for text
-     and one for data.  */
-  segs = 2;
-
-  s = bfd_get_section_by_name (abfd, ".interp");
-  if (s != NULL && (s->flags & SEC_LOAD) != 0)
-    {
-      /* If we have a loadable interpreter section, we need a
-	 PT_INTERP segment.  In this case, assume we also need a
-	 PT_PHDR segment, although that may not be true for all
-	 targets.  */
-      segs += 2;
-    }
-
-  if (bfd_get_section_by_name (abfd, ".dynamic") != NULL)
-    {
-      /* We need a PT_DYNAMIC segment.  */
-      ++segs;
-    }
-
-  for (s = abfd->sections; s != NULL; s = s->next)
-    {
-      if ((s->flags & SEC_LOAD) != 0
-	  && strncmp (s->name, ".note", 5) == 0)
-	{
-	  /* We need a PT_NOTE segment.  */
-	  ++segs;
-	}
-    }
-
-  /* Let the backend count up any program headers it might need.  */
-  if (bed->elf_backend_additional_program_headers)
-    {
-      int a;
-
-      a = (*bed->elf_backend_additional_program_headers) (abfd);
-      if (a == -1)
-	abort ();
-      segs += a;
-    }
-
-  elf_tdata (abfd)->program_header_size = segs * bed->s->sizeof_phdr;
-  return elf_tdata (abfd)->program_header_size;
-}
-
-/* Work out the file positions of all the sections.  This is called by
-   _bfd_elf_compute_section_file_positions.  All the section sizes and
-   VMAs must be known before this is called.
-
-   We do not consider reloc sections at this point, unless they form
-   part of the loadable image.  Reloc sections are assigned file
-   positions in assign_file_positions_for_relocs, which is called by
-   write_object_contents and final_link.
-
-   We also don't set the positions of the .symtab and .strtab here.  */
-
-static boolean
-assign_file_positions_except_relocs (abfd)
-     bfd *abfd;
-{
-  struct elf_obj_tdata * const tdata = elf_tdata (abfd);
-  Elf_Internal_Ehdr * const i_ehdrp = elf_elfheader (abfd);
-  Elf_Internal_Shdr ** const i_shdrpp = elf_elfsections (abfd);
-  file_ptr off;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-
-  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0
-      && bfd_get_format (abfd) != bfd_core)
-    {
-      Elf_Internal_Shdr **hdrpp;
-      unsigned int i;
-
-      /* Start after the ELF header.  */
-      off = i_ehdrp->e_ehsize;
-
-      /* We are not creating an executable, which means that we are
-	 not creating a program header, and that the actual order of
-	 the sections in the file is unimportant.  */
-      for (i = 1, hdrpp = i_shdrpp + 1; i < i_ehdrp->e_shnum; i++, hdrpp++)
-	{
-	  Elf_Internal_Shdr *hdr;
-
-	  hdr = *hdrpp;
-	  if (hdr->sh_type == SHT_REL || hdr->sh_type == SHT_RELA)
-	    {
-	      hdr->sh_offset = -1;
-	      continue;
-	    }
-	  if (i == tdata->symtab_section
-	      || i == tdata->strtab_section)
-	    {
-	      hdr->sh_offset = -1;
-	      continue;
-	    }
-
-	  off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
-	}
-    }
-  else
-    {
-      unsigned int i;
-      Elf_Internal_Shdr **hdrpp;
-
-      /* Assign file positions for the loaded sections based on the
-         assignment of sections to segments.  */
-      if (! assign_file_positions_for_segments (abfd))
-	return false;
-
-      /* Assign file positions for the other sections.  */
-
-      off = elf_tdata (abfd)->next_file_pos;
-      for (i = 1, hdrpp = i_shdrpp + 1; i < i_ehdrp->e_shnum; i++, hdrpp++)
-	{
-	  Elf_Internal_Shdr *hdr;
-
-	  hdr = *hdrpp;
-	  if (hdr->bfd_section != NULL
-	      && hdr->bfd_section->filepos != 0)
-	    hdr->sh_offset = hdr->bfd_section->filepos;
-	  else if ((hdr->sh_flags & SHF_ALLOC) != 0)
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: warning: allocated section `%s' not in segment"),
-		bfd_get_filename (abfd),
-		(hdr->bfd_section == NULL
-		 ? "*unknown*"
-		 : hdr->bfd_section->name)));
-	      if ((abfd->flags & D_PAGED) != 0)
-		off += (hdr->sh_addr - off) % bed->maxpagesize;
-	      else
-		off += (hdr->sh_addr - off) % hdr->sh_addralign;
-	      off = _bfd_elf_assign_file_position_for_section (hdr, off,
-							       false);
-	    }
-	  else if (hdr->sh_type == SHT_REL
-		   || hdr->sh_type == SHT_RELA
-		   || hdr == i_shdrpp[tdata->symtab_section]
-		   || hdr == i_shdrpp[tdata->strtab_section])
-	    hdr->sh_offset = -1;
-	  else
-	    off = _bfd_elf_assign_file_position_for_section (hdr, off, true);
-	}
-    }
-
-  /* Place the section headers.  */
-  off = align_file_position (off, bed->s->file_align);
-  i_ehdrp->e_shoff = off;
-  off += i_ehdrp->e_shnum * i_ehdrp->e_shentsize;
-
-  elf_tdata (abfd)->next_file_pos = off;
-
-  return true;
-}
-
-static boolean
-prep_headers (abfd)
-     bfd *abfd;
-{
-  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form */
-  Elf_Internal_Phdr *i_phdrp = 0; /* Program header table, internal form */
-  Elf_Internal_Shdr **i_shdrp;	/* Section header table, internal form */
-  int count;
-  struct bfd_strtab_hash *shstrtab;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-
-  i_ehdrp = elf_elfheader (abfd);
-  i_shdrp = elf_elfsections (abfd);
-
-  shstrtab = _bfd_elf_stringtab_init ();
-  if (shstrtab == NULL)
-    return false;
-
-  elf_shstrtab (abfd) = shstrtab;
-
-  i_ehdrp->e_ident[EI_MAG0] = ELFMAG0;
-  i_ehdrp->e_ident[EI_MAG1] = ELFMAG1;
-  i_ehdrp->e_ident[EI_MAG2] = ELFMAG2;
-  i_ehdrp->e_ident[EI_MAG3] = ELFMAG3;
-
-  i_ehdrp->e_ident[EI_CLASS] = bed->s->elfclass;
-  i_ehdrp->e_ident[EI_DATA] =
-    bfd_big_endian (abfd) ? ELFDATA2MSB : ELFDATA2LSB;
-  i_ehdrp->e_ident[EI_VERSION] = bed->s->ev_current;
-
-  for (count = EI_PAD; count < EI_NIDENT; count++)
-    i_ehdrp->e_ident[count] = 0;
-
-  if ((abfd->flags & DYNAMIC) != 0)
-    i_ehdrp->e_type = ET_DYN;
-  else if ((abfd->flags & EXEC_P) != 0)
-    i_ehdrp->e_type = ET_EXEC;
-  else if (bfd_get_format (abfd) == bfd_core)
-    i_ehdrp->e_type = ET_CORE;
-  else
-    i_ehdrp->e_type = ET_REL;
-
-  switch (bfd_get_arch (abfd))
-    {
-    case bfd_arch_unknown:
-      i_ehdrp->e_machine = EM_NONE;
-      break;
-    case bfd_arch_sparc:
-      if (bed->s->arch_size == 64)
-	i_ehdrp->e_machine = EM_SPARCV9;
-      else
-	i_ehdrp->e_machine = EM_SPARC;
-      break;
-    case bfd_arch_i386:
-      i_ehdrp->e_machine = EM_386;
-      break;
-    case bfd_arch_m68k:
-      i_ehdrp->e_machine = EM_68K;
-      break;
-    case bfd_arch_m88k:
-      i_ehdrp->e_machine = EM_88K;
-      break;
-    case bfd_arch_i860:
-      i_ehdrp->e_machine = EM_860;
-      break;
-    case bfd_arch_mips:	/* MIPS Rxxxx */
-      i_ehdrp->e_machine = EM_MIPS;	/* only MIPS R3000 */
-      break;
-    case bfd_arch_hppa:
-      i_ehdrp->e_machine = EM_PARISC;
-      break;
-    case bfd_arch_powerpc:
-      i_ehdrp->e_machine = EM_PPC;
-      break;
-    case bfd_arch_alpha:
-      i_ehdrp->e_machine = EM_ALPHA;
-      break;
-    case bfd_arch_sh:
-      i_ehdrp->e_machine = EM_SH;
-      break;
-    case bfd_arch_d10v:
-      i_ehdrp->e_machine = EM_CYGNUS_D10V;
-      break;
-    case bfd_arch_d30v:
-      i_ehdrp->e_machine = EM_CYGNUS_D30V;
-      break;
-    case bfd_arch_fr30:
-      i_ehdrp->e_machine = EM_CYGNUS_FR30;
-      break;
-    case bfd_arch_mcore:
-      i_ehdrp->e_machine = EM_MCORE;
-      break;
-    case bfd_arch_v850:
-      switch (bfd_get_mach (abfd))
-	{
-	default:
-	case 0:               i_ehdrp->e_machine = EM_CYGNUS_V850; break;
-	}
-      break;
-   case bfd_arch_arc:
-      i_ehdrp->e_machine = EM_CYGNUS_ARC;
-      break;
-   case bfd_arch_arm:
-      i_ehdrp->e_machine = EM_ARM;
-      break;
-    case bfd_arch_m32r:
-      i_ehdrp->e_machine = EM_CYGNUS_M32R;
-      break;
-    case bfd_arch_mn10200:
-      i_ehdrp->e_machine = EM_CYGNUS_MN10200;
-      break;
-    case bfd_arch_mn10300:
-      i_ehdrp->e_machine = EM_CYGNUS_MN10300;
-      break;
-      /* also note that EM_M32, AT&T WE32100 is unknown to bfd */
-    default:
-      i_ehdrp->e_machine = EM_NONE;
-    }
-  i_ehdrp->e_version = bed->s->ev_current;
-  i_ehdrp->e_ehsize = bed->s->sizeof_ehdr;
-
-  /* no program header, for now. */
-  i_ehdrp->e_phoff = 0;
-  i_ehdrp->e_phentsize = 0;
-  i_ehdrp->e_phnum = 0;
-
-  /* each bfd section is section header entry */
-  i_ehdrp->e_entry = bfd_get_start_address (abfd);
-  i_ehdrp->e_shentsize = bed->s->sizeof_shdr;
-
-  /* if we're building an executable, we'll need a program header table */
-  if (abfd->flags & EXEC_P)
-    {
-      /* it all happens later */
-#if 0
-      i_ehdrp->e_phentsize = sizeof (Elf_External_Phdr);
-
-      /* elf_build_phdrs() returns a (NULL-terminated) array of
-	 Elf_Internal_Phdrs */
-      i_phdrp = elf_build_phdrs (abfd, i_ehdrp, i_shdrp, &i_ehdrp->e_phnum);
-      i_ehdrp->e_phoff = outbase;
-      outbase += i_ehdrp->e_phentsize * i_ehdrp->e_phnum;
-#endif
-    }
-  else
-    {
-      i_ehdrp->e_phentsize = 0;
-      i_phdrp = 0;
-      i_ehdrp->e_phoff = 0;
-    }
-
-  elf_tdata (abfd)->symtab_hdr.sh_name =
-    (unsigned int) _bfd_stringtab_add (shstrtab, ".symtab", true, false);
-  elf_tdata (abfd)->strtab_hdr.sh_name =
-    (unsigned int) _bfd_stringtab_add (shstrtab, ".strtab", true, false);
-  elf_tdata (abfd)->shstrtab_hdr.sh_name =
-    (unsigned int) _bfd_stringtab_add (shstrtab, ".shstrtab", true, false);
-  if (elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
-      || elf_tdata (abfd)->symtab_hdr.sh_name == (unsigned int) -1
-      || elf_tdata (abfd)->shstrtab_hdr.sh_name == (unsigned int) -1)
-    return false;
-
-  return true;
-}
-
-/* Assign file positions for all the reloc sections which are not part
-   of the loadable file image.  */
-
-void
-_bfd_elf_assign_file_positions_for_relocs (abfd)
-     bfd *abfd;
-{
-  file_ptr off;
-  unsigned int i;
-  Elf_Internal_Shdr **shdrpp;
-
-  off = elf_tdata (abfd)->next_file_pos;
-
-  for (i = 1, shdrpp = elf_elfsections (abfd) + 1;
-       i < elf_elfheader (abfd)->e_shnum;
-       i++, shdrpp++)
-    {
-      Elf_Internal_Shdr *shdrp;
-
-      shdrp = *shdrpp;
-      if ((shdrp->sh_type == SHT_REL || shdrp->sh_type == SHT_RELA)
-	  && shdrp->sh_offset == -1)
-	off = _bfd_elf_assign_file_position_for_section (shdrp, off, true);
-    }
-
-  elf_tdata (abfd)->next_file_pos = off;
-}
-
-boolean
-_bfd_elf_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  Elf_Internal_Ehdr *i_ehdrp;
-  Elf_Internal_Shdr **i_shdrp;
-  boolean failed;
-  unsigned int count;
-
-  if (! abfd->output_has_begun
-      && ! _bfd_elf_compute_section_file_positions
-             (abfd, (struct bfd_link_info *) NULL))
-    return false;
-
-  i_shdrp = elf_elfsections (abfd);
-  i_ehdrp = elf_elfheader (abfd);
-
-  failed = false;
-  bfd_map_over_sections (abfd, bed->s->write_relocs, &failed);
-  if (failed)
-    return false;
-
-  _bfd_elf_assign_file_positions_for_relocs (abfd);
-
-  /* After writing the headers, we need to write the sections too... */
-  for (count = 1; count < i_ehdrp->e_shnum; count++)
-    {
-      if (bed->elf_backend_section_processing)
-	(*bed->elf_backend_section_processing) (abfd, i_shdrp[count]);
-      if (i_shdrp[count]->contents)
-	{
-	  if (bfd_seek (abfd, i_shdrp[count]->sh_offset, SEEK_SET) != 0
-	      || (bfd_write (i_shdrp[count]->contents, i_shdrp[count]->sh_size,
-			     1, abfd)
-		  != i_shdrp[count]->sh_size))
-	    return false;
-	}
-    }
-
-  /* Write out the section header names.  */
-  if (bfd_seek (abfd, elf_tdata (abfd)->shstrtab_hdr.sh_offset, SEEK_SET) != 0
-      || ! _bfd_stringtab_emit (abfd, elf_shstrtab (abfd)))
-    return false;
-
-  if (bed->elf_backend_final_write_processing)
-    (*bed->elf_backend_final_write_processing) (abfd,
-						elf_tdata (abfd)->linker);
-
-  return bed->s->write_shdrs_and_ehdr (abfd);
-}
-
-boolean
-_bfd_elf_write_corefile_contents (abfd)
-     bfd *abfd;
-{
-  /* Hopefully this can be done just like an object file. */
-  return _bfd_elf_write_object_contents (abfd);
-}
-/* given a section, search the header to find them... */
-int
-_bfd_elf_section_from_bfd_section (abfd, asect)
-     bfd *abfd;
-     struct sec *asect;
-{
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  Elf_Internal_Shdr **i_shdrp = elf_elfsections (abfd);
-  int index;
-  Elf_Internal_Shdr *hdr;
-  int maxindex = elf_elfheader (abfd)->e_shnum;
-
-  for (index = 0; index < maxindex; index++)
-    {
-      hdr = i_shdrp[index];
-      if (hdr->bfd_section == asect)
-	return index;
-    }
-
-  if (bed->elf_backend_section_from_bfd_section)
-    {
-      for (index = 0; index < maxindex; index++)
-	{
-	  int retval;
-
-	  hdr = i_shdrp[index];
-	  retval = index;
-	  if ((*bed->elf_backend_section_from_bfd_section)
-	      (abfd, hdr, asect, &retval))
-	    return retval;
-	}
-    }
-
-  if (bfd_is_abs_section (asect))
-    return SHN_ABS;
-  if (bfd_is_com_section (asect))
-    return SHN_COMMON;
-  if (bfd_is_und_section (asect))
-    return SHN_UNDEF;
-
-  bfd_set_error (bfd_error_nonrepresentable_section);
-
-  return -1;
-}
-
-/* Given a BFD symbol, return the index in the ELF symbol table, or -1
-   on error.  */
-
-int
-_bfd_elf_symbol_from_bfd_symbol (abfd, asym_ptr_ptr)
-     bfd *abfd;
-     asymbol **asym_ptr_ptr;
-{
-  asymbol *asym_ptr = *asym_ptr_ptr;
-  int idx;
-  flagword flags = asym_ptr->flags;
-
-  /* When gas creates relocations against local labels, it creates its
-     own symbol for the section, but does put the symbol into the
-     symbol chain, so udata is 0.  When the linker is generating
-     relocatable output, this section symbol may be for one of the
-     input sections rather than the output section.  */
-  if (asym_ptr->udata.i == 0
-      && (flags & BSF_SECTION_SYM)
-      && asym_ptr->section)
-    {
-      int indx;
-
-      if (asym_ptr->section->output_section != NULL)
-	indx = asym_ptr->section->output_section->index;
-      else
-	indx = asym_ptr->section->index;
-      if (elf_section_syms (abfd)[indx])
-	asym_ptr->udata.i = elf_section_syms (abfd)[indx]->udata.i;
-    }
-
-  idx = asym_ptr->udata.i;
-
-  if (idx == 0)
-    {
-      /* This case can occur when using --strip-symbol on a symbol
-         which is used in a relocation entry.  */
-      (*_bfd_error_handler)
-	(_("%s: symbol `%s' required but not present"),
-	 bfd_get_filename (abfd), bfd_asymbol_name (asym_ptr));
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-#if DEBUG & 4
-  {
-    fprintf (stderr,
-	     _("elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx%s\n"),
-	     (long) asym_ptr, asym_ptr->name, idx, flags,
-	     elf_symbol_flags (flags));
-    fflush (stderr);
-  }
-#endif
-
-  return idx;
-}
-
-/* Copy private BFD data.  This copies any program header information.  */
-
-static boolean
-copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  Elf_Internal_Ehdr *iehdr;
-  struct elf_segment_map *mfirst;
-  struct elf_segment_map **pm;
-  struct elf_segment_map *m;
-  Elf_Internal_Phdr *p;
-  unsigned int i;
-  unsigned int num_segments;
-  boolean phdr_included = false;
-
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  if (elf_tdata (ibfd)->phdr == NULL)
-    return true;
-
-  iehdr = elf_elfheader (ibfd);
-
-  mfirst = NULL;
-  pm = &mfirst;
-
-  num_segments = elf_elfheader (ibfd)->e_phnum;
-
-#define IS_CONTAINED_BY(addr, len, bottom, phdr)		 	\
-	  ((addr) >= (bottom)				 	  	\
-	   && (   ((addr) + (len)) <= ((bottom) + (phdr)->p_memsz)	\
-	       || ((addr) + (len)) <= ((bottom) + (phdr)->p_filesz)))
-
-  /* Special case: corefile "NOTE" section containing regs, prpsinfo etc. */
-
-#define IS_COREFILE_NOTE(p, s)                                          \
-	    (p->p_type == PT_NOTE                                       \
-	     && bfd_get_format (ibfd) == bfd_core                       \
-	     && s->vma == 0 && s->lma == 0                              \
-	     && (bfd_vma) s->filepos >= p->p_offset                     \
-	     && (bfd_vma) s->filepos + s->_raw_size                     \
-	     <= p->p_offset + p->p_filesz)
-
-  /* The complicated case when p_vaddr is 0 is to handle the Solaris
-     linker, which generates a PT_INTERP section with p_vaddr and
-     p_memsz set to 0.  */
-
-#define IS_SOLARIS_PT_INTERP(p, s)					\
-	    (p->p_vaddr == 0						\
-	     && p->p_filesz > 0						\
-	     && (s->flags & SEC_HAS_CONTENTS) != 0			\
-	     && s->_raw_size > 0					\
-	     && (bfd_vma) s->filepos >= p->p_offset			\
-	     && ((bfd_vma) s->filepos + s->_raw_size			\
-		     <= p->p_offset + p->p_filesz))
-
-  /* Scan through the segments specified in the program header
-     of the input BFD.  */
-  for (i = 0, p = elf_tdata (ibfd)->phdr; i < num_segments; i++, p++)
-    {
-      unsigned int csecs;
-      asection *s;
-      asection **sections;
-      asection *os;
-      unsigned int isec;
-      bfd_vma matching_lma;
-      bfd_vma suggested_lma;
-      unsigned int j;
-
-      /* For each section in the input BFD, decide if it should be
-	 included in the current segment.  A section will be included
-	 if it is within the address space of the segment, and it is
-	 an allocated segment, and there is an output section
-	 associated with it.  */
-      csecs = 0;
-      for (s = ibfd->sections; s != NULL; s = s->next)
-	if (s->output_section != NULL)
-	  {
-	    if ((IS_CONTAINED_BY (s->vma, s->_raw_size, p->p_vaddr, p)
-		 || IS_SOLARIS_PT_INTERP (p, s))
-		&& (s->flags & SEC_ALLOC) != 0)
-	      ++csecs;
-	    else if (IS_COREFILE_NOTE (p, s))
-	      ++csecs;
-	  }
-
-      /* Allocate a segment map big enough to contain all of the
-	 sections we have selected.  */
-      m = ((struct elf_segment_map *)
-	   bfd_alloc (obfd,
-		      (sizeof (struct elf_segment_map)
-		       + ((size_t) csecs - 1) * sizeof (asection *))));
-      if (m == NULL)
-	return false;
-
-      /* Initialise the fields of the segment map.  Default to
-	 using the physical address of the segment in the input BFD.  */
-      m->next          = NULL;
-      m->p_type        = p->p_type;
-      m->p_flags       = p->p_flags;
-      m->p_flags_valid = 1;
-      m->p_paddr       = p->p_paddr;
-      m->p_paddr_valid = 1;
-
-      /* Determine if this segment contains the ELF file header
-	 and if it contains the program headers themselves.  */
-      m->includes_filehdr = (p->p_offset == 0
-			     && p->p_filesz >= iehdr->e_ehsize);
-
-      m->includes_phdrs = 0;
-
-      if (! phdr_included || p->p_type != PT_LOAD)
-	{
-	  m->includes_phdrs =
-	    (p->p_offset <= (bfd_vma) iehdr->e_phoff
-	     && (p->p_offset + p->p_filesz
-		 >= ((bfd_vma) iehdr->e_phoff
-		     + iehdr->e_phnum * iehdr->e_phentsize)));
-	  if (p->p_type == PT_LOAD && m->includes_phdrs)
-	    phdr_included = true;
-	}
-
-      if (csecs == 0)
-	{
-	  /* Special segments, such as the PT_PHDR segment, may contain
-	     no sections, but ordinary, loadable segments should contain
-	     something.  */
-
-	  if (p->p_type == PT_LOAD)
-	      _bfd_error_handler
-		(_("%s: warning: Empty loadable segment detected\n"),
-		 bfd_get_filename (ibfd));
-
-	  m->count = 0;
-	  *pm = m;
-	  pm = &m->next;
-
-	  continue;
-	}
-
-      /* Now scan the sections in the input BFD again and attempt
-	 to add their corresponding output sections to the segment map.
-	 The problem here is how to handle an output section which has
-	 been moved (ie had its LMA changed).  There are four possibilities:
-
-	 1. None of the sections have been moved.
-	    In this case we can continue to use the segment LMA from the
-	    input BFD.
-
-	 2. All of the sections have been moved by the same amount.
-	    In this case we can change the segment's LMA to match the LMA
-	    of the first section.
-
-	 3. Some of the sections have been moved, others have not.
-	    In this case those sections which have not been moved can be
-	    placed in the current segment which will have to have its size,
-	    and possibly its LMA changed, and a new segment or segments will
-	    have to be created to contain the other sections.
-
-	 4. The sections have been moved, but not be the same amount.
-	    In this case we can change the segment's LMA to match the LMA
-	    of the first section and we will have to create a new segment
-	    or segments to contain the other sections.
-
-	 In order to save time, we allocate an array to hold the section
-	 pointers that we are interested in.  As these sections get assigned
-	 to a segment, they are removed from this array.  */
-
-      sections = (asection **) bfd_malloc (sizeof (asection *) * csecs);
-      if (sections == NULL)
-	return false;
-
-      /* Step One: Scan for segment vs section LMA conflicts.
-	 Also add the sections to the section array allocated above.
-	 Also add the sections to the current segment.  In the common
-	 case, where the sections have not been moved, this means that
-	 we have completely filled the segment, and there is nothing
-	 more to do.  */
-
-      isec = 0;
-      matching_lma = false;
-      suggested_lma = 0;
-
-      for (j = 0, s = ibfd->sections; s != NULL; s = s->next)
-	{
-	  os = s->output_section;
-
-	  if ((((IS_CONTAINED_BY (s->vma, s->_raw_size, p->p_vaddr, p)
-		 || IS_SOLARIS_PT_INTERP (p, s))
-		&& (s->flags & SEC_ALLOC) != 0)
-	       || IS_COREFILE_NOTE (p, s))
-	      && os != NULL)
-	    {
-	      sections[j++] = s;
-
-	      /* The Solaris native linker always sets p_paddr to 0.
-		 We try to catch that case here, and set it to the
-		 correct value.  */
-	      if (p->p_paddr == 0
-		  && p->p_vaddr != 0
-		  && isec == 0
-		  && os->lma != 0
-		  && (os->vma == (p->p_vaddr
-				  + (m->includes_filehdr
-				     ? iehdr->e_ehsize
-				     : 0)
-				  + (m->includes_phdrs
-				     ? iehdr->e_phnum * iehdr->e_phentsize
-				     : 0))))
-		m->p_paddr = p->p_vaddr;
-
-	      /* Match up the physical address of the segment with the
-		 LMA address of the output section.  */
-	      if (IS_CONTAINED_BY (os->lma, os->_raw_size, m->p_paddr, p)
-		  || IS_COREFILE_NOTE (p, s))
-		{
-		  if (matching_lma == 0)
-		    matching_lma = os->lma;
-
-		  /* We assume that if the section fits within the segment
-		     that it does not overlap any other section within that
-		     segment.  */
-		  m->sections[isec++] = os;
-		}
-	      else if (suggested_lma == 0)
-		suggested_lma = os->lma;
-	    }
-	}
-
-      BFD_ASSERT (j == csecs);
-
-      /* Step Two: Adjust the physical address of the current segment,
-	 if necessary.  */
-      if (isec == csecs)
-	{
-	  /* All of the sections fitted within the segment as currently
-	     specified.  This is the default case.  Add the segment to
-	     the list of built segments and carry on to process the next
-	     program header in the input BFD.  */
-	  m->count = csecs;
-	  *pm = m;
-	  pm = &m->next;
-
-	  free (sections);
-	  continue;
-	}
-      else if (matching_lma != 0)
-	{
-	  /* At least one section fits inside the current segment.
-	     Keep it, but modify its physical address to match the
-	     LMA of the first section that fitted.  */
-
-	  m->p_paddr = matching_lma;
-	}
-      else
-	{
-	  /* None of the sections fitted inside the current segment.
-	     Change the current segment's physical address to match
-	     the LMA of the first section.  */
-
-	  m->p_paddr = suggested_lma;
-	}
-
-      /* Step Three: Loop over the sections again, this time assigning
-	 those that fit to the current segment and remvoing them from the
-	 sections array; but making sure not to leave large gaps.  Once all
-	 possible sections have been assigned to the current segment it is
-	 added to the list of built segments and if sections still remain
-	 to be assigned, a new segment is constructed before repeating
-	 the loop.  */
-      isec = 0;
-      do
-	{
-	  m->count = 0;
-	  suggested_lma = 0;
-
-	  /* Fill the current segment with sections that fit.  */
-	  for (j = 0; j < csecs; j++)
-	    {
-	      s = sections[j];
-
-	      if (s == NULL)
-		continue;
-
-	      os = s->output_section;
-
-	      if (IS_CONTAINED_BY (os->lma, os->_raw_size, m->p_paddr, p)
-		  || IS_COREFILE_NOTE (p, s))
-		{
-		  if (m->count == 0)
-		    {
-		      /* If the first section in a segment does not start at
-			 the beginning of the segment, then something is wrong.  */
-		      if (os->lma != m->p_paddr)
-			abort ();
-		    }
-		  else
-		    {
-		      asection * prev_sec;
-		      bfd_vma maxpagesize;
-
-		      prev_sec = m->sections[m->count - 1];
-		      maxpagesize = get_elf_backend_data (obfd)->maxpagesize;
-
-		      /* If the gap between the end of the previous section
-			 and the start of this section is more than maxpagesize
-			 then we need to start a new segment.  */
-		      if (BFD_ALIGN (prev_sec->lma + prev_sec->_raw_size, maxpagesize)
-			  < BFD_ALIGN (os->lma, maxpagesize))
-			{
-			  if (suggested_lma == 0)
-			    suggested_lma = os->lma;
-
-			  continue;
-			}
-		    }
-
-		  m->sections[m->count++] = os;
-		  ++isec;
-		  sections[j] = NULL;
-		}
-	      else if (suggested_lma == 0)
-		suggested_lma = os->lma;
-	    }
-
-	  BFD_ASSERT (m->count > 0);
-
-	  /* Add the current segment to the list of built segments.  */
-	  *pm = m;
-	  pm = &m->next;
-
-	  if (isec < csecs)
-	    {
-	      /* We still have not allocated all of the sections to
-		 segments.  Create a new segment here, initialise it
-		 and carry on looping.  */
-
-	      m = ((struct elf_segment_map *)
-		   bfd_alloc (obfd,
-			      (sizeof (struct elf_segment_map)
-			       + ((size_t) csecs - 1) * sizeof (asection *))));
-	      if (m == NULL)
-		return false;
-
-	      /* Initialise the fields of the segment map.  Set the physical
-		 physical address to the LMA of the first section that has
-		 not yet been assigned.  */
-
-	      m->next             = NULL;
-	      m->p_type           = p->p_type;
-	      m->p_flags          = p->p_flags;
-	      m->p_flags_valid    = 1;
-	      m->p_paddr          = suggested_lma;
-	      m->p_paddr_valid    = 1;
-	      m->includes_filehdr = 0;
-	      m->includes_phdrs   = 0;
-	    }
-	}
-      while (isec < csecs);
-
-      free (sections);
-    }
-
-  /* The Solaris linker creates program headers in which all the
-     p_paddr fields are zero.  When we try to objcopy or strip such a
-     file, we get confused.  Check for this case, and if we find it
-     reset the p_paddr_valid fields.  */
-  for (m = mfirst; m != NULL; m = m->next)
-    if (m->p_paddr != 0)
-      break;
-  if (m == NULL)
-    {
-      for (m = mfirst; m != NULL; m = m->next)
-	m->p_paddr_valid = 0;
-    }
-
-  elf_tdata (obfd)->segment_map = mfirst;
-
-#if 0
-  /* Final Step: Sort the segments into ascending order of physical address. */
-  if (mfirst != NULL)
-    {
-      struct elf_segment_map* prev;
-
-      prev = mfirst;
-      for (m = mfirst->next; m != NULL; prev = m, m = m->next)
-	{
-	  /* Yes I know - its a bubble sort....*/
-	  if (m->next != NULL && (m->next->p_paddr < m->p_paddr))
-	    {
-	      /* swap m and m->next */
-	      prev->next = m->next;
-	      m->next = m->next->next;
-	      prev->next->next = m;
-
-	      /* restart loop. */
-	      m = mfirst;
-	    }
-	}
-    }
-#endif
-
-#undef IS_CONTAINED_BY
-#undef IS_SOLARIS_PT_INTERP
-#undef IS_COREFILE_NOTE
-  return true;
-}
-
-/* Copy private section information.  This copies over the entsize
-   field, and sometimes the info field.  */
-
-boolean
-_bfd_elf_copy_private_section_data (ibfd, isec, obfd, osec)
-     bfd *ibfd;
-     asection *isec;
-     bfd *obfd;
-     asection *osec;
-{
-  Elf_Internal_Shdr *ihdr, *ohdr;
-
-  if (ibfd->xvec->flavour != bfd_target_elf_flavour
-      || obfd->xvec->flavour != bfd_target_elf_flavour)
-    return true;
-
-  /* Copy over private BFD data if it has not already been copied.
-     This must be done here, rather than in the copy_private_bfd_data
-     entry point, because the latter is called after the section
-     contents have been set, which means that the program headers have
-     already been worked out.  */
-  if (elf_tdata (obfd)->segment_map == NULL
-      && elf_tdata (ibfd)->phdr != NULL)
-    {
-      asection *s;
-
-      /* Only set up the segments if there are no more SEC_ALLOC
-         sections.  FIXME: This won't do the right thing if objcopy is
-         used to remove the last SEC_ALLOC section, since objcopy
-         won't call this routine in that case.  */
-      for (s = isec->next; s != NULL; s = s->next)
-	if ((s->flags & SEC_ALLOC) != 0)
-	  break;
-      if (s == NULL)
-	{
-	  if (! copy_private_bfd_data (ibfd, obfd))
-	    return false;
-	}
-    }
-
-  ihdr = &elf_section_data (isec)->this_hdr;
-  ohdr = &elf_section_data (osec)->this_hdr;
-
-  ohdr->sh_entsize = ihdr->sh_entsize;
-
-  if (ihdr->sh_type == SHT_SYMTAB
-      || ihdr->sh_type == SHT_DYNSYM
-      || ihdr->sh_type == SHT_GNU_verneed
-      || ihdr->sh_type == SHT_GNU_verdef)
-    ohdr->sh_info = ihdr->sh_info;
-
-  return true;
-}
-
-/* Copy private symbol information.  If this symbol is in a section
-   which we did not map into a BFD section, try to map the section
-   index correctly.  We use special macro definitions for the mapped
-   section indices; these definitions are interpreted by the
-   swap_out_syms function.  */
-
-#define MAP_ONESYMTAB (SHN_LORESERVE - 1)
-#define MAP_DYNSYMTAB (SHN_LORESERVE - 2)
-#define MAP_STRTAB (SHN_LORESERVE - 3)
-#define MAP_SHSTRTAB (SHN_LORESERVE - 4)
-
-boolean
-_bfd_elf_copy_private_symbol_data (ibfd, isymarg, obfd, osymarg)
-     bfd *ibfd;
-     asymbol *isymarg;
-     bfd *obfd;
-     asymbol *osymarg;
-{
-  elf_symbol_type *isym, *osym;
-
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  isym = elf_symbol_from (ibfd, isymarg);
-  osym = elf_symbol_from (obfd, osymarg);
-
-  if (isym != NULL
-      && osym != NULL
-      && bfd_is_abs_section (isym->symbol.section))
-    {
-      unsigned int shndx;
-
-      shndx = isym->internal_elf_sym.st_shndx;
-      if (shndx == elf_onesymtab (ibfd))
-	shndx = MAP_ONESYMTAB;
-      else if (shndx == elf_dynsymtab (ibfd))
-	shndx = MAP_DYNSYMTAB;
-      else if (shndx == elf_tdata (ibfd)->strtab_section)
-	shndx = MAP_STRTAB;
-      else if (shndx == elf_tdata (ibfd)->shstrtab_section)
-	shndx = MAP_SHSTRTAB;
-      osym->internal_elf_sym.st_shndx = shndx;
-    }
-
-  return true;
-}
-
-/* Swap out the symbols.  */
-
-static boolean
-swap_out_syms (abfd, sttp, relocatable_p)
-     bfd *abfd;
-     struct bfd_strtab_hash **sttp;
-     int relocatable_p;
-{
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-
-  if (!elf_map_symbols (abfd))
-    return false;
-
-  /* Dump out the symtabs. */
-  {
-    int symcount = bfd_get_symcount (abfd);
-    asymbol **syms = bfd_get_outsymbols (abfd);
-    struct bfd_strtab_hash *stt;
-    Elf_Internal_Shdr *symtab_hdr;
-    Elf_Internal_Shdr *symstrtab_hdr;
-    char *outbound_syms;
-    int idx;
-
-    stt = _bfd_elf_stringtab_init ();
-    if (stt == NULL)
-      return false;
-
-    symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-    symtab_hdr->sh_type = SHT_SYMTAB;
-    symtab_hdr->sh_entsize = bed->s->sizeof_sym;
-    symtab_hdr->sh_size = symtab_hdr->sh_entsize * (symcount + 1);
-    symtab_hdr->sh_info = elf_num_locals (abfd) + 1;
-    symtab_hdr->sh_addralign = bed->s->file_align;
-
-    symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr;
-    symstrtab_hdr->sh_type = SHT_STRTAB;
-
-    outbound_syms = bfd_alloc (abfd,
-			       (1 + symcount) * bed->s->sizeof_sym);
-    if (outbound_syms == NULL)
-      return false;
-    symtab_hdr->contents = (PTR) outbound_syms;
-
-    /* now generate the data (for "contents") */
-    {
-      /* Fill in zeroth symbol and swap it out.  */
-      Elf_Internal_Sym sym;
-      sym.st_name = 0;
-      sym.st_value = 0;
-      sym.st_size = 0;
-      sym.st_info = 0;
-      sym.st_other = 0;
-      sym.st_shndx = SHN_UNDEF;
-      bed->s->swap_symbol_out (abfd, &sym, (PTR) outbound_syms);
-      outbound_syms += bed->s->sizeof_sym;
-    }
-    for (idx = 0; idx < symcount; idx++)
-      {
-	Elf_Internal_Sym sym;
-	bfd_vma value = syms[idx]->value;
-	elf_symbol_type *type_ptr;
-	flagword flags = syms[idx]->flags;
-	int type;
-
-	if (flags & BSF_SECTION_SYM)
-	  /* Section symbols have no names.  */
-	  sym.st_name = 0;
-	else
-	  {
-	    sym.st_name = (unsigned long) _bfd_stringtab_add (stt,
-							      syms[idx]->name,
-							      true, false);
-	    if (sym.st_name == (unsigned long) -1)
-	      return false;
-	  }
-
-	type_ptr = elf_symbol_from (abfd, syms[idx]);
-
-	if ((flags & BSF_SECTION_SYM) == 0
-	    && bfd_is_com_section (syms[idx]->section))
-	  {
-	    /* ELF common symbols put the alignment into the `value' field,
-	       and the size into the `size' field.  This is backwards from
-	       how BFD handles it, so reverse it here.  */
-	    sym.st_size = value;
-	    if (type_ptr == NULL
-		|| type_ptr->internal_elf_sym.st_value == 0)
-	      sym.st_value = value >= 16 ? 16 : (1 << bfd_log2 (value));
-	    else
-	      sym.st_value = type_ptr->internal_elf_sym.st_value;
-	    sym.st_shndx = _bfd_elf_section_from_bfd_section
-	      (abfd, syms[idx]->section);
-	  }
-	else
-	  {
-	    asection *sec = syms[idx]->section;
-	    int shndx;
-
-	    if (sec->output_section)
-	      {
-		value += sec->output_offset;
-		sec = sec->output_section;
-	      }
-	    /* Don't add in the section vma for relocatable output.  */
-	    if (! relocatable_p)
-	      value += sec->vma;
-	    sym.st_value = value;
-	    sym.st_size = type_ptr ? type_ptr->internal_elf_sym.st_size : 0;
-
-	    if (bfd_is_abs_section (sec)
-		&& type_ptr != NULL
-		&& type_ptr->internal_elf_sym.st_shndx != 0)
-	      {
-		/* This symbol is in a real ELF section which we did
-                   not create as a BFD section.  Undo the mapping done
-                   by copy_private_symbol_data.  */
-		shndx = type_ptr->internal_elf_sym.st_shndx;
-		switch (shndx)
-		  {
-		  case MAP_ONESYMTAB:
-		    shndx = elf_onesymtab (abfd);
-		    break;
-		  case MAP_DYNSYMTAB:
-		    shndx = elf_dynsymtab (abfd);
-		    break;
-		  case MAP_STRTAB:
-		    shndx = elf_tdata (abfd)->strtab_section;
-		    break;
-		  case MAP_SHSTRTAB:
-		    shndx = elf_tdata (abfd)->shstrtab_section;
-		    break;
-		  default:
-		    break;
-		  }
-	      }
-	    else
-	      {
-		shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-		if (shndx == -1)
-		  {
-		    asection *sec2;
-
-		    /* Writing this would be a hell of a lot easier if
-		       we had some decent documentation on bfd, and
-		       knew what to expect of the library, and what to
-		       demand of applications.  For example, it
-		       appears that `objcopy' might not set the
-		       section of a symbol to be a section that is
-		       actually in the output file.  */
-		    sec2 = bfd_get_section_by_name (abfd, sec->name);
-		    BFD_ASSERT (sec2 != 0);
-		    shndx = _bfd_elf_section_from_bfd_section (abfd, sec2);
-		    BFD_ASSERT (shndx != -1);
-		  }
-	      }
-
-	    sym.st_shndx = shndx;
-	  }
-
-	if ((flags & BSF_FUNCTION) != 0)
-	  type = STT_FUNC;
-	else if ((flags & BSF_OBJECT) != 0)
-	  type = STT_OBJECT;
-	else
-	  type = STT_NOTYPE;
-
-        /* Processor-specific types */
-        if (bed->elf_backend_get_symbol_type)
-          type = (*bed->elf_backend_get_symbol_type) (&type_ptr->internal_elf_sym, type);
-
-	if (flags & BSF_SECTION_SYM)
-	  sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-	else if (bfd_is_com_section (syms[idx]->section))
-	  sym.st_info = ELF_ST_INFO (STB_GLOBAL, type);
-	else if (bfd_is_und_section (syms[idx]->section))
-	  sym.st_info = ELF_ST_INFO (((flags & BSF_WEAK)
-				      ? STB_WEAK
-				      : STB_GLOBAL),
-				     type);
-	else if (flags & BSF_FILE)
-	  sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE);
-	else
-	  {
-	    int bind = STB_LOCAL;
-
-	    if (flags & BSF_LOCAL)
-	      bind = STB_LOCAL;
-	    else if (flags & BSF_WEAK)
-	      bind = STB_WEAK;
-	    else if (flags & BSF_GLOBAL)
-	      bind = STB_GLOBAL;
-
-	    sym.st_info = ELF_ST_INFO (bind, type);
-	  }
-
-	if (type_ptr != NULL)
-	  sym.st_other = type_ptr->internal_elf_sym.st_other;
-	else
-	  sym.st_other = 0;
-
-	bed->s->swap_symbol_out (abfd, &sym, (PTR) outbound_syms);
-	outbound_syms += bed->s->sizeof_sym;
-      }
-
-    *sttp = stt;
-    symstrtab_hdr->sh_size = _bfd_stringtab_size (stt);
-    symstrtab_hdr->sh_type = SHT_STRTAB;
-
-    symstrtab_hdr->sh_flags = 0;
-    symstrtab_hdr->sh_addr = 0;
-    symstrtab_hdr->sh_entsize = 0;
-    symstrtab_hdr->sh_link = 0;
-    symstrtab_hdr->sh_info = 0;
-    symstrtab_hdr->sh_addralign = 1;
-  }
-
-  return true;
-}
-
-/* Return the number of bytes required to hold the symtab vector.
-
-   Note that we base it on the count plus 1, since we will null terminate
-   the vector allocated based on this size.  However, the ELF symbol table
-   always has a dummy entry as symbol #0, so it ends up even.  */
-
-long
-_bfd_elf_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  long symcount;
-  long symtab_size;
-  Elf_Internal_Shdr *hdr = &elf_tdata (abfd)->symtab_hdr;
-
-  symcount = hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;
-  symtab_size = (symcount - 1 + 1) * (sizeof (asymbol *));
-
-  return symtab_size;
-}
-
-long
-_bfd_elf_get_dynamic_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  long symcount;
-  long symtab_size;
-  Elf_Internal_Shdr *hdr = &elf_tdata (abfd)->dynsymtab_hdr;
-
-  if (elf_dynsymtab (abfd) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  symcount = hdr->sh_size / get_elf_backend_data (abfd)->s->sizeof_sym;
-  symtab_size = (symcount - 1 + 1) * (sizeof (asymbol *));
-
-  return symtab_size;
-}
-
-long
-_bfd_elf_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  return (asect->reloc_count + 1) * sizeof (arelent *);
-}
-
-/* Canonicalize the relocs.  */
-
-long
-_bfd_elf_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *tblptr;
-  unsigned int i;
-
-  if (! get_elf_backend_data (abfd)->s->slurp_reloc_table (abfd,
-							   section,
-							   symbols,
-							   false))
-    return -1;
-
-  tblptr = section->relocation;
-  for (i = 0; i < section->reloc_count; i++)
-    *relptr++ = tblptr++;
-
-  *relptr = NULL;
-
-  return section->reloc_count;
-}
-
-long
-_bfd_elf_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  long symcount = get_elf_backend_data (abfd)->s->slurp_symbol_table
-    (abfd, alocation, false);
-
-  if (symcount >= 0)
-    bfd_get_symcount (abfd) = symcount;
-  return symcount;
-}
-
-long
-_bfd_elf_canonicalize_dynamic_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  return get_elf_backend_data (abfd)->s->slurp_symbol_table
-    (abfd, alocation, true);
-}
-
-/* Return the size required for the dynamic reloc entries.  Any
-   section that was actually installed in the BFD, and has type
-   SHT_REL or SHT_RELA, and uses the dynamic symbol table, is
-   considered to be a dynamic reloc section.  */
-
-long
-_bfd_elf_get_dynamic_reloc_upper_bound (abfd)
-     bfd *abfd;
-{
-  long ret;
-  asection *s;
-
-  if (elf_dynsymtab (abfd) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  ret = sizeof (arelent *);
-  for (s = abfd->sections; s != NULL; s = s->next)
-    if (elf_section_data (s)->this_hdr.sh_link == elf_dynsymtab (abfd)
-	&& (elf_section_data (s)->this_hdr.sh_type == SHT_REL
-	    || elf_section_data (s)->this_hdr.sh_type == SHT_RELA))
-      ret += ((s->_raw_size / elf_section_data (s)->this_hdr.sh_entsize)
-	      * sizeof (arelent *));
-
-  return ret;
-}
-
-/* Canonicalize the dynamic relocation entries.  Note that we return
-   the dynamic relocations as a single block, although they are
-   actually associated with particular sections; the interface, which
-   was designed for SunOS style shared libraries, expects that there
-   is only one set of dynamic relocs.  Any section that was actually
-   installed in the BFD, and has type SHT_REL or SHT_RELA, and uses
-   the dynamic symbol table, is considered to be a dynamic reloc
-   section.  */
-
-long
-_bfd_elf_canonicalize_dynamic_reloc (abfd, storage, syms)
-     bfd *abfd;
-     arelent **storage;
-     asymbol **syms;
-{
-  boolean (*slurp_relocs) PARAMS ((bfd *, asection *, asymbol **, boolean));
-  asection *s;
-  long ret;
-
-  if (elf_dynsymtab (abfd) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table;
-  ret = 0;
-  for (s = abfd->sections; s != NULL; s = s->next)
-    {
-      if (elf_section_data (s)->this_hdr.sh_link == elf_dynsymtab (abfd)
-	  && (elf_section_data (s)->this_hdr.sh_type == SHT_REL
-	      || elf_section_data (s)->this_hdr.sh_type == SHT_RELA))
-	{
-	  arelent *p;
-	  long count, i;
-
-	  if (! (*slurp_relocs) (abfd, s, syms, true))
-	    return -1;
-	  count = s->_raw_size / elf_section_data (s)->this_hdr.sh_entsize;
-	  p = s->relocation;
-	  for (i = 0; i < count; i++)
-	    *storage++ = p++;
-	  ret += count;
-	}
-    }
-
-  *storage = NULL;
-
-  return ret;
-}
-
-/* Read in the version information.  */
-
-boolean
-_bfd_elf_slurp_version_tables (abfd)
-     bfd *abfd;
-{
-  bfd_byte *contents = NULL;
-
-  if (elf_dynverdef (abfd) != 0)
-    {
-      Elf_Internal_Shdr *hdr;
-      Elf_External_Verdef *everdef;
-      Elf_Internal_Verdef *iverdef;
-      unsigned int i;
-
-      hdr = &elf_tdata (abfd)->dynverdef_hdr;
-
-      elf_tdata (abfd)->verdef =
-	((Elf_Internal_Verdef *)
-	 bfd_zalloc (abfd, hdr->sh_info * sizeof (Elf_Internal_Verdef)));
-      if (elf_tdata (abfd)->verdef == NULL)
-	goto error_return;
-
-      elf_tdata (abfd)->cverdefs = hdr->sh_info;
-
-      contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
-      if (contents == NULL)
-	goto error_return;
-      if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
-	  || bfd_read ((PTR) contents, 1, hdr->sh_size, abfd) != hdr->sh_size)
-	goto error_return;
-
-      everdef = (Elf_External_Verdef *) contents;
-      iverdef = elf_tdata (abfd)->verdef;
-      for (i = 0; i < hdr->sh_info; i++, iverdef++)
-	{
-	  Elf_External_Verdaux *everdaux;
-	  Elf_Internal_Verdaux *iverdaux;
-	  unsigned int j;
-
-	  _bfd_elf_swap_verdef_in (abfd, everdef, iverdef);
-
-	  iverdef->vd_bfd = abfd;
-
-	  iverdef->vd_auxptr = ((Elf_Internal_Verdaux *)
-				bfd_alloc (abfd,
-					   (iverdef->vd_cnt
-					    * sizeof (Elf_Internal_Verdaux))));
-	  if (iverdef->vd_auxptr == NULL)
-	    goto error_return;
-
-	  everdaux = ((Elf_External_Verdaux *)
-		      ((bfd_byte *) everdef + iverdef->vd_aux));
-	  iverdaux = iverdef->vd_auxptr;
-	  for (j = 0; j < iverdef->vd_cnt; j++, iverdaux++)
-	    {
-	      _bfd_elf_swap_verdaux_in (abfd, everdaux, iverdaux);
-
-	      iverdaux->vda_nodename =
-		bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
-						 iverdaux->vda_name);
-	      if (iverdaux->vda_nodename == NULL)
-		goto error_return;
-
-	      if (j + 1 < iverdef->vd_cnt)
-		iverdaux->vda_nextptr = iverdaux + 1;
-	      else
-		iverdaux->vda_nextptr = NULL;
-
-	      everdaux = ((Elf_External_Verdaux *)
-			  ((bfd_byte *) everdaux + iverdaux->vda_next));
-	    }
-
-	  iverdef->vd_nodename = iverdef->vd_auxptr->vda_nodename;
-
-	  if (i + 1 < hdr->sh_info)
-	    iverdef->vd_nextdef = iverdef + 1;
-	  else
-	    iverdef->vd_nextdef = NULL;
-
-	  everdef = ((Elf_External_Verdef *)
-		     ((bfd_byte *) everdef + iverdef->vd_next));
-	}
-
-      free (contents);
-      contents = NULL;
-    }
-
-  if (elf_dynverref (abfd) != 0)
-    {
-      Elf_Internal_Shdr *hdr;
-      Elf_External_Verneed *everneed;
-      Elf_Internal_Verneed *iverneed;
-      unsigned int i;
-
-      hdr = &elf_tdata (abfd)->dynverref_hdr;
-
-      elf_tdata (abfd)->verref =
-	((Elf_Internal_Verneed *)
-	 bfd_zalloc (abfd, hdr->sh_info * sizeof (Elf_Internal_Verneed)));
-      if (elf_tdata (abfd)->verref == NULL)
-	goto error_return;
-
-      elf_tdata (abfd)->cverrefs = hdr->sh_info;
-
-      contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
-      if (contents == NULL)
-	goto error_return;
-      if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) != 0
-	  || bfd_read ((PTR) contents, 1, hdr->sh_size, abfd) != hdr->sh_size)
-	goto error_return;
-
-      everneed = (Elf_External_Verneed *) contents;
-      iverneed = elf_tdata (abfd)->verref;
-      for (i = 0; i < hdr->sh_info; i++, iverneed++)
-	{
-	  Elf_External_Vernaux *evernaux;
-	  Elf_Internal_Vernaux *ivernaux;
-	  unsigned int j;
-
-	  _bfd_elf_swap_verneed_in (abfd, everneed, iverneed);
-
-	  iverneed->vn_bfd = abfd;
-
-	  iverneed->vn_filename =
-	    bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
-					     iverneed->vn_file);
-	  if (iverneed->vn_filename == NULL)
-	    goto error_return;
-
-	  iverneed->vn_auxptr =
-	    ((Elf_Internal_Vernaux *)
-	     bfd_alloc (abfd,
-			iverneed->vn_cnt * sizeof (Elf_Internal_Vernaux)));
-
-	  evernaux = ((Elf_External_Vernaux *)
-		      ((bfd_byte *) everneed + iverneed->vn_aux));
-	  ivernaux = iverneed->vn_auxptr;
-	  for (j = 0; j < iverneed->vn_cnt; j++, ivernaux++)
-	    {
-	      _bfd_elf_swap_vernaux_in (abfd, evernaux, ivernaux);
-
-	      ivernaux->vna_nodename =
-		bfd_elf_string_from_elf_section (abfd, hdr->sh_link,
-						 ivernaux->vna_name);
-	      if (ivernaux->vna_nodename == NULL)
-		goto error_return;
-
-	      if (j + 1 < iverneed->vn_cnt)
-		ivernaux->vna_nextptr = ivernaux + 1;
-	      else
-		ivernaux->vna_nextptr = NULL;
-
-	      evernaux = ((Elf_External_Vernaux *)
-			  ((bfd_byte *) evernaux + ivernaux->vna_next));
-	    }
-
-	  if (i + 1 < hdr->sh_info)
-	    iverneed->vn_nextref = iverneed + 1;
-	  else
-	    iverneed->vn_nextref = NULL;
-
-	  everneed = ((Elf_External_Verneed *)
-		      ((bfd_byte *) everneed + iverneed->vn_next));
-	}
-
-      free (contents);
-      contents = NULL;
-    }
-
-  return true;
-
- error_return:
-  if (contents == NULL)
-    free (contents);
-  return false;
-}
-
-asymbol *
-_bfd_elf_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  elf_symbol_type *newsym;
-
-  newsym = (elf_symbol_type *) bfd_zalloc (abfd, sizeof (elf_symbol_type));
-  if (!newsym)
-    return NULL;
-  else
-    {
-      newsym->symbol.the_bfd = abfd;
-      return &newsym->symbol;
-    }
-}
-
-void
-_bfd_elf_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-/* Return whether a symbol name implies a local symbol.  Most targets
-   use this function for the is_local_label_name entry point, but some
-   override it.  */
-
-boolean
-_bfd_elf_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  /* Normal local symbols start with ``.L''.  */
-  if (name[0] == '.' && name[1] == 'L')
-    return true;
-
-  /* At least some SVR4 compilers (e.g., UnixWare 2.1 cc) generate
-     DWARF debugging symbols starting with ``..''.  */
-  if (name[0] == '.' && name[1] == '.')
-    return true;
-
-  /* gcc will sometimes generate symbols beginning with ``_.L_'' when
-     emitting DWARF debugging output.  I suspect this is actually a
-     small bug in gcc (it calls ASM_OUTPUT_LABEL when it should call
-     ASM_GENERATE_INTERNAL_LABEL, and this causes the leading
-     underscore to be emitted on some ELF targets).  For ease of use,
-     we treat such symbols as local.  */
-  if (name[0] == '_' && name[1] == '.' && name[2] == 'L' && name[3] == '_')
-    return true;
-
-  return false;
-}
-
-alent *
-_bfd_elf_get_lineno (ignore_abfd, symbol)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-{
-  abort ();
-  return NULL;
-}
-
-boolean
-_bfd_elf_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  /* If this isn't the right architecture for this backend, and this
-     isn't the generic backend, fail.  */
-  if (arch != get_elf_backend_data (abfd)->arch
-      && arch != bfd_arch_unknown
-      && get_elf_backend_data (abfd)->arch != bfd_arch_unknown)
-    return false;
-
-  return bfd_default_set_arch_mach (abfd, arch, machine);
-}
-
-/* Find the nearest line to a particular section and offset, for error
-   reporting.  */
-
-boolean
-_bfd_elf_find_nearest_line (abfd,
-			    section,
-			    symbols,
-			    offset,
-			    filename_ptr,
-			    functionname_ptr,
-			    line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     CONST char **filename_ptr;
-     CONST char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  boolean found;
-  const char *filename;
-  asymbol *func;
-  bfd_vma low_func;
-  asymbol **p;
-
-  if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
-				     filename_ptr, functionname_ptr, 
-				     line_ptr))
-    return true;
-
-  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
-				     filename_ptr, functionname_ptr,
-				     line_ptr))
-    return true;
-
-  if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
-					     &found, filename_ptr,
-					     functionname_ptr, line_ptr,
-					     &elf_tdata (abfd)->line_info))
-    return false;
-  if (found)
-    return true;
-
-  if (symbols == NULL)
-    return false;
-
-  filename = NULL;
-  func = NULL;
-  low_func = 0;
-
-  for (p = symbols; *p != NULL; p++)
-    {
-      elf_symbol_type *q;
-
-      q = (elf_symbol_type *) *p;
-
-      if (bfd_get_section (&q->symbol) != section)
-	continue;
-
-      switch (ELF_ST_TYPE (q->internal_elf_sym.st_info))
-	{
-	default:
-	  break;
-	case STT_FILE:
-	  filename = bfd_asymbol_name (&q->symbol);
-	  break;
-	case STT_NOTYPE:
-	case STT_FUNC:
-	  if (q->symbol.section == section
-	      && q->symbol.value >= low_func
-	      && q->symbol.value <= offset)
-	    {
-	      func = (asymbol *) q;
-	      low_func = q->symbol.value;
-	    }
-	  break;
-	}
-    }
-
-  if (func == NULL)
-    return false;
-
-  *filename_ptr = filename;
-  *functionname_ptr = bfd_asymbol_name (func);
-  *line_ptr = 0;
-  return true;
-}
-
-int
-_bfd_elf_sizeof_headers (abfd, reloc)
-     bfd *abfd;
-     boolean reloc;
-{
-  int ret;
-
-  ret = get_elf_backend_data (abfd)->s->sizeof_ehdr;
-  if (! reloc)
-    ret += get_program_header_size (abfd);
-  return ret;
-}
-
-boolean
-_bfd_elf_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  Elf_Internal_Shdr *hdr;
-
-  if (! abfd->output_has_begun
-      && ! _bfd_elf_compute_section_file_positions
-      (abfd, (struct bfd_link_info *) NULL))
-    return false;
-
-  hdr = &elf_section_data (section)->this_hdr;
-
-  if (bfd_seek (abfd, hdr->sh_offset + offset, SEEK_SET) == -1)
-    return false;
-  if (bfd_write (location, 1, count, abfd) != count)
-    return false;
-
-  return true;
-}
-
-void
-_bfd_elf_no_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
-{
-  abort ();
-}
-
-#if 0
-void
-_bfd_elf_no_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf_Internal_Rel *dst;
-{
-  abort ();
-}
-#endif
-
-/* Try to convert a non-ELF reloc into an ELF one.  */
-
-boolean
-_bfd_elf_validate_reloc (abfd, areloc)
-     bfd *abfd;
-     arelent *areloc;
-{
-  /* Check whether we really have an ELF howto. */
-
-  if ((*areloc->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec)
-    {
-      bfd_reloc_code_real_type code;
-      reloc_howto_type *howto;
-
-      /* Alien reloc: Try to determine its type to replace it with an
-	 equivalent ELF reloc. */
-
-      if (areloc->howto->pc_relative)
-	{
-	  switch (areloc->howto->bitsize)
-	    {
-	    case 8:
-	      code = BFD_RELOC_8_PCREL;
-	      break;
-	    case 12:
-	      code = BFD_RELOC_12_PCREL;
-	      break;
-	    case 16:
-	      code = BFD_RELOC_16_PCREL;
-	      break;
-	    case 24:
-	      code = BFD_RELOC_24_PCREL;
-	      break;
-	    case 32:
-	      code = BFD_RELOC_32_PCREL;
-	      break;
-	    case 64:
-	      code = BFD_RELOC_64_PCREL;
-	      break;
-	    default:
-	      goto fail;
-	    }
-
-	  howto = bfd_reloc_type_lookup (abfd, code);
-
-	  if (areloc->howto->pcrel_offset != howto->pcrel_offset)
-	    {
-	      if (howto->pcrel_offset)
-		areloc->addend += areloc->address;
-	      else
-		areloc->addend -= areloc->address; /* addend is unsigned!! */
-	    }
-	}
-      else
-	{
-	  switch (areloc->howto->bitsize)
-	    {
-	    case 8:
-	      code = BFD_RELOC_8;
-	      break;
-	    case 14:
-	      code = BFD_RELOC_14;
-	      break;
-	    case 16:
-	      code = BFD_RELOC_16;
-	      break;
-	    case 26:
-	      code = BFD_RELOC_26;
-	      break;
-	    case 32:
-	      code = BFD_RELOC_32;
-	      break;
-	    case 64:
-	      code = BFD_RELOC_64;
-	      break;
-	    default:
-	      goto fail;
-	    }
-
-	  howto = bfd_reloc_type_lookup (abfd, code);
-	}
-
-      if (howto)
-	areloc->howto = howto;
-      else
-	goto fail;
-    }
-
-  return true;
-
- fail:
-  (*_bfd_error_handler)
-    (_("%s: unsupported relocation type %s"),
-     bfd_get_filename (abfd), areloc->howto->name);
-  bfd_set_error (bfd_error_bad_value);
-  return false;
-}
-
-boolean
-_bfd_elf_close_and_cleanup (abfd)
-     bfd *abfd;
-{
-  if (bfd_get_format (abfd) == bfd_object)
-    {
-      if (elf_shstrtab (abfd) != NULL)
-	_bfd_stringtab_free (elf_shstrtab (abfd));
-    }
-
-  return _bfd_generic_close_and_cleanup (abfd);
-}
-
-/* For Rel targets, we encode meaningful data for BFD_RELOC_VTABLE_ENTRY
-   in the relocation's offset.  Thus we cannot allow any sort of sanity
-   range-checking to interfere.  There is nothing else to do in processing
-   this reloc.  */
-
-bfd_reloc_status_type
-_bfd_elf_rel_vtable_reloc_fn (abfd, re, symbol, data, is, obfd, errmsg)
-     bfd *abfd;
-     arelent *re;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *is;
-     bfd *obfd;
-     char **errmsg;
-{
-  return bfd_reloc_ok;
-}
-
-
-/* Elf core file support.  Much of this only works on native
-   toolchains, since we rely on knowing the
-   machine-dependent procfs structure in order to pick
-   out details about the corefile. */
-
-#ifdef HAVE_SYS_PROCFS_H
-# include <sys/procfs.h>
-#endif
-
-
-/* Define offsetof for those systems which lack it. */
-
-#ifndef offsetof
-# define offsetof(TYPE, MEMBER) ((unsigned long) &((TYPE *)0)->MEMBER)
-#endif
-
-
-/* FIXME: this is kinda wrong, but it's what gdb wants. */
-
-static int
-elfcore_make_pid (abfd)
-     bfd* abfd;
-{
-  return ((elf_tdata (abfd)->core_lwpid << 16)
-	  + (elf_tdata (abfd)->core_pid));
-}
-
-
-/* If there isn't a section called NAME, make one, using
-   data from SECT.  Note, this function will generate a
-   reference to NAME, so you shouldn't deallocate or
-   overwrite it. */
-
-static boolean
-elfcore_maybe_make_sect (abfd, name, sect)
-     bfd* abfd;
-     char* name;
-     asection* sect;
-{
-  asection* sect2;
-
-  if (bfd_get_section_by_name (abfd, name) != NULL)
-    return true;
-
-  sect2 = bfd_make_section (abfd, name);
-  if (sect2 == NULL)
-    return false;
-
-  sect2->_raw_size = sect->_raw_size;
-  sect2->filepos = sect->filepos;
-  sect2->flags = sect->flags;
-  sect2->alignment_power = sect->alignment_power;
-  return true;
-}
-
-
-/* prstatus_t exists on:
-     solaris 2.[567]
-     linux 2.[01] + glibc
-     unixware 4.2
-*/
-
-#if defined (HAVE_PRSTATUS_T)
-static boolean
-elfcore_grok_prstatus (abfd, note)
-     bfd* abfd;
-     Elf_Internal_Note* note;
-{
-  prstatus_t prstat;
-  char buf[100];
-  char* name;
-  asection* sect;
-
-  if (note->descsz != sizeof (prstat))
-    return true;
-
-  memcpy (&prstat, note->descdata, sizeof (prstat));
-
-  elf_tdata (abfd)->core_signal = prstat.pr_cursig;
-  elf_tdata (abfd)->core_pid = prstat.pr_pid;
-
-  /* pr_who exists on:
-       solaris 2.[567]
-       unixware 4.2
-     pr_who doesn't exist on:
-       linux 2.[01]
-  */
-#if defined (HAVE_PRSTATUS_T_PR_WHO)
-  elf_tdata (abfd)->core_lwpid = prstat.pr_who;
-#endif
-
-  /* Make a ".reg/999" section. */
-
-  sprintf (buf, ".reg/%d", elfcore_make_pid (abfd));
-  name = bfd_alloc (abfd, strlen (buf) + 1);
-  if (name == NULL)
-    return false;
-  strcpy (name, buf);
-
-  sect = bfd_make_section (abfd, name);
-  if (sect == NULL)
-    return false;
-  sect->_raw_size = sizeof (prstat.pr_reg);
-  sect->filepos = note->descpos + offsetof (prstatus_t, pr_reg);
-  sect->flags = SEC_HAS_CONTENTS;
-  sect->alignment_power = 2;
-
-  if (! elfcore_maybe_make_sect (abfd, ".reg", sect))
-    return false;
-
-  return true;
-}
-#endif /* defined (HAVE_PRSTATUS_T) */
-
-
-/* There isn't a consistent prfpregset_t across platforms,
-   but it doesn't matter, because we don't have to pick this
-   data structure apart. */
-
-static boolean
-elfcore_grok_prfpreg (abfd, note)
-     bfd* abfd;
-     Elf_Internal_Note* note;
-{
-  char buf[100];
-  char* name;
-  asection* sect;
-
-  /* Make a ".reg2/999" section. */
-
-  sprintf (buf, ".reg2/%d", elfcore_make_pid (abfd));
-  name = bfd_alloc (abfd, strlen (buf) + 1);
-  if (name == NULL)
-    return false;
-  strcpy (name, buf);
-
-  sect = bfd_make_section (abfd, name);
-  if (sect == NULL)
-    return false;
-  sect->_raw_size = note->descsz;
-  sect->filepos = note->descpos;
-  sect->flags = SEC_HAS_CONTENTS;
-  sect->alignment_power = 2;
-
-  if (! elfcore_maybe_make_sect (abfd, ".reg2", sect))
-    return false;
-
-  return true;
-}
-
-#if defined (HAVE_PRPSINFO_T)
-# define elfcore_psinfo_t prpsinfo_t
-#endif
-
-#if defined (HAVE_PSINFO_T)
-# define elfcore_psinfo_t psinfo_t
-#endif
-
-
-#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
-
-/* return a malloc'ed copy of a string at START which is at
-   most MAX bytes long, possibly without a terminating '\0'.
-   the copy will always have a terminating '\0'. */
-
-static char*
-elfcore_strndup (abfd, start, max)
-     bfd* abfd;
-     char* start;
-     int max;
-{
-  char* dup;
-  char* end = memchr (start, '\0', max);
-  int len;
-
-  if (end == NULL)
-    len = max;
-  else
-    len = end - start;
-
-  dup = bfd_alloc (abfd, len + 1);
-  if (dup == NULL)
-    return NULL;
-
-  memcpy (dup, start, len);
-  dup[len] = '\0';
-
-  return dup;
-}
-
-static boolean
-elfcore_grok_psinfo (abfd, note)
-     bfd* abfd;
-     Elf_Internal_Note* note;
-{
-  elfcore_psinfo_t psinfo;
-
-  if (note->descsz != sizeof (elfcore_psinfo_t))
-    return true;
-
-  memcpy (&psinfo, note->descdata, note->descsz);
-
-  elf_tdata (abfd)->core_program
-    = elfcore_strndup (abfd, psinfo.pr_fname, sizeof (psinfo.pr_fname));
-
-  elf_tdata (abfd)->core_command
-    = elfcore_strndup (abfd, psinfo.pr_psargs, sizeof (psinfo.pr_psargs));
-
-  /* Note that for some reason, a spurious space is tacked
-     onto the end of the args in some (at least one anyway)
-     implementations, so strip it off if it exists. */
-
-  {
-    char* command = elf_tdata (abfd)->core_command;
-    int n = strlen (command);
-
-    if (0 < n && command[n - 1] == ' ')
-      command[n - 1] = '\0';
-  }
-
-  return true;
-}
-#endif /* defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T) */
-
-
-#if defined (HAVE_PSTATUS_T)
-static boolean
-elfcore_grok_pstatus (abfd, note)
-     bfd* abfd;
-     Elf_Internal_Note* note;
-{
-  pstatus_t pstat;
-
-  if (note->descsz != sizeof (pstat))
-    return true;
-
-  memcpy (&pstat, note->descdata, sizeof (pstat));
-
-  elf_tdata (abfd)->core_pid = pstat.pr_pid;
-
-  /* Could grab some more details from the "representative"
-     lwpstatus_t in pstat.pr_lwp, but we'll catch it all in an
-     NT_LWPSTATUS note, presumably. */
-
-  return true;
-}
-#endif /* defined (HAVE_PSTATUS_T) */
-
-
-#if defined (HAVE_LWPSTATUS_T)
-static boolean
-elfcore_grok_lwpstatus (abfd, note)
-     bfd* abfd;
-     Elf_Internal_Note* note;
-{
-  lwpstatus_t lwpstat;
-  char buf[100];
-  char* name;
-  asection* sect;
-
-  if (note->descsz != sizeof (lwpstat))
-    return true;
-
-  memcpy (&lwpstat, note->descdata, sizeof (lwpstat));
-
-  elf_tdata (abfd)->core_lwpid = lwpstat.pr_lwpid;
-  elf_tdata (abfd)->core_signal = lwpstat.pr_cursig;
-
-  /* Make a ".reg/999" section. */
-
-  sprintf (buf, ".reg/%d", elfcore_make_pid (abfd));
-  name = bfd_alloc (abfd, strlen (buf) + 1);
-  if (name == NULL)
-    return false;
-  strcpy (name, buf);
-
-  sect = bfd_make_section (abfd, name);
-  if (sect == NULL)
-    return false;
-
-#if defined (HAVE_LWPSTATUS_T_PR_CONTEXT)
-  sect->_raw_size = sizeof (lwpstat.pr_context.uc_mcontext.gregs);
-  sect->filepos = note->descpos
-    + offsetof (lwpstatus_t, pr_context.uc_mcontext.gregs);
-#endif
-
-#if defined (HAVE_LWPSTATUS_T_PR_REG)
-  sect->_raw_size = sizeof (lwpstat.pr_reg);
-  sect->filepos = note->descpos + offsetof (lwpstatus_t, pr_reg);
-#endif
-
-  sect->flags = SEC_HAS_CONTENTS;
-  sect->alignment_power = 2;
-
-  if (!elfcore_maybe_make_sect (abfd, ".reg", sect))
-    return false;
-
-  /* Make a ".reg2/999" section */
-
-  sprintf (buf, ".reg2/%d", elfcore_make_pid (abfd));
-  name = bfd_alloc (abfd, strlen (buf) + 1);
-  if (name == NULL)
-    return false;
-  strcpy (name, buf);
-
-  sect = bfd_make_section (abfd, name);
-  if (sect == NULL)
-    return false;
-
-#if defined (HAVE_LWPSTATUS_T_PR_CONTEXT)
-  sect->_raw_size = sizeof (lwpstat.pr_context.uc_mcontext.fpregs);
-  sect->filepos = note->descpos
-    + offsetof (lwpstatus_t, pr_context.uc_mcontext.fpregs);
-#endif
-
-#if defined (HAVE_LWPSTATUS_T_PR_FPREG)
-  sect->_raw_size = sizeof (lwpstat.pr_fpreg);
-  sect->filepos = note->descpos + offsetof (lwpstatus_t, pr_fpreg);
-#endif
-
-  sect->flags = SEC_HAS_CONTENTS;
-  sect->alignment_power = 2;
-
-  if (!elfcore_maybe_make_sect (abfd, ".reg2", sect))
-    return false;
-
-  return true;
-}
-#endif /* defined (HAVE_LWPSTATUS_T) */
-
-
-
-static boolean
-elfcore_grok_note (abfd, note)
-     bfd* abfd;
-     Elf_Internal_Note* note;
-{
-  switch (note->type)
-    {
-    default:
-      return true;
-
-#if defined (HAVE_PRSTATUS_T)
-    case NT_PRSTATUS:
-      return elfcore_grok_prstatus (abfd, note);
-#endif
-
-#if defined (HAVE_PSTATUS_T)
-    case NT_PSTATUS:
-      return elfcore_grok_pstatus (abfd, note);
-#endif
-
-#if defined (HAVE_LWPSTATUS_T)
-    case NT_LWPSTATUS:
-      return elfcore_grok_lwpstatus (abfd, note);
-#endif
-
-    case NT_FPREGSET:		/* FIXME: rename to NT_PRFPREG */
-      return elfcore_grok_prfpreg (abfd, note);
-
-#if defined (HAVE_PRPSINFO_T) || defined (HAVE_PSINFO_T)
-    case NT_PRPSINFO:
-    case NT_PSINFO:
-      return elfcore_grok_psinfo (abfd, note);
-#endif
-    }
-}
-
-
-static boolean
-elfcore_read_notes (abfd, offset, size)
-     bfd* abfd;
-     bfd_vma offset;
-     bfd_vma size;
-{
-  char* buf;
-  char* p;
-
-  if (size <= 0)
-    return true;
-
-  if (bfd_seek (abfd, offset, SEEK_SET) == -1)
-    return false;
-
-  buf = bfd_malloc ((size_t) size);
-  if (buf == NULL)
-    return false;
-
-  if (bfd_read (buf, size, 1, abfd) != size)
-    {
-    error:
-      free (buf);
-      return false;
-    }
-
-  p = buf;
-  while (p < buf + size)
-    {
-      /* FIXME: bad alignment assumption. */
-      Elf_External_Note* xnp = (Elf_External_Note*) p;
-      Elf_Internal_Note in;
-
-      in.type = bfd_h_get_32 (abfd, (bfd_byte *) xnp->type);
-
-      in.namesz = bfd_h_get_32 (abfd, (bfd_byte *) xnp->namesz);
-      in.namedata = xnp->name;
-
-      in.descsz = bfd_h_get_32 (abfd, (bfd_byte *) xnp->descsz);
-      in.descdata = in.namedata + BFD_ALIGN (in.namesz, 4);
-      in.descpos = offset + (in.descdata - buf);
-
-      if (! elfcore_grok_note (abfd, &in))
-	goto error;
-
-      p = in.descdata + BFD_ALIGN (in.descsz, 4);
-    }
-
-  free (buf);
-  return true;
-}
-
-
-
-boolean
-_bfd_elfcore_section_from_phdr (abfd, phdr, sec_num)
-     bfd* abfd;
-     Elf_Internal_Phdr* phdr;
-     int sec_num;
-{
-  if (! bfd_section_from_phdr (abfd, phdr, sec_num))
-    return false;
-
-  if (phdr->p_type == PT_NOTE
-      && ! elfcore_read_notes (abfd, phdr->p_offset, phdr->p_filesz))
-    return false;
-
-  return true;
-}
-
diff --git a/bfd/elf32-arc.c b/bfd/elf32-arc.c
deleted file mode 100644
index a490a246b07..00000000000
--- a/bfd/elf32-arc.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ARC-specific support for 32-bit ELF
-   Copyright (C) 1994, 1995, 1997 Free Software Foundation, Inc.
-   Contributed by Doug Evans (dje@cygnus.com).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/arc.h"
-
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
- PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void arc_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-static boolean arc_elf_object_p PARAMS ((bfd *));
-static void arc_elf_final_write_processing PARAMS ((bfd *, boolean));
-
-/* Try to minimize the amount of space occupied by relocation tables
-   on the ROM (not that the ROM won't be swamped by other ELF overhead).  */
-#define USE_REL
-
-static reloc_howto_type elf_arc_howto_table[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_ARC_NONE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARC_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A standard 32 bit relocation.  */
-  HOWTO (R_ARC_32,		/* type */
-	 0,	                /* rightshift */
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
-	 32,	                /* bitsize */
-	 false,	                /* pc_relative */
-	 0,	                /* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_ARC_32",		/* name */
-	 false,	                /* partial_inplace */
-	 0xffffffff,	        /* src_mask */
-	 0xffffffff,   		/* dst_mask */
-	 false),                /* pcrel_offset */
-
-  /* A 26 bit absolute branch, right shifted by 2.  */
-  HOWTO (R_ARC_B26,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARC_B26",		/* name */
-	 false,			/* partial_inplace */
-	 0x00ffffff,		/* src_mask */
-	 0x00ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A relative 22 bit branch; bits 21-2 are stored in bits 26-7.  */
-  HOWTO (R_ARC_B22_PCREL,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 22,			/* bitsize */
-	 true,			/* pc_relative */
-	 7,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARC_B22_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0x07ffff80,		/* src_mask */
-	 0x07ffff80,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-};
-
-/* Map BFD reloc types to ARC ELF reloc types.  */
-
-struct arc_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static const struct arc_reloc_map arc_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_ARC_NONE, },
-  { BFD_RELOC_32, R_ARC_32 },
-  { BFD_RELOC_CTOR, R_ARC_32 },
-  { BFD_RELOC_ARC_B26, R_ARC_B26 },
-  { BFD_RELOC_ARC_B22_PCREL, R_ARC_B22_PCREL },
-};
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (arc_reloc_map) / sizeof (struct arc_reloc_map);
-       i++)
-    {
-      if (arc_reloc_map[i].bfd_reloc_val == code)
-	return &elf_arc_howto_table[arc_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Set the howto pointer for an ARC ELF reloc.  */
-
-static void
-arc_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_ARC_max);
-  cache_ptr->howto = &elf_arc_howto_table[r_type];
-}
-
-/* Set the right machine number for an ARC ELF file.  */
-
-static boolean
-arc_elf_object_p (abfd)
-     bfd *abfd;
-{
-  int mach;
-  unsigned long arch = elf_elfheader (abfd)->e_flags & EF_ARC_MACH;
-
-  switch (arch)
-    {
-    case E_ARC_MACH_BASE:
-      mach = bfd_mach_arc_base;
-      break;
-    default:
-      /* Unknown cpu type.  ??? What to do?  */
-      return false;
-    }
-
-  (void) bfd_default_set_arch_mach (abfd, bfd_arch_arc, mach);
-  return true;
-}
-
-/* The final processing done just before writing out an ARC ELF object file.
-   This gets the ARC architecture right based on the machine number.  */
-
-static void
-arc_elf_final_write_processing (abfd, linker)
-     bfd *abfd;
-     boolean linker;
-{
-  int mach;
-  unsigned long val;
-
-  switch (mach = bfd_get_mach (abfd))
-    {
-    case bfd_mach_arc_base:
-      val = E_ARC_MACH_BASE;
-      break;
-    default:
-      return;
-    }
-
-  elf_elfheader (abfd)->e_flags &=~ EF_ARC_MACH;
-  elf_elfheader (abfd)->e_flags |= val;
-}
-
-#define TARGET_LITTLE_SYM	bfd_elf32_littlearc_vec
-#define TARGET_LITTLE_NAME	"elf32-littlearc"
-#define TARGET_BIG_SYM		bfd_elf32_bigarc_vec
-#define TARGET_BIG_NAME		"elf32-bigarc"
-#define ELF_ARCH		bfd_arch_arc
-#define ELF_MACHINE_CODE	EM_CYGNUS_ARC
-#define ELF_MAXPAGESIZE		0x1000
-
-#define elf_info_to_howto	0
-#define elf_info_to_howto_rel	arc_info_to_howto_rel
-#define elf_backend_object_p	arc_elf_object_p
-#define elf_backend_final_write_processing \
-				arc_elf_final_write_processing
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
deleted file mode 100644
index d4e97d6b9bf..00000000000
--- a/bfd/elf32-arm.h
+++ /dev/null
@@ -1,3010 +0,0 @@
-/* 32-bit ELF support for ARM
-   Copyright 1998, 1999 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-typedef unsigned long int insn32;
-typedef unsigned short int insn16;
-
-static boolean elf32_arm_set_private_flags
-  PARAMS ((bfd *, flagword));
-static boolean elf32_arm_copy_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean elf32_arm_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean elf32_arm_print_private_bfd_data
-  PARAMS ((bfd *, PTR));
-static int elf32_arm_get_symbol_type 
-  PARAMS (( Elf_Internal_Sym *, int));
-static struct bfd_link_hash_table *elf32_arm_link_hash_table_create
-  PARAMS ((bfd *));
-static bfd_reloc_status_type elf32_arm_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, bfd_vma, struct bfd_link_info *, asection *, const char *, unsigned char));
-
-static insn32 insert_thumb_branch
-  PARAMS ((insn32, int));
-static struct elf_link_hash_entry *find_thumb_glue
-  PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
-static struct elf_link_hash_entry *find_arm_glue
-  PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
-static void record_arm_to_thumb_glue
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static void record_thumb_to_arm_glue
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-
-/* The linker script knows the section names for placement.
-   The entry_names are used to do simple name mangling on the stubs.
-   Given a function name, and its type, the stub can be found. The
-   name can be changed. The only requirement is the %s be present.
- */
-
-#define INTERWORK_FLAG( abfd )   (elf_elfheader (abfd)->e_flags & EF_INTERWORK)
-
-#define THUMB2ARM_GLUE_SECTION_NAME ".glue_7t"
-#define THUMB2ARM_GLUE_ENTRY_NAME   "__%s_from_thumb"
-
-#define ARM2THUMB_GLUE_SECTION_NAME ".glue_7"
-#define ARM2THUMB_GLUE_ENTRY_NAME   "__%s_from_arm"
-
-/* The name of the dynamic interpreter.  This is put in the .interp
-   section.  */
-#define ELF_DYNAMIC_INTERPRETER     "/usr/lib/ld.so.1"
-
-/* The size in bytes of an entry in the procedure linkage table.  */
-
-#define PLT_ENTRY_SIZE 16
-
-/* The first entry in a procedure linkage table looks like
-   this.  It is set up so that any shared library function that is
-   called before the relocation has been set up calles the dynamic
-   linker first */
-
-static const bfd_byte elf32_arm_plt0_entry [PLT_ENTRY_SIZE] =
-{
-  0x04, 0xe0, 0x2d, 0xe5,	/* str   lr, [sp, #-4]!     */
-  0x10, 0xe0, 0x9f, 0xe5,	/* ldr   lr, [pc, #16]      */
-  0x0e, 0xe0, 0x8f, 0xe0,	/* adr   lr, pc, lr         */
-  0x08, 0xf0, 0xbe, 0xe5	/* ldr   pc, [lr, #-4]      */
-};
-
-/* Subsequent entries in a procedure linkage table look like
-   this.  */
-
-static const bfd_byte elf32_arm_plt_entry [PLT_ENTRY_SIZE] =
-{
-  0x04, 0xc0, 0x9f, 0xe5,	/* ldr   ip, [pc, #4]       */
-  0x0c, 0xc0, 0x8f, 0xe0,	/* add   ip, pc, ip         */
-  0x00, 0xf0, 0x9c, 0xe5,	/* ldr   pc, [ip]           */
-  0x00, 0x00, 0x00, 0x00        /* offset to symbol in got  */
-};
-
-
-/* The ARM linker needs to keep track of the number of relocs that it
-   decides to copy in check_relocs for each symbol.  This is so that
-   it can discard PC relative relocs if it doesn't need them when
-   linking with -Bsymbolic.  We store the information in a field
-   extending the regular ELF linker hash table.  */
-
-/* This structure keeps track of the number of PC relative relocs we
-   have copied for a given symbol.  */
-
-struct elf32_arm_pcrel_relocs_copied
-{
-  /* Next section.  */
-  struct elf32_arm_pcrel_relocs_copied * next;
-  /* A section in dynobj.  */
-  asection * section;
-  /* Number of relocs copied in this section.  */
-  bfd_size_type count;
-};
-
-/* arm ELF linker hash entry.  */
-
-struct elf32_arm_link_hash_entry
-{
-  struct elf_link_hash_entry root;
-
-  /* Number of PC relative relocs copied for this symbol.  */
-  struct elf32_arm_pcrel_relocs_copied * pcrel_relocs_copied;
-};
-
-/* Declare this now that the above structures are defined.  */
-
-static boolean elf32_arm_discard_copies
-  PARAMS ((struct elf32_arm_link_hash_entry *, PTR));
-
-/* Traverse an arm ELF linker hash table.  */
-
-#define elf32_arm_link_hash_traverse(table, func, info)			\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the ARM elf linker hash table from a link_info structure.  */
-#define elf32_arm_hash_table(info) \
-  ((struct elf32_arm_link_hash_table *) ((info)->hash))
-
-/* ARM ELF linker hash table */
-struct elf32_arm_link_hash_table
-  {
-    /* The main hash table.  */
-    struct elf_link_hash_table root;
-
-    /* The size in bytes of the section containg the Thumb-to-ARM glue.  */
-    long int thumb_glue_size;
-
-    /* The size in bytes of the section containg the ARM-to-Thumb glue.  */
-    long int arm_glue_size;
-
-    /* An arbitary input BFD chosen to hold the glue sections.  */
-    bfd * bfd_of_glue_owner;
-  };
-
-
-/* Create an ARM elf linker hash table */
-
-static struct bfd_link_hash_table *
-elf32_arm_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct elf32_arm_link_hash_table *ret;
-
-  ret = ((struct elf32_arm_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct elf32_arm_link_hash_table)));
-  if (ret == (struct elf32_arm_link_hash_table *) NULL)
-    return NULL;
-
-  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
-				      _bfd_elf_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  ret->thumb_glue_size = 0;
-  ret->arm_glue_size = 0;
-  ret->bfd_of_glue_owner = NULL;
-
-  return &ret->root.root;
-}
-
-static struct elf_link_hash_entry *
-find_thumb_glue (link_info, name, input_bfd)
-     struct bfd_link_info *link_info;
-     CONST char *name;
-     bfd *input_bfd;
-{
-  char *tmp_name;
-  struct elf_link_hash_entry *hash;
-  struct elf32_arm_link_hash_table *hash_table;
-
-  /* We need a pointer to the armelf specific hash table.  */
-  hash_table = elf32_arm_hash_table (link_info);
-
-
-  tmp_name = ((char *)
-       bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1));
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
-
-  hash = elf_link_hash_lookup
-    (&(hash_table)->root, tmp_name, false, false, true);
-
-  if (hash == NULL)
-    /* xgettext:c-format */
-    _bfd_error_handler (_ ("%s: unable to find THUMB glue '%s' for `%s'"),
-			bfd_get_filename (input_bfd), tmp_name, name);
-
-  free (tmp_name);
-
-  return hash;
-}
-
-static struct elf_link_hash_entry *
-find_arm_glue (link_info, name, input_bfd)
-     struct bfd_link_info *link_info;
-     CONST char *name;
-     bfd *input_bfd;
-{
-  char *tmp_name;
-  struct elf_link_hash_entry *myh;
-  struct elf32_arm_link_hash_table *hash_table;
-
-  /* We need a pointer to the elfarm specific hash table.  */
-  hash_table = elf32_arm_hash_table (link_info);
-
-  tmp_name = ((char *)
-       bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
-
-  myh = elf_link_hash_lookup
-    (&(hash_table)->root, tmp_name, false, false, true);
-
-  if (myh == NULL)
-    /* xgettext:c-format */
-    _bfd_error_handler (_ ("%s: unable to find ARM glue '%s' for `%s'"),
-			bfd_get_filename (input_bfd), tmp_name, name);
-
-  free (tmp_name);
-
-  return myh;
-}
-
-/*
-   ARM->Thumb glue:
-
-   .arm
-   __func_from_arm:
-   ldr r12, __func_addr
-   bx  r12
-   __func_addr:
-   .word func    @ behave as if you saw a ARM_32 reloc
- */
-
-#define ARM2THUMB_GLUE_SIZE 12
-static const insn32 a2t1_ldr_insn = 0xe59fc000;
-static const insn32 a2t2_bx_r12_insn = 0xe12fff1c;
-static const insn32 a2t3_func_addr_insn = 0x00000001;
-
-/*
-   Thumb->ARM:                          Thumb->(non-interworking aware) ARM
-
-   .thumb                               .thumb
-   .align 2                             .align 2
-   __func_from_thumb:              __func_from_thumb:
-   bx pc                                push {r6, lr}
-   nop                                  ldr  r6, __func_addr
-   .arm                                         mov  lr, pc
-   __func_change_to_arm:                        bx   r6
-   b func                       .arm
-   __func_back_to_thumb:
-   ldmia r13! {r6, lr}
-   bx    lr
-   __func_addr:
-   .word        func 
- */
-
-#define THUMB2ARM_GLUE_SIZE 8
-static const insn16 t2a1_bx_pc_insn = 0x4778;
-static const insn16 t2a2_noop_insn = 0x46c0;
-static const insn32 t2a3_b_insn = 0xea000000;
-
-static const insn16 t2a1_push_insn = 0xb540;
-static const insn16 t2a2_ldr_insn = 0x4e03;
-static const insn16 t2a3_mov_insn = 0x46fe;
-static const insn16 t2a4_bx_insn = 0x4730;
-static const insn32 t2a5_pop_insn = 0xe8bd4040;
-static const insn32 t2a6_bx_insn = 0xe12fff1e;
-
-boolean
-bfd_elf32_arm_allocate_interworking_sections (info)
-     struct bfd_link_info * info;
-{
-  asection * s;
-  bfd_byte * foo;
-  struct elf32_arm_link_hash_table * globals;
-
-  globals = elf32_arm_hash_table (info);
-
-  BFD_ASSERT (globals != NULL);
-
-  if (globals->arm_glue_size != 0)
-    {
-      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-      s = bfd_get_section_by_name
-	(globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
-
-      BFD_ASSERT (s != NULL);
-
-      foo = (bfd_byte *) bfd_alloc
-	(globals->bfd_of_glue_owner, globals->arm_glue_size);
-
-      s->_raw_size = s->_cooked_size = globals->arm_glue_size;
-      s->contents = foo;
-    }
-
-  if (globals->thumb_glue_size != 0)
-    {
-      BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-      s = bfd_get_section_by_name
-	(globals->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
-
-      BFD_ASSERT (s != NULL);
-
-      foo = (bfd_byte *) bfd_alloc
-	(globals->bfd_of_glue_owner, globals->thumb_glue_size);
-
-      s->_raw_size = s->_cooked_size = globals->thumb_glue_size;
-      s->contents = foo;
-    }
-
-  return true;
-}
-
-static void
-record_arm_to_thumb_glue (link_info, h)
-     struct bfd_link_info * link_info;
-     struct elf_link_hash_entry * h;
-{
-  const char * name = h->root.root.string;
-  register asection * s;
-  char * tmp_name;
-  struct elf_link_hash_entry * myh;
-  struct elf32_arm_link_hash_table * globals;
-
-  globals = elf32_arm_hash_table (link_info);
-
-  BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-  s = bfd_get_section_by_name
-    (globals->bfd_of_glue_owner, ARM2THUMB_GLUE_SECTION_NAME);
-
-
-  BFD_ASSERT (s != NULL);
-
-  tmp_name = ((char *)
-       bfd_malloc (strlen (name) + strlen (ARM2THUMB_GLUE_ENTRY_NAME) + 1));
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, ARM2THUMB_GLUE_ENTRY_NAME, name);
-
-  myh = elf_link_hash_lookup
-    (&(globals)->root, tmp_name, false, false, true);
-
-  if (myh != NULL)
-    {
-      free (tmp_name);
-      return;			/* we've already seen this guy */
-    }
-
-  /* The only trick here is using hash_table->arm_glue_size as the value. Even
-     though the section isn't allocated yet, this is where we will be putting
-     it.  */
-
-  _bfd_generic_link_add_one_symbol (link_info, globals->bfd_of_glue_owner, tmp_name,
-				    BSF_GLOBAL,
-				    s, globals->arm_glue_size + 1,
-				    NULL, true, false,
-				    (struct bfd_link_hash_entry **) &myh);
-
-  free (tmp_name);
-
-  globals->arm_glue_size += ARM2THUMB_GLUE_SIZE;
-
-  return;
-}
-
-static void
-record_thumb_to_arm_glue (link_info, h)
-     struct bfd_link_info *link_info;
-     struct elf_link_hash_entry *h;
-{
-  const char *name = h->root.root.string;
-  register asection *s;
-  char *tmp_name;
-  struct elf_link_hash_entry *myh;
-  struct elf32_arm_link_hash_table *hash_table;
-  char bind;
-
-  hash_table = elf32_arm_hash_table (link_info);
-
-  BFD_ASSERT (hash_table != NULL);
-  BFD_ASSERT (hash_table->bfd_of_glue_owner != NULL);
-
-  s = bfd_get_section_by_name
-    (hash_table->bfd_of_glue_owner, THUMB2ARM_GLUE_SECTION_NAME);
-
-  BFD_ASSERT (s != NULL);
-
-  tmp_name = (char *) bfd_malloc (strlen (name) + strlen (THUMB2ARM_GLUE_ENTRY_NAME) + 1);
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, THUMB2ARM_GLUE_ENTRY_NAME, name);
-
-  myh = elf_link_hash_lookup
-    (&(hash_table)->root, tmp_name, false, false, true);
-
-  if (myh != NULL)
-    {
-      free (tmp_name);
-      return;			/* we've already seen this guy */
-    }
-
-  _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner, tmp_name,
-			     BSF_GLOBAL, s, hash_table->thumb_glue_size + 1,
-				    NULL, true, false,
-				    (struct bfd_link_hash_entry **) &myh);
-
-  /* If we mark it 'thumb', the disassembler will do a better job.  */
-  bind = ELF_ST_BIND (myh->type);
-  myh->type = ELF_ST_INFO (bind, STT_ARM_TFUNC);
-
-  free (tmp_name);
-
-  /* Allocate another symbol to mark where we switch to arm mode.  */
-
-#define CHANGE_TO_ARM "__%s_change_to_arm"
-#define BACK_FROM_ARM "__%s_back_from_arm"
-
-  tmp_name = (char *) bfd_malloc (strlen (name) + strlen (CHANGE_TO_ARM) + 1);
-
-  BFD_ASSERT (tmp_name);
-
-  sprintf (tmp_name, CHANGE_TO_ARM, name);
-
-  myh = NULL;
-
-  _bfd_generic_link_add_one_symbol (link_info, hash_table->bfd_of_glue_owner, tmp_name,
-			      BSF_LOCAL, s, hash_table->thumb_glue_size + 4,
-				    NULL, true, false,
-				    (struct bfd_link_hash_entry **) &myh);
-
-  free (tmp_name);
-
-  hash_table->thumb_glue_size += THUMB2ARM_GLUE_SIZE;
-
-  return;
-}
-
-/* Select a BFD to be used to hold the sections used by the glue code.
-   This function is called from the linker scripts in ld/emultempl/
-   {armelf/pe}.em  */
-boolean
-bfd_elf32_arm_get_bfd_for_interworking (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  struct elf32_arm_link_hash_table *globals;
-  flagword flags;
-  asection *sec;
-
-  /* If we are only performing a partial link do not bother
-     getting a bfd to hold the glue.  */
-  if (info->relocateable)
-    return true;
-
-  globals = elf32_arm_hash_table (info);
-
-  BFD_ASSERT (globals != NULL);
-
-  if (globals->bfd_of_glue_owner != NULL)
-    return true;
-
-  sec = bfd_get_section_by_name (abfd, ARM2THUMB_GLUE_SECTION_NAME);
-
-  if (sec == NULL)
-    {
-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-
-      sec = bfd_make_section (abfd, ARM2THUMB_GLUE_SECTION_NAME);
-
-      if (sec == NULL
-	  || !bfd_set_section_flags (abfd, sec, flags)
-	  || !bfd_set_section_alignment (abfd, sec, 2))
-	return false;
-    }
-
-  sec = bfd_get_section_by_name (abfd, THUMB2ARM_GLUE_SECTION_NAME);
-
-  if (sec == NULL)
-    {
-      flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-
-      sec = bfd_make_section (abfd, THUMB2ARM_GLUE_SECTION_NAME);
-
-      if (sec == NULL
-	  || !bfd_set_section_flags (abfd, sec, flags)
-	  || !bfd_set_section_alignment (abfd, sec, 2))
-	return false;
-    }
-
-  /* Save the bfd for later use.  */
-  globals->bfd_of_glue_owner = abfd;
-
-  return true;
-}
-
-boolean
-bfd_elf32_arm_process_before_allocation (abfd, link_info)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *free_relocs = NULL;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *contents = NULL;
-  bfd_byte *free_contents = NULL;
-  Elf32_External_Sym *extsyms = NULL;
-  Elf32_External_Sym *free_extsyms = NULL;
-
-  asection *sec;
-  struct elf32_arm_link_hash_table *globals;
-
-  /* If we are only performing a partial link do not bother
-     to construct any glue.  */
-  if (link_info->relocateable)
-    return true;
-
-  /* Here we have a bfd that is to be included on the link.  We have a hook
-     to do reloc rummaging, before section sizes are nailed down.  */
-
-  globals = elf32_arm_hash_table (link_info);
-
-  BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-  /* Rummage around all the relocs and map the glue vectors.  */
-  sec = abfd->sections;
-
-  if (sec == NULL)
-    return true;
-
-  for (; sec != NULL; sec = sec->next)
-    {
-      if (sec->reloc_count == 0)
-	continue;
-
-      symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-      /* Load the relocs.  */
-
-      irel = (_bfd_elf32_link_read_relocs (abfd, sec, (PTR) NULL,
-					(Elf_Internal_Rela *) NULL, false));
-
-      BFD_ASSERT (irel != 0);
-
-      irelend = irel + sec->reloc_count;
-      for (; irel < irelend; irel++)
-	{
-	  long r_type;
-	  unsigned long r_index;
-	  unsigned char code;
-
-	  struct elf_link_hash_entry *h;
-
-	  r_type = ELF32_R_TYPE (irel->r_info);
-	  r_index = ELF32_R_SYM (irel->r_info);
-
-	  /* These are the only relocation types we care about */
-	  if (r_type != R_ARM_PC24
-	      && r_type != R_ARM_THM_PC22)
-	    continue;
-
-	  /* Get the section contents if we haven't done so already.  */
-	  if (contents == NULL)
-	    {
-	      /* Get cached copy if it exists.  */
-	      if (elf_section_data (sec)->this_hdr.contents != NULL)
-		contents = elf_section_data (sec)->this_hdr.contents;
-	      else
-		{
-		  /* Go get them off disk.  */
-		  contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-		  if (contents == NULL)
-		    goto error_return;
-		  free_contents = contents;
-
-		  if (!bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		    goto error_return;
-		}
-	    }
-
-	  /* Read this BFD's symbols if we haven't done so already.  */
-	  if (extsyms == NULL)
-	    {
-	      /* Get cached copy if it exists.  */
-	      if (symtab_hdr->contents != NULL)
-		extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-	      else
-		{
-		  /* Go get them off disk.  */
-		  extsyms = ((Elf32_External_Sym *)
-			     bfd_malloc (symtab_hdr->sh_size));
-		  if (extsyms == NULL)
-		    goto error_return;
-		  free_extsyms = extsyms;
-		  if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-		      || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
-			  != symtab_hdr->sh_size))
-		    goto error_return;
-		}
-	    }
-
-	  /* If the relocation is not against a symbol it cannot concern us. */
-
-	  h = NULL;
-
-	  /* We don't care about local symbols */
-	  if (r_index < symtab_hdr->sh_info)
-	    continue;
-
-	  /* This is an external symbol */
-	  r_index -= symtab_hdr->sh_info;
-	  h = (struct elf_link_hash_entry *)
-	    elf_sym_hashes (abfd)[r_index];
-
-	  /* If the relocation is against a static symbol it must be within
-	     the current section and so cannot be a cross ARM/Thumb relocation.  */
-	  if (h == NULL)
-	    continue;
-
-	  switch (r_type)
-	    {
-	    case R_ARM_PC24:
-	      /* This one is a call from arm code.  We need to look up
-	         the target of the call. If it is a thumb target, we
-	         insert glue.  */
-
-	      if (ELF_ST_TYPE(h->type) == STT_ARM_TFUNC)
-		record_arm_to_thumb_glue (link_info, h);
-	      break;
-
-	    case R_ARM_THM_PC22:
-	      /* This one is a call from thumb code.  We look 
-	         up the target of the call. If it is not a thumb
-                 target, we insert glue. */ 
-
-	      if (ELF_ST_TYPE (h->type) != STT_ARM_TFUNC)
-		record_thumb_to_arm_glue (link_info, h);
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-    }
-
-  return true;
-error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-  return false;
-
-}
-
-/* The thumb form of a long branch is a bit finicky, because the offset
-   encoding is split over two fields, each in it's own instruction. They
-   can occur in any order. So given a thumb form of long branch, and an 
-   offset, insert the offset into the thumb branch and return finished
-   instruction. 
-
-   It takes two thumb instructions to encode the target address. Each has 
-   11 bits to invest. The upper 11 bits are stored in one (identifed by
-   H-0.. see below), the lower 11 bits are stored in the other (identified 
-   by H-1). 
-
-   Combine together and shifted left by 1 (it's a half word address) and 
-   there you have it.
-
-   Op: 1111 = F,
-   H-0, upper address-0 = 000
-   Op: 1111 = F,
-   H-1, lower address-0 = 800
-
-   They can be ordered either way, but the arm tools I've seen always put 
-   the lower one first. It probably doesn't matter. krk@cygnus.com
-
-   XXX:  Actually the order does matter.  The second instruction (H-1)
-   moves the computed address into the PC, so it must be the second one
-   in the sequence.  The problem, however is that whilst little endian code
-   stores the instructions in HI then LOW order, big endian code does the
-   reverse.  nickc@cygnus.com  */
-
-#define LOW_HI_ORDER 0xF800F000
-#define HI_LOW_ORDER 0xF000F800
-
-static insn32
-insert_thumb_branch (br_insn, rel_off)
-     insn32 br_insn;
-     int rel_off;
-{
-  unsigned int low_bits;
-  unsigned int high_bits;
-
-
-  BFD_ASSERT ((rel_off & 1) != 1);
-
-  rel_off >>= 1;		/* half word aligned address */
-  low_bits = rel_off & 0x000007FF;	/* the bottom 11 bits */
-  high_bits = (rel_off >> 11) & 0x000007FF;	/* the top 11 bits */
-
-  if ((br_insn & LOW_HI_ORDER) == LOW_HI_ORDER)
-    br_insn = LOW_HI_ORDER | (low_bits << 16) | high_bits;
-  else if ((br_insn & HI_LOW_ORDER) == HI_LOW_ORDER)
-    br_insn = HI_LOW_ORDER | (high_bits << 16) | low_bits;
-  else
-    abort ();			/* error - not a valid branch instruction form */
-
-  /* FIXME: abort is probably not the right call. krk@cygnus.com */
-
-  return br_insn;
-}
-
-/* Thumb code calling an ARM function */
-static int
-elf32_thumb_to_arm_stub (info, name, input_bfd, output_bfd, input_section,
-			 hit_data, sym_sec, offset, addend, val)
-     struct bfd_link_info *info;
-     char *name;
-     bfd *input_bfd;
-     bfd *output_bfd;
-     asection *input_section;
-     bfd_byte *hit_data;
-     asection *sym_sec;
-     int offset;
-     int addend;
-     bfd_vma val;
-{
-  asection *s = 0;
-  long int my_offset;
-  unsigned long int tmp;
-  long int ret_offset;
-  struct elf_link_hash_entry *myh;
-  struct elf32_arm_link_hash_table *globals;
-
-  myh = find_thumb_glue (info, name, input_bfd);
-  if (myh == NULL)
-    return false;
-
-  globals = elf32_arm_hash_table (info);
-
-  BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-  my_offset = myh->root.u.def.value;
-
-  s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
-			       THUMB2ARM_GLUE_SECTION_NAME);
-
-  BFD_ASSERT (s != NULL);
-  BFD_ASSERT (s->contents != NULL);
-  BFD_ASSERT (s->output_section != NULL);
-
-  if ((my_offset & 0x01) == 0x01)
-    {
-      if (sym_sec != NULL
-	  && sym_sec->owner != NULL
-	  && !INTERWORK_FLAG (sym_sec->owner))
-	{
-	  _bfd_error_handler
-	    (_ ("%s(%s): warning: interworking not enabled."),
-	     bfd_get_filename (sym_sec->owner), name);
-	  _bfd_error_handler
-	    (_ ("  first occurrence: %s: thumb call to arm"),
-	     bfd_get_filename (input_bfd));
-
-	  return false;
-	}
-
-      --my_offset;
-      myh->root.u.def.value = my_offset;
-
-      bfd_put_16 (output_bfd, t2a1_bx_pc_insn,
-		  s->contents + my_offset);
-
-      bfd_put_16 (output_bfd, t2a2_noop_insn,
-		  s->contents + my_offset + 2);
-
-      ret_offset =
-	((bfd_signed_vma) val)	/* Address of destination of the stub */
-	- ((bfd_signed_vma)
-	   (s->output_offset	/* Offset from the start of the current section to the start of the stubs.  */
-	    + my_offset		/* Offset of the start of this stub from the start of the stubs.  */
-	    + s->output_section->vma)	/* Address of the start of the current section.  */
-	   + 4			/* The branch instruction is 4 bytes into the stub.  */
-	   + 8);		/* ARM branches work from the pc of the instruction + 8.  */
-
-      bfd_put_32 (output_bfd,
-		  t2a3_b_insn | ((ret_offset >> 2) & 0x00FFFFFF),
-		  s->contents + my_offset + 4);
-    }
-
-  BFD_ASSERT (my_offset <= globals->thumb_glue_size);
-
-  /* Now go back and fix up the original BL insn to point
-     to here.  */
-  ret_offset =
-    s->output_offset
-    + my_offset
-    - (input_section->output_offset
-       + offset + addend)
-    - 4;
-
-  tmp = bfd_get_32 (input_bfd, hit_data
-		    - input_section->vma);
-
-  bfd_put_32 (output_bfd,
-	      insert_thumb_branch (tmp, ret_offset),
-	      hit_data - input_section->vma);
-
-  return true;
-}
-
-/* Arm code calling a Thumb function */
-static int
-elf32_arm_to_thumb_stub (info, name, input_bfd, output_bfd, input_section,
-			 hit_data, sym_sec, offset, addend, val)
-
-     struct bfd_link_info *info;
-     char *name;
-     bfd *input_bfd;
-     bfd *output_bfd;
-     asection *input_section;
-     bfd_byte *hit_data;
-     asection *sym_sec;
-     int offset;
-     int addend;
-     bfd_vma val;
-{
-  unsigned long int tmp;
-  long int my_offset;
-  asection *s;
-  long int ret_offset;
-  struct elf_link_hash_entry *myh;
-  struct elf32_arm_link_hash_table *globals;
-
-  myh = find_arm_glue (info, name, input_bfd);
-  if (myh == NULL)
-    return false;
-
-  globals = elf32_arm_hash_table (info);
-
-  BFD_ASSERT (globals != NULL);
-  BFD_ASSERT (globals->bfd_of_glue_owner != NULL);
-
-  my_offset = myh->root.u.def.value;
-  s = bfd_get_section_by_name (globals->bfd_of_glue_owner,
-			       ARM2THUMB_GLUE_SECTION_NAME);
-  BFD_ASSERT (s != NULL);
-  BFD_ASSERT (s->contents != NULL);
-  BFD_ASSERT (s->output_section != NULL);
-
-  if ((my_offset & 0x01) == 0x01)
-    {
-      if (sym_sec != NULL
-	  && sym_sec->owner != NULL
-	  && !INTERWORK_FLAG (sym_sec->owner))
-	{
-	  _bfd_error_handler
-	    (_ ("%s(%s): warning: interworking not enabled."),
-	     bfd_get_filename (sym_sec->owner), name);
-	  _bfd_error_handler
-	    (_ ("  first occurrence: %s: arm call to thumb"),
-	     bfd_get_filename (input_bfd));
-	}
-      --my_offset;
-      myh->root.u.def.value = my_offset;
-
-      bfd_put_32 (output_bfd, a2t1_ldr_insn,
-		  s->contents + my_offset);
-
-      bfd_put_32 (output_bfd, a2t2_bx_r12_insn,
-		  s->contents + my_offset + 4);
-
-      /* It's a thumb address.  Add the low order bit.  */
-      bfd_put_32 (output_bfd, val | a2t3_func_addr_insn,
-		  s->contents + my_offset + 8);
-    }
-
-  BFD_ASSERT (my_offset <= globals->arm_glue_size);
-
-  tmp = bfd_get_32 (input_bfd, hit_data);
-  tmp = tmp & 0xFF000000;
-
-  /* Somehow these are both 4 too far, so subtract 8. */
-  ret_offset = s->output_offset
-    + my_offset
-    + s->output_section->vma
-    - (input_section->output_offset
-       + input_section->output_section->vma
-       + offset + addend)
-    - 8;
-
-  tmp = tmp | ((ret_offset >> 2) & 0x00FFFFFF);
-
-  bfd_put_32 (output_bfd, tmp, hit_data
-	      - input_section->vma);
-
-
-  return true;
-}
-
-/* Perform a relocation as part of a final link.  */
-static bfd_reloc_status_type
-elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
-			       input_section, contents, rel, value,
-			       info, sym_sec, sym_name, sym_flags)
-     reloc_howto_type *     howto;
-     bfd *                  input_bfd;
-     bfd *                  output_bfd;
-     asection *             input_section;
-     bfd_byte *             contents;
-     Elf_Internal_Rela *    rel;
-     bfd_vma                value;
-     struct bfd_link_info * info;
-     asection *             sym_sec;
-     const char *           sym_name;
-     unsigned char          sym_flags;
-{
-  unsigned long                 r_type = howto->type;
-  unsigned long                 r_symndx;
-  bfd_byte *                    hit_data = contents + rel->r_offset;
-  bfd *                         dynobj = NULL;
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  bfd_vma *                     local_got_offsets;
-  asection *                    sgot = NULL;
-  asection *                    splt = NULL;
-  asection *                    sreloc = NULL;
-  struct elf_link_hash_entry *  h = NULL;
-  bfd_vma                       addend;
-    
-  dynobj = elf_hash_table (info)->dynobj;
-  if (dynobj)
-    {
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-    }
-  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-  local_got_offsets = elf_local_got_offsets (input_bfd);
-  r_symndx = ELF32_R_SYM (rel->r_info);
-
-#ifdef USE_REL
-  addend = (bfd_get_32 (input_bfd, hit_data) & howto->src_mask);
-#else
-  addend = rel->r_addend;
-#endif
-  
-  switch (r_type)
-    {
-    case R_ARM_NONE:
-      return bfd_reloc_ok;
-
-    case R_ARM_PC24:
-    case R_ARM_ABS32:
-    case R_ARM_REL32:
-      /* When generating a shared object, these relocations are copied
-	 into the output file to be resolved at run time. */
-      
-      if (info->shared
-	  && (r_type != R_ARM_PC24
- 	      || (h != NULL
-	          && h->dynindx != -1
-		  && (! info->symbolic
-		      || (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0))))
-	{
-	  Elf_Internal_Rel outrel;
-	  boolean skip, relocate;
-	  
-	  if (sreloc == NULL)
-	    {
-	      const char * name;
-	      
-	      name = (bfd_elf_string_from_elf_section
-		      (input_bfd,
-		       elf_elfheader (input_bfd)->e_shstrndx,
-		       elf_section_data (input_section)->rel_hdr.sh_name));
-	      if (name == NULL)
-		return bfd_reloc_notsupported;
-	      
-	      BFD_ASSERT (strncmp (name, ".rel", 4) == 0
-			  && strcmp (bfd_get_section_name (input_bfd,
-							   input_section),
-				     name + 4) == 0);
-	      
-	      sreloc = bfd_get_section_by_name (dynobj, name);
-	      BFD_ASSERT (sreloc != NULL);
-	    }
-	  
-	  skip = false;
-	  
-	  if (elf_section_data (input_section)->stab_info == NULL)
-	    outrel.r_offset = rel->r_offset;
-	  else
-	    {
-	      bfd_vma off;
-	      
-	      off = (_bfd_stab_section_offset
-		     (output_bfd, &elf_hash_table (info)->stab_info,
-		      input_section,
-		      & elf_section_data (input_section)->stab_info,
-		      rel->r_offset));
-	      if (off == (bfd_vma) -1)
-		skip = true;
-	      outrel.r_offset = off;
-	    }
-	  
-	  outrel.r_offset += (input_section->output_section->vma
-			      + input_section->output_offset);
-	  
-	  if (skip)
-	    {
-	      memset (&outrel, 0, sizeof outrel);
-	      relocate = false;
-	    }
-	  else if (r_type == R_ARM_PC24)
-	    {
-	      BFD_ASSERT (h != NULL && h->dynindx != -1);
-	      if ((input_section->flags & SEC_ALLOC) != 0)
-		relocate = false;
-	      else
-		relocate = true;
-	      outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_PC24);
-	    }
-	  else
-	    {
-	      if (h == NULL
-		  || ((info->symbolic || h->dynindx == -1)
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) != 0))
-		{
-		  relocate = true;
-		  outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
-		}
-	      else
-		{
-		  BFD_ASSERT (h->dynindx != -1);
-		  if ((input_section->flags & SEC_ALLOC) != 0)
-		    relocate = false;
-		  else
-		    relocate = true;
-		  outrel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_ABS32);
-		}
-	    }
-	  
-	  bfd_elf32_swap_reloc_out (output_bfd, &outrel,
-				    (((Elf32_External_Rel *)
-				      sreloc->contents)
-				     + sreloc->reloc_count));
-	  ++sreloc->reloc_count;
-	  
-	  /* If this reloc is against an external symbol, we do not want to 
-	     fiddle with the addend.  Otherwise, we need to include the symbol
-	     value so that it becomes an addend for the dynamic reloc. */
-	  if (! relocate)
-	    return bfd_reloc_ok;
-	  
-	  return _bfd_final_link_relocate (howto, input_bfd, input_section, 
-					   contents, rel->r_offset, value,
-					   (bfd_vma) 0);
-	}
-      else switch (r_type)
-	{
-	case R_ARM_PC24:
-	  /* Arm B/BL instruction */
-	  
-	  /* Check for arm calling thumb function.  */
-	  if (sym_flags == STT_ARM_TFUNC)
-	    {
-	      elf32_arm_to_thumb_stub (info, sym_name, input_bfd, output_bfd,
-				       input_section, hit_data, sym_sec, rel->r_offset, addend, value);
-	      return bfd_reloc_ok;
-	    }
-	  
-	  value = value + addend;
-	  value -= (input_section->output_section->vma
-		    + input_section->output_offset + 8);
-	  value -= rel->r_offset;
-	  value = value >> howto->rightshift;
-	  
-	  value &= 0xffffff;
-	  value |= (bfd_get_32 (input_bfd, hit_data) & 0xff000000);
-	  break;
-	  
-	case R_ARM_ABS32:
-	  value += addend;
-	  if (sym_flags == STT_ARM_TFUNC)
-	    value |= 1;
-	  break;
-	  
-	case R_ARM_REL32:
-	  value -= (input_section->output_section->vma
-		    + input_section->output_offset);
-	  value += addend;
-	  break;
-	}
-      
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_ARM_ABS8:
-      value += addend;
-      if ((long) value > 0x7f || (long) value < -0x80)
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_ARM_ABS16:
-      value += addend;
-
-      if ((long) value > 0x7fff || (long) value < -0x8000)
-	return bfd_reloc_overflow;
-
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_ARM_ABS12:
-      /* Support ldr and str instruction for the arm */
-      /* Also thumb b (unconditional branch).  ??? Really?  */
-      value += addend;
-
-      if ((long) value > 0x7ff || (long) value < -0x800)
-	return bfd_reloc_overflow;
-
-      value |= (bfd_get_32 (input_bfd, hit_data) & 0xfffff000);
-      bfd_put_32 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_ARM_THM_ABS5:
-      /* Support ldr and str instructions for the thumb. */
-#ifdef USE_REL
-      /* Need to refetch addend.  */
-      addend = bfd_get_16 (input_bfd, hit_data) & howto->src_mask;
-      /* ??? Need to determine shift amount from operand size.  */
-      addend >>= howto->rightshift;
-#endif
-      value += addend;
-
-      /* ??? Isn't value unsigned?  */
-      if ((long) value > 0x1f || (long) value < -0x10)
-	return bfd_reloc_overflow;
-
-      /* ??? Value needs to be properly shifted into place first.  */
-      value |= bfd_get_16 (input_bfd, hit_data) & 0xf83f;
-      bfd_put_16 (input_bfd, value, hit_data);
-      return bfd_reloc_ok;
-
-    case R_ARM_THM_PC22:
-      /* Thumb BL (branch long instruction). */
-      {
-	bfd_vma relocation;
-	boolean overflow = false;
-	bfd_vma upper_insn = bfd_get_16 (input_bfd, hit_data);
-	bfd_vma lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
-	bfd_vma src_mask = 0x007FFFFE;
-	bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
-	bfd_signed_vma reloc_signed_min = ~reloc_signed_max;
-	bfd_vma check;
-	bfd_signed_vma signed_check;
-	bfd_vma add;
-	bfd_signed_vma signed_add;
-
-#ifdef USE_REL
-	/* Need to refetch the addend and squish the two 11 bit pieces
-	   together.  */
-	{
-	  bfd_vma upper = bfd_get_16 (input_bfd, hit_data) & 0x7ff;
-	  bfd_vma lower = bfd_get_16 (input_bfd, hit_data + 2) & 0x7ff;
-	  upper = (upper ^ 0x400) - 0x400; /* sign extend */
-	  addend = (upper << 12) | (lower << 1);
-	}
-#endif
-
-        /* If it's not a call to thumb, assume call to arm */
-	if (sym_flags != STT_ARM_TFUNC)
-	  {
-	    if (elf32_thumb_to_arm_stub
-		(info, sym_name, input_bfd, output_bfd, input_section,
-		 hit_data, sym_sec, rel->r_offset, addend, value))
-	      return bfd_reloc_ok;
-	    else
-	      return bfd_reloc_dangerous;
-	  }
-
-	/* +4: pc is offset by 4 */
-	relocation = value + addend + 4;
-	relocation -= (input_section->output_section->vma
-		       + input_section->output_offset);
-	relocation -= rel->r_offset;
-
-	check = relocation >> howto->rightshift;
-
-	/* If this is a signed value, the rightshift just dropped
-	   leading 1 bits (assuming twos complement).  */
-	if ((bfd_signed_vma) relocation >= 0)
-	  signed_check = check;
-	else
-	  signed_check = check | ~((bfd_vma) -1 >> howto->rightshift);
-
-	add = ((upper_insn & 0x7ff) << 12) | ((lower_insn & 0x7ff) << 1);
-	/* sign extend */
-	signed_add = (add ^ 0x400000) - 0x400000;
-
-	/* Add the value from the object file.  */
-	signed_check += signed_add;
-	relocation += signed_add;
-
-	/* Assumes two's complement.  */
-	if (signed_check > reloc_signed_max
-	    || signed_check < reloc_signed_min)
-	  overflow = true;
-
-	/* Put RELOCATION back into the insn.  */
-	upper_insn = (upper_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 12) & 0x7ff);
-	lower_insn = (lower_insn & ~(bfd_vma) 0x7ff) | ((relocation >> 1) & 0x7ff);
-
-	/* Put the relocated value back in the object file:  */
-	bfd_put_16 (input_bfd, upper_insn, hit_data);
-	bfd_put_16 (input_bfd, lower_insn, hit_data + 2);
-
-	return (overflow ? bfd_reloc_overflow : bfd_reloc_ok);
-      }
-      break;
-
-    case R_ARM_GNU_VTINHERIT:
-    case R_ARM_GNU_VTENTRY:
-      return bfd_reloc_ok;
-
-    case R_ARM_COPY:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_GLOB_DAT:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_JUMP_SLOT:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_RELATIVE:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_GOTOFF:
-      /* Relocation is relative to the start of the
-         global offset table.  */
-
-      BFD_ASSERT (sgot != NULL);
-      if (sgot == NULL)
-        return bfd_reloc_notsupported;
-        
-      /* Note that sgot->output_offset is not involved in this
-         calculation.  We always want the start of .got.  If we
-         define _GLOBAL_OFFSET_TABLE in a different way, as is
-         permitted by the ABI, we might have to change this
-         calculation. */
-      
-      value -= sgot->output_section->vma;
-      return _bfd_final_link_relocate (howto, input_bfd, input_section, 
-      				       contents, rel->r_offset, value,
-      				       (bfd_vma) 0);
-
-    case R_ARM_GOTPC:
-      /* Use global offset table as symbol value. */
-
-      BFD_ASSERT (sgot != NULL);
-      
-      if (sgot == NULL)
-        return bfd_reloc_notsupported;
-
-      value = sgot->output_section->vma;
-      return _bfd_final_link_relocate (howto, input_bfd, input_section, 
-      				       contents, rel->r_offset, value,
-      				       (bfd_vma) 0);
-      
-    case R_ARM_GOT32:
-      /* Relocation is to the entry for this symbol in the
-         global offset table. */
-      if (sgot == NULL)
-	return bfd_reloc_notsupported;
-      
-      if (h != NULL)
-	{
-	  bfd_vma off;
-	  
-	  off = h->got.offset;
-	  BFD_ASSERT (off != (bfd_vma) -1);
-	  
-	  if (!elf_hash_table (info)->dynamic_sections_created ||
-	      (info->shared && (info->symbolic || h->dynindx == -1)
-	       && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
-	    {
-	      /* This is actually a static link, or it is a -Bsymbolic link
-		 and the symbol is defined locally.  We must initialize this
-		 entry in the global offset table.  Since the offset must
-		 always be a multiple of 4, we use the least significant bit
-		 to record whether we have initialized it already.
-		 
-		 When doing a dynamic link, we create a .rel.got relocation
-		 entry to initialize the value.  This is done in the 
-		 finish_dynamic_symbol routine. */
-	      
-	      if ((off & 1) != 0)
-		off &= ~1;
-	      else
-		{
-		  bfd_put_32 (output_bfd, value, sgot->contents + off);
-		  h->got.offset |= 1;
-		}
-	    }
-	  
-	  value = sgot->output_offset + off;
-	}
-      else
-	{
-	  bfd_vma off;
-	  
-	  BFD_ASSERT (local_got_offsets != NULL &&
-		      local_got_offsets[r_symndx] != (bfd_vma) -1);
-	  
-	  off = local_got_offsets[r_symndx];
-	  
-	  /* The offset must always be a multiple of 4.  We use the
-	     least significant bit to record whether we have already
-	     generated the necessary reloc. */
-	  if ((off & 1) != 0)
-	    off &= ~1;
-	  else
-	    {
-	      bfd_put_32 (output_bfd, value, sgot->contents + off);
-	      
-	      if (info->shared)
-		{
-		  asection * srelgot;
-		  Elf_Internal_Rel outrel;
-		  
-		  srelgot = bfd_get_section_by_name (dynobj, ".rel.got");
-		  BFD_ASSERT (srelgot != NULL);
-		  
-		  outrel.r_offset = (sgot->output_section->vma
-				     + sgot->output_offset 
-				     + off);
-		  outrel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
-		  bfd_elf32_swap_reloc_out (output_bfd, &outrel,
-					    (((Elf32_External_Rel *)
-					      srelgot->contents)
-					     + srelgot->reloc_count));
-		  ++srelgot->reloc_count;
-		}
-	      
-	      local_got_offsets[r_symndx] |= 1;
-	    }
-	  
-	  value = sgot->output_offset + off;
-	}
-      
-      return _bfd_final_link_relocate (howto, input_bfd, input_section, 
-      				       contents, rel->r_offset, value,
-      				       (bfd_vma) 0);
-      
-    case R_ARM_PLT32:
-      /* Relocation is to the entry for this symbol in the
-         procedure linkage table.  */
-
-      /* Resolve a PLT32 reloc against a local symbol directly,
-         without using the procedure linkage table. */
-      if (h == NULL)
-        return _bfd_final_link_relocate (howto, input_bfd, input_section,
-        				 contents, rel->r_offset, value,
-        				 (bfd_vma) 0);
-
-      if (h->plt.offset == (bfd_vma) -1)
-        /* We didn't make a PLT entry for this symbol.  This
-           happens when statically linking PIC code, or when
-           using -Bsymbolic.  */
-	return _bfd_final_link_relocate (howto, input_bfd, input_section,
-					 contents, rel->r_offset, value,
-					 (bfd_vma) 0);
-
-      BFD_ASSERT(splt != NULL);
-      if (splt == NULL)
-        return bfd_reloc_notsupported;
-
-      value = (splt->output_section->vma
-	       + splt->output_offset
-	       + h->plt.offset);
-      return _bfd_final_link_relocate (howto, input_bfd, input_section,
-        			       contents, rel->r_offset, value,
-        			       (bfd_vma) 0);
-      
-    case R_ARM_SBREL32:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_AMP_VCALL9:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_RSBREL32:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_THM_RPC22:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_RREL32:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_RABS32:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_RPC24:
-      return bfd_reloc_notsupported;
-
-    case R_ARM_RBASE:
-      return bfd_reloc_notsupported;
-
-    default:
-      return bfd_reloc_notsupported;
-    }
-}
-
-
-/* Relocate an ARM ELF section.  */
-static boolean
-elf32_arm_relocate_section (output_bfd, info, input_bfd, input_section,
-			    contents, relocs, local_syms, local_sections)
-     bfd *                  output_bfd;
-     struct bfd_link_info * info;
-     bfd *                  input_bfd;
-     asection *             input_section;
-     bfd_byte *             contents;
-     Elf_Internal_Rela *    relocs;
-     Elf_Internal_Sym *     local_syms;
-     asection **            local_sections;
-{
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
-  const char *                  name;
-
-  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type * howto;
-      unsigned long r_symndx;
-      Elf_Internal_Sym * sym;
-      asection * sec;
-      struct elf_link_hash_entry * h;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      r_type = ELF32_R_TYPE (rel->r_info);
-
-      if (r_type == R_ARM_GNU_VTENTRY
-          || r_type == R_ARM_GNU_VTINHERIT )
-        continue;
-
-      /* ScottB: range check r_type here. */
-      
-      howto = elf32_arm_howto_table + r_type;
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-#ifdef USE_REL
-		  {
-		    bfd_vma val;
-		    val = bfd_get_32 (input_bfd, contents + rel->r_offset);
-		    val += (sec->output_offset + sym->st_value) >> howto->rightshift;
-		    bfd_put_32 (input_bfd, val, contents + rel->r_offset);
-		  }
-#else
-		  rel->r_addend += (sec->output_offset + sym->st_value)
-		    >> howto->rightshift;
-#endif
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      
-              relocation = (h->root.u.def.value
-	  	           + sec->output_section->vma
-		           + sec->output_offset);
-	      
-	      /* In these cases, we don't need the relocation value.
-	         We check specially because in some obscure cases 
-	         sec->output_section will be NULL. */
-	      switch (r_type)
-		{
-	        case R_ARM_PC24:
-	        case R_ARM_ABS32:
-	          if (info->shared
-	              && (
-	              	  (!info->symbolic && h->dynindx != -1)
-	                  || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR == 0)
-			  )
-	              && ((input_section->flags & SEC_ALLOC) != 0)
-		      )
-	            relocation = 0;
-		  break;
-		  
-	        case R_ARM_GOTPC:
-	          relocation = 0;
-		  break;
-		  
-	        case R_ARM_GOT32:
-	          if (elf_hash_table(info)->dynamic_sections_created
-	              && (!info->shared
-	                  || (!info->symbolic && h->dynindx != -1)
-	                  || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-			  )
-		      )
-	            relocation = 0;
-		  break;
-		  
-	        case R_ARM_PLT32:
-	          if (h->plt.offset != (bfd_vma)-1)
-	            relocation = 0;
-		  break;
-		  
-	        default:
-		  if (sec->output_section == NULL)
-		    {
-		      (*_bfd_error_handler)
-			(_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-			 bfd_get_filename (input_bfd), h->root.root.string,
-			 bfd_get_section_name (input_bfd, input_section));
-		      relocation = 0;
-		    }
-		}
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else
-	    {
-	      if (!((*info->callbacks->undefined_symbol)
-		    (info, h->root.root.string, input_bfd,
-		     input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      if (h != NULL)
-	name = h->root.root.string;
-      else
-	{
-	  name = (bfd_elf_string_from_elf_section
-		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
-	  if (name == NULL || *name == '\0')
-	    name = bfd_section_name (input_bfd, sec);
-	}
-      
-      r = elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
-					 input_section, contents, rel,
-					 relocation, info, sec, name,
-					 (h ? ELF_ST_TYPE (h->type) :
-					  ELF_ST_TYPE (sym->st_info)));
-
-      if (r != bfd_reloc_ok)
-	{
-	  const char * msg = (const char *) 0;
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      if (!((*info->callbacks->reloc_overflow)
-		    (info, name, howto->name, (bfd_vma) 0,
-		     input_bfd, input_section, rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_undefined:
-	      if (!((*info->callbacks->undefined_symbol)
-		    (info, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_outofrange:
-	      msg = _ ("internal error: out of range error");
-	      goto common_error;
-
-	    case bfd_reloc_notsupported:
-	      msg = _ ("internal error: unsupported relocation error");
-	      goto common_error;
-
-	    case bfd_reloc_dangerous:
-	      msg = _ ("internal error: dangerous error");
-	      goto common_error;
-
-	    default:
-	      msg = _ ("internal error: unknown error");
-	      /* fall through */
-
-	    common_error:
-	      if (!((*info->callbacks->warning)
-		    (info, msg, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Function to keep ARM specific flags in the ELF header. */
-static boolean
-elf32_arm_set_private_flags (abfd, flags)
-     bfd *abfd;
-     flagword flags;
-{
-  if (elf_flags_init (abfd)
-      && elf_elfheader (abfd)->e_flags != flags)
-    {
-      if (flags & EF_INTERWORK)
-	_bfd_error_handler (_ ("\
-Warning: Not setting interwork flag of %s since it has already been specified as non-interworking"),
-			    bfd_get_filename (abfd));
-      else
-	_bfd_error_handler (_ ("\
-Warning: Clearing the interwork flag of %s due to outside request"),
-			    bfd_get_filename (abfd));
-    }
-  else
-    {
-      elf_elfheader (abfd)->e_flags = flags;
-      elf_flags_init (abfd) = true;
-    }
-
-  return true;
-}
-
-/* Copy backend specific data from one object module to another */
-static boolean
-elf32_arm_copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  flagword in_flags;
-  flagword out_flags;
-
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  in_flags = elf_elfheader (ibfd)->e_flags;
-  out_flags = elf_elfheader (obfd)->e_flags;
-
-  if (elf_flags_init (obfd) && in_flags != out_flags)
-    {
-      /* Cannot mix PIC and non-PIC code.  */
-      if ((in_flags & EF_PIC) != (out_flags & EF_PIC))
-	return false;
-
-      /* Cannot mix APCS26 and APCS32 code.  */
-      if ((in_flags & EF_APCS_26) != (out_flags & EF_APCS_26))
-	return false;
-
-      /* Cannot mix float APCS and non-float APCS code.  */
-      if ((in_flags & EF_APCS_FLOAT) != (out_flags & EF_APCS_FLOAT))
-	return false;
-
-      /* If the src and dest have different interworking flags
-         then turn off the interworking bit.  */
-      if ((in_flags & EF_INTERWORK) != (out_flags & EF_INTERWORK))
-	{
-	  if (out_flags & EF_INTERWORK)
-	    _bfd_error_handler (_ ("\
-Warning: Clearing the interwork flag in %s because non-interworking code in %s has been linked with it"),
-			  bfd_get_filename (obfd), bfd_get_filename (ibfd));
-
-	  in_flags &= ~EF_INTERWORK;
-	}
-    }
-
-  elf_elfheader (obfd)->e_flags = in_flags;
-  elf_flags_init (obfd) = true;
-
-  return true;
-}
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-static boolean
-elf32_arm_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  flagword out_flags;
-  flagword in_flags;
-
-  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  /* Check if we have the same endianess */
-  if (   ibfd->xvec->byteorder != obfd->xvec->byteorder
-      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN
-      && ibfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
-    {
-      (*_bfd_error_handler)
-	(_("%s: compiled for a %s endian system and target is %s endian"),
-	 bfd_get_filename (ibfd),
-	 bfd_big_endian (ibfd) ? "big" : "little",
-	 bfd_big_endian (obfd) ? "big" : "little");
-
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  /* The input BFD must have had its flags initialised.  */
-  /* The following seems bogus to me -- The flags are initialized in
-     the assembler but I don't think an elf_flags_init field is
-     written into the object */
-  /* BFD_ASSERT (elf_flags_init (ibfd)); */
-
-  in_flags  = elf_elfheader (ibfd)->e_flags;
-  out_flags = elf_elfheader (obfd)->e_flags;
-
-  if (!elf_flags_init (obfd))
-    {
-      /* If the input is the default architecture then do not
-         bother setting the flags for the output architecture,
-         instead allow future merges to do this.  If no future
-         merges ever set these flags then they will retain their
-         unitialised values, which surprise surprise, correspond
-         to the default values.  */
-      if (bfd_get_arch_info (ibfd)->the_default)
-	return true;
-
-      elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = in_flags;
-
-      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
-	  && bfd_get_arch_info (obfd)->the_default)
-	return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
-
-      return true;
-    }
-
-  /* Check flag compatibility.  */
-  if (in_flags == out_flags)
-    return true;
-
-  /* Complain about various flag mismatches.  */
-
-  if ((in_flags & EF_APCS_26) != (out_flags & EF_APCS_26))
-    _bfd_error_handler (_ ("\
-Error: %s compiled for APCS-%d, whereas %s is compiled for APCS-%d"),
-			bfd_get_filename (ibfd),
-			in_flags & EF_APCS_26 ? 26 : 32,
-			bfd_get_filename (obfd),
-			out_flags & EF_APCS_26 ? 26 : 32);
-
-  if ((in_flags & EF_APCS_FLOAT) != (out_flags & EF_APCS_FLOAT))
-    _bfd_error_handler (_ ("\
-Error: %s passes floats in %s registers, whereas %s passes them in %s registers"),
-			bfd_get_filename (ibfd),
-		     in_flags & EF_APCS_FLOAT ? _ ("float") : _ ("integer"),
-			bfd_get_filename (obfd),
-		      out_flags & EF_APCS_26 ? _ ("float") : _ ("integer"));
-
-  if ((in_flags & EF_PIC) != (out_flags & EF_PIC))
-    _bfd_error_handler (_ ("\
-Error: %s is compiled as position %s code, whereas %s is not"),
-			bfd_get_filename (ibfd),
-		    in_flags & EF_PIC ? _ ("independent") : _ ("dependent"),
-			bfd_get_filename (obfd));
-
-  /* Interworking mismatch is only a warning. */
-  if ((in_flags & EF_INTERWORK) != (out_flags & EF_INTERWORK))
-    {
-      _bfd_error_handler (_ ("\
-Warning: %s %s interworking, whereas %s %s"),
-			  bfd_get_filename (ibfd),
-	  in_flags & EF_INTERWORK ? _ ("supports") : _ ("does not support"),
-			  bfd_get_filename (obfd),
-		    out_flags & EF_INTERWORK ? _ ("does not") : _ ("does"));
-      return true;
-    }
-
-  return false;
-}
-
-/* Display the flags field */
-static boolean
-elf32_arm_print_private_bfd_data (abfd, ptr)
-     bfd *abfd;
-     PTR ptr;
-{
-  FILE *file = (FILE *) ptr;
-
-  BFD_ASSERT (abfd != NULL && ptr != NULL);
-
-  /* Print normal ELF private data.  */
-  _bfd_elf_print_private_bfd_data (abfd, ptr);
-
-  /* Ignore init flag - it may not be set, despite the flags field containing valid data.  */
-
-  /* xgettext:c-format */
-  fprintf (file, _ ("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
-
-  if (elf_elfheader (abfd)->e_flags & EF_INTERWORK)
-    fprintf (file, _ (" [interworking enabled]"));
-  else
-    fprintf (file, _ (" [interworking not enabled]"));
-
-  if (elf_elfheader (abfd)->e_flags & EF_APCS_26)
-    fprintf (file, _ (" [APCS-26]"));
-  else
-    fprintf (file, _ (" [APCS-32]"));
-
-  if (elf_elfheader (abfd)->e_flags & EF_APCS_FLOAT)
-    fprintf (file, _ (" [floats passed in float registers]"));
-  else
-    fprintf (file, _ (" [floats passed in integer registers]"));
-
-  if (elf_elfheader (abfd)->e_flags & EF_PIC)
-    fprintf (file, _ (" [position independent]"));
-  else
-    fprintf (file, _ (" [absolute position]"));
-
-  fputc ('\n', file);
-
-  return true;
-}
-
-static int
-elf32_arm_get_symbol_type (elf_sym, type)
-     Elf_Internal_Sym * elf_sym;
-     int type;
-{
-  if (ELF_ST_TYPE (elf_sym->st_info) == STT_ARM_TFUNC)
-    return ELF_ST_TYPE (elf_sym->st_info);
-  else
-    return type;
-}
-    
-static asection *
-elf32_arm_gc_mark_hook (abfd, info, rel, h, sym)
-       bfd *abfd;
-       struct bfd_link_info *info;
-       Elf_Internal_Rela *rel;
-       struct elf_link_hash_entry *h;
-       Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_ARM_GNU_VTINHERIT:
-      case R_ARM_GNU_VTENTRY:
-        break;
-
-      default:
-        switch (h->root.type)
-          {
-          case bfd_link_hash_defined:
-          case bfd_link_hash_defweak:
-            return h->root.u.def.section;
-
-          case bfd_link_hash_common:
-            return h->root.u.c.p->section;
-          }
-       }
-     }
-   else
-     {
-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
-  return NULL;
-}
-
-static boolean
-elf32_arm_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  /* we don't use got and plt entries for armelf */
-  return true;
-}
-
-/* Look through the relocs for a section during the first phase.
-   Since we don't do .gots or .plts, we just need to consider the
-   virtual table relocs for gc.  */
- 
-static boolean
-elf32_arm_check_relocs (abfd, info, sec, relocs)
-     bfd *                      abfd;
-     struct bfd_link_info *     info;
-     asection *                 sec;
-     const Elf_Internal_Rela *  relocs;
-{
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  struct elf_link_hash_entry ** sym_hashes_end;
-  const Elf_Internal_Rela *     rel;
-  const Elf_Internal_Rela *     rel_end;
-  bfd *                         dynobj;
-  asection * sgot, *srelgot, *sreloc;
-  bfd_vma * local_got_offsets;
-   
-  if (info->relocateable)
-    return true;
- 
-  sgot = srelgot = sreloc = NULL;
-				   
-  dynobj = elf_hash_table (info)->dynobj;
-  local_got_offsets = elf_local_got_offsets (abfd);
-  
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
- 
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      struct elf_link_hash_entry *h;
-      unsigned long r_symndx;
- 
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-        h = NULL;
-      else
-        h = sym_hashes[r_symndx - symtab_hdr->sh_info];
- 
-      /* Some relocs require a global offset table.  */
-      if (dynobj == NULL)
-	{
-	  switch (ELF32_R_TYPE (rel->r_info))
-	    {
-	    case R_ARM_GOT32:
-	    case R_ARM_GOTOFF:
-	    case R_ARM_GOTPC:
-	      elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-
-      switch (ELF32_R_TYPE (rel->r_info))
-        {
-	  case R_ARM_GOT32:
-	    /* This symbol requires a global offset table entry.  */
-	    if (sgot == NULL)
-	      {
-	        sgot = bfd_get_section_by_name (dynobj, ".got");
-	        BFD_ASSERT (sgot != NULL);
-	      }
-
-	    /* Get the got relocation section if necessary.  */
-	    if (srelgot == NULL
-	        && (h != NULL || info->shared))
-	      {
-	        srelgot = bfd_get_section_by_name (dynobj, ".rel.got");
-	      
-	        /* If no got relocation section, make one and initialize.  */
-	        if (srelgot == NULL)
-		  {
-		    srelgot = bfd_make_section (dynobj, ".rel.got");
-		    if (srelgot == NULL
-		        || ! bfd_set_section_flags (dynobj, srelgot,
-		  				    (SEC_ALLOC
-						     | SEC_LOAD
-						     | SEC_HAS_CONTENTS
-						     | SEC_IN_MEMORY
-						     | SEC_LINKER_CREATED
-						     | SEC_READONLY))
-		        || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		      return false;
-		  }
-	      }
-
-	    if (h != NULL)
-	      {
-	        if (h->got.offset != (bfd_vma) -1)
-		  /* We have already allocated space in the .got.  */
-		  break;
-		
-	        h->got.offset = sgot->_raw_size;
-
-	        /* Make sure this symbol is output as a dynamic symbol.  */
-	        if (h->dynindx == -1)
-		  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		    return false;
-
-	        srelgot->_raw_size += sizeof (Elf32_External_Rel);
-	      }
-	    else
-	      {
-     	        /* This is a global offset table entry for a local
-                   symbol.  */
-	        if (local_got_offsets == NULL)
-		  {
-		    size_t size;
-		    register unsigned int i;
-
-		    size = symtab_hdr->sh_info * sizeof (bfd_vma);
-		    local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
-		    if (local_got_offsets == NULL)
-		      return false;
-		    elf_local_got_offsets (abfd) = local_got_offsets;
-		    for (i = 0; i < symtab_hdr->sh_info; i++)
-		      local_got_offsets[i] = (bfd_vma) -1;
-		  }
-		
-	        if (local_got_offsets[r_symndx] != (bfd_vma) -1)
-		  /* We have already allocated space in the .got.  */
-		  break;
-
-	        local_got_offsets[r_symndx] = sgot->_raw_size;
-
-	        if (info->shared)
-		  /* If we are generating a shared object, we need to
-		     output a R_ARM_RELATIVE reloc so that the dynamic
-		     linker can adjust this GOT entry.  */
-		  srelgot->_raw_size += sizeof (Elf32_External_Rel);
-	      }
-
-	    sgot->_raw_size += 4;
-	    break;
-
-  	  case R_ARM_PLT32:
-	    /* This symbol requires a procedure linkage table entry.  We
-               actually build the entry in adjust_dynamic_symbol,
-               because this might be a case of linking PIC code which is
-               never referenced by a dynamic object, in which case we
-               don't need to generate a procedure linkage table entry
-               after all.  */
-
-	    /* If this is a local symbol, we resolve it directly without
-               creating a procedure linkage table entry.  */
-	    if (h == NULL)
-	      continue;
-
-	    h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-	    break;
-
-	  case R_ARM_ABS32:
-	  case R_ARM_REL32:
-	  case R_ARM_PC24:
-	    /* If we are creating a shared library, and this is a reloc
-               against a global symbol, or a non PC relative reloc
-               against a local symbol, then we need to copy the reloc
-               into the shared library.  However, if we are linking with
-               -Bsymbolic, we do not need to copy a reloc against a
-               global symbol which is defined in an object we are
-               including in the link (i.e., DEF_REGULAR is set).  At
-               this point we have not seen all the input files, so it is
-               possible that DEF_REGULAR is not set now but will be set
-               later (it is never cleared).  We account for that
-               possibility below by storing information in the
-               pcrel_relocs_copied field of the hash table entry.  */
-	    if (info->shared
-	      && (ELF32_R_TYPE (rel->r_info) != R_ARM_PC24
-	        || (h != NULL
-		  && (! info->symbolic
-		    || (h->elf_link_hash_flags
-		      & ELF_LINK_HASH_DEF_REGULAR) == 0))))
-	      {
-	        /* When creating a shared object, we must copy these
-                   reloc types into the output file.  We create a reloc
-                   section in dynobj and make room for this reloc.  */
-	        if (sreloc == NULL)
-		  {
-		    const char * name;
-
-		    name = (bfd_elf_string_from_elf_section
-			    (abfd,
-			     elf_elfheader (abfd)->e_shstrndx,
-			     elf_section_data (sec)->rel_hdr.sh_name));
-		    if (name == NULL)
-		      return false;
-
-		    BFD_ASSERT (strncmp (name, ".rel", 4) == 0
-		 	        && strcmp (bfd_get_section_name (abfd, sec),
-					   name + 4) == 0);
-
-		    sreloc = bfd_get_section_by_name (dynobj, name);
-		    if (sreloc == NULL)
-		      {
-		        flagword flags;
-
-		        sreloc = bfd_make_section (dynobj, name);
-		        flags = (SEC_HAS_CONTENTS | SEC_READONLY
-			         | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-		        if ((sec->flags & SEC_ALLOC) != 0)
-			  flags |= SEC_ALLOC | SEC_LOAD;
-		        if (sreloc == NULL
-			    || ! bfd_set_section_flags (dynobj, sreloc, flags)
-			    || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			  return false;
-		      }
-		  }
-
-	        sreloc->_raw_size += sizeof (Elf32_External_Rel);
-	        /* If we are linking with -Bsymbolic, and this is a
-                   global symbol, we count the number of PC relative
-                   relocations we have entered for this symbol, so that
-                   we can discard them again if the symbol is later
-                   defined by a regular object.  Note that this function
-                   is only called if we are using an elf_i386 linker
-                   hash table, which means that h is really a pointer to
-                   an elf_i386_link_hash_entry.  */
-	        if (h != NULL && info->symbolic
-		    && ELF32_R_TYPE (rel->r_info) == R_ARM_PC24)
-		  {
-		    struct elf32_arm_link_hash_entry * eh;
-		    struct elf32_arm_pcrel_relocs_copied * p;
-
-		    eh = (struct elf32_arm_link_hash_entry *) h;
-
-		    for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
-		      if (p->section == sreloc)
-		        break;
-
-		    if (p == NULL)
-		      {
-		        p = ((struct elf32_arm_pcrel_relocs_copied *)
-			     bfd_alloc (dynobj, sizeof * p));
-			
-		        if (p == NULL)
-			  return false;
-		        p->next = eh->pcrel_relocs_copied;
-		        eh->pcrel_relocs_copied = p;
-		        p->section = sreloc;
-		        p->count = 0;
-		      }
-
-		    ++p->count;
-		  }
-	      }
-	    break;
-
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_ARM_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
- 
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_ARM_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
-          break;
-        }
-    }
- 
-  return true;
-}
-
-       
-/* Find the nearest line to a particular section and offset, for error
-   reporting.   This code is a duplicate of the code in elf.c, except
-   that it also accepts STT_ARM_TFUNC as a symbol that names a function. */
-
-static boolean
-elf32_arm_find_nearest_line
-  (abfd, section, symbols, offset, filename_ptr, functionname_ptr, line_ptr)
-     bfd *          abfd;
-     asection *     section;
-     asymbol **     symbols;
-     bfd_vma        offset;
-     CONST char **  filename_ptr;
-     CONST char **  functionname_ptr;
-     unsigned int * line_ptr;
-{
-  boolean      found;
-  const char * filename;
-  asymbol *    func;
-  bfd_vma      low_func;
-  asymbol **   p;
-
-  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
-				     filename_ptr, functionname_ptr, 
-				     line_ptr))
-    return true;
-
-  if (! _bfd_stab_section_find_nearest_line (abfd, symbols, section, offset,
-					     &found, filename_ptr,
-					     functionname_ptr, line_ptr,
-					     &elf_tdata (abfd)->line_info))
-    return false;
-  
-  if (found)
-    return true;
-
-  if (symbols == NULL)
-    return false;
-
-  filename = NULL;
-  func = NULL;
-  low_func = 0;
-
-  for (p = symbols; *p != NULL; p++)
-    {
-      elf_symbol_type *q;
-
-      q = (elf_symbol_type *) *p;
-
-      if (bfd_get_section (&q->symbol) != section)
-	continue;
-
-      switch (ELF_ST_TYPE (q->internal_elf_sym.st_info))
-	{
-	default:
-	  break;
-	case STT_FILE:
-	  filename = bfd_asymbol_name (&q->symbol);
-	  break;
-	case STT_NOTYPE:
-	case STT_FUNC:
-	case STT_ARM_TFUNC:
-	  if (q->symbol.section == section
-	      && q->symbol.value >= low_func
-	      && q->symbol.value <= offset)
-	    {
-	      func = (asymbol *) q;
-	      low_func = q->symbol.value;
-	    }
-	  break;
-	}
-    }
-
-  if (func == NULL)
-    return false;
-
-  *filename_ptr = filename;
-  *functionname_ptr = bfd_asymbol_name (func);
-  *line_ptr = 0;
-  
-  return true;
-}
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-elf32_arm_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info * info;
-     struct elf_link_hash_entry * h;
-{
-  bfd * dynobj;
-  asection * s;
-  unsigned int power_of_two;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
-  /* If this is a function, put it in the procedure linkage table.  We
-     will fill in the contents of the procedure linkage table later,
-     when we know the address of the .got section.  */
-  if (h->type == STT_FUNC
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
-    {
-      if (! info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0)
-	{
-	  /* This case can occur if we saw a PLT32 reloc in an input
-             file, but the symbol was never referred to by a dynamic
-             object.  In such a case, we don't actually need to build
-             a procedure linkage table, and we can just do a PC32
-             reloc instead.  */
-	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
-	  return true;
-	}
-
-      /* Make sure this symbol is output as a dynamic symbol.  */
-      if (h->dynindx == -1)
-	{
-	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-      /* If this is the first .plt entry, make room for the special
-	 first entry.  */
-      if (s->_raw_size == 0)
-	s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* If this symbol is not defined in a regular file, and we are
-	 not generating a shared library, then set the symbol to this
-	 location in the .plt.  This is required to make function
-	 pointers compare as equal between the normal executable and
-	 the shared library.  */
-      if (! info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  h->root.u.def.section = s;
-	  h->root.u.def.value = s->_raw_size;
-	}
-
-      h->plt.offset = s->_raw_size;
-
-      /* Make room for this entry.  */
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .got.plt section, which
-	 will be placed in the .got section by the linker script.  */
-
-      s = bfd_get_section_by_name (dynobj, ".got.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += 4;
-
-      /* We also need to make an entry in the .rel.plt section.  */
-
-      s = bfd_get_section_by_name (dynobj, ".rel.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf32_External_Rel);
-
-      return true;
-    }
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  /* If we are creating a shared library, we must presume that the
-     only references to the symbol are via the global offset table.
-     For such cases we need not do anything here; the relocations will
-     be handled correctly by relocate_section.  */
-  if (info->shared)
-    return true;
-
-  /* We must allocate the symbol in our .dynbss section, which will
-     become part of the .bss section of the executable.  There will be
-     an entry for this symbol in the .dynsym section.  The dynamic
-     object will contain position independent code, so all references
-     from the dynamic object to this symbol will go through the global
-     offset table.  The dynamic linker will use the .dynsym entry to
-     determine the address it must put in the global offset table, so
-     both the dynamic object and the regular object will refer to the
-     same memory location for the variable.  */
-
-  s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
-
-  /* We must generate a R_ARM_COPY reloc to tell the dynamic linker to
-     copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rel.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-    {
-      asection *srel;
-
-      srel = bfd_get_section_by_name (dynobj, ".rel.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf32_External_Rel);
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
-    }
-
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 3)
-    power_of_two = 3;
-
-  /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
-    {
-      if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
-    }
-
-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->_raw_size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->_raw_size += h->size;
-
-  return true;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-elf32_arm_size_dynamic_sections (output_bfd, info)
-     bfd * output_bfd;
-     struct bfd_link_info * info;
-{
-  bfd * dynobj;
-  asection * s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (! info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-    }
-  else
-    {
-      /* We may have created entries in the .rel.got section.
-         However, if we are not creating the dynamic sections, we will
-         not actually use these entries.  Reset the size of .rel.got,
-         which will cause it to get stripped from the output file
-         below.  */
-      s = bfd_get_section_by_name (dynobj, ".rel.got");
-      if (s != NULL)
-	s->_raw_size = 0;
-    }
-
-  /* If this is a -Bsymbolic shared link, then we need to discard all
-     PC relative relocs against symbols defined in a regular object.
-     We allocated space for them in the check_relocs routine, but we
-     will not fill them in in the relocate_section routine.  */
-  if (info->shared && info->symbolic)
-    elf32_arm_link_hash_traverse (elf32_arm_hash_table (info),
-				  elf32_arm_discard_copies,
-				  (PTR) NULL);
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char * name;
-      boolean strip;
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-	continue;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strcmp (name, ".plt") == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* Strip this section if we don't need it; see the
-                 comment below.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      /* Remember whether there is a PLT.  */
-	      plt = true;
-	    }
-	}
-      else if (strncmp (name, ".rel", 4) == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is mostly to handle .rel.bss and
-		 .rel.plt.  We must create both sections in
-		 create_dynamic_sections, because they must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      asection * target;
-
-	      /* Remember whether there are any reloc sections other
-                 than .rel.plt.  */
-	      if (strcmp (name, ".rel.plt") != 0)
-		{
-		  const char *outname;
-
-		  relocs = true;
-
-		  /* If this relocation section applies to a read only
-		     section, then we probably need a DT_TEXTREL
-		     entry.  The entries in the .rel.plt section
-		     really apply to the .got section, which we
-		     created ourselves and so know is not readonly.  */
-		  outname = bfd_get_section_name (output_bfd,
-						  s->output_section);
-		  target = bfd_get_section_by_name (output_bfd, outname + 4);
-		  if (target != NULL
-		      && (target->flags & SEC_READONLY) != 0
-		      && (target->flags & SEC_ALLOC) != 0)
-		    reltext = true;
-		}
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
-	    }
-	}
-      else if (strncmp (name, ".got", 4) != 0)
-	{
-	  /* It's not one of our sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	{
-	  asection ** spp;
-
-	  for (spp = &s->output_section->owner->sections;
-	       *spp != s->output_section;
-	       spp = &(*spp)->next)
-	    ;
-	  *spp = s->output_section->next;
-	  --s->output_section->owner->section_count;
-
-	  continue;
-	}
-
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in elf32_arm_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (! info->shared)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
-	}
-
-      if (plt)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_PLTGOT, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTREL, DT_REL)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_JMPREL, 0))
-	    return false;
-	}
-
-      if (relocs)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_REL, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_RELSZ, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_RELENT,
-						sizeof (Elf32_External_Rel)))
-	    return false;
-	}
-
-      if (reltext)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* This function is called via elf32_arm_link_hash_traverse if we are
-   creating a shared object with -Bsymbolic.  It discards the space
-   allocated to copy PC relative relocs against symbols which are
-   defined in regular objects.  We allocated space for them in the
-   check_relocs routine, but we won't fill them in in the
-   relocate_section routine.  */
-
-static boolean
-elf32_arm_discard_copies (h, ignore)
-     struct elf32_arm_link_hash_entry * h;
-     PTR ignore;
-{
-  struct elf32_arm_pcrel_relocs_copied * s;
-
-  /* We only discard relocs for symbols defined in a regular object.  */
-  if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
-
-  for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
-    s->section->_raw_size -= s->count * sizeof (Elf32_External_Rel);
-
-  return true;
-}
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-elf32_arm_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd * output_bfd;
-     struct bfd_link_info * info;
-     struct elf_link_hash_entry * h;
-     Elf_Internal_Sym * sym;
-{
-  bfd * dynobj;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  if (h->plt.offset != (bfd_vma) -1)
-    {
-      asection * splt;
-      asection * sgot;
-      asection * srel;
-      bfd_vma plt_index;
-      bfd_vma got_offset;
-      Elf_Internal_Rel rel;
-
-      /* This symbol has an entry in the procedure linkage table.  Set
-	 it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-      srel = bfd_get_section_by_name (dynobj, ".rel.plt");
-      BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
-
-      /* Get the index in the procedure linkage table which
-	 corresponds to this symbol.  This is the index of this symbol
-	 in all the symbols for which we are making plt entries.  The
-	 first entry in the procedure linkage table is reserved.  */
-      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
-
-      /* Get the offset into the .got table of the entry that
-	 corresponds to this function.  Each .got entry is 4 bytes.
-	 The first three are reserved.  */
-      got_offset = (plt_index + 3) * 4;
-
-      /* Fill in the entry in the procedure linkage table.  */
-      memcpy (splt->contents + h->plt.offset,
-              elf32_arm_plt_entry,
-	      PLT_ENTRY_SIZE);
-      bfd_put_32 (output_bfd,
-		      (sgot->output_section->vma
-		       + sgot->output_offset
-		       + got_offset 
-		       - splt->output_section->vma
-		       - splt->output_offset
-		       - h->plt.offset - 12),
-		      splt->contents + h->plt.offset + 12);
-
-      /* Fill in the entry in the global offset table.  */
-      bfd_put_32 (output_bfd,
-		  (splt->output_section->vma
-		   + splt->output_offset),
-		  sgot->contents + got_offset);
-
-      /* Fill in the entry in the .rel.plt section.  */
-      rel.r_offset = (sgot->output_section->vma
-		      + sgot->output_offset
-		      + got_offset);
-      rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_JUMP_SLOT);
-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-				((Elf32_External_Rel *) srel->contents
-				 + plt_index));
-
-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
-	  sym->st_shndx = SHN_UNDEF;
-	}
-    }
-
-  if (h->got.offset != (bfd_vma) -1)
-    {
-      asection * sgot;
-      asection * srel;
-      Elf_Internal_Rel rel;
-
-      /* This symbol has an entry in the global offset table.  Set it
-	 up.  */
-      
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srel = bfd_get_section_by_name (dynobj, ".rel.got");
-      BFD_ASSERT (sgot != NULL && srel != NULL);
-
-      rel.r_offset = (sgot->output_section->vma
-		      + sgot->output_offset
-		      + (h->got.offset &~ 1));
-
-      /* If this is a -Bsymbolic link, and the symbol is defined
-	 locally, we just want to emit a RELATIVE reloc.  The entry in
-	 the global offset table will already have been initialized in
-	 the relocate_section function.  */
-      if (info->shared
-	  && (info->symbolic || h->dynindx == -1)
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
-	rel.r_info = ELF32_R_INFO (0, R_ARM_RELATIVE);
-      else
-	{
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	  rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_GLOB_DAT);
-	}
-
-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-				((Elf32_External_Rel *) srel->contents
-				 + srel->reloc_count));
-      ++srel->reloc_count;
-    }
-
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
-    {
-      asection * s;
-      Elf_Internal_Rel rel;
-
-      /* This symbol needs a copy reloc.  Set it up.  */
-
-      BFD_ASSERT (h->dynindx != -1
-		  && (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak));
-
-      s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				   ".rel.bss");
-      BFD_ASSERT (s != NULL);
-
-      rel.r_offset = (h->root.u.def.value
-		      + h->root.u.def.section->output_section->vma
-		      + h->root.u.def.section->output_offset);
-      rel.r_info = ELF32_R_INFO (h->dynindx, R_ARM_COPY);
-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-				((Elf32_External_Rel *) s->contents
-				 + s->reloc_count));
-      ++s->reloc_count;
-    }
-
-  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-
-  return true;
-}
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-elf32_arm_finish_dynamic_sections (output_bfd, info)
-     bfd * output_bfd;
-     struct bfd_link_info * info;
-{
-  bfd * dynobj;
-  asection * sgot;
-  asection * sdyn;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-  BFD_ASSERT (sgot != NULL);
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      asection *splt;
-      Elf32_External_Dyn *dyncon, *dynconend;
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (splt != NULL && sdyn != NULL);
-
-      dyncon = (Elf32_External_Dyn *) sdyn->contents;
-      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char * name;
-	  asection * s;
-
-	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    default:
-	      break;
-
-	    case DT_PLTGOT:
-	      name = ".got";
-	      goto get_vma;
-	    case DT_JMPREL:
-	      name = ".rel.plt";
-	    get_vma:
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_ptr = s->vma;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_PLTRELSZ:
-	      s = bfd_get_section_by_name (output_bfd, ".rel.plt");
-	      BFD_ASSERT (s != NULL);
-	      if (s->_cooked_size != 0)
-		dyn.d_un.d_val = s->_cooked_size;
-	      else
-		dyn.d_un.d_val = s->_raw_size;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_RELSZ:
-	      /* My reading of the SVR4 ABI indicates that the
-		 procedure linkage table relocs (DT_JMPREL) should be
-		 included in the overall relocs (DT_REL).  This is
-		 what Solaris does.  However, UnixWare can not handle
-		 that case.  Therefore, we override the DT_RELSZ entry
-		 here to make it not include the JMPREL relocs.  Since
-		 the linker script arranges for .rel.plt to follow all
-		 other relocation sections, we don't have to worry
-		 about changing the DT_REL entry.  */
-	      s = bfd_get_section_by_name (output_bfd, ".rel.plt");
-	      if (s != NULL)
-		{
-		  if (s->_cooked_size != 0)
-		    dyn.d_un.d_val -= s->_cooked_size;
-		  else
-		    dyn.d_un.d_val -= s->_raw_size;
-		}
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-	    }
-	}
-
-      /* Fill in the first entry in the procedure linkage table.  */
-      if (splt->_raw_size > 0)
-	memcpy (splt->contents, elf32_arm_plt0_entry, PLT_ENTRY_SIZE);
-
-      /* UnixWare sets the entsize of .plt to 4, although that doesn't
-	 really seem like the right value.  */
-      elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
-    }
-
-  /* Fill in the first three entries in the global offset table.  */
-  if (sgot->_raw_size > 0)
-    {
-      if (sdyn == NULL)
-	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
-      else
-	bfd_put_32 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    sgot->contents);
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
-    }
-
-  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
-
-  return true;
-}
-
-#define ELF_ARCH			bfd_arch_arm
-#define ELF_MACHINE_CODE		EM_ARM
-#define ELF_MAXPAGE_SIZE		0x8000
-
-
-#define bfd_elf32_bfd_copy_private_bfd_data 	elf32_arm_copy_private_bfd_data
-#define bfd_elf32_bfd_merge_private_bfd_data 	elf32_arm_merge_private_bfd_data
-#define bfd_elf32_bfd_set_private_flags		elf32_arm_set_private_flags
-#define bfd_elf32_bfd_print_private_bfd_data	elf32_arm_print_private_bfd_data
-#define bfd_elf32_bfd_link_hash_table_create    elf32_arm_link_hash_table_create
-#define bfd_elf32_bfd_reloc_type_lookup 	elf32_arm_reloc_type_lookup
-#define bfd_elf32_find_nearest_line	        elf32_arm_find_nearest_line
-
-#define elf_backend_get_symbol_type             elf32_arm_get_symbol_type
-#define elf_backend_gc_mark_hook                elf32_arm_gc_mark_hook
-#define elf_backend_gc_sweep_hook               elf32_arm_gc_sweep_hook
-#define elf_backend_check_relocs                elf32_arm_check_relocs
-#define elf_backend_relocate_section    	elf32_arm_relocate_section
-#define elf_backend_adjust_dynamic_symbol	elf32_arm_adjust_dynamic_symbol
-#define elf_backend_create_dynamic_sections	_bfd_elf_create_dynamic_sections
-#define elf_backend_finish_dynamic_symbol	elf32_arm_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections	elf32_arm_finish_dynamic_sections
-#define elf_backend_size_dynamic_sections	elf32_arm_size_dynamic_sections
-
-#define elf_backend_can_gc_sections 1
-#define elf_backend_plt_readonly    1
-#define elf_backend_want_got_plt    1
-#define elf_backend_want_plt_sym    0
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-d10v.c b/bfd/elf32-d10v.c
deleted file mode 100644
index be80bae2e9b..00000000000
--- a/bfd/elf32-d10v.c
+++ /dev/null
@@ -1,534 +0,0 @@
-/* D10V-specific support for 32-bit ELF
-   Copyright (C) 1996 Free Software Foundation, Inc.
-   Contributed by Martin Hunt (hunt@cygnus.com).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-/* #include "elf/d10v.h" */
-
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void d10v_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-
-
-/* Use REL instead of RELA to save space */
-#define USE_REL
-
-enum reloc_type
-{
-  R_D10V_NONE = 0,
-  R_D10V_10_PCREL_R,
-  R_D10V_10_PCREL_L,
-  R_D10V_16,
-  R_D10V_18,
-  R_D10V_18_PCREL,
-  R_D10V_32,
-  R_D10V_GNU_VTINHERIT,
-  R_D10V_GNU_VTENTRY,
-  R_D10V_max
-};
-
-static reloc_howto_type elf_d10v_howto_table[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_D10V_NONE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D10V_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An PC Relative 10-bit relocation, shifted by 2  */
-  /* right container */
-  HOWTO (R_D10V_10_PCREL_R,	/* type */
-	 2,	                /* rightshift */
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
-	 10,	                /* bitsize */
-	 true,	                /* pc_relative */
-	 0,	                /* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_D10V_10_PCREL_R",	/* name */
-	 false,	                /* partial_inplace */
-	 0xff,		        /* src_mask */
-	 0xff,   		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* An PC Relative 10-bit relocation, shifted by 2  */
-  /* left container */
-  HOWTO (R_D10V_10_PCREL_L,	/* type */
-	 2,	                /* rightshift */
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */
-	 10,	                /* bitsize */
-	 true,	                /* pc_relative */
-	 15,	                /* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_D10V_10_PCREL_L",	/* name */
-	 false,	                /* partial_inplace */
-	 0x07f8000,		        /* src_mask */
-	 0x07f8000,   		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 16 bit absolute relocation */
-  HOWTO (R_D10V_16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D10V_16",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An 18 bit absolute relocation, right shifted 2 */
-  HOWTO (R_D10V_18,		/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D10V_18",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A relative 18 bit relocation, right shifted by 2  */
-  HOWTO (R_D10V_18_PCREL,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D10V_18_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 32 bit absolute relocation */
-  HOWTO (R_D10V_32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D10V_32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_D10V_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_D10V_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_D10V_GNU_VTENTRY,     /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_D10V_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
- 
-};
-
-/* Map BFD reloc types to D10V ELF reloc types.  */
-
-struct d10v_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
- static const struct d10v_reloc_map d10v_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_D10V_NONE, },
-  { BFD_RELOC_D10V_10_PCREL_R, R_D10V_10_PCREL_R },
-  { BFD_RELOC_D10V_10_PCREL_L, R_D10V_10_PCREL_L },
-  { BFD_RELOC_16, R_D10V_16 },
-  { BFD_RELOC_D10V_18, R_D10V_18 },
-  { BFD_RELOC_D10V_18_PCREL, R_D10V_18_PCREL },
-  { BFD_RELOC_32, R_D10V_32 },
-  { BFD_RELOC_VTABLE_INHERIT, R_D10V_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY, R_D10V_GNU_VTENTRY },
-};
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (d10v_reloc_map) / sizeof (struct d10v_reloc_map);
-       i++)
-    {
-      if (d10v_reloc_map[i].bfd_reloc_val == code)
-	return &elf_d10v_howto_table[d10v_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Set the howto pointer for an D10V ELF reloc.  */
-
-static void
-d10v_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_D10V_max);
-  cache_ptr->howto = &elf_d10v_howto_table[r_type];
-}
-
-static asection *
-elf32_d10v_gc_mark_hook (abfd, info, rel, h, sym)
-       bfd *abfd;
-       struct bfd_link_info *info;
-       Elf_Internal_Rela *rel;
-       struct elf_link_hash_entry *h;
-       Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_D10V_GNU_VTINHERIT:
-      case R_D10V_GNU_VTENTRY:
-        break;
-
-      default:
-        switch (h->root.type)
-          {
-          case bfd_link_hash_defined:
-          case bfd_link_hash_defweak:
-            return h->root.u.def.section;
-
-          case bfd_link_hash_common:
-            return h->root.u.c.p->section;
-          }
-       }
-     }
-   else
-     {
-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
-  return NULL;
-}
-
-static boolean
-elf32_d10v_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  /* we don't use got and plt entries for d10v */
-  return true;
-}
-
-/* Look through the relocs for a section during the first phase.
-   Since we don't do .gots or .plts, we just need to consider the
-   virtual table relocs for gc.  */
- 
-static boolean
-elf32_d10v_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
- 
-  if (info->relocateable)
-    return true;
- 
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
- 
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      struct elf_link_hash_entry *h;
-      unsigned long r_symndx;
- 
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-        h = NULL;
-      else
-        h = sym_hashes[r_symndx - symtab_hdr->sh_info];
- 
-      switch (ELF32_R_TYPE (rel->r_info))
-        {
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_D10V_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
- 
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_D10V_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
-        }
-    }
- 
-  return true;
-}
-
-/* Relocate a D10V ELF section.  */
-static boolean
-elf32_d10v_relocate_section (output_bfd, info, input_bfd, input_section,
-			    contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  Elf_Internal_Rela *rel, *relend;
-  const char *name;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      struct elf_link_hash_entry *h;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      r_type = ELF32_R_TYPE (rel->r_info);
-
-      if (r_type == R_D10V_GNU_VTENTRY
-          || r_type == R_D10V_GNU_VTINHERIT )
-        continue;
-
-      howto = elf_d10v_howto_table + r_type;
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else
-	    {
-	      if (!((*info->callbacks->undefined_symbol)
-		    (info, h->root.root.string, input_bfd,
-		     input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      if (h != NULL)
-	name = h->root.root.string;
-      else
-	{
-	  name = (bfd_elf_string_from_elf_section
-		  (input_bfd, symtab_hdr->sh_link, sym->st_name));
-	  if (name == NULL || *name == '\0')
-	    name = bfd_section_name (input_bfd, sec);
-	}
-      
-      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-                                    contents, rel->r_offset,
-                                    relocation, rel->r_addend);
-
-      if (r != bfd_reloc_ok)
-	{
-	  const char * msg = (const char *) 0;
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      if (!((*info->callbacks->reloc_overflow)
-		    (info, name, howto->name, (bfd_vma) 0,
-		     input_bfd, input_section, rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_undefined:
-	      if (!((*info->callbacks->undefined_symbol)
-		    (info, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_outofrange:
-	      msg = _ ("internal error: out of range error");
-	      goto common_error;
-
-	    case bfd_reloc_notsupported:
-	      msg = _ ("internal error: unsupported relocation error");
-	      goto common_error;
-
-	    case bfd_reloc_dangerous:
-	      msg = _ ("internal error: dangerous error");
-	      goto common_error;
-
-	    default:
-	      msg = _ ("internal error: unknown error");
-	      /* fall through */
-
-	    common_error:
-	      if (!((*info->callbacks->warning)
-		    (info, msg, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-#define ELF_ARCH		bfd_arch_d10v
-#define ELF_MACHINE_CODE	EM_CYGNUS_D10V
-#define ELF_MAXPAGESIZE		0x1000
-
-#define TARGET_BIG_SYM          bfd_elf32_d10v_vec
-#define TARGET_BIG_NAME		"elf32-d10v"
-
-#define elf_info_to_howto	             0
-#define elf_info_to_howto_rel	             d10v_info_to_howto_rel
-#define elf_backend_object_p	             0
-#define elf_backend_final_write_processing   0
-#define elf_backend_gc_mark_hook             elf32_d10v_gc_mark_hook
-#define elf_backend_gc_sweep_hook            elf32_d10v_gc_sweep_hook
-#define elf_backend_check_relocs             elf32_d10v_check_relocs
-#define elf_backend_relocate_section         elf32_d10v_relocate_section
-#define elf_backend_can_gc_sections          1
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-d30v.c b/bfd/elf32-d30v.c
deleted file mode 100644
index 0b0e9e9e6cd..00000000000
--- a/bfd/elf32-d30v.c
+++ /dev/null
@@ -1,601 +0,0 @@
-/* D30V-specific support for 32-bit ELF
-   Copyright (C) 1997, 1998 Free Software Foundation, Inc.
-   Contributed by Martin Hunt (hunt@cygnus.com).
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void d30v_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-static void d30v_info_to_howto_rela
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static bfd_reloc_status_type bfd_elf_d30v_reloc PARAMS ((
-     bfd *abfd,
-     arelent *reloc_entry,
-     asymbol *symbol,
-     PTR data,
-     asection *input_section,
-     bfd *output_bfd,
-     char **error_message));
-static bfd_reloc_status_type bfd_elf_d30v_reloc_21 PARAMS ((
-     bfd *abfd,
-     arelent *reloc_entry,
-     asymbol *symbol,
-     PTR data,
-     asection *input_section,
-     bfd *output_bfd,
-     char **error_message));
-
-enum reloc_type
-{
-  R_D30V_NONE = 0,
-  R_D30V_6,
-  R_D30V_9_PCREL,
-  R_D30V_9_PCREL_R,
-  R_D30V_15,
-  R_D30V_15_PCREL,
-  R_D30V_15_PCREL_R,
-  R_D30V_21,
-  R_D30V_21_PCREL,
-  R_D30V_21_PCREL_R,
-  R_D30V_32,
-  R_D30V_32_PCREL,
-  R_D30V_32_NORMAL,
-  R_D30V_max
-};
-
-static reloc_howto_type elf_d30v_howto_table[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_D30V_NONE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 6 bit absolute relocation */
-  HOWTO (R_D30V_6,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_6",		/* name */
-	 false,			/* partial_inplace */
-	 0x3f,			/* src_mask */
-	 0x3f,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A relative 9 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_9_PCREL,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_9_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0x3f,			/* src_mask */
-	 0x3f,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 9 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_9_PCREL_R,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_9_PCREL_R",	/* name */
-	 false,			/* partial_inplace */
-	 0x3f,			/* src_mask */
-	 0x3f,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* An absolute 15 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_15,		/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_15",		/* name */
-	 false,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A relative 15 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_15_PCREL,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_15_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 15 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_15_PCREL_R,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_15_PCREL_R",	/* name */
-	 false,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* An absolute 21 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_21,		/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_21",		/* name */
-	 false,			/* partial_inplace */
-	 0x3ffff,		/* src_mask */
-	 0x3ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A relative 21 bit relocation, right shifted by 3 */
-  HOWTO (R_D30V_21_PCREL,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_21_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0x3ffff,		/* src_mask */
-	 0x3ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 21 bit relocation, right shifted by 3, in the Right container */
-  HOWTO (R_D30V_21_PCREL_R,	/* type */
-	 3,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 18,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc_21,	/* special_function */
-	 "R_D30V_21_PCREL_R",	/* name */
-	 false,			/* partial_inplace */
-	 0x3ffff,		/* src_mask */
-	 0x3ffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A D30V 32 bit absolute relocation */
-  HOWTO (R_D30V_32,		/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc,	/* special_function */
-	 "R_D30V_32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A relative 32 bit relocation */
-  HOWTO (R_D30V_32_PCREL,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_d30v_reloc,	/* special_function */
-	 "R_D30V_32_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A regular 32 bit absolute relocation */
-  HOWTO (R_D30V_32_NORMAL,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_D30V_32_NORMAL",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-};
-
-#define MIN32 (long long)0xffffffff80000000LL
-#define MAX32 0x7fffffffLL
-
-static bfd_reloc_status_type
-bfd_elf_d30v_reloc (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  long long relocation;
-  bfd_vma in1, in2, num;
-  bfd_vma tmp_addr = 0;
-  bfd_reloc_status_type r;
-  asection *reloc_target_output_section;
-  bfd_size_type addr = reloc_entry->address;
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  bfd_vma output_base = 0;
-  reloc_howto_type *howto = reloc_entry->howto;
-  int make_absolute = 0;
-
-  r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
-                             input_section, output_bfd, error_message);
-  if (r != bfd_reloc_continue)
-    return r; 
-
-  /* a hacked-up version of bfd_perform_reloc() follows */
- if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0
-      && output_bfd == (bfd *) NULL)
-    flag = bfd_reloc_undefined;
-
-  /* Is the address of the relocation really within the section?  */
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Work out which section the relocation is targetted at and the
-     initial relocation command value.  */
-
-  /* Get symbol value.  (Common symbols are special.)  */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  reloc_target_output_section = symbol->section->output_section;
-
-  /* Convert input-section-relative symbol value to absolute.  */
-  if (output_bfd)
-    output_base = 0;
-  else
-    output_base = reloc_target_output_section->vma;
-
-  relocation += output_base + symbol->section->output_offset;
-
-  /* Add in supplied addend.  */
-  relocation += reloc_entry->addend;
-
-  /* Here the variable relocation holds the final address of the
-     symbol we are relocating against, plus any addend.  */
-
-  if (howto->pc_relative == true)
-    {
-      tmp_addr = input_section->output_section->vma + input_section->output_offset 
-	+ reloc_entry->address;
-      relocation -= tmp_addr;
-    }
-  
-  if (output_bfd != (bfd *) NULL)
-    {
-      /* This is a partial relocation, and we want to apply the relocation
-	 to the reloc entry rather than the raw data. Modify the reloc
-	 inplace to reflect what we now know.  */
-      reloc_entry->addend = relocation;
-      reloc_entry->address += input_section->output_offset;
-      return flag;
-    }
-  else
-    reloc_entry->addend = 0;
-  
-  in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-  in2 = bfd_get_32 (abfd, (bfd_byte *) data + addr + 4);
-
-  /* extract the addend */
-  num = ((in2 & 0x3FFFF)
-	 | ((in2 & 0xFF00000) >> 2)
-	 | ((in1 & 0x3F) << 26));
-  in1 &= 0xFFFFFFC0;
-  in2 = 0x80000000;
-  
-  relocation += num;
-
-  if (howto->pc_relative == true && howto->bitsize == 32)
-    {
-      /* the D30V has a PC that doesn't wrap and PC-relative jumps */
-      /* are signed, so a PC-relative jump can'tbe more than +/- 2^31 byrtes */
-      /* if one exceeds this, change it to an absolute jump */
-      if (relocation > MAX32)
-	{
-	  relocation = (relocation + tmp_addr) & 0xffffffff;
-	  make_absolute = 1;
-	}
-      else if (relocation < MIN32)
-	{
-	  relocation = (relocation + tmp_addr) & 0xffffffff;
-	  make_absolute = 1;
-	}
-    }
-  
-  in1 |= (relocation >> 26) & 0x3F;	/* top 6 bits */
-  in2 |= ((relocation & 0x03FC0000) << 2);  /* next 8 bits */ 
-  in2 |= relocation & 0x0003FFFF;		/* bottom 18 bits */
-  
-  /* change a PC-relative instruction to its absolute equivalent */
-  /* with this simple hack */
-  if (make_absolute)
-    in1 |= 0x00100000;
-
-  bfd_put_32 (abfd, in1, (bfd_byte *) data + addr);
-  bfd_put_32 (abfd, in2, (bfd_byte *) data + addr + 4);
-  
-  return flag;
-}   
-
-
-static bfd_reloc_status_type
-bfd_elf_d30v_reloc_21 (abfd, reloc_entry, symbol, data, input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_vma in1, num;
-  bfd_reloc_status_type r;
-  asection *reloc_target_output_section;
-  bfd_size_type addr = reloc_entry->address;
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  bfd_vma output_base = 0;
-  reloc_howto_type *howto = reloc_entry->howto;
-  int mask, max;
-
-  r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
-                             input_section, output_bfd, error_message);
-  if (r != bfd_reloc_continue)
-    return r; 
-
-  /* a hacked-up version of bfd_perform_reloc() follows */
- if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0
-      && output_bfd == (bfd *) NULL)
-    flag = bfd_reloc_undefined;
-
-  /* Is the address of the relocation really within the section?  */
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Work out which section the relocation is targetted at and the
-     initial relocation command value.  */
-
-  /* Get symbol value.  (Common symbols are special.)  */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  reloc_target_output_section = symbol->section->output_section;
-
-  /* Convert input-section-relative symbol value to absolute.  */
-  if (output_bfd)
-    output_base = 0;
-  else
-    output_base = reloc_target_output_section->vma;
-
-  relocation += output_base + symbol->section->output_offset;
-
-  /* Add in supplied addend.  */
-  relocation += reloc_entry->addend;
-
-  /* Here the variable relocation holds the final address of the
-     symbol we are relocating against, plus any addend.  */
-
-  if (howto->pc_relative == true)
-    {
-      relocation -= input_section->output_section->vma + input_section->output_offset;
-      if (howto->pcrel_offset == true)
-	relocation -= reloc_entry->address;
-    }
-
-  if (output_bfd != (bfd *) NULL)
-    {
-      /* This is a partial relocation, and we want to apply the relocation
-	 to the reloc entry rather than the raw data. Modify the reloc
-	 inplace to reflect what we now know.  */
-      reloc_entry->addend = relocation;
-      reloc_entry->address += input_section->output_offset;
-      return flag;
-    }
-  else
-    reloc_entry->addend = 0;
-  
-  in1 = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-
-  mask =  (1 << howto->bitsize) - 1;
-  if (howto->bitsize == 6)
-    mask <<= 12;
-  max = (1 << (howto->bitsize + 2)) - 1;
-
-  /* extract the addend */
-  num = in1 & mask;  /* 18 bits */
-  if (howto->bitsize == 6)
-    num >>= 12;
-  num <<= 3; /* shift left 3 */
-  in1 &= ~mask;  /* mask out addend */
-
-  relocation += num;
-  if (howto->type == R_D30V_21_PCREL_R || howto->type == R_D30V_15_PCREL_R ||
-      howto->type == R_D30V_9_PCREL_R )
-    {
-      relocation += 4;
-    }
-
-  if ((int)relocation < 0 )
-    {
-      if (~(int)relocation > max)
-	flag = bfd_reloc_overflow;
-    }
-  else
-    {
-      if ((int)relocation > max)
-	flag = bfd_reloc_overflow;
-    }
-  relocation >>= 3; 
-  if (howto->bitsize == 6)
-    in1 |= ((relocation & (mask >> 12)) << 12);
-  else
-    in1 |= relocation & mask;
-
-  bfd_put_32 (abfd, in1, (bfd_byte *) data + addr);
-  
-  return flag;
-}   
-
-/* Map BFD reloc types to D30V ELF reloc types.  */
-
-struct d30v_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-
-static const struct d30v_reloc_map d30v_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_D30V_NONE, },
-  { BFD_RELOC_D30V_6, R_D30V_6 },
-  { BFD_RELOC_D30V_9_PCREL, R_D30V_9_PCREL },
-  { BFD_RELOC_D30V_9_PCREL_R, R_D30V_9_PCREL_R },
-  { BFD_RELOC_D30V_15, R_D30V_15 },
-  { BFD_RELOC_D30V_15_PCREL, R_D30V_15_PCREL },
-  { BFD_RELOC_D30V_15_PCREL_R, R_D30V_15_PCREL_R },
-  { BFD_RELOC_D30V_21, R_D30V_21 },
-  { BFD_RELOC_D30V_21_PCREL, R_D30V_21_PCREL },
-  { BFD_RELOC_D30V_21_PCREL_R, R_D30V_21_PCREL_R },
-  { BFD_RELOC_D30V_32, R_D30V_32 },
-  { BFD_RELOC_D30V_32_PCREL, R_D30V_32_PCREL },
-  { BFD_RELOC_32, R_D30V_32_NORMAL },
-};
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (d30v_reloc_map) / sizeof (struct d30v_reloc_map);
-       i++)
-    {
-      if (d30v_reloc_map[i].bfd_reloc_val == code)
-	return &elf_d30v_howto_table[d30v_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Set the howto pointer for an D30V ELF reloc (type REL).  */
-
-static void
-d30v_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_D30V_max);
-  cache_ptr->howto = &elf_d30v_howto_table[r_type];
-}
-
-/* Set the howto pointer for an D30V ELF reloc (type RELA).  */
-
-static void
-d30v_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_D30V_max);
-  cache_ptr->howto = &elf_d30v_howto_table[r_type];
-}
-
-#define ELF_ARCH		bfd_arch_d30v
-#define ELF_MACHINE_CODE	EM_CYGNUS_D30V
-#define ELF_MAXPAGESIZE		0x1000
-
-#define TARGET_BIG_SYM          bfd_elf32_d30v_vec
-#define TARGET_BIG_NAME		"elf32-d30v"
-
-#define elf_info_to_howto	d30v_info_to_howto_rela
-#define elf_info_to_howto_rel	d30v_info_to_howto_rel
-#define elf_backend_object_p	0
-#define elf_backend_final_write_processing	0
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-fr30.c b/bfd/elf32-fr30.c
deleted file mode 100644
index 7c8725f5562..00000000000
--- a/bfd/elf32-fr30.c
+++ /dev/null
@@ -1,811 +0,0 @@
-/* FR30-specific support for 32-bit ELF.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/fr30.h"
-
-/* Forward declarations.  */
-static bfd_reloc_status_type fr30_elf_i20_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type fr30_elf_i32_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type * fr30_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void fr30_info_to_howto_rela 
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static boolean fr30_elf_relocate_section 
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static bfd_reloc_status_type fr30_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, bfd_vma));
-static boolean fr30_elf_gc_sweep_hook
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
-static asection * fr30_elf_gc_mark_hook
-  PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Rela *, struct elf_link_hash_entry *, Elf_Internal_Sym *));
-
-static reloc_howto_type fr30_elf_howto_table [] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_FR30_NONE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_FR30_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An 8 bit absolute relocation.  */
-  HOWTO (R_FR30_8,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 4,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_FR30_8",		/* name */
-	 true,			/* partial_inplace */
-	 0x0000,		/* src_mask */
-	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 20 bit absolute relocation.  */
-  HOWTO (R_FR30_20,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 20,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 fr30_elf_i20_reloc,	/* special_function */
-	 "R_FR30_20",		/* name */
-	 true,			/* partial_inplace */
-	 0x00000000,		/* src_mask */
-	 0x00f0ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit absolute relocation.  */
-  HOWTO (R_FR30_32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_FR30_32",		/* name */
-	 true,			/* partial_inplace */
-	 0x00000000,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit into 48 bits absolute relocation.  */
-  HOWTO (R_FR30_48,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 fr30_elf_i32_reloc,	/* special_function */
-	 "R_FR30_48",		/* name */
-	 true,			/* partial_inplace */
-	 0x00000000,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 6 bit absolute relocation.  */
-  HOWTO (R_FR30_6_IN_4,		/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 false,			/* pc_relative */
-	 4,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_FR30_6_IN_4",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000,		/* src_mask */
-	 0x00f0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-  
-  /* An 8 bit absolute relocation.  */
-  HOWTO (R_FR30_8_IN_8,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 4,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,/* special_function */
-	 "R_FR30_8_IN_8",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000,		/* src_mask */
-	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-  
-  /* A 9 bit absolute relocation.  */
-  HOWTO (R_FR30_9_IN_8,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 9,			/* bitsize */
-	 false,			/* pc_relative */
-	 4,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,/* special_function */
-	 "R_FR30_9_IN_8",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000,		/* src_mask */
-	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-  
-  /* A 10 bit absolute relocation.  */
-  HOWTO (R_FR30_10_IN_8,	/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 10,			/* bitsize */
-	 false,			/* pc_relative */
-	 4,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,/* special_function */
-	 "R_FR30_10_IN_8",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000,		/* src_mask */
-	 0x0ff0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A PC relative 9 bit relocation, right shifted by 1.  */
-  HOWTO (R_FR30_9_PCREL,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 9,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_FR30_9_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0x0000,		/* src_mask */
-	 0x00ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A PC relative 12 bit relocation, right shifted by 1.  */
-  HOWTO (R_FR30_12_PCREL,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc, /* special_function */
-	 "R_FR30_12_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0x0000,		/* src_mask */
-	 0x07ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_FR30_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_FR30_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_FR30_GNU_VTENTRY,     /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_FR30_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
- 
-};
-
-/* Utility to actually perform an R_FR30_20 reloc.  */
-
-static bfd_reloc_status_type
-fr30_elf_i20_reloc (abfd, reloc_entry, symbol, data,
-		    input_section, output_bfd, error_message)
-     bfd *      abfd;
-     arelent *  reloc_entry;
-     asymbol *  symbol;
-     PTR        data;
-     asection * input_section;
-     bfd *      output_bfd;
-     char **    error_message;
-{
-  bfd_vma       relocation;
-  unsigned long x;
-  
-  /* This part is from bfd_elf_generic_reloc.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! reloc_entry->howto->partial_inplace
-	  || reloc_entry->addend == 0))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != NULL)
-    /* FIXME: See bfd_perform_relocation.  Is this right?  */
-    return bfd_reloc_ok;
-
-  relocation =
-    symbol->value
-    + symbol->section->output_section->vma
-    + symbol->section->output_offset
-    + reloc_entry->addend;
-
-  if (relocation > ((1U << 20) - 1))
-    return bfd_reloc_overflow;
-
-  x = bfd_get_32 (abfd, data + reloc_entry->address);
-  x = (x & 0xff0f0000) | (relocation & 0x0000ffff) | ((relocation & 0x000f0000) << 4);
-  bfd_put_32 (abfd, x, data + reloc_entry->address);
-
-  return bfd_reloc_ok;
-}
-
-
-/* Utility to actually perform a R_FR30_48 reloc.  */
-
-static bfd_reloc_status_type
-fr30_elf_i32_reloc (abfd, reloc_entry, symbol, data,
-		    input_section, output_bfd, error_message)
-     bfd *      abfd;
-     arelent *  reloc_entry;
-     asymbol *  symbol;
-     PTR        data;
-     asection * input_section;
-     bfd *      output_bfd;
-     char **    error_message;
-{
-  bfd_vma       relocation;
-
-  /* This part is from bfd_elf_generic_reloc.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! reloc_entry->howto->partial_inplace
-	  || reloc_entry->addend == 0))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != NULL)
-    /* FIXME: See bfd_perform_relocation.  Is this right?  */
-    return bfd_reloc_ok;
-
-  relocation =
-    symbol->value
-    + symbol->section->output_section->vma
-    + symbol->section->output_offset
-    + reloc_entry->addend;
-
-  bfd_put_32 (abfd, relocation, data + reloc_entry->address + 2);
-
-  return bfd_reloc_ok;
-}
-
-/* Map BFD reloc types to FR30 ELF reloc types.  */
-
-struct fr30_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned int fr30_reloc_val;
-};
-
-static const struct fr30_reloc_map fr30_reloc_map [] =
-{
-  { BFD_RELOC_NONE,           R_FR30_NONE },
-  { BFD_RELOC_8,              R_FR30_8 },
-  { BFD_RELOC_FR30_20,        R_FR30_20 },
-  { BFD_RELOC_32,             R_FR30_32 },
-  { BFD_RELOC_FR30_48,        R_FR30_48 },
-  { BFD_RELOC_FR30_6_IN_4,    R_FR30_6_IN_4 },
-  { BFD_RELOC_FR30_8_IN_8,    R_FR30_8_IN_8 },
-  { BFD_RELOC_FR30_9_IN_8,    R_FR30_9_IN_8 },
-  { BFD_RELOC_FR30_10_IN_8,   R_FR30_10_IN_8 },
-  { BFD_RELOC_FR30_9_PCREL,   R_FR30_9_PCREL },
-  { BFD_RELOC_FR30_12_PCREL,  R_FR30_12_PCREL },
-  { BFD_RELOC_VTABLE_INHERIT, R_FR30_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY,   R_FR30_GNU_VTENTRY },
-};
-
-static reloc_howto_type *
-fr30_reloc_type_lookup (abfd, code)
-     bfd * abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = sizeof (fr30_reloc_map) / sizeof (fr30_reloc_map[0]);
-       --i;)
-    if (fr30_reloc_map [i].bfd_reloc_val == code)
-      return & fr30_elf_howto_table [fr30_reloc_map[i].fr30_reloc_val];
-  
-  return NULL;
-}
-
-/* Set the howto pointer for an FR30 ELF reloc.  */
-
-static void
-fr30_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd * abfd;
-     arelent * cache_ptr;
-     Elf32_Internal_Rela * dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_FR30_max);
-  cache_ptr->howto = & fr30_elf_howto_table [r_type];
-}
-
-/* Perform a single relocation.  By default we use the standard BFD
-   routines, but a few relocs, we have to do them ourselves.  */
-
-static bfd_reloc_status_type
-fr30_final_link_relocate (howto, input_bfd, input_section, contents, rel, relocation)
-     reloc_howto_type *  howto;
-     bfd *               input_bfd;
-     asection *          input_section;
-     bfd_byte *          contents;
-     Elf_Internal_Rela * rel;
-     bfd_vma             relocation;
-{
-  bfd_reloc_status_type r = bfd_reloc_ok;
-  bfd_vma               x;
-  bfd_signed_vma	srel;
-  
-  switch (howto->type)
-    {
-    case R_FR30_20:
-      contents   += rel->r_offset;
-      relocation += rel->r_addend;
-
-      if (relocation > ((1 << 20) - 1))
-	return bfd_reloc_overflow;
-      
-      x = bfd_get_32 (input_bfd, contents);
-      x = (x & 0xff0f0000) | (relocation & 0x0000ffff) | ((relocation & 0x000f0000) << 4);
-      bfd_put_32 (input_bfd, x, contents);
-      break;
-      
-    case R_FR30_48:
-      contents   += rel->r_offset + 2;
-      relocation += rel->r_addend;
-      bfd_put_32 (input_bfd, relocation, contents);
-      break;
-
-    case R_FR30_9_PCREL:
-      contents   += rel->r_offset + 1;
-      srel = (bfd_signed_vma) relocation;
-      srel += rel->r_addend;
-      srel -= rel->r_offset;
-      srel -= 2;  /* Branch instructions add 2 to the PC... */
-      srel -= (input_section->output_section->vma +
-		     input_section->output_offset);
-      
-      if (srel & 1)
-	return bfd_reloc_outofrange;
-      if (srel > ((1 << 8) - 1) || (srel < - (1 << 8)))
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (input_bfd, srel >> 1, contents);
-      break;
-
-    case R_FR30_12_PCREL:
-      contents   += rel->r_offset;
-      srel = (bfd_signed_vma) relocation;
-      srel += rel->r_addend;
-      srel -= rel->r_offset;
-      srel -= 2; /* Branch instructions add 2 to the PC... */
-      srel -= (input_section->output_section->vma +
-		     input_section->output_offset);
-      
-      if (srel & 1)
-	return bfd_reloc_outofrange;
-      if (srel > ((1 << 11) - 1) || (srel < - (1 << 11)))
-	  return bfd_reloc_overflow;
-      
-      x = bfd_get_16 (input_bfd, contents);
-      x = (x & 0xf800) | ((srel >> 1) & 0x7ff);
-      bfd_put_16 (input_bfd, x, contents);
-      break;
-
-    default:
-      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-				    contents, rel->r_offset,
-				    relocation, rel->r_addend);
-    }
-
-  return r;
-}
-
-
-/* Relocate an FR30 ELF section.
-   There is some attempt to make this function usable for many architectures,
-   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
-   if only to serve as a learning tool.
-
-   The RELOCATE_SECTION function is called by the new ELF backend linker
-   to handle the relocations for a section.
-
-   The relocs are always passed as Rela structures; if the section
-   actually uses Rel structures, the r_addend field will always be
-   zero.
-
-   This function is responsible for adjusting the section contents as
-   necessary, and (if using Rela relocs and generating a relocateable
-   output file) adjusting the reloc addend as necessary.
-
-   This function does not have to worry about setting the reloc
-   address or the reloc symbol index.
-
-   LOCAL_SYMS is a pointer to the swapped in local symbols.
-
-   LOCAL_SECTIONS is an array giving the section in the input file
-   corresponding to the st_shndx field of each local symbol.
-
-   The global hash table entry for the global symbols can be found
-   via elf_sym_hashes (input_bfd).
-
-   When generating relocateable output, this function must handle
-   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
-   going to be the section symbol corresponding to the output
-   section, which means that the addend must be adjusted
-   accordingly.  */
-
-static boolean
-fr30_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, local_syms, local_sections)
-     bfd *                   output_bfd;
-     struct bfd_link_info *  info;
-     bfd *                   input_bfd;
-     asection *              input_section;
-     bfd_byte *              contents;
-     Elf_Internal_Rela *     relocs;
-     Elf_Internal_Sym *      local_syms;
-     asection **             local_sections;
-{
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
-
-  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-  relend     = relocs + input_section->reloc_count;
-
-  for (rel = relocs; rel < relend; rel ++)
-    {
-      reloc_howto_type *           howto;
-      unsigned long                r_symndx;
-      Elf_Internal_Sym *           sym;
-      asection *                   sec;
-      struct elf_link_hash_entry * h;
-      bfd_vma                      relocation;
-      bfd_reloc_status_type        r;
-      const char *                 name = NULL;
-      int                          r_type;
-      
-      r_type = ELF32_R_TYPE (rel->r_info);
-      
-      if (   r_type == R_FR30_GNU_VTINHERIT
-	  || r_type == R_FR30_GNU_VTENTRY)
-	continue;
-      
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-             anything, unless the reloc is against a section symbol,
-             in which case we have to adjust according to where the
-             section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections [r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      howto  = fr30_elf_howto_table + ELF32_R_TYPE (rel->r_info);
-      h      = NULL;
-      sym    = NULL;
-      sec    = NULL;
-      
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections [r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	  
-	  name = bfd_elf_string_from_elf_section
-	    (input_bfd, symtab_hdr->sh_link, sym->st_name);
-	  name = (name == NULL) ? bfd_section_name (input_bfd, sec) : name;
-#if 0
-	  fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n",
-		   sec->name, name, sym->st_name,
-		   sec->output_section->vma, sec->output_offset,
-		   sym->st_value, rel->r_addend);
-#endif
-	}
-      else
-	{
-	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
-	  
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
-	  name = h->root.root.string;
-	  
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-#if 0
-	      fprintf (stderr,
-		       "defined: sec: %s, name: %s, value: %x + %x + %x gives: %x\n",
-		       sec->name, name, h->root.u.def.value,
-		       sec->output_section->vma, sec->output_offset, relocation);
-#endif
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    {
-#if 0
-	      fprintf (stderr, "undefined: sec: %s, name: %s\n",
-		       sec->name, name);
-#endif
-	      relocation = 0;
-	    }
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-#if 0
-	      fprintf (stderr, "unknown: name: %s\n", name);
-#endif
-	      relocation = 0;
-	    }
-	}
-      
-      r = fr30_final_link_relocate (howto, input_bfd, input_section,
-				     contents, rel, relocation);
-
-      if (r != bfd_reloc_ok)
-	{
-	  const char * msg = (const char *) NULL;
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      r = info->callbacks->reloc_overflow
-		(info, name, howto->name, (bfd_vma) 0,
-		 input_bfd, input_section, rel->r_offset);
-	      break;
-	      
-	    case bfd_reloc_undefined:
-	      r = info->callbacks->undefined_symbol
-		(info, name, input_bfd, input_section, rel->r_offset);
-	      break;
-	      
-	    case bfd_reloc_outofrange:
-	      msg = _("internal error: out of range error");
-	      break;
-
-	    case bfd_reloc_notsupported:
-	      msg = _("internal error: unsupported relocation error");
-	      break;
-
-	    case bfd_reloc_dangerous:
-	      msg = _("internal error: dangerous relocation");
-	      break;
-
-	    default:
-	      msg = _("internal error: unknown error");
-	      break;
-	    }
-
-	  if (msg)
-	    r = info->callbacks->warning
-	      (info, msg, name, input_bfd, input_section, rel->r_offset);
-
-	  if (! r)
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* Return the section that should be marked against GC for a given
-   relocation.  */
-
-static asection *
-fr30_elf_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *                        abfd;
-     struct bfd_link_info *       info;
-     Elf_Internal_Rela *          rel;
-     struct elf_link_hash_entry * h;
-     Elf_Internal_Sym *           sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_FR30_GNU_VTINHERIT:
-	case R_FR30_GNU_VTENTRY:
-	  break;
-
-	default:
-	  switch (h->root.type)
-	    {
-	    case bfd_link_hash_defined:
-	    case bfd_link_hash_defweak:
-	      return h->root.u.def.section;
-
-	    case bfd_link_hash_common:
-	      return h->root.u.c.p->section;
-	    }
-	}
-    }
-  else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-		&& sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
-
-  return NULL;
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-
-static boolean
-fr30_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *                     abfd;
-     struct bfd_link_info *    info;
-     asection *                sec;
-     const Elf_Internal_Rela * relocs;
-{
-  return true;
-}
-
-/* Look through the relocs for a section during the first phase.
-   Since we don't do .gots or .plts, we just need to consider the
-   virtual table relocs for gc.  */
- 
-static boolean
-fr30_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
- 
-  if (info->relocateable)
-    return true;
- 
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
- 
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      struct elf_link_hash_entry *h;
-      unsigned long r_symndx;
- 
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-        h = NULL;
-      else
-        h = sym_hashes[r_symndx - symtab_hdr->sh_info];
- 
-      switch (ELF32_R_TYPE (rel->r_info))
-        {
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_FR30_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
- 
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_FR30_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
-          break;
-        }
-    }
- 
-  return true;
-}
-
-#define ELF_ARCH		bfd_arch_fr30
-#define ELF_MACHINE_CODE	EM_CYGNUS_FR30
-#define ELF_MAXPAGESIZE		0x1000
-
-#define TARGET_BIG_SYM          bfd_elf32_fr30_vec
-#define TARGET_BIG_NAME		"elf32-fr30"
-
-#define elf_info_to_howto_rel			NULL
-#define elf_info_to_howto			fr30_info_to_howto_rela
-#define elf_backend_relocate_section		fr30_elf_relocate_section
-#define elf_backend_gc_mark_hook		fr30_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook		fr30_elf_gc_sweep_hook
-#define elf_backend_check_relocs                fr30_elf_check_relocs
-
-#define elf_backend_can_gc_sections		1
-
-#define bfd_elf32_bfd_reloc_type_lookup		fr30_reloc_type_lookup
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-gen.c b/bfd/elf32-gen.c
deleted file mode 100644
index a4d3cac0850..00000000000
--- a/bfd/elf32-gen.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Generic support for 32-bit ELF
-   Copyright 1993, 1995, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-/* This does not include any relocation information, but should be
-   good enough for GDB or objdump to read the file.  */
-
-static reloc_howto_type dummy =
-  HOWTO (0,			/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "UNKNOWN",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
-
-static void
-elf_generic_info_to_howto (abfd, bfd_reloc, elf_reloc)
-     bfd *abfd;
-     arelent *bfd_reloc;
-     Elf32_Internal_Rela *elf_reloc;
-{
-  bfd_reloc->howto = &dummy;
-}
-
-static void
-elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
-     bfd *abfd;
-     arelent *bfd_reloc;
-     Elf32_Internal_Rel *elf_reloc;
-{
-  bfd_reloc->howto = &dummy;
-}
-
-#define TARGET_LITTLE_SYM		bfd_elf32_little_generic_vec
-#define TARGET_LITTLE_NAME		"elf32-little"
-#define TARGET_BIG_SYM			bfd_elf32_big_generic_vec
-#define TARGET_BIG_NAME			"elf32-big"
-#define ELF_ARCH			bfd_arch_unknown
-#define ELF_MACHINE_CODE		EM_NONE
-#define bfd_elf32_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
-#define elf_info_to_howto		elf_generic_info_to_howto
-#define elf_info_to_howto_rel		elf_generic_info_to_howto_rel
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
deleted file mode 100644
index 6bd7f67a0ab..00000000000
--- a/bfd/elf32-hppa.c
+++ /dev/null
@@ -1,2988 +0,0 @@
-/* BFD back-end for HP PA-RISC ELF files.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997
-   Free Software Foundation, Inc.
-
-   Written by
-
-	Center for Software Science
-	Department of Computer Science
-	University of Utah
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-/* The internal type of a symbol table extension entry.  */
-typedef unsigned long symext_entryS;
-
-/* The external type of a symbol table extension entry.  */
-#define ELF32_PARISC_SX_SIZE (4)
-#define ELF32_PARISC_SX_GET(bfd, addr) bfd_h_get_32 ((bfd), (addr))
-#define ELF32_PARISC_SX_PUT(bfd, val, addr) \
-  bfd_h_put_32 ((bfd), (val), (addr))
-
-/* HPPA symbol table extension entry types */
-enum elf32_hppa_symextn_types
-{
-  PARISC_SXT_NULL,
-  PARISC_SXT_SYMNDX,
-  PARISC_SXT_ARG_RELOC,
-};
-
-/* These macros compose and decompose the value of a symextn entry:
-
-   entry_type = ELF32_PARISC_SX_TYPE(word);
-   entry_value = ELF32_PARISC_SX_VAL(word);
-   word = ELF32_PARISC_SX_WORD(type,val);  */
-
-#define ELF32_PARISC_SX_TYPE(p)		((p) >> 24)
-#define ELF32_PARISC_SX_VAL(p)		((p) & 0xFFFFFF)
-#define ELF32_PARISC_SX_WORD(type,val)	(((type) << 24) + (val & 0xFFFFFF))
-
-/* The following was added facilitate implementation of the .hppa_symextn
-   section.  This section is built after the symbol table is built in the
-   elf_write_object_contents routine (called from bfd_close).  It is built
-   so late because it requires information that is not known until
-   the symbol and string table sections have been allocated, and
-   the symbol table has been built. */
-
-#define SYMEXTN_SECTION_NAME ".PARISC.symext"
-
-struct symext_chain
-  {
-    symext_entryS entry;
-    struct symext_chain *next;
-  };
-
-typedef struct symext_chain symext_chainS;
-
-/* We use three different hash tables to hold information for
-   linking PA ELF objects.
-
-   The first is the elf32_hppa_link_hash_table which is derived
-   from the standard ELF linker hash table.  We use this as a place to
-   attach other hash tables and static information.
-
-   The second is the stub hash table which is derived from the
-   base BFD hash table.  The stub hash table holds the information
-   necessary to build the linker stubs during a link.
-
-   The last hash table keeps track of argument location information needed
-   to build hash tables.  Each function with nonzero argument location
-   bits will have an entry in this table.  */
-
-/* Hash table for linker stubs.  */
-
-struct elf32_hppa_stub_hash_entry
-{
-  /* Base hash table entry structure, we can get the name of the stub
-     (and thus know exactly what actions it performs) from the base
-     hash table entry.  */
-  struct bfd_hash_entry root;
-
-  /* Offset of the beginning of this stub.  */
-  bfd_vma offset;
-
-  /* Given the symbol's value and its section we can determine its final
-     value when building the stubs (so the stub knows where to jump.  */
-  symvalue target_value;
-  asection *target_section;
-};
-
-struct elf32_hppa_stub_hash_table
-{
-  /* The hash table itself.  */
-  struct bfd_hash_table root;
-
-  /* The stub BFD.  */
-  bfd *stub_bfd;
-
-  /* Where to place the next stub.  */
-  bfd_byte *location;
-
-  /* Current offset in the stub section.  */
-  unsigned int offset;
-
-};
-
-/* Hash table for argument location information.  */
-
-struct elf32_hppa_args_hash_entry
-{
-  /* Base hash table entry structure.  */
-  struct bfd_hash_entry root;
-
-  /* The argument location bits for this entry.  */
-  int arg_bits;
-};
-
-struct elf32_hppa_args_hash_table
-{
-  /* The hash table itself.  */
-  struct bfd_hash_table root;
-};
-
-struct elf32_hppa_link_hash_entry
-{
-  struct elf_link_hash_entry root;
-};
-
-struct elf32_hppa_link_hash_table
-{
-  /* The main hash table.  */
-  struct elf_link_hash_table root;
-
-  /* The stub hash table.  */
-  struct elf32_hppa_stub_hash_table *stub_hash_table;
-
-  /* The argument relocation bits hash table.  */
-  struct elf32_hppa_args_hash_table *args_hash_table;
-
-  /* A count of the number of output symbols.  */
-  unsigned int output_symbol_count;
-
-  /* Stuff so we can handle DP relative relocations.  */
-  long global_value;
-  int global_sym_defined;
-};
-
-/* FIXME.  */
-#define ARGUMENTS	0
-#define RETURN_VALUE	1
-
-/* The various argument relocations that may be performed.  */
-typedef enum
-{
-  /* No relocation.  */
-  NO,
-  /* Relocate 32 bits from GR to FP register.  */
-  GF,
-  /* Relocate 64 bits from a GR pair to FP pair.  */
-  GD,
-  /* Relocate 32 bits from FP to GR.  */
-  FG,
-  /* Relocate 64 bits from FP pair to GR pair.  */
-  DG,
-} arg_reloc_type;
-
-/* What is being relocated (eg which argument or the return value).  */
-typedef enum
-{
-  ARG0, ARG1, ARG2, ARG3, RET,
-} arg_reloc_location;
-
-
-/* ELF32/HPPA relocation support
-
-	This file contains ELF32/HPPA relocation support as specified
-	in the Stratus FTX/Golf Object File Format (SED-1762) dated
-	February 1994.  */
-
-#include "elf32-hppa.h"
-#include "hppa_stubs.h"
-
-static bfd_reloc_status_type hppa_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-
-static unsigned long hppa_elf_relocate_insn
-  PARAMS ((bfd *, asection *, unsigned long, unsigned long, long,
-	   long, unsigned long, unsigned long, unsigned long));
-
-static bfd_reloc_status_type hppa_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd*, char **));
-
-static reloc_howto_type * elf_hppa_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-
-static boolean elf32_hppa_set_section_contents
-  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
-
-static void elf32_hppa_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-
-static boolean elf32_hppa_backend_symbol_table_processing
-  PARAMS ((bfd *, elf_symbol_type *, unsigned int));
-
-static void elf32_hppa_backend_begin_write_processing
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-static void elf32_hppa_backend_final_write_processing
-  PARAMS ((bfd *, boolean));
-
-static void add_entry_to_symext_chain
-  PARAMS ((bfd *, unsigned int, unsigned int, symext_chainS **,
-	   symext_chainS **));
-
-static void
-elf_hppa_tc_make_sections PARAMS ((bfd *, symext_chainS *));
-
-static boolean hppa_elf_is_local_label_name PARAMS ((bfd *, const char *));
-
-static boolean elf32_hppa_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
-	   const char **, flagword *, asection **, bfd_vma *));
-
-static bfd_reloc_status_type elf32_hppa_bfd_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *,
-	   bfd_byte *, bfd_vma, bfd_vma, bfd_vma, struct bfd_link_info *,
-	   asection *, const char *, int));
-
-static struct bfd_link_hash_table *elf32_hppa_link_hash_table_create
-  PARAMS ((bfd *));
-
-static struct bfd_hash_entry *
-elf32_hppa_stub_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-
-static struct bfd_hash_entry *
-elf32_hppa_args_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-
-static boolean
-elf32_hppa_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *,
-	   bfd_byte *, Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-
-static boolean
-elf32_hppa_stub_hash_table_init
-  PARAMS ((struct elf32_hppa_stub_hash_table *, bfd *,
-	   struct bfd_hash_entry *(*) PARAMS ((struct bfd_hash_entry *,
-					       struct bfd_hash_table *,
-					       const char *))));
-
-static boolean
-elf32_hppa_build_one_stub PARAMS ((struct bfd_hash_entry *, PTR));
-
-static boolean
-elf32_hppa_read_symext_info
-  PARAMS ((bfd *, Elf_Internal_Shdr *, struct elf32_hppa_args_hash_table *,
-	   Elf_Internal_Sym *));
-
-static unsigned int elf32_hppa_size_of_stub
-  PARAMS ((unsigned int, unsigned int, bfd_vma, bfd_vma, const char *));
-
-static boolean elf32_hppa_arg_reloc_needed
-  PARAMS ((unsigned int, unsigned int, arg_reloc_type []));
-
-static void elf32_hppa_name_of_stub
-  PARAMS ((unsigned int, unsigned int, bfd_vma, bfd_vma, char *));
-
-static boolean elf32_hppa_size_symext PARAMS ((struct bfd_hash_entry *, PTR));
-
-static boolean elf32_hppa_link_output_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const char *,
-	   Elf_Internal_Sym *, asection *));
-
-/* ELF/PA relocation howto entries.  */
-
-static reloc_howto_type elf_hppa_howto_table[ELF_HOWTO_TABLE_SIZE] =
-{
-  {R_PARISC_NONE, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_NONE"},
-  /* The values in DIR32 are to placate the check in
-     _bfd_stab_section_find_nearest_line.  */
-  {R_PARISC_DIR32, 0, 2, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DIR32", false, 0, 0xffffffff, false},
-  {R_PARISC_DIR21L, 0, 0, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DIR21L"},
-  {R_PARISC_DIR17R, 0, 0, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DIR17R"},
-  {R_PARISC_DIR17F, 0, 0, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DIR17F"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DIR14R, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DIR14R"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_PCREL21L, 0, 0, 21, true, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PCREL21L"},
-  {R_PARISC_PCREL17R, 0, 0, 17, true, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PCREL17R"},
-  {R_PARISC_PCREL17F, 0, 0, 17, true, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PCREL17F"},
-  {R_PARISC_PCREL17C, 0, 0, 17, true, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PCREL17C"},
-  {R_PARISC_PCREL14R, 0, 0, 14, true, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PCREL14R"},
-  {R_PARISC_PCREL14F, 0, 0, 14, true, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PCREL14F"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DPREL21L, 0, 0, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DPREL21L"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DPREL14R, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DPREL14R"},
-  {R_PARISC_DPREL14F, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DPREL14F"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DLTREL21L, 0, 0, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DLTREL21L"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DLTREL14R, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DLTREL14R"},
-  {R_PARISC_DLTREL14F, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DLTREL14F"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DLTIND21L, 0, 0, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DLTIND21L"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DLTIND14R, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DLTIND14R"},
-  {R_PARISC_DLTIND14F, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_DLTIND14F"},
-
-  {R_PARISC_SETBASE, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_SETBASE"},
-  {R_PARISC_BASEREL32, 0, 0, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_BASEREL32"},
-  {R_PARISC_BASEREL21L, 0, 0, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_BASEREL21L"},
-  {R_PARISC_BASEREL17R, 0, 0, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_BASEREL17R"},
-  {R_PARISC_BASEREL17F, 0, 0, 17, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_BASEREL17F"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_BASEREL14R, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_BASEREL14R"},
-  {R_PARISC_BASEREL14F, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_BASEREL14F"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_TEXTREL32, 0, 0, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_TEXTREL32"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_DATAREL32, 0, 0, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_PLABEL32, 0, 0, 32, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PLABEL32"},
-  {R_PARISC_PLABEL21L, 0, 0, 21, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PLABEL21L"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_PLABEL14R, 0, 0, 14, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PLABEL14R"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_PLTIND21L, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PLTIND21L"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_UNIMPLEMENTED"},
-  {R_PARISC_PLTIND14R, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PLTIND14R"},
-  {R_PARISC_PLTIND14F, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_PLTIND14F"},
-
-
-  {R_PARISC_COPY, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_COPY"},
-  {R_PARISC_GLOB_DAT, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_GLOB_DAT"},
-  {R_PARISC_JMP_SLOT, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_JMP_SLOT"},
-  {R_PARISC_RELATIVE, 0, 0, 0, false, 0, complain_overflow_bitfield, hppa_elf_reloc, "R_PARISC_RELATIVE"},
-
-  {R_PARISC_UNIMPLEMENTED, 0, 0, 0, false, 0, complain_overflow_dont, NULL, "R_PARISC_UNIMPLEMENTED"},
-};
-
-/* Where (what register type) is an argument comming from?  */
-typedef enum
-{
-  AR_NO,
-  AR_GR,
-  AR_FR,
-  AR_FU,
-  AR_FPDBL1,
-  AR_FPDBL2,
-} arg_location;
-
-/* Horizontal represents the callee's argument location information,
-   vertical represents caller's argument location information.  Value at a
-   particular X,Y location represents what (if any) argument relocation
-   needs to be performed to make caller and callee agree.  */
-
-static CONST arg_reloc_type arg_mismatches[6][6] =
-{
-  {NO, NO, NO, NO, NO, NO},
-  {NO, NO, GF, NO, GD, NO},
-  {NO, FG, NO, NO, NO, NO},
-  {NO, NO, NO, NO, NO, NO},
-  {NO, DG, NO, NO, NO, NO},
-  {NO, DG, NO, NO, NO, NO},
-};
-
-/* Likewise, but reversed for the return value.  */
-static CONST arg_reloc_type ret_mismatches[6][6] =
-{
-  {NO, NO, NO, NO, NO, NO},
-  {NO, NO, FG, NO, DG, NO},
-  {NO, GF, NO, NO, NO, NO},
-  {NO, NO, NO, NO, NO, NO},
-  {NO, GD, NO, NO, NO, NO},
-  {NO, GD, NO, NO, NO, NO},
-};
-
-/* Misc static crud for symbol extension records.  */
-static symext_chainS *symext_rootP;
-static symext_chainS *symext_lastP;
-static bfd_size_type symext_chain_size;
-
-/* FIXME: We should be able to try this static variable!  */
-static bfd_byte *symextn_contents;
-
-
-/* For linker stub hash tables.  */
-#define elf32_hppa_stub_hash_lookup(table, string, create, copy) \
-  ((struct elf32_hppa_stub_hash_entry *) \
-   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-
-#define elf32_hppa_stub_hash_traverse(table, func, info) \
-  (bfd_hash_traverse \
-   (&(table)->root, \
-    (boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) (func), \
-    (info)))
-
-/* For linker args hash tables.  */
-#define elf32_hppa_args_hash_lookup(table, string, create, copy) \
-  ((struct elf32_hppa_args_hash_entry *) \
-   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-
-#define elf32_hppa_args_hash_traverse(table, func, info) \
-  (bfd_hash_traverse \
-   (&(table)->root, \
-    (boolean (*) PARAMS ((struct bfd_hash_entry *, PTR))) (func), \
-    (info)))
-
-#define elf32_hppa_args_hash_table_init(table, newfunc) \
-  (bfd_hash_table_init \
-   (&(table)->root, \
-    (struct bfd_hash_entry *(*) PARAMS ((struct bfd_hash_entry *, \
-					 struct bfd_hash_table *, \
-					 const char *))) (newfunc)))
-
-/* For HPPA linker hash table.  */
-
-#define elf32_hppa_link_hash_lookup(table, string, create, copy, follow)\
-  ((struct elf32_hppa_link_hash_entry *)				\
-   elf_link_hash_lookup (&(table)->root, (string), (create),		\
-			 (copy), (follow)))
-
-#define elf32_hppa_link_hash_traverse(table, func, info)		\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the PA ELF linker hash table from a link_info structure.  */
-
-#define elf32_hppa_hash_table(p) \
-  ((struct elf32_hppa_link_hash_table *) ((p)->hash))
-
-
-/* Extract specific argument location bits for WHICH from
-   the full argument location in AR.  */
-#define EXTRACT_ARBITS(ar, which) ((ar) >> (8 - ((which) * 2))) & 3
-
-/* Assorted hash table functions.  */
-
-/* Initialize an entry in the stub hash table.  */
-
-static struct bfd_hash_entry *
-elf32_hppa_stub_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct elf32_hppa_stub_hash_entry *ret;
-
-  ret = (struct elf32_hppa_stub_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == NULL)
-    ret = ((struct elf32_hppa_stub_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct elf32_hppa_stub_hash_entry)));
-  if (ret == NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct elf32_hppa_stub_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
-  if (ret)
-    {
-      /* Initialize the local fields.  */
-      ret->offset = 0;
-      ret->target_value = 0;
-      ret->target_section = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize a stub hash table.  */
-
-static boolean
-elf32_hppa_stub_hash_table_init (table, stub_bfd, newfunc)
-     struct elf32_hppa_stub_hash_table *table;
-     bfd *stub_bfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  table->offset = 0;
-  table->location = 0;
-  table->stub_bfd = stub_bfd;
-  return (bfd_hash_table_init (&table->root, newfunc));
-}
-
-/* Initialize an entry in the argument location hash table.  */
-
-static struct bfd_hash_entry *
-elf32_hppa_args_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct elf32_hppa_args_hash_entry *ret;
-
-  ret = (struct elf32_hppa_args_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == NULL)
-    ret = ((struct elf32_hppa_args_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct elf32_hppa_args_hash_entry)));
-  if (ret == NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct elf32_hppa_args_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
-  /* Initialize the local fields.  */
-  if (ret)
-    ret->arg_bits = 0;
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create the derived linker hash table.  The PA ELF port uses the derived
-   hash table to keep information specific to the PA ELF linker (without
-   using static variables).  */
-
-static struct bfd_link_hash_table *
-elf32_hppa_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct elf32_hppa_link_hash_table *ret;
-
-  ret = ((struct elf32_hppa_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct elf32_hppa_link_hash_table)));
-  if (ret == NULL)
-    return NULL;
-  if (!_bfd_elf_link_hash_table_init (&ret->root, abfd,
-				      _bfd_elf_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-  ret->stub_hash_table = NULL;
-  ret->args_hash_table = NULL;
-  ret->output_symbol_count = 0;
-  ret->global_value = 0;
-  ret->global_sym_defined = 0;
-
-  return &ret->root.root;
-}
-
-/* Relocate the given INSN given the various input parameters.
-
-   FIXME: endianness and sizeof (long) issues abound here.  */
-
-static unsigned long
-hppa_elf_relocate_insn (abfd, input_sect, insn, address, sym_value,
-			r_addend, r_format, r_field, pcrel)
-     bfd *abfd;
-     asection *input_sect;
-     unsigned long insn;
-     unsigned long address;
-     long sym_value;
-     long r_addend;
-     unsigned long r_format;
-     unsigned long r_field;
-     unsigned long pcrel;
-{
-  unsigned char opcode = get_opcode (insn);
-  long constant_value;
-
-  switch (opcode)
-    {
-    case LDO:
-    case LDB:
-    case LDH:
-    case LDW:
-    case LDWM:
-    case STB:
-    case STH:
-    case STW:
-    case STWM:
-    case COMICLR:
-    case SUBI:
-    case ADDIT:
-    case ADDI:
-    case LDIL:
-    case ADDIL:
-      constant_value = HPPA_R_CONSTANT (r_addend);
-
-      if (pcrel)
-	sym_value -= address;
-
-      sym_value = hppa_field_adjust (sym_value, constant_value, r_field);
-      return hppa_rebuild_insn (abfd, insn, sym_value, r_format);
-
-    case BL:
-    case BE:
-    case BLE:
-      /* XXX computing constant_value is not needed??? */
-      constant_value = assemble_17 ((insn & 0x001f0000) >> 16,
-				    (insn & 0x00001ffc) >> 2,
-				    insn & 1);
-
-      constant_value = (constant_value << 15) >> 15;
-      if (pcrel)
-	{
-	  sym_value -=
-	    address + input_sect->output_offset
-	    + input_sect->output_section->vma;
-	  sym_value = hppa_field_adjust (sym_value, -8, r_field);
-	}
-      else
-	sym_value = hppa_field_adjust (sym_value, constant_value, r_field);
-
-      return hppa_rebuild_insn (abfd, insn, sym_value >> 2, r_format);
-
-    default:
-      if (opcode == 0)
-	{
-	  constant_value = HPPA_R_CONSTANT (r_addend);
-
-	  if (pcrel)
-	    sym_value -= address;
-
-	  return hppa_field_adjust (sym_value, constant_value, r_field);
-	}
-      else
-	abort ();
-    }
-}
-
-/* Relocate an HPPA ELF section.  */
-
-static boolean
-elf32_hppa_relocate_section (output_bfd, info, input_bfd, input_section,
-			     contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *rel;
-  Elf_Internal_Rela *relend;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      asection *sym_sec;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-      const char *sym_name;
-
-      r_type = ELF32_R_TYPE (rel->r_info);
-      if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      howto = elf_hppa_howto_table + r_type;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sym_sec = local_sections[r_symndx];
-		  rel->r_addend += sym_sec->output_offset;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sym_sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sym_sec = local_sections[r_symndx];
-	  relocation = ((ELF_ST_TYPE (sym->st_info) == STT_SECTION
-			   ? 0 : sym->st_value)
-			 + sym_sec->output_offset
-			 + sym_sec->output_section->vma);
-	}
-      else
-	{
-	  long indx;
-
-	  indx = r_symndx - symtab_hdr->sh_info;
-	  h = elf_sym_hashes (input_bfd)[indx];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sym_sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sym_sec->output_offset
-			    + sym_sec->output_section->vma);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else
-	    {
-	      if (!((*info->callbacks->undefined_symbol)
-		    (info, h->root.root.string, input_bfd,
-		     input_section, rel->r_offset)))
-		return false;
-	      break;
-	    }
-	}
-
-      if (h != NULL)
-	sym_name = h->root.root.string;
-      else
-	{
-	  sym_name = bfd_elf_string_from_elf_section (input_bfd,
-						      symtab_hdr->sh_link,
-						      sym->st_name);
-	  if (sym_name == NULL)
-	    return false;
-	  if (*sym_name == '\0')
-	    sym_name = bfd_section_name (input_bfd, sym_sec);
-	}
-
-      /* If args_hash_table is NULL, then we have encountered some
-	 kind of link error (ex. undefined symbols).  Do not try to
-	 apply any relocations, continue the loop so we can notify
-	 the user of several errors in a single attempted link.  */
-      if (elf32_hppa_hash_table (info)->args_hash_table == NULL)
-	continue;
-
-      r = elf32_hppa_bfd_final_link_relocate (howto, input_bfd, output_bfd,
-					      input_section, contents,
-					      rel->r_offset, relocation,
-					      rel->r_addend, info, sym_sec,
-					      sym_name, h == NULL);
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    /* This can happen for DP relative relocs if $global$ is
-	       undefined.  This is a panic situation so we don't try
-	       to continue.  */
-	    case bfd_reloc_undefined:
-	    case bfd_reloc_notsupported:
-	      if (!((*info->callbacks->undefined_symbol)
-		    (info, "$global$", input_bfd,
-		     input_section, rel->r_offset)))
-		return false;
-	      return false;
-	    case bfd_reloc_dangerous:
-	      {
-		/* We use this return value to indicate that we performed
-		   a "dangerous" relocation.  This doesn't mean we did
-		   the wrong thing, it just means there may be some cleanup
-		   that needs to be done here.
-
-		   In particular we had to swap the last call insn and its
-		   delay slot.  If the delay slot insn needed a relocation,
-		   then we'll need to adjust the next relocation entry's
-		   offset to account for the fact that the insn moved.
-
-		   This hair wouldn't be necessary if we inserted stubs
-		   between procedures and used a "bl" to get to the stub.  */
-		if (rel != relend)
-		  {
-		    Elf_Internal_Rela *next_rel = rel + 1;
-
-		    if (rel->r_offset + 4 == next_rel->r_offset)
-		      next_rel->r_offset -= 4;
-		  }
-		break;
-	      }
-	    default:
-	    case bfd_reloc_outofrange:
-	    case bfd_reloc_overflow:
-	      {
-		if (!((*info->callbacks->reloc_overflow)
-		      (info, sym_name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Return one (or more) BFD relocations which implement the base
-   relocation with modifications based on format and field.  */
-
-elf32_hppa_reloc_type **
-hppa_elf_gen_reloc_type (abfd, base_type, format, field, ignore, sym)
-     bfd *abfd;
-     elf32_hppa_reloc_type base_type;
-     int format;
-     int field;
-     int ignore;
-     asymbol *sym;
-{
-  elf32_hppa_reloc_type *finaltype;
-  elf32_hppa_reloc_type **final_types;
-
-  /* Allocate slots for the BFD relocation.  */
-  final_types = ((elf32_hppa_reloc_type **)
-		 bfd_alloc (abfd, sizeof (elf32_hppa_reloc_type *) * 2));
-  if (final_types == NULL)
-    return NULL;
-
-  /* Allocate space for the relocation itself.  */
-  finaltype = ((elf32_hppa_reloc_type *)
-	       bfd_alloc (abfd, sizeof (elf32_hppa_reloc_type)));
-  if (finaltype == NULL)
-    return NULL;
-
-  /* Some reasonable defaults.  */
-  final_types[0] = finaltype;
-  final_types[1] = NULL;
-
-#define final_type finaltype[0]
-
-  final_type = base_type;
-
-  /* Just a tangle of nested switch statements to deal with the braindamage
-     that a different field selector means a completely different relocation
-     for PA ELF.  */
-  switch (base_type)
-    {
-    case R_HPPA:
-    case R_HPPA_ABS_CALL:
-      switch (format)
-	{
-	case 14:
-	  switch (field)
-	    {
-	    case e_rsel:
-	    case e_rrsel:
-	      final_type = R_PARISC_DIR14R;
-	      break;
-	    case e_rtsel:
-	      final_type = R_PARISC_DLTREL14R;
-	      break;
-	    case e_tsel:
-	      final_type = R_PARISC_DLTREL14F;
-	      break;
-	    case e_rpsel:
-	      final_type = R_PARISC_PLABEL14R;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	case 17:
-	  switch (field)
-	    {
-	    case e_fsel:
-	      final_type = R_PARISC_DIR17F;
-	      break;
-	    case e_rsel:
-	    case e_rrsel:
-	      final_type = R_PARISC_DIR17R;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	case 21:
-	  switch (field)
-	    {
-	    case e_lsel:
-	    case e_lrsel:
-	      final_type = R_PARISC_DIR21L;
-	      break;
-	    case e_ltsel:
-	      final_type = R_PARISC_DLTREL21L;
-	      break;
-	    case e_lpsel:
-	      final_type = R_PARISC_PLABEL21L;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	case 32:
-	  switch (field)
-	    {
-	    case e_fsel:
-	      final_type = R_PARISC_DIR32;
-	      break;
-	    case e_psel:
-	      final_type = R_PARISC_PLABEL32;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	default:
-	  return NULL;
-	}
-      break;
-
-
-    case R_HPPA_GOTOFF:
-      switch (format)
-	{
-	case 14:
-	  switch (field)
-	    {
-	    case e_rsel:
-	    case e_rrsel:
-	      final_type = R_PARISC_DPREL14R;
-	      break;
-	    case e_fsel:
-	      final_type = R_PARISC_DPREL14F;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	case 21:
-	  switch (field)
-	    {
-	    case e_lrsel:
-	    case e_lsel:
-	      final_type = R_PARISC_DPREL21L;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	default:
-	  return NULL;
-	}
-      break;
-
-
-    case R_HPPA_PCREL_CALL:
-      switch (format)
-	{
-	case 14:
-	  switch (field)
-	    {
-	    case e_rsel:
-	    case e_rrsel:
-	      final_type = R_PARISC_PCREL14R;
-	      break;
-	    case e_fsel:
-	      final_type = R_PARISC_PCREL14F;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	case 17:
-	  switch (field)
-	    {
-	    case e_rsel:
-	    case e_rrsel:
-	      final_type = R_PARISC_PCREL17R;
-	      break;
-	    case e_fsel:
-	      final_type = R_PARISC_PCREL17F;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	case 21:
-	  switch (field)
-	    {
-	    case e_lsel:
-	    case e_lrsel:
-	      final_type = R_PARISC_PCREL21L;
-	      break;
-	    default:
-	      return NULL;
-	    }
-	  break;
-
-	default:
-	  return NULL;
-	}
-      break;
-
-    default:
-      return NULL;
-    }
-
-  return final_types;
-}
-
-#undef final_type
-
-/* Set the contents of a particular section at a particular location.  */
-
-static boolean
-elf32_hppa_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  /* Ignore write requests for the symbol extension section until we've
-     had the chance to rebuild it ourselves.  */
-  if (!strcmp (section->name, ".PARISC.symextn") && !symext_chain_size)
-    return true;
-  else
-    return _bfd_elf_set_section_contents (abfd, section, location,
-					  offset, count);
-}
-
-/* Translate from an elf into field into a howto relocation pointer.  */
-
-static void
-elf32_hppa_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_PARISC_UNIMPLEMENTED);
-  cache_ptr->howto = &elf_hppa_howto_table[ELF32_R_TYPE (dst->r_info)];
-}
-
-
-/* Actually perform a relocation.  NOTE this is (mostly) superceeded
-   by elf32_hppa_bfd_final_link_relocate which is called by the new
-   fast linker.  */
-
-static bfd_reloc_status_type
-hppa_elf_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-		error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* It is no longer valid to call hppa_elf_reloc when creating
-     a final executable.  */
-  if (output_bfd)
-    {
-      reloc_entry->address += input_section->output_offset;
-
-      /* Work around lossage in generic elf code to write relocations.
-	 (maps different section symbols into the same symbol index).  */
-      if ((symbol_in->flags & BSF_SECTION_SYM)
-	  && symbol_in->section)
-	reloc_entry->addend += symbol_in->section->output_offset;
-      return bfd_reloc_ok;
-    }
-  else
-    {
-      *error_message = (char *) _("Unsupported call to hppa_elf_reloc");
-      return bfd_reloc_notsupported;
-    }
-}
-
-/* Actually perform a relocation as part of a final link.  This can get
-   rather hairy when linker stubs are needed.  */
-
-static bfd_reloc_status_type
-elf32_hppa_bfd_final_link_relocate (howto, input_bfd, output_bfd,
-				    input_section, contents, offset, value,
-				    addend, info, sym_sec, sym_name, is_local)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd *output_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma offset;
-     bfd_vma value;
-     bfd_vma addend;
-     struct bfd_link_info *info;
-     asection *sym_sec;
-     const char *sym_name;
-     int is_local;
-{
-  unsigned long insn;
-  unsigned long r_type = howto->type;
-  unsigned long r_format = howto->bitsize;
-  unsigned long r_field = e_fsel;
-  bfd_byte *hit_data = contents + offset;
-  boolean r_pcrel = howto->pc_relative;
-
-  insn = bfd_get_32 (input_bfd, hit_data);
-
-  /* Make sure we have a value for $global$.  FIXME isn't this effectively
-     just like the gp pointer on MIPS?  Can we use those routines for this
-     purpose?  */
-  if (!elf32_hppa_hash_table (info)->global_sym_defined)
-    {
-      struct elf_link_hash_entry *h;
-      asection *sec;
-
-      h = elf_link_hash_lookup (elf_hash_table (info), "$global$", false,
-				 false, false);
-
-      /* If there isn't a $global$, then we're in deep trouble.  */
-      if (h == NULL)
-	return bfd_reloc_notsupported;
-
-      /* If $global$ isn't a defined symbol, then we're still in deep
-	 trouble.  */
-      if (h->root.type != bfd_link_hash_defined)
-	return bfd_reloc_undefined;
-
-      sec = h->root.u.def.section;
-      elf32_hppa_hash_table (info)->global_value = (h->root.u.def.value
-						    + sec->output_section->vma
-						    + sec->output_offset);
-      elf32_hppa_hash_table (info)->global_sym_defined = 1;
-    }
-
-  switch (r_type)
-    {
-    case R_PARISC_NONE:
-      break;
-
-    case R_PARISC_DIR32:
-    case R_PARISC_DIR17F:
-    case R_PARISC_PCREL17C:
-      r_field = e_fsel;
-      goto do_basic_type_1;
-    case R_PARISC_DIR21L:
-    case R_PARISC_PCREL21L:
-      r_field = e_lrsel;
-      goto do_basic_type_1;
-    case R_PARISC_DIR17R:
-    case R_PARISC_PCREL17R:
-    case R_PARISC_DIR14R:
-    case R_PARISC_PCREL14R:
-      r_field = e_rrsel;
-      goto do_basic_type_1;
-
-    /* For all the DP relative relocations, we need to examine the symbol's
-       section.  If it's a code section, then "data pointer relative" makes
-       no sense.  In that case we don't adjust the "value", and for 21 bit
-       addil instructions, we change the source addend register from %dp to
-       %r0.  */
-    case R_PARISC_DPREL21L:
-      r_field = e_lrsel;
-      if (sym_sec->flags & SEC_CODE)
-	{
-	  if ((insn & 0xfc000000) >> 26 == 0xa
-	       && (insn & 0x03e00000) >> 21 == 0x1b)
-	    insn &= ~0x03e00000;
-	}
-      else
-	value -= elf32_hppa_hash_table (info)->global_value;
-      goto do_basic_type_1;
-    case R_PARISC_DPREL14R:
-      r_field = e_rrsel;
-      if ((sym_sec->flags & SEC_CODE) == 0)
-	value -= elf32_hppa_hash_table (info)->global_value;
-      goto do_basic_type_1;
-    case R_PARISC_DPREL14F:
-      r_field = e_fsel;
-      if ((sym_sec->flags & SEC_CODE) == 0)
-	value -= elf32_hppa_hash_table (info)->global_value;
-      goto do_basic_type_1;
-
-    /* These cases are separate as they may involve a lot more work
-       to deal with linker stubs.  */
-    case R_PARISC_PLABEL32:
-    case R_PARISC_PLABEL21L:
-    case R_PARISC_PLABEL14R:
-    case R_PARISC_PCREL17F:
-      {
-	bfd_vma location;
-	unsigned int len, caller_args, callee_args;
-	arg_reloc_type arg_reloc_types[5];
-	struct elf32_hppa_args_hash_table *args_hash_table;
-	struct elf32_hppa_args_hash_entry *args_hash;
-	char *new_name, *stub_name;
-
-	/* Get the field selector right.  We'll need it in a minute.  */
-	if (r_type == R_PARISC_PCREL17F
-	    || r_type == R_PARISC_PLABEL32)
-	  r_field = e_fsel;
-	else if (r_type == R_PARISC_PLABEL21L)
-	  r_field = e_lrsel;
-	else if (r_type == R_PARISC_PLABEL14R)
-	  r_field = e_rrsel;
-
-	/* Find out where we are and where we're going.  */
-	location = (offset +
-		    input_section->output_offset +
-		    input_section->output_section->vma);
-
-	/* Now look for the argument relocation bits associated with the
-	   target.  */
-	len = strlen (sym_name) + 1;
-	if (is_local)
-	  len += 9;
-	new_name = bfd_malloc (len);
-	if (!new_name)
-	  return bfd_reloc_notsupported;
-	strcpy (new_name, sym_name);
-
-	/* Local symbols have unique IDs.  */
-	if (is_local)
-	  sprintf (new_name + len - 10, "_%08x", (int)sym_sec);
-
-	args_hash_table = elf32_hppa_hash_table (info)->args_hash_table;
-
-	args_hash = elf32_hppa_args_hash_lookup (args_hash_table,
-						 new_name, false, false);
-	if (args_hash == NULL)
-	  callee_args = 0;
-	else
-	  callee_args = args_hash->arg_bits;
-
-	/* If this is a CALL relocation, then get the caller's bits
-	   from the addend.  Else use the magic 0x155 value for PLABELS.
-
-	   Also we don't care about the destination (value) for PLABELS.  */
-	if (r_type == R_PARISC_PCREL17F)
-	  caller_args = HPPA_R_ARG_RELOC (addend);
-	else
-	  {
-	    caller_args = 0x155;
-	    location = value;
-	  }
-
-	/* Any kind of linker stub needed?  */
-	if (((int)(value - location) > 0x3ffff)
-	    || ((int)(value - location) < (int)0xfffc0000)
-	    || elf32_hppa_arg_reloc_needed (caller_args, callee_args,
-					    arg_reloc_types))
-	  {
-	    struct elf32_hppa_stub_hash_table *stub_hash_table;
-	    struct elf32_hppa_stub_hash_entry *stub_hash;
-	    asection *stub_section;
-
-	    /* Build a name for the stub.  */
-
-	    len = strlen (new_name);
-	    len += 23;
-	    stub_name = bfd_malloc (len);
-	    if (!stub_name)
-	      return bfd_reloc_notsupported;
-	    elf32_hppa_name_of_stub (caller_args, callee_args,
-				     location, value, stub_name);
-	    strcat (stub_name, new_name);
-	    free (new_name);
-
-	    stub_hash_table = elf32_hppa_hash_table (info)->stub_hash_table;
-
-	    stub_hash
-	      = elf32_hppa_stub_hash_lookup (stub_hash_table, stub_name,
-					     false, false);
-
-	    /* We're done with that name.  */
-	    free (stub_name);
-
-	    /* The stub BFD only has one section.  */
-	    stub_section = stub_hash_table->stub_bfd->sections;
-
-	    if (stub_hash != NULL)
-	      {
-
-		if (r_type == R_PARISC_PCREL17F)
-		  {
-		    unsigned long delay_insn;
-		    unsigned int opcode, rtn_reg, ldo_target_reg, ldo_src_reg;
-
-		    /* We'll need to peek at the next insn.  */
-		    delay_insn = bfd_get_32 (input_bfd, hit_data + 4);
-		    opcode = get_opcode (delay_insn);
-
-		    /* We also need to know the return register for this
-		       call.  */
-		    rtn_reg = (insn & 0x03e00000) >> 21;
-
-		    ldo_src_reg = (delay_insn & 0x03e00000) >> 21;
-		    ldo_target_reg = (delay_insn & 0x001f0000) >> 16;
-
-		    /* Munge up the value and other parameters for
-		       hppa_elf_relocate_insn.  */
-
-		    value = (stub_hash->offset
-			     + stub_section->output_offset
-			     + stub_section->output_section->vma);
-
-		    r_format = 17;
-		    r_field = e_fsel;
-		    r_pcrel = 0;
-		    addend = 0;
-
-		    /* We need to peek at the delay insn and determine if
-		       we'll need to swap the branch and its delay insn.  */
-		    if ((insn & 2)
-			|| (opcode == LDO
-			    && ldo_target_reg == rtn_reg)
-			|| (delay_insn == 0x08000240))
-		      {
-			/* No need to swap the branch and its delay slot, but
-			   we do need to make sure to jump past the return
-			   pointer update in the stub.  */
-			value += 4;
-
-			/* If the delay insn does a return pointer adjustment,
-			   then we have to make sure it stays valid.  */
-			if (opcode == LDO
-			    && ldo_target_reg == rtn_reg)
-			  {
-			    delay_insn &= 0xfc00ffff;
-			    delay_insn |= ((31 << 21) | (31 << 16));
-			    bfd_put_32 (input_bfd, delay_insn, hit_data + 4);
-			  }
-			/* Use a BLE to reach the stub.  */
-			insn = BLE_SR4_R0;
-		      }
-		    else
-		      {
-			/* Wonderful, we have to swap the call insn and its
-			   delay slot.  */
-			bfd_put_32 (input_bfd, delay_insn, hit_data);
-			/* Use a BLE,n to reach the stub.  */
-			insn = (BLE_SR4_R0 | 0x2);
-			bfd_put_32 (input_bfd, insn, hit_data + 4);
-			insn = hppa_elf_relocate_insn (input_bfd,
-						       input_section,
-						       insn, offset + 4,
-						       value, addend,
-						       r_format, r_field,
-						       r_pcrel);
-			/* Update the instruction word.  */
-			bfd_put_32 (input_bfd, insn, hit_data + 4);
-			return bfd_reloc_dangerous;
-		      }
-		  }
-		else
-		  {
-		    /* PLABEL stuff is easy.  */
-
-		    value = (stub_hash->offset
-			     + stub_section->output_offset
-			     + stub_section->output_section->vma);
-		    /* We don't need the RP adjustment for PLABELs.  */
-		    value += 4;
-		    if (r_type == R_PARISC_PLABEL32)
-		      r_format = 32;
-		    else if (r_type == R_PARISC_PLABEL21L)
-		      r_format = 21;
-		    else if (r_type == R_PARISC_PLABEL14R)
-		      r_format = 14;
-
-		    r_pcrel = 0;
-		    addend = 0;
-		  }
-		}
-	      else
-		return bfd_reloc_notsupported;
-	  }
-	goto do_basic_type_1;
-      }
-
-do_basic_type_1:
-      insn = hppa_elf_relocate_insn (input_bfd, input_section, insn,
-				     offset, value, addend, r_format,
-				     r_field, r_pcrel);
-      break;
-
-    /* Something we don't know how to handle.  */
-    default:
-      return bfd_reloc_notsupported;
-    }
-
-  /* Update the instruction word.  */
-  bfd_put_32 (input_bfd, insn, hit_data);
-  return (bfd_reloc_ok);
-}
-
-/* Return the address of the howto table entry to perform the CODE
-   relocation for an ARCH machine.  */
-
-static reloc_howto_type *
-elf_hppa_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  if ((int) code < (int) R_PARISC_UNIMPLEMENTED)
-    {
-      BFD_ASSERT ((int) elf_hppa_howto_table[(int) code].type == (int) code);
-      return &elf_hppa_howto_table[(int) code];
-    }
-  return NULL;
-}
-
-/* Return true if SYM represents a local label symbol.  */
-
-static boolean
-hppa_elf_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return (name[0] == 'L' && name[1] == '$');
-}
-
-/* Do any backend specific processing when beginning to write an object
-   file.  For PA ELF we need to determine the size of the symbol extension
-   section *before* any other output processing happens.  */
-
-static void
-elf32_hppa_backend_begin_write_processing (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  unsigned int i;
-  asection *symextn_sec;
-
-  /* Size up the symbol extension section.  */
-  if ((abfd->outsymbols == NULL
-       && info == NULL)
-      || symext_chain_size != 0)
-    return;
-
-  if (info == NULL)
-    {
-      /* We were not called from the BFD ELF linker code, so we need
-	 to examine the output BFD's outsymbols.
-
-	 Note we can not build the symbol extensions now as the symbol
-	 map hasn't been set up.  */
-      for (i = 0; i < abfd->symcount; i++)
-	{
-	  elf_symbol_type *symbol = (elf_symbol_type *)abfd->outsymbols[i];
-
-	  /* Only functions ever need an entry in the symbol extension
-	     section.  */
-	  if (!(symbol->symbol.flags & BSF_FUNCTION))
-	    continue;
-
-	  /* And only if they specify the locations of their arguments.  */
-	  if (symbol->tc_data.hppa_arg_reloc == 0)
-	    continue;
-
-	  /* Yup.  This function symbol needs an entry.  */
-	  symext_chain_size += 2 * ELF32_PARISC_SX_SIZE;
-	}
-    }
-  else if (info->relocateable == true)
-    {
-      struct elf32_hppa_args_hash_table *table;
-      table = elf32_hppa_hash_table (info)->args_hash_table;
-
-      /* Determine the size of the symbol extension section.  */
-      elf32_hppa_args_hash_traverse (table,
-				     elf32_hppa_size_symext,
-				     &symext_chain_size);
-    }
-
-  /* Now create the section and set its size.  We'll fill in the
-     contents later.  */
-  symextn_sec = bfd_get_section_by_name (abfd, SYMEXTN_SECTION_NAME);
-  if (symextn_sec == NULL)
-    symextn_sec = bfd_make_section (abfd, SYMEXTN_SECTION_NAME);
-
-  bfd_set_section_flags (abfd, symextn_sec,
-			 SEC_LOAD | SEC_HAS_CONTENTS | SEC_DATA);
-  symextn_sec->output_section = symextn_sec;
-  symextn_sec->output_offset = 0;
-  bfd_set_section_alignment (abfd, symextn_sec, 2);
-  bfd_set_section_size (abfd, symextn_sec, symext_chain_size);
-}
-
-/* Called for each entry in the args location hash table.  For each
-   entry we bump the size pointer by 2 records (16 bytes).  */
-
-static boolean
-elf32_hppa_size_symext (gen_entry, in_args)
-     struct bfd_hash_entry *gen_entry;
-     PTR in_args;
-{
-  bfd_size_type *sizep = (bfd_size_type *)in_args;
-
-  *sizep += 2 * ELF32_PARISC_SX_SIZE;
-  return true;
-}
-
-/* Backend routine called by the linker for each output symbol.
-
-   For PA ELF we use this opportunity to add an appropriate entry
-   to the symbol extension chain for function symbols.  */
-
-static boolean
-elf32_hppa_link_output_symbol_hook (abfd, info, name, sym, section)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const char *name;
-     Elf_Internal_Sym *sym;
-     asection *section;
-{
-  char *new_name;
-  unsigned int len, index;
-  struct elf32_hppa_args_hash_table *args_hash_table;
-  struct elf32_hppa_args_hash_entry *args_hash;
-
-  /* If the args hash table is NULL, then we've encountered an error
-     of some sorts (for example, an undefined symbol).  In that case
-     we've got nothing else to do.
-
-     NOTE: elf_link_output_symbol will abort if we return false here!  */
-  if (elf32_hppa_hash_table (info)->args_hash_table == NULL)
-    return true;
-
-  index = elf32_hppa_hash_table (info)->output_symbol_count++;
-
-  /* We need to look up this symbol in the args hash table to see if
-     it has argument relocation bits.  */
-  if (ELF_ST_TYPE (sym->st_info) != STT_FUNC)
-    return true;
-
-  /* We know it's a function symbol of some kind.  */
-  len = strlen (name) + 1;
-  if (ELF_ST_BIND (sym->st_info) == STB_LOCAL)
-    len += 9;
-
-  new_name = bfd_malloc (len);
-  if (new_name == NULL)
-    return false;
-
-  strcpy (new_name, name);
-  if (ELF_ST_BIND (sym->st_info) == STB_LOCAL)
-    sprintf (new_name + len - 10, "_%08x", (int)section);
-
-  /* Now that we have the unique name, we can look it up in the
-     args hash table.  */
-  args_hash_table = elf32_hppa_hash_table (info)->args_hash_table;
-  args_hash = elf32_hppa_args_hash_lookup (args_hash_table, new_name,
-					   false, false);
-  free (new_name);
-  if (args_hash == NULL)
-    return true;
-
-  /* We know this symbol has arg reloc bits.  */
-  add_entry_to_symext_chain (abfd, args_hash->arg_bits,
-			     index, &symext_rootP, &symext_lastP);
-  return true;
-}
-
-/* Perform any processing needed late in the object file writing process.
-   For PA ELF we build and set the contents of the symbol extension
-   section.  */
-
-static void
-elf32_hppa_backend_final_write_processing (abfd, linker)
-     bfd *abfd;
-     boolean linker;
-{
-  asection *symextn_sec;
-  unsigned int i;
-
-  /* Now build the symbol extension section.  */
-  if (symext_chain_size == 0)
-    return;
-
-  if (! linker)
-    {
-      /* We were not called from the backend linker, so we still need
-	 to build the symbol extension chain.
-
-         Look at each symbol, adding the appropriate information to the
-	 symbol extension section list as necessary.  */
-      for (i = 0; i < abfd->symcount; i++)
-	{
-	  elf_symbol_type *symbol = (elf_symbol_type *) abfd->outsymbols[i];
-
-	  /* Only functions ever need an entry in the symbol extension
-	     section.  */
-	  if (!(symbol->symbol.flags & BSF_FUNCTION))
-	    continue;
-
-	  /* And only if they specify the locations of their arguments.  */
-	  if (symbol->tc_data.hppa_arg_reloc == 0)
-	    continue;
-
-	  /* Add this symbol's information to the chain.  */
-	  add_entry_to_symext_chain (abfd, symbol->tc_data.hppa_arg_reloc,
-				     symbol->symbol.udata.i, &symext_rootP,
-				     &symext_lastP);
-	}
-    }
-
-  /* Now fill in the contents of the symbol extension section.  */
-  elf_hppa_tc_make_sections (abfd, symext_rootP);
-
-  /* And attach that as the section's contents.  */
-  symextn_sec = bfd_get_section_by_name (abfd, SYMEXTN_SECTION_NAME);
-  if (symextn_sec == (asection *) 0)
-    abort();
-
-  symextn_sec->contents = (void *)symextn_contents;
-
-  bfd_set_section_contents (abfd, symextn_sec, symextn_sec->contents,
-			    symextn_sec->output_offset, symextn_sec->_raw_size);
-}
-
-/* Update the symbol extention chain to include the symbol pointed to
-   by SYMBOLP if SYMBOLP is a function symbol.  Used internally and by GAS.  */
-
-static void
-add_entry_to_symext_chain (abfd, arg_reloc, sym_idx, symext_root, symext_last)
-     bfd *abfd;
-     unsigned int arg_reloc;
-     unsigned int sym_idx;
-     symext_chainS **symext_root;
-     symext_chainS **symext_last;
-{
-  symext_chainS *symextP;
-
-  /* Allocate memory and initialize this entry.  */
-  symextP = (symext_chainS *) bfd_alloc (abfd, sizeof (symext_chainS) * 2);
-  if (!symextP)
-    abort();			/* FIXME */
-
-  symextP[0].entry = ELF32_PARISC_SX_WORD (PARISC_SXT_SYMNDX, sym_idx);
-  symextP[0].next = &symextP[1];
-
-  symextP[1].entry = ELF32_PARISC_SX_WORD (PARISC_SXT_ARG_RELOC, arg_reloc);
-  symextP[1].next = NULL;
-
-  /* Now update the chain itself so it can be walked later to build
-     the symbol extension section.  */
-  if (*symext_root == NULL)
-    {
-      *symext_root = &symextP[0];
-      *symext_last = &symextP[1];
-    }
-  else
-    {
-      (*symext_last)->next = &symextP[0];
-      *symext_last = &symextP[1];
-    }
-}
-
-/* Build the symbol extension section.  */
-
-static void
-elf_hppa_tc_make_sections (abfd, symext_root)
-     bfd *abfd;
-     symext_chainS *symext_root;
-{
-  symext_chainS *symextP;
-  unsigned int i;
-  asection *symextn_sec;
-
-  symextn_sec = bfd_get_section_by_name (abfd, SYMEXTN_SECTION_NAME);
-
-  /* Grab some memory for the contents of the symbol extension section
-     itself.  */
-  symextn_contents = (bfd_byte *) bfd_zalloc (abfd,
-					      symextn_sec->_raw_size);
-  if (!symextn_contents)
-    abort();			/* FIXME */
-
-  /* Fill in the contents of the symbol extension chain.  */
-  for (i = 0, symextP = symext_root; symextP; symextP = symextP->next, ++i)
-    ELF32_PARISC_SX_PUT (abfd, (bfd_vma) symextP->entry,
-			 symextn_contents + i * ELF32_PARISC_SX_SIZE);
-
-  return;
-}
-
-/* Do some PA ELF specific work after reading in the symbol table.
-   In particular attach the argument relocation from the
-   symbol extension section to the appropriate symbols.  */
-
-static boolean
-elf32_hppa_backend_symbol_table_processing (abfd, esyms,symcnt)
-     bfd *abfd;
-     elf_symbol_type *esyms;
-     unsigned int symcnt;
-{
-  Elf32_Internal_Shdr *symextn_hdr =
-    bfd_elf_find_section (abfd, SYMEXTN_SECTION_NAME);
-  unsigned int i, current_sym_idx = 0;
-
-  /* If no symbol extension existed, then all symbol extension information
-     is assumed to be zero.  */
-  if (symextn_hdr == NULL)
-    {
-      for (i = 0; i < symcnt; i++)
-	esyms[i].tc_data.hppa_arg_reloc = 0;
-      return (true);
-    }
-
-  /* FIXME:  Why not use bfd_get_section_contents here?  Also should give
-     memory back when we're done.  */
-  /* Allocate a buffer of the appropriate size for the symextn section.  */
-  symextn_hdr->contents = bfd_zalloc(abfd,symextn_hdr->sh_size);
-  if (!symextn_hdr->contents)
-    return false;
-
-  /* Read in the symextn section.  */
-  if (bfd_seek (abfd, symextn_hdr->sh_offset, SEEK_SET) == -1)
-    return false;
-  if (bfd_read ((PTR) symextn_hdr->contents, 1, symextn_hdr->sh_size, abfd)
-      != symextn_hdr->sh_size)
-    return false;
-
-  /* Parse entries in the symbol extension section, updating the symtab
-     entries as we go */
-  for (i = 0; i < symextn_hdr->sh_size / ELF32_PARISC_SX_SIZE; i++)
-    {
-      symext_entryS se =
-	ELF32_PARISC_SX_GET (abfd,
-			     ((unsigned char *)symextn_hdr->contents
-			      + i * ELF32_PARISC_SX_SIZE));
-      unsigned int se_value = ELF32_PARISC_SX_VAL (se);
-      unsigned int se_type = ELF32_PARISC_SX_TYPE (se);
-
-      switch (se_type)
-	{
-	case PARISC_SXT_NULL:
-	  break;
-
-	case PARISC_SXT_SYMNDX:
-	  if (se_value >= symcnt)
-	    {
-	      bfd_set_error (bfd_error_bad_value);
-	      return (false);
-	    }
-	  current_sym_idx = se_value - 1;
-	  break;
-
-	case PARISC_SXT_ARG_RELOC:
-	  esyms[current_sym_idx].tc_data.hppa_arg_reloc = se_value;
-	  break;
-
-	default:
-	  bfd_set_error (bfd_error_bad_value);
-	  return (false);
-	}
-    }
-  return (true);
-}
-
-/* Read and attach the symbol extension information for the symbols
-   in INPUT_BFD to the argument location hash table.  Handle locals
-   if DO_LOCALS is true; likewise for globals when DO_GLOBALS is true.  */
-
-static boolean
-elf32_hppa_read_symext_info (input_bfd, symtab_hdr, args_hash_table, local_syms)
-     bfd *input_bfd;
-     Elf_Internal_Shdr *symtab_hdr;
-     struct elf32_hppa_args_hash_table *args_hash_table;
-     Elf_Internal_Sym *local_syms;
-{
-  asection *symextn_sec;
-  bfd_byte *contents;
-  unsigned int i, n_entries, current_index = 0;
-
-  /* Get the symbol extension section for this BFD.  If no section exists
-     then there's nothing to do.  Likewise if the section exists, but
-     has no contents.  */
-  symextn_sec = bfd_get_section_by_name (input_bfd, SYMEXTN_SECTION_NAME);
-  if (symextn_sec == NULL)
-    return true;
-
-  /* Done separately so we can turn off SEC_HAS_CONTENTS (see below).  */
-  if (symextn_sec->_raw_size == 0)
-    {
-      symextn_sec->flags &= ~SEC_HAS_CONTENTS;
-      return true;
-    }
-
-  contents = (bfd_byte *) bfd_malloc ((size_t) symextn_sec->_raw_size);
-  if (contents == NULL)
-    return false;
-
-  /* How gross.  We turn off SEC_HAS_CONTENTS for the input symbol extension
-     sections to keep the generic ELF/BFD code from trying to do anything
-     with them.  We have to undo that hack temporarily so that we can read
-     in the contents with the generic code.  */
-  symextn_sec->flags |= SEC_HAS_CONTENTS;
-  if (bfd_get_section_contents (input_bfd, symextn_sec, contents,
-				0, symextn_sec->_raw_size) == false)
-    {
-      symextn_sec->flags &= ~SEC_HAS_CONTENTS;
-      free (contents);
-      return false;
-    }
-
-  /* Gross.  Turn off SEC_HAS_CONTENTS for the input symbol extension
-     sections (see above).  */
-  symextn_sec->flags &= ~SEC_HAS_CONTENTS;
-
-  n_entries = symextn_sec->_raw_size / ELF32_PARISC_SX_SIZE;
-  for (i = 0; i < n_entries; i++)
-    {
-      symext_entryS entry =
-	ELF32_PARISC_SX_GET (input_bfd, contents + i * ELF32_PARISC_SX_SIZE);
-      unsigned int value = ELF32_PARISC_SX_VAL (entry);
-      unsigned int type = ELF32_PARISC_SX_TYPE (entry);
-      struct elf32_hppa_args_hash_entry *args_hash;
-
-      switch (type)
-	{
-	case PARISC_SXT_NULL:
-	  break;
-
-	case PARISC_SXT_SYMNDX:
-	  if (value >= symtab_hdr->sh_size / sizeof (Elf32_External_Sym))
-	    {
-	      bfd_set_error (bfd_error_bad_value);
-	      free (contents);
-	      return false;
-	    }
-	  current_index = value;
-	  break;
-
-	case PARISC_SXT_ARG_RELOC:
-	  if (current_index < symtab_hdr->sh_info)
-	    {
-	      Elf_Internal_Shdr *hdr;
-	      char *new_name;
-	      const char *sym_name;
-	      asection *sym_sec;
-	      unsigned int len;
-
-	      hdr = elf_elfsections (input_bfd)[local_syms[current_index].st_shndx];
-	      sym_sec = hdr->bfd_section;
-	      sym_name = bfd_elf_string_from_elf_section (input_bfd,
-						      symtab_hdr->sh_link,
-	 			        local_syms[current_index].st_name);
-	      len = strlen (sym_name) + 10;
-	      new_name = bfd_malloc (len);
-	      if (new_name == NULL)
-		{
-		  free (contents);
-		  return false;
-		}
-	      strcpy (new_name, sym_name);
-	      sprintf (new_name + len - 10, "_%08x", (int)sym_sec);
-
-	      /* This is a global symbol with argument location info.
-		 We need to enter it into the hash table.  */
-	      args_hash = elf32_hppa_args_hash_lookup (args_hash_table,
-						       new_name, true,
-						       true);
-	      free (new_name);
-	      if (args_hash == NULL)
-		{
-		  free (contents);
-		  return false;
-		}
-	      args_hash->arg_bits = value;
-	      break;
-	    }
-	  else if (current_index >= symtab_hdr->sh_info)
-	    {
-	      struct elf_link_hash_entry *h;
-
-	      current_index -= symtab_hdr->sh_info;
-	      h = elf_sym_hashes(input_bfd)[current_index];
-	      /* This is a global symbol with argument location
-		 information.  We need to enter it into the hash table.  */
-	      args_hash = elf32_hppa_args_hash_lookup (args_hash_table,
-						       h->root.root.string,
-						       true, true);
-	      if (args_hash == NULL)
-		{
-		  bfd_set_error (bfd_error_bad_value);
-		  free (contents);
-		  return false;
-		}
-	      args_hash->arg_bits = value;
-	      break;
-	    }
-	  else
-	    break;
-
-	default:
-	  bfd_set_error (bfd_error_bad_value);
-	  free (contents);
-	  return false;
-	}
-    }
-  free (contents);
-  return true;
-}
-
-/* Undo the generic ELF code's subtraction of section->vma from the
-   value of each external symbol.  */
-
-static boolean
-elf32_hppa_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const Elf_Internal_Sym *sym;
-     const char **namep;
-     flagword *flagsp;
-     asection **secp;
-     bfd_vma *valp;
-{
-  *valp += (*secp)->vma;
-  return true;
-}
-
-/* Determine the name of the stub needed to perform a call assuming the
-   argument relocation bits for caller and callee are in CALLER and CALLEE
-   for a call from LOCATION to DESTINATION.  Copy the name into STUB_NAME.  */
-
-static void
-elf32_hppa_name_of_stub (caller, callee, location, destination, stub_name)
-     unsigned int caller, callee;
-     bfd_vma location, destination;
-     char *stub_name;
-{
-  arg_reloc_type arg_reloc_types[5];
-
-  if (elf32_hppa_arg_reloc_needed (caller, callee, arg_reloc_types))
-    {
-      arg_reloc_location i;
-      /* Fill in the basic template.  */
-      strcpy (stub_name, "__XX_XX_XX_XX_XX_stub_");
-
-      /* Now fix the specifics.  */
-      for (i = ARG0; i <= RET; i++)
-	switch (arg_reloc_types[i])
-	  {
-	    case NO:
-	      stub_name[3 * i + 2] = 'N';
-	      stub_name[3 * i + 3] = 'O';
-	      break;
-	    case GF:
-	      stub_name[3 * i + 2] = 'G';
-	      stub_name[3 * i + 3] = 'F';
-	      break;
-	    case FG:
-	      stub_name[3 * i + 2] = 'F';
-	      stub_name[3 * i + 3] = 'G';
-	      break;
-	    case GD:
-	      stub_name[3 * i + 2] = 'G';
-	      stub_name[3 * i + 3] = 'D';
-	      break;
-	    case DG:
-	      stub_name[3 * i + 2] = 'D';
-	      stub_name[3 * i + 3] = 'G';
-	      break;
-	  }
-    }
-  else
-    strcpy (stub_name, "_____long_branch_stub_");
-}
-
-/* Determine if an argument relocation stub is needed to perform a
-   call assuming the argument relocation bits for caller and callee
-   are in CALLER and CALLEE.  Place the type of relocations (if any)
-   into stub_types_p.  */
-
-static boolean
-elf32_hppa_arg_reloc_needed (caller, callee, stub_types)
-     unsigned int caller, callee;
-     arg_reloc_type stub_types[5];
-{
-  /* Special case for no relocations.  */
-  if (caller == 0 || callee == 0)
-    return 0;
-  else
-    {
-      arg_location caller_loc[5];
-      arg_location callee_loc[5];
-
-      /* Extract the location information for the argument and return
-	 value on both the caller and callee sides.  */
-      caller_loc[ARG0] = EXTRACT_ARBITS (caller, ARG0);
-      callee_loc[ARG0] = EXTRACT_ARBITS (callee, ARG0);
-      caller_loc[ARG1] = EXTRACT_ARBITS (caller, ARG1);
-      callee_loc[ARG1] = EXTRACT_ARBITS (callee, ARG1);
-      caller_loc[ARG2] = EXTRACT_ARBITS (caller, ARG2);
-      callee_loc[ARG2] = EXTRACT_ARBITS (callee, ARG2);
-      caller_loc[ARG3] = EXTRACT_ARBITS (caller, ARG3);
-      callee_loc[ARG3] = EXTRACT_ARBITS (callee, ARG3);
-      caller_loc[RET] = EXTRACT_ARBITS (caller, RET);
-      callee_loc[RET] = EXTRACT_ARBITS (callee, RET);
-
-      /* Check some special combinations.  This is necessary to
-	 deal with double precision FP arguments.  */
-      if (caller_loc[ARG0] == AR_FU || caller_loc[ARG1] == AR_FU)
-	{
-	  caller_loc[ARG0] = AR_FPDBL1;
-	  caller_loc[ARG1] = AR_NO;
-	}
-      if (caller_loc[ARG2] == AR_FU || caller_loc[ARG3] == AR_FU)
-	{
-	  caller_loc[ARG2] = AR_FPDBL2;
-	  caller_loc[ARG3] = AR_NO;
-	}
-      if (callee_loc[ARG0] == AR_FU || callee_loc[ARG1] == AR_FU)
-	{
-	  callee_loc[ARG0] = AR_FPDBL1;
-	  callee_loc[ARG1] = AR_NO;
-	}
-      if (callee_loc[ARG2] == AR_FU || callee_loc[ARG3] == AR_FU)
-	{
-	  callee_loc[ARG2] = AR_FPDBL2;
-	  callee_loc[ARG3] = AR_NO;
-	}
-
-      /* Now look up any relocation needed for each argument and the
-	 return value.  */
-      stub_types[ARG0] = arg_mismatches[caller_loc[ARG0]][callee_loc[ARG0]];
-      stub_types[ARG1] = arg_mismatches[caller_loc[ARG1]][callee_loc[ARG1]];
-      stub_types[ARG2] = arg_mismatches[caller_loc[ARG2]][callee_loc[ARG2]];
-      stub_types[ARG3] = arg_mismatches[caller_loc[ARG3]][callee_loc[ARG3]];
-      stub_types[RET] = ret_mismatches[caller_loc[RET]][callee_loc[RET]];
-
-      return (stub_types[ARG0] != NO
-	      || stub_types[ARG1] != NO
-	      || stub_types[ARG2] != NO
-	      || stub_types[ARG3] != NO
-	      || stub_types[RET] != NO);
-    }
-}
-
-/* Compute the size of the stub needed to call from LOCATION to DESTINATION
-   (a function named SYM_NAME), with argument relocation bits CALLER and
-   CALLEE.  Return zero if no stub is needed to perform such a call.  */
-
-static unsigned int
-elf32_hppa_size_of_stub (callee, caller, location, destination, sym_name)
-     unsigned int callee, caller;
-     bfd_vma location, destination;
-     const char *sym_name;
-{
-  arg_reloc_type arg_reloc_types[5];
-
-  /* Determine if a long branch or argument relocation stub is needed.
-     If an argument relocation stub is needed, the relocation will be
-     stored into arg_reloc_types.  */
-  if (!(((int)(location - destination) > 0x3ffff)
-	|| ((int)(location - destination) < (int)0xfffc0000)
-	|| elf32_hppa_arg_reloc_needed (caller, callee, arg_reloc_types)))
-    return 0;
-
-  /* Some kind of stub is needed.  Determine how big it needs to be.
-     First check for argument relocation stubs as they also handle
-     long calls.  Then check for long calls to millicode and finally
-     the normal long calls.  */
-  if (arg_reloc_types[ARG0] != NO
-      || arg_reloc_types[ARG1] != NO
-      || arg_reloc_types[ARG2] != NO
-      || arg_reloc_types[ARG3] != NO
-      || arg_reloc_types[RET] != NO)
-    {
-      /* Some kind of argument relocation stub is needed.  */
-      unsigned int len = 16;
-      arg_reloc_location i;
-
-      /* Each GR or FG relocation takes 2 insns, each GD or DG
-	 relocation takes 3 insns.  Plus 4 more insns for the
-         RP adjustment, ldil & (be | ble) and copy.  */
-      for (i = ARG0; i <= RET; i++)
-	switch (arg_reloc_types[i])
-	  {
-	    case GF:
-	    case FG:
-	      len += 8;
-	      break;
-
-	    case GD:
-	    case DG:
-	      len += 12;
-	      break;
-
-	    default:
-	      break;
-	  }
-
-      /* Extra instructions are needed if we're relocating a return value.  */
-      if (arg_reloc_types[RET] != NO)
-	len += 12;
-
-      return len;
-    }
-  else if (!strncmp ("$$", sym_name, 2)
-      && strcmp ("$$dyncall", sym_name))
-    return 12;
-  else
-    return 16;
-}
-
-/* Build one linker stub as defined by the stub hash table entry GEN_ENTRY.
-   IN_ARGS contains the stub BFD and link info pointers.  */
-
-static boolean
-elf32_hppa_build_one_stub (gen_entry, in_args)
-     struct bfd_hash_entry *gen_entry;
-     PTR in_args;
-{
-  void **args = (void **)in_args;
-  bfd *stub_bfd = (bfd *)args[0];
-  struct bfd_link_info *info = (struct bfd_link_info *)args[1];
-  struct elf32_hppa_stub_hash_entry *entry;
-  struct elf32_hppa_stub_hash_table *stub_hash_table;
-  bfd_byte *loc;
-  symvalue sym_value;
-  const char *sym_name;
-
-  /* Initialize pointers to the stub hash table, the particular entry we
-     are building a stub for, and where (in memory) we should place the stub
-     instructions.  */
-  entry = (struct elf32_hppa_stub_hash_entry *)gen_entry;
-  stub_hash_table = elf32_hppa_hash_table(info)->stub_hash_table;
-  loc = stub_hash_table->location;
-
-  /* Make a note of the offset within the stubs for this entry.  */
-  entry->offset = stub_hash_table->offset;
-
-  /* The symbol's name starts at offset 22.  */
-  sym_name = entry->root.string + 22;
-
-  sym_value = (entry->target_value
-	       + entry->target_section->output_offset
-	       + entry->target_section->output_section->vma);
-
-  if (strncmp ("_____long_branch_stub_", entry->root.string, 22))
-    {
-      /* This must be an argument or return value relocation stub.  */
-      unsigned long insn;
-      arg_reloc_location i;
-      bfd_byte *begin_loc = loc;
-
-      /* First the return pointer adjustment.  Depending on exact calling
-	 sequence this instruction may be skipped.  */
-      bfd_put_32 (stub_bfd, LDO_M4_R31_R31, loc);
-      loc += 4;
-
-      /* If we are relocating a return value, then we're going to have
-	 to return into the stub.  So we have to save off the user's
-	 return pointer into the stack at RP'.  */
-      if (strncmp (entry->root.string + 14, "NO", 2))
-	{
-	  bfd_put_32 (stub_bfd, STW_R31_M8R30, loc);
-	  loc += 4;
-	}
-
-      /* Iterate over the argument relocations, emitting instructions
-	 to move them around as necessary.  */
-      for (i = ARG0; i <= ARG3; i++)
-	{
-	  if (!strncmp (entry->root.string + 3 * i + 2, "GF", 2))
-	    {
-	      bfd_put_32 (stub_bfd, STW_ARG_M16R30 | ((26 - i) << 16), loc);
-	      bfd_put_32 (stub_bfd, FLDW_M16R30_FARG | (4 + i), loc + 4);
-	      loc += 8;
-	    }
-	  else if (!strncmp (entry->root.string + 3 * i + 2, "FG", 2))
-	    {
-	      bfd_put_32 (stub_bfd, FSTW_FARG_M16R30 | (4 + i), loc);
-	      bfd_put_32 (stub_bfd, LDW_M16R30_ARG | ((26 - i) << 16), loc + 4);
-	      loc += 8;
-	    }
-	  else if (!strncmp (entry->root.string + 3 * i + 2, "GD", 2))
-	    {
-	      bfd_put_32 (stub_bfd, STW_ARG_M12R30 | ((26 - i) << 16), loc);
-	      bfd_put_32 (stub_bfd, STW_ARG_M16R30 | ((25 - i) << 16), loc + 4);
-	      bfd_put_32 (stub_bfd, FLDD_M16R30_FARG | (5 + i), loc + 8);
-	      loc += 12;
-	    }
-	  else if (!strncmp (entry->root.string + 3 * i + 2, "DG", 2))
-	    {
-	      bfd_put_32 (stub_bfd, FSTD_FARG_M16R30 | (5 + i), loc);
-	      bfd_put_32 (stub_bfd, LDW_M12R30_ARG | ((26 - i) << 16), loc + 4);
-	      bfd_put_32 (stub_bfd, LDW_M16R30_ARG | ((25 - i) << 16), loc + 8);
-	      loc += 12;
-	    }
-	}
-
-      /* Load the high bits of the target address into %r1.  */
-      insn = hppa_rebuild_insn (stub_bfd, LDIL_R1,
-				hppa_field_adjust (sym_value, 0, e_lrsel), 21);
-      bfd_put_32 (stub_bfd, insn, loc);
-      loc += 4;
-
-      /* If we are relocating a return value, then we're going to have
-	 to return into the stub, then perform the return value relocation.  */
-      if (strncmp (entry->root.string + 14, "NO", 2))
-	{
-	  /* To return to the stub we "ble" to the target and copy the return
-	     pointer from %r31 into %r2.  */
-	  insn = hppa_rebuild_insn (stub_bfd,
-				    BLE_SR4_R1,
-				    hppa_field_adjust (sym_value, 0,
-						       e_rrsel) >> 2,
-				    17);
-	  bfd_put_32 (stub_bfd, insn, loc);
-	  bfd_put_32 (stub_bfd, COPY_R31_R2, loc + 4);
-
-	  /* Reload the return pointer for our caller from the stack.  */
-	  bfd_put_32 (stub_bfd, LDW_M8R30_R31, loc + 8);
-	  loc += 12;
-
-	  /* Perform the return value relocation.  */
-	  if (!strncmp (entry->root.string + 14, "GF", 2))
-	    {
-	      bfd_put_32 (stub_bfd, STW_ARG_M16R30 | (28 << 16), loc);
-	      bfd_put_32 (stub_bfd, FLDW_M16R30_FARG | 4, loc + 4);
-	      loc += 8;
-	    }
-	  else if (!strncmp (entry->root.string + 14, "FG", 2))
-	    {
-	      bfd_put_32 (stub_bfd, FSTW_FARG_M16R30 | 4, loc);
-	      bfd_put_32 (stub_bfd, LDW_M16R30_ARG | (28 << 16), loc + 4);
-	      loc += 8;
-	    }
-	  else if (!strncmp (entry->root.string + 2, "GD", 2))
-	    {
-	      bfd_put_32 (stub_bfd, STW_ARG_M12R30 | (28 << 16), loc);
-	      bfd_put_32 (stub_bfd, STW_ARG_M16R30 | (29 << 16), loc + 4);
-	      bfd_put_32 (stub_bfd, FLDD_M16R30_FARG | 4, loc + 8);
-	      loc += 12;
-	    }
-	  else if (!strncmp (entry->root.string + 2, "DG", 2))
-	    {
-	      bfd_put_32 (stub_bfd, FSTD_FARG_M16R30 | 4, loc);
-	      bfd_put_32 (stub_bfd, LDW_M12R30_ARG | (28 << 16), loc + 4);
-	      bfd_put_32 (stub_bfd, LDW_M16R30_ARG | (29 << 16), loc + 8);
-	      loc += 12;
-	    }
-	  /* Branch back to the user's code now.  */
-	  bfd_put_32 (stub_bfd, BV_N_0_R31, loc);
-	  loc += 4;
-	}
-      else
-	{
-	  /* No return value relocation, so we can simply "be" to the
-	     target and copy out return pointer into %r2.  */
-	  insn = hppa_rebuild_insn (stub_bfd, BE_SR4_R1,
-				    hppa_field_adjust (sym_value, 0,
-						       e_rrsel) >> 2, 17);
-	  bfd_put_32 (stub_bfd, insn, loc);
-	  bfd_put_32 (stub_bfd, COPY_R31_R2, loc + 4);
-	  loc += 8;
-	}
-
-      /* Update the location and offsets.  */
-      stub_hash_table->location += (loc - begin_loc);
-      stub_hash_table->offset += (loc - begin_loc);
-    }
-  else
-    {
-      /* Create one of two variant long branch stubs.  One for $$dyncall and
-	 normal calls, the other for calls to millicode.  */
-      unsigned long insn;
-      int millicode_call = 0;
-
-      if (!strncmp ("$$", sym_name, 2) && strcmp ("$$dyncall", sym_name))
-	millicode_call = 1;
-
-      /* First the return pointer adjustment.  Depending on exact calling
-	 sequence this instruction may be skipped.  */
-      bfd_put_32 (stub_bfd, LDO_M4_R31_R31, loc);
-
-      /* The next two instructions are the long branch itself.  A long branch
-	 is formed with "ldil" loading the upper bits of the target address
-	 into a register, then branching with "be" which adds in the lower bits.
-	 Long branches to millicode nullify the delay slot of the "be".  */
-      insn = hppa_rebuild_insn (stub_bfd, LDIL_R1,
-				hppa_field_adjust (sym_value, 0, e_lrsel), 21);
-      bfd_put_32 (stub_bfd, insn, loc + 4);
-      insn = hppa_rebuild_insn (stub_bfd, BE_SR4_R1 | (millicode_call ? 2 : 0),
-				hppa_field_adjust (sym_value, 0, e_rrsel) >> 2,
-				17);
-      bfd_put_32 (stub_bfd, insn, loc + 8);
-
-      if (!millicode_call)
-	{
-	  /* The sequence to call this stub places the return pointer into %r31,
-	     the final target expects the return pointer in %r2, so copy the
-	      return pointer into the proper register.  */
-	  bfd_put_32 (stub_bfd, COPY_R31_R2, loc + 12);
-
-	  /* Update the location and offsets.  */
-	  stub_hash_table->location += 16;
-	  stub_hash_table->offset += 16;
-	}
-      else
-	{
-	  /* Update the location and offsets.  */
-	  stub_hash_table->location += 12;
-	  stub_hash_table->offset += 12;
-	}
-
-    }
-  return true;
-}
-
-/* External entry points for sizing and building linker stubs.  */
-
-/* Build all the stubs associated with the current output file.  The
-   stubs are kept in a hash table attached to the main linker hash
-   table.  This is called via hppaelf_finish in the linker.  */
-
-boolean
-elf32_hppa_build_stubs (stub_bfd, info)
-     bfd *stub_bfd;
-     struct bfd_link_info *info;
-{
-  /* The stub BFD only has one section.  */
-  asection *stub_sec = stub_bfd->sections;
-  struct elf32_hppa_stub_hash_table *table;
-  unsigned int size;
-  void *args[2];
-
-  /* So we can pass both the BFD for the stubs and the link info
-     structure to the routine which actually builds stubs.  */
-  args[0] = stub_bfd;
-  args[1] = info;
-
-  /* Allocate memory to hold the linker stubs.  */
-  size = bfd_section_size (stub_bfd, stub_sec);
-  stub_sec->contents = (unsigned char *) bfd_zalloc (stub_bfd, size);
-  if (stub_sec->contents == NULL)
-    return false;
-  table = elf32_hppa_hash_table(info)->stub_hash_table;
-  table->location = stub_sec->contents;
-
-  /* Build the stubs as directed by the stub hash table.  */
-  elf32_hppa_stub_hash_traverse (table, elf32_hppa_build_one_stub, args);
-
-  return true;
-}
-
-/* Determine and set the size of the stub section for a final link.
-
-   The basic idea here is to examine all the relocations looking for
-   PC-relative calls to a target that is unreachable with a "bl"
-   instruction or calls where the caller and callee disagree on the
-   location of their arguments or return value.  */
-
-boolean
-elf32_hppa_size_stubs (stub_bfd, output_bfd, link_info)
-     bfd *stub_bfd;
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-{
-  bfd *input_bfd;
-  asection *section, *stub_sec = 0;
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Sym *local_syms, *isym, **all_local_syms;
-  Elf32_External_Sym *ext_syms, *esym;
-  unsigned int i, index, bfd_count = 0;
-  struct elf32_hppa_stub_hash_table *stub_hash_table = 0;
-  struct elf32_hppa_args_hash_table *args_hash_table = 0;
-
-  /* Create and initialize the stub hash table.  */
-  stub_hash_table = ((struct elf32_hppa_stub_hash_table *)
-		     bfd_malloc (sizeof (struct elf32_hppa_stub_hash_table)));
-  if (!stub_hash_table)
-    goto error_return;
-
-  if (!elf32_hppa_stub_hash_table_init (stub_hash_table, stub_bfd,
-					elf32_hppa_stub_hash_newfunc))
-    goto error_return;
-
-  /* Likewise for the argument location hash table.  */
-  args_hash_table = ((struct elf32_hppa_args_hash_table *)
-		     bfd_malloc (sizeof (struct elf32_hppa_args_hash_table)));
-  if (!args_hash_table)
-    goto error_return;
-
-  if (!elf32_hppa_args_hash_table_init (args_hash_table,
-					elf32_hppa_args_hash_newfunc))
-    goto error_return;
-
-  /* Attach the hash tables to the main hash table.  */
-  elf32_hppa_hash_table(link_info)->stub_hash_table = stub_hash_table;
-  elf32_hppa_hash_table(link_info)->args_hash_table = args_hash_table;
-
-  /* Count the number of input BFDs.  */
-  for (input_bfd = link_info->input_bfds;
-       input_bfd != NULL;
-       input_bfd = input_bfd->link_next)
-     bfd_count++;
-
-  /* We want to read in symbol extension records only once.  To do this
-     we need to read in the local symbols in parallel and save them for
-     later use; so hold pointers to the local symbols in an array.  */
-  all_local_syms
-    = (Elf_Internal_Sym **) bfd_malloc (sizeof (Elf_Internal_Sym *)
-					* bfd_count);
-  if (all_local_syms == NULL)
-    goto error_return;
-  memset (all_local_syms, 0, sizeof (Elf_Internal_Sym *) * bfd_count);
-
-  /* Walk over all the input BFDs adding entries to the args hash table
-     for all the external functions.  */
-  for (input_bfd = link_info->input_bfds, index = 0;
-       input_bfd != NULL;
-       input_bfd = input_bfd->link_next, index++)
-    {
-      /* We'll need the symbol table in a second.  */
-      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-      if (symtab_hdr->sh_info == 0)
-	continue;
-
-      /* We need an array of the local symbols attached to the input bfd.
-	 Unfortunately, we're going to have to read & swap them in.  */
-      local_syms
-	= (Elf_Internal_Sym *) bfd_malloc (symtab_hdr->sh_info
-					   * sizeof (Elf_Internal_Sym));
-      if (local_syms == NULL)
-	{
-	  for (i = 0; i < bfd_count; i++)
-	    if (all_local_syms[i])
-	      free (all_local_syms[i]);
-	  free (all_local_syms);
-	  goto error_return;
-	}
-      all_local_syms[index] = local_syms;
-
-      ext_syms
-	= (Elf32_External_Sym *) bfd_malloc (symtab_hdr->sh_info
-					     * sizeof (Elf32_External_Sym));
-      if (ext_syms == NULL)
-	{
-	  for (i = 0; i < bfd_count; i++)
-	    if (all_local_syms[i])
-	      free (all_local_syms[i]);
-	  free (all_local_syms);
-	  goto error_return;
-	}
-
-      if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-	  || bfd_read (ext_syms, 1,
-		       (symtab_hdr->sh_info
-			* sizeof (Elf32_External_Sym)), input_bfd)
-	  != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym)))
-	{
-	  for (i = 0; i < bfd_count; i++)
-	    if (all_local_syms[i])
-	      free (all_local_syms[i]);
-	  free (all_local_syms);
-	  free (ext_syms);
-	  goto error_return;
-	}
-
-      /* Swap the local symbols in.  */
-      isym = local_syms;
-      esym = ext_syms;
-      for (i = 0; i < symtab_hdr->sh_info; i++, esym++, isym++)
-	 bfd_elf32_swap_symbol_in (input_bfd, esym, isym);
-
-      /* Now we can free the external symbols.  */
-      free (ext_syms);
-
-      if (elf32_hppa_read_symext_info (input_bfd, symtab_hdr, args_hash_table,
-				       local_syms) == false)
-	{
-	  for (i = 0; i < bfd_count; i++)
-	    if (all_local_syms[i])
-	      free (all_local_syms[i]);
-	  free (all_local_syms);
-	  goto error_return;
-	}
-    }
-
-  /* Magic as we know the stub bfd only has one section.  */
-  stub_sec = stub_bfd->sections;
-
-  /* If generating a relocateable output file, then we don't
-     have to examine the relocs.  */
-  if (link_info->relocateable)
-    {
-      for (i = 0; i < bfd_count; i++)
-	if (all_local_syms[i])
-	  free (all_local_syms[i]);
-      free (all_local_syms);
-      return true;
-    }
-
-  /* Now that we have argument location information for all the global
-     functions we can start looking for stubs.  */
-  for (input_bfd = link_info->input_bfds, index = 0;
-       input_bfd != NULL;
-       input_bfd = input_bfd->link_next, index++)
-    {
-      /* We'll need the symbol table in a second.  */
-      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-      if (symtab_hdr->sh_info == 0)
-	continue;
-
-      local_syms = all_local_syms[index];
-
-      /* Walk over each section attached to the input bfd.  */
-      for (section = input_bfd->sections;
-	   section != NULL;
-	   section = section->next)
-	{
-	  Elf_Internal_Shdr *input_rel_hdr;
-	  Elf32_External_Rela *external_relocs, *erelaend, *erela;
-	  Elf_Internal_Rela *internal_relocs, *irelaend, *irela;
-
-	  /* If there aren't any relocs, then there's nothing to do.  */
-	  if ((section->flags & SEC_RELOC) == 0
-	      || section->reloc_count == 0)
-	    continue;
-
-	  /* Allocate space for the external relocations.  */
-	  external_relocs
-	    = ((Elf32_External_Rela *)
-	       bfd_malloc (section->reloc_count
-			   * sizeof (Elf32_External_Rela)));
-	  if (external_relocs == NULL)
-	    {
-	      for (i = 0; i < bfd_count; i++)
-		if (all_local_syms[i])
-		  free (all_local_syms[i]);
-	      free (all_local_syms);
-	      goto error_return;
-	    }
-
-	  /* Likewise for the internal relocations.  */
-	  internal_relocs
-	    = ((Elf_Internal_Rela *)
-	       bfd_malloc (section->reloc_count * sizeof (Elf_Internal_Rela)));
-	  if (internal_relocs == NULL)
-	    {
-	      free (external_relocs);
-	      for (i = 0; i < bfd_count; i++)
-		if (all_local_syms[i])
-		  free (all_local_syms[i]);
-	      free (all_local_syms);
-	      goto error_return;
-	    }
-
-	  /* Read in the external relocs.  */
-	  input_rel_hdr = &elf_section_data (section)->rel_hdr;
-	  if (bfd_seek (input_bfd, input_rel_hdr->sh_offset, SEEK_SET) != 0
-	      || bfd_read (external_relocs, 1, input_rel_hdr->sh_size,
-			   input_bfd) != input_rel_hdr->sh_size)
-	    {
-	      free (external_relocs);
-	      free (internal_relocs);
-	      for (i = 0; i < bfd_count; i++)
-		if (all_local_syms[i])
-		  free (all_local_syms[i]);
-	      free (all_local_syms);
-	      goto error_return;
-	    }
-
-	  /* Swap in the relocs.  */
-	  erela = external_relocs;
-	  erelaend = erela + section->reloc_count;
-	  irela = internal_relocs;
-	  for (; erela < erelaend; erela++, irela++)
-	    bfd_elf32_swap_reloca_in (input_bfd, erela, irela);
-
-	  /* We're done with the external relocs, free them.  */
-	  free (external_relocs);
-
-	  /* Now examine each relocation.  */
-	  irela = internal_relocs;
-	  irelaend = irela + section->reloc_count;
-	  for (; irela < irelaend; irela++)
-	    {
-	      long r_type, callee_args, caller_args, size_of_stub;
-	      unsigned long r_index;
-	      struct elf_link_hash_entry *hash;
-	      struct elf32_hppa_stub_hash_entry *stub_hash;
-	      struct elf32_hppa_args_hash_entry *args_hash;
-	      Elf_Internal_Sym *sym;
-	      asection *sym_sec;
-	      const char *sym_name;
-	      symvalue sym_value;
-	      bfd_vma location, destination;
-	      char *new_name = NULL;
-
-	      r_type = ELF32_R_TYPE (irela->r_info);
-	      r_index = ELF32_R_SYM (irela->r_info);
-
-	      if (r_type < 0 || r_type >= (int) R_PARISC_UNIMPLEMENTED)
-		{
-		  bfd_set_error (bfd_error_bad_value);
-		  free (internal_relocs);
-		  for (i = 0; i < bfd_count; i++)
-		    if (all_local_syms[i])
-		      free (all_local_syms[i]);
-		  free (all_local_syms);
-		  goto error_return;
-		}
-
-	      /* Only look for stubs on call instructions or plabel
-		 references.  */
-	      if (r_type != R_PARISC_PCREL17F
-		  && r_type != R_PARISC_PLABEL32
-		  && r_type != R_PARISC_PLABEL21L
-		  && r_type != R_PARISC_PLABEL14R)
-		continue;
-
-	      /* Now determine the call target, its name, value, section
-		 and argument relocation bits.  */
-	      hash = NULL;
-	      sym = NULL;
-	      sym_sec = NULL;
-	      if (r_index < symtab_hdr->sh_info)
-		{
-		  /* It's a local symbol.  */
-		  Elf_Internal_Shdr *hdr;
-
-		  sym = local_syms + r_index;
-		  hdr = elf_elfsections (input_bfd)[sym->st_shndx];
-		  sym_sec = hdr->bfd_section;
-		  sym_name = bfd_elf_string_from_elf_section (input_bfd,
-							      symtab_hdr->sh_link,
-							      sym->st_name);
-		  sym_value = (ELF_ST_TYPE (sym->st_info) == STT_SECTION
-			       ? 0 : sym->st_value);
-		  destination = (sym_value
-				 + sym_sec->output_offset
-				 + sym_sec->output_section->vma);
-
-		  /* Tack on an ID so we can uniquely identify this local
-		     symbol in the stub or arg info hash tables.  */
-		  new_name = bfd_malloc (strlen (sym_name) + 10);
-		  if (new_name == 0)
-		    {
-		      free (internal_relocs);
-		      for (i = 0; i < bfd_count; i++)
-			if (all_local_syms[i])
-			  free (all_local_syms[i]);
-		      free (all_local_syms);
-		      goto error_return;
-		    }
-		  sprintf (new_name, "%s_%08x", sym_name, (int)sym_sec);
-		  sym_name = new_name;
-		}
-	      else
-		{
-		  /* It's an external symbol.  */
-		  long index;
-
-		  index = r_index - symtab_hdr->sh_info;
-		  hash = elf_sym_hashes (input_bfd)[index];
-		  if (hash->root.type == bfd_link_hash_defined
-		      || hash->root.type == bfd_link_hash_defweak)
-		    {
-		      sym_sec = hash->root.u.def.section;
-		      sym_name = hash->root.root.string;
-		      sym_value = hash->root.u.def.value;
-		      destination = (sym_value
-				     + sym_sec->output_offset
-				     + sym_sec->output_section->vma);
-		    }
-		  else
-		    {
-		      bfd_set_error (bfd_error_bad_value);
-		      free (internal_relocs);
-		      for (i = 0; i < bfd_count; i++)
-			if (all_local_syms[i])
-			  free (all_local_syms[i]);
-		      free (all_local_syms);
-		      goto error_return;
-		    }
-		}
-
-	      args_hash = elf32_hppa_args_hash_lookup (args_hash_table,
-						       sym_name, false, false);
-
-	      /* Get both caller and callee argument information.  */
-	      if (args_hash == NULL)
-		callee_args = 0;
-	      else
-		callee_args = args_hash->arg_bits;
-
-	      /* For calls get the caller's bits from the addend of
-		 the call relocation.  For PLABELS the caller's bits
-		 are assumed to have all args & return values in general
-		 registers (0x155).  */
-	      if (r_type == R_PARISC_PCREL17F)
-		caller_args = HPPA_R_ARG_RELOC (irela->r_addend);
-	      else
-		caller_args = 0x155;
-
-	      /* Now determine where the call point is.  */
-	      location = (section->output_offset
-			  + section->output_section->vma
-			  + irela->r_offset);
-
-	      /* We only care about the destination for PCREL function
-		 calls (eg. we don't care for PLABELS).  */
-	      if (r_type != R_PARISC_PCREL17F)
-		location = destination;
-
-	      /* Determine what (if any) linker stub is needed and its
-		 size (in bytes).  */
-	      size_of_stub = elf32_hppa_size_of_stub (callee_args,
-						      caller_args,
-						      location,
-						      destination,
-						      sym_name);
-	      if (size_of_stub != 0)
-		{
-		  char *stub_name;
-		  unsigned int len;
-
-		  /* Get the name of this stub.  */
-		  len = strlen (sym_name);
-		  len += 23;
-
-		  stub_name = bfd_malloc (len);
-		  if (!stub_name)
-		    {
-		      /* Because sym_name was mallocd above for local
-			 symbols.  */
-		      if (r_index < symtab_hdr->sh_info)
-			free (new_name);
-
-		      free (internal_relocs);
-		      for (i = 0; i < bfd_count; i++)
-			if (all_local_syms[i])
-			  free (all_local_syms[i]);
-		      free (all_local_syms);
-		      goto error_return;
-		    }
-		  elf32_hppa_name_of_stub (caller_args, callee_args,
-					   location, destination, stub_name);
-		  strcat (stub_name + 22, sym_name);
-
-		  /* Because sym_name was malloced above for local symbols.  */
-		  if (r_index < symtab_hdr->sh_info)
-		    free (new_name);
-
-		  stub_hash
-		    = elf32_hppa_stub_hash_lookup (stub_hash_table, stub_name,
-						   false, false);
-		  if (stub_hash != NULL)
-		    {
-		      /* The proper stub has already been created, nothing
-			 else to do.  */
-		      free (stub_name);
-		    }
-		  else
-		    {
-		      bfd_set_section_size (stub_bfd, stub_sec,
-					    (bfd_section_size (stub_bfd,
-							       stub_sec)
-					     + size_of_stub));
-
-		      /* Enter this entry into the linker stub hash table.  */
-		      stub_hash
-			= elf32_hppa_stub_hash_lookup (stub_hash_table,
-						       stub_name, true, true);
-		      if (stub_hash == NULL)
-			{
-			  free (stub_name);
-			  free (internal_relocs);
-			  for (i = 0; i < bfd_count; i++)
-			    if (all_local_syms[i])
-			      free (all_local_syms[i]);
-			  free (all_local_syms);
-			  goto error_return;
-			}
-
-		      /* We'll need these to determine the address that the
-			 stub will branch to.  */
-		      stub_hash->target_value = sym_value;
-		      stub_hash->target_section = sym_sec;
-		    }
-		  free (stub_name);
-		}
-	    }
-	  /* We're done with the internal relocs, free them.  */
-	  free (internal_relocs);
-	}
-    }
-  /* We're done with the local symbols, free them.  */
-  for (i = 0; i < bfd_count; i++)
-    if (all_local_syms[i])
-      free (all_local_syms[i]);
-  free (all_local_syms);
-  return true;
-
-error_return:
-  /* Return gracefully, avoiding dangling references to the hash tables.  */
-  if (stub_hash_table)
-    {
-      elf32_hppa_hash_table(link_info)->stub_hash_table = NULL;
-      free (stub_hash_table);
-    }
-  if (args_hash_table)
-    {
-      elf32_hppa_hash_table(link_info)->args_hash_table = NULL;
-      free (args_hash_table);
-    }
-  /* Set the size of the stub section to zero since we're never going
-     to create them.   Avoids losing when we try to get its contents
-     too.  */
-  bfd_set_section_size (stub_bfd, stub_sec, 0);
-  return false;
-}
-
-/* Misc BFD support code.  */
-#define bfd_elf32_bfd_reloc_type_lookup		elf_hppa_reloc_type_lookup
-#define bfd_elf32_bfd_is_local_label_name	hppa_elf_is_local_label_name
-
-/* Symbol extension stuff.  */
-#define bfd_elf32_set_section_contents		elf32_hppa_set_section_contents
-#define elf_info_to_howto			elf32_hppa_info_to_howto
-#define elf_backend_symbol_table_processing \
-  elf32_hppa_backend_symbol_table_processing
-#define elf_backend_begin_write_processing \
-  elf32_hppa_backend_begin_write_processing
-#define elf_backend_final_write_processing \
-  elf32_hppa_backend_final_write_processing
-
-/* Stuff for the BFD linker.  */
-#define elf_backend_relocate_section		elf32_hppa_relocate_section
-#define elf_backend_add_symbol_hook		elf32_hppa_add_symbol_hook
-#define elf_backend_link_output_symbol_hook \
-  elf32_hppa_link_output_symbol_hook
-#define bfd_elf32_bfd_link_hash_table_create \
-  elf32_hppa_link_hash_table_create
-
-#define TARGET_BIG_SYM		bfd_elf32_hppa_vec
-#define TARGET_BIG_NAME		"elf32-hppa"
-#define ELF_ARCH		bfd_arch_hppa
-#define ELF_MACHINE_CODE	EM_PARISC
-#define ELF_MAXPAGESIZE		0x1000
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-hppa.h b/bfd/elf32-hppa.h
deleted file mode 100644
index b2339204592..00000000000
--- a/bfd/elf32-hppa.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ELF32/HPPA support
-
-   This file contains ELF32/HPPA relocation support as specified
-   in the Stratus FTX/Golf Object File Format (SED-1762) dated
-   February 1994.
-
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-
-   Written by:
-
-   Center for Software Science
-   Department of Computer Science
-   University of Utah
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _ELF32_HPPA_H
-#define _ELF32_HPPA_H
-
-#include "elf-bfd.h"
-#include "libhppa.h"
-#include "elf/hppa.h"
-
-#define ELF_HOWTO_TABLE_SIZE	R_PARISC_UNIMPLEMENTED + 1
-#define N_PARISC_RELOCS		R_PARISC_UNIMPLEMENTED + 1
-
-/* Define groups of basic relocations.  FIXME:  These should
-   be the only basic relocations created by GAS.  The rest
-   should be internal to the BFD backend.  
-
-   The idea is both SOM and ELF define these basic relocation
-   types so they map into a SOM or ELF specific relocation 
-   as appropriate.  This allows GAS to share much more code
-   between the two target object formats.  */
-
-#define R_HPPA_NONE			R_PARISC_NONE
-#define	R_HPPA				R_PARISC_DIR32
-#define	R_HPPA_GOTOFF			R_PARISC_DPREL21L
-#define	R_HPPA_PCREL_CALL		R_PARISC_PCREL21L
-#define R_HPPA_ABS_CALL			R_PARISC_DIR17F
-#define R_HPPA_COMPLEX			R_PARISC_UNIMPLEMENTED
-
-elf32_hppa_reloc_type ** hppa_elf_gen_reloc_type
-  PARAMS ((bfd *, elf32_hppa_reloc_type, int, int, int, asymbol *));
-
-boolean elf32_hppa_size_stubs
-  PARAMS ((bfd *, bfd *, struct bfd_link_info *));
-
-boolean elf32_hppa_build_stubs
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-#endif /* _ELF32_HPPA_H */
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
deleted file mode 100644
index 830c680e885..00000000000
--- a/bfd/elf32-i386.c
+++ /dev/null
@@ -1,1943 +0,0 @@
-/* Intel 80386/80486-specific support for 32-bit ELF
-   Copyright 1993-1998, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-static reloc_howto_type *elf_i386_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void elf_i386_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static void elf_i386_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-static boolean elf_i386_is_local_label_name PARAMS ((bfd *, const char *));
-static struct bfd_hash_entry *elf_i386_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *elf_i386_link_hash_table_create
-  PARAMS ((bfd *));
-static boolean elf_i386_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
-static boolean elf_i386_adjust_dynamic_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf_i386_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_i386_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf_i386_finish_dynamic_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
-	   Elf_Internal_Sym *));
-static boolean elf_i386_finish_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-#define USE_REL	1		/* 386 uses REL relocations instead of RELA */
-
-#include "elf/i386.h"
-
-static reloc_howto_type elf_howto_table[]=
-{
-  HOWTO(R_386_NONE,	 0,0, 0,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_NONE",	    true,0x00000000,0x00000000,false),
-  HOWTO(R_386_32,	 0,2,32,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_32",	    true,0xffffffff,0xffffffff,false),
-  HOWTO(R_386_PC32,	 0,2,32,true, 0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_PC32",	    true,0xffffffff,0xffffffff,true),
-  HOWTO(R_386_GOT32,	 0,2,32,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_GOT32",    true,0xffffffff,0xffffffff,false),
-  HOWTO(R_386_PLT32,	 0,2,32,true,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_PLT32",    true,0xffffffff,0xffffffff,true),
-  HOWTO(R_386_COPY,      0,2,32,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_COPY",	    true,0xffffffff,0xffffffff,false),
-  HOWTO(R_386_GLOB_DAT,  0,2,32,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_GLOB_DAT", true,0xffffffff,0xffffffff,false),
-  HOWTO(R_386_JUMP_SLOT, 0,2,32,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_JUMP_SLOT",true,0xffffffff,0xffffffff,false),
-  HOWTO(R_386_RELATIVE,  0,2,32,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_RELATIVE", true,0xffffffff,0xffffffff,false),
-  HOWTO(R_386_GOTOFF,    0,2,32,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_GOTOFF",   true,0xffffffff,0xffffffff,false),
-  HOWTO(R_386_GOTPC,     0,2,32,true,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_GOTPC",    true,0xffffffff,0xffffffff,true),
-  { 11 },
-  { 12 },
-  { 13 },
-  { 14 },
-  { 15 },
-  { 16 },
-  { 17 },
-  { 18 },
-  { 19 },
-  /* The remaining relocs are a GNU extension.  */
-  HOWTO(R_386_16,	 0,1,16,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_16",	    true,0xffff,0xffff,false),
-  HOWTO(R_386_PC16,	 0,1,16,true, 0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_PC16",	    true,0xffff,0xffff,true),
-  HOWTO(R_386_8,	 0,0,8,false,0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_8",	    true,0xff,0xff,false),
-  HOWTO(R_386_PC8,	 0,0,8,true, 0,complain_overflow_bitfield, bfd_elf_generic_reloc,"R_386_PC8",	    true,0xff,0xff,true),
-};
-
-/* GNU extension to record C++ vtable hierarchy.  */
-static reloc_howto_type elf32_i386_vtinherit_howto =
-  HOWTO (R_386_GNU_VTINHERIT,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "R_386_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false);
-
-/* GNU extension to record C++ vtable member usage.  */
-static reloc_howto_type elf32_i386_vtentry_howto =
-  HOWTO (R_386_GNU_VTENTRY,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
-	 "R_386_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false);
-
-#ifdef DEBUG_GEN_RELOC
-#define TRACE(str) fprintf (stderr, "i386 bfd reloc lookup %d (%s)\n", code, str)
-#else
-#define TRACE(str)
-#endif
-
-static reloc_howto_type *
-elf_i386_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_NONE:
-      TRACE ("BFD_RELOC_NONE");
-      return &elf_howto_table[ (int)R_386_NONE ];
-
-    case BFD_RELOC_32:
-      TRACE ("BFD_RELOC_32");
-      return &elf_howto_table[ (int)R_386_32 ];
-
-    case BFD_RELOC_CTOR:
-      TRACE ("BFD_RELOC_CTOR");
-      return &elf_howto_table[ (int)R_386_32 ];
-
-    case BFD_RELOC_32_PCREL:
-      TRACE ("BFD_RELOC_PC32");
-      return &elf_howto_table[ (int)R_386_PC32 ];
-
-    case BFD_RELOC_386_GOT32:
-      TRACE ("BFD_RELOC_386_GOT32");
-      return &elf_howto_table[ (int)R_386_GOT32 ];
-
-    case BFD_RELOC_386_PLT32:
-      TRACE ("BFD_RELOC_386_PLT32");
-      return &elf_howto_table[ (int)R_386_PLT32 ];
-
-    case BFD_RELOC_386_COPY:
-      TRACE ("BFD_RELOC_386_COPY");
-      return &elf_howto_table[ (int)R_386_COPY ];
-
-    case BFD_RELOC_386_GLOB_DAT:
-      TRACE ("BFD_RELOC_386_GLOB_DAT");
-      return &elf_howto_table[ (int)R_386_GLOB_DAT ];
-
-    case BFD_RELOC_386_JUMP_SLOT:
-      TRACE ("BFD_RELOC_386_JUMP_SLOT");
-      return &elf_howto_table[ (int)R_386_JUMP_SLOT ];
-
-    case BFD_RELOC_386_RELATIVE:
-      TRACE ("BFD_RELOC_386_RELATIVE");
-      return &elf_howto_table[ (int)R_386_RELATIVE ];
-
-    case BFD_RELOC_386_GOTOFF:
-      TRACE ("BFD_RELOC_386_GOTOFF");
-      return &elf_howto_table[ (int)R_386_GOTOFF ];
-
-    case BFD_RELOC_386_GOTPC:
-      TRACE ("BFD_RELOC_386_GOTPC");
-      return &elf_howto_table[ (int)R_386_GOTPC ];
-
-      /* The remaining relocs are a GNU extension.  */
-    case BFD_RELOC_16:
-      TRACE ("BFD_RELOC_16");
-      return &elf_howto_table[(int) R_386_16];
-
-    case BFD_RELOC_16_PCREL:
-      TRACE ("BFD_RELOC_16_PCREL");
-      return &elf_howto_table[(int) R_386_PC16];
-
-    case BFD_RELOC_8:
-      TRACE ("BFD_RELOC_8");
-      return &elf_howto_table[(int) R_386_8];
-
-    case BFD_RELOC_8_PCREL:
-      TRACE ("BFD_RELOC_8_PCREL");
-      return &elf_howto_table[(int) R_386_PC8];
-
-    case BFD_RELOC_VTABLE_INHERIT:
-      TRACE ("BFD_RELOC_VTABLE_INHERIT");
-      return &elf32_i386_vtinherit_howto;
-
-    case BFD_RELOC_VTABLE_ENTRY:
-      TRACE ("BFD_RELOC_VTABLE_ENTRY");
-      return &elf32_i386_vtentry_howto;
-
-    default:
-      break;
-    }
-
-  TRACE ("Unknown");
-  return 0;
-}
-
-static void
-elf_i386_info_to_howto (abfd, cache_ptr, dst)
-     bfd		*abfd;
-     arelent		*cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  abort ();
-}
-
-static void
-elf_i386_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
-{
-  enum elf_i386_reloc_type type;
-
-  type = (enum elf_i386_reloc_type) ELF32_R_TYPE (dst->r_info);
-  if (type == R_386_GNU_VTINHERIT)
-    cache_ptr->howto = &elf32_i386_vtinherit_howto;
-  else if (type == R_386_GNU_VTENTRY)
-    cache_ptr->howto = &elf32_i386_vtentry_howto;
-  else
-    {
-      BFD_ASSERT (type < R_386_max);
-      BFD_ASSERT (type < FIRST_INVALID_RELOC || type > LAST_INVALID_RELOC);
-      cache_ptr->howto = &elf_howto_table[(int) type];
-    }
-}
-
-/* Return whether a symbol name implies a local label.  The UnixWare
-   2.1 cc generates temporary symbols that start with .X, so we
-   recognize them here.  FIXME: do other SVR4 compilers also use .X?.
-   If so, we should move the .X recognition into
-   _bfd_elf_is_local_label_name.  */
-
-static boolean
-elf_i386_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  if (name[0] == '.' && name[1] == 'X')
-    return true;
-
-  return _bfd_elf_is_local_label_name (abfd, name);
-}
-
-/* Functions for the i386 ELF linker.  */
-
-/* The name of the dynamic interpreter.  This is put in the .interp
-   section.  */
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
-
-/* The size in bytes of an entry in the procedure linkage table.  */
-
-#define PLT_ENTRY_SIZE 16
-
-/* The first entry in an absolute procedure linkage table looks like
-   this.  See the SVR4 ABI i386 supplement to see how this works.  */
-
-static const bfd_byte elf_i386_plt0_entry[PLT_ENTRY_SIZE] =
-{
-  0xff, 0x35,	/* pushl contents of address */
-  0, 0, 0, 0,	/* replaced with address of .got + 4.  */
-  0xff, 0x25,	/* jmp indirect */
-  0, 0, 0, 0,	/* replaced with address of .got + 8.  */
-  0, 0, 0, 0	/* pad out to 16 bytes.  */
-};
-
-/* Subsequent entries in an absolute procedure linkage table look like
-   this.  */
-
-static const bfd_byte elf_i386_plt_entry[PLT_ENTRY_SIZE] =
-{
-  0xff, 0x25,	/* jmp indirect */
-  0, 0, 0, 0,	/* replaced with address of this symbol in .got.  */
-  0x68,		/* pushl immediate */
-  0, 0, 0, 0,	/* replaced with offset into relocation table.  */
-  0xe9,		/* jmp relative */
-  0, 0, 0, 0	/* replaced with offset to start of .plt.  */
-};
-
-/* The first entry in a PIC procedure linkage table look like this.  */
-
-static const bfd_byte elf_i386_pic_plt0_entry[PLT_ENTRY_SIZE] =
-{
-  0xff, 0xb3, 4, 0, 0, 0,	/* pushl 4(%ebx) */
-  0xff, 0xa3, 8, 0, 0, 0,	/* jmp *8(%ebx) */
-  0, 0, 0, 0			/* pad out to 16 bytes.  */
-};
-
-/* Subsequent entries in a PIC procedure linkage table look like this.  */
-
-static const bfd_byte elf_i386_pic_plt_entry[PLT_ENTRY_SIZE] =
-{
-  0xff, 0xa3,	/* jmp *offset(%ebx) */
-  0, 0, 0, 0,	/* replaced with offset of this symbol in .got.  */
-  0x68,		/* pushl immediate */
-  0, 0, 0, 0,	/* replaced with offset into relocation table.  */
-  0xe9,		/* jmp relative */
-  0, 0, 0, 0	/* replaced with offset to start of .plt.  */
-};
-
-/* The i386 linker needs to keep track of the number of relocs that it
-   decides to copy in check_relocs for each symbol.  This is so that
-   it can discard PC relative relocs if it doesn't need them when
-   linking with -Bsymbolic.  We store the information in a field
-   extending the regular ELF linker hash table.  */
-
-/* This structure keeps track of the number of PC relative relocs we
-   have copied for a given symbol.  */
-
-struct elf_i386_pcrel_relocs_copied
-{
-  /* Next section.  */
-  struct elf_i386_pcrel_relocs_copied *next;
-  /* A section in dynobj.  */
-  asection *section;
-  /* Number of relocs copied in this section.  */
-  bfd_size_type count;
-};
-
-/* i386 ELF linker hash entry.  */
-
-struct elf_i386_link_hash_entry
-{
-  struct elf_link_hash_entry root;
-
-  /* Number of PC relative relocs copied for this symbol.  */
-  struct elf_i386_pcrel_relocs_copied *pcrel_relocs_copied;
-};
-
-/* i386 ELF linker hash table.  */
-
-struct elf_i386_link_hash_table
-{
-  struct elf_link_hash_table root;
-};
-
-/* Declare this now that the above structures are defined.  */
-
-static boolean elf_i386_discard_copies
-  PARAMS ((struct elf_i386_link_hash_entry *, PTR));
-
-/* Traverse an i386 ELF linker hash table.  */
-
-#define elf_i386_link_hash_traverse(table, func, info)			\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the i386 ELF linker hash table from a link_info structure.  */
-
-#define elf_i386_hash_table(p) \
-  ((struct elf_i386_link_hash_table *) ((p)->hash))
-
-/* Create an entry in an i386 ELF linker hash table.  */
-
-static struct bfd_hash_entry *
-elf_i386_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct elf_i386_link_hash_entry *ret =
-    (struct elf_i386_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct elf_i386_link_hash_entry *) NULL)
-    ret = ((struct elf_i386_link_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct elf_i386_link_hash_entry)));
-  if (ret == (struct elf_i386_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct elf_i386_link_hash_entry *)
-	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				     table, string));
-  if (ret != (struct elf_i386_link_hash_entry *) NULL)
-    {
-      ret->pcrel_relocs_copied = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create an i386 ELF linker hash table.  */
-
-static struct bfd_link_hash_table *
-elf_i386_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct elf_i386_link_hash_table *ret;
-
-  ret = ((struct elf_i386_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct elf_i386_link_hash_table)));
-  if (ret == (struct elf_i386_link_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
-				       elf_i386_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  return &ret->root.root;
-}
-
-/* Look through the relocs for a section during the first phase, and
-   allocate space in the global offset table or procedure linkage
-   table.  */
-
-static boolean
-elf_i386_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_vma *local_got_offsets;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-  asection *sgot;
-  asection *srelgot;
-  asection *sreloc;
-
-  if (info->relocateable)
-    return true;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_offsets = elf_local_got_offsets (abfd);
-
-  sgot = NULL;
-  srelgot = NULL;
-  sreloc = NULL;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-      /* Some relocs require a global offset table.  */
-      if (dynobj == NULL)
-	{
-	  switch (ELF32_R_TYPE (rel->r_info))
-	    {
-	    case R_386_GOT32:
-	    case R_386_GOTOFF:
-	    case R_386_GOTPC:
-	      elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_386_GOT32:
-	  /* This symbol requires a global offset table entry.  */
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (srelgot == NULL
-	      && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rel.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rel.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
-	  if (h != NULL)
-	    {
-	      if (h->got.offset != (bfd_vma) -1)
-		{
-		  /* We have already allocated space in the .got.  */
-		  break;
-		}
-	      h->got.offset = sgot->_raw_size;
-
-	      /* Make sure this symbol is output as a dynamic symbol.  */
-	      if (h->dynindx == -1)
-		{
-		  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		    return false;
-		}
-
-	      srelgot->_raw_size += sizeof (Elf32_External_Rel);
-	    }
-	  else
-	    {
-     	      /* This is a global offset table entry for a local
-                 symbol.  */
-	      if (local_got_offsets == NULL)
-		{
-		  size_t size;
-		  register unsigned int i;
-
-		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
-		  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
-		  if (local_got_offsets == NULL)
-		    return false;
-		  elf_local_got_offsets (abfd) = local_got_offsets;
-		  for (i = 0; i < symtab_hdr->sh_info; i++)
-		    local_got_offsets[i] = (bfd_vma) -1;
-		}
-	      if (local_got_offsets[r_symndx] != (bfd_vma) -1)
-		{
-		  /* We have already allocated space in the .got.  */
-		  break;
-		}
-	      local_got_offsets[r_symndx] = sgot->_raw_size;
-
-	      if (info->shared)
-		{
-		  /* If we are generating a shared object, we need to
-                     output a R_386_RELATIVE reloc so that the dynamic
-                     linker can adjust this GOT entry.  */
-		  srelgot->_raw_size += sizeof (Elf32_External_Rel);
-		}
-	    }
-
-	  sgot->_raw_size += 4;
-
-	  break;
-
-	case R_386_PLT32:
-	  /* This symbol requires a procedure linkage table entry.  We
-             actually build the entry in adjust_dynamic_symbol,
-             because this might be a case of linking PIC code which is
-             never referenced by a dynamic object, in which case we
-             don't need to generate a procedure linkage table entry
-             after all.  */
-
-	  /* If this is a local symbol, we resolve it directly without
-             creating a procedure linkage table entry.  */
-	  if (h == NULL)
-	    continue;
-
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-
-	  break;
-
-	case R_386_32:
-	case R_386_PC32:
-	  /* If we are creating a shared library, and this is a reloc
-             against a global symbol, or a non PC relative reloc
-             against a local symbol, then we need to copy the reloc
-             into the shared library.  However, if we are linking with
-             -Bsymbolic, we do not need to copy a reloc against a
-             global symbol which is defined in an object we are
-             including in the link (i.e., DEF_REGULAR is set).  At
-             this point we have not seen all the input files, so it is
-             possible that DEF_REGULAR is not set now but will be set
-             later (it is never cleared).  We account for that
-             possibility below by storing information in the
-             pcrel_relocs_copied field of the hash table entry.  */
-	  if (info->shared
-	      && (sec->flags & SEC_ALLOC) != 0
-	      && (ELF32_R_TYPE (rel->r_info) != R_386_PC32
-		  || (h != NULL
-		      && (! info->symbolic
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))))
-	    {
-	      /* When creating a shared object, we must copy these
-                 reloc types into the output file.  We create a reloc
-                 section in dynobj and make room for this reloc.  */
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (abfd,
-			   elf_elfheader (abfd)->e_shstrndx,
-			   elf_section_data (sec)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rel", 4) == 0
-			      && strcmp (bfd_get_section_name (abfd, sec),
-					 name + 4) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  if (sreloc == NULL)
-		    {
-		      flagword flags;
-
-		      sreloc = bfd_make_section (dynobj, name);
-		      flags = (SEC_HAS_CONTENTS | SEC_READONLY
-			       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-		      if ((sec->flags & SEC_ALLOC) != 0)
-			flags |= SEC_ALLOC | SEC_LOAD;
-		      if (sreloc == NULL
-			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
-			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
-		    }
-		}
-
-	      sreloc->_raw_size += sizeof (Elf32_External_Rel);
-
-	      /* If we are linking with -Bsymbolic, and this is a
-                 global symbol, we count the number of PC relative
-                 relocations we have entered for this symbol, so that
-                 we can discard them again if the symbol is later
-                 defined by a regular object.  Note that this function
-                 is only called if we are using an elf_i386 linker
-                 hash table, which means that h is really a pointer to
-                 an elf_i386_link_hash_entry.  */
-	      if (h != NULL && info->symbolic
-		  && ELF32_R_TYPE (rel->r_info) == R_386_PC32)
-		{
-		  struct elf_i386_link_hash_entry *eh;
-		  struct elf_i386_pcrel_relocs_copied *p;
-
-		  eh = (struct elf_i386_link_hash_entry *) h;
-
-		  for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
-		    if (p->section == sreloc)
-		      break;
-
-		  if (p == NULL)
-		    {
-		      p = ((struct elf_i386_pcrel_relocs_copied *)
-			   bfd_alloc (dynobj, sizeof *p));
-		      if (p == NULL)
-			return false;
-		      p->next = eh->pcrel_relocs_copied;
-		      eh->pcrel_relocs_copied = p;
-		      p->section = sreloc;
-		      p->count = 0;
-		    }
-
-		  ++p->count;
-		}
-	    }
-
-	  break;
-
-	  /* This relocation describes the C++ object vtable hierarchy.
-	     Reconstruct it for later use during GC.  */
-	case R_386_GNU_VTINHERIT:
-	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
-	  break;
-
-	  /* This relocation describes which C++ vtable entries are actually
-	     used.  Record for later use during GC.  */
-	case R_386_GNU_VTENTRY:
-	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-	    return false;
-	  break;
-
-	default:
-	  break;
-	}
-    }
-
-  return true;
-}
-
-/* Return the section that should be marked against GC for a given
-   relocation.  */
-
-static asection *
-elf_i386_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     Elf_Internal_Rela *rel;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_386_GNU_VTINHERIT:
-	case R_386_GNU_VTENTRY:
-	  break;
-
-	default:
-	  switch (h->root.type)
-	    {
-	    case bfd_link_hash_defined:
-	    case bfd_link_hash_defweak:
-	      return h->root.u.def.section;
-
-	    case bfd_link_hash_common:
-	      return h->root.u.c.p->section;
-
-	    default:
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-		&& sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
-
-  return NULL;
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-
-static boolean
-elf_i386_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  /* ??? It would seem that the existing i386 code does no sort
-     of reference counting or whatnot on its GOT and PLT entries,
-     so it is not possible to garbage collect them at this time.  */
-
-  return true;
-}
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-elf_i386_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  bfd *dynobj;
-  asection *s;
-  unsigned int power_of_two;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
-  /* If this is a function, put it in the procedure linkage table.  We
-     will fill in the contents of the procedure linkage table later,
-     when we know the address of the .got section.  */
-  if (h->type == STT_FUNC
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
-    {
-      if (! info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0)
-	{
-	  /* This case can occur if we saw a PLT32 reloc in an input
-             file, but the symbol was never referred to by a dynamic
-             object.  In such a case, we don't actually need to build
-             a procedure linkage table, and we can just do a PC32
-             reloc instead.  */
-	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
-	  return true;
-	}
-
-      /* Make sure this symbol is output as a dynamic symbol.  */
-      if (h->dynindx == -1)
-	{
-	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-      /* If this is the first .plt entry, make room for the special
-	 first entry.  */
-      if (s->_raw_size == 0)
-	s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* If this symbol is not defined in a regular file, and we are
-	 not generating a shared library, then set the symbol to this
-	 location in the .plt.  This is required to make function
-	 pointers compare as equal between the normal executable and
-	 the shared library.  */
-      if (! info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  h->root.u.def.section = s;
-	  h->root.u.def.value = s->_raw_size;
-	}
-
-      h->plt.offset = s->_raw_size;
-
-      /* Make room for this entry.  */
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .got.plt section, which
-	 will be placed in the .got section by the linker script.  */
-
-      s = bfd_get_section_by_name (dynobj, ".got.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += 4;
-
-      /* We also need to make an entry in the .rel.plt section.  */
-
-      s = bfd_get_section_by_name (dynobj, ".rel.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf32_External_Rel);
-
-      return true;
-    }
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  /* If we are creating a shared library, we must presume that the
-     only references to the symbol are via the global offset table.
-     For such cases we need not do anything here; the relocations will
-     be handled correctly by relocate_section.  */
-  if (info->shared)
-    return true;
-
-  /* We must allocate the symbol in our .dynbss section, which will
-     become part of the .bss section of the executable.  There will be
-     an entry for this symbol in the .dynsym section.  The dynamic
-     object will contain position independent code, so all references
-     from the dynamic object to this symbol will go through the global
-     offset table.  The dynamic linker will use the .dynsym entry to
-     determine the address it must put in the global offset table, so
-     both the dynamic object and the regular object will refer to the
-     same memory location for the variable.  */
-
-  s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
-
-  /* We must generate a R_386_COPY reloc to tell the dynamic linker to
-     copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rel.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-    {
-      asection *srel;
-
-      srel = bfd_get_section_by_name (dynobj, ".rel.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf32_External_Rel);
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
-    }
-
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 3)
-    power_of_two = 3;
-
-  /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
-    {
-      if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
-    }
-
-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->_raw_size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->_raw_size += h->size;
-
-  return true;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-elf_i386_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (! info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-    }
-  else
-    {
-      /* We may have created entries in the .rel.got section.
-         However, if we are not creating the dynamic sections, we will
-         not actually use these entries.  Reset the size of .rel.got,
-         which will cause it to get stripped from the output file
-         below.  */
-      s = bfd_get_section_by_name (dynobj, ".rel.got");
-      if (s != NULL)
-	s->_raw_size = 0;
-    }
-
-  /* If this is a -Bsymbolic shared link, then we need to discard all
-     PC relative relocs against symbols defined in a regular object.
-     We allocated space for them in the check_relocs routine, but we
-     will not fill them in in the relocate_section routine.  */
-  if (info->shared && info->symbolic)
-    elf_i386_link_hash_traverse (elf_i386_hash_table (info),
-				 elf_i386_discard_copies,
-				 (PTR) NULL);
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      boolean strip;
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-	continue;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strcmp (name, ".plt") == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* Strip this section if we don't need it; see the
-                 comment below.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      /* Remember whether there is a PLT.  */
-	      plt = true;
-	    }
-	}
-      else if (strncmp (name, ".rel", 4) == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is mostly to handle .rel.bss and
-		 .rel.plt.  We must create both sections in
-		 create_dynamic_sections, because they must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      asection *target;
-
-	      /* Remember whether there are any reloc sections other
-                 than .rel.plt.  */
-	      if (strcmp (name, ".rel.plt") != 0)
-		{
-		  const char *outname;
-
-		  relocs = true;
-
-		  /* If this relocation section applies to a read only
-		     section, then we probably need a DT_TEXTREL
-		     entry.  The entries in the .rel.plt section
-		     really apply to the .got section, which we
-		     created ourselves and so know is not readonly.  */
-		  outname = bfd_get_section_name (output_bfd,
-						  s->output_section);
-		  target = bfd_get_section_by_name (output_bfd, outname + 4);
-		  if (target != NULL
-		      && (target->flags & SEC_READONLY) != 0
-		      && (target->flags & SEC_ALLOC) != 0)
-		    reltext = true;
-		}
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
-	    }
-	}
-      else if (strncmp (name, ".got", 4) != 0)
-	{
-	  /* It's not one of our sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	{
-	  _bfd_strip_section_from_output (s);
-	  continue;
-	}
-
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in elf_i386_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (! info->shared)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
-	}
-
-      if (plt)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_PLTGOT, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTREL, DT_REL)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_JMPREL, 0))
-	    return false;
-	}
-
-      if (relocs)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_REL, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_RELSZ, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_RELENT,
-						sizeof (Elf32_External_Rel)))
-	    return false;
-	}
-
-      if (reltext)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* This function is called via elf_i386_link_hash_traverse if we are
-   creating a shared object with -Bsymbolic.  It discards the space
-   allocated to copy PC relative relocs against symbols which are
-   defined in regular objects.  We allocated space for them in the
-   check_relocs routine, but we won't fill them in in the
-   relocate_section routine.  */
-
-/*ARGSUSED*/
-static boolean
-elf_i386_discard_copies (h, ignore)
-     struct elf_i386_link_hash_entry *h;
-     PTR ignore;
-{
-  struct elf_i386_pcrel_relocs_copied *s;
-
-  /* We only discard relocs for symbols defined in a regular object.  */
-  if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
-
-  for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
-    s->section->_raw_size -= s->count * sizeof (Elf32_External_Rel);
-
-  return true;
-}
-
-/* Relocate an i386 ELF section.  */
-
-static boolean
-elf_i386_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_vma *local_got_offsets;
-  asection *sgot;
-  asection *splt;
-  asection *sreloc;
-  Elf_Internal_Rela *rel;
-  Elf_Internal_Rela *relend;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-  local_got_offsets = elf_local_got_offsets (input_bfd);
-
-  sgot = NULL;
-  splt = NULL;
-  sreloc = NULL;
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_type = ELF32_R_TYPE (rel->r_info);
-      if (r_type == R_386_GNU_VTINHERIT
-	  || r_type == R_386_GNU_VTENTRY)
-	continue;
-      if (r_type < 0
-	  || r_type >= (int) R_386_max
-	  || (r_type >= (int) FIRST_INVALID_RELOC
-	      && r_type <= (int) LAST_INVALID_RELOC))
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      howto = elf_howto_table + r_type;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  bfd_vma val;
-
-		  sec = local_sections[r_symndx];
-		  val = bfd_get_32 (input_bfd, contents + rel->r_offset);
-		  val += sec->output_offset + sym->st_value;
-		  bfd_put_32 (input_bfd, val, contents + rel->r_offset);
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      if (r_type == R_386_GOTPC
-		  || (r_type == R_386_PLT32
-		      && h->plt.offset != (bfd_vma) -1)
-		  || (r_type == R_386_GOT32
-		      && elf_hash_table (info)->dynamic_sections_created
-		      && (! info->shared
-			  || (! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		  || (info->shared
-		      && ((! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0)
-		      && (r_type == R_386_32
-			  || r_type == R_386_PC32)
-		      && ((input_section->flags & SEC_ALLOC) != 0
-			  /* DWARF will emit R_386_32 relocations in its
-			     sections against symbols defined externally
-			     in shared libraries.  We can't do anything
-			     with them here.  */
-			  || (input_section->flags & SEC_DEBUGGING) != 0)))
-		{
-		  /* In these cases, we don't need the relocation
-                     value.  We check specially because in some
-                     obscure cases sec->output_section will be NULL.  */
-		  relocation = 0;
-		}
-	      else if (sec->output_section == NULL)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: warning: unresolvable relocation against symbol `%s' from %s section"),
-		     bfd_get_filename (input_bfd), h->root.root.string,
-		     bfd_get_section_name (input_bfd, input_section));
-		  relocation = 0;
-		}
-	      else
-		relocation = (h->root.u.def.value
-			      + sec->output_section->vma
-			      + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else if (info->shared && !info->symbolic && !info->no_undefined)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      switch (r_type)
-	{
-	case R_386_GOT32:
-	  /* Relocation is to the entry for this symbol in the global
-	     offset table.  */
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (h != NULL)
-	    {
-	      bfd_vma off;
-
-	      off = h->got.offset;
-	      BFD_ASSERT (off != (bfd_vma) -1);
-
-	      if (! elf_hash_table (info)->dynamic_sections_created
-		  || (info->shared
-		      && (info->symbolic || h->dynindx == -1)
-		      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
-		{
-		  /* This is actually a static link, or it is a
-		     -Bsymbolic link and the symbol is defined
-		     locally, or the symbol was forced to be local
-		     because of a version file.  We must initialize
-		     this entry in the global offset table.  Since the
-		     offset must always be a multiple of 4, we use the
-		     least significant bit to record whether we have
-		     initialized it already.
-
-		     When doing a dynamic link, we create a .rel.got
-		     relocation entry to initialize the value.  This
-		     is done in the finish_dynamic_symbol routine.  */
-		  if ((off & 1) != 0)
-		    off &= ~1;
-		  else
-		    {
-		      bfd_put_32 (output_bfd, relocation,
-				  sgot->contents + off);
-		      h->got.offset |= 1;
-		    }
-		}
-
-	      relocation = sgot->output_offset + off;
-	    }
-	  else
-	    {
-	      bfd_vma off;
-
-	      BFD_ASSERT (local_got_offsets != NULL
-			  && local_got_offsets[r_symndx] != (bfd_vma) -1);
-
-	      off = local_got_offsets[r_symndx];
-
-	      /* The offset must always be a multiple of 4.  We use
-                 the least significant bit to record whether we have
-                 already generated the necessary reloc.  */
-	      if ((off & 1) != 0)
-		off &= ~1;
-	      else
-		{
-		  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
-
-		  if (info->shared)
-		    {
-		      asection *srelgot;
-		      Elf_Internal_Rel outrel;
-
-		      srelgot = bfd_get_section_by_name (dynobj, ".rel.got");
-		      BFD_ASSERT (srelgot != NULL);
-
-		      outrel.r_offset = (sgot->output_section->vma
-					 + sgot->output_offset
-					 + off);
-		      outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
-		      bfd_elf32_swap_reloc_out (output_bfd, &outrel,
-						(((Elf32_External_Rel *)
-						  srelgot->contents)
-						 + srelgot->reloc_count));
-		      ++srelgot->reloc_count;
-		    }
-
-		  local_got_offsets[r_symndx] |= 1;
-		}
-
-	      relocation = sgot->output_offset + off;
-	    }
-
-	  break;
-
-	case R_386_GOTOFF:
-	  /* Relocation is relative to the start of the global offset
-	     table.  */
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  /* Note that sgot->output_offset is not involved in this
-	     calculation.  We always want the start of .got.  If we
-	     defined _GLOBAL_OFFSET_TABLE in a different way, as is
-	     permitted by the ABI, we might have to change this
-	     calculation.  */
-	  relocation -= sgot->output_section->vma;
-
-	  break;
-
-	case R_386_GOTPC:
-	  /* Use global offset table as symbol value.  */
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  relocation = sgot->output_section->vma;
-
-	  break;
-
-	case R_386_PLT32:
-	  /* Relocation is to the entry for this symbol in the
-	     procedure linkage table.  */
-
-	  /* Resolve a PLT32 reloc again a local symbol directly,
-             without using the procedure linkage table.  */
-	  if (h == NULL)
-	    break;
-
-	  if (h->plt.offset == (bfd_vma) -1)
-	    {
-	      /* We didn't make a PLT entry for this symbol.  This
-                 happens when statically linking PIC code, or when
-                 using -Bsymbolic.  */
-	      break;
-	    }
-
-	  if (splt == NULL)
-	    {
-	      splt = bfd_get_section_by_name (dynobj, ".plt");
-	      BFD_ASSERT (splt != NULL);
-	    }
-
-	  relocation = (splt->output_section->vma
-			+ splt->output_offset
-			+ h->plt.offset);
-
-	  break;
-
-	case R_386_32:
-	case R_386_PC32:
-	  if (info->shared
-	      && (input_section->flags & SEC_ALLOC) != 0
-	      && (r_type != R_386_PC32
-		  || (h != NULL
-		      && h->dynindx != -1
-		      && (! info->symbolic
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))))
-	    {
-	      Elf_Internal_Rel outrel;
-	      boolean skip, relocate;
-
-	      /* When generating a shared object, these relocations
-		 are copied into the output file to be resolved at run
-		 time.  */
-
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (input_bfd,
-			   elf_elfheader (input_bfd)->e_shstrndx,
-			   elf_section_data (input_section)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rel", 4) == 0
-			      && strcmp (bfd_get_section_name (input_bfd,
-							       input_section),
-					 name + 4) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  BFD_ASSERT (sreloc != NULL);
-		}
-
-	      skip = false;
-
-	      if (elf_section_data (input_section)->stab_info == NULL)
-		outrel.r_offset = rel->r_offset;
-	      else
-		{
-		  bfd_vma off;
-
-		  off = (_bfd_stab_section_offset
-			 (output_bfd, &elf_hash_table (info)->stab_info,
-			  input_section,
-			  &elf_section_data (input_section)->stab_info,
-			  rel->r_offset));
-		  if (off == (bfd_vma) -1)
-		    skip = true;
-		  outrel.r_offset = off;
-		}
-
-	      outrel.r_offset += (input_section->output_section->vma
-				  + input_section->output_offset);
-
-	      if (skip)
-		{
-		  memset (&outrel, 0, sizeof outrel);
-		  relocate = false;
-		}
-	      else if (r_type == R_386_PC32)
-		{
-		  BFD_ASSERT (h != NULL && h->dynindx != -1);
-		  relocate = false;
-		  outrel.r_info = ELF32_R_INFO (h->dynindx, R_386_PC32);
-		}
-	      else
-		{
-		  /* h->dynindx may be -1 if this symbol was marked to
-                     become local.  */
-		  if (h == NULL
-		      || ((info->symbolic || h->dynindx == -1)
-			  && (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) != 0))
-		    {
-		      relocate = true;
-		      outrel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
-		    }
-		  else
-		    {
-		      BFD_ASSERT (h->dynindx != -1);
-		      relocate = false;
-		      outrel.r_info = ELF32_R_INFO (h->dynindx, R_386_32);
-		    }
-		}
-
-	      bfd_elf32_swap_reloc_out (output_bfd, &outrel,
-					(((Elf32_External_Rel *)
-					  sreloc->contents)
-					 + sreloc->reloc_count));
-	      ++sreloc->reloc_count;
-
-	      /* If this reloc is against an external symbol, we do
-		 not want to fiddle with the addend.  Otherwise, we
-		 need to include the symbol value so that it becomes
-		 an addend for the dynamic reloc.  */
-	      if (! relocate)
-		continue;
-	    }
-
-	  break;
-
-	default:
-	  break;
-	}
-
-      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-				    contents, rel->r_offset,
-				    relocation, (bfd_vma) 0);
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else
-		  {
-		    name = bfd_elf_string_from_elf_section (input_bfd,
-							    symtab_hdr->sh_link,
-							    sym->st_name);
-		    if (name == NULL)
-		      return false;
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-		if (! ((*info->callbacks->reloc_overflow)
-		       (info, name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-elf_i386_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  bfd *dynobj;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  if (h->plt.offset != (bfd_vma) -1)
-    {
-      asection *splt;
-      asection *sgot;
-      asection *srel;
-      bfd_vma plt_index;
-      bfd_vma got_offset;
-      Elf_Internal_Rel rel;
-
-      /* This symbol has an entry in the procedure linkage table.  Set
-	 it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-      srel = bfd_get_section_by_name (dynobj, ".rel.plt");
-      BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
-
-      /* Get the index in the procedure linkage table which
-	 corresponds to this symbol.  This is the index of this symbol
-	 in all the symbols for which we are making plt entries.  The
-	 first entry in the procedure linkage table is reserved.  */
-      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
-
-      /* Get the offset into the .got table of the entry that
-	 corresponds to this function.  Each .got entry is 4 bytes.
-	 The first three are reserved.  */
-      got_offset = (plt_index + 3) * 4;
-
-      /* Fill in the entry in the procedure linkage table.  */
-      if (! info->shared)
-	{
-	  memcpy (splt->contents + h->plt.offset, elf_i386_plt_entry,
-		  PLT_ENTRY_SIZE);
-	  bfd_put_32 (output_bfd,
-		      (sgot->output_section->vma
-		       + sgot->output_offset
-		       + got_offset),
-		      splt->contents + h->plt.offset + 2);
-	}
-      else
-	{
-	  memcpy (splt->contents + h->plt.offset, elf_i386_pic_plt_entry,
-		  PLT_ENTRY_SIZE);
-	  bfd_put_32 (output_bfd, got_offset,
-		      splt->contents + h->plt.offset + 2);
-	}
-
-      bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rel),
-		  splt->contents + h->plt.offset + 7);
-      bfd_put_32 (output_bfd, - (h->plt.offset + PLT_ENTRY_SIZE),
-		  splt->contents + h->plt.offset + 12);
-
-      /* Fill in the entry in the global offset table.  */
-      bfd_put_32 (output_bfd,
-		  (splt->output_section->vma
-		   + splt->output_offset
-		   + h->plt.offset
-		   + 6),
-		  sgot->contents + got_offset);
-
-      /* Fill in the entry in the .rel.plt section.  */
-      rel.r_offset = (sgot->output_section->vma
-		      + sgot->output_offset
-		      + got_offset);
-      rel.r_info = ELF32_R_INFO (h->dynindx, R_386_JUMP_SLOT);
-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-				((Elf32_External_Rel *) srel->contents
-				 + plt_index));
-
-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
-	  sym->st_shndx = SHN_UNDEF;
-	}
-    }
-
-  if (h->got.offset != (bfd_vma) -1)
-    {
-      asection *sgot;
-      asection *srel;
-      Elf_Internal_Rel rel;
-
-      /* This symbol has an entry in the global offset table.  Set it
-	 up.  */
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srel = bfd_get_section_by_name (dynobj, ".rel.got");
-      BFD_ASSERT (sgot != NULL && srel != NULL);
-
-      rel.r_offset = (sgot->output_section->vma
-		      + sgot->output_offset
-		      + (h->got.offset &~ 1));
-
-      /* If this is a -Bsymbolic link, and the symbol is defined
-	 locally, we just want to emit a RELATIVE reloc.  Likewise if
-	 the symbol was forced to be local because of a version file.
-	 The entry in the global offset table will already have been
-	 initialized in the relocate_section function.  */
-      if (info->shared
-	  && (info->symbolic || h->dynindx == -1)
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
-	rel.r_info = ELF32_R_INFO (0, R_386_RELATIVE);
-      else
-	{
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	  rel.r_info = ELF32_R_INFO (h->dynindx, R_386_GLOB_DAT);
-	}
-
-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-				((Elf32_External_Rel *) srel->contents
-				 + srel->reloc_count));
-      ++srel->reloc_count;
-    }
-
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
-    {
-      asection *s;
-      Elf_Internal_Rel rel;
-
-      /* This symbol needs a copy reloc.  Set it up.  */
-
-      BFD_ASSERT (h->dynindx != -1
-		  && (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak));
-
-      s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				   ".rel.bss");
-      BFD_ASSERT (s != NULL);
-
-      rel.r_offset = (h->root.u.def.value
-		      + h->root.u.def.section->output_section->vma
-		      + h->root.u.def.section->output_offset);
-      rel.r_info = ELF32_R_INFO (h->dynindx, R_386_COPY);
-      bfd_elf32_swap_reloc_out (output_bfd, &rel,
-				((Elf32_External_Rel *) s->contents
-				 + s->reloc_count));
-      ++s->reloc_count;
-    }
-
-  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-
-  return true;
-}
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-elf_i386_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *sgot;
-  asection *sdyn;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-  BFD_ASSERT (sgot != NULL);
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      asection *splt;
-      Elf32_External_Dyn *dyncon, *dynconend;
-
-      BFD_ASSERT (sdyn != NULL);
-
-      dyncon = (Elf32_External_Dyn *) sdyn->contents;
-      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  asection *s;
-
-	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    default:
-	      break;
-
-	    case DT_PLTGOT:
-	      name = ".got";
-	      goto get_vma;
-	    case DT_JMPREL:
-	      name = ".rel.plt";
-	    get_vma:
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_ptr = s->vma;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_PLTRELSZ:
-	      s = bfd_get_section_by_name (output_bfd, ".rel.plt");
-	      BFD_ASSERT (s != NULL);
-	      if (s->_cooked_size != 0)
-		dyn.d_un.d_val = s->_cooked_size;
-	      else
-		dyn.d_un.d_val = s->_raw_size;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_RELSZ:
-	      /* My reading of the SVR4 ABI indicates that the
-		 procedure linkage table relocs (DT_JMPREL) should be
-		 included in the overall relocs (DT_REL).  This is
-		 what Solaris does.  However, UnixWare can not handle
-		 that case.  Therefore, we override the DT_RELSZ entry
-		 here to make it not include the JMPREL relocs.  Since
-		 the linker script arranges for .rel.plt to follow all
-		 other relocation sections, we don't have to worry
-		 about changing the DT_REL entry.  */
-	      s = bfd_get_section_by_name (output_bfd, ".rel.plt");
-	      if (s != NULL)
-		{
-		  if (s->_cooked_size != 0)
-		    dyn.d_un.d_val -= s->_cooked_size;
-		  else
-		    dyn.d_un.d_val -= s->_raw_size;
-		}
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-	    }
-	}
-
-      /* Fill in the first entry in the procedure linkage table.  */
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      if (splt && splt->_raw_size > 0)
-	{
-	  if (info->shared)
-	    memcpy (splt->contents, elf_i386_pic_plt0_entry, PLT_ENTRY_SIZE);
-	  else
-	    {
-	      memcpy (splt->contents, elf_i386_plt0_entry, PLT_ENTRY_SIZE);
-	      bfd_put_32 (output_bfd,
-			  sgot->output_section->vma + sgot->output_offset + 4,
-			  splt->contents + 2);
-	      bfd_put_32 (output_bfd,
-			  sgot->output_section->vma + sgot->output_offset + 8,
-			  splt->contents + 8);
-	    }
-
-	  /* UnixWare sets the entsize of .plt to 4, although that doesn't
-	     really seem like the right value.  */
-	  elf_section_data (splt->output_section)->this_hdr.sh_entsize = 4;
-	}
-    }
-
-  /* Fill in the first three entries in the global offset table.  */
-  if (sgot->_raw_size > 0)
-    {
-      if (sdyn == NULL)
-	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
-      else
-	bfd_put_32 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    sgot->contents);
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
-    }
-
-  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
-
-  return true;
-}
-
-#define TARGET_LITTLE_SYM		bfd_elf32_i386_vec
-#define TARGET_LITTLE_NAME		"elf32-i386"
-#define ELF_ARCH			bfd_arch_i386
-#define ELF_MACHINE_CODE		EM_386
-#define ELF_MAXPAGESIZE			0x1000
-#define elf_info_to_howto		elf_i386_info_to_howto
-#define elf_info_to_howto_rel		elf_i386_info_to_howto_rel
-#define bfd_elf32_bfd_reloc_type_lookup	elf_i386_reloc_type_lookup
-#define bfd_elf32_bfd_is_local_label_name \
-					elf_i386_is_local_label_name
-#define elf_backend_create_dynamic_sections \
-					_bfd_elf_create_dynamic_sections
-#define bfd_elf32_bfd_link_hash_table_create \
-					elf_i386_link_hash_table_create
-#define elf_backend_check_relocs	elf_i386_check_relocs
-#define elf_backend_adjust_dynamic_symbol \
-					elf_i386_adjust_dynamic_symbol
-#define elf_backend_size_dynamic_sections \
-					elf_i386_size_dynamic_sections
-#define elf_backend_relocate_section	elf_i386_relocate_section
-#define elf_backend_finish_dynamic_symbol \
-					elf_i386_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections \
-					elf_i386_finish_dynamic_sections
-#define elf_backend_gc_mark_hook	elf_i386_gc_mark_hook
-#define elf_backend_gc_sweep_hook	elf_i386_gc_sweep_hook
-
-#define elf_backend_can_gc_sections	1
-#define elf_backend_want_got_plt	1
-#define elf_backend_plt_readonly	1
-#define elf_backend_want_plt_sym	0
-#define elf_backend_got_header_size	12
-#define elf_backend_plt_header_size	PLT_ENTRY_SIZE
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-i860.c b/bfd/elf32-i860.c
deleted file mode 100644
index a8537a75508..00000000000
--- a/bfd/elf32-i860.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* Intel 860 specific support for 32-bit ELF
-   Copyright 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-#define bfd_elf32_bfd_reloc_type_lookup	bfd_default_reloc_type_lookup
-#define elf_info_to_howto		_bfd_elf_no_info_to_howto
-
-#define TARGET_BIG_SYM	bfd_elf32_i860_vec
-#define TARGET_BIG_NAME "elf32-i860"
-#define ELF_ARCH	bfd_arch_i860
-#define ELF_MACHINE_CODE EM_860
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
deleted file mode 100644
index b2f852370e9..00000000000
--- a/bfd/elf32-m32r.c
+++ /dev/null
@@ -1,2082 +0,0 @@
-/* M32R-specific support for 32-bit ELF.
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/m32r.h"
-
-static bfd_reloc_status_type m32r_elf_10_pcrel_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type m32r_elf_do_10_pcrel_reloc
-  PARAMS ((bfd *, reloc_howto_type *, asection *,
-	   bfd_byte *, bfd_vma, asection *, bfd_vma, bfd_vma));
-static bfd_reloc_status_type m32r_elf_hi16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static void m32r_elf_relocate_hi16
-  PARAMS ((bfd *, int, Elf_Internal_Rela *, Elf_Internal_Rela *,
-	   bfd_byte *, bfd_vma));
-bfd_reloc_status_type m32r_elf_lo16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type m32r_elf_sda16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void m32r_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-boolean _bfd_m32r_elf_section_from_bfd_section
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *, int *));
-void _bfd_m32r_elf_symbol_processing
-  PARAMS ((bfd *, asymbol *));
-static boolean m32r_elf_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
-	   const char **, flagword *, asection **, bfd_vma *));
-static boolean m32r_elf_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-#if 0 /* not yet */
-static boolean m32r_elf_relax_delete_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, int));
-#endif
-
-static bfd_reloc_status_type m32r_elf_final_sda_base
-  PARAMS ((bfd *, struct bfd_link_info *, const char **, bfd_vma *));
-static boolean m32r_elf_object_p
-  PARAMS ((bfd *));
-static void m32r_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
-static boolean m32r_elf_set_private_flags
-  PARAMS ((bfd *, flagword));
-static boolean m32r_elf_copy_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean m32r_elf_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean m32r_elf_print_private_bfd_data
-  PARAMS ((bfd *, PTR));
-
-#define NOP_INSN		0x7000
-#define MAKE_PARALLEL(insn)	((insn) | 0x8000)
-
-/* Use REL instead of RELA to save space.
-   This only saves space in libraries and object files, but perhaps
-   relocs will be put in ROM?  All in all though, REL relocs are a pain
-   to work with.  */
-#define USE_REL
-
-static reloc_howto_type m32r_elf_howto_table[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_M32R_NONE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_M32R_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 16 bit absolute relocation.  */
-  HOWTO (R_M32R_16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_M32R_16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit absolute relocation.  */
-  HOWTO (R_M32R_32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_M32R_32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 24 bit address.  */
-  HOWTO (R_M32R_24,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 24,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_M32R_24",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffff,		/* src_mask */
-	 0xffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An PC Relative 10-bit relocation, shifted by 2.
-     This reloc is complicated because relocations are relative to pc & -4.
-     i.e. branches in the right insn slot use the address of the left insn
-     slot for pc.  */
-  /* ??? It's not clear whether this should have partial_inplace set or not.
-     Branch relaxing in the assembler can store the addend in the insn,
-     and if bfd_install_relocation gets called the addend may get added
-     again.  */
-  HOWTO (R_M32R_10_PCREL,	/* type */
-	 2,	                /* rightshift */
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */
-	 10,	                /* bitsize */
-	 true,	                /* pc_relative */
-	 0,	                /* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 m32r_elf_10_pcrel_reloc, /* special_function */
-	 "R_M32R_10_PCREL",	/* name */
-	 false,	                /* partial_inplace */
-	 0xff,		        /* src_mask */
-	 0xff,   		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 18 bit relocation, right shifted by 2.  */
-  HOWTO (R_M32R_18_PCREL,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_M32R_18_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 26 bit relocation, right shifted by 2.  */
-  /* ??? It's not clear whether this should have partial_inplace set or not.
-     Branch relaxing in the assembler can store the addend in the insn,
-     and if bfd_install_relocation gets called the addend may get added
-     again.  */
-  HOWTO (R_M32R_26_PCREL,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_M32R_26_PCREL",	/* name */
-	 false,			/* partial_inplace */
-	 0xffffff,		/* src_mask */
-	 0xffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* High 16 bits of address when lower 16 is or'd in.  */
-  HOWTO (R_M32R_HI16_ULO,	/* type */
-	 16,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 m32r_elf_hi16_reloc,	/* special_function */
-	 "R_M32R_HI16_ULO",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of address when lower 16 is added in.  */
-  HOWTO (R_M32R_HI16_SLO,	/* type */
-	 16,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 m32r_elf_hi16_reloc,	/* special_function */
-	 "R_M32R_HI16_SLO",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Lower 16 bits of address.  */
-  HOWTO (R_M32R_LO16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 m32r_elf_lo16_reloc,	/* special_function */
-	 "R_M32R_LO16",		/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Small data area 16 bits offset.  */
-  HOWTO (R_M32R_SDA16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 m32r_elf_sda16_reloc,	/* special_function */
-	 "R_M32R_SDA16",	/* name */
-	 true,			/* partial_inplace */  /* FIXME: correct? */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_M32R_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_M32R_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_M32R_GNU_VTENTRY,     /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_M32R_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-};
-
-/* Handle the R_M32R_10_PCREL reloc.  */
-
-static bfd_reloc_status_type
-m32r_elf_10_pcrel_reloc (abfd, reloc_entry, symbol, data,
-			 input_section, output_bfd, error_message)
-     bfd * abfd;
-     arelent * reloc_entry;
-     asymbol * symbol;
-     PTR data;
-     asection * input_section;
-     bfd * output_bfd;
-     char ** error_message;
-{
-  /* This part is from bfd_elf_generic_reloc.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! reloc_entry->howto->partial_inplace
-	  || reloc_entry->addend == 0))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != NULL)
-    {
-      /* FIXME: See bfd_perform_relocation.  Is this right?  */
-      return bfd_reloc_continue;
-    }
-
-  return m32r_elf_do_10_pcrel_reloc (abfd, reloc_entry->howto,
-				     input_section,
-				     data, reloc_entry->address,
-				     symbol->section,
-				     (symbol->value
-				      + symbol->section->output_section->vma
-				      + symbol->section->output_offset),
-				     reloc_entry->addend);
-}
-
-/* Utility to actually perform an R_M32R_10_PCREL reloc.  */
-
-static bfd_reloc_status_type
-m32r_elf_do_10_pcrel_reloc (abfd, howto, input_section, data, offset,
-			    symbol_section, symbol_value, addend)
-     bfd *abfd;
-     reloc_howto_type *howto;
-     asection *input_section;
-     bfd_byte *data;
-     bfd_vma offset;
-     asection *symbol_section;
-     bfd_vma symbol_value;
-     bfd_vma addend;
-{
-  bfd_signed_vma relocation;
-  unsigned long x;
-  bfd_reloc_status_type status;
-
-  /* Sanity check the address (offset in section).  */
-  if (offset > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  relocation = symbol_value + addend;
-  /* Make it pc relative.  */
-  relocation -=	(input_section->output_section->vma
-		 + input_section->output_offset);
-  /* These jumps mask off the lower two bits of the current address
-     before doing pcrel calculations.  */
-  relocation -= (offset & -4L);
-
-  if (relocation < -0x200 || relocation > 0x1ff)
-    status = bfd_reloc_overflow;
-  else
-    status = bfd_reloc_ok;
-
-  x = bfd_get_16 (abfd, data + offset);
-  relocation >>= howto->rightshift;
-  relocation <<= howto->bitpos;
-  x = (x & ~howto->dst_mask) | (((x & howto->src_mask) + relocation) & howto->dst_mask);
-  bfd_put_16 (abfd, x, data + offset);
-
-  return status;
-}
-
-/* Handle the R_M32R_HI16_[SU]LO relocs.
-   HI16_SLO is for the add3 and load/store with displacement instructions.
-   HI16_ULO is for the or3 instruction.
-   For R_M32R_HI16_SLO, the lower 16 bits are sign extended when added to
-   the high 16 bytes so if the lower 16 bits are negative (bit 15 == 1) then
-   we must add one to the high 16 bytes (which will get subtracted off when
-   the low 16 bits are added).
-   These relocs have to be done in combination with an R_M32R_LO16 reloc
-   because there is a carry from the LO16 to the HI16.  Here we just save
-   the information we need; we do the actual relocation when we see the LO16.
-   This code is copied from the elf32-mips.c.  We also support an arbitrary
-   number of HI16 relocs to be associated with a single LO16 reloc.  The
-   assembler sorts the relocs to ensure each HI16 immediately precedes its
-   LO16.  However if there are multiple copies, the assembler may not find
-   the real LO16 so it picks the first one it finds.  */
-
-struct m32r_hi16
-{
-  struct m32r_hi16 *next;
-  bfd_byte *addr;
-  bfd_vma addend;
-};
-
-/* FIXME: This should not be a static variable.  */
-
-static struct m32r_hi16 *m32r_hi16_list;
-
-static bfd_reloc_status_type
-m32r_elf_hi16_reloc (abfd, reloc_entry, symbol, data,
-		     input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_reloc_status_type ret;
-  bfd_vma relocation;
-  struct m32r_hi16 *n;
-
-  /* This part is from bfd_elf_generic_reloc.
-     If we're relocating, and this an external symbol, we don't want
-     to change anything.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* Sanity check the address (offset in section).  */
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  ret = bfd_reloc_ok;
-  if (bfd_is_und_section (symbol->section)
-      && output_bfd == (bfd *) NULL)
-    ret = bfd_reloc_undefined;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-
-  /* Save the information, and let LO16 do the actual relocation.  */
-  n = (struct m32r_hi16 *) bfd_malloc (sizeof *n);
-  if (n == NULL)
-    return bfd_reloc_outofrange;
-  n->addr = (bfd_byte *) data + reloc_entry->address;
-  n->addend = relocation;
-  n->next = m32r_hi16_list;
-  m32r_hi16_list = n;
-
-  if (output_bfd != (bfd *) NULL)
-    reloc_entry->address += input_section->output_offset;
-
-  return ret;
-}
-
-/* Handle an M32R ELF HI16 reloc.  */
-
-static void
-m32r_elf_relocate_hi16 (input_bfd, type, relhi, rello, contents, addend)
-     bfd *input_bfd;
-     int type;
-     Elf_Internal_Rela *relhi;
-     Elf_Internal_Rela *rello;
-     bfd_byte *contents;
-     bfd_vma addend;
-{
-  unsigned long insn;
-  bfd_vma addlo;
-
-  insn = bfd_get_32 (input_bfd, contents + relhi->r_offset);
-
-  addlo = bfd_get_32 (input_bfd, contents + rello->r_offset);
-  if (type == R_M32R_HI16_SLO)
-    addlo = ((addlo & 0xffff) ^ 0x8000) - 0x8000;
-  else
-    addlo &= 0xffff;
-
-  addend += ((insn & 0xffff) << 16) + addlo;
-
-  /* Reaccount for sign extension of low part.  */
-  if (type == R_M32R_HI16_SLO
-      && (addend & 0x8000) != 0)
-    addend += 0x10000;
-
-  bfd_put_32 (input_bfd,
-	      (insn & 0xffff0000) | ((addend >> 16) & 0xffff),
-	      contents + relhi->r_offset);
-}
-
-/* Do an R_M32R_LO16 relocation.  This is a straightforward 16 bit
-   inplace relocation; this function exists in order to do the
-   R_M32R_HI16_[SU]LO relocation described above.  */
-
-bfd_reloc_status_type
-m32r_elf_lo16_reloc (abfd, reloc_entry, symbol, data,
-		     input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (m32r_hi16_list != NULL)
-    {
-      struct m32r_hi16 *l;
-
-      l = m32r_hi16_list;
-      while (l != NULL)
-	{
-	  unsigned long insn;
-	  unsigned long val;
-	  unsigned long vallo;
-	  struct m32r_hi16 *next;
-
-	  /* Do the HI16 relocation.  Note that we actually don't need
-	     to know anything about the LO16 itself, except where to
-	     find the low 16 bits of the addend needed by the LO16.  */
-	  insn = bfd_get_32 (abfd, l->addr);
-	  vallo = ((bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address)
-		   & 0xffff) ^ 0x8000) - 0x8000;
-	  val = ((insn & 0xffff) << 16) + vallo;
-	  val += l->addend;
-
-	  /* Reaccount for sign extension of low part.  */
-	  if ((val & 0x8000) != 0)
-	    val += 0x10000;
-
-	  insn = (insn &~ 0xffff) | ((val >> 16) & 0xffff);
-	  bfd_put_32 (abfd, insn, l->addr);
-
-	  next = l->next;
-	  free (l);
-	  l = next;
-	}
-
-      m32r_hi16_list = NULL;
-    }
-
-  /* Now do the LO16 reloc in the usual way.  */
-  return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
-				input_section, output_bfd, error_message);
-}
-
-/* Handle the R_M32R_SDA16 reloc.
-   This reloc is used to compute the address of objects in the small data area
-   and to perform loads and stores from that area.
-   The lower 16 bits are sign extended and added to the register specified
-   in the instruction, which is assumed to point to _SDA_BASE_.  */
-
-static bfd_reloc_status_type
-m32r_elf_sda16_reloc (abfd, reloc_entry, symbol, data,
-		      input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* This part is from bfd_elf_generic_reloc.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! reloc_entry->howto->partial_inplace
-	  || reloc_entry->addend == 0))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != NULL)
-    {
-      /* FIXME: See bfd_perform_relocation.  Is this right?  */
-      return bfd_reloc_continue;
-    }
-
-  /* FIXME: not sure what to do here yet.  But then again, the linker
-     may never call us.  */
-  abort ();
-}
-
-/* Map BFD reloc types to M32R ELF reloc types.  */
-
-struct m32r_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static const struct m32r_reloc_map m32r_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_M32R_NONE },
-  { BFD_RELOC_16, R_M32R_16 },
-  { BFD_RELOC_32, R_M32R_32 },
-  { BFD_RELOC_M32R_24, R_M32R_24 },
-  { BFD_RELOC_M32R_10_PCREL, R_M32R_10_PCREL },
-  { BFD_RELOC_M32R_18_PCREL, R_M32R_18_PCREL },
-  { BFD_RELOC_M32R_26_PCREL, R_M32R_26_PCREL },
-  { BFD_RELOC_M32R_HI16_ULO, R_M32R_HI16_ULO },
-  { BFD_RELOC_M32R_HI16_SLO, R_M32R_HI16_SLO },
-  { BFD_RELOC_M32R_LO16, R_M32R_LO16 },
-  { BFD_RELOC_M32R_SDA16, R_M32R_SDA16 },
-  { BFD_RELOC_VTABLE_INHERIT, R_M32R_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY, R_M32R_GNU_VTENTRY },
-};
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (m32r_reloc_map) / sizeof (struct m32r_reloc_map);
-       i++)
-    {
-      if (m32r_reloc_map[i].bfd_reloc_val == code)
-	return &m32r_elf_howto_table[m32r_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Set the howto pointer for an M32R ELF reloc.  */
-
-static void
-m32r_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_M32R_max);
-  cache_ptr->howto = &m32r_elf_howto_table[r_type];
-}
-
-/* Given a BFD section, try to locate the corresponding ELF section
-   index.  */
-
-boolean
-_bfd_m32r_elf_section_from_bfd_section (abfd, hdr, sec, retval)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     asection *sec;
-     int *retval;
-{
-  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
-    {
-      *retval = SHN_M32R_SCOMMON;
-      return true;
-    }
-  return false;
-}
-
-/* M32R ELF uses two common sections.  One is the usual one, and the other
-   is for small objects.  All the small objects are kept together, and then
-   referenced via one register, which yields faster assembler code.  It is
-   up to the compiler to emit an instruction to load the register with
-   _SDA_BASE.  This is what we use for the small common section.  This
-   approach is copied from elf32-mips.c.  */
-static asection m32r_elf_scom_section;
-static asymbol m32r_elf_scom_symbol;
-static asymbol *m32r_elf_scom_symbol_ptr;
-
-/* Handle the special M32R section numbers that a symbol may use.  */
-
-void
-_bfd_m32r_elf_symbol_processing (abfd, asym)
-     bfd *abfd;
-     asymbol *asym;
-{
-  elf_symbol_type *elfsym;
-
-  elfsym = (elf_symbol_type *) asym;
-
-  switch (elfsym->internal_elf_sym.st_shndx)
-    {
-    case SHN_M32R_SCOMMON:
-      if (m32r_elf_scom_section.name == NULL)
-	{
-	  /* Initialize the small common section.  */
-	  m32r_elf_scom_section.name = ".scommon";
-	  m32r_elf_scom_section.flags = SEC_IS_COMMON;
-	  m32r_elf_scom_section.output_section = &m32r_elf_scom_section;
-	  m32r_elf_scom_section.symbol = &m32r_elf_scom_symbol;
-	  m32r_elf_scom_section.symbol_ptr_ptr = &m32r_elf_scom_symbol_ptr;
-	  m32r_elf_scom_symbol.name = ".scommon";
-	  m32r_elf_scom_symbol.flags = BSF_SECTION_SYM;
-	  m32r_elf_scom_symbol.section = &m32r_elf_scom_section;
-	  m32r_elf_scom_symbol_ptr = &m32r_elf_scom_symbol;
-	}
-      asym->section = &m32r_elf_scom_section;
-      asym->value = elfsym->internal_elf_sym.st_size;
-      break;
-    }
-}
-
-/* Hook called by the linker routine which adds symbols from an object
-   file.  We must handle the special M32R section numbers here.
-   We also keep watching for whether we need to create the sdata special
-   linker sections.  */
-
-static boolean
-m32r_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const Elf_Internal_Sym *sym;
-     const char **namep;
-     flagword *flagsp;
-     asection **secp;
-     bfd_vma *valp;
-{
-  if (! info->relocateable
-      && (*namep)[0] == '_' && (*namep)[1] == 'S'
-      && strcmp (*namep, "_SDA_BASE_") == 0)
-    {
-      /* This is simpler than using _bfd_elf_create_linker_section
-	 (our needs are simpler than ppc's needs).  Also
-	 _bfd_elf_create_linker_section currently has a bug where if a .sdata
-	 section already exists a new one is created that follows it which
-	 screws of _SDA_BASE_ address calcs because output_offset != 0.  */
-      struct elf_link_hash_entry *h;
-      asection *s = bfd_get_section_by_name (abfd, ".sdata");
-
-      /* The following code was cobbled from elf32-ppc.c and elflink.c.  */
-
-      if (s == NULL)
-	{
-	  int flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-		       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-
-	  s = bfd_make_section_anyway (abfd, ".sdata");
-	  if (s == NULL)
-	    return false;
-	  bfd_set_section_flags (abfd, s, flags);
-	  bfd_set_section_alignment (abfd, s, 2);
-	}
-
-      h = (struct elf_link_hash_entry *)
-	bfd_link_hash_lookup (info->hash, "_SDA_BASE_", false, false, false);
-
-      if ((h == NULL || h->root.type == bfd_link_hash_undefined)
-	  && !(_bfd_generic_link_add_one_symbol (info,
-						 abfd,
-						 "_SDA_BASE_",
-						 BSF_GLOBAL,
-						 s,
-						 32768,
-						 (const char *) NULL,
-						 false,
-						 get_elf_backend_data (abfd)->collect,
-						 (struct bfd_link_hash_entry **) &h)))
-	return false;
-      h->type = STT_OBJECT;
-    }
-
-  switch (sym->st_shndx)
-    {
-    case SHN_M32R_SCOMMON:
-      *secp = bfd_make_section_old_way (abfd, ".scommon");
-      (*secp)->flags |= SEC_IS_COMMON;
-      *valp = sym->st_size;
-      break;
-    }
-
-  return true;
-}
-
-/* We have to figure out the SDA_BASE value, so that we can adjust the
-   symbol value correctly.  We look up the symbol _SDA_BASE_ in the output
-   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
-   target data.  We don't need to adjust the symbol value for an
-   external symbol if we are producing relocateable output.  */
-
-static bfd_reloc_status_type
-m32r_elf_final_sda_base (output_bfd, info, error_message, psb)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char **error_message;
-     bfd_vma *psb;
-{
-  if (elf_gp (output_bfd) == 0)
-    {
-      struct bfd_link_hash_entry *h;
-
-      h = bfd_link_hash_lookup (info->hash, "_SDA_BASE_", false, false, true);
-      if (h != (struct bfd_link_hash_entry *) NULL
-	  && h->type == bfd_link_hash_defined)
-	elf_gp (output_bfd) = (h->u.def.value
-			       + h->u.def.section->output_section->vma
-			       + h->u.def.section->output_offset);
-      else
-	{
-	  /* Only get the error once.  */
-	  *psb = elf_gp (output_bfd) = 4;
-	  *error_message =
-	    (const char *) _("SDA relocation when _SDA_BASE_ not defined");
-	  return bfd_reloc_dangerous;
-	}
-    }
-  *psb = elf_gp (output_bfd);
-  return bfd_reloc_ok;
-}
-
-/* Relocate an M32R/D ELF section.
-   There is some attempt to make this function usable for many architectures,
-   both USE_REL and USE_RELA ['twould be nice if such a critter existed],
-   if only to serve as a learning tool.
-
-   The RELOCATE_SECTION function is called by the new ELF backend linker
-   to handle the relocations for a section.
-
-   The relocs are always passed as Rela structures; if the section
-   actually uses Rel structures, the r_addend field will always be
-   zero.
-
-   This function is responsible for adjust the section contents as
-   necessary, and (if using Rela relocs and generating a
-   relocateable output file) adjusting the reloc addend as
-   necessary.
-
-   This function does not have to worry about setting the reloc
-   address or the reloc symbol index.
-
-   LOCAL_SYMS is a pointer to the swapped in local symbols.
-
-   LOCAL_SECTIONS is an array giving the section in the input file
-   corresponding to the st_shndx field of each local symbol.
-
-   The global hash table entry for the global symbols can be found
-   via elf_sym_hashes (input_bfd).
-
-   When generating relocateable output, this function must handle
-   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
-   going to be the section symbol corresponding to the output
-   section, which means that the addend must be adjusted
-   accordingly.  */
-
-static boolean
-m32r_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
-  Elf_Internal_Rela *rel, *relend;
-  /* Assume success.  */
-  boolean ret = true;
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      /* We can't modify r_addend here as elf_link_input_bfd has an assert to
-	 ensure it's zero (we use REL relocs, not RELA).  Therefore this
-	 should be assigning zero to `addend', but for clarity we use
-	 `r_addend'.  */
-      bfd_vma addend = rel->r_addend;
-      bfd_vma offset = rel->r_offset;
-      struct elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      const char *sym_name;
-      bfd_reloc_status_type r;
-      const char *errmsg = NULL;
-
-      h = NULL;
-      r_type = ELF32_R_TYPE (rel->r_info);
-      if (r_type < 0 || r_type >= (int) R_M32R_max)
-	{
-	  (*_bfd_error_handler) (_("%s: unknown relocation type %d"),
-				 bfd_get_filename (input_bfd),
-				 (int) r_type);
-	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
-	  continue;
-	}
-
-      if (r_type == R_M32R_GNU_VTENTRY
-          || r_type == R_M32R_GNU_VTINHERIT)
-        continue;
-
-      howto = m32r_elf_howto_table + r_type;
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  sec = NULL;
-	  if (r_symndx >= symtab_hdr->sh_info)
-	    {
-	      /* External symbol.  */
-	      continue;
-	    }
-
-	  /* Local symbol.  */
-	  sym = local_syms + r_symndx;
-	  sym_name = "<local symbol>";
-	  /* STT_SECTION: symbol is associated with a section.  */
-	  if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
-	    {
-	      /* Symbol isn't associated with a section.  Nothing to do.  */
-	      continue;
-	    }
-
-	  sec = local_sections[r_symndx];
-	  addend += sec->output_offset + sym->st_value;
-#ifndef USE_REL
-	  /* This can't be done for USE_REL because it doesn't mean anything
-	     and elf_link_input_bfd asserts this stays zero.  */
-	  rel->r_addend = addend;
-#endif
-
-#ifndef USE_REL
-	  /* Addends are stored with relocs.  We're done.  */
-	  continue;
-#else /* USE_REL */
-	  /* If partial_inplace, we need to store any additional addend
-	     back in the section.  */
-	  if (! howto->partial_inplace)
-	    continue;
-	  /* ??? Here is a nice place to call a special_function
-	     like handler.  */
-	  if (r_type != R_M32R_HI16_SLO && r_type != R_M32R_HI16_ULO)
-	    r = _bfd_relocate_contents (howto, input_bfd,
-					addend, contents + offset);
-	  else
-	    {
-	      Elf_Internal_Rela *lorel;
-
-	      /* We allow an arbitrary number of HI16 relocs before the
-		 LO16 reloc.  This permits gcc to emit the HI and LO relocs
-		 itself.  */
-	      for (lorel = rel + 1;
-		   (lorel < relend
-		    && (ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_SLO
-			|| ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_ULO));
-		   lorel++)
-		continue;
-	      if (lorel < relend
-		  && ELF32_R_TYPE (lorel->r_info) == R_M32R_LO16)
-		{
-		  m32r_elf_relocate_hi16 (input_bfd, r_type, rel, lorel,
-					  contents, addend);
-		  r = bfd_reloc_ok;
-		}
-	      else
-		r = _bfd_relocate_contents (howto, input_bfd,
-					    addend, contents + offset);
-	    }
-#endif /* USE_REL */
-	}
-      else
-	{
-	  bfd_vma relocation;
-
-	  /* This is a final link.  */
-	  sym = NULL;
-	  sec = NULL;
-
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      /* Local symbol.  */
-	      sym = local_syms + r_symndx;
-	      sec = local_sections[r_symndx];
-	      sym_name = "<local symbol>";
-	      relocation = (sec->output_section->vma
-			    + sec->output_offset
-			    + sym->st_value);
-	    }
-	  else
-	    {
-	      /* External symbol.  */
-	      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	      while (h->root.type == bfd_link_hash_indirect
-		     || h->root.type == bfd_link_hash_warning)
-		h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	      sym_name = h->root.root.string;
-
-	      if (h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak)
-		{
-		  sec = h->root.u.def.section;
-		  if (sec->output_section == NULL)
-		    relocation = 0;
-		  else
-		    relocation = (h->root.u.def.value
-				  + sec->output_section->vma
-				  + sec->output_offset);
-		}
-	      else if (h->root.type == bfd_link_hash_undefweak)
-		relocation = 0;
-	      else
-		{
-		  if (! ((*info->callbacks->undefined_symbol)
-			 (info, h->root.root.string, input_bfd,
-			  input_section, offset)))
-		    return false;
-		  relocation = 0;
-		}
-	    }
-
-	  /* Sanity check the address.  */
-	  if (offset > input_section->_raw_size)
-	    {
-	      r = bfd_reloc_outofrange;
-	      goto check_reloc;
-	    }
-
-	  switch ((int) r_type)
-	    {
-	    case (int) R_M32R_10_PCREL :
-	      r = m32r_elf_do_10_pcrel_reloc (input_bfd, howto, input_section,
-					      contents, offset,
-					      sec, relocation, addend);
-	      break;
-
-	    case (int) R_M32R_HI16_SLO :
-	    case (int) R_M32R_HI16_ULO :
-	      {
-		Elf_Internal_Rela *lorel;
-
-		/* We allow an arbitrary number of HI16 relocs before the
-		   LO16 reloc.  This permits gcc to emit the HI and LO relocs
-		   itself.  */
-		for (lorel = rel + 1;
-		     (lorel < relend
-		      && (ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_SLO
-			  || ELF32_R_TYPE (lorel->r_info) == R_M32R_HI16_ULO));
-		     lorel++)
-		  continue;
-		if (lorel < relend
-		    && ELF32_R_TYPE (lorel->r_info) == R_M32R_LO16)
-		  {
-		    m32r_elf_relocate_hi16 (input_bfd, r_type, rel, lorel,
-					    contents, relocation + addend);
-		    r = bfd_reloc_ok;
-		  }
-		else
-		  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-						contents, offset,
-						relocation, addend);
-	      }
-	      break;
-
-	    case (int) R_M32R_SDA16 :
-	      {
-		const char *name;
-
-		BFD_ASSERT (sec != NULL);
-		name = bfd_get_section_name (abfd, sec);
-
-		if (strcmp (name, ".sdata") == 0
-		    || strcmp (name, ".sbss") == 0
-		    || strcmp (name, ".scommon") == 0)
-		  {
-		    bfd_vma sda_base;
-		    bfd *out_bfd = sec->output_section->owner;
-
-		    r = m32r_elf_final_sda_base (out_bfd, info,
-						 &errmsg,
-						 &sda_base);
-		    if (r != bfd_reloc_ok)
-		      {
-			ret = false;
-			goto check_reloc;
-		      }
-
-		    /* At this point `relocation' contains the object's
-		       address.  */
-		    relocation -= sda_base;
-		    /* Now it contains the offset from _SDA_BASE_.  */
-		  }
-		else
-		  {
-		    (*_bfd_error_handler) (_("%s: The target (%s) of an %s relocation is in the wrong section (%s)"),
-					   bfd_get_filename (input_bfd),
-					   sym_name,
-					   m32r_elf_howto_table[(int) r_type].name,
-					   bfd_get_section_name (abfd, sec));
-		    /*bfd_set_error (bfd_error_bad_value); ??? why? */
-		    ret = false;
-		    continue;
-		  }
-	      }
-	      /* fall through */
-
-	    default :
-	      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					    contents, offset,
-					    relocation, addend);
-	      break;
-	    }
-	}
-
-    check_reloc:
-
-      if (r != bfd_reloc_ok)
-	{
-	  /* FIXME: This should be generic enough to go in a utility.  */
-	  const char *name;
-
-	  if (h != NULL)
-	    name = h->root.root.string;
-	  else
-	    {
-	      name = (bfd_elf_string_from_elf_section
-		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
-	      if (name == NULL || *name == '\0')
-		name = bfd_section_name (input_bfd, sec);
-	    }
-
-	  if (errmsg != NULL)
-	    goto common_error;
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      if (! ((*info->callbacks->reloc_overflow)
-		     (info, name, howto->name, (bfd_vma) 0,
-		      input_bfd, input_section, offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_undefined:
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, name, input_bfd, input_section,
-		      offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_outofrange:
-	      errmsg = _("internal error: out of range error");
-	      goto common_error;
-
-	    case bfd_reloc_notsupported:
-	      errmsg = _("internal error: unsupported relocation error");
-	      goto common_error;
-
-	    case bfd_reloc_dangerous:
-	      errmsg = _("internal error: dangerous error");
-	      goto common_error;
-
-	    default:
-	      errmsg = _("internal error: unknown error");
-	      /* fall through */
-
-	    common_error:
-	      if (!((*info->callbacks->warning)
-		    (info, errmsg, name, input_bfd, input_section,
-		     offset)))
-		return false;
-	      break;
-	    }
-	}
-    }
-
-  return ret;
-}
-
-#if 0 /* relaxing not supported yet */
-
-/* This function handles relaxing for the m32r.
-   Relaxing on the m32r is tricky because of instruction alignment
-   requirements (4 byte instructions must be aligned on 4 byte boundaries).
-
-   The following relaxing opportunities are handled:
-
-   seth/add3/jl -> bl24 or bl8
-   seth/add3 -> ld24
-
-   It would be nice to handle bl24 -> bl8 but given:
-
-   - 4 byte insns must be on 4 byte boundaries
-   - branch instructions only branch to insns on 4 byte boundaries
-
-   this isn't much of a win because the insn in the 2 "deleted" bytes
-   must become a nop.  With some complexity some real relaxation could be
-   done but the frequency just wouldn't make it worth it; it's better to
-   try to do all the code compaction one can elsewhere.
-   When the chip supports parallel 16 bit insns, things may change.
-*/
-
-static boolean 
-m32r_elf_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  /* The Rela structures are used here because that's what
-     _bfd_elf32_link_read_relocs uses [for convenience - it sets the addend
-     field to 0].  */
-  Elf_Internal_Rela *internal_relocs;
-  Elf_Internal_Rela *free_relocs = NULL;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *contents = NULL;
-  bfd_byte *free_contents = NULL;
-  Elf32_External_Sym *extsyms = NULL;
-  Elf32_External_Sym *free_extsyms = NULL;
-
-  /* Assume nothing changes.  */
-  *again = false;
-
-  /* We don't have to do anything for a relocateable link, if
-     this section does not have relocs, or if this is not a
-     code section.  */
-  if (link_info->relocateable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0
-      || (sec->flags & SEC_CODE) == 0
-      || 0 /* FIXME: check SHF_M32R_CAN_RELAX */)
-    return true;
-
-  /* If this is the first time we have been called for this section,
-     initialize the cooked size.  */
-  if (sec->_cooked_size == 0)
-    sec->_cooked_size = sec->_raw_size;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-
-  /* Get a copy of the native relocations.  */
-  internal_relocs = (_bfd_elf32_link_read_relocs
-		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-		      link_info->keep_memory));
-  if (internal_relocs == NULL)
-    goto error_return;
-  if (! link_info->keep_memory)
-    free_relocs = internal_relocs;
-
-  /* Walk through them looking for relaxing opportunities.  */
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma symval;
-
-      /* If this isn't something that can be relaxed, then ignore
-	 this reloc.  */
-      if (ELF32_R_TYPE (irel->r_info) != (int) R_M32R_HI16_SLO)
-	continue;
-
-      /* Get the section contents if we haven't done so already.  */
-      if (contents == NULL)
-	{
-	  /* Get cached copy if it exists.  */
-	  if (elf_section_data (sec)->this_hdr.contents != NULL)
-	    contents = elf_section_data (sec)->this_hdr.contents;
-	  else
-	    {
-	      /* Go get them off disk.  */
-	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (contents == NULL)
-		goto error_return;
-	      free_contents = contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      /* Read this BFD's symbols if we haven't done so already.  */
-      if (extsyms == NULL)
-	{
-	  /* Get cached copy if it exists.  */
-	  if (symtab_hdr->contents != NULL)
-	    extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-	  else
-	    {
-	      /* Go get them off disk.  */
-	      extsyms = ((Elf32_External_Sym *)
-			 bfd_malloc (symtab_hdr->sh_size));
-	      if (extsyms == NULL)
-		goto error_return;
-	      free_extsyms = extsyms;
-	      if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-		  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
-		      != symtab_hdr->sh_size))
-		goto error_return;
-	    }
-	}
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-	{
-	  Elf_Internal_Sym isym;
-	  asection *sym_sec;
-
-	  /* A local symbol.  */
-	  bfd_elf32_swap_symbol_in (abfd,
-				    extsyms + ELF32_R_SYM (irel->r_info),
-				    &isym);
-
-	  sym_sec = bfd_section_from_elf_index (abfd, isym.st_shndx);
-	  symval = (isym.st_value
-		    + sym_sec->output_section->vma
-		    + sym_sec->output_offset);
-	}
-      else
-	{
-	  unsigned long indx;
-	  struct elf_link_hash_entry *h;
-
-	  /* An external symbol.  */
-	  indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info;
-	  h = elf_sym_hashes (abfd)[indx];
-	  BFD_ASSERT (h != NULL);
-	  if (h->root.type != bfd_link_hash_defined
-	      && h->root.type != bfd_link_hash_defweak)
-	    {
-	      /* This appears to be a reference to an undefined
-                 symbol.  Just ignore it--it will be caught by the
-                 regular reloc processing.  */
-	      continue;
-	    }
-
-	  symval = (h->root.u.def.value
-		    + h->root.u.def.section->output_section->vma
-		    + h->root.u.def.section->output_offset);
-	}
-
-      /* For simplicity of coding, we are going to modify the section
-	 contents, the section relocs, and the BFD symbol table.  We
-	 must tell the rest of the code not to free up this
-	 information.  It would be possible to instead create a table
-	 of changes which have to be made, as is done in coff-mips.c;
-	 that would be more work, but would require less memory when
-	 the linker is run.  */
-
-      /* Try to change a seth/add3/jl subroutine call to bl24 or bl8.
-	 This sequence is generated by the compiler when compiling in
-	 32 bit mode.  Also look for seth/add3 -> ld24.  */
-
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_M32R_HI16_SLO)
-	{
-	  Elf_Internal_Rela *nrel;
-	  bfd_vma pc = (sec->output_section->vma + sec->output_offset
-			+ irel->r_offset);
-	  bfd_signed_vma pcrel_value = symval - pc;
-	  unsigned int code,reg;
-	  int addend,nop_p,bl8_p,to_delete;
-
-	  /* The tests are ordered so that we get out as quickly as possible
-	     if this isn't something we can relax, taking into account that
-	     we are looking for two separate possibilities (jl/ld24).  */
-
-	  /* Do nothing if no room in the section for this to be what we're
-	     looking for.  */
-	  if (irel->r_offset > sec->_cooked_size - 8)
-	    continue;
-
-	  /* Make sure the next relocation applies to the next
-	     instruction and that it's the add3's reloc.  */
-	  nrel = irel + 1;
-	  if (nrel == irelend
-	      || irel->r_offset + 4 != nrel->r_offset
-	      || ELF32_R_TYPE (nrel->r_info) != (int) R_M32R_LO16)
-	    continue;
-
-	  /* See if the instructions are seth/add3.  */
-	  /* FIXME: This is where macros from cgen can come in.  */
-	  code = bfd_get_16 (abfd, contents + irel->r_offset + 0);
-	  if ((code & 0xf0ff) != 0xd0c0)
-	    continue; /* not seth rN,foo */
-	  reg = (code & 0x0f00) >> 8;
-	  code = bfd_get_16 (abfd, contents + irel->r_offset + 4);
-	  if (code != (0x80a0 | reg | (reg << 8)))
-	    continue; /* not add3 rN,rN,foo */
-
-	  /* At this point we've confirmed we have seth/add3.  Now check
-	     whether the next insn is a jl, in which case try to change this
-	     to bl24 or bl8.  */
-
-	  /* Ensure the branch target is in range.
-	     The bl24 instruction has a 24 bit operand which is the target
-	     address right shifted by 2, giving a signed range of 26 bits.
-	     Note that 4 bytes are added to the high value because the target
-	     will be at least 4 bytes closer if we can relax.  It'll actually
-	     be 4 or 8 bytes closer, but we don't know which just yet and
-	     the difference isn't significant enough to worry about.  */
-#ifndef USE_REL /* put in for learning purposes */
-	  pcrel_value += irel->r_addend;
-#else
-	  addend = bfd_get_signed_16 (abfd, contents + irel->r_offset + 2);
-	  pcrel_value += addend;
-#endif
-
-	  if (pcrel_value >= -(1 << 25) && pcrel_value < (1 << 25) + 4
-	      /* Do nothing if no room in the section for this to be what we're
-		 looking for.  */
-	      && (irel->r_offset <= sec->_cooked_size - 12)
-	      /* Ensure the next insn is "jl rN".  */
-	      && ((code = bfd_get_16 (abfd, contents + irel->r_offset + 8)),
-		  code != (0x1ec0 | reg)))
-	    {
-	      /* We can relax to bl24/bl8.  */
-
-	      /* See if there's a nop following the jl.
-		 Also see if we can use a bl8 insn.  */
-	      code = bfd_get_16 (abfd, contents + irel->r_offset + 10);
-	      nop_p = (code & 0x7fff) == NOP_INSN;
-	      bl8_p = pcrel_value >= -0x200 && pcrel_value < 0x200;
-
-	      if (bl8_p)
-		{
-		  /* Change "seth rN,foo" to "bl8 foo || nop".
-		     We OR in CODE just in case it's not a nop (technically,
-		     CODE currently must be a nop, but for cleanness we
-		     allow it to be anything).  */
-#ifndef USE_REL /* put in for learning purposes */
-		  code = 0x7e000000 | MAKE_PARALLEL (code);
-#else
-		  code = (0x7e000000 + (((addend >> 2) & 0xff) << 16)) | MAKE_PARALLEL (code);
-#endif
-		  to_delete = 8;
-		}
-	      else
-		{
-		  /* Change the seth rN,foo to a bl24 foo.  */
-#ifndef USE_REL /* put in for learning purposes */
-		  code = 0xfe000000;
-#else
-		  code = 0xfe000000 + ((addend >> 2) & 0xffffff);
-#endif
-		  to_delete = nop_p ? 8 : 4;
-		}
-
-	      bfd_put_32 (abfd, code, contents + irel->r_offset);
-
-	      /* Set the new reloc type.  */
-	      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (nrel->r_info),
-					   bl8_p ? R_M32R_10_PCREL : R_M32R_26_PCREL);
-
-	      /* Delete the add3 reloc by making it a null reloc.  */
-	      nrel->r_info = ELF32_R_INFO (ELF32_R_SYM (nrel->r_info),
-					   R_M32R_NONE);
-	    }
-	  else if (addend >= 0
-		   && symval + addend <= 0xffffff)
-	    {
-	      /* We can relax to ld24.  */
-
-	      code = 0xe0000000 | (reg << 24) | (addend & 0xffffff);
-	      bfd_put_32 (abfd, code, contents + irel->r_offset);
-	      to_delete = 4;
-	      /* Tell the following code a nop filler isn't needed.  */
-	      nop_p = 1;
-	    }
-	  else
-	    {
-	      /* Can't do anything here.  */
-	      continue;
-	    }
-
-	  /* Note that we've changed the relocs, section contents, etc.  */
-	  elf_section_data (sec)->relocs = internal_relocs;
-	  free_relocs = NULL;
-
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	  free_contents = NULL;
-
-	  symtab_hdr->contents = (bfd_byte *) extsyms;
-	  free_extsyms = NULL;
-
-	  /* Delete TO_DELETE bytes of data.  */
-	  if (!m32r_elf_relax_delete_bytes (abfd, sec,
-					    irel->r_offset + 4, to_delete))
-	    goto error_return;
-
-	  /* Now that the following bytes have been moved into place, see if
-	     we need to replace the jl with a nop.  This happens when we had
-	     to use a bl24 insn and the insn following the jl isn't a nop.
-	     Technically, this situation can't happen (since the insn can
-	     never be executed) but to be clean we do this.  When the chip
-	     supports parallel 16 bit insns things may change.
-	     We don't need to do this in the case of relaxing to ld24,
-	     and the above code sets nop_p so this isn't done.  */
-	  if (! nop_p && to_delete == 4)
-	    bfd_put_16 (abfd, NOP_INSN, contents + irel->r_offset + 4);
-
-	  /* That will change things, so we should relax again.
-	     Note that this is not required, and it may be slow.  */
-	  *again = true;
-
-	  continue;
-	}
-
-      /* loop to try the next reloc */
-    }
-
-  if (free_relocs != NULL)
-    {
-      free (free_relocs);
-      free_relocs = NULL;
-    }
-
-  if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_contents);
-      else
-	{
-	  /* Cache the section contents for elf_link_input_bfd.  */
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	}
-      free_contents = NULL;
-    }
-
-  if (free_extsyms != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_extsyms);
-      else
-	{
-	  /* Cache the symbols for elf_link_input_bfd.  */
-	  symtab_hdr->contents = extsyms;
-	}
-      free_extsyms = NULL;
-    }
-
-  return true;
-
- error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-  return false;
-}
-
-/* Delete some bytes from a section while relaxing.  */
-
-static boolean
-m32r_elf_relax_delete_bytes (abfd, sec, addr, count)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     int count;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf32_External_Sym *extsyms;
-  int shndx, index;
-  bfd_byte *contents;
-  Elf_Internal_Rela *irel, *irelend;
-  Elf_Internal_Rela *irelalign;
-  bfd_vma toaddr;
-  Elf32_External_Sym *esym, *esymend;
-  struct elf_link_hash_entry *sym_hash;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-
-  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-  contents = elf_section_data (sec)->this_hdr.contents;
-
-  /* The deletion must stop at the next ALIGN reloc for an aligment
-     power larger than the number of bytes we are deleting.  */
-
-  irelalign = NULL;
-  toaddr = sec->_cooked_size;
-
-  irel = elf_section_data (sec)->relocs;
-  irelend = irel + sec->reloc_count;
-
-  /* Actually delete the bytes.  */
-  memmove (contents + addr, contents + addr + count, toaddr - addr - count);
-  sec->_cooked_size -= count;
-
-  /* Adjust all the relocs.  */
-  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
-    {
-      /* Get the new reloc address.  */
-      if ((irel->r_offset > addr
-	   && irel->r_offset < toaddr))
-	irel->r_offset -= count;
-    }
-
-  /* Adjust the local symbols defined in this section.  */
-  esym = extsyms;
-  esymend = esym + symtab_hdr->sh_info;
-  for (; esym < esymend; esym++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-
-      if (isym.st_shndx == shndx
-	  && isym.st_value > addr
-	  && isym.st_value < toaddr)
-	{
-	  isym.st_value -= count;
-	  bfd_elf32_swap_symbol_out (abfd, &isym, esym);
-	}
-    }
-
-  /* Now adjust the global symbols defined in this section.  */
-  esym = extsyms + symtab_hdr->sh_info;
-  esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
-  for (index = 0; esym < esymend; esym++, index++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-      sym_hash = elf_sym_hashes (abfd)[index];
-      if (isym.st_shndx == shndx
-	  && ((sym_hash)->root.type == bfd_link_hash_defined
-	      || (sym_hash)->root.type == bfd_link_hash_defweak)
-	  && (sym_hash)->root.u.def.section == sec
-	  && (sym_hash)->root.u.def.value > addr
-	  && (sym_hash)->root.u.def.value < toaddr)
-	{
-	  (sym_hash)->root.u.def.value -= count;
-	}
-    }
-
-  return true;
-}
-
-/* This is a version of bfd_generic_get_relocated_section_contents
-   which uses m32r_elf_relocate_section.  */
-
-static bfd_byte *
-m32r_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
-					 data, relocateable, symbols)
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  asection *input_section = link_order->u.indirect.section;
-  bfd *input_bfd = input_section->owner;
-  asection **sections = NULL;
-  Elf_Internal_Rela *internal_relocs = NULL;
-  Elf32_External_Sym *external_syms = NULL;
-  Elf_Internal_Sym *internal_syms = NULL;
-
-  /* We only need to handle the case of relaxing, or of having a
-     particular set of section contents, specially.  */
-  if (relocateable
-      || elf_section_data (input_section)->this_hdr.contents == NULL)
-    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
-						       link_order, data,
-						       relocateable,
-						       symbols);
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
-	  input_section->_raw_size);
-
-  if ((input_section->flags & SEC_RELOC) != 0
-      && input_section->reloc_count > 0)
-    {
-      Elf_Internal_Sym *isymp;
-      asection **secpp;
-      Elf32_External_Sym *esym, *esymend;
-
-      if (symtab_hdr->contents != NULL)
-	external_syms = (Elf32_External_Sym *) symtab_hdr->contents;
-      else
-	{
-	  external_syms = ((Elf32_External_Sym *)
-			   bfd_malloc (symtab_hdr->sh_info
-				       * sizeof (Elf32_External_Sym)));
-	  if (external_syms == NULL && symtab_hdr->sh_info > 0)
-	    goto error_return;
-	  if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-	      || (bfd_read (external_syms, sizeof (Elf32_External_Sym),
-			    symtab_hdr->sh_info, input_bfd)
-		  != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym))))
-	    goto error_return;
-	}
-
-      internal_relocs = (_bfd_elf32_link_read_relocs
-			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
-      if (internal_relocs == NULL)
-	goto error_return;
-
-      internal_syms = ((Elf_Internal_Sym *)
-		       bfd_malloc (symtab_hdr->sh_info
-				   * sizeof (Elf_Internal_Sym)));
-      if (internal_syms == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      sections = (asection **) bfd_malloc (symtab_hdr->sh_info
-					   * sizeof (asection *));
-      if (sections == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      isymp = internal_syms;
-      secpp = sections;
-      esym = external_syms;
-      esymend = esym + symtab_hdr->sh_info;
-      for (; esym < esymend; ++esym, ++isymp, ++secpp)
-	{
-	  asection *isec;
-
-	  bfd_elf32_swap_symbol_in (input_bfd, esym, isymp);
-
-	  if (isymp->st_shndx == SHN_UNDEF)
-	    isec = bfd_und_section_ptr;
-	  else if (isymp->st_shndx > 0 && isymp->st_shndx < SHN_LORESERVE)
-	    isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
-	  else if (isymp->st_shndx == SHN_ABS)
-	    isec = bfd_abs_section_ptr;
-	  else if (isymp->st_shndx == SHN_COMMON)
-	    isec = bfd_com_section_ptr;
-	  else if (isymp->st_shndx == SHN_M32R_SCOMMON)
-	    isec = &m32r_elf_scom_section;
-	  else
-	    {
-	      /* Who knows?  */
-	      isec = NULL;
-	    }
-
-	  *secpp = isec;
-	}
-
-      if (! m32r_elf_relocate_section (output_bfd, link_info, input_bfd,
-				       input_section, data, internal_relocs,
-				       internal_syms, sections))
-	goto error_return;
-
-      if (sections != NULL)
-	free (sections);
-      sections = NULL;
-      if (internal_syms != NULL)
-	free (internal_syms);
-      internal_syms = NULL;
-      if (external_syms != NULL && symtab_hdr->contents == NULL)
-	free (external_syms);
-      external_syms = NULL;
-      if (internal_relocs != elf_section_data (input_section)->relocs)
-	free (internal_relocs);
-      internal_relocs = NULL;
-    }
-
-  return data;
-
- error_return:
-  if (internal_relocs != NULL
-      && internal_relocs != elf_section_data (input_section)->relocs)
-    free (internal_relocs);
-  if (external_syms != NULL && symtab_hdr->contents == NULL)
-    free (external_syms);
-  if (internal_syms != NULL)
-    free (internal_syms);
-  if (sections != NULL)
-    free (sections);
-  return NULL;
-}
-
-#endif /* #if 0 */
-
-/* Set the right machine number.  */
-static boolean
-m32r_elf_object_p (abfd)
-     bfd *abfd;
-{
-  switch (elf_elfheader (abfd)->e_flags & EF_M32R_ARCH)
-    {
-    default:
-    case E_M32R_ARCH:   (void) bfd_default_set_arch_mach (abfd, bfd_arch_m32r, bfd_mach_m32r);  break;
-    }
-  return true;
-}
-
-/* Store the machine number in the flags field.  */
-static void
-m32r_elf_final_write_processing (abfd, linker)
-     bfd *   abfd;
-     boolean linker;
-{
-  unsigned long val;
-
-  switch (bfd_get_mach (abfd))
-    {
-    default:
-    case bfd_mach_m32r:  val = E_M32R_ARCH; break;
-    }
-
-  elf_elfheader (abfd)->e_flags &=~ EF_M32R_ARCH;
-  elf_elfheader (abfd)->e_flags |= val;
-}
-
-/* Function to keep M32R specific file flags. */
-static boolean
-m32r_elf_set_private_flags (abfd, flags)
-     bfd *    abfd;
-     flagword flags;
-{
-  BFD_ASSERT (!elf_flags_init (abfd)
-	      || elf_elfheader (abfd)->e_flags == flags);
-
-  elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
-}
-
-/* Copy backend specific data from one object module to another */
-static boolean
-m32r_elf_copy_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
-{
-  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  BFD_ASSERT (!elf_flags_init (obfd)
-	      || (elf_elfheader (obfd)->e_flags
-		  == elf_elfheader (ibfd)->e_flags));
-
-  elf_gp (obfd) = elf_gp (ibfd);
-  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = true;
-  return true;
-}
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-static boolean
-m32r_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
-{
-  flagword out_flags;
-  flagword in_flags;
-
-  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  in_flags  = elf_elfheader (ibfd)->e_flags;
-  out_flags = elf_elfheader (obfd)->e_flags;
-
-  if (! elf_flags_init (obfd))
-    {
-      /* If the input is the default architecture then do not
-	 bother setting the flags for the output architecture,
-	 instead allow future merges to do this.  If no future
-	 merges ever set these flags then they will retain their
-	 unitialised values, which surprise surprise, correspond
-	 to the default values.  */
-      if (bfd_get_arch_info (ibfd)->the_default)
-	return true;
-      
-      elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = in_flags;
-
-      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
-	  && bfd_get_arch_info (obfd)->the_default)
-	{
-	  return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
-	}
-
-      return true;
-    }
-
-  /* Check flag compatibility.  */
-  if (in_flags == out_flags)
-    return true;
-
-  if ((in_flags & EF_M32R_ARCH) != (out_flags & EF_M32R_ARCH))
-    {
-      if ((in_flags & EF_M32R_ARCH) != E_M32R_ARCH)
-	{
-	  _bfd_error_handler (_("%s: Instruction set mismatch with previous modules"),
-			      bfd_get_filename (ibfd));
-
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-    }
-
-  return true;
-}
-
-/* Display the flags field */
-static boolean
-m32r_elf_print_private_bfd_data (abfd, ptr)
-     bfd *   abfd;
-     PTR     ptr;
-{
-  FILE * file = (FILE *) ptr;
-  
-  BFD_ASSERT (abfd != NULL && ptr != NULL)
-  
-  _bfd_elf_print_private_bfd_data (abfd, ptr);
-  
-  fprintf (file, _("private flags = %lx"), elf_elfheader (abfd)->e_flags);
-  
-  switch (elf_elfheader (abfd)->e_flags & EF_M32R_ARCH)
-    {
-    default:
-    case E_M32R_ARCH:  fprintf (file, _(": m32r instructions"));  break;
-    }
-  
-  fputc ('\n', file);
-  
-  return true;
-}
-
-asection *
-m32r_elf_gc_mark_hook (abfd, info, rel, h, sym)
-       bfd *abfd;
-       struct bfd_link_info *info;
-       Elf_Internal_Rela *rel;
-       struct elf_link_hash_entry *h;
-       Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_M32R_GNU_VTINHERIT:
-      case R_M32R_GNU_VTENTRY:
-        break;
- 
-      default:
-        switch (h->root.type)
-          {
-          case bfd_link_hash_defined:
-          case bfd_link_hash_defweak:
-            return h->root.u.def.section;
- 
-          case bfd_link_hash_common:
-            return h->root.u.c.p->section;
-          }
-       }
-     }
-   else
-     {
-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
-  return NULL;
-}
-
-static boolean
-m32r_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  /* we don't use got and plt entries for m32r */
-  return true;
-}
-
-
-/* Look through the relocs for a section during the first phase.
-   Since we don't do .gots or .plts, we just need to consider the
-   virtual table relocs for gc.  */
- 
-static boolean
-m32r_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
- 
-  if (info->relocateable)
-    return true;
- 
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
- 
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      struct elf_link_hash_entry *h;
-      unsigned long r_symndx;
- 
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-        h = NULL;
-      else
-        h = sym_hashes[r_symndx - symtab_hdr->sh_info];
- 
-      switch (ELF32_R_TYPE (rel->r_info))
-        {
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_M32R_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
- 
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_M32R_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
-        }
-    }
- 
-  return true;
-}
-
-
-
-
-#define ELF_ARCH		bfd_arch_m32r
-#define ELF_MACHINE_CODE	EM_CYGNUS_M32R
-#define ELF_MAXPAGESIZE		0x1000
-
-#define TARGET_BIG_SYM          bfd_elf32_m32r_vec
-#define TARGET_BIG_NAME		"elf32-m32r"
-
-#define elf_info_to_howto			0
-#define elf_info_to_howto_rel			m32r_info_to_howto_rel
-#define elf_backend_section_from_bfd_section	_bfd_m32r_elf_section_from_bfd_section
-#define elf_backend_symbol_processing		_bfd_m32r_elf_symbol_processing
-#define elf_backend_add_symbol_hook		m32r_elf_add_symbol_hook
-#define elf_backend_relocate_section		m32r_elf_relocate_section
-#define elf_backend_gc_mark_hook                m32r_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook               m32r_elf_gc_sweep_hook
-#define elf_backend_check_relocs                m32r_elf_check_relocs
-
-#define elf_backend_can_gc_sections             1
-#if 0 /* not yet */
-/* relax support */
-#define bfd_elf32_bfd_relax_section		m32r_elf_relax_section
-#define bfd_elf32_bfd_get_relocated_section_contents \
-					m32r_elf_get_relocated_section_contents
-#endif
-
-#define elf_backend_object_p			m32r_elf_object_p
-#define elf_backend_final_write_processing 	m32r_elf_final_write_processing
-#define bfd_elf32_bfd_copy_private_bfd_data 	m32r_elf_copy_private_bfd_data
-#define bfd_elf32_bfd_merge_private_bfd_data 	m32r_elf_merge_private_bfd_data
-#define bfd_elf32_bfd_set_private_flags		m32r_elf_set_private_flags
-#define bfd_elf32_bfd_print_private_bfd_data	m32r_elf_print_private_bfd_data
-					
-#include "elf32-target.h"
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
deleted file mode 100644
index 2d0aba210fb..00000000000
--- a/bfd/elf32-m68k.c
+++ /dev/null
@@ -1,2128 +0,0 @@
-/* Motorola 68k series support for 32-bit ELF
-   Copyright 1993, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/m68k.h"
-
-static reloc_howto_type *reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void rtype_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static struct bfd_hash_entry *elf_m68k_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *elf_m68k_link_hash_table_create
-  PARAMS ((bfd *));
-static boolean elf_m68k_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
-static asection *elf_m68k_gc_mark_hook
-  PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Rela *,
-	   struct elf_link_hash_entry *, Elf_Internal_Sym *));
-static boolean elf_m68k_gc_sweep_hook
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
-static boolean elf_m68k_adjust_dynamic_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf_m68k_adjust_dynindx
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_m68k_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_m68k_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf_m68k_finish_dynamic_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
-	   Elf_Internal_Sym *));
-static boolean elf_m68k_finish_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-static reloc_howto_type howto_table[] = {
-  HOWTO(R_68K_NONE,       0, 0, 0, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_NONE",      false, 0, 0x00000000,false),
-  HOWTO(R_68K_32,         0, 2,32, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_32",        false, 0, 0xffffffff,false),
-  HOWTO(R_68K_16,         0, 1,16, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_16",        false, 0, 0x0000ffff,false),
-  HOWTO(R_68K_8,          0, 0, 8, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_8",         false, 0, 0x000000ff,false),
-  HOWTO(R_68K_PC32,       0, 2,32, true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PC32",      false, 0, 0xffffffff,true),
-  HOWTO(R_68K_PC16,       0, 1,16, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC16",      false, 0, 0x0000ffff,true),
-  HOWTO(R_68K_PC8,        0, 0, 8, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PC8",       false, 0, 0x000000ff,true),
-  HOWTO(R_68K_GOT32,      0, 2,32, true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32",     false, 0, 0xffffffff,true),
-  HOWTO(R_68K_GOT16,      0, 1,16, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16",     false, 0, 0x0000ffff,true),
-  HOWTO(R_68K_GOT8,       0, 0, 8, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8",      false, 0, 0x000000ff,true),
-  HOWTO(R_68K_GOT32O,     0, 2,32, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_GOT32O",    false, 0, 0xffffffff,false),
-  HOWTO(R_68K_GOT16O,     0, 1,16, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT16O",    false, 0, 0x0000ffff,false),
-  HOWTO(R_68K_GOT8O,      0, 0, 8, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_GOT8O",     false, 0, 0x000000ff,false),
-  HOWTO(R_68K_PLT32,      0, 2,32, true, 0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32",     false, 0, 0xffffffff,true),
-  HOWTO(R_68K_PLT16,      0, 1,16, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16",     false, 0, 0x0000ffff,true),
-  HOWTO(R_68K_PLT8,       0, 0, 8, true, 0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8",      false, 0, 0x000000ff,true),
-  HOWTO(R_68K_PLT32O,     0, 2,32, false,0, complain_overflow_bitfield, bfd_elf_generic_reloc, "R_68K_PLT32O",    false, 0, 0xffffffff,false),
-  HOWTO(R_68K_PLT16O,     0, 1,16, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT16O",    false, 0, 0x0000ffff,false),
-  HOWTO(R_68K_PLT8O,      0, 0, 8, false,0, complain_overflow_signed,   bfd_elf_generic_reloc, "R_68K_PLT8O",     false, 0, 0x000000ff,false),
-  HOWTO(R_68K_COPY,       0, 0, 0, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_COPY",      false, 0, 0xffffffff,false),
-  HOWTO(R_68K_GLOB_DAT,   0, 2,32, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_GLOB_DAT",  false, 0, 0xffffffff,false),
-  HOWTO(R_68K_JMP_SLOT,   0, 2,32, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_JMP_SLOT",  false, 0, 0xffffffff,false),
-  HOWTO(R_68K_RELATIVE,   0, 2,32, false,0, complain_overflow_dont,     bfd_elf_generic_reloc, "R_68K_RELATIVE",  false, 0, 0xffffffff,false),
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_68K_GNU_VTINHERIT,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "R_68K_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_68K_GNU_VTENTRY,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
-	 "R_68K_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),
-};
-
-static void
-rtype_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
-{
-  BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_68K_max);
-  cache_ptr->howto = &howto_table[ELF32_R_TYPE(dst->r_info)];
-}
-
-#define elf_info_to_howto rtype_to_howto
-
-static const struct
-{
-  bfd_reloc_code_real_type bfd_val;
-  int elf_val;
-} reloc_map[] = {
-  { BFD_RELOC_NONE, R_68K_NONE },
-  { BFD_RELOC_32, R_68K_32 },
-  { BFD_RELOC_16, R_68K_16 },
-  { BFD_RELOC_8, R_68K_8 },
-  { BFD_RELOC_32_PCREL, R_68K_PC32 },
-  { BFD_RELOC_16_PCREL, R_68K_PC16 },
-  { BFD_RELOC_8_PCREL, R_68K_PC8 },
-  { BFD_RELOC_32_GOT_PCREL, R_68K_GOT32 },
-  { BFD_RELOC_16_GOT_PCREL, R_68K_GOT16 },
-  { BFD_RELOC_8_GOT_PCREL, R_68K_GOT8 },
-  { BFD_RELOC_32_GOTOFF, R_68K_GOT32O },
-  { BFD_RELOC_16_GOTOFF, R_68K_GOT16O },
-  { BFD_RELOC_8_GOTOFF, R_68K_GOT8O },
-  { BFD_RELOC_32_PLT_PCREL, R_68K_PLT32 },
-  { BFD_RELOC_16_PLT_PCREL, R_68K_PLT16 },
-  { BFD_RELOC_8_PLT_PCREL, R_68K_PLT8 },
-  { BFD_RELOC_32_PLTOFF, R_68K_PLT32O },
-  { BFD_RELOC_16_PLTOFF, R_68K_PLT16O },
-  { BFD_RELOC_8_PLTOFF, R_68K_PLT8O },
-  { BFD_RELOC_NONE, R_68K_COPY },
-  { BFD_RELOC_68K_GLOB_DAT, R_68K_GLOB_DAT },
-  { BFD_RELOC_68K_JMP_SLOT, R_68K_JMP_SLOT },
-  { BFD_RELOC_68K_RELATIVE, R_68K_RELATIVE },
-  { BFD_RELOC_CTOR, R_68K_32 },
-  { BFD_RELOC_VTABLE_INHERIT, R_68K_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY, R_68K_GNU_VTENTRY },
-};
-
-static reloc_howto_type *
-reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-  for (i = 0; i < sizeof (reloc_map) / sizeof (reloc_map[0]); i++)
-    {
-      if (reloc_map[i].bfd_val == code)
-	return &howto_table[reloc_map[i].elf_val];
-    }
-  return 0;
-}
-
-#define bfd_elf32_bfd_reloc_type_lookup reloc_type_lookup
-#define ELF_ARCH bfd_arch_m68k
-/* end code generated by elf.el */
-
-#define USE_RELA
-
-
-/* Functions for the m68k ELF linker.  */
-
-/* The name of the dynamic interpreter.  This is put in the .interp
-   section.  */
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
-
-/* The size in bytes of an entry in the procedure linkage table.  */
-
-#define PLT_ENTRY_SIZE 20
-
-/* The first entry in a procedure linkage table looks like this.  See
-   the SVR4 ABI m68k supplement to see how this works.  */
-
-static const bfd_byte elf_m68k_plt0_entry[PLT_ENTRY_SIZE] =
-{
-  0x2f, 0x3b, 0x01, 0x70, /* move.l (%pc,addr),-(%sp) */
-  0, 0, 0, 0,		  /* replaced with offset to .got + 4.  */
-  0x4e, 0xfb, 0x01, 0x71, /* jmp ([%pc,addr]) */
-  0, 0, 0, 0,		  /* replaced with offset to .got + 8.  */
-  0, 0, 0, 0		  /* pad out to 20 bytes.  */
-};
-
-/* Subsequent entries in a procedure linkage table look like this.  */
-
-static const bfd_byte elf_m68k_plt_entry[PLT_ENTRY_SIZE] =
-{
-  0x4e, 0xfb, 0x01, 0x71, /* jmp ([%pc,symbol@GOTPC]) */
-  0, 0, 0, 0,		  /* replaced with offset to symbol's .got entry.  */
-  0x2f, 0x3c,		  /* move.l #offset,-(%sp) */
-  0, 0, 0, 0,		  /* replaced with offset into relocation table.  */
-  0x60, 0xff,		  /* bra.l .plt */
-  0, 0, 0, 0		  /* replaced with offset to start of .plt.  */
-};
-
-/* The m68k linker needs to keep track of the number of relocs that it
-   decides to copy in check_relocs for each symbol.  This is so that it
-   can discard PC relative relocs if it doesn't need them when linking
-   with -Bsymbolic.  We store the information in a field extending the
-   regular ELF linker hash table.  */
-
-/* This structure keeps track of the number of PC relative relocs we have
-   copied for a given symbol.  */
-
-struct elf_m68k_pcrel_relocs_copied
-{
-  /* Next section.  */
-  struct elf_m68k_pcrel_relocs_copied *next;
-  /* A section in dynobj.  */
-  asection *section;
-  /* Number of relocs copied in this section.  */
-  bfd_size_type count;
-};
-
-/* m68k ELF linker hash entry.  */
-
-struct elf_m68k_link_hash_entry
-{
-  struct elf_link_hash_entry root;
-
-  /* Number of PC relative relocs copied for this symbol.  */
-  struct elf_m68k_pcrel_relocs_copied *pcrel_relocs_copied;
-};
-
-/* m68k ELF linker hash table.  */
-
-struct elf_m68k_link_hash_table
-{
-  struct elf_link_hash_table root;
-};
-
-/* Declare this now that the above structures are defined.  */
-
-static boolean elf_m68k_discard_copies
-  PARAMS ((struct elf_m68k_link_hash_entry *, PTR));
-
-/* Traverse an m68k ELF linker hash table.  */
-
-#define elf_m68k_link_hash_traverse(table, func, info)			\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the m68k ELF linker hash table from a link_info structure.  */
-
-#define elf_m68k_hash_table(p) \
-  ((struct elf_m68k_link_hash_table *) (p)->hash)
-
-/* Create an entry in an m68k ELF linker hash table.  */
-
-static struct bfd_hash_entry *
-elf_m68k_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct elf_m68k_link_hash_entry *ret =
-    (struct elf_m68k_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct elf_m68k_link_hash_entry *) NULL)
-    ret = ((struct elf_m68k_link_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct elf_m68k_link_hash_entry)));
-  if (ret == (struct elf_m68k_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct elf_m68k_link_hash_entry *)
-	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				     table, string));
-  if (ret != (struct elf_m68k_link_hash_entry *) NULL)
-    {
-      ret->pcrel_relocs_copied = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create an m68k ELF linker hash table.  */
-
-static struct bfd_link_hash_table *
-elf_m68k_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct elf_m68k_link_hash_table *ret;
-
-  ret = ((struct elf_m68k_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct elf_m68k_link_hash_table)));
-  if (ret == (struct elf_m68k_link_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
-				       elf_m68k_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  return &ret->root.root;
-}
-
-/* Look through the relocs for a section during the first phase, and
-   allocate space in the global offset table or procedure linkage
-   table.  */
-
-static boolean
-elf_m68k_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-  asection *sgot;
-  asection *srelgot;
-  asection *sreloc;
-
-  if (info->relocateable)
-    return true;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  sgot = NULL;
-  srelgot = NULL;
-  sreloc = NULL;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_68K_GOT8:
-	case R_68K_GOT16:
-	case R_68K_GOT32:
-	  if (h != NULL
-	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	    break;
-	  /* Fall through.  */
-	case R_68K_GOT8O:
-	case R_68K_GOT16O:
-	case R_68K_GOT32O:
-	  /* This symbol requires a global offset table entry.  */
-
-	  if (dynobj == NULL)
-	    {
-	      /* Create the .got section.  */
-	      elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (!_bfd_elf_create_got_section (dynobj, info))
-		return false;
-	    }
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (srelgot == NULL
-	      && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || !bfd_set_section_flags (dynobj, srelgot,
-						 (SEC_ALLOC
-						  | SEC_LOAD
-						  | SEC_HAS_CONTENTS
-						  | SEC_IN_MEMORY
-						  | SEC_LINKER_CREATED
-						  | SEC_READONLY))
-		      || !bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
-	  if (h != NULL)
-	    {
-	      if (h->got.refcount == -1)
-		{
-		  h->got.refcount = 1;
-
-		  /* Make sure this symbol is output as a dynamic symbol.  */
-		  if (h->dynindx == -1)
-		    {
-		      if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-			return false;
-		    }
-
-		  /* Allocate space in the .got section.  */
-		  sgot->_raw_size += 4;
-		  /* Allocate relocation space.  */
-		  srelgot->_raw_size += sizeof (Elf32_External_Rela);
-		}
-	      else
-		h->got.refcount++;
-	    }
-	  else
-	    {
-	      /* This is a global offset table entry for a local symbol.  */
-	      if (local_got_refcounts == NULL)
-		{
-		  size_t size;
-
-		  size = symtab_hdr->sh_info * sizeof (bfd_signed_vma);
-		  local_got_refcounts = ((bfd_signed_vma *)
-					 bfd_alloc (abfd, size));
-		  if (local_got_refcounts == NULL)
-		    return false;
-		  elf_local_got_refcounts (abfd) = local_got_refcounts;
-		  memset (local_got_refcounts, -1, size);
-		}
-	      if (local_got_refcounts[r_symndx] == -1)
-		{
-		  local_got_refcounts[r_symndx] = 1;
-
-		  sgot->_raw_size += 4;
-		  if (info->shared)
-		    {
-		      /* If we are generating a shared object, we need to
-			 output a R_68K_RELATIVE reloc so that the dynamic
-			 linker can adjust this GOT entry.  */
-		      srelgot->_raw_size += sizeof (Elf32_External_Rela);
-		    }
-		}
-	      else
-		local_got_refcounts[r_symndx]++;
-	    }
-	  break;
-
-	case R_68K_PLT8:
-	case R_68K_PLT16:
-	case R_68K_PLT32:
-	  /* This symbol requires a procedure linkage table entry.  We
-	     actually build the entry in adjust_dynamic_symbol,
-             because this might be a case of linking PIC code which is
-             never referenced by a dynamic object, in which case we
-             don't need to generate a procedure linkage table entry
-             after all.  */
-
-	  /* If this is a local symbol, we resolve it directly without
-	     creating a procedure linkage table entry.  */
-	  if (h == NULL)
-	    continue;
-
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-	  if (h->plt.refcount == -1)
-	    h->plt.refcount = 1;
-	  else
-	    h->plt.refcount++;
-	  break;
-
-	case R_68K_PLT8O:
-	case R_68K_PLT16O:
-	case R_68K_PLT32O:
-	  /* This symbol requires a procedure linkage table entry.  */
-
-	  if (h == NULL)
-	    {
-	      /* It does not make sense to have this relocation for a
-		 local symbol.  FIXME: does it?  How to handle it if
-		 it does make sense?  */
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-
-	  /* Make sure this symbol is output as a dynamic symbol.  */
-	  if (h->dynindx == -1)
-	    {
-	      if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
-	    }
-
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-	  if (h->plt.refcount == -1)
-	    h->plt.refcount = 1;
-	  else
-	    h->plt.refcount++;
-	  break;
-
-	case R_68K_PC8:
-	case R_68K_PC16:
-	case R_68K_PC32:
-	  /* If we are creating a shared library and this is not a local
-	     symbol, we need to copy the reloc into the shared library.
-	     However when linking with -Bsymbolic and this is a global
-	     symbol which is defined in an object we are including in the
-	     link (i.e., DEF_REGULAR is set), then we can resolve the
-	     reloc directly.  At this point we have not seen all the input
-	     files, so it is possible that DEF_REGULAR is not set now but
-	     will be set later (it is never cleared).  We account for that
-	     possibility below by storing information in the
-	     pcrel_relocs_copied field of the hash table entry.  */
-	  if (!(info->shared
-		&& (sec->flags & SEC_ALLOC) != 0
-		&& h != NULL
-		&& (!info->symbolic
-		    || (h->elf_link_hash_flags
-			& ELF_LINK_HASH_DEF_REGULAR) == 0)))
-	    {
-	      if (h != NULL)
-		{
-		  /* Make sure a plt entry is created for this symbol if
-		     it turns out to be a function defined by a dynamic
-		     object.  */
-		  if (h->plt.refcount == -1)
-		    h->plt.refcount = 1;
-		  else
-		    h->plt.refcount++;
-		}
-	      break;
-	    }
-	  /* Fall through.  */
-	case R_68K_8:
-	case R_68K_16:
-	case R_68K_32:
-	  if (h != NULL)
-	    {
-	      /* Make sure a plt entry is created for this symbol if it
-		 turns out to be a function defined by a dynamic object.  */
-	      if (h->plt.refcount == -1)
-		h->plt.refcount = 1;
-	      else
-		h->plt.refcount++;
-	    }
-
-	  /* If we are creating a shared library, we need to copy the
-	     reloc into the shared library.  */
-	  if (info->shared
-	      && (sec->flags & SEC_ALLOC) != 0)
-	    {
-	      /* When creating a shared object, we must copy these
-		 reloc types into the output file.  We create a reloc
-		 section in dynobj and make room for this reloc.  */
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (abfd,
-			   elf_elfheader (abfd)->e_shstrndx,
-			   elf_section_data (sec)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (abfd, sec),
-					 name + 5) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  if (sreloc == NULL)
-		    {
-		      sreloc = bfd_make_section (dynobj, name);
-		      if (sreloc == NULL
-			  || !bfd_set_section_flags (dynobj, sreloc,
-						     (SEC_ALLOC
-						      | SEC_LOAD
-						      | SEC_HAS_CONTENTS
-						      | SEC_IN_MEMORY
-						      | SEC_LINKER_CREATED
-						      | SEC_READONLY))
-			  || !bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
-		    }
-		}
-
-	      sreloc->_raw_size += sizeof (Elf32_External_Rela);
-
-	      /* If we are linking with -Bsymbolic, we count the number of
-		 PC relative relocations we have entered for this symbol,
-		 so that we can discard them again if the symbol is later
-		 defined by a regular object.  Note that this function is
-		 only called if we are using an m68kelf linker hash table,
-		 which means that h is really a pointer to an
-		 elf_m68k_link_hash_entry.  */
-	      if ((ELF32_R_TYPE (rel->r_info) == R_68K_PC8
- 		   || ELF32_R_TYPE (rel->r_info) == R_68K_PC16
- 		   || ELF32_R_TYPE (rel->r_info) == R_68K_PC32)
-		  && info->symbolic)
-		{
-		  struct elf_m68k_link_hash_entry *eh;
-		  struct elf_m68k_pcrel_relocs_copied *p;
-
-		  eh = (struct elf_m68k_link_hash_entry *) h;
-
-		  for (p = eh->pcrel_relocs_copied; p != NULL; p = p->next)
-		    if (p->section == sreloc)
-		      break;
-
-		  if (p == NULL)
-		    {
-		      p = ((struct elf_m68k_pcrel_relocs_copied *)
-			   bfd_alloc (dynobj, sizeof *p));
-		      if (p == NULL)
-			return false;
-		      p->next = eh->pcrel_relocs_copied;
-		      eh->pcrel_relocs_copied = p;
-		      p->section = sreloc;
-		      p->count = 0;
-		    }
-
-		  ++p->count;
-		}
-	    }
-
-	  break;
-
-	  /* This relocation describes the C++ object vtable hierarchy.
-	     Reconstruct it for later use during GC.  */
-	case R_68K_GNU_VTINHERIT:
-	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
-	  break;
-
-	  /* This relocation describes which C++ vtable entries are actually
-	     used.  Record for later use during GC.  */
-	case R_68K_GNU_VTENTRY:
-	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
-	  break;
-
-	default:
-	  break;
-	}
-    }
-
-  return true;
-}
-
-/* Return the section that should be marked against GC for a given
-   relocation.  */
-
-static asection *
-elf_m68k_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     Elf_Internal_Rela *rel;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_68K_GNU_VTINHERIT:
-	case R_68K_GNU_VTENTRY:
-	  break;
-
-	default:
-	  switch (h->root.type)
-	    {
-	    default:
-	      break;
-
-	    case bfd_link_hash_defined:
-	    case bfd_link_hash_defweak:
-	      return h->root.u.def.section;
-
-	    case bfd_link_hash_common:
-	      return h->root.u.c.p->section;
-	    }
-	}
-    }
-  else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-		&& sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
-
-  return NULL;
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-
-static boolean
-elf_m68k_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
-  const Elf_Internal_Rela *rel, *relend;
-  unsigned long r_symndx;
-  struct elf_link_hash_entry *h;
-  bfd *dynobj;
-  asection *sgot;
-  asection *srelgot;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  dynobj = elf_hash_table (info)->dynobj;
-  if (dynobj)
-    {
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-    }
-
-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; rel++)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_68K_GOT8:
-	case R_68K_GOT16:
-	case R_68K_GOT32:
-	case R_68K_GOT8O:
-	case R_68K_GOT16O:
-	case R_68K_GOT32O:
-	  r_symndx = ELF32_R_SYM (rel->r_info);
-	  if (r_symndx >= symtab_hdr->sh_info)
-	    {
-	      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	      if (h->got.refcount > 0)
-		{
-		  --h->got.refcount;
-		  if (h->got.refcount == 0)
-		    {
-		      /* We don't need the .got entry any more.  */
-		      sgot->_raw_size -= 4;
-		      srelgot->_raw_size -= sizeof (Elf32_External_Rela);
-		    }
-		}
-	    }
-	  else
-	    {
-	      if (local_got_refcounts[r_symndx] > 0)
-		{
-		  --local_got_refcounts[r_symndx];
-		  if (local_got_refcounts[r_symndx] == 0)
-		    {
-		      /* We don't need the .got entry any more.  */
-		      sgot->_raw_size -= 4;
-		      if (info->shared)
-			srelgot->_raw_size -= sizeof (Elf32_External_Rela);
-		    }
-		}
-	    }
-	  break;
-
-	case R_68K_PLT8:
-	case R_68K_PLT16:
-	case R_68K_PLT32:
-	case R_68K_PLT8O:
-	case R_68K_PLT16O:
-	case R_68K_PLT32O:
-	case R_68K_PC8:
-	case R_68K_PC16:
-	case R_68K_PC32:
-	case R_68K_8:
-	case R_68K_16:
-	case R_68K_32:
-	  r_symndx = ELF32_R_SYM (rel->r_info);
-	  if (r_symndx >= symtab_hdr->sh_info)
-	    {
-	      h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	      if (h->plt.refcount > 0)
-		--h->plt.refcount;
-	    }
-	  break;
-
-	default:
-	  break;
-	}
-    }
-
-  return true;
-}
-
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-elf_m68k_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  bfd *dynobj;
-  asection *s;
-  unsigned int power_of_two;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
-  /* If this is a function, put it in the procedure linkage table.  We
-     will fill in the contents of the procedure linkage table later,
-     when we know the address of the .got section.  */
-  if (h->type == STT_FUNC
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
-    {
-      if (! info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) == 0
-	  /* We must always create the plt entry if it was referenced
-	     by a PLTxxO relocation.  In this case we already recorded
-	     it as a dynamic symbol.  */
-	  && h->dynindx == -1)
-	{
-	  /* This case can occur if we saw a PLTxx reloc in an input
-	     file, but the symbol was never referred to by a dynamic
-	     object.  In such a case, we don't actually need to build
-	     a procedure linkage table, and we can just do a PCxx
-	     reloc instead.  */
-	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
-	  h->plt.offset = (bfd_vma) -1;
-	  return true;
-	}
-
-      /* GC may have rendered this entry unused.  */
-      if (h->plt.refcount <= 0)
-	{
-	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  h->plt.offset = (bfd_vma) -1;
-	  return true;
-	}
-
-      /* Make sure this symbol is output as a dynamic symbol.  */
-      if (h->dynindx == -1)
-	{
-	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-      /* If this is the first .plt entry, make room for the special
-	 first entry.  */
-      if (s->_raw_size == 0)
-	s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* If this symbol is not defined in a regular file, and we are
-	 not generating a shared library, then set the symbol to this
-	 location in the .plt.  This is required to make function
-	 pointers compare as equal between the normal executable and
-	 the shared library.  */
-      if (!info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  h->root.u.def.section = s;
-	  h->root.u.def.value = s->_raw_size;
-	}
-
-      h->plt.offset = s->_raw_size;
-
-      /* Make room for this entry.  */
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .got.plt section, which
-	 will be placed in the .got section by the linker script.  */
-
-      s = bfd_get_section_by_name (dynobj, ".got.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += 4;
-
-      /* We also need to make an entry in the .rela.plt section.  */
-
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf32_External_Rela);
-
-      return true;
-    }
-
-  /* Reinitialize the plt offset now that it is not used as a reference
-     count any more.  */
-  h->plt.offset = (bfd_vma) -1;
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  /* If we are creating a shared library, we must presume that the
-     only references to the symbol are via the global offset table.
-     For such cases we need not do anything here; the relocations will
-     be handled correctly by relocate_section.  */
-  if (info->shared)
-    return true;
-
-  /* We must allocate the symbol in our .dynbss section, which will
-     become part of the .bss section of the executable.  There will be
-     an entry for this symbol in the .dynsym section.  The dynamic
-     object will contain position independent code, so all references
-     from the dynamic object to this symbol will go through the global
-     offset table.  The dynamic linker will use the .dynsym entry to
-     determine the address it must put in the global offset table, so
-     both the dynamic object and the regular object will refer to the
-     same memory location for the variable.  */
-
-  s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
-
-  /* We must generate a R_68K_COPY reloc to tell the dynamic linker to
-     copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-    {
-      asection *srel;
-
-      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf32_External_Rela);
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
-    }
-
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 3)
-    power_of_two = 3;
-
-  /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
-    {
-      if (!bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
-    }
-
-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->_raw_size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->_raw_size += h->size;
-
-  return true;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-elf_m68k_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (!info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-    }
-  else
-    {
-      /* We may have created entries in the .rela.got section.
-	 However, if we are not creating the dynamic sections, we will
-	 not actually use these entries.  Reset the size of .rela.got,
-	 which will cause it to get stripped from the output file
-	 below.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.got");
-      if (s != NULL)
-	s->_raw_size = 0;
-    }
-
-  /* If this is a -Bsymbolic shared link, then we need to discard all PC
-     relative relocs against symbols defined in a regular object.  We
-     allocated space for them in the check_relocs routine, but we will not
-     fill them in in the relocate_section routine.  */
-  if (info->shared && info->symbolic)
-    elf_m68k_link_hash_traverse (elf_m68k_hash_table (info),
-				 elf_m68k_discard_copies,
-				 (PTR) NULL);
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      boolean strip;
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-	continue;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strcmp (name, ".plt") == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* Strip this section if we don't need it; see the
-                 comment below.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      /* Remember whether there is a PLT.  */
-	      plt = true;
-	    }
-	}
-      else if (strncmp (name, ".rela", 5) == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is mostly to handle .rela.bss and
-		 .rela.plt.  We must create both sections in
-		 create_dynamic_sections, because they must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      asection *target;
-
-	      /* Remember whether there are any reloc sections other
-                 than .rela.plt.  */
-	      if (strcmp (name, ".rela.plt") != 0)
-		{
-		  const char *outname;
-
-		  relocs = true;
-
-		  /* If this relocation section applies to a read only
-		     section, then we probably need a DT_TEXTREL
-		     entry.  .rela.plt is actually associated with
-		     .got.plt, which is never readonly.  */
-		  outname = bfd_get_section_name (output_bfd,
-						  s->output_section);
-		  target = bfd_get_section_by_name (output_bfd, outname + 5);
-		  if (target != NULL
-		      && (target->flags & SEC_READONLY) != 0
-		      && (target->flags & SEC_ALLOC) != 0)
-		    reltext = true;
-		}
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
-	    }
-	}
-      else if (strncmp (name, ".got", 4) != 0)
-	{
-	  /* It's not one of our sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	{
-	  _bfd_strip_section_from_output (s);
-	  continue;
-	}
-
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in elf_m68k_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (!info->shared)
-	{
-	  if (!bfd_elf32_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
-	}
-
-      if (plt)
-	{
-	  if (!bfd_elf32_add_dynamic_entry (info, DT_PLTGOT, 0)
-	      || !bfd_elf32_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-	      || !bfd_elf32_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
-	      || !bfd_elf32_add_dynamic_entry (info, DT_JMPREL, 0))
-	    return false;
-	}
-
-      if (relocs)
-	{
-	  if (!bfd_elf32_add_dynamic_entry (info, DT_RELA, 0)
-	      || !bfd_elf32_add_dynamic_entry (info, DT_RELASZ, 0)
-	      || !bfd_elf32_add_dynamic_entry (info, DT_RELAENT,
-					       sizeof (Elf32_External_Rela)))
-	    return false;
-	}
-
-      if (reltext)
-	{
-	  if (!bfd_elf32_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-    }
-
-  /* If we are generating a shared library, we generate a section
-     symbol for each output section for which we might need to copy
-     relocs.  These are local symbols, which means that they must come
-     first in the dynamic symbol table.  That means we must increment
-     the dynamic symbol index of every other dynamic symbol.  */
-  if (info->shared)
-    {
-      int c;
-
-      c = 0;
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  if ((s->flags & SEC_LINKER_CREATED) != 0
-	      || (s->flags & SEC_ALLOC) == 0)
-	    continue;
-
-	  elf_section_data (s)->dynindx = c + 1;
-
-	  /* These symbols will have no names, so we don't need to
-             fiddle with dynstr_index.  */
-
-	  ++c;
-	}
-
-      elf_link_hash_traverse (elf_hash_table (info),
-			      elf_m68k_adjust_dynindx,
-			      (PTR) &c);
-      elf_hash_table (info)->dynsymcount += c;
-    }
-
-  return true;
-}
-
-/* Increment the index of a dynamic symbol by a given amount.  Called
-   via elf_link_hash_traverse.  */
-
-static boolean
-elf_m68k_adjust_dynindx (h, cparg)
-     struct elf_link_hash_entry *h;
-     PTR cparg;
-{
-  int *cp = (int *) cparg;
-
-  if (h->dynindx != -1)
-    h->dynindx += *cp;
-  return true;
-}
-
-/* This function is called via elf_m68k_link_hash_traverse if we are
-   creating a shared object with -Bsymbolic.  It discards the space
-   allocated to copy PC relative relocs against symbols which are defined
-   in regular objects.  We allocated space for them in the check_relocs
-   routine, but we won't fill them in in the relocate_section routine.  */
-
-/*ARGSUSED*/
-static boolean
-elf_m68k_discard_copies (h, ignore)
-     struct elf_m68k_link_hash_entry *h;
-     PTR ignore;
-{
-  struct elf_m68k_pcrel_relocs_copied *s;
-
-  /* We only discard relocs for symbols defined in a regular object.  */
-  if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
-
-  for (s = h->pcrel_relocs_copied; s != NULL; s = s->next)
-    s->section->_raw_size -= s->count * sizeof (Elf32_External_Rela);
-
-  return true;
-}
-
-/* Relocate an M68K ELF section.  */
-
-static boolean
-elf_m68k_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_vma *local_got_offsets;
-  asection *sgot;
-  asection *splt;
-  asection *sreloc;
-  Elf_Internal_Rela *rel;
-  Elf_Internal_Rela *relend;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-  local_got_offsets = elf_local_got_offsets (input_bfd);
-
-  sgot = NULL;
-  splt = NULL;
-  sreloc = NULL;
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_type = ELF32_R_TYPE (rel->r_info);
-      if (r_type < 0 || r_type >= (int) R_68K_max)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      howto = howto_table + r_type;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      if (((r_type == R_68K_PLT8
-		    || r_type == R_68K_PLT16
-		    || r_type == R_68K_PLT32
-		    || r_type == R_68K_PLT8O
-		    || r_type == R_68K_PLT16O
-		    || r_type == R_68K_PLT32O)
-		   && h->plt.offset != (bfd_vma) -1
-		   && elf_hash_table (info)->dynamic_sections_created)
-		  || ((r_type == R_68K_GOT8O
-		       || r_type == R_68K_GOT16O
-		       || r_type == R_68K_GOT32O
-		       || ((r_type == R_68K_GOT8
-			    || r_type == R_68K_GOT16
-			    || r_type == R_68K_GOT32)
-			   && strcmp (h->root.root.string,
-				      "_GLOBAL_OFFSET_TABLE_") != 0))
-		      && elf_hash_table (info)->dynamic_sections_created
-		      && (! info->shared
-			  || (! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		  || (info->shared
-		      && ((! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0)
-		      && (input_section->flags & SEC_ALLOC) != 0
-		      && (r_type == R_68K_8
-			  || r_type == R_68K_16
-			  || r_type == R_68K_32
-			  || r_type == R_68K_PC8
-			  || r_type == R_68K_PC16
-			  || r_type == R_68K_PC32)))
-		{
-		  /* In these cases, we don't need the relocation
-		     value.  We check specially because in some
-		     obscure cases sec->output_section will be NULL.  */
-		  relocation = 0;
-		}
-	      else
-		relocation = (h->root.u.def.value
-			      + sec->output_section->vma
-			      + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else if (info->shared && !info->symbolic && !info->no_undefined)
-	    relocation = 0;
-	  else
-	    {
-	      if (!(info->callbacks->undefined_symbol
-		    (info, h->root.root.string, input_bfd,
-		     input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      switch (r_type)
-	{
-	case R_68K_GOT8:
-	case R_68K_GOT16:
-	case R_68K_GOT32:
-	  /* Relocation is to the address of the entry for this symbol
-	     in the global offset table.  */
-	  if (h != NULL
-	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	    break;
-	  /* Fall through.  */
-	case R_68K_GOT8O:
-	case R_68K_GOT16O:
-	case R_68K_GOT32O:
-	  /* Relocation is the offset of the entry for this symbol in
-	     the global offset table.  */
-
-	  {
-	    bfd_vma off;
-
-	    if (sgot == NULL)
-	      {
-		sgot = bfd_get_section_by_name (dynobj, ".got");
-		BFD_ASSERT (sgot != NULL);
-	      }
-
-	    if (h != NULL)
-	      {
-		off = h->got.offset;
-		BFD_ASSERT (off != (bfd_vma) -1);
-
-		if (!elf_hash_table (info)->dynamic_sections_created
-		    || (info->shared
-			&& (info->symbolic || h->dynindx == -1)
-			&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
-		  {
-		    /* This is actually a static link, or it is a
-		       -Bsymbolic link and the symbol is defined
-		       locally, or the symbol was forced to be local
-		       because of a version file..  We must initialize
-		       this entry in the global offset table.  Since
-		       the offset must always be a multiple of 4, we
-		       use the least significant bit to record whether
-		       we have initialized it already.
-
-		       When doing a dynamic link, we create a .rela.got
-		       relocation entry to initialize the value.  This
-		       is done in the finish_dynamic_symbol routine.  */
-		    if ((off & 1) != 0)
-		      off &= ~1;
-		    else
-		      {
-			bfd_put_32 (output_bfd, relocation,
-				    sgot->contents + off);
-			h->got.offset |= 1;
-		      }
-		  }
-	      }
-	    else
-	      {
-		BFD_ASSERT (local_got_offsets != NULL
-			    && local_got_offsets[r_symndx] != (bfd_vma) -1);
-
-		off = local_got_offsets[r_symndx];
-
-		/* The offset must always be a multiple of 4.  We use
-		   the least significant bit to record whether we have
-		   already generated the necessary reloc.  */
-		if ((off & 1) != 0)
-		  off &= ~1;
-		else
-		  {
-		    bfd_put_32 (output_bfd, relocation, sgot->contents + off);
-
-		    if (info->shared)
-		      {
-			asection *srelgot;
-			Elf_Internal_Rela outrel;
-
-			srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-			BFD_ASSERT (srelgot != NULL);
-
-			outrel.r_offset = (sgot->output_section->vma
-					   + sgot->output_offset
-					   + off);
-			outrel.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
-			outrel.r_addend = relocation;
-			bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-						   (((Elf32_External_Rela *)
-						     srelgot->contents)
-						    + srelgot->reloc_count));
-			++srelgot->reloc_count;
-		      }
-
-		    local_got_offsets[r_symndx] |= 1;
-		  }
-	      }
-
-	    relocation = sgot->output_offset + off;
-	    if (r_type == R_68K_GOT8O
-		|| r_type == R_68K_GOT16O
-		|| r_type == R_68K_GOT32O)
-	      {
-		/* This relocation does not use the addend.  */
-		rel->r_addend = 0;
-	      }
-	    else
-	      relocation += sgot->output_section->vma;
-	  }
-	  break;
-
-	case R_68K_PLT8:
-	case R_68K_PLT16:
-	case R_68K_PLT32:
-	  /* Relocation is to the entry for this symbol in the
-	     procedure linkage table.  */
-
-	  /* Resolve a PLTxx reloc against a local symbol directly,
-	     without using the procedure linkage table.  */
-	  if (h == NULL)
-	    break;
-
-	  if (h->plt.offset == (bfd_vma) -1
-	      || !elf_hash_table (info)->dynamic_sections_created)
-	    {
-	      /* We didn't make a PLT entry for this symbol.  This
-		 happens when statically linking PIC code, or when
-		 using -Bsymbolic.  */
-	      break;
-	    }
-
-	  if (splt == NULL)
-	    {
-	      splt = bfd_get_section_by_name (dynobj, ".plt");
-	      BFD_ASSERT (splt != NULL);
-	    }
-
-	  relocation = (splt->output_section->vma
-			+ splt->output_offset
-			+ h->plt.offset);
-	  break;
-
-	case R_68K_PLT8O:
-	case R_68K_PLT16O:
-	case R_68K_PLT32O:
-	  /* Relocation is the offset of the entry for this symbol in
-	     the procedure linkage table.  */
-	  BFD_ASSERT (h != NULL && h->plt.offset != (bfd_vma) -1);
-
-	  if (splt == NULL)
-	    {
-	      splt = bfd_get_section_by_name (dynobj, ".plt");
-	      BFD_ASSERT (splt != NULL);
-	    }
-
-	  relocation = h->plt.offset;
-
-	  /* This relocation does not use the addend.  */
-	  rel->r_addend = 0;
-
-	  break;
-
-	case R_68K_PC8:
-	case R_68K_PC16:
-	case R_68K_PC32:
-	  if (h == NULL)
-	    break;
-	  /* Fall through.  */
-	case R_68K_8:
-	case R_68K_16:
-	case R_68K_32:
-	  if (info->shared
-	      && (input_section->flags & SEC_ALLOC) != 0
-	      && ((r_type != R_68K_PC8
-		   && r_type != R_68K_PC16
-		   && r_type != R_68K_PC32)
-		  || (!info->symbolic
-		      || (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)))
-	    {
-	      Elf_Internal_Rela outrel;
-	      boolean skip, relocate;
-
-	      /* When generating a shared object, these relocations
-		 are copied into the output file to be resolved at run
-		 time.  */
-
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (input_bfd,
-			   elf_elfheader (input_bfd)->e_shstrndx,
-			   elf_section_data (input_section)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (input_bfd,
-							       input_section),
-					 name + 5) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  BFD_ASSERT (sreloc != NULL);
-		}
-
-	      skip = false;
-
-	      if (elf_section_data (input_section)->stab_info == NULL)
-		outrel.r_offset = rel->r_offset;
-	      else
-		{
-		  bfd_vma off;
-
-		  off = (_bfd_stab_section_offset
-			 (output_bfd, &elf_hash_table (info)->stab_info,
-			  input_section,
-			  &elf_section_data (input_section)->stab_info,
-			  rel->r_offset));
-		  if (off == (bfd_vma) -1)
-		    skip = true;
-		  outrel.r_offset = off;
-		}
-
-	      outrel.r_offset += (input_section->output_section->vma
-				  + input_section->output_offset);
-
-	      if (skip)
-		{
-		  memset (&outrel, 0, sizeof outrel);
-		  relocate = false;
-		}
-	      /* h->dynindx may be -1 if the symbol was marked to
-                 become local.  */
-	      else if (h != NULL
-		       && ((! info->symbolic && h->dynindx != -1)
-			   || (h->elf_link_hash_flags
-			       & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		{
-		  BFD_ASSERT (h->dynindx != -1);
-		  relocate = false;
-		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
-		  outrel.r_addend = relocation + rel->r_addend;
-		}
-	      else
-		{
-		  if (r_type == R_68K_32)
-		    {
-		      relocate = true;
-		      outrel.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
-		      outrel.r_addend = relocation + rel->r_addend;
-		    }
-		  else
-		    {
-		      long indx;
-
-		      if (h == NULL)
-			sec = local_sections[r_symndx];
-		      else
-			{
-			  BFD_ASSERT (h->root.type == bfd_link_hash_defined
-				      || (h->root.type
-					  == bfd_link_hash_defweak));
-			  sec = h->root.u.def.section;
-			}
-		      if (sec != NULL && bfd_is_abs_section (sec))
-			indx = 0;
-		      else if (sec == NULL || sec->owner == NULL)
-			{
-			  bfd_set_error (bfd_error_bad_value);
-			  return false;
-			}
-		      else
-			{
-			  asection *osec;
-
-			  osec = sec->output_section;
-			  indx = elf_section_data (osec)->dynindx;
-			  BFD_ASSERT (indx > 0);
-			}
-
-		      relocate = false;
-		      outrel.r_info = ELF32_R_INFO (indx, r_type);
-		      outrel.r_addend = relocation + rel->r_addend;
-		    }
-		}
-
-	      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-					 (((Elf32_External_Rela *)
-					   sreloc->contents)
-					  + sreloc->reloc_count));
-	      ++sreloc->reloc_count;
-
-	      /* This reloc will be computed at runtime, so there's no
-                 need to do anything now, except for R_68K_32
-                 relocations that have been turned into
-                 R_68K_RELATIVE.  */
-	      if (!relocate)
-		continue;
-	    }
-
-	  break;
-
-	case R_68K_GNU_VTINHERIT:
-	case R_68K_GNU_VTENTRY:
-	  /* These are no-ops in the end.  */
-	  continue;
-
-	default:
-	  break;
-	}
-
-      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-				    contents, rel->r_offset,
-				    relocation, rel->r_addend);
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else
-		  {
-		    name = bfd_elf_string_from_elf_section (input_bfd,
-							    symtab_hdr->sh_link,
-							    sym->st_name);
-		    if (name == NULL)
-		      return false;
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-		if (!(info->callbacks->reloc_overflow
-		      (info, name, howto->name, (bfd_vma) 0,
-		       input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-elf_m68k_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  bfd *dynobj;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  if (h->plt.offset != (bfd_vma) -1)
-    {
-      asection *splt;
-      asection *sgot;
-      asection *srela;
-      bfd_vma plt_index;
-      bfd_vma got_offset;
-      Elf_Internal_Rela rela;
-
-      /* This symbol has an entry in the procedure linkage table.  Set
-	 it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (splt != NULL && sgot != NULL && srela != NULL);
-
-      /* Get the index in the procedure linkage table which
-	 corresponds to this symbol.  This is the index of this symbol
-	 in all the symbols for which we are making plt entries.  The
-	 first entry in the procedure linkage table is reserved.  */
-      plt_index = h->plt.offset / PLT_ENTRY_SIZE - 1;
-
-      /* Get the offset into the .got table of the entry that
-	 corresponds to this function.  Each .got entry is 4 bytes.
-	 The first three are reserved.  */
-      got_offset = (plt_index + 3) * 4;
-
-      /* Fill in the entry in the procedure linkage table.  */
-      memcpy (splt->contents + h->plt.offset, elf_m68k_plt_entry,
-	      PLT_ENTRY_SIZE);
-      /* The offset is relative to the first extension word.  */
-      bfd_put_32 (output_bfd,
-		  (sgot->output_section->vma
-		   + sgot->output_offset
-		   + got_offset
-		   - (splt->output_section->vma
-		      + h->plt.offset + 2)),
-		  splt->contents + h->plt.offset + 4);
-
-      bfd_put_32 (output_bfd, plt_index * sizeof (Elf32_External_Rela),
-		  splt->contents + h->plt.offset + 10);
-      bfd_put_32 (output_bfd, - (h->plt.offset + 16),
-		  splt->contents + h->plt.offset + 16);
-
-      /* Fill in the entry in the global offset table.  */
-      bfd_put_32 (output_bfd,
-		  (splt->output_section->vma
-		   + splt->output_offset
-		   + h->plt.offset
-		   + 8),
-		  sgot->contents + got_offset);
-
-      /* Fill in the entry in the .rela.plt section.  */
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
-		       + got_offset);
-      rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_JMP_SLOT);
-      rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + plt_index));
-
-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
-	  sym->st_shndx = SHN_UNDEF;
-	}
-    }
-
-  if (h->got.offset != (bfd_vma) -1)
-    {
-      asection *sgot;
-      asection *srela;
-      Elf_Internal_Rela rela;
-
-      /* This symbol has an entry in the global offset table.  Set it
-	 up.  */
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srela = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (sgot != NULL && srela != NULL);
-
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
-		       + (h->got.offset &~ 1));
-
-      /* If this is a -Bsymbolic link, and the symbol is defined
-	 locally, we just want to emit a RELATIVE reloc.  Likewise if
-	 the symbol was forced to be local because of a version file.
-	 The entry in the global offset table will already have been
-	 initialized in the relocate_section function.  */
-      if (info->shared
-	  && (info->symbolic || h->dynindx == -1)
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
-	{
-	  rela.r_info = ELF32_R_INFO (0, R_68K_RELATIVE);
-	  rela.r_addend = bfd_get_signed_32 (output_bfd,
-					     (sgot->contents
-					      + (h->got.offset & ~1)));
-	}
-      else
-	{
-	  bfd_put_32 (output_bfd, (bfd_vma) 0,
-		      sgot->contents + (h->got.offset & ~1));
-	  rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_GLOB_DAT);
-	  rela.r_addend = 0;
-	}
-
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + srela->reloc_count));
-      ++srela->reloc_count;
-    }
-
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
-    {
-      asection *s;
-      Elf_Internal_Rela rela;
-
-      /* This symbol needs a copy reloc.  Set it up.  */
-
-      BFD_ASSERT (h->dynindx != -1
-		  && (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak));
-
-      s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				   ".rela.bss");
-      BFD_ASSERT (s != NULL);
-
-      rela.r_offset = (h->root.u.def.value
-		       + h->root.u.def.section->output_section->vma
-		       + h->root.u.def.section->output_offset);
-      rela.r_info = ELF32_R_INFO (h->dynindx, R_68K_COPY);
-      rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) s->contents
-				  + s->reloc_count));
-      ++s->reloc_count;
-    }
-
-  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-
-  return true;
-}
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-elf_m68k_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *sgot;
-  asection *sdyn;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sgot = bfd_get_section_by_name (dynobj, ".got.plt");
-  BFD_ASSERT (sgot != NULL);
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      asection *splt;
-      Elf32_External_Dyn *dyncon, *dynconend;
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (splt != NULL && sdyn != NULL);
-
-      dyncon = (Elf32_External_Dyn *) sdyn->contents;
-      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  asection *s;
-
-	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    default:
-	      break;
-
-	    case DT_PLTGOT:
-	      name = ".got";
-	      goto get_vma;
-	    case DT_JMPREL:
-	      name = ".rela.plt";
-	    get_vma:
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_ptr = s->vma;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_PLTRELSZ:
-	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
-	      BFD_ASSERT (s != NULL);
-	      if (s->_cooked_size != 0)
-		dyn.d_un.d_val = s->_cooked_size;
-	      else
-		dyn.d_un.d_val = s->_raw_size;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_RELASZ:
-	      /* The procedure linkage table relocs (DT_JMPREL) should
-		 not be included in the overall relocs (DT_RELA).
-		 Therefore, we override the DT_RELASZ entry here to
-		 make it not include the JMPREL relocs.  Since the
-		 linker script arranges for .rela.plt to follow all
-		 other relocation sections, we don't have to worry
-		 about changing the DT_RELA entry.  */
-	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
-	      if (s != NULL)
-		{
-		  if (s->_cooked_size != 0)
-		    dyn.d_un.d_val -= s->_cooked_size;
-		  else
-		    dyn.d_un.d_val -= s->_raw_size;
-		}
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-	    }
-	}
-
-      /* Fill in the first entry in the procedure linkage table.  */
-      if (splt->_raw_size > 0)
-	{
-	  memcpy (splt->contents, elf_m68k_plt0_entry, PLT_ENTRY_SIZE);
-	  bfd_put_32 (output_bfd,
-		      (sgot->output_section->vma
-		       + sgot->output_offset + 4
-		       - (splt->output_section->vma + 2)),
-		      splt->contents + 4);
-	  bfd_put_32 (output_bfd,
-		      (sgot->output_section->vma
-		       + sgot->output_offset + 8
-		       - (splt->output_section->vma + 10)),
-		      splt->contents + 12);
-	}
-
-      elf_section_data (splt->output_section)->this_hdr.sh_entsize
-	= PLT_ENTRY_SIZE;
-    }
-
-  /* Fill in the first three entries in the global offset table.  */
-  if (sgot->_raw_size > 0)
-    {
-      if (sdyn == NULL)
-	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
-      else
-	bfd_put_32 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    sgot->contents);
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 4);
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + 8);
-    }
-
-  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
-
-  if (info->shared)
-    {
-      asection *sdynsym;
-      asection *s;
-      Elf_Internal_Sym sym;
-      int c;
-
-      /* Set up the section symbols for the output sections.  */
-
-      sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (sdynsym != NULL);
-
-      sym.st_size = 0;
-      sym.st_name = 0;
-      sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-      sym.st_other = 0;
-
-      c = 0;
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  int indx;
-
-	  if (elf_section_data (s)->dynindx == 0)
-	    continue;
-
-	  sym.st_value = s->vma;
-
-	  indx = elf_section_data (s)->this_idx;
-	  BFD_ASSERT (indx > 0);
-	  sym.st_shndx = indx;
-
-	  bfd_elf32_swap_symbol_out (output_bfd, &sym,
-				     (PTR) (((Elf32_External_Sym *)
-					     sdynsym->contents)
-					    + elf_section_data (s)->dynindx));
-
-	  ++c;
-	}
-
-      /* Set the sh_info field of the output .dynsym section to the
-         index of the first global symbol.  */
-      elf_section_data (sdynsym->output_section)->this_hdr.sh_info = c + 1;
-    }
-
-  return true;
-}
-
-#define TARGET_BIG_SYM			bfd_elf32_m68k_vec
-#define TARGET_BIG_NAME			"elf32-m68k"
-#define ELF_MACHINE_CODE		EM_68K
-#define ELF_MAXPAGESIZE			0x2000
-#define elf_backend_create_dynamic_sections \
-					_bfd_elf_create_dynamic_sections
-#define bfd_elf32_bfd_link_hash_table_create \
-					elf_m68k_link_hash_table_create
-#define bfd_elf32_bfd_final_link	_bfd_elf32_gc_common_final_link
-
-#define elf_backend_check_relocs	elf_m68k_check_relocs
-#define elf_backend_adjust_dynamic_symbol \
-					elf_m68k_adjust_dynamic_symbol
-#define elf_backend_size_dynamic_sections \
-					elf_m68k_size_dynamic_sections
-#define elf_backend_relocate_section	elf_m68k_relocate_section
-#define elf_backend_finish_dynamic_symbol \
-					elf_m68k_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections \
-					elf_m68k_finish_dynamic_sections
-#define elf_backend_gc_mark_hook	elf_m68k_gc_mark_hook
-#define elf_backend_gc_sweep_hook	elf_m68k_gc_sweep_hook
-#define elf_backend_can_gc_sections 1
-#define elf_backend_want_got_plt 1
-#define elf_backend_plt_readonly 1
-#define elf_backend_want_plt_sym 0
-#define elf_backend_got_header_size	12
-#define elf_backend_plt_header_size	PLT_ENTRY_SIZE
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-m88k.c b/bfd/elf32-m88k.c
deleted file mode 100644
index f3c535e0776..00000000000
--- a/bfd/elf32-m88k.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Motorola 88k-specific support for 32-bit ELF
-   Copyright 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-/* This does not include any relocations, but should be good enough
-   for GDB.  */
-
-#define TARGET_BIG_SYM		bfd_elf32_m88k_vec
-#define TARGET_BIG_NAME		"elf32-m88k"
-#define ELF_ARCH		bfd_arch_m88k
-#define ELF_MACHINE_CODE	EM_88K
-#define bfd_elf32_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
-#define elf_info_to_howto		_bfd_elf_no_info_to_howto
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
deleted file mode 100644
index ef3a39f1957..00000000000
--- a/bfd/elf32-mcore.c
+++ /dev/null
@@ -1,747 +0,0 @@
-/* Motorolla MCore specific support for 32-bit ELF
-   Copyright 1994, 1995, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file is based on a preliminary RCE ELF ABI.  The
-   information may not match the final RCE ELF ABI.   */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/mcore.h"
-#include <assert.h>
-
-#define	USE_RELA	/* Only USE_REL is actually significant, but this is
-			   here are a reminder... */
-
-static void mcore_elf_howto_init
-  PARAMS ((void));
-static reloc_howto_type * mcore_elf_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void mcore_elf_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static boolean mcore_elf_set_private_flags
-  PARAMS ((bfd *, flagword));
-static boolean mcore_elf_copy_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean mcore_elf_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static bfd_reloc_status_type mcore_elf_unsupported_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean mcore_elf_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-
-static reloc_howto_type * mcore_elf_howto_table [(int) R_MCORE_max];
-
-static reloc_howto_type mcore_elf_howto_raw[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_MCORE_NONE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 1,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,  /* complain_on_overflow */
-	 mcore_elf_unsupported_reloc, /* special_function */
-	 "R_MCORE_NONE",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A standard 32 bit relocation.  */
-  HOWTO (R_MCORE_ADDR32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "ADDR32",		/* name *//* For compatability with coff/pe port.  */
-	 false,			/* partial_inplace */
-	 0x0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 8 bits + 2 zero bits; jmpi/jsri/lrw instructions.
-     Should not appear in object files. */
-  HOWTO (R_MCORE_PCRELIMM8BY4,	/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mcore_elf_unsupported_reloc,	/* special_function */
-	 "R_MCORE_PCRELIMM8BY4",/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* bsr/bt/bf/br instructions; 11 bits + 1 zero bit 
-     Span 2k instructions == 4k bytes.
-     Only useful pieces at the relocated address are the opcode (5 bits) */
-  HOWTO (R_MCORE_PCRELIMM11BY2,/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 11,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MCORE_PCRELIMM11BY2",/* name */
-	 false,			/* partial_inplace */
-	 0x0,			/* src_mask */
-	 0x7ff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 4 bits + 1 zero bit; 'loopt' instruction only; unsupported. */
-  HOWTO (R_MCORE_PCRELIMM4BY2,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 4,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mcore_elf_unsupported_reloc,/* special_function */
-	 "R_MCORE_PCRELIMM4BY2",/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 32-bit pc-relative. Eventually this will help support PIC code. */
-  HOWTO (R_MCORE_PCREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MCORE_PCREL32",	/* name */
-	 false,			/* partial_inplace */
-	 0x0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* Like PCRELIMM11BY2, this relocation indicates that there is a
-     'jsri' at the specified address. There is a separate relocation
-     entry for the literal pool entry that it references, but we 
-     might be able to change the jsri to a bsr if the target turns out
-     to be close enough [even though we won't reclaim the literal pool
-     entry, we'll get some runtime efficiency back]. Note that this
-     is a relocation that we are allowed to safely ignore.  */ 
-  HOWTO (R_MCORE_PCRELJSR_IMM11BY2,/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 11,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MCORE_PCRELJSR_IMM11BY2", /* name */
-	 false,			/* partial_inplace */
-	 0x0,			/* src_mask */
-	 0x7ff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-  
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_MCORE_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_MCORE_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_MCORE_GNU_VTENTRY,   /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont,/* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_MCORE_GNU_VTENTRY", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-};
-
-#ifndef NUM_ELEM
-#define NUM_ELEM(a) (sizeof (a) / sizeof (a)[0])
-#endif
-
-/* Initialize the mcore_elf_howto_table, so that linear accesses can be done.  */
-static void
-mcore_elf_howto_init ()
-{
-  unsigned int i;
-
-  for (i = NUM_ELEM (mcore_elf_howto_raw); i--;)
-    {
-      unsigned int type;
-      
-      type = mcore_elf_howto_raw[i].type;
-      
-      BFD_ASSERT (type < NUM_ELEM (mcore_elf_howto_table));
-      
-      mcore_elf_howto_table [type] = & mcore_elf_howto_raw [i];
-    }
-}
-
-
-static reloc_howto_type *
-mcore_elf_reloc_type_lookup (abfd, code)
-     bfd * abfd;
-     bfd_reloc_code_real_type code;
-{
-  enum elf_mcore_reloc_type mcore_reloc = R_MCORE_NONE;
-
-  switch (code)
-    {
-    case BFD_RELOC_NONE:		     mcore_reloc = R_MCORE_NONE; break;
-    case BFD_RELOC_32:			     mcore_reloc = R_MCORE_ADDR32; break;
-    case BFD_RELOC_MCORE_PCREL_IMM8BY4:	     mcore_reloc = R_MCORE_PCRELIMM8BY4; break;
-    case BFD_RELOC_MCORE_PCREL_IMM11BY2:     mcore_reloc = R_MCORE_PCRELIMM11BY2; break;
-    case BFD_RELOC_MCORE_PCREL_IMM4BY2:	     mcore_reloc = R_MCORE_PCRELIMM4BY2; break;
-    case BFD_RELOC_32_PCREL:		     mcore_reloc = R_MCORE_PCREL32; break;
-    case BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2: mcore_reloc = R_MCORE_PCRELJSR_IMM11BY2; break;
-    case BFD_RELOC_VTABLE_INHERIT:           mcore_reloc = R_MCORE_GNU_VTINHERIT; break;
-    case BFD_RELOC_VTABLE_ENTRY:             mcore_reloc = R_MCORE_GNU_VTENTRY; break;
-    default:
-      return (reloc_howto_type *)NULL;
-    }
-
-  if (! mcore_elf_howto_table [R_MCORE_PCRELIMM8BY4])	/* Initialize howto table if needed */
-    mcore_elf_howto_init ();
-
-  return mcore_elf_howto_table [(int) mcore_reloc];
-};
-
-/* Set the howto pointer for a RCE ELF reloc.  */
-static void
-mcore_elf_info_to_howto (abfd, cache_ptr, dst)
-     bfd * abfd;
-     arelent * cache_ptr;
-     Elf32_Internal_Rela * dst;
-{
-  if (! mcore_elf_howto_table [R_MCORE_PCRELIMM8BY4])	/* Initialize howto table if needed */
-    mcore_elf_howto_init ();
-
-  BFD_ASSERT (ELF32_R_TYPE (dst->r_info) < (unsigned int) R_MCORE_max);
-  
-  cache_ptr->howto = mcore_elf_howto_table [ELF32_R_TYPE (dst->r_info)];
-}
-
-/* Function to set whether a module needs the -mrelocatable bit set. */
-static boolean
-mcore_elf_set_private_flags (abfd, flags)
-     bfd * abfd;
-     flagword flags;
-{
-  BFD_ASSERT (! elf_flags_init (abfd)
-	      || elf_elfheader (abfd)->e_flags == flags);
-
-  elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
-}
-
-/* Copy backend specific data from one object module to another.  */
-static boolean
-mcore_elf_copy_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
-{
-  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  BFD_ASSERT (! elf_flags_init (obfd)
-	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
-
-  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = true;
-  return true;
-}
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-static boolean
-mcore_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
-{
-  flagword old_flags;
-  flagword new_flags;
-  boolean error;
-
-  /* Check if we have the same endianess */
-  if (   ibfd->xvec->byteorder != obfd->xvec->byteorder
-      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
-    {
-      (*_bfd_error_handler)
-	(_("%s: compiled for a %s endian system and target is %s endian.\n"),
-	 bfd_get_filename (ibfd),
-         bfd_big_endian (ibfd) ? "big" : "little",
-         bfd_big_endian (obfd) ? "big" : "little");
-
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  new_flags = elf_elfheader (ibfd)->e_flags;
-  old_flags = elf_elfheader (obfd)->e_flags;
-  
-  if (! elf_flags_init (obfd))	/* First call, no flags set */
-    {
-      elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = new_flags;
-    }
-  else if (new_flags == old_flags)	/* Compatible flags are ok */
-    ;
-  
-  return true;
-}
-
-
-/* Don't pretend we can deal with unsupported relocs.  */
-
-/*ARGSUSED*/
-static bfd_reloc_status_type
-mcore_elf_unsupported_reloc (abfd, reloc_entry, symbol, data, input_section,
-			   output_bfd, error_message)
-     bfd * abfd;
-     arelent * reloc_entry;
-     asymbol * symbol;
-     PTR data;
-     asection * input_section;
-     bfd * output_bfd;
-     char ** error_message;
-{
-  BFD_ASSERT (reloc_entry->howto != (reloc_howto_type *)0);
-  
-  _bfd_error_handler (_("%s: Relocation %s (%d) is not currently supported.\n"),
-		      bfd_get_filename (abfd),
-		      reloc_entry->howto->name,
-		      reloc_entry->howto->type);
-
-  return bfd_reloc_notsupported;
-}
-
-
-/* The RELOCATE_SECTION function is called by the ELF backend linker
-   to handle the relocations for a section.
-
-   The relocs are always passed as Rela structures; if the section
-   actually uses Rel structures, the r_addend field will always be
-   zero.
-
-   This function is responsible for adjust the section contents as
-   necessary, and (if using Rela relocs and generating a
-   relocateable output file) adjusting the reloc addend as
-   necessary.
-
-   This function does not have to worry about setting the reloc
-   address or the reloc symbol index.
-
-   LOCAL_SYMS is a pointer to the swapped in local symbols.
-
-   LOCAL_SECTIONS is an array giving the section in the input file
-   corresponding to the st_shndx field of each local symbol.
-
-   The global hash table entry for the global symbols can be found
-   via elf_sym_hashes (input_bfd).
-
-   When generating relocateable output, this function must handle
-   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
-   going to be the section symbol corresponding to the output
-   section, which means that the addend must be adjusted
-   accordingly.  */
-
-static boolean
-mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			  contents, relocs, local_syms, local_sections)
-     bfd * output_bfd;
-     struct bfd_link_info * info;
-     bfd * input_bfd;
-     asection * input_section;
-     bfd_byte * contents;
-     Elf_Internal_Rela * relocs;
-     Elf_Internal_Sym * local_syms;
-     asection ** local_sections;
-{
-  Elf_Internal_Shdr *           symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes = elf_sym_hashes (input_bfd);
-  Elf_Internal_Rela *           rel = relocs;
-  Elf_Internal_Rela *           relend = relocs + input_section->reloc_count;
-  boolean ret = true;
-  long insn;
-
-#ifdef DEBUG
-  fprintf (stderr,
-	   "mcore_elf_relocate_section called for %s section %s, %ld relocations%s\n",
-	   bfd_get_filename (input_bfd),
-	   bfd_section_name(input_bfd, input_section),
-	   (long) input_section->reloc_count,
-	   (info->relocateable) ? " (relocatable)" : "");
-#endif
-
-  if (! mcore_elf_howto_table [R_MCORE_PCRELIMM8BY4])	/* Initialize howto table if needed */
-    mcore_elf_howto_init ();
-
-  for (; rel < relend; rel++)
-    {
-      enum elf_mcore_reloc_type    r_type = (enum elf_mcore_reloc_type) ELF32_R_TYPE (rel->r_info);
-      bfd_vma                      offset = rel->r_offset;
-      bfd_vma                      addend = rel->r_addend;
-      bfd_reloc_status_type        r = bfd_reloc_other;
-      asection *                   sec = (asection *) 0;
-      reloc_howto_type *           howto;
-      bfd_vma                      relocation;
-      Elf_Internal_Sym *           sym = (Elf_Internal_Sym *) 0;
-      unsigned long                r_symndx;
-      struct elf_link_hash_entry * h = (struct elf_link_hash_entry *) 0;
-      unsigned short               oldinst;
-      
-      /* Unknown relocation handling */
-      if ((unsigned) r_type >= (unsigned) R_MCORE_max
-	  || ! mcore_elf_howto_table [(int)r_type])
-	{
-	  _bfd_error_handler (_("%s: Unknown relocation type %d\n"),
-			      bfd_get_filename (input_bfd),
-			      (int) r_type);
-
-	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
-	  continue;
-	}
-      
-      howto = mcore_elf_howto_table [(int) r_type];
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      
-	      if ((unsigned)ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  addend = rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-#ifdef DEBUG
-	  fprintf (stderr, "\ttype = %s (%d), symbol index = %ld, offset = %ld, addend = %ld\n",
-		   howto->name, (int) r_type, r_symndx, (long) offset, (long) addend);
-#endif
-	  continue;
-	}
-
-      /* This is a final link.  */
-
-      /* Complain about known relocation that are not yet supported */
-      if (howto->special_function == mcore_elf_unsupported_reloc)
-	{
-	  _bfd_error_handler (_("%s: Relocation %s (%d) is not currently supported.\n"),
-			      bfd_get_filename (input_bfd),
-			      howto->name,
-			      (int)r_type);
-
-	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
-	  continue;
-	}
-
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections [r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes [r_symndx - symtab_hdr->sh_info];
-	  if (   h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else if (info->shared)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-			(info, h->root.root.string, input_bfd,
-		 	 input_section, rel->r_offset)))
-		return false;
-
-	      ret = false;
-	      continue;
-	    }
-	}
-
-      switch (r_type)
-	{
-	default:
-	case R_MCORE_PCRELIMM8BY4:	
-	case R_MCORE_PCRELIMM11BY2:
-	case R_MCORE_PCRELIMM4BY2:
-	  break;
-
-	case R_MCORE_PCRELJSR_IMM11BY2:
-	  oldinst = bfd_get_16 (input_bfd, contents + offset);
-#define	MCORE_INST_BSR	0xF800
-	  bfd_put_16 (input_bfd, MCORE_INST_BSR, contents + offset);
-	  break;
-	}
-
-
-#ifdef DEBUG
-      fprintf (stderr, "\ttype = %s (%d), symbol index = %ld, offset = %ld, addend = %ld\n",
-	       howto->name, r_type, r_symndx, (long) offset, (long) addend);
-#endif
-
-      r = _bfd_final_link_relocate
-	(howto, input_bfd, input_section, contents, offset, relocation, addend);
-
-      if (r != bfd_reloc_ok && r_type == R_MCORE_PCRELJSR_IMM11BY2)
-	{
-	  /* Wasn't ok, back it out and give up.  */
-	  bfd_put_16 (input_bfd, oldinst, contents + offset);
-	  r = bfd_reloc_ok;
-	}
-      
-      if (r != bfd_reloc_ok)
-	{
-	  ret = false;
-	  
-	  switch (r)
-	    {
-	    default:
-	      break;
-
-	    case bfd_reloc_overflow:
-	      {
-		const char * name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else
-		  {
-		    name = bfd_elf_string_from_elf_section
-		      (input_bfd, symtab_hdr->sh_link, sym->st_name);
-		    
-		    if (name == NULL)
-		      break;
-
-		    if (* name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-
-		(*info->callbacks->reloc_overflow)
-		  (info, name, howto->name, (bfd_vma) 0, input_bfd, input_section,
-		   offset);
-	      }
-	      break;
-	    }
-	}
-    }
-
-#ifdef DEBUG
-  fprintf (stderr, "\n");
-#endif
-
-  return ret;
-}
-
-/* Return the section that should be marked against GC for a given
-   relocation.  */
-
-static asection *
-mcore_elf_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *                        abfd;
-     struct bfd_link_info *       info;
-     Elf_Internal_Rela *          rel;
-     struct elf_link_hash_entry * h;
-     Elf_Internal_Sym *           sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_MCORE_GNU_VTINHERIT:
-	case R_MCORE_GNU_VTENTRY:
-	  break;
-
-	default:
-	  switch (h->root.type)
-	    {
-	    case bfd_link_hash_defined:
-	    case bfd_link_hash_defweak:
-	      return h->root.u.def.section;
-	      
-	    case bfd_link_hash_common:
-	      return h->root.u.c.p->section;
-	    }
-	}
-    }
-  else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-		&& sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
-
-  return NULL;
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-
-static boolean
-mcore_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *                     abfd;
-     struct bfd_link_info *    info;
-     asection *                sec;
-     const Elf_Internal_Rela * relocs;
-{
-  return true;
-}
-
-/* Look through the relocs for a section during the first phase.
-   Since we don't do .gots or .plts, we just need to consider the
-   virtual table relocs for gc.  */
- 
-static boolean
-mcore_elf_check_relocs (abfd, info, sec, relocs)
-     bfd * abfd;
-     struct bfd_link_info * info;
-     asection * sec;
-     const Elf_Internal_Rela * relocs;
-{
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  struct elf_link_hash_entry ** sym_hashes_end;
-  const Elf_Internal_Rela *     rel;
-  const Elf_Internal_Rela *     rel_end;
- 
-  if (info->relocateable)
-    return true;
- 
-  symtab_hdr = & elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
- 
-  rel_end = relocs + sec->reloc_count;
-  
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      struct elf_link_hash_entry * h;
-      unsigned long r_symndx;
- 
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      
-      if (r_symndx < symtab_hdr->sh_info)
-        h = NULL;
-      else
-        h = sym_hashes [r_symndx - symtab_hdr->sh_info];
- 
-      switch (ELF32_R_TYPE (rel->r_info))
-        {
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_MCORE_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
-	  
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_MCORE_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
-          break;
-        }
-    }
- 
-  return true;
-}
-
-#define TARGET_BIG_SYM		bfd_elf32_mcore_big_vec
-#define TARGET_BIG_NAME		"elf32-mcore-big"
-#define TARGET_LITTLE_SYM       bfd_elf32_mcore_little_vec
-#define TARGET_LITTLE_NAME      "elf32-mcore-little"
-
-#define ELF_ARCH		bfd_arch_mcore
-#define ELF_MACHINE_CODE	EM_MCORE
-#define ELF_MAXPAGESIZE		0x1000		/* 4k, if we ever have 'em */
-#define elf_info_to_howto	mcore_elf_info_to_howto
-#define elf_info_to_howto_rel	NULL
-
-
-#define bfd_elf32_bfd_copy_private_bfd_data	mcore_elf_copy_private_bfd_data
-#define bfd_elf32_bfd_merge_private_bfd_data	mcore_elf_merge_private_bfd_data
-#define bfd_elf32_bfd_set_private_flags		mcore_elf_set_private_flags
-#define bfd_elf32_bfd_reloc_type_lookup		mcore_elf_reloc_type_lookup
-#define elf_backend_relocate_section		mcore_elf_relocate_section
-#define elf_backend_gc_mark_hook		mcore_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook		mcore_elf_gc_sweep_hook
-#define elf_backend_check_relocs                mcore_elf_check_relocs
-
-#define elf_backend_can_gc_sections		1
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
deleted file mode 100644
index 9f03262eb38..00000000000
--- a/bfd/elf32-mips.c
+++ /dev/null
@@ -1,7800 +0,0 @@
-/* MIPS-specific support for 32-bit ELF
-   Copyright 1993, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
-
-   Most of the information added by Ian Lance Taylor, Cygnus Support,
-   <ian@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file handles MIPS ELF targets.  SGI Irix 5 uses a slightly
-   different MIPS ELF from other targets.  This matters when linking.
-   This file supports both, switching at runtime.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "genlink.h"
-#include "elf-bfd.h"
-#include "elf/mips.h"
-
-/* Get the ECOFF swapping routines.  */
-#include "coff/sym.h"
-#include "coff/symconst.h"
-#include "coff/internal.h"
-#include "coff/ecoff.h"
-#include "coff/mips.h"
-#define ECOFF_32
-#include "ecoffswap.h"
-
-static bfd_reloc_status_type mips32_64bit_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *bfd_elf32_bfd_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void mips_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-static void bfd_mips_elf32_swap_gptab_in
-  PARAMS ((bfd *, const Elf32_External_gptab *, Elf32_gptab *));
-static void bfd_mips_elf32_swap_gptab_out
-  PARAMS ((bfd *, const Elf32_gptab *, Elf32_External_gptab *));
-static boolean mips_elf_sym_is_global PARAMS ((bfd *, asymbol *));
-static boolean mips_elf32_object_p PARAMS ((bfd *));
-static boolean mips_elf_create_procedure_table
-  PARAMS ((PTR, bfd *, struct bfd_link_info *, asection *,
-	   struct ecoff_debug_info *));
-static int mips_elf_additional_program_headers PARAMS ((bfd *));
-static boolean mips_elf_modify_segment_map PARAMS ((bfd *));
-static INLINE int elf_mips_isa PARAMS ((flagword));
-static INLINE int elf_mips_mach PARAMS ((flagword));
-static INLINE char* elf_mips_abi_name PARAMS ((flagword));
-static boolean mips_elf32_section_from_shdr
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, char *));
-static boolean mips_elf32_section_processing
-  PARAMS ((bfd *, Elf32_Internal_Shdr *));
-static boolean mips_elf_is_local_label_name
-  PARAMS ((bfd *, const char *));
-static struct bfd_hash_entry *mips_elf_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *mips_elf_link_hash_table_create
-  PARAMS ((bfd *));
-static int gptab_compare PARAMS ((const void *, const void *));
-static boolean mips_elf_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-static void mips_elf_relocate_hi16
-  PARAMS ((bfd *, Elf_Internal_Rela *, Elf_Internal_Rela *, bfd_byte *,
-	   bfd_vma));
-static boolean mips_elf_relocate_got_local
-  PARAMS ((bfd *, bfd *, asection *, Elf_Internal_Rela *,
-	   Elf_Internal_Rela *, bfd_byte *, bfd_vma));
-static void mips_elf_relocate_global_got
-   PARAMS ((bfd *, Elf_Internal_Rela *, bfd_byte *, bfd_vma));
-static bfd_reloc_status_type mips16_jump_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type mips16_gprel_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean mips_elf_adjust_dynindx
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean mips_elf_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean mips_elf_link_output_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
-	   asection *));
-static boolean mips_elf_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean mips_elf_create_compact_rel_section
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean mips_elf_create_got_section
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean mips_elf_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
-static boolean mips_elf_adjust_dynamic_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean mips_elf_always_size_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean mips_elf_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean mips_elf_finish_dynamic_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
-	   Elf_Internal_Sym *));
-static boolean mips_elf_finish_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean mips_elf_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
-	   const char **, flagword *, asection **, bfd_vma *));
-static bfd_reloc_status_type mips_elf_final_gp
-  PARAMS ((bfd *, asymbol *, boolean, char **, bfd_vma *));
-static bfd_byte *elf32_mips_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
-
-/* This is true for Irix 5 executables, false for normal MIPS ELF ABI
-   executables.  FIXME: At the moment, we default to always generating
-   Irix 5 executables.  */
-
-#define SGI_COMPAT(abfd) (1)
-
-/* This structure is used to hold .got information when linking.  It
-   is stored in the tdata field of the bfd_elf_section_data structure.  */
-
-struct mips_got_info
-{
-  /* The symbol index of the first global .got symbol.  */
-  unsigned long global_gotsym;
-  /* The number of local .got entries.  */
-  unsigned int local_gotno;
-  /* The number of local .got entries we have used.  */
-  unsigned int assigned_gotno;
-};
-
-/* The number of local .got entries we reserve.  */
-#define MIPS_RESERVED_GOTNO (2)
-
-/* Instructions which appear in a stub.  For some reason the stub is
-   slightly different on an SGI system.  */
-#define ELF_MIPS_GP_OFFSET(abfd) (SGI_COMPAT (abfd) ? 0x7ff0 : 0x8000)
-#define STUB_LW(abfd)					\
-  (SGI_COMPAT (abfd)					\
-   ? 0x8f998010			/* lw t9,0x8010(gp) */	\
-   : 0x8f998000)		/* lw t9,0x8000(gp) */
-#define STUB_MOVE 0x03e07825	/* move t7,ra */
-#define STUB_JALR 0x0320f809	/* jal t9 */
-#define STUB_LI16 0x34180000	/* ori t8,zero,0 */
-#define MIPS_FUNCTION_STUB_SIZE (16)
-
-#if 0
-/* We no longer try to identify particular sections for the .dynsym
-   section.  When we do, we wind up crashing if there are other random
-   sections with relocations.  */
-
-/* Names of sections which appear in the .dynsym section in an Irix 5
-   executable.  */
-
-static const char * const mips_elf_dynsym_sec_names[] =
-{
-  ".text",
-  ".init",
-  ".fini",
-  ".data",
-  ".rodata",
-  ".sdata",
-  ".sbss",
-  ".bss",
-  NULL
-};
-
-#define SIZEOF_MIPS_DYNSYM_SECNAMES \
-  (sizeof mips_elf_dynsym_sec_names / sizeof mips_elf_dynsym_sec_names[0])
-
-/* The number of entries in mips_elf_dynsym_sec_names which go in the
-   text segment.  */
-
-#define MIPS_TEXT_DYNSYM_SECNO (3)
-
-#endif /* 0 */
-
-/* The names of the runtime procedure table symbols used on Irix 5.  */
-
-static const char * const mips_elf_dynsym_rtproc_names[] =
-{
-  "_procedure_table",
-  "_procedure_string_table",
-  "_procedure_table_size",
-  NULL
-};
-
-/* These structures are used to generate the .compact_rel section on
-   Irix 5.  */
-
-typedef struct
-{
-  unsigned long id1;		/* Always one?  */
-  unsigned long num;		/* Number of compact relocation entries.  */
-  unsigned long id2;		/* Always two?  */
-  unsigned long offset;		/* The file offset of the first relocation.  */
-  unsigned long reserved0;	/* Zero?  */
-  unsigned long reserved1;	/* Zero?  */
-} Elf32_compact_rel;
-
-typedef struct
-{
-  bfd_byte id1[4];
-  bfd_byte num[4];
-  bfd_byte id2[4];
-  bfd_byte offset[4];
-  bfd_byte reserved0[4];
-  bfd_byte reserved1[4];
-} Elf32_External_compact_rel;
-
-typedef struct
-{
-  unsigned int ctype : 1;	/* 1: long 0: short format. See below.  */
-  unsigned int rtype : 4;	/* Relocation types. See below. */
-  unsigned int dist2to : 8;
-  unsigned int relvaddr : 19;	/* (VADDR - vaddr of the previous entry)/ 4 */
-  unsigned long konst;		/* KONST field. See below.  */
-  unsigned long vaddr;		/* VADDR to be relocated.  */
-} Elf32_crinfo;
-
-typedef struct
-{
-  unsigned int ctype : 1;	/* 1: long 0: short format. See below.  */
-  unsigned int rtype : 4;	/* Relocation types. See below. */
-  unsigned int dist2to : 8;
-  unsigned int relvaddr : 19;	/* (VADDR - vaddr of the previous entry)/ 4 */
-  unsigned long konst;		/* KONST field. See below.  */
-} Elf32_crinfo2;
-
-typedef struct
-{
-  bfd_byte info[4];
-  bfd_byte konst[4];
-  bfd_byte vaddr[4];
-} Elf32_External_crinfo;
-
-typedef struct
-{
-  bfd_byte info[4];
-  bfd_byte konst[4];
-} Elf32_External_crinfo2;
-
-/* These are the constants used to swap the bitfields in a crinfo.  */
-
-#define CRINFO_CTYPE (0x1)
-#define CRINFO_CTYPE_SH (31)
-#define CRINFO_RTYPE (0xf)
-#define CRINFO_RTYPE_SH (27)
-#define CRINFO_DIST2TO (0xff)
-#define CRINFO_DIST2TO_SH (19)
-#define CRINFO_RELVADDR (0x7ffff)
-#define CRINFO_RELVADDR_SH (0)
-
-/* A compact relocation info has long (3 words) or short (2 words)
-   formats.  A short format doesn't have VADDR field and relvaddr
-   fields contains ((VADDR - vaddr of the previous entry) >> 2).  */
-#define CRF_MIPS_LONG			1
-#define CRF_MIPS_SHORT			0
-
-/* There are 4 types of compact relocation at least. The value KONST
-   has different meaning for each type:
-
-   (type)		(konst)
-   CT_MIPS_REL32	Address in data
-   CT_MIPS_WORD		Address in word (XXX)
-   CT_MIPS_GPHI_LO	GP - vaddr
-   CT_MIPS_JMPAD	Address to jump
-   */
-
-#define CRT_MIPS_REL32			0xa
-#define CRT_MIPS_WORD			0xb
-#define CRT_MIPS_GPHI_LO		0xc
-#define CRT_MIPS_JMPAD			0xd
-
-#define mips_elf_set_cr_format(x,format)	((x).ctype = (format))
-#define mips_elf_set_cr_type(x,type)		((x).rtype = (type))
-#define mips_elf_set_cr_dist2to(x,v)		((x).dist2to = (v))
-#define mips_elf_set_cr_relvaddr(x,d)		((x).relvaddr = (d)<<2)
-
-static void bfd_elf32_swap_compact_rel_out
-  PARAMS ((bfd *, const Elf32_compact_rel *, Elf32_External_compact_rel *));
-static void bfd_elf32_swap_crinfo_out
-  PARAMS ((bfd *, const Elf32_crinfo *, Elf32_External_crinfo *));
-
-#define USE_REL	1		/* MIPS uses REL relocations instead of RELA */
-
-static reloc_howto_type elf_mips_howto_table[] =
-{
-  /* No relocation.  */
-  HOWTO (R_MIPS_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit relocation.  */
-  HOWTO (R_MIPS_16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit relocation.  */
-  HOWTO (R_MIPS_32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit symbol relative relocation.  */
-  HOWTO (R_MIPS_REL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_REL32",	/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 26 bit branch address.  */
-  HOWTO (R_MIPS_26,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 			/* This needs complex overflow
-				   detection, because the upper four
-				   bits must match the PC.  */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_26",		/* name */
-	 true,			/* partial_inplace */
-	 0x3ffffff,		/* src_mask */
-	 0x3ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of symbol value.  */
-  HOWTO (R_MIPS_HI16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 _bfd_mips_elf_hi16_reloc,	/* special_function */
-	 "R_MIPS_HI16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of symbol value.  */
-  HOWTO (R_MIPS_LO16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 _bfd_mips_elf_lo16_reloc,	/* special_function */
-	 "R_MIPS_LO16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GP relative reference.  */
-  HOWTO (R_MIPS_GPREL16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel16_reloc, /* special_function */
-	 "R_MIPS_GPREL16",	/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Reference to literal section.  */
-  HOWTO (R_MIPS_LITERAL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel16_reloc, /* special_function */
-	 "R_MIPS_LITERAL",	/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Reference to global offset table.  */
-  HOWTO (R_MIPS_GOT16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_got16_reloc,	/* special_function */
-	 "R_MIPS_GOT16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit PC relative reference.  */
-  HOWTO (R_MIPS_PC16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_PC16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit call through global offset table.  */
-  /* FIXME: This is not handled correctly.  */
-  HOWTO (R_MIPS_CALL16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit GP relative reference.  */
-  HOWTO (R_MIPS_GPREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel32_reloc, /* special_function */
-	 "R_MIPS_GPREL32",	/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-    /* The remaining relocs are defined on Irix 5, although they are
-       not defined by the ABI.  */
-    { 13 },
-    { 14 },
-    { 15 },
-
-  /* A 5 bit shift field.  */
-  HOWTO (R_MIPS_SHIFT5,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 5,			/* bitsize */
-	 false,			/* pc_relative */
-	 6,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SHIFT5",	/* name */
-	 true,			/* partial_inplace */
-	 0x000007c0,		/* src_mask */
-	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 6 bit shift field.  */
-  /* FIXME: This is not handled correctly; a special function is
-     needed to put the most significant bit in the right place.  */
-  HOWTO (R_MIPS_SHIFT6,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 false,			/* pc_relative */
-	 6,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SHIFT6",	/* name */
-	 true,			/* partial_inplace */
-	 0x000007c4,		/* src_mask */
-	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit relocation.  This is used in 32 bit ELF when addresses
-     are 64 bits long; the upper 32 bits are simply a sign extension.
-     The fields of the howto should be the same as for R_MIPS_32,
-     other than the type, name, and special_function.  */
-  HOWTO (R_MIPS_64,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 mips32_64bit_reloc,	/* special_function */
-	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Displacement in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_DISP,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_DISP",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Displacement to page pointer in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_PAGE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_PAGE",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Offset from page pointer in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_OFST,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_OFST",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_HI16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_LO16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 64 bit subtraction.  Presumably not used in 32 bit ELF.  */
-  { R_MIPS_SUB },
-
-  /* Used to cause the linker to insert and delete instructions?  */
-  { R_MIPS_INSERT_A },
-  { R_MIPS_INSERT_B },
-  { R_MIPS_DELETE },
-
-  /* Get the higher values of a 64 bit addend.  Presumably not used in
-     32 bit ELF.  */
-  { R_MIPS_HIGHER },
-  { R_MIPS_HIGHEST },
-
-  /* High 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_CALL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL_HI16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_CALL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL_LO16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  { R_MIPS_SCN_DISP },
-  { R_MIPS_REL16 },
-  { R_MIPS_ADD_IMMEDIATE },
-  { R_MIPS_PJUMP },
-  { R_MIPS_RELGOT }
-};
-
-/* The reloc used for BFD_RELOC_CTOR when doing a 64 bit link.  This
-   is a hack to make the linker think that we need 64 bit values.  */
-static reloc_howto_type elf_mips_ctor64_howto =
-  HOWTO (R_MIPS_64,		/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 mips32_64bit_reloc,	/* special_function */
-	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
-
-/* The reloc used for the mips16 jump instruction.  */
-static reloc_howto_type elf_mips16_jump_howto =
-  HOWTO (R_MIPS16_26,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 			/* This needs complex overflow
-				   detection, because the upper four
-				   bits must match the PC.  */
-	 mips16_jump_reloc,	/* special_function */
-	 "R_MIPS16_26",		/* name */
-	 true,			/* partial_inplace */
-	 0x3ffffff,		/* src_mask */
-	 0x3ffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
-
-/* The reloc used for the mips16 gprel instruction.  The src_mask and
-   dsk_mask for this howto do not reflect the actual instruction, in
-   which the value is not contiguous; the masks are for the
-   convenience of the relocate_section routine.  */
-static reloc_howto_type elf_mips16_gprel_howto =
-  HOWTO (R_MIPS16_GPREL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 mips16_gprel_reloc,	/* special_function */
-	 "R_MIPS16_GPREL",	/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
-
-
-/* GNU extension to record C++ vtable hierarchy */
-static reloc_howto_type elf_mips_gnu_vtinherit_howto =
-  HOWTO (R_MIPS_GNU_VTINHERIT,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "R_MIPS_GNU_VTINHERIT", /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
-
-/* GNU extension to record C++ vtable member usage */
-static reloc_howto_type elf_mips_gnu_vtentry_howto =
-  HOWTO (R_MIPS_GNU_VTENTRY,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 _bfd_elf_rel_vtable_reloc_fn, /* special_function */
-	 "R_MIPS_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
-
-/* Do a R_MIPS_HI16 relocation.  This has to be done in combination
-   with a R_MIPS_LO16 reloc, because there is a carry from the LO16 to
-   the HI16.  Here we just save the information we need; we do the
-   actual relocation when we see the LO16.  MIPS ELF requires that the
-   LO16 immediately follow the HI16.  As a GNU extension, we permit an
-   arbitrary number of HI16 relocs to be associated with a single LO16
-   reloc.  This extension permits gcc to output the HI and LO relocs
-   itself.  */
-
-struct mips_hi16
-{
-  struct mips_hi16 *next;
-  bfd_byte *addr;
-  bfd_vma addend;
-};
-
-/* FIXME: This should not be a static variable.  */
-
-static struct mips_hi16 *mips_hi16_list;
-
-bfd_reloc_status_type
-_bfd_mips_elf_hi16_reloc (abfd,
-		     reloc_entry,
-		     symbol,
-		     data,
-		     input_section,
-		     output_bfd,
-		     error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_reloc_status_type ret;
-  bfd_vma relocation;
-  struct mips_hi16 *n;
-
-  /* If we're relocating, and this an external symbol, we don't want
-     to change anything.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  ret = bfd_reloc_ok;
-
-  if (strcmp (bfd_asymbol_name (symbol), "_gp_disp") == 0)
-    {
-      boolean relocateable;
-      bfd_vma gp;
-
-      if (ret == bfd_reloc_undefined)
-	abort ();
-
-      if (output_bfd != NULL)
-	relocateable = true;
-      else
-	{
-	  relocateable = false;
-	  output_bfd = symbol->section->output_section->owner;
-	}
-
-      ret = mips_elf_final_gp (output_bfd, symbol, relocateable,
-			       error_message, &gp);
-      if (ret != bfd_reloc_ok)
-	return ret;
-
-      relocation = gp - reloc_entry->address;
-    }
-  else
-    {
-      if (bfd_is_und_section (symbol->section)
-	  && output_bfd == (bfd *) NULL)
-	ret = bfd_reloc_undefined;
-
-      if (bfd_is_com_section (symbol->section))
-	relocation = 0;
-      else
-	relocation = symbol->value;
-    }
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Save the information, and let LO16 do the actual relocation.  */
-  n = (struct mips_hi16 *) bfd_malloc (sizeof *n);
-  if (n == NULL)
-    return bfd_reloc_outofrange;
-  n->addr = (bfd_byte *) data + reloc_entry->address;
-  n->addend = relocation;
-  n->next = mips_hi16_list;
-  mips_hi16_list = n;
-
-  if (output_bfd != (bfd *) NULL)
-    reloc_entry->address += input_section->output_offset;
-
-  return ret;
-}
-
-/* Do a R_MIPS_LO16 relocation.  This is a straightforward 16 bit
-   inplace relocation; this function exists in order to do the
-   R_MIPS_HI16 relocation described above.  */
-
-bfd_reloc_status_type
-_bfd_mips_elf_lo16_reloc (abfd,
-		     reloc_entry,
-		     symbol,
-		     data,
-		     input_section,
-		     output_bfd,
-		     error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  arelent gp_disp_relent;
-
-  if (mips_hi16_list != NULL)
-    {
-      struct mips_hi16 *l;
-
-      l = mips_hi16_list;
-      while (l != NULL)
-	{
-	  unsigned long insn;
-	  unsigned long val;
-	  unsigned long vallo;
-	  struct mips_hi16 *next;
-
-	  /* Do the HI16 relocation.  Note that we actually don't need
-	     to know anything about the LO16 itself, except where to
-	     find the low 16 bits of the addend needed by the LO16.  */
-	  insn = bfd_get_32 (abfd, l->addr);
-	  vallo = (bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address)
-		   & 0xffff);
-	  val = ((insn & 0xffff) << 16) + vallo;
-	  val += l->addend;
-
-	  /* The low order 16 bits are always treated as a signed
-	     value.  Therefore, a negative value in the low order bits
-	     requires an adjustment in the high order bits.  We need
-	     to make this adjustment in two ways: once for the bits we
-	     took from the data, and once for the bits we are putting
-	     back in to the data.  */
-	  if ((vallo & 0x8000) != 0)
-	    val -= 0x10000;
-	  if ((val & 0x8000) != 0)
-	    val += 0x10000;
-
-	  insn = (insn &~ 0xffff) | ((val >> 16) & 0xffff);
-	  bfd_put_32 (abfd, insn, l->addr);
-
-	  if (strcmp (bfd_asymbol_name (symbol), "_gp_disp") == 0)
-	    {
-	      gp_disp_relent = *reloc_entry;
-	      reloc_entry = &gp_disp_relent;
-	      reloc_entry->addend = l->addend;
-	    }
-
-	  next = l->next;
-	  free (l);
-	  l = next;
-	}
-
-      mips_hi16_list = NULL;
-    }
-  else if (strcmp (bfd_asymbol_name (symbol), "_gp_disp") == 0)
-    {
-      bfd_reloc_status_type ret;
-      bfd_vma gp, relocation;
-
-      /* FIXME: Does this case ever occur?  */
-
-      ret = mips_elf_final_gp (output_bfd, symbol, true, error_message, &gp);
-      if (ret != bfd_reloc_ok)
-	return ret;
-
-      relocation = gp - reloc_entry->address;
-      relocation += symbol->section->output_section->vma;
-      relocation += symbol->section->output_offset;
-      relocation += reloc_entry->addend;
-
-      if (reloc_entry->address > input_section->_cooked_size)
-	return bfd_reloc_outofrange;
-
-      gp_disp_relent = *reloc_entry;
-      reloc_entry = &gp_disp_relent;
-      reloc_entry->addend = relocation - 4;
-    }
-
-  /* Now do the LO16 reloc in the usual way.  */
-  return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
-				input_section, output_bfd, error_message);
-}
-
-/* Do a R_MIPS_GOT16 reloc.  This is a reloc against the global offset
-   table used for PIC code.  If the symbol is an external symbol, the
-   instruction is modified to contain the offset of the appropriate
-   entry in the global offset table.  If the symbol is a section
-   symbol, the next reloc is a R_MIPS_LO16 reloc.  The two 16 bit
-   addends are combined to form the real addend against the section
-   symbol; the GOT16 is modified to contain the offset of an entry in
-   the global offset table, and the LO16 is modified to offset it
-   appropriately.  Thus an offset larger than 16 bits requires a
-   modified value in the global offset table.
-
-   This implementation suffices for the assembler, but the linker does
-   not yet know how to create global offset tables.  */
-
-bfd_reloc_status_type
-_bfd_mips_elf_got16_reloc (abfd,
-		      reloc_entry,
-		      symbol,
-		      data,
-		      input_section,
-		      output_bfd,
-		      error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* If we're relocating, and this an external symbol, we don't want
-     to change anything.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* If we're relocating, and this is a local symbol, we can handle it
-     just like HI16.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) != 0)
-    return _bfd_mips_elf_hi16_reloc (abfd, reloc_entry, symbol, data,
-				     input_section, output_bfd, error_message);
-
-  abort ();
-}
-
-/* We have to figure out the gp value, so that we can adjust the
-   symbol value correctly.  We look up the symbol _gp in the output
-   BFD.  If we can't find it, we're stuck.  We cache it in the ELF
-   target data.  We don't need to adjust the symbol value for an
-   external symbol if we are producing relocateable output.  */
-
-static bfd_reloc_status_type
-mips_elf_final_gp (output_bfd, symbol, relocateable, error_message, pgp)
-     bfd *output_bfd;
-     asymbol *symbol;
-     boolean relocateable;
-     char **error_message;
-     bfd_vma *pgp;
-{
-  if (bfd_is_und_section (symbol->section)
-      && ! relocateable)
-    {
-      *pgp = 0;
-      return bfd_reloc_undefined;
-    }
-
-  *pgp = _bfd_get_gp_value (output_bfd);
-  if (*pgp == 0
-      && (! relocateable
-	  || (symbol->flags & BSF_SECTION_SYM) != 0))
-    {
-      if (relocateable)
-	{
-	  /* Make up a value.  */
-	  *pgp = symbol->section->output_section->vma + 0x4000;
-	  _bfd_set_gp_value (output_bfd, *pgp);
-	}
-      else
-	{
-	  unsigned int count;
-	  asymbol **sym;
-	  unsigned int i;
-
-	  count = bfd_get_symcount (output_bfd);
-	  sym = bfd_get_outsymbols (output_bfd);
-
-	  if (sym == (asymbol **) NULL)
-	    i = count;
-	  else
-	    {
-	      for (i = 0; i < count; i++, sym++)
-		{
-		  register CONST char *name;
-
-		  name = bfd_asymbol_name (*sym);
-		  if (*name == '_' && strcmp (name, "_gp") == 0)
-		    {
-		      *pgp = bfd_asymbol_value (*sym);
-		      _bfd_set_gp_value (output_bfd, *pgp);
-		      break;
-		    }
-		}
-	    }
-
-	  if (i >= count)
-	    {
-	      /* Only get the error once.  */
-	      *pgp = 4;
-	      _bfd_set_gp_value (output_bfd, *pgp);
-	      *error_message =
-		(char *) _("GP relative relocation when _gp not defined");
-	      return bfd_reloc_dangerous;
-	    }
-	}
-    }
-
-  return bfd_reloc_ok;
-}
-
-/* Do a R_MIPS_GPREL16 relocation.  This is a 16 bit value which must
-   become the offset from the gp register.  This function also handles
-   R_MIPS_LITERAL relocations, although those can be handled more
-   cleverly because the entries in the .lit8 and .lit4 sections can be
-   merged.  */
-
-static bfd_reloc_status_type gprel16_with_gp PARAMS ((bfd *, asymbol *,
-						      arelent *, asection *,
-						      boolean, PTR, bfd_vma));
-
-bfd_reloc_status_type
-_bfd_mips_elf_gprel16_reloc (abfd, reloc_entry, symbol, data, input_section,
-			     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  boolean relocateable;
-  bfd_reloc_status_type ret;
-  bfd_vma gp;
-
-  /* If we're relocating, and this is an external symbol with no
-     addend, we don't want to change anything.  We will only have an
-     addend if this is a newly created reloc, not read from an ELF
-     file.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != (bfd *) NULL)
-    relocateable = true;
-  else
-    {
-      relocateable = false;
-      output_bfd = symbol->section->output_section->owner;
-    }
-
-  ret = mips_elf_final_gp (output_bfd, symbol, relocateable, error_message,
-			   &gp);
-  if (ret != bfd_reloc_ok)
-    return ret;
-
-  return gprel16_with_gp (abfd, symbol, reloc_entry, input_section,
-			  relocateable, data, gp);
-}
-
-static bfd_reloc_status_type
-gprel16_with_gp (abfd, symbol, reloc_entry, input_section, relocateable, data,
-		 gp)
-     bfd *abfd;
-     asymbol *symbol;
-     arelent *reloc_entry;
-     asection *input_section;
-     boolean relocateable;
-     PTR data;
-     bfd_vma gp;
-{
-  bfd_vma relocation;
-  unsigned long insn;
-  unsigned long val;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  insn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
-
-  /* Set val to the offset into the section or symbol.  */
-  if (reloc_entry->howto->src_mask == 0)
-    {
-      /* This case occurs with the 64-bit MIPS ELF ABI.  */
-      val = reloc_entry->addend;
-    }
-  else
-    {
-      val = ((insn & 0xffff) + reloc_entry->addend) & 0xffff;
-      if (val & 0x8000)
-	val -= 0x10000;
-    }
-
-  /* Adjust val for the final section location and GP value.  If we
-     are producing relocateable output, we don't want to do this for
-     an external symbol.  */
-  if (! relocateable
-      || (symbol->flags & BSF_SECTION_SYM) != 0)
-    val += relocation - gp;
-
-  insn = (insn &~ 0xffff) | (val & 0xffff);
-  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
-
-  if (relocateable)
-    reloc_entry->address += input_section->output_offset;
-
-  /* Make sure it fit in 16 bits.  */
-  if (val >= 0x8000 && val < 0xffff8000)
-    return bfd_reloc_overflow;
-
-  return bfd_reloc_ok;
-}
-
-/* Do a R_MIPS_GPREL32 relocation.  Is this 32 bit value the offset
-   from the gp register? XXX */
-
-static bfd_reloc_status_type gprel32_with_gp PARAMS ((bfd *, asymbol *,
-						      arelent *, asection *,
-						      boolean, PTR, bfd_vma));
-
-bfd_reloc_status_type
-_bfd_mips_elf_gprel32_reloc (abfd,
-			reloc_entry,
-			symbol,
-			data,
-			input_section,
-			output_bfd,
-			error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  boolean relocateable;
-  bfd_reloc_status_type ret;
-  bfd_vma gp;
-
-  /* If we're relocating, and this is an external symbol with no
-     addend, we don't want to change anything.  We will only have an
-     addend if this is a newly created reloc, not read from an ELF
-     file.  */
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      *error_message = (char *)
-	_("32bits gp relative relocation occurs for an external symbol");
-      return bfd_reloc_outofrange;
-    }
-
-  if (output_bfd != (bfd *) NULL)
-    {
-      relocateable = true;
-      gp = _bfd_get_gp_value (output_bfd);
-    }
-  else
-    {
-      relocateable = false;
-      output_bfd = symbol->section->output_section->owner;
-
-      ret = mips_elf_final_gp (output_bfd, symbol, relocateable,
-			       error_message, &gp);
-      if (ret != bfd_reloc_ok)
-	return ret;
-    }
-
-  return gprel32_with_gp (abfd, symbol, reloc_entry, input_section,
-			  relocateable, data, gp);
-}
-
-static bfd_reloc_status_type
-gprel32_with_gp (abfd, symbol, reloc_entry, input_section, relocateable, data,
-		 gp)
-     bfd *abfd;
-     asymbol *symbol;
-     arelent *reloc_entry;
-     asection *input_section;
-     boolean relocateable;
-     PTR data;
-     bfd_vma gp;
-{
-  bfd_vma relocation;
-  unsigned long val;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  if (reloc_entry->howto->src_mask == 0)
-    {
-      /* This case arises with the 64-bit MIPS ELF ABI.  */
-      val = 0;
-    }
-  else
-    val = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
-
-  /* Set val to the offset into the section or symbol.  */
-  val += reloc_entry->addend;
-
-  /* Adjust val for the final section location and GP value.  If we
-     are producing relocateable output, we don't want to do this for
-     an external symbol.  */
-  if (! relocateable
-      || (symbol->flags & BSF_SECTION_SYM) != 0)
-    val += relocation - gp;
-
-  bfd_put_32 (abfd, val, (bfd_byte *) data + reloc_entry->address);
-
-  if (relocateable)
-    reloc_entry->address += input_section->output_offset;
-
-  return bfd_reloc_ok;
-}
-
-/* Handle a 64 bit reloc in a 32 bit MIPS ELF file.  These are
-   generated when addreses are 64 bits.  The upper 32 bits are a simle
-   sign extension.  */
-
-static bfd_reloc_status_type
-mips32_64bit_reloc (abfd, reloc_entry, symbol, data, input_section,
-		    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_reloc_status_type r;
-  arelent reloc32;
-  unsigned long val;
-  bfd_size_type addr;
-
-  r = bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data,
-			     input_section, output_bfd, error_message);
-  if (r != bfd_reloc_continue)
-    return r;
-
-  /* Do a normal 32 bit relocation on the lower 32 bits.  */
-  reloc32 = *reloc_entry;
-  if (bfd_big_endian (abfd))
-    reloc32.address += 4;
-  reloc32.howto = &elf_mips_howto_table[R_MIPS_32];
-  r = bfd_perform_relocation (abfd, &reloc32, data, input_section,
-			      output_bfd, error_message);
-
-  /* Sign extend into the upper 32 bits.  */
-  val = bfd_get_32 (abfd, (bfd_byte *) data + reloc32.address);
-  if ((val & 0x80000000) != 0)
-    val = 0xffffffff;
-  else
-    val = 0;
-  addr = reloc_entry->address;
-  if (bfd_little_endian (abfd))
-    addr += 4;
-  bfd_put_32 (abfd, val, (bfd_byte *) data + addr);
-
-  return r;
-}
-
-/* Handle a mips16 jump.  */
-
-static bfd_reloc_status_type
-mips16_jump_reloc (abfd, reloc_entry, symbol, data, input_section,
-		   output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* FIXME.  */
-  {
-    static boolean warned;
-
-    if (! warned)
-      (*_bfd_error_handler)
-	(_("Linking mips16 objects into %s format is not supported"),
-	 bfd_get_target (input_section->output_section->owner));
-    warned = true;
-  }
-
-  return bfd_reloc_undefined;
-}
-
-/* Handle a mips16 GP relative reloc.  */
-
-static bfd_reloc_status_type
-mips16_gprel_reloc (abfd, reloc_entry, symbol, data, input_section,
-		    output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  boolean relocateable;
-  bfd_reloc_status_type ret;
-  bfd_vma gp;
-  unsigned short extend, insn;
-  unsigned long final;
-
-  /* If we're relocating, and this is an external symbol with no
-     addend, we don't want to change anything.  We will only have an
-     addend if this is a newly created reloc, not read from an ELF
-     file.  */
-  if (output_bfd != NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && reloc_entry->addend == 0)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != NULL)
-    relocateable = true;
-  else
-    {
-      relocateable = false;
-      output_bfd = symbol->section->output_section->owner;
-    }
-
-  ret = mips_elf_final_gp (output_bfd, symbol, relocateable, error_message,
-			   &gp);
-  if (ret != bfd_reloc_ok)
-    return ret;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Pick up the mips16 extend instruction and the real instruction.  */
-  extend = bfd_get_16 (abfd, (bfd_byte *) data + reloc_entry->address);
-  insn = bfd_get_16 (abfd, (bfd_byte *) data + reloc_entry->address + 2);
-
-  /* Stuff the current addend back as a 32 bit value, do the usual
-     relocation, and then clean up.  */
-  bfd_put_32 (abfd,
-	      (((extend & 0x1f) << 11)
-	       | (extend & 0x7e0)
-	       | (insn & 0x1f)),
-	      (bfd_byte *) data + reloc_entry->address);
-
-  ret = gprel16_with_gp (abfd, symbol, reloc_entry, input_section,
-			 relocateable, data, gp);
-
-  final = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
-  bfd_put_16 (abfd,
-	      ((extend & 0xf800)
-	       | ((final >> 11) & 0x1f)
-	       | (final & 0x7e0)),
-	      (bfd_byte *) data + reloc_entry->address);
-  bfd_put_16 (abfd,
-	      ((insn & 0xffe0)
-	       | (final & 0x1f)),
-	      (bfd_byte *) data + reloc_entry->address + 2);
-
-  return ret;
-}
-
-/* Return the ISA for a MIPS e_flags value.  */
-
-static INLINE int
-elf_mips_isa (flags)
-     flagword flags;
-{
-  switch (flags & EF_MIPS_ARCH)
-    {
-    case E_MIPS_ARCH_1:
-      return 1;
-    case E_MIPS_ARCH_2:
-      return 2;
-    case E_MIPS_ARCH_3:
-      return 3;
-    case E_MIPS_ARCH_4:
-      return 4;
-    }
-  return 4;
-}
-
-/* Return the MACH for a MIPS e_flags value.  */
-
-static INLINE int
-elf_mips_mach (flags)
-     flagword flags;
-{
-  switch (flags & EF_MIPS_MACH)
-    {
-    case E_MIPS_MACH_3900:
-      return bfd_mach_mips3900;
-
-    case E_MIPS_MACH_4010:
-      return bfd_mach_mips4010;
-
-    case E_MIPS_MACH_4100:
-      return bfd_mach_mips4100;
-
-    case E_MIPS_MACH_4111:
-      return bfd_mach_mips4111;
-
-    case E_MIPS_MACH_4650:
-      return bfd_mach_mips4650;
-
-    default:
-      switch (flags & EF_MIPS_ARCH)
-	{
-	default:
-	case E_MIPS_ARCH_1:
-	  return bfd_mach_mips3000;
-	  break;
-
-	case E_MIPS_ARCH_2:
-	  return bfd_mach_mips6000;
-	  break;
-
-	case E_MIPS_ARCH_3:
-	  return bfd_mach_mips4000;
-	  break;
-
-	case E_MIPS_ARCH_4:
-	  return bfd_mach_mips8000;
-	  break;
-	}
-    }
-
-  return 0;
-}
-
-/* Return printable name for ABI from flagword. */
-
-static INLINE char*
-elf_mips_abi_name (flags)
-     flagword flags;
-{
-  switch (flags & EF_MIPS_ABI)
-    {
-    case 0:
-      return "none";
-    case E_MIPS_ABI_O32:
-      return "O32";
-    case E_MIPS_ABI_O64:
-      return "O64";
-    case E_MIPS_ABI_EABI32:
-      return "EABI32";
-    case E_MIPS_ABI_EABI64:
-      return "EABI64";
-    default:
-      return "unknown abi";
-    }
-}
-
-/* A mapping from BFD reloc types to MIPS ELF reloc types.  */
-
-struct elf_reloc_map {
-  bfd_reloc_code_real_type bfd_reloc_val;
-  enum elf_mips_reloc_type elf_reloc_val;
-};
-
-static CONST struct elf_reloc_map mips_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_MIPS_NONE, },
-  { BFD_RELOC_16, R_MIPS_16 },
-  { BFD_RELOC_32, R_MIPS_32 },
-  { BFD_RELOC_64, R_MIPS_64 },
-  { BFD_RELOC_MIPS_JMP, R_MIPS_26 },
-  { BFD_RELOC_HI16_S, R_MIPS_HI16 },
-  { BFD_RELOC_LO16, R_MIPS_LO16 },
-  { BFD_RELOC_MIPS_GPREL, R_MIPS_GPREL16 },
-  { BFD_RELOC_MIPS_LITERAL, R_MIPS_LITERAL },
-  { BFD_RELOC_MIPS_GOT16, R_MIPS_GOT16 },
-  { BFD_RELOC_16_PCREL, R_MIPS_PC16 },
-  { BFD_RELOC_MIPS_CALL16, R_MIPS_CALL16 },
-  { BFD_RELOC_MIPS_GPREL32, R_MIPS_GPREL32 },
-  { BFD_RELOC_MIPS_GOT_HI16, R_MIPS_GOT_HI16 },
-  { BFD_RELOC_MIPS_GOT_LO16, R_MIPS_GOT_LO16 },
-  { BFD_RELOC_MIPS_CALL_HI16, R_MIPS_CALL_HI16 },
-  { BFD_RELOC_MIPS_CALL_LO16, R_MIPS_CALL_LO16 }
-};
-
-/* Given a BFD reloc type, return a howto structure.  */
-
-static reloc_howto_type *
-bfd_elf32_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0; i < sizeof (mips_reloc_map) / sizeof (struct elf_reloc_map); i++)
-    {
-      if (mips_reloc_map[i].bfd_reloc_val == code)
-	return &elf_mips_howto_table[(int) mips_reloc_map[i].elf_reloc_val];
-    }
-
-  switch (code)
-    {
-    default:
-      bfd_set_error (bfd_error_bad_value);
-      return NULL;
-
-    case BFD_RELOC_CTOR:
-      /* We need to handle BFD_RELOC_CTOR specially.
-	 Select the right relocation (R_MIPS_32 or R_MIPS_64) based on the
-	 size of addresses on this architecture.  */
-      if (bfd_arch_bits_per_address (abfd) == 32)
-	return &elf_mips_howto_table[(int) R_MIPS_32];
-      else
-	return &elf_mips_ctor64_howto;
-
-    case BFD_RELOC_MIPS16_JMP:
-      return &elf_mips16_jump_howto;
-    case BFD_RELOC_MIPS16_GPREL:
-      return &elf_mips16_gprel_howto;
-    case BFD_RELOC_VTABLE_INHERIT:
-      return &elf_mips_gnu_vtinherit_howto;
-    case BFD_RELOC_VTABLE_ENTRY:
-      return &elf_mips_gnu_vtentry_howto;
-    }
-}
-
-/* Given a MIPS reloc type, fill in an arelent structure.  */
-
-static void
-mips_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rel *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  switch (r_type)
-    {
-    case R_MIPS16_26:
-      cache_ptr->howto = &elf_mips16_jump_howto;
-      break;
-    case R_MIPS16_GPREL:
-      cache_ptr->howto = &elf_mips16_gprel_howto;
-      break;
-    case R_MIPS_GNU_VTINHERIT:
-      cache_ptr->howto = &elf_mips_gnu_vtinherit_howto;
-      break;
-    case R_MIPS_GNU_VTENTRY:
-      cache_ptr->howto = &elf_mips_gnu_vtentry_howto;
-      break;
-
-    default:
-      BFD_ASSERT (r_type < (unsigned int) R_MIPS_max);
-      cache_ptr->howto = &elf_mips_howto_table[r_type];
-      break;
-    }
-
-  /* The addend for a GPREL16 or LITERAL relocation comes from the GP
-     value for the object file.  We get the addend now, rather than
-     when we do the relocation, because the symbol manipulations done
-     by the linker may cause us to lose track of the input BFD.  */
-  if (((*cache_ptr->sym_ptr_ptr)->flags & BSF_SECTION_SYM) != 0
-      && (r_type == (unsigned int) R_MIPS_GPREL16
-	  || r_type == (unsigned int) R_MIPS_LITERAL))
-    cache_ptr->addend = elf_gp (abfd);
-}
-
-/* A .reginfo section holds a single Elf32_RegInfo structure.  These
-   routines swap this structure in and out.  They are used outside of
-   BFD, so they are globally visible.  */
-
-void
-bfd_mips_elf32_swap_reginfo_in (abfd, ex, in)
-     bfd *abfd;
-     const Elf32_External_RegInfo *ex;
-     Elf32_RegInfo *in;
-{
-  in->ri_gprmask = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_gprmask);
-  in->ri_cprmask[0] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[0]);
-  in->ri_cprmask[1] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[1]);
-  in->ri_cprmask[2] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[2]);
-  in->ri_cprmask[3] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[3]);
-  in->ri_gp_value = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_gp_value);
-}
-
-void
-bfd_mips_elf32_swap_reginfo_out (abfd, in, ex)
-     bfd *abfd;
-     const Elf32_RegInfo *in;
-     Elf32_External_RegInfo *ex;
-{
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_gprmask,
-		(bfd_byte *) ex->ri_gprmask);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[0],
-		(bfd_byte *) ex->ri_cprmask[0]);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[1],
-		(bfd_byte *) ex->ri_cprmask[1]);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[2],
-		(bfd_byte *) ex->ri_cprmask[2]);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[3],
-		(bfd_byte *) ex->ri_cprmask[3]);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_gp_value,
-		(bfd_byte *) ex->ri_gp_value);
-}
-
-/* In the 64 bit ABI, the .MIPS.options section holds register
-   information in an Elf64_Reginfo structure.  These routines swap
-   them in and out.  They are globally visible because they are used
-   outside of BFD.  These routines are here so that gas can call them
-   without worrying about whether the 64 bit ABI has been included.  */
-
-void
-bfd_mips_elf64_swap_reginfo_in (abfd, ex, in)
-     bfd *abfd;
-     const Elf64_External_RegInfo *ex;
-     Elf64_Internal_RegInfo *in;
-{
-  in->ri_gprmask = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_gprmask);
-  in->ri_pad = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_pad);
-  in->ri_cprmask[0] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[0]);
-  in->ri_cprmask[1] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[1]);
-  in->ri_cprmask[2] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[2]);
-  in->ri_cprmask[3] = bfd_h_get_32 (abfd, (bfd_byte *) ex->ri_cprmask[3]);
-  in->ri_gp_value = bfd_h_get_64 (abfd, (bfd_byte *) ex->ri_gp_value);
-}
-
-void
-bfd_mips_elf64_swap_reginfo_out (abfd, in, ex)
-     bfd *abfd;
-     const Elf64_Internal_RegInfo *in;
-     Elf64_External_RegInfo *ex;
-{
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_gprmask,
-		(bfd_byte *) ex->ri_gprmask);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_pad,
-		(bfd_byte *) ex->ri_pad);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[0],
-		(bfd_byte *) ex->ri_cprmask[0]);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[1],
-		(bfd_byte *) ex->ri_cprmask[1]);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[2],
-		(bfd_byte *) ex->ri_cprmask[2]);
-  bfd_h_put_32 (abfd, (bfd_vma) in->ri_cprmask[3],
-		(bfd_byte *) ex->ri_cprmask[3]);
-  bfd_h_put_64 (abfd, (bfd_vma) in->ri_gp_value,
-		(bfd_byte *) ex->ri_gp_value);
-}
-
-/* Swap an entry in a .gptab section.  Note that these routines rely
-   on the equivalence of the two elements of the union.  */
-
-static void
-bfd_mips_elf32_swap_gptab_in (abfd, ex, in)
-     bfd *abfd;
-     const Elf32_External_gptab *ex;
-     Elf32_gptab *in;
-{
-  in->gt_entry.gt_g_value = bfd_h_get_32 (abfd, ex->gt_entry.gt_g_value);
-  in->gt_entry.gt_bytes = bfd_h_get_32 (abfd, ex->gt_entry.gt_bytes);
-}
-
-static void
-bfd_mips_elf32_swap_gptab_out (abfd, in, ex)
-     bfd *abfd;
-     const Elf32_gptab *in;
-     Elf32_External_gptab *ex;
-{
-  bfd_h_put_32 (abfd, (bfd_vma) in->gt_entry.gt_g_value,
-		ex->gt_entry.gt_g_value);
-  bfd_h_put_32 (abfd, (bfd_vma) in->gt_entry.gt_bytes,
-		ex->gt_entry.gt_bytes);
-}
-
-static void
-bfd_elf32_swap_compact_rel_out (abfd, in, ex)
-     bfd *abfd;
-     const Elf32_compact_rel *in;
-     Elf32_External_compact_rel *ex;
-{
-  bfd_h_put_32 (abfd, (bfd_vma) in->id1, ex->id1);
-  bfd_h_put_32 (abfd, (bfd_vma) in->num, ex->num);
-  bfd_h_put_32 (abfd, (bfd_vma) in->id2, ex->id2);
-  bfd_h_put_32 (abfd, (bfd_vma) in->offset, ex->offset);
-  bfd_h_put_32 (abfd, (bfd_vma) in->reserved0, ex->reserved0);
-  bfd_h_put_32 (abfd, (bfd_vma) in->reserved1, ex->reserved1);
-}
-
-static void
-bfd_elf32_swap_crinfo_out (abfd, in, ex)
-     bfd *abfd;
-     const Elf32_crinfo *in;
-     Elf32_External_crinfo *ex;
-{
-  unsigned long l;
-
-  l = (((in->ctype & CRINFO_CTYPE) << CRINFO_CTYPE_SH)
-       | ((in->rtype & CRINFO_RTYPE) << CRINFO_RTYPE_SH)
-       | ((in->dist2to & CRINFO_DIST2TO) << CRINFO_DIST2TO_SH)
-       | ((in->relvaddr & CRINFO_RELVADDR) << CRINFO_RELVADDR_SH));
-  bfd_h_put_32 (abfd, (bfd_vma) l, ex->info);
-  bfd_h_put_32 (abfd, (bfd_vma) in->konst, ex->konst);
-  bfd_h_put_32 (abfd, (bfd_vma) in->vaddr, ex->vaddr);
-}
-
-/* Swap in an options header.  */
-
-void
-bfd_mips_elf_swap_options_in (abfd, ex, in)
-     bfd *abfd;
-     const Elf_External_Options *ex;
-     Elf_Internal_Options *in;
-{
-  in->kind = bfd_h_get_8 (abfd, ex->kind);
-  in->size = bfd_h_get_8 (abfd, ex->size);
-  in->section = bfd_h_get_16 (abfd, ex->section);
-  in->info = bfd_h_get_32 (abfd, ex->info);
-}
-
-/* Swap out an options header.  */
-
-void
-bfd_mips_elf_swap_options_out (abfd, in, ex)
-     bfd *abfd;
-     const Elf_Internal_Options *in;
-     Elf_External_Options *ex;
-{
-  bfd_h_put_8 (abfd, in->kind, ex->kind);
-  bfd_h_put_8 (abfd, in->size, ex->size);
-  bfd_h_put_16 (abfd, in->section, ex->section);
-  bfd_h_put_32 (abfd, in->info, ex->info);
-}
-
-/* Determine whether a symbol is global for the purposes of splitting
-   the symbol table into global symbols and local symbols.  At least
-   on Irix 5, this split must be between section symbols and all other
-   symbols.  On most ELF targets the split is between static symbols
-   and externally visible symbols.  */
-
-/*ARGSUSED*/
-static boolean
-mips_elf_sym_is_global (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
-{
-  return (sym->flags & BSF_SECTION_SYM) == 0 ? true : false;
-}
-
-/* Set the right machine number for a MIPS ELF file.  This is used for
-   both the 32-bit and the 64-bit ABI.  */
-
-boolean
-_bfd_mips_elf_object_p (abfd)
-     bfd *abfd;
-{
-  bfd_default_set_arch_mach (abfd, bfd_arch_mips,
-			     elf_mips_mach (elf_elfheader (abfd)->e_flags));
-  return true;
-}
-
-/* Set the right machine number for a 32-bit MIPS ELF file.  */
-
-static boolean
-mips_elf32_object_p (abfd)
-     bfd *abfd;
-{
-  /* Irix 5 is broken.  Object file symbol tables are not always
-     sorted correctly such that local symbols precede global symbols,
-     and the sh_info field in the symbol table is not always right.  */
-  elf_bad_symtab (abfd) = true;
-
-  return _bfd_mips_elf_object_p (abfd);
-}
-
-/* The final processing done just before writing out a MIPS ELF object
-   file.  This gets the MIPS architecture right based on the machine
-   number.  This is used by both the 32-bit and the 64-bit ABI.  */
-
-/*ARGSUSED*/
-void
-_bfd_mips_elf_final_write_processing (abfd, linker)
-     bfd *abfd;
-     boolean linker;
-{
-  unsigned long val;
-  unsigned int i;
-  Elf_Internal_Shdr **hdrpp;
-  const char *name;
-  asection *sec;
-
-  switch (bfd_get_mach (abfd))
-    {
-    default:
-    case bfd_mach_mips3000:
-      val = E_MIPS_ARCH_1;
-      break;
-
-    case bfd_mach_mips3900:
-      val = E_MIPS_ARCH_1 | E_MIPS_MACH_3900;
-      break;
-
-    case bfd_mach_mips6000:
-      val = E_MIPS_ARCH_2;
-      break;
-
-    case bfd_mach_mips4000:
-    case bfd_mach_mips4300:
-      val = E_MIPS_ARCH_3;
-      break;
-
-    case bfd_mach_mips4010:
-      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4010;
-      break;
-
-    case bfd_mach_mips4100:
-      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4100;
-      break;
-
-    case bfd_mach_mips4111:
-      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4111;
-      break;
-
-    case bfd_mach_mips4650:
-      val = E_MIPS_ARCH_3 | E_MIPS_MACH_4650;
-      break;
-
-    case bfd_mach_mips8000:
-      val = E_MIPS_ARCH_4;
-      break;
-    }
-
-  elf_elfheader (abfd)->e_flags &= ~ (EF_MIPS_ARCH | EF_MIPS_MACH);
-  elf_elfheader (abfd)->e_flags |= val;
-
-  /* Set the sh_info field for .gptab sections and other appropriate
-     info for each special section.  */
-  for (i = 1, hdrpp = elf_elfsections (abfd) + 1;
-       i < elf_elfheader (abfd)->e_shnum;
-       i++, hdrpp++)
-    {
-      switch ((*hdrpp)->sh_type)
-	{
-	case SHT_MIPS_LIBLIST:
-	  sec = bfd_get_section_by_name (abfd, ".dynstr");
-	  if (sec != NULL)
-	    (*hdrpp)->sh_link = elf_section_data (sec)->this_idx;
-	  break;
-
-	case SHT_MIPS_GPTAB:
-	  BFD_ASSERT ((*hdrpp)->bfd_section != NULL);
-	  name = bfd_get_section_name (abfd, (*hdrpp)->bfd_section);
-	  BFD_ASSERT (name != NULL
-		      && strncmp (name, ".gptab.", sizeof ".gptab." - 1) == 0);
-	  sec = bfd_get_section_by_name (abfd, name + sizeof ".gptab" - 1);
-	  BFD_ASSERT (sec != NULL);
-	  (*hdrpp)->sh_info = elf_section_data (sec)->this_idx;
-	  break;
-
-	case SHT_MIPS_CONTENT:
-	  BFD_ASSERT ((*hdrpp)->bfd_section != NULL);
-	  name = bfd_get_section_name (abfd, (*hdrpp)->bfd_section);
-	  BFD_ASSERT (name != NULL
-		      && strncmp (name, ".MIPS.content",
-				  sizeof ".MIPS.content" - 1) == 0);
-	  sec = bfd_get_section_by_name (abfd,
-					 name + sizeof ".MIPS.content" - 1);
-	  BFD_ASSERT (sec != NULL);
-	  (*hdrpp)->sh_info = elf_section_data (sec)->this_idx;
-	  break;
-
-	case SHT_MIPS_SYMBOL_LIB:
-	  sec = bfd_get_section_by_name (abfd, ".dynsym");
-	  if (sec != NULL)
-	    (*hdrpp)->sh_link = elf_section_data (sec)->this_idx;
-	  sec = bfd_get_section_by_name (abfd, ".liblist");
-	  if (sec != NULL)
-	    (*hdrpp)->sh_info = elf_section_data (sec)->this_idx;
-	  break;
-
-	case SHT_MIPS_EVENTS:
-	  BFD_ASSERT ((*hdrpp)->bfd_section != NULL);
-	  name = bfd_get_section_name (abfd, (*hdrpp)->bfd_section);
-	  BFD_ASSERT (name != NULL);
-	  if (strncmp (name, ".MIPS.events", sizeof ".MIPS.events" - 1) == 0)
-	    sec = bfd_get_section_by_name (abfd,
-					   name + sizeof ".MIPS.events" - 1);
-	  else
-	    {
-	      BFD_ASSERT (strncmp (name, ".MIPS.post_rel",
-				   sizeof ".MIPS.post_rel" - 1) == 0);
-	      sec = bfd_get_section_by_name (abfd,
-					     (name
-					      + sizeof ".MIPS.post_rel" - 1));
-	    }
-	  BFD_ASSERT (sec != NULL);
-	  (*hdrpp)->sh_link = elf_section_data (sec)->this_idx;
-	  break;
-
-	}
-    }
-}
-
-/* Function to keep MIPS specific file flags like as EF_MIPS_PIC. */
-
-boolean
-_bfd_mips_elf_set_private_flags (abfd, flags)
-     bfd *abfd;
-     flagword flags;
-{
-  BFD_ASSERT (!elf_flags_init (abfd)
-	      || elf_elfheader (abfd)->e_flags == flags);
-
-  elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
-}
-
-/* Copy backend specific data from one object module to another */
-
-boolean
-_bfd_mips_elf_copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  BFD_ASSERT (!elf_flags_init (obfd)
-	      || (elf_elfheader (obfd)->e_flags
-		  == elf_elfheader (ibfd)->e_flags));
-
-  elf_gp (obfd) = elf_gp (ibfd);
-  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = true;
-  return true;
-}
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-
-boolean
-_bfd_mips_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  flagword old_flags;
-  flagword new_flags;
-  boolean ok;
-
-  /* Check if we have the same endianess */
-  if (ibfd->xvec->byteorder != obfd->xvec->byteorder
-      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
-    {
-      const char *msg;
-
-      if (bfd_big_endian (ibfd))
-	msg = _("%s: compiled for a big endian system and target is little endian");
-      else
-	msg = _("%s: compiled for a little endian system and target is big endian");
-
-      (*_bfd_error_handler) (msg, bfd_get_filename (ibfd));
-
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  new_flags = elf_elfheader (ibfd)->e_flags;
-  elf_elfheader (obfd)->e_flags |= new_flags & EF_MIPS_NOREORDER;
-  old_flags = elf_elfheader (obfd)->e_flags;
-
-  if (! elf_flags_init (obfd))
-    {
-      elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = new_flags;
-
-      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
-	  && bfd_get_arch_info (obfd)->the_default)
-	{
-	  if (! bfd_set_arch_mach (obfd, bfd_get_arch (ibfd),
-				   bfd_get_mach (ibfd)))
-	    return false;
-	}
-
-      return true;
-    }
-
-  /* Check flag compatibility.  */
-
-  new_flags &= ~EF_MIPS_NOREORDER;
-  old_flags &= ~EF_MIPS_NOREORDER;
-
-  if (new_flags == old_flags)
-    return true;
-
-  ok = true;
-
-  if ((new_flags & EF_MIPS_PIC) != (old_flags & EF_MIPS_PIC))
-    {
-      new_flags &= ~EF_MIPS_PIC;
-      old_flags &= ~EF_MIPS_PIC;
-      (*_bfd_error_handler)
-	(_("%s: linking PIC files with non-PIC files"),
-	 bfd_get_filename (ibfd));
-      ok = false;
-    }
-
-  if ((new_flags & EF_MIPS_CPIC) != (old_flags & EF_MIPS_CPIC))
-    {
-      new_flags &= ~EF_MIPS_CPIC;
-      old_flags &= ~EF_MIPS_CPIC;
-      (*_bfd_error_handler)
-	(_("%s: linking abicalls files with non-abicalls files"),
-	 bfd_get_filename (ibfd));
-      ok = false;
-    }
-
-  /* Compare the ISA's. */
-  if ((new_flags & (EF_MIPS_ARCH | EF_MIPS_MACH))
-      != (old_flags & (EF_MIPS_ARCH | EF_MIPS_MACH)))
-    {
-      int new_mach = new_flags & EF_MIPS_MACH;
-      int old_mach = old_flags & EF_MIPS_MACH;
-      int new_isa = elf_mips_isa (new_flags);
-      int old_isa = elf_mips_isa (old_flags);
-
-      /* If either has no machine specified, just compare the general isa's.
-	 Some combinations of machines are ok, if the isa's match. */
-      if (! new_mach 
-	  || ! old_mach
-	  || new_mach == old_mach
-	  )
-	{
-	  /* Don't warn about mixing -mips1 and -mips2 code, or mixing -mips3
-	     and -mips4 code.  They will normally use the same data sizes and
-	     calling conventions.  */
-
-	  if ((new_isa == 1 || new_isa == 2)
-	      ? (old_isa != 1 && old_isa != 2)
-	      : (old_isa == 1 || old_isa == 2))
-	    {
-	      (*_bfd_error_handler)
-	       (_("%s: ISA mismatch (-mips%d) with previous modules (-mips%d)"),
-		bfd_get_filename (ibfd), new_isa, old_isa);
-	      ok = false;
-	    }
-	}
-
-      else
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: ISA mismatch (%d) with previous modules (%d)"),
-	     bfd_get_filename (ibfd),
-	     elf_mips_mach (new_flags),
-	     elf_mips_mach (old_flags));
-	  ok = false;
-	}
-
-      new_flags &= ~ (EF_MIPS_ARCH | EF_MIPS_MACH);
-      old_flags &= ~ (EF_MIPS_ARCH | EF_MIPS_MACH);
-    }
-
-  /* Compare ABI's */
-  if ((new_flags & EF_MIPS_ABI) != (old_flags & EF_MIPS_ABI))
-    {
-      /* Only error if both are set (to different values). */
-      if ((new_flags & EF_MIPS_ABI)
-	  && (old_flags & EF_MIPS_ABI))
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: ABI mismatch: linking %s module with previous %s modules"),
-	     bfd_get_filename (ibfd),
-	     elf_mips_abi_name (new_flags),
-	     elf_mips_abi_name (old_flags));
-	  ok = false;
-	}
-      new_flags &= ~EF_MIPS_ABI;
-      old_flags &= ~EF_MIPS_ABI;
-    }
-
-  /* Warn about any other mismatches */
-  if (new_flags != old_flags)
-    {
-      (*_bfd_error_handler)
-	(_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
-	 bfd_get_filename (ibfd), (unsigned long) new_flags,
-	 (unsigned long) old_flags);
-      ok = false;
-    }
-
-  if (! ok)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  return true;
-}
-
-static boolean
-_bfd_mips_elf_print_private_bfd_data (abfd, ptr)
-     bfd *abfd;
-     PTR ptr;
-{
-  FILE *file = (FILE *) ptr;
-
-  BFD_ASSERT (abfd != NULL && ptr != NULL);
-
-  /* Print normal ELF private data.  */
-  _bfd_elf_print_private_bfd_data (abfd, ptr);
-
-  /* xgettext:c-format */
-  fprintf (file, _ ("private flags = %lx:"), elf_elfheader (abfd)->e_flags);
-
-  if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_O32)
-    fprintf (file, _ (" [abi=O32]"));
-  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_O64)
-    fprintf (file, _ (" [abi=O64]"));
-  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI32)
-    fprintf (file, _ (" [abi=EABI32]"));
-  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI) == E_MIPS_ABI_EABI64)
-    fprintf (file, _ (" [abi=EABI64]"));
-  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ABI))
-    fprintf (file, _ (" [abi unknown]"));
-  else
-    fprintf (file, _ (" [no abi set]"));
-
-  if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_1)
-    fprintf (file, _ (" [mips1]"));
-  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_2)
-    fprintf (file, _ (" [mips2]"));
-  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_3)
-    fprintf (file, _ (" [mips3]"));
-  else if ((elf_elfheader (abfd)->e_flags & EF_MIPS_ARCH) == E_MIPS_ARCH_4)
-    fprintf (file, _ (" [mips4]"));
-  else
-    fprintf (file, _ (" [unknown ISA]"));
-
-  if (elf_elfheader (abfd)->e_flags & EF_MIPS_32BITMODE)
-    fprintf (file, _ (" [32bitmode]"));
-  else
-    fprintf (file, _ (" [not 32bitmode]"));
-
-  fputc ('\n', file);
-
-  return true;
-}
-
-/* Handle a MIPS specific section when reading an object file.  This
-   is called when elfcode.h finds a section with an unknown type.
-   This routine supports both the 32-bit and 64-bit ELF ABI.
-
-   FIXME: We need to handle the SHF_MIPS_GPREL flag, but I'm not sure
-   how to.  */
-
-boolean
-_bfd_mips_elf_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-     const char *name;
-{
-  flagword flags = 0;
-
-  /* There ought to be a place to keep ELF backend specific flags, but
-     at the moment there isn't one.  We just keep track of the
-     sections by their name, instead.  Fortunately, the ABI gives
-     suggested names for all the MIPS specific sections, so we will
-     probably get away with this.  */
-  switch (hdr->sh_type)
-    {
-    case SHT_MIPS_LIBLIST:
-      if (strcmp (name, ".liblist") != 0)
-	return false;
-      break;
-    case SHT_MIPS_MSYM:
-      if (strcmp (name, ".msym") != 0)
-	return false;
-      break;
-    case SHT_MIPS_CONFLICT:
-      if (strcmp (name, ".conflict") != 0)
-	return false;
-      break;
-    case SHT_MIPS_GPTAB:
-      if (strncmp (name, ".gptab.", sizeof ".gptab." - 1) != 0)
-	return false;
-      break;
-    case SHT_MIPS_UCODE:
-      if (strcmp (name, ".ucode") != 0)
-	return false;
-      break;
-    case SHT_MIPS_DEBUG:
-      if (strcmp (name, ".mdebug") != 0)
-	return false;
-      flags = SEC_DEBUGGING;
-      break;
-    case SHT_MIPS_REGINFO:
-      if (strcmp (name, ".reginfo") != 0
-	  || hdr->sh_size != sizeof (Elf32_External_RegInfo))
-	return false;
-      flags = (SEC_LINK_ONCE | SEC_LINK_DUPLICATES_SAME_SIZE);
-      break;
-    case SHT_MIPS_IFACE:
-      if (strcmp (name, ".MIPS.interfaces") != 0)
-	return false;
-      break;
-    case SHT_MIPS_CONTENT:
-      if (strncmp (name, ".MIPS.content", sizeof ".MIPS.content" - 1) != 0)
-	return false;
-      break;
-    case SHT_MIPS_OPTIONS:
-      if (strcmp (name, ".options") != 0
-	  && strcmp (name, ".MIPS.options") != 0)
-	return false;
-      break;
-    case SHT_MIPS_DWARF:
-      if (strncmp (name, ".debug_", sizeof ".debug_" - 1) != 0)
-	return false;
-      break;
-    case SHT_MIPS_SYMBOL_LIB:
-      if (strcmp (name, ".MIPS.symlib") != 0)
-	return false;
-      break;
-    case SHT_MIPS_EVENTS:
-      if (strncmp (name, ".MIPS.events", sizeof ".MIPS.events" - 1) != 0
-	  && strncmp (name, ".MIPS.post_rel",
-		      sizeof ".MIPS.post_rel" - 1) != 0)
-	return false;
-      break;
-    default:
-      return false;
-    }
-
-  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
-
-  if (flags)
-    {
-      if (! bfd_set_section_flags (abfd, hdr->bfd_section,
-				   (bfd_get_section_flags (abfd,
-							   hdr->bfd_section)
-				    | flags)))
-	return false;
-    }
-
-  return true;
-}
-
-/* Handle a 32-bit MIPS ELF specific section.  */
-
-static boolean
-mips_elf32_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-     char *name;
-{
-  if (! _bfd_mips_elf_section_from_shdr (abfd, hdr, name))
-    return false;
-
-  /* FIXME: We should record sh_info for a .gptab section.  */
-
-  /* For a .reginfo section, set the gp value in the tdata information
-     from the contents of this section.  We need the gp value while
-     processing relocs, so we just get it now.  The .reginfo section
-     is not used in the 64-bit MIPS ELF ABI.  */
-  if (hdr->sh_type == SHT_MIPS_REGINFO)
-    {
-      Elf32_External_RegInfo ext;
-      Elf32_RegInfo s;
-
-      if (! bfd_get_section_contents (abfd, hdr->bfd_section, (PTR) &ext,
-				      (file_ptr) 0, sizeof ext))
-	return false;
-      bfd_mips_elf32_swap_reginfo_in (abfd, &ext, &s);
-      elf_gp (abfd) = s.ri_gp_value;
-    }
-
-  /* For a SHT_MIPS_OPTIONS section, look for a ODK_REGINFO entry, and
-     set the gp value based on what we find.  We may see both
-     SHT_MIPS_REGINFO and SHT_MIPS_OPTIONS/ODK_REGINFO; in that case,
-     they should agree.  */
-  if (hdr->sh_type == SHT_MIPS_OPTIONS)
-    {
-      bfd_byte *contents, *l, *lend;
-
-      contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
-      if (contents == NULL)
-	return false;
-      if (! bfd_get_section_contents (abfd, hdr->bfd_section, contents,
-				      (file_ptr) 0, hdr->sh_size))
-	{
-	  free (contents);
-	  return false;
-	}
-      l = contents;
-      lend = contents + hdr->sh_size;
-      while (l + sizeof (Elf_External_Options) <= lend)
-	{
-	  Elf_Internal_Options intopt;
-
-	  bfd_mips_elf_swap_options_in (abfd, (Elf_External_Options *) l,
-					&intopt);
-	  if (intopt.kind == ODK_REGINFO)
-	    {
-	      Elf32_RegInfo intreg;
-
-	      bfd_mips_elf32_swap_reginfo_in
-		(abfd,
-		 ((Elf32_External_RegInfo *)
-		  (l + sizeof (Elf_External_Options))),
-		 &intreg);
-	      elf_gp (abfd) = intreg.ri_gp_value;
-	    }
-	  l += intopt.size;
-	}
-      free (contents);
-    }
-
-  return true;
-}
-
-/* Set the correct type for a MIPS ELF section.  We do this by the
-   section name, which is a hack, but ought to work.  This routine is
-   used by both the 32-bit and the 64-bit ABI.  */
-
-boolean
-_bfd_mips_elf_fake_sections (abfd, hdr, sec)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     asection *sec;
-{
-  register const char *name;
-
-  name = bfd_get_section_name (abfd, sec);
-
-  if (strcmp (name, ".liblist") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_LIBLIST;
-      hdr->sh_info = sec->_raw_size / sizeof (Elf32_Lib);
-      /* The sh_link field is set in final_write_processing.  */
-    }
-  else if (strcmp (name, ".msym") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_MSYM;
-      hdr->sh_entsize = 8;
-      /* FIXME: Set the sh_info field.  */
-    }
-  else if (strcmp (name, ".conflict") == 0)
-    hdr->sh_type = SHT_MIPS_CONFLICT;
-  else if (strncmp (name, ".gptab.", sizeof ".gptab." - 1) == 0)
-    {
-      hdr->sh_type = SHT_MIPS_GPTAB;
-      hdr->sh_entsize = sizeof (Elf32_External_gptab);
-      /* The sh_info field is set in final_write_processing.  */
-    }
-  else if (strcmp (name, ".ucode") == 0)
-    hdr->sh_type = SHT_MIPS_UCODE;
-  else if (strcmp (name, ".mdebug") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_DEBUG;
-      /* In a shared object on Irix 5.3, the .mdebug section has an
-         entsize of 0.  FIXME: Does this matter?  */
-      if (SGI_COMPAT (abfd) && (abfd->flags & DYNAMIC) != 0)
-	hdr->sh_entsize = 0;
-      else
-	hdr->sh_entsize = 1;
-    }
-  else if (strcmp (name, ".reginfo") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_REGINFO;
-      /* In a shared object on Irix 5.3, the .reginfo section has an
-         entsize of 0x18.  FIXME: Does this matter?  */
-      if (SGI_COMPAT (abfd) && (abfd->flags & DYNAMIC) != 0)
-	hdr->sh_entsize = sizeof (Elf32_External_RegInfo);
-      else
-	hdr->sh_entsize = 1;
-    }
-  else if (SGI_COMPAT (abfd)
-	   && (strcmp (name, ".hash") == 0
-	       || strcmp (name, ".dynamic") == 0
-	       || strcmp (name, ".dynstr") == 0))
-    {
-      hdr->sh_entsize = 0;
-#if 0
-      /* This isn't how the Irix 6 linker behaves.  */
-      hdr->sh_info = SIZEOF_MIPS_DYNSYM_SECNAMES;
-#endif
-    }
-  else if (strcmp (name, ".got") == 0
-	   || strcmp (name, ".sdata") == 0
-	   || strcmp (name, ".sbss") == 0
-	   || strcmp (name, ".lit4") == 0
-	   || strcmp (name, ".lit8") == 0)
-    hdr->sh_flags |= SHF_MIPS_GPREL;
-  else if (strcmp (name, ".MIPS.interfaces") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_IFACE;
-      hdr->sh_flags |= SHF_MIPS_NOSTRIP;
-    }
-  else if (strcmp (name, ".MIPS.content") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_CONTENT;
-      /* The sh_info field is set in final_write_processing.  */
-    }
-  else if (strcmp (name, ".options") == 0
-	   || strcmp (name, ".MIPS.options") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_OPTIONS;
-      hdr->sh_entsize = 1;
-      hdr->sh_flags |= SHF_MIPS_NOSTRIP;
-    }
-  else if (strncmp (name, ".debug_", sizeof ".debug_" - 1) == 0)
-    hdr->sh_type = SHT_MIPS_DWARF;
-  else if (strcmp (name, ".MIPS.symlib") == 0)
-    {
-      hdr->sh_type = SHT_MIPS_SYMBOL_LIB;
-      /* The sh_link and sh_info fields are set in
-         final_write_processing.  */
-    }
-  else if (strncmp (name, ".MIPS.events", sizeof ".MIPS.events" - 1) == 0
-	   || strncmp (name, ".MIPS.post_rel",
-		       sizeof ".MIPS.post_rel" - 1) == 0)
-    {
-      hdr->sh_type = SHT_MIPS_EVENTS;
-      hdr->sh_flags |= SHF_MIPS_NOSTRIP;
-      /* The sh_link field is set in final_write_processing.  */
-    }
-
-  return true;
-}
-
-/* Given a BFD section, try to locate the corresponding ELF section
-   index.  This is used by both the 32-bit and the 64-bit ABI.
-   Actually, it's not clear to me that the 64-bit ABI supports these,
-   but for non-PIC objects we will certainly want support for at least
-   the .scommon section.  */
-
-boolean
-_bfd_mips_elf_section_from_bfd_section (abfd, hdr, sec, retval)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     asection *sec;
-     int *retval;
-{
-  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
-    {
-      *retval = SHN_MIPS_SCOMMON;
-      return true;
-    }
-  if (strcmp (bfd_get_section_name (abfd, sec), ".acommon") == 0)
-    {
-      *retval = SHN_MIPS_ACOMMON;
-      return true;
-    }
-  return false;
-}
-
-/* When are writing out the .options or .MIPS.options section,
-   remember the bytes we are writing out, so that we can install the
-   GP value in the section_processing routine.  */
-
-boolean
-_bfd_mips_elf_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (strcmp (section->name, ".options") == 0
-      || strcmp (section->name, ".MIPS.options") == 0)
-    {
-      bfd_byte *c;
-
-      if (elf_section_data (section) == NULL)
-	{
-	  section->used_by_bfd =
-	    (PTR) bfd_zalloc (abfd, sizeof (struct bfd_elf_section_data));
-	  if (elf_section_data (section) == NULL)
-	    return false;
-	}
-      c = (bfd_byte *) elf_section_data (section)->tdata;
-      if (c == NULL)
-	{
-	  bfd_size_type size;
-
-	  if (section->_cooked_size != 0)
-	    size = section->_cooked_size;
-	  else
-	    size = section->_raw_size;
-	  c = (bfd_byte *) bfd_zalloc (abfd, size);
-	  if (c == NULL)
-	    return false;
-	  elf_section_data (section)->tdata = (PTR) c;
-	}
-
-      memcpy (c + offset, location, count);
-    }
-
-  return _bfd_elf_set_section_contents (abfd, section, location, offset,
-					count);
-}
-
-/* Work over a section just before writing it out.  This routine is
-   used by both the 32-bit and the 64-bit ABI.  FIXME: We recognize
-   sections that need the SHF_MIPS_GPREL flag by name; there has to be
-   a better way.  */
-
-boolean
-_bfd_mips_elf_section_processing (abfd, hdr)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-{
-  if (hdr->bfd_section != NULL)
-    {
-      const char *name = bfd_get_section_name (abfd, hdr->bfd_section);
-
-      if (strcmp (name, ".sdata") == 0)
-	{
-	  hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL;
-	  hdr->sh_type = SHT_PROGBITS;
-	}
-      else if (strcmp (name, ".sbss") == 0)
-	{
-	  hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL;
-	  hdr->sh_type = SHT_NOBITS;
-	}
-      else if (strcmp (name, ".lit8") == 0
-	       || strcmp (name, ".lit4") == 0)
-	{
-	  hdr->sh_flags |= SHF_ALLOC | SHF_WRITE | SHF_MIPS_GPREL;
-	  hdr->sh_type = SHT_PROGBITS;
-	}
-      else if (strcmp (name, ".compact_rel") == 0)
-	{
-	  hdr->sh_flags = 0;
-	  hdr->sh_type = SHT_PROGBITS;
-	}
-      else if (strcmp (name, ".rtproc") == 0)
-	{
-	  if (hdr->sh_addralign != 0 && hdr->sh_entsize == 0)
-	    {
-	      unsigned int adjust;
-
-	      adjust = hdr->sh_size % hdr->sh_addralign;
-	      if (adjust != 0)
-		hdr->sh_size += hdr->sh_addralign - adjust;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Work over a section just before writing it out.  We update the GP
-   value in the SHT_MIPS_REGINFO and SHT_MIPS_OPTIONS sections based
-   on the value we are using.  */
-
-static boolean
-mips_elf32_section_processing (abfd, hdr)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-{
-  if (hdr->sh_type == SHT_MIPS_REGINFO)
-    {
-      bfd_byte buf[4];
-
-      BFD_ASSERT (hdr->sh_size == sizeof (Elf32_External_RegInfo));
-      BFD_ASSERT (hdr->contents == NULL);
-
-      if (bfd_seek (abfd,
-		    hdr->sh_offset + sizeof (Elf32_External_RegInfo) - 4,
-		    SEEK_SET) == -1)
-	return false;
-      bfd_h_put_32 (abfd, (bfd_vma) elf_gp (abfd), buf);
-      if (bfd_write (buf, (bfd_size_type) 1, (bfd_size_type) 4, abfd) != 4)
-	return false;
-    }
-
-  if (hdr->sh_type == SHT_MIPS_OPTIONS
-      && hdr->bfd_section != NULL
-      && elf_section_data (hdr->bfd_section) != NULL
-      && elf_section_data (hdr->bfd_section)->tdata != NULL)
-    {
-      bfd_byte *contents, *l, *lend;
-
-      /* We stored the section contents in the elf_section_data tdata
-	 field in the set_section_contents routine.  We save the
-	 section contents so that we don't have to read them again.
-	 At this point we know that elf_gp is set, so we can look
-	 through the section contents to see if there is an
-	 ODK_REGINFO structure.  */
-
-      contents = (bfd_byte *) elf_section_data (hdr->bfd_section)->tdata;
-      l = contents;
-      lend = contents + hdr->sh_size;
-      while (l + sizeof (Elf_External_Options) <= lend)
-	{
-	  Elf_Internal_Options intopt;
-
-	  bfd_mips_elf_swap_options_in (abfd, (Elf_External_Options *) l,
-					&intopt);
-	  if (intopt.kind == ODK_REGINFO)
-	    {
-	      bfd_byte buf[4];
-
-	      if (bfd_seek (abfd,
-			    (hdr->sh_offset
-			     + (l - contents)
-			     + sizeof (Elf_External_Options)
-			     + (sizeof (Elf32_External_RegInfo) - 4)),
-			     SEEK_SET) == -1)
-		return false;
-	      bfd_h_put_32 (abfd, elf_gp (abfd), buf);
-	      if (bfd_write (buf, 1, 4, abfd) != 4)
-		return false;
-	    }
-	  l += intopt.size;
-	}
-    }
-
-  return _bfd_mips_elf_section_processing (abfd, hdr);
-}
-
-/* MIPS ELF uses two common sections.  One is the usual one, and the
-   other is for small objects.  All the small objects are kept
-   together, and then referenced via the gp pointer, which yields
-   faster assembler code.  This is what we use for the small common
-   section.  This approach is copied from ecoff.c.  */
-static asection mips_elf_scom_section;
-static asymbol mips_elf_scom_symbol;
-static asymbol *mips_elf_scom_symbol_ptr;
-
-/* MIPS ELF also uses an acommon section, which represents an
-   allocated common symbol which may be overridden by a
-   definition in a shared library.  */
-static asection mips_elf_acom_section;
-static asymbol mips_elf_acom_symbol;
-static asymbol *mips_elf_acom_symbol_ptr;
-
-/* The Irix 5 support uses two virtual sections, which represent
-   text/data symbols defined in dynamic objects.  */
-static asection mips_elf_text_section;
-static asection *mips_elf_text_section_ptr;
-static asymbol mips_elf_text_symbol;
-static asymbol *mips_elf_text_symbol_ptr;
-
-static asection mips_elf_data_section;
-static asection *mips_elf_data_section_ptr;
-static asymbol mips_elf_data_symbol;
-static asymbol *mips_elf_data_symbol_ptr;
-
-/* Handle the special MIPS section numbers that a symbol may use.
-   This is used for both the 32-bit and the 64-bit ABI.  */
-
-void
-_bfd_mips_elf_symbol_processing (abfd, asym)
-     bfd *abfd;
-     asymbol *asym;
-{
-  elf_symbol_type *elfsym;
-
-  elfsym = (elf_symbol_type *) asym;
-  switch (elfsym->internal_elf_sym.st_shndx)
-    {
-    case SHN_MIPS_ACOMMON:
-      /* This section is used in a dynamically linked executable file.
-	 It is an allocated common section.  The dynamic linker can
-	 either resolve these symbols to something in a shared
-	 library, or it can just leave them here.  For our purposes,
-	 we can consider these symbols to be in a new section.  */
-      if (mips_elf_acom_section.name == NULL)
-	{
-	  /* Initialize the acommon section.  */
-	  mips_elf_acom_section.name = ".acommon";
-	  mips_elf_acom_section.flags = SEC_ALLOC;
-	  mips_elf_acom_section.output_section = &mips_elf_acom_section;
-	  mips_elf_acom_section.symbol = &mips_elf_acom_symbol;
-	  mips_elf_acom_section.symbol_ptr_ptr = &mips_elf_acom_symbol_ptr;
-	  mips_elf_acom_symbol.name = ".acommon";
-	  mips_elf_acom_symbol.flags = BSF_SECTION_SYM;
-	  mips_elf_acom_symbol.section = &mips_elf_acom_section;
-	  mips_elf_acom_symbol_ptr = &mips_elf_acom_symbol;
-	}
-      asym->section = &mips_elf_acom_section;
-      break;
-
-    case SHN_COMMON:
-      /* Common symbols less than the GP size are automatically
-	 treated as SHN_MIPS_SCOMMON symbols.  */
-      if (asym->value > elf_gp_size (abfd))
-	break;
-      /* Fall through.  */
-    case SHN_MIPS_SCOMMON:
-      if (mips_elf_scom_section.name == NULL)
-	{
-	  /* Initialize the small common section.  */
-	  mips_elf_scom_section.name = ".scommon";
-	  mips_elf_scom_section.flags = SEC_IS_COMMON;
-	  mips_elf_scom_section.output_section = &mips_elf_scom_section;
-	  mips_elf_scom_section.symbol = &mips_elf_scom_symbol;
-	  mips_elf_scom_section.symbol_ptr_ptr = &mips_elf_scom_symbol_ptr;
-	  mips_elf_scom_symbol.name = ".scommon";
-	  mips_elf_scom_symbol.flags = BSF_SECTION_SYM;
-	  mips_elf_scom_symbol.section = &mips_elf_scom_section;
-	  mips_elf_scom_symbol_ptr = &mips_elf_scom_symbol;
-	}
-      asym->section = &mips_elf_scom_section;
-      asym->value = elfsym->internal_elf_sym.st_size;
-      break;
-
-    case SHN_MIPS_SUNDEFINED:
-      asym->section = bfd_und_section_ptr;
-      break;
-
-#if 0 /* for SGI_COMPAT */
-    case SHN_MIPS_TEXT:
-      asym->section = mips_elf_text_section_ptr;
-      break;
-
-    case SHN_MIPS_DATA:
-      asym->section = mips_elf_data_section_ptr;
-      break;
-#endif
-    }
-}
-
-/* When creating an Irix 5 executable, we need REGINFO and RTPROC
-   segments.  */
-
-static int
-mips_elf_additional_program_headers (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  int ret;
-
-  ret = 0;
-
-  if (! SGI_COMPAT (abfd))
-    return ret;
-
-  s = bfd_get_section_by_name (abfd, ".reginfo");
-  if (s != NULL && (s->flags & SEC_LOAD) != 0)
-    {
-      /* We need a PT_MIPS_REGINFO segment.  */
-      ++ret;
-    }
-
-  if (bfd_get_section_by_name (abfd, ".dynamic") != NULL
-      && bfd_get_section_by_name (abfd, ".mdebug") != NULL)
-    {
-      /* We need a PT_MIPS_RTPROC segment.  */
-      ++ret;
-    }
-
-  return ret;
-}
-
-/* Modify the segment map for an Irix 5 executable.  */
-
-static boolean
-mips_elf_modify_segment_map (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  struct elf_segment_map *m, **pm;
-
-  if (! SGI_COMPAT (abfd))
-    return true;
-
-  /* If there is a .reginfo section, we need a PT_MIPS_REGINFO
-     segment.  */
-  s = bfd_get_section_by_name (abfd, ".reginfo");
-  if (s != NULL && (s->flags & SEC_LOAD) != 0)
-    {
-      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
-	if (m->p_type == PT_MIPS_REGINFO)
-	  break;
-      if (m == NULL)
-	{
-	  m = (struct elf_segment_map *) bfd_zalloc (abfd, sizeof *m);
-	  if (m == NULL)
-	    return false;
-
-	  m->p_type = PT_MIPS_REGINFO;
-	  m->count = 1;
-	  m->sections[0] = s;
-
-	  /* We want to put it after the PHDR and INTERP segments.  */
-	  pm = &elf_tdata (abfd)->segment_map;
-	  while (*pm != NULL
-		 && ((*pm)->p_type == PT_PHDR
-		     || (*pm)->p_type == PT_INTERP))
-	    pm = &(*pm)->next;
-
-	  m->next = *pm;
-	  *pm = m;
-	}
-    }
-
-  /* If there are .dynamic and .mdebug sections, we make a room for
-     the RTPROC header.  FIXME: Rewrite without section names.  */
-  if (bfd_get_section_by_name (abfd, ".interp") == NULL
-      && bfd_get_section_by_name (abfd, ".dynamic") != NULL
-      && bfd_get_section_by_name (abfd, ".mdebug") != NULL)
-    {
-      for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next)
-	if (m->p_type == PT_MIPS_RTPROC)
-	  break;
-      if (m == NULL)
-	{
-	  m = (struct elf_segment_map *) bfd_zalloc (abfd, sizeof *m);
-	  if (m == NULL)
-	    return false;
-
-	  m->p_type = PT_MIPS_RTPROC;
-
-	  s = bfd_get_section_by_name (abfd, ".rtproc");
-	  if (s == NULL)
-	    {
-	      m->count = 0;
-	      m->p_flags = 0;
-	      m->p_flags_valid = 1;
-	    }
-	  else
-	    {
-	      m->count = 1;
-	      m->sections[0] = s;
-	    }
-
-	  /* We want to put it after the DYNAMIC segment.  */
-	  pm = &elf_tdata (abfd)->segment_map;
-	  while (*pm != NULL && (*pm)->p_type != PT_DYNAMIC)
-	    pm = &(*pm)->next;
-	  if (*pm != NULL)
-	    pm = &(*pm)->next;
-
-	  m->next = *pm;
-	  *pm = m;
-	}
-    }
-
-  /* On Irix 5, the PT_DYNAMIC segment includes the .dynamic, .dynstr,
-     .dynsym, and .hash sections, and everything in between.  */
-  for (pm = &elf_tdata (abfd)->segment_map; *pm != NULL; pm = &(*pm)->next)
-    if ((*pm)->p_type == PT_DYNAMIC)
-      break;
-  m = *pm;
-  if (m != NULL
-      && m->count == 1
-      && strcmp (m->sections[0]->name, ".dynamic") == 0)
-    {
-      static const char *sec_names[] =
-	{ ".dynamic", ".dynstr", ".dynsym", ".hash" };
-      bfd_vma low, high;
-      unsigned int i, c;
-      struct elf_segment_map *n;
-
-      low = 0xffffffff;
-      high = 0;
-      for (i = 0; i < sizeof sec_names / sizeof sec_names[0]; i++)
-	{
-	  s = bfd_get_section_by_name (abfd, sec_names[i]);
-	  if (s != NULL && (s->flags & SEC_LOAD) != 0)
-	    {
-	      bfd_size_type sz;
-
-	      if (low > s->vma)
-		low = s->vma;
-	      sz = s->_cooked_size;
-	      if (sz == 0)
-		sz = s->_raw_size;
-	      if (high < s->vma + sz)
-		high = s->vma + sz;
-	    }
-	}
-
-      c = 0;
-      for (s = abfd->sections; s != NULL; s = s->next)
-	if ((s->flags & SEC_LOAD) != 0
-	    && s->vma >= low
-	    && ((s->vma
-		 + (s->_cooked_size != 0 ? s->_cooked_size : s->_raw_size))
-		<= high))
-	  ++c;
-
-      n = ((struct elf_segment_map *)
-	   bfd_zalloc (abfd, sizeof *n + (c - 1) * sizeof (asection *)));
-      if (n == NULL)
-	return false;
-      *n = *m;
-      n->count = c;
-
-      i = 0;
-      for (s = abfd->sections; s != NULL; s = s->next)
-	{
-	  if ((s->flags & SEC_LOAD) != 0
-	      && s->vma >= low
-	      && ((s->vma
-		   + (s->_cooked_size != 0 ? s->_cooked_size : s->_raw_size))
-		  <= high))
-	    {
-	      n->sections[i] = s;
-	      ++i;
-	    }
-	}
-
-      *pm = n;
-    }
-
-  return true;
-}
-
-/* The structure of the runtime procedure descriptor created by the
-   loader for use by the static exception system.  */
-
-typedef struct runtime_pdr {
-	bfd_vma	adr;		/* memory address of start of procedure */
-	long	regmask;	/* save register mask */
-	long	regoffset;	/* save register offset */
-	long	fregmask;	/* save floating point register mask */
-	long	fregoffset;	/* save floating point register offset */
-	long	frameoffset;	/* frame size */
-	short	framereg;	/* frame pointer register */
-	short	pcreg;		/* offset or reg of return pc */
-	long	irpss;		/* index into the runtime string table */
-	long	reserved;
-	struct exception_info *exception_info;/* pointer to exception array */
-} RPDR, *pRPDR;
-#define cbRPDR sizeof(RPDR)
-#define rpdNil ((pRPDR) 0)
-
-/* Swap RPDR (runtime procedure table entry) for output.  */
-
-static void ecoff_swap_rpdr_out
-  PARAMS ((bfd *, const RPDR *, struct rpdr_ext *));
-
-static void
-ecoff_swap_rpdr_out (abfd, in, ex)
-     bfd *abfd;
-     const RPDR *in;
-     struct rpdr_ext *ex;
-{
-  /* ecoff_put_off was defined in ecoffswap.h.  */
-  ecoff_put_off (abfd, in->adr, (bfd_byte *) ex->p_adr);
-  bfd_h_put_32 (abfd, in->regmask, (bfd_byte *) ex->p_regmask);
-  bfd_h_put_32 (abfd, in->regoffset, (bfd_byte *) ex->p_regoffset);
-  bfd_h_put_32 (abfd, in->fregmask, (bfd_byte *) ex->p_fregmask);
-  bfd_h_put_32 (abfd, in->fregoffset, (bfd_byte *) ex->p_fregoffset);
-  bfd_h_put_32 (abfd, in->frameoffset, (bfd_byte *) ex->p_frameoffset);
-
-  bfd_h_put_16 (abfd, in->framereg, (bfd_byte *) ex->p_framereg);
-  bfd_h_put_16 (abfd, in->pcreg, (bfd_byte *) ex->p_pcreg);
-
-  bfd_h_put_32 (abfd, in->irpss, (bfd_byte *) ex->p_irpss);
-#if 0 /* FIXME */
-  ecoff_put_off (abfd, in->exception_info, (bfd_byte *) ex->p_exception_info);
-#endif
-}
-
-/* Read ECOFF debugging information from a .mdebug section into a
-   ecoff_debug_info structure.  */
-
-boolean
-_bfd_mips_elf_read_ecoff_info (abfd, section, debug)
-     bfd *abfd;
-     asection *section;
-     struct ecoff_debug_info *debug;
-{
-  HDRR *symhdr;
-  const struct ecoff_debug_swap *swap;
-  char *ext_hdr = NULL;
-
-  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-  memset (debug, 0, sizeof(*debug));
-
-  ext_hdr = (char *) bfd_malloc ((size_t) swap->external_hdr_size);
-  if (ext_hdr == NULL && swap->external_hdr_size != 0)
-    goto error_return;
-
-  if (bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0,
-				swap->external_hdr_size)
-      == false)
-    goto error_return;
-
-  symhdr = &debug->symbolic_header;
-  (*swap->swap_hdr_in) (abfd, ext_hdr, symhdr);
-
-  /* The symbolic header contains absolute file offsets and sizes to
-     read.  */
-#define READ(ptr, offset, count, size, type)				\
-  if (symhdr->count == 0)						\
-    debug->ptr = NULL;							\
-  else									\
-    {									\
-      debug->ptr = (type) bfd_malloc ((size_t) (size * symhdr->count));	\
-      if (debug->ptr == NULL)						\
-	goto error_return;						\
-      if (bfd_seek (abfd, (file_ptr) symhdr->offset, SEEK_SET) != 0	\
-	  || (bfd_read (debug->ptr, size, symhdr->count,		\
-			abfd) != size * symhdr->count))			\
-	goto error_return;						\
-    }
-
-  READ (line, cbLineOffset, cbLine, sizeof (unsigned char), unsigned char *);
-  READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, PTR);
-  READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, PTR);
-  READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, PTR);
-  READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, PTR);
-  READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
-	union aux_ext *);
-  READ (ss, cbSsOffset, issMax, sizeof (char), char *);
-  READ (ssext, cbSsExtOffset, issExtMax, sizeof (char), char *);
-  READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, PTR);
-  READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, PTR);
-  READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, PTR);
-#undef READ
-
-  debug->fdr = NULL;
-  debug->adjust = NULL;
-
-  return true;
-
- error_return:
-  if (ext_hdr != NULL)
-    free (ext_hdr);
-  if (debug->line != NULL)
-    free (debug->line);
-  if (debug->external_dnr != NULL)
-    free (debug->external_dnr);
-  if (debug->external_pdr != NULL)
-    free (debug->external_pdr);
-  if (debug->external_sym != NULL)
-    free (debug->external_sym);
-  if (debug->external_opt != NULL)
-    free (debug->external_opt);
-  if (debug->external_aux != NULL)
-    free (debug->external_aux);
-  if (debug->ss != NULL)
-    free (debug->ss);
-  if (debug->ssext != NULL)
-    free (debug->ssext);
-  if (debug->external_fdr != NULL)
-    free (debug->external_fdr);
-  if (debug->external_rfd != NULL)
-    free (debug->external_rfd);
-  if (debug->external_ext != NULL)
-    free (debug->external_ext);
-  return false;
-}
-
-/* MIPS ELF local labels start with '$', not 'L'.  */
-
-/*ARGSUSED*/
-static boolean
-mips_elf_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  if (name[0] == '$')
-    return true;
-
-  /* On Irix 6, the labels go back to starting with '.', so we accept
-     the generic ELF local label syntax as well.  */
-  return _bfd_elf_is_local_label_name (abfd, name);
-}
-
-/* MIPS ELF uses a special find_nearest_line routine in order the
-   handle the ECOFF debugging information.  */
-
-struct mips_elf_find_line
-{
-  struct ecoff_debug_info d;
-  struct ecoff_find_line i;
-};
-
-boolean
-_bfd_mips_elf_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
-				 functionname_ptr, line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  asection *msec;
-
-  if (_bfd_dwarf1_find_nearest_line (abfd, section, symbols, offset,
-				     filename_ptr, functionname_ptr,
-				     line_ptr))
-    return true;
-
-  if (_bfd_dwarf2_find_nearest_line (abfd, section, symbols, offset,
-				     filename_ptr, functionname_ptr,
-				     line_ptr))
-    return true;
-
-  msec = bfd_get_section_by_name (abfd, ".mdebug");
-  if (msec != NULL)
-    {
-      flagword origflags;
-      struct mips_elf_find_line *fi;
-      const struct ecoff_debug_swap * const swap =
-	get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-
-      /* If we are called during a link, mips_elf_final_link may have
-	 cleared the SEC_HAS_CONTENTS field.  We force it back on here
-	 if appropriate (which it normally will be).  */
-      origflags = msec->flags;
-      if (elf_section_data (msec)->this_hdr.sh_type != SHT_NOBITS)
-	msec->flags |= SEC_HAS_CONTENTS;
-
-      fi = elf_tdata (abfd)->find_line_info;
-      if (fi == NULL)
-	{
-	  bfd_size_type external_fdr_size;
-	  char *fraw_src;
-	  char *fraw_end;
-	  struct fdr *fdr_ptr;
-
-	  fi = ((struct mips_elf_find_line *)
-		bfd_zalloc (abfd, sizeof (struct mips_elf_find_line)));
-	  if (fi == NULL)
-	    {
-	      msec->flags = origflags;
-	      return false;
-	    }
-
-	  if (! _bfd_mips_elf_read_ecoff_info (abfd, msec, &fi->d))
-	    {
-	      msec->flags = origflags;
-	      return false;
-	    }
-
-	  /* Swap in the FDR information.  */
-	  fi->d.fdr = ((struct fdr *)
-		       bfd_alloc (abfd,
-				  (fi->d.symbolic_header.ifdMax *
-				   sizeof (struct fdr))));
-	  if (fi->d.fdr == NULL)
-	    {
-	      msec->flags = origflags;
-	      return false;
-	    }
-	  external_fdr_size = swap->external_fdr_size;
-	  fdr_ptr = fi->d.fdr;
-	  fraw_src = (char *) fi->d.external_fdr;
-	  fraw_end = (fraw_src
-		      + fi->d.symbolic_header.ifdMax * external_fdr_size);
-	  for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
-	    (*swap->swap_fdr_in) (abfd, (PTR) fraw_src, fdr_ptr);
-
-	  elf_tdata (abfd)->find_line_info = fi;
-
-	  /* Note that we don't bother to ever free this information.
-             find_nearest_line is either called all the time, as in
-             objdump -l, so the information should be saved, or it is
-             rarely called, as in ld error messages, so the memory
-             wasted is unimportant.  Still, it would probably be a
-             good idea for free_cached_info to throw it away.  */
-	}
-
-      if (_bfd_ecoff_locate_line (abfd, section, offset, &fi->d, swap,
-				  &fi->i, filename_ptr, functionname_ptr,
-				  line_ptr))
-	{
-	  msec->flags = origflags;
-	  return true;
-	}
-
-      msec->flags = origflags;
-    }
-
-  /* Fall back on the generic ELF find_nearest_line routine.  */
-
-  return _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
-				     filename_ptr, functionname_ptr,
-				     line_ptr);
-}
-
-  /* The mips16 compiler uses a couple of special sections to handle
-     floating point arguments.
-
-     Section names that look like .mips16.fn.FNNAME contain stubs that
-     copy floating point arguments from the fp regs to the gp regs and
-     then jump to FNNAME.  If any 32 bit function calls FNNAME, the
-     call should be redirected to the stub instead.  If no 32 bit
-     function calls FNNAME, the stub should be discarded.  We need to
-     consider any reference to the function, not just a call, because
-     if the address of the function is taken we will need the stub,
-     since the address might be passed to a 32 bit function.
-
-     Section names that look like .mips16.call.FNNAME contain stubs
-     that copy floating point arguments from the gp regs to the fp
-     regs and then jump to FNNAME.  If FNNAME is a 32 bit function,
-     then any 16 bit function that calls FNNAME should be redirected
-     to the stub instead.  If FNNAME is not a 32 bit function, the
-     stub should be discarded.
-
-     .mips16.call.fp.FNNAME sections are similar, but contain stubs
-     which call FNNAME and then copy the return value from the fp regs
-     to the gp regs.  These stubs store the return value in $18 while
-     calling FNNAME; any function which might call one of these stubs
-     must arrange to save $18 around the call.  (This case is not
-     needed for 32 bit functions that call 16 bit functions, because
-     16 bit functions always return floating point values in both
-     $f0/$f1 and $2/$3.)
-
-     Note that in all cases FNNAME might be defined statically.
-     Therefore, FNNAME is not used literally.  Instead, the relocation
-     information will indicate which symbol the section is for.
-
-     We record any stubs that we find in the symbol table.  */
-
-#define FN_STUB ".mips16.fn."
-#define CALL_STUB ".mips16.call."
-#define CALL_FP_STUB ".mips16.call.fp."
-
-/* The MIPS ELF linker needs additional information for each symbol in
-   the global hash table.  */
-
-struct mips_elf_link_hash_entry
-{
-  struct elf_link_hash_entry root;
-
-  /* External symbol information.  */
-  EXTR esym;
-
-  /* Number of MIPS_32 or MIPS_REL32 relocs against this symbol.  */
-  unsigned int mips_32_relocs;
-
-  /* If there is a stub that 32 bit functions should use to call this
-     16 bit function, this points to the section containing the stub.  */
-  asection *fn_stub;
-
-  /* Whether we need the fn_stub; this is set if this symbol appears
-     in any relocs other than a 16 bit call.  */
-  boolean need_fn_stub;
-
-  /* If there is a stub that 16 bit functions should use to call this
-     32 bit function, this points to the section containing the stub.  */
-  asection *call_stub;
-
-  /* This is like the call_stub field, but it is used if the function
-     being called returns a floating point value.  */
-  asection *call_fp_stub;
-};
-
-/* MIPS ELF linker hash table.  */
-
-struct mips_elf_link_hash_table
-{
-  struct elf_link_hash_table root;
-#if 0
-  /* We no longer use this.  */
-  /* String section indices for the dynamic section symbols.  */
-  bfd_size_type dynsym_sec_strindex[SIZEOF_MIPS_DYNSYM_SECNAMES];
-#endif
-  /* The number of .rtproc entries.  */
-  bfd_size_type procedure_count;
-  /* The size of the .compact_rel section (if SGI_COMPAT).  */
-  bfd_size_type compact_rel_size;
-  /* This flag indicates that the value of DT_MIPS_RLD_MAP dynamic
-     entry is set to the address of __rld_obj_head as in Irix 5. */
-  boolean use_rld_obj_head;
-  /* This is the value of the __rld_map or __rld_obj_head symbol.  */
-  bfd_vma rld_value;
-  /* This is set if we see any mips16 stub sections. */
-  boolean mips16_stubs_seen;
-};
-
-/* Look up an entry in a MIPS ELF linker hash table.  */
-
-#define mips_elf_link_hash_lookup(table, string, create, copy, follow)	\
-  ((struct mips_elf_link_hash_entry *)					\
-   elf_link_hash_lookup (&(table)->root, (string), (create),		\
-			 (copy), (follow)))
-
-/* Traverse a MIPS ELF linker hash table.  */
-
-#define mips_elf_link_hash_traverse(table, func, info)			\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the MIPS ELF linker hash table from a link_info structure.  */
-
-#define mips_elf_hash_table(p) \
-  ((struct mips_elf_link_hash_table *) ((p)->hash))
-
-static boolean mips_elf_output_extsym
-  PARAMS ((struct mips_elf_link_hash_entry *, PTR));
-
-/* Create an entry in a MIPS ELF linker hash table.  */
-
-static struct bfd_hash_entry *
-mips_elf_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct mips_elf_link_hash_entry *ret =
-    (struct mips_elf_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct mips_elf_link_hash_entry *) NULL)
-    ret = ((struct mips_elf_link_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct mips_elf_link_hash_entry)));
-  if (ret == (struct mips_elf_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct mips_elf_link_hash_entry *)
-	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				     table, string));
-  if (ret != (struct mips_elf_link_hash_entry *) NULL)
-    {
-      /* Set local fields.  */
-      memset (&ret->esym, 0, sizeof (EXTR));
-      /* We use -2 as a marker to indicate that the information has
-	 not been set.  -1 means there is no associated ifd.  */
-      ret->esym.ifd = -2;
-      ret->mips_32_relocs = 0;
-      ret->fn_stub = NULL;
-      ret->need_fn_stub = false;
-      ret->call_stub = NULL;
-      ret->call_fp_stub = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create a MIPS ELF linker hash table.  */
-
-static struct bfd_link_hash_table *
-mips_elf_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct mips_elf_link_hash_table *ret;
-
-  ret = ((struct mips_elf_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct mips_elf_link_hash_table)));
-  if (ret == (struct mips_elf_link_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
-				       mips_elf_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-#if 0
-  /* We no longer use this.  */
-  for (i = 0; i < SIZEOF_MIPS_DYNSYM_SECNAMES; i++)
-    ret->dynsym_sec_strindex[i] = (bfd_size_type) -1;
-#endif
-  ret->procedure_count = 0;
-  ret->compact_rel_size = 0;
-  ret->use_rld_obj_head = false;
-  ret->rld_value = 0;
-  ret->mips16_stubs_seen = false;
-
-  return &ret->root.root;
-}
-
-/* Hook called by the linker routine which adds symbols from an object
-   file.  We must handle the special MIPS section numbers here.  */
-
-/*ARGSUSED*/
-static boolean
-mips_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const Elf_Internal_Sym *sym;
-     const char **namep;
-     flagword *flagsp;
-     asection **secp;
-     bfd_vma *valp;
-{
-  if (SGI_COMPAT (abfd)
-      && (abfd->flags & DYNAMIC) != 0
-      && strcmp (*namep, "_rld_new_interface") == 0)
-    {
-      /* Skip Irix 5 rld entry name.  */
-      *namep = NULL;
-      return true;
-    }
-
-  switch (sym->st_shndx)
-    {
-    case SHN_COMMON:
-      /* Common symbols less than the GP size are automatically
-	 treated as SHN_MIPS_SCOMMON symbols.  */
-      if (sym->st_size > elf_gp_size (abfd))
-	break;
-      /* Fall through.  */
-    case SHN_MIPS_SCOMMON:
-      *secp = bfd_make_section_old_way (abfd, ".scommon");
-      (*secp)->flags |= SEC_IS_COMMON;
-      *valp = sym->st_size;
-      break;
-
-    case SHN_MIPS_TEXT:
-      /* This section is used in a shared object.  */
-      if (mips_elf_text_section_ptr == NULL)
-	{
-	  /* Initialize the section.  */
-	  mips_elf_text_section.name = ".text";
-	  mips_elf_text_section.flags = SEC_NO_FLAGS;
-	  mips_elf_text_section.output_section = NULL;
-	  mips_elf_text_section.symbol = &mips_elf_text_symbol;
-	  mips_elf_text_section.symbol_ptr_ptr = &mips_elf_text_symbol_ptr;
-	  mips_elf_text_symbol.name = ".text";
-	  mips_elf_text_symbol.flags = BSF_SECTION_SYM;
-	  mips_elf_text_symbol.section = &mips_elf_text_section;
-	  mips_elf_text_symbol_ptr = &mips_elf_text_symbol;
-	  mips_elf_text_section_ptr = &mips_elf_text_section;
-	}
-      /* This code used to do *secp = bfd_und_section_ptr if
-         info->shared.  I don't know why, and that doesn't make sense,
-         so I took it out.  */
-      *secp = mips_elf_text_section_ptr;
-      break;
-
-    case SHN_MIPS_ACOMMON:
-      /* Fall through. XXX Can we treat this as allocated data?  */
-    case SHN_MIPS_DATA:
-      /* This section is used in a shared object.  */
-      if (mips_elf_data_section_ptr == NULL)
-	{
-	  /* Initialize the section.  */
-	  mips_elf_data_section.name = ".data";
-	  mips_elf_data_section.flags = SEC_NO_FLAGS;
-	  mips_elf_data_section.output_section = NULL;
-	  mips_elf_data_section.symbol = &mips_elf_data_symbol;
-	  mips_elf_data_section.symbol_ptr_ptr = &mips_elf_data_symbol_ptr;
-	  mips_elf_data_symbol.name = ".data";
-	  mips_elf_data_symbol.flags = BSF_SECTION_SYM;
-	  mips_elf_data_symbol.section = &mips_elf_data_section;
-	  mips_elf_data_symbol_ptr = &mips_elf_data_symbol;
-	  mips_elf_data_section_ptr = &mips_elf_data_section;
-	}
-      /* This code used to do *secp = bfd_und_section_ptr if
-         info->shared.  I don't know why, and that doesn't make sense,
-         so I took it out.  */
-      *secp = mips_elf_data_section_ptr;
-      break;
-
-    case SHN_MIPS_SUNDEFINED:
-      *secp = bfd_und_section_ptr;
-      break;
-    }
-
-  if (SGI_COMPAT (abfd)
-      && ! info->shared
-      && info->hash->creator == abfd->xvec
-      && strcmp (*namep, "__rld_obj_head") == 0)
-    {
-      struct elf_link_hash_entry *h;
-
-      /* Mark __rld_obj_head as dynamic.  */
-      h = NULL;
-      if (! (_bfd_generic_link_add_one_symbol
-	     (info, abfd, *namep, BSF_GLOBAL, *secp,
-	      (bfd_vma) *valp, (const char *) NULL, false,
-	      get_elf_backend_data (abfd)->collect,
-	      (struct bfd_link_hash_entry **) &h)))
-	return false;
-      h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-      h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-      h->type = STT_OBJECT;
-
-      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	return false;
-
-      mips_elf_hash_table (info)->use_rld_obj_head = true;
-    }
-
-  /* If this is a mips16 text symbol, add 1 to the value to make it
-     odd.  This will cause something like .word SYM to come up with
-     the right value when it is loaded into the PC.  */
-  if (sym->st_other == STO_MIPS16)
-    ++*valp;
-
-  return true;
-}
-
-/* Structure used to pass information to mips_elf_output_extsym.  */
-
-struct extsym_info
-{
-  bfd *abfd;
-  struct bfd_link_info *info;
-  struct ecoff_debug_info *debug;
-  const struct ecoff_debug_swap *swap;
-  boolean failed;
-};
-
-/* This routine is used to write out ECOFF debugging external symbol
-   information.  It is called via mips_elf_link_hash_traverse.  The
-   ECOFF external symbol information must match the ELF external
-   symbol information.  Unfortunately, at this point we don't know
-   whether a symbol is required by reloc information, so the two
-   tables may wind up being different.  We must sort out the external
-   symbol information before we can set the final size of the .mdebug
-   section, and we must set the size of the .mdebug section before we
-   can relocate any sections, and we can't know which symbols are
-   required by relocation until we relocate the sections.
-   Fortunately, it is relatively unlikely that any symbol will be
-   stripped but required by a reloc.  In particular, it can not happen
-   when generating a final executable.  */
-
-static boolean
-mips_elf_output_extsym (h, data)
-     struct mips_elf_link_hash_entry *h;
-     PTR data;
-{
-  struct extsym_info *einfo = (struct extsym_info *) data;
-  boolean strip;
-  asection *sec, *output_section;
-
-  if (h->root.indx == -2)
-    strip = false;
-  else if (((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-	    || (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
-	   && (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-	   && (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    strip = true;
-  else if (einfo->info->strip == strip_all
-	   || (einfo->info->strip == strip_some
-	       && bfd_hash_lookup (einfo->info->keep_hash,
-				   h->root.root.root.string,
-				   false, false) == NULL))
-    strip = true;
-  else
-    strip = false;
-
-  if (strip)
-    return true;
-
-  if (h->esym.ifd == -2)
-    {
-      h->esym.jmptbl = 0;
-      h->esym.cobol_main = 0;
-      h->esym.weakext = 0;
-      h->esym.reserved = 0;
-      h->esym.ifd = ifdNil;
-      h->esym.asym.value = 0;
-      h->esym.asym.st = stGlobal;
-
-      if (SGI_COMPAT (einfo->abfd)
-	  && (h->root.root.type == bfd_link_hash_undefined
-	      || h->root.root.type == bfd_link_hash_undefweak))
-	{
-	  const char *name;
-
-	  /* Use undefined class.  Also, set class and type for some
-             special symbols.  */
-	  name = h->root.root.root.string;
-	  if (strcmp (name, mips_elf_dynsym_rtproc_names[0]) == 0
-	      || strcmp (name, mips_elf_dynsym_rtproc_names[1]) == 0)
-	    {
-	      h->esym.asym.sc = scData;
-	      h->esym.asym.st = stLabel;
-	      h->esym.asym.value = 0;
-	    }
-	  else if (strcmp (name, mips_elf_dynsym_rtproc_names[2]) == 0)
-	    {
-	      h->esym.asym.sc = scAbs;
-	      h->esym.asym.st = stLabel;
-	      h->esym.asym.value =
-		mips_elf_hash_table (einfo->info)->procedure_count;
-	    }
-	  else if (strcmp (name, "_gp_disp") == 0)
-	    {
-	      h->esym.asym.sc = scAbs;
-	      h->esym.asym.st = stLabel;
-	      h->esym.asym.value = elf_gp (einfo->abfd);
-	    }
-	  else
-	    h->esym.asym.sc = scUndefined;
-	}
-      else if (h->root.root.type != bfd_link_hash_defined
-	  && h->root.root.type != bfd_link_hash_defweak)
-	h->esym.asym.sc = scAbs;
-      else
-	{
-	  const char *name;
-
-	  sec = h->root.root.u.def.section;
-	  output_section = sec->output_section;
-
-	  /* When making a shared library and symbol h is the one from
-	     the another shared library, OUTPUT_SECTION may be null.  */
-	  if (output_section == NULL)
-	    h->esym.asym.sc = scUndefined;
-	  else
-	    {
-	      name = bfd_section_name (output_section->owner, output_section);
-
-	      if (strcmp (name, ".text") == 0)
-		h->esym.asym.sc = scText;
-	      else if (strcmp (name, ".data") == 0)
-		h->esym.asym.sc = scData;
-	      else if (strcmp (name, ".sdata") == 0)
-		h->esym.asym.sc = scSData;
-	      else if (strcmp (name, ".rodata") == 0
-		       || strcmp (name, ".rdata") == 0)
-		h->esym.asym.sc = scRData;
-	      else if (strcmp (name, ".bss") == 0)
-		h->esym.asym.sc = scBss;
-	      else if (strcmp (name, ".sbss") == 0)
-		h->esym.asym.sc = scSBss;
-	      else if (strcmp (name, ".init") == 0)
-		h->esym.asym.sc = scInit;
-	      else if (strcmp (name, ".fini") == 0)
-		h->esym.asym.sc = scFini;
-	      else
-		h->esym.asym.sc = scAbs;
-	    }
-	}
-
-      h->esym.asym.reserved = 0;
-      h->esym.asym.index = indexNil;
-    }
-
-  if (h->root.root.type == bfd_link_hash_common)
-    h->esym.asym.value = h->root.root.u.c.size;
-  else if (h->root.root.type == bfd_link_hash_defined
-	   || h->root.root.type == bfd_link_hash_defweak)
-    {
-      if (h->esym.asym.sc == scCommon)
-	h->esym.asym.sc = scBss;
-      else if (h->esym.asym.sc == scSCommon)
-	h->esym.asym.sc = scSBss;
-
-      sec = h->root.root.u.def.section;
-      output_section = sec->output_section;
-      if (output_section != NULL)
-	h->esym.asym.value = (h->root.root.u.def.value
-			      + sec->output_offset
-			      + output_section->vma);
-      else
-	h->esym.asym.value = 0;
-    }
-  else if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
-    {
-      /* Set type and value for a symbol with a function stub.  */
-      h->esym.asym.st = stProc;
-      sec = h->root.root.u.def.section;
-      if (sec == NULL)
-	h->esym.asym.value = 0;
-      else
-	{
-	  output_section = sec->output_section;
-	  if (output_section != NULL)
-	    h->esym.asym.value = (h->root.plt.offset
-				  + sec->output_offset
-				  + output_section->vma);
-	  else
-	    h->esym.asym.value = 0;
-	}
-#if 0 /* FIXME?  */
-      h->esym.ifd = 0;
-#endif
-    }
-
-  if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
-				      h->root.root.root.string,
-				      &h->esym))
-    {
-      einfo->failed = true;
-      return false;
-    }
-
-  return true;
-}
-
-/* Create a runtime procedure table from the .mdebug section.  */
-
-static boolean
-mips_elf_create_procedure_table (handle, abfd, info, s, debug)
-     PTR handle;
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *s;
-     struct ecoff_debug_info *debug;
-{
-  const struct ecoff_debug_swap *swap;
-  HDRR *hdr = &debug->symbolic_header;
-  RPDR *rpdr, *rp;
-  struct rpdr_ext *erp;
-  PTR rtproc;
-  struct pdr_ext *epdr;
-  struct sym_ext *esym;
-  char *ss, **sv;
-  char *str;
-  unsigned long size, count;
-  unsigned long sindex;
-  unsigned long i;
-  PDR pdr;
-  SYMR sym;
-  const char *no_name_func = _("static procedure (no name)");
-
-  epdr = NULL;
-  rpdr = NULL;
-  esym = NULL;
-  ss = NULL;
-  sv = NULL;
-
-  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-
-  sindex = strlen (no_name_func) + 1;
-  count = hdr->ipdMax;
-  if (count > 0)
-    {
-      size = swap->external_pdr_size;
-
-      epdr = (struct pdr_ext *) bfd_malloc (size * count);
-      if (epdr == NULL)
-	goto error_return;
-
-      if (! _bfd_ecoff_get_accumulated_pdr (handle, (PTR) epdr))
-	goto error_return;
-
-      size = sizeof (RPDR);
-      rp = rpdr = (RPDR *) bfd_malloc (size * count);
-      if (rpdr == NULL)
-	goto error_return;
-
-      sv = (char **) bfd_malloc (sizeof (char *) * count);
-      if (sv == NULL)
-	goto error_return;
-
-      count = hdr->isymMax;
-      size = swap->external_sym_size;
-      esym = (struct sym_ext *) bfd_malloc (size * count);
-      if (esym == NULL)
-	goto error_return;
-
-      if (! _bfd_ecoff_get_accumulated_sym (handle, (PTR) esym))
-	goto error_return;
-
-      count = hdr->issMax;
-      ss = (char *) bfd_malloc (count);
-      if (ss == NULL)
-	goto error_return;
-      if (! _bfd_ecoff_get_accumulated_ss (handle, (PTR) ss))
-	goto error_return;
-
-      count = hdr->ipdMax;
-      for (i = 0; i < count; i++, rp++)
-	{
-	  (*swap->swap_pdr_in) (abfd, (PTR) (epdr + i), &pdr);
-	  (*swap->swap_sym_in) (abfd, (PTR) &esym[pdr.isym], &sym);
-	  rp->adr = sym.value;
-	  rp->regmask = pdr.regmask;
-	  rp->regoffset = pdr.regoffset;
-	  rp->fregmask = pdr.fregmask;
-	  rp->fregoffset = pdr.fregoffset;
-	  rp->frameoffset = pdr.frameoffset;
-	  rp->framereg = pdr.framereg;
-	  rp->pcreg = pdr.pcreg;
-	  rp->irpss = sindex;
-	  sv[i] = ss + sym.iss;
-	  sindex += strlen (sv[i]) + 1;
-	}
-    }
-
-  size = sizeof (struct rpdr_ext) * (count + 2) + sindex;
-  size = BFD_ALIGN (size, 16);
-  rtproc = (PTR) bfd_alloc (abfd, size);
-  if (rtproc == NULL)
-    {
-      mips_elf_hash_table (info)->procedure_count = 0;
-      goto error_return;
-    }
-
-  mips_elf_hash_table (info)->procedure_count = count + 2;
-
-  erp = (struct rpdr_ext *) rtproc;
-  memset (erp, 0, sizeof (struct rpdr_ext));
-  erp++;
-  str = (char *) rtproc + sizeof (struct rpdr_ext) * (count + 2);
-  strcpy (str, no_name_func);
-  str += strlen (no_name_func) + 1;
-  for (i = 0; i < count; i++)
-    {
-      ecoff_swap_rpdr_out (abfd, rpdr + i, erp + i);
-      strcpy (str, sv[i]);
-      str += strlen (sv[i]) + 1;
-    }
-  ecoff_put_off (abfd, (bfd_vma) -1, (bfd_byte *) (erp + count)->p_adr);
-
-  /* Set the size and contents of .rtproc section.  */
-  s->_raw_size = size;
-  s->contents = (bfd_byte *) rtproc;
-
-  /* Skip this section later on (I don't think this currently
-     matters, but someday it might).  */
-  s->link_order_head = (struct bfd_link_order *) NULL;
-
-  if (epdr != NULL)
-    free (epdr);
-  if (rpdr != NULL)
-    free (rpdr);
-  if (esym != NULL)
-    free (esym);
-  if (ss != NULL)
-    free (ss);
-  if (sv != NULL)
-    free (sv);
-
-  return true;
-
- error_return:
-  if (epdr != NULL)
-    free (epdr);
-  if (rpdr != NULL)
-    free (rpdr);
-  if (esym != NULL)
-    free (esym);
-  if (ss != NULL)
-    free (ss);
-  if (sv != NULL)
-    free (sv);
-  return false;
-}
-
-/* A comparison routine used to sort .gptab entries.  */
-
-static int
-gptab_compare (p1, p2)
-     const PTR p1;
-     const PTR p2;
-{
-  const Elf32_gptab *a1 = (const Elf32_gptab *) p1;
-  const Elf32_gptab *a2 = (const Elf32_gptab *) p2;
-
-  return a1->gt_entry.gt_g_value - a2->gt_entry.gt_g_value;
-}
-
-/* We need to use a special link routine to handle the .reginfo and
-   the .mdebug sections.  We need to merge all instances of these
-   sections together, not write them all out sequentially.  */
-
-static boolean
-mips_elf_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  asection **secpp;
-  asection *o;
-  struct bfd_link_order *p;
-  asection *reginfo_sec, *mdebug_sec, *gptab_data_sec, *gptab_bss_sec;
-  asection *rtproc_sec;
-  Elf32_RegInfo reginfo;
-  struct ecoff_debug_info debug;
-  const struct ecoff_debug_swap *swap
-    = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-  HDRR *symhdr = &debug.symbolic_header;
-  PTR mdebug_handle = NULL;
-
-  /* Drop the .options section, since it has special semantics which I
-     haven't bothered to figure out.  */
-  for (secpp = &abfd->sections; *secpp != NULL; secpp = &(*secpp)->next)
-    {
-      if (strcmp ((*secpp)->name, ".options") == 0)
-	{
-	  for (p = (*secpp)->link_order_head; p != NULL; p = p->next)
-	    if (p->type == bfd_indirect_link_order)
-	      p->u.indirect.section->flags &=~ SEC_HAS_CONTENTS;
-	  (*secpp)->link_order_head = NULL;
-	  *secpp = (*secpp)->next;
-	  --abfd->section_count;
-	  break;
-	}
-    }
-
-  /* Get a value for the GP register.  */
-  if (elf_gp (abfd) == 0)
-    {
-      struct bfd_link_hash_entry *h;
-
-      h = bfd_link_hash_lookup (info->hash, "_gp", false, false, true);
-      if (h != (struct bfd_link_hash_entry *) NULL
-	  && h->type == bfd_link_hash_defined)
-	elf_gp (abfd) = (h->u.def.value
-			 + h->u.def.section->output_section->vma
-			 + h->u.def.section->output_offset);
-      else if (info->relocateable)
-	{
-	  bfd_vma lo;
-
-	  /* Make up a value.  */
-	  lo = (bfd_vma) -1;
-	  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-	    {
-	      if (o->vma < lo
-		  && (strcmp (o->name, ".sbss") == 0
-		      || strcmp (o->name, ".sdata") == 0
-		      || strcmp (o->name, ".lit4") == 0
-		      || strcmp (o->name, ".lit8") == 0))
-		lo = o->vma;
-	    }
-	  elf_gp (abfd) = lo + ELF_MIPS_GP_OFFSET (abfd);
-	}
-      else
-	{
-	  /* If the relocate_section function needs to do a reloc
-	     involving the GP value, it should make a reloc_dangerous
-	     callback to warn that GP is not defined.  */
-	}
-    }
-
-  /* Go through the sections and collect the .reginfo and .mdebug
-     information.  */
-  reginfo_sec = NULL;
-  mdebug_sec = NULL;
-  gptab_data_sec = NULL;
-  gptab_bss_sec = NULL;
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    {
-      if (strcmp (o->name, ".reginfo") == 0)
-	{
-	  memset (&reginfo, 0, sizeof reginfo);
-
-	  /* We have found the .reginfo section in the output file.
-	     Look through all the link_orders comprising it and merge
-	     the information together.  */
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      asection *input_section;
-	      bfd *input_bfd;
-	      Elf32_External_RegInfo ext;
-	      Elf32_RegInfo sub;
-
-	      if (p->type != bfd_indirect_link_order)
-		{
-		  if (p->type == bfd_fill_link_order)
-		    continue;
-		  abort ();
-		}
-
-	      input_section = p->u.indirect.section;
-	      input_bfd = input_section->owner;
-
-	      /* The linker emulation code has probably clobbered the
-                 size to be zero bytes.  */
-	      if (input_section->_raw_size == 0)
-		input_section->_raw_size = sizeof (Elf32_External_RegInfo);
-
-	      if (! bfd_get_section_contents (input_bfd, input_section,
-					      (PTR) &ext,
-					      (file_ptr) 0,
-					      sizeof ext))
-		return false;
-
-	      bfd_mips_elf32_swap_reginfo_in (input_bfd, &ext, &sub);
-
-	      reginfo.ri_gprmask |= sub.ri_gprmask;
-	      reginfo.ri_cprmask[0] |= sub.ri_cprmask[0];
-	      reginfo.ri_cprmask[1] |= sub.ri_cprmask[1];
-	      reginfo.ri_cprmask[2] |= sub.ri_cprmask[2];
-	      reginfo.ri_cprmask[3] |= sub.ri_cprmask[3];
-
-	      /* ri_gp_value is set by the function
-		 mips_elf32_section_processing when the section is
-		 finally written out.  */
-
-	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		 elf_link_input_bfd ignores this section.  */
-	      input_section->flags &=~ SEC_HAS_CONTENTS;
-	    }
-
-	  /* Size has been set in mips_elf_always_size_sections  */
-	  BFD_ASSERT(o->_raw_size == sizeof (Elf32_External_RegInfo));
-
-	  /* Skip this section later on (I don't think this currently
-	     matters, but someday it might).  */
-	  o->link_order_head = (struct bfd_link_order *) NULL;
-
-	  reginfo_sec = o;
-	}
-
-      if (strcmp (o->name, ".mdebug") == 0)
-	{
-	  struct extsym_info einfo;
-
-	  /* We have found the .mdebug section in the output file.
-	     Look through all the link_orders comprising it and merge
-	     the information together.  */
-	  symhdr->magic = swap->sym_magic;
-	  /* FIXME: What should the version stamp be?  */
-	  symhdr->vstamp = 0;
-	  symhdr->ilineMax = 0;
-	  symhdr->cbLine = 0;
-	  symhdr->idnMax = 0;
-	  symhdr->ipdMax = 0;
-	  symhdr->isymMax = 0;
-	  symhdr->ioptMax = 0;
-	  symhdr->iauxMax = 0;
-	  symhdr->issMax = 0;
-	  symhdr->issExtMax = 0;
-	  symhdr->ifdMax = 0;
-	  symhdr->crfd = 0;
-	  symhdr->iextMax = 0;
-
-	  /* We accumulate the debugging information itself in the
-	     debug_info structure.  */
-	  debug.line = NULL;
-	  debug.external_dnr = NULL;
-	  debug.external_pdr = NULL;
-	  debug.external_sym = NULL;
-	  debug.external_opt = NULL;
-	  debug.external_aux = NULL;
-	  debug.ss = NULL;
-	  debug.ssext = debug.ssext_end = NULL;
-	  debug.external_fdr = NULL;
-	  debug.external_rfd = NULL;
-	  debug.external_ext = debug.external_ext_end = NULL;
-
-	  mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
-	  if (mdebug_handle == (PTR) NULL)
-	    return false;
-
-	  if (SGI_COMPAT (abfd))
-	    {
-	      asection *s;
-	      EXTR esym;
-	      bfd_vma last;
-	      unsigned int i;
-	      static const char * const name[] =
-		{ ".text", ".init", ".fini", ".data",
-		    ".rodata", ".sdata", ".sbss", ".bss" };
-	      static const int sc[] = { scText, scInit, scFini, scData,
-					  scRData, scSData, scSBss, scBss };
-
-	      esym.jmptbl = 0;
-	      esym.cobol_main = 0;
-	      esym.weakext = 0;
-	      esym.reserved = 0;
-	      esym.ifd = ifdNil;
-	      esym.asym.iss = issNil;
-	      esym.asym.st = stLocal;
-	      esym.asym.reserved = 0;
-	      esym.asym.index = indexNil;
-	      last = 0;
-	      for (i = 0; i < 8; i++)
-		{
-		  esym.asym.sc = sc[i];
-		  s = bfd_get_section_by_name (abfd, name[i]);
-		  if (s != NULL)
-		    {
-		      esym.asym.value = s->vma;
-		      last = s->vma + s->_raw_size;
-		    }
-		  else
-		    esym.asym.value = last;
-
-		  if (! bfd_ecoff_debug_one_external (abfd, &debug, swap,
-						      name[i], &esym))
-		    return false;
-		}
-	    }
-
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      asection *input_section;
-	      bfd *input_bfd;
-	      const struct ecoff_debug_swap *input_swap;
-	      struct ecoff_debug_info input_debug;
-	      char *eraw_src;
-	      char *eraw_end;
-
-	      if (p->type != bfd_indirect_link_order)
-		{
-		  if (p->type == bfd_fill_link_order)
-		    continue;
-		  abort ();
-		}
-
-	      input_section = p->u.indirect.section;
-	      input_bfd = input_section->owner;
-
-	      if (bfd_get_flavour (input_bfd) != bfd_target_elf_flavour
-		  || (get_elf_backend_data (input_bfd)
-		      ->elf_backend_ecoff_debug_swap) == NULL)
-		{
-		  /* I don't know what a non MIPS ELF bfd would be
-		     doing with a .mdebug section, but I don't really
-		     want to deal with it.  */
-		  continue;
-		}
-
-	      input_swap = (get_elf_backend_data (input_bfd)
-			    ->elf_backend_ecoff_debug_swap);
-
-	      BFD_ASSERT (p->size == input_section->_raw_size);
-
-	      /* The ECOFF linking code expects that we have already
-		 read in the debugging information and set up an
-		 ecoff_debug_info structure, so we do that now.  */
-	      if (! _bfd_mips_elf_read_ecoff_info (input_bfd, input_section,
-						   &input_debug))
-		return false;
-
-	      if (! (bfd_ecoff_debug_accumulate
-		     (mdebug_handle, abfd, &debug, swap, input_bfd,
-		      &input_debug, input_swap, info)))
-		return false;
-
-	      /* Loop through the external symbols.  For each one with
-		 interesting information, try to find the symbol in
-		 the linker global hash table and save the information
-		 for the output external symbols.  */
-	      eraw_src = input_debug.external_ext;
-	      eraw_end = (eraw_src
-			  + (input_debug.symbolic_header.iextMax
-			     * input_swap->external_ext_size));
-	      for (;
-		   eraw_src < eraw_end;
-		   eraw_src += input_swap->external_ext_size)
-		{
-		  EXTR ext;
-		  const char *name;
-		  struct mips_elf_link_hash_entry *h;
-
-		  (*input_swap->swap_ext_in) (input_bfd, (PTR) eraw_src, &ext);
-		  if (ext.asym.sc == scNil
-		      || ext.asym.sc == scUndefined
-		      || ext.asym.sc == scSUndefined)
-		    continue;
-
-		  name = input_debug.ssext + ext.asym.iss;
-		  h = mips_elf_link_hash_lookup (mips_elf_hash_table (info),
-						 name, false, false, true);
-		  if (h == NULL || h->esym.ifd != -2)
-		    continue;
-
-		  if (ext.ifd != -1)
-		    {
-		      BFD_ASSERT (ext.ifd
-				  < input_debug.symbolic_header.ifdMax);
-		      ext.ifd = input_debug.ifdmap[ext.ifd];
-		    }
-
-		  h->esym = ext;
-		}
-
-	      /* Free up the information we just read.  */
-	      free (input_debug.line);
-	      free (input_debug.external_dnr);
-	      free (input_debug.external_pdr);
-	      free (input_debug.external_sym);
-	      free (input_debug.external_opt);
-	      free (input_debug.external_aux);
-	      free (input_debug.ss);
-	      free (input_debug.ssext);
-	      free (input_debug.external_fdr);
-	      free (input_debug.external_rfd);
-	      free (input_debug.external_ext);
-
-	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		 elf_link_input_bfd ignores this section.  */
-	      input_section->flags &=~ SEC_HAS_CONTENTS;
-	    }
-
-	  if (SGI_COMPAT (abfd) && info->shared)
-	    {
-	      /* Create .rtproc section.  */
-	      rtproc_sec = bfd_get_section_by_name (abfd, ".rtproc");
-	      if (rtproc_sec == NULL)
-		{
-		  flagword flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY
-				    | SEC_LINKER_CREATED | SEC_READONLY);
-
-		  rtproc_sec = bfd_make_section (abfd, ".rtproc");
-		  if (rtproc_sec == NULL
-		      || ! bfd_set_section_flags (abfd, rtproc_sec, flags)
-		      || ! bfd_set_section_alignment (abfd, rtproc_sec, 4))
-		    return false;
-		}
-
-	      if (! mips_elf_create_procedure_table (mdebug_handle, abfd,
-						     info, rtproc_sec, &debug))
-		return false;
-	    }
-
-	  /* Build the external symbol information.  */
-	  einfo.abfd = abfd;
-	  einfo.info = info;
-	  einfo.debug = &debug;
-	  einfo.swap = swap;
-	  einfo.failed = false;
-	  mips_elf_link_hash_traverse (mips_elf_hash_table (info),
-				       mips_elf_output_extsym,
-				       (PTR) &einfo);
-	  if (einfo.failed)
-	    return false;
-
-	  /* Set the size of the .mdebug section.  */
-	  o->_raw_size = bfd_ecoff_debug_size (abfd, &debug, swap);
-
-	  /* Skip this section later on (I don't think this currently
-	     matters, but someday it might).  */
-	  o->link_order_head = (struct bfd_link_order *) NULL;
-
-	  mdebug_sec = o;
-	}
-
-      if (strncmp (o->name, ".gptab.", sizeof ".gptab." - 1) == 0)
-	{
-	  const char *subname;
-	  unsigned int c;
-	  Elf32_gptab *tab;
-	  Elf32_External_gptab *ext_tab;
-	  unsigned int i;
-
-	  /* The .gptab.sdata and .gptab.sbss sections hold
-	     information describing how the small data area would
-	     change depending upon the -G switch.  These sections
-	     not used in executables files.  */
-	  if (! info->relocateable)
-	    {
-	      asection **secpp;
-
-	      for (p = o->link_order_head;
-		   p != (struct bfd_link_order *) NULL;
-		   p = p->next)
-		{
-		  asection *input_section;
-
-		  if (p->type != bfd_indirect_link_order)
-		    {
-		      if (p->type == bfd_fill_link_order)
-			continue;
-		      abort ();
-		    }
-
-		  input_section = p->u.indirect.section;
-
-		  /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		     elf_link_input_bfd ignores this section.  */
-		  input_section->flags &=~ SEC_HAS_CONTENTS;
-		}
-
-	      /* Skip this section later on (I don't think this
-		 currently matters, but someday it might).  */
-	      o->link_order_head = (struct bfd_link_order *) NULL;
-
-	      /* Really remove the section.  */
-	      for (secpp = &abfd->sections;
-		   *secpp != o;
-		   secpp = &(*secpp)->next)
-		;
-	      *secpp = (*secpp)->next;
-	      --abfd->section_count;
-
-	      continue;
-	    }
-
-	  /* There is one gptab for initialized data, and one for
-	     uninitialized data.  */
-	  if (strcmp (o->name, ".gptab.sdata") == 0)
-	    gptab_data_sec = o;
-	  else if (strcmp (o->name, ".gptab.sbss") == 0)
-	    gptab_bss_sec = o;
-	  else
-	    {
-	      (*_bfd_error_handler)
-		(_("%s: illegal section name `%s'"),
-		 bfd_get_filename (abfd), o->name);
-	      bfd_set_error (bfd_error_nonrepresentable_section);
-	      return false;
-	    }
-
-	  /* The linker script always combines .gptab.data and
-	     .gptab.sdata into .gptab.sdata, and likewise for
-	     .gptab.bss and .gptab.sbss.  It is possible that there is
-	     no .sdata or .sbss section in the output file, in which
-	     case we must change the name of the output section.  */
-	  subname = o->name + sizeof ".gptab" - 1;
-	  if (bfd_get_section_by_name (abfd, subname) == NULL)
-	    {
-	      if (o == gptab_data_sec)
-		o->name = ".gptab.data";
-	      else
-		o->name = ".gptab.bss";
-	      subname = o->name + sizeof ".gptab" - 1;
-	      BFD_ASSERT (bfd_get_section_by_name (abfd, subname) != NULL);
-	    }
-
-	  /* Set up the first entry.  */
-	  c = 1;
-	  tab = (Elf32_gptab *) bfd_malloc (c * sizeof (Elf32_gptab));
-	  if (tab == NULL)
-	    return false;
-	  tab[0].gt_header.gt_current_g_value = elf_gp_size (abfd);
-	  tab[0].gt_header.gt_unused = 0;
-
-	  /* Combine the input sections.  */
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      asection *input_section;
-	      bfd *input_bfd;
-	      bfd_size_type size;
-	      unsigned long last;
-	      bfd_size_type gpentry;
-
-	      if (p->type != bfd_indirect_link_order)
-		{
-		  if (p->type == bfd_fill_link_order)
-		    continue;
-		  abort ();
-		}
-
-	      input_section = p->u.indirect.section;
-	      input_bfd = input_section->owner;
-
-	      /* Combine the gptab entries for this input section one
-		 by one.  We know that the input gptab entries are
-		 sorted by ascending -G value.  */
-	      size = bfd_section_size (input_bfd, input_section);
-	      last = 0;
-	      for (gpentry = sizeof (Elf32_External_gptab);
-		   gpentry < size;
-		   gpentry += sizeof (Elf32_External_gptab))
-		{
-		  Elf32_External_gptab ext_gptab;
-		  Elf32_gptab int_gptab;
-		  unsigned long val;
-		  unsigned long add;
-		  boolean exact;
-		  unsigned int look;
-
-		  if (! (bfd_get_section_contents
-			 (input_bfd, input_section, (PTR) &ext_gptab,
-			  gpentry, sizeof (Elf32_External_gptab))))
-		    {
-		      free (tab);
-		      return false;
-		    }
-
-		  bfd_mips_elf32_swap_gptab_in (input_bfd, &ext_gptab,
-						&int_gptab);
-		  val = int_gptab.gt_entry.gt_g_value;
-		  add = int_gptab.gt_entry.gt_bytes - last;
-
-		  exact = false;
-		  for (look = 1; look < c; look++)
-		    {
-		      if (tab[look].gt_entry.gt_g_value >= val)
-			tab[look].gt_entry.gt_bytes += add;
-
-		      if (tab[look].gt_entry.gt_g_value == val)
-			exact = true;
-		    }
-
-		  if (! exact)
-		    {
-		      Elf32_gptab *new_tab;
-		      unsigned int max;
-
-		      /* We need a new table entry.  */
-		      new_tab = ((Elf32_gptab *)
-				 bfd_realloc ((PTR) tab,
-					      (c + 1) * sizeof (Elf32_gptab)));
-		      if (new_tab == NULL)
-			{
-			  free (tab);
-			  return false;
-			}
-		      tab = new_tab;
-		      tab[c].gt_entry.gt_g_value = val;
-		      tab[c].gt_entry.gt_bytes = add;
-
-		      /* Merge in the size for the next smallest -G
-			 value, since that will be implied by this new
-			 value.  */
-		      max = 0;
-		      for (look = 1; look < c; look++)
-			{
-			  if (tab[look].gt_entry.gt_g_value < val
-			      && (max == 0
-				  || (tab[look].gt_entry.gt_g_value
-				      > tab[max].gt_entry.gt_g_value)))
-			    max = look;
-			}
-		      if (max != 0)
-			tab[c].gt_entry.gt_bytes +=
-			  tab[max].gt_entry.gt_bytes;
-
-		      ++c;
-		    }
-
-		  last = int_gptab.gt_entry.gt_bytes;
-		}
-
-	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		 elf_link_input_bfd ignores this section.  */
-	      input_section->flags &=~ SEC_HAS_CONTENTS;
-	    }
-
-	  /* The table must be sorted by -G value.  */
-	  if (c > 2)
-	    qsort (tab + 1, c - 1, sizeof (tab[0]), gptab_compare);
-
-	  /* Swap out the table.  */
-	  ext_tab = ((Elf32_External_gptab *)
-		     bfd_alloc (abfd, c * sizeof (Elf32_External_gptab)));
-	  if (ext_tab == NULL)
-	    {
-	      free (tab);
-	      return false;
-	    }
-
-	  for (i = 0; i < c; i++)
-	    bfd_mips_elf32_swap_gptab_out (abfd, tab + i, ext_tab + i);
-	  free (tab);
-
-	  o->_raw_size = c * sizeof (Elf32_External_gptab);
-	  o->contents = (bfd_byte *) ext_tab;
-
-	  /* Skip this section later on (I don't think this currently
-	     matters, but someday it might).  */
-	  o->link_order_head = (struct bfd_link_order *) NULL;
-	}
-    }
-
-  /* Invoke the regular ELF backend linker to do all the work.  */
-  if (! bfd_elf32_bfd_final_link (abfd, info))
-    return false;
-
-  /* Now write out the computed sections.  */
-
-  if (reginfo_sec != (asection *) NULL)
-    {
-      Elf32_External_RegInfo ext;
-
-      bfd_mips_elf32_swap_reginfo_out (abfd, &reginfo, &ext);
-      if (! bfd_set_section_contents (abfd, reginfo_sec, (PTR) &ext,
-				      (file_ptr) 0, sizeof ext))
-	return false;
-    }
-
-  if (mdebug_sec != (asection *) NULL)
-    {
-      BFD_ASSERT (abfd->output_has_begun);
-      if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug,
-					       swap, info,
-					       mdebug_sec->filepos))
-	return false;
-
-      bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
-    }
-
-  if (gptab_data_sec != (asection *) NULL)
-    {
-      if (! bfd_set_section_contents (abfd, gptab_data_sec,
-				      gptab_data_sec->contents,
-				      (file_ptr) 0,
-				      gptab_data_sec->_raw_size))
-	return false;
-    }
-
-  if (gptab_bss_sec != (asection *) NULL)
-    {
-      if (! bfd_set_section_contents (abfd, gptab_bss_sec,
-				      gptab_bss_sec->contents,
-				      (file_ptr) 0,
-				      gptab_bss_sec->_raw_size))
-	return false;
-    }
-
-  if (SGI_COMPAT (abfd))
-    {
-      rtproc_sec = bfd_get_section_by_name (abfd, ".rtproc");
-      if (rtproc_sec != NULL)
-	{
-	  if (! bfd_set_section_contents (abfd, rtproc_sec,
-					  rtproc_sec->contents,
-					  (file_ptr) 0,
-					  rtproc_sec->_raw_size))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* Handle a MIPS ELF HI16 reloc.  */
-
-static void
-mips_elf_relocate_hi16 (input_bfd, relhi, rello, contents, addend)
-     bfd *input_bfd;
-     Elf_Internal_Rela *relhi;
-     Elf_Internal_Rela *rello;
-     bfd_byte *contents;
-     bfd_vma addend;
-{
-  bfd_vma insn;
-  bfd_vma addlo;
-
-  insn = bfd_get_32 (input_bfd, contents + relhi->r_offset);
-
-  addlo = bfd_get_32 (input_bfd, contents + rello->r_offset);
-  addlo &= 0xffff;
-
-  addend += ((insn & 0xffff) << 16) + addlo;
-
-  if ((addlo & 0x8000) != 0)
-    addend -= 0x10000;
-  if ((addend & 0x8000) != 0)
-    addend += 0x10000;
-
-  bfd_put_32 (input_bfd,
-	      (insn & 0xffff0000) | ((addend >> 16) & 0xffff),
-	      contents + relhi->r_offset);
-}
-
-/* Handle a MIPS ELF local GOT16 reloc.  */
-
-static boolean
-mips_elf_relocate_got_local (output_bfd, input_bfd, sgot, relhi, rello,
-			     contents, addend)
-     bfd *output_bfd;
-     bfd *input_bfd;
-     asection *sgot;
-     Elf_Internal_Rela *relhi;
-     Elf_Internal_Rela *rello;
-     bfd_byte *contents;
-     bfd_vma addend;
-{
-  unsigned int assigned_gotno;
-  unsigned int i;
-  bfd_vma insn;
-  bfd_vma addlo;
-  bfd_vma address;
-  bfd_vma hipage;
-  bfd_byte *got_contents;
-  struct mips_got_info *g;
-
-  insn = bfd_get_32 (input_bfd, contents + relhi->r_offset);
-
-  addlo = bfd_get_32 (input_bfd, contents + rello->r_offset);
-  addlo &= 0xffff;
-
-  addend += ((insn & 0xffff) << 16) + addlo;
-
-  if ((addlo & 0x8000) != 0)
-    addend -= 0x10000;
-  if ((addend & 0x8000) != 0)
-    addend += 0x10000;
-
-  /* Get a got entry representing requested hipage.  */
-  BFD_ASSERT (elf_section_data (sgot) != NULL);
-  g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-  BFD_ASSERT (g != NULL);
-
-  assigned_gotno = g->assigned_gotno;
-  got_contents = sgot->contents;
-  hipage = addend & 0xffff0000;
-
-  for (i = MIPS_RESERVED_GOTNO; i < assigned_gotno; i++)
-    {
-      address = bfd_get_32 (input_bfd, got_contents + i * 4);
-      if (hipage == (address & 0xffff0000))
-	break;
-    }
-
-  if (i == assigned_gotno)
-    {
-      if (assigned_gotno >= g->local_gotno)
-	{
-	  (*_bfd_error_handler)
-	    (_("more got entries are needed for hipage relocations"));
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      bfd_put_32 (input_bfd, hipage, got_contents + assigned_gotno * 4);
-      ++g->assigned_gotno;
-    }
-
-  i = - ELF_MIPS_GP_OFFSET (output_bfd) + i * 4;
-  bfd_put_32 (input_bfd, (insn & 0xffff0000) | (i & 0xffff),
-	      contents + relhi->r_offset);
-
-  return true;
-}
-
-/* Handle MIPS ELF CALL16 reloc and global GOT16 reloc.  */
-
-static void
-mips_elf_relocate_global_got (input_bfd, rel, contents, offset)
-     bfd *input_bfd;
-     Elf_Internal_Rela *rel;
-     bfd_byte *contents;
-     bfd_vma offset;
-{
-  bfd_vma insn;
-
-  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
-  bfd_put_32 (input_bfd,
-	      (insn & 0xffff0000) | (offset & 0xffff),
-	      contents + rel->r_offset);
-}
-
-/* Relocate a MIPS ELF section.  */
-
-static boolean
-mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  size_t locsymcount;
-  size_t extsymoff;
-  asection *sgot, *sreloc, *scpt;
-  bfd *dynobj;
-  bfd_vma gp;
-  Elf_Internal_Rela *rel;
-  Elf_Internal_Rela *relend;
-  struct mips_got_info *g;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-  sgot = NULL;
-  sreloc = NULL;
-  if (dynobj == NULL || ! SGI_COMPAT (output_bfd))
-    scpt = NULL;
-  else
-    scpt = bfd_get_section_by_name (dynobj, ".compact_rel");
-  g = NULL;
-
-  if (elf_bad_symtab (input_bfd))
-    {
-      locsymcount = symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
-      extsymoff = 0;
-    }
-  else
-    {
-      locsymcount = symtab_hdr->sh_info;
-      extsymoff = symtab_hdr->sh_info;
-    }
-
-  gp = _bfd_get_gp_value (output_bfd);
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      bfd_vma addend;
-      struct elf_link_hash_entry *h;
-      asection *sec;
-      Elf_Internal_Sym *sym;
-      struct mips_elf_link_hash_entry *mh;
-      int other;
-      bfd_reloc_status_type r;
-
-      r_type = ELF32_R_TYPE (rel->r_info);
-      if (r_type == R_MIPS_GNU_VTINHERIT
-	  || r_type == R_MIPS_GNU_VTENTRY)
-	continue;
-      if ((r_type < 0 || r_type >= (int) R_MIPS_max)
-	  && r_type != R_MIPS16_26
-	  && r_type != R_MIPS16_GPREL)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      if (r_type == R_MIPS16_26)
-	howto = &elf_mips16_jump_howto;
-      else if (r_type == R_MIPS16_GPREL)
-	howto = &elf_mips16_gprel_howto;
-      else
-	howto = elf_mips_howto_table + r_type;
-
-      if (dynobj != NULL
-	  && (r_type == R_MIPS_CALL16
-	      || r_type == R_MIPS_GOT16
-	      || r_type == R_MIPS_CALL_HI16
-	      || r_type == R_MIPS_CALL_LO16
-	      || r_type == R_MIPS_GOT_HI16
-	      || r_type == R_MIPS_GOT_LO16))
-	{
-	  /* We need the .got section.  */
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	      BFD_ASSERT (elf_section_data (sgot) != NULL);
-	      g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-	      BFD_ASSERT (g != NULL);
-	    }
-	}
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      /* Mix in the change in GP address for a GP relative reloc.  */
-      if (r_type != R_MIPS_GPREL16
-	  && r_type != R_MIPS_LITERAL
-	  && r_type != R_MIPS_GPREL32
-	  && r_type != R_MIPS16_GPREL)
-	addend = 0;
-      else
-	{
-	  if (gp == 0)
-	    {
-	      if (! ((*info->callbacks->reloc_dangerous)
-		     (info,
-		      _("GP relative relocation when GP not defined"),
-		      input_bfd, input_section,
-		      rel->r_offset)))
-		return false;
-	      /* Only give the error once per link.  */
-	      gp = 4;
-	      _bfd_set_gp_value (output_bfd, gp);
-	    }
-
-	  if (r_symndx < extsymoff
-	      || (elf_bad_symtab (input_bfd)
-		  && local_sections[r_symndx] != NULL))
-	    {
-	      /* This is a relocation against a section.  The current
-		 addend in the instruction is the difference between
-		 INPUT_SECTION->vma and the GP value of INPUT_BFD.  We
-		 must change this to be the difference between the
-		 final definition (which will end up in RELOCATION)
-		 and the GP value of OUTPUT_BFD (which is in GP).  */
-	      addend = elf_gp (input_bfd) - gp;
-	    }
-	  else if (! info->relocateable)
-	    {
-	      /* We are doing a final link.  The current addend in the
-		 instruction is simply the desired offset into the
-		 symbol (normally zero).  We want the instruction to
-		 hold the difference between the final definition of
-		 the symbol (which will end up in RELOCATION) and the
-		 GP value of OUTPUT_BFD (which is in GP).  */
-	      addend = - gp;
-	    }
-	  else
-	    {
-	      /* We are generating relocateable output, and we aren't
-		 going to define this symbol, so we just leave the
-		 instruction alone.  */
-	      addend = 0;
-	    }
-	}
-
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx >= locsymcount
-	      || (elf_bad_symtab (input_bfd)
-		  && local_sections[r_symndx] == NULL))
-	    r = bfd_reloc_ok;
-	  else
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
-		r = bfd_reloc_ok;
-	      else
-		{
-		  sec = local_sections[r_symndx];
-
-		  /* It would be logical to add sym->st_value here,
-		     but Irix 5 sometimes generates a garbage symbol
-		     value.  */
-		  addend += sec->output_offset;
-
-		  /* If this is HI16 or GOT16 with an associated LO16,
-		     adjust the addend accordingly.  Otherwise, just
-		     relocate.  */
-		  if (r_type == R_MIPS_64 && bfd_big_endian (input_bfd))
-		    r = _bfd_relocate_contents (howto, input_bfd,
-						addend,
-						contents + rel->r_offset + 4);
-		  else if (r_type != R_MIPS_HI16 && r_type != R_MIPS_GOT16)
-		    r = _bfd_relocate_contents (howto, input_bfd,
-						addend,
-						contents + rel->r_offset);
-		  else
-		    {
-		      Elf_Internal_Rela *lorel;
-
-		      /* As a GNU extension, permit an arbitrary
-			 number of R_MIPS_HI16 relocs before the
-			 R_MIPS_LO16 reloc.  This permits gcc to emit
-			 the HI and LO relocs itself.  */
-		      if (r_type == R_MIPS_GOT16)
-			lorel = rel + 1;
-		      else
-			{
-			  for (lorel = rel + 1;
-			       (lorel < relend
-				&& (ELF32_R_TYPE (lorel->r_info)
-				    == R_MIPS_HI16));
-			       lorel++)
-			    ;
-			}
-		      if (lorel < relend
-			  && ELF32_R_TYPE (lorel->r_info) == R_MIPS_LO16)
-			{
-			  mips_elf_relocate_hi16 (input_bfd, rel, lorel,
-						  contents, addend);
-			  r = bfd_reloc_ok;
-			}
-		      else
-			r = _bfd_relocate_contents (howto, input_bfd,
-						    addend,
-						    contents + rel->r_offset);
-		    }
-		}
-	    }
-	}
-      else
-	{
-	  bfd_vma relocation;
-	  boolean local;
-	  boolean undefined_error;
-
-	  /* This is a final link.  */
-	  undefined_error = false;
-	  sym = NULL;
-	  if (r_symndx < extsymoff
-	      || (elf_bad_symtab (input_bfd)
-		  && local_sections[r_symndx] != NULL))
-	    {
-	      local = true;
-	      sym = local_syms + r_symndx;
-	      sec = local_sections[r_symndx];
-	      relocation = (sec->output_section->vma
-			    + sec->output_offset);
-
-	      /* It would be logical to always add sym->st_value here,
-		 but Irix 5 sometimes generates a garbage symbol
-		 value.  */
-	      if (ELF_ST_TYPE (sym->st_info) != STT_SECTION)
-		relocation += sym->st_value;
-
-	      /* mips16 text labels should be treated as odd.  */
-	      if (sym->st_other == STO_MIPS16)
-		++relocation;
-	    }
-	  else
-	    {
-	      long indx;
-
-	      local = false;
-	      indx = r_symndx - extsymoff;
-	      h = elf_sym_hashes (input_bfd)[indx];
-	      while (h->root.type == bfd_link_hash_indirect
-		     || h->root.type == bfd_link_hash_warning)
-		h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	      if (strcmp (h->root.root.string, "_gp_disp") == 0)
-		{
-		  if (gp == 0)
-		    {
-		      if (! ((*info->callbacks->reloc_dangerous)
-			     (info,
-			      _("_gp_disp used when GP not defined"),
-			      input_bfd, input_section,
-			      rel->r_offset)))
-			return false;
-		      /* Only give the error once per link.  */
-		      gp = 4;
-		      _bfd_set_gp_value (output_bfd, gp);
-		      relocation = 0;
-		    }
-		  else
-		    {
-		      sec = input_section;
-		      if (sec->output_section != NULL)
-			relocation = (gp
-				      - (rel->r_offset
-					 + sec->output_section->vma
-					 + sec->output_offset));
-		      else
-			relocation = gp - rel->r_offset;
-		      if (r_type == R_MIPS_LO16)
-			relocation += 4;
-		    }
-		}
-	      else if (h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak)
-		{
-		  sec = h->root.u.def.section;
-		  if (sec->output_section == NULL)
-		    relocation = 0;
-		  else
-		    relocation = (h->root.u.def.value
-				  + sec->output_section->vma
-				  + sec->output_offset);
-		}
-	      else if (h->root.type == bfd_link_hash_undefweak)
-		relocation = 0;
-	      else if (info->shared && !info->symbolic && !info->no_undefined)
-		relocation = 0;
-	      else if (strcmp (h->root.root.string, "_DYNAMIC_LINK") == 0)
-		{
-		  /* If this is a dynamic link, we should have created
-                     a _DYNAMIC_LINK symbol in
-                     mips_elf_create_dynamic_sections.  Otherwise, we
-                     should define the symbol with a value of 0.
-                     FIXME: It should probably get into the symbol
-                     table somehow as well.  */
-		  BFD_ASSERT (! info->shared);
-		  BFD_ASSERT (bfd_get_section_by_name (output_bfd,
-						       ".dynamic") == NULL);
-		  relocation = 0;
-		}
-	      else
-		{
-		  if (! ((*info->callbacks->undefined_symbol)
-			 (info, h->root.root.string, input_bfd,
-			  input_section, rel->r_offset)))
-		    return false;
-		  undefined_error = true;
-		  relocation = 0;
-		}
-	    }
-
-	  mh = (struct mips_elf_link_hash_entry *) h;
-	  if (h != NULL)
-	    other = h->other;
-	  else if (sym != NULL)
-	    other = sym->st_other;
-	  else
-	    other = 0;
-
-	  /* If this function has an fn_stub, then it is a mips16
-	     function which needs a stub if it is called by a 32 bit
-	     function.  If this reloc is anything other than a 16 bit
-	     call, redirect the reloc to the stub.  We don't redirect
-	     relocs from other stub functions.  */
-	  if (r_type != R_MIPS16_26
-	      && ((mh != NULL
-		   && mh->fn_stub != NULL)
-		  || (mh == NULL
-		      && elf_tdata (input_bfd)->local_stubs != NULL
-		      && elf_tdata (input_bfd)->local_stubs[r_symndx] != NULL))
-	      && strncmp (bfd_get_section_name (input_bfd, input_section),
-			  FN_STUB, sizeof FN_STUB - 1) != 0
-	      && strncmp (bfd_get_section_name (input_bfd, input_section),
-			  CALL_STUB, sizeof CALL_STUB - 1) != 0
-	      && strncmp (bfd_get_section_name (input_bfd, input_section),
-			  CALL_FP_STUB, sizeof CALL_FP_STUB - 1) != 0)
-	    {
-	      if (mh != NULL)
-		{
-		  BFD_ASSERT (mh->need_fn_stub);
-		  relocation = (mh->fn_stub->output_section->vma
-				+ mh->fn_stub->output_offset);
-		}
-	      else
-		{
-		  asection *fn_stub;
-
-		  fn_stub = elf_tdata (input_bfd)->local_stubs[r_symndx];
-		  relocation = (fn_stub->output_section->vma
-				+ fn_stub->output_offset);
-		}
-
-	      /* RELOCATION now points to 32 bit code.  */
-	      other = 0;
-	    }
-
-	  /* If this function has a call_stub, then it is called by a
-             mips16 function; the call needs to go through a stub if
-             this function is a 32 bit function.  If this reloc is a
-             16 bit call, and the symbol is not a 16 bit function,
-             then redirect the reloc to the stub.  Note that we don't
-             need to worry about calling the function through a
-             function pointer; such calls are handled by routing
-             through a special mips16 routine.  We don't have to check
-             whether this call is from a stub; it can't be, because a
-             stub contains 32 bit code, and hence can not have a 16
-             bit reloc.  */
-	  if (r_type == R_MIPS16_26
-	      && mh != NULL
-	      && (mh->call_stub != NULL || mh->call_fp_stub != NULL)
-	      && other != STO_MIPS16)
-	    {
-	      asection *stub;
-
-	      /* If both call_stub and call_fp_stub are defined, we
-                 can figure out which one to use by seeing which one
-                 appears in the input file.  */
-	      if (mh->call_stub != NULL && mh->call_fp_stub != NULL)
-		{
-		  asection *o;
-
-		  stub = NULL;
-		  for (o = input_bfd->sections; o != NULL; o = o->next)
-		    {
-		      if (strncmp (bfd_get_section_name (input_bfd, o),
-				   CALL_FP_STUB, sizeof CALL_FP_STUB - 1) == 0)
-			{
-			  stub = mh->call_fp_stub;
-			  break;
-			}
-		    }
-		  if (stub == NULL)
-		    stub = mh->call_stub;
-		}
-	      else if (mh->call_stub != NULL)
-		stub = mh->call_stub;
-	      else
-		stub = mh->call_fp_stub;
-
-	      BFD_ASSERT (stub->_raw_size > 0);
-	      relocation = stub->output_section->vma + stub->output_offset;
-	    }
-
-	  if (r_type == R_MIPS_HI16)
-	    {
-	      Elf_Internal_Rela *lorel;
-
-	      /* As a GNU extension, permit an arbitrary number of
-		 R_MIPS_HI16 relocs before the R_MIPS_LO16 reloc.
-		 This permits gcc to emit the HI and LO relocs itself.  */
-	      for (lorel = rel + 1;
-		   (lorel < relend
-		    && ELF32_R_TYPE (lorel->r_info) == R_MIPS_HI16);
-		   lorel++)
-		;
-	      if (lorel < relend
-		  && ELF32_R_TYPE (lorel->r_info) == R_MIPS_LO16)
-		{
-		  mips_elf_relocate_hi16 (input_bfd, rel, lorel,
-					  contents, relocation + addend);
-		  r = bfd_reloc_ok;
-		}
-	      else
-		r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					      contents, rel->r_offset,
-					      relocation, addend);
-	    }
-	  else if (r_type == R_MIPS_GOT16 && local)
-	    {
-	      /* GOT16 must also have an associated LO16 in the local
-		 case.  In this case, the addend is extracted and the
-		 section in which the referenced object is determined.
-		 Then the final address of the object is computed and
-		 the GOT entry for the hipage (an aligned 64kb chunk)
-		 is added to .got section if needed.  The offset field
-		 of the GOT16-relocated instruction is replaced by the
-		 index of this GOT entry for the hipage.  */
-	      if ((rel + 1) < relend
-		  && ELF32_R_TYPE ((rel + 1)->r_info) == R_MIPS_LO16)
-		{
-		  if (! mips_elf_relocate_got_local (output_bfd, input_bfd,
-						     sgot, rel, rel + 1,
-						     contents,
-						     relocation + addend))
-		    return false;
-		  r = bfd_reloc_ok;
-		}
-	      else
-		r = bfd_reloc_outofrange;
-	    }
-	  else if (r_type == R_MIPS_CALL16
-		   || r_type == R_MIPS_GOT16
-		   || r_type == R_MIPS_CALL_LO16
-		   || r_type == R_MIPS_GOT_LO16)
-	    {
-	      bfd_vma offset;
-
-	      /* This symbol must be registered as a global symbol
-		 having the corresponding got entry.  */
-	      BFD_ASSERT (h->got.offset != (bfd_vma) -1);
-
-	      offset = (h->dynindx - g->global_gotsym + g->local_gotno) * 4;
-	      BFD_ASSERT (g->local_gotno <= offset
-			  && offset < sgot->_raw_size);
-	      bfd_put_32 (output_bfd, relocation + addend,
-			  sgot->contents + offset);
-	      offset = (sgot->output_section->vma + sgot->output_offset
-			+ offset - gp);
-	      mips_elf_relocate_global_got (input_bfd, rel, contents,
-					    offset);
-	      r = bfd_reloc_ok;
-	    }
-	  else if (r_type == R_MIPS_CALL_HI16
-		   || r_type == R_MIPS_GOT_HI16)
-	    {
-	      bfd_vma offset;
-
-	      /* This must be a global symbol with a got entry.  The
-                 next reloc must be the corresponding LO16 reloc.  */
-	      BFD_ASSERT (h != NULL && h->got.offset != (bfd_vma) -1);
-	      BFD_ASSERT ((rel + 1) < relend);
-	      BFD_ASSERT ((int) ELF32_R_TYPE ((rel + 1)->r_info)
-			  == (r_type == R_MIPS_CALL_HI16
-			      ? (int) R_MIPS_CALL_LO16
-			      : (int) R_MIPS_GOT_LO16));
-
-	      offset = (h->dynindx - g->global_gotsym + g->local_gotno) * 4;
-	      BFD_ASSERT (g->local_gotno <= offset
-			  && offset < sgot->_raw_size);
-	      bfd_put_32 (output_bfd, relocation + addend,
-			  sgot->contents + offset);
-	      offset = (sgot->output_section->vma + sgot->output_offset
-			+ offset - gp);
-	      mips_elf_relocate_hi16 (input_bfd, rel, rel + 1, contents,
-				      offset);
-	      r = bfd_reloc_ok;
-	    }
-	  else if (r_type == R_MIPS_REL32
-		   || r_type == R_MIPS_32)
-	    {
-	      Elf_Internal_Rel outrel;
-	      Elf32_crinfo cptrel;
-	      bfd_byte *cr;
-
-	      if ((info->shared
-		   || (elf_hash_table (info)->dynamic_sections_created
-		       && h != NULL
-		       && ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)
-			   == 0)))
-		  && (input_section->flags & SEC_ALLOC) != 0)
-		{
-		  boolean skip;
-
-		  /* When generating a shared object, these
-		     relocations are copied into the output file to be
-		     resolved at run time.  */
-		  if (sreloc == NULL)
-		    {
-		      sreloc = bfd_get_section_by_name (dynobj, ".rel.dyn");
-		      BFD_ASSERT (sreloc != NULL);
-		    }
-
-		  skip = false;
-
-		  if (elf_section_data (input_section)->stab_info == NULL)
-		    outrel.r_offset = rel->r_offset;
-		  else
-		    {
-		      bfd_vma off;
-
-		      off = (_bfd_stab_section_offset
-			     (output_bfd, &elf_hash_table (info)->stab_info,
-			      input_section,
-			      &elf_section_data (input_section)->stab_info,
-			      rel->r_offset));
-		      if (off == (bfd_vma) -1)
-			skip = true;
-		      outrel.r_offset = off;
-		    }
-
-		  outrel.r_offset += (input_section->output_section->vma
-				      + input_section->output_offset);
-
-		  addend = bfd_get_32 (input_bfd, contents + rel->r_offset);
-
-		  if (skip)
-		    memset (&outrel, 0, sizeof outrel);
-		  else if (h != NULL
-			   && (! info->symbolic
-			       || (h->elf_link_hash_flags
-				   & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		    {
-		      BFD_ASSERT (h->dynindx != -1);
-		      outrel.r_info = ELF32_R_INFO (h->dynindx, R_MIPS_REL32);
-		      sec = input_section;
-		    }
-		  else
-		    {
-		      long indx;
-
-		      if (h == NULL)
-			sec = local_sections[r_symndx];
-		      else
-			{
-			  BFD_ASSERT (h->root.type == bfd_link_hash_defined
-				      || (h->root.type
-					  == bfd_link_hash_defweak));
-			  sec = h->root.u.def.section;
-			}
-		      if (sec != NULL && bfd_is_abs_section (sec))
-			indx = 0;
-		      else if (sec == NULL || sec->owner == NULL)
-			{
-			  bfd_set_error (bfd_error_bad_value);
-			  return false;
-			}
-		      else
-			{
-			  asection *osec;
-
-			  osec = sec->output_section;
-			  indx = elf_section_data (osec)->dynindx;
-			  if (indx == 0)
-			    abort ();
-			}
-
-		      outrel.r_info = ELF32_R_INFO (indx, R_MIPS_REL32);
-		      addend += relocation;
-		    }
-
-		  if (! skip)
-		    bfd_put_32 (output_bfd, addend, contents + rel->r_offset);
-
-		  bfd_elf32_swap_reloc_out (output_bfd, &outrel,
-					     (((Elf32_External_Rel *)
-					       sreloc->contents)
-					      + sreloc->reloc_count));
-		  ++sreloc->reloc_count;
-
-		  if (! skip && SGI_COMPAT (output_bfd))
-		    {
-		      if (scpt == NULL)
-			continue;
-
-		      /* Make an entry of compact relocation info.  */
-		      mips_elf_set_cr_format (cptrel, CRF_MIPS_LONG);
-		      cptrel.vaddr = (rel->r_offset
-				      + input_section->output_section->vma
-				      + input_section->output_offset);
-		      if (r_type == R_MIPS_REL32)
-			mips_elf_set_cr_type (cptrel, CRT_MIPS_REL32);
-		      else
-			mips_elf_set_cr_type (cptrel, CRT_MIPS_WORD);
-		      mips_elf_set_cr_dist2to (cptrel, 0);
-		      cptrel.konst = addend;
-
-		      cr = (scpt->contents
-			    + sizeof (Elf32_External_compact_rel));
-		      bfd_elf32_swap_crinfo_out (output_bfd, &cptrel,
-						 ((Elf32_External_crinfo *) cr
-						  + scpt->reloc_count));
-		      ++scpt->reloc_count;
-		    }
-
-		  /* This reloc will be computed at runtime, so
-		     there's no need to do anything now.  */
-		  continue;
-		}
-	      else
-		r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					      contents, rel->r_offset,
-					      relocation, addend);
-	    }
-	  else if (r_type == R_MIPS_64)
-	    {
-	      bfd_size_type addr;
-	      unsigned long val;
-
-	      /* Do a 32 bit relocation, and sign extend to 64 bits.  */
-	      addr = rel->r_offset;
-	      if (bfd_big_endian (input_bfd))
-		addr += 4;
-	      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					    contents, addr, relocation,
-					    addend);
-	      val = bfd_get_32 (input_bfd, contents + addr);
-	      if ((val & 0x80000000) != 0)
-		val = 0xffffffff;
-	      else
-		val = 0;
-	      addr = rel->r_offset;
-	      if (bfd_little_endian (input_bfd))
-		addr += 4;
-	      bfd_put_32 (input_bfd, val, contents + addr);
-	    }
-	  else if (r_type == R_MIPS_26 && other == STO_MIPS16)
-	    {
-	      unsigned long insn;
-
-	      /* This is a jump to a mips16 routine from a mips32
-                 routine.  We need to change jal into jalx.  */
-	      insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
-	      if (((insn >> 26) & 0x3f) != 0x3
-		  && ((insn >> 26) & 0x3f) != 0x1d)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: %s+0x%lx: jump to mips16 routine which is not jal"),
-		     bfd_get_filename (input_bfd),
-		     input_section->name,
-		     (unsigned long) rel->r_offset);
-		  bfd_set_error (bfd_error_bad_value);
-		  return false;
-		}
-	      insn = (insn & 0x3ffffff) | (0x1d << 26);
-	      bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
-	      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					    contents, rel->r_offset,
-					    relocation, addend);
-	    }
-	  else if (r_type == R_MIPS16_26)
-	    {
-	      /* It's easiest to do the normal relocation, and then
-                 dig out the instruction and swap the first word the
-                 way the mips16 expects it.  If this is little endian,
-                 though, we need to swap the two words first, and then
-                 swap them back again later, so that the address looks
-                 right.  */
-
-	      if (bfd_little_endian (input_bfd))
-		{
-		  unsigned long insn;
-
-		  insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
-		  insn = ((insn >> 16) & 0xffff) | ((insn & 0xffff) << 16);
-		  bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
-		}
-
-	      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					    contents, rel->r_offset,
-					    relocation, addend);
-	      if (r == bfd_reloc_ok)
-		{
-		  unsigned long insn;
-
-		  if (bfd_little_endian (input_bfd))
-		    {
-		      insn = bfd_get_32 (input_bfd, contents + rel->r_offset);
-		      insn = ((insn >> 16) & 0xffff) | ((insn & 0xffff) << 16);
-		      bfd_put_32 (input_bfd, insn, contents + rel->r_offset);
-		    }
-
-		  insn = bfd_get_16 (input_bfd, contents + rel->r_offset);
-		  insn = ((insn & 0xfc00)
-			  | ((insn & 0x1f) << 5)
-			  | ((insn & 0x3e0) >> 5));
-		  /* If this is a jump to a 32 bit routine, then make
-		     it jalx.  */
-		  if (other != STO_MIPS16)
-		    insn |= 0x400;
-		  bfd_put_16 (input_bfd, insn, contents + rel->r_offset);
-		}
-	    }
-	  else if (r_type == R_MIPS16_GPREL)
-	    {
-	      unsigned short extend, insn;
-	      bfd_byte buf[4];
-	      unsigned long final;
-
-	      /* Extract the addend into buf, run the regular reloc,
-                 and stuff the resulting value back into the
-                 instructions.  */
-	      if (rel->r_offset > input_section->_raw_size)
-		r = bfd_reloc_outofrange;
-	      else
-		{
-		  extend = bfd_get_16 (input_bfd, contents + rel->r_offset);
-		  insn = bfd_get_16 (input_bfd, contents + rel->r_offset + 2);
-		  bfd_put_32 (input_bfd,
-			      (((extend & 0x1f) << 11)
-			       | (extend & 0x7e0)
-			       | (insn & 0x1f)),
-			      buf);
-		  r = _bfd_final_link_relocate (howto, input_bfd,
-						input_section, buf,
-						(bfd_vma) 0, relocation,
-						addend);
-		  final = bfd_get_32 (input_bfd, buf);
-		  bfd_put_16 (input_bfd,
-			      ((extend & 0xf800)
-			       | ((final >> 11) & 0x1f)
-			       | (final & 0x7e0)),
-			      contents + rel->r_offset);
-		  bfd_put_16 (input_bfd,
-			      ((insn & 0xffe0)
-			       | (final & 0x1f)),
-			      contents + rel->r_offset + 2);
-		}
-	    }
-	  else
-	    r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					  contents, rel->r_offset,
-					  relocation, addend);
-
-	  /* The jal instruction can only jump to an address which is
-             divisible by 4, and it can only jump to an address with
-             the same upper 4 bits as the PC.  */
-	  if (r == bfd_reloc_ok
-	      && (r_type == R_MIPS16_26 || r_type == R_MIPS_26))
-	    {
-	      bfd_vma addr;
-              bfd_vma pc;
-              bfd_vma target;
-
-              pc = ((input_section->output_section->vma
-                     + input_section->output_offset
-                     + rel->r_offset)
-                    & 0xf0000000);
-              target = bfd_get_32 (input_bfd, contents + rel->r_offset)
-			& (howto->dst_mask);
-              addr = (target << 2) + pc;
-	      if (other == STO_MIPS16)
-		addr &= ~ (bfd_vma) 1;
-	      if ((addr & 3) != 0
-		  || ((addr & 0xf0000000)
-                      != pc))
-		r = bfd_reloc_overflow;
-	    }
-
-	  /* Don't bother to report a relocation overflow for a call
-             to a weak undefined symbol with a value of zero.  This
-             permits us to use
-	         if (!f) f();
-	     even if we aren't in range to call address zero.  */
-	  if (r == bfd_reloc_overflow
-	      && (r_type == R_MIPS16_26 || r_type == R_MIPS_26)
-	      && relocation + addend == 0
-	      && h != NULL
-	      && h->root.type == bfd_link_hash_undefweak)
-	    r = bfd_reloc_ok;
-
-	  /* If we've already issued an error for an undefined symbol,
-             don't issue another useless error.  */
-	  if (undefined_error
-	      && (r == bfd_reloc_undefined || r == bfd_reloc_overflow))
-	    r = bfd_reloc_ok;
-
-	  if (SGI_COMPAT (abfd)
-	      && scpt != NULL
-	      && (input_section->flags & SEC_ALLOC) != 0)
-	    {
-	      Elf32_crinfo cptrel;
-	      bfd_byte *cr;
-
-	      /* Make an entry of compact relocation info.  */
-	      mips_elf_set_cr_format (cptrel, CRF_MIPS_LONG);
-	      cptrel.vaddr = (rel->r_offset
-			      + input_section->output_section->vma
-			      + input_section->output_offset);
-
-	      switch (r_type)
-		{
-		case R_MIPS_26:
-		  mips_elf_set_cr_type (cptrel, CRT_MIPS_JMPAD);
-		  /* XXX How should we set dist2to in this case. */
-		  mips_elf_set_cr_dist2to (cptrel, 8);
-		  cptrel.konst = addend + relocation;
-		  cr = scpt->contents + sizeof (Elf32_External_compact_rel);
-		  bfd_elf32_swap_crinfo_out (output_bfd, &cptrel,
-					     ((Elf32_External_crinfo *) cr
-					      + scpt->reloc_count));
-		  ++scpt->reloc_count;
-		  break;
-
-		case R_MIPS_GPREL16:
-		case R_MIPS_LITERAL:
-		case R_MIPS_GPREL32:
-		  mips_elf_set_cr_type (cptrel, CRT_MIPS_GPHI_LO);
-		  cptrel.konst = gp - cptrel.vaddr;
-		  mips_elf_set_cr_dist2to (cptrel, 4);
-		  cr = scpt->contents + sizeof (Elf32_External_compact_rel);
-		  bfd_elf32_swap_crinfo_out (output_bfd, &cptrel,
-					     ((Elf32_External_crinfo *) cr
-					      + scpt->reloc_count));
-		  ++scpt->reloc_count;
-		  break;
-
-		default:
-		  break;
-		}
-	    }
-	}
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else
-		  {
-		    name = bfd_elf_string_from_elf_section (input_bfd,
-							    symtab_hdr->sh_link,
-							    sym->st_name);
-		    if (name == NULL)
-		      return false;
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-		if (! ((*info->callbacks->reloc_overflow)
-		       (info, name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* This hook function is called before the linker writes out a global
-   symbol.  We mark symbols as small common if appropriate.  This is
-   also where we undo the increment of the value for a mips16 symbol.  */
-
-/*ARGSIGNORED*/
-static boolean
-mips_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const char *name;
-     Elf_Internal_Sym *sym;
-     asection *input_sec;
-{
-  /* If we see a common symbol, which implies a relocatable link, then
-     if a symbol was small common in an input file, mark it as small
-     common in the output file.  */
-  if (sym->st_shndx == SHN_COMMON
-      && strcmp (input_sec->name, ".scommon") == 0)
-    sym->st_shndx = SHN_MIPS_SCOMMON;
-
-  if (sym->st_other == STO_MIPS16
-      && (sym->st_value & 1) != 0)
-    --sym->st_value;
-
-  return true;
-}
-
-/* Functions for the dynamic linker.  */
-
-/* The name of the dynamic interpreter.  This is put in the .interp
-   section.  */
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/libc.so.1"
-
-/* Create dynamic sections when linking against a dynamic object.  */
-
-static boolean
-mips_elf_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  struct elf_link_hash_entry *h;
-  flagword flags;
-  register asection *s;
-  const char * const *namep;
-
-  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-	   | SEC_LINKER_CREATED | SEC_READONLY);
-
-  /* Mips ABI requests the .dynamic section to be read only.  */
-  s = bfd_get_section_by_name (abfd, ".dynamic");
-  if (s != NULL)
-    {
-      if (! bfd_set_section_flags (abfd, s, flags))
-	return false;
-    }
-
-  /* We need to create .got section.  */
-  if (! mips_elf_create_got_section (abfd, info))
-    return false;
-
-  /* Create .stub section.  */
-  if (bfd_get_section_by_name (abfd, ".stub") == NULL)
-    {
-      s = bfd_make_section (abfd, ".stub");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-    }
-
-  if (SGI_COMPAT (abfd)
-      && !info->shared
-      && bfd_get_section_by_name (abfd, ".rld_map") == NULL)
-    {
-      s = bfd_make_section (abfd, ".rld_map");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags & ~SEC_READONLY)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-    }
-
-  if (SGI_COMPAT (abfd))
-    {
-      for (namep = mips_elf_dynsym_rtproc_names; *namep != NULL; namep++)
-	{
-	  h = NULL;
-	  if (! (_bfd_generic_link_add_one_symbol
-		 (info, abfd, *namep, BSF_GLOBAL, bfd_und_section_ptr,
-		  (bfd_vma) 0, (const char *) NULL, false,
-		  get_elf_backend_data (abfd)->collect,
-		  (struct bfd_link_hash_entry **) &h)))
-	    return false;
-	  h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-	  h->type = STT_SECTION;
-
-	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-
-      /* We need to create a .compact_rel section.  */
-      if (! mips_elf_create_compact_rel_section (abfd, info))
-	return false;
-
-      /* Change aligments of some sections.  */
-      s = bfd_get_section_by_name (abfd, ".hash");
-      if (s != NULL)
-	bfd_set_section_alignment (abfd, s, 4);
-      s = bfd_get_section_by_name (abfd, ".dynsym");
-      if (s != NULL)
-	bfd_set_section_alignment (abfd, s, 4);
-      s = bfd_get_section_by_name (abfd, ".dynstr");
-      if (s != NULL)
-	bfd_set_section_alignment (abfd, s, 4);
-      s = bfd_get_section_by_name (abfd, ".reginfo");
-      if (s != NULL)
-	bfd_set_section_alignment (abfd, s, 4);
-      s = bfd_get_section_by_name (abfd, ".dynamic");
-      if (s != NULL)
-	bfd_set_section_alignment (abfd, s, 4);
-    }
-
-  if (!info->shared)
-    {
-      h = NULL;
-      if (! (_bfd_generic_link_add_one_symbol
-	     (info, abfd, "_DYNAMIC_LINK", BSF_GLOBAL, bfd_abs_section_ptr,
-	      (bfd_vma) 0, (const char *) NULL, false,
-	      get_elf_backend_data (abfd)->collect,
-	      (struct bfd_link_hash_entry **) &h)))
-	return false;
-      h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-      h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-      h->type = STT_SECTION;
-
-      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	return false;
-
-      if (! mips_elf_hash_table (info)->use_rld_obj_head)
-	{
-	  /* __rld_map is a four byte word located in the .data section
-	     and is filled in by the rtld to contain a pointer to
-	     the _r_debug structure. Its symbol value will be set in
-	     mips_elf_finish_dynamic_symbol.  */
-	  s = bfd_get_section_by_name (abfd, ".rld_map");
-	  BFD_ASSERT (s != NULL);
-
-	  h = NULL;
-	  if (! (_bfd_generic_link_add_one_symbol
-		 (info, abfd, "__rld_map", BSF_GLOBAL, s,
-		  (bfd_vma) 0, (const char *) NULL, false,
-		  get_elf_backend_data (abfd)->collect,
-		  (struct bfd_link_hash_entry **) &h)))
-	    return false;
-	  h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-	  h->type = STT_OBJECT;
-
-	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* Create the .compact_rel section.  */
-
-static boolean
-mips_elf_create_compact_rel_section (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags;
-  register asection *s;
-
-  if (bfd_get_section_by_name (abfd, ".compact_rel") == NULL)
-    {
-      flags = (SEC_HAS_CONTENTS | SEC_IN_MEMORY | SEC_LINKER_CREATED
-	       | SEC_READONLY);
-
-      s = bfd_make_section (abfd, ".compact_rel");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      s->_raw_size = sizeof (Elf32_External_compact_rel);
-    }
-
-  return true;
-}
-
-/* Create the .got section to hold the global offset table. */
-
-static boolean
-mips_elf_create_got_section (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags;
-  register asection *s;
-  struct elf_link_hash_entry *h;
-  struct mips_got_info *g;
-
-  /* This function may be called more than once.  */
-  if (bfd_get_section_by_name (abfd, ".got") != NULL)
-    return true;
-
-  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-	   | SEC_LINKER_CREATED);
-
-  s = bfd_make_section (abfd, ".got");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags)
-      || ! bfd_set_section_alignment (abfd, s, 4))
-    return false;
-
-  /* Define the symbol _GLOBAL_OFFSET_TABLE_.  We don't do this in the
-     linker script because we don't want to define the symbol if we
-     are not creating a global offset table.  */
-  h = NULL;
-  if (! (_bfd_generic_link_add_one_symbol
-	 (info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
-	  (bfd_vma) 0, (const char *) NULL, false,
-	  get_elf_backend_data (abfd)->collect,
-	  (struct bfd_link_hash_entry **) &h)))
-    return false;
-  h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-  h->type = STT_OBJECT;
-
-  if (info->shared
-      && ! bfd_elf32_link_record_dynamic_symbol (info, h))
-    return false;
-
-  /* The first several global offset table entries are reserved.  */
-  s->_raw_size = MIPS_RESERVED_GOTNO * 4;
-
-  g = (struct mips_got_info *) bfd_alloc (abfd,
-					  sizeof (struct mips_got_info));
-  if (g == NULL)
-    return false;
-  g->global_gotsym = 0;
-  g->local_gotno = MIPS_RESERVED_GOTNO;
-  g->assigned_gotno = MIPS_RESERVED_GOTNO;
-  if (elf_section_data (s) == NULL)
-    {
-      s->used_by_bfd =
-	(PTR) bfd_zalloc (abfd, sizeof (struct bfd_elf_section_data));
-      if (elf_section_data (s) == NULL)
-	return false;
-    }
-  elf_section_data (s)->tdata = (PTR) g;
-
-  return true;
-}
-
-/* Look through the relocs for a section during the first phase, and
-   allocate space in the global offset table.  */
-
-static boolean
-mips_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  const char *name;
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  struct mips_got_info *g;
-  size_t extsymoff;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-  asection *sgot;
-  asection *sreloc;
-
-  if (info->relocateable)
-    return true;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  extsymoff = (elf_bad_symtab (abfd)) ? 0 : symtab_hdr->sh_info;
-
-  /* Check for the mips16 stub sections.  */
-
-  name = bfd_get_section_name (abfd, sec);
-  if (strncmp (name, FN_STUB, sizeof FN_STUB - 1) == 0)
-    {
-      unsigned long r_symndx;
-
-      /* Look at the relocation information to figure out which symbol
-         this is for.  */
-
-      r_symndx = ELF32_R_SYM (relocs->r_info);
-
-      if (r_symndx < extsymoff
-	  || sym_hashes[r_symndx - extsymoff] == NULL)
-	{
-	  asection *o;
-
-	  /* This stub is for a local symbol.  This stub will only be
-             needed if there is some relocation in this BFD, other
-             than a 16 bit function call, which refers to this symbol.  */
-	  for (o = abfd->sections; o != NULL; o = o->next)
-	    {
-	      Elf_Internal_Rela *sec_relocs;
-	      const Elf_Internal_Rela *r, *rend;
-
-	      /* We can ignore stub sections when looking for relocs.  */
-	      if ((o->flags & SEC_RELOC) == 0
-		  || o->reloc_count == 0
-		  || strncmp (bfd_get_section_name (abfd, o), FN_STUB,
-			      sizeof FN_STUB - 1) == 0
-		  || strncmp (bfd_get_section_name (abfd, o), CALL_STUB,
-			      sizeof CALL_STUB - 1) == 0
-		  || strncmp (bfd_get_section_name (abfd, o), CALL_FP_STUB,
-			      sizeof CALL_FP_STUB - 1) == 0)
-		continue;
-
-	      sec_relocs = (_bfd_elf32_link_read_relocs
-			    (abfd, o, (PTR) NULL,
-			     (Elf_Internal_Rela *) NULL,
-			     info->keep_memory));
-	      if (sec_relocs == NULL)
-		return false;
-
-	      rend = sec_relocs + o->reloc_count;
-	      for (r = sec_relocs; r < rend; r++)
-		if (ELF32_R_SYM (r->r_info) == r_symndx
-		    && ELF32_R_TYPE (r->r_info) != R_MIPS16_26)
-		  break;
-
-	      if (! info->keep_memory)
-		free (sec_relocs);
-
-	      if (r < rend)
-		break;
-	    }
-
-	  if (o == NULL)
-	    {
-	      /* There is no non-call reloc for this stub, so we do
-                 not need it.  Since this function is called before
-                 the linker maps input sections to output sections, we
-                 can easily discard it by setting the SEC_EXCLUDE
-                 flag.  */
-	      sec->flags |= SEC_EXCLUDE;
-	      return true;
-	    }
-
-	  /* Record this stub in an array of local symbol stubs for
-             this BFD. */
-	  if (elf_tdata (abfd)->local_stubs == NULL)
-	    {
-	      unsigned long symcount;
-	      asection **n;
-
-	      if (elf_bad_symtab (abfd))
-		symcount = symtab_hdr->sh_size / sizeof (Elf32_External_Sym);
-	      else
-		symcount = symtab_hdr->sh_info;
-	      n = (asection **) bfd_zalloc (abfd,
-					    symcount * sizeof (asection *));
-	      if (n == NULL)
-		return false;
-	      elf_tdata (abfd)->local_stubs = n;
-	    }
-
-	  elf_tdata (abfd)->local_stubs[r_symndx] = sec;
-
-	  /* We don't need to set mips16_stubs_seen in this case.
-             That flag is used to see whether we need to look through
-             the global symbol table for stubs.  We don't need to set
-             it here, because we just have a local stub.  */
-	}
-      else
-	{
-	  struct mips_elf_link_hash_entry *h;
-
-	  h = ((struct mips_elf_link_hash_entry *)
-	       sym_hashes[r_symndx - extsymoff]);
-
-	  /* H is the symbol this stub is for.  */
-
-	  h->fn_stub = sec;
-	  mips_elf_hash_table (info)->mips16_stubs_seen = true;
-	}
-    }
-  else if (strncmp (name, CALL_STUB, sizeof CALL_STUB - 1) == 0
-	   || strncmp (name, CALL_FP_STUB, sizeof CALL_FP_STUB - 1) == 0)
-    {
-      unsigned long r_symndx;
-      struct mips_elf_link_hash_entry *h;
-      asection **loc;
-
-      /* Look at the relocation information to figure out which symbol
-         this is for.  */
-
-      r_symndx = ELF32_R_SYM (relocs->r_info);
-
-      if (r_symndx < extsymoff
-	  || sym_hashes[r_symndx - extsymoff] == NULL)
-	{
-	  /* This stub was actually built for a static symbol defined
-	     in the same file.  We assume that all static symbols in
-	     mips16 code are themselves mips16, so we can simply
-	     discard this stub.  Since this function is called before
-	     the linker maps input sections to output sections, we can
-	     easily discard it by setting the SEC_EXCLUDE flag.  */
-	  sec->flags |= SEC_EXCLUDE;
-	  return true;
-	}
-
-      h = ((struct mips_elf_link_hash_entry *)
-	   sym_hashes[r_symndx - extsymoff]);
-
-      /* H is the symbol this stub is for.  */
-
-      if (strncmp (name, CALL_FP_STUB, sizeof CALL_FP_STUB - 1) == 0)
-	loc = &h->call_fp_stub;
-      else
-	loc = &h->call_stub;
-
-      /* If we already have an appropriate stub for this function, we
-	 don't need another one, so we can discard this one.  Since
-	 this function is called before the linker maps input sections
-	 to output sections, we can easily discard it by setting the
-	 SEC_EXCLUDE flag.  We can also discard this section if we
-	 happen to already know that this is a mips16 function; it is
-	 not necessary to check this here, as it is checked later, but
-	 it is slightly faster to check now.  */
-      if (*loc != NULL || h->root.other == STO_MIPS16)
-	{
-	  sec->flags |= SEC_EXCLUDE;
-	  return true;
-	}
-
-      *loc = sec;
-      mips_elf_hash_table (info)->mips16_stubs_seen = true;
-    }
-
-  if (dynobj == NULL)
-    {
-      sgot = NULL;
-      g = NULL;
-    }
-  else
-    {
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      if (sgot == NULL)
-	g = NULL;
-      else
-	{
-	  BFD_ASSERT (elf_section_data (sgot) != NULL);
-	  g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-	  BFD_ASSERT (g != NULL);
-	}
-    }
-
-  sreloc = NULL;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (r_symndx < extsymoff)
-	h = NULL;
-      else
-	{
-	  h = sym_hashes[r_symndx - extsymoff];
-
-	  /* This may be an indirect symbol created because of a version.  */
-	  if (h != NULL)
-	    {
-	      while (h->root.type == bfd_link_hash_indirect)
-		h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	    }
-	}
-
-      /* Some relocs require a global offset table.  */
-      if (dynobj == NULL || sgot == NULL)
-	{
-	  switch (ELF32_R_TYPE (rel->r_info))
-	    {
-	    case R_MIPS_GOT16:
-	    case R_MIPS_CALL16:
-	    case R_MIPS_CALL_HI16:
-	    case R_MIPS_CALL_LO16:
-	    case R_MIPS_GOT_HI16:
-	    case R_MIPS_GOT_LO16:
-	      if (dynobj == NULL)
-		elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! mips_elf_create_got_section (dynobj, info))
-		return false;
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	      BFD_ASSERT (elf_section_data (sgot) != NULL);
-	      g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-	      BFD_ASSERT (g != NULL);
-	      break;
-
-	    case R_MIPS_32:
-	    case R_MIPS_REL32:
-	      if (dynobj == NULL
-		  && (info->shared || h != NULL)
-		  && (sec->flags & SEC_ALLOC) != 0)
-		elf_hash_table (info)->dynobj = dynobj = abfd;
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_MIPS_CALL16:
-	case R_MIPS_CALL_HI16:
-	case R_MIPS_CALL_LO16:
-	  /* This symbol requires a global offset table entry.  */
-
-	  if (h == NULL)
-	    {
-	      (*_bfd_error_handler)
-		(_("%s: CALL16 reloc at 0x%lx not against global symbol"),
-		 bfd_get_filename (abfd), (unsigned long) rel->r_offset);
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-
-	  /* Make sure this symbol is output as a dynamic symbol.  */
-	  if (h->dynindx == -1)
-	    {
-	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
-	    }
-
-	  if (h->got.offset != (bfd_vma) -1)
-	    {
-	      /* We have already allocated space in the .got.  */
-	      break;
-	    }
-
-	  /* Note the index of the first global got symbol in .dynsym.  */
-	  if (g->global_gotsym == 0
-	      || g->global_gotsym > (unsigned long) h->dynindx)
-	    g->global_gotsym = h->dynindx;
-
-	  /* Make this symbol to have the corresponding got entry.  */
-	  h->got.offset = 0;
-
-	  /* We need a stub, not a plt entry for the undefined
-	     function.  But we record it as if it needs plt.  See
-	     elf_adjust_dynamic_symbol in elflink.h.  */
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-	  h->type = STT_FUNC;
-
-	  break;
-
-	case R_MIPS_GOT16:
-	case R_MIPS_GOT_HI16:
-	case R_MIPS_GOT_LO16:
-	  /* This symbol requires a global offset table entry.  */
-
-	  if (h != NULL)
-	    {
-	      /* Make sure this symbol is output as a dynamic symbol.  */
-	      if (h->dynindx == -1)
-		{
-		  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		    return false;
-		}
-
-	      if (h->got.offset != (bfd_vma) -1)
-		{
-		  /* We have already allocated space in the .got.  */
-		  break;
-		}
-	      /* Note the index of the first global got symbol in
-                 .dynsym.  */
-	      if (g->global_gotsym == 0
-		  || g->global_gotsym > (unsigned long) h->dynindx)
-		g->global_gotsym = h->dynindx;
-
-	      /* Make this symbol to be the global got symbol.  */
-	      h->got.offset = 0;
-	    }
-
-	  break;
-
-	case R_MIPS_32:
-	case R_MIPS_REL32:
-	  if ((info->shared || h != NULL)
-	      && (sec->flags & SEC_ALLOC) != 0)
-	    {
-	      if (sreloc == NULL)
-		{
-		  const char *name = ".rel.dyn";
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  if (sreloc == NULL)
-		    {
-		      sreloc = bfd_make_section (dynobj, name);
-		      if (sreloc == NULL
-			  || ! bfd_set_section_flags (dynobj, sreloc,
-						      (SEC_ALLOC
-						       | SEC_LOAD
-						       | SEC_HAS_CONTENTS
-						       | SEC_IN_MEMORY
-						       | SEC_LINKER_CREATED
-						       | SEC_READONLY))
-			  || ! bfd_set_section_alignment (dynobj, sreloc,
-							  4))
-			return false;
-		    }
-		}
-	      if (info->shared)
-		{
-		  /* When creating a shared object, we must copy these
-		     reloc types into the output file as R_MIPS_REL32
-		     relocs.  We make room for this reloc in the
-		     .rel.dyn reloc section */
-		  if (sreloc->_raw_size == 0)
-		    {
-		      /* Add a null element. */
-		      sreloc->_raw_size += sizeof (Elf32_External_Rel);
-		      ++sreloc->reloc_count;
-		    }
-		  sreloc->_raw_size += sizeof (Elf32_External_Rel);
-		}
-	      else
-		{
-		  struct mips_elf_link_hash_entry *hmips;
-
-		  /* We only need to copy this reloc if the symbol is
-                     defined in a dynamic object.  */
-		  hmips = (struct mips_elf_link_hash_entry *) h;
-		  ++hmips->mips_32_relocs;
-		}
-	    }
-
-	  if (SGI_COMPAT (abfd))
-	    mips_elf_hash_table (info)->compact_rel_size +=
-	      sizeof (Elf32_External_crinfo);
-
-	  break;
-
-	case R_MIPS_26:
-	case R_MIPS_GPREL16:
-	case R_MIPS_LITERAL:
-	case R_MIPS_GPREL32:
-	  if (SGI_COMPAT (abfd))
-	    mips_elf_hash_table (info)->compact_rel_size +=
-	      sizeof (Elf32_External_crinfo);
-	  break;
-
-	  /* This relocation describes the C++ object vtable hierarchy.
-	     Reconstruct it for later use during GC.  */
-	case R_MIPS_GNU_VTINHERIT:
-	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
-	  break;
-
-	  /* This relocation describes which C++ vtable entries are actually
-	     used.  Record for later use during GC.  */
-	case R_MIPS_GNU_VTENTRY:
-	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_offset))
-	    return false;
-	  break;
-
-	default:
-	  break;
-	}
-
-      /* If this reloc is not a 16 bit call, and it has a global
-         symbol, then we will need the fn_stub if there is one.
-         References from a stub section do not count. */
-      if (h != NULL
-	  && ELF32_R_TYPE (rel->r_info) != R_MIPS16_26
-	  && strncmp (bfd_get_section_name (abfd, sec), FN_STUB,
-		      sizeof FN_STUB - 1) != 0
-	  && strncmp (bfd_get_section_name (abfd, sec), CALL_STUB,
-		      sizeof CALL_STUB - 1) != 0
-	  && strncmp (bfd_get_section_name (abfd, sec), CALL_FP_STUB,
-		      sizeof CALL_FP_STUB - 1) != 0)
-	{
-	  struct mips_elf_link_hash_entry *mh;
-
-	  mh = (struct mips_elf_link_hash_entry *) h;
-	  mh->need_fn_stub = true;
-	}
-    }
-
-  return true;
-}
-
-/* Return the section that should be marked against GC for a given
-   relocation.  */
-
-static asection *
-mips_elf_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     Elf_Internal_Rela *rel;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  /* ??? Do mips16 stub sections need to be handled special?  */
-
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_MIPS_GNU_VTINHERIT:
-	case R_MIPS_GNU_VTENTRY:
-	  break;
-
-	default:
-	  switch (h->root.type)
-	    {
-	    case bfd_link_hash_defined:
-	    case bfd_link_hash_defweak:
-	      return h->root.u.def.section;
-
-	    case bfd_link_hash_common:
-	      return h->root.u.c.p->section;
-
-	    default:
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-		&& sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
-
-  return NULL;
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-
-static boolean
-mips_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-#if 0
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
-  const Elf_Internal_Rela *rel, *relend;
-  unsigned long r_symndx;
-  struct elf_link_hash_entry *h;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; rel++)
-    switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_MIPS_GOT16:
-      case R_MIPS_CALL16:
-      case R_MIPS_CALL_HI16:
-      case R_MIPS_CALL_LO16:
-      case R_MIPS_GOT_HI16:
-      case R_MIPS_GOT_LO16:
-	/* ??? It would seem that the existing MIPS code does no sort
-	   of reference counting or whatnot on its GOT and PLT entries,
-	   so it is not possible to garbage collect them at this time.  */
-        break;
-
-      default:
-	break;
-      }
-#endif
-
-  return true;
-}
-
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-mips_elf_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  bfd *dynobj;
-  struct mips_elf_link_hash_entry *hmips;
-  asection *s;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
-  /* If this symbol is defined in a dynamic object, we need to copy
-     any R_MIPS_32 or R_MIPS_REL32 relocs against it into the output
-     file.  */
-  hmips = (struct mips_elf_link_hash_entry *) h;
-  if (! info->relocateable
-      && hmips->mips_32_relocs != 0
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    {
-      s = bfd_get_section_by_name (dynobj, ".rel.dyn");
-      BFD_ASSERT (s != NULL);
-
-      if (s->_raw_size == 0)
-	{
-	  /* Make room for a null element. */
-	  s->_raw_size += sizeof (Elf32_External_Rel);
-	  ++s->reloc_count;
-	}
-      s->_raw_size += hmips->mips_32_relocs * sizeof (Elf32_External_Rel);
-    }
-
-  /* For a function, create a stub, if needed. */
-  if (h->type == STT_FUNC
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
-    {
-      if (! elf_hash_table (info)->dynamic_sections_created)
-	return true;
-
-      /* If this symbol is not defined in a regular file, then set
-	 the symbol to the stub location.  This is required to make
-	 function pointers compare as equal between the normal
-	 executable and the shared library.  */
-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  /* We need .stub section.  */
-	  s = bfd_get_section_by_name (dynobj, ".stub");
-	  BFD_ASSERT (s != NULL);
-
-	  h->root.u.def.section = s;
-	  h->root.u.def.value = s->_raw_size;
-
-	  /* XXX Write this stub address somewhere.  */
-	  h->plt.offset = s->_raw_size;
-
-	  /* Make room for this stub code.  */
-	  s->_raw_size += MIPS_FUNCTION_STUB_SIZE;
-
-	  /* The last half word of the stub will be filled with the index
-	     of this symbol in .dynsym section.  */
-	  return true;
-	}
-    }
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  return true;
-}
-
-/* This function is called after all the input files have been read,
-   and the input sections have been assigned to output sections.  We
-   check for any mips16 stub sections that we can discard.  */
-
-static boolean mips_elf_check_mips16_stubs
-  PARAMS ((struct mips_elf_link_hash_entry *, PTR));
-
-static boolean
-mips_elf_always_size_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  asection *ri;
-
-  /* The .reginfo section has a fixed size.  */
-  ri = bfd_get_section_by_name (output_bfd, ".reginfo");
-  if (ri != NULL)
-    bfd_set_section_size (output_bfd, ri, sizeof (Elf32_External_RegInfo));
-
-  if (info->relocateable
-      || ! mips_elf_hash_table (info)->mips16_stubs_seen)
-    return true;
-
-  mips_elf_link_hash_traverse (mips_elf_hash_table (info),
-			       mips_elf_check_mips16_stubs,
-			       (PTR) NULL);
-
-  return true;
-}
-
-/* Check the mips16 stubs for a particular symbol, and see if we can
-   discard them.  */
-
-/*ARGSUSED*/
-static boolean
-mips_elf_check_mips16_stubs (h, data)
-     struct mips_elf_link_hash_entry *h;
-     PTR data;
-{
-  if (h->fn_stub != NULL
-      && ! h->need_fn_stub)
-    {
-      /* We don't need the fn_stub; the only references to this symbol
-         are 16 bit calls.  Clobber the size to 0 to prevent it from
-         being included in the link.  */
-      h->fn_stub->_raw_size = 0;
-      h->fn_stub->_cooked_size = 0;
-      h->fn_stub->flags &= ~ SEC_RELOC;
-      h->fn_stub->reloc_count = 0;
-      h->fn_stub->flags |= SEC_EXCLUDE;
-    }
-
-  if (h->call_stub != NULL
-      && h->root.other == STO_MIPS16)
-    {
-      /* We don't need the call_stub; this is a 16 bit function, so
-         calls from other 16 bit functions are OK.  Clobber the size
-         to 0 to prevent it from being included in the link.  */
-      h->call_stub->_raw_size = 0;
-      h->call_stub->_cooked_size = 0;
-      h->call_stub->flags &= ~ SEC_RELOC;
-      h->call_stub->reloc_count = 0;
-      h->call_stub->flags |= SEC_EXCLUDE;
-    }
-
-  if (h->call_fp_stub != NULL
-      && h->root.other == STO_MIPS16)
-    {
-      /* We don't need the call_stub; this is a 16 bit function, so
-         calls from other 16 bit functions are OK.  Clobber the size
-         to 0 to prevent it from being included in the link.  */
-      h->call_fp_stub->_raw_size = 0;
-      h->call_fp_stub->_cooked_size = 0;
-      h->call_fp_stub->flags &= ~ SEC_RELOC;
-      h->call_fp_stub->reloc_count = 0;
-      h->call_fp_stub->flags |= SEC_EXCLUDE;
-    }
-
-  return true;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-mips_elf_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *s;
-  boolean reltext;
-  asection *sgot;
-  struct mips_got_info *g;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (! info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-    }
-
-  /* Recompute the size of .got for local entires (reserved and
-     hipages) if needed.  To estimate it, get the upper bound of total
-     size of loadable sections.  */
-  sgot = bfd_get_section_by_name (dynobj, ".got");
-
-  if (sgot != NULL)
-    {
-      bfd_size_type loadable_size = 0;
-      bfd_size_type local_gotno;
-      struct _bfd *sub;
-
-      BFD_ASSERT (elf_section_data (sgot) != NULL);
-      g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-      BFD_ASSERT (g != NULL);
-
-      for (sub = info->input_bfds; sub; sub = sub->link_next)
-	for (s = sub->sections; s != NULL; s = s->next)
-	  {
-	    if ((s->flags & SEC_ALLOC) == 0)
-	      continue;
-	    loadable_size += (s->_raw_size + 0xf) & ~0xf;
-	  }
-
-      loadable_size += MIPS_FUNCTION_STUB_SIZE;
-
-      /* Assume there are two loadable segments consisting of
-	 contiguous sections.  Is 5 enough? */
-      local_gotno = (loadable_size >> 16) + 5 + MIPS_RESERVED_GOTNO;
-      g->local_gotno = local_gotno;
-      sgot->_raw_size += local_gotno * 4;
-    }
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  reltext = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      boolean strip;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-	continue;
-
-      strip = false;
-
-      if (strncmp (name, ".rel", 4) == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* We only strip the section if the output section name
-                 has the same name.  Otherwise, there might be several
-                 input sections for this output section.  FIXME: This
-                 code is probably not needed these days anyhow, since
-                 the linker now does not create empty output sections.  */
-	      if (s->output_section != NULL
-		  && strcmp (name,
-			     bfd_get_section_name (s->output_section->owner,
-						   s->output_section)) == 0)
-		strip = true;
-	    }
-	  else
-	    {
-	      const char *outname;
-	      asection *target;
-
-	      /* If this relocation section applies to a read only
-                 section, then we probably need a DT_TEXTREL entry.
-                 If the relocation section is .rel.dyn, we always
-                 assert a DT_TEXTREL entry rather than testing whether
-                 there exists a relocation to a read only section or
-                 not.  */
-	      outname = bfd_get_section_name (output_bfd,
-					      s->output_section);
-	      target = bfd_get_section_by_name (output_bfd, outname + 4);
-	      if ((target != NULL
-		   && (target->flags & SEC_READONLY) != 0
-		   && (target->flags & SEC_ALLOC) != 0)
-		  || strcmp (outname, ".rel.dyn") == 0)
-		reltext = true;
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      if (strcmp (name, ".rel.dyn") != 0)
-		s->reloc_count = 0;
-	    }
-	}
-      else if (strncmp (name, ".got", 4) == 0)
-	{
-	  int i;
-
-	  BFD_ASSERT (elf_section_data (s) != NULL);
-	  g = (struct mips_got_info *) elf_section_data (s)->tdata;
-	  BFD_ASSERT (g != NULL);
-
-	  /* Fix the size of .got section for the correspondence of
-	     global symbols and got entries. This adds some useless
-	     got entries. Is this required by ABI really?  */
-	  i = elf_hash_table (info)->dynsymcount - g->global_gotsym;
-	  s->_raw_size += i * 4;
-	}
-      else if (strncmp (name, ".stub", 5) == 0)
-	{
-	  /* Irix rld assumes that the function stub isn't at the end
-	     of .text section. So put a dummy. XXX  */
-	  s->_raw_size += MIPS_FUNCTION_STUB_SIZE;
-	}
-      else if (! info->shared
-	       && ! mips_elf_hash_table (info)->use_rld_obj_head
-	       && strncmp (name, ".rld_map", 8) == 0)
-	{
-	  /* We add a room for __rld_map. It will be filled in by the
-	     rtld to contain a pointer to the _r_debug structure.  */
-	  s->_raw_size += 4;
-	}
-      else if (SGI_COMPAT (output_bfd)
-	       && strncmp (name, ".compact_rel", 12) == 0)
-	s->_raw_size += mips_elf_hash_table (info)->compact_rel_size;
-      else if (strncmp (name, ".init", 5) != 0)
-	{
-	  /* It's not one of our sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	{
-	  _bfd_strip_section_from_output (s);
-	  continue;
-	}
-
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	{
-	  bfd_set_error (bfd_error_no_memory);
-	  return false;
-	}
-      memset (s->contents, 0, s->_raw_size);
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in elf_mips_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (! info->shared)
-	{
-	  if (SGI_COMPAT (output_bfd))
-	    {
-	      /* SGI object has the equivalence of DT_DEBUG in the
-		 DT_MIPS_RLD_MAP entry.  */
-	      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_RLD_MAP, 0))
-		return false;
-	    }
-	  else
-	    if (! bfd_elf32_add_dynamic_entry (info, DT_DEBUG, 0))
-	      return false;
-	}
-
-      if (reltext)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_PLTGOT, 0))
-	return false;
-
-      if (bfd_get_section_by_name (dynobj, ".rel.dyn"))
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_REL, 0))
-	    return false;
-
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_RELSZ, 0))
-	    return false;
-
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_RELENT, 0))
-	    return false;
-	}
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_CONFLICTNO, 0))
-	return false;
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_LIBLISTNO, 0))
-	return false;
-
-      if (bfd_get_section_by_name (dynobj, ".conflict") != NULL)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_CONFLICT, 0))
-	    return false;
-
-	  s = bfd_get_section_by_name (dynobj, ".liblist");
-	  BFD_ASSERT (s != NULL);
-
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_LIBLIST, 0))
-	    return false;
-	}
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_RLD_VERSION, 0))
-	return false;
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_FLAGS, 0))
-	return false;
-
-#if 0
-      /* Time stamps in executable files are a bad idea.  */
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_TIME_STAMP, 0))
-	return false;
-#endif
-
-#if 0 /* FIXME  */
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_ICHECKSUM, 0))
-	return false;
-#endif
-
-#if 0 /* FIXME  */
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_IVERSION, 0))
-	return false;
-#endif
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_BASE_ADDRESS, 0))
-	return false;
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_LOCAL_GOTNO, 0))
-	return false;
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_SYMTABNO, 0))
-	return false;
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_UNREFEXTNO, 0))
-	return false;
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_GOTSYM, 0))
-	return false;
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_MIPS_HIPAGENO, 0))
-	return false;
-
-#if 0 /* (SGI_COMPAT) */
-      if (! bfd_get_section_by_name (dynobj, ".init"))
-	if (! bfd_elf32_add_dynamic_entry (info, DT_INIT, 0))
-	  return false;
-
-      if (! bfd_get_section_by_name (dynobj, ".fini"))
-	if (! bfd_elf32_add_dynamic_entry (info, DT_FINI, 0))
-	  return false;
-#endif
-    }
-
-  /* If we use dynamic linking, we generate a section symbol for each
-     output section.  These are local symbols, which means that they
-     must come first in the dynamic symbol table.
-     That means we must increment the dynamic symbol index of every
-     other dynamic symbol.  */
-  {
-    unsigned int c, i;
-    struct mips_got_info *g;
-
-    c = 0;
-    if (elf_hash_table (info)->dynamic_sections_created)
-      {
-#if 0
-	/* We no longer try to restrict the set of sections which get
-           dynamic symbol table entries, since it fails if we have
-           other random sections which need dynamic relocations.  */
-	const char * const *namep;
-	bfd_size_type strindex;
-	struct bfd_strtab_hash *dynstr;
-
-	if (SGI_COMPAT (output_bfd))
-	  {
-	    c = SIZEOF_MIPS_DYNSYM_SECNAMES - 1;
-	    elf_link_hash_traverse (elf_hash_table (info),
-				    mips_elf_adjust_dynindx,
-				    (PTR) &c);
-	    elf_hash_table (info)->dynsymcount += c;
-
-	    dynstr = elf_hash_table (info)->dynstr;
-	    BFD_ASSERT (dynstr != NULL);
-
-	    for (i = 1, namep = mips_elf_dynsym_sec_names;
-		 *namep != NULL;
-		 i++, namep++)
-	      {
-		s = bfd_get_section_by_name (output_bfd, *namep);
-		if (s != NULL)
-		  elf_section_data (s)->dynindx = i;
-
-		strindex = _bfd_stringtab_add (dynstr, *namep, true, false);
-		if (strindex == (bfd_size_type) -1)
-		  return false;
-
-		mips_elf_hash_table (info)->dynsym_sec_strindex[i] = strindex;
-	      }
-	  }
-	else
-#endif /* 0 */
-	  {
-	    c = bfd_count_sections (output_bfd);
-	    elf_link_hash_traverse (elf_hash_table (info),
-				    mips_elf_adjust_dynindx,
-				    (PTR) &c);
-	    elf_hash_table (info)->dynsymcount += c;
-
-	    for (i = 1, s = output_bfd->sections; s != NULL; s = s->next, i++)
-	      {
-		elf_section_data (s)->dynindx = i;
-		/* These symbols will have no names, so we don't need to
-		   fiddle with dynstr_index.  */
-	      }
-	  }
-      }
-
-    if (sgot != NULL)
-      {
-	BFD_ASSERT (elf_section_data (sgot) != NULL);
-	g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-	BFD_ASSERT (g != NULL);
-
-	/* If there are no global got symbols, fake the last symbol so
-	   for safety.  */
-	if (g->global_gotsym)
-	  g->global_gotsym += c;
-	else
-	  g->global_gotsym = elf_hash_table (info)->dynsymcount - 1;
-      }
-  }
-
-  return true;
-}
-
-/* Increment the index of a dynamic symbol by a given amount.  Called
-   via elf_link_hash_traverse.  */
-
-static boolean
-mips_elf_adjust_dynindx (h, cparg)
-     struct elf_link_hash_entry *h;
-     PTR cparg;
-{
-  unsigned int *cp = (unsigned int *) cparg;
-
-  if (h->dynindx != -1)
-    h->dynindx += *cp;
-  return true;
-}
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-mips_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  bfd *dynobj;
-  bfd_vma gval;
-  asection *sgot;
-  struct mips_got_info *g;
-  const char *name;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  gval = sym->st_value;
-
-  if (h->plt.offset != (bfd_vma) -1)
-    {
-      asection *s;
-      bfd_byte *p;
-      bfd_byte stub[MIPS_FUNCTION_STUB_SIZE];
-
-      /* This symbol has a stub.  Set it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      s = bfd_get_section_by_name (dynobj, ".stub");
-      BFD_ASSERT (s != NULL);
-
-      /* Fill the stub.  */
-      p = stub;
-      bfd_put_32 (output_bfd, STUB_LW(output_bfd), p);
-      p += 4;
-      bfd_put_32 (output_bfd, STUB_MOVE, p);
-      p += 4;
-
-      /* FIXME: Can h->dynindex be more than 64K?  */
-      if (h->dynindx & 0xffff0000)
-	return false;
-
-      bfd_put_32 (output_bfd, STUB_JALR, p);
-      p += 4;
-      bfd_put_32 (output_bfd, STUB_LI16 + h->dynindx, p);
-
-      BFD_ASSERT (h->plt.offset <= s->_raw_size);
-      memcpy (s->contents + h->plt.offset, stub, MIPS_FUNCTION_STUB_SIZE);
-
-      /* Mark the symbol as undefined.  plt.offset != -1 occurs
-	 only for the referenced symbol.  */
-      sym->st_shndx = SHN_UNDEF;
-
-      /* The run-time linker uses the st_value field of the symbol
-	 to reset the global offset table entry for this external
-	 to its stub address when unlinking a shared object.  */
-      gval = s->output_section->vma + s->output_offset + h->plt.offset;
-      sym->st_value = gval;
-    }
-
-  BFD_ASSERT (h->dynindx != -1);
-
-  sgot = bfd_get_section_by_name (dynobj, ".got");
-  BFD_ASSERT (sgot != NULL);
-  BFD_ASSERT (elf_section_data (sgot) != NULL);
-  g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-  BFD_ASSERT (g != NULL);
-
-  if ((unsigned long) h->dynindx >= g->global_gotsym)
-    {
-      bfd_size_type offset;
-
-      /* This symbol has an entry in the global offset table.  Set its
-	 value to the corresponding got entry, if needed.  */
-      if (h->got.offset == (bfd_vma) -1)
-	{
-	  offset = (h->dynindx - g->global_gotsym + g->local_gotno) * 4;
-	  BFD_ASSERT (g->local_gotno * 4 <= offset
-		      && offset < sgot->_raw_size);
-	  bfd_put_32 (output_bfd, gval, sgot->contents + offset);
-	}
-    }
-
-  /* Mark _DYNAMIC and _GLOBAL_OFFSET_TABLE_ as absolute.  */
-  name = h->root.root.string;
-  if (strcmp (name, "_DYNAMIC") == 0
-      || strcmp (name, "_GLOBAL_OFFSET_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-  else if (strcmp (name, "_DYNAMIC_LINK") == 0)
-    {
-      sym->st_shndx = SHN_ABS;
-      sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
-      sym->st_value = 1;
-    }
-  else if (SGI_COMPAT (output_bfd))
-    {
-      if (strcmp (name, "_gp_disp") == 0)
-	{
-	  sym->st_shndx = SHN_ABS;
-	  sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
-	  sym->st_value = elf_gp (output_bfd);
-	}
-      else if (strcmp (name, mips_elf_dynsym_rtproc_names[0]) == 0
-	       || strcmp (name, mips_elf_dynsym_rtproc_names[1]) == 0)
-	{
-	  sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
-	  sym->st_other = STO_PROTECTED;
-	  sym->st_value = 0;
-	  sym->st_shndx = SHN_MIPS_DATA;
-	}
-      else if (strcmp (name, mips_elf_dynsym_rtproc_names[2]) == 0)
-	{
-	  sym->st_info = ELF_ST_INFO (STB_GLOBAL, STT_SECTION);
-	  sym->st_other = STO_PROTECTED;
-	  sym->st_value = mips_elf_hash_table (info)->procedure_count;
-	  sym->st_shndx = SHN_ABS;
-	}
-      else if (sym->st_shndx != SHN_UNDEF && sym->st_shndx != SHN_ABS)
-	{
-	  if (h->type == STT_FUNC)
-	    sym->st_shndx = SHN_MIPS_TEXT;
-	  else if (h->type == STT_OBJECT)
-	    sym->st_shndx = SHN_MIPS_DATA;
-	}
-    }
-
-  if (SGI_COMPAT (output_bfd)
-      && ! info->shared)
-    {
-      if (! mips_elf_hash_table (info)->use_rld_obj_head
-	  && strcmp (name, "__rld_map") == 0)
-	{
-	  asection *s = bfd_get_section_by_name (dynobj, ".rld_map");
-	  BFD_ASSERT (s != NULL);
-	  sym->st_value = s->output_section->vma + s->output_offset;
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, s->contents);
-	  if (mips_elf_hash_table (info)->rld_value == 0)
-	    mips_elf_hash_table (info)->rld_value = sym->st_value;
-	}
-      else if (mips_elf_hash_table (info)->use_rld_obj_head
-	       && strcmp (name, "__rld_obj_head") == 0)
-	{
-	  asection *s = bfd_get_section_by_name (dynobj, ".rld_map");
-	  BFD_ASSERT (s != NULL);
-	  mips_elf_hash_table (info)->rld_value = sym->st_value;
-	}
-    }
-
-  /* If this is a mips16 symbol, force the value to be even.  */
-  if (sym->st_other == STO_MIPS16
-      && (sym->st_value & 1) != 0)
-    --sym->st_value;
-
-  return true;
-}
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-mips_elf_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *sdyn;
-  asection *sgot;
-  struct mips_got_info *g;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  sgot = bfd_get_section_by_name (dynobj, ".got");
-  if (sgot == NULL)
-    g = NULL;
-  else
-    {
-      BFD_ASSERT (elf_section_data (sgot) != NULL);
-      g = (struct mips_got_info *) elf_section_data (sgot)->tdata;
-      BFD_ASSERT (g != NULL);
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      Elf32_External_Dyn *dyncon, *dynconend;
-
-      BFD_ASSERT (sdyn != NULL);
-      BFD_ASSERT (g != NULL);
-
-      dyncon = (Elf32_External_Dyn *) sdyn->contents;
-      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  size_t elemsize;
-	  asection *s;
-
-	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    default:
-	      break;
-
-	    case DT_RELENT:
-	      s = bfd_get_section_by_name (dynobj, ".rel.dyn");
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_val = sizeof (Elf32_External_Rel);
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_STRSZ:
-	      /* Rewrite DT_STRSZ.  */
-	      dyn.d_un.d_val =
-		_bfd_stringtab_size (elf_hash_table (info)->dynstr);
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_PLTGOT:
-	      name = ".got";
-	      goto get_vma;
-	    case DT_MIPS_CONFLICT:
-	      name = ".conflict";
-	      goto get_vma;
-	    case DT_MIPS_LIBLIST:
-	      name = ".liblist";
-	    get_vma:
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_ptr = s->vma;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_RLD_VERSION:
-	      dyn.d_un.d_val = 1; /* XXX */
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_FLAGS:
-	      dyn.d_un.d_val = RHF_NOTPOT; /* XXX */
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_CONFLICTNO:
-	      name = ".conflict";
-	      elemsize = sizeof (Elf32_Conflict);
-	      goto set_elemno;
-
-	    case DT_MIPS_LIBLISTNO:
-	      name = ".liblist";
-	      elemsize = sizeof (Elf32_Lib);
-	    set_elemno:
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      if (s != NULL)
-		{
-		  if (s->_cooked_size != 0)
-		    dyn.d_un.d_val = s->_cooked_size / elemsize;
-		  else
-		    dyn.d_un.d_val = s->_raw_size / elemsize;
-		}
-	      else
-		    dyn.d_un.d_val = 0;
-
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_TIME_STAMP:
-	      time ((time_t *) &dyn.d_un.d_val);
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_ICHECKSUM:
-	      /* XXX FIXME: */
-	      break;
-
-	    case DT_MIPS_IVERSION:
-	      /* XXX FIXME: */
-	      break;
-
-	    case DT_MIPS_BASE_ADDRESS:
-	      s = output_bfd->sections;
-	      BFD_ASSERT (s != NULL);
-	      dyn.d_un.d_ptr = s->vma & ~(0xffff);
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_LOCAL_GOTNO:
-	      dyn.d_un.d_val = g->local_gotno;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_SYMTABNO:
-	      name = ".dynsym";
-	      elemsize = sizeof (Elf32_External_Sym);
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      BFD_ASSERT (s != NULL);
-
-	      if (s->_cooked_size != 0)
-		dyn.d_un.d_val = s->_cooked_size / elemsize;
-	      else
-		dyn.d_un.d_val = s->_raw_size / elemsize;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_UNREFEXTNO:
-#if 0
-	      dyn.d_un.d_val = SIZEOF_MIPS_DYNSYM_SECNAMES;
-#else
-	      dyn.d_un.d_val = bfd_count_sections (output_bfd);
-#endif
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_GOTSYM:
-	      dyn.d_un.d_val = g->global_gotsym;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_HIPAGENO:
-	      dyn.d_un.d_val = g->local_gotno - MIPS_RESERVED_GOTNO;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    case DT_MIPS_RLD_MAP:
-	      dyn.d_un.d_ptr = mips_elf_hash_table (info)->rld_value;
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	      break;
-
-	    }
-	}
-    }
-
-  /* The first entry of the global offset table will be filled at
-     runtime. The second entry will be used by some runtime loaders.
-     This isn't the case of Irix rld. */
-  if (sgot != NULL && sgot->_raw_size > 0)
-    {
-      bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
-      bfd_put_32 (output_bfd, (bfd_vma) 0x80000000, sgot->contents + 4);
-    }
-
-  if (sgot != NULL)
-    elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
-
-  {
-    asection *sdynsym;
-    asection *s;
-    Elf_Internal_Sym sym;
-    Elf32_compact_rel cpt;
-
-    /* Set up the section symbols for the output sections. SGI sets
-       the STT_NOTYPE attribute for these symbols.  Should we do so?  */
-
-    sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
-    if (sdynsym != NULL)
-      {
-#if 0
-	const char *name;
-	const char * const * namep = mips_elf_dynsym_sec_names;
-	unsigned int i;
-	bfd_vma last;
-	long dindx;
-
-	/* We no longer try to restrict the set of sections which get
-           dynamic symbol table entries, since it fails if we have
-           other random sections which need dynamic relocations.  */
-	if (SGI_COMPAT (output_bfd))
-	  {
-	    sym.st_size = 0;
-	    sym.st_name = 0;
-	    sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_NOTYPE);
-	    sym.st_other = 0;
-
-	    i = 0;
-	    last = 0;
-	    dindx = 0;
-	    while ((name = *namep++) != NULL)
-	      {
-		s = bfd_get_section_by_name (output_bfd, name);
-		if (s != NULL)
-		  {
-		    sym.st_value = s->vma;
-		    dindx = elf_section_data (s)->dynindx;
-		    last = s->vma + s->_raw_size;
-		  }
-		else
-		  {
-		    sym.st_value = last;
-		    dindx++;
-		  }
-
-		sym.st_shndx = (i < MIPS_TEXT_DYNSYM_SECNO
-				? SHN_MIPS_TEXT
-				: SHN_MIPS_DATA);
-		++i;
-		sym.st_name =
-		  mips_elf_hash_table (info)->dynsym_sec_strindex[dindx];
-
-		bfd_elf32_swap_symbol_out (output_bfd, &sym,
-					   (((Elf32_External_Sym *)
-					     sdynsym->contents)
-					    + dindx));
-	      }
-
-	    /* Set the sh_info field of the output .dynsym section to
-	       the index of the first global symbol.  */
-	    elf_section_data (sdynsym->output_section)->this_hdr.sh_info =
-	      SIZEOF_MIPS_DYNSYM_SECNAMES;
-	  }
-	else
-#endif /* 0 */
-	  {
-	    sym.st_size = 0;
-	    sym.st_name = 0;
-	    sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-	    sym.st_other = 0;
-
-	    for (s = output_bfd->sections; s != NULL; s = s->next)
-	      {
-		int indx;
-
-		sym.st_value = s->vma;
-
-		indx = elf_section_data (s)->this_idx;
-		BFD_ASSERT (indx > 0);
-		sym.st_shndx = indx;
-
-		bfd_elf32_swap_symbol_out (output_bfd, &sym,
-					   (((Elf32_External_Sym *)
-					     sdynsym->contents)
-					    + elf_section_data (s)->dynindx));
-	      }
-
-	    /* Set the sh_info field of the output .dynsym section to
-	       the index of the first global symbol.  */
-	    elf_section_data (sdynsym->output_section)->this_hdr.sh_info =
-	      bfd_count_sections (output_bfd) + 1;
-	  }
-      }
-
-    if (SGI_COMPAT (output_bfd))
-      {
-	/* Write .compact_rel section out.  */
-	s = bfd_get_section_by_name (dynobj, ".compact_rel");
-	if (s != NULL)
-	  {
-	    cpt.id1 = 1;
-	    cpt.num = s->reloc_count;
-	    cpt.id2 = 2;
-	    cpt.offset = (s->output_section->filepos
-			  + sizeof (Elf32_External_compact_rel));
-	    cpt.reserved0 = 0;
-	    cpt.reserved1 = 0;
-	    bfd_elf32_swap_compact_rel_out (output_bfd, &cpt,
-					    ((Elf32_External_compact_rel *)
-					     s->contents));
-
-	    /* Clean up a dummy stub function entry in .text.  */
-	    s = bfd_get_section_by_name (dynobj, ".stub");
-	    if (s != NULL)
-	      {
-		file_ptr dummy_offset;
-
-		BFD_ASSERT (s->_raw_size >= MIPS_FUNCTION_STUB_SIZE);
-		dummy_offset = s->_raw_size - MIPS_FUNCTION_STUB_SIZE;
-		memset (s->contents + dummy_offset, 0,
-			MIPS_FUNCTION_STUB_SIZE);
-	      }
-	  }
-      }
-
-    /* Clean up a first relocation in .rel.dyn.  */
-    s = bfd_get_section_by_name (dynobj, ".rel.dyn");
-    if (s != NULL && s->_raw_size > 0)
-      memset (s->contents, 0, sizeof (Elf32_External_Rel));
-  }
-
-  return true;
-}
-
-/* This is almost identical to bfd_generic_get_... except that some
-   MIPS relocations need to be handled specially.  Sigh.  */
-
-static bfd_byte *
-elf32_mips_get_relocated_section_contents (abfd, link_info, link_order, data,
-					   relocateable, symbols)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  /* Get enough memory to hold the stuff */
-  bfd *input_bfd = link_order->u.indirect.section->owner;
-  asection *input_section = link_order->u.indirect.section;
-
-  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
-  arelent **reloc_vector = NULL;
-  long reloc_count;
-
-  if (reloc_size < 0)
-    goto error_return;
-
-  reloc_vector = (arelent **) bfd_malloc (reloc_size);
-  if (reloc_vector == NULL && reloc_size != 0)
-    goto error_return;
-
-  /* read in the section */
-  if (!bfd_get_section_contents (input_bfd,
-				 input_section,
-				 (PTR) data,
-				 0,
-				 input_section->_raw_size))
-    goto error_return;
-
-  /* We're not relaxing the section, so just copy the size info */
-  input_section->_cooked_size = input_section->_raw_size;
-  input_section->reloc_done = true;
-
-  reloc_count = bfd_canonicalize_reloc (input_bfd,
-					input_section,
-					reloc_vector,
-					symbols);
-  if (reloc_count < 0)
-    goto error_return;
-
-  if (reloc_count > 0)
-    {
-      arelent **parent;
-      /* for mips */
-      int gp_found;
-      bfd_vma gp = 0x12345678;	/* initialize just to shut gcc up */
-
-      {
-	struct bfd_hash_entry *h;
-	struct bfd_link_hash_entry *lh;
-	/* Skip all this stuff if we aren't mixing formats.  */
-	if (abfd && input_bfd
-	    && abfd->xvec == input_bfd->xvec)
-	  lh = 0;
-	else
-	  {
-	    h = bfd_hash_lookup (&link_info->hash->table, "_gp", false, false);
-	    lh = (struct bfd_link_hash_entry *) h;
-	  }
-      lookup:
-	if (lh)
-	  {
-	    switch (lh->type)
-	      {
-	      case bfd_link_hash_undefined:
-	      case bfd_link_hash_undefweak:
-	      case bfd_link_hash_common:
-		gp_found = 0;
-		break;
-	      case bfd_link_hash_defined:
-	      case bfd_link_hash_defweak:
-		gp_found = 1;
-		gp = lh->u.def.value;
-		break;
-	      case bfd_link_hash_indirect:
-	      case bfd_link_hash_warning:
-		lh = lh->u.i.link;
-		/* @@FIXME  ignoring warning for now */
-		goto lookup;
-	      case bfd_link_hash_new:
-	      default:
-		abort ();
-	      }
-	  }
-	else
-	  gp_found = 0;
-      }
-      /* end mips */
-      for (parent = reloc_vector; *parent != (arelent *) NULL;
-	   parent++)
-	{
-	  char *error_message = (char *) NULL;
-	  bfd_reloc_status_type r;
-
-	  /* Specific to MIPS: Deal with relocation types that require
-	     knowing the gp of the output bfd.  */
-	  asymbol *sym = *(*parent)->sym_ptr_ptr;
-	  if (bfd_is_abs_section (sym->section) && abfd)
-	    {
-	      /* The special_function wouldn't get called anyways.  */
-	    }
-	  else if (!gp_found)
-	    {
-	      /* The gp isn't there; let the special function code
-		 fall over on its own.  */
-	    }
-	  else if ((*parent)->howto->special_function
-		   == _bfd_mips_elf_gprel16_reloc)
-	    {
-	      /* bypass special_function call */
-	      r = gprel16_with_gp (input_bfd, sym, *parent, input_section,
-				   relocateable, (PTR) data, gp);
-	      goto skip_bfd_perform_relocation;
-	    }
-	  /* end mips specific stuff */
-
-	  r = bfd_perform_relocation (input_bfd,
-				      *parent,
-				      (PTR) data,
-				      input_section,
-				      relocateable ? abfd : (bfd *) NULL,
-				      &error_message);
-	skip_bfd_perform_relocation:
-
-	  if (relocateable)
-	    {
-	      asection *os = input_section->output_section;
-
-	      /* A partial link, so keep the relocs */
-	      os->orelocation[os->reloc_count] = *parent;
-	      os->reloc_count++;
-	    }
-
-	  if (r != bfd_reloc_ok)
-	    {
-	      switch (r)
-		{
-		case bfd_reloc_undefined:
-		  if (!((*link_info->callbacks->undefined_symbol)
-			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-			 input_bfd, input_section, (*parent)->address)))
-		    goto error_return;
-		  break;
-		case bfd_reloc_dangerous:
-		  BFD_ASSERT (error_message != (char *) NULL);
-		  if (!((*link_info->callbacks->reloc_dangerous)
-			(link_info, error_message, input_bfd, input_section,
-			 (*parent)->address)))
-		    goto error_return;
-		  break;
-		case bfd_reloc_overflow:
-		  if (!((*link_info->callbacks->reloc_overflow)
-			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-			 (*parent)->howto->name, (*parent)->addend,
-			 input_bfd, input_section, (*parent)->address)))
-		    goto error_return;
-		  break;
-		case bfd_reloc_outofrange:
-		default:
-		  abort ();
-		  break;
-		}
-
-	    }
-	}
-    }
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return data;
-
-error_return:
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return NULL;
-}
-#define bfd_elf32_bfd_get_relocated_section_contents \
-  elf32_mips_get_relocated_section_contents
-
-/* ECOFF swapping routines.  These are used when dealing with the
-   .mdebug section, which is in the ECOFF debugging format.  */
-static const struct ecoff_debug_swap mips_elf32_ecoff_debug_swap =
-{
-  /* Symbol table magic number.  */
-  magicSym,
-  /* Alignment of debugging information.  E.g., 4.  */
-  4,
-  /* Sizes of external symbolic information.  */
-  sizeof (struct hdr_ext),
-  sizeof (struct dnr_ext),
-  sizeof (struct pdr_ext),
-  sizeof (struct sym_ext),
-  sizeof (struct opt_ext),
-  sizeof (struct fdr_ext),
-  sizeof (struct rfd_ext),
-  sizeof (struct ext_ext),
-  /* Functions to swap in external symbolic data.  */
-  ecoff_swap_hdr_in,
-  ecoff_swap_dnr_in,
-  ecoff_swap_pdr_in,
-  ecoff_swap_sym_in,
-  ecoff_swap_opt_in,
-  ecoff_swap_fdr_in,
-  ecoff_swap_rfd_in,
-  ecoff_swap_ext_in,
-  _bfd_ecoff_swap_tir_in,
-  _bfd_ecoff_swap_rndx_in,
-  /* Functions to swap out external symbolic data.  */
-  ecoff_swap_hdr_out,
-  ecoff_swap_dnr_out,
-  ecoff_swap_pdr_out,
-  ecoff_swap_sym_out,
-  ecoff_swap_opt_out,
-  ecoff_swap_fdr_out,
-  ecoff_swap_rfd_out,
-  ecoff_swap_ext_out,
-  _bfd_ecoff_swap_tir_out,
-  _bfd_ecoff_swap_rndx_out,
-  /* Function to read in symbolic data.  */
-  _bfd_mips_elf_read_ecoff_info
-};
-
-#define TARGET_LITTLE_SYM		bfd_elf32_littlemips_vec
-#define TARGET_LITTLE_NAME		"elf32-littlemips"
-#define TARGET_BIG_SYM			bfd_elf32_bigmips_vec
-#define TARGET_BIG_NAME			"elf32-bigmips"
-#define ELF_ARCH			bfd_arch_mips
-#define ELF_MACHINE_CODE		EM_MIPS
-
-/* The SVR4 MIPS ABI says that this should be 0x10000, but Irix 5 uses
-   a value of 0x1000, and we are compatible.  */
-#define ELF_MAXPAGESIZE			0x1000
-
-#define elf_backend_collect		true
-#define elf_backend_type_change_ok	true
-#define elf_backend_can_gc_sections	true
-#define elf_info_to_howto		0
-#define elf_info_to_howto_rel		mips_info_to_howto_rel
-#define elf_backend_sym_is_global	mips_elf_sym_is_global
-#define elf_backend_object_p		mips_elf32_object_p
-#define elf_backend_section_from_shdr	mips_elf32_section_from_shdr
-#define elf_backend_fake_sections	_bfd_mips_elf_fake_sections
-#define elf_backend_section_from_bfd_section \
-					_bfd_mips_elf_section_from_bfd_section
-#define elf_backend_section_processing	mips_elf32_section_processing
-#define elf_backend_symbol_processing	_bfd_mips_elf_symbol_processing
-#define elf_backend_additional_program_headers \
-					mips_elf_additional_program_headers
-#define elf_backend_modify_segment_map	mips_elf_modify_segment_map
-#define elf_backend_final_write_processing \
-					_bfd_mips_elf_final_write_processing
-#define elf_backend_ecoff_debug_swap	&mips_elf32_ecoff_debug_swap
-
-#define bfd_elf32_bfd_is_local_label_name \
-					mips_elf_is_local_label_name
-#define bfd_elf32_find_nearest_line	_bfd_mips_elf_find_nearest_line
-#define bfd_elf32_set_section_contents	_bfd_mips_elf_set_section_contents
-#define bfd_elf32_bfd_link_hash_table_create \
-					mips_elf_link_hash_table_create
-#define bfd_elf32_bfd_final_link	mips_elf_final_link
-#define bfd_elf32_bfd_copy_private_bfd_data \
-					_bfd_mips_elf_copy_private_bfd_data
-#define bfd_elf32_bfd_merge_private_bfd_data \
-					_bfd_mips_elf_merge_private_bfd_data
-#define bfd_elf32_bfd_set_private_flags	_bfd_mips_elf_set_private_flags
-#define bfd_elf32_bfd_print_private_bfd_data \
-					_bfd_mips_elf_print_private_bfd_data
-#define elf_backend_add_symbol_hook	mips_elf_add_symbol_hook
-#define elf_backend_create_dynamic_sections \
-					mips_elf_create_dynamic_sections
-#define elf_backend_check_relocs	mips_elf_check_relocs
-#define elf_backend_adjust_dynamic_symbol \
-					mips_elf_adjust_dynamic_symbol
-#define elf_backend_always_size_sections \
-					mips_elf_always_size_sections
-#define elf_backend_size_dynamic_sections \
-					mips_elf_size_dynamic_sections
-#define elf_backend_relocate_section	mips_elf_relocate_section
-#define elf_backend_link_output_symbol_hook \
-					mips_elf_link_output_symbol_hook
-#define elf_backend_finish_dynamic_symbol \
-					mips_elf_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections \
-					mips_elf_finish_dynamic_sections
-#define elf_backend_gc_mark_hook	mips_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook	mips_elf_gc_sweep_hook
-
-#define elf_backend_got_header_size	(4*MIPS_RESERVED_GOTNO)
-#define elf_backend_plt_header_size	0
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
deleted file mode 100644
index 25bb24ae4f9..00000000000
--- a/bfd/elf32-ppc.c
+++ /dev/null
@@ -1,3848 +0,0 @@
-/* PowerPC-specific support for 32-bit ELF
-   Copyright 1994, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file is based on a preliminary PowerPC ELF ABI.  The
-   information may not match the final PowerPC ELF ABI.  It includes
-   suggestions from the in-progress Embedded PowerPC ABI, and that
-   information may also not match.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/ppc.h"
-
-#define USE_RELA		/* we want RELA relocations, not REL */
-
-
-static reloc_howto_type *ppc_elf_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void ppc_elf_info_to_howto
-  PARAMS ((bfd *abfd, arelent *cache_ptr, Elf32_Internal_Rela *dst));
-static void ppc_elf_howto_init PARAMS ((void));
-static bfd_reloc_status_type ppc_elf_addr16_ha_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean ppc_elf_set_private_flags PARAMS ((bfd *, flagword));
-static boolean ppc_elf_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-static boolean ppc_elf_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-
-static int ppc_elf_additional_program_headers PARAMS ((bfd *));
-static boolean ppc_elf_modify_segment_map PARAMS ((bfd *));
-
-static boolean ppc_elf_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-static boolean ppc_elf_section_from_shdr PARAMS ((bfd *,
-						  Elf32_Internal_Shdr *,
-						  char *));
-static boolean ppc_elf_fake_sections
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *));
-
-static elf_linker_section_t *ppc_elf_create_linker_section
-  PARAMS ((bfd *abfd,
-	   struct bfd_link_info *info,
-	   enum elf_linker_section_enum));
-
-static boolean ppc_elf_check_relocs PARAMS ((bfd *,
-					     struct bfd_link_info *,
-					     asection *,
-					     const Elf_Internal_Rela *));
-
-static asection * ppc_elf_gc_mark_hook PARAMS ((bfd *abfd,
-						struct bfd_link_info *info,
-						Elf_Internal_Rela *rel,
-						struct elf_link_hash_entry *h,
-						Elf_Internal_Sym *sym));
-
-static boolean ppc_elf_gc_sweep_hook PARAMS ((bfd *abfd,
-					      struct bfd_link_info *info,
-					      asection *sec,
-					      const Elf_Internal_Rela *relocs));
-
-static boolean ppc_elf_adjust_dynamic_symbol PARAMS ((struct bfd_link_info *,
-						      struct elf_link_hash_entry *));
-
-static boolean ppc_elf_adjust_dynindx PARAMS ((struct elf_link_hash_entry *, PTR));
-
-static boolean ppc_elf_size_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *));
-
-static boolean ppc_elf_relocate_section PARAMS ((bfd *,
-						 struct bfd_link_info *info,
-						 bfd *,
-						 asection *,
-						 bfd_byte *,
-						 Elf_Internal_Rela *relocs,
-						 Elf_Internal_Sym *local_syms,
-						 asection **));
-
-static boolean ppc_elf_add_symbol_hook  PARAMS ((bfd *,
-						 struct bfd_link_info *,
-						 const Elf_Internal_Sym *,
-						 const char **,
-						 flagword *,
-						 asection **,
-						 bfd_vma *));
-
-static boolean ppc_elf_finish_dynamic_symbol PARAMS ((bfd *,
-						      struct bfd_link_info *,
-						      struct elf_link_hash_entry *,
-						      Elf_Internal_Sym *));
-
-static boolean ppc_elf_finish_dynamic_sections PARAMS ((bfd *, struct bfd_link_info *));
-
-#define BRANCH_PREDICT_BIT 0x200000		/* branch prediction bit for branch taken relocs */
-#define RA_REGISTER_MASK 0x001f0000		/* mask to set RA in memory instructions */
-#define RA_REGISTER_SHIFT 16			/* value to shift register by to insert RA */
-
-/* The name of the dynamic interpreter.  This is put in the .interp
-   section.  */
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
-
-/* The size in bytes of an entry in the procedure linkage table.  */
-#define PLT_ENTRY_SIZE 12
-/* The initial size of the plt reserved for the dynamic linker.  */
-#define PLT_INITIAL_ENTRY_SIZE 72
-/* The size of the gap between entries in the PLT.  */
-#define PLT_SLOT_SIZE 8
-/* The number of single-slot PLT entries (the rest use two slots).  */
-#define PLT_NUM_SINGLE_ENTRIES 8192
-
-
-static reloc_howto_type *ppc_elf_howto_table[ (int)R_PPC_max ];
-
-static reloc_howto_type ppc_elf_howto_raw[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_PPC_NONE,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A standard 32 bit relocation.  */
-  HOWTO (R_PPC_ADDR32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An absolute 26 bit branch; the lower two bits must be zero.
-     FIXME: we don't check that, we just clear them.  */
-  HOWTO (R_PPC_ADDR24,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR24",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x3fffffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A standard 16 bit relocation.  */
-  HOWTO (R_PPC_ADDR16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 16 bit relocation without overflow.  */
-  HOWTO (R_PPC_ADDR16_LO,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR16_LO",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high order 16 bits of an address.  */
-  HOWTO (R_PPC_ADDR16_HI,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR16_HI",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high order 16 bits of an address, plus 1 if the contents of
-     the low 16 bits, treated as a signed number, is negative.	*/
-  HOWTO (R_PPC_ADDR16_HA,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 ppc_elf_addr16_ha_reloc, /* special_function */
-	 "R_PPC_ADDR16_HA",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An absolute 16 bit branch; the lower two bits must be zero.
-     FIXME: we don't check that, we just clear them.  */
-  HOWTO (R_PPC_ADDR14,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR14",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An absolute 16 bit branch, for which bit 10 should be set to
-     indicate that the branch is expected to be taken.	The lower two
-     bits must be zero.	 */
-  HOWTO (R_PPC_ADDR14_BRTAKEN,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR14_BRTAKEN",/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* An absolute 16 bit branch, for which bit 10 should be set to
-     indicate that the branch is not expected to be taken.  The lower
-     two bits must be zero.  */
-  HOWTO (R_PPC_ADDR14_BRNTAKEN, /* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_ADDR14_BRNTAKEN",/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xfffc,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A relative 26 bit branch; the lower two bits must be zero.	 */
-  HOWTO (R_PPC_REL24,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_REL24",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x3fffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 16 bit branch; the lower two bits must be zero.	 */
-  HOWTO (R_PPC_REL14,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_REL14",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xfffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 16 bit branch.	Bit 10 should be set to indicate that
-     the branch is expected to be taken.  The lower two bits must be
-     zero.  */
-  HOWTO (R_PPC_REL14_BRTAKEN,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_REL14_BRTAKEN",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xfffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A relative 16 bit branch.	Bit 10 should be set to indicate that
-     the branch is not expected to be taken.  The lower two bits must
-     be zero.  */
-  HOWTO (R_PPC_REL14_BRNTAKEN,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_REL14_BRNTAKEN",/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xfffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* Like R_PPC_ADDR16, but referring to the GOT table entry for the
-     symbol.  */
-  HOWTO (R_PPC_GOT16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_GOT16",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Like R_PPC_ADDR16_LO, but referring to the GOT table entry for
-     the symbol.  */
-  HOWTO (R_PPC_GOT16_LO,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_GOT16_LO",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Like R_PPC_ADDR16_HI, but referring to the GOT table entry for
-     the symbol.  */
-  HOWTO (R_PPC_GOT16_HI,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_GOT16_HI",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		 /* pcrel_offset */
-
-  /* Like R_PPC_ADDR16_HA, but referring to the GOT table entry for
-     the symbol.  */
-  HOWTO (R_PPC_GOT16_HA,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 ppc_elf_addr16_ha_reloc, /* special_function */
-	 "R_PPC_GOT16_HA",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Like R_PPC_REL24, but referring to the procedure linkage table
-     entry for the symbol.  */
-  HOWTO (R_PPC_PLTREL24,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,  /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_PLTREL24",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x3fffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* This is used only by the dynamic linker.  The symbol should exist
-     both in the object being run and in some shared library.  The
-     dynamic linker copies the data addressed by the symbol from the
-     shared library into the object, because the object being
-     run has to have the data at some particular address.  */
-  HOWTO (R_PPC_COPY,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	 /* special_function */
-	 "R_PPC_COPY",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Like R_PPC_ADDR32, but used when setting global offset table
-     entries.  */
-  HOWTO (R_PPC_GLOB_DAT,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	 /* special_function */
-	 "R_PPC_GLOB_DAT",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Marks a procedure linkage table entry for a symbol.  */
-  HOWTO (R_PPC_JMP_SLOT,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	 /* special_function */
-	 "R_PPC_JMP_SLOT",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Used only by the dynamic linker.  When the object is run, this
-     longword is set to the load address of the object, plus the
-     addend.  */
-  HOWTO (R_PPC_RELATIVE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	 /* special_function */
-	 "R_PPC_RELATIVE",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Like R_PPC_REL24, but uses the value of the symbol within the
-     object rather than the final value.  Normally used for
-     _GLOBAL_OFFSET_TABLE_.  */
-  HOWTO (R_PPC_LOCAL24PC,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_LOCAL24PC",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x3fffffc,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* Like R_PPC_ADDR32, but may be unaligned.  */
-  HOWTO (R_PPC_UADDR32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_UADDR32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Like R_PPC_ADDR16, but may be unaligned.  */
-  HOWTO (R_PPC_UADDR16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_UADDR16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32-bit PC relative */
-  HOWTO (R_PPC_REL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_REL32",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 32-bit relocation to the symbol's procedure linkage table.
-     FIXME: not supported. */
-  HOWTO (R_PPC_PLT32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_PLT32",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32-bit PC relative relocation to the symbol's procedure linkage table.
-     FIXME: not supported. */
-  HOWTO (R_PPC_PLTREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_PLTREL32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* Like R_PPC_ADDR16_LO, but referring to the PLT table entry for
-     the symbol.  */
-  HOWTO (R_PPC_PLT16_LO,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_PLT16_LO",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Like R_PPC_ADDR16_HI, but referring to the PLT table entry for
-     the symbol.  */
-  HOWTO (R_PPC_PLT16_HI,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_PLT16_HI",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		 /* pcrel_offset */
-
-  /* Like R_PPC_ADDR16_HA, but referring to the PLT table entry for
-     the symbol.  */
-  HOWTO (R_PPC_PLT16_HA,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 ppc_elf_addr16_ha_reloc, /* special_function */
-	 "R_PPC_PLT16_HA",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A sign-extended 16 bit value relative to _SDA_BASE_, for use with
-     small data items.  */
-  HOWTO (R_PPC_SDAREL16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_SDAREL16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32-bit section relative relocation. */
-  HOWTO (R_PPC_SECTOFF,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_SECTOFF",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 16-bit lower half section relative relocation. */
-  HOWTO (R_PPC_SECTOFF_LO,	  /* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_SECTOFF_LO",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16-bit upper half section relative relocation. */
-  HOWTO (R_PPC_SECTOFF_HI,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_SECTOFF_HI",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		 /* pcrel_offset */
-
-  /* 16-bit upper half adjusted section relative relocation. */
-  HOWTO (R_PPC_SECTOFF_HA,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 ppc_elf_addr16_ha_reloc, /* special_function */
-	 "R_PPC_SECTOFF_HA",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The remaining relocs are from the Embedded ELF ABI, and are not
-     in the SVR4 ELF ABI.  */
-
-  /* 32 bit value resulting from the addend minus the symbol */
-  HOWTO (R_PPC_EMB_NADDR32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_NADDR32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit value resulting from the addend minus the symbol */
-  HOWTO (R_PPC_EMB_NADDR16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_NADDR16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit value resulting from the addend minus the symbol */
-  HOWTO (R_PPC_EMB_NADDR16_LO,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_ADDR16_LO",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high order 16 bits of the addend minus the symbol */
-  HOWTO (R_PPC_EMB_NADDR16_HI,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_NADDR16_HI", /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high order 16 bits of the result of the addend minus the address,
-     plus 1 if the contents of the low 16 bits, treated as a signed number,
-     is negative.  */
-  HOWTO (R_PPC_EMB_NADDR16_HA,	/* type */
-	 16,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 ppc_elf_addr16_ha_reloc, /* special_function */
-	 "R_PPC_EMB_NADDR16_HA", /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit value resulting from allocating a 4 byte word to hold an
-     address in the .sdata section, and returning the offset from
-     _SDA_BASE_ for that relocation */
-  HOWTO (R_PPC_EMB_SDAI16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_SDAI16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit value resulting from allocating a 4 byte word to hold an
-     address in the .sdata2 section, and returning the offset from
-     _SDA2_BASE_ for that relocation */
-  HOWTO (R_PPC_EMB_SDA2I16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_SDA2I16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A sign-extended 16 bit value relative to _SDA2_BASE_, for use with
-     small data items.	 */
-  HOWTO (R_PPC_EMB_SDA2REL,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_SDA2REL",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Relocate against either _SDA_BASE_ or _SDA2_BASE_, filling in the 16 bit
-     signed offset from the appropriate base, and filling in the register
-     field with the appropriate register (0, 2, or 13).  */
-  HOWTO (R_PPC_EMB_SDA21,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_SDA21",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Relocation not handled: R_PPC_EMB_MRKREF */
-  /* Relocation not handled: R_PPC_EMB_RELSEC16 */
-  /* Relocation not handled: R_PPC_EMB_RELST_LO */
-  /* Relocation not handled: R_PPC_EMB_RELST_HI */
-  /* Relocation not handled: R_PPC_EMB_RELST_HA */
-  /* Relocation not handled: R_PPC_EMB_BIT_FLD */
-
-  /* PC relative relocation against either _SDA_BASE_ or _SDA2_BASE_, filling
-     in the 16 bit signed offset from the appropriate base, and filling in the
-     register field with the appropriate register (0, 2, or 13).  */
-  HOWTO (R_PPC_EMB_RELSDA,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_EMB_RELSDA",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_PPC_GNU_VTINHERIT,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "R_PPC_GNU_VTINHERIT",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_PPC_GNU_VTENTRY,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "R_PPC_GNU_VTENTRY",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Phony reloc to handle AIX style TOC entries */
-  HOWTO (R_PPC_TOC16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_PPC_TOC16",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-};
-
-
-/* Initialize the ppc_elf_howto_table, so that linear accesses can be done.  */
-
-static void
-ppc_elf_howto_init ()
-{
-  unsigned int i, type;
-
-  for (i = 0; i < sizeof (ppc_elf_howto_raw) / sizeof (ppc_elf_howto_raw[0]); i++)
-    {
-      type = ppc_elf_howto_raw[i].type;
-      BFD_ASSERT (type < sizeof(ppc_elf_howto_table) / sizeof(ppc_elf_howto_table[0]));
-      ppc_elf_howto_table[type] = &ppc_elf_howto_raw[i];
-    }
-}
-
-
-/* This function handles relaxing for the PPC with option --mpc860c0[=<n>].
-
-   The MPC860, revision C0 or earlier contains a bug in the die.
-   If all of the following conditions are true, the next instruction
-   to be executed *may* be treated as a no-op.
-   1/ A forward branch is executed.
-   2/ The branch is predicted as not taken.
-   3/ The branch is taken.
-   4/ The branch is located in the last 5 words of a page.
-      (The EOP limit is 5 by default but may be specified as any value from 1-10.)
-   
-   Our software solution is to detect these problematic branches in a
-   linker pass and modify them as follows:
-   1/ Unconditional branches - Since these are always predicted taken,
-      there is no problem and no action is required.
-   2/ Conditional backward branches - No problem, no action required.
-   3/ Conditional forward branches - Ensure that the "inverse prediction
-      bit" is set (ensure it is predicted taken).
-   4/ Conditional register branches - Ensure that the "y bit" is set
-      (ensure it is predicted taken).
-*/
-
-/* Sort sections by address.  */
-
-static int
-ppc_elf_sort_rela (arg1, arg2)
-    const void *arg1;
-    const void *arg2;
-{
-  const Elf_Internal_Rela **rela1 = (const Elf_Internal_Rela**) arg1;
-  const Elf_Internal_Rela **rela2 = (const Elf_Internal_Rela**) arg2;
-
-  /* Sort by offset. */
-  return ((*rela1)->r_offset - (*rela2)->r_offset);
-}
-
-static boolean
-ppc_elf_relax_section (abfd, isec, link_info, again)
-    bfd *abfd;
-    asection *isec;
-    struct bfd_link_info *link_info;
-    boolean *again;
-{
-#define PAGESIZE 0x1000
-
-  bfd_byte *contents = NULL;
-  bfd_byte *free_contents = NULL;
-  Elf_Internal_Rela *internal_relocs = NULL;
-  Elf_Internal_Rela *free_relocs = NULL;
-  Elf_Internal_Rela **rela_comb = NULL;
-  int comb_curr, comb_count;
-
-  /* We never have to do this more than once per input section. */
-  *again = false;
-
-  /* If needed, initialize this section's cooked size.  */
-  if (isec->_cooked_size == 0)
-      isec->_cooked_size = isec->_raw_size;
-
-  /* We're only interested in text sections which overlap the
-  troublesome area at the end of a page. */
-  if (link_info->mpc860c0 && (isec->flags & SEC_CODE) && isec->_cooked_size)
-    {
-      bfd_vma dot, end_page, end_section;
-      boolean section_modified;
-
-      /* Get the section contents. */
-      /* Get cached copy if it exists.  */
-      if (elf_section_data (isec)->this_hdr.contents != NULL)
-	  contents = elf_section_data (isec)->this_hdr.contents;
-      else
-	{
-	  /* Go get them off disk.  */
-	  contents = (bfd_byte *) bfd_malloc (isec->_raw_size);
-	  if (contents == NULL)
-	      goto error_return;
-	  free_contents = contents;
-
-	  if (! bfd_get_section_contents (abfd, isec, contents,
-					  (file_ptr) 0, isec->_raw_size))
-	      goto error_return;
-	}
-
-      comb_curr = 0;
-      comb_count = 0;
-      if (isec->reloc_count)
-        {
-          unsigned n;
-
-          /* Get a copy of the native relocations.  */
-          internal_relocs = _bfd_elf32_link_read_relocs (
-    	    abfd, isec, (PTR) NULL, (Elf_Internal_Rela *) NULL, 
-    	    link_info->keep_memory);
-          if (internal_relocs == NULL)
-    	      goto error_return;
-          if (! link_info->keep_memory)
-    	      free_relocs = internal_relocs;
-    
-          /* Setup a faster access method for the reloc info we need. */
-          rela_comb = (Elf_Internal_Rela**)
-	    bfd_malloc (isec->reloc_count*sizeof(Elf_Internal_Rela*));
-          if (rela_comb == NULL)
-              goto error_return;
-          for (n=0; n<isec->reloc_count; ++n)
-            {
-              long r_type;
-    
-              r_type = ELF32_R_TYPE (internal_relocs[n].r_info);
-              if (r_type < 0 || r_type >= (int)R_PPC_max)
-                  goto error_return;
-    
-              /* Prologue constants are sometimes present in the ".text"
-              sections and they can be identified by their associated relocation.
-              We don't want to process those words and some others which
-              can also be identified by their relocations.  However, not all
-              conditional branches will have a relocation so we will
-              only ignore words that 1) have a reloc, and 2) the reloc
-              is not applicable to a conditional branch.
-              The array rela_comb is built here for use in the EOP scan loop. */
-              switch (r_type)
-                {
-                case R_PPC_ADDR14_BRNTAKEN:     /* absolute, predicted not taken */
-                case R_PPC_REL14:               /* relative cond. br. */
-                case R_PPC_REL14_BRNTAKEN:      /* rel. cond. br., predicted not taken */
-                  /* We should check the instruction. */
-                  break;
-                default:
-                  /* The word is not a conditional branch - ignore it. */
-                  rela_comb[comb_count++] = &internal_relocs[n];
-                  break;
-                }
-            }
-          if (comb_count > 1)
-              qsort (rela_comb, (size_t) comb_count, sizeof (int), ppc_elf_sort_rela);
-        }
-
-      /* Enumerate each EOP region that overlaps this section. */
-      end_section = isec->vma + isec->_cooked_size;
-      dot = end_page = (isec->vma | (PAGESIZE - 1)) + 1;
-      dot -= link_info->mpc860c0;
-      section_modified = false;
-      if (dot < isec->vma)      /* Increment the start position if this section */
-          dot = isec->vma;      /* begins in the middle of its first EOP region. */
-      for (;
-           dot < end_section;
-           dot += PAGESIZE, end_page += PAGESIZE)
-        {
-
-          /* Check each word in this EOP region. */
-          for (; dot < end_page; dot += 4)
-            {
-              bfd_vma isec_offset;
-              unsigned long insn;
-              boolean skip, modified;
-
-              /* Don't process this word if there is a relocation for it and
-              the relocation indicates the word is not a conditional branch. */
-              skip = false;
-              isec_offset = dot - isec->vma;
-              for (; comb_curr<comb_count; ++comb_curr)
-                {
-                  bfd_vma r_offset;
-
-                  r_offset = rela_comb[comb_curr]->r_offset;
-                  if (r_offset >= isec_offset)
-                    {
-                      if (r_offset == isec_offset) skip = true;
-                      break;
-                    }
-                }
-              if (skip) continue;
-
-              /* Check the current word for a problematic conditional branch. */
-#define BO0(insn) ((insn) & 0x02000000)
-#define BO2(insn) ((insn) & 0x00800000)
-#define BO4(insn) ((insn) & 0x00200000)
-              insn = (unsigned long) bfd_get_32 (abfd, contents + isec_offset);
-              modified = false;
-              if ((insn & 0xFc000000) == 0x40000000)
-                {
-                  /* Instruction is BCx */
-                  if ((!BO0(insn) || !BO2(insn)) && !BO4(insn))
-                    {
-                      bfd_vma target;
-                      /* This branch is predicted as "normal".
-                      If this is a forward branch, it is problematic. */
-
-                      target = insn & 0x0000Fffc;               /*extract*/
-                      target = (target ^ 0x8000) - 0x8000;      /*sign extend*/
-                      if ((insn & 0x00000002) == 0)
-                          target += dot;                        /*convert to abs*/
-                      if (target > dot)
-                        {
-                          insn |= 0x00200000;   /* set the prediction bit */
-                          modified = true;
-                        }
-                    }
-                }
-              else if ((insn & 0xFc00Fffe) == 0x4c000420)
-                {
-                  /* Instruction is BCCTRx */
-                  if ((!BO0(insn) || !BO2(insn)) && !BO4(insn))
-		    {
-		      /* This branch is predicted as not-taken.
-		      If this is a forward branch, it is problematic.
-                      Since we can't tell statically if it will branch forward,
-                      always set the prediction bit. */
-                      insn |= 0x00200000;   /* set the prediction bit */
-                      modified = true;
-		    }
-                }
-              else if ((insn & 0xFc00Fffe) == 0x4c000020)
-                {
-                  /* Instruction is BCLRx */
-                  if ((!BO0(insn) || !BO2(insn)) && !BO4(insn))
-		    {
-		      /* This branch is predicted as not-taken.
-		      If this is a forward branch, it is problematic.
-                      Since we can't tell statically if it will branch forward,
-                      always set the prediction bit. */
-                      insn |= 0x00200000;   /* set the prediction bit */
-                      modified = true;
-		    }
-                }
-#undef BO0
-#undef BO2
-#undef BO4
-              if (modified)
-	        {
-                  bfd_put_32 (abfd, insn, contents + isec_offset);
-		  section_modified = true;
-	        }
-            }
-        }
-      if (section_modified)
-	{
-	  elf_section_data (isec)->this_hdr.contents = contents;
-	  free_contents = NULL;
-	}
-    }
-
-  if (rela_comb != NULL)
-    {
-      free (rela_comb);
-      rela_comb = NULL;
-    }
-
-  if (free_relocs != NULL)
-    {
-      free (free_relocs);
-      free_relocs = NULL;
-    }
-
-  if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_contents);
-      else
-	{
-	  /* Cache the section contents for elf_link_input_bfd.  */
-	  elf_section_data (isec)->this_hdr.contents = contents;
-	}
-      free_contents = NULL;
-    }
-
-  return true;
-
-error_return:
-  if (rela_comb != NULL)
-    free (rela_comb);
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  return false;
-}
-
-
-static reloc_howto_type *
-ppc_elf_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  enum elf_ppc_reloc_type ppc_reloc = R_PPC_NONE;
-
-  if (!ppc_elf_howto_table[R_PPC_ADDR32])
-    /* Initialize howto table if needed */
-    ppc_elf_howto_init ();
-
-  switch ((int)code)
-    {
-    default:
-      return (reloc_howto_type *)NULL;
-
-    case BFD_RELOC_NONE:		ppc_reloc = R_PPC_NONE;			break;
-    case BFD_RELOC_32:			ppc_reloc = R_PPC_ADDR32;		break;
-    case BFD_RELOC_PPC_BA26:		ppc_reloc = R_PPC_ADDR24;		break;
-    case BFD_RELOC_16:			ppc_reloc = R_PPC_ADDR16;		break;
-    case BFD_RELOC_LO16:		ppc_reloc = R_PPC_ADDR16_LO;		break;
-    case BFD_RELOC_HI16:		ppc_reloc = R_PPC_ADDR16_HI;		break;
-    case BFD_RELOC_HI16_S:		ppc_reloc = R_PPC_ADDR16_HA;		break;
-    case BFD_RELOC_PPC_BA16:		ppc_reloc = R_PPC_ADDR14;		break;
-    case BFD_RELOC_PPC_BA16_BRTAKEN:	ppc_reloc = R_PPC_ADDR14_BRTAKEN;	break;
-    case BFD_RELOC_PPC_BA16_BRNTAKEN:	ppc_reloc = R_PPC_ADDR14_BRNTAKEN;	break;
-    case BFD_RELOC_PPC_B26:		ppc_reloc = R_PPC_REL24;		break;
-    case BFD_RELOC_PPC_B16:		ppc_reloc = R_PPC_REL14;		break;
-    case BFD_RELOC_PPC_B16_BRTAKEN:	ppc_reloc = R_PPC_REL14_BRTAKEN;	break;
-    case BFD_RELOC_PPC_B16_BRNTAKEN:	ppc_reloc = R_PPC_REL14_BRNTAKEN;	break;
-    case BFD_RELOC_16_GOTOFF:		ppc_reloc = R_PPC_GOT16;		break;
-    case BFD_RELOC_LO16_GOTOFF:		ppc_reloc = R_PPC_GOT16_LO;		break;
-    case BFD_RELOC_HI16_GOTOFF:		ppc_reloc = R_PPC_GOT16_HI;		break;
-    case BFD_RELOC_HI16_S_GOTOFF:	ppc_reloc = R_PPC_GOT16_HA;		break;
-    case BFD_RELOC_24_PLT_PCREL:	ppc_reloc = R_PPC_PLTREL24;		break;
-    case BFD_RELOC_PPC_COPY:		ppc_reloc = R_PPC_COPY;			break;
-    case BFD_RELOC_PPC_GLOB_DAT:	ppc_reloc = R_PPC_GLOB_DAT;		break;
-    case BFD_RELOC_PPC_LOCAL24PC:	ppc_reloc = R_PPC_LOCAL24PC;		break;
-    case BFD_RELOC_32_PCREL:		ppc_reloc = R_PPC_REL32;		break;
-    case BFD_RELOC_32_PLTOFF:		ppc_reloc = R_PPC_PLT32;		break;
-    case BFD_RELOC_32_PLT_PCREL:	ppc_reloc = R_PPC_PLTREL32;		break;
-    case BFD_RELOC_LO16_PLTOFF:		ppc_reloc = R_PPC_PLT16_LO;		break;
-    case BFD_RELOC_HI16_PLTOFF:		ppc_reloc = R_PPC_PLT16_HI;		break;
-    case BFD_RELOC_HI16_S_PLTOFF:	ppc_reloc = R_PPC_PLT16_HA;		break;
-    case BFD_RELOC_GPREL16:		ppc_reloc = R_PPC_SDAREL16;		break;
-    case BFD_RELOC_32_BASEREL:		ppc_reloc = R_PPC_SECTOFF;		break;
-    case BFD_RELOC_LO16_BASEREL:	ppc_reloc = R_PPC_SECTOFF_LO;		break;
-    case BFD_RELOC_HI16_BASEREL:	ppc_reloc = R_PPC_SECTOFF_HI;		break;
-    case BFD_RELOC_HI16_S_BASEREL:	ppc_reloc = R_PPC_SECTOFF_HA;		break;
-    case BFD_RELOC_CTOR:		ppc_reloc = R_PPC_ADDR32;		break;
-    case BFD_RELOC_PPC_TOC16:		ppc_reloc = R_PPC_TOC16;		break;
-    case BFD_RELOC_PPC_EMB_NADDR32:	ppc_reloc = R_PPC_EMB_NADDR32;		break;
-    case BFD_RELOC_PPC_EMB_NADDR16:	ppc_reloc = R_PPC_EMB_NADDR16;		break;
-    case BFD_RELOC_PPC_EMB_NADDR16_LO:	ppc_reloc = R_PPC_EMB_NADDR16_LO;	break;
-    case BFD_RELOC_PPC_EMB_NADDR16_HI:	ppc_reloc = R_PPC_EMB_NADDR16_HI;	break;
-    case BFD_RELOC_PPC_EMB_NADDR16_HA:	ppc_reloc = R_PPC_EMB_NADDR16_HA;	break;
-    case BFD_RELOC_PPC_EMB_SDAI16:	ppc_reloc = R_PPC_EMB_SDAI16;		break;
-    case BFD_RELOC_PPC_EMB_SDA2I16:	ppc_reloc = R_PPC_EMB_SDA2I16;		break;
-    case BFD_RELOC_PPC_EMB_SDA2REL:	ppc_reloc = R_PPC_EMB_SDA2REL;		break;
-    case BFD_RELOC_PPC_EMB_SDA21:	ppc_reloc = R_PPC_EMB_SDA21;		break;
-    case BFD_RELOC_PPC_EMB_MRKREF:	ppc_reloc = R_PPC_EMB_MRKREF;		break;
-    case BFD_RELOC_PPC_EMB_RELSEC16:	ppc_reloc = R_PPC_EMB_RELSEC16;		break;
-    case BFD_RELOC_PPC_EMB_RELST_LO:	ppc_reloc = R_PPC_EMB_RELST_LO;		break;
-    case BFD_RELOC_PPC_EMB_RELST_HI:	ppc_reloc = R_PPC_EMB_RELST_HI;		break;
-    case BFD_RELOC_PPC_EMB_RELST_HA:	ppc_reloc = R_PPC_EMB_RELST_HA;		break;
-    case BFD_RELOC_PPC_EMB_BIT_FLD:	ppc_reloc = R_PPC_EMB_BIT_FLD;		break;
-    case BFD_RELOC_PPC_EMB_RELSDA:	ppc_reloc = R_PPC_EMB_RELSDA;		break;
-    case BFD_RELOC_VTABLE_INHERIT:	ppc_reloc = R_PPC_GNU_VTINHERIT;	break;
-    case BFD_RELOC_VTABLE_ENTRY:	ppc_reloc = R_PPC_GNU_VTENTRY;		break;
-    }
-
-  return ppc_elf_howto_table[ (int)ppc_reloc ];
-};
-
-/* Set the howto pointer for a PowerPC ELF reloc.  */
-
-static void
-ppc_elf_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf32_Internal_Rela *dst;
-{
-  if (!ppc_elf_howto_table[ R_PPC_ADDR32 ])	/* Initialize howto table if needed */
-    ppc_elf_howto_init ();
-
-  BFD_ASSERT (ELF32_R_TYPE (dst->r_info) < (unsigned int) R_PPC_max);
-  cache_ptr->howto = ppc_elf_howto_table[ELF32_R_TYPE (dst->r_info)];
-}
-
-/* Handle the R_PPC_ADDR16_HA reloc.  */
-
-static bfd_reloc_status_type
-ppc_elf_addr16_ha_reloc (abfd, reloc_entry, symbol, data, input_section,
-			 output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-
-  if (output_bfd != NULL)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-
-  reloc_entry->addend += (relocation & 0x8000) << 1;
-
-  return bfd_reloc_continue;
-}
-
-/* Function to set whether a module needs the -mrelocatable bit set. */
-
-static boolean
-ppc_elf_set_private_flags (abfd, flags)
-     bfd *abfd;
-     flagword flags;
-{
-  BFD_ASSERT (!elf_flags_init (abfd)
-	      || elf_elfheader (abfd)->e_flags == flags);
-
-  elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
-}
-
-/* Copy backend specific data from one object module to another */
-static boolean
-ppc_elf_copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  BFD_ASSERT (!elf_flags_init (obfd)
-	      || elf_elfheader (obfd)->e_flags == elf_elfheader (ibfd)->e_flags);
-
-  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = true;
-  return true;
-}
-
-/* Merge backend specific data from an object file to the output
-   object file when linking */
-static boolean
-ppc_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  flagword old_flags;
-  flagword new_flags;
-  boolean error;
-
-  /* Check if we have the same endianess */
-  if (ibfd->xvec->byteorder != obfd->xvec->byteorder
-      && obfd->xvec->byteorder != BFD_ENDIAN_UNKNOWN)
-    {
-      const char *msg;
-
-      if (bfd_big_endian (ibfd))
-	msg = _("%s: compiled for a big endian system and target is little endian");
-      else
-	msg = _("%s: compiled for a little endian system and target is big endian");
-
-      (*_bfd_error_handler) (msg, bfd_get_filename (ibfd));
-
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  new_flags = elf_elfheader (ibfd)->e_flags;
-  old_flags = elf_elfheader (obfd)->e_flags;
-  if (!elf_flags_init (obfd))	/* First call, no flags set */
-    {
-      elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = new_flags;
-    }
-
-  else if (new_flags == old_flags)	/* Compatible flags are ok */
-    ;
-
-  else					/* Incompatible flags */
-    {
-      /* Warn about -mrelocatable mismatch.  Allow -mrelocatable-lib to be linked
-         with either.  */
-      error = false;
-      if ((new_flags & EF_PPC_RELOCATABLE) != 0
-	  && (old_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0)
-	{
-	  error = true;
-	  (*_bfd_error_handler)
-	    (_("%s: compiled with -mrelocatable and linked with modules compiled normally"),
-	     bfd_get_filename (ibfd));
-	}
-      else if ((new_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0
-	       && (old_flags & EF_PPC_RELOCATABLE) != 0)
-	{
-	  error = true;
-	  (*_bfd_error_handler)
-	    (_("%s: compiled normally and linked with modules compiled with -mrelocatable"),
-	     bfd_get_filename (ibfd));
-	}
-
-      /* The output is -mrelocatable-lib iff both the input files are.  */
-      if (! (new_flags & EF_PPC_RELOCATABLE_LIB))
-	elf_elfheader (obfd)->e_flags &= ~EF_PPC_RELOCATABLE_LIB;
-
-      /* The output is -mrelocatable iff it can't be -mrelocatable-lib,
-         but each input file is either -mrelocatable or -mrelocatable-lib.  */
-      if (! (elf_elfheader (obfd)->e_flags & EF_PPC_RELOCATABLE_LIB)
-	  && (new_flags & (EF_PPC_RELOCATABLE_LIB | EF_PPC_RELOCATABLE))
-	  && (old_flags & (EF_PPC_RELOCATABLE_LIB | EF_PPC_RELOCATABLE)))
-	elf_elfheader (obfd)->e_flags |= EF_PPC_RELOCATABLE;
-
-      /* Do not warn about eabi vs. V.4 mismatch, just or in the bit if any module uses it */
-      elf_elfheader (obfd)->e_flags |= (new_flags & EF_PPC_EMB);
-
-      new_flags &= ~ (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB | EF_PPC_EMB);
-      old_flags &= ~ (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB | EF_PPC_EMB);
-
-      /* Warn about any other mismatches */
-      if (new_flags != old_flags)
-	{
-	  error = true;
-	  (*_bfd_error_handler)
-	    (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
-	     bfd_get_filename (ibfd), (long)new_flags, (long)old_flags);
-	}
-
-      if (error)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-    }
-
-  return true;
-}
-
-
-/* Handle a PowerPC specific section when reading an object file.  This
-   is called when elfcode.h finds a section with an unknown type.  */
-
-static boolean
-ppc_elf_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf32_Internal_Shdr *hdr;
-     char *name;
-{
-  asection *newsect;
-  flagword flags;
-
-  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
-
-  newsect = hdr->bfd_section;
-  flags = bfd_get_section_flags (abfd, newsect);
-  if (hdr->sh_flags & SHF_EXCLUDE)
-    flags |= SEC_EXCLUDE;
-
-  if (hdr->sh_type == SHT_ORDERED)
-    flags |= SEC_SORT_ENTRIES;
-
-  bfd_set_section_flags (abfd, newsect, flags);
-  return true;
-}
-
-
-/* Set up any other section flags and such that may be necessary.  */
-
-static boolean
-ppc_elf_fake_sections (abfd, shdr, asect)
-     bfd *abfd;
-     Elf32_Internal_Shdr *shdr;
-     asection *asect;
-{
-  if ((asect->flags & SEC_EXCLUDE) != 0)
-    shdr->sh_flags |= SHF_EXCLUDE;
-
-  if ((asect->flags & SEC_SORT_ENTRIES) != 0)
-    shdr->sh_type = SHT_ORDERED;
-
-  return true;
-}
-
-
-/* Create a special linker section */
-static elf_linker_section_t *
-ppc_elf_create_linker_section (abfd, info, which)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     enum elf_linker_section_enum which;
-{
-  bfd *dynobj = elf_hash_table (info)->dynobj;
-  elf_linker_section_t *lsect;
-
-  /* Record the first bfd section that needs the special section */
-  if (!dynobj)
-    dynobj = elf_hash_table (info)->dynobj = abfd;
-
-  /* If this is the first time, create the section */
-  lsect = elf_linker_section (dynobj, which);
-  if (!lsect)
-    {
-      elf_linker_section_t defaults;
-      static elf_linker_section_t zero_section;
-
-      defaults = zero_section;
-      defaults.which = which;
-      defaults.hole_written_p = false;
-      defaults.alignment = 2;
-
-      /* Both of these sections are (technically) created by the user
-	 putting data in them, so they shouldn't be marked
-	 SEC_LINKER_CREATED.
-
-	 The linker creates them so it has somewhere to attach their
-	 respective symbols. In fact, if they were empty it would
-	 be OK to leave the symbol set to 0 (or any random number), because
-	 the appropriate register should never be used.  */
-      defaults.flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-			| SEC_IN_MEMORY);
-
-      switch (which)
-	{
-	default:
-	  (*_bfd_error_handler) (_("%s: Unknown special linker type %d"),
-				 bfd_get_filename (abfd),
-				 (int)which);
-
-	  bfd_set_error (bfd_error_bad_value);
-	  return (elf_linker_section_t *)0;
-
-	case LINKER_SECTION_SDATA:	/* .sdata/.sbss section */
-	  defaults.name		  = ".sdata";
-	  defaults.rel_name	  = ".rela.sdata";
-	  defaults.bss_name	  = ".sbss";
-	  defaults.sym_name	  = "_SDA_BASE_";
-	  defaults.sym_offset	  = 32768;
-	  break;
-
-	case LINKER_SECTION_SDATA2:	/* .sdata2/.sbss2 section */
-	  defaults.name		  = ".sdata2";
-	  defaults.rel_name	  = ".rela.sdata2";
-	  defaults.bss_name	  = ".sbss2";
-	  defaults.sym_name	  = "_SDA2_BASE_";
-	  defaults.sym_offset	  = 32768;
-	  defaults.flags	 |= SEC_READONLY;
-	  break;
-	}
-
-      lsect = _bfd_elf_create_linker_section (abfd, info, which, &defaults);
-    }
-
-  return lsect;
-}
-
-
-/* If we have a non-zero sized .sbss2 or .PPC.EMB.sbss0 sections, we need to bump up
-   the number of section headers.  */
-
-static int
-ppc_elf_additional_program_headers (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  int ret;
-
-  ret = 0;
-
-  s = bfd_get_section_by_name (abfd, ".interp");
-  if (s != NULL)
-    ++ret;
-
-  s = bfd_get_section_by_name (abfd, ".sbss2");
-  if (s != NULL && (s->flags & SEC_LOAD) != 0 && s->_raw_size > 0)
-    ++ret;
-
-  s = bfd_get_section_by_name (abfd, ".PPC.EMB.sbss0");
-  if (s != NULL && (s->flags & SEC_LOAD) != 0 && s->_raw_size > 0)
-    ++ret;
-
-  return ret;
-}
-
-/* Modify the segment map if needed */
-
-static boolean
-ppc_elf_modify_segment_map (abfd)
-     bfd *abfd;
-{
-  return true;
-}
-
-/* We have to create .dynsbss and .rela.sbss here so that they get mapped
-   to output sections (just like _bfd_elf_create_dynamic_sections has
-   to create .dynbss and .rela.bss).  */
-
-static boolean
-ppc_elf_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  register asection *s;
-  flagword flags;
-
-  if (!_bfd_elf_create_dynamic_sections(abfd, info))
-    return false;
-
-  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-	   | SEC_LINKER_CREATED);
-
-  s = bfd_make_section (abfd, ".dynsbss");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, SEC_ALLOC))
-    return false;
-
-  if (! info->shared)
-    {
-      s = bfd_make_section (abfd, ".rela.sbss");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-    }
-  return true;
-}
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-ppc_elf_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  bfd *dynobj = elf_hash_table (info)->dynobj;
-  asection *s;
-  unsigned int power_of_two;
-  bfd_vma plt_offset;
-
-#ifdef DEBUG
-  fprintf (stderr, "ppc_elf_adjust_dynamic_symbol called for %s\n", h->root.root.string);
-#endif
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
-
-  /* If this is a function, put it in the procedure linkage table.  We
-     will fill in the contents of the procedure linkage table later,
-     when we know the address of the .got section.  */
-  if (h->type == STT_FUNC
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
-    {
-      if (! elf_hash_table (info)->dynamic_sections_created
-	  || ((!info->shared || info->symbolic || h->dynindx == -1)
-	      && (h->elf_link_hash_flags
-		  & ELF_LINK_HASH_DEF_REGULAR) != 0)
-	  || (info->shared && h->plt.refcount <= 0))
-	{
-	  /* A PLT entry is not required/allowed when:
-
-	     1. We are not using ld.so; because then the PLT entry
-	     can't be set up, so we can't use one.
-
-	     2. We know for certain that a symbol is defined in
-	     this object, because this object is the application,
-	     is linked with -Bsymbolic, or because the symbol is local.
-
-	     3. GC has rendered the entry unused.
-	     Note, however, that in an executable all references to the
-	     symbol go to the PLT, so we can't turn it off in that case.
-	     ??? The correct thing to do here is to reference count
-	     all uses of the symbol, not just those to the GOT or PLT.  */
-	  h->plt.offset = (bfd_vma) -1;
-	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  return true;
-	}
-
-      /* Make sure this symbol is output as a dynamic symbol.  */
-      if (h->dynindx == -1)
-	{
-	  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-      BFD_ASSERT (h->dynindx != -1);
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-      /* If this is the first .plt entry, make room for the special
-	 first entry.  */
-      if (s->_raw_size == 0)
-	s->_raw_size += PLT_INITIAL_ENTRY_SIZE;
-
-      /* The PowerPC PLT is actually composed of two parts, the first part
-	 is 2 words (for a load and a jump), and then there is a remaining
-	 word available at the end.  */
-      plt_offset = (PLT_INITIAL_ENTRY_SIZE
-		    + (PLT_SLOT_SIZE
-		       * ((s->_raw_size - PLT_INITIAL_ENTRY_SIZE)
-			  / PLT_ENTRY_SIZE)));
-
-      /* If this symbol is not defined in a regular file, and we are
-	 not generating a shared library, then set the symbol to this
-	 location in the .plt.  This is required to make function
-	 pointers compare as equal between the normal executable and
-	 the shared library.  */
-      if (! info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  h->root.u.def.section = s;
-	  h->root.u.def.value = plt_offset;
-	}
-
-      h->plt.offset = plt_offset;
-
-      /* Make room for this entry.  After the 8192nd entry, room
-         for two entries is allocated.  */
-      if ((s->_raw_size - PLT_INITIAL_ENTRY_SIZE) / PLT_ENTRY_SIZE
-	  >= PLT_NUM_SINGLE_ENTRIES)
-	s->_raw_size += 2 * PLT_ENTRY_SIZE;
-      else
-	s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .rela.plt section.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf32_External_Rela);
-
-      return true;
-    }
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  /* If we are creating a shared library, we must presume that the
-     only references to the symbol are via the global offset table.
-     For such cases we need not do anything here; the relocations will
-     be handled correctly by relocate_section.  */
-  if (info->shared)
-    return true;
-
-  /* We must allocate the symbol in our .dynbss section, which will
-     become part of the .bss section of the executable.  There will be
-     an entry for this symbol in the .dynsym section.  The dynamic
-     object will contain position independent code, so all references
-     from the dynamic object to this symbol will go through the global
-     offset table.  The dynamic linker will use the .dynsym entry to
-     determine the address it must put in the global offset table, so
-     both the dynamic object and the regular object will refer to the
-     same memory location for the variable.
-
-     Of course, if the symbol is sufficiently small, we must instead
-     allocate it in .sbss.  FIXME: It would be better to do this if and
-     only if there were actually SDAREL relocs for that symbol.  */
-
-  if (h->size <= elf_gp_size (dynobj))
-    s = bfd_get_section_by_name (dynobj, ".dynsbss");
-  else
-    s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
-
-  /* We must generate a R_PPC_COPY reloc to tell the dynamic linker to
-     copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rela.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-    {
-      asection *srel;
-
-      if (h->size <= elf_gp_size (dynobj))
-	srel = bfd_get_section_by_name (dynobj, ".rela.sbss");
-      else
-	srel = bfd_get_section_by_name (dynobj, ".rela.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf32_External_Rela);
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
-    }
-
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 4)
-    power_of_two = 4;
-
-  /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
-    {
-      if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
-    }
-
-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->_raw_size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->_raw_size += h->size;
-
-  return true;
-}
-
-
-/* Increment the index of a dynamic symbol by a given amount.  Called
-   via elf_link_hash_traverse.  */
-
-static boolean
-ppc_elf_adjust_dynindx (h, cparg)
-     struct elf_link_hash_entry *h;
-     PTR cparg;
-{
-  int *cp = (int *) cparg;
-
-#ifdef DEBUG
-  fprintf (stderr, "ppc_elf_adjust_dynindx called, h->dynindx = %d, *cp = %d\n", h->dynindx, *cp);
-#endif
-
-  if (h->dynindx != -1)
-    h->dynindx += *cp;
-
-  return true;
-}
-
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-ppc_elf_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *s;
-  boolean plt;
-  boolean relocs;
-  boolean reltext;
-
-#ifdef DEBUG
-  fprintf (stderr, "ppc_elf_size_dynamic_sections called\n");
-#endif
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (! info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-    }
-  else
-    {
-      /* We may have created entries in the .rela.got, .rela.sdata, and
-	 .rela.sdata2 sections.  However, if we are not creating the
-	 dynamic sections, we will not actually use these entries.  Reset
-	 the size of .rela.got, et al, which will cause it to get
-	 stripped from the output file below.  */
-      static char *rela_sections[] = { ".rela.got", ".rela.sdata",
-				       ".rela.sdata2", ".rela.sbss",
-				       (char *)0 };
-      char **p;
-
-      for (p = rela_sections; *p != (char *)0; p++)
-	{
-	  s = bfd_get_section_by_name (dynobj, *p);
-	  if (s != NULL)
-	    s->_raw_size = 0;
-	}
-    }
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  plt = false;
-  relocs = false;
-  reltext = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      boolean strip;
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-	continue;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strcmp (name, ".plt") == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* Strip this section if we don't need it; see the
-                 comment below.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      /* Remember whether there is a PLT.  */
-	      plt = true;
-	    }
-	}
-      else if (strncmp (name, ".rela", 5) == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is mostly to handle .rela.bss and
-		 .rela.plt.  We must create both sections in
-		 create_dynamic_sections, because they must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      asection *target;
-	      const char *outname;
-
-	      /* Remember whether there are any relocation sections. */
-	      relocs = true;
-
-	      /* If this relocation section applies to a read only
-		 section, then we probably need a DT_TEXTREL entry.  */
-	      outname = bfd_get_section_name (output_bfd,
-					      s->output_section);
-	      target = bfd_get_section_by_name (output_bfd, outname + 5);
-	      if (target != NULL
-		  && (target->flags & SEC_READONLY) != 0
-		  && (target->flags & SEC_ALLOC) != 0)
-		reltext = true;
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
-	    }
-	}
-      else if (strcmp (name, ".got") != 0
-	       && strcmp (name, ".sdata") != 0
-	       && strcmp (name, ".sdata2") != 0)
-	{
-	  /* It's not one of our sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	{
-	  _bfd_strip_section_from_output (s);
-	  continue;
-	}
-
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in ppc_elf_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (! info->shared)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
-	}
-
-      if (plt)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_PLTGOT, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_JMPREL, 0))
-	    return false;
-	}
-
-      if (relocs)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_RELA, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_RELASZ, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_RELAENT,
-						sizeof (Elf32_External_Rela)))
-	    return false;
-	}
-
-      if (reltext)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-    }
-
-  /* If we are generating a shared library, we generate a section
-     symbol for each output section.  These are local symbols, which
-     means that they must come first in the dynamic symbol table.
-     That means we must increment the dynamic symbol index of every
-     other dynamic symbol.
-
-     FIXME: We assume that there will never be relocations to
-     locations in linker-created sections that do not have
-     externally-visible names. Instead, we should work out precisely
-     which sections relocations are targetted at.  */
-  if (info->shared)
-    {
-      int c;
-
-      for (c = 0, s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  if ((s->flags & SEC_LINKER_CREATED) != 0
-	      || (s->flags & SEC_ALLOC) == 0)
-	    {
-	      elf_section_data (s)->dynindx = -1;
-	      continue;
-	    }
-
-	  /* These symbols will have no names, so we don't need to
-	     fiddle with dynstr_index.  */
-
-	  elf_section_data (s)->dynindx = c + 1;
-
-	  c++;
-	}
-
-      elf_link_hash_traverse (elf_hash_table (info),
-			      ppc_elf_adjust_dynindx,
-			      (PTR) &c);
-      elf_hash_table (info)->dynsymcount += c;
-    }
-
-  return true;
-}
-
-
-/* Look through the relocs for a section during the first phase, and
-   allocate space in the global offset table or procedure linkage
-   table.  */
-
-static boolean
-ppc_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-  bfd_signed_vma *local_got_refcounts;
-  elf_linker_section_t *sdata;
-  elf_linker_section_t *sdata2;
-  asection *sreloc;
-  asection *sgot = NULL;
-  asection *srelgot = NULL;
-
-  if (info->relocateable)
-    return true;
-
-#ifdef DEBUG
-  fprintf (stderr, "ppc_elf_check_relocs called for section %s in %s\n",
-	   bfd_get_section_name (abfd, sec),
-	   bfd_get_filename (abfd));
-#endif
-
-  /* Create the linker generated sections all the time so that the
-     special symbols are created.  */
-
-  if ((sdata = elf_linker_section (abfd, LINKER_SECTION_SDATA)) == NULL)
-    {
-      sdata = ppc_elf_create_linker_section (abfd, info, LINKER_SECTION_SDATA);
-      if (!sdata)
-	return false;
-    }
-
-
-  if ((sdata2 = elf_linker_section (abfd, LINKER_SECTION_SDATA2)) == NULL)
-    {
-      sdata2 = ppc_elf_create_linker_section (abfd, info, LINKER_SECTION_SDATA2);
-      if (!sdata2)
-	return false;
-    }
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
-
-  sreloc = NULL;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-      /* If a relocation refers to _GLOBAL_OFFSET_TABLE_, create the .got.
-	 This shows up in particular in an R_PPC_ADDR32 in the eabi
-	 startup code.  */
-      if (h && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	{
-	  if (sgot == NULL)
-	    {
-	      if (dynobj == NULL)
-		elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-	}
-
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	/* GOT16 relocations */
-	case R_PPC_GOT16:
-	case R_PPC_GOT16_LO:
-	case R_PPC_GOT16_HI:
-	case R_PPC_GOT16_HA:
-	  /* This symbol requires a global offset table entry.  */
-
-	  if (sgot == NULL)
-	    {
-	      if (dynobj == NULL)
-		elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (srelgot == NULL
-	      && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
-	  if (h != NULL)
-	    {
-	      if (h->got.refcount == -1)
-		{
-		  /* Make sure this symbol is output as a dynamic symbol.  */
-		  if (h->dynindx == -1)
-		    if (!bfd_elf32_link_record_dynamic_symbol (info, h))
-		      return false;
-
-		  /* Allocate space in the .got.  */
-		  sgot->_raw_size += 4;
-		  /* Allocate relocation space.  */
-		  srelgot->_raw_size += sizeof (Elf32_External_Rela);
-
-		  h->got.refcount = 1;
-		}
-	      else
-		h->got.refcount++;
-	    }
-	  else
-	    {
-	      /* This is a global offset table entry for a local symbol.  */
-	      if (local_got_refcounts == NULL)
-		{
-		  size_t size;
-
-		  size = symtab_hdr->sh_info * sizeof (bfd_signed_vma);
-		  local_got_refcounts = (bfd_signed_vma *)
-		    bfd_alloc (abfd, size);
-		  if (local_got_refcounts == NULL)
-		    return false;
-		  elf_local_got_refcounts (abfd) = local_got_refcounts;
-		  memset (local_got_refcounts, -1, size);
-		}
-	      if (local_got_refcounts[r_symndx] == -1)
-		{
-		  sgot->_raw_size += 4;
-
-		  /* If we are generating a shared object, we need to
-                     output a R_PPC_RELATIVE reloc so that the
-                     dynamic linker can adjust this GOT entry.  */
-		  if (info->shared)
-		    srelgot->_raw_size += sizeof (Elf32_External_Rela);
-
-		  local_got_refcounts[r_symndx] = 1;
-		}
-	      else
-		local_got_refcounts[r_symndx]++;
-	    }
-	  break;
-
-	/* Indirect .sdata relocation */
-	case R_PPC_EMB_SDAI16:
-	  if (info->shared)
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: relocation %s cannot be used when making a shared object"),
-		bfd_get_filename (abfd), "R_PPC_EMB_SDAI16"));
-	       return false;
-	    }
-
-	  if (srelgot == NULL && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
-	  if (!bfd_elf32_create_pointer_linker_section (abfd, info, sdata, h, rel))
-	    return false;
-
-	  break;
-
-	/* Indirect .sdata2 relocation */
-	case R_PPC_EMB_SDA2I16:
-	  if (info->shared)
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: relocation %s cannot be used when making a shared object"),
-		bfd_get_filename (abfd), "R_PPC_EMB_SDA2I16"));
-	      return false;
-	    }
-
-	  if (srelgot == NULL && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
-	  if (!bfd_elf32_create_pointer_linker_section (abfd, info, sdata2, h, rel))
-	    return false;
-
-	  break;
-
-	case R_PPC_SDAREL16:
-	case R_PPC_EMB_SDA2REL:
-	case R_PPC_EMB_SDA21:
-	  if (info->shared)
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: relocation %s cannot be used when making a shared object"),
-		bfd_get_filename (abfd),
-		ppc_elf_howto_table[(int)ELF32_R_TYPE (rel->r_info)]->name));
-	      return false;
-	    }
-	  break;
-
-	case R_PPC_PLT32:
-	case R_PPC_PLTREL24:
-	case R_PPC_PLT16_LO:
-	case R_PPC_PLT16_HI:
-	case R_PPC_PLT16_HA:
-#ifdef DEBUG
-	  fprintf (stderr, "Reloc requires a PLT entry\n");
-#endif
-	  /* This symbol requires a procedure linkage table entry.  We
-             actually build the entry in adjust_dynamic_symbol,
-             because this might be a case of linking PIC code without
-             linking in any dynamic objects, in which case we don't
-             need to generate a procedure linkage table after all.  */
-
-	  if (h == NULL)
-	    {
-	      /* It does not make sense to have a procedure linkage
-                 table entry for a local symbol.  */
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-
-	  /* Make sure this symbol is output as a dynamic symbol.  */
-	  if (h->dynindx == -1)
-	    {
-	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
-	    }
-	  if (h->plt.refcount == -1)
-	    {
-	      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-	      h->plt.refcount = 1;
-	    }
-	  else
-	    h->plt.refcount++;
-	  break;
-
-	  /* The following relocations don't need to propagate the
-	     relocation if linking a shared object since they are
-	     section relative.  */
-	case R_PPC_SECTOFF:
-	case R_PPC_SECTOFF_LO:
-	case R_PPC_SECTOFF_HI:
-	case R_PPC_SECTOFF_HA:
-	  break;
-
-	  /* This refers only to functions defined in the shared library */
-	case R_PPC_LOCAL24PC:
-	  break;
-
-	  /* This relocation describes the C++ object vtable hierarchy.
-	     Reconstruct it for later use during GC.  */
-	case R_PPC_GNU_VTINHERIT:
-	  if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-	    return false;
-	  break;
-
-	  /* This relocation describes which C++ vtable entries are actually
-	     used.  Record for later use during GC.  */
-	case R_PPC_GNU_VTENTRY:
-	  if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-	    return false;
-	  break;
-
-	  /* When creating a shared object, we must copy these
-	     relocs into the output file.  We create a reloc
-	     section in dynobj and make room for the reloc.  */
-	case R_PPC_REL24:
-	case R_PPC_REL14:
-	case R_PPC_REL14_BRTAKEN:
-	case R_PPC_REL14_BRNTAKEN:
-	case R_PPC_REL32:
-	  if (h == NULL
-	      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	    break;
-	  /* fall through */
-
-	default:
-	  if (info->shared)
-	    {
-#ifdef DEBUG
-	      fprintf (stderr, "ppc_elf_check_relocs need to create relocation for %s\n",
-		       (h && h->root.root.string) ? h->root.root.string : "<unknown>");
-#endif
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (abfd,
-			   elf_elfheader (abfd)->e_shstrndx,
-			   elf_section_data (sec)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (abfd, sec),
-					 name + 5) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  if (sreloc == NULL)
-		    {
-		      flagword flags;
-
-		      sreloc = bfd_make_section (dynobj, name);
-		      flags = (SEC_HAS_CONTENTS | SEC_READONLY
-			       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-		      if ((sec->flags & SEC_ALLOC) != 0)
-			flags |= SEC_ALLOC | SEC_LOAD;
-		      if (sreloc == NULL
-			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
-			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
-		    }
-		}
-
-	      sreloc->_raw_size += sizeof (Elf32_External_Rela);
-
-	      /* FIXME: We should here do what the m68k and i386
-		 backends do: if the reloc is pc-relative, record it
-		 in case it turns out that the reloc is unnecessary
-		 because the symbol is forced local by versioning or
-		 we are linking with -Bdynamic.  Fortunately this
-		 case is not frequent.  */
-	    }
-
-	  break;
-	}
-    }
-
-  return true;
-}
-
-/* Return the section that should be marked against GC for a given
-   relocation.  */
-
-static asection *
-ppc_elf_gc_mark_hook (abfd, info, rel, h, sym)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     Elf_Internal_Rela *rel;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_PPC_GNU_VTINHERIT:
-	case R_PPC_GNU_VTENTRY:
-	  break;
-
-	default:
-	  switch (h->root.type)
-	    {
-	    case bfd_link_hash_defined:
-	    case bfd_link_hash_defweak:
-	      return h->root.u.def.section;
-
-	    case bfd_link_hash_common:
-	      return h->root.u.c.p->section;
-
-	    default:
-	      break;
-	    }
-	}
-    }
-  else
-    {
-      if (!(elf_bad_symtab (abfd)
-	    && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-	  && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-		&& sym->st_shndx != SHN_COMMON))
-	{
-	  return bfd_section_from_elf_index (abfd, sym->st_shndx);
-	}
-    }
-
-  return NULL;
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-
-static boolean
-ppc_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
-  const Elf_Internal_Rela *rel, *relend;
-  unsigned long r_symndx;
-  struct elf_link_hash_entry *h;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; rel++)
-    switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_PPC_GOT16:
-      case R_PPC_GOT16_LO:
-      case R_PPC_GOT16_HI:
-      case R_PPC_GOT16_HA:
-	r_symndx = ELF32_R_SYM (rel->r_info);
-	if (r_symndx >= symtab_hdr->sh_info)
-	  {
-	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	    if (h->got.refcount > 0)
-	      h->got.refcount--;
-	  }
-	else
-	  {
-	    if (local_got_refcounts[r_symndx] > 0)
-	      local_got_refcounts[r_symndx]--;
-	  }
-        break;
-
-      case R_PPC_PLT32:
-      case R_PPC_PLTREL24:
-      case R_PPC_PLT16_LO:
-      case R_PPC_PLT16_HI:
-      case R_PPC_PLT16_HA:
-	r_symndx = ELF32_R_SYM (rel->r_info);
-	if (r_symndx >= symtab_hdr->sh_info)
-	  {
-	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	    if (h->plt.refcount > 0)
-	      h->plt.refcount--;
-	  }
-	break;
-
-      default:
-	break;
-      }
-
-  return true;
-}
-
-/* Hook called by the linker routine which adds symbols from an object
-   file.  We use it to put .comm items in .sbss, and not .bss.  */
-
-/*ARGSUSED*/
-static boolean
-ppc_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const Elf_Internal_Sym *sym;
-     const char **namep;
-     flagword *flagsp;
-     asection **secp;
-     bfd_vma *valp;
-{
-  if (sym->st_shndx == SHN_COMMON
-      && !info->relocateable
-      && sym->st_size <= (bfd_vma) bfd_get_gp_size (abfd))
-    {
-      /* Common symbols less than or equal to -G nn bytes are automatically
-	 put into .sdata.  */
-      elf_linker_section_t *sdata
-	= ppc_elf_create_linker_section (abfd, info, LINKER_SECTION_SDATA);
-
-      if (!sdata->bss_section)
-	{
-	  /* We don't go through bfd_make_section, because we don't
-             want to attach this common section to DYNOBJ.  The linker
-             will move the symbols to the appropriate output section
-             when it defines common symbols.  */
-	  sdata->bss_section = ((asection *)
-				bfd_zalloc (abfd, sizeof (asection)));
-	  if (sdata->bss_section == NULL)
-	    return false;
-	  sdata->bss_section->name = sdata->bss_name;
-	  sdata->bss_section->flags = SEC_IS_COMMON;
-	  sdata->bss_section->output_section = sdata->bss_section;
-	  sdata->bss_section->symbol =
-	    (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-	  sdata->bss_section->symbol_ptr_ptr =
-	    (asymbol **) bfd_zalloc (abfd, sizeof (asymbol *));
-	  if (sdata->bss_section->symbol == NULL
-	      || sdata->bss_section->symbol_ptr_ptr == NULL)
-	    return false;
-	  sdata->bss_section->symbol->name = sdata->bss_name;
-	  sdata->bss_section->symbol->flags = BSF_SECTION_SYM;
-	  sdata->bss_section->symbol->section = sdata->bss_section;
-	  *sdata->bss_section->symbol_ptr_ptr = sdata->bss_section->symbol;
-	}
-
-      *secp = sdata->bss_section;
-      *valp = sym->st_size;
-    }
-
-  return true;
-}
-
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-ppc_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  bfd *dynobj;
-
-#ifdef DEBUG
-  fprintf (stderr, "ppc_elf_finish_dynamic_symbol called for %s",
-	   h->root.root.string);
-#endif
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (h->plt.offset != (bfd_vma) -1)
-    {
-      asection *splt;
-      asection *srela;
-      Elf_Internal_Rela rela;
-      bfd_vma reloc_index;
-
-#ifdef DEBUG
-      fprintf (stderr, ", plt_offset = %d", h->plt.offset);
-#endif
-
-      /* This symbol has an entry in the procedure linkage table.  Set
-         it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (splt != NULL && srela != NULL);
-
-      /* We don't need to fill in the .plt.  The ppc dynamic linker
-	 will fill it in.  */
-
-      /* Fill in the entry in the .rela.plt section.  */
-      rela.r_offset = (splt->output_section->vma
-		       + splt->output_offset
-		       + h->plt.offset);
-      rela.r_info = ELF32_R_INFO (h->dynindx, R_PPC_JMP_SLOT);
-      rela.r_addend = 0;
-
-      reloc_index = (h->plt.offset - PLT_INITIAL_ENTRY_SIZE) / PLT_SLOT_SIZE;
-      if (reloc_index > PLT_NUM_SINGLE_ENTRIES)
-	reloc_index -= (reloc_index - PLT_NUM_SINGLE_ENTRIES) / 2;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + reloc_index));
-
-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
-	  sym->st_shndx = SHN_UNDEF;
-	}
-    }
-
-  if (h->got.offset != (bfd_vma) -1)
-    {
-      asection *sgot;
-      asection *srela;
-      Elf_Internal_Rela rela;
-
-      /* This symbol has an entry in the global offset table.  Set it
-         up.  */
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srela = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (sgot != NULL && srela != NULL);
-
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
-		       + (h->got.offset &~ 1));
-
-      /* If this is a -Bsymbolic link, and the symbol is defined
-	 locally, we just want to emit a RELATIVE reloc.  The entry in
-	 the global offset table will already have been initialized in
-	 the relocate_section function.  */
-      if (info->shared
-	  && (info->symbolic || h->dynindx == -1)
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
-	{
-	  rela.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE);
-	  rela.r_addend = (h->root.u.def.value
-			   + h->root.u.def.section->output_section->vma
-			   + h->root.u.def.section->output_offset);
-	}
-      else
-	{
-	  BFD_ASSERT((h->got.offset & 1) == 0);
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	  rela.r_info = ELF32_R_INFO (h->dynindx, R_PPC_GLOB_DAT);
-	  rela.r_addend = 0;
-	}
-
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + srela->reloc_count));
-      ++srela->reloc_count;
-    }
-
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
-    {
-      asection *s;
-      Elf_Internal_Rela rela;
-
-      /* This symbols needs a copy reloc.  Set it up.  */
-
-#ifdef DEBUG
-      fprintf (stderr, ", copy");
-#endif
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      if (h->size <= elf_gp_size (dynobj))
-	s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				     ".rela.sbss");
-      else
-	s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				     ".rela.bss");
-      BFD_ASSERT (s != NULL);
-
-      rela.r_offset = (h->root.u.def.value
-		       + h->root.u.def.section->output_section->vma
-		       + h->root.u.def.section->output_offset);
-      rela.r_info = ELF32_R_INFO (h->dynindx, R_PPC_COPY);
-      rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) s->contents
-				  + s->reloc_count));
-      ++s->reloc_count;
-    }
-
-#ifdef DEBUG
-  fprintf (stderr, "\n");
-#endif
-
-  /* Mark some specially defined symbols as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0
-      || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-
-  return true;
-}
-
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-ppc_elf_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  asection *sdyn;
-  bfd *dynobj = elf_hash_table (info)->dynobj;
-  asection *sgot = bfd_get_section_by_name (dynobj, ".got");
-
-#ifdef DEBUG
-  fprintf (stderr, "ppc_elf_finish_dynamic_sections called\n");
-#endif
-
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      asection *splt;
-      Elf32_External_Dyn *dyncon, *dynconend;
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (splt != NULL && sdyn != NULL);
-
-      dyncon = (Elf32_External_Dyn *) sdyn->contents;
-      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  boolean size;
-
-	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    case DT_PLTGOT:   name = ".plt";	  size = false; break;
-	    case DT_PLTRELSZ: name = ".rela.plt"; size = true;  break;
-	    case DT_JMPREL:   name = ".rela.plt"; size = false; break;
-	    default:	      name = NULL;	  size = false; break;
-	    }
-
-	  if (name != NULL)
-	    {
-	      asection *s;
-
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      if (s == NULL)
-		dyn.d_un.d_val = 0;
-	      else
-		{
-		  if (! size)
-		    dyn.d_un.d_ptr = s->vma;
-		  else
-		    {
-		      if (s->_cooked_size != 0)
-			dyn.d_un.d_val = s->_cooked_size;
-		      else
-			dyn.d_un.d_val = s->_raw_size;
-		    }
-		}
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	    }
-	}
-    }
-
-  /* Add a blrl instruction at _GLOBAL_OFFSET_TABLE_-4 so that a function can
-     easily find the address of the _GLOBAL_OFFSET_TABLE_.  */
-  if (sgot)
-    {
-      unsigned char *contents = sgot->contents;
-      bfd_put_32 (output_bfd, 0x4e800021 /* blrl */, contents);
-
-      if (sdyn == NULL)
-	bfd_put_32 (output_bfd, (bfd_vma) 0, contents+4);
-      else
-	bfd_put_32 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    contents+4);
-
-      elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
-    }
-
-  if (info->shared)
-    {
-      asection *sdynsym;
-      asection *s;
-      Elf_Internal_Sym sym;
-      int maxdindx = 0;
-
-      /* Set up the section symbols for the output sections.  */
-
-      sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (sdynsym != NULL);
-
-      sym.st_size = 0;
-      sym.st_name = 0;
-      sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-      sym.st_other = 0;
-
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  int indx, dindx;
-
-	  sym.st_value = s->vma;
-
-	  indx = elf_section_data (s)->this_idx;
-	  dindx = elf_section_data (s)->dynindx;
-	  if (dindx != -1)
-	    {
-	      BFD_ASSERT(indx > 0);
-	      BFD_ASSERT(dindx > 0);
-
-	      if (dindx > maxdindx)
-		maxdindx = dindx;
-
-	      sym.st_shndx = indx;
-
-	      bfd_elf32_swap_symbol_out (output_bfd, &sym,
-					 (PTR) (((Elf32_External_Sym *)
-						 sdynsym->contents)
-						+ dindx));
-	    }
-	}
-
-      /* Set the sh_info field of the output .dynsym section to the
-         index of the first global symbol.  */
-      elf_section_data (sdynsym->output_section)->this_hdr.sh_info =
-	maxdindx + 1;
-    }
-
-  return true;
-}
-
-
-/* The RELOCATE_SECTION function is called by the ELF backend linker
-   to handle the relocations for a section.
-
-   The relocs are always passed as Rela structures; if the section
-   actually uses Rel structures, the r_addend field will always be
-   zero.
-
-   This function is responsible for adjust the section contents as
-   necessary, and (if using Rela relocs and generating a
-   relocateable output file) adjusting the reloc addend as
-   necessary.
-
-   This function does not have to worry about setting the reloc
-   address or the reloc symbol index.
-
-   LOCAL_SYMS is a pointer to the swapped in local symbols.
-
-   LOCAL_SECTIONS is an array giving the section in the input file
-   corresponding to the st_shndx field of each local symbol.
-
-   The global hash table entry for the global symbols can be found
-   via elf_sym_hashes (input_bfd).
-
-   When generating relocateable output, this function must handle
-   STB_LOCAL/STT_SECTION symbols specially.  The output symbol is
-   going to be the section symbol corresponding to the output
-   section, which means that the addend must be adjusted
-   accordingly.  */
-
-static boolean
-ppc_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			  contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr		  = &elf_tdata (input_bfd)->symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (input_bfd);
-  bfd *dynobj				  = elf_hash_table (info)->dynobj;
-  elf_linker_section_t *sdata		  = (dynobj) ? elf_linker_section (dynobj, LINKER_SECTION_SDATA)  : NULL;
-  elf_linker_section_t *sdata2		  = (dynobj) ? elf_linker_section (dynobj, LINKER_SECTION_SDATA2) : NULL;
-  Elf_Internal_Rela *rel		  = relocs;
-  Elf_Internal_Rela *relend		  = relocs + input_section->reloc_count;
-  asection *sreloc			  = NULL;
-  asection *splt;
-  asection *sgot;
-  bfd_vma *local_got_offsets;
-  boolean ret				  = true;
-  long insn;
-
-#ifdef DEBUG
-  fprintf (stderr, "ppc_elf_relocate_section called for %s section %s, %ld relocations%s\n",
-	   bfd_get_filename (input_bfd),
-	   bfd_section_name(input_bfd, input_section),
-	   (long)input_section->reloc_count,
-	   (info->relocateable) ? " (relocatable)" : "");
-#endif
-
-  if (!ppc_elf_howto_table[ R_PPC_ADDR32 ])	/* Initialize howto table if needed */
-    ppc_elf_howto_init ();
-
-  local_got_offsets = elf_local_got_offsets (input_bfd);
-
-  splt = sgot = NULL;
-  if (dynobj != NULL)
-    {
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-    }
-
-  for (; rel < relend; rel++)
-    {
-      enum elf_ppc_reloc_type r_type	= (enum elf_ppc_reloc_type)ELF32_R_TYPE (rel->r_info);
-      bfd_vma offset			= rel->r_offset;
-      bfd_vma addend			= rel->r_addend;
-      bfd_reloc_status_type r		= bfd_reloc_other;
-      Elf_Internal_Sym *sym		= (Elf_Internal_Sym *)0;
-      asection *sec			= (asection *)0;
-      struct elf_link_hash_entry *h	= (struct elf_link_hash_entry *)0;
-      const char *sym_name		= (const char *)0;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      bfd_vma relocation;
-
-      /* Unknown relocation handling */
-      if ((unsigned)r_type >= (unsigned)R_PPC_max || !ppc_elf_howto_table[(int)r_type])
-	{
-	  (*_bfd_error_handler) (_("%s: unknown relocation type %d"),
-				 bfd_get_filename (input_bfd),
-				 (int)r_type);
-
-	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
-	  continue;
-	}
-
-      howto = ppc_elf_howto_table[(int)r_type];
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if ((unsigned)ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  addend = rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-#ifdef DEBUG
-	  fprintf (stderr, "\ttype = %s (%d), symbol index = %ld, offset = %ld, addend = %ld\n",
-		   howto->name,
-		   (int)r_type,
-		   r_symndx,
-		   (long)offset,
-		   (long)addend);
-#endif
-	  continue;
-	}
-
-      /* This is a final link.  */
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  sym_name = "<local symbol>";
-
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  sym_name = h->root.root.string;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      if ((r_type == R_PPC_PLT32
-		   && h->plt.offset != (bfd_vma) -1)
-		  || (r_type == R_PPC_LOCAL24PC
-		      && sec->output_section == NULL)
-		  || ((r_type == R_PPC_GOT16
-		       || r_type == R_PPC_GOT16_LO
-		       || r_type == R_PPC_GOT16_HI
-		       || r_type == R_PPC_GOT16_HA)
-		      && elf_hash_table (info)->dynamic_sections_created
-		      && (! info->shared
-			  || (! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		  || (info->shared
-		      && ((! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0)
-		      && (input_section->flags & SEC_ALLOC) != 0
-		      && (r_type == R_PPC_ADDR32
-			  || r_type == R_PPC_ADDR24
-			  || r_type == R_PPC_ADDR16
-			  || r_type == R_PPC_ADDR16_LO
-			  || r_type == R_PPC_ADDR16_HI
-			  || r_type == R_PPC_ADDR16_HA
-			  || r_type == R_PPC_ADDR14
-			  || r_type == R_PPC_ADDR14_BRTAKEN
-			  || r_type == R_PPC_ADDR14_BRNTAKEN
-			  || r_type == R_PPC_PLTREL24
-			  || r_type == R_PPC_COPY
-			  || r_type == R_PPC_GLOB_DAT
-			  || r_type == R_PPC_JMP_SLOT
-			  || r_type == R_PPC_UADDR32
-			  || r_type == R_PPC_UADDR16
-			  || r_type == R_PPC_SDAREL16
-			  || r_type == R_PPC_EMB_NADDR32
-			  || r_type == R_PPC_EMB_NADDR16
-			  || r_type == R_PPC_EMB_NADDR16_LO
-			  || r_type == R_PPC_EMB_NADDR16_HI
-			  || r_type == R_PPC_EMB_NADDR16_HA
-			  || r_type == R_PPC_EMB_SDAI16
-			  || r_type == R_PPC_EMB_SDA2I16
-			  || r_type == R_PPC_EMB_SDA2REL
-			  || r_type == R_PPC_EMB_SDA21
-			  || r_type == R_PPC_EMB_MRKREF
-			  || r_type == R_PPC_EMB_BIT_FLD
-			  || r_type == R_PPC_EMB_RELSDA
-			  || ((r_type == R_PPC_REL24
-			       || r_type == R_PPC_REL32
-			       || r_type == R_PPC_REL14
-			       || r_type == R_PPC_REL14_BRTAKEN
-			       || r_type == R_PPC_REL14_BRNTAKEN
-			       || r_type == R_PPC_RELATIVE)
-			      && strcmp (h->root.root.string,
-					 "_GLOBAL_OFFSET_TABLE_") != 0))))
-		{
-		  /* In these cases, we don't need the relocation
-                     value.  We check specially because in some
-                     obscure cases sec->output_section will be NULL.  */
-		  relocation = 0;
-		}
-	      else
-		relocation = (h->root.u.def.value
-			      + sec->output_section->vma
-			      + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else if (info->shared && !info->symbolic && !info->no_undefined)
-	    relocation = 0;
-	  else
-	    {
-	      (*info->callbacks->undefined_symbol)(info,
-						   h->root.root.string,
-						   input_bfd,
-						   input_section,
-						   rel->r_offset);
-	      ret = false;
-	      continue;
-	    }
-	}
-
-      switch ((int)r_type)
-	{
-	default:
-	  (*_bfd_error_handler) (_("%s: unknown relocation type %d for symbol %s"),
-				 bfd_get_filename (input_bfd),
-				 (int)r_type, sym_name);
-
-	  bfd_set_error (bfd_error_bad_value);
-	  ret = false;
-	  continue;
-
-	/* Relocations that need no special processing.  */
-	case (int)R_PPC_LOCAL24PC:
-	  /* It makes no sense to point a local relocation
-	     at a symbol not in this object.  */
-	  if (h != NULL
-	      && (h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak)
-	      && sec->output_section == NULL)
-	    {
-	      (*info->callbacks->undefined_symbol) (info,
-						    h->root.root.string,
-						    input_bfd,
-						    input_section,
-						    rel->r_offset);
-	      ret = false;
-	      continue;
-	    }
-	  break;
-
-	/* Relocations that may need to be propagated if this is a shared
-           object.  */
-	case (int)R_PPC_REL24:
-	case (int)R_PPC_REL32:
-	case (int)R_PPC_REL14:
-	  /* If these relocations are not to a named symbol, they can be
-	     handled right here, no need to bother the dynamic linker.  */
-	  if (h == NULL
-	      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	    break;
-	/* fall through */
-
-	/* Relocations that always need to be propagated if this is a shared
-           object.  */
-	case (int)R_PPC_NONE:
-	case (int)R_PPC_ADDR32:
-	case (int)R_PPC_ADDR24:
-	case (int)R_PPC_ADDR16:
-	case (int)R_PPC_ADDR16_LO:
-	case (int)R_PPC_ADDR16_HI:
-	case (int)R_PPC_ADDR16_HA:
-	case (int)R_PPC_ADDR14:
-	case (int)R_PPC_UADDR32:
-	case (int)R_PPC_UADDR16:
-	  if (info->shared)
-	    {
-	      Elf_Internal_Rela outrel;
-	      boolean skip;
-
-#ifdef DEBUG
-	      fprintf (stderr, "ppc_elf_relocate_section need to create relocation for %s\n",
-		       (h && h->root.root.string) ? h->root.root.string : "<unknown>");
-#endif
-
-	      /* When generating a shared object, these relocations
-                 are copied into the output file to be resolved at run
-                 time.  */
-
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (input_bfd,
-			   elf_elfheader (input_bfd)->e_shstrndx,
-			   elf_section_data (input_section)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (input_bfd,
-							       input_section),
-					 name + 5) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  BFD_ASSERT (sreloc != NULL);
-		}
-
-	      skip = false;
-
-	      if (elf_section_data (input_section)->stab_info == NULL)
-		outrel.r_offset = rel->r_offset;
-	      else
-		{
-		  bfd_vma off;
-
-		  off = (_bfd_stab_section_offset
-			 (output_bfd, &elf_hash_table (info)->stab_info,
-			  input_section,
-			  &elf_section_data (input_section)->stab_info,
-			  rel->r_offset));
-		  if (off == (bfd_vma) -1)
-		    skip = true;
-		  outrel.r_offset = off;
-		}
-
-	      outrel.r_offset += (input_section->output_section->vma
-				  + input_section->output_offset);
-
-	      if (skip)
-		memset (&outrel, 0, sizeof outrel);
-	      /* h->dynindx may be -1 if this symbol was marked to
-                 become local.  */
-	      else if (h != NULL
-		       && ((! info->symbolic && h->dynindx != -1)
-			   || (h->elf_link_hash_flags
-			       & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		{
-		  BFD_ASSERT (h->dynindx != -1);
-		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
-		  outrel.r_addend = rel->r_addend;
-		}
-	      else
-		{
-		  if (r_type == R_PPC_ADDR32)
-		    {
-		      outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE);
-		      outrel.r_addend = relocation + rel->r_addend;
-		    }
-		  else
-		    {
-		      long indx;
-
-		      if (h == NULL)
-			sec = local_sections[r_symndx];
-		      else
-			{
-			  BFD_ASSERT (h->root.type == bfd_link_hash_defined
-				      || (h->root.type
-					  == bfd_link_hash_defweak));
-			  sec = h->root.u.def.section;
-			}
-		      if (sec != NULL && bfd_is_abs_section (sec))
-			indx = 0;
-		      else if (sec == NULL || sec->owner == NULL)
-			{
-			  bfd_set_error (bfd_error_bad_value);
-			  return false;
-			}
-		      else
-			{
-			  asection *osec;
-
-			  osec = sec->output_section;
-			  indx = elf_section_data (osec)->dynindx;
-			  BFD_ASSERT(indx > 0);
-#ifdef DEBUG
-			  if (indx <= 0)
-			    {
-			      printf("indx=%d section=%s flags=%08x name=%s\n",
-				     indx, osec->name, osec->flags,
-				     h->root.root.string);
-			    }
-#endif
-			}
-
-		      outrel.r_info = ELF32_R_INFO (indx, r_type);
-		      outrel.r_addend = relocation + rel->r_addend;
-		    }
-		}
-
-	      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-					 (((Elf32_External_Rela *)
-					   sreloc->contents)
-					  + sreloc->reloc_count));
-	      ++sreloc->reloc_count;
-
-	      /* This reloc will be computed at runtime, so there's no
-                 need to do anything now, unless this is a RELATIVE
-                 reloc in an unallocated section.  */
-	      if (skip
-		  || (input_section->flags & SEC_ALLOC) != 0
-		  || ELF32_R_TYPE (outrel.r_info) != R_PPC_RELATIVE)
-		continue;
-	    }
-
-	  /* Arithmetic adjust relocations that aren't going into a
-	     shared object.  */
-	  if (r_type == R_PPC_ADDR16_HA
-	      /* It's just possible that this symbol is a weak symbol
-		 that's not actually defined anywhere. In that case,
-		 'sec' would be NULL, and we should leave the symbol
-		 alone (it will be set to zero elsewhere in the link).  */
-	      && sec != NULL)
-	    {
-	      addend += ((relocation + addend) & 0x8000) << 1;
-	    }
-	  break;
-
-	/* branch taken prediction relocations */
-	case (int)R_PPC_ADDR14_BRTAKEN:
-	case (int)R_PPC_REL14_BRTAKEN:
-	  insn = bfd_get_32 (output_bfd, contents + offset);
-	  if ((relocation - offset) & 0x8000)
-	    insn &= ~BRANCH_PREDICT_BIT;
-	  else
-	    insn |= BRANCH_PREDICT_BIT;
-	  bfd_put_32 (output_bfd, insn, contents + offset);
-	  break;
-
-	/* branch not taken predicition relocations */
-	case (int)R_PPC_ADDR14_BRNTAKEN:
-	case (int)R_PPC_REL14_BRNTAKEN:
-	  insn = bfd_get_32 (output_bfd, contents + offset);
-	  if ((relocation - offset) & 0x8000)
-	    insn |= BRANCH_PREDICT_BIT;
-	  else
-	    insn &= ~BRANCH_PREDICT_BIT;
-	  bfd_put_32 (output_bfd, insn, contents + offset);
-	  break;
-
-	/* GOT16 relocations */
-	case (int)R_PPC_GOT16:
-	case (int)R_PPC_GOT16_LO:
-	case (int)R_PPC_GOT16_HI:
-	case (int)R_PPC_GOT16_HA:
-	  /* Relocation is to the entry for this symbol in the global
-             offset table.  */
-	  BFD_ASSERT (sgot != NULL);
-
-	  if (h != NULL)
-	    {
-	      bfd_vma off;
-
-	      off = h->got.offset;
-	      BFD_ASSERT (off != (bfd_vma) -1);
-
-	      if (! elf_hash_table (info)->dynamic_sections_created
-		  || (info->shared
-		      && (info->symbolic || h->dynindx == -1)
-		      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
-		{
-		  /* This is actually a static link, or it is a
-                     -Bsymbolic link and the symbol is defined
-                     locally.  We must initialize this entry in the
-                     global offset table.  Since the offset must
-                     always be a multiple of 4, we use the least
-                     significant bit to record whether we have
-                     initialized it already.
-
-		     When doing a dynamic link, we create a .rela.got
-		     relocation entry to initialize the value.  This
-		     is done in the finish_dynamic_symbol routine.  */
-		  if ((off & 1) != 0)
-		    off &= ~1;
-		  else
-		    {
-		      bfd_put_32 (output_bfd, relocation,
-				  sgot->contents + off);
-		      h->got.offset |= 1;
-		    }
-		}
-
-	      relocation = sgot->output_offset + off - 4;
-	    }
-	  else
-	    {
-	      bfd_vma off;
-
-	      BFD_ASSERT (local_got_offsets != NULL
-			  && local_got_offsets[r_symndx] != (bfd_vma) -1);
-
-	      off = local_got_offsets[r_symndx];
-
-	      /* The offset must always be a multiple of 4.  We use
-		 the least significant bit to record whether we have
-		 already processed this entry.  */
-	      if ((off & 1) != 0)
-		off &= ~1;
-	      else
-		{
-		  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
-
-		  if (info->shared)
-		    {
-		      asection *srelgot;
-		      Elf_Internal_Rela outrel;
-
-		      /* We need to generate a R_PPC_RELATIVE reloc
-			 for the dynamic linker.  */
-		      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-		      BFD_ASSERT (srelgot != NULL);
-
-		      outrel.r_offset = (sgot->output_section->vma
-					 + sgot->output_offset
-					 + off);
-		      outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE);
-		      outrel.r_addend = relocation;
-		      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-						 (((Elf32_External_Rela *)
-						   srelgot->contents)
-						  + srelgot->reloc_count));
-		      ++srelgot->reloc_count;
-		    }
-
-		  local_got_offsets[r_symndx] |= 1;
-		}
-
-	      relocation = sgot->output_offset + off - 4;
-	    }
-	  break;
-
-	/* Indirect .sdata relocation */
-	case (int)R_PPC_EMB_SDAI16:
-	  BFD_ASSERT (sdata != NULL);
-	  relocation = bfd_elf32_finish_pointer_linker_section (output_bfd, input_bfd, info,
-								sdata, h, relocation, rel,
-								R_PPC_RELATIVE);
-	  break;
-
-	/* Indirect .sdata2 relocation */
-	case (int)R_PPC_EMB_SDA2I16:
-	  BFD_ASSERT (sdata2 != NULL);
-	  relocation = bfd_elf32_finish_pointer_linker_section (output_bfd, input_bfd, info,
-								sdata2, h, relocation, rel,
-								R_PPC_RELATIVE);
-	  break;
-
-	/* Handle the TOC16 reloc.  We want to use the offset within the .got
-	   section, not the actual VMA.  This is appropriate when generating
-	   an embedded ELF object, for which the .got section acts like the
-	   AIX .toc section.  */
-	case (int)R_PPC_TOC16:			/* phony GOT16 relocations */
-	  BFD_ASSERT (sec != (asection *)0);
-	  BFD_ASSERT (bfd_is_und_section (sec)
-		      || strcmp (bfd_get_section_name (abfd, sec), ".got") == 0
-		      || strcmp (bfd_get_section_name (abfd, sec), ".cgot") == 0)
-
-	  addend -= sec->output_section->vma + sec->output_offset + 0x8000;
-	  break;
-
-	case (int)R_PPC_PLTREL24:
-	  /* Relocation is to the entry for this symbol in the
-             procedure linkage table.  */
-	  BFD_ASSERT (h != NULL);
-
-	  if (h->plt.offset == (bfd_vma) -1
-	      || splt == NULL)
-	    {
-	      /* We didn't make a PLT entry for this symbol.  This
-                 happens when statically linking PIC code, or when
-                 using -Bsymbolic.  */
-	      break;
-	    }
-
-	  relocation = (splt->output_section->vma
-			+ splt->output_offset
-			+ h->plt.offset);
- 	  break;
-
-	/* relocate against _SDA_BASE_ */
-	case (int)R_PPC_SDAREL16:
-	  {
-	    const char *name;
-
-	    BFD_ASSERT (sec != (asection *)0);
-	    name = bfd_get_section_name (abfd, sec->output_section);
-	    if (strcmp (name, ".sdata") != 0
-		&& strcmp (name, ".sbss") != 0)
-	      {
-		(*_bfd_error_handler) (_("%s: The target (%s) of a %s relocation is in the wrong output section (%s)"),
-				       bfd_get_filename (input_bfd),
-				       sym_name,
-				       ppc_elf_howto_table[ (int)r_type ]->name,
-				       name);
-	      }
-	    addend -= (sdata->sym_hash->root.u.def.value
-		       + sdata->sym_hash->root.u.def.section->output_section->vma
-		       + sdata->sym_hash->root.u.def.section->output_offset);
-	  }
-	  break;
-
-
-	/* relocate against _SDA2_BASE_ */
-	case (int)R_PPC_EMB_SDA2REL:
-	  {
-	    const char *name;
-
-	    BFD_ASSERT (sec != (asection *)0);
-	    name = bfd_get_section_name (abfd, sec->output_section);
-	    if (strcmp (name, ".sdata2") != 0 && strcmp (name, ".sbss2") != 0)
-	      {
-		(*_bfd_error_handler) (_("%s: The target (%s) of a %s relocation is in the wrong output section (%s)"),
-				       bfd_get_filename (input_bfd),
-				       sym_name,
-				       ppc_elf_howto_table[ (int)r_type ]->name,
-				       name);
-		
-		bfd_set_error (bfd_error_bad_value);
-		ret = false;
-		continue;
-	      }
-	    addend -= (sdata2->sym_hash->root.u.def.value
-		       + sdata2->sym_hash->root.u.def.section->output_section->vma
-		       + sdata2->sym_hash->root.u.def.section->output_offset);
-	  }
-	  break;
-
-
-	/* relocate against either _SDA_BASE_, _SDA2_BASE_, or 0 */
-	case (int)R_PPC_EMB_SDA21:
-	case (int)R_PPC_EMB_RELSDA:
-	  {
-	    const char *name;
-	    int reg;
-
-	    BFD_ASSERT (sec != (asection *)0);
-	    name = bfd_get_section_name (abfd, sec->output_section);
-	    if (strcmp (name, ".sdata") == 0 || strcmp (name, ".sbss") == 0)
-	      {
-		reg = 13;
-		addend -= (sdata->sym_hash->root.u.def.value
-			   + sdata->sym_hash->root.u.def.section->output_section->vma
-			   + sdata->sym_hash->root.u.def.section->output_offset);
-	      }
-
-	    else if (strcmp (name, ".sdata2") == 0 || strcmp (name, ".sbss2") == 0)
-	      {
-		reg = 2;
-		addend -= (sdata2->sym_hash->root.u.def.value
-			   + sdata2->sym_hash->root.u.def.section->output_section->vma
-			   + sdata2->sym_hash->root.u.def.section->output_offset);
-	      }
-
-	    else if (strcmp (name, ".PPC.EMB.sdata0") == 0 || strcmp (name, ".PPC.EMB.sbss0") == 0)
-	      {
-		reg = 0;
-	      }
-
-	    else
-	      {
-		(*_bfd_error_handler) (_("%s: The target (%s) of a %s relocation is in the wrong output section (%s)"),
-				       bfd_get_filename (input_bfd),
-				       sym_name,
-				       ppc_elf_howto_table[ (int)r_type ]->name,
-				       name);
-
-		bfd_set_error (bfd_error_bad_value);
-		ret = false;
-		continue;
-	      }
-
-	    if (r_type == R_PPC_EMB_SDA21)
-	      {			/* fill in register field */
-		insn = bfd_get_32 (output_bfd, contents + offset);
-		insn = (insn & ~RA_REGISTER_MASK) | (reg << RA_REGISTER_SHIFT);
-		bfd_put_32 (output_bfd, insn, contents + offset);
-	      }
-	  }
-	  break;
-
-	/* Relocate against the beginning of the section */
-	case (int)R_PPC_SECTOFF:
-	case (int)R_PPC_SECTOFF_LO:
-	case (int)R_PPC_SECTOFF_HI:
-	  BFD_ASSERT (sec != (asection *)0);
-	  addend -= sec->output_section->vma;
-	  break;
-
-	case (int)R_PPC_SECTOFF_HA:
-	  BFD_ASSERT (sec != (asection *)0);
-	  addend -= sec->output_section->vma;
-	  addend += ((relocation + addend) & 0x8000) << 1;
-	  break;
-
-	/* Negative relocations */
-	case (int)R_PPC_EMB_NADDR32:
-	case (int)R_PPC_EMB_NADDR16:
-	case (int)R_PPC_EMB_NADDR16_LO:
-	case (int)R_PPC_EMB_NADDR16_HI:
-	  addend -= 2*relocation;
-	  break;
-
-	case (int)R_PPC_EMB_NADDR16_HA:
-	  addend -= 2*relocation;
-	  addend += ((relocation + addend) & 0x8000) << 1;
-	  break;
-
-	/* NOP relocation that prevents garbage collecting linkers from omitting a
-	   reference.  */
-	case (int)R_PPC_EMB_MRKREF:
-	  continue;
-
-	case (int)R_PPC_COPY:
-	case (int)R_PPC_GLOB_DAT:
-	case (int)R_PPC_JMP_SLOT:
-	case (int)R_PPC_RELATIVE:
-	case (int)R_PPC_PLT32:
-	case (int)R_PPC_PLTREL32:
-	case (int)R_PPC_PLT16_LO:
-	case (int)R_PPC_PLT16_HI:
-	case (int)R_PPC_PLT16_HA:
-	case (int)R_PPC_EMB_RELSEC16:
-	case (int)R_PPC_EMB_RELST_LO:
-	case (int)R_PPC_EMB_RELST_HI:
-	case (int)R_PPC_EMB_RELST_HA:
-	case (int)R_PPC_EMB_BIT_FLD:
-	  (*_bfd_error_handler) (_("%s: Relocation %s is not yet supported for symbol %s."),
-				 bfd_get_filename (input_bfd),
-				 ppc_elf_howto_table[ (int)r_type ]->name,
-				 sym_name);
-
-	  bfd_set_error (bfd_error_invalid_operation);
-	  ret = false;
-	  continue;
-
-	case (int)R_PPC_GNU_VTINHERIT:
-	case (int)R_PPC_GNU_VTENTRY:
-	  /* These are no-ops in the end.  */
-	  continue;
-	}
-
-
-#ifdef DEBUG
-      fprintf (stderr, "\ttype = %s (%d), name = %s, symbol index = %ld, offset = %ld, addend = %ld\n",
-	       howto->name,
-	       (int)r_type,
-	       sym_name,
-	       r_symndx,
-	       (long)offset,
-	       (long)addend);
-#endif
-
-      r = _bfd_final_link_relocate (howto,
-				    input_bfd,
-				    input_section,
-				    contents,
-				    offset,
-				    relocation,
-				    addend);
-
-      if (r != bfd_reloc_ok)
-	{
-	  ret = false;
-	  switch (r)
-	    {
-	    default:
-	      break;
-
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else
-		  {
-		    name = bfd_elf_string_from_elf_section (input_bfd,
-							    symtab_hdr->sh_link,
-							    sym->st_name);
-		    if (name == NULL)
-		      break;
-
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-
-		(*info->callbacks->reloc_overflow)(info,
-						   name,
-						   howto->name,
-						   (bfd_vma) 0,
-						   input_bfd,
-						   input_section,
-						   offset);
-	      }
-	      break;
-
-	    }
-	}
-    }
-
-
-#ifdef DEBUG
-  fprintf (stderr, "\n");
-#endif
-
-  return ret;
-}
-
-
-#define TARGET_LITTLE_SYM	bfd_elf32_powerpcle_vec
-#define TARGET_LITTLE_NAME	"elf32-powerpcle"
-#define TARGET_BIG_SYM		bfd_elf32_powerpc_vec
-#define TARGET_BIG_NAME		"elf32-powerpc"
-#define ELF_ARCH		bfd_arch_powerpc
-#define ELF_MACHINE_CODE	EM_PPC
-#define ELF_MAXPAGESIZE		0x10000
-#define elf_info_to_howto	ppc_elf_info_to_howto
-
-#ifdef  EM_CYGNUS_POWERPC
-#define ELF_MACHINE_ALT1	EM_CYGNUS_POWERPC
-#endif
-
-#ifdef EM_PPC_OLD
-#define ELF_MACHINE_ALT2	EM_PPC_OLD
-#endif
-
-#define elf_backend_plt_not_loaded	1
-#define elf_backend_got_symbol_offset	4
-#define elf_backend_can_gc_sections	1
-#define elf_backend_got_header_size	12
-#define elf_backend_plt_header_size	PLT_INITIAL_ENTRY_SIZE
-
-#define bfd_elf32_bfd_copy_private_bfd_data	ppc_elf_copy_private_bfd_data
-#define bfd_elf32_bfd_merge_private_bfd_data	ppc_elf_merge_private_bfd_data
-#define bfd_elf32_bfd_relax_section             ppc_elf_relax_section
-#define bfd_elf32_bfd_reloc_type_lookup		ppc_elf_reloc_type_lookup
-#define bfd_elf32_bfd_set_private_flags		ppc_elf_set_private_flags
-#define bfd_elf32_bfd_final_link		_bfd_elf32_gc_common_final_link
-
-#define elf_backend_gc_mark_hook		ppc_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook		ppc_elf_gc_sweep_hook
-#define elf_backend_section_from_shdr		ppc_elf_section_from_shdr
-#define elf_backend_relocate_section		ppc_elf_relocate_section
-#define elf_backend_create_dynamic_sections	ppc_elf_create_dynamic_sections
-#define elf_backend_check_relocs		ppc_elf_check_relocs
-#define elf_backend_adjust_dynamic_symbol	ppc_elf_adjust_dynamic_symbol
-#define elf_backend_add_symbol_hook		ppc_elf_add_symbol_hook
-#define elf_backend_size_dynamic_sections	ppc_elf_size_dynamic_sections
-#define elf_backend_finish_dynamic_symbol	ppc_elf_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections	ppc_elf_finish_dynamic_sections
-#define elf_backend_fake_sections		ppc_elf_fake_sections
-#define elf_backend_additional_program_headers	ppc_elf_additional_program_headers
-#define elf_backend_modify_segment_map		ppc_elf_modify_segment_map
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
deleted file mode 100644
index ebbe352456e..00000000000
--- a/bfd/elf32-sh.c
+++ /dev/null
@@ -1,2059 +0,0 @@
-/* Hitachi SH specific support for 32-bit ELF
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-   Contributed by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/sh.h"
-
-static bfd_reloc_status_type sh_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type sh_elf_ignore_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static reloc_howto_type *sh_elf_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void sh_elf_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean sh_elf_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-static boolean sh_elf_relax_delete_bytes
-  PARAMS ((bfd *, asection *, bfd_vma, int));
-static boolean sh_elf_align_loads
-  PARAMS ((bfd *, asection *, Elf_Internal_Rela *, bfd_byte *, boolean *));
-static boolean sh_elf_swap_insns
-  PARAMS ((bfd *, asection *, PTR, bfd_byte *, bfd_vma));
-static boolean sh_elf_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static bfd_byte *sh_elf_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean, asymbol **));
-
-static reloc_howto_type sh_elf_howto_table[] =
-{
-  /* No relocation.  */
-  HOWTO (R_SH_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit absolute relocation.  Setting partial_inplace to true and
-     src_mask to a non-zero value is similar to the COFF toolchain.  */
-  HOWTO (R_SH_DIR32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_DIR32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit PC relative relocation.  */
-  HOWTO (R_SH_REL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_REL32",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit PC relative branch divided by 2.  */
-  HOWTO (R_SH_DIR8WPN,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_DIR8WPN",	/* name */
-	 true,			/* partial_inplace */
-	 0xff,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 12 bit PC relative branch divided by 2.  */
-  HOWTO (R_SH_IND12W,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_IND12W",		/* name */
-	 true,			/* partial_inplace */
-	 0xfff,			/* src_mask */
-	 0xfff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit unsigned PC relative divided by 4.  */
-  HOWTO (R_SH_DIR8WPL,		/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_DIR8WPL",	/* name */
-	 true,			/* partial_inplace */
-	 0xff,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit unsigned PC relative divided by 2.  */
-  HOWTO (R_SH_DIR8WPZ,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_DIR8WPZ",	/* name */
-	 true,			/* partial_inplace */
-	 0xff,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit GBR relative.  FIXME: This only makes sense if we have some
-     special symbol for the GBR relative area, and that is not
-     implemented.  */
-  HOWTO (R_SH_DIR8BP,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_DIR8BP",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit GBR relative divided by 2.  FIXME: This only makes sense if
-     we have some special symbol for the GBR relative area, and that
-     is not implemented.  */
-  HOWTO (R_SH_DIR8W,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_DIR8W",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit GBR relative divided by 4.  FIXME: This only makes sense if
-     we have some special symbol for the GBR relative area, and that
-     is not implemented.  */
-  HOWTO (R_SH_DIR8L,		/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_reloc,		/* special_function */
-	 "R_SH_DIR8L",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xff,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  { 10 },
-  { 11 },
-  { 12 },
-  { 13 },
-  { 14 },
-  { 15 },
-  { 16 },
-  { 17 },
-  { 18 },
-  { 19 },
-  { 20 },
-  { 21 },
-  { 22 },
-  { 23 },
-  { 24 },
-
-  /* The remaining relocs are a GNU extension used for relaxing.  The
-     final pass of the linker never needs to do anything with any of
-     these relocs.  Any required operations are handled by the
-     relaxation code.  */
-
-  /* A 16 bit switch table entry.  This is generated for an expression
-     such as ``.word L1 - L2''.  The offset holds the difference
-     between the reloc address and L2.  */
-  HOWTO (R_SH_SWITCH16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_SWITCH16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 32 bit switch table entry.  This is generated for an expression
-     such as ``.long L1 - L2''.  The offset holds the difference
-     between the reloc address and L2.  */
-  HOWTO (R_SH_SWITCH32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_SWITCH32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* Indicates a .uses pseudo-op.  The compiler will generate .uses
-     pseudo-ops when it finds a function call which can be relaxed.
-     The offset field holds the PC relative offset to the instruction
-     which loads the register used in the function call.  */
-  HOWTO (R_SH_USES,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_USES",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* The assembler will generate this reloc for addresses referred to
-     by the register loads associated with USES relocs.  The offset
-     field holds the number of times the address is referenced in the
-     object file.  */
-  HOWTO (R_SH_COUNT,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_COUNT",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* Indicates an alignment statement.  The offset field is the power
-     of 2 to which subsequent portions of the object file must be
-     aligned.  */
-  HOWTO (R_SH_ALIGN,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_ALIGN",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* The assembler will generate this reloc before a block of
-     instructions.  A section should be processed as assumining it
-     contains data, unless this reloc is seen.  */
-  HOWTO (R_SH_CODE,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_CODE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* The assembler will generate this reloc after a block of
-     instructions when it sees data that is not instructions.  */
-  HOWTO (R_SH_DATA,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_DATA",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* The assembler generates this reloc for each label within a block
-     of instructions.  This permits the linker to avoid swapping
-     instructions which are the targets of branches.  */
-  HOWTO (R_SH_LABEL,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_LABEL",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* An 8 bit switch table entry.  This is generated for an expression
-     such as ``.word L1 - L2''.  The offset holds the difference
-     between the reloc address and L2.  */
-  HOWTO (R_SH_SWITCH8,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_unsigned, /* complain_on_overflow */
-	 sh_elf_ignore_reloc,	/* special_function */
-	 "R_SH_SWITCH8",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_SH_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_SH_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_SH_GNU_VTENTRY,     /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_SH_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-};
-
-/* This function is used for normal relocs.  This is like the COFF
-   function, and is almost certainly incorrect for other ELF targets.  */
-
-static bfd_reloc_status_type
-sh_elf_reloc (abfd, reloc_entry, symbol_in, data, input_section, output_bfd,
-	  error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  unsigned long insn;
-  bfd_vma sym_value;
-  enum elf_sh_reloc_type r_type;
-  bfd_vma addr = reloc_entry->address;
-  bfd_byte *hit_data = addr + (bfd_byte *) data;
-
-  r_type = (enum elf_sh_reloc_type) reloc_entry->howto->type;
-
-  if (output_bfd != NULL)
-    {
-      /* Partial linking--do nothing.  */
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* Almost all relocs have to do with relaxing.  If any work must be
-     done for them, it has been done in sh_relax_section.  */
-  if (r_type != R_SH_DIR32
-      && (r_type != R_SH_IND12W
-	  || (symbol_in->flags & BSF_LOCAL) != 0))
-    return bfd_reloc_ok;
-
-  if (symbol_in != NULL
-      && bfd_is_und_section (symbol_in->section))
-    return bfd_reloc_undefined;
-
-  if (bfd_is_com_section (symbol_in->section))
-    sym_value = 0;                           
-  else 
-    sym_value = (symbol_in->value +
-		 symbol_in->section->output_section->vma +
-		 symbol_in->section->output_offset);
-
-  switch (r_type)
-    {
-    case R_SH_DIR32:
-      insn = bfd_get_32 (abfd, hit_data);
-      insn += sym_value + reloc_entry->addend;
-      bfd_put_32 (abfd, insn, hit_data);
-      break;
-    case R_SH_IND12W:
-      insn = bfd_get_16 (abfd, hit_data);
-      sym_value += reloc_entry->addend;
-      sym_value -= (input_section->output_section->vma
-		    + input_section->output_offset
-		    + addr
-		    + 4);
-      sym_value += (insn & 0xfff) << 1;
-      if (insn & 0x800)
-	sym_value -= 0x1000;
-      insn = (insn & 0xf000) | (sym_value & 0xfff);
-      bfd_put_16 (abfd, insn, hit_data);
-      if (sym_value < (bfd_vma) -0x1000 || sym_value >= 0x1000)
-	return bfd_reloc_overflow;
-      break;
-    default:
-      abort ();
-      break;
-    }
-
-  return bfd_reloc_ok;
-}
-
-/* This function is used for relocs which are only used for relaxing,
-   which the linker should otherwise ignore.  */
-
-static bfd_reloc_status_type
-sh_elf_ignore_reloc (abfd, reloc_entry, symbol, data, input_section,
-		     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd != NULL)
-    reloc_entry->address += input_section->output_offset;
-  return bfd_reloc_ok;
-}
-
-/* This structure is used to map BFD reloc codes to SH ELF relocs.  */
-
-struct elf_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-/* An array mapping BFD reloc codes to SH ELF relocs.  */
-
-static const struct elf_reloc_map sh_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_SH_NONE },
-  { BFD_RELOC_32, R_SH_DIR32 },
-  { BFD_RELOC_CTOR, R_SH_DIR32 },
-  { BFD_RELOC_32_PCREL, R_SH_REL32 },
-  { BFD_RELOC_SH_PCDISP8BY2, R_SH_DIR8WPN },
-  { BFD_RELOC_SH_PCDISP12BY2, R_SH_IND12W },
-  { BFD_RELOC_SH_PCRELIMM8BY2, R_SH_DIR8WPZ },
-  { BFD_RELOC_SH_PCRELIMM8BY4, R_SH_DIR8WPL },
-  { BFD_RELOC_8_PCREL, R_SH_SWITCH8 },
-  { BFD_RELOC_SH_SWITCH16, R_SH_SWITCH16 },
-  { BFD_RELOC_SH_SWITCH32, R_SH_SWITCH32 },
-  { BFD_RELOC_SH_USES, R_SH_USES },
-  { BFD_RELOC_SH_COUNT, R_SH_COUNT },
-  { BFD_RELOC_SH_ALIGN, R_SH_ALIGN },
-  { BFD_RELOC_SH_CODE, R_SH_CODE },
-  { BFD_RELOC_SH_DATA, R_SH_DATA },
-  { BFD_RELOC_SH_LABEL, R_SH_LABEL },
-  { BFD_RELOC_VTABLE_INHERIT, R_SH_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY, R_SH_GNU_VTENTRY },
-};
-
-/* Given a BFD reloc code, return the howto structure for the
-   corresponding SH ELf reloc.  */
-
-static reloc_howto_type *
-sh_elf_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0; i < sizeof (sh_reloc_map) / sizeof (struct elf_reloc_map); i++)
-    {
-      if (sh_reloc_map[i].bfd_reloc_val == code)
-	return &sh_elf_howto_table[(int) sh_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-/* Given an ELF reloc, fill in the howto field of a relent.  */
-
-static void
-sh_elf_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
-{
-  unsigned int r;
-
-  r = ELF32_R_TYPE (dst->r_info);
-
-  BFD_ASSERT (r < (unsigned int) R_SH_max);
-  BFD_ASSERT (r < R_SH_FIRST_INVALID_RELOC || r > R_SH_LAST_INVALID_RELOC);
-
-  cache_ptr->howto = &sh_elf_howto_table[r];
-}
-
-/* This function handles relaxing for SH ELF.  See the corresponding
-   function in coff-sh.c for a description of what this does.  FIXME:
-   There is a lot of duplication here between this code and the COFF
-   specific code.  The format of relocs and symbols is wound deeply
-   into this code, but it would still be better if the duplication
-   could be eliminated somehow.  Note in particular that although both
-   functions use symbols like R_SH_CODE, those symbols have different
-   values; in coff-sh.c they come from include/coff/sh.h, whereas here
-   they come from enum elf_sh_reloc_type in include/elf/sh.h.  */
-
-static boolean 
-sh_elf_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *internal_relocs;
-  Elf_Internal_Rela *free_relocs = NULL;
-  boolean have_code;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *contents = NULL;
-  bfd_byte *free_contents = NULL;
-  Elf32_External_Sym *extsyms = NULL;
-  Elf32_External_Sym *free_extsyms = NULL;
-
-  *again = false;
-
-  if (link_info->relocateable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0)
-    return true;
-
-  /* If this is the first time we have been called for this section,
-     initialize the cooked size.  */
-  if (sec->_cooked_size == 0)
-    sec->_cooked_size = sec->_raw_size;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-
-  internal_relocs = (_bfd_elf32_link_read_relocs
-		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-		      link_info->keep_memory));
-  if (internal_relocs == NULL)
-    goto error_return;
-  if (! link_info->keep_memory)
-    free_relocs = internal_relocs;
-
-  have_code = false;
-
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma laddr, paddr, symval;
-      unsigned short insn;
-      Elf_Internal_Rela *irelfn, *irelscan, *irelcount;
-      bfd_signed_vma foff;
-
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_CODE)
-	have_code = true;
-
-      if (ELF32_R_TYPE (irel->r_info) != (int) R_SH_USES)
-	continue;
-
-      /* Get the section contents.  */
-      if (contents == NULL)
-	{
-	  if (elf_section_data (sec)->this_hdr.contents != NULL)
-	    contents = elf_section_data (sec)->this_hdr.contents;
-	  else
-	    {
-	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (contents == NULL)
-		goto error_return;
-	      free_contents = contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      /* The r_addend field of the R_SH_USES reloc will point us to
-         the register load.  The 4 is because the r_addend field is
-         computed as though it were a jump offset, which are based
-         from 4 bytes after the jump instruction.  */
-      laddr = irel->r_offset + 4 + irel->r_addend;
-      if (laddr >= sec->_raw_size)
-	{
-	  (*_bfd_error_handler) (_("%s: 0x%lx: warning: bad R_SH_USES offset"),
-				 bfd_get_filename (abfd),
-				 (unsigned long) irel->r_offset);
-	  continue;
-	}
-      insn = bfd_get_16 (abfd, contents + laddr);
-
-      /* If the instruction is not mov.l NN,rN, we don't know what to
-         do.  */
-      if ((insn & 0xf000) != 0xd000)
-	{
-	  ((*_bfd_error_handler)
-	   (_("%s: 0x%lx: warning: R_SH_USES points to unrecognized insn 0x%x"),
-	    bfd_get_filename (abfd), (unsigned long) irel->r_offset, insn));
-	  continue;
-	}
-
-      /* Get the address from which the register is being loaded.  The
-      	 displacement in the mov.l instruction is quadrupled.  It is a
-      	 displacement from four bytes after the movl instruction, but,
-      	 before adding in the PC address, two least significant bits
-      	 of the PC are cleared.  We assume that the section is aligned
-      	 on a four byte boundary.  */
-      paddr = insn & 0xff;
-      paddr *= 4;
-      paddr += (laddr + 4) &~ 3;
-      if (paddr >= sec->_raw_size)
-	{
-	  ((*_bfd_error_handler)
-	   (_("%s: 0x%lx: warning: bad R_SH_USES load offset"),
-	    bfd_get_filename (abfd), (unsigned long) irel->r_offset));
-	  continue;
-	}
-
-      /* Get the reloc for the address from which the register is
-         being loaded.  This reloc will tell us which function is
-         actually being called.  */
-      for (irelfn = internal_relocs; irelfn < irelend; irelfn++)
-	if (irelfn->r_offset == paddr
-	    && ELF32_R_TYPE (irelfn->r_info) == (int) R_SH_DIR32)
-	  break;
-      if (irelfn >= irelend)
-	{
-	  ((*_bfd_error_handler)
-	   (_("%s: 0x%lx: warning: could not find expected reloc"),
-	    bfd_get_filename (abfd), (unsigned long) paddr));
-	  continue;
-	}
-
-      /* Read this BFD's symbols if we haven't done so already.  */
-      if (extsyms == NULL)
-	{
-	  if (symtab_hdr->contents != NULL)
-	    extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-	  else
-	    {
-	      extsyms = ((Elf32_External_Sym *)
-			 bfd_malloc (symtab_hdr->sh_size));
-	      if (extsyms == NULL)
-		goto error_return;
-	      free_extsyms = extsyms;
-	      if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-		  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
-		      != symtab_hdr->sh_size))
-		goto error_return;
-	    }
-	}
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (ELF32_R_SYM (irelfn->r_info) < symtab_hdr->sh_info)
-	{
-	  Elf_Internal_Sym isym;
-
-	  /* A local symbol.  */
-	  bfd_elf32_swap_symbol_in (abfd,
-				    extsyms + ELF32_R_SYM (irelfn->r_info),
-				    &isym);
-
-	  if (isym.st_shndx != _bfd_elf_section_from_bfd_section (abfd, sec))
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: 0x%lx: warning: symbol in unexpected section"),
-		bfd_get_filename (abfd), (unsigned long) paddr));
-	      continue;
-	    }
-
-	  symval = (isym.st_value
-		    + sec->output_section->vma
-		    + sec->output_offset);
-	}
-      else
-	{
-	  unsigned long indx;
-	  struct elf_link_hash_entry *h;
-
-	  indx = ELF32_R_SYM (irelfn->r_info) - symtab_hdr->sh_info;
-	  h = elf_sym_hashes (abfd)[indx];
-	  BFD_ASSERT (h != NULL);
-	  if (h->root.type != bfd_link_hash_defined
-	      && h->root.type != bfd_link_hash_defweak)
-	    {
-	      /* This appears to be a reference to an undefined
-                 symbol.  Just ignore it--it will be caught by the
-                 regular reloc processing.  */
-	      continue;
-	    }
-
-	  symval = (h->root.u.def.value
-		    + h->root.u.def.section->output_section->vma
-		    + h->root.u.def.section->output_offset);
-	}
-
-      symval += bfd_get_32 (abfd, contents + paddr);
-
-      /* See if this function call can be shortened.  */
-      foff = (symval
-	      - (irel->r_offset
-		 + sec->output_section->vma
-		 + sec->output_offset
-		 + 4));
-      if (foff < -0x1000 || foff >= 0x1000)
-	{
-	  /* After all that work, we can't shorten this function call.  */
-	  continue;
-	}
-
-      /* Shorten the function call.  */
-
-      /* For simplicity of coding, we are going to modify the section
-	 contents, the section relocs, and the BFD symbol table.  We
-	 must tell the rest of the code not to free up this
-	 information.  It would be possible to instead create a table
-	 of changes which have to be made, as is done in coff-mips.c;
-	 that would be more work, but would require less memory when
-	 the linker is run.  */
-
-      elf_section_data (sec)->relocs = internal_relocs;
-      free_relocs = NULL;
-
-      elf_section_data (sec)->this_hdr.contents = contents;
-      free_contents = NULL;
-
-      symtab_hdr->contents = (bfd_byte *) extsyms;
-      free_extsyms = NULL;
-
-      /* Replace the jsr with a bsr.  */
-
-      /* Change the R_SH_USES reloc into an R_SH_IND12W reloc, and
-         replace the jsr with a bsr.  */
-      irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irelfn->r_info), R_SH_IND12W);
-      if (ELF32_R_SYM (irelfn->r_info) < symtab_hdr->sh_info)
-	{
-	  /* If this needs to be changed because of future relaxing,
-             it will be handled here like other internal IND12W
-             relocs.  */
-	  bfd_put_16 (abfd,
-		      0xb000 | ((foff >> 1) & 0xfff),
-		      contents + irel->r_offset);
-	}
-      else
-	{
-	  /* We can't fully resolve this yet, because the external
-             symbol value may be changed by future relaxing.  We let
-             the final link phase handle it.  */
-	  bfd_put_16 (abfd, 0xb000, contents + irel->r_offset);
-	}
-
-      /* See if there is another R_SH_USES reloc referring to the same
-         register load.  */
-      for (irelscan = internal_relocs; irelscan < irelend; irelscan++)
-	if (ELF32_R_TYPE (irelscan->r_info) == (int) R_SH_USES
-	    && laddr == irelscan->r_offset + 4 + irelscan->r_addend)
-	  break;
-      if (irelscan < irelend)
-	{
-	  /* Some other function call depends upon this register load,
-	     and we have not yet converted that function call.
-	     Indeed, we may never be able to convert it.  There is
-	     nothing else we can do at this point.  */
-	  continue;
-	}
-
-      /* Look for a R_SH_COUNT reloc on the location where the
-         function address is stored.  Do this before deleting any
-         bytes, to avoid confusion about the address.  */
-      for (irelcount = internal_relocs; irelcount < irelend; irelcount++)
-	if (irelcount->r_offset == paddr
-	    && ELF32_R_TYPE (irelcount->r_info) == (int) R_SH_COUNT)
-	  break;
-
-      /* Delete the register load.  */
-      if (! sh_elf_relax_delete_bytes (abfd, sec, laddr, 2))
-	goto error_return;
-
-      /* That will change things, so, just in case it permits some
-         other function call to come within range, we should relax
-         again.  Note that this is not required, and it may be slow.  */
-      *again = true;
-
-      /* Now check whether we got a COUNT reloc.  */
-      if (irelcount >= irelend)
-	{
-	  ((*_bfd_error_handler)
-	   (_("%s: 0x%lx: warning: could not find expected COUNT reloc"),
-	    bfd_get_filename (abfd), (unsigned long) paddr));
-	  continue;
-	}
-
-      /* The number of uses is stored in the r_addend field.  We've
-         just deleted one.  */
-      if (irelcount->r_addend == 0)
-	{
-	  ((*_bfd_error_handler) (_("%s: 0x%lx: warning: bad count"),
-				  bfd_get_filename (abfd),
-				  (unsigned long) paddr));
-	  continue;
-	}
-
-      --irelcount->r_addend;
-
-      /* If there are no more uses, we can delete the address.  Reload
-         the address from irelfn, in case it was changed by the
-         previous call to sh_elf_relax_delete_bytes.  */
-      if (irelcount->r_addend == 0)
-	{
-	  if (! sh_elf_relax_delete_bytes (abfd, sec, irelfn->r_offset, 4))
-	    goto error_return;
-	}
-
-      /* We've done all we can with that function call.  */
-    }
-
-  /* Look for load and store instructions that we can align on four
-     byte boundaries.  */
-  if (have_code)
-    {
-      boolean swapped;
-
-      /* Get the section contents.  */
-      if (contents == NULL)
-	{
-	  if (elf_section_data (sec)->this_hdr.contents != NULL)
-	    contents = elf_section_data (sec)->this_hdr.contents;
-	  else
-	    {
-	      contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (contents == NULL)
-		goto error_return;
-	      free_contents = contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      if (! sh_elf_align_loads (abfd, sec, internal_relocs, contents,
-				&swapped))
-	goto error_return;
-
-      if (swapped)
-	{
-	  elf_section_data (sec)->relocs = internal_relocs;
-	  free_relocs = NULL;
-
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	  free_contents = NULL;
-
-	  symtab_hdr->contents = (bfd_byte *) extsyms;
-	  free_extsyms = NULL;
-	}
-    }
-
-  if (free_relocs != NULL)
-    {
-      free (free_relocs);
-      free_relocs = NULL;
-    }
-
-  if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_contents);
-      else
-	{
-	  /* Cache the section contents for elf_link_input_bfd.  */
-	  elf_section_data (sec)->this_hdr.contents = contents;
-	}
-      free_contents = NULL;
-    }
-
-  if (free_extsyms != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_extsyms);
-      else
-	{
-	  /* Cache the symbols for elf_link_input_bfd.  */
-	  symtab_hdr->contents = extsyms;
-	}
-      free_extsyms = NULL;
-    }
-
-  return true;
-
- error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-  return false;
-}
-
-/* Delete some bytes from a section while relaxing.  FIXME: There is a
-   lot of duplication between this function and sh_relax_delete_bytes
-   in coff-sh.c.  */
-
-static boolean
-sh_elf_relax_delete_bytes (abfd, sec, addr, count)
-     bfd *abfd;
-     asection *sec;
-     bfd_vma addr;
-     int count;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf32_External_Sym *extsyms;
-  int shndx, index;
-  bfd_byte *contents;
-  Elf_Internal_Rela *irel, *irelend;
-  Elf_Internal_Rela *irelalign;
-  bfd_vma toaddr;
-  Elf32_External_Sym *esym, *esymend;
-  struct elf_link_hash_entry *sym_hash;
-  asection *o;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  extsyms = (Elf32_External_Sym *) symtab_hdr->contents;
-
-  shndx = _bfd_elf_section_from_bfd_section (abfd, sec);
-
-  contents = elf_section_data (sec)->this_hdr.contents;
-
-  /* The deletion must stop at the next ALIGN reloc for an aligment
-     power larger than the number of bytes we are deleting.  */
-
-  irelalign = NULL;
-  toaddr = sec->_cooked_size;
-
-  irel = elf_section_data (sec)->relocs;
-  irelend = irel + sec->reloc_count;
-  for (; irel < irelend; irel++)
-    {
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_ALIGN
-	  && irel->r_offset > addr
-	  && count < (1 << irel->r_addend))
-	{
-	  irelalign = irel;
-	  toaddr = irel->r_offset;
-	  break;
-	}
-    }
-
-  /* Actually delete the bytes.  */
-  memmove (contents + addr, contents + addr + count, toaddr - addr - count);
-  if (irelalign == NULL)
-    sec->_cooked_size -= count;
-  else
-    {
-      int i;
-
-#define NOP_OPCODE (0x0009)
-
-      BFD_ASSERT ((count & 1) == 0);
-      for (i = 0; i < count; i += 2)
-	bfd_put_16 (abfd, NOP_OPCODE, contents + toaddr - count + i);
-    }
-
-  /* Adjust all the relocs.  */
-  for (irel = elf_section_data (sec)->relocs; irel < irelend; irel++)
-    {
-      bfd_vma nraddr, stop;
-      bfd_vma start = 0;
-      int insn = 0;
-      Elf_Internal_Sym sym;
-      int off, adjust, oinsn;
-      bfd_signed_vma voff = 0;
-      boolean overflow;
-
-      /* Get the new reloc address.  */
-      nraddr = irel->r_offset;
-      if ((irel->r_offset > addr
-	   && irel->r_offset < toaddr)
-	  || (ELF32_R_TYPE (irel->r_info) == (int) R_SH_ALIGN
-	      && irel->r_offset == toaddr))
-	nraddr -= count;
-
-      /* See if this reloc was for the bytes we have deleted, in which
-	 case we no longer care about it.  Don't delete relocs which
-	 represent addresses, though.  */
-      if (irel->r_offset >= addr
-	  && irel->r_offset < addr + count
-	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_ALIGN
-	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_CODE
-	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_DATA
-	  && ELF32_R_TYPE (irel->r_info) != (int) R_SH_LABEL)
-	irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info),
-				     (int) R_SH_NONE);
-
-      /* If this is a PC relative reloc, see if the range it covers
-         includes the bytes we have deleted.  */
-      switch ((enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info))
-	{
-	default:
-	  break;
-
-	case R_SH_DIR8WPN:
-	case R_SH_IND12W:
-	case R_SH_DIR8WPZ:
-	case R_SH_DIR8WPL:
-	  start = irel->r_offset;
-	  insn = bfd_get_16 (abfd, contents + nraddr);
-	  break;
-	}
-
-      switch ((enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info))
-	{
-	default:
-	  start = stop = addr;
-	  break;
-
-	case R_SH_DIR32:
-	  /* If this reloc is against a symbol defined in this
-             section, and the symbol will not be adjusted below, we
-             must check the addend to see it will put the value in
-             range to be adjusted, and hence must be changed.  */
-	  if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-	    {
-	      bfd_elf32_swap_symbol_in (abfd,
-					extsyms + ELF32_R_SYM (irel->r_info),
-					&sym);
-	      if (sym.st_shndx == shndx
-		  && (sym.st_value <= addr
-		      || sym.st_value >= toaddr))
-		{
-		  bfd_vma val;
-
-		  val = bfd_get_32 (abfd, contents + nraddr);
-		  val += sym.st_value;
-		  if (val > addr && val < toaddr)
-		    bfd_put_32 (abfd, val - count, contents + nraddr);
-		}
-	    }
-	  start = stop = addr;
-	  break;
-
-	case R_SH_DIR8WPN:
-	  off = insn & 0xff;
-	  if (off & 0x80)
-	    off -= 0x100;
-	  stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
-	  break;
-
-	case R_SH_IND12W:
-	  if (ELF32_R_SYM (irel->r_info) >= symtab_hdr->sh_info)
-	    start = stop = addr;
-	  else
-	    {
-	      off = insn & 0xfff;
-	      if (off & 0x800)
-		off -= 0x1000;
-	      stop = (bfd_vma) ((bfd_signed_vma) start + 4 + off * 2);
-	    }
-	  break;
-
-	case R_SH_DIR8WPZ:
-	  off = insn & 0xff;
-	  stop = start + 4 + off * 2;
-	  break;
-
-	case R_SH_DIR8WPL:
-	  off = insn & 0xff;
-	  stop = (start &~ (bfd_vma) 3) + 4 + off * 4;
-	  break;
-
-	case R_SH_SWITCH8:
-	case R_SH_SWITCH16:
-	case R_SH_SWITCH32:
-	  /* These relocs types represent
-	       .word L2-L1
-	     The r_offset field holds the difference between the reloc
-	     address and L1.  That is the start of the reloc, and
-	     adding in the contents gives us the top.  We must adjust
-	     both the r_offset field and the section contents.  */
-
-	  start = irel->r_offset;
-	  stop = (bfd_vma) ((bfd_signed_vma) start - (long) irel->r_addend);
-
-	  if (start > addr
-	      && start < toaddr
-	      && (stop <= addr || stop >= toaddr))
-	    irel->r_addend += count;
-	  else if (stop > addr
-		   && stop < toaddr
-		   && (start <= addr || start >= toaddr))
-	    irel->r_addend -= count;
-
-	  start = stop;
-
-	  if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_SWITCH16)
-	    voff = bfd_get_signed_16 (abfd, contents + nraddr);
-	  else if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_SWITCH8)
-	    voff = bfd_get_8 (abfd, contents + nraddr);
-	  else
-	    voff = bfd_get_signed_32 (abfd, contents + nraddr);
-	  stop = (bfd_vma) ((bfd_signed_vma) start + voff);
-
-	  break;
-
-	case R_SH_USES:
-	  start = irel->r_offset;
-	  stop = (bfd_vma) ((bfd_signed_vma) start
-			    + (long) irel->r_addend
-			    + 4);
-	  break;
-	}
-
-      if (start > addr
-	  && start < toaddr
-	  && (stop <= addr || stop >= toaddr))
-	adjust = count;
-      else if (stop > addr
-	       && stop < toaddr
-	       && (start <= addr || start >= toaddr))
-	adjust = - count;
-      else
-	adjust = 0;
-
-      if (adjust != 0)
-	{
-	  oinsn = insn;
-	  overflow = false;
-	  switch ((enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info))
-	    {
-	    default:
-	      abort ();
-	      break;
-
-	    case R_SH_DIR8WPN:
-	    case R_SH_DIR8WPZ:
-	      insn += adjust / 2;
-	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, contents + nraddr);
-	      break;
-
-	    case R_SH_IND12W:
-	      insn += adjust / 2;
-	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, contents + nraddr);
-	      break;
-
-	    case R_SH_DIR8WPL:
-	      BFD_ASSERT (adjust == count || count >= 4);
-	      if (count >= 4)
-		insn += adjust / 4;
-	      else
-		{
-		  if ((irel->r_offset & 3) == 0)
-		    ++insn;
-		}
-	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, contents + nraddr);
-	      break;
-
-	    case R_SH_SWITCH16:
-	      voff += adjust;
-	      if (voff < - 0x8000 || voff >= 0x8000)
-		overflow = true;
-	      bfd_put_signed_16 (abfd, voff, contents + nraddr);
-	      break;
-
-	    case R_SH_SWITCH32:
-	      voff += adjust;
-	      bfd_put_signed_32 (abfd, voff, contents + nraddr);
-	      break;
-
-	    case R_SH_USES:
-	      irel->r_addend += adjust;
-	      break;
-	    }
-
-	  if (overflow)
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: 0x%lx: fatal: reloc overflow while relaxing"),
-		bfd_get_filename (abfd), (unsigned long) irel->r_offset));
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-	}
-
-      irel->r_offset = nraddr;
-    }
-
-  /* Look through all the other sections.  If there contain any IMM32
-     relocs against internal symbols which we are not going to adjust
-     below, we may need to adjust the addends.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      Elf_Internal_Rela *internal_relocs;
-      Elf_Internal_Rela *irelscan, *irelscanend;
-      bfd_byte *ocontents;
-
-      if (o == sec
-	  || (o->flags & SEC_RELOC) == 0
-	  || o->reloc_count == 0)
-	continue;
-
-      /* We always cache the relocs.  Perhaps, if info->keep_memory is
-         false, we should free them, if we are permitted to, when we
-         leave sh_coff_relax_section.  */
-      internal_relocs = (_bfd_elf32_link_read_relocs
-			 (abfd, o, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-			  true));
-      if (internal_relocs == NULL)
-	return false;
-
-      ocontents = NULL;
-      irelscanend = internal_relocs + o->reloc_count;
-      for (irelscan = internal_relocs; irelscan < irelscanend; irelscan++)
-	{
-	  Elf_Internal_Sym sym;
-
-	  if (ELF32_R_TYPE (irelscan->r_info) != (int) R_SH_DIR32)
-	    continue;
-
-	  if (ELF32_R_SYM (irelscan->r_info) >= symtab_hdr->sh_info)
-	    continue;
-
-	  bfd_elf32_swap_symbol_in (abfd,
-				    extsyms + ELF32_R_SYM (irelscan->r_info),
-				    &sym);
-
-	  if (sym.st_shndx == shndx
-	      && (sym.st_value <= addr
-		  || sym.st_value >= toaddr))
-	    {
-	      bfd_vma val;
-
-	      if (ocontents == NULL)
-		{
-		  if (elf_section_data (o)->this_hdr.contents != NULL)
-		    ocontents = elf_section_data (o)->this_hdr.contents;
-		  else
-		    {
-		      /* We always cache the section contents.
-                         Perhaps, if info->keep_memory is false, we
-                         should free them, if we are permitted to,
-                         when we leave sh_coff_relax_section.  */
-		      ocontents = (bfd_byte *) bfd_malloc (o->_raw_size);
-		      if (ocontents == NULL)
-			return false;
-		      if (! bfd_get_section_contents (abfd, o, ocontents,
-						      (file_ptr) 0,
-						      o->_raw_size))
-			return false;
-		      elf_section_data (o)->this_hdr.contents = ocontents;
-		    }
-		}
-
-	      val = bfd_get_32 (abfd, ocontents + irelscan->r_offset);
-	      val += sym.st_value;
-	      if (val > addr && val < toaddr)
-		bfd_put_32 (abfd, val - count,
-			    ocontents + irelscan->r_offset);
-	    }
-	}
-    }
-
-  /* Adjust the local symbols defined in this section.  */
-  esym = extsyms;
-  esymend = esym + symtab_hdr->sh_info;
-  for (; esym < esymend; esym++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-
-      if (isym.st_shndx == shndx
-	  && isym.st_value > addr
-	  && isym.st_value < toaddr)
-	{
-	  isym.st_value -= count;
-	  bfd_elf32_swap_symbol_out (abfd, &isym, esym);
-	}
-    }
-
-  /* Now adjust the global symbols defined in this section.  */
-  esym = extsyms + symtab_hdr->sh_info;
-  esymend = extsyms + (symtab_hdr->sh_size / sizeof (Elf32_External_Sym));
-  for (index = 0; esym < esymend; esym++, index++)
-    {
-      Elf_Internal_Sym isym;
-
-      bfd_elf32_swap_symbol_in (abfd, esym, &isym);
-      sym_hash = elf_sym_hashes (abfd)[index];
-      if (isym.st_shndx == shndx
-	  && ((sym_hash)->root.type == bfd_link_hash_defined
-	      || (sym_hash)->root.type == bfd_link_hash_defweak)
-	  && (sym_hash)->root.u.def.section == sec
-	  && (sym_hash)->root.u.def.value > addr
-	  && (sym_hash)->root.u.def.value < toaddr)
-	{
-	  (sym_hash)->root.u.def.value -= count;
-	}
-    }
-
-  /* See if we can move the ALIGN reloc forward.  We have adjusted
-     r_offset for it already.  */
-  if (irelalign != NULL)
-    {
-      bfd_vma alignto, alignaddr;
-
-      alignto = BFD_ALIGN (toaddr, 1 << irelalign->r_addend);
-      alignaddr = BFD_ALIGN (irelalign->r_offset,
-			     1 << irelalign->r_addend);
-      if (alignto != alignaddr)
-	{
-	  /* Tail recursion.  */
-	  return sh_elf_relax_delete_bytes (abfd, sec, alignaddr,
-					    alignto - alignaddr);
-	}
-    }
-
-  return true;
-}
-
-/* Look for loads and stores which we can align to four byte
-   boundaries.  This is like sh_align_loads in coff-sh.c.  */
-
-static boolean
-sh_elf_align_loads (abfd, sec, internal_relocs, contents, pswapped)
-     bfd *abfd;
-     asection *sec;
-     Elf_Internal_Rela *internal_relocs;
-     bfd_byte *contents;
-     boolean *pswapped;
-{
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_vma *labels = NULL;
-  bfd_vma *label, *label_end;
-
-  *pswapped = false;
-
-  irelend = internal_relocs + sec->reloc_count;
-
-  /* Get all the addresses with labels on them.  */
-  labels = (bfd_vma *) bfd_malloc (sec->reloc_count * sizeof (bfd_vma));
-  if (labels == NULL)
-    goto error_return;
-  label_end = labels;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_LABEL)
-	{
-	  *label_end = irel->r_offset;
-	  ++label_end;
-	}
-    }
-
-  /* Note that the assembler currently always outputs relocs in
-     address order.  If that ever changes, this code will need to sort
-     the label values and the relocs.  */
-
-  label = labels;
-
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma start, stop;
-
-      if (ELF32_R_TYPE (irel->r_info) != (int) R_SH_CODE)
-	continue;
-
-      start = irel->r_offset;
-
-      for (irel++; irel < irelend; irel++)
-	if (ELF32_R_TYPE (irel->r_info) == (int) R_SH_DATA)
-	  break;
-      if (irel < irelend)
-	stop = irel->r_offset;
-      else
-	stop = sec->_cooked_size;
-
-      if (! _bfd_sh_align_load_span (abfd, sec, contents, sh_elf_swap_insns,
-				     (PTR) internal_relocs, &label,
-				     label_end, start, stop, pswapped))
-	goto error_return;
-    }
-
-  free (labels);
-
-  return true;
-
- error_return:
-  if (labels != NULL)
-    free (labels);
-  return false;
-}
-
-/* Swap two SH instructions.  This is like sh_swap_insns in coff-sh.c.  */
-
-static boolean
-sh_elf_swap_insns (abfd, sec, relocs, contents, addr)
-     bfd *abfd;
-     asection *sec;
-     PTR relocs;
-     bfd_byte *contents;
-     bfd_vma addr;
-{
-  Elf_Internal_Rela *internal_relocs = (Elf_Internal_Rela *) relocs;
-  unsigned short i1, i2;
-  Elf_Internal_Rela *irel, *irelend;
-
-  /* Swap the instructions themselves.  */
-  i1 = bfd_get_16 (abfd, contents + addr);
-  i2 = bfd_get_16 (abfd, contents + addr + 2);
-  bfd_put_16 (abfd, i2, contents + addr);
-  bfd_put_16 (abfd, i1, contents + addr + 2);
-
-  /* Adjust all reloc addresses.  */
-  irelend = internal_relocs + sec->reloc_count;
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      enum elf_sh_reloc_type type;
-      int add;
-
-      /* There are a few special types of relocs that we don't want to
-         adjust.  These relocs do not apply to the instruction itself,
-         but are only associated with the address.  */
-      type = (enum elf_sh_reloc_type) ELF32_R_TYPE (irel->r_info);
-      if (type == R_SH_ALIGN
-	  || type == R_SH_CODE
-	  || type == R_SH_DATA
-	  || type == R_SH_LABEL)
-	continue;
-
-      /* If an R_SH_USES reloc points to one of the addresses being
-         swapped, we must adjust it.  It would be incorrect to do this
-         for a jump, though, since we want to execute both
-         instructions after the jump.  (We have avoided swapping
-         around a label, so the jump will not wind up executing an
-         instruction it shouldn't).  */
-      if (type == R_SH_USES)
-	{
-	  bfd_vma off;
-
-	  off = irel->r_offset + 4 + irel->r_addend;
-	  if (off == addr)
-	    irel->r_offset += 2;
-	  else if (off == addr + 2)
-	    irel->r_offset -= 2;
-	}
-
-      if (irel->r_offset == addr)
-	{
-	  irel->r_offset += 2;
-	  add = -2;
-	}
-      else if (irel->r_offset == addr + 2)
-	{
-	  irel->r_offset -= 2;
-	  add = 2;
-	}
-      else
-	add = 0;
-
-      if (add != 0)
-	{
-	  bfd_byte *loc;
-	  unsigned short insn, oinsn;
-	  boolean overflow;
-
-	  loc = contents + irel->r_offset;
-	  overflow = false;
-	  switch (type)
-	    {
-	    default:
-	      break;
-
-	    case R_SH_DIR8WPN:
-	    case R_SH_DIR8WPZ:
-	      insn = bfd_get_16 (abfd, loc);
-	      oinsn = insn;
-	      insn += add / 2;
-	      if ((oinsn & 0xff00) != (insn & 0xff00))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, loc);
-	      break;
-
-	    case R_SH_IND12W:
-	      insn = bfd_get_16 (abfd, loc);
-	      oinsn = insn;
-	      insn += add / 2;
-	      if ((oinsn & 0xf000) != (insn & 0xf000))
-		overflow = true;
-	      bfd_put_16 (abfd, insn, loc);
-	      break;
-
-	    case R_SH_DIR8WPL:
-	      /* This reloc ignores the least significant 3 bits of
-                 the program counter before adding in the offset.
-                 This means that if ADDR is at an even address, the
-                 swap will not affect the offset.  If ADDR is an at an
-                 odd address, then the instruction will be crossing a
-                 four byte boundary, and must be adjusted.  */
-	      if ((addr & 3) != 0)
-		{
-		  insn = bfd_get_16 (abfd, loc);
-		  oinsn = insn;
-		  insn += add / 2;
-		  if ((oinsn & 0xff00) != (insn & 0xff00))
-		    overflow = true;
-		  bfd_put_16 (abfd, insn, loc);
-		}
-
-	      break;
-	    }
-
-	  if (overflow)
-	    {
-	      ((*_bfd_error_handler)
-	       (_("%s: 0x%lx: fatal: reloc overflow while relaxing"),
-		bfd_get_filename (abfd), (unsigned long) irel->r_offset));
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Relocate an SH ELF section.  */
-
-static boolean
-sh_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			 contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  Elf_Internal_Rela *rel, *relend;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      struct elf_link_hash_entry *h;
-      bfd_vma relocation;
-      bfd_vma addend = (bfd_vma)0;
-      bfd_reloc_status_type r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-             anything, unless the reloc is against a section symbol,
-             in which case we have to adjust according to where the
-             section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      r_type = ELF32_R_TYPE (rel->r_info);
-
-      /* Many of the relocs are only used for relaxing, and are
-         handled entirely by the relaxation code.  */
-      if (r_type > (int) R_SH_LAST_INVALID_RELOC)
-	continue;
-
-      if (r_type < 0
-	  || r_type >= (int) R_SH_FIRST_INVALID_RELOC)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      /* FIXME: This is certainly incorrect.  However, it is how the
-         COFF linker works.  */
-      if (r_type != (int) R_SH_DIR32
-	  && r_type != (int) R_SH_IND12W)
-	continue;
-
-      howto = sh_elf_howto_table + r_type;
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  /* There is nothing to be done for an internal IND12W
-             relocation.  FIXME: This is probably wrong, but it's how
-             the COFF relocations work.  */
-	  if (r_type == (int) R_SH_IND12W)
-	    continue;
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      /* FIXME: This is how the COFF relocations work.  */
-      if (r_type == (int) R_SH_IND12W)
-	relocation -= 4;
-
-      switch ((int)r_type)
-	{
-	case (int)R_SH_DIR32:
-	  addend = rel->r_addend;
-	  break;
-	}
-
-      /* COFF relocs don't use the addend. The addend is used for R_SH_DIR32 
-	 to be compatible with other compilers. */
-      r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-				    contents, rel->r_offset,
-				    relocation, addend);
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else
-		  {
-		    name = (bfd_elf_string_from_elf_section
-			    (input_bfd, symtab_hdr->sh_link, sym->st_name));
-		    if (name == NULL)
-		      return false;
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-		if (! ((*info->callbacks->reloc_overflow)
-		       (info, name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* This is a version of bfd_generic_get_relocated_section_contents
-   which uses sh_elf_relocate_section.  */
-
-static bfd_byte *
-sh_elf_get_relocated_section_contents (output_bfd, link_info, link_order,
-					data, relocateable, symbols)
-     bfd *output_bfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  asection *input_section = link_order->u.indirect.section;
-  bfd *input_bfd = input_section->owner;
-  asection **sections = NULL;
-  Elf_Internal_Rela *internal_relocs = NULL;
-  Elf32_External_Sym *external_syms = NULL;
-  Elf_Internal_Sym *internal_syms = NULL;
-
-  /* We only need to handle the case of relaxing, or of having a
-     particular set of section contents, specially.  */
-  if (relocateable
-      || elf_section_data (input_section)->this_hdr.contents == NULL)
-    return bfd_generic_get_relocated_section_contents (output_bfd, link_info,
-						       link_order, data,
-						       relocateable,
-						       symbols);
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-
-  memcpy (data, elf_section_data (input_section)->this_hdr.contents,
-	  input_section->_raw_size);
-
-  if ((input_section->flags & SEC_RELOC) != 0
-      && input_section->reloc_count > 0)
-    {
-      Elf_Internal_Sym *isymp;
-      asection **secpp;
-      Elf32_External_Sym *esym, *esymend;
-
-      if (symtab_hdr->contents != NULL)
-	external_syms = (Elf32_External_Sym *) symtab_hdr->contents;
-      else
-	{
-	  external_syms = ((Elf32_External_Sym *)
-			   bfd_malloc (symtab_hdr->sh_info
-				       * sizeof (Elf32_External_Sym)));
-	  if (external_syms == NULL && symtab_hdr->sh_info > 0)
-	    goto error_return;
-	  if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-	      || (bfd_read (external_syms, sizeof (Elf32_External_Sym),
-			    symtab_hdr->sh_info, input_bfd)
-		  != (symtab_hdr->sh_info * sizeof (Elf32_External_Sym))))
-	    goto error_return;
-	}
-
-      internal_relocs = (_bfd_elf32_link_read_relocs
-			 (input_bfd, input_section, (PTR) NULL,
-			  (Elf_Internal_Rela *) NULL, false));
-      if (internal_relocs == NULL)
-	goto error_return;
-
-      internal_syms = ((Elf_Internal_Sym *)
-		       bfd_malloc (symtab_hdr->sh_info
-				   * sizeof (Elf_Internal_Sym)));
-      if (internal_syms == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      sections = (asection **) bfd_malloc (symtab_hdr->sh_info
-					   * sizeof (asection *));
-      if (sections == NULL && symtab_hdr->sh_info > 0)
-	goto error_return;
-
-      isymp = internal_syms;
-      secpp = sections;
-      esym = external_syms;
-      esymend = esym + symtab_hdr->sh_info;
-      for (; esym < esymend; ++esym, ++isymp, ++secpp)
-	{
-	  asection *isec;
-
-	  bfd_elf32_swap_symbol_in (input_bfd, esym, isymp);
-
-	  if (isymp->st_shndx == SHN_UNDEF)
-	    isec = bfd_und_section_ptr;
-	  else if (isymp->st_shndx > 0 && isymp->st_shndx < SHN_LORESERVE)
-	    isec = bfd_section_from_elf_index (input_bfd, isymp->st_shndx);
-	  else if (isymp->st_shndx == SHN_ABS)
-	    isec = bfd_abs_section_ptr;
-	  else if (isymp->st_shndx == SHN_COMMON)
-	    isec = bfd_com_section_ptr;
-	  else
-	    {
-	      /* Who knows?  */
-	      isec = NULL;
-	    }
-
-	  *secpp = isec;
-	}
-
-      if (! sh_elf_relocate_section (output_bfd, link_info, input_bfd,
-				     input_section, data, internal_relocs,
-				     internal_syms, sections))
-	goto error_return;
-
-      if (sections != NULL)
-	free (sections);
-      sections = NULL;
-      if (internal_syms != NULL)
-	free (internal_syms);
-      internal_syms = NULL;
-      if (external_syms != NULL && symtab_hdr->contents == NULL)
-	free (external_syms);
-      external_syms = NULL;
-      if (internal_relocs != elf_section_data (input_section)->relocs)
-	free (internal_relocs);
-      internal_relocs = NULL;
-    }
-
-  return data;
-
- error_return:
-  if (internal_relocs != NULL
-      && internal_relocs != elf_section_data (input_section)->relocs)
-    free (internal_relocs);
-  if (external_syms != NULL && symtab_hdr->contents == NULL)
-    free (external_syms);
-  if (internal_syms != NULL)
-    free (internal_syms);
-  if (sections != NULL)
-    free (sections);
-  return NULL;
-}
-static asection *
-sh_elf_gc_mark_hook (abfd, info, rel, h, sym)
-       bfd *abfd;
-       struct bfd_link_info *info;
-       Elf_Internal_Rela *rel;
-       struct elf_link_hash_entry *h;
-       Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_SH_GNU_VTINHERIT:
-      case R_SH_GNU_VTENTRY:
-        break;
-
-      default:
-        switch (h->root.type)
-          {
-          case bfd_link_hash_defined:
-          case bfd_link_hash_defweak:
-            return h->root.u.def.section;
-
-          case bfd_link_hash_common:
-            return h->root.u.c.p->section;
-          }
-       }
-     }
-   else
-     {
-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
-  return NULL;
-}
-
-static boolean
-sh_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  /* we don't use got and plt entries for sh. */
-  return true;
-}
-
-/* Look through the relocs for a section during the first phase.
-   Since we don't do .gots or .plts, we just need to consider the
-   virtual table relocs for gc.  */
- 
-static boolean
-sh_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
- 
-  if (info->relocateable)
-    return true;
- 
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + symtab_hdr->sh_size/sizeof(Elf32_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    sym_hashes_end -= symtab_hdr->sh_info;
- 
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      struct elf_link_hash_entry *h;
-      unsigned long r_symndx;
- 
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-        h = NULL;
-      else
-        h = sym_hashes[r_symndx - symtab_hdr->sh_info];
- 
-      switch (ELF32_R_TYPE (rel->r_info))
-        {
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_SH_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
- 
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_SH_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
-          break;
-        }
-    }
- 
-  return true;
-}
-
-#define TARGET_BIG_SYM		bfd_elf32_sh_vec
-#define TARGET_BIG_NAME		"elf32-sh"
-#define TARGET_LITTLE_SYM	bfd_elf32_shl_vec
-#define TARGET_LITTLE_NAME	"elf32-shl"
-#define ELF_ARCH		bfd_arch_sh
-#define ELF_MACHINE_CODE	EM_SH
-#define ELF_MAXPAGESIZE		0x1
-
-#define elf_symbol_leading_char '_'
-
-#define bfd_elf32_bfd_reloc_type_lookup	sh_elf_reloc_type_lookup
-#define elf_info_to_howto		sh_elf_info_to_howto
-#define bfd_elf32_bfd_relax_section	sh_elf_relax_section
-#define elf_backend_relocate_section	sh_elf_relocate_section
-#define bfd_elf32_bfd_get_relocated_section_contents \
-					sh_elf_get_relocated_section_contents
-
-#define elf_backend_gc_mark_hook        sh_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook       sh_elf_gc_sweep_hook
-#define elf_backend_check_relocs        sh_elf_check_relocs
-
-#define elf_backend_can_gc_sections 1
-#include "elf32-target.h"
diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
deleted file mode 100644
index ec57c8cb35f..00000000000
--- a/bfd/elf32-sparc.c
+++ /dev/null
@@ -1,2059 +0,0 @@
-/* SPARC-specific support for 32-bit ELF
-   Copyright (C) 1993, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/sparc.h"
-
-static reloc_howto_type *elf32_sparc_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void elf32_sparc_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-static boolean elf32_sparc_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   const Elf_Internal_Rela *));
-static boolean elf32_sparc_adjust_dynamic_symbol
-  PARAMS ((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf32_sparc_adjust_dynindx
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf32_sparc_size_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf32_sparc_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf32_sparc_finish_dynamic_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
-	   Elf_Internal_Sym *));
-static boolean elf32_sparc_finish_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf32_sparc_merge_private_bfd_data PARAMS ((bfd *, bfd *));
-static boolean elf32_sparc_object_p
-  PARAMS ((bfd *));
-static void elf32_sparc_final_write_processing
-  PARAMS ((bfd *, boolean));
-
-/* The relocation "howto" table.  */
-
-static bfd_reloc_status_type sparc_elf_notsupported_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type sparc_elf_wdisp16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-
-reloc_howto_type _bfd_sparc_elf_howto_table[] =
-{
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_8,         0,0, 8,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_8",       false,0,0x000000ff,true),
-  HOWTO(R_SPARC_16,        0,1,16,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_16",      false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_32,        0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_32",      false,0,0xffffffff,true),
-  HOWTO(R_SPARC_DISP8,     0,0, 8,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP8",   false,0,0x000000ff,true),
-  HOWTO(R_SPARC_DISP16,    0,1,16,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP16",  false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_DISP32,    0,2,32,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP32",  false,0,0x00ffffff,true),
-  HOWTO(R_SPARC_WDISP30,   2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP30", false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_WDISP22,   2,2,22,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP22", false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HI22,     10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HI22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_22,        0,2,22,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_22",      false,0,0x003fffff,true),
-  HOWTO(R_SPARC_13,        0,2,13,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_13",      false,0,0x00001fff,true),
-  HOWTO(R_SPARC_LO10,      0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LO10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT10,     0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT10",   false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT13,     0,2,13,false,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_GOT13",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_GOT22,    10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT22",   false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC10,      0,2,10,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC22,     10,2,22,true, 0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PC22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WPLT30,    2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WPLT30",  false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_COPY,      0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_COPY",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_GLOB_DAT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_JMP_SLOT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_RELATIVE,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_RELATIVE",false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA32,      0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UA32",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_PLT32,     0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PLT32",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_HIPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HIPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_LOPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_LOPLT10",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT32,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT32",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PCPLT10",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_10,        0,2,10,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_10",      false,0,0x000003ff,true),
-  HOWTO(R_SPARC_11,        0,2,11,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_11",      false,0,0x000007ff,true),
-  /* These are for sparc64 in a 64 bit environment.
-     Values need to be here because the table is indexed by reloc number.  */
-  HOWTO(R_SPARC_64,        0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_64",      false,0,0x00000000,true),
-  HOWTO(R_SPARC_OLO10,     0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_OLO10",   false,0,0x00000000,true),
-  HOWTO(R_SPARC_HH22,      0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HH22",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_HM10,      0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_HM10",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_LM22,      0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_LM22",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_PC_HH22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_HH22", false,0,0x00000000,true),
-  HOWTO(R_SPARC_PC_HM10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_HM10", false,0,0x00000000,true),
-  HOWTO(R_SPARC_PC_LM22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsupported_reloc,  "R_SPARC_PC_LM22", false,0,0x00000000,true),
-  /* End sparc64 in 64 bit environment values.
-     The following are for sparc64 in a 32 bit environment.  */
-  HOWTO(R_SPARC_WDISP16,   2,2,16,true, 0,complain_overflow_signed,  sparc_elf_wdisp16_reloc,"R_SPARC_WDISP16", false,0,0x00000000,true),
-  HOWTO(R_SPARC_WDISP19,   2,2,19,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP19", false,0,0x0007ffff,true),
-  HOWTO(R_SPARC_UNUSED_42, 0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UNUSED_42",false,0,0x00000000,true),
-  HOWTO(R_SPARC_7,         0,2, 7,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_7",       false,0,0x0000007f,true),
-  HOWTO(R_SPARC_5,         0,2, 5,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_5",       false,0,0x0000001f,true),
-  HOWTO(R_SPARC_6,         0,2, 6,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_6",       false,0,0x0000003f,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_REV32,      0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_REV32",      false,0,0xffffffff,true),
-};
-static reloc_howto_type elf32_sparc_vtinherit_howto =
-  HOWTO (R_SPARC_GNU_VTINHERIT, 0,2,0,false,0,complain_overflow_dont, NULL, "R_SPARC_GNU_VTINHERIT", false,0, 0, false);
-static reloc_howto_type elf32_sparc_vtentry_howto =
-  HOWTO (R_SPARC_GNU_VTENTRY, 0,2,0,false,0,complain_overflow_dont, _bfd_elf_rel_vtable_reloc_fn,"R_SPARC_GNU_VTENTRY", false,0,0, false);
-
-
-struct elf_reloc_map {
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static CONST struct elf_reloc_map sparc_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_SPARC_NONE, },
-  { BFD_RELOC_16, R_SPARC_16, },
-  { BFD_RELOC_8, R_SPARC_8 },
-  { BFD_RELOC_8_PCREL, R_SPARC_DISP8 },
-  { BFD_RELOC_CTOR, R_SPARC_32 },
-  { BFD_RELOC_32, R_SPARC_32 },
-  { BFD_RELOC_32_PCREL, R_SPARC_DISP32 },
-  { BFD_RELOC_HI22, R_SPARC_HI22 },
-  { BFD_RELOC_LO10, R_SPARC_LO10, },
-  { BFD_RELOC_32_PCREL_S2, R_SPARC_WDISP30 },
-  { BFD_RELOC_SPARC22, R_SPARC_22 },
-  { BFD_RELOC_SPARC13, R_SPARC_13 },
-  { BFD_RELOC_SPARC_GOT10, R_SPARC_GOT10 },
-  { BFD_RELOC_SPARC_GOT13, R_SPARC_GOT13 },
-  { BFD_RELOC_SPARC_GOT22, R_SPARC_GOT22 },
-  { BFD_RELOC_SPARC_PC10, R_SPARC_PC10 },
-  { BFD_RELOC_SPARC_PC22, R_SPARC_PC22 },
-  { BFD_RELOC_SPARC_WPLT30, R_SPARC_WPLT30 },
-  { BFD_RELOC_SPARC_COPY, R_SPARC_COPY },
-  { BFD_RELOC_SPARC_GLOB_DAT, R_SPARC_GLOB_DAT },
-  { BFD_RELOC_SPARC_JMP_SLOT, R_SPARC_JMP_SLOT },
-  { BFD_RELOC_SPARC_RELATIVE, R_SPARC_RELATIVE },
-  { BFD_RELOC_SPARC_WDISP22, R_SPARC_WDISP22 },
-  /* ??? Doesn't dwarf use this?  */
-/*{ BFD_RELOC_SPARC_UA32, R_SPARC_UA32 }, not used?? */
-  {BFD_RELOC_SPARC_10, R_SPARC_10},
-  {BFD_RELOC_SPARC_11, R_SPARC_11},
-  {BFD_RELOC_SPARC_64, R_SPARC_64},
-  {BFD_RELOC_SPARC_OLO10, R_SPARC_OLO10},
-  {BFD_RELOC_SPARC_HH22, R_SPARC_HH22},
-  {BFD_RELOC_SPARC_HM10, R_SPARC_HM10},
-  {BFD_RELOC_SPARC_LM22, R_SPARC_LM22},
-  {BFD_RELOC_SPARC_PC_HH22, R_SPARC_PC_HH22},
-  {BFD_RELOC_SPARC_PC_HM10, R_SPARC_PC_HM10},
-  {BFD_RELOC_SPARC_PC_LM22, R_SPARC_PC_LM22},
-  {BFD_RELOC_SPARC_WDISP16, R_SPARC_WDISP16},
-  {BFD_RELOC_SPARC_WDISP19, R_SPARC_WDISP19},
-  {BFD_RELOC_SPARC_7, R_SPARC_7},
-  {BFD_RELOC_SPARC_5, R_SPARC_5},
-  {BFD_RELOC_SPARC_6, R_SPARC_6},
-  {BFD_RELOC_SPARC_REV32, R_SPARC_REV32 },
-  {BFD_RELOC_VTABLE_INHERIT, R_SPARC_GNU_VTINHERIT},
-  {BFD_RELOC_VTABLE_ENTRY, R_SPARC_GNU_VTENTRY},
-};
-
-static reloc_howto_type *
-elf32_sparc_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-  
-  switch (code)
-    {
-    case BFD_RELOC_VTABLE_INHERIT:
-      return &elf32_sparc_vtinherit_howto;
-
-    case BFD_RELOC_VTABLE_ENTRY:
-      return &elf32_sparc_vtentry_howto;
-
-    default:
-      for (i = 0; i < sizeof (sparc_reloc_map) / sizeof (struct elf_reloc_map); i++)
-        {
-          if (sparc_reloc_map[i].bfd_reloc_val == code)
-	    return &_bfd_sparc_elf_howto_table[(int) sparc_reloc_map[i].elf_reloc_val];
-        }
-    }
-    bfd_set_error (bfd_error_bad_value);
-    return NULL;
-}
-
-/* We need to use ELF32_R_TYPE so we have our own copy of this function,
-   and elf64-sparc.c has its own copy.  */
-
-static void
-elf32_sparc_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf_Internal_Rela *dst;
-{
-  BFD_ASSERT (ELF32_R_TYPE(dst->r_info) < (unsigned int) R_SPARC_max);
-  cache_ptr->howto = &_bfd_sparc_elf_howto_table[ELF32_R_TYPE(dst->r_info)];
-}
-
-/* For unsupported relocs.  */
-
-static bfd_reloc_status_type
-sparc_elf_notsupported_reloc (abfd,
-			     reloc_entry,
-			     symbol,
-			     data,
-			     input_section,
-			     output_bfd,
-			     error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return bfd_reloc_notsupported;
-}
-
-/* Handle the WDISP16 reloc.  */
-
-static bfd_reloc_status_type
-sparc_elf_wdisp16_reloc (abfd,
-			 reloc_entry,
-			 symbol,
-			 data,
-			 input_section,
-			 output_bfd,
-			 error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_vma x;
-
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! reloc_entry->howto->partial_inplace
-	  || reloc_entry->addend == 0))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (output_bfd != NULL)
-    return bfd_reloc_continue;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  relocation = (symbol->value
-		+ symbol->section->output_section->vma
-		+ symbol->section->output_offset);
-  relocation += reloc_entry->addend;
-  relocation -=	(input_section->output_section->vma
-		 + input_section->output_offset);
-  relocation -= reloc_entry->address;
-
-  x = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
-  x |= ((((relocation >> 2) & 0xc000) << 6)
-	| ((relocation >> 2) & 0x3fff));
-  bfd_put_32 (abfd, x, (bfd_byte *) data + reloc_entry->address);
-
-  if ((bfd_signed_vma) relocation < - 0x40000
-      || (bfd_signed_vma) relocation > 0x3ffff)
-    return bfd_reloc_overflow;
-  else
-    return bfd_reloc_ok;
-}
-
-/* Functions for the SPARC ELF linker.  */
-
-/* The name of the dynamic interpreter.  This is put in the .interp
-   section.  */
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1"
-
-/* The nop opcode we use.  */
-
-#define SPARC_NOP 0x01000000
-
-/* The size in bytes of an entry in the procedure linkage table.  */
-
-#define PLT_ENTRY_SIZE 12
-
-/* The first four entries in a procedure linkage table are reserved,
-   and the initial contents are unimportant (we zero them out).
-   Subsequent entries look like this.  See the SVR4 ABI SPARC
-   supplement to see how this works.  */
-
-/* sethi %hi(.-.plt0),%g1.  We fill in the address later.  */
-#define PLT_ENTRY_WORD0 0x03000000
-/* b,a .plt0.  We fill in the offset later.  */
-#define PLT_ENTRY_WORD1 0x30800000
-/* nop.  */
-#define PLT_ENTRY_WORD2 SPARC_NOP
-
-/* Look through the relocs for a section during the first phase, and
-   allocate space in the global offset table or procedure linkage
-   table.  */
-
-static boolean
-elf32_sparc_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_vma *local_got_offsets;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-  asection *sgot;
-  asection *srelgot;
-  asection *sreloc;
-
-  if (info->relocateable)
-    return true;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_offsets = elf_local_got_offsets (abfd);
-
-  sgot = NULL;
-  srelgot = NULL;
-  sreloc = NULL;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-      switch (ELF32_R_TYPE (rel->r_info))
-	{
-	case R_SPARC_GOT10:
-	case R_SPARC_GOT13:
-	case R_SPARC_GOT22:
-	  /* This symbol requires a global offset table entry.  */
-
-	  if (dynobj == NULL)
-	    {
-	      /* Create the .got section.  */
-	      elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	    }
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (srelgot == NULL
-	      && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 2))
-		    return false;
-		}
-	    }
-
-	  if (h != NULL)
-	    {
-	      if (h->got.offset != (bfd_vma) -1)
-		{
-		  /* We have already allocated space in the .got.  */
-		  break;
-		}
-	      h->got.offset = sgot->_raw_size;
-
-	      /* Make sure this symbol is output as a dynamic symbol.  */
-	      if (h->dynindx == -1)
-		{
-		  if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		    return false;
-		}
-
-	      srelgot->_raw_size += sizeof (Elf32_External_Rela);
-	    }
-	  else
-	    {
-	      /* This is a global offset table entry for a local
-                 symbol.  */
-	      if (local_got_offsets == NULL)
-		{
-		  size_t size;
-		  register unsigned int i;
-
-		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
-		  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
-		  if (local_got_offsets == NULL)
-		    return false;
-		  elf_local_got_offsets (abfd) = local_got_offsets;
-		  for (i = 0; i < symtab_hdr->sh_info; i++)
-		    local_got_offsets[i] = (bfd_vma) -1;
-		}
-	      if (local_got_offsets[r_symndx] != (bfd_vma) -1)
-		{
-		  /* We have already allocated space in the .got.  */
-		  break;
-		}
-	      local_got_offsets[r_symndx] = sgot->_raw_size;
-
-	      if (info->shared)
-		{
-		  /* If we are generating a shared object, we need to
-                     output a R_SPARC_RELATIVE reloc so that the
-                     dynamic linker can adjust this GOT entry.  */
-		  srelgot->_raw_size += sizeof (Elf32_External_Rela);
-		}
-	    }
-
-	  sgot->_raw_size += 4;
-
-	  /* If the .got section is more than 0x1000 bytes, we add
-	     0x1000 to the value of _GLOBAL_OFFSET_TABLE_, so that 13
-	     bit relocations have a greater chance of working.  */
-	  if (sgot->_raw_size >= 0x1000
-	      && elf_hash_table (info)->hgot->root.u.def.value == 0)
-	    elf_hash_table (info)->hgot->root.u.def.value = 0x1000;
-
-	  break;
-
-	case R_SPARC_WPLT30:
-	  /* This symbol requires a procedure linkage table entry.  We
-             actually build the entry in adjust_dynamic_symbol,
-             because this might be a case of linking PIC code without
-             linking in any dynamic objects, in which case we don't
-             need to generate a procedure linkage table after all.  */
-
-	  if (h == NULL)
-	    {
-	      /* The Solaris native assembler will generate a WPLT30
-                 reloc for a local symbol if you assemble a call from
-                 one section to another when using -K pic.  We treat
-                 it as WDISP30.  */
-	      break;
-	    }
-
-	  /* Make sure this symbol is output as a dynamic symbol.  */
-	  if (h->dynindx == -1)
-	    {
-	      if (! bfd_elf32_link_record_dynamic_symbol (info, h))
-		return false;
-	    }
-
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-
-	  break;
-
-	case R_SPARC_PC10:
-	case R_SPARC_PC22:
-	  if (h != NULL
-	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	    break;
-	  /* Fall through.  */
-	case R_SPARC_DISP8:
-	case R_SPARC_DISP16:
-	case R_SPARC_DISP32:
-	case R_SPARC_WDISP30:
-	case R_SPARC_WDISP22:
-	case R_SPARC_WDISP19:
-	case R_SPARC_WDISP16:
-	  /* If we are linking with -Bsymbolic, we do not need to copy
-             a PC relative reloc against a global symbol which is
-             defined in an object we are including in the link (i.e.,
-             DEF_REGULAR is set).  FIXME: At this point we have not
-             seen all the input files, so it is possible that
-             DEF_REGULAR is not set now but will be set later (it is
-             never cleared).  This needs to be handled as in
-             elf32-i386.c.  */
-	  if (h == NULL
-	      || (info->symbolic
-		  && (h->elf_link_hash_flags
-		      & ELF_LINK_HASH_DEF_REGULAR) != 0))
-	    break;
-	  /* Fall through.  */
-	case R_SPARC_8:
-	case R_SPARC_16:
-	case R_SPARC_32:
-	case R_SPARC_HI22:
-	case R_SPARC_22:
-	case R_SPARC_13:
-	case R_SPARC_LO10:
-	case R_SPARC_UA32:
-	  if (info->shared)
-	    {
-	      /* When creating a shared object, we must copy these
-                 relocs into the output file.  We create a reloc
-                 section in dynobj and make room for the reloc.  */
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (abfd,
-			   elf_elfheader (abfd)->e_shstrndx,
-			   elf_section_data (sec)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (abfd, sec),
-					 name + 5) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  if (sreloc == NULL)
-		    {
-		      flagword flags;
-
-		      sreloc = bfd_make_section (dynobj, name);
-		      flags = (SEC_HAS_CONTENTS | SEC_READONLY
-			       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-		      if ((sec->flags & SEC_ALLOC) != 0)
-			flags |= SEC_ALLOC | SEC_LOAD;
-		      if (sreloc == NULL
-			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
-			  || ! bfd_set_section_alignment (dynobj, sreloc, 2))
-			return false;
-		    }
-		}
-
-	      sreloc->_raw_size += sizeof (Elf32_External_Rela);
-	    }
-
-	  break;
-
-        case R_SPARC_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
-
-        case R_SPARC_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
-          break;
-
-	default:
-	  break;
-	}
-    }
-
-  return true;
-}
-
-static asection *
-elf32_sparc_gc_mark_hook (abfd, info, rel, h, sym)
-       bfd *abfd;
-       struct bfd_link_info *info;
-       Elf_Internal_Rela *rel;
-       struct elf_link_hash_entry *h;
-       Elf_Internal_Sym *sym;
-{
-
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_SPARC_GNU_VTINHERIT:
-      case R_SPARC_GNU_VTENTRY:
-        break;
-
-      default:
-        switch (h->root.type)
-          {
-          case bfd_link_hash_defined:
-          case bfd_link_hash_defweak:
-            return h->root.u.def.section;
-
-          case bfd_link_hash_common:
-            return h->root.u.c.p->section;
-          }
-       }
-     }
-   else
-     {
-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
-
-  return NULL;
-}
-
-/* Update the got entry reference counts for the section being removed.  */
-static boolean
-elf32_sparc_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_signed_vma *local_got_refcounts;
-  const Elf_Internal_Rela *rel, *relend;
-  unsigned long r_symndx;
-  struct elf_link_hash_entry *h;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_refcounts = elf_local_got_refcounts (abfd);
-
-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; rel++)
-    switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_SPARC_GOT10:
-      case R_SPARC_GOT13:
-      case R_SPARC_GOT22:
-	r_symndx = ELF32_R_SYM (rel->r_info);
-	if (r_symndx >= symtab_hdr->sh_info)
-	  {
-	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	    if (h->got.refcount > 0)
-	      h->got.refcount--;
-	  }
-	else
-	  {
-	    if (local_got_refcounts[r_symndx] > 0)
-	      local_got_refcounts[r_symndx]--;
-	  }
-        break;
-
-      case R_SPARC_PLT32:
-      case R_SPARC_HIPLT22:
-      case R_SPARC_LOPLT10:
-      case R_SPARC_PCPLT32:
-      case R_SPARC_PCPLT10:
-	r_symndx = ELF32_R_SYM (rel->r_info);
-	if (r_symndx >= symtab_hdr->sh_info)
-	  {
-	    h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	    if (h->plt.refcount > 0)
-	      h->plt.refcount--;
-	  }
-	break;
-
-      default:
-	break;
-      }
-
-  return true;
-}
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-elf32_sparc_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  bfd *dynobj;
-  asection *s;
-  unsigned int power_of_two;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
-  /* If this is a function, put it in the procedure linkage table.  We
-     will fill in the contents of the procedure linkage table later
-     (although we could actually do it here).  The STT_NOTYPE
-     condition is a hack specifically for the Oracle libraries
-     delivered for Solaris; for some inexplicable reason, they define
-     some of their functions as STT_NOTYPE when they really should be
-     STT_FUNC.  */
-  if (h->type == STT_FUNC
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0
-      || (h->type == STT_NOTYPE
-	  && (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	  && (h->root.u.def.section->flags & SEC_CODE) != 0))
-    {
-      if (! elf_hash_table (info)->dynamic_sections_created
-	  || ((!info->shared || info->symbolic || h->dynindx == -1)
-	      && (h->elf_link_hash_flags
-		  & ELF_LINK_HASH_DEF_REGULAR) != 0))
-	{
-	  /* This case can occur if we saw a WPLT30 reloc in an input
-	     file, but none of the input files were dynamic objects.
-	     Or, when linking the main application or a -Bsymbolic
-	     shared library against PIC code.  Or when a global symbol
-	     has been made private, e.g. via versioning.
-
-	     In these cases we know what value the symbol will resolve
-	     to, so we don't actually need to build a procedure linkage
-	     table, and we can just do a WDISP30 reloc instead.  */
-
-	  h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	  return true;
-	}
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-      /* The first four entries in .plt are reserved.  */
-      if (s->_raw_size == 0)
-	s->_raw_size = 4 * PLT_ENTRY_SIZE;
-
-      /* The procedure linkage table has a maximum size.  */
-      if (s->_raw_size >= 0x400000)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-     /* If this symbol is not defined in a regular file, and we are
-       not generating a shared library, then set the symbol to this
-       location in the .plt.  This is required to make function
-       pointers compare as equal between the normal executable and
-       the shared library.  */
-     if (! info->shared
-	&& (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-      {
-	h->root.u.def.section = s;
-	h->root.u.def.value = s->_raw_size;
-      }
-
-      h->plt.offset = s->_raw_size;
-
-      /* Make room for this entry.  */
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .rela.plt section.  */
-
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf32_External_Rela);
-
-      return true;
-    }
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  /* If we are creating a shared library, we must presume that the
-     only references to the symbol are via the global offset table.
-     For such cases we need not do anything here; the relocations will
-     be handled correctly by relocate_section.  */
-  if (info->shared)
-    return true;
-
-  /* We must allocate the symbol in our .dynbss section, which will
-     become part of the .bss section of the executable.  There will be
-     an entry for this symbol in the .dynsym section.  The dynamic
-     object will contain position independent code, so all references
-     from the dynamic object to this symbol will go through the global
-     offset table.  The dynamic linker will use the .dynsym entry to
-     determine the address it must put in the global offset table, so
-     both the dynamic object and the regular object will refer to the
-     same memory location for the variable.  */
-
-  s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
-
-  /* We must generate a R_SPARC_COPY reloc to tell the dynamic linker
-     to copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rel.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-    {
-      asection *srel;
-
-      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf32_External_Rela);
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
-    }
-
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 3)
-    power_of_two = 3;
-
-  /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
-    {
-      if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
-    }
-
-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->_raw_size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->_raw_size += h->size;
-
-  return true;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-elf32_sparc_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *s;
-  boolean reltext;
-  boolean relplt;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (! info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-
-      /* Make space for the trailing nop in .plt.  */
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-      if (s->_raw_size > 0)
-	s->_raw_size += 4;
-    }
-  else
-    {
-      /* We may have created entries in the .rela.got section.
-         However, if we are not creating the dynamic sections, we will
-         not actually use these entries.  Reset the size of .rela.got,
-         which will cause it to get stripped from the output file
-         below.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.got");
-      if (s != NULL)
-	s->_raw_size = 0;
-    }
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  reltext = false;
-  relplt = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      boolean strip;
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-	continue;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strncmp (name, ".rela", 5) == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is to handle .rela.bss and
-		 .rel.plt.  We must create it in
-		 create_dynamic_sections, because it must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      const char *outname;
-	      asection *target;
-
-	      /* If this relocation section applies to a read only
-		 section, then we probably need a DT_TEXTREL entry.  */
-	      outname = bfd_get_section_name (output_bfd,
-					      s->output_section);
-	      target = bfd_get_section_by_name (output_bfd, outname + 5);
-	      if (target != NULL
-		  && (target->flags & SEC_READONLY) != 0
-		  && (target->flags & SEC_ALLOC) != 0)
-		reltext = true;
-
-	      if (strcmp (name, ".rela.plt") == 0)
-		relplt = true;
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
-	    }
-	}
-      else if (strcmp (name, ".plt") != 0
-	       && strcmp (name, ".got") != 0)
-	{
-	  /* It's not one of our sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	{
-	  _bfd_strip_section_from_output (s);
-	  continue;
-	}
-
-      /* Allocate memory for the section contents.  */
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in elf32_sparc_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (! info->shared)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
-	}
-
-      if (relplt)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_PLTGOT, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
-	      || ! bfd_elf32_add_dynamic_entry (info, DT_JMPREL, 0))
-	    return false;
-	}
-
-      if (! bfd_elf32_add_dynamic_entry (info, DT_RELA, 0)
-	  || ! bfd_elf32_add_dynamic_entry (info, DT_RELASZ, 0)
-	  || ! bfd_elf32_add_dynamic_entry (info, DT_RELAENT,
-					    sizeof (Elf32_External_Rela)))
-	return false;
-
-      if (reltext)
-	{
-	  if (! bfd_elf32_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-    }
-
-  /* If we are generating a shared library, we generate a section
-     symbol for each output section for which we might need to copy
-     relocs.  These are local symbols, which means that they must come
-     first in the dynamic symbol table.  That means we must increment
-     the dynamic symbol index of every other dynamic symbol.  */
-  if (info->shared)
-    {
-      int c;
-
-      c = 0;
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  if ((s->flags & SEC_LINKER_CREATED) != 0
-	      || (s->flags & SEC_ALLOC) == 0)
-	    continue;
-
-	  elf_section_data (s)->dynindx = c + 1;
-
-	  /* These symbols will have no names, so we don't need to
-             fiddle with dynstr_index.  */
-
-	  ++c;
-	}
-
-      elf_link_hash_traverse (elf_hash_table (info),
-			      elf32_sparc_adjust_dynindx,
-			      (PTR) &c);
-      elf_hash_table (info)->dynsymcount += c;
-    }
-
-  return true;
-}
-
-/* Increment the index of a dynamic symbol by a given amount.  Called
-   via elf_link_hash_traverse.  */
-
-static boolean
-elf32_sparc_adjust_dynindx (h, cparg)
-     struct elf_link_hash_entry *h;
-     PTR cparg;
-{
-  int *cp = (int *) cparg;
-
-  if (h->dynindx != -1)
-    h->dynindx += *cp;
-  return true;
-}
-
-/* Relocate a SPARC ELF section.  */
-
-static boolean
-elf32_sparc_relocate_section (output_bfd, info, input_bfd, input_section,
-			      contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_vma *local_got_offsets;
-  bfd_vma got_base;
-  asection *sgot;
-  asection *splt;
-  asection *sreloc;
-  Elf_Internal_Rela *rel;
-  Elf_Internal_Rela *relend;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-  local_got_offsets = elf_local_got_offsets (input_bfd);
-
-  if (elf_hash_table (info)->hgot == NULL)
-    got_base = 0;
-  else
-    got_base = elf_hash_table (info)->hgot->root.u.def.value;
-
-  sgot = NULL;
-  splt = NULL;
-  sreloc = NULL;
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_type = ELF32_R_TYPE (rel->r_info);
-
-      if (r_type == R_SPARC_GNU_VTINHERIT 
-          || r_type == R_SPARC_GNU_VTENTRY)
-        continue;
-
-      if (r_type < 0 || r_type >= (int) R_SPARC_max)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      howto = _bfd_sparc_elf_howto_table + r_type;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      if ((r_type == R_SPARC_WPLT30
-		   && h->plt.offset != (bfd_vma) -1)
-		  || ((r_type == R_SPARC_GOT10
-		       || r_type == R_SPARC_GOT13
-		       || r_type == R_SPARC_GOT22)
-		      && elf_hash_table (info)->dynamic_sections_created
-		      && (! info->shared
-			  || (! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		  || (info->shared
-		      && ((! info->symbolic && h->dynindx != -1)
-			  || (h->elf_link_hash_flags
-			      & ELF_LINK_HASH_DEF_REGULAR) == 0)
-		      && (r_type == R_SPARC_8
-			  || r_type == R_SPARC_16
-			  || r_type == R_SPARC_32
-			  || r_type == R_SPARC_DISP8
-			  || r_type == R_SPARC_DISP16
-			  || r_type == R_SPARC_DISP32
-			  || r_type == R_SPARC_WDISP30
-			  || r_type == R_SPARC_WDISP22
-			  || r_type == R_SPARC_WDISP19
-			  || r_type == R_SPARC_WDISP16
-			  || r_type == R_SPARC_HI22
-			  || r_type == R_SPARC_22
-			  || r_type == R_SPARC_13
-			  || r_type == R_SPARC_LO10
-			  || r_type == R_SPARC_UA32
-			  || ((r_type == R_SPARC_PC10
-			       || r_type == R_SPARC_PC22)
-			      && strcmp (h->root.root.string,
-					 "_GLOBAL_OFFSET_TABLE_") != 0))))
-		{
-		  /* In these cases, we don't need the relocation
-                     value.  We check specially because in some
-                     obscure cases sec->output_section will be NULL.  */
-		  relocation = 0;
-		}
-	      else
-		relocation = (h->root.u.def.value
-			      + sec->output_section->vma
-			      + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else if (info->shared && !info->symbolic && !info->no_undefined)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      switch (r_type)
-	{
-	case R_SPARC_GOT10:
-	case R_SPARC_GOT13:
-	case R_SPARC_GOT22:
-	  /* Relocation is to the entry for this symbol in the global
-             offset table.  */
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (h != NULL)
-	    {
-	      bfd_vma off;
-
-	      off = h->got.offset;
-	      BFD_ASSERT (off != (bfd_vma) -1);
-
-	      if (! elf_hash_table (info)->dynamic_sections_created
-		  || (info->shared
-		      && (info->symbolic || h->dynindx == -1)
-		      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
-		{
-		  /* This is actually a static link, or it is a
-                     -Bsymbolic link and the symbol is defined
-                     locally, or the symbol was forced to be local
-                     because of a version file.  We must initialize
-                     this entry in the global offset table.  Since the
-                     offset must always be a multiple of 4, we use the
-                     least significant bit to record whether we have
-                     initialized it already.
-
-		     When doing a dynamic link, we create a .rela.got
-		     relocation entry to initialize the value.  This
-		     is done in the finish_dynamic_symbol routine.  */
-		  if ((off & 1) != 0)
-		    off &= ~1;
-		  else
-		    {
-		      bfd_put_32 (output_bfd, relocation,
-				  sgot->contents + off);
-		      h->got.offset |= 1;
-		    }
-		}
-
-	      relocation = sgot->output_offset + off - got_base;
-	    }
-	  else
-	    {
-	      bfd_vma off;
-
-	      BFD_ASSERT (local_got_offsets != NULL
-			  && local_got_offsets[r_symndx] != (bfd_vma) -1);
-
-	      off = local_got_offsets[r_symndx];
-
-	      /* The offset must always be a multiple of 4.  We use
-		 the least significant bit to record whether we have
-		 already processed this entry.  */
-	      if ((off & 1) != 0)
-		off &= ~1;
-	      else
-		{
-		  bfd_put_32 (output_bfd, relocation, sgot->contents + off);
-
-		  if (info->shared)
-		    {
-		      asection *srelgot;
-		      Elf_Internal_Rela outrel;
-
-		      /* We need to generate a R_SPARC_RELATIVE reloc
-			 for the dynamic linker.  */
-		      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-		      BFD_ASSERT (srelgot != NULL);
-
-		      outrel.r_offset = (sgot->output_section->vma
-					 + sgot->output_offset
-					 + off);
-		      outrel.r_info = ELF32_R_INFO (0, R_SPARC_RELATIVE);
-		      outrel.r_addend = 0;
-		      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-						 (((Elf32_External_Rela *)
-						   srelgot->contents)
-						  + srelgot->reloc_count));
-		      ++srelgot->reloc_count;
-		    }
-
-		  local_got_offsets[r_symndx] |= 1;
-		}
-
-	      relocation = sgot->output_offset + off - got_base;
-	    }
-
-	  break;
-
-	case R_SPARC_WPLT30:
-	  /* Relocation is to the entry for this symbol in the
-             procedure linkage table.  */
-
-	  /* The Solaris native assembler will generate a WPLT30 reloc
-	     for a local symbol if you assemble a call from one
-	     section to another when using -K pic.  We treat it as
-	     WDISP30.  */
-	  if (h == NULL)
-	    break;
-
-	  if (h->plt.offset == (bfd_vma) -1)
-	    {
-	      /* We didn't make a PLT entry for this symbol.  This
-                 happens when statically linking PIC code, or when
-                 using -Bsymbolic.  */
-	      break;
-	    }
-
-	  if (splt == NULL)
-	    {
-	      splt = bfd_get_section_by_name (dynobj, ".plt");
-	      BFD_ASSERT (splt != NULL);
-	    }
-
-	  relocation = (splt->output_section->vma
-			+ splt->output_offset
-			+ h->plt.offset);
-	  break;
-
-	case R_SPARC_PC10:
-	case R_SPARC_PC22:
-	  if (h != NULL
-	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	    break;
-	  /* Fall through.  */
-	case R_SPARC_DISP8:
-	case R_SPARC_DISP16:
-	case R_SPARC_DISP32:
-	case R_SPARC_WDISP30:
-	case R_SPARC_WDISP22:
-	case R_SPARC_WDISP19:
-	case R_SPARC_WDISP16:
-	  if (h == NULL
-	      || (info->symbolic
-		  && (h->elf_link_hash_flags
-		      & ELF_LINK_HASH_DEF_REGULAR) != 0))
-	    break;
-	  /* Fall through.  */
-	case R_SPARC_8:
-	case R_SPARC_16:
-	case R_SPARC_32:
-	case R_SPARC_HI22:
-	case R_SPARC_22:
-	case R_SPARC_13:
-	case R_SPARC_LO10:
-	case R_SPARC_UA32:
-	  if (info->shared)
-	    {
-	      Elf_Internal_Rela outrel;
-	      boolean skip;
-
-	      /* When generating a shared object, these relocations
-                 are copied into the output file to be resolved at run
-                 time.  */
-
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (input_bfd,
-			   elf_elfheader (input_bfd)->e_shstrndx,
-			   elf_section_data (input_section)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (input_bfd,
-							       input_section),
-					 name + 5) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  BFD_ASSERT (sreloc != NULL);
-		}
-
-	      skip = false;
-
-	      if (elf_section_data (input_section)->stab_info == NULL)
-		outrel.r_offset = rel->r_offset;
-	      else
-		{
-		  bfd_vma off;
-
-		  off = (_bfd_stab_section_offset
-			 (output_bfd, &elf_hash_table (info)->stab_info,
-			  input_section,
-			  &elf_section_data (input_section)->stab_info,
-			  rel->r_offset));
-		  if (off == (bfd_vma) -1)
-		    skip = true;
-		  outrel.r_offset = off;
-		}
-
-	      outrel.r_offset += (input_section->output_section->vma
-				  + input_section->output_offset);
-
-	      if (skip)
-		memset (&outrel, 0, sizeof outrel);
-	      /* h->dynindx may be -1 if the symbol was marked to
-                 become local.  */
-	      else if (h != NULL
-		       && ((! info->symbolic && h->dynindx != -1)
-			   || (h->elf_link_hash_flags
-			       & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		{
-		  BFD_ASSERT (h->dynindx != -1);
-		  outrel.r_info = ELF32_R_INFO (h->dynindx, r_type);
-		  outrel.r_addend = rel->r_addend;
-		}
-	      else
-		{
-		  if (r_type == R_SPARC_32)
-		    {
-		      outrel.r_info = ELF32_R_INFO (0, R_SPARC_RELATIVE);
-		      outrel.r_addend = relocation + rel->r_addend;
-		    }
-		  else
-		    {
-		      long indx;
-
-		      if (h == NULL)
-			sec = local_sections[r_symndx];
-		      else
-			{
-			  BFD_ASSERT (h->root.type == bfd_link_hash_defined
-				      || (h->root.type
-					  == bfd_link_hash_defweak));
-			  sec = h->root.u.def.section;
-			}
-		      if (sec != NULL && bfd_is_abs_section (sec))
-			indx = 0;
-		      else if (sec == NULL || sec->owner == NULL)
-			{
-			  bfd_set_error (bfd_error_bad_value);
-			  return false;
-			}
-		      else
-			{
-			  asection *osec;
-
-			  osec = sec->output_section;
-			  indx = elf_section_data (osec)->dynindx;
-
-			  /* FIXME: we really should be able to link non-pic
-			     shared libraries.  */
-			  if (indx == 0)
-			    {
-			      BFD_FAIL ();
-			      (*_bfd_error_handler)
-				(_("%s: probably compiled without -fPIC?"),
-				 bfd_get_filename (input_bfd));
-			      bfd_set_error (bfd_error_bad_value);
-			      return false;
-			    }
-			}
-
-		      outrel.r_info = ELF32_R_INFO (indx, r_type);
-
-		      /* For non-RELATIVE dynamic relocations, we keep the
-			 same symbol, and so generally the same addend.  But
-			 we do need to adjust those relocations referencing
-			 sections.  */
-		      outrel.r_addend = rel->r_addend;
-		      if (r_symndx < symtab_hdr->sh_info
-			  && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		        outrel.r_addend += sec->output_offset+sym->st_value;
-		    }
-		}
-
-	      bfd_elf32_swap_reloca_out (output_bfd, &outrel,
-					 (((Elf32_External_Rela *)
-					   sreloc->contents)
-					  + sreloc->reloc_count));
-	      ++sreloc->reloc_count;
-
-	      /* This reloc will be computed at runtime, so there's no
-                 need to do anything now, unless this is a RELATIVE
-                 reloc in an unallocated section.  */
-	      if (skip
-		  || (input_section->flags & SEC_ALLOC) != 0
-		  || ELF32_R_TYPE (outrel.r_info) != R_SPARC_RELATIVE)
-		continue;
-	    }
-	  break;
-
-	default:
-	  break;
-	}
-
-      if (r_type == R_SPARC_WDISP16)
-	{
-	  bfd_vma x;
-
-	  relocation += rel->r_addend;
-	  relocation -= (input_section->output_section->vma
-			 + input_section->output_offset);
-	  relocation -= rel->r_offset;
-
-	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
-	  x |= ((((relocation >> 2) & 0xc000) << 6)
-		| ((relocation >> 2) & 0x3fff));
-	  bfd_put_32 (input_bfd, x, contents + rel->r_offset);
-
-	  if ((bfd_signed_vma) relocation < - 0x40000
-	      || (bfd_signed_vma) relocation > 0x3ffff)
-	    r = bfd_reloc_overflow;
-	  else
-	    r = bfd_reloc_ok;
-	}
-      else if (r_type == R_SPARC_REV32)
-	{
-	  bfd_vma x;
-
-	  relocation = relocation + rel->r_addend;
-
-	  x = bfd_get_32 (input_bfd, contents + rel->r_offset);
-	  x = x + relocation;
-	  bfd_putl32 (/*input_bfd,*/ x, contents + rel->r_offset);
-	  r = bfd_reloc_ok;
-	}
-      else
-	r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-				      contents, rel->r_offset,
-				      relocation, rel->r_addend);
-
-
-      if (r != bfd_reloc_ok)
-	{
-	  switch (r)
-	    {
-	    default:
-	    case bfd_reloc_outofrange:
-	      abort ();
-	    case bfd_reloc_overflow:
-	      {
-		const char *name;
-
-		if (h != NULL)
-		  name = h->root.root.string;
-		else
-		  {
-		    name = bfd_elf_string_from_elf_section (input_bfd,
-							    symtab_hdr->sh_link,
-							    sym->st_name);
-		    if (name == NULL)
-		      return false;
-		    if (*name == '\0')
-		      name = bfd_section_name (input_bfd, sec);
-		  }
-		if (! ((*info->callbacks->reloc_overflow)
-		       (info, name, howto->name, (bfd_vma) 0,
-			input_bfd, input_section, rel->r_offset)))
-		  return false;
-	      }
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-elf32_sparc_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  bfd *dynobj;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  if (h->plt.offset != (bfd_vma) -1)
-    {
-      asection *splt;
-      asection *srela;
-      Elf_Internal_Rela rela;
-
-      /* This symbol has an entry in the procedure linkage table.  Set
-         it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (splt != NULL && srela != NULL);
-
-      /* Fill in the entry in the procedure linkage table.  */
-      bfd_put_32 (output_bfd,
-		  PLT_ENTRY_WORD0 + h->plt.offset,
-		  splt->contents + h->plt.offset);
-      bfd_put_32 (output_bfd,
-		  (PLT_ENTRY_WORD1
-		   + (((- (h->plt.offset + 4)) >> 2) & 0x3fffff)),
-		  splt->contents + h->plt.offset + 4);
-      bfd_put_32 (output_bfd, PLT_ENTRY_WORD2,
-		  splt->contents + h->plt.offset + 8);
-
-      /* Fill in the entry in the .rela.plt section.  */
-      rela.r_offset = (splt->output_section->vma
-		       + splt->output_offset
-		       + h->plt.offset);
-      rela.r_info = ELF32_R_INFO (h->dynindx, R_SPARC_JMP_SLOT);
-      rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + h->plt.offset / PLT_ENTRY_SIZE - 4));
-
-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
-	  sym->st_shndx = SHN_UNDEF;
-	}
-    }
-
-  if (h->got.offset != (bfd_vma) -1)
-    {
-      asection *sgot;
-      asection *srela;
-      Elf_Internal_Rela rela;
-
-      /* This symbol has an entry in the global offset table.  Set it
-         up.  */
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srela = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (sgot != NULL && srela != NULL);
-
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
-		       + (h->got.offset &~ 1));
-
-      /* If this is a -Bsymbolic link, and the symbol is defined
-	 locally, we just want to emit a RELATIVE reloc.  Likewise if
-	 the symbol was forced to be local because of a version file.
-	 The entry in the global offset table will already have been
-	 initialized in the relocate_section function.  */
-      if (info->shared
-	  && (info->symbolic || h->dynindx == -1)
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
-	rela.r_info = ELF32_R_INFO (0, R_SPARC_RELATIVE);
-      else
-	{
-	  bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	  rela.r_info = ELF32_R_INFO (h->dynindx, R_SPARC_GLOB_DAT);
-	}
-
-      rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) srela->contents
-				  + srela->reloc_count));
-      ++srela->reloc_count;
-    }
-
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
-    {
-      asection *s;
-      Elf_Internal_Rela rela;
-
-      /* This symbols needs a copy reloc.  Set it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				   ".rela.bss");
-      BFD_ASSERT (s != NULL);
-
-      rela.r_offset = (h->root.u.def.value
-		       + h->root.u.def.section->output_section->vma
-		       + h->root.u.def.section->output_offset);
-      rela.r_info = ELF32_R_INFO (h->dynindx, R_SPARC_COPY);
-      rela.r_addend = 0;
-      bfd_elf32_swap_reloca_out (output_bfd, &rela,
-				 ((Elf32_External_Rela *) s->contents
-				  + s->reloc_count));
-      ++s->reloc_count;
-    }
-
-  /* Mark some specially defined symbols as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0
-      || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-
-  return true;
-}
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-elf32_sparc_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *sdyn;
-  asection *sgot;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      asection *splt;
-      Elf32_External_Dyn *dyncon, *dynconend;
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (splt != NULL && sdyn != NULL);
-
-      dyncon = (Elf32_External_Dyn *) sdyn->contents;
-      dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  boolean size;
-
-	  bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    case DT_PLTGOT:   name = ".plt"; size = false; break;
-	    case DT_PLTRELSZ: name = ".rela.plt"; size = true; break;
-	    case DT_JMPREL:   name = ".rela.plt"; size = false; break;
-	    default:	  name = NULL; size = false; break;
-	    }
-
-	  if (name != NULL)
-	    {
-	      asection *s;
-
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      if (s == NULL)
-		dyn.d_un.d_val = 0;
-	      else
-		{
-		  if (! size)
-		    dyn.d_un.d_ptr = s->vma;
-		  else
-		    {
-		      if (s->_cooked_size != 0)
-			dyn.d_un.d_val = s->_cooked_size;
-		      else
-			dyn.d_un.d_val = s->_raw_size;
-		    }
-		}
-	      bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon);
-	    }
-	}
-
-      /* Clear the first four entries in the procedure linkage table,
-	 and put a nop in the last four bytes.  */
-      if (splt->_raw_size > 0)
-	{
-	  memset (splt->contents, 0, 4 * PLT_ENTRY_SIZE);
-	  bfd_put_32 (output_bfd, SPARC_NOP,
-		      splt->contents + splt->_raw_size - 4);
-	}
-
-      elf_section_data (splt->output_section)->this_hdr.sh_entsize =
-	PLT_ENTRY_SIZE;
-    }
-
-  /* Set the first entry in the global offset table to the address of
-     the dynamic section.  */
-  sgot = bfd_get_section_by_name (dynobj, ".got");
-  BFD_ASSERT (sgot != NULL);
-  if (sgot->_raw_size > 0)
-    {
-      if (sdyn == NULL)
-	bfd_put_32 (output_bfd, (bfd_vma) 0, sgot->contents);
-      else
-	bfd_put_32 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    sgot->contents);
-    }
-
-  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 4;
-
-  if (info->shared)
-    {
-      asection *sdynsym;
-      asection *s;
-      Elf_Internal_Sym sym;
-      int c;
-
-      /* Set up the section symbols for the output sections.  */
-
-      sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (sdynsym != NULL);
-
-      sym.st_size = 0;
-      sym.st_name = 0;
-      sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-      sym.st_other = 0;
-
-      c = 0;
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  int indx;
-
-	  if (elf_section_data (s)->dynindx == 0)
-	    continue;
-
-	  sym.st_value = s->vma;
-
-	  indx = elf_section_data (s)->this_idx;
-	  BFD_ASSERT (indx > 0);
-	  sym.st_shndx = indx;
-
-	  bfd_elf32_swap_symbol_out (output_bfd, &sym,
-				     (PTR) (((Elf32_External_Sym *)
-					     sdynsym->contents)
-					    + elf_section_data (s)->dynindx));
-
-	  ++c;
-	}
-
-      /* Set the sh_info field of the output .dynsym section to the
-         index of the first global symbol.  */
-      elf_section_data (sdynsym->output_section)->this_hdr.sh_info = c + 1;
-    }
-
-  return true;
-}
-
-/* Functions for dealing with the e_flags field.
-
-   We don't define set_private_flags or copy_private_bfd_data because
-   the only currently defined values are based on the bfd mach number,
-   so we use the latter instead and defer setting e_flags until the
-   file is written out.  */
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-
-static boolean
-elf32_sparc_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  boolean error;
-  static int previous_ibfd_e_flags = -1;
-
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  error = false;
-
-#if 0
-  /* ??? The native linker doesn't do this so we can't (otherwise gcc would
-     have to know which linker is being used).  Instead, the native linker
-     bumps up the architecture level when it has to.  However, I still think
-     warnings like these are good, so it would be nice to have them turned on
-     by some option.  */
-
-  /* If the output machine is normal sparc, we can't allow v9 input files.  */
-  if (bfd_get_mach (obfd) == bfd_mach_sparc
-      && (bfd_get_mach (ibfd) == bfd_mach_sparc_v8plus
-	  || bfd_get_mach (ibfd) == bfd_mach_sparc_v8plusa))
-    {
-      error = true;
-      (*_bfd_error_handler)
-	(_("%s: compiled for a v8plus system and target is v8"),
-	 bfd_get_filename (ibfd));
-    }
-  /* If the output machine is v9, we can't allow v9+vis input files.  */
-  if (bfd_get_mach (obfd) == bfd_mach_sparc_v8plus
-      && bfd_get_mach (ibfd) == bfd_mach_sparc_v8plusa)
-    {
-      error = true;
-      (*_bfd_error_handler)
-	(_("%s: compiled for a v8plusa system and target is v8plus"),
-	 bfd_get_filename (ibfd));
-    }
-#else
-  if (bfd_get_mach (ibfd) >= bfd_mach_sparc_v9)
-    {
-      error = true;
-      (*_bfd_error_handler)
-	(_("%s: compiled for a 64 bit system and target is 32 bit"),
-	 bfd_get_filename (ibfd));
-    }
-  else if (bfd_get_mach (obfd) < bfd_get_mach (ibfd))
-    bfd_set_arch_mach (obfd, bfd_arch_sparc, bfd_get_mach (ibfd));
-#endif
-
-  if (((elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA)
-       != previous_ibfd_e_flags)
-      && previous_ibfd_e_flags >= 0)
-    {
-      (*_bfd_error_handler)
-	(_("%s: linking little endian files with big endian files"),
-	 bfd_get_filename (ibfd));
-      error = true;
-    }
-  previous_ibfd_e_flags = elf_elfheader (ibfd)->e_flags & EF_SPARC_LEDATA;
-
-  if (error)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  return true;
-}
-
-/* Set the right machine number.  */
-
-static boolean
-elf32_sparc_object_p (abfd)
-     bfd *abfd;
-{
-  if (elf_elfheader (abfd)->e_machine == EM_SPARC32PLUS)
-    {
-      if (elf_elfheader (abfd)->e_flags & EF_SPARC_SUN_US1)
-	return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
-					  bfd_mach_sparc_v8plusa);
-      else if (elf_elfheader (abfd)->e_flags & EF_SPARC_32PLUS)
-	return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
-					  bfd_mach_sparc_v8plus);
-      else
-	return false;
-    }
-  else if (elf_elfheader (abfd)->e_flags & EF_SPARC_LEDATA)
-    return bfd_default_set_arch_mach (abfd, bfd_arch_sparc,
-                                      bfd_mach_sparc_sparclite_le);
-  else
-    return bfd_default_set_arch_mach (abfd, bfd_arch_sparc, bfd_mach_sparc);
-}
-
-/* The final processing done just before writing out the object file.
-   We need to set the e_machine field appropriately.  */
-
-static void
-elf32_sparc_final_write_processing (abfd, linker)
-     bfd *abfd;
-     boolean linker;
-{
-  switch (bfd_get_mach (abfd))
-    {
-    case bfd_mach_sparc :
-      break; /* nothing to do */
-    case bfd_mach_sparc_v8plus :
-      elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
-      elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
-      elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS;
-      break;
-    case bfd_mach_sparc_v8plusa :
-      elf_elfheader (abfd)->e_machine = EM_SPARC32PLUS;
-      elf_elfheader (abfd)->e_flags &=~ EF_SPARC_32PLUS_MASK;
-      elf_elfheader (abfd)->e_flags |= EF_SPARC_32PLUS | EF_SPARC_SUN_US1;
-      break;
-    case bfd_mach_sparc_sparclite_le :
-      elf_elfheader (abfd)->e_machine = EM_SPARC;
-      elf_elfheader (abfd)->e_flags |= EF_SPARC_LEDATA;
-      break;
-    default :
-      abort ();
-      break;
-    }
-}
-
-#define TARGET_BIG_SYM	bfd_elf32_sparc_vec
-#define TARGET_BIG_NAME	"elf32-sparc"
-#define ELF_ARCH	bfd_arch_sparc
-#define ELF_MACHINE_CODE EM_SPARC
-#define ELF_MACHINE_ALT1 EM_SPARC32PLUS
-#define ELF_MAXPAGESIZE 0x10000
-
-#define bfd_elf32_bfd_reloc_type_lookup	elf32_sparc_reloc_type_lookup
-#define elf_info_to_howto		elf32_sparc_info_to_howto
-#define elf_backend_create_dynamic_sections \
-					_bfd_elf_create_dynamic_sections
-#define elf_backend_check_relocs	elf32_sparc_check_relocs
-#define elf_backend_adjust_dynamic_symbol \
-					elf32_sparc_adjust_dynamic_symbol
-#define elf_backend_size_dynamic_sections \
-					elf32_sparc_size_dynamic_sections
-#define elf_backend_relocate_section	elf32_sparc_relocate_section
-#define elf_backend_finish_dynamic_symbol \
-					elf32_sparc_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections \
-					elf32_sparc_finish_dynamic_sections
-#define bfd_elf32_bfd_merge_private_bfd_data \
-					elf32_sparc_merge_private_bfd_data
-#define elf_backend_object_p		elf32_sparc_object_p
-#define elf_backend_final_write_processing \
-					elf32_sparc_final_write_processing
-#define elf_backend_gc_mark_hook        elf32_sparc_gc_mark_hook
-#define elf_backend_gc_sweep_hook       elf32_sparc_gc_sweep_hook
-
-#define elf_backend_can_gc_sections 1
-#define elf_backend_want_got_plt 0
-#define elf_backend_plt_readonly 0
-#define elf_backend_want_plt_sym 1
-#define elf_backend_got_header_size 4
-#define elf_backend_plt_header_size (4*PLT_ENTRY_SIZE)
-
-#include "elf32-target.h"
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
deleted file mode 100644
index e71353df55f..00000000000
--- a/bfd/elf32-v850.c
+++ /dev/null
@@ -1,2230 +0,0 @@
-/* V850-specific support for 32-bit ELF
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-
-/* XXX FIXME: This code is littered with 32bit int, 16bit short, 8bit char
-   dependencies.  As is the gas & simulator code or the v850.  */
-
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-#include "elf/v850.h"
-
-/* sign-extend a 24-bit number */
-#define SEXT24(x)	((((x) & 0xffffff) ^ (~ 0x7fffff)) + 0x800000)
-      
-static reloc_howto_type *v850_elf_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static void v850_elf_info_to_howto_rel
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rel *));
-static void v850_elf_info_to_howto_rela
-  PARAMS ((bfd *, arelent *, Elf32_Internal_Rela *));
-static bfd_reloc_status_type v850_elf_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static boolean v850_elf_is_local_label_name
-  PARAMS ((bfd *, const char *));
-static boolean v850_elf_relocate_section
-  PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	  Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static bfd_reloc_status_type v850_elf_perform_relocation
-  PARAMS ((bfd *, int, bfd_vma, bfd_byte *));
-static boolean v850_elf_check_relocs
-  PARAMS ((bfd *, struct bfd_link_info *, asection *, const Elf_Internal_Rela *));
-static void remember_hi16s_reloc
-  PARAMS ((bfd *, bfd_vma, bfd_byte *));
-static bfd_byte * find_remembered_hi16s_reloc
-  PARAMS ((bfd_vma, boolean *));
-static bfd_reloc_status_type v850_elf_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, bfd *, asection *, bfd_byte *, bfd_vma,
-	   bfd_vma, bfd_vma, struct bfd_link_info *, asection *, int));
-static boolean v850_elf_object_p
-  PARAMS ((bfd *));
-static boolean v850_elf_fake_sections
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *));
-static void v850_elf_final_write_processing
-  PARAMS ((bfd *, boolean));
-static boolean v850_elf_set_private_flags
-  PARAMS ((bfd *, flagword));
-static boolean v850_elf_copy_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean v850_elf_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-static boolean v850_elf_print_private_bfd_data
-  PARAMS ((bfd *, PTR));
-static boolean v850_elf_section_from_bfd_section
-  PARAMS ((bfd *, Elf32_Internal_Shdr *, asection *, int *));
-static void v850_elf_symbol_processing
-  PARAMS ((bfd *, asymbol *));
-static boolean v850_elf_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
-	   const char **, flagword *, asection **, bfd_vma *));
-static boolean v850_elf_link_output_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const char *,
-	   Elf_Internal_Sym *, asection *));
-static boolean v850_elf_section_from_shdr
-  PARAMS ((bfd *, Elf_Internal_Shdr *, char *));
-
-/* Note: It is REQUIRED that the 'type' value of each entry in this array
-   match the index of the entry in the array.  */
-static reloc_howto_type v850_elf_howto_table[] =
-{
-  /* This reloc does nothing.  */
-  HOWTO (R_V850_NONE,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,		/* special_function */
-	 "R_V850_NONE",			/* name */
-	 false,				/* partial_inplace */
-	 0,				/* src_mask */
-	 0,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* A PC relative 9 bit branch. */
-  HOWTO (R_V850_9_PCREL,		/* type */
-	 2,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 26,				/* bitsize */
-	 true,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_9_PCREL",		/* name */
-	 false,				/* partial_inplace */
-	 0x00ffffff,			/* src_mask */
-	 0x00ffffff,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  /* A PC relative 22 bit branch. */
-  HOWTO (R_V850_22_PCREL,		/* type */
-	 2,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 22,				/* bitsize */
-	 true,				/* pc_relative */
-	 7,				/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_22_PCREL",		/* name */
-	 false,				/* partial_inplace */
-	 0x07ffff80,			/* src_mask */
-	 0x07ffff80,			/* dst_mask */
-	 true),				/* pcrel_offset */
-
-  /* High 16 bits of symbol value.  */
-  HOWTO (R_V850_HI16_S,			/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_HI16_S",		/* name */
-	 true,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* High 16 bits of symbol value.  */
-  HOWTO (R_V850_HI16,			/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_HI16",			/* name */
-	 true,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* Low 16 bits of symbol value.  */
-  HOWTO (R_V850_LO16,			/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_LO16",			/* name */
-	 true,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* Simple 32bit reloc.  */
-  HOWTO (R_V850_32,			/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 32,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_32",			/* name */
-	 true,				/* partial_inplace */
-	 0xffffffff,			/* src_mask */
-	 0xffffffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* Simple 16bit reloc.  */
-  HOWTO (R_V850_16,			/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,		/* special_function */
-	 "R_V850_16",			/* name */
-	 true,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* Simple 8bit reloc.	 */
-  HOWTO (R_V850_8,			/* type */
-	 0,				/* rightshift */
-	 0,				/* size (0 = byte, 1 = short, 2 = long) */
-	 8,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,		/* special_function */
-	 "R_V850_8",			/* name */
-	 true,				/* partial_inplace */
-	 0xff,				/* src_mask */
-	 0xff,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 16 bit offset from the short data area pointer.  */
-  HOWTO (R_V850_SDA_16_16_OFFSET,	/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_SDA_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 15 bit offset from the short data area pointer.  */
-  HOWTO (R_V850_SDA_15_16_OFFSET,	/* type */
-	 1,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 1,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_SDA_15_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0xfffe,			/* src_mask */
-	 0xfffe,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 16 bit offset from the zero data area pointer.  */
-  HOWTO (R_V850_ZDA_16_16_OFFSET,	/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_ZDA_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 15 bit offset from the zero data area pointer.  */
-  HOWTO (R_V850_ZDA_15_16_OFFSET,	/* type */
-	 1,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 1,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_ZDA_15_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0xfffe,			/* src_mask */
-	 0xfffe,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 6 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_6_8_OFFSET,		/* type */
-	 2,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 8,				/* bitsize */
-	 false,				/* pc_relative */
-	 1,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_TDA_6_8_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0x7e,				/* src_mask */
-	 0x7e,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 8 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_7_8_OFFSET,		/* type */
-	 1,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 8,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_TDA_7_8_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0x7f,				/* src_mask */
-	 0x7f,				/* dst_mask */
-	 false),			/* pcrel_offset */
-  
-  /* 7 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_7_7_OFFSET,		/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 7,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_TDA_7_7_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0x7f,				/* src_mask */
-	 0x7f,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 16 bit offset from the tiny data area pointer!  */
-  HOWTO (R_V850_TDA_16_16_OFFSET,	/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_TDA_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xfff,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 5 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_4_5_OFFSET,		/* type */
-	 1,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 5,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_TDA_4_5_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0x0f,				/* src_mask */
-	 0x0f,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 4 bit offset from the tiny data area pointer.  */
-  HOWTO (R_V850_TDA_4_4_OFFSET,		/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 4,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_TDA_4_4_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0x0f,				/* src_mask */
-	 0x0f,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 16 bit offset from the short data area pointer.  */
-  HOWTO (R_V850_SDA_16_16_SPLIT_OFFSET,	/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_SDA_16_16_SPLIT_OFFSET",/* name */
-	 false,				/* partial_inplace */
-	 0xfffe0020,			/* src_mask */
-	 0xfffe0020,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 16 bit offset from the zero data area pointer.  */
-  HOWTO (R_V850_ZDA_16_16_SPLIT_OFFSET,	/* type */
-	 0,				/* rightshift */
-	 2,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_ZDA_16_16_SPLIT_OFFSET",/* name */
-	 false,				/* partial_inplace */
-	 0xfffe0020,			/* src_mask */
-	 0xfffe0020,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 6 bit offset from the call table base pointer.  */
-  HOWTO (R_V850_CALLT_6_7_OFFSET,	/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 7,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_CALLT_6_7_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0x3f,				/* src_mask */
-	 0x3f,				/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* 16 bit offset from the call table base pointer.  */
-  HOWTO (R_V850_CALLT_16_16_OFFSET,	/* type */
-	 0,				/* rightshift */
-	 1,				/* size (0 = byte, 1 = short, 2 = long) */
-	 16,				/* bitsize */
-	 false,				/* pc_relative */
-	 0,				/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 v850_elf_reloc,		/* special_function */
-	 "R_V850_CALLT_16_16_OFFSET",	/* name */
-	 false,				/* partial_inplace */
-	 0xffff,			/* src_mask */
-	 0xffff,			/* dst_mask */
-	 false),			/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_V850_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_V850_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_V850_GNU_VTENTRY,     /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_V850_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
- 
-};
-
-/* Map BFD reloc types to V850 ELF reloc types.  */
-
-struct v850_elf_reloc_map
-{
-  /* BFD_RELOC_V850_CALLT_16_16_OFFSET is 258, which will not fix in an
-     unsigned char.  */
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static const struct v850_elf_reloc_map v850_elf_reloc_map[] =
-{
-  { BFD_RELOC_NONE,		R_V850_NONE },
-  { BFD_RELOC_V850_9_PCREL,	R_V850_9_PCREL },
-  { BFD_RELOC_V850_22_PCREL,	R_V850_22_PCREL },
-  { BFD_RELOC_HI16_S,		R_V850_HI16_S },
-  { BFD_RELOC_HI16,		R_V850_HI16 },
-  { BFD_RELOC_LO16,		R_V850_LO16 },
-  { BFD_RELOC_32,		R_V850_32 },
-  { BFD_RELOC_16,		R_V850_16 },
-  { BFD_RELOC_8,		R_V850_8 },
-  { BFD_RELOC_V850_SDA_16_16_OFFSET, R_V850_SDA_16_16_OFFSET },
-  { BFD_RELOC_V850_SDA_15_16_OFFSET, R_V850_SDA_15_16_OFFSET },
-  { BFD_RELOC_V850_ZDA_16_16_OFFSET, R_V850_ZDA_16_16_OFFSET },
-  { BFD_RELOC_V850_ZDA_15_16_OFFSET, R_V850_ZDA_15_16_OFFSET },
-  { BFD_RELOC_V850_TDA_6_8_OFFSET,   R_V850_TDA_6_8_OFFSET   },
-  { BFD_RELOC_V850_TDA_7_8_OFFSET,   R_V850_TDA_7_8_OFFSET   },
-  { BFD_RELOC_V850_TDA_7_7_OFFSET,   R_V850_TDA_7_7_OFFSET   },
-  { BFD_RELOC_V850_TDA_16_16_OFFSET, R_V850_TDA_16_16_OFFSET },
-  { BFD_RELOC_V850_TDA_4_5_OFFSET,         R_V850_TDA_4_5_OFFSET         },
-  { BFD_RELOC_V850_TDA_4_4_OFFSET,         R_V850_TDA_4_4_OFFSET         },
-  { BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET, R_V850_SDA_16_16_SPLIT_OFFSET },
-  { BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET, R_V850_ZDA_16_16_SPLIT_OFFSET },
-  { BFD_RELOC_V850_CALLT_6_7_OFFSET,       R_V850_CALLT_6_7_OFFSET       },
-  { BFD_RELOC_V850_CALLT_16_16_OFFSET,     R_V850_CALLT_16_16_OFFSET     },
-  { BFD_RELOC_VTABLE_INHERIT,               R_V850_GNU_VTINHERIT },
-  { BFD_RELOC_VTABLE_ENTRY,                 R_V850_GNU_VTENTRY },
-
-};
-
-
-/* Map a bfd relocation into the appropriate howto structure */
-static reloc_howto_type *
-v850_elf_reloc_type_lookup (abfd, code)
-     bfd *                     abfd;
-     bfd_reloc_code_real_type  code;
-{
-  unsigned int i;
-
-  for (i = 0;
-       i < sizeof (v850_elf_reloc_map) / sizeof (struct v850_elf_reloc_map);
-       i++)
-    {
-      if (v850_elf_reloc_map[i].bfd_reloc_val == code)
-	{
-	  BFD_ASSERT (v850_elf_howto_table[v850_elf_reloc_map[i].elf_reloc_val].type == v850_elf_reloc_map[i].elf_reloc_val);
-	  
-	  return & v850_elf_howto_table[v850_elf_reloc_map[i].elf_reloc_val];
-	}
-    }
-
-  return NULL;
-}
-
-
-/* Set the howto pointer for an V850 ELF reloc.  */
-static void
-v850_elf_info_to_howto_rel (abfd, cache_ptr, dst)
-     bfd *                 abfd;
-     arelent *             cache_ptr;
-     Elf32_Internal_Rel *  dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
-  cache_ptr->howto = &v850_elf_howto_table[r_type];
-}
-
-/* Set the howto pointer for a V850 ELF reloc (type RELA). */
-static void
-v850_elf_info_to_howto_rela (abfd, cache_ptr, dst)
-     bfd *                 abfd;
-     arelent *             cache_ptr;
-     Elf32_Internal_Rela   *dst;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_V850_max);
-  cache_ptr->howto = &v850_elf_howto_table[r_type];
-}
-
-
-/* Look through the relocs for a section during the first phase, and
-   allocate space in the global offset table or procedure linkage
-   table.  */
-
-static boolean
-v850_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *                      abfd;
-     struct bfd_link_info *     info;
-     asection *                 sec;
-     const Elf_Internal_Rela *  relocs;
-{
-  boolean ret = true;
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-  asection *sreloc;
-  enum v850_reloc_type r_type;
-  int other = 0;
-  const char *common = (const char *)0;
-
-  if (info->relocateable)
-    return true;
-
-#ifdef DEBUG
-  fprintf (stderr, "v850_elf_check_relocs called for section %s in %s\n",
-	   bfd_get_section_name (abfd, sec),
-	   bfd_get_filename (abfd));
-#endif
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  sreloc = NULL;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-      r_type = (enum v850_reloc_type) ELF32_R_TYPE (rel->r_info);
-      switch (r_type)
-	{
-	default:
-	case R_V850_NONE:
-	case R_V850_9_PCREL:
-	case R_V850_22_PCREL:
-	case R_V850_HI16_S:
-	case R_V850_HI16:
-	case R_V850_LO16:
-	case R_V850_32:
-	case R_V850_16:
-	case R_V850_8:
-	case R_V850_CALLT_6_7_OFFSET:
-	case R_V850_CALLT_16_16_OFFSET:
-	  break;
-
-        /* This relocation describes the C++ object vtable hierarchy.
-           Reconstruct it for later use during GC.  */
-        case R_V850_GNU_VTINHERIT:
-          if (!_bfd_elf32_gc_record_vtinherit (abfd, sec, h, rel->r_offset))
-            return false;
-          break;
-
-        /* This relocation describes which C++ vtable entries are actually
-           used.  Record for later use during GC.  */
-        case R_V850_GNU_VTENTRY:
-          if (!_bfd_elf32_gc_record_vtentry (abfd, sec, h, rel->r_addend))
-            return false;
-          break;
-
-	case R_V850_SDA_16_16_SPLIT_OFFSET:
-	case R_V850_SDA_16_16_OFFSET:
-	case R_V850_SDA_15_16_OFFSET:
-	  other = V850_OTHER_SDA;
-	  common = ".scommon";
-	  goto small_data_common;
-	  
-	case R_V850_ZDA_16_16_SPLIT_OFFSET:
-	case R_V850_ZDA_16_16_OFFSET:
-	case R_V850_ZDA_15_16_OFFSET:
-	  other = V850_OTHER_ZDA;
-	  common = ".zcommon";
-	  goto small_data_common;
-	  
-	case R_V850_TDA_4_5_OFFSET:
-	case R_V850_TDA_4_4_OFFSET:
-	case R_V850_TDA_6_8_OFFSET:
-	case R_V850_TDA_7_8_OFFSET:
-	case R_V850_TDA_7_7_OFFSET:
-	case R_V850_TDA_16_16_OFFSET:
-	  other = V850_OTHER_TDA;
-	  common = ".tcommon";
-	  /* fall through */
-
-#define V850_OTHER_MASK (V850_OTHER_TDA | V850_OTHER_SDA | V850_OTHER_ZDA)
-
-	small_data_common:
-	  if (h)
-	    {
-	      h->other |= other;	/* flag which type of relocation was used */
-	      if ((h->other & V850_OTHER_MASK) != (other & V850_OTHER_MASK)
-		  && (h->other & V850_OTHER_ERROR) == 0)
-		{
-		  const char * msg;
-		  static char  buff[200]; /* XXX */
-
-		  switch (h->other & V850_OTHER_MASK)
-		    {
-		    default:
-		      msg = _("Variable `%s' cannot occupy in multiple small data regions");
-		      break;
-		    case V850_OTHER_SDA | V850_OTHER_ZDA | V850_OTHER_TDA:
-		      msg = _("Variable `%s' can only be in one of the small, zero, and tiny data regions");
-		      break;
-		    case V850_OTHER_SDA | V850_OTHER_ZDA:
-		      msg = _("Variable `%s' cannot be in both small and zero data regions simultaneously");
-		      break;
-		    case V850_OTHER_SDA | V850_OTHER_TDA:
-		      msg = _("Variable `%s' cannot be in both small and tiny data regions simultaneously");
-		      break;
-		    case V850_OTHER_ZDA | V850_OTHER_TDA:
-		      msg = _("Variable `%s' cannot be in both zero and tiny data regions simultaneously");
-		      break;
-		    }
-
-		  sprintf (buff, msg, h->root.root.string);
-		  info->callbacks->warning (info, buff, h->root.root.string,
-					    abfd, h->root.u.def.section, 0);
-
-		  bfd_set_error (bfd_error_bad_value);
-		  h->other |= V850_OTHER_ERROR;
-		  ret = false;
-		}
-	    }
-
-	  if (h && h->root.type == bfd_link_hash_common
-	      && h->root.u.c.p
-	      && !strcmp (bfd_get_section_name (abfd, h->root.u.c.p->section), "COMMON"))
-	    {
-	      asection *section = h->root.u.c.p->section = bfd_make_section_old_way (abfd, common);
-	      section->flags |= SEC_IS_COMMON;
-	    }
-
-#ifdef DEBUG
-	  fprintf (stderr, "v850_elf_check_relocs, found %s relocation for %s%s\n",
-		   v850_elf_howto_table[ (int)r_type ].name,
-		   (h && h->root.root.string) ? h->root.root.string : "<unknown>",
-		   (h->root.type == bfd_link_hash_common) ? ", symbol is common" : "");
-#endif
-	  break;
-	}
-    }
-
-  return ret;
-}
-
-/*
- * In the old version, when an entry was checked out from the table,
- * it was deleted.  This produced an error if the entry was needed
- * more than once, as the second attempted retry failed.
- *
- * In the current version, the entry is not deleted, instead we set
- * the field 'found' to true.  If a second lookup matches the same
- * entry, then we know that the hi16s reloc has already been updated
- * and does not need to be updated a second time.
- *
- * TODO - TOFIX: If it is possible that we need to restore 2 different
- * addresses from the same table entry, where the first generates an
- * overflow, whilst the second do not, then this code will fail.
- */
-
-typedef struct hi16s_location
-{
-  bfd_vma       addend;
-  bfd_byte *    address;
-  unsigned long counter;
-  boolean       found;
-  struct hi16s_location * next;
-}
-hi16s_location;
-
-static hi16s_location *  previous_hi16s;
-static hi16s_location *  free_hi16s;
-static unsigned long     hi16s_counter;
-
-static void
-remember_hi16s_reloc (abfd, addend, address)
-     bfd *      abfd;
-     bfd_vma    addend;
-     bfd_byte * address;
-{
-  hi16s_location * entry = NULL;
-  
-  /* Find a free structure.  */
-  if (free_hi16s == NULL)
-    free_hi16s = (hi16s_location *) bfd_zalloc (abfd, sizeof (* free_hi16s));
-
-  entry      = free_hi16s;
-  free_hi16s = free_hi16s->next;
-  
-  entry->addend  = addend;
-  entry->address = address;
-  entry->counter = hi16s_counter ++;
-  entry->found   = false;
-  entry->next    = previous_hi16s;
-  previous_hi16s = entry;
-  
-  /* Cope with wrap around of our counter.  */
-  if (hi16s_counter == 0)
-    {
-      /* XXX - Assume that all counter entries differ only in their low 16 bits.  */
-      for (entry = previous_hi16s; entry != NULL; entry = entry->next)
-	entry->counter &= 0xffff;
-
-      hi16s_counter = 0x10000;
-    }
-  
-  return;
-}
-
-static bfd_byte *
-find_remembered_hi16s_reloc (addend, already_found)
-     bfd_vma   addend;
-     boolean * already_found;
-{
-  hi16s_location * match = NULL;
-  hi16s_location * entry;
-  hi16s_location * previous = NULL;
-  hi16s_location * prev;
-  int              i;
-  bfd_byte *       addr;
-  
-  /* Search the table.  Record the most recent entry that matches.  */
-  for (entry = previous_hi16s; entry; entry = entry->next)
-    {
-      if (entry->addend == addend
-	  && (match == NULL || match->counter < entry->counter))
-	{
-	  previous = prev;
-	  match    = entry;
-	}
-      
-      prev = entry;
-    }
-
-  if (match == NULL)
-    return NULL;
-
-  /* Extract the address.  */
-  addr = match->address;
-
-  /* Remeber if this entry has already been used before.  */
-  if (already_found)
-    * already_found = match->found;
-
-  /* Note that this entry has now been used.  */
-  match->found = true;
-  
-  return addr;
-}     
-
-/* FIXME:  The code here probably ought to be removed and the code in reloc.c
-   allowed to do its  stuff instead.  At least for most of the relocs, anwyay.  */
-static bfd_reloc_status_type
-v850_elf_perform_relocation (abfd, r_type, addend, address)
-     bfd *      abfd;
-     int        r_type;
-     bfd_vma    addend;
-     bfd_byte * address;
-{
-  unsigned long insn;
-  bfd_signed_vma saddend = (bfd_signed_vma) addend;
-  
-  switch (r_type)
-    {
-    default:
-      /* fprintf (stderr, "reloc type %d not SUPPORTED\n", r_type ); */
-      return bfd_reloc_notsupported;
-      
-    case R_V850_32:
-      bfd_put_32 (abfd, addend, address);
-      return bfd_reloc_ok;
-      
-    case R_V850_22_PCREL:
-      if (saddend > 0x1fffff || saddend < -0x200000)
-	return bfd_reloc_overflow;
-      
-      if ((addend % 2) != 0)
-	return bfd_reloc_dangerous;
-      
-      insn  = bfd_get_32 (abfd, address);
-      insn &= ~0xfffe003f;
-      insn |= (((addend & 0xfffe) << 16) | ((addend & 0x3f0000) >> 16));
-      bfd_put_32 (abfd, insn, address);
-      return bfd_reloc_ok;
-      
-    case R_V850_9_PCREL:
-      if (saddend > 0xff || saddend < -0x100)
-	return bfd_reloc_overflow;
-      
-      if ((addend % 2) != 0)
-	return bfd_reloc_dangerous;
-      
-      insn  = bfd_get_16 (abfd, address);
-      insn &= ~ 0xf870;
-      insn |= ((addend & 0x1f0) << 7) | ((addend & 0x0e) << 3);
-      break;
-      
-    case R_V850_HI16:
-      addend += (bfd_get_16 (abfd, address) << 16);
-      addend = (addend >> 16);
-      insn = addend;
-      break;
-      
-    case R_V850_HI16_S:
-      /* Remember where this relocation took place.  */
-      remember_hi16s_reloc (abfd, addend, address);
-
-      addend += (bfd_get_16 (abfd, address) << 16);
-      addend = (addend >> 16) + ((addend & 0x8000) != 0);
-      
-      /* This relocation cannot overflow. */
-      if (addend > 0x7fff)
-	addend = 0;
-      
-      insn = addend;
-      break;
-      
-    case R_V850_LO16:
-      /* Calculate the sum of the value stored in the instruction and the
-	 addend and check for overflow from the low 16 bits into the high
-	 16 bits.  The assembler has already done some of this:  If the
-	 value stored in the instruction has its 15th bit set, (counting
-	 from zero) then the assembler will have added 1 to the value
-	 stored in the associated HI16S reloc.  So for example, these
-	 relocations:
-
-	     movhi hi( fred ), r0, r1
-	     movea lo( fred ), r1, r1
-
-	 will store 0 in the value fields for the MOVHI and MOVEA instructions
-	 and addend will be the address of fred, but for these instructions:
-
-	     movhi hi( fred + 0x123456), r0, r1
-	     movea lo( fred + 0x123456), r1, r1
-
-	 the value stored in the MOVHI instruction will be 0x12 and the value
-	 stored in the MOVEA instruction will be 0x3456.  If however the
-	 instructions were:
-
-	     movhi hi( fred + 0x10ffff), r0, r1
-	     movea lo( fred + 0x10ffff), r1, r1
-
-	 then the value stored in the MOVHI instruction would be 0x11 (not
-	 0x10) and the value stored in the MOVEA instruction would be 0xffff.
-	 Thus (assuming for the moment that the addend is 0), at run time the
-	 MOVHI instruction loads 0x110000 into r1, then the MOVEA instruction
-	 adds 0xffffffff (sign extension!) producing 0x10ffff.  Similarly if
-	 the instructions were:
-
-	     movhi hi( fred - 1), r0, r1
-	     movea lo( fred - 1), r1, r1
-
-	 then 0 is stored in the MOVHI instruction and -1 is stored in the
-	 MOVEA instruction.
-
-	 Overflow can occur if the addition of the value stored in the
-	 instruction plus the addend sets the 15th bit when before it was clear.
-	 This is because the 15th bit will be sign extended into the high part,
-	 thus reducing its value by one, but since the 15th bit was originally
-	 clear, the assembler will not have added 1 to the previous HI16S reloc
-	 to compensate for this effect.  For example:
-
-	    movhi hi( fred + 0x123456), r0, r1
-	    movea lo( fred + 0x123456), r1, r1
-
-	 The value stored in HI16S reloc is 0x12, the value stored in the LO16
-	 reloc is 0x3456.  If we assume that the address of fred is 0x00007000
-	 then the relocations become:
-
-	   HI16S: 0x0012 + (0x00007000 >> 16)    = 0x12
-	   LO16:  0x3456 + (0x00007000 & 0xffff) = 0xa456
-
-	 but when the instructions are executed, the MOVEA instruction's value
-	 is signed extended, so the sum becomes:
-
-	      0x00120000
-	    + 0xffffa456
-	    ------------
-	      0x0011a456    but 'fred + 0x123456' = 0x0012a456
-
-	 Note that if the 15th bit was set in the value stored in the LO16
-	 reloc, then we do not have to do anything:
-
-	    movhi hi( fred + 0x10ffff), r0, r1
-	    movea lo( fred + 0x10ffff), r1, r1
-
-	    HI16S:  0x0011 + (0x00007000 >> 16)    = 0x11
-	    LO16:   0xffff + (0x00007000 & 0xffff) = 0x6fff
-
-	      0x00110000
-	    + 0x00006fff
-	    ------------
-	      0x00116fff  = fred + 0x10ffff = 0x7000 + 0x10ffff
-
-	 
-	 Overflow can also occur if the computation carries into the 16th bit
-	 and it also results in the 15th bit having the same value as the 15th
-	 bit of the original value.   What happens is that the HI16S reloc
-	 will have already examined the 15th bit of the original value and
-	 added 1 to the high part if the bit is set.  This compensates for the
-	 sign extension of 15th bit of the result of the computation.  But now
-	 there is a carry into the 16th bit, and this has not been allowed for.
-
-	 So, for example if fred is at address 0xf000:
-
-	   movhi hi( fred + 0xffff), r0, r1    [bit 15 of the offset is set]
-	   movea lo( fred + 0xffff), r1, r1
-
-	   HI16S: 0x0001 + (0x0000f000 >> 16)    = 0x0001
-	   LO16:  0xffff + (0x0000f000 & 0xffff) = 0xefff   (carry into bit 16 is lost)
-
-	     0x00010000
-	   + 0xffffefff
-	   ------------
-	     0x0000efff   but 'fred + 0xffff' = 0x0001efff
-
-	 Similarly, if the 15th bit remains clear, but overflow occurs into
-	 the 16th bit then (assuming the address of fred is 0xf000):
-
-	   movhi hi( fred + 0x7000), r0, r1    [bit 15 of the offset is clear]
-	   movea lo( fred + 0x7000), r1, r1
-
-	   HI16S: 0x0000 + (0x0000f000 >> 16)    = 0x0000
-	   LO16:  0x7000 + (0x0000f000 & 0xffff) = 0x6fff  (carry into bit 16 is lost)
-
-	     0x00000000
-	   + 0x00006fff
-	   ------------
-	     0x00006fff   but 'fred + 0x7000' = 0x00016fff
-	   
-	 Note - there is no need to change anything if a carry occurs, and the
-	 15th bit changes its value from being set to being clear, as the HI16S
-	 reloc will have already added in 1 to the high part for us:
-
-	   movhi hi( fred + 0xffff), r0, r1     [bit 15 of the offset is set]
-	   movea lo( fred + 0xffff), r1, r1
-
-	   HI16S: 0x0001 + (0x00007000 >> 16)
-	   LO16:  0xffff + (0x00007000 & 0xffff) = 0x6fff  (carry into bit 16 is lost)
-
-	     0x00010000
-	   + 0x00006fff   (bit 15 not set, so the top half is zero)
-	   ------------
-	     0x00016fff   which is right (assuming that fred is at 0x7000)
-
-	 but if the 15th bit goes from being clear to being set, then we must
-	 once again handle overflow:
-
-	   movhi hi( fred + 0x7000), r0, r1     [bit 15 of the offset is clear]
-	   movea lo( fred + 0x7000), r1, r1
-
-	   HI16S: 0x0000 + (0x0000ffff >> 16)
-	   LO16:  0x7000 + (0x0000ffff & 0xffff) = 0x6fff  (carry into bit 16)
-
-	     0x00000000
-	   + 0x00006fff   (bit 15 not set, so the top half is zero)
-	   ------------
-	     0x00006fff   which is wrong (assuming that fred is at 0xffff)
-	 */
-
-      {
-	long result;
-
-	insn   = bfd_get_16 (abfd, address);
-	result = insn + addend;
-
-#define BIT15_SET(x) ((x) & 0x8000)
-#define OVERFLOWS(a,i) ((((a) & 0xffff) + (i)) > 0xffff)
-	
-	if ((BIT15_SET (result) && ! BIT15_SET (addend))
-	    || (OVERFLOWS (addend, insn)
-		&& ((! BIT15_SET (insn)) || (BIT15_SET (addend)))))
-	  {
-	    boolean already_updated;
-	    bfd_byte * hi16s_address = find_remembered_hi16s_reloc
-	      (addend, & already_updated);
-	    
-	    /* Amend the matching HI16_S relocation.  */
-	    if (hi16s_address != NULL)
-	      {
-		if (! already_updated)
-		  {
-		    insn = bfd_get_16 (abfd, hi16s_address);
-		    insn += 1;
-		    bfd_put_16 (abfd, insn, hi16s_address);
-		  }
-	      }
-	    else
-	      {
-		fprintf (stderr, _("FAILED to find previous HI16 reloc\n"));
-		return bfd_reloc_overflow;
-	      }
-	  }
-	
-	/* Do not complain if value has top bit set, as this has been anticipated.  */
-	insn = result & 0xffff;
-	break;
-      }
-
-    case R_V850_8:
-      addend += (char) bfd_get_8 (abfd, address);
-
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0x7f || saddend < -0x80)
-	return bfd_reloc_overflow;
-
-      bfd_put_8 (abfd, addend, address);
-      return bfd_reloc_ok;
-
-    case R_V850_CALLT_16_16_OFFSET:
-      addend += bfd_get_16 (abfd, address);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0xffff || saddend < 0)
-	return bfd_reloc_overflow;
-
-      insn = addend;
-      break;
-      
-    case R_V850_16:
-
-      /* drop through */            
-    case R_V850_SDA_16_16_OFFSET:
-    case R_V850_ZDA_16_16_OFFSET:
-    case R_V850_TDA_16_16_OFFSET:
-      addend += bfd_get_16 (abfd, address);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0x7fff || saddend < -0x8000)
-	return bfd_reloc_overflow;
-
-      insn = addend;
-      break;
-      
-    case R_V850_SDA_15_16_OFFSET:
-    case R_V850_ZDA_15_16_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += (insn & 0xfffe);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0x7ffe || saddend < -0x8000)
-	return bfd_reloc_overflow;
-      
-      if (addend & 1)
-        return bfd_reloc_dangerous;
-      
-      insn = (addend & ~1) | (insn & 1);
-      break;
-      
-    case R_V850_TDA_6_8_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += ((insn & 0x7e) << 1);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0xfc || saddend < 0)
-	return bfd_reloc_overflow;
-      
-      if (addend & 3)
-	return bfd_reloc_dangerous;
-      
-      insn &= 0xff81;
-      insn |= (addend >> 1);
-      break;
-      
-    case R_V850_TDA_7_8_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += ((insn & 0x7f) << 1);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0xfe || saddend < 0)
-	return bfd_reloc_overflow;
-      
-      if (addend & 1)
-	return bfd_reloc_dangerous;
-      
-      insn &= 0xff80;
-      insn |= (addend >> 1);
-      break;
-      
-    case R_V850_TDA_7_7_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += insn & 0x7f;
-	
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0x7f || saddend < 0)
-	return bfd_reloc_overflow;
-      
-      insn &= 0xff80;
-      insn |= addend;
-      break;
-      
-    case R_V850_TDA_4_5_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += ((insn & 0xf) << 1);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0x1e || saddend < 0)
-	return bfd_reloc_overflow;
-      
-      if (addend & 1)
-	return bfd_reloc_dangerous;
-      
-      insn &= 0xfff0;
-      insn |= (addend >> 1);
-      break;
-      
-    case R_V850_TDA_4_4_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += insn & 0xf;
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0xf || saddend < 0)
-	return bfd_reloc_overflow;
-      
-      insn &= 0xfff0;
-      insn |= addend;
-      break;
-      
-    case R_V850_ZDA_16_16_SPLIT_OFFSET:
-    case R_V850_SDA_16_16_SPLIT_OFFSET:
-      insn = bfd_get_32 (abfd, address);
-      addend += ((insn & 0xfffe0000) >> 16) + ((insn & 0x20) >> 5);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0x7fff || saddend < -0x8000)
-	return bfd_reloc_overflow;
-      
-      insn &= 0x0001ffdf;
-      insn |= (addend & 1) << 5;
-      insn |= (addend & ~1) << 16;
-      
-      bfd_put_32 (abfd, insn, address);
-      return bfd_reloc_ok;
-      
-    case R_V850_CALLT_6_7_OFFSET:
-      insn = bfd_get_16 (abfd, address);
-      addend += ((insn & 0x3f) << 1);
-      
-      saddend = (bfd_signed_vma) addend;
-      
-      if (saddend > 0x7e || saddend < 0)
-	return bfd_reloc_overflow;
-      
-      if (addend & 1)
-	return bfd_reloc_dangerous;
-      
-      insn &= 0xff80;
-      insn |= (addend >> 1);
-      break;
-
-    case R_V850_GNU_VTINHERIT:
-    case R_V850_GNU_VTENTRY:
-      return bfd_reloc_ok;
-
-    }
-
-  bfd_put_16 (abfd, insn, address);
-  return bfd_reloc_ok;
-}
-
-
-/* Insert the addend into the instruction.  */
-static bfd_reloc_status_type
-v850_elf_reloc (abfd, reloc, symbol, data, isection, obfd, err)
-     bfd *       abfd;
-     arelent *   reloc;
-     asymbol *   symbol;
-     PTR         data;
-     asection *  isection;
-     bfd *       obfd;
-     char **     err;
-{
-  long relocation;
-  
-  /* If there is an output BFD,
-     and the symbol is not a section name (which is only defined at final link time),
-     and either we are not putting the addend into the instruction
-         or the addend is zero, so there is nothing to add into the instruction
-     then just fixup the address and return.  */
-  if (obfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! reloc->howto->partial_inplace
-	  || reloc->addend == 0))
-    {
-      reloc->address += isection->output_offset;
-      return bfd_reloc_ok;
-    }
-#if 0  
-  else if (obfd != NULL)
-    {
-      return bfd_reloc_continue;
-    }
-#endif
-  
-  /* Catch relocs involving undefined symbols.  */
-  if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0
-      && obfd == NULL)
-    return bfd_reloc_undefined;
-
-  /* We handle final linking of some relocs ourselves.  */
-
-  /* Is the address of the relocation really within the section?  */
-  if (reloc->address > isection->_cooked_size)
-    return bfd_reloc_outofrange;
-  
-  /* Work out which section the relocation is targetted at and the
-     initial relocation command value.  */
-  
-  /* Get symbol value.  (Common symbols are special.)  */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-  
-  /* Convert input-section-relative symbol value to absolute + addend.  */
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc->addend;
-  
-  if (reloc->howto->pc_relative == true)
-    {
-      /* Here the variable relocation holds the final address of the
-	 symbol we are relocating against, plus any addend.  */
-      relocation -= isection->output_section->vma + isection->output_offset;
-      
-      /* Deal with pcrel_offset */
-      relocation -= reloc->address;
-    }
-
-  reloc->addend = relocation;	
-  return bfd_reloc_ok;
-}
-
-
-/*ARGSUSED*/
-static boolean
-v850_elf_is_local_label_name (abfd, name)
-     bfd *         abfd;
-     const char *  name;
-{
-  return (   (name[0] == '.' && (name[1] == 'L' || name[1] == '.'))
-	  || (name[0] == '_' &&  name[1] == '.' && name[2] == 'L' && name[3] == '_'));
-}
-
-
-/* Perform a relocation as part of a final link.  */
-static bfd_reloc_status_type
-v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
-				    input_section, contents, offset, value,
-				    addend, info, sym_sec, is_local)
-     reloc_howto_type *      howto;
-     bfd *                   input_bfd;
-     bfd *                   output_bfd;
-     asection *              input_section;
-     bfd_byte *              contents;
-     bfd_vma                 offset;
-     bfd_vma                 value;
-     bfd_vma                 addend;
-     struct bfd_link_info *  info;
-     asection *              sym_sec;
-     int                     is_local;
-{
-  unsigned long  r_type   = howto->type;
-  bfd_byte *     hit_data = contents + offset;
-
-  /* Adjust the value according to the relocation.  */
-  switch (r_type)
-    {
-    case R_V850_9_PCREL:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset);
-      value -= offset;
-      break;
-    
-    case R_V850_22_PCREL:
-      value -= (input_section->output_section->vma
-		+ input_section->output_offset
-		+ offset);
-
-      value = SEXT24 (value);  /* Only the bottom 24 bits of the PC are valid */
-      break;
-      
-    case R_V850_HI16_S:
-    case R_V850_HI16:
-    case R_V850_LO16:
-    case R_V850_16:
-    case R_V850_32:
-    case R_V850_8:
-      break;
-
-    case R_V850_ZDA_15_16_OFFSET:	
-    case R_V850_ZDA_16_16_OFFSET:
-    case R_V850_ZDA_16_16_SPLIT_OFFSET:
-      if (sym_sec == NULL)
-	return bfd_reloc_undefined;
-	  
-      value -= sym_sec->output_section->vma;
-      break;
-
-    case R_V850_SDA_15_16_OFFSET:
-    case R_V850_SDA_16_16_OFFSET:
-    case R_V850_SDA_16_16_SPLIT_OFFSET:
-      {
-	unsigned long                gp;
-	struct bfd_link_hash_entry * h;
-
-	if (sym_sec == NULL)
-	  return bfd_reloc_undefined;
-	  
-	/* Get the value of __gp.  */
-	h = bfd_link_hash_lookup (info->hash, "__gp", false, false, true);
-	if (h == (struct bfd_link_hash_entry *) NULL
-	    || h->type != bfd_link_hash_defined)
-	  return bfd_reloc_other;
-
-	gp = (h->u.def.value
-	      + h->u.def.section->output_section->vma
-	      + h->u.def.section->output_offset);
-
-	value -= sym_sec->output_section->vma;
-	value -= (gp - sym_sec->output_section->vma);
-      }
-    break;
-
-    case R_V850_TDA_4_4_OFFSET:
-    case R_V850_TDA_4_5_OFFSET:
-    case R_V850_TDA_16_16_OFFSET:
-    case R_V850_TDA_7_7_OFFSET:
-    case R_V850_TDA_7_8_OFFSET:
-    case R_V850_TDA_6_8_OFFSET:
-      {
-	unsigned long                ep;
-	struct bfd_link_hash_entry * h;
-	
-	/* Get the value of __ep.  */
-	h = bfd_link_hash_lookup (info->hash, "__ep", false, false, true);
-	if (h == (struct bfd_link_hash_entry *) NULL
-	    || h->type != bfd_link_hash_defined)
-	  return bfd_reloc_continue;  /* Actually this indicates that __ep could not be found. */
-
-	ep = (h->u.def.value
-	      + h->u.def.section->output_section->vma
-	      + h->u.def.section->output_offset);
-
-	value -= ep;
-      }
-    break;
-    
-    case R_V850_CALLT_6_7_OFFSET:
-      {
-	unsigned long                ctbp;
-	struct bfd_link_hash_entry * h;
-	
-	/* Get the value of __ctbp.  */
-	h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true);
-	if (h == (struct bfd_link_hash_entry *) NULL
-	    || h->type != bfd_link_hash_defined)
-	  return (bfd_reloc_dangerous + 1);  /* Actually this indicates that __ctbp could not be found. */
-
-	ctbp = (h->u.def.value
-	      + h->u.def.section->output_section->vma
-	      + h->u.def.section->output_offset);
-	value -= ctbp;
-      }
-    break;
-    
-    case R_V850_CALLT_16_16_OFFSET:
-      {
-	unsigned long                ctbp;
-	struct bfd_link_hash_entry * h;
-
-	if (sym_sec == NULL)
-	  return bfd_reloc_undefined;
-	  
-	/* Get the value of __ctbp.  */
-	h = bfd_link_hash_lookup (info->hash, "__ctbp", false, false, true);
-	if (h == (struct bfd_link_hash_entry *) NULL
-	    || h->type != bfd_link_hash_defined)
-	  return (bfd_reloc_dangerous + 1);
-
-	ctbp = (h->u.def.value
-	      + h->u.def.section->output_section->vma
-	      + h->u.def.section->output_offset);
-
-	value -= sym_sec->output_section->vma;
-	value -= (ctbp - sym_sec->output_section->vma);
-      }
-    break;
-      
-    case R_V850_NONE:
-    case R_V850_GNU_VTINHERIT:
-    case R_V850_GNU_VTENTRY:
-      return bfd_reloc_ok;
-
-    default:
-      return bfd_reloc_notsupported;
-    }
-
-  /* Perform the relocation.  */
-  return v850_elf_perform_relocation (input_bfd, r_type, value + addend, hit_data); 
-}
-
-
-/* Relocate an V850 ELF section.  */
-static boolean
-v850_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			   contents, relocs, local_syms, local_sections)
-     bfd *                  output_bfd;
-     struct bfd_link_info * info;
-     bfd *                  input_bfd;
-     asection *             input_section;
-     bfd_byte *             contents;
-     Elf_Internal_Rela *    relocs;
-     Elf_Internal_Sym *     local_syms;
-     asection **            local_sections;
-{
-  Elf_Internal_Shdr *           symtab_hdr;
-  struct elf_link_hash_entry ** sym_hashes;
-  Elf_Internal_Rela *           rel;
-  Elf_Internal_Rela *           relend;
-
-  symtab_hdr = & elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-
-  if (sym_hashes == NULL)
-    {
-      info->callbacks->warning
-	(info, "no hash table available", NULL, input_bfd, input_section, 0);
-
-      return false;
-    }
-  
-  /* Reset the list of remembered HI16S relocs to empty.  */
-  free_hi16s     = previous_hi16s;
-  previous_hi16s = NULL;
-  hi16s_counter  = 0;
-  
-  rel    = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int                          r_type;
-      reloc_howto_type *           howto;
-      unsigned long                r_symndx;
-      Elf_Internal_Sym *           sym;
-      asection *                   sec;
-      struct elf_link_hash_entry * h;
-      bfd_vma                      relocation;
-      bfd_reloc_status_type        r;
-
-      r_symndx = ELF32_R_SYM (rel->r_info);
-      r_type   = ELF32_R_TYPE (rel->r_info);
-
-      if (r_type == R_V850_GNU_VTENTRY
-          || r_type == R_V850_GNU_VTINHERIT)
-        continue;
-
-      howto = v850_elf_howto_table + r_type;
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-             anything, unless the reloc is against a section symbol,
-             in which case we have to adjust according to where the
-             section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-#if 0
-	  {
-	    char * name;
-	    name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link, sym->st_name);
-	    name = (name == NULL) ? "<none>" : name;
-fprintf (stderr, "local: sec: %s, sym: %s (%d), value: %x + %x + %x addend %x\n",
-	 sec->name, name, sym->st_name,
-	 sec->output_section->vma, sec->output_offset, sym->st_value, rel->r_addend);
-	  }
-#endif
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.u.def.section;
-	      relocation = (h->root.u.def.value
-			    + sec->output_section->vma
-			    + sec->output_offset);
-#if 0
-fprintf (stderr, "defined: sec: %s, name: %s, value: %x + %x + %x gives: %x\n",
-	 sec->name, h->root.root.string, h->root.u.def.value, sec->output_section->vma, sec->output_offset, relocation);
-#endif
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    {
-#if 0
-fprintf (stderr, "undefined: sec: %s, name: %s\n",
-	 sec->name, h->root.root.string);
-#endif
-	      relocation = 0;
-	    }
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-#if 0
-fprintf (stderr, "unknown: name: %s\n", h->root.root.string);
-#endif
-	      relocation = 0;
-	    }
-	}
-
-      /* FIXME: We should use the addend, but the COFF relocations
-         don't.  */
-      r = v850_elf_final_link_relocate (howto, input_bfd, output_bfd,
-					input_section,
-					contents, rel->r_offset,
-					relocation, rel->r_addend,
-					info, sec, h == NULL);
-
-      if (r != bfd_reloc_ok)
-	{
-	  const char * name;
-	  const char * msg = (const char *)0;
-
-	  if (h != NULL)
-	    name = h->root.root.string;
-	  else
-	    {
-	      name = (bfd_elf_string_from_elf_section
-		      (input_bfd, symtab_hdr->sh_link, sym->st_name));
-	      if (name == NULL || *name == '\0')
-		name = bfd_section_name (input_bfd, sec);
-	    }
-
-	  switch (r)
-	    {
-	    case bfd_reloc_overflow:
-	      if (! ((*info->callbacks->reloc_overflow)
-		     (info, name, howto->name, (bfd_vma) 0,
-		      input_bfd, input_section, rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_undefined:
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, name, input_bfd, input_section,
-		      rel->r_offset)))
-		return false;
-	      break;
-
-	    case bfd_reloc_outofrange:
-	      msg = _("internal error: out of range error");
-	      goto common_error;
-
-	    case bfd_reloc_notsupported:
-	      msg = _("internal error: unsupported relocation error");
-	      goto common_error;
-
-	    case bfd_reloc_dangerous:
-	      msg = _("internal error: dangerous relocation");
-	      goto common_error;
-
-	    case bfd_reloc_other:
-	      msg = _("could not locate special linker symbol __gp");
-	      goto common_error;
-
-	    case bfd_reloc_continue:
-	      msg = _("could not locate special linker symbol __ep");
-	      goto common_error;
-
-	    case (bfd_reloc_dangerous + 1):
-	      msg = _("could not locate special linker symbol __ctbp");
-	      goto common_error;
-	      
-	    default:
-	      msg = _("internal error: unknown error");
-	      /* fall through */
-
-	    common_error:
-	      if (!((*info->callbacks->warning)
-		    (info, msg, name, input_bfd, input_section,
-		     rel->r_offset)))
-		return false;
-	      break;
-	    }
-	}
-    }
-
-  return true;
-}
-
-static boolean
-v850_elf_gc_sweep_hook (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  /* No got and plt entries for v850-elf */
-  return true;
-}
-
-static asection *
-v850_elf_gc_mark_hook (abfd, info, rel, h, sym)
-       bfd *abfd;
-       struct bfd_link_info *info;
-       Elf_Internal_Rela *rel;
-       struct elf_link_hash_entry *h;
-       Elf_Internal_Sym *sym;
-{
-  if (h != NULL)
-    {
-      switch (ELF32_R_TYPE (rel->r_info))
-      {
-      case R_V850_GNU_VTINHERIT:
-      case R_V850_GNU_VTENTRY:
-        break;
-
-      default:
-        switch (h->root.type)
-          {
-          case bfd_link_hash_defined:
-          case bfd_link_hash_defweak:
-            return h->root.u.def.section;
-
-          case bfd_link_hash_common:
-            return h->root.u.c.p->section;
-          }
-       }
-     }
-   else
-     {
-       if (!(elf_bad_symtab (abfd)
-           && ELF_ST_BIND (sym->st_info) != STB_LOCAL)
-         && ! ((sym->st_shndx <= 0 || sym->st_shndx >= SHN_LORESERVE)
-                && sym->st_shndx != SHN_COMMON))
-          {
-            return bfd_section_from_elf_index (abfd, sym->st_shndx);
-          }
-      }
-  return NULL;
-}
-/* Set the right machine number.  */
-static boolean
-v850_elf_object_p (abfd)
-     bfd *abfd;
-{
-  switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
-    {
-    default:
-    case E_V850_ARCH:   (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, 0); break;
-    case E_V850E_ARCH:  (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850e); break;
-    case E_V850EA_ARCH: (void) bfd_default_set_arch_mach (abfd, bfd_arch_v850, bfd_mach_v850ea); break;
-    }
-  return true;
-}
-
-/* Store the machine number in the flags field.  */
-static void
-v850_elf_final_write_processing (abfd, linker)
-     bfd *   abfd;
-     boolean linker;
-{
-  unsigned long val;
-
-  switch (bfd_get_mach (abfd))
-    {
-    default:
-    case 0: val = E_V850_ARCH; break;
-    case bfd_mach_v850e:  val = E_V850E_ARCH; break;
-    case bfd_mach_v850ea: val = E_V850EA_ARCH;  break;
-    }
-
-  elf_elfheader (abfd)->e_flags &=~ EF_V850_ARCH;
-  elf_elfheader (abfd)->e_flags |= val;
-}
-
-/* Function to keep V850 specific file flags. */
-static boolean
-v850_elf_set_private_flags (abfd, flags)
-     bfd *    abfd;
-     flagword flags;
-{
-  BFD_ASSERT (!elf_flags_init (abfd)
-	      || elf_elfheader (abfd)->e_flags == flags);
-
-  elf_elfheader (abfd)->e_flags = flags;
-  elf_flags_init (abfd) = true;
-  return true;
-}
-
-/* Copy backend specific data from one object module to another */
-static boolean
-v850_elf_copy_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
-{
-  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  BFD_ASSERT (!elf_flags_init (obfd)
-	      || (elf_elfheader (obfd)->e_flags
-		  == elf_elfheader (ibfd)->e_flags));
-
-  elf_gp (obfd) = elf_gp (ibfd);
-  elf_elfheader (obfd)->e_flags = elf_elfheader (ibfd)->e_flags;
-  elf_flags_init (obfd) = true;
-  return true;
-}
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-static boolean
-v850_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd * ibfd;
-     bfd * obfd;
-{
-  flagword out_flags;
-  flagword in_flags;
-
-  if (   bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  in_flags = elf_elfheader (ibfd)->e_flags;
-  out_flags = elf_elfheader (obfd)->e_flags;
-
-  if (! elf_flags_init (obfd))
-    {
-      /* If the input is the default architecture then do not
-	 bother setting the flags for the output architecture,
-	 instead allow future merges to do this.  If no future
-	 merges ever set these flags then they will retain their
-	 unitialised values, which surprise surprise, correspond
-	 to the default values.  */
-      if (bfd_get_arch_info (ibfd)->the_default)
-	return true;
-      
-      elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = in_flags;
-
-      if (bfd_get_arch (obfd) == bfd_get_arch (ibfd)
-	  && bfd_get_arch_info (obfd)->the_default)
-	{
-	  return bfd_set_arch_mach (obfd, bfd_get_arch (ibfd), bfd_get_mach (ibfd));
-	}
-
-      return true;
-    }
-
-  /* Check flag compatibility.  */
-  if (in_flags == out_flags)
-    return true;
-
-  if ((in_flags & EF_V850_ARCH) != (out_flags & EF_V850_ARCH)
-      && (in_flags & EF_V850_ARCH) != E_V850_ARCH)
-    _bfd_error_handler (_("%s: Architecture mismatch with previous modules"),
-			bfd_get_filename (ibfd));
-
-  return true;
-}
-/* Display the flags field */
-
-static boolean
-v850_elf_print_private_bfd_data (abfd, ptr)
-     bfd *   abfd;
-     PTR     ptr;
-{
-  FILE * file = (FILE *) ptr;
-  
-  BFD_ASSERT (abfd != NULL && ptr != NULL);
-  
-  _bfd_elf_print_private_bfd_data (abfd, ptr);
-  
-  /* xgettext:c-format */
-  fprintf (file, _("private flags = %lx: "), elf_elfheader (abfd)->e_flags);
-  
-  switch (elf_elfheader (abfd)->e_flags & EF_V850_ARCH)
-    {
-    default:
-    case E_V850_ARCH: fprintf (file, _("v850 architecture")); break;
-    case E_V850E_ARCH:  fprintf (file, _("v850e architecture")); break;
-    case E_V850EA_ARCH: fprintf (file, _("v850ea architecture")); break;
-    }
-  
-  fputc ('\n', file);
-  
-  return true;
-}
-
-/* V850 ELF uses four common sections.  One is the usual one, and the
-   others are for (small) objects in one of the special data areas:
-   small, tiny and zero.  All the objects are kept together, and then
-   referenced via the gp register, the ep register or the r0 register
-   respectively, which yields smaller, faster assembler code.  This
-   approach is copied from elf32-mips.c.  */
-
-static asection  v850_elf_scom_section;
-static asymbol   v850_elf_scom_symbol;
-static asymbol * v850_elf_scom_symbol_ptr;
-static asection  v850_elf_tcom_section;
-static asymbol   v850_elf_tcom_symbol;
-static asymbol * v850_elf_tcom_symbol_ptr;
-static asection  v850_elf_zcom_section;
-static asymbol   v850_elf_zcom_symbol;
-static asymbol * v850_elf_zcom_symbol_ptr;
-
-
-/* Given a BFD section, try to locate the corresponding ELF section
-   index.  */
-
-static boolean
-v850_elf_section_from_bfd_section (abfd, hdr, sec, retval)
-     bfd *                 abfd;
-     Elf32_Internal_Shdr * hdr;
-     asection *            sec;
-     int *                 retval;
-{
-  if (strcmp (bfd_get_section_name (abfd, sec), ".scommon") == 0)
-    *retval = SHN_V850_SCOMMON;
-  else if (strcmp (bfd_get_section_name (abfd, sec), ".tcommon") == 0)
-    *retval = SHN_V850_TCOMMON;
-  else if (strcmp (bfd_get_section_name (abfd, sec), ".zcommon") == 0)
-    *retval = SHN_V850_ZCOMMON;
-  else
-    return false;
-  
-  return true;
-}
-
-/* Handle the special V850 section numbers that a symbol may use.  */
-
-static void
-v850_elf_symbol_processing (abfd, asym)
-     bfd *     abfd;
-     asymbol * asym;
-{
-  elf_symbol_type * elfsym = (elf_symbol_type *) asym;
-  unsigned short index;
-  
-  index = elfsym->internal_elf_sym.st_shndx;
-
-  /* If the section index is an "ordinary" index, then it may
-     refer to a v850 specific section created by the assembler.
-     Check the section's type and change the index it matches.
-     
-     FIXME: Should we alter the st_shndx field as well ?  */
-  
-  if (index < elf_elfheader(abfd)[0].e_shnum)
-    switch (elf_elfsections(abfd)[index]->sh_type)
-      {
-      case SHT_V850_SCOMMON:
-	index = SHN_V850_SCOMMON;
-	break;
-	
-      case SHT_V850_TCOMMON:
-	index = SHN_V850_TCOMMON;
-	break;
-	
-      case SHT_V850_ZCOMMON:
-	index = SHN_V850_ZCOMMON;
-	break;
-	
-      default:
-	break;
-      }
-  
-  switch (index)
-    {
-    case SHN_V850_SCOMMON:
-      if (v850_elf_scom_section.name == NULL)
-	{
-	  /* Initialize the small common section.  */
-	  v850_elf_scom_section.name           = ".scommon";
-	  v850_elf_scom_section.flags          = SEC_IS_COMMON | SEC_ALLOC | SEC_DATA;
-	  v850_elf_scom_section.output_section = & v850_elf_scom_section;
-	  v850_elf_scom_section.symbol         = & v850_elf_scom_symbol;
-	  v850_elf_scom_section.symbol_ptr_ptr = & v850_elf_scom_symbol_ptr;
-	  v850_elf_scom_symbol.name            = ".scommon";
-	  v850_elf_scom_symbol.flags           = BSF_SECTION_SYM;
-	  v850_elf_scom_symbol.section         = & v850_elf_scom_section;
-	  v850_elf_scom_symbol_ptr             = & v850_elf_scom_symbol;
-	}
-      asym->section = & v850_elf_scom_section;
-      asym->value = elfsym->internal_elf_sym.st_size;
-      break;
-      
-    case SHN_V850_TCOMMON:
-      if (v850_elf_tcom_section.name == NULL)
-	{
-	  /* Initialize the tcommon section.  */
-	  v850_elf_tcom_section.name           = ".tcommon";
-	  v850_elf_tcom_section.flags          = SEC_IS_COMMON;
-	  v850_elf_tcom_section.output_section = & v850_elf_tcom_section;
-	  v850_elf_tcom_section.symbol         = & v850_elf_tcom_symbol;
-	  v850_elf_tcom_section.symbol_ptr_ptr = & v850_elf_tcom_symbol_ptr;
-	  v850_elf_tcom_symbol.name            = ".tcommon";
-	  v850_elf_tcom_symbol.flags           = BSF_SECTION_SYM;
-	  v850_elf_tcom_symbol.section         = & v850_elf_tcom_section;
-	  v850_elf_tcom_symbol_ptr             = & v850_elf_tcom_symbol;
-	}
-      asym->section = & v850_elf_tcom_section;
-      asym->value = elfsym->internal_elf_sym.st_size;
-      break;
-
-    case SHN_V850_ZCOMMON:
-      if (v850_elf_zcom_section.name == NULL)
-	{
-	  /* Initialize the zcommon section.  */
-	  v850_elf_zcom_section.name           = ".zcommon";
-	  v850_elf_zcom_section.flags          = SEC_IS_COMMON;
-	  v850_elf_zcom_section.output_section = & v850_elf_zcom_section;
-	  v850_elf_zcom_section.symbol         = & v850_elf_zcom_symbol;
-	  v850_elf_zcom_section.symbol_ptr_ptr = & v850_elf_zcom_symbol_ptr;
-	  v850_elf_zcom_symbol.name            = ".zcommon";
-	  v850_elf_zcom_symbol.flags           = BSF_SECTION_SYM;
-	  v850_elf_zcom_symbol.section         = & v850_elf_zcom_section;
-	  v850_elf_zcom_symbol_ptr             = & v850_elf_zcom_symbol;
-	}
-      asym->section = & v850_elf_zcom_section;
-      asym->value = elfsym->internal_elf_sym.st_size;
-      break;
-    }
-}
-
-/* Hook called by the linker routine which adds symbols from an object
-   file.  We must handle the special v850 section numbers here.  */
-
-/*ARGSUSED*/
-static boolean
-v850_elf_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *                    abfd;
-     struct bfd_link_info *   info;
-     const Elf_Internal_Sym * sym;
-     const char **            namep;
-     flagword *               flagsp;
-     asection **              secp;
-     bfd_vma *                valp;
-{
-  int index = sym->st_shndx;
-  
-  /* If the section index is an "ordinary" index, then it may
-     refer to a v850 specific section created by the assembler.
-     Check the section's type and change the index it matches.
-     
-     FIXME: Should we alter the st_shndx field as well ?  */
-  
-  if (index < elf_elfheader(abfd)[0].e_shnum)
-    switch (elf_elfsections(abfd)[index]->sh_type)
-      {
-      case SHT_V850_SCOMMON:
-	index = SHN_V850_SCOMMON;
-	break;
-	
-      case SHT_V850_TCOMMON:
-	index = SHN_V850_TCOMMON;
-	break;
-	
-      case SHT_V850_ZCOMMON:
-	index = SHN_V850_ZCOMMON;
-	break;
-	
-      default:
-	break;
-      }
-  
-  switch (index)
-    {
-    case SHN_V850_SCOMMON:
-      *secp = bfd_make_section_old_way (abfd, ".scommon");
-      (*secp)->flags |= SEC_IS_COMMON;
-      *valp = sym->st_size;
-      break;
-      
-    case SHN_V850_TCOMMON:
-      *secp = bfd_make_section_old_way (abfd, ".tcommon");
-      (*secp)->flags |= SEC_IS_COMMON;
-      *valp = sym->st_size;
-      break;
-      
-    case SHN_V850_ZCOMMON:
-      *secp = bfd_make_section_old_way (abfd, ".zcommon");
-      (*secp)->flags |= SEC_IS_COMMON;
-      *valp = sym->st_size;
-      break;
-    }
-
-  return true;
-}
-
-/*ARGSIGNORED*/
-static boolean
-v850_elf_link_output_symbol_hook (abfd, info, name, sym, input_sec)
-     bfd *                  abfd;
-     struct bfd_link_info * info;
-     const char *           name;
-     Elf_Internal_Sym *     sym;
-     asection *             input_sec;
-{
-  /* If we see a common symbol, which implies a relocatable link, then
-     if a symbol was in a special common section in an input file, mark
-     it as a special common in the output file.  */
-  
-  if (sym->st_shndx == SHN_COMMON)
-    {
-      if (strcmp (input_sec->name, ".scommon") == 0)
-	sym->st_shndx = SHN_V850_SCOMMON;
-      else if (strcmp (input_sec->name, ".tcommon") == 0)
-	sym->st_shndx = SHN_V850_TCOMMON;
-      else if (strcmp (input_sec->name, ".zcommon") == 0)
-	sym->st_shndx = SHN_V850_ZCOMMON;
-    }
-
-  return true;
-}
-
-static boolean
-v850_elf_section_from_shdr (abfd, hdr, name)
-     bfd *               abfd;
-     Elf_Internal_Shdr * hdr;
-     char *              name;
-{
-  /* There ought to be a place to keep ELF backend specific flags, but
-     at the moment there isn't one.  We just keep track of the
-     sections by their name, instead.  */
-
-  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
-
-  switch (hdr->sh_type)
-    {
-    case SHT_V850_SCOMMON:
-    case SHT_V850_TCOMMON:
-    case SHT_V850_ZCOMMON:
-      if (! bfd_set_section_flags (abfd, hdr->bfd_section,
-				   (bfd_get_section_flags (abfd,
-							   hdr->bfd_section)
-				    | SEC_IS_COMMON)))
-	return false;
-    }
-
-  return true;
-}
-
-/* Set the correct type for a V850 ELF section.  We do this by the
-   section name, which is a hack, but ought to work.  */
-static boolean
-v850_elf_fake_sections (abfd, hdr, sec)
-     bfd *                 abfd;
-     Elf32_Internal_Shdr * hdr;
-     asection *            sec;
-{
-  register const char * name;
-
-  name = bfd_get_section_name (abfd, sec);
-
-  if (strcmp (name, ".scommon") == 0)
-    {
-      hdr->sh_type = SHT_V850_SCOMMON;
-    }
-  else if (strcmp (name, ".tcommon") == 0)
-    {
-      hdr->sh_type = SHT_V850_TCOMMON;
-    }
-  else if (strcmp (name, ".zcommon") == 0)
-    hdr->sh_type = SHT_V850_ZCOMMON;
-  
-  return true;
-}
-
-
-
-#define TARGET_LITTLE_SYM			bfd_elf32_v850_vec
-#define TARGET_LITTLE_NAME			"elf32-v850"
-#define ELF_ARCH				bfd_arch_v850
-#define ELF_MACHINE_CODE			EM_CYGNUS_V850
-#define ELF_MAXPAGESIZE				0x1000
-	
-#define elf_info_to_howto			v850_elf_info_to_howto_rela
-#define elf_info_to_howto_rel			v850_elf_info_to_howto_rel
-
-#define elf_backend_check_relocs		v850_elf_check_relocs
-#define elf_backend_relocate_section    	v850_elf_relocate_section
-#define elf_backend_object_p			v850_elf_object_p
-#define elf_backend_final_write_processing 	v850_elf_final_write_processing
-#define elf_backend_section_from_bfd_section 	v850_elf_section_from_bfd_section
-#define elf_backend_symbol_processing		v850_elf_symbol_processing
-#define elf_backend_add_symbol_hook		v850_elf_add_symbol_hook
-#define elf_backend_link_output_symbol_hook 	v850_elf_link_output_symbol_hook
-#define elf_backend_section_from_shdr		v850_elf_section_from_shdr
-#define elf_backend_fake_sections		v850_elf_fake_sections
-#define elf_backend_gc_mark_hook                v850_elf_gc_mark_hook
-#define elf_backend_gc_sweep_hook               v850_elf_gc_sweep_hook
-
-#define elf_backend_can_gc_sections 1
-
-
-#define bfd_elf32_bfd_is_local_label_name	v850_elf_is_local_label_name
-#define bfd_elf32_bfd_reloc_type_lookup		v850_elf_reloc_type_lookup
-#define bfd_elf32_bfd_copy_private_bfd_data 	v850_elf_copy_private_bfd_data
-#define bfd_elf32_bfd_merge_private_bfd_data 	v850_elf_merge_private_bfd_data
-#define bfd_elf32_bfd_set_private_flags		v850_elf_set_private_flags
-#define bfd_elf32_bfd_print_private_bfd_data	v850_elf_print_private_bfd_data
-
-#define elf_symbol_leading_char			'_'
-
-#include "elf32-target.h"
diff --git a/bfd/elf32.c b/bfd/elf32.c
deleted file mode 100644
index f2229694406..00000000000
--- a/bfd/elf32.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* ELF 32-bit executable support for BFD.
-   Copyright 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define ARCH_SIZE		32
-
-
-#include "elfcode.h"
diff --git a/bfd/elf64-alpha.c b/bfd/elf64-alpha.c
deleted file mode 100644
index 1964f86e859..00000000000
--- a/bfd/elf64-alpha.c
+++ /dev/null
@@ -1,4768 +0,0 @@
-/* Alpha specific support for 64-bit ELF
-   Copyright 1996, 97, 98, 1999 Free Software Foundation, Inc.
-   Contributed by Richard Henderson <rth@tamu.edu>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* We need a published ABI spec for this.  Until one comes out, don't
-   assume this'll remain unchanged forever.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-#include "elf/alpha.h"
-
-#define ALPHAECOFF
-
-#define NO_COFF_RELOCS
-#define NO_COFF_SYMBOLS
-#define NO_COFF_LINENOS
-
-/* Get the ECOFF swapping routines.  Needed for the debug information. */
-#include "coff/internal.h"
-#include "coff/sym.h"
-#include "coff/symconst.h"
-#include "coff/ecoff.h"
-#include "coff/alpha.h"
-#include "aout/ar.h"
-#include "libcoff.h"
-#include "libecoff.h"
-#define ECOFF_64
-#include "ecoffswap.h"
-
-static boolean elf64_alpha_mkobject PARAMS ((bfd *));
-static struct bfd_hash_entry * elf64_alpha_link_hash_newfunc
-  PARAMS((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table * elf64_alpha_bfd_link_hash_table_create
-  PARAMS((bfd *));
-
-static bfd_reloc_status_type elf64_alpha_reloc_nil
-  PARAMS((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type elf64_alpha_reloc_bad
-  PARAMS((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type elf64_alpha_do_reloc_gpdisp
-  PARAMS((bfd *, bfd_vma, bfd_byte *, bfd_byte *));
-static bfd_reloc_status_type elf64_alpha_reloc_gpdisp
-  PARAMS((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-
-static reloc_howto_type * elf64_alpha_bfd_reloc_type_lookup
-  PARAMS((bfd *, bfd_reloc_code_real_type));
-static void elf64_alpha_info_to_howto
-  PARAMS((bfd *, arelent *, Elf64_Internal_Rela *));
-
-static boolean elf64_alpha_object_p
-  PARAMS((bfd *));
-static boolean elf64_alpha_section_from_shdr
-  PARAMS((bfd *, Elf64_Internal_Shdr *, char *));
-static boolean elf64_alpha_fake_sections
-  PARAMS((bfd *, Elf64_Internal_Shdr *, asection *));
-static boolean elf64_alpha_create_got_section
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_create_dynamic_sections
-  PARAMS((bfd *, struct bfd_link_info *));
-
-static boolean elf64_alpha_read_ecoff_info
-  PARAMS((bfd *, asection *, struct ecoff_debug_info *));
-static boolean elf64_alpha_is_local_label_name
-  PARAMS((bfd *, const char *));
-static boolean elf64_alpha_find_nearest_line
-  PARAMS((bfd *, asection *, asymbol **, bfd_vma, const char **,
-	  const char **, unsigned int *));
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct alpha_elf_link_hash_entry;
-#endif
-
-static boolean elf64_alpha_output_extsym
-  PARAMS((struct alpha_elf_link_hash_entry *, PTR));
-
-static boolean elf64_alpha_can_merge_gots
-  PARAMS((bfd *, bfd *));
-static void elf64_alpha_merge_gots
-  PARAMS((bfd *, bfd *));
-static boolean elf64_alpha_calc_got_offsets_for_symbol
-  PARAMS ((struct alpha_elf_link_hash_entry *, PTR));
-static void elf64_alpha_calc_got_offsets PARAMS ((struct bfd_link_info *));
-static boolean elf64_alpha_size_got_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_always_size_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_calc_dynrel_sizes
-  PARAMS ((struct alpha_elf_link_hash_entry *, struct bfd_link_info *));
-static boolean elf64_alpha_add_symbol_hook
-  PARAMS ((bfd *, struct bfd_link_info *, const Elf_Internal_Sym *,
-	   const char **, flagword *, asection **, bfd_vma *));
-static boolean elf64_alpha_check_relocs
-  PARAMS((bfd *, struct bfd_link_info *, asection *sec,
-	  const Elf_Internal_Rela *));
-static boolean elf64_alpha_adjust_dynamic_symbol
-  PARAMS((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean elf64_alpha_size_dynamic_sections
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_adjust_dynindx
-  PARAMS((struct elf_link_hash_entry *, PTR));
-static boolean elf64_alpha_relocate_section
-  PARAMS((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	  Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean elf64_alpha_finish_dynamic_symbol
-  PARAMS((bfd *, struct bfd_link_info *, struct elf_link_hash_entry *,
-	  Elf_Internal_Sym *));
-static boolean elf64_alpha_finish_dynamic_sections
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean elf64_alpha_final_link
-  PARAMS((bfd *, struct bfd_link_info *));
-
-
-struct alpha_elf_link_hash_entry
-{
-  struct elf_link_hash_entry root;
-
-  /* External symbol information.  */
-  EXTR esym;
-
-  /* Cumulative flags for all the .got entries.  */
-  int flags;
-
-  /* Contexts (LITUSE) in which a literal was referenced.  */
-#define ALPHA_ELF_LINK_HASH_LU_ADDR 0x01
-#define ALPHA_ELF_LINK_HASH_LU_MEM  0x02
-#define ALPHA_ELF_LINK_HASH_LU_BYTE 0x04
-#define ALPHA_ELF_LINK_HASH_LU_FUNC 0x08
-
-  /* Used to implement multiple .got subsections.  */
-  struct alpha_elf_got_entry
-  {
-    struct alpha_elf_got_entry *next;
-
-    /* which .got subsection?  */
-    bfd *gotobj;
-
-    /* the addend in effect for this entry.  */
-    bfd_vma addend;
-
-    /* the .got offset for this entry.  */
-    int got_offset;
-
-    int flags;
-
-    /* An additional flag.  */
-#define ALPHA_ELF_GOT_ENTRY_RELOCS_DONE 0x10
-
-    int use_count;
-  } *got_entries;
-
-  /* used to count non-got, non-plt relocations for delayed sizing
-     of relocation sections.  */
-  struct alpha_elf_reloc_entry
-  {
-    struct alpha_elf_reloc_entry *next;
-
-    /* which .reloc section? */
-    asection *srel;
-
-    /* what kind of relocation? */
-    unsigned long rtype;
-
-    /* how many did we find?  */
-    unsigned long count;
-  } *reloc_entries;
-};
-
-/* Alpha ELF linker hash table.  */
-
-struct alpha_elf_link_hash_table
-{
-  struct elf_link_hash_table root;
-
-  /* The head of a list of .got subsections linked through
-     alpha_elf_tdata(abfd)->got_link_next.  */
-  bfd *got_list;
-};
-
-/* Look up an entry in a Alpha ELF linker hash table.  */
-
-#define alpha_elf_link_hash_lookup(table, string, create, copy, follow)	\
-  ((struct alpha_elf_link_hash_entry *)					\
-   elf_link_hash_lookup (&(table)->root, (string), (create),		\
-			 (copy), (follow)))
-
-/* Traverse a Alpha ELF linker hash table.  */
-
-#define alpha_elf_link_hash_traverse(table, func, info)			\
-  (elf_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct elf_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the Alpha ELF linker hash table from a link_info structure.  */
-
-#define alpha_elf_hash_table(p) \
-  ((struct alpha_elf_link_hash_table *) ((p)->hash))
-
-/* Get the object's symbols as our own entry type.  */
-
-#define alpha_elf_sym_hashes(abfd) \
-  ((struct alpha_elf_link_hash_entry **)elf_sym_hashes(abfd))
-
-/* Should we do dynamic things to this symbol?  */
-
-#define alpha_elf_dynamic_symbol_p(h, info) 				\
-  ((((info)->shared && !(info)->symbolic)				\
-    || (((h)->elf_link_hash_flags					\
-	 & (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))	\
-        == (ELF_LINK_HASH_DEF_DYNAMIC | ELF_LINK_HASH_REF_REGULAR))	\
-    || (h)->root.type == bfd_link_hash_undefweak			\
-    || (h)->root.type == bfd_link_hash_defweak)				\
-   && (h)->dynindx != -1)
-
-/* Create an entry in a Alpha ELF linker hash table.  */
-
-static struct bfd_hash_entry *
-elf64_alpha_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct alpha_elf_link_hash_entry *ret =
-    (struct alpha_elf_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct alpha_elf_link_hash_entry *) NULL)
-    ret = ((struct alpha_elf_link_hash_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct alpha_elf_link_hash_entry)));
-  if (ret == (struct alpha_elf_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct alpha_elf_link_hash_entry *)
-	 _bfd_elf_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				     table, string));
-  if (ret != (struct alpha_elf_link_hash_entry *) NULL)
-    {
-      /* Set local fields.  */
-      memset (&ret->esym, 0, sizeof (EXTR));
-      /* We use -2 as a marker to indicate that the information has
-	 not been set.  -1 means there is no associated ifd.  */
-      ret->esym.ifd = -2;
-      ret->flags = 0;
-      ret->got_entries = NULL;
-      ret->reloc_entries = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create a Alpha ELF linker hash table.  */
-
-static struct bfd_link_hash_table *
-elf64_alpha_bfd_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct alpha_elf_link_hash_table *ret;
-
-  ret = ((struct alpha_elf_link_hash_table *)
-	 bfd_zalloc (abfd, sizeof (struct alpha_elf_link_hash_table)));
-  if (ret == (struct alpha_elf_link_hash_table *) NULL)
-    return NULL;
-
-  if (! _bfd_elf_link_hash_table_init (&ret->root, abfd,
-				       elf64_alpha_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return NULL;
-    }
-
-  return &ret->root.root;
-}
-
-/* We have some private fields hanging off of the elf_tdata structure.  */
-
-struct alpha_elf_obj_tdata
-{
-  struct elf_obj_tdata root;
-
-  /* For every input file, these are the got entries for that object's
-     local symbols.  */
-  struct alpha_elf_got_entry ** local_got_entries;
-
-  /* For every input file, this is the object that owns the got that
-     this input file uses.  */
-  bfd *gotobj;
-
-  /* For every got, this is a linked list through the objects using this got */
-  bfd *in_got_link_next;
-
-  /* For every got, this is a link to the next got subsegment.  */
-  bfd *got_link_next;
-
-  /* For every got, this is the section.  */
-  asection *got;
-
-  /* For every got, this is it's total number of *entries*.  */
-  int total_got_entries;
-
-  /* For every got, this is the sum of the number of *entries* required
-     to hold all of the member object's local got.  */
-  int n_local_got_entries;
-};
-
-#define alpha_elf_tdata(abfd) \
-  ((struct alpha_elf_obj_tdata *) (abfd)->tdata.any)
-
-static boolean
-elf64_alpha_mkobject (abfd)
-     bfd *abfd;
-{
-  abfd->tdata.any = bfd_zalloc (abfd, sizeof (struct alpha_elf_obj_tdata));
-  if (abfd->tdata.any == NULL)
-    return false;
-  return true;
-}
-
-static boolean
-elf64_alpha_object_p (abfd)
-     bfd *abfd;
-{
-  /* Allocate our special target data.  */
-  struct alpha_elf_obj_tdata *new_tdata;
-  new_tdata = bfd_zalloc (abfd, sizeof (struct alpha_elf_obj_tdata));
-  if (new_tdata == NULL)
-    return false;
-  new_tdata->root = *abfd->tdata.elf_obj_data;
-  abfd->tdata.any = new_tdata;
-
-  /* Set the right machine number for an Alpha ELF file.  */
-  return bfd_default_set_arch_mach (abfd, bfd_arch_alpha, 0);
-}
-
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
-   from smaller values.  Start with zero, widen, *then* decrement.  */
-#define MINUS_ONE	(((bfd_vma)0) - 1)
-
-static reloc_howto_type elf64_alpha_howto_table[] =
-{
-  HOWTO (R_ALPHA_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_nil,	/* special_function */
-	 "NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 32 bit reference to a symbol.  */
-  HOWTO (R_ALPHA_REFLONG,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "REFLONG",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit reference to a symbol.  */
-  HOWTO (R_ALPHA_REFQUAD,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "REFQUAD",		/* name */
-	 false,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit GP relative offset.  This is just like REFLONG except
-     that when the value is used the value of the gp register will be
-     added in.  */
-  HOWTO (R_ALPHA_GPREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "GPREL32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Used for an instruction that refers to memory off the GP register.  */
-  HOWTO (R_ALPHA_LITERAL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "ELF_LITERAL",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* This reloc only appears immediately following an ELF_LITERAL reloc.
-     It identifies a use of the literal.  The symbol index is special:
-     1 means the literal address is in the base register of a memory
-     format instruction; 2 means the literal address is in the byte
-     offset register of a byte-manipulation instruction; 3 means the
-     literal address is in the target register of a jsr instruction.
-     This does not actually do any relocation.  */
-  HOWTO (R_ALPHA_LITUSE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_nil,	/* special_function */
-	 "LITUSE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Load the gp register.  This is always used for a ldah instruction
-     which loads the upper 16 bits of the gp register.  The symbol
-     index of the GPDISP instruction is an offset in bytes to the lda
-     instruction that loads the lower 16 bits.  The value to use for
-     the relocation is the difference between the GP value and the
-     current location; the load will always be done against a register
-     holding the current address.
-
-     NOTE: Unlike ECOFF, partial in-place relocation is not done.  If
-     any offset is present in the instructions, it is an offset from
-     the register to the ldah instruction.  This lets us avoid any
-     stupid hackery like inventing a gp value to do partial relocation
-     against.  Also unlike ECOFF, we do the whole relocation off of
-     the GPDISP rather than a GPDISP_HI16/GPDISP_LO16 pair.  An odd,
-     space consuming bit, that, since all the information was present
-     in the GPDISP_HI16 reloc.  */
-  HOWTO (R_ALPHA_GPDISP,	/* type */
-	 16,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_gpdisp, /* special_function */
-	 "GPDISP",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 21 bit branch.  */
-  HOWTO (R_ALPHA_BRADDR,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 21,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "BRADDR",		/* name */
-	 false,			/* partial_inplace */
-	 0x1fffff,		/* src_mask */
-	 0x1fffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A hint for a jump to a register.  */
-  HOWTO (R_ALPHA_HINT,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 14,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "HINT",		/* name */
-	 false,			/* partial_inplace */
-	 0x3fff,		/* src_mask */
-	 0x3fff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 16 bit PC relative offset.  */
-  HOWTO (R_ALPHA_SREL16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL16",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit PC relative offset.  */
-  HOWTO (R_ALPHA_SREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit PC relative offset.  */
-  HOWTO (R_ALPHA_SREL64,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL64",		/* name */
-	 false,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Push a value on the reloc evaluation stack.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_PUSH,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "OP_PUSH",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Store the value from the stack at the given address.  Store it in
-     a bitfield of size r_size starting at bit position r_offset.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_STORE,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "OP_STORE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Subtract the reloc address from the value on the top of the
-     relocation stack.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_PSUB,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "OP_PSUB",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Shift the value on the top of the relocation stack right by the
-     given value.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_OP_PRSHIFT,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "OP_PRSHIFT",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Change the value of GP used by +r_addend until the next GPVALUE or the
-     end of the input bfd.  */
-  /* Not implemented -- it's dumb.  */
-  HOWTO (R_ALPHA_GPVALUE,
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "GPVALUE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high 16 bits of the displacement from GP to the target.  */
-  HOWTO (R_ALPHA_GPRELHIGH,
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "GPRELHIGH",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The low 16 bits of the displacement from GP to the target.  */
-  HOWTO (R_ALPHA_GPRELLOW,
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "GPRELLOW",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 16-bit displacement from the GP to the target.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_GP_16,
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "IMMED_GP_16",		/* name */
-	 false,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high bits of a 32-bit displacement from the GP to the target; the
-     low bits are supplied in the subsequent R_ALPHA_IMMED_LO32 relocs.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_GP_HI32,
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "IMMED_GP_HI32",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high bits of a 32-bit displacement to the starting address of the
-     current section (the relocation target is ignored); the low bits are 
-     supplied in the subsequent R_ALPHA_IMMED_LO32 relocs.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_SCN_HI32,
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "IMMED_SCN_HI32",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The high bits of a 32-bit displacement from the previous br, bsr, jsr
-     or jmp insn (as tagged by a BRADDR or HINT reloc) to the target; the
-     low bits are supplied by subsequent R_ALPHA_IMMED_LO32 relocs.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_BR_HI32,
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "IMMED_BR_HI32",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* The low 16 bits of a displacement calculated in a previous HI32 reloc.  */
-  /* XXX: Not implemented.  */
-  HOWTO (R_ALPHA_IMMED_LO32,
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 elf64_alpha_reloc_bad, /* special_function */
-	 "IMMED_LO32",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Misc ELF relocations. */
-
-  /* A dynamic relocation to copy the target into our .dynbss section.  */
-  /* Not generated, as all Alpha objects use PIC, so it is not needed.  It
-     is present because every other ELF has one, but should not be used
-     because .dynbss is an ugly thing.  */
-  HOWTO (R_ALPHA_COPY,
-	 0,
-	 0,
-	 0,
-	 false,
-	 0,
-	 complain_overflow_dont,
-	 bfd_elf_generic_reloc,
-	 "COPY",
-	 false,
-	 0,
-	 0,
-	 true),
-
-  /* A dynamic relocation for a .got entry.  */
-  HOWTO (R_ALPHA_GLOB_DAT,
-	 0,
-	 0,
-	 0,
-	 false,
-	 0,
-	 complain_overflow_dont,
-	 bfd_elf_generic_reloc,
-	 "GLOB_DAT",
-	 false,
-	 0,
-	 0,
-	 true),
-
-  /* A dynamic relocation for a .plt entry.  */
-  HOWTO (R_ALPHA_JMP_SLOT,
-	 0,
-	 0,
-	 0,
-	 false,
-	 0,
-	 complain_overflow_dont,
-	 bfd_elf_generic_reloc,
-	 "JMP_SLOT",
-	 false,
-	 0,
-	 0,
-	 true),
-
-  /* A dynamic relocation to add the base of the DSO to a 64-bit field.  */
-  HOWTO (R_ALPHA_RELATIVE,
-	 0,
-	 0,
-	 0,
-	 false,
-	 0,
-	 complain_overflow_dont,
-	 bfd_elf_generic_reloc,
-	 "RELATIVE",
-	 false,
-	 0,
-	 0,
-	 true)
-};
-
-/* A relocation function which doesn't do anything.  */
-
-static bfd_reloc_status_type
-elf64_alpha_reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc;
-     asymbol *sym;
-     PTR data;
-     asection *sec;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd)
-    reloc->address += sec->output_offset;
-  return bfd_reloc_ok;
-}
-
-/* A relocation function used for an unsupported reloc.  */
-
-static bfd_reloc_status_type
-elf64_alpha_reloc_bad (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc;
-     asymbol *sym;
-     PTR data;
-     asection *sec;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd)
-    reloc->address += sec->output_offset;
-  return bfd_reloc_notsupported;
-}
-
-/* Do the work of the GPDISP relocation.  */
-
-static bfd_reloc_status_type
-elf64_alpha_do_reloc_gpdisp (abfd, gpdisp, p_ldah, p_lda)
-     bfd *abfd;
-     bfd_vma gpdisp;
-     bfd_byte *p_ldah;
-     bfd_byte *p_lda;
-{
-  bfd_reloc_status_type ret = bfd_reloc_ok;
-  bfd_vma addend;
-  unsigned long i_ldah, i_lda;
-
-  i_ldah = bfd_get_32 (abfd, p_ldah);
-  i_lda = bfd_get_32 (abfd, p_lda);
-
-  /* Complain if the instructions are not correct.  */
-  if (((i_ldah >> 26) & 0x3f) != 0x09
-      || ((i_lda >> 26) & 0x3f) != 0x08)
-    ret = bfd_reloc_dangerous;
-
-  /* Extract the user-supplied offset, mirroring the sign extensions
-     that the instructions perform.  */
-  addend = ((i_ldah & 0xffff) << 16) | (i_lda & 0xffff);
-  addend = (addend ^ 0x80008000) - 0x80008000;
-
-  gpdisp += addend;
-
-  if ((bfd_signed_vma) gpdisp < -(bfd_signed_vma) 0x80000000
-      || (bfd_signed_vma) gpdisp >= (bfd_signed_vma) 0x7fff8000)
-    ret = bfd_reloc_overflow;
-
-  /* compensate for the sign extension again.  */
-  i_ldah = ((i_ldah & 0xffff0000)
-	    | (((gpdisp >> 16) + ((gpdisp >> 15) & 1)) & 0xffff));
-  i_lda = (i_lda & 0xffff0000) | (gpdisp & 0xffff);
-
-  bfd_put_32 (abfd, i_ldah, p_ldah);
-  bfd_put_32 (abfd, i_lda, p_lda);
-
-  return ret;
-}
-
-/* The special function for the GPDISP reloc.  */
-
-static bfd_reloc_status_type
-elf64_alpha_reloc_gpdisp (abfd, reloc_entry, sym, data, input_section,
-			  output_bfd, err_msg)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *sym;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **err_msg;
-{
-  bfd_reloc_status_type ret;
-  bfd_vma gp, relocation;
-  bfd_byte *p_ldah, *p_lda;
-
-  /* Don't do anything if we're not doing a final link.  */
-  if (output_bfd)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  if (reloc_entry->address > input_section->_cooked_size ||
-      reloc_entry->address + reloc_entry->addend > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* The gp used in the portion of the output object to which this
-     input object belongs is cached on the input bfd.  */
-  gp = _bfd_get_gp_value (abfd);
-
-  relocation = (input_section->output_section->vma
-		+ input_section->output_offset
-		+ reloc_entry->address);
-
-  p_ldah = (bfd_byte *) data + reloc_entry->address;
-  p_lda = p_ldah + reloc_entry->addend;
-
-  ret = elf64_alpha_do_reloc_gpdisp (abfd, gp - relocation, p_ldah, p_lda);
-
-  /* Complain if the instructions are not correct.  */
-  if (ret == bfd_reloc_dangerous)
-    *err_msg = _("GPDISP relocation did not find ldah and lda instructions");
-
-  return ret;
-}
-
-/* A mapping from BFD reloc types to Alpha ELF reloc types.  */
-
-struct elf_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  int elf_reloc_val;
-};
-
-static const struct elf_reloc_map elf64_alpha_reloc_map[] =
-{
-  {BFD_RELOC_NONE,		R_ALPHA_NONE},
-  {BFD_RELOC_32,		R_ALPHA_REFLONG},
-  {BFD_RELOC_64,		R_ALPHA_REFQUAD},
-  {BFD_RELOC_CTOR,		R_ALPHA_REFQUAD},
-  {BFD_RELOC_GPREL32,		R_ALPHA_GPREL32},
-  {BFD_RELOC_ALPHA_ELF_LITERAL,	R_ALPHA_LITERAL},
-  {BFD_RELOC_ALPHA_LITUSE,	R_ALPHA_LITUSE},
-  {BFD_RELOC_ALPHA_GPDISP,	R_ALPHA_GPDISP},
-  {BFD_RELOC_23_PCREL_S2,	R_ALPHA_BRADDR},
-  {BFD_RELOC_ALPHA_HINT,	R_ALPHA_HINT},
-  {BFD_RELOC_16_PCREL,		R_ALPHA_SREL16},
-  {BFD_RELOC_32_PCREL,		R_ALPHA_SREL32},
-  {BFD_RELOC_64_PCREL,		R_ALPHA_SREL64},
-};
-
-/* Given a BFD reloc type, return a HOWTO structure.  */
-
-static reloc_howto_type *
-elf64_alpha_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  const struct elf_reloc_map *i, *e;
-  i = e = elf64_alpha_reloc_map;
-  e += sizeof (elf64_alpha_reloc_map) / sizeof (struct elf_reloc_map);
-  for (; i != e; ++i)
-    {
-      if (i->bfd_reloc_val == code)
-	return &elf64_alpha_howto_table[i->elf_reloc_val];
-    }
-  return 0;
-}
-
-/* Given an Alpha ELF reloc type, fill in an arelent structure.  */
-
-static void
-elf64_alpha_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf64_Internal_Rela *dst;
-{
-  unsigned r_type;
-
-  r_type = ELF64_R_TYPE(dst->r_info);
-  BFD_ASSERT (r_type < (unsigned int) R_ALPHA_max);
-  cache_ptr->howto = &elf64_alpha_howto_table[r_type];
-}
-
-/* These functions do relaxation for Alpha ELF. 
-
-   Currently I'm only handling what I can do with existing compiler
-   and assembler support, which means no instructions are removed,
-   though some may be nopped.  At this time GCC does not emit enough
-   information to do all of the relaxing that is possible.  It will
-   take some not small amount of work for that to happen.
-
-   There are a couple of interesting papers that I once read on this
-   subject, that I cannot find references to at the moment, that
-   related to Alpha in particular.  They are by David Wall, then of
-   DEC WRL.  */
-
-#define OP_LDA		0x08
-#define OP_LDAH		0x09
-#define INSN_JSR	0x68004000
-#define INSN_JSR_MASK	0xfc00c000
-#define OP_LDQ		0x29
-#define OP_BR		0x30
-#define OP_BSR		0x34
-#define INSN_UNOP	0x2fe00000
-
-struct alpha_relax_info
-{
-  bfd *abfd;
-  asection *sec;
-  bfd_byte *contents;
-  Elf_Internal_Rela *relocs, *relend;
-  struct bfd_link_info *link_info;
-  boolean changed_contents;
-  boolean changed_relocs;
-  bfd_vma gp;
-  bfd *gotobj;
-  asection *tsec;
-  struct alpha_elf_link_hash_entry *h;
-  struct alpha_elf_got_entry *gotent;
-  unsigned char other;
-};
-
-static Elf_Internal_Rela * elf64_alpha_relax_with_lituse
-  PARAMS((struct alpha_relax_info *info, bfd_vma symval, 
-          Elf_Internal_Rela *irel, Elf_Internal_Rela *irelend));
-
-static boolean elf64_alpha_relax_without_lituse
-  PARAMS((struct alpha_relax_info *info, bfd_vma symval, 
-          Elf_Internal_Rela *irel));
-
-static bfd_vma elf64_alpha_relax_opt_call
-  PARAMS((struct alpha_relax_info *info, bfd_vma symval));
-
-static boolean elf64_alpha_relax_section
-  PARAMS((bfd *abfd, asection *sec, struct bfd_link_info *link_info,
-	  boolean *again));
-
-static Elf_Internal_Rela *
-elf64_alpha_find_reloc_at_ofs (rel, relend, offset, type)
-     Elf_Internal_Rela *rel, *relend;
-     bfd_vma offset;
-     int type;
-{
-  while (rel < relend)
-    {
-      if (rel->r_offset == offset && ELF64_R_TYPE (rel->r_info) == type)
-	return rel;
-      ++rel;
-    }
-  return NULL;
-}
-
-static Elf_Internal_Rela *
-elf64_alpha_relax_with_lituse (info, symval, irel, irelend)
-     struct alpha_relax_info *info;
-     bfd_vma symval;
-     Elf_Internal_Rela *irel, *irelend;
-{
-  Elf_Internal_Rela *urel;
-  int flags, count, i;
-  bfd_signed_vma disp;
-  boolean fits16;
-  boolean fits32;
-  boolean lit_reused = false;
-  boolean all_optimized = true;
-  unsigned int lit_insn;
-
-  lit_insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
-  if (lit_insn >> 26 != OP_LDQ)
-    {
-      ((*_bfd_error_handler)
-       ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
-	bfd_get_filename (info->abfd), info->sec->name,
-	(unsigned long)irel->r_offset));
-      return irel;
-    }
-
-  /* Summarize how this particular LITERAL is used.  */
-  for (urel = irel+1, flags = count = 0; urel < irelend; ++urel, ++count)
-    {
-      if (ELF64_R_TYPE (urel->r_info) != R_ALPHA_LITUSE)
-	break;
-      if (urel->r_addend >= 0 && urel->r_addend <= 3)
-	flags |= 1 << urel->r_addend;
-    }
-
-  /* A little preparation for the loop... */
-  disp = symval - info->gp;
-  fits16 = (disp >= -(bfd_signed_vma)0x8000 && disp < 0x8000);
-  fits32 = (disp >= -(bfd_signed_vma)0x80000000 && disp < 0x7fff8000);
-
-  for (urel = irel+1, i = 0; i < count; ++i, ++urel)
-    {
-      unsigned int insn;
-      insn = bfd_get_32 (info->abfd, info->contents + urel->r_offset);
-
-      switch (urel->r_addend)
-	{
-	default: /* 0 = ADDRESS FORMAT */
-	  /* This type is really just a placeholder to note that all
-	     uses cannot be optimized, but to still allow some.  */
-	  all_optimized = false;
-	  break;
-
-	case 1: /* MEM FORMAT */
-	  /* We can always optimize 16-bit displacements.  */
-	  if (fits16)
-	    {
-	      /* FIXME: sanity check the insn for mem format with
-		 zero addend.  */
-
-	      /* Take the op code and dest from this insn, take the base 
-		 register from the literal insn.  Leave the offset alone.  */
-	      insn = (insn & 0xffe00000) | (lit_insn & 0x001f0000);
-	      urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-					   R_ALPHA_GPRELLOW);
-	      urel->r_addend = irel->r_addend;
-	      info->changed_relocs = true;
-
-	      bfd_put_32 (info->abfd, insn, info->contents + urel->r_offset);
-	      info->changed_contents = true;
-	    }
-
-	  /* If all mem+byte, we can optimize 32-bit mem displacements.  */
-	  else if (fits32 && !(flags & ~6))
-	    {
-	      /* FIXME: sanity check that lit insn Ra is mem insn Rb, and
-		 that mem_insn disp is zero.  */
-
-	      irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-					   R_ALPHA_GPRELHIGH);
-	      lit_insn = (OP_LDAH << 26) | (lit_insn & 0x03ff0000);
-	      bfd_put_32 (info->abfd, lit_insn,
-			  info->contents + irel->r_offset);
-	      lit_reused = true;
-	      info->changed_contents = true;
-
-	      urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-					   R_ALPHA_GPRELLOW);
-	      urel->r_addend = irel->r_addend;
-	      info->changed_relocs = true;
-	    }
-	  else
-	    all_optimized = false;
-	  break;
-
-	case 2: /* BYTE OFFSET FORMAT */
-	  /* We can always optimize byte instructions.  */
-
-	  /* FIXME: sanity check the insn for byte op.  Check that the
-	     literal dest reg is indeed Rb in the byte insn.  */
-
-	  insn = (insn & ~0x001ff000) | ((symval & 7) << 13) | 0x1000;
-
-	  urel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-	  urel->r_addend = 0;
-	  info->changed_relocs = true;
-
-	  bfd_put_32 (info->abfd, insn, info->contents + urel->r_offset);
-	  info->changed_contents = true;
-	  break;
-
-	case 3: /* CALL FORMAT */
-	  {
-	    /* If not zero, place to jump without needing pv.  */
-	    bfd_vma optdest = elf64_alpha_relax_opt_call (info, symval);
-	    bfd_vma org = (info->sec->output_section->vma
-			   + info->sec->output_offset
-			   + urel->r_offset + 4);
-	    bfd_signed_vma odisp;
-
-	    odisp = (optdest ? optdest : symval) - org;
-	    if (odisp >= -0x400000 && odisp < 0x400000)
-	      {
-		Elf_Internal_Rela *xrel;
-
-		/* Preserve branch prediction call stack when possible. */
-		if ((insn & INSN_JSR_MASK) == INSN_JSR)
-		  insn = (OP_BSR << 26) | (insn & 0x03e00000);
-		else
-		  insn = (OP_BR << 26) | (insn & 0x03e00000);
-		  
-		urel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info),
-					     R_ALPHA_BRADDR);
-		urel->r_addend = irel->r_addend;
-
-		if (optdest)
-		  urel->r_addend += optdest - symval;
-		else
-		  all_optimized = false;
-
-		bfd_put_32 (info->abfd, insn, info->contents + urel->r_offset);
-
-		/* Kill any HINT reloc that might exist for this insn.  */
-		xrel = (elf64_alpha_find_reloc_at_ofs
-			(info->relocs, info->relend, urel->r_offset, 
-			 R_ALPHA_HINT));
-		if (xrel)
-		  xrel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-
-		info->changed_contents = true;
-		info->changed_relocs = true;
-	      }
-	    else
-	      all_optimized = false;
-
-	    /* ??? If target gp == current gp we can eliminate the gp reload.
-	       This does depend on every place a gp could be reloaded will
-	       be, which currently happens for all code produced by gcc, but
-	       not necessarily by hand-coded assembly, or if sibling calls
-	       are enabled in gcc. 
-
-	       Perhaps conditionalize this on a flag being set in the target
-	       object file's header, and have gcc set it?  */
-	  }
-	  break;
-	}
-    }
-
-  /* If all cases were optimized, we can reduce the use count on this
-     got entry by one, possibly eliminating it.  */
-  if (all_optimized)
-    {
-      info->gotent->use_count -= 1;
-      alpha_elf_tdata (info->gotent->gotobj)->total_got_entries -= 1;
-      if (!info->h)
-	alpha_elf_tdata (info->gotent->gotobj)->n_local_got_entries -= 1;
-
-      /* If the literal instruction is no longer needed (it may have been
-	 reused.  We can eliminate it.
-	 ??? For now, I don't want to deal with compacting the section,
-	 so just nop it out.  */
-      if (!lit_reused)
-	{
-	  irel->r_info = ELF64_R_INFO (0, R_ALPHA_NONE);
-	  info->changed_relocs = true;
-
-	  bfd_put_32 (info->abfd, INSN_UNOP, info->contents + irel->r_offset);
-	  info->changed_contents = true;
-	}
-    }
-
-  return irel + count;
-}
-
-static bfd_vma
-elf64_alpha_relax_opt_call (info, symval)
-     struct alpha_relax_info *info;
-     bfd_vma symval;
-{
-  /* If the function has the same gp, and we can identify that the
-     function does not use its function pointer, we can eliminate the
-     address load.  */
-
-  /* If the symbol is marked NOPV, we are being told the function never
-     needs its procedure value.  */
-  if (info->other == STO_ALPHA_NOPV)
-    return symval;
-
-  /* If the symbol is marked STD_GP, we are being told the function does
-     a normal ldgp in the first two words.  */ 
-  else if (info->other == STO_ALPHA_STD_GPLOAD)
-    ;
-
-  /* Otherwise, we may be able to identify a GP load in the first two
-     words, which we can then skip.  */
-  else 
-    {
-      Elf_Internal_Rela *tsec_relocs, *tsec_relend, *tsec_free, *gpdisp;
-      bfd_vma ofs;
-
-      /* Load the relocations from the section that the target symbol is in. */
-      if (info->sec == info->tsec)
-	{
-	  tsec_relocs = info->relocs;
-	  tsec_relend = info->relend;
-	  tsec_free = NULL;
-	}
-      else
-	{
-	  tsec_relocs = (_bfd_elf64_link_read_relocs
-		         (info->abfd, info->tsec, (PTR) NULL,
-			 (Elf_Internal_Rela *) NULL,
-			 info->link_info->keep_memory));
-	  if (tsec_relocs == NULL)
-	    return 0;
-	  tsec_relend = tsec_relocs + info->tsec->reloc_count;
-	  tsec_free = (info->link_info->keep_memory ? NULL : tsec_relocs);
-	}
-
-      /* Recover the symbol's offset within the section.  */
-      ofs = (symval - info->tsec->output_section->vma
-	     - info->tsec->output_offset);
-  
-      /* Look for a GPDISP reloc.  */
-      gpdisp = (elf64_alpha_find_reloc_at_ofs
-		(tsec_relocs, tsec_relend, ofs, R_ALPHA_GPDISP));
-
-      if (!gpdisp || gpdisp->r_addend != 4)
-	{
-	  if (tsec_free)
-	    free (tsec_free);
-	  return 0;
-	}
-      if (tsec_free)
-        free (tsec_free);
-    }
-
-  /* We've now determined that we can skip an initial gp load.  Verify 
-     that the call and the target use the same gp.   */
-  if (info->link_info->hash->creator != info->tsec->owner->xvec
-      || info->gotobj != alpha_elf_tdata (info->tsec->owner)->gotobj)
-    return 0;
-
-  return symval + 8;
-}
-
-static boolean
-elf64_alpha_relax_without_lituse (info, symval, irel)
-     struct alpha_relax_info *info;
-     bfd_vma symval;
-     Elf_Internal_Rela *irel;
-{
-  unsigned int insn;
-  bfd_signed_vma disp;
-
-  /* Get the instruction.  */
-  insn = bfd_get_32 (info->abfd, info->contents + irel->r_offset);
-
-  if (insn >> 26 != OP_LDQ)
-    {
-      ((*_bfd_error_handler)
-       ("%s: %s+0x%lx: warning: LITERAL relocation against unexpected insn",
-	bfd_get_filename (info->abfd), info->sec->name,
-	(unsigned long) irel->r_offset));
-      return true;
-    }
-
-  /* So we aren't told much.  Do what we can with the address load and
-     fake the rest.  All of the optimizations here require that the
-     offset from the GP fit in 16 bits.  */
-
-  disp = symval - info->gp;
-  if (disp < -0x8000 || disp >= 0x8000)
-    return true;
-
-  /* On the LITERAL instruction itself, consider exchanging
-     `ldq R,X(gp)' for `lda R,Y(gp)'.  */
-
-  insn = (OP_LDA << 26) | (insn & 0x03ff0000);
-  bfd_put_32 (info->abfd, insn, info->contents + irel->r_offset);
-  info->changed_contents = true;
-
-  irel->r_info = ELF64_R_INFO (ELF64_R_SYM (irel->r_info), R_ALPHA_GPRELLOW);
-  info->changed_relocs = true;
-
-  /* Reduce the use count on this got entry by one, possibly
-     eliminating it.  */
-  info->gotent->use_count -= 1;
-  alpha_elf_tdata (info->gotent->gotobj)->total_got_entries -= 1;
-  if (!info->h)
-    alpha_elf_tdata (info->gotent->gotobj)->n_local_got_entries -= 1;
-
-  /* ??? Search forward through this basic block looking for insns
-     that use the target register.  Stop after an insn modifying the
-     register is seen, or after a branch or call.
-
-     Any such memory load insn may be substituted by a load directly
-     off the GP.  This allows the memory load insn to be issued before
-     the calculated GP register would otherwise be ready. 
-
-     Any such jsr insn can be replaced by a bsr if it is in range.
-
-     This would mean that we'd have to _add_ relocations, the pain of
-     which gives one pause.  */
-
-  return true;
-}
-
-static boolean
-elf64_alpha_relax_section (abfd, sec, link_info, again)
-     bfd *abfd;
-     asection *sec;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *internal_relocs;
-  Elf_Internal_Rela *free_relocs = NULL;
-  Elf_Internal_Rela *irel, *irelend;
-  bfd_byte *free_contents = NULL;
-  Elf64_External_Sym *extsyms = NULL;
-  Elf64_External_Sym *free_extsyms = NULL;
-  struct alpha_elf_got_entry **local_got_entries;
-  struct alpha_relax_info info;
-
-  /* We are not currently changing any sizes, so only one pass.  */
-  *again = false;
-
-  if (link_info->relocateable
-      || (sec->flags & SEC_RELOC) == 0
-      || sec->reloc_count == 0)
-    return true;
-
-  /* If this is the first time we have been called for this section,
-     initialize the cooked size.  */
-  if (sec->_cooked_size == 0)
-    sec->_cooked_size = sec->_raw_size;
-
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
-
-  /* Load the relocations for this section.  */
-  internal_relocs = (_bfd_elf64_link_read_relocs
-		     (abfd, sec, (PTR) NULL, (Elf_Internal_Rela *) NULL,
-		      link_info->keep_memory));
-  if (internal_relocs == NULL)
-    goto error_return;
-  if (! link_info->keep_memory)
-    free_relocs = internal_relocs;
-
-  memset(&info, 0, sizeof(info));
-  info.abfd = abfd;
-  info.sec = sec;
-  info.link_info = link_info;
-  info.relocs = internal_relocs;
-  info.relend = irelend = internal_relocs + sec->reloc_count;
-
-  /* Find the GP for this object.  */
-  info.gotobj = alpha_elf_tdata (abfd)->gotobj;
-  if (info.gotobj)
-    {
-      asection *sgot = alpha_elf_tdata (info.gotobj)->got;
-      info.gp = _bfd_get_gp_value (info.gotobj);
-      if (info.gp == 0)
-	{
-	  info.gp = (sgot->output_section->vma
-		     + sgot->output_offset
-		     + 0x8000);
-	  _bfd_set_gp_value (info.gotobj, info.gp);
-	}
-    }
-
-  for (irel = internal_relocs; irel < irelend; irel++)
-    {
-      bfd_vma symval;
-      Elf_Internal_Sym isym;
-      struct alpha_elf_got_entry *gotent;
-
-      if (ELF64_R_TYPE (irel->r_info) != (int) R_ALPHA_LITERAL)
-	continue;
-
-      /* Get the section contents.  */
-      if (info.contents == NULL)
-	{
-	  if (elf_section_data (sec)->this_hdr.contents != NULL)
-	    info.contents = elf_section_data (sec)->this_hdr.contents;
-	  else
-	    {
-	      info.contents = (bfd_byte *) bfd_malloc (sec->_raw_size);
-	      if (info.contents == NULL)
-		goto error_return;
-	      free_contents = info.contents;
-
-	      if (! bfd_get_section_contents (abfd, sec, info.contents,
-					      (file_ptr) 0, sec->_raw_size))
-		goto error_return;
-	    }
-	}
-
-      /* Read this BFD's symbols if we haven't done so already.  */
-      if (extsyms == NULL)
-	{
-	  if (symtab_hdr->contents != NULL)
-	    extsyms = (Elf64_External_Sym *) symtab_hdr->contents;
-	  else
-	    {
-	      extsyms = ((Elf64_External_Sym *)
-			 bfd_malloc (symtab_hdr->sh_size));
-	      if (extsyms == NULL)
-		goto error_return;
-	      free_extsyms = extsyms;
-	      if (bfd_seek (abfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-		  || (bfd_read (extsyms, 1, symtab_hdr->sh_size, abfd)
-		      != symtab_hdr->sh_size))
-		goto error_return;
-	    }
-	}
-
-      /* Get the value of the symbol referred to by the reloc.  */
-      if (ELF64_R_SYM (irel->r_info) < symtab_hdr->sh_info)
-	{
-	  /* A local symbol.  */
-	  bfd_elf64_swap_symbol_in (abfd,
-				    extsyms + ELF64_R_SYM (irel->r_info),
-				    &isym);
-	  if (isym.st_shndx == SHN_UNDEF)
-	    info.tsec = bfd_und_section_ptr;
-	  else if (isym.st_shndx > 0 && isym.st_shndx < SHN_LORESERVE)
-	    info.tsec = bfd_section_from_elf_index (abfd, isym.st_shndx);
-	  else if (isym.st_shndx == SHN_ABS)
-	    info.tsec = bfd_abs_section_ptr;
-	  else if (isym.st_shndx == SHN_COMMON)
-	    info.tsec = bfd_com_section_ptr;
-	  else 
-	    continue;	/* who knows. */
-
-	  info.h = NULL;
-	  info.other = isym.st_other;
-	  gotent = local_got_entries[ELF64_R_SYM(irel->r_info)];
-	  symval = isym.st_value;
-	}
-      else
-	{
-	  unsigned long indx;
-	  struct alpha_elf_link_hash_entry *h;
-
-	  indx = ELF64_R_SYM (irel->r_info) - symtab_hdr->sh_info;
-	  h = alpha_elf_sym_hashes (abfd)[indx];
-	  BFD_ASSERT (h != NULL);
-
-	  while (h->root.root.type == bfd_link_hash_indirect
-		 || h->root.root.type == bfd_link_hash_warning)
-	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
-
-	  /* We can't do anthing with undefined or dynamic symbols.  */
-	  if (h->root.root.type == bfd_link_hash_undefined
-	      || h->root.root.type == bfd_link_hash_undefweak
-	      || alpha_elf_dynamic_symbol_p (&h->root, link_info))
-	    continue;
-
-	  info.h = h;
-	  info.gotent = gotent;
-	  info.tsec = h->root.root.u.def.section;
-	  info.other = h->root.other;
-	  gotent = h->got_entries;
-	  symval = h->root.root.u.def.value;
-	}
-
-      /* Search for the got entry to be used by this relocation.  */
-      while (gotent->gotobj != info.gotobj || gotent->addend != irel->r_addend)
-	gotent = gotent->next;
-      info.gotent = gotent;
-
-      symval += info.tsec->output_section->vma + info.tsec->output_offset;
-      symval += irel->r_addend;
-
-      BFD_ASSERT(info.gotent != NULL);
-
-      /* If there exist LITUSE relocations immediately following, this
-	 opens up all sorts of interesting optimizations, because we
-	 now know every location that this address load is used.  */
-
-      if (irel+1 < irelend && ELF64_R_TYPE (irel[1].r_info) == R_ALPHA_LITUSE)
-	{
-	  irel = elf64_alpha_relax_with_lituse (&info, symval, irel, irelend);
-	  if (irel == NULL)
-	    goto error_return;
-	}
-      else
-	{
-	  if (!elf64_alpha_relax_without_lituse (&info, symval, irel))
-	    goto error_return;
-	}
-    }
-
-  if (!elf64_alpha_size_got_sections (abfd, link_info))
-    return false;
-
-  if (info.changed_relocs)
-    {
-      elf_section_data (sec)->relocs = internal_relocs;
-    }
-  else if (free_relocs != NULL)
-    {
-      free (free_relocs);
-    }
-
-  if (info.changed_contents)
-    {
-      elf_section_data (sec)->this_hdr.contents = info.contents;
-    }
-  else if (free_contents != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_contents);
-      else
-	{
-	  /* Cache the section contents for elf_link_input_bfd.  */
-	  elf_section_data (sec)->this_hdr.contents = info.contents;
-	}
-    }
-
-  if (free_extsyms != NULL)
-    {
-      if (! link_info->keep_memory)
-	free (free_extsyms);
-      else
-	{
-	  /* Cache the symbols for elf_link_input_bfd.  */
-	  symtab_hdr->contents = extsyms;
-	}
-    }
-
-  *again = info.changed_contents || info.changed_relocs;
-
-  return true;
-
- error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  if (free_contents != NULL)
-    free (free_contents);
-  if (free_extsyms != NULL)
-    free (free_extsyms);
-  return false;
-}
-
-/* PLT/GOT Stuff */
-#define PLT_HEADER_SIZE 32
-#define PLT_HEADER_WORD1	0xc3600000	/* br   $27,.+4     */
-#define PLT_HEADER_WORD2	0xa77b000c	/* ldq  $27,12($27) */
-#define PLT_HEADER_WORD3	0x47ff041f	/* nop              */
-#define PLT_HEADER_WORD4	0x6b7b0000	/* jmp  $27,($27)   */
-
-#define PLT_ENTRY_SIZE 12
-#define PLT_ENTRY_WORD1		0xc3800000	/* br   $28, plt0   */
-#define PLT_ENTRY_WORD2		0
-#define PLT_ENTRY_WORD3		0
-
-#define MAX_GOT_ENTRIES		(64*1024 / 8)
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so"
-
-/* Handle an Alpha specific section when reading an object file.  This
-   is called when elfcode.h finds a section with an unknown type.
-   FIXME: We need to handle the SHF_ALPHA_GPREL flag, but I'm not sure
-   how to.  */
-
-static boolean
-elf64_alpha_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf64_Internal_Shdr *hdr;
-     char *name;
-{
-  asection *newsect;
-
-  /* There ought to be a place to keep ELF backend specific flags, but
-     at the moment there isn't one.  We just keep track of the
-     sections by their name, instead.  Fortunately, the ABI gives
-     suggested names for all the MIPS specific sections, so we will
-     probably get away with this.  */
-  switch (hdr->sh_type)
-    {
-    case SHT_ALPHA_DEBUG:
-      if (strcmp (name, ".mdebug") != 0)
-	return false;
-      break;
-#ifdef ERIC_neverdef
-    case SHT_ALPHA_REGINFO:
-      if (strcmp (name, ".reginfo") != 0
-	  || hdr->sh_size != sizeof (Elf64_External_RegInfo))
-	return false;
-      break;
-#endif
-    default:
-      return false;
-    }
-
-  if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name))
-    return false;
-  newsect = hdr->bfd_section;
-
-  if (hdr->sh_type == SHT_ALPHA_DEBUG)
-    {
-      if (! bfd_set_section_flags (abfd, newsect,
-				   (bfd_get_section_flags (abfd, newsect)
-				    | SEC_DEBUGGING)))
-	return false;
-    }
-
-#ifdef ERIC_neverdef
-  /* For a .reginfo section, set the gp value in the tdata information
-     from the contents of this section.  We need the gp value while
-     processing relocs, so we just get it now.  */
-  if (hdr->sh_type == SHT_ALPHA_REGINFO)
-    {
-      Elf64_External_RegInfo ext;
-      Elf64_RegInfo s;
-
-      if (! bfd_get_section_contents (abfd, newsect, (PTR) &ext,
-				      (file_ptr) 0, sizeof ext))
-	return false;
-      bfd_alpha_elf64_swap_reginfo_in (abfd, &ext, &s);
-      elf_gp (abfd) = s.ri_gp_value;
-    }
-#endif
-
-  return true;
-}
-
-/* Set the correct type for an Alpha ELF section.  We do this by the
-   section name, which is a hack, but ought to work.  */
-
-static boolean
-elf64_alpha_fake_sections (abfd, hdr, sec)
-     bfd *abfd;
-     Elf64_Internal_Shdr *hdr;
-     asection *sec;
-{
-  register const char *name;
-
-  name = bfd_get_section_name (abfd, sec);
-
-  if (strcmp (name, ".mdebug") == 0)
-    {
-      hdr->sh_type = SHT_ALPHA_DEBUG;
-      /* In a shared object on Irix 5.3, the .mdebug section has an
-         entsize of 0.  FIXME: Does this matter?  */
-      if ((abfd->flags & DYNAMIC) != 0 )
-	hdr->sh_entsize = 0;
-      else
-	hdr->sh_entsize = 1;
-    }
-#ifdef ERIC_neverdef
-  else if (strcmp (name, ".reginfo") == 0)
-    {
-      hdr->sh_type = SHT_ALPHA_REGINFO;
-      /* In a shared object on Irix 5.3, the .reginfo section has an
-         entsize of 0x18.  FIXME: Does this matter?  */
-      if ((abfd->flags & DYNAMIC) != 0)
-	hdr->sh_entsize = sizeof (Elf64_External_RegInfo);
-      else
-	hdr->sh_entsize = 1;
-
-      /* Force the section size to the correct value, even if the
-	 linker thinks it is larger.  The link routine below will only
-	 write out this much data for .reginfo.  */
-      hdr->sh_size = sec->_raw_size = sizeof (Elf64_External_RegInfo);
-    }
-  else if (strcmp (name, ".hash") == 0
-	   || strcmp (name, ".dynamic") == 0
-	   || strcmp (name, ".dynstr") == 0)
-    {
-      hdr->sh_entsize = 0;
-      hdr->sh_info = SIZEOF_ALPHA_DYNSYM_SECNAMES;
-    }
-#endif
-  else if (strcmp (name, ".sdata") == 0
-	   || strcmp (name, ".sbss") == 0
-	   || strcmp (name, ".lit4") == 0
-	   || strcmp (name, ".lit8") == 0)
-    hdr->sh_flags |= SHF_ALPHA_GPREL;
-
-  return true;
-}
-
-/* Hook called by the linker routine which adds symbols from an object
-   file.  We use it to put .comm items in .sbss, and not .bss.  */
-
-static boolean
-elf64_alpha_add_symbol_hook (abfd, info, sym, namep, flagsp, secp, valp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const Elf_Internal_Sym *sym;
-     const char **namep;
-     flagword *flagsp;
-     asection **secp;
-     bfd_vma *valp;
-{
-  if (sym->st_shndx == SHN_COMMON
-      && !info->relocateable
-      && sym->st_size <= bfd_get_gp_size (abfd))
-    {
-      /* Common symbols less than or equal to -G nn bytes are
-	 automatically put into .sbss.  */
-
-      asection *scomm = bfd_get_section_by_name (abfd, ".scommon");
-
-      if (scomm == NULL)
-	{
-	  scomm = bfd_make_section (abfd, ".scommon");
-	  if (scomm == NULL
-	      || !bfd_set_section_flags (abfd, scomm, (SEC_ALLOC
-						       | SEC_IS_COMMON
-						       | SEC_LINKER_CREATED)))
-	    return false;
-	}
-
-      *secp = scomm;
-      *valp = sym->st_size;
-    }
-
-  return true;
-}
-
-/* Create the .got section.  */
-
-static boolean
-elf64_alpha_create_got_section(abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  asection *s;
-
-  if (bfd_get_section_by_name (abfd, ".got"))
-    return true;
-
-  s = bfd_make_section (abfd, ".got");
-  if (s == NULL
-      || !bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD
-					   | SEC_HAS_CONTENTS
-					   | SEC_IN_MEMORY
-					   | SEC_LINKER_CREATED))
-      || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
-
-  alpha_elf_tdata (abfd)->got = s;
-
-  return true;
-}
-
-/* Create all the dynamic sections.  */
-
-static boolean
-elf64_alpha_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  asection *s;
-  struct elf_link_hash_entry *h;
-
-  /* We need to create .plt, .rela.plt, .got, and .rela.got sections.  */
-
-  s = bfd_make_section (abfd, ".plt");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD
-					    | SEC_HAS_CONTENTS
-					    | SEC_IN_MEMORY
-					    | SEC_LINKER_CREATED
-					    | SEC_CODE))
-      || ! bfd_set_section_alignment (abfd, s, 3))
-    return false;
-
-  /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
-     .plt section.  */
-  h = NULL;
-  if (! (_bfd_generic_link_add_one_symbol
-	 (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-	  (bfd_vma) 0, (const char *) NULL, false,
-	  get_elf_backend_data (abfd)->collect,
-	  (struct bfd_link_hash_entry **) &h)))
-    return false;
-  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-  h->type = STT_OBJECT;
-
-  if (info->shared
-      && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
-
-  s = bfd_make_section (abfd, ".rela.plt");
-  if (s == NULL
-      || !bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD
-					   | SEC_HAS_CONTENTS
-					   | SEC_IN_MEMORY
-					   | SEC_LINKER_CREATED
-					   | SEC_READONLY))
-      || ! bfd_set_section_alignment (abfd, s, 3))
-    return false;
-
-  /* We may or may not have created a .got section for this object, but
-     we definitely havn't done the rest of the work.  */
-
-  if (!elf64_alpha_create_got_section (abfd, info))
-    return false;
-
-  s = bfd_make_section(abfd, ".rela.got");
-  if (s == NULL
-      || !bfd_set_section_flags (abfd, s, (SEC_ALLOC | SEC_LOAD
-					   | SEC_HAS_CONTENTS
-					   | SEC_IN_MEMORY
-					   | SEC_LINKER_CREATED
-					   | SEC_READONLY))
-      || !bfd_set_section_alignment (abfd, s, 3))
-    return false;
-
-  /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the
-     dynobj's .got section.  We don't do this in the linker script
-     because we don't want to define the symbol if we are not creating
-     a global offset table.  */
-  h = NULL;
-  if (!(_bfd_generic_link_add_one_symbol
-	(info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL,
-	 alpha_elf_tdata(abfd)->got, (bfd_vma) 0, (const char *) NULL,
-	 false, get_elf_backend_data (abfd)->collect,
-	 (struct bfd_link_hash_entry **) &h)))
-    return false;
-  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-  h->type = STT_OBJECT;
-
-  if (info->shared
-      && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
-
-  elf_hash_table (info)->hgot = h;
-
-  return true;
-}
-
-/* Read ECOFF debugging information from a .mdebug section into a
-   ecoff_debug_info structure.  */
-
-static boolean
-elf64_alpha_read_ecoff_info (abfd, section, debug)
-     bfd *abfd;
-     asection *section;
-     struct ecoff_debug_info *debug;
-{
-  HDRR *symhdr;
-  const struct ecoff_debug_swap *swap;
-  char *ext_hdr = NULL;
-
-  swap = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-  memset (debug, 0, sizeof(*debug));
-
-  ext_hdr = (char *) bfd_malloc ((size_t) swap->external_hdr_size);
-  if (ext_hdr == NULL && swap->external_hdr_size != 0)
-    goto error_return;
-
-  if (bfd_get_section_contents (abfd, section, ext_hdr, (file_ptr) 0,
-				swap->external_hdr_size)
-      == false)
-    goto error_return;
-
-  symhdr = &debug->symbolic_header;
-  (*swap->swap_hdr_in) (abfd, ext_hdr, symhdr);
-
-  /* The symbolic header contains absolute file offsets and sizes to
-     read.  */
-#define READ(ptr, offset, count, size, type)				\
-  if (symhdr->count == 0)						\
-    debug->ptr = NULL;							\
-  else									\
-    {									\
-      debug->ptr = (type) bfd_malloc ((size_t) (size * symhdr->count));	\
-      if (debug->ptr == NULL)						\
-	goto error_return;						\
-      if (bfd_seek (abfd, (file_ptr) symhdr->offset, SEEK_SET) != 0	\
-	  || (bfd_read (debug->ptr, size, symhdr->count,		\
-			abfd) != size * symhdr->count))			\
-	goto error_return;						\
-    }
-
-  READ (line, cbLineOffset, cbLine, sizeof (unsigned char), unsigned char *);
-  READ (external_dnr, cbDnOffset, idnMax, swap->external_dnr_size, PTR);
-  READ (external_pdr, cbPdOffset, ipdMax, swap->external_pdr_size, PTR);
-  READ (external_sym, cbSymOffset, isymMax, swap->external_sym_size, PTR);
-  READ (external_opt, cbOptOffset, ioptMax, swap->external_opt_size, PTR);
-  READ (external_aux, cbAuxOffset, iauxMax, sizeof (union aux_ext),
-	union aux_ext *);
-  READ (ss, cbSsOffset, issMax, sizeof (char), char *);
-  READ (ssext, cbSsExtOffset, issExtMax, sizeof (char), char *);
-  READ (external_fdr, cbFdOffset, ifdMax, swap->external_fdr_size, PTR);
-  READ (external_rfd, cbRfdOffset, crfd, swap->external_rfd_size, PTR);
-  READ (external_ext, cbExtOffset, iextMax, swap->external_ext_size, PTR);
-#undef READ
-
-  debug->fdr = NULL;
-  debug->adjust = NULL;
-
-  return true;
-
- error_return:
-  if (ext_hdr != NULL)
-    free (ext_hdr);
-  if (debug->line != NULL)
-    free (debug->line);
-  if (debug->external_dnr != NULL)
-    free (debug->external_dnr);
-  if (debug->external_pdr != NULL)
-    free (debug->external_pdr);
-  if (debug->external_sym != NULL)
-    free (debug->external_sym);
-  if (debug->external_opt != NULL)
-    free (debug->external_opt);
-  if (debug->external_aux != NULL)
-    free (debug->external_aux);
-  if (debug->ss != NULL)
-    free (debug->ss);
-  if (debug->ssext != NULL)
-    free (debug->ssext);
-  if (debug->external_fdr != NULL)
-    free (debug->external_fdr);
-  if (debug->external_rfd != NULL)
-    free (debug->external_rfd);
-  if (debug->external_ext != NULL)
-    free (debug->external_ext);
-  return false;
-}
-
-/* Alpha ELF local labels start with '$'.  */
-
-static boolean
-elf64_alpha_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return name[0] == '$';
-}
-
-/* Alpha ELF follows MIPS ELF in using a special find_nearest_line
-   routine in order to handle the ECOFF debugging information.  We
-   still call this mips_elf_find_line because of the slot
-   find_line_info in elf_obj_tdata is declared that way.  */
-
-struct mips_elf_find_line
-{
-  struct ecoff_debug_info d;
-  struct ecoff_find_line i;
-};
-
-static boolean
-elf64_alpha_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
-			       functionname_ptr, line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  asection *msec;
-
-  msec = bfd_get_section_by_name (abfd, ".mdebug");
-  if (msec != NULL)
-    {
-      flagword origflags;
-      struct mips_elf_find_line *fi;
-      const struct ecoff_debug_swap * const swap =
-	get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-
-      /* If we are called during a link, alpha_elf_final_link may have
-	 cleared the SEC_HAS_CONTENTS field.  We force it back on here
-	 if appropriate (which it normally will be).  */
-      origflags = msec->flags;
-      if (elf_section_data (msec)->this_hdr.sh_type != SHT_NOBITS)
-	msec->flags |= SEC_HAS_CONTENTS;
-
-      fi = elf_tdata (abfd)->find_line_info;
-      if (fi == NULL)
-	{
-	  bfd_size_type external_fdr_size;
-	  char *fraw_src;
-	  char *fraw_end;
-	  struct fdr *fdr_ptr;
-
-	  fi = ((struct mips_elf_find_line *)
-		bfd_zalloc (abfd, sizeof (struct mips_elf_find_line)));
-	  if (fi == NULL)
-	    {
-	      msec->flags = origflags;
-	      return false;
-	    }
-
-	  if (!elf64_alpha_read_ecoff_info (abfd, msec, &fi->d))
-	    {
-	      msec->flags = origflags;
-	      return false;
-	    }
-
-	  /* Swap in the FDR information.  */
-	  fi->d.fdr = ((struct fdr *)
-		       bfd_alloc (abfd,
-				  (fi->d.symbolic_header.ifdMax *
-				   sizeof (struct fdr))));
-	  if (fi->d.fdr == NULL)
-	    {
-	      msec->flags = origflags;
-	      return false;
-	    }
-	  external_fdr_size = swap->external_fdr_size;
-	  fdr_ptr = fi->d.fdr;
-	  fraw_src = (char *) fi->d.external_fdr;
-	  fraw_end = (fraw_src
-		      + fi->d.symbolic_header.ifdMax * external_fdr_size);
-	  for (; fraw_src < fraw_end; fraw_src += external_fdr_size, fdr_ptr++)
-	    (*swap->swap_fdr_in) (abfd, (PTR) fraw_src, fdr_ptr);
-
-	  elf_tdata (abfd)->find_line_info = fi;
-
-	  /* Note that we don't bother to ever free this information.
-             find_nearest_line is either called all the time, as in
-             objdump -l, so the information should be saved, or it is
-             rarely called, as in ld error messages, so the memory
-             wasted is unimportant.  Still, it would probably be a
-             good idea for free_cached_info to throw it away.  */
-	}
-
-      if (_bfd_ecoff_locate_line (abfd, section, offset, &fi->d, swap,
-				  &fi->i, filename_ptr, functionname_ptr,
-				  line_ptr))
-	{
-	  msec->flags = origflags;
-	  return true;
-	}
-
-      msec->flags = origflags;
-    }
-
-  /* Fall back on the generic ELF find_nearest_line routine.  */
-
-  return _bfd_elf_find_nearest_line (abfd, section, symbols, offset,
-				     filename_ptr, functionname_ptr,
-				     line_ptr);
-}
-
-/* Structure used to pass information to alpha_elf_output_extsym.  */
-
-struct extsym_info
-{
-  bfd *abfd;
-  struct bfd_link_info *info;
-  struct ecoff_debug_info *debug;
-  const struct ecoff_debug_swap *swap;
-  boolean failed;
-};
-
-static boolean
-elf64_alpha_output_extsym (h, data)
-     struct alpha_elf_link_hash_entry *h;
-     PTR data;
-{
-  struct extsym_info *einfo = (struct extsym_info *) data;
-  boolean strip;
-  asection *sec, *output_section;
-
-  if (h->root.indx == -2)
-    strip = false;
-  else if (((h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-           || (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
-          && (h->root.elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-          && (h->root.elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    strip = true;
-  else if (einfo->info->strip == strip_all
-          || (einfo->info->strip == strip_some
-              && bfd_hash_lookup (einfo->info->keep_hash,
-                                  h->root.root.root.string,
-                                  false, false) == NULL))
-    strip = true;
-  else
-    strip = false;
-
-  if (strip)
-    return true;
-
-  if (h->esym.ifd == -2)
-    {
-      h->esym.jmptbl = 0;
-      h->esym.cobol_main = 0;
-      h->esym.weakext = 0;
-      h->esym.reserved = 0;
-      h->esym.ifd = ifdNil;
-      h->esym.asym.value = 0;
-      h->esym.asym.st = stGlobal;
-
-      if (h->root.root.type != bfd_link_hash_defined
-         && h->root.root.type != bfd_link_hash_defweak)
-       h->esym.asym.sc = scAbs;
-      else
-       {
-         const char *name;
-
-         sec = h->root.root.u.def.section;
-         output_section = sec->output_section;
-
-         /* When making a shared library and symbol h is the one from
-            the another shared library, OUTPUT_SECTION may be null.  */
-         if (output_section == NULL)
-           h->esym.asym.sc = scUndefined;
-         else
-           {
-             name = bfd_section_name (output_section->owner, output_section);
-
-             if (strcmp (name, ".text") == 0)
-               h->esym.asym.sc = scText;
-             else if (strcmp (name, ".data") == 0)
-               h->esym.asym.sc = scData;
-             else if (strcmp (name, ".sdata") == 0)
-               h->esym.asym.sc = scSData;
-             else if (strcmp (name, ".rodata") == 0
-                      || strcmp (name, ".rdata") == 0)
-               h->esym.asym.sc = scRData;
-             else if (strcmp (name, ".bss") == 0)
-               h->esym.asym.sc = scBss;
-             else if (strcmp (name, ".sbss") == 0)
-               h->esym.asym.sc = scSBss;
-             else if (strcmp (name, ".init") == 0)
-               h->esym.asym.sc = scInit;
-             else if (strcmp (name, ".fini") == 0)
-               h->esym.asym.sc = scFini;
-             else
-               h->esym.asym.sc = scAbs;
-           }
-       }
-
-      h->esym.asym.reserved = 0;
-      h->esym.asym.index = indexNil;
-    }
-
-  if (h->root.root.type == bfd_link_hash_common)
-    h->esym.asym.value = h->root.root.u.c.size;
-  else if (h->root.root.type == bfd_link_hash_defined
-	   || h->root.root.type == bfd_link_hash_defweak)
-    {
-      if (h->esym.asym.sc == scCommon)
-       h->esym.asym.sc = scBss;
-      else if (h->esym.asym.sc == scSCommon)
-       h->esym.asym.sc = scSBss;
-
-      sec = h->root.root.u.def.section;
-      output_section = sec->output_section;
-      if (output_section != NULL)
-       h->esym.asym.value = (h->root.root.u.def.value
-                             + sec->output_offset
-                             + output_section->vma);
-      else
-       h->esym.asym.value = 0;
-    }
-  else if ((h->root.elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0)
-    {
-      /* Set type and value for a symbol with a function stub.  */
-      h->esym.asym.st = stProc;
-      sec = bfd_get_section_by_name (einfo->abfd, ".plt");
-      if (sec == NULL)
-	h->esym.asym.value = 0;
-      else
-	{
-	  output_section = sec->output_section;
-	  if (output_section != NULL)
-	    h->esym.asym.value = (h->root.plt.offset
-				  + sec->output_offset
-				  + output_section->vma);
-	  else
-	    h->esym.asym.value = 0;
-	}
-#if 0 /* FIXME?  */
-      h->esym.ifd = 0;
-#endif
-    }
-
-  if (! bfd_ecoff_debug_one_external (einfo->abfd, einfo->debug, einfo->swap,
-                                     h->root.root.root.string,
-                                     &h->esym))
-    {
-      einfo->failed = true;
-      return false;
-    }
-
-  return true;
-}
-
-/* FIXME:  Create a runtime procedure table from the .mdebug section.
-
-static boolean
-mips_elf_create_procedure_table (handle, abfd, info, s, debug)
-     PTR handle;
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *s;
-     struct ecoff_debug_info *debug;
-*/
-
-/* Handle dynamic relocations when doing an Alpha ELF link.  */
-
-static boolean
-elf64_alpha_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  bfd *dynobj;
-  asection *sreloc;
-  const char *rel_sec_name;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct alpha_elf_link_hash_entry **sym_hashes;
-  struct alpha_elf_got_entry **local_got_entries;
-  const Elf_Internal_Rela *rel, *relend;
-  int got_created;
-
-  if (info->relocateable)
-    return true;
-
-  dynobj = elf_hash_table(info)->dynobj;
-  if (dynobj == NULL)
-    elf_hash_table(info)->dynobj = dynobj = abfd;
-
-  sreloc = NULL;
-  rel_sec_name = NULL;
-  symtab_hdr = &elf_tdata(abfd)->symtab_hdr;
-  sym_hashes = alpha_elf_sym_hashes(abfd);
-  local_got_entries = alpha_elf_tdata(abfd)->local_got_entries;
-  got_created = 0;
-
-  relend = relocs + sec->reloc_count;
-  for (rel = relocs; rel < relend; ++rel)
-    {
-      unsigned long r_symndx, r_type;
-      struct alpha_elf_link_hash_entry *h;
-
-      r_symndx = ELF64_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-	  while (h->root.root.type == bfd_link_hash_indirect
-		 || h->root.root.type == bfd_link_hash_warning)
-	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
-
-	  h->root.elf_link_hash_flags |= ELF_LINK_HASH_REF_REGULAR;
-	}
-      r_type = ELF64_R_TYPE (rel->r_info);
-
-      switch (r_type)
-	{
-	case R_ALPHA_LITERAL:
-	  {
-	    struct alpha_elf_got_entry *gotent;
-	    int flags = 0;
-
-	    if (h)
-	      {
-		/* Search for and possibly create a got entry.  */
-		for (gotent = h->got_entries; gotent ; gotent = gotent->next)
-		  if (gotent->gotobj == abfd &&
-		      gotent->addend == rel->r_addend)
-		    break;
-
-		if (!gotent)
-		  {
-		    gotent = ((struct alpha_elf_got_entry *)
-			      bfd_alloc (abfd,
-					 sizeof (struct alpha_elf_got_entry)));
-		    if (!gotent)
-		      return false;
-
-		    gotent->gotobj = abfd;
-		    gotent->addend = rel->r_addend;
-		    gotent->got_offset = -1;
-		    gotent->flags = 0;
-		    gotent->use_count = 1;
-
-		    gotent->next = h->got_entries;
-		    h->got_entries = gotent;
-
-		    alpha_elf_tdata (abfd)->total_got_entries++;
-		  }
-		else
-		  gotent->use_count += 1;
-	      }
-	    else
-	      {
-		/* This is a local .got entry -- record for merge.  */
-		if (!local_got_entries)
-		  {
-		    size_t size;
-		    size = (symtab_hdr->sh_info
-			    * sizeof (struct alpha_elf_got_entry *));
-
-		    local_got_entries = ((struct alpha_elf_got_entry **)
-					 bfd_alloc (abfd, size));
-		    if (!local_got_entries)
-		      return false;
-
-		    memset (local_got_entries, 0, size);
-		    alpha_elf_tdata (abfd)->local_got_entries =
-		      local_got_entries;
-		  }
-
-		for (gotent = local_got_entries[ELF64_R_SYM(rel->r_info)];
-		     gotent != NULL && gotent->addend != rel->r_addend;
-		     gotent = gotent->next)
-		  continue;
-		if (!gotent)
-		  {
-		    gotent = ((struct alpha_elf_got_entry *)
-			      bfd_alloc (abfd,
-					 sizeof (struct alpha_elf_got_entry)));
-		    if (!gotent)
-		      return false;
-
-		    gotent->gotobj = abfd;
-		    gotent->addend = rel->r_addend;
-		    gotent->got_offset = -1;
-		    gotent->flags = 0;
-		    gotent->use_count = 1;
-
-		    gotent->next = local_got_entries[ELF64_R_SYM(rel->r_info)];
-		    local_got_entries[ELF64_R_SYM(rel->r_info)] = gotent;
-
-		    alpha_elf_tdata(abfd)->total_got_entries++;
-		    alpha_elf_tdata(abfd)->n_local_got_entries++;
-		  }
-		else
-		  gotent->use_count += 1;
-	      }
-
-	    /* Remember how this literal is used from its LITUSEs.
-	       This will be important when it comes to decide if we can
-	       create a .plt entry for a function symbol.  */
-	    if (rel+1 < relend
-		&& ELF64_R_TYPE (rel[1].r_info) == R_ALPHA_LITUSE)
-	      {
-		do
-		  {
-		    ++rel;
-		    if (rel->r_addend >= 1 && rel->r_addend <= 3)
-		      flags |= 1 << rel->r_addend;
-		  }
-		while (rel+1 < relend &&
-		       ELF64_R_TYPE (rel[1].r_info) == R_ALPHA_LITUSE);
-	      }
-	    else
-	      {
-		/* No LITUSEs -- presumably the address is not being
-		   loaded for nothing.  */
-		flags = ALPHA_ELF_LINK_HASH_LU_ADDR;
-	      }
-
-	    gotent->flags |= flags;
-	    if (h)
-	      {
-		/* Make a guess as to whether a .plt entry will be needed.  */
-		if ((h->flags |= flags) == ALPHA_ELF_LINK_HASH_LU_FUNC)
-		  h->root.elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-		else
-		  h->root.elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-	      }
-	  }
-	  /* FALLTHRU */
-
-	case R_ALPHA_GPDISP:
-	case R_ALPHA_GPREL32:
-	case R_ALPHA_GPRELHIGH:
-	case R_ALPHA_GPRELLOW:
-	  /* We don't actually use the .got here, but the sections must
-	     be created before the linker maps input sections to output
-	     sections.  */
-	  if (!got_created)
-	    {
-	      if (!elf64_alpha_create_got_section (abfd, info))
-		return false;
-
-	      /* Make sure the object's gotobj is set to itself so
-		 that we default to every object with its own .got.
-		 We'll merge .gots later once we've collected each
-		 object's info.  */
-	      alpha_elf_tdata(abfd)->gotobj = abfd;
-
-	      got_created = 1;
-	    }
-	  break;
-
-	case R_ALPHA_SREL16:
-	case R_ALPHA_SREL32:
-	case R_ALPHA_SREL64:
-	  if (h == NULL)
-	    break;
-	  /* FALLTHRU */
-
-	case R_ALPHA_REFLONG:
-	case R_ALPHA_REFQUAD:
-	  if (rel_sec_name == NULL)
-	    {
-	      rel_sec_name = (bfd_elf_string_from_elf_section
-			      (abfd, elf_elfheader(abfd)->e_shstrndx,
-			       elf_section_data(sec)->rel_hdr.sh_name));
-	      if (rel_sec_name == NULL)
-		return false;
-
-	      BFD_ASSERT (strncmp (rel_sec_name, ".rela", 5) == 0
-			  && strcmp (bfd_get_section_name (abfd, sec),
-				     rel_sec_name+5) == 0);
-	    }
-
-	  /* We need to create the section here now whether we eventually
-	     use it or not so that it gets mapped to an output section by
-	     the linker.  If not used, we'll kill it in
-	     size_dynamic_sections.  */
-	  if (sreloc == NULL)
-	    {
-	      sreloc = bfd_get_section_by_name (dynobj, rel_sec_name);
-	      if (sreloc == NULL)
-		{
-		  sreloc = bfd_make_section (dynobj, rel_sec_name);
-		  if (sreloc == NULL
-		      || !bfd_set_section_flags (dynobj, sreloc,
-						 (SEC_ALLOC|SEC_LOAD
-						  | SEC_HAS_CONTENTS
-						  | SEC_IN_MEMORY
-						  | SEC_LINKER_CREATED
-						  | SEC_READONLY))
-		      || !bfd_set_section_alignment (dynobj, sreloc, 3))
-		    return false;
-		}
-	    }
-
-	  if (h)
-	    {
-	      /* Since we havn't seen all of the input symbols yet, we
-		 don't know whether we'll actually need a dynamic relocation
-		 entry for this reloc.  So make a record of it.  Once we
-		 find out if this thing needs dynamic relocation we'll
-		 expand the relocation sections by the appropriate amount. */
-
-	      struct alpha_elf_reloc_entry *rent;
-
-	      for (rent = h->reloc_entries; rent; rent = rent->next)
-		if (rent->rtype == r_type && rent->srel == sreloc)
-		  break;
-
-	      if (!rent)
-		{
-		  rent = ((struct alpha_elf_reloc_entry *)
-			  bfd_alloc (abfd,
-				     sizeof (struct alpha_elf_reloc_entry)));
-		  if (!rent)
-		    return false;
-
-		  rent->srel = sreloc;
-		  rent->rtype = r_type;
-		  rent->count = 1;
-
-		  rent->next = h->reloc_entries;
-		  h->reloc_entries = rent;
-		}
-	      else
-		rent->count++;
-	    }
-	  else if (info->shared)
-	    {
-	      /* If this is a shared library, we need a RELATIVE reloc.  */
-	      sreloc->_raw_size += sizeof (Elf64_External_Rela);
-	    }
-	  break;
-	}
-    }
-
-  return true;
-}
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-elf64_alpha_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  bfd *dynobj;
-  asection *s;
-  struct alpha_elf_link_hash_entry *ah;
-
-  dynobj = elf_hash_table(info)->dynobj;
-  ah = (struct alpha_elf_link_hash_entry *)h;
-
-  /* Now that we've seen all of the input symbols, finalize our decision
-     about whether this symbol should get a .plt entry.  */
-
-  if (h->root.type != bfd_link_hash_undefweak
-      && alpha_elf_dynamic_symbol_p (h, info)
-      && ((h->type == STT_FUNC
-	   && !(ah->flags & ALPHA_ELF_LINK_HASH_LU_ADDR))
-	  || (h->type == STT_NOTYPE
-	      && ah->flags == ALPHA_ELF_LINK_HASH_LU_FUNC))
-      /* Don't prevent otherwise valid programs from linking by attempting
-	 to create a new .got entry somewhere.  A Correct Solution would be
-	 to add a new .got section to a new object file and let it be merged
-	 somewhere later.  But for now don't bother.  */
-      && ah->got_entries)
-    {
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-
-      s = bfd_get_section_by_name(dynobj, ".plt");
-      if (!s && !elf64_alpha_create_dynamic_sections (dynobj, info))
-	return false;
-
-      /* The first bit of the .plt is reserved.  */
-      if (s->_raw_size == 0)
-	s->_raw_size = PLT_HEADER_SIZE;
-
-      h->plt.offset = s->_raw_size;
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* If this symbol is not defined in a regular file, and we are not
-	 generating a shared library, then set the symbol to the location
-	 in the .plt.  This is required to make function pointers compare
-	 equal between the normal executable and the shared library.  */
-      if (! info->shared
-	  && h->root.type != bfd_link_hash_defweak)
-	{
-	  h->root.u.def.section = s;
-	  h->root.u.def.value = h->plt.offset;
-	}
-
-      /* We also need a JMP_SLOT entry in the .rela.plt section.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size += sizeof (Elf64_External_Rela);
-
-      return true;
-    }
-  else
-    h->elf_link_hash_flags &= ~ELF_LINK_HASH_NEEDS_PLT;
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  The Alpha, since it uses .got entries for all
-     symbols even in regular objects, does not need the hackery of a
-     .dynbss section and COPY dynamic relocations.  */
-
-  return true;
-}
-
-/* Symbol versioning can create new symbols, and make our old symbols
-   indirect to the new ones.  Consolidate the got and reloc information
-   in these situations.  */
-
-static boolean
-elf64_alpha_merge_ind_symbols (hi, dummy)
-     struct alpha_elf_link_hash_entry *hi;
-     PTR dummy;
-{
-  struct alpha_elf_link_hash_entry *hs;
-
-  if (hi->root.root.type != bfd_link_hash_indirect)
-    return true;
-  hs = hi;
-  do {
-    hs = (struct alpha_elf_link_hash_entry *)hs->root.root.u.i.link;
-  } while (hs->root.root.type == bfd_link_hash_indirect);
-
-  /* Merge the flags.  Whee.  */
-
-  hs->flags |= hi->flags;
-
-  /* Merge the .got entries.  Cannibalize the old symbol's list in
-     doing so, since we don't need it anymore.  */
-
-  if (hs->got_entries == NULL)
-    hs->got_entries = hi->got_entries;
-  else
-    {
-      struct alpha_elf_got_entry *gi, *gs, *gin, *gsh;
-
-      gsh = hs->got_entries;
-      for (gi = hi->got_entries; gi ; gi = gin)
-	{
-	  gin = gi->next;
-	  for (gs = gsh; gs ; gs = gs->next)
-	    if (gi->gotobj == gs->gotobj && gi->addend == gs->addend)
-	      goto got_found;
-	  gi->next = hs->got_entries;
-	  hs->got_entries = gi;
-	got_found:;
-	}
-    }
-  hi->got_entries = NULL;
-
-  /* And similar for the reloc entries.  */
-
-  if (hs->reloc_entries == NULL)
-    hs->reloc_entries = hi->reloc_entries;
-  else
-    {
-      struct alpha_elf_reloc_entry *ri, *rs, *rin, *rsh;
-
-      rsh = hs->reloc_entries;
-      for (ri = hi->reloc_entries; ri ; ri = rin)
-	{
-	  rin = ri->next;
-	  for (rs = rsh; rs ; rs = rs->next)
-	    if (ri->rtype == rs->rtype)
-	      {
-		rs->count += ri->count;
-		goto found_reloc;
-	      }
-	  ri->next = hs->reloc_entries;
-	  hs->reloc_entries = ri;
-	found_reloc:;
-	}
-    }
-  hi->reloc_entries = NULL;
-
-  return true;
-}
-
-/* Is it possible to merge two object file's .got tables?  */
-
-static boolean
-elf64_alpha_can_merge_gots (a, b)
-     bfd *a, *b;
-{
-  int total = alpha_elf_tdata (a)->total_got_entries;
-  bfd *bsub;
-
-  /* Trivial quick fallout test.  */
-  if (total + alpha_elf_tdata (b)->total_got_entries <= MAX_GOT_ENTRIES)
-    return true;
-
-  /* By their nature, local .got entries cannot be merged.  */
-  if ((total += alpha_elf_tdata (b)->n_local_got_entries) > MAX_GOT_ENTRIES)
-    return false;
-
-  /* Failing the common trivial comparison, we must effectively
-     perform the merge.  Not actually performing the merge means that
-     we don't have to store undo information in case we fail.  */
-  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
-    {
-      struct alpha_elf_link_hash_entry **hashes = alpha_elf_sym_hashes (bsub);
-      Elf_Internal_Shdr *symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
-      int i, n;
-
-      n = symtab_hdr->sh_size / symtab_hdr->sh_entsize - symtab_hdr->sh_info;
-      for (i = 0; i < n; ++i)
-	{
-	  struct alpha_elf_got_entry *ae, *be;
-	  struct alpha_elf_link_hash_entry *h;
-
-	  h = hashes[i];
-	  while (h->root.root.type == bfd_link_hash_indirect
-	         || h->root.root.type == bfd_link_hash_warning)
-	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
-
-	  for (be = h->got_entries; be ; be = be->next)
-	    {
-	      if (be->use_count == 0)
-	        continue;
-	      if (be->gotobj != b)
-	        continue;
-
-	      for (ae = h->got_entries; ae ; ae = ae->next)
-	        if (ae->gotobj == a && ae->addend == be->addend)
-		  goto global_found;
-
-	      if (++total > MAX_GOT_ENTRIES)
-	        return false;
-	    global_found:;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Actually merge two .got tables.  */
-
-static void
-elf64_alpha_merge_gots (a, b)
-     bfd *a, *b;
-{
-  int total = alpha_elf_tdata (a)->total_got_entries;
-  bfd *bsub;
-
-  /* Remember local expansion.  */
-  {
-    int e = alpha_elf_tdata (b)->n_local_got_entries;
-    total += e;
-    alpha_elf_tdata (a)->n_local_got_entries += e;
-  }
-
-  for (bsub = b; bsub ; bsub = alpha_elf_tdata (bsub)->in_got_link_next)
-    {
-      struct alpha_elf_got_entry **local_got_entries;
-      struct alpha_elf_link_hash_entry **hashes;
-      Elf_Internal_Shdr *symtab_hdr;
-      int i, n;
-
-      /* Let the local .got entries know they are part of a new subsegment.  */
-      local_got_entries = alpha_elf_tdata (bsub)->local_got_entries;
-      if (local_got_entries)
-        {
-	  n = elf_tdata (bsub)->symtab_hdr.sh_info;
-	  for (i = 0; i < n; ++i)
-	    {
-	      struct alpha_elf_got_entry *ent;
-	      for (ent = local_got_entries[i]; ent; ent = ent->next)
-	        ent->gotobj = a;
-	    }
-        }
-
-      /* Merge the global .got entries.  */
-      hashes = alpha_elf_sym_hashes (bsub);
-      symtab_hdr = &elf_tdata (bsub)->symtab_hdr;
-
-      n = symtab_hdr->sh_size / symtab_hdr->sh_entsize - symtab_hdr->sh_info;
-      for (i = 0; i < n; ++i)
-        {
-	  struct alpha_elf_got_entry *ae, *be, **pbe, **start;
-	  struct alpha_elf_link_hash_entry *h;
-
-	  h = hashes[i];
-	  while (h->root.root.type == bfd_link_hash_indirect
-	         || h->root.root.type == bfd_link_hash_warning)
-	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
-
-	  start = &h->got_entries;
-	  for (pbe = start, be = *start; be ; pbe = &be->next, be = be->next)
-	    {
-	      if (be->use_count == 0)
-	        {
-		  *pbe = be->next;
-		  continue;
-	        }
-	      if (be->gotobj != b)
-	        continue;
-
-	      for (ae = *start; ae ; ae = ae->next)
-	        if (ae->gotobj == a && ae->addend == be->addend)
-		  {
-		    ae->flags |= be->flags;
-		    ae->use_count += be->use_count;
-		    *pbe = be->next;
-		    goto global_found;
-		  }
-	      be->gotobj = a;
-	      total += 1;
-
-	    global_found:;
-	    }
-        }
-
-      alpha_elf_tdata (bsub)->gotobj = a;
-    }
-  alpha_elf_tdata (a)->total_got_entries = total;
-
-  /* Merge the two in_got chains.  */
-  {
-    bfd *next;
-
-    bsub = a;
-    while ((next = alpha_elf_tdata (bsub)->in_got_link_next) != NULL)
-      bsub = next;
-
-    alpha_elf_tdata (bsub)->in_got_link_next = b;
-  }
-}
-
-/* Calculate the offsets for the got entries.  */
-
-static boolean
-elf64_alpha_calc_got_offsets_for_symbol (h, arg)
-     struct alpha_elf_link_hash_entry *h;
-     PTR arg;
-{
-  struct alpha_elf_got_entry *gotent;
-
-  for (gotent = h->got_entries; gotent; gotent = gotent->next)
-    if (gotent->use_count > 0)
-      {
-	bfd_size_type *plge
-	  = &alpha_elf_tdata (gotent->gotobj)->got->_raw_size;
-
-	gotent->got_offset = *plge;
-	*plge += 8;
-      }
-
-  return true;
-}
-
-static void
-elf64_alpha_calc_got_offsets (info)
-     struct bfd_link_info *info;
-{
-  bfd *i, *got_list = alpha_elf_hash_table(info)->got_list;
-
-  /* First, zero out the .got sizes, as we may be recalculating the
-     .got after optimizing it.  */
-  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
-    alpha_elf_tdata(i)->got->_raw_size = 0;
-
-  /* Next, fill in the offsets for all the global entries.  */
-  alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
-				elf64_alpha_calc_got_offsets_for_symbol,
-				NULL);
-
-  /* Finally, fill in the offsets for the local entries.  */
-  for (i = got_list; i ; i = alpha_elf_tdata(i)->got_link_next)
-    {
-      bfd_size_type got_offset = alpha_elf_tdata(i)->got->_raw_size;
-      bfd *j;
-
-      for (j = i; j ; j = alpha_elf_tdata(j)->in_got_link_next)
-	{
-	  struct alpha_elf_got_entry **local_got_entries, *gotent;
-	  int k, n;
-
-	  local_got_entries = alpha_elf_tdata(j)->local_got_entries;
-	  if (!local_got_entries)
-	    continue;
-
-	  for (k = 0, n = elf_tdata(j)->symtab_hdr.sh_info; k < n; ++k)
-	    for (gotent = local_got_entries[k]; gotent; gotent = gotent->next)
-	      if (gotent->use_count > 0)
-	        {
-		  gotent->got_offset = got_offset;
-		  got_offset += 8;
-	        }
-	}
-
-      alpha_elf_tdata(i)->got->_raw_size = got_offset;
-      alpha_elf_tdata(i)->got->_cooked_size = got_offset;
-    }
-}
-
-/* Constructs the gots.  */
-
-static boolean
-elf64_alpha_size_got_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *i, *got_list, *cur_got_obj;
-  int something_changed = 0;
-
-  got_list = alpha_elf_hash_table (info)->got_list;
-
-  /* On the first time through, pretend we have an existing got list
-     consisting of all of the input files.  */
-  if (got_list == NULL)
-    {
-      for (i = info->input_bfds; i ; i = i->link_next)
-	{
-	  bfd *this_got = alpha_elf_tdata (i)->gotobj;
-	  if (this_got == NULL)
-	    continue;
-
-	  /* We are assuming no merging has yet ocurred.  */
-	  BFD_ASSERT (this_got == i);
-
-          if (alpha_elf_tdata (this_got)->total_got_entries > MAX_GOT_ENTRIES)
-	    {
-	      /* Yikes! A single object file has too many entries.  */
-	      (*_bfd_error_handler)
-	        (_("%s: .got subsegment exceeds 64K (size %d)"),
-	         bfd_get_filename (i),
-	         alpha_elf_tdata (this_got)->total_got_entries * 8);
-	      return false;
-	    }
-
-	  if (got_list == NULL)
-	    got_list = this_got;
-	  else
-	    alpha_elf_tdata(cur_got_obj)->got_link_next = this_got;
-	  cur_got_obj = this_got;
-	}
-
-      /* Strange degenerate case of no got references.  */
-      if (got_list == NULL)
-	return true;
-
-      alpha_elf_hash_table (info)->got_list = got_list;
-
-      /* Force got offsets to be recalculated.  */
-      something_changed = 1;
-    }
-
-  cur_got_obj = got_list;
-  i = alpha_elf_tdata(cur_got_obj)->got_link_next;
-  while (i != NULL)
-    {
-      if (elf64_alpha_can_merge_gots (cur_got_obj, i))
-	{
-	  elf64_alpha_merge_gots (cur_got_obj, i);
-	  i = alpha_elf_tdata(i)->got_link_next;
-	  alpha_elf_tdata(cur_got_obj)->got_link_next = i;
-	  something_changed = 1;
-	}
-      else
-	{
-	  cur_got_obj = i;
-	  i = alpha_elf_tdata(i)->got_link_next;
-	}
-    }
-
-  /* Once the gots have been merged, fill in the got offsets for
-     everything therein.  */
-  if (1 || something_changed)
-    elf64_alpha_calc_got_offsets (info);
-
-  return true;
-}
-
-static boolean
-elf64_alpha_always_size_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *i;
-
-  if (info->relocateable)
-    return true;
-
-  /* First, take care of the indirect symbols created by versioning.  */
-  alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
-				elf64_alpha_merge_ind_symbols,
-				NULL);
-
-  if (!elf64_alpha_size_got_sections (output_bfd, info))
-    return false;
-
-  /* Allocate space for all of the .got subsections.  */
-  i = alpha_elf_hash_table (info)->got_list;
-  for ( ; i ; i = alpha_elf_tdata(i)->got_link_next)
-    {
-      asection *s = alpha_elf_tdata(i)->got;
-      if (s->_raw_size > 0)
-	{
-	  s->contents = (bfd_byte *) bfd_zalloc (i, s->_raw_size);
-	  if (s->contents == NULL)
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* Work out the sizes of the dynamic relocation entries.  */
-
-static boolean
-elf64_alpha_calc_dynrel_sizes (h, info)
-     struct alpha_elf_link_hash_entry *h;
-     struct bfd_link_info *info;
-{
-  /* If the symbol was defined as a common symbol in a regular object
-     file, and there was no definition in any dynamic object, then the
-     linker will have allocated space for the symbol in a common
-     section but the ELF_LINK_HASH_DEF_REGULAR flag will not have been
-     set.  This is done for dynamic symbols in
-     elf_adjust_dynamic_symbol but this is not done for non-dynamic
-     symbols, somehow.  */
-  if (((h->root.elf_link_hash_flags
-       & (ELF_LINK_HASH_DEF_REGULAR
-	  | ELF_LINK_HASH_REF_REGULAR
-	  | ELF_LINK_HASH_DEF_DYNAMIC))
-       == ELF_LINK_HASH_REF_REGULAR)
-      && (h->root.root.type == bfd_link_hash_defined
-	  || h->root.root.type == bfd_link_hash_defweak)
-      && !(h->root.root.u.def.section->owner->flags & DYNAMIC))
-    {
-      h->root.elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-    }
-
-  /* If the symbol is dynamic, we'll need all the relocations in their
-     natural form.  If this is a shared object, and it has been forced
-     local, we'll need the same number of RELATIVE relocations.  */
-
-  if (alpha_elf_dynamic_symbol_p (&h->root, info) || info->shared)
-    {
-      struct alpha_elf_reloc_entry *relent;
-      bfd *dynobj;
-      struct alpha_elf_got_entry *gotent;
-      bfd_size_type count;
-      asection *srel;
-
-      for (relent = h->reloc_entries; relent; relent = relent->next)
-	if (relent->rtype == R_ALPHA_REFLONG
-	    || relent->rtype == R_ALPHA_REFQUAD)
-	  {
-	    relent->srel->_raw_size +=
-	      sizeof(Elf64_External_Rela) * relent->count;
-	  }
-
-      dynobj = elf_hash_table(info)->dynobj;
-      count = 0;
-
-      for (gotent = h->got_entries; gotent ; gotent = gotent->next)
-	count++;
-
-      /* If we are using a .plt entry, subtract one, as the first
-	 reference uses a .rela.plt entry instead.  */
-      if (h->root.plt.offset != MINUS_ONE)
-	count--;
-
-      if (count > 0)
-	{
-	  srel = bfd_get_section_by_name (dynobj, ".rela.got");
-	  BFD_ASSERT (srel != NULL);
-	  srel->_raw_size += sizeof (Elf64_External_Rela) * count;
-	}
-    }
-
-  return true;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-elf64_alpha_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *s;
-  boolean reltext;
-  boolean relplt;
-
-  dynobj = elf_hash_table(info)->dynobj;
-  BFD_ASSERT(dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (!info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-
-      /* Now that we've seen all of the input files, we can decide which
-	 symbols need dynamic relocation entries and which don't.  We've
-	 collected information in check_relocs that we can now apply to
-	 size the dynamic relocation sections.  */
-      alpha_elf_link_hash_traverse (alpha_elf_hash_table (info),
-				    elf64_alpha_calc_dynrel_sizes,
-				    info);
-
-      /* When building shared libraries, each local .got entry needs a
-	 RELATIVE reloc.  */
-      if (info->shared)
-	{
-	  bfd *i;
-	  asection *srel;
-	  bfd_size_type count;
-
-	  srel = bfd_get_section_by_name (dynobj, ".rela.got");
-	  BFD_ASSERT (srel != NULL);
-
-	  for (i = alpha_elf_hash_table(info)->got_list, count = 0;
-	       i != NULL;
-	       i = alpha_elf_tdata(i)->got_link_next)
-	    count += alpha_elf_tdata(i)->n_local_got_entries;
-
-	  srel->_raw_size += count * sizeof(Elf64_External_Rela);
-	}
-    }
-  /* else we're not dynamic and by definition we don't need such things.  */
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  reltext = false;
-  relplt = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      boolean strip;
-
-      if (!(s->flags & SEC_LINKER_CREATED))
-	continue;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      /* If we don't need this section, strip it from the output file.
-	 This is to handle .rela.bss and .rela.plt.  We must create it
-	 in create_dynamic_sections, because it must be created before
-	 the linker maps input sections to output sections.  The
-	 linker does that before adjust_dynamic_symbol is called, and
-	 it is that function which decides whether anything needs to
-	 go into these sections.  */
-
-      strip = false;
-
-      if (strncmp (name, ".rela", 5) == 0)
-	{
-	  strip = (s->_raw_size == 0);
-
-	  if (!strip)
-	    {
-	      const char *outname;
-	      asection *target;
-
-	      /* If this relocation section applies to a read only
-		 section, then we probably need a DT_TEXTREL entry.  */
-	      outname = bfd_get_section_name (output_bfd,
-					      s->output_section);
-	      target = bfd_get_section_by_name (output_bfd, outname + 5);
-	      if (target != NULL
-		  && (target->flags & SEC_READONLY) != 0
-		  && (target->flags & SEC_ALLOC) != 0)
-		reltext = true;
-
-	      if (strcmp(name, ".rela.plt") == 0)
-		relplt = true;
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
-	    }
-	}
-      else if (strcmp (name, ".plt") != 0)
-	{
-	  /* It's not one of our dynamic sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	_bfd_strip_section_from_output (s);
-      else
-	{
-	  /* Allocate memory for the section contents.  */
-	  s->contents = (bfd_byte *) bfd_zalloc(dynobj, s->_raw_size);
-	  if (s->contents == NULL && s->_raw_size != 0)
-	    return false;
-	}
-    }
-
-  /* If we are generating a shared library, we generate a section
-     symbol for each output section.  These are local symbols, which
-     means that they must come first in the dynamic symbol table.
-     That means we must increment the dynamic symbol index of every
-     other dynamic symbol.  */
-  if (info->shared)
-    {
-      long c[2], i;
-      asection *p;
-
-      c[0] = 0;
-      c[1] = bfd_count_sections (output_bfd);
-
-      elf_hash_table (info)->dynsymcount += c[1];
-      elf_link_hash_traverse (elf_hash_table(info),
-			      elf64_alpha_adjust_dynindx,
-			      (PTR) c);
-
-      for (i = 1, p = output_bfd->sections;
-	   p != NULL;
-	   p = p->next, i++)
-	{
-	  elf_section_data (p)->dynindx = i;
-	  /* These symbols will have no names, so we don't need to
-	     fiddle with dynstr_index.  */
-	}
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in elf64_alpha_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (!info->shared)
-	{
-	  if (!bfd_elf64_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
-	}
-
-      if (! bfd_elf64_add_dynamic_entry (info, DT_PLTGOT, 0))
-	return false;
-
-      if (relplt)
-	{
-	  if (! bfd_elf64_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-	      || ! bfd_elf64_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
-	      || ! bfd_elf64_add_dynamic_entry (info, DT_JMPREL, 0))
-	    return false;
-	}
-
-      if (! bfd_elf64_add_dynamic_entry (info, DT_RELA, 0)
-	  || ! bfd_elf64_add_dynamic_entry (info, DT_RELASZ, 0)
-	  || ! bfd_elf64_add_dynamic_entry (info, DT_RELAENT,
-					    sizeof(Elf64_External_Rela)))
-	return false;
-
-      if (reltext)
-	{
-	  if (! bfd_elf64_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* Increment the index of a dynamic symbol by a given amount.  Called
-   via elf_link_hash_traverse.  */
-
-static boolean
-elf64_alpha_adjust_dynindx (h, cparg)
-     struct elf_link_hash_entry *h;
-     PTR cparg;
-{
-  long *cp = (long *)cparg;
-
-  if (h->dynindx >= cp[0])
-    h->dynindx += cp[1];
-
-  return true;
-}
-
-/* Relocate an Alpha ELF section.  */
-
-static boolean
-elf64_alpha_relocate_section (output_bfd, info, input_bfd, input_section,
-			      contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Rela *rel;
-  Elf_Internal_Rela *relend;
-  asection *sec, *sgot, *srel, *srelgot;
-  bfd *dynobj, *gotobj;
-  bfd_vma gp;
-
-  srelgot = srel = NULL;
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  dynobj = elf_hash_table (info)->dynobj;
-  if (dynobj)
-    {
-      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-    }
-
-  /* Find the gp value for this input bfd.  */
-  sgot = NULL;
-  gp = 0;
-  gotobj = alpha_elf_tdata (input_bfd)->gotobj;
-  if (gotobj)
-    {
-      sgot = alpha_elf_tdata (gotobj)->got;
-      gp = _bfd_get_gp_value (gotobj);
-      if (gp == 0)
-	{
-	  gp = (sgot->output_section->vma
-		+ sgot->output_offset
-		+ 0x8000);
-	  _bfd_set_gp_value (gotobj, gp);
-	}
-    }
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      unsigned long r_symndx;
-      struct alpha_elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      bfd_vma relocation;
-      bfd_vma addend;
-      bfd_reloc_status_type r;
-
-      r_type = ELF64_R_TYPE(rel->r_info);
-      if (r_type < 0 || r_type >= (int) R_ALPHA_max)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      howto = elf64_alpha_howto_table + r_type;
-
-      r_symndx = ELF64_R_SYM(rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = alpha_elf_sym_hashes (input_bfd)[r_symndx - symtab_hdr->sh_info];
-
-	  while (h->root.root.type == bfd_link_hash_indirect
-		 || h->root.root.type == bfd_link_hash_warning)
-	    h = (struct alpha_elf_link_hash_entry *)h->root.root.u.i.link;
-
-	  if (h->root.root.type == bfd_link_hash_defined
-	      || h->root.root.type == bfd_link_hash_defweak)
-	    {
-	      sec = h->root.root.u.def.section;
-
-#if rth_notdef
-	      if ((r_type == R_ALPHA_LITERAL
-		   && elf_hash_table(info)->dynamic_sections_created
-		   && (!info->shared
-		       || !info->symbolic
-		       || !(h->root.elf_link_hash_flags
-			    & ELF_LINK_HASH_DEF_REGULAR)))
-		  || (info->shared
-		      && (!info->symbolic
-			  || !(h->root.elf_link_hash_flags
-			       & ELF_LINK_HASH_DEF_REGULAR))
-		      && (input_section->flags & SEC_ALLOC)
-		      && (r_type == R_ALPHA_REFLONG
-			  || r_type == R_ALPHA_REFQUAD
-			  || r_type == R_ALPHA_LITERAL)))
-		{
-		  /* In these cases, we don't need the relocation value.
-		     We check specially because in some obscure cases
-		     sec->output_section will be NULL.  */
-		  relocation = 0;
-		}
-#else
-	      /* FIXME: Are not these obscure cases simply bugs?  Let's
-		 get something working and come back to this.  */
-	      if (sec->output_section == NULL)
-		relocation = 0;
-#endif /* rth_notdef */
-	      else
-		{
-		  relocation = (h->root.root.u.def.value
-				+ sec->output_section->vma
-				+ sec->output_offset);
-		}
-	    }
-	  else if (h->root.root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else if (info->shared && !info->symbolic && !info->no_undefined)
-	    relocation = 0;
-	  else
-	    {
-	      if (!((*info->callbacks->undefined_symbol)
-		    (info, h->root.root.root.string, input_bfd,
-		     input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-      addend = rel->r_addend;
-
-      switch (r_type)
-	{
-	case R_ALPHA_GPDISP:
-	  {
-	    bfd_byte *p_ldah, *p_lda;
-
-	    BFD_ASSERT(gp != 0);
-
-	    relocation = (input_section->output_section->vma
-			  + input_section->output_offset
-			  + rel->r_offset);
-
-	    p_ldah = contents + rel->r_offset - input_section->vma;
-	    p_lda = p_ldah + rel->r_addend;
-
-	    r = elf64_alpha_do_reloc_gpdisp (input_bfd, gp - relocation,
-					     p_ldah, p_lda);
-	  }
-	  break;
-
-	case R_ALPHA_OP_PUSH:
-	case R_ALPHA_OP_STORE:
-	case R_ALPHA_OP_PSUB:
-	case R_ALPHA_OP_PRSHIFT:
-	  /* We hate these silly beasts.  */
-	  abort();
-
-	case R_ALPHA_LITERAL:
-	  {
-	    struct alpha_elf_got_entry *gotent;
-	    boolean dynamic_symbol;
-
-	    BFD_ASSERT(sgot != NULL);
-	    BFD_ASSERT(gp != 0);
-
-	    if (h != NULL)
-	      {
-		gotent = h->got_entries;
-		dynamic_symbol = alpha_elf_dynamic_symbol_p (&h->root, info);
-	      }
-	    else
-	      {
-		gotent = (alpha_elf_tdata(input_bfd)->
-			  local_got_entries[r_symndx]);
-		dynamic_symbol = false;
-	      }
-
-	    BFD_ASSERT(gotent != NULL);
-
-	    while (gotent->gotobj != gotobj || gotent->addend != addend)
-	      gotent = gotent->next;
-
-	    BFD_ASSERT(gotent->use_count >= 1);
-
-	    /* Initialize the .got entry's value.  */
-	    if (!(gotent->flags & ALPHA_ELF_GOT_ENTRY_RELOCS_DONE))
-	      {
-		bfd_put_64 (output_bfd, relocation+addend,
-			    sgot->contents + gotent->got_offset);
-
-		/* If the symbol has been forced local, output a
-		   RELATIVE reloc, otherwise it will be handled in
-		   finish_dynamic_symbol.  */
-		if (info->shared && !dynamic_symbol)
-		  {
-		    Elf_Internal_Rela outrel;
-
-		    BFD_ASSERT(srelgot != NULL);
-
-		    outrel.r_offset = (sgot->output_section->vma
-				       + sgot->output_offset
-				       + gotent->got_offset);
-		    outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-		    outrel.r_addend = 0;
-
-		    bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-					       ((Elf64_External_Rela *)
-					        srelgot->contents)
-					       + srelgot->reloc_count++);
-		    BFD_ASSERT (sizeof(Elf64_External_Rela)
-				* srelgot->reloc_count
-				<= srelgot->_cooked_size);
-		  }
-
-		gotent->flags |= ALPHA_ELF_GOT_ENTRY_RELOCS_DONE;
-	      }
-
-	    /* Figure the gprel relocation.  */
-	    addend = 0;
-	    relocation = (sgot->output_section->vma
-			  + sgot->output_offset
-			  + gotent->got_offset);
-	    relocation -= gp;
-	  }
-	  /* overflow handled by _bfd_final_link_relocate */
-	  goto default_reloc;
-
-	case R_ALPHA_GPREL32:
-	case R_ALPHA_GPRELLOW:
-	  BFD_ASSERT(gp != 0);
-	  relocation -= gp;
-	  goto default_reloc;
-
-	case R_ALPHA_GPRELHIGH:
-	  BFD_ASSERT(gp != 0);
-	  relocation -= gp;
-	  relocation += addend;
-	  addend = 0;
-	  relocation = (((bfd_signed_vma) relocation >> 16)
-			+ ((relocation >> 15) & 1));
-	  goto default_reloc;
-
-	case R_ALPHA_BRADDR:
-	case R_ALPHA_HINT:
-	  /* The regular PC-relative stuff measures from the start of
-	     the instruction rather than the end.  */
-	  addend -= 4;
-	  goto default_reloc;
-
-	case R_ALPHA_REFLONG:
-	case R_ALPHA_REFQUAD:
-	  {
-	    Elf_Internal_Rela outrel;
-	    boolean skip;
-
-	    /* Careful here to remember RELATIVE relocations for global
-	       variables for symbolic shared objects.  */
-
-	    if (h && alpha_elf_dynamic_symbol_p (&h->root, info))
-	      {
-		BFD_ASSERT(h->root.dynindx != -1);
-		outrel.r_info = ELF64_R_INFO(h->root.dynindx, r_type);
-		outrel.r_addend = addend;
-		addend = 0, relocation = 0;
-	      }
-	    else if (info->shared)
-	      {
-		outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-		outrel.r_addend = 0;
-	      }
-	    else
-	      goto default_reloc;
-
-	    if (!srel)
-	      {
-		const char *name;
-
-		name = (bfd_elf_string_from_elf_section
-			(input_bfd, elf_elfheader(input_bfd)->e_shstrndx,
-			 elf_section_data(input_section)->rel_hdr.sh_name));
-		BFD_ASSERT(name != NULL);
-
-		srel = bfd_get_section_by_name (dynobj, name);
-		BFD_ASSERT(srel != NULL);
-	      }
-
-	    skip = false;
-
-	    if (elf_section_data (input_section)->stab_info == NULL)
-	      outrel.r_offset = rel->r_offset;
-	    else
-	      {
-		bfd_vma off;
-
-		off = (_bfd_stab_section_offset
-		       (output_bfd, &elf_hash_table (info)->stab_info,
-			input_section,
-			&elf_section_data (input_section)->stab_info,
-			rel->r_offset));
-		if (off == (bfd_vma) -1)
-		  skip = true;
-		outrel.r_offset = off;
-	      }
-
-	    if (! skip)
-	      outrel.r_offset += (input_section->output_section->vma
-				  + input_section->output_offset);
-	    else
-	      memset (&outrel, 0, sizeof outrel);
-
-	    bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-				       ((Elf64_External_Rela *)
-					srel->contents)
-				       + srel->reloc_count++);
-	    BFD_ASSERT (sizeof(Elf64_External_Rela) * srel->reloc_count
-			<= srel->_cooked_size);
-	  }
-	  goto default_reloc;
-
-	default:
-	default_reloc:
-	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					contents, rel->r_offset, relocation,
-					addend);
-	  break;
-	}
-
-      switch (r)
-	{
-	case bfd_reloc_ok:
-	  break;
-
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-
-	    if (h != NULL)
-	      name = h->root.root.root.string;
-	    else
-	      {
-		name = (bfd_elf_string_from_elf_section
-			(input_bfd, symtab_hdr->sh_link, sym->st_name));
-		if (name == NULL)
-		  return false;
-		if (*name == '\0')
-		  name = bfd_section_name (input_bfd, sec);
-	      }
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, (bfd_vma) 0,
-		    input_bfd, input_section, rel->r_offset)))
-	      return false;
-	  }
-	  break;
-
-	default:
-	case bfd_reloc_outofrange:
-	  abort ();
-	}
-    }
-
-  return true;
-}
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-elf64_alpha_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  bfd *dynobj = elf_hash_table(info)->dynobj;
-
-  if (h->plt.offset != MINUS_ONE)
-    {
-      /* Fill in the .plt entry for this symbol.  */
-      asection *splt, *sgot, *srel;
-      Elf_Internal_Rela outrel;
-      bfd_vma got_addr, plt_addr;
-      bfd_vma plt_index;
-      struct alpha_elf_got_entry *gotent;
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      /* The first .got entry will be updated by the .plt with the
-	 address of the target function.  */
-      gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries;
-      BFD_ASSERT (gotent && gotent->addend == 0);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (splt != NULL);
-      srel = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (srel != NULL);
-      sgot = alpha_elf_tdata (gotent->gotobj)->got;
-      BFD_ASSERT (sgot != NULL);
-
-      got_addr = (sgot->output_section->vma
-		  + sgot->output_offset
-		  + gotent->got_offset);
-      plt_addr = (splt->output_section->vma
-		  + splt->output_offset
-		  + h->plt.offset);
-
-      plt_index = (h->plt.offset - PLT_HEADER_SIZE) / PLT_ENTRY_SIZE;
-
-      /* Fill in the entry in the procedure linkage table.  */
-      {
-	unsigned insn1, insn2, insn3;
-
-	insn1 = PLT_ENTRY_WORD1 | ((-(h->plt.offset + 4) >> 2) & 0x1fffff);
-	insn2 = PLT_ENTRY_WORD2;
-	insn3 = PLT_ENTRY_WORD3;
-
-	bfd_put_32 (output_bfd, insn1, splt->contents + h->plt.offset);
-	bfd_put_32 (output_bfd, insn2, splt->contents + h->plt.offset + 4);
-	bfd_put_32 (output_bfd, insn3, splt->contents + h->plt.offset + 8);
-      }
-
-      /* Fill in the entry in the .rela.plt section.  */
-      outrel.r_offset = got_addr;
-      outrel.r_info = ELF64_R_INFO(h->dynindx, R_ALPHA_JMP_SLOT);
-      outrel.r_addend = 0;
-
-      bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-				 ((Elf64_External_Rela *)srel->contents
-				  + plt_index));
-
-      if (!(h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
-	{
-	  /* Mark the symbol as undefined, rather than as defined in the
-	     .plt section.  Leave the value alone.  */
-	  sym->st_shndx = SHN_UNDEF;
-	}
-
-      /* Fill in the entries in the .got.  */
-      bfd_put_64 (output_bfd, plt_addr, sgot->contents + gotent->got_offset);
-
-      /* Subsequent .got entries will continue to bounce through the .plt.  */
-      if (gotent->next)
-	{
-	  srel = bfd_get_section_by_name (dynobj, ".rela.got");
-	  BFD_ASSERT (! info->shared || srel != NULL);
-
-	  gotent = gotent->next;
-	  do
-	    {
-	      sgot = alpha_elf_tdata(gotent->gotobj)->got;
-	      BFD_ASSERT(sgot != NULL);
-	      BFD_ASSERT(gotent->addend == 0);
-
-	      bfd_put_64 (output_bfd, plt_addr,
-		          sgot->contents + gotent->got_offset);
-
-	      if (info->shared)
-		{
-		  outrel.r_offset = (sgot->output_section->vma
-				     + sgot->output_offset
-				     + gotent->got_offset);
-		  outrel.r_info = ELF64_R_INFO(0, R_ALPHA_RELATIVE);
-		  outrel.r_addend = 0;
-
-		  bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-					     ((Elf64_External_Rela *)
-					      srel->contents)
-					     + srel->reloc_count++);
-		  BFD_ASSERT (sizeof(Elf64_External_Rela) * srel->reloc_count
-			      <= srel->_cooked_size);
-		}
-
-	      gotent = gotent->next;
-	    }
-          while (gotent != NULL);
-	}
-    }
-  else if (alpha_elf_dynamic_symbol_p (h, info))
-    {
-      /* Fill in the dynamic relocations for this symbol's .got entries.  */
-      asection *srel;
-      Elf_Internal_Rela outrel;
-      struct alpha_elf_got_entry *gotent;
-
-      srel = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (srel != NULL);
-
-      outrel.r_info = ELF64_R_INFO (h->dynindx, R_ALPHA_GLOB_DAT);
-      for (gotent = ((struct alpha_elf_link_hash_entry *) h)->got_entries;
-	   gotent != NULL;
-	   gotent = gotent->next)
-	{
-	  asection *sgot = alpha_elf_tdata (gotent->gotobj)->got;
-	  outrel.r_offset = (sgot->output_section->vma
-			     + sgot->output_offset
-			     + gotent->got_offset);
-	  outrel.r_addend = gotent->addend;
-
-	  bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-				     ((Elf64_External_Rela *)srel->contents
-				      + srel->reloc_count++));
-	  BFD_ASSERT (sizeof(Elf64_External_Rela) * srel->reloc_count
-		      <= srel->_cooked_size);
-	}
-    }
-
-  /* Mark some specially defined symbols as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0
-      || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-
-  return true;
-}
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-elf64_alpha_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *sdyn;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      asection *splt;
-      Elf64_External_Dyn *dyncon, *dynconend;
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (splt != NULL && sdyn != NULL);
-
-      dyncon = (Elf64_External_Dyn *) sdyn->contents;
-      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  asection *s;
-
-	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    case DT_PLTGOT:
-	      name = ".plt";
-	      goto get_vma;
-	    case DT_PLTRELSZ:
-	      name = ".rela.plt";
-	      goto get_size;
-	    case DT_JMPREL:
-	      name = ".rela.plt";
-	      goto get_vma;
-
-	    case DT_RELASZ:
-	      /* My interpretation of the TIS v1.1 ELF document indicates
-		 that RELASZ should not include JMPREL.  This is not what
-		 the rest of the BFD does.  It is, however, what the
-		 glibc ld.so wants.  Do this fixup here until we found
-		 out who is right.  */
-	      s = bfd_get_section_by_name (output_bfd, ".rela.plt");
-	      if (s)
-		{
-		  dyn.d_un.d_val -=
-		    (s->_cooked_size ? s->_cooked_size : s->_raw_size);
-		}
-	      break;
-
-	    get_vma:
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      dyn.d_un.d_ptr = (s ? s->vma : 0);
-	      break;
-
-	    get_size:
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      dyn.d_un.d_val =
-		(s->_cooked_size ? s->_cooked_size : s->_raw_size);
-	      break;
-	    }
-
-	  bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
-	}
-
-      /* Initialize the PLT0 entry */
-      if (splt->_raw_size > 0)
-	{
-	  bfd_put_32 (output_bfd, PLT_HEADER_WORD1, splt->contents);
-	  bfd_put_32 (output_bfd, PLT_HEADER_WORD2, splt->contents + 4);
-	  bfd_put_32 (output_bfd, PLT_HEADER_WORD3, splt->contents + 8);
-	  bfd_put_32 (output_bfd, PLT_HEADER_WORD4, splt->contents + 12);
-
-	  /* The next two words will be filled in by ld.so */
-	  bfd_put_64 (output_bfd, 0, splt->contents + 16);
-	  bfd_put_64 (output_bfd, 0, splt->contents + 24);
-
-	  elf_section_data (splt->output_section)->this_hdr.sh_entsize =
-	    PLT_HEADER_SIZE;
-	}
-    }
-
-  if (info->shared)
-    {
-      asection *sdynsym;
-      asection *s;
-      Elf_Internal_Sym sym;
-
-      /* Set up the section symbols for the output sections.  */
-
-      sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (sdynsym != NULL);
-
-      sym.st_size = 0;
-      sym.st_name = 0;
-      sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-      sym.st_other = 0;
-
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  int indx;
-
-	  sym.st_value = s->vma;
-
-	  indx = elf_section_data (s)->this_idx;
-	  BFD_ASSERT (indx > 0);
-	  sym.st_shndx = indx;
-
-	  bfd_elf64_swap_symbol_out (output_bfd, &sym,
-				     (PTR) (((Elf64_External_Sym *)
-					     sdynsym->contents)
-					    + elf_section_data (s)->dynindx));
-	}
-
-      /* Set the sh_info field of the output .dynsym section to the
-         index of the first global symbol.  */
-      elf_section_data (sdynsym->output_section)->this_hdr.sh_info =
-	bfd_count_sections (output_bfd) + 1;
-    }
-
-  return true;
-}
-
-/* We need to use a special link routine to handle the .reginfo and
-   the .mdebug sections.  We need to merge all instances of these
-   sections together, not write them all out sequentially.  */
-
-static boolean
-elf64_alpha_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  asection *o;
-  struct bfd_link_order *p;
-  asection *reginfo_sec, *mdebug_sec, *gptab_data_sec, *gptab_bss_sec;
-  struct ecoff_debug_info debug;
-  const struct ecoff_debug_swap *swap
-    = get_elf_backend_data (abfd)->elf_backend_ecoff_debug_swap;
-  HDRR *symhdr = &debug.symbolic_header;
-  PTR mdebug_handle = NULL;
-
-#if 0
-	      if (++ngots == 2)
-		{
-		  (*info->callbacks->warning)
-		    (info, _("using multiple gp values"), (char *) NULL,
-		     output_bfd, (asection *) NULL, (bfd_vma) 0);
-		}
-#endif
-
-  /* Go through the sections and collect the .reginfo and .mdebug
-     information.  */
-  reginfo_sec = NULL;
-  mdebug_sec = NULL;
-  gptab_data_sec = NULL;
-  gptab_bss_sec = NULL;
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    {
-#ifdef ERIC_neverdef
-      if (strcmp (o->name, ".reginfo") == 0)
-	{
-	  memset (&reginfo, 0, sizeof reginfo);
-
-	  /* We have found the .reginfo section in the output file.
-	     Look through all the link_orders comprising it and merge
-	     the information together.  */
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      asection *input_section;
-	      bfd *input_bfd;
-	      Elf64_External_RegInfo ext;
-	      Elf64_RegInfo sub;
-
-	      if (p->type != bfd_indirect_link_order)
-		{
-		  if (p->type == bfd_fill_link_order)
-		    continue;
-		  abort ();
-		}
-
-	      input_section = p->u.indirect.section;
-	      input_bfd = input_section->owner;
-
-	      /* The linker emulation code has probably clobbered the
-                 size to be zero bytes.  */
-	      if (input_section->_raw_size == 0)
-		input_section->_raw_size = sizeof (Elf64_External_RegInfo);
-
-	      if (! bfd_get_section_contents (input_bfd, input_section,
-					      (PTR) &ext,
-					      (file_ptr) 0,
-					      sizeof ext))
-		return false;
-
-	      bfd_alpha_elf64_swap_reginfo_in (input_bfd, &ext, &sub);
-
-	      reginfo.ri_gprmask |= sub.ri_gprmask;
-	      reginfo.ri_cprmask[0] |= sub.ri_cprmask[0];
-	      reginfo.ri_cprmask[1] |= sub.ri_cprmask[1];
-	      reginfo.ri_cprmask[2] |= sub.ri_cprmask[2];
-	      reginfo.ri_cprmask[3] |= sub.ri_cprmask[3];
-
-	      /* ri_gp_value is set by the function
-		 alpha_elf_section_processing when the section is
-		 finally written out.  */
-
-	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		 elf_link_input_bfd ignores this section.  */
-	      input_section->flags &=~ SEC_HAS_CONTENTS;
-	    }
-
-	  /* Force the section size to the value we want.  */
-	  o->_raw_size = sizeof (Elf64_External_RegInfo);
-
-	  /* Skip this section later on (I don't think this currently
-	     matters, but someday it might).  */
-	  o->link_order_head = (struct bfd_link_order *) NULL;
-
-	  reginfo_sec = o;
-	}
-#endif
-
-      if (strcmp (o->name, ".mdebug") == 0)
-	{
-	  struct extsym_info einfo;
-
-	  /* We have found the .mdebug section in the output file.
-	     Look through all the link_orders comprising it and merge
-	     the information together.  */
-	  symhdr->magic = swap->sym_magic;
-	  /* FIXME: What should the version stamp be?  */
-	  symhdr->vstamp = 0;
-	  symhdr->ilineMax = 0;
-	  symhdr->cbLine = 0;
-	  symhdr->idnMax = 0;
-	  symhdr->ipdMax = 0;
-	  symhdr->isymMax = 0;
-	  symhdr->ioptMax = 0;
-	  symhdr->iauxMax = 0;
-	  symhdr->issMax = 0;
-	  symhdr->issExtMax = 0;
-	  symhdr->ifdMax = 0;
-	  symhdr->crfd = 0;
-	  symhdr->iextMax = 0;
-
-	  /* We accumulate the debugging information itself in the
-	     debug_info structure.  */
-	  debug.line = NULL;
-	  debug.external_dnr = NULL;
-	  debug.external_pdr = NULL;
-	  debug.external_sym = NULL;
-	  debug.external_opt = NULL;
-	  debug.external_aux = NULL;
-	  debug.ss = NULL;
-	  debug.ssext = debug.ssext_end = NULL;
-	  debug.external_fdr = NULL;
-	  debug.external_rfd = NULL;
-	  debug.external_ext = debug.external_ext_end = NULL;
-
-	  mdebug_handle = bfd_ecoff_debug_init (abfd, &debug, swap, info);
-	  if (mdebug_handle == (PTR) NULL)
-	    return false;
-
-	  if (1)
-	    {
-	      asection *s;
-	      EXTR esym;
-	      bfd_vma last;
-	      unsigned int i;
-	      static const char * const name[] =
-		{
-		  ".text", ".init", ".fini", ".data",
-		  ".rodata", ".sdata", ".sbss", ".bss"
-		};
-	      static const int sc[] = { scText, scInit, scFini, scData,
-					  scRData, scSData, scSBss, scBss };
-
-	      esym.jmptbl = 0;
-	      esym.cobol_main = 0;
-	      esym.weakext = 0;
-	      esym.reserved = 0;
-	      esym.ifd = ifdNil;
-	      esym.asym.iss = issNil;
-	      esym.asym.st = stLocal;
-	      esym.asym.reserved = 0;
-	      esym.asym.index = indexNil;
-	      for (i = 0; i < 8; i++)
-		{
-		  esym.asym.sc = sc[i];
-		  s = bfd_get_section_by_name (abfd, name[i]);
-		  if (s != NULL)
-		    {
-		      esym.asym.value = s->vma;
-		      last = s->vma + s->_raw_size;
-		    }
-		  else
-		    esym.asym.value = last;
-
-		  if (! bfd_ecoff_debug_one_external (abfd, &debug, swap,
-						      name[i], &esym))
-		    return false;
-		}
-	    }
-
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      asection *input_section;
-	      bfd *input_bfd;
-	      const struct ecoff_debug_swap *input_swap;
-	      struct ecoff_debug_info input_debug;
-	      char *eraw_src;
-	      char *eraw_end;
-
-	      if (p->type != bfd_indirect_link_order)
-		{
-		  if (p->type == bfd_fill_link_order)
-		    continue;
-		  abort ();
-		}
-
-	      input_section = p->u.indirect.section;
-	      input_bfd = input_section->owner;
-
-	      if (bfd_get_flavour (input_bfd) != bfd_target_elf_flavour
-		  || (get_elf_backend_data (input_bfd)
-		      ->elf_backend_ecoff_debug_swap) == NULL)
-		{
-		  /* I don't know what a non ALPHA ELF bfd would be
-		     doing with a .mdebug section, but I don't really
-		     want to deal with it.  */
-		  continue;
-		}
-
-	      input_swap = (get_elf_backend_data (input_bfd)
-			    ->elf_backend_ecoff_debug_swap);
-
-	      BFD_ASSERT (p->size == input_section->_raw_size);
-
-	      /* The ECOFF linking code expects that we have already
-		 read in the debugging information and set up an
-		 ecoff_debug_info structure, so we do that now.  */
-	      if (!elf64_alpha_read_ecoff_info (input_bfd, input_section,
-						&input_debug))
-		return false;
-
-	      if (! (bfd_ecoff_debug_accumulate
-		     (mdebug_handle, abfd, &debug, swap, input_bfd,
-		      &input_debug, input_swap, info)))
-		return false;
-
-	      /* Loop through the external symbols.  For each one with
-		 interesting information, try to find the symbol in
-		 the linker global hash table and save the information
-		 for the output external symbols.  */
-	      eraw_src = input_debug.external_ext;
-	      eraw_end = (eraw_src
-			  + (input_debug.symbolic_header.iextMax
-			     * input_swap->external_ext_size));
-	      for (;
-		   eraw_src < eraw_end;
-		   eraw_src += input_swap->external_ext_size)
-		{
-		  EXTR ext;
-		  const char *name;
-		  struct alpha_elf_link_hash_entry *h;
-
-		  (*input_swap->swap_ext_in) (input_bfd, (PTR) eraw_src, &ext);
-		  if (ext.asym.sc == scNil
-		      || ext.asym.sc == scUndefined
-		      || ext.asym.sc == scSUndefined)
-		    continue;
-
-		  name = input_debug.ssext + ext.asym.iss;
-		  h = alpha_elf_link_hash_lookup (alpha_elf_hash_table (info),
-						  name, false, false, true);
-		  if (h == NULL || h->esym.ifd != -2)
-		    continue;
-
-		  if (ext.ifd != -1)
-		    {
-		      BFD_ASSERT (ext.ifd
-				  < input_debug.symbolic_header.ifdMax);
-		      ext.ifd = input_debug.ifdmap[ext.ifd];
-		    }
-
-		  h->esym = ext;
-		}
-
-	      /* Free up the information we just read.  */
-	      free (input_debug.line);
-	      free (input_debug.external_dnr);
-	      free (input_debug.external_pdr);
-	      free (input_debug.external_sym);
-	      free (input_debug.external_opt);
-	      free (input_debug.external_aux);
-	      free (input_debug.ss);
-	      free (input_debug.ssext);
-	      free (input_debug.external_fdr);
-	      free (input_debug.external_rfd);
-	      free (input_debug.external_ext);
-
-	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		 elf_link_input_bfd ignores this section.  */
-	      input_section->flags &=~ SEC_HAS_CONTENTS;
-	    }
-
-#ifdef ERIC_neverdef
-	  if (info->shared)
-	    {
-	      /* Create .rtproc section.  */
-	      rtproc_sec = bfd_get_section_by_name (abfd, ".rtproc");
-	      if (rtproc_sec == NULL)
-		{
-		  flagword flags = (SEC_HAS_CONTENTS
-				    | SEC_IN_MEMORY
-				    | SEC_LINKER_CREATED
-				    | SEC_READONLY);
-
-		  rtproc_sec = bfd_make_section (abfd, ".rtproc");
-		  if (rtproc_sec == NULL
-		      || ! bfd_set_section_flags (abfd, rtproc_sec, flags)
-		      || ! bfd_set_section_alignment (abfd, rtproc_sec, 12))
-		    return false;
-		}
-
-	      if (! alpha_elf_create_procedure_table (mdebug_handle, abfd,
-						     info, rtproc_sec, &debug))
-		return false;
-	    }
-#endif
-
-
-	  /* Build the external symbol information.  */
-	  einfo.abfd = abfd;
-	  einfo.info = info;
-	  einfo.debug = &debug;
-	  einfo.swap = swap;
-	  einfo.failed = false;
-	  elf_link_hash_traverse (elf_hash_table (info),
-				  elf64_alpha_output_extsym,
-				  (PTR) &einfo);
-	  if (einfo.failed)
-	    return false;
-
-	  /* Set the size of the .mdebug section.  */
-	  o->_raw_size = bfd_ecoff_debug_size (abfd, &debug, swap);
-
-	  /* Skip this section later on (I don't think this currently
-	     matters, but someday it might).  */
-	  o->link_order_head = (struct bfd_link_order *) NULL;
-
-	  mdebug_sec = o;
-	}
-
-#ifdef ERIC_neverdef
-      if (strncmp (o->name, ".gptab.", sizeof ".gptab." - 1) == 0)
-	{
-	  const char *subname;
-	  unsigned int c;
-	  Elf64_gptab *tab;
-	  Elf64_External_gptab *ext_tab;
-	  unsigned int i;
-
-	  /* The .gptab.sdata and .gptab.sbss sections hold
-	     information describing how the small data area would
-	     change depending upon the -G switch.  These sections
-	     not used in executables files.  */
-	  if (! info->relocateable)
-	    {
-	      asection **secpp;
-
-	      for (p = o->link_order_head;
-		   p != (struct bfd_link_order *) NULL;
-		   p = p->next)
-		{
-		  asection *input_section;
-
-		  if (p->type != bfd_indirect_link_order)
-		    {
-		      if (p->type == bfd_fill_link_order)
-			continue;
-		      abort ();
-		    }
-
-		  input_section = p->u.indirect.section;
-
-		  /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		     elf_link_input_bfd ignores this section.  */
-		  input_section->flags &=~ SEC_HAS_CONTENTS;
-		}
-
-	      /* Skip this section later on (I don't think this
-		 currently matters, but someday it might).  */
-	      o->link_order_head = (struct bfd_link_order *) NULL;
-
-	      /* Really remove the section.  */
-	      for (secpp = &abfd->sections;
-		   *secpp != o;
-		   secpp = &(*secpp)->next)
-		;
-	      *secpp = (*secpp)->next;
-	      --abfd->section_count;
-
-	      continue;
-	    }
-
-	  /* There is one gptab for initialized data, and one for
-	     uninitialized data.  */
-	  if (strcmp (o->name, ".gptab.sdata") == 0)
-	    gptab_data_sec = o;
-	  else if (strcmp (o->name, ".gptab.sbss") == 0)
-	    gptab_bss_sec = o;
-	  else
-	    {
-	      (*_bfd_error_handler)
-		(_("%s: illegal section name `%s'"),
-		 bfd_get_filename (abfd), o->name);
-	      bfd_set_error (bfd_error_nonrepresentable_section);
-	      return false;
-	    }
-
-	  /* The linker script always combines .gptab.data and
-	     .gptab.sdata into .gptab.sdata, and likewise for
-	     .gptab.bss and .gptab.sbss.  It is possible that there is
-	     no .sdata or .sbss section in the output file, in which
-	     case we must change the name of the output section.  */
-	  subname = o->name + sizeof ".gptab" - 1;
-	  if (bfd_get_section_by_name (abfd, subname) == NULL)
-	    {
-	      if (o == gptab_data_sec)
-		o->name = ".gptab.data";
-	      else
-		o->name = ".gptab.bss";
-	      subname = o->name + sizeof ".gptab" - 1;
-	      BFD_ASSERT (bfd_get_section_by_name (abfd, subname) != NULL);
-	    }
-
-	  /* Set up the first entry.  */
-	  c = 1;
-	  tab = (Elf64_gptab *) bfd_malloc (c * sizeof (Elf64_gptab));
-	  if (tab == NULL)
-	    return false;
-	  tab[0].gt_header.gt_current_g_value = elf_gp_size (abfd);
-	  tab[0].gt_header.gt_unused = 0;
-
-	  /* Combine the input sections.  */
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      asection *input_section;
-	      bfd *input_bfd;
-	      bfd_size_type size;
-	      unsigned long last;
-	      bfd_size_type gpentry;
-
-	      if (p->type != bfd_indirect_link_order)
-		{
-		  if (p->type == bfd_fill_link_order)
-		    continue;
-		  abort ();
-		}
-
-	      input_section = p->u.indirect.section;
-	      input_bfd = input_section->owner;
-
-	      /* Combine the gptab entries for this input section one
-		 by one.  We know that the input gptab entries are
-		 sorted by ascending -G value.  */
-	      size = bfd_section_size (input_bfd, input_section);
-	      last = 0;
-	      for (gpentry = sizeof (Elf64_External_gptab);
-		   gpentry < size;
-		   gpentry += sizeof (Elf64_External_gptab))
-		{
-		  Elf64_External_gptab ext_gptab;
-		  Elf64_gptab int_gptab;
-		  unsigned long val;
-		  unsigned long add;
-		  boolean exact;
-		  unsigned int look;
-
-		  if (! (bfd_get_section_contents
-			 (input_bfd, input_section, (PTR) &ext_gptab,
-			  gpentry, sizeof (Elf64_External_gptab))))
-		    {
-		      free (tab);
-		      return false;
-		    }
-
-		  bfd_alpha_elf64_swap_gptab_in (input_bfd, &ext_gptab,
-						&int_gptab);
-		  val = int_gptab.gt_entry.gt_g_value;
-		  add = int_gptab.gt_entry.gt_bytes - last;
-
-		  exact = false;
-		  for (look = 1; look < c; look++)
-		    {
-		      if (tab[look].gt_entry.gt_g_value >= val)
-			tab[look].gt_entry.gt_bytes += add;
-
-		      if (tab[look].gt_entry.gt_g_value == val)
-			exact = true;
-		    }
-
-		  if (! exact)
-		    {
-		      Elf64_gptab *new_tab;
-		      unsigned int max;
-
-		      /* We need a new table entry.  */
-		      new_tab = ((Elf64_gptab *)
-				 bfd_realloc ((PTR) tab,
-					      (c + 1) * sizeof (Elf64_gptab)));
-		      if (new_tab == NULL)
-			{
-			  free (tab);
-			  return false;
-			}
-		      tab = new_tab;
-		      tab[c].gt_entry.gt_g_value = val;
-		      tab[c].gt_entry.gt_bytes = add;
-
-		      /* Merge in the size for the next smallest -G
-			 value, since that will be implied by this new
-			 value.  */
-		      max = 0;
-		      for (look = 1; look < c; look++)
-			{
-			  if (tab[look].gt_entry.gt_g_value < val
-			      && (max == 0
-				  || (tab[look].gt_entry.gt_g_value
-				      > tab[max].gt_entry.gt_g_value)))
-			    max = look;
-			}
-		      if (max != 0)
-			tab[c].gt_entry.gt_bytes +=
-			  tab[max].gt_entry.gt_bytes;
-
-		      ++c;
-		    }
-
-		  last = int_gptab.gt_entry.gt_bytes;
-		}
-
-	      /* Hack: reset the SEC_HAS_CONTENTS flag so that
-		 elf_link_input_bfd ignores this section.  */
-	      input_section->flags &=~ SEC_HAS_CONTENTS;
-	    }
-
-	  /* The table must be sorted by -G value.  */
-	  if (c > 2)
-	    qsort (tab + 1, c - 1, sizeof (tab[0]), gptab_compare);
-
-	  /* Swap out the table.  */
-	  ext_tab = ((Elf64_External_gptab *)
-		     bfd_alloc (abfd, c * sizeof (Elf64_External_gptab)));
-	  if (ext_tab == NULL)
-	    {
-	      free (tab);
-	      return false;
-	    }
-
-	  for (i = 0; i < c; i++)
-	    bfd_alpha_elf64_swap_gptab_out (abfd, tab + i, ext_tab + i);
-	  free (tab);
-
-	  o->_raw_size = c * sizeof (Elf64_External_gptab);
-	  o->contents = (bfd_byte *) ext_tab;
-
-	  /* Skip this section later on (I don't think this currently
-	     matters, but someday it might).  */
-	  o->link_order_head = (struct bfd_link_order *) NULL;
-	}
-#endif
-
-    }
-
-  /* Invoke the regular ELF backend linker to do all the work.  */
-  if (! bfd_elf64_bfd_final_link (abfd, info))
-    return false;
-
-  /* Now write out the computed sections.  */
-
-  /* The .got subsections...  */
-  {
-    bfd *i, *dynobj = elf_hash_table(info)->dynobj;
-    for (i = alpha_elf_hash_table(info)->got_list;
-	 i != NULL;
-	 i = alpha_elf_tdata(i)->got_link_next)
-      {
-	asection *sgot;
-
-	/* elf_bfd_final_link already did everything in dynobj.  */
-	if (i == dynobj)
-	  continue;
-
-	sgot = alpha_elf_tdata(i)->got;
-	if (! bfd_set_section_contents (abfd, sgot->output_section,
-					sgot->contents, sgot->output_offset,
-					sgot->_raw_size))
-	  return false;
-      }
-  }
-
-#ifdef ERIC_neverdef
-  if (reginfo_sec != (asection *) NULL)
-    {
-      Elf64_External_RegInfo ext;
-
-      bfd_alpha_elf64_swap_reginfo_out (abfd, &reginfo, &ext);
-      if (! bfd_set_section_contents (abfd, reginfo_sec, (PTR) &ext,
-				      (file_ptr) 0, sizeof ext))
-	return false;
-    }
-#endif
-
-  if (mdebug_sec != (asection *) NULL)
-    {
-      BFD_ASSERT (abfd->output_has_begun);
-      if (! bfd_ecoff_write_accumulated_debug (mdebug_handle, abfd, &debug,
-					       swap, info,
-					       mdebug_sec->filepos))
-	return false;
-
-      bfd_ecoff_debug_free (mdebug_handle, abfd, &debug, swap, info);
-    }
-
-  if (gptab_data_sec != (asection *) NULL)
-    {
-      if (! bfd_set_section_contents (abfd, gptab_data_sec,
-				      gptab_data_sec->contents,
-				      (file_ptr) 0,
-				      gptab_data_sec->_raw_size))
-	return false;
-    }
-
-  if (gptab_bss_sec != (asection *) NULL)
-    {
-      if (! bfd_set_section_contents (abfd, gptab_bss_sec,
-				      gptab_bss_sec->contents,
-				      (file_ptr) 0,
-				      gptab_bss_sec->_raw_size))
-	return false;
-    }
-
-  return true;
-}
-
-/* ECOFF swapping routines.  These are used when dealing with the
-   .mdebug section, which is in the ECOFF debugging format.  Copied
-   from elf32-mips.c. */
-static const struct ecoff_debug_swap
-elf64_alpha_ecoff_debug_swap =
-{
-  /* Symbol table magic number.  */
-  magicSym2,
-  /* Alignment of debugging information.  E.g., 4.  */
-  8,
-  /* Sizes of external symbolic information.  */
-  sizeof (struct hdr_ext),
-  sizeof (struct dnr_ext),
-  sizeof (struct pdr_ext),
-  sizeof (struct sym_ext),
-  sizeof (struct opt_ext),
-  sizeof (struct fdr_ext),
-  sizeof (struct rfd_ext),
-  sizeof (struct ext_ext),
-  /* Functions to swap in external symbolic data.  */
-  ecoff_swap_hdr_in,
-  ecoff_swap_dnr_in,
-  ecoff_swap_pdr_in,
-  ecoff_swap_sym_in,
-  ecoff_swap_opt_in,
-  ecoff_swap_fdr_in,
-  ecoff_swap_rfd_in,
-  ecoff_swap_ext_in,
-  _bfd_ecoff_swap_tir_in,
-  _bfd_ecoff_swap_rndx_in,
-  /* Functions to swap out external symbolic data.  */
-  ecoff_swap_hdr_out,
-  ecoff_swap_dnr_out,
-  ecoff_swap_pdr_out,
-  ecoff_swap_sym_out,
-  ecoff_swap_opt_out,
-  ecoff_swap_fdr_out,
-  ecoff_swap_rfd_out,
-  ecoff_swap_ext_out,
-  _bfd_ecoff_swap_tir_out,
-  _bfd_ecoff_swap_rndx_out,
-  /* Function to read in symbolic data.  */
-  elf64_alpha_read_ecoff_info
-};
-
-#define TARGET_LITTLE_SYM	bfd_elf64_alpha_vec
-#define TARGET_LITTLE_NAME	"elf64-alpha"
-#define ELF_ARCH		bfd_arch_alpha
-#define ELF_MACHINE_CODE 	EM_ALPHA
-#define ELF_MAXPAGESIZE 	0x10000
-
-#define bfd_elf64_bfd_link_hash_table_create \
-  elf64_alpha_bfd_link_hash_table_create
-
-#define bfd_elf64_bfd_reloc_type_lookup \
-  elf64_alpha_bfd_reloc_type_lookup
-#define elf_info_to_howto \
-  elf64_alpha_info_to_howto
-
-#define bfd_elf64_mkobject \
-  elf64_alpha_mkobject
-#define elf_backend_object_p \
-  elf64_alpha_object_p
-
-#define elf_backend_section_from_shdr \
-  elf64_alpha_section_from_shdr
-#define elf_backend_fake_sections \
-  elf64_alpha_fake_sections
-
-#define bfd_elf64_bfd_is_local_label_name \
-  elf64_alpha_is_local_label_name
-#define bfd_elf64_find_nearest_line \
-  elf64_alpha_find_nearest_line
-#define bfd_elf64_bfd_relax_section \
-  elf64_alpha_relax_section
-
-#define elf_backend_add_symbol_hook \
-  elf64_alpha_add_symbol_hook
-#define elf_backend_check_relocs \
-  elf64_alpha_check_relocs
-#define elf_backend_create_dynamic_sections \
-  elf64_alpha_create_dynamic_sections
-#define elf_backend_adjust_dynamic_symbol \
-  elf64_alpha_adjust_dynamic_symbol
-#define elf_backend_always_size_sections \
-  elf64_alpha_always_size_sections
-#define elf_backend_size_dynamic_sections \
-  elf64_alpha_size_dynamic_sections
-#define elf_backend_relocate_section \
-  elf64_alpha_relocate_section
-#define elf_backend_finish_dynamic_symbol \
-  elf64_alpha_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections \
-  elf64_alpha_finish_dynamic_sections
-#define bfd_elf64_bfd_final_link \
-  elf64_alpha_final_link
-
-#define elf_backend_ecoff_debug_swap \
-  &elf64_alpha_ecoff_debug_swap
-
-/*
- * A few constants that determine how the .plt section is set up.
- */
-#define elf_backend_want_got_plt 0
-#define elf_backend_plt_readonly 0
-#define elf_backend_want_plt_sym 1
-#define elf_backend_got_header_size 0
-#define elf_backend_plt_header_size PLT_HEADER_SIZE
-
-#include "elf64-target.h"
diff --git a/bfd/elf64-gen.c b/bfd/elf64-gen.c
deleted file mode 100644
index 2f470ff057f..00000000000
--- a/bfd/elf64-gen.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Generic support for 64-bit ELF
-   Copyright 1993, 1995, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-/* This does not include any relocation information, but should be
-   good enough for GDB or objdump to read the file.  */
-
-static reloc_howto_type dummy =
-  HOWTO (0,			/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 NULL,			/* special_function */
-	 "UNKNOWN",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
-
-static void
-elf_generic_info_to_howto (abfd, bfd_reloc, elf_reloc)
-     bfd *abfd;
-     arelent *bfd_reloc;
-     Elf64_Internal_Rela *elf_reloc;
-{
-  bfd_reloc->howto = &dummy;
-}
-
-static void
-elf_generic_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
-     bfd *abfd;
-     arelent *bfd_reloc;
-     Elf64_Internal_Rel *elf_reloc;
-{
-  bfd_reloc->howto = &dummy;
-}
-
-#define TARGET_LITTLE_SYM		bfd_elf64_little_generic_vec
-#define TARGET_LITTLE_NAME		"elf64-little"
-#define TARGET_BIG_SYM			bfd_elf64_big_generic_vec
-#define TARGET_BIG_NAME			"elf64-big"
-#define ELF_ARCH			bfd_arch_unknown
-#define ELF_MACHINE_CODE		EM_NONE
-#define bfd_elf64_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
-#define elf_info_to_howto		elf_generic_info_to_howto
-#define elf_info_to_howto_rel		elf_generic_info_to_howto_rel
-
-#include "elf64-target.h"
diff --git a/bfd/elf64-mips.c b/bfd/elf64-mips.c
deleted file mode 100644
index 9fb8bb9c85e..00000000000
--- a/bfd/elf64-mips.c
+++ /dev/null
@@ -1,2127 +0,0 @@
-/* MIPS-specific support for 64-bit ELF
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-   Ian Lance Taylor, Cygnus Support
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file supports the 64-bit MIPS ELF ABI.
-
-   The MIPS 64-bit ELF ABI uses an unusual reloc format.  This file
-   overrides the usual ELF reloc handling, and handles reading and
-   writing the relocations here.
-
-   The MIPS 64-bit ELF ABI also uses an unusual archive map format.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/ar.h"
-#include "bfdlink.h"
-#include "genlink.h"
-#include "elf-bfd.h"
-#include "elf/mips.h"
-
-/* Get the ECOFF swapping routines.  The 64-bit ABI is not supposed to
-   use ECOFF.  However, we support it anyhow for an easier changeover.  */
-#include "coff/sym.h"
-#include "coff/symconst.h"
-#include "coff/internal.h"
-#include "coff/ecoff.h"
-/* The 64 bit versions of the mdebug data structures are in alpha.h.  */
-#include "coff/alpha.h"
-#define ECOFF_64
-#include "ecoffswap.h"
-
-static void mips_elf64_swap_reloc_in
-  PARAMS ((bfd *, const Elf64_Mips_External_Rel *,
-	   Elf64_Mips_Internal_Rel *));
-static void mips_elf64_swap_reloca_in
-  PARAMS ((bfd *, const Elf64_Mips_External_Rela *,
-	   Elf64_Mips_Internal_Rela *));
-#if 0
-static void mips_elf64_swap_reloc_out
-  PARAMS ((bfd *, const Elf64_Mips_Internal_Rel *,
-	   Elf64_Mips_External_Rel *));
-#endif
-static void mips_elf64_swap_reloca_out
-  PARAMS ((bfd *, const Elf64_Mips_Internal_Rela *,
-	   Elf64_Mips_External_Rela *));
-static reloc_howto_type *mips_elf64_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static long mips_elf64_get_reloc_upper_bound PARAMS ((bfd *, asection *));
-static boolean mips_elf64_slurp_one_reloc_table
-  PARAMS ((bfd *, asection *, asymbol **, const Elf_Internal_Shdr *));
-static boolean mips_elf64_slurp_reloc_table
-  PARAMS ((bfd *, asection *, asymbol **, boolean));
-static void mips_elf64_write_relocs PARAMS ((bfd *, asection *, PTR));
-static boolean mips_elf64_section_from_shdr
-  PARAMS ((bfd *, Elf_Internal_Shdr *, char *));
-static boolean mips_elf64_section_processing
-  PARAMS ((bfd *, Elf_Internal_Shdr *));
-static boolean mips_elf64_slurp_armap PARAMS ((bfd *));
-static boolean mips_elf64_write_armap
-  PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
-   from smaller values.  Start with zero, widen, *then* decrement.  */
-#define MINUS_ONE	(((bfd_vma)0) - 1)
-
-/* The relocation table used for SHT_REL sections.  */
-
-static reloc_howto_type mips_elf64_howto_table_rel[] =
-{
-  /* No relocation.  */
-  HOWTO (R_MIPS_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit relocation.  */
-  HOWTO (R_MIPS_16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit relocation.  */
-  HOWTO (R_MIPS_32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit symbol relative relocation.  */
-  HOWTO (R_MIPS_REL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_REL32",	/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 26 bit branch address.  */
-  HOWTO (R_MIPS_26,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 			/* This needs complex overflow
-				   detection, because the upper four
-				   bits must match the PC.  */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_26",		/* name */
-	 true,			/* partial_inplace */
-	 0x3ffffff,		/* src_mask */
-	 0x3ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of symbol value.  */
-  HOWTO (R_MIPS_HI16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 _bfd_mips_elf_hi16_reloc,	/* special_function */
-	 "R_MIPS_HI16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of symbol value.  */
-  HOWTO (R_MIPS_LO16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 _bfd_mips_elf_lo16_reloc,	/* special_function */
-	 "R_MIPS_LO16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GP relative reference.  */
-  HOWTO (R_MIPS_GPREL16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel16_reloc, /* special_function */
-	 "R_MIPS_GPREL16",	/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Reference to literal section.  */
-  HOWTO (R_MIPS_LITERAL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel16_reloc, /* special_function */
-	 "R_MIPS_LITERAL",	/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Reference to global offset table.  */
-  HOWTO (R_MIPS_GOT16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_got16_reloc,	/* special_function */
-	 "R_MIPS_GOT16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit PC relative reference.  */
-  HOWTO (R_MIPS_PC16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_PC16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit call through global offset table.  */
-  /* FIXME: This is not handled correctly.  */
-  HOWTO (R_MIPS_CALL16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit GP relative reference.  */
-  HOWTO (R_MIPS_GPREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel32_reloc, /* special_function */
-	 "R_MIPS_GPREL32",	/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-    { 13 },
-    { 14 },
-    { 15 },
-
-  /* A 5 bit shift field.  */
-  HOWTO (R_MIPS_SHIFT5,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 5,			/* bitsize */
-	 false,			/* pc_relative */
-	 6,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SHIFT5",	/* name */
-	 true,			/* partial_inplace */
-	 0x000007c0,		/* src_mask */
-	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 6 bit shift field.  */
-  /* FIXME: This is not handled correctly; a special function is
-     needed to put the most significant bit in the right place.  */
-  HOWTO (R_MIPS_SHIFT6,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 false,			/* pc_relative */
-	 6,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SHIFT6",	/* name */
-	 true,			/* partial_inplace */
-	 0x000007c4,		/* src_mask */
-	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 64 bit relocation.  */
-  HOWTO (R_MIPS_64,		/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Displacement in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_DISP,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_DISP",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Displacement to page pointer in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_PAGE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_PAGE",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Offset from page pointer in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_OFST,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_OFST",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_HI16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_LO16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 64 bit substraction.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_SUB,		/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SUB",		/* name */
-	 true,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Insert the addend as an instruction.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_INSERT_A,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_INSERT_A",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Insert the addend as an instruction, and change all relocations
-     to refer to the old instruction at the address.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_INSERT_B,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_INSERT_B",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Delete a 32 bit instruction.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_DELETE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_DELETE",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Get the higher value of a 64 bit addend.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_HIGHER,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_HIGHER",	/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Get the highest value of a 64 bit addend.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_HIGHEST,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_HIGHEST",	/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_CALL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL_HI16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_CALL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL_LO16",	/* name */
-	 true,			/* partial_inplace */
-	 0x0000ffff,		/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* I'm not sure what the remaining relocs are, but they are defined
-     on Irix 6.  */
-
-  HOWTO (R_MIPS_SCN_DISP,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SCN_DISP",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_REL16,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_REL16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_ADD_IMMEDIATE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_ADD_IMMEDIATE", /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_PJUMP,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_PJUMP",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_RELGOT,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_RELGOT",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false)			/* pcrel_offset */
-};
-
-/* The relocation table used for SHT_RELA sections.  */
-
-static reloc_howto_type mips_elf64_howto_table_rela[] =
-{
-  /* No relocation.  */
-  HOWTO (R_MIPS_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit relocation.  */
-  HOWTO (R_MIPS_16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_16",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit relocation.  */
-  HOWTO (R_MIPS_32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_32",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit symbol relative relocation.  */
-  HOWTO (R_MIPS_REL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_REL32",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 26 bit branch address.  */
-  HOWTO (R_MIPS_26,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 26,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 			/* This needs complex overflow
-				   detection, because the upper four
-				   bits must match the PC.  */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_26",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x3ffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of symbol value.  */
-  HOWTO (R_MIPS_HI16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_HI16",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of symbol value.  */
-  HOWTO (R_MIPS_LO16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_LO16",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* GP relative reference.  */
-  HOWTO (R_MIPS_GPREL16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel16_reloc, /* special_function */
-	 "R_MIPS_GPREL16",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Reference to literal section.  */
-  HOWTO (R_MIPS_LITERAL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel16_reloc, /* special_function */
-	 "R_MIPS_LITERAL",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Reference to global offset table.  */
-  /* FIXME: This is not handled correctly.  */
-  HOWTO (R_MIPS_GOT16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit PC relative reference.  */
-  HOWTO (R_MIPS_PC16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_PC16",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit call through global offset table.  */
-  /* FIXME: This is not handled correctly.  */
-  HOWTO (R_MIPS_CALL16,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit GP relative reference.  */
-  HOWTO (R_MIPS_GPREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 _bfd_mips_elf_gprel32_reloc, /* special_function */
-	 "R_MIPS_GPREL32",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-    { 13 },
-    { 14 },
-    { 15 },
-
-  /* A 5 bit shift field.  */
-  HOWTO (R_MIPS_SHIFT5,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 5,			/* bitsize */
-	 false,			/* pc_relative */
-	 6,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SHIFT5",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x000007c0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 6 bit shift field.  */
-  /* FIXME: This is not handled correctly; a special function is
-     needed to put the most significant bit in the right place.  */
-  HOWTO (R_MIPS_SHIFT6,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 6,			/* bitsize */
-	 false,			/* pc_relative */
-	 6,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SHIFT6",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x000007c4,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 64 bit relocation.  */
-  HOWTO (R_MIPS_64,		/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_64",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Displacement in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_DISP,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_DISP",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Displacement to page pointer in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_PAGE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_PAGE",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Offset from page pointer in the global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_OFST,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_OFST",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_HI16",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_GOT_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_GOT_LO16",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 64 bit substraction.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_SUB,		/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SUB",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Insert the addend as an instruction.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_INSERT_A,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_INSERT_A",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Insert the addend as an instruction, and change all relocations
-     to refer to the old instruction at the address.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_INSERT_B,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_INSERT_B",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Delete a 32 bit instruction.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_DELETE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_DELETE",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Get the higher value of a 64 bit addend.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_HIGHER,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_HIGHER",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Get the highest value of a 64 bit addend.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_HIGHEST,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_HIGHEST",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* High 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_CALL_HI16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL_HI16",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Low 16 bits of displacement in global offset table.  */
-  /* FIXME: Not handled correctly.  */
-  HOWTO (R_MIPS_CALL_LO16,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_CALL_LO16",	/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x0000ffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* I'm not sure what the remaining relocs are, but they are defined
-     on Irix 6.  */
-
-  HOWTO (R_MIPS_SCN_DISP,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_SCN_DISP",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_REL16,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_REL16",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_ADD_IMMEDIATE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_ADD_IMMEDIATE", /* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_PJUMP,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_PJUMP",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_MIPS_RELGOT,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_MIPS_RELGOT",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false)			/* pcrel_offset */
-};
-
-/* Swap in a MIPS 64-bit Rel reloc.  */
-
-static void
-mips_elf64_swap_reloc_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf64_Mips_External_Rel *src;
-     Elf64_Mips_Internal_Rel *dst;
-{
-  dst->r_offset = bfd_h_get_64 (abfd, (bfd_byte *) src->r_offset);
-  dst->r_sym = bfd_h_get_32 (abfd, (bfd_byte *) src->r_sym);
-  dst->r_ssym = bfd_h_get_8 (abfd, (bfd_byte *) src->r_ssym);
-  dst->r_type3 = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type3);
-  dst->r_type2 = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type2);
-  dst->r_type = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type);
-}
-
-/* Swap in a MIPS 64-bit Rela reloc.  */
-
-static void
-mips_elf64_swap_reloca_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf64_Mips_External_Rela *src;
-     Elf64_Mips_Internal_Rela *dst;
-{
-  dst->r_offset = bfd_h_get_64 (abfd, (bfd_byte *) src->r_offset);
-  dst->r_sym = bfd_h_get_32 (abfd, (bfd_byte *) src->r_sym);
-  dst->r_ssym = bfd_h_get_8 (abfd, (bfd_byte *) src->r_ssym);
-  dst->r_type3 = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type3);
-  dst->r_type2 = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type2);
-  dst->r_type = bfd_h_get_8 (abfd, (bfd_byte *) src->r_type);
-  dst->r_addend = bfd_h_get_signed_64 (abfd, (bfd_byte *) src->r_addend);
-}
-
-#if 0
-
-/* This is not currently used.  */
-
-/* Swap out a MIPS 64-bit Rel reloc.  */
-
-static void
-mips_elf64_swap_reloc_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf64_Mips_Internal_Rel *src;
-     Elf64_Mips_External_Rel *dst;
-{
-  bfd_h_put_64 (abfd, src->r_offset, (bfd_byte *) dst->r_offset);
-  bfd_h_put_32 (abfd, src->r_sym, (bfd_byte *) dst->r_sym);
-  bfd_h_put_8 (abfd, src->r_ssym, (bfd_byte *) dst->r_ssym);
-  bfd_h_put_8 (abfd, src->r_type3, (bfd_byte *) dst->r_type3);
-  bfd_h_put_8 (abfd, src->r_type2, (bfd_byte *) dst->r_type2);
-  bfd_h_put_8 (abfd, src->r_type, (bfd_byte *) dst->r_type);
-}
-
-#endif /* 0 */
-
-/* Swap out a MIPS 64-bit Rela reloc.  */
-
-static void
-mips_elf64_swap_reloca_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf64_Mips_Internal_Rela *src;
-     Elf64_Mips_External_Rela *dst;
-{
-  bfd_h_put_64 (abfd, src->r_offset, (bfd_byte *) dst->r_offset);
-  bfd_h_put_32 (abfd, src->r_sym, (bfd_byte *) dst->r_sym);
-  bfd_h_put_8 (abfd, src->r_ssym, (bfd_byte *) dst->r_ssym);
-  bfd_h_put_8 (abfd, src->r_type3, (bfd_byte *) dst->r_type3);
-  bfd_h_put_8 (abfd, src->r_type2, (bfd_byte *) dst->r_type2);
-  bfd_h_put_8 (abfd, src->r_type, (bfd_byte *) dst->r_type);
-  bfd_h_put_64 (abfd, src->r_addend, (bfd_byte *) dst->r_addend);
-}
-
-/* A mapping from BFD reloc types to MIPS ELF reloc types.  */
-
-struct elf_reloc_map
-{
-  bfd_reloc_code_real_type bfd_reloc_val;
-  enum elf_mips_reloc_type elf_reloc_val;
-};
-
-static CONST struct elf_reloc_map mips_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_MIPS_NONE, },
-  { BFD_RELOC_16, R_MIPS_16 },
-  { BFD_RELOC_32, R_MIPS_32 },
-  { BFD_RELOC_64, R_MIPS_64 },
-  { BFD_RELOC_CTOR, R_MIPS_64 },
-  { BFD_RELOC_32_PCREL, R_MIPS_REL32 },
-  { BFD_RELOC_MIPS_JMP, R_MIPS_26 },
-  { BFD_RELOC_HI16_S, R_MIPS_HI16 },
-  { BFD_RELOC_LO16, R_MIPS_LO16 },
-  { BFD_RELOC_MIPS_GPREL, R_MIPS_GPREL16 },
-  { BFD_RELOC_MIPS_LITERAL, R_MIPS_LITERAL },
-  { BFD_RELOC_MIPS_GOT16, R_MIPS_GOT16 },
-  { BFD_RELOC_16_PCREL, R_MIPS_PC16 },
-  { BFD_RELOC_MIPS_CALL16, R_MIPS_CALL16 },
-  { BFD_RELOC_MIPS_GPREL32, R_MIPS_GPREL32 },
-  { BFD_RELOC_MIPS_GOT_HI16, R_MIPS_GOT_HI16 },
-  { BFD_RELOC_MIPS_GOT_LO16, R_MIPS_GOT_LO16 },
-  { BFD_RELOC_MIPS_CALL_HI16, R_MIPS_CALL_HI16 },
-  { BFD_RELOC_MIPS_CALL_LO16, R_MIPS_CALL_LO16 }
-};
-
-/* Given a BFD reloc type, return a howto structure.  */
-
-static reloc_howto_type *
-mips_elf64_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0; i < sizeof (mips_reloc_map) / sizeof (struct elf_reloc_map); i++)
-    {
-      if (mips_reloc_map[i].bfd_reloc_val == code)
-	{
-	  int v;
-
-	  v = (int) mips_reloc_map[i].elf_reloc_val;
-	  return &mips_elf64_howto_table_rel[v];
-	}
-    }
-
-  return NULL;
-}
-
-/* Since each entry in an SHT_REL or SHT_RELA section can represent up
-   to three relocs, we must tell the user to allocate more space.  */
-
-static long
-mips_elf64_get_reloc_upper_bound (abfd, sec)
-     bfd *abfd;
-     asection *sec;
-{
-  return (sec->reloc_count * 3 + 1) * sizeof (arelent *);
-}
-
-/* Read the relocations from one reloc section.  */
-
-static boolean
-mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, rel_hdr)
-     bfd *abfd;
-     asection *asect;
-     asymbol **symbols;
-     const Elf_Internal_Shdr *rel_hdr;
-{
-  PTR allocated = NULL;
-  bfd_byte *native_relocs;
-  arelent *relents;
-  arelent *relent;
-  unsigned int count;
-  unsigned int i;
-  int entsize;
-  reloc_howto_type *howto_table;
-
-  allocated = (PTR) bfd_malloc (rel_hdr->sh_size);
-  if (allocated == NULL)
-    goto error_return;
-
-  if (bfd_seek (abfd, rel_hdr->sh_offset, SEEK_SET) != 0
-      || (bfd_read (allocated, 1, rel_hdr->sh_size, abfd) != rel_hdr->sh_size))
-    goto error_return;
-
-  native_relocs = (bfd_byte *) allocated;
-
-  relents = asect->relocation + asect->reloc_count;
-
-  entsize = rel_hdr->sh_entsize;
-  BFD_ASSERT (entsize == sizeof (Elf64_Mips_External_Rel)
-	      || entsize == sizeof (Elf64_Mips_External_Rela));
-
-  count = rel_hdr->sh_size / entsize;
-
-  if (entsize == sizeof (Elf64_Mips_External_Rel))
-    howto_table = mips_elf64_howto_table_rel;
-  else
-    howto_table = mips_elf64_howto_table_rela;
-
-  relent = relents;
-  for (i = 0; i < count; i++, native_relocs += entsize)
-    {
-      Elf64_Mips_Internal_Rela rela;
-      boolean used_sym, used_ssym;
-      int ir;
-
-      if (entsize == sizeof (Elf64_Mips_External_Rela))
-	mips_elf64_swap_reloca_in (abfd,
-				   (Elf64_Mips_External_Rela *) native_relocs,
-				   &rela);
-      else
-	{
-	  Elf64_Mips_Internal_Rel rel;
-
-	  mips_elf64_swap_reloc_in (abfd,
-				    (Elf64_Mips_External_Rel *) native_relocs,
-				    &rel);
-	  rela.r_offset = rel.r_offset;
-	  rela.r_sym = rel.r_sym;
-	  rela.r_ssym = rel.r_ssym;
-	  rela.r_type3 = rel.r_type3;
-	  rela.r_type2 = rel.r_type2;
-	  rela.r_type = rel.r_type;
-	  rela.r_addend = 0;
-	}
-
-      /* Each entry represents up to three actual relocations.  */
-
-      used_sym = false;
-      used_ssym = false;
-      for (ir = 0; ir < 3; ir++)
-	{
-	  enum elf_mips_reloc_type type;
-
-	  switch (ir)
-	    {
-	    default:
-	      abort ();
-	    case 0:
-	      type = (enum elf_mips_reloc_type) rela.r_type;
-	      break;
-	    case 1:
-	      type = (enum elf_mips_reloc_type) rela.r_type2;
-	      break;
-	    case 2:
-	      type = (enum elf_mips_reloc_type) rela.r_type3;
-	      break;
-	    }
-
-	  if (type == R_MIPS_NONE)
-	    {
-	      /* There are no more relocations in this entry.  If this
-                 is the first entry, we need to generate a dummy
-                 relocation so that the generic linker knows that
-                 there has been a break in the sequence of relocations
-                 applying to a particular address.  */
-	      if (ir == 0)
-		{
-		  relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-		  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
-		    relent->address = rela.r_offset;
-		  else
-		    relent->address = rela.r_offset - asect->vma;
-		  relent->addend = 0;
-		  relent->howto = &howto_table[(int) R_MIPS_NONE];
-		  ++relent;
-		}
-	      break;
-	    }
-
-	  /* Some types require symbols, whereas some do not.  */
-	  switch (type)
-	    {
-	    case R_MIPS_NONE:
-	    case R_MIPS_LITERAL:
-	    case R_MIPS_INSERT_A:
-	    case R_MIPS_INSERT_B:
-	    case R_MIPS_DELETE:
-	      relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	      break;
-
-	    default:
-	      if (! used_sym)
-		{
-		  if (rela.r_sym == 0)
-		    relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-		  else
-		    {
-		      asymbol **ps, *s;
-
-		      ps = symbols + rela.r_sym - 1;
-		      s = *ps;
-		      if ((s->flags & BSF_SECTION_SYM) == 0)
-			relent->sym_ptr_ptr = ps;
-		      else
-			relent->sym_ptr_ptr = s->section->symbol_ptr_ptr;
-		    }
-
-		  used_sym = true;
-		}
-	      else if (! used_ssym)
-		{
-		  switch (rela.r_ssym)
-		    {
-		    case RSS_UNDEF:
-		      relent->sym_ptr_ptr =
-			bfd_abs_section_ptr->symbol_ptr_ptr;
-		      break;
-
-		    case RSS_GP:
-		    case RSS_GP0:
-		    case RSS_LOC:
-		      /* FIXME: I think these need to be handled using
-                         special howto structures.  */
-		      BFD_ASSERT (0);
-		      break;
-
-		    default:
-		      BFD_ASSERT (0);
-		      break;
-		    }
-
-		  used_ssym = true;
-		}
-	      else
-		relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-
-	      break;
-	    }
-
-	  /* The address of an ELF reloc is section relative for an
-	     object file, and absolute for an executable file or
-	     shared library.  The address of a BFD reloc is always
-	     section relative.  */
-	  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
-	    relent->address = rela.r_offset;
-	  else
-	    relent->address = rela.r_offset - asect->vma;
-
-	  relent->addend = rela.r_addend;
-
-	  relent->howto = &howto_table[(int) type];
-
-	  ++relent;
-	}
-    }
-
-  asect->reloc_count += relent - relents;
-
-  if (allocated != NULL)
-    free (allocated);
-
-  return true;
-
- error_return:
-  if (allocated != NULL)
-    free (allocated);
-  return false;
-}
-
-/* Read the relocations.  On Irix 6, there can be two reloc sections
-   associated with a single data section.  */
-
-static boolean
-mips_elf64_slurp_reloc_table (abfd, asect, symbols, dynamic)
-     bfd *abfd;
-     asection *asect;
-     asymbol **symbols;
-     boolean dynamic;
-{
-  struct bfd_elf_section_data * const d = elf_section_data (asect);
-
-  if (dynamic)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  if (asect->relocation != NULL
-      || (asect->flags & SEC_RELOC) == 0
-      || asect->reloc_count == 0)
-    return true;
-
-  /* Allocate space for 3 arelent structures for each Rel structure.  */
-  asect->relocation = ((arelent *)
-		       bfd_alloc (abfd,
-				  asect->reloc_count * 3 * sizeof (arelent)));
-  if (asect->relocation == NULL)
-    return false;
-
-  /* The slurp_one_reloc_table routine increments reloc_count.  */
-  asect->reloc_count = 0;
-
-  if (! mips_elf64_slurp_one_reloc_table (abfd, asect, symbols, &d->rel_hdr))
-    return false;
-  if (d->rel_hdr2 != NULL)
-    {
-      if (! mips_elf64_slurp_one_reloc_table (abfd, asect, symbols,
-					      d->rel_hdr2))
-	return false;
-    }
-
-  return true;
-}
-
-/* Write out the relocations.  */
-
-static void
-mips_elf64_write_relocs (abfd, sec, data)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-{
-  boolean *failedp = (boolean *) data;
-  unsigned int count;
-  Elf_Internal_Shdr *rela_hdr;
-  Elf64_Mips_External_Rela *ext_rela;
-  unsigned int idx;
-  asymbol *last_sym = 0;
-  int last_sym_idx = 0;
-
-  /* If we have already failed, don't do anything.  */
-  if (*failedp)
-    return;
-
-  if ((sec->flags & SEC_RELOC) == 0)
-    return;
-
-  /* The linker backend writes the relocs out itself, and sets the
-     reloc_count field to zero to inhibit writing them here.  Also,
-     sometimes the SEC_RELOC flag gets set even when there aren't any
-     relocs.  */
-  if (sec->reloc_count == 0)
-    return;
-
-  /* We can combine up to three relocs that refer to the same address
-     if the latter relocs have no associated symbol.  */
-  count = 0;
-  for (idx = 0; idx < sec->reloc_count; idx++)
-    {
-      bfd_vma addr;
-      unsigned int i;
-
-      ++count;
-
-      addr = sec->orelocation[idx]->address;
-      for (i = 0; i < 2; i++)
-	{
-	  arelent *r;
-
-	  if (idx + 1 >= sec->reloc_count)
-	    break;
-	  r = sec->orelocation[idx + 1];
-	  if (r->address != addr
-	      || ! bfd_is_abs_section ((*r->sym_ptr_ptr)->section)
-	      || (*r->sym_ptr_ptr)->value != 0)
-	    break;
-
-	  /* We can merge the reloc at IDX + 1 with the reloc at IDX.  */
-
-	  ++idx;
-	}
-    }
-
-  rela_hdr = &elf_section_data (sec)->rel_hdr;
-
-  rela_hdr->sh_size = rela_hdr->sh_entsize * count;
-  rela_hdr->contents = (PTR) bfd_alloc (abfd, rela_hdr->sh_size);
-  if (rela_hdr->contents == NULL)
-    {
-      *failedp = true;
-      return;
-    }
-
-  ext_rela = (Elf64_Mips_External_Rela *) rela_hdr->contents;
-  for (idx = 0; idx < sec->reloc_count; idx++, ext_rela++)
-    {
-      arelent *ptr;
-      Elf64_Mips_Internal_Rela int_rela;
-      asymbol *sym;
-      int n;
-      unsigned int i;
-
-      ptr = sec->orelocation[idx];
-
-      /* The address of an ELF reloc is section relative for an object
-	 file, and absolute for an executable file or shared library.
-	 The address of a BFD reloc is always section relative.  */
-      if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
-	int_rela.r_offset = ptr->address;
-      else
-	int_rela.r_offset = ptr->address + sec->vma;
-
-      sym = *ptr->sym_ptr_ptr;
-      if (sym == last_sym)
-	n = last_sym_idx;
-      else
-	{
-	  last_sym = sym;
-	  n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
-	  if (n < 0)
-	    {
-	      *failedp = true;
-	      return;
-	    }
-	  last_sym_idx = n;
-	}
-
-      int_rela.r_sym = n;
-
-      int_rela.r_addend = ptr->addend;
-
-      int_rela.r_ssym = RSS_UNDEF;
-
-      if ((*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
-	  && ! _bfd_elf_validate_reloc (abfd, ptr))
-	{
-	  *failedp = true;
-	  return;
-	}
-
-      int_rela.r_type = ptr->howto->type;
-      int_rela.r_type2 = (int) R_MIPS_NONE;
-      int_rela.r_type3 = (int) R_MIPS_NONE;
-
-      for (i = 0; i < 2; i++)
-	{
-	  arelent *r;
-
-	  if (idx + 1 >= sec->reloc_count)
-	    break;
-	  r = sec->orelocation[idx + 1];
-	  if (r->address != ptr->address
-	      || ! bfd_is_abs_section ((*r->sym_ptr_ptr)->section)
-	      || (*r->sym_ptr_ptr)->value != 0)
-	    break;
-
-	  /* We can merge the reloc at IDX + 1 with the reloc at IDX.  */
-
-	  if (i == 0)
-	    int_rela.r_type2 = r->howto->type;
-	  else
-	    int_rela.r_type3 = r->howto->type;
-
-	  ++idx;
-	}
-
-      mips_elf64_swap_reloca_out (abfd, &int_rela, ext_rela);
-    }
-
-  BFD_ASSERT (ext_rela - (Elf64_Mips_External_Rela *) rela_hdr->contents
-	      == count);
-}
-
-/* Handle a 64-bit MIPS ELF specific section.  */
-
-static boolean
-mips_elf64_section_from_shdr (abfd, hdr, name)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-     char *name;
-{
-  if (! _bfd_mips_elf_section_from_shdr (abfd, hdr, name))
-    return false;
-
-  /* For a SHT_MIPS_OPTIONS section, look for a ODK_REGINFO entry, and
-     set the gp value based on what we find.  We may see both
-     SHT_MIPS_REGINFO and SHT_MIPS_OPTIONS/ODK_REGINFO; in that case,
-     they should agree.  */
-  if (hdr->sh_type == SHT_MIPS_OPTIONS)
-    {
-      bfd_byte *contents, *l, *lend;
-
-      contents = (bfd_byte *) bfd_malloc (hdr->sh_size);
-      if (contents == NULL)
-	return false;
-      if (! bfd_get_section_contents (abfd, hdr->bfd_section, contents,
-				      (file_ptr) 0, hdr->sh_size))
-	{
-	  free (contents);
-	  return false;
-	}
-      l = contents;
-      lend = contents + hdr->sh_size;
-      while (l + sizeof (Elf_External_Options) <= lend)
-	{
-	  Elf_Internal_Options intopt;
-
-	  bfd_mips_elf_swap_options_in (abfd, (Elf_External_Options *) l,
-					&intopt);
-	  if (intopt.kind == ODK_REGINFO)
-	    {
-	      Elf64_Internal_RegInfo intreg;
-
-	      bfd_mips_elf64_swap_reginfo_in
-		(abfd,
-		 ((Elf64_External_RegInfo *)
-		  (l + sizeof (Elf_External_Options))),
-		 &intreg);
-	      elf_gp (abfd) = intreg.ri_gp_value;
-	    }
-	  l += intopt.size;
-	}
-      free (contents);
-    }
-
-  return true;
-}
-
-/* Work over a section just before writing it out.  We update the GP
-   value in the SHT_MIPS_OPTIONS section based on the value we are
-   using.  */
-
-static boolean
-mips_elf64_section_processing (abfd, hdr)
-     bfd *abfd;
-     Elf_Internal_Shdr *hdr;
-{
-  if (hdr->sh_type == SHT_MIPS_OPTIONS
-      && hdr->bfd_section != NULL
-      && elf_section_data (hdr->bfd_section) != NULL
-      && elf_section_data (hdr->bfd_section)->tdata != NULL)
-    {
-      bfd_byte *contents, *l, *lend;
-
-      /* We stored the section contents in the elf_section_data tdata
-	 field in the set_section_contents routine.  We save the
-	 section contents so that we don't have to read them again.
-	 At this point we know that elf_gp is set, so we can look
-	 through the section contents to see if there is an
-	 ODK_REGINFO structure.  */
-
-      contents = (bfd_byte *) elf_section_data (hdr->bfd_section)->tdata;
-      l = contents;
-      lend = contents + hdr->sh_size;
-      while (l + sizeof (Elf_External_Options) <= lend)
-	{
-	  Elf_Internal_Options intopt;
-
-	  bfd_mips_elf_swap_options_in (abfd, (Elf_External_Options *) l,
-					&intopt);
-	  if (intopt.kind == ODK_REGINFO)
-	    {
-	      bfd_byte buf[8];
-
-	      if (bfd_seek (abfd,
-			    (hdr->sh_offset
-			     + (l - contents)
-			     + sizeof (Elf_External_Options)
-			     + (sizeof (Elf64_External_RegInfo) - 8)),
-			     SEEK_SET) == -1)
-		return false;
-	      bfd_h_put_64 (abfd, elf_gp (abfd), buf);
-	      if (bfd_write (buf, 1, 8, abfd) != 8)
-		return false;
-	    }
-	  l += intopt.size;
-	}
-    }
-
-  return _bfd_mips_elf_section_processing (abfd, hdr);
-}
-
-/* Irix 6 defines a brand new archive map format, so that they can
-   have archives more than 4 GB in size.  */
-
-/* Read an Irix 6 armap.  */
-
-static boolean
-mips_elf64_slurp_armap (abfd)
-     bfd *abfd;
-{
-  struct artdata *ardata = bfd_ardata (abfd);
-  char nextname[17];
-  file_ptr arhdrpos;
-  bfd_size_type i, parsed_size, nsymz, stringsize, carsym_size, ptrsize;
-  struct areltdata *mapdata;
-  bfd_byte int_buf[8];
-  char *stringbase;
-  bfd_byte *raw_armap = NULL;
-  carsym *carsyms;
-
-  ardata->symdefs = NULL;
-
-  /* Get the name of the first element.  */
-  arhdrpos = bfd_tell (abfd);
-  i = bfd_read ((PTR) nextname, 1, 16, abfd);
-  if (i == 0)
-    return true;
-  if (i != 16)
-    return false;
-
-  if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) != 0)
-    return false;
-
-  /* Archives with traditional armaps are still permitted.  */
-  if (strncmp (nextname, "/               ", 16) == 0)
-    return bfd_slurp_armap (abfd);
-
-  if (strncmp (nextname, "/SYM64/         ", 16) != 0)
-    {
-      bfd_has_map (abfd) = false;
-      return true;
-    }
-
-  mapdata = (struct areltdata *) _bfd_read_ar_hdr (abfd);
-  if (mapdata == NULL)
-    return false;
-  parsed_size = mapdata->parsed_size;
-  bfd_release (abfd, (PTR) mapdata);
-
-  if (bfd_read (int_buf, 1, 8, abfd) != 8)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_malformed_archive);
-      return false;
-    }
-
-  nsymz = bfd_getb64 (int_buf);
-  stringsize = parsed_size - 8 * nsymz - 8;
-
-  carsym_size = nsymz * sizeof (carsym);
-  ptrsize = 8 * nsymz;
-
-  ardata->symdefs = (carsym *) bfd_zalloc (abfd, carsym_size + stringsize + 1);
-  if (ardata->symdefs == NULL)
-    return false;
-  carsyms = ardata->symdefs;
-  stringbase = ((char *) ardata->symdefs) + carsym_size;
-
-  raw_armap = (bfd_byte *) bfd_alloc (abfd, ptrsize);
-  if (raw_armap == NULL)
-    goto error_return;
-
-  if (bfd_read (raw_armap, 1, ptrsize, abfd) != ptrsize
-      || bfd_read (stringbase, 1, stringsize, abfd) != stringsize)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_malformed_archive);
-      goto error_return;
-    }
-
-  for (i = 0; i < nsymz; i++)
-    {
-      carsyms->file_offset = bfd_getb64 (raw_armap + i * 8);
-      carsyms->name = stringbase;
-      stringbase += strlen (stringbase) + 1;
-      ++carsyms;
-    }
-  *stringbase = '\0';
-
-  ardata->symdef_count = nsymz;
-  ardata->first_file_filepos = arhdrpos + sizeof (struct ar_hdr) + parsed_size;
-
-  bfd_has_map (abfd) = true;
-  bfd_release (abfd, raw_armap);
-
-  return true;
-
- error_return:
-  if (raw_armap != NULL)
-    bfd_release (abfd, raw_armap);
-  if (ardata->symdefs != NULL)
-    bfd_release (abfd, ardata->symdefs);
-  return false;
-}
-
-/* Write out an Irix 6 armap.  The Irix 6 tools are supposed to be
-   able to handle ordinary ELF armaps, but at least on Irix 6.2 the
-   linker crashes.  */
-
-static boolean
-mips_elf64_write_armap (arch, elength, map, symbol_count, stridx)
-     bfd *arch;
-     unsigned int elength;
-     struct orl *map;
-     unsigned int symbol_count;
-     int stridx;
-{
-  unsigned int ranlibsize = (symbol_count * 8) + 8;
-  unsigned int stringsize = stridx;
-  unsigned int mapsize = stringsize + ranlibsize;
-  file_ptr archive_member_file_ptr;
-  bfd *current = arch->archive_head;
-  unsigned int count;
-  struct ar_hdr hdr;
-  unsigned int i;
-  int padding;
-  bfd_byte buf[8];
-
-  padding = BFD_ALIGN (mapsize, 8) - mapsize;
-  mapsize += padding;
-
-  /* work out where the first object file will go in the archive */
-  archive_member_file_ptr = (mapsize
-			     + elength
-			     + sizeof (struct ar_hdr)
-			     + SARMAG);
-
-  memset ((char *) (&hdr), 0, sizeof (struct ar_hdr));
-  strcpy (hdr.ar_name, "/SYM64/");
-  sprintf (hdr.ar_size, "%-10d", (int) mapsize);
-  sprintf (hdr.ar_date, "%ld", (long) time (NULL));
-  /* This, at least, is what Intel coff sets the values to.: */
-  sprintf ((hdr.ar_uid), "%d", 0);
-  sprintf ((hdr.ar_gid), "%d", 0);
-  sprintf ((hdr.ar_mode), "%-7o", (unsigned) 0);
-  strncpy (hdr.ar_fmag, ARFMAG, 2);
-
-  for (i = 0; i < sizeof (struct ar_hdr); i++)
-    if (((char *) (&hdr))[i] == '\0')
-      (((char *) (&hdr))[i]) = ' ';
-
-  /* Write the ar header for this item and the number of symbols */
-
-  if (bfd_write ((PTR) &hdr, 1, sizeof (struct ar_hdr), arch)
-      != sizeof (struct ar_hdr))
-    return false;
-
-  bfd_putb64 (symbol_count, buf);
-  if (bfd_write (buf, 1, 8, arch) != 8)
-    return false;
-
-  /* Two passes, first write the file offsets for each symbol -
-     remembering that each offset is on a two byte boundary.  */
-
-  /* Write out the file offset for the file associated with each
-     symbol, and remember to keep the offsets padded out.  */
-
-  current = arch->archive_head;
-  count = 0;
-  while (current != (bfd *) NULL && count < symbol_count)
-    {
-      /* For each symbol which is used defined in this object, write out
-	 the object file's address in the archive */
-
-      while (((bfd *) (map[count]).pos) == current)
-	{
-	  bfd_putb64 (archive_member_file_ptr, buf);
-	  if (bfd_write (buf, 1, 8, arch) != 8)
-	    return false;
-	  count++;
-	}
-      /* Add size of this archive entry */
-      archive_member_file_ptr += (arelt_size (current)
-				  + sizeof (struct ar_hdr));
-      /* remember about the even alignment */
-      archive_member_file_ptr += archive_member_file_ptr % 2;
-      current = current->next;
-    }
-
-  /* now write the strings themselves */
-  for (count = 0; count < symbol_count; count++)
-    {
-      size_t len = strlen (*map[count].name) + 1;
-
-      if (bfd_write (*map[count].name, 1, len, arch) != len)
-	return false;
-    }
-
-  /* The spec says that this should be padded to an 8 byte boundary.
-     However, the Irix 6.2 tools do not appear to do this.  */
-  while (padding != 0)
-    {
-      if (bfd_write ("", 1, 1, arch) != 1)
-	return false;
-      --padding;
-    }
-
-  return true;
-}
-
-/* ECOFF swapping routines.  These are used when dealing with the
-   .mdebug section, which is in the ECOFF debugging format.  */
-static const struct ecoff_debug_swap mips_elf64_ecoff_debug_swap =
-{
-  /* Symbol table magic number.  */
-  magicSym2,
-  /* Alignment of debugging information.  E.g., 4.  */
-  8,
-  /* Sizes of external symbolic information.  */
-  sizeof (struct hdr_ext),
-  sizeof (struct dnr_ext),
-  sizeof (struct pdr_ext),
-  sizeof (struct sym_ext),
-  sizeof (struct opt_ext),
-  sizeof (struct fdr_ext),
-  sizeof (struct rfd_ext),
-  sizeof (struct ext_ext),
-  /* Functions to swap in external symbolic data.  */
-  ecoff_swap_hdr_in,
-  ecoff_swap_dnr_in,
-  ecoff_swap_pdr_in,
-  ecoff_swap_sym_in,
-  ecoff_swap_opt_in,
-  ecoff_swap_fdr_in,
-  ecoff_swap_rfd_in,
-  ecoff_swap_ext_in,
-  _bfd_ecoff_swap_tir_in,
-  _bfd_ecoff_swap_rndx_in,
-  /* Functions to swap out external symbolic data.  */
-  ecoff_swap_hdr_out,
-  ecoff_swap_dnr_out,
-  ecoff_swap_pdr_out,
-  ecoff_swap_sym_out,
-  ecoff_swap_opt_out,
-  ecoff_swap_fdr_out,
-  ecoff_swap_rfd_out,
-  ecoff_swap_ext_out,
-  _bfd_ecoff_swap_tir_out,
-  _bfd_ecoff_swap_rndx_out,
-  /* Function to read in symbolic data.  */
-  _bfd_mips_elf_read_ecoff_info
-};
-
-/* Relocations in the 64 bit MIPS ELF ABI are more complex than in
-   standard ELF.  This structure is used to redirect the relocation
-   handling routines.  */
-
-const struct elf_size_info mips_elf64_size_info =
-{
-  sizeof (Elf64_External_Ehdr),
-  sizeof (Elf64_External_Phdr),
-  sizeof (Elf64_External_Shdr),
-  sizeof (Elf64_Mips_External_Rel),
-  sizeof (Elf64_Mips_External_Rela),
-  sizeof (Elf64_External_Sym),
-  sizeof (Elf64_External_Dyn),
-  sizeof (Elf_External_Note),
-  64,		/* arch_size */
-  8,		/* file_align */
-  ELFCLASS64,
-  EV_CURRENT,
-  bfd_elf64_write_out_phdrs,
-  bfd_elf64_write_shdrs_and_ehdr,
-  mips_elf64_write_relocs,
-  bfd_elf64_swap_symbol_out,
-  mips_elf64_slurp_reloc_table,
-  bfd_elf64_slurp_symbol_table,
-  bfd_elf64_swap_dyn_in
-};
-
-#define TARGET_LITTLE_SYM		bfd_elf64_littlemips_vec
-#define TARGET_LITTLE_NAME		"elf64-littlemips"
-#define TARGET_BIG_SYM			bfd_elf64_bigmips_vec
-#define TARGET_BIG_NAME			"elf64-bigmips"
-#define ELF_ARCH			bfd_arch_mips
-#define ELF_MACHINE_CODE		EM_MIPS
-#define ELF_MAXPAGESIZE			0x1000
-#define elf_backend_size_info		mips_elf64_size_info
-#define elf_backend_object_p		_bfd_mips_elf_object_p
-#define elf_backend_section_from_shdr	mips_elf64_section_from_shdr
-#define elf_backend_fake_sections	_bfd_mips_elf_fake_sections
-#define elf_backend_section_from_bfd_section \
-					_bfd_mips_elf_section_from_bfd_section
-#define elf_backend_section_processing	mips_elf64_section_processing
-#define elf_backend_symbol_processing	_bfd_mips_elf_symbol_processing
-#define elf_backend_final_write_processing \
-					_bfd_mips_elf_final_write_processing
-#define elf_backend_ecoff_debug_swap	&mips_elf64_ecoff_debug_swap
-
-#define bfd_elf64_find_nearest_line	_bfd_mips_elf_find_nearest_line
-#define bfd_elf64_get_reloc_upper_bound mips_elf64_get_reloc_upper_bound
-#define bfd_elf64_bfd_reloc_type_lookup	mips_elf64_reloc_type_lookup
-#define bfd_elf64_set_section_contents	_bfd_mips_elf_set_section_contents
-#define bfd_elf64_bfd_copy_private_bfd_data \
-					_bfd_mips_elf_copy_private_bfd_data
-#define bfd_elf64_bfd_merge_private_bfd_data \
-					_bfd_mips_elf_merge_private_bfd_data
-#define bfd_elf64_bfd_set_private_flags	_bfd_mips_elf_set_private_flags
-
-#define bfd_elf64_archive_functions
-#define bfd_elf64_archive_slurp_armap	mips_elf64_slurp_armap
-#define bfd_elf64_archive_slurp_extended_name_table \
-				_bfd_archive_coff_slurp_extended_name_table
-#define bfd_elf64_archive_construct_extended_name_table \
-				_bfd_archive_coff_construct_extended_name_table
-#define bfd_elf64_archive_truncate_arname \
-					_bfd_archive_coff_truncate_arname
-#define bfd_elf64_archive_write_armap	mips_elf64_write_armap
-#define bfd_elf64_archive_read_ar_hdr	_bfd_archive_coff_read_ar_hdr
-#define bfd_elf64_archive_openr_next_archived_file \
-				_bfd_archive_coff_openr_next_archived_file
-#define bfd_elf64_archive_get_elt_at_index \
-					_bfd_archive_coff_get_elt_at_index
-#define bfd_elf64_archive_generic_stat_arch_elt \
-					_bfd_archive_coff_generic_stat_arch_elt
-#define bfd_elf64_archive_update_armap_timestamp \
-				_bfd_archive_coff_update_armap_timestamp
-
-#include "elf64-target.h"
diff --git a/bfd/elf64-sparc.c b/bfd/elf64-sparc.c
deleted file mode 100644
index 17fe98dafc2..00000000000
--- a/bfd/elf64-sparc.c
+++ /dev/null
@@ -1,2275 +0,0 @@
-/* SPARC-specific support for 64-bit ELF
-   Copyright (C) 1993, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-/* This is defined if one wants to build upward compatible binaries
-   with the original sparc64-elf toolchain.  The support is kept in for
-   now but is turned off by default.  dje 970930  */
-/*#define SPARC64_OLD_RELOCS*/
-
-#include "elf/sparc.h"
-
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value.  */
-#define MINUS_ONE (~ (bfd_vma) 0)
-
-static reloc_howto_type *sparc64_elf_reloc_type_lookup
-  PARAMS ((bfd *, bfd_reloc_code_real_type));
-static void sparc64_elf_info_to_howto
-  PARAMS ((bfd *, arelent *, Elf_Internal_Rela *));
-
-static void sparc64_elf_build_plt
-  PARAMS((bfd *, unsigned char *, int));
-static bfd_vma sparc64_elf_plt_entry_offset
-  PARAMS((int));
-static bfd_vma sparc64_elf_plt_ptr_offset
-  PARAMS((int, int));
-
-static boolean sparc64_elf_check_relocs
-  PARAMS((bfd *, struct bfd_link_info *, asection *sec,
-	  const Elf_Internal_Rela *));
-static boolean sparc64_elf_adjust_dynamic_symbol
-  PARAMS((struct bfd_link_info *, struct elf_link_hash_entry *));
-static boolean sparc64_elf_size_dynamic_sections
-  PARAMS((bfd *, struct bfd_link_info *));
-static boolean sparc64_elf_adjust_dynindx
-  PARAMS((struct elf_link_hash_entry *, PTR));
-
-static boolean sparc64_elf_merge_private_bfd_data
-  PARAMS ((bfd *, bfd *));
-
-static boolean sparc64_elf_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   Elf_Internal_Rela *, Elf_Internal_Sym *, asection **));
-static boolean sparc64_elf_object_p PARAMS ((bfd *));
-
-/* The relocation "howto" table.  */
-
-static bfd_reloc_status_type sparc_elf_notsup_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type sparc_elf_wdisp16_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type sparc_elf_hix22_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static bfd_reloc_status_type sparc_elf_lox10_reloc
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-
-static reloc_howto_type sparc64_elf_howto_table[] =
-{
-  HOWTO(R_SPARC_NONE,      0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_8,         0,0, 8,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_8",       false,0,0x000000ff,true),
-  HOWTO(R_SPARC_16,        0,1,16,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_16",      false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_32,        0,2,32,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_32",      false,0,0xffffffff,true),
-  HOWTO(R_SPARC_DISP8,     0,0, 8,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP8",   false,0,0x000000ff,true),
-  HOWTO(R_SPARC_DISP16,    0,1,16,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP16",  false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_DISP32,    0,2,32,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP32",  false,0,0x00ffffff,true),
-  HOWTO(R_SPARC_WDISP30,   2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP30", false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_WDISP22,   2,2,22,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP22", false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HI22,     10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HI22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_22,        0,2,22,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_22",      false,0,0x003fffff,true),
-  HOWTO(R_SPARC_13,        0,2,13,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_13",      false,0,0x00001fff,true),
-  HOWTO(R_SPARC_LO10,      0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LO10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT10,     0,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT10",   false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT13,     0,2,13,false,0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_GOT13",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_GOT22,    10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GOT22",   false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC10,      0,2,10,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC22,     10,2,22,true, 0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_PC22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WPLT30,    2,2,30,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WPLT30",  false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_COPY,      0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_COPY",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_GLOB_DAT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_JMP_SLOT,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_RELATIVE,  0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_RELATIVE",false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA32,      0,0,00,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UA32",    false,0,0x00000000,true),
-#ifndef SPARC64_OLD_RELOCS
-  /* These aren't implemented yet.  */
-  HOWTO(R_SPARC_PLT32,     0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PLT32",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_HIPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_HIPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_LOPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_LOPLT10",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT32,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT32",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT22,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT22",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_PCPLT10,   0,0,00,false,0,complain_overflow_dont,    sparc_elf_notsup_reloc, "R_SPARC_PCPLT10",  false,0,0x00000000,true),
-#endif
-  HOWTO(R_SPARC_10,        0,2,10,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_10",      false,0,0x000003ff,true),
-  HOWTO(R_SPARC_11,        0,2,11,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_11",      false,0,0x000007ff,true),
-  HOWTO(R_SPARC_64,        0,4,64,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_64",      false,0,MINUS_ONE, true),
-  HOWTO(R_SPARC_OLO10,     0,2,13,false,0,complain_overflow_signed,  sparc_elf_notsup_reloc, "R_SPARC_OLO10",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_HH22,     42,2,22,false,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_HH22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HM10,     32,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_HM10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_LM22,     10,2,22,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_LM22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC_HH22,  42,2,22,true, 0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_PC_HH22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC_HM10,  32,2,10,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_HM10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC_LM22,  10,2,22,true, 0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_PC_LM22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WDISP16,   2,2,16,true, 0,complain_overflow_signed,  sparc_elf_wdisp16_reloc,"R_SPARC_WDISP16", false,0,0x00000000,true),
-  HOWTO(R_SPARC_WDISP19,   2,2,19,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_WDISP19", false,0,0x0007ffff,true),
-  HOWTO(R_SPARC_UNUSED_42, 0,0, 0,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_UNUSED_42",false,0,0x00000000,true),
-  HOWTO(R_SPARC_7,         0,2, 7,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_7",       false,0,0x0000007f,true),
-  HOWTO(R_SPARC_5,         0,2, 5,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_5",       false,0,0x0000001f,true),
-  HOWTO(R_SPARC_6,         0,2, 6,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_6",       false,0,0x0000003f,true),
-  HOWTO(R_SPARC_DISP64,    0,4,64,true, 0,complain_overflow_signed,  bfd_elf_generic_reloc,  "R_SPARC_DISP64",  false,0,MINUS_ONE, true),
-  HOWTO(R_SPARC_PLT64,     0,4,64,false,0,complain_overflow_bitfield,sparc_elf_notsup_reloc, "R_SPARC_PLT64",   false,0,MINUS_ONE, false),
-  HOWTO(R_SPARC_HIX22,     0,4, 0,false,0,complain_overflow_bitfield,sparc_elf_hix22_reloc,  "R_SPARC_HIX22",   false,0,MINUS_ONE, false),
-  HOWTO(R_SPARC_LOX10,     0,4, 0,false,0,complain_overflow_dont,    sparc_elf_lox10_reloc,  "R_SPARC_LOX10",   false,0,MINUS_ONE, false),
-  HOWTO(R_SPARC_H44,      22,2,22,false,0,complain_overflow_unsigned,bfd_elf_generic_reloc,  "R_SPARC_H44",     false,0,0x003fffff,false),
-  HOWTO(R_SPARC_M44,      12,2,10,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_M44",     false,0,0x000003ff,false),
-  HOWTO(R_SPARC_L44,       0,2,13,false,0,complain_overflow_dont,    bfd_elf_generic_reloc,  "R_SPARC_L44",     false,0,0x00000fff,false),
-  HOWTO(R_SPARC_REGISTER,  0,4, 0,false,0,complain_overflow_bitfield,sparc_elf_notsup_reloc, "R_SPARC_REGISTER",false,0,MINUS_ONE, false),
-  HOWTO(R_SPARC_UA64,        0,4,64,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA64",      false,0,MINUS_ONE, true),
-  HOWTO(R_SPARC_UA16,        0,1,16,false,0,complain_overflow_bitfield,bfd_elf_generic_reloc,  "R_SPARC_UA16",      false,0,0x0000ffff,true)
-};
-
-struct elf_reloc_map {
-  bfd_reloc_code_real_type bfd_reloc_val;
-  unsigned char elf_reloc_val;
-};
-
-static CONST struct elf_reloc_map sparc_reloc_map[] =
-{
-  { BFD_RELOC_NONE, R_SPARC_NONE, },
-  { BFD_RELOC_16, R_SPARC_16, },
-  { BFD_RELOC_8, R_SPARC_8 },
-  { BFD_RELOC_8_PCREL, R_SPARC_DISP8 },
-  { BFD_RELOC_CTOR, R_SPARC_64 },
-  { BFD_RELOC_32, R_SPARC_32 },
-  { BFD_RELOC_32_PCREL, R_SPARC_DISP32 },
-  { BFD_RELOC_HI22, R_SPARC_HI22 },
-  { BFD_RELOC_LO10, R_SPARC_LO10, },
-  { BFD_RELOC_32_PCREL_S2, R_SPARC_WDISP30 },
-  { BFD_RELOC_SPARC22, R_SPARC_22 },
-  { BFD_RELOC_SPARC13, R_SPARC_13 },
-  { BFD_RELOC_SPARC_GOT10, R_SPARC_GOT10 },
-  { BFD_RELOC_SPARC_GOT13, R_SPARC_GOT13 },
-  { BFD_RELOC_SPARC_GOT22, R_SPARC_GOT22 },
-  { BFD_RELOC_SPARC_PC10, R_SPARC_PC10 },
-  { BFD_RELOC_SPARC_PC22, R_SPARC_PC22 },
-  { BFD_RELOC_SPARC_WPLT30, R_SPARC_WPLT30 },
-  { BFD_RELOC_SPARC_COPY, R_SPARC_COPY },
-  { BFD_RELOC_SPARC_GLOB_DAT, R_SPARC_GLOB_DAT },
-  { BFD_RELOC_SPARC_JMP_SLOT, R_SPARC_JMP_SLOT },
-  { BFD_RELOC_SPARC_RELATIVE, R_SPARC_RELATIVE },
-  { BFD_RELOC_SPARC_WDISP22, R_SPARC_WDISP22 },
-  /* ??? Doesn't dwarf use this?  */
-/*{ BFD_RELOC_SPARC_UA32, R_SPARC_UA32 }, not used?? */
-  {BFD_RELOC_SPARC_10, R_SPARC_10},
-  {BFD_RELOC_SPARC_11, R_SPARC_11},
-  {BFD_RELOC_SPARC_64, R_SPARC_64},
-  {BFD_RELOC_SPARC_OLO10, R_SPARC_OLO10},
-  {BFD_RELOC_SPARC_HH22, R_SPARC_HH22},
-  {BFD_RELOC_SPARC_HM10, R_SPARC_HM10},
-  {BFD_RELOC_SPARC_LM22, R_SPARC_LM22},
-  {BFD_RELOC_SPARC_PC_HH22, R_SPARC_PC_HH22},
-  {BFD_RELOC_SPARC_PC_HM10, R_SPARC_PC_HM10},
-  {BFD_RELOC_SPARC_PC_LM22, R_SPARC_PC_LM22},
-  {BFD_RELOC_SPARC_WDISP16, R_SPARC_WDISP16},
-  {BFD_RELOC_SPARC_WDISP19, R_SPARC_WDISP19},
-  {BFD_RELOC_SPARC_7, R_SPARC_7},
-  {BFD_RELOC_SPARC_5, R_SPARC_5},
-  {BFD_RELOC_SPARC_6, R_SPARC_6},
-  {BFD_RELOC_SPARC_DISP64, R_SPARC_DISP64},
-  {BFD_RELOC_SPARC_PLT64, R_SPARC_PLT64},
-  {BFD_RELOC_SPARC_HIX22, R_SPARC_HIX22},
-  {BFD_RELOC_SPARC_LOX10, R_SPARC_LOX10},
-  {BFD_RELOC_SPARC_H44, R_SPARC_H44},
-  {BFD_RELOC_SPARC_M44, R_SPARC_M44},
-  {BFD_RELOC_SPARC_L44, R_SPARC_L44},
-  {BFD_RELOC_SPARC_REGISTER, R_SPARC_REGISTER}
-};
-
-static reloc_howto_type *
-sparc64_elf_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-  for (i = 0; i < sizeof (sparc_reloc_map) / sizeof (struct elf_reloc_map); i++)
-    {
-      if (sparc_reloc_map[i].bfd_reloc_val == code)
-	return &sparc64_elf_howto_table[(int) sparc_reloc_map[i].elf_reloc_val];
-    }
-  return 0;
-}
-
-static void
-sparc64_elf_info_to_howto (abfd, cache_ptr, dst)
-     bfd *abfd;
-     arelent *cache_ptr;
-     Elf64_Internal_Rela *dst;
-{
-  BFD_ASSERT (ELF64_R_TYPE (dst->r_info) < (unsigned int) R_SPARC_max);
-  cache_ptr->howto = &sparc64_elf_howto_table[ELF64_R_TYPE (dst->r_info)];
-}
-
-/* Utility for performing the standard initial work of an instruction
-   relocation.
-   *PRELOCATION will contain the relocated item.
-   *PINSN will contain the instruction from the input stream.
-   If the result is `bfd_reloc_other' the caller can continue with
-   performing the relocation.  Otherwise it must stop and return the
-   value to its caller.  */
-
-static bfd_reloc_status_type
-init_insn_reloc (abfd,
-		 reloc_entry,
-		 symbol,
-		 data,
-		 input_section,
-		 output_bfd,
-		 prelocation,
-		 pinsn)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     bfd_vma *prelocation;
-     bfd_vma *pinsn;
-{
-  bfd_vma relocation;
-  reloc_howto_type *howto = reloc_entry->howto;
-
-  if (output_bfd != (bfd *) NULL
-      && (symbol->flags & BSF_SECTION_SYM) == 0
-      && (! howto->partial_inplace
-	  || reloc_entry->addend == 0))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* This works because partial_inplace == false.  */
-  if (output_bfd != NULL)
-    return bfd_reloc_continue;
-
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  relocation = (symbol->value
-		+ symbol->section->output_section->vma
-		+ symbol->section->output_offset);
-  relocation += reloc_entry->addend;
-  if (howto->pc_relative)
-    {
-      relocation -= (input_section->output_section->vma
-		     + input_section->output_offset);
-      relocation -= reloc_entry->address;
-    }
-
-  *prelocation = relocation;
-  *pinsn = bfd_get_32 (abfd, (bfd_byte *) data + reloc_entry->address);
-  return bfd_reloc_other;
-}
-
-/* For unsupported relocs.  */
-
-static bfd_reloc_status_type
-sparc_elf_notsup_reloc (abfd,
-			reloc_entry,
-			symbol,
-			data,
-			input_section,
-			output_bfd,
-			error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  return bfd_reloc_notsupported;
-}
-
-/* Handle the WDISP16 reloc.  */
-
-static bfd_reloc_status_type
-sparc_elf_wdisp16_reloc (abfd, reloc_entry, symbol, data, input_section,
-			 output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_vma insn;
-  bfd_reloc_status_type status;
-
-  status = init_insn_reloc (abfd, reloc_entry, symbol, data,
-			    input_section, output_bfd, &relocation, &insn);
-  if (status != bfd_reloc_other)
-    return status;
-
-  insn = (insn & ~0x303fff) | ((((relocation >> 2) & 0xc000) << 6)
-			       | ((relocation >> 2) & 0x3fff));
-  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
-
-  if ((bfd_signed_vma) relocation < - 0x40000
-      || (bfd_signed_vma) relocation > 0x3ffff)
-    return bfd_reloc_overflow;
-  else
-    return bfd_reloc_ok;
-}
-
-/* Handle the HIX22 reloc.  */
-
-static bfd_reloc_status_type
-sparc_elf_hix22_reloc (abfd,
-		       reloc_entry,
-		       symbol,
-		       data,
-		       input_section,
-		       output_bfd,
-		       error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_vma insn;
-  bfd_reloc_status_type status;
-
-  status = init_insn_reloc (abfd, reloc_entry, symbol, data,
-			    input_section, output_bfd, &relocation, &insn);
-  if (status != bfd_reloc_other)
-    return status;
-
-  relocation ^= MINUS_ONE;
-  insn = (insn & ~0x3fffff) | ((relocation >> 10) & 0x3fffff);
-  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
-
-  if ((relocation & ~ (bfd_vma) 0xffffffff) != 0)
-    return bfd_reloc_overflow;
-  else
-    return bfd_reloc_ok;
-}
-
-/* Handle the LOX10 reloc.  */
-
-static bfd_reloc_status_type
-sparc_elf_lox10_reloc (abfd,
-		       reloc_entry,
-		       symbol,
-		       data,
-		       input_section,
-		       output_bfd,
-		       error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_vma insn;
-  bfd_reloc_status_type status;
-
-  status = init_insn_reloc (abfd, reloc_entry, symbol, data,
-			    input_section, output_bfd, &relocation, &insn);
-  if (status != bfd_reloc_other)
-    return status;
-
-  insn = (insn & ~0x1fff) | 0x1c00 | (relocation & 0x3ff);
-  bfd_put_32 (abfd, insn, (bfd_byte *) data + reloc_entry->address);
-
-  return bfd_reloc_ok;
-}
-
-/* PLT/GOT stuff */
-
-/* Both the headers and the entries are icache aligned.  */
-#define PLT_ENTRY_SIZE		32
-#define PLT_HEADER_SIZE		(4 * PLT_ENTRY_SIZE)
-#define LARGE_PLT_THRESHOLD	32768
-#define GOT_RESERVED_ENTRIES	1
-
-#define ELF_DYNAMIC_INTERPRETER "/usr/lib/sparcv9/ld.so.1"
-
-
-/* Fill in the .plt section.  */
-
-static void
-sparc64_elf_build_plt (output_bfd, contents, nentries)
-     bfd *output_bfd;
-     unsigned char *contents;
-     int nentries;
-{
-  const unsigned int nop = 0x01000000;
-  int i, j;
-  
-  /* The first four entries are reserved, and are initially undefined.
-     We fill them with `illtrap 0' to force ld.so to do something.  */
-
-  for (i = 0; i < PLT_HEADER_SIZE/4; ++i)
-    bfd_put_32 (output_bfd, 0, contents+i*4);
-
-  /* The first 32768 entries are close enough to plt1 to get there via
-     a straight branch.  */
-
-  for (i = 4; i < LARGE_PLT_THRESHOLD && i < nentries; ++i)
-    {
-      unsigned char *entry = contents + i * PLT_ENTRY_SIZE;
-      unsigned int sethi, ba;
-
-      /* sethi (. - plt0), %g1 */
-      sethi = 0x03000000 | (i * PLT_ENTRY_SIZE);
-
-      /* ba,a,pt %icc, plt1 */
-      ba = 0x30480000 | (((contents+PLT_ENTRY_SIZE) - (entry+4)) / 4 & 0x7ffff);
-
-      bfd_put_32 (output_bfd, sethi, entry);
-      bfd_put_32 (output_bfd, ba, entry+4);
-      bfd_put_32 (output_bfd, nop, entry+8);
-      bfd_put_32 (output_bfd, nop, entry+12);
-      bfd_put_32 (output_bfd, nop, entry+16);
-      bfd_put_32 (output_bfd, nop, entry+20);
-      bfd_put_32 (output_bfd, nop, entry+24);
-      bfd_put_32 (output_bfd, nop, entry+28);
-    }
-
-  /* Now the tricky bit.  Entries 32768 and higher are grouped in blocks of
-     160: 160 entries and 160 pointers.  This is to separate code from data,
-     which is much friendlier on the cache.  */
-  
-  for (; i < nentries; i += 160)
-    {
-      int block = (i + 160 <= nentries ? 160 : nentries - i);
-      for (j = 0; j < block; ++j)
-	{
-	  unsigned char *entry, *ptr;
-	  unsigned int ldx;
-
-	  entry = contents + i*PLT_ENTRY_SIZE + j*4*6;
-	  ptr = contents + i*PLT_ENTRY_SIZE + block*4*6 + j*8;
-
-	  /* ldx [%o7 + ptr - entry+4], %g1 */
-	  ldx = 0xc25be000 | ((ptr - entry+4) & 0x1fff);
-
-	  bfd_put_32 (output_bfd, 0x8a10000f, entry);    /* mov %o7,%g5 */
-	  bfd_put_32 (output_bfd, 0x40000002, entry+4);  /* call .+8 */
-	  bfd_put_32 (output_bfd, nop, entry+8);         /* nop */
-	  bfd_put_32 (output_bfd, ldx, entry+12);        /* ldx [%o7+P],%g1 */
-	  bfd_put_32 (output_bfd, 0x83c3c001, entry+16); /* jmpl %o7+%g1,%g1 */
-	  bfd_put_32 (output_bfd, 0x9e100005, entry+20); /* mov %g5,%o7 */
-
-	  bfd_put_64 (output_bfd, contents - entry+4, ptr);
-	}
-    }
-}
-
-/* Return the offset of a particular plt entry within the .plt section.  */
-
-static bfd_vma
-sparc64_elf_plt_entry_offset (index)
-     int index;
-{
-  int block, ofs;
-
-  if (index < LARGE_PLT_THRESHOLD)
-    return index * PLT_ENTRY_SIZE;
-
-  /* See above for details.  */
-
-  block = (index - LARGE_PLT_THRESHOLD) / 160;
-  ofs = (index - LARGE_PLT_THRESHOLD) % 160;
-
-  return ((bfd_vma)(LARGE_PLT_THRESHOLD + block*160) * PLT_ENTRY_SIZE
-	  + ofs * 6*4);
-}
-
-static bfd_vma
-sparc64_elf_plt_ptr_offset (index, max)
-     int index, max;
-{
-  int block, ofs, last;
-
-  BFD_ASSERT(index >= LARGE_PLT_THRESHOLD);
-
-  /* See above for details.  */
-
-  block = (index - LARGE_PLT_THRESHOLD) / 160;
-  ofs = (index - LARGE_PLT_THRESHOLD) % 160;
-  last = (max - LARGE_PLT_THRESHOLD) % 160;
-
-  return ((LARGE_PLT_THRESHOLD + block*160) * PLT_ENTRY_SIZE
-	  + last * 6*4
-	  + ofs * 8);
-}
-
-
-
-/* Look through the relocs for a section during the first phase, and
-   allocate space in the global offset table or procedure linkage
-   table.  */
-
-static boolean
-sparc64_elf_check_relocs (abfd, info, sec, relocs)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     const Elf_Internal_Rela *relocs;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_vma *local_got_offsets;
-  const Elf_Internal_Rela *rel;
-  const Elf_Internal_Rela *rel_end;
-  asection *sgot;
-  asection *srelgot;
-  asection *sreloc;
-
-  if (info->relocateable || !(sec->flags & SEC_ALLOC))
-    return true;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (abfd);
-  local_got_offsets = elf_local_got_offsets (abfd);
-
-  sgot = NULL;
-  srelgot = NULL;
-  sreloc = NULL;
-
-  rel_end = relocs + sec->reloc_count;
-  for (rel = relocs; rel < rel_end; rel++)
-    {
-      unsigned long r_symndx;
-      struct elf_link_hash_entry *h;
-
-      r_symndx = ELF64_R_SYM (rel->r_info);
-      if (r_symndx < symtab_hdr->sh_info)
-	h = NULL;
-      else
-	h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-
-      switch (ELF64_R_TYPE (rel->r_info))
-	{
-	case R_SPARC_GOT10:
-	case R_SPARC_GOT13:
-	case R_SPARC_GOT22:
-	  /* This symbol requires a global offset table entry.  */
-
-	  if (dynobj == NULL)
-	    {
-	      /* Create the .got section.  */
-	      elf_hash_table (info)->dynobj = dynobj = abfd;
-	      if (! _bfd_elf_create_got_section (dynobj, info))
-		return false;
-	    }
-
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (srelgot == NULL && (h != NULL || info->shared))
-	    {
-	      srelgot = bfd_get_section_by_name (dynobj, ".rela.got");
-	      if (srelgot == NULL)
-		{
-		  srelgot = bfd_make_section (dynobj, ".rela.got");
-		  if (srelgot == NULL
-		      || ! bfd_set_section_flags (dynobj, srelgot,
-						  (SEC_ALLOC
-						   | SEC_LOAD
-						   | SEC_HAS_CONTENTS
-						   | SEC_IN_MEMORY
-						   | SEC_LINKER_CREATED
-						   | SEC_READONLY))
-		      || ! bfd_set_section_alignment (dynobj, srelgot, 3))
-		    return false;
-		}
-	    }
-
-	  if (h != NULL)
-	    {
-	      if (h->got.offset != (bfd_vma) -1)
-		{
-		  /* We have already allocated space in the .got.  */
-		  break;
-		}
-	      h->got.offset = sgot->_raw_size;
-
-	      /* Make sure this symbol is output as a dynamic symbol.  */
-	      if (h->dynindx == -1)
-		{
-		  if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		    return false;
-		}
-
-	      srelgot->_raw_size += sizeof (Elf64_External_Rela);
-	    }
-	  else
-	    {
-	      /* This is a global offset table entry for a local
-                 symbol.  */
-	      if (local_got_offsets == NULL)
-		{
-		  size_t size;
-		  register unsigned int i;
-
-		  size = symtab_hdr->sh_info * sizeof (bfd_vma);
-		  local_got_offsets = (bfd_vma *) bfd_alloc (abfd, size);
-		  if (local_got_offsets == NULL)
-		    return false;
-		  elf_local_got_offsets (abfd) = local_got_offsets;
-		  for (i = 0; i < symtab_hdr->sh_info; i++)
-		    local_got_offsets[i] = (bfd_vma) -1;
-		}
-	      if (local_got_offsets[r_symndx] != (bfd_vma) -1)
-		{
-		  /* We have already allocated space in the .got.  */
-		  break;
-		}
-	      local_got_offsets[r_symndx] = sgot->_raw_size;
-
-	      if (info->shared)
-		{
-		  /* If we are generating a shared object, we need to
-                     output a R_SPARC_RELATIVE reloc so that the
-                     dynamic linker can adjust this GOT entry.  */
-		  srelgot->_raw_size += sizeof (Elf64_External_Rela);
-		}
-	    }
-
-	  sgot->_raw_size += 8;
-
-#if 0
-	  /* Doesn't work for 64-bit -fPIC, since sethi/or builds
-	     unsigned numbers.  If we permit ourselves to modify
-	     code so we get sethi/xor, this could work.
-	     Question: do we consider conditionally re-enabling
-             this for -fpic, once we know about object code models?  */
-	  /* If the .got section is more than 0x1000 bytes, we add
-	     0x1000 to the value of _GLOBAL_OFFSET_TABLE_, so that 13
-	     bit relocations have a greater chance of working.  */
-	  if (sgot->_raw_size >= 0x1000
-	      && elf_hash_table (info)->hgot->root.u.def.value == 0)
-	    elf_hash_table (info)->hgot->root.u.def.value = 0x1000;
-#endif
-
-	  break;
-
-	case R_SPARC_WPLT30:
-	case R_SPARC_PLT32:
-	case R_SPARC_HIPLT22:
-	case R_SPARC_LOPLT10:
-	case R_SPARC_PCPLT32:
-	case R_SPARC_PCPLT22:
-	case R_SPARC_PCPLT10:
-	case R_SPARC_PLT64:
-	  /* This symbol requires a procedure linkage table entry.  We
-             actually build the entry in adjust_dynamic_symbol,
-             because this might be a case of linking PIC code without
-             linking in any dynamic objects, in which case we don't
-             need to generate a procedure linkage table after all.  */
-
-	  if (h == NULL)
-	    {
-	      /* It does not make sense to have a procedure linkage
-                 table entry for a local symbol.  */
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-
-	  /* Make sure this symbol is output as a dynamic symbol.  */
-	  if (h->dynindx == -1)
-	    {
-	      if (! bfd_elf64_link_record_dynamic_symbol (info, h))
-		return false;
-	    }
-
-	  h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_PLT;
-	  break;
-
-	case R_SPARC_PC10:
-	case R_SPARC_PC22:
-	case R_SPARC_PC_HH22:
-	case R_SPARC_PC_HM10:
-	case R_SPARC_PC_LM22:
-	  if (h != NULL
-	      && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0)
-	    break;
-	  /* Fall through.  */
-	case R_SPARC_DISP8:
-	case R_SPARC_DISP16:
-	case R_SPARC_DISP32:
-	case R_SPARC_DISP64:
-	case R_SPARC_WDISP30:
-	case R_SPARC_WDISP22:
-	case R_SPARC_WDISP19:
-	case R_SPARC_WDISP16:
-	  if (h == NULL)
-	    break;
-	  /* Fall through.  */
-	case R_SPARC_8:
-	case R_SPARC_16:
-	case R_SPARC_32:
-	case R_SPARC_HI22:
-	case R_SPARC_22:
-	case R_SPARC_13:
-	case R_SPARC_LO10:
-	case R_SPARC_UA32:
-	case R_SPARC_10:
-	case R_SPARC_11:
-	case R_SPARC_64:
-	case R_SPARC_OLO10:
-	case R_SPARC_HH22:
-	case R_SPARC_HM10:
-	case R_SPARC_LM22:
-	case R_SPARC_7:
-	case R_SPARC_5:
-	case R_SPARC_6:
-	case R_SPARC_HIX22:
-	case R_SPARC_LOX10:
-	case R_SPARC_H44:
-	case R_SPARC_M44:
-	case R_SPARC_L44:
-	case R_SPARC_UA64:
-	case R_SPARC_UA16:
-	  /* When creating a shared object, we must copy these relocs
-	     into the output file.  We create a reloc section in
-	     dynobj and make room for the reloc. 
-
-	     But don't do this for debugging sections -- this shows up
-	     with DWARF2 -- first because they are not loaded, and
-	     second because DWARF sez the debug info is not to be
-	     biased by the load address.  */
-	  if (info->shared && (sec->flags & SEC_ALLOC))
-	    {
-	      if (sreloc == NULL)
-		{
-		  const char *name;
-
-		  name = (bfd_elf_string_from_elf_section
-			  (abfd,
-			   elf_elfheader (abfd)->e_shstrndx,
-			   elf_section_data (sec)->rel_hdr.sh_name));
-		  if (name == NULL)
-		    return false;
-
-		  BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-			      && strcmp (bfd_get_section_name (abfd, sec),
-					 name + 5) == 0);
-
-		  sreloc = bfd_get_section_by_name (dynobj, name);
-		  if (sreloc == NULL)
-		    {
-		      flagword flags;
-
-		      sreloc = bfd_make_section (dynobj, name);
-		      flags = (SEC_HAS_CONTENTS | SEC_READONLY
-			       | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-		      if ((sec->flags & SEC_ALLOC) != 0)
-			flags |= SEC_ALLOC | SEC_LOAD;
-		      if (sreloc == NULL
-			  || ! bfd_set_section_flags (dynobj, sreloc, flags)
-			  || ! bfd_set_section_alignment (dynobj, sreloc, 3))
-			return false;
-		    }
-		}
-
-	      sreloc->_raw_size += sizeof (Elf64_External_Rela);
-	    }
-	  break;
-
-	case R_SPARC_REGISTER:
-	  /* Nothing to do.  */
-	  break;
-
-	default:
-	  (*_bfd_error_handler)(_("%s: check_relocs: unhandled reloc type %d"),
-				bfd_get_filename(abfd),
-				ELF64_R_TYPE (rel->r_info));
-	  return false;
-	}
-    }
-
-  return true;
-}
-
-/* Adjust a symbol defined by a dynamic object and referenced by a
-   regular object.  The current definition is in some section of the
-   dynamic object, but we're not including those sections.  We have to
-   change the definition to something the rest of the link can
-   understand.  */
-
-static boolean
-sparc64_elf_adjust_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  bfd *dynobj;
-  asection *s;
-  unsigned int power_of_two;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* Make sure we know what is going on here.  */
-  BFD_ASSERT (dynobj != NULL
-	      && ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT)
-		  || h->weakdef != NULL
-		  || ((h->elf_link_hash_flags
-		       & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_REF_REGULAR) != 0
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR) == 0)));
-
-  /* If this is a function, put it in the procedure linkage table.  We
-     will fill in the contents of the procedure linkage table later
-     (although we could actually do it here).  The STT_NOTYPE
-     condition is a hack specifically for the Oracle libraries
-     delivered for Solaris; for some inexplicable reason, they define
-     some of their functions as STT_NOTYPE when they really should be
-     STT_FUNC.  */
-  if (h->type == STT_FUNC
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0
-      || (h->type == STT_NOTYPE
-	  && (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	  && (h->root.u.def.section->flags & SEC_CODE) != 0))
-    {
-      if (! elf_hash_table (info)->dynamic_sections_created)
-	{
-	  /* This case can occur if we saw a WPLT30 reloc in an input
-             file, but none of the input files were dynamic objects.
-             In such a case, we don't actually need to build a
-             procedure linkage table, and we can just do a WDISP30
-             reloc instead.  */
-	  BFD_ASSERT ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0);
-	  return true;
-	}
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-
-      /* The first four bit in .plt is reserved.  */
-      if (s->_raw_size == 0)
-	s->_raw_size = PLT_HEADER_SIZE;
-
-      /* If this symbol is not defined in a regular file, and we are
-	 not generating a shared library, then set the symbol to this
-	 location in the .plt.  This is required to make function
-	 pointers compare as equal between the normal executable and
-	 the shared library.  */
-      if (! info->shared
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  h->root.u.def.section = s;
-	  h->root.u.def.value = s->_raw_size;
-	}
-
-      /* To simplify matters later, just store the plt index here.  */
-      h->plt.offset = s->_raw_size / PLT_ENTRY_SIZE;
-
-      /* Make room for this entry.  */
-      s->_raw_size += PLT_ENTRY_SIZE;
-
-      /* We also need to make an entry in the .rela.plt section.  */
-
-      s = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (s != NULL);
-
-      /* The first plt entries are reserved, and the relocations must
-	 pair up exactly.  */
-      if (s->_raw_size == 0)
-	s->_raw_size += (PLT_HEADER_SIZE/PLT_ENTRY_SIZE
-			 * sizeof (Elf64_External_Rela));
-
-      s->_raw_size += sizeof (Elf64_External_Rela);
-
-      /* The procedure linkage table size is bounded by the magnitude
-	 of the offset we can describe in the entry.  */
-      if (s->_raw_size >= (bfd_vma)1 << 32)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      return true;
-    }
-
-  /* If this is a weak symbol, and there is a real definition, the
-     processor independent code will have arranged for us to see the
-     real definition first, and we can just use the same value.  */
-  if (h->weakdef != NULL)
-    {
-      BFD_ASSERT (h->weakdef->root.type == bfd_link_hash_defined
-		  || h->weakdef->root.type == bfd_link_hash_defweak);
-      h->root.u.def.section = h->weakdef->root.u.def.section;
-      h->root.u.def.value = h->weakdef->root.u.def.value;
-      return true;
-    }
-
-  /* This is a reference to a symbol defined by a dynamic object which
-     is not a function.  */
-
-  /* If we are creating a shared library, we must presume that the
-     only references to the symbol are via the global offset table.
-     For such cases we need not do anything here; the relocations will
-     be handled correctly by relocate_section.  */
-  if (info->shared)
-    return true;
-
-  /* We must allocate the symbol in our .dynbss section, which will
-     become part of the .bss section of the executable.  There will be
-     an entry for this symbol in the .dynsym section.  The dynamic
-     object will contain position independent code, so all references
-     from the dynamic object to this symbol will go through the global
-     offset table.  The dynamic linker will use the .dynsym entry to
-     determine the address it must put in the global offset table, so
-     both the dynamic object and the regular object will refer to the
-     same memory location for the variable.  */
-
-  s = bfd_get_section_by_name (dynobj, ".dynbss");
-  BFD_ASSERT (s != NULL);
-
-  /* We must generate a R_SPARC_COPY reloc to tell the dynamic linker
-     to copy the initial value out of the dynamic object and into the
-     runtime process image.  We need to remember the offset into the
-     .rel.bss section we are going to use.  */
-  if ((h->root.u.def.section->flags & SEC_ALLOC) != 0)
-    {
-      asection *srel;
-
-      srel = bfd_get_section_by_name (dynobj, ".rela.bss");
-      BFD_ASSERT (srel != NULL);
-      srel->_raw_size += sizeof (Elf64_External_Rela);
-      h->elf_link_hash_flags |= ELF_LINK_HASH_NEEDS_COPY;
-    }
-
-  /* We need to figure out the alignment required for this symbol.  I
-     have no idea how ELF linkers handle this.  16-bytes is the size
-     of the largest type that requires hard alignment -- long double.  */
-  power_of_two = bfd_log2 (h->size);
-  if (power_of_two > 4)
-    power_of_two = 4;
-
-  /* Apply the required alignment.  */
-  s->_raw_size = BFD_ALIGN (s->_raw_size,
-			    (bfd_size_type) (1 << power_of_two));
-  if (power_of_two > bfd_get_section_alignment (dynobj, s))
-    {
-      if (! bfd_set_section_alignment (dynobj, s, power_of_two))
-	return false;
-    }
-
-  /* Define the symbol as being at this point in the section.  */
-  h->root.u.def.section = s;
-  h->root.u.def.value = s->_raw_size;
-
-  /* Increment the section size to make room for the symbol.  */
-  s->_raw_size += h->size;
-
-  return true;
-}
-
-/* Set the sizes of the dynamic sections.  */
-
-static boolean
-sparc64_elf_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *s;
-  boolean reltext;
-  boolean relplt;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  BFD_ASSERT (dynobj != NULL);
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Set the contents of the .interp section to the interpreter.  */
-      if (! info->shared)
-	{
-	  s = bfd_get_section_by_name (dynobj, ".interp");
-	  BFD_ASSERT (s != NULL);
-	  s->_raw_size = sizeof ELF_DYNAMIC_INTERPRETER;
-	  s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER;
-	}
-    }
-  else
-    {
-      /* We may have created entries in the .rela.got section.
-         However, if we are not creating the dynamic sections, we will
-         not actually use these entries.  Reset the size of .rela.got,
-         which will cause it to get stripped from the output file
-         below.  */
-      s = bfd_get_section_by_name (dynobj, ".rela.got");
-      if (s != NULL)
-	s->_raw_size = 0;
-    }
-
-  /* The check_relocs and adjust_dynamic_symbol entry points have
-     determined the sizes of the various dynamic sections.  Allocate
-     memory for them.  */
-  reltext = false;
-  relplt = false;
-  for (s = dynobj->sections; s != NULL; s = s->next)
-    {
-      const char *name;
-      boolean strip;
-
-      if ((s->flags & SEC_LINKER_CREATED) == 0)
-	continue;
-
-      /* It's OK to base decisions on the section name, because none
-	 of the dynobj section names depend upon the input files.  */
-      name = bfd_get_section_name (dynobj, s);
-
-      strip = false;
-
-      if (strncmp (name, ".rela", 5) == 0)
-	{
-	  if (s->_raw_size == 0)
-	    {
-	      /* If we don't need this section, strip it from the
-		 output file.  This is to handle .rela.bss and
-		 .rel.plt.  We must create it in
-		 create_dynamic_sections, because it must be created
-		 before the linker maps input sections to output
-		 sections.  The linker does that before
-		 adjust_dynamic_symbol is called, and it is that
-		 function which decides whether anything needs to go
-		 into these sections.  */
-	      strip = true;
-	    }
-	  else
-	    {
-	      const char *outname;
-	      asection *target;
-
-	      /* If this relocation section applies to a read only
-		 section, then we probably need a DT_TEXTREL entry.  */
-	      outname = bfd_get_section_name (output_bfd,
-					      s->output_section);
-	      target = bfd_get_section_by_name (output_bfd, outname + 5);
-	      if (target != NULL
-		  && (target->flags & SEC_READONLY) != 0)
-		reltext = true;
-
-	      if (strcmp (name, ".rela.plt") == 0)
-		relplt = true;
-
-	      /* We use the reloc_count field as a counter if we need
-		 to copy relocs into the output file.  */
-	      s->reloc_count = 0;
-	    }
-	}
-      else if (strcmp (name, ".plt") != 0
-	       && strncmp (name, ".got", 4) != 0)
-	{
-	  /* It's not one of our sections, so don't allocate space.  */
-	  continue;
-	}
-
-      if (strip)
-	{
-	  _bfd_strip_section_from_output (s);
-	  continue;
-	}
-
-      /* Allocate memory for the section contents.  Zero the memory
-	 for the benefit of .rela.plt, which has 4 unused entries
-	 at the beginning, and we don't want garbage.  */
-      s->contents = (bfd_byte *) bfd_zalloc (dynobj, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      /* Add some entries to the .dynamic section.  We fill in the
-	 values later, in sparc64_elf_finish_dynamic_sections, but we
-	 must add the entries now so that we get the correct size for
-	 the .dynamic section.  The DT_DEBUG entry is filled in by the
-	 dynamic linker and used by the debugger.  */
-      if (! info->shared)
-	{
-	  if (! bfd_elf64_add_dynamic_entry (info, DT_DEBUG, 0))
-	    return false;
-	}
-
-      if (relplt)
-	{
-	  if (! bfd_elf64_add_dynamic_entry (info, DT_PLTGOT, 0)
-	      || ! bfd_elf64_add_dynamic_entry (info, DT_PLTRELSZ, 0)
-	      || ! bfd_elf64_add_dynamic_entry (info, DT_PLTREL, DT_RELA)
-	      || ! bfd_elf64_add_dynamic_entry (info, DT_JMPREL, 0)
-	      || ! bfd_elf64_add_dynamic_entry (info, DT_SPARC_PLTFMT,
-						(info->shared != 0) + 1))
-	    return false;
-	}
-
-      if (! bfd_elf64_add_dynamic_entry (info, DT_RELA, 0)
-	  || ! bfd_elf64_add_dynamic_entry (info, DT_RELASZ, 0)
-	  || ! bfd_elf64_add_dynamic_entry (info, DT_RELAENT,
-					    sizeof (Elf64_External_Rela)))
-	return false;
-
-      if (reltext)
-	{
-	  if (! bfd_elf64_add_dynamic_entry (info, DT_TEXTREL, 0))
-	    return false;
-	}
-    }
-
-  /* If we are generating a shared library, we generate a section
-     symbol for each output section for which we might need to copy
-     relocs.  These are local symbols, which means that they must come
-     first in the dynamic symbol table.  That means we must increment
-     the dynamic symbol index of every other dynamic symbol.  */
-  if (info->shared)
-    {
-      int c;
-
-      c = 0;
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  if ((s->flags & SEC_LINKER_CREATED) != 0
-	      || (s->flags & SEC_ALLOC) == 0)
-	    continue;
-
-	  elf_section_data (s)->dynindx = c + 1;
-
-	  /* These symbols will have no names, so we don't need to
-             fiddle with dynstr_index.  */
-
-	  ++c;
-	}
-
-      elf_link_hash_traverse (elf_hash_table (info),
-			      sparc64_elf_adjust_dynindx,
-			      (PTR) &c);
-      elf_hash_table (info)->dynsymcount += c;
-    }
-
-  return true;
-}
-
-/* Increment the index of a dynamic symbol by a given amount.  Called
-   via elf_link_hash_traverse.  */
-
-static boolean
-sparc64_elf_adjust_dynindx (h, cparg)
-     struct elf_link_hash_entry *h;
-     PTR cparg;
-{
-  int *cp = (int *) cparg;
-
-  if (h->dynindx != -1)
-    h->dynindx += *cp;
-  return true;
-}
-
-
-/* Relocate a SPARC64 ELF section.  */
-
-static boolean
-sparc64_elf_relocate_section (output_bfd, info, input_bfd, input_section,
-			      contents, relocs, local_syms, local_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     Elf_Internal_Rela *relocs;
-     Elf_Internal_Sym *local_syms;
-     asection **local_sections;
-{
-  bfd *dynobj;
-  Elf_Internal_Shdr *symtab_hdr;
-  struct elf_link_hash_entry **sym_hashes;
-  bfd_vma *local_got_offsets;
-  bfd_vma got_base;
-  asection *sgot;
-  asection *splt;
-  asection *sreloc;
-  Elf_Internal_Rela *rel;
-  Elf_Internal_Rela *relend;
-
-  dynobj = elf_hash_table (info)->dynobj;
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  sym_hashes = elf_sym_hashes (input_bfd);
-  local_got_offsets = elf_local_got_offsets (input_bfd);
-
-  if (elf_hash_table(info)->hgot == NULL)
-    got_base = 0;
-  else
-    got_base = elf_hash_table (info)->hgot->root.u.def.value;
-
-  sgot = splt = sreloc = NULL;
-
-  rel = relocs;
-  relend = relocs + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      int r_type;
-      reloc_howto_type *howto;
-      long r_symndx;
-      struct elf_link_hash_entry *h;
-      Elf_Internal_Sym *sym;
-      asection *sec;
-      bfd_vma relocation;
-      bfd_reloc_status_type r;
-
-      r_type = ELF64_R_TYPE (rel->r_info);
-      if (r_type < 0 || r_type >= (int) R_SPARC_max)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      howto = sparc64_elf_howto_table + r_type;
-
-      r_symndx = ELF64_R_SYM (rel->r_info);
-
-      if (info->relocateable)
-	{
-	  /* This is a relocateable link.  We don't have to change
-	     anything, unless the reloc is against a section symbol,
-	     in which case we have to adjust according to where the
-	     section symbol winds up in the output section.  */
-	  if (r_symndx < symtab_hdr->sh_info)
-	    {
-	      sym = local_syms + r_symndx;
-	      if (ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-		{
-		  sec = local_sections[r_symndx];
-		  rel->r_addend += sec->output_offset + sym->st_value;
-		}
-	    }
-
-	  continue;
-	}
-
-      /* This is a final link.  */
-      h = NULL;
-      sym = NULL;
-      sec = NULL;
-      if (r_symndx < symtab_hdr->sh_info)
-	{
-	  sym = local_syms + r_symndx;
-	  sec = local_sections[r_symndx];
-	  relocation = (sec->output_section->vma
-			+ sec->output_offset
-			+ sym->st_value);
-	}
-      else
-	{
-	  h = sym_hashes[r_symndx - symtab_hdr->sh_info];
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      boolean skip_it = false;
-	      sec = h->root.u.def.section;
-
-	      switch (r_type)
-		{
-		case R_SPARC_WPLT30:
-		case R_SPARC_PLT32:
-		case R_SPARC_HIPLT22:
-		case R_SPARC_LOPLT10:
-		case R_SPARC_PCPLT32:
-		case R_SPARC_PCPLT22:
-		case R_SPARC_PCPLT10:
-		case R_SPARC_PLT64:
-		  if (h->plt.offset != (bfd_vma) -1)
-		    skip_it = true;
-		  break;
-
-		case R_SPARC_GOT10:
-		case R_SPARC_GOT13:
-		case R_SPARC_GOT22:
-		  if (elf_hash_table(info)->dynamic_sections_created
-		      && (!info->shared
-			  || (!info->symbolic && h->dynindx != -1)
-			  || !(h->elf_link_hash_flags
-			       & ELF_LINK_HASH_DEF_REGULAR)))
-		    skip_it = true;
-		  break;
-
-		case R_SPARC_PC10:
-		case R_SPARC_PC22:
-		case R_SPARC_PC_HH22:
-		case R_SPARC_PC_HM10:
-		case R_SPARC_PC_LM22:
-		  if (!strcmp(h->root.root.string, "_GLOBAL_OFFSET_TABLE_"))
-		    break;
-		  /* FALLTHRU */
-
-		case R_SPARC_8:
-		case R_SPARC_16:
-		case R_SPARC_32:
-		case R_SPARC_DISP8:
-		case R_SPARC_DISP16:
-		case R_SPARC_DISP32:
-		case R_SPARC_WDISP30:
-		case R_SPARC_WDISP22:
-		case R_SPARC_HI22:
-		case R_SPARC_22:
-		case R_SPARC_13:
-		case R_SPARC_LO10:
-		case R_SPARC_UA32:
-		case R_SPARC_10:
-		case R_SPARC_11:
-		case R_SPARC_64:
-		case R_SPARC_OLO10:
-		case R_SPARC_HH22:
-		case R_SPARC_HM10:
-		case R_SPARC_LM22:
-		case R_SPARC_WDISP19:
-		case R_SPARC_WDISP16:
-		case R_SPARC_7:
-		case R_SPARC_5:
-		case R_SPARC_6:
-		case R_SPARC_DISP64:
-		case R_SPARC_HIX22:
-		case R_SPARC_LOX10:
-		case R_SPARC_H44:
-		case R_SPARC_M44:
-		case R_SPARC_L44:
-		case R_SPARC_UA64:
-		case R_SPARC_UA16:
-		  if (info->shared
-		      && ((!info->symbolic && h->dynindx != -1)
-			  || !(h->elf_link_hash_flags
-			       & ELF_LINK_HASH_DEF_REGULAR)))
-		    skip_it = true;
-		  break;
-		}
-
-	      if (skip_it)
-		{
-		  /* In these cases, we don't need the relocation
-                     value.  We check specially because in some
-                     obscure cases sec->output_section will be NULL.  */
-		  relocation = 0;
-		}
-	      else
-		{
-		  relocation = (h->root.u.def.value
-				+ sec->output_section->vma
-				+ sec->output_offset);
-		}
-	    }
-	  else if (h->root.type == bfd_link_hash_undefweak)
-	    relocation = 0;
-	  else if (info->shared && !info->symbolic && !info->no_undefined)
-	    relocation = 0;
-	  else
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd,
-		      input_section, rel->r_offset)))
-		return false;
-	      relocation = 0;
-	    }
-	}
-
-      /* When generating a shared object, these relocations are copied
-	 into the output file to be resolved at run time.  */
-      if (info->shared && (input_section->flags & SEC_ALLOC))
-	{
-	  switch (r_type)
-	    {
-	    case R_SPARC_PC10:
-	    case R_SPARC_PC22:
-	    case R_SPARC_PC_HH22:
-	    case R_SPARC_PC_HM10:
-	    case R_SPARC_PC_LM22:
-	      if (h != NULL
-		  && !strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_"))
-		break;
-	      /* Fall through.  */
-	    case R_SPARC_DISP8:
-	    case R_SPARC_DISP16:
-	    case R_SPARC_DISP32:
-	    case R_SPARC_WDISP30:
-	    case R_SPARC_WDISP22:
-	    case R_SPARC_WDISP19:
-	    case R_SPARC_WDISP16:
-	    case R_SPARC_DISP64:
-	      if (h == NULL)
-		break;
-	      /* Fall through.  */
-	    case R_SPARC_8:
-	    case R_SPARC_16:
-	    case R_SPARC_32:
-	    case R_SPARC_HI22:
-	    case R_SPARC_22:
-	    case R_SPARC_13:
-	    case R_SPARC_LO10:
-	    case R_SPARC_UA32:
-	    case R_SPARC_10:
-	    case R_SPARC_11:
-	    case R_SPARC_64:
-	    case R_SPARC_OLO10:
-	    case R_SPARC_HH22:
-	    case R_SPARC_HM10:
-	    case R_SPARC_LM22:
-	    case R_SPARC_7:
-	    case R_SPARC_5:
-	    case R_SPARC_6:
-	    case R_SPARC_HIX22:
-	    case R_SPARC_LOX10:
-	    case R_SPARC_H44:
-	    case R_SPARC_M44:
-	    case R_SPARC_L44:
-	    case R_SPARC_UA64:
-	    case R_SPARC_UA16:
-	      {
-		Elf_Internal_Rela outrel;
-		boolean skip;
-
-		if (sreloc == NULL)
-		  {
-		    const char *name =
-		      (bfd_elf_string_from_elf_section
-		       (input_bfd,
-			elf_elfheader (input_bfd)->e_shstrndx,
-			elf_section_data (input_section)->rel_hdr.sh_name));
-
-		    if (name == NULL)
-		      return false;
-
-		    BFD_ASSERT (strncmp (name, ".rela", 5) == 0
-				&& strcmp (bfd_get_section_name(input_bfd,
-								input_section),
-					   name + 5) == 0);
-
-		    sreloc = bfd_get_section_by_name (dynobj, name);
-		    BFD_ASSERT (sreloc != NULL);
-		  }
-
-		skip = false;
-
-		if (elf_section_data (input_section)->stab_info == NULL)
-		  outrel.r_offset = rel->r_offset;
-		else
-		  {
-		    bfd_vma off;
-
-		    off = (_bfd_stab_section_offset
-			   (output_bfd, &elf_hash_table (info)->stab_info,
-			    input_section,
-			    &elf_section_data (input_section)->stab_info,
-			    rel->r_offset));
-		    if (off == MINUS_ONE)
-		      skip = true;
-		    outrel.r_offset = off;
-		  }
-
-		outrel.r_offset += (input_section->output_section->vma
-				    + input_section->output_offset);
-
-		/* Optimize unaligned reloc usage now that we know where
-		   it finally resides.  */
-		switch (r_type)
-		  {
-		  case R_SPARC_16:
-		    if (outrel.r_offset & 1) r_type = R_SPARC_UA16;
-		    break;
-		  case R_SPARC_UA16:
-		    if (!(outrel.r_offset & 1)) r_type = R_SPARC_16;
-		    break;
-		  case R_SPARC_32:
-		    if (outrel.r_offset & 3) r_type = R_SPARC_UA32;
-		    break;
-		  case R_SPARC_UA32:
-		    if (!(outrel.r_offset & 3)) r_type = R_SPARC_32;
-		    break;
-		  case R_SPARC_64:
-		    if (outrel.r_offset & 7) r_type = R_SPARC_UA64;
-		    break;
-		  case R_SPARC_UA64:
-		    if (!(outrel.r_offset & 7)) r_type = R_SPARC_64;
-		    break;
-		  }
-
-		if (skip)
-		  memset (&outrel, 0, sizeof outrel);
-		/* h->dynindx may be -1 if the symbol was marked to
-		   become local.  */
-		else if (h != NULL
-			 && ((! info->symbolic && h->dynindx != -1)
-			     || (h->elf_link_hash_flags
-				 & ELF_LINK_HASH_DEF_REGULAR) == 0))
-		  {
-		    BFD_ASSERT (h->dynindx != -1);
-		    outrel.r_info = ELF64_R_INFO (h->dynindx, r_type);
-		    outrel.r_addend = rel->r_addend;
-		  }
-		else
-		  {
-		    if (r_type == R_SPARC_64)
-		      {
-			outrel.r_info = ELF64_R_INFO (0, R_SPARC_RELATIVE);
-			outrel.r_addend = relocation + rel->r_addend;
-		      }
-		    else
-		      {
-			long indx;
-
-			if (h == NULL)
-			  sec = local_sections[r_symndx];
-			else
-			  {
-			    BFD_ASSERT (h->root.type == bfd_link_hash_defined
-					|| (h->root.type
-					    == bfd_link_hash_defweak));
-			    sec = h->root.u.def.section;
-			  }
-			if (sec != NULL && bfd_is_abs_section (sec))
-			  indx = 0;
-			else if (sec == NULL || sec->owner == NULL)
-			  {
-			    bfd_set_error (bfd_error_bad_value);
-			    return false;
-			  }
-			else
-			  {
-			    asection *osec;
-
-			    osec = sec->output_section;
-			    indx = elf_section_data (osec)->dynindx;
-
-			    /* FIXME: we really should be able to link non-pic
-			       shared libraries.  */
-			    if (indx == 0)
-			      {
-				BFD_FAIL ();
-				(*_bfd_error_handler)
-				  (_("%s: probably compiled without -fPIC?"),
-				   bfd_get_filename (input_bfd));
-				bfd_set_error (bfd_error_bad_value);
-				return false;
-			      }
-			  }
-
-			outrel.r_info = ELF64_R_INFO (indx, r_type);
-
-			/* For non-RELATIVE dynamic relocations, we keep the
-			   same symbol, and so generally the same addend.  But
-			   we do need to adjust those relocations referencing
-			   sections.  */
-			outrel.r_addend = rel->r_addend;
-			if (r_symndx < symtab_hdr->sh_info
-			    && ELF_ST_TYPE (sym->st_info) == STT_SECTION)
-			  outrel.r_addend += sec->output_offset+sym->st_value;
-		      }
-		  }
-
-		bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-					   (((Elf64_External_Rela *)
-					     sreloc->contents)
-					    + sreloc->reloc_count));
-		++sreloc->reloc_count;
-
-		/* This reloc will be computed at runtime, so there's no
-		   need to do anything now, unless this is a RELATIVE
-		   reloc in an unallocated section.  */
-		if (skip
-		    || (input_section->flags & SEC_ALLOC) != 0
-		    || ELF64_R_TYPE (outrel.r_info) != R_SPARC_RELATIVE)
-		  continue;
-	      }
-	    break;
-	    }
-	}
-
-      switch (r_type)
-	{
-	case R_SPARC_GOT10:
-	case R_SPARC_GOT13:
-	case R_SPARC_GOT22:
-	  /* Relocation is to the entry for this symbol in the global
-	     offset table.  */
-	  if (sgot == NULL)
-	    {
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      BFD_ASSERT (sgot != NULL);
-	    }
-
-	  if (h != NULL)
-	    {
-	      bfd_vma off = h->got.offset;
-	      BFD_ASSERT (off != (bfd_vma) -1);
-
-	      if (! elf_hash_table (info)->dynamic_sections_created
-		  || (info->shared
-		      && (info->symbolic || h->dynindx == -1)
-		      && (h->elf_link_hash_flags
-			  & ELF_LINK_HASH_DEF_REGULAR)))
-		{
-		  /* This is actually a static link, or it is a -Bsymbolic
-		     link and the symbol is defined locally, or the symbol
-		     was forced to be local because of a version file.  We
-		     must initialize this entry in the global offset table.
-		     Since the offset must always be a multiple of 8, we
-		     use the least significant bit to record whether we
-		     have initialized it already.
-
-		     When doing a dynamic link, we create a .rela.got
-		     relocation entry to initialize the value.  This is
-		     done in the finish_dynamic_symbol routine.  */
-
-		  if ((off & 1) != 0)
-		    off &= ~1;
-		  else
-		    {
-		      bfd_put_64 (output_bfd, relocation,
-				  sgot->contents + off);
-		      h->got.offset |= 1;
-		    }
-		}
-	      relocation = sgot->output_offset + off - got_base;
-	    }
-	  else
-	    {
-	      bfd_vma off;
-
-	      BFD_ASSERT (local_got_offsets != NULL);
-	      off = local_got_offsets[r_symndx];
-	      BFD_ASSERT (off != (bfd_vma) -1);
-
-	      /* The offset must always be a multiple of 8.  We use
-		 the least significant bit to record whether we have
-		 already processed this entry.  */
-	      if ((off & 1) != 0)
-		off &= ~1;
-	      else
-		{
-		  bfd_put_64 (output_bfd, relocation, sgot->contents + off);
-		  local_got_offsets[r_symndx] |= 1;
-
-		  if (info->shared)
-		    {
-		      asection *srelgot;
-		      Elf_Internal_Rela outrel;
-
-		      /* We need to generate a R_SPARC_RELATIVE reloc
-			 for the dynamic linker.  */
-		      srelgot = bfd_get_section_by_name(dynobj, ".rela.got");
-		      BFD_ASSERT (srelgot != NULL);
-
-		      outrel.r_offset = (sgot->output_section->vma
-					 + sgot->output_offset
-					 + off);
-		      outrel.r_info = ELF64_R_INFO (0, R_SPARC_RELATIVE);
-		      outrel.r_addend = relocation;
-		      bfd_elf64_swap_reloca_out (output_bfd, &outrel,
-						 (((Elf64_External_Rela *)
-						   srelgot->contents)
-						  + srelgot->reloc_count));
-		      ++srelgot->reloc_count;
-		    }
-		}
-	      relocation = sgot->output_offset + off - got_base;
-	    }
-	  goto do_default;
-
-	case R_SPARC_WPLT30:
-	case R_SPARC_PLT32:
-	case R_SPARC_HIPLT22:
-	case R_SPARC_LOPLT10:
-	case R_SPARC_PCPLT32:
-	case R_SPARC_PCPLT22:
-	case R_SPARC_PCPLT10:
-	case R_SPARC_PLT64:
-	  /* Relocation is to the entry for this symbol in the
-             procedure linkage table.  */
-	  BFD_ASSERT (h != NULL);
-
-	  if (h->plt.offset == (bfd_vma) -1)
-	    {
-	      /* We didn't make a PLT entry for this symbol.  This
-		 happens when statically linking PIC code, or when
-		 using -Bsymbolic.  */
-	      goto do_default;
-	    }
-
-	  if (splt == NULL)
-	    {
-	      splt = bfd_get_section_by_name (dynobj, ".plt");
-	      BFD_ASSERT (splt != NULL);
-	    }
-
-	  relocation = (splt->output_section->vma
-			+ splt->output_offset
-			+ sparc64_elf_plt_entry_offset (h->plt.offset));
-	  goto do_default;
-
-	case R_SPARC_OLO10:
-	  {
-	    bfd_vma x;
-
-	    relocation += rel->r_addend;
-	    relocation = (relocation & 0x3ff) + ELF64_R_TYPE_DATA (rel->r_info);
-
-	    x = bfd_get_32 (input_bfd, contents + rel->r_offset);
-	    x = (x & ~0x1fff) | (relocation & 0x1fff);
-	    bfd_put_32 (input_bfd, x, contents + rel->r_offset);
-
-	    r = bfd_check_overflow (howto->complain_on_overflow,
-				    howto->bitsize, howto->rightshift,
-				    bfd_arch_bits_per_address (input_bfd),
-				    relocation);
-	  }
-	  break;
-
-	case R_SPARC_WDISP16:
-	  {
-	    bfd_vma x;
-
-	    relocation += rel->r_addend;
-	    /* Adjust for pc-relative-ness.  */
-	    relocation -= (input_section->output_section->vma
-			   + input_section->output_offset);
-	    relocation -= rel->r_offset;
-
-	    x = bfd_get_32 (input_bfd, contents + rel->r_offset);
-	    x = (x & ~0x303fff) | ((((relocation >> 2) & 0xc000) << 6)
-				   | ((relocation >> 2) & 0x3fff));
-	    bfd_put_32 (input_bfd, x, contents + rel->r_offset);
-
-	    r = bfd_check_overflow (howto->complain_on_overflow,
-				    howto->bitsize, howto->rightshift,
-				    bfd_arch_bits_per_address (input_bfd),
-				    relocation);
-	  }
-	  break;
-
-	case R_SPARC_HIX22:
-	  {
-	    bfd_vma x;
-
-	    relocation += rel->r_addend;
-	    relocation = relocation ^ MINUS_ONE;
-
-	    x = bfd_get_32 (input_bfd, contents + rel->r_offset);
-	    x = (x & ~0x3fffff) | ((relocation >> 10) & 0x3fffff);
-	    bfd_put_32 (input_bfd, x, contents + rel->r_offset);
-
-	    r = bfd_check_overflow (howto->complain_on_overflow,
-				    howto->bitsize, howto->rightshift,
-				    bfd_arch_bits_per_address (input_bfd),
-				    relocation);
-	  }
-	  break;
-
-	case R_SPARC_LOX10:
-	  {
-	    bfd_vma x;
-
-	    relocation += rel->r_addend;
-	    relocation = (relocation & 0x3ff) | 0x1c00;
-
-	    x = bfd_get_32 (input_bfd, contents + rel->r_offset);
-	    x = (x & ~0x1fff) | relocation;
-	    bfd_put_32 (input_bfd, x, contents + rel->r_offset);
-
-	    r = bfd_reloc_ok;
-	  }
-	  break;
-
-	default:
-	do_default:
-	  r = _bfd_final_link_relocate (howto, input_bfd, input_section,
-					contents, rel->r_offset,
-					relocation, rel->r_addend);
-	  break;
-	}
-
-      switch (r)
-	{
-	case bfd_reloc_ok:
-	  break;
-
-	default:
-	case bfd_reloc_outofrange:
-	  abort ();
-
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-
-	    if (h != NULL)
-	      {
-		if (h->root.type == bfd_link_hash_undefweak
-		    && howto->pc_relative)
-		  {
-		    /* Assume this is a call protected by other code that
-		       detect the symbol is undefined.  If this is the case,
-		       we can safely ignore the overflow.  If not, the 
-		       program is hosed anyway, and a little warning isn't
-		       going to help.  */
-		    break;
-		  }
-		  
-	        name = h->root.root.string;
-	      }
-	    else
-	      {
-		name = (bfd_elf_string_from_elf_section
-			(input_bfd,
-			 symtab_hdr->sh_link,
-			 sym->st_name));
-		if (name == NULL)
-		  return false;
-		if (*name == '\0')
-		  name = bfd_section_name (input_bfd, sec);
-	      }
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto->name, (bfd_vma) 0,
-		    input_bfd, input_section, rel->r_offset)))
-	      return false;
-	  }
-	break;
-	}
-    }
-
-  return true;
-}
-
-/* Finish up dynamic symbol handling.  We set the contents of various
-   dynamic sections here.  */
-
-static boolean
-sparc64_elf_finish_dynamic_symbol (output_bfd, info, h, sym)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-     Elf_Internal_Sym *sym;
-{
-  bfd *dynobj;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  if (h->plt.offset != (bfd_vma) -1)
-    {
-      asection *splt;
-      asection *srela;
-      Elf_Internal_Rela rela;
-
-      /* This symbol has an entry in the PLT.  Set it up. */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      srela = bfd_get_section_by_name (dynobj, ".rela.plt");
-      BFD_ASSERT (splt != NULL && srela != NULL);
-
-      /* Fill in the entry in the .rela.plt section.  */
-
-      if (h->plt.offset < LARGE_PLT_THRESHOLD)
-	{
-	  rela.r_offset = sparc64_elf_plt_entry_offset (h->plt.offset);
-	  rela.r_addend = 0;
-	}
-      else
-	{
-	  int max = splt->_raw_size / PLT_ENTRY_SIZE;
-	  rela.r_offset = sparc64_elf_plt_ptr_offset (h->plt.offset, max);
-	  rela.r_addend = -(sparc64_elf_plt_entry_offset (h->plt.offset) + 4);
-	}
-      rela.r_offset += (splt->output_section->vma + splt->output_offset);
-      rela.r_info = ELF64_R_INFO (h->dynindx, R_SPARC_JMP_SLOT);
-
-      bfd_elf64_swap_reloca_out (output_bfd, &rela,
-				 ((Elf64_External_Rela *) srela->contents
-				  + h->plt.offset));
-
-      if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	{
-	  /* Mark the symbol as undefined, rather than as defined in
-	     the .plt section.  Leave the value alone.  */
-	  sym->st_shndx = SHN_UNDEF;
-	}
-    }
-
-  if (h->got.offset != (bfd_vma) -1)
-    {
-      asection *sgot;
-      asection *srela;
-      Elf_Internal_Rela rela;
-
-      /* This symbol has an entry in the GOT.  Set it up.  */
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-      srela = bfd_get_section_by_name (dynobj, ".rela.got");
-      BFD_ASSERT (sgot != NULL && srela != NULL);
-
-      rela.r_offset = (sgot->output_section->vma
-		       + sgot->output_offset
-		       + (h->got.offset &~ 1));
-
-      /* If this is a -Bsymbolic link, and the symbol is defined
-	 locally, we just want to emit a RELATIVE reloc.  Likewise if
-	 the symbol was forced to be local because of a version file.
-	 The entry in the global offset table will already have been
-	 initialized in the relocate_section function.  */
-      if (info->shared
-	  && (info->symbolic || h->dynindx == -1)
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR))
-	{
-	  asection *sec = h->root.u.def.section;
-	  rela.r_info = ELF64_R_INFO (0, R_SPARC_RELATIVE);
-	  rela.r_addend = (h->root.u.def.value
-			   + sec->output_section->vma
-			   + sec->output_offset);
-	}
-      else
-	{
-	  bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents + h->got.offset);
-	  rela.r_info = ELF64_R_INFO (h->dynindx, R_SPARC_GLOB_DAT);
-	  rela.r_addend = 0;
-	}
-
-      bfd_elf64_swap_reloca_out (output_bfd, &rela,
-				 ((Elf64_External_Rela *) srela->contents
-				  + srela->reloc_count));
-      ++srela->reloc_count;
-    }
-
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_COPY) != 0)
-    {
-      asection *s;
-      Elf_Internal_Rela rela;
-
-      /* This symbols needs a copy reloc.  Set it up.  */
-
-      BFD_ASSERT (h->dynindx != -1);
-
-      s = bfd_get_section_by_name (h->root.u.def.section->owner,
-				   ".rela.bss");
-      BFD_ASSERT (s != NULL);
-
-      rela.r_offset = (h->root.u.def.value
-		       + h->root.u.def.section->output_section->vma
-		       + h->root.u.def.section->output_offset);
-      rela.r_info = ELF64_R_INFO (h->dynindx, R_SPARC_COPY);
-      rela.r_addend = 0;
-      bfd_elf64_swap_reloca_out (output_bfd, &rela,
-				 ((Elf64_External_Rela *) s->contents
-				  + s->reloc_count));
-      ++s->reloc_count;
-    }
-
-  /* Mark some specially defined symbols as absolute.  */
-  if (strcmp (h->root.root.string, "_DYNAMIC") == 0
-      || strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0
-      || strcmp (h->root.root.string, "_PROCEDURE_LINKAGE_TABLE_") == 0)
-    sym->st_shndx = SHN_ABS;
-
-  return true;
-}
-
-/* Finish up the dynamic sections.  */
-
-static boolean
-sparc64_elf_finish_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *sdyn;
-  asection *sgot;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      asection *splt;
-      Elf64_External_Dyn *dyncon, *dynconend;
-
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (splt != NULL && sdyn != NULL);
-
-      dyncon = (Elf64_External_Dyn *) sdyn->contents;
-      dynconend = (Elf64_External_Dyn *) (sdyn->contents + sdyn->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  boolean size;
-
-	  bfd_elf64_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    case DT_PLTGOT:   name = ".plt"; size = false; break;
-	    case DT_PLTRELSZ: name = ".rela.plt"; size = true; break;
-	    case DT_JMPREL:   name = ".rela.plt"; size = false; break;
-	    default:	      name = NULL; size = false; break;
-	    }
-
-	  if (name != NULL)
-	    {
-	      asection *s;
-
-	      s = bfd_get_section_by_name (output_bfd, name);
-	      if (s == NULL)
-		dyn.d_un.d_val = 0;
-	      else
-		{
-		  if (! size)
-		    dyn.d_un.d_ptr = s->vma;
-		  else
-		    {
-		      if (s->_cooked_size != 0)
-			dyn.d_un.d_val = s->_cooked_size;
-		      else
-			dyn.d_un.d_val = s->_raw_size;
-		    }
-		}
-	      bfd_elf64_swap_dyn_out (output_bfd, &dyn, dyncon);
-	    }
-	}
-
-      /* Initialize the contents of the .plt section.  */
-      if (splt->_raw_size > 0)
-	{
-	  sparc64_elf_build_plt(output_bfd, splt->contents,
-				splt->_raw_size / PLT_ENTRY_SIZE);
-	}
-
-      elf_section_data (splt->output_section)->this_hdr.sh_entsize =
-	PLT_ENTRY_SIZE;
-    }
-
-  /* Set the first entry in the global offset table to the address of
-     the dynamic section.  */
-  sgot = bfd_get_section_by_name (dynobj, ".got");
-  BFD_ASSERT (sgot != NULL);
-  if (sgot->_raw_size > 0)
-    {
-      if (sdyn == NULL)
-	bfd_put_64 (output_bfd, (bfd_vma) 0, sgot->contents);
-      else
-	bfd_put_64 (output_bfd,
-		    sdyn->output_section->vma + sdyn->output_offset,
-		    sgot->contents);
-    }
-
-  elf_section_data (sgot->output_section)->this_hdr.sh_entsize = 8;
-
-  if (info->shared)
-    {
-      asection *sdynsym;
-      asection *s;
-      Elf_Internal_Sym sym;
-      int c;
-
-      /* Set up the section symbols for the output sections.  */
-
-      sdynsym = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (sdynsym != NULL);
-
-      sym.st_size = 0;
-      sym.st_name = 0;
-      sym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-      sym.st_other = 0;
-
-      c = 0;
-      for (s = output_bfd->sections; s != NULL; s = s->next)
-	{
-	  int indx;
-
-	  if (elf_section_data (s)->dynindx == 0)
-	    continue;
-
-	  sym.st_value = s->vma;
-
-	  indx = elf_section_data (s)->this_idx;
-	  BFD_ASSERT (indx > 0);
-	  sym.st_shndx = indx;
-
-	  bfd_elf64_swap_symbol_out (output_bfd, &sym,
-				     (PTR) (((Elf64_External_Sym *)
-					     sdynsym->contents)
-					    + elf_section_data (s)->dynindx));
-
-	  ++c;
-	}
-
-      /* Set the sh_info field of the output .dynsym section to the
-         index of the first global symbol.  */
-      elf_section_data (sdynsym->output_section)->this_hdr.sh_info = c + 1;
-    }
-
-  return true;
-}
-
-/* Functions for dealing with the e_flags field. */
-
-/* Merge backend specific data from an object file to the output
-   object file when linking.  */
-
-static boolean
-sparc64_elf_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-  boolean error;
-  flagword new_flags, old_flags;
-  int new_mm, old_mm;
-
-  if (bfd_get_flavour (ibfd) != bfd_target_elf_flavour
-      || bfd_get_flavour (obfd) != bfd_target_elf_flavour)
-    return true;
-
-  new_flags = elf_elfheader (ibfd)->e_flags;
-  old_flags = elf_elfheader (obfd)->e_flags;
-
-  if (!elf_flags_init (obfd))   /* First call, no flags set */
-    {
-      elf_flags_init (obfd) = true;
-      elf_elfheader (obfd)->e_flags = new_flags;
-    }
-                      
-  else if (new_flags == old_flags)      /* Compatible flags are ok */
-    ;
-                            
-  else                                  /* Incompatible flags */
-    {
-      error = false;
-  
-      old_flags |= (new_flags & (EF_SPARC_SUN_US1|EF_SPARC_HAL_R1));
-      new_flags |= (old_flags & (EF_SPARC_SUN_US1|EF_SPARC_HAL_R1));
-      if ((old_flags & (EF_SPARC_SUN_US1|EF_SPARC_HAL_R1)) ==
-           (EF_SPARC_SUN_US1|EF_SPARC_HAL_R1))
-        {
-          error = true;
-          (*_bfd_error_handler)
-            (_("%s: linking UltraSPARC specific with HAL specific code"),
-             bfd_get_filename (ibfd));
-        }
-        
-      /* Choose the most restrictive memory ordering */
-      old_mm = (old_flags & EF_SPARCV9_MM);
-      new_mm = (new_flags & EF_SPARCV9_MM);
-      old_flags &= ~EF_SPARCV9_MM;
-      new_flags &= ~EF_SPARCV9_MM;
-      if (new_mm < old_mm) old_mm = new_mm;
-      old_flags |= old_mm;
-      new_flags |= old_mm;
-
-      /* Warn about any other mismatches */
-      if (new_flags != old_flags)
-        {
-          error = true;
-          (*_bfd_error_handler)
-            (_("%s: uses different e_flags (0x%lx) fields than previous modules (0x%lx)"),
-             bfd_get_filename (ibfd), (long)new_flags, (long)old_flags);
-        }
-
-      elf_elfheader (obfd)->e_flags = old_flags;
-
-      if (error)
-        {
-          bfd_set_error (bfd_error_bad_value);
-          return false;
-        }
-    }
-  return true;
-}
-
-
-/* Set the right machine number for a SPARC64 ELF file.  */
-
-static boolean
-sparc64_elf_object_p (abfd)
-     bfd *abfd;
-{
-  unsigned long mach = bfd_mach_sparc_v9;
-  
-  if (elf_elfheader (abfd)->e_flags & EF_SPARC_SUN_US1)
-    mach = bfd_mach_sparc_v9a;
-  return bfd_default_set_arch_mach (abfd, bfd_arch_sparc, mach);
-}
-
-#define TARGET_BIG_SYM	bfd_elf64_sparc_vec
-#define TARGET_BIG_NAME	"elf64-sparc"
-#define ELF_ARCH	bfd_arch_sparc
-#define ELF_MAXPAGESIZE 0x100000
-
-/* This is the official ABI value.  */
-#define ELF_MACHINE_CODE EM_SPARCV9
-
-/* This is the value that we used before the ABI was released.  */
-#define ELF_MACHINE_ALT1 EM_OLD_SPARCV9
-
-#define elf_info_to_howto \
-  sparc64_elf_info_to_howto
-#define bfd_elf64_bfd_reloc_type_lookup \
-  sparc64_elf_reloc_type_lookup
-
-#define elf_backend_create_dynamic_sections \
-  _bfd_elf_create_dynamic_sections
-#define elf_backend_check_relocs \
-  sparc64_elf_check_relocs
-#define elf_backend_adjust_dynamic_symbol \
-  sparc64_elf_adjust_dynamic_symbol
-#define elf_backend_size_dynamic_sections \
-  sparc64_elf_size_dynamic_sections
-#define elf_backend_relocate_section \
-  sparc64_elf_relocate_section
-#define elf_backend_finish_dynamic_symbol \
-  sparc64_elf_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_sections \
-  sparc64_elf_finish_dynamic_sections
-
-#define bfd_elf64_bfd_merge_private_bfd_data \
-  sparc64_elf_merge_private_bfd_data
-
-#define elf_backend_object_p \
-  sparc64_elf_object_p
-
-#define elf_backend_want_got_plt 0
-#define elf_backend_plt_readonly 0
-#define elf_backend_want_plt_sym 1
-
-/* Section 5.2.4 of the ABI specifies a 256-byte boundary for the table.  */
-#define elf_backend_plt_alignment 8
-
-#define elf_backend_got_header_size 8
-#define elf_backend_plt_header_size PLT_HEADER_SIZE
-
-#include "elf64-target.h"
diff --git a/bfd/elf64.c b/bfd/elf64.c
deleted file mode 100644
index 69fb5b5e6e1..00000000000
--- a/bfd/elf64.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ELF 64-bit executable support for BFD.
-   Copyright 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define ARCH_SIZE		64
-
-#include "elfcode.h"
diff --git a/bfd/elfarm-nabi.c b/bfd/elfarm-nabi.c
deleted file mode 100644
index 5952e74e5ef..00000000000
--- a/bfd/elfarm-nabi.c
+++ /dev/null
@@ -1,670 +0,0 @@
-/* 32-bit ELF support for ARM new abi option.
-   Copyright 1999 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "elf/arm.h"
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-#ifndef NUM_ELEM
-#define NUM_ELEM(a)  (sizeof (a) / (sizeof (a)[0]))
-#endif
-
-#define USE_REL
-
-#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_vec
-#define TARGET_LITTLE_NAME              "elf32-littlearm"
-#define TARGET_BIG_SYM                  bfd_elf32_bigarm_vec
-#define TARGET_BIG_NAME                 "elf32-bigarm"
-
-#define elf_info_to_howto               0
-#define elf_info_to_howto_rel           elf32_arm_info_to_howto_rel 
-
-
-static reloc_howto_type * elf32_arm_reloc_type_lookup
-  PARAMS ((bfd * abfd, bfd_reloc_code_real_type code));
-
-static reloc_howto_type elf32_arm_howto_table[] =
-{
-  /* No relocation */
-  HOWTO (R_ARM_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_PC24,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 24,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_PC24",		/* name */
-	 false,			/* partial_inplace */
-	 0x00ffffff,		/* src_mask */
-	 0x00ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 32 bit absolute */
-  HOWTO (R_ARM_ABS32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* standard 32bit pc-relative reloc */
-  HOWTO (R_ARM_REL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_REL32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit absolute */
-  HOWTO (R_ARM_PC13,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_PC13",		/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-   /* 16 bit absolute */
-  HOWTO (R_ARM_ABS16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS16",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 12 bit absolute */
-  HOWTO (R_ARM_ABS12,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS12",		/* name */
-	 false,			/* partial_inplace */
-	 0x000008ff,		/* src_mask */
-	 0x000008ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_THM_ABS5,	/* type */
-	 6,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 5,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_ABS5",	/* name */
-	 false,			/* partial_inplace */
-	 0x000007e0,		/* src_mask */
-	 0x000007e0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 8 bit absolute */
-  HOWTO (R_ARM_ABS8,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS8",		/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_SBREL32,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_SBREL32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_THM_PC22,	/* type */
-	 1,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 23,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_PC22",	/* name */
-	 false,			/* partial_inplace */
-	 0x07ff07ff,		/* src_mask */
-	 0x07ff07ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  HOWTO (R_ARM_THM_PC8,	        /* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_PC8",	/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  HOWTO (R_ARM_AMP_VCALL9,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_AMP_VCALL9",	/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  HOWTO (R_ARM_SWI24,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_SWI24",		/* name */
-	 false,			/* partial_inplace */
-	 0x00000000,		/* src_mask */
-	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_THM_SWI8,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_SWI8",		/* name */
-	 false,			/* partial_inplace */
-	 0x00000000,		/* src_mask */
-	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* These next two relocs are defined, but I do not know what they do.  */
-  
-  HOWTO (R_ARM_XPC25,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_XPC25",		/* name */
-	 false,			/* partial_inplace */
-	 0x00000000,		/* src_mask */
-	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_THM_XPC22,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_XPC22",	/* name */
-	 false,			/* partial_inplace */
-	 0x00000000,		/* src_mask */
-	 0x00000000,		/* dst_mask */
-	 false),		/* pcrel_offset */
-  
-  /* These next three relocs are not defined, but we need to fill the space.  */
-
-  HOWTO (R_ARM_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_unknown_17",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_unknown_18",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_unknown_19",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Relocs used in ARM Linux */
-  
-  HOWTO (R_ARM_COPY,		/* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         32,                    /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_COPY",		/* name */
-         true,			/* partial_inplace */
-         0xffffffff,		/* src_mask */
-         0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
-
-  HOWTO (R_ARM_GLOB_DAT,	/* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         32,                    /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_GLOB_DAT",	/* name */
-         true,			/* partial_inplace */
-         0xffffffff,		/* src_mask */
-         0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
-         
-  HOWTO (R_ARM_JUMP_SLOT,	/* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         32,                    /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_JUMP_SLOT",	/* name */
-         true,			/* partial_inplace */
-         0xffffffff,		/* src_mask */
-         0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
-         
-  HOWTO (R_ARM_RELATIVE,	/* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         32,                    /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_RELATIVE",	/* name */
-         true,			/* partial_inplace */
-         0xffffffff,		/* src_mask */
-         0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
-         
-  HOWTO (R_ARM_GOTOFF,		/* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         32,                    /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_GOTOFF",	/* name */
-         true,			/* partial_inplace */
-         0xffffffff,		/* src_mask */
-         0xffffffff,		/* dst_mask */
-         false),                /* pcrel_offset */
-         
-  HOWTO (R_ARM_GOTPC,		/* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         32,                    /* bitsize */
-         true,			/* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_GOTPC",		/* name */
-         true,			/* partial_inplace */
-         0xffffffff,		/* src_mask */
-         0xffffffff,		/* dst_mask */
-         true),			/* pcrel_offset */
-         
-  HOWTO (R_ARM_GOT32,		/* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         32,                    /* bitsize */
-         false,			/* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_GOT32",		/* name */
-         true,			/* partial_inplace */
-         0xffffffff,		/* src_mask */
-         0xffffffff,		/* dst_mask */
-         false),		/* pcrel_offset */
-         
-  HOWTO (R_ARM_PLT32,		/* type */
-         2,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         26,                    /* bitsize */
-         true,			/* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_bitfield,/* complain_on_overflow */
-         bfd_elf_generic_reloc, /* special_function */
-         "R_ARM_PLT32",		/* name */
-         true,			/* partial_inplace */
-         0x00ffffff,		/* src_mask */
-         0x00ffffff,		/* dst_mask */
-         true),			/* pcrel_offset */
-  
-  /* End of relocs used in ARM Linux */ 
-
-  HOWTO (R_ARM_RREL32,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RREL32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_RABS32,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RABS32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_RPC24,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RPC24",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_RBASE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RBASE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-};
-
-  /* GNU extension to record C++ vtable hierarchy */
-static reloc_howto_type elf32_arm_vtinherit_howto =
-  HOWTO (R_ARM_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_ARM_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false);                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-static reloc_howto_type elf32_arm_vtentry_howto =
-  HOWTO (R_ARM_GNU_VTENTRY,     /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_ARM_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false);                /* pcrel_offset */
-
-  /* 12 bit pc relative */
-static reloc_howto_type elf32_arm_thm_pc11_howto =
-  HOWTO (R_ARM_THM_PC11,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 11,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_PC11",	/* name */
-	 false,			/* partial_inplace */
-	 0x000007ff,		/* src_mask */
-	 0x000007ff,		/* dst_mask */
-	 true);			/* pcrel_offset */
-
-  /* 12 bit pc relative */
-static reloc_howto_type elf32_arm_thm_pc9_howto =
-  HOWTO (R_ARM_THM_PC9,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_PC9",	/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 true);			/* pcrel_offset */
-
- 
-static void
-elf32_arm_info_to_howto_rel (abfd, bfd_reloc, elf_reloc)
-     bfd * abfd;
-     arelent * bfd_reloc;
-     Elf32_Internal_Rel * elf_reloc;
-{
-  unsigned int r_type;
-  
-  r_type = ELF32_R_TYPE (elf_reloc->r_info);
-
-  switch (r_type)
-    {
-    case R_ARM_GNU_VTINHERIT:
-      bfd_reloc->howto = & elf32_arm_vtinherit_howto;
-      break;
-      
-    case R_ARM_GNU_VTENTRY:
-      bfd_reloc->howto = & elf32_arm_vtentry_howto;
-      break;
-      
-    case R_ARM_THM_PC11:
-      bfd_reloc->howto = & elf32_arm_thm_pc11_howto;
-      break;
-      
-    case R_ARM_THM_PC9:
-      bfd_reloc->howto = & elf32_arm_thm_pc9_howto;
-      break;
-      
-    default:
-      if (r_type >= NUM_ELEM (elf32_arm_howto_table))
-	bfd_reloc->howto = NULL;
-      else
-        bfd_reloc->howto = & elf32_arm_howto_table[r_type];
-      break;
-    }
-}
-  
-struct elf32_arm_reloc_map
-  {
-    bfd_reloc_code_real_type  bfd_reloc_val;
-    unsigned char             elf_reloc_val;
-  };
-
-static const struct elf32_arm_reloc_map elf32_arm_reloc_map[] =
-{
-  {BFD_RELOC_NONE,                 R_ARM_NONE},
-  {BFD_RELOC_ARM_PCREL_BRANCH,     R_ARM_PC24},
-  {BFD_RELOC_32,                   R_ARM_ABS32},
-  {BFD_RELOC_32_PCREL,             R_ARM_REL32},
-  {BFD_RELOC_8,                    R_ARM_ABS8},
-  {BFD_RELOC_16,                   R_ARM_ABS16},
-  {BFD_RELOC_ARM_OFFSET_IMM,       R_ARM_ABS12},
-  {BFD_RELOC_ARM_THUMB_OFFSET,     R_ARM_THM_ABS5},
-  {BFD_RELOC_THUMB_PCREL_BRANCH23, R_ARM_THM_PC22},
-  {BFD_RELOC_ARM_COPY,             R_ARM_COPY},
-  {BFD_RELOC_ARM_GLOB_DAT,         R_ARM_GLOB_DAT},
-  {BFD_RELOC_ARM_JUMP_SLOT,        R_ARM_JUMP_SLOT},
-  {BFD_RELOC_ARM_RELATIVE,         R_ARM_RELATIVE},
-  {BFD_RELOC_ARM_GOTOFF,           R_ARM_GOTOFF},
-  {BFD_RELOC_ARM_GOTPC,            R_ARM_GOTPC},
-  {BFD_RELOC_ARM_GOT32,            R_ARM_GOT32},
-  {BFD_RELOC_ARM_PLT32,            R_ARM_PLT32}
-};
-
-static reloc_howto_type *
-elf32_arm_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  switch (code)
-    {
-    case BFD_RELOC_VTABLE_INHERIT:
-      return & elf32_arm_vtinherit_howto;
-
-    case BFD_RELOC_VTABLE_ENTRY:
-      return & elf32_arm_vtentry_howto;
-
-    case BFD_RELOC_THUMB_PCREL_BRANCH12:
-      return & elf32_arm_thm_pc11_howto;
-
-    case BFD_RELOC_THUMB_PCREL_BRANCH9:
-      return & elf32_arm_thm_pc9_howto;
-
-    default:
-      for (i = 0; i < NUM_ELEM (elf32_arm_reloc_map); i ++)
-	if (elf32_arm_reloc_map[i].bfd_reloc_val == code)
-	  return & elf32_arm_howto_table[elf32_arm_reloc_map[i].elf_reloc_val];
-      
-      return NULL;
-   }
-}
-
-#include "elf32-arm.h"
diff --git a/bfd/elfarm-oabi.c b/bfd/elfarm-oabi.c
deleted file mode 100644
index f219b92ea7b..00000000000
--- a/bfd/elfarm-oabi.c
+++ /dev/null
@@ -1,381 +0,0 @@
-/* 32-bit ELF support for ARM old abi option.
-   Copyright 1999 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "elf/arm-oabi.h"
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-#define USE_RELA
-
-#define TARGET_LITTLE_SYM               bfd_elf32_littlearm_oabi_vec
-#define TARGET_LITTLE_NAME              "elf32-littlearm-oabi"
-#define TARGET_BIG_SYM                  bfd_elf32_bigarm_oabi_vec
-#define TARGET_BIG_NAME                 "elf32-bigarm-oabi"
-
-#define elf_info_to_howto               elf32_arm_info_to_howto
-#define elf_info_to_howto_rel           0
-
-static reloc_howto_type elf32_arm_howto_table[] =
-{
-  /* No relocation */
-  HOWTO (R_ARM_NONE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_NONE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_PC24,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 24,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_PC24",		/* name */
-	 false,			/* partial_inplace */
-	 0x00ffffff,		/* src_mask */
-	 0x00ffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 32 bit absolute */
-  HOWTO (R_ARM_ABS32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* standard 32bit pc-relative reloc */
-  HOWTO (R_ARM_REL32,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_REL32",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 8 bit absolute */
-  HOWTO (R_ARM_ABS8,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS8",		/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-   /* 16 bit absolute */
-  HOWTO (R_ARM_ABS16,		/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS16",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 12 bit absolute */
-  HOWTO (R_ARM_ABS12,		/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 12,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_ABS12",		/* name */
-	 false,			/* partial_inplace */
-	 0x000008ff,		/* src_mask */
-	 0x000008ff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_THM_ABS5,	/* type */
-	 6,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 5,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_ABS5",	/* name */
-	 false,			/* partial_inplace */
-	 0x000007e0,		/* src_mask */
-	 0x000007e0,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_THM_PC22,	/* type */
-	 1,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 23,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_PC22",	/* name */
-	 false,			/* partial_inplace */
-	 0x07ff07ff,		/* src_mask */
-	 0x07ff07ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  HOWTO (R_ARM_SBREL32,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_SBREL32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_AMP_VCALL9,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_AMP_VCALL9",	/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 12 bit pc relative */
-  HOWTO (R_ARM_THM_PC11,	/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 11,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_PC11",	/* name */
-	 false,			/* partial_inplace */
-	 0x000007ff,		/* src_mask */
-	 0x000007ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* 12 bit pc relative */
-  HOWTO (R_ARM_THM_PC9,		/* type */
-	 1,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_THM_PC9",	/* name */
-	 false,			/* partial_inplace */
-	 0x000000ff,		/* src_mask */
-	 0x000000ff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* GNU extension to record C++ vtable hierarchy */
-  HOWTO (R_ARM_GNU_VTINHERIT, /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         NULL,                  /* special_function */
-         "R_ARM_GNU_VTINHERIT", /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
-
-  /* GNU extension to record C++ vtable member usage */
-  HOWTO (R_ARM_GNU_VTENTRY,     /* type */
-         0,                     /* rightshift */
-         2,                     /* size (0 = byte, 1 = short, 2 = long) */
-         0,                     /* bitsize */
-         false,                 /* pc_relative */
-         0,                     /* bitpos */
-         complain_overflow_dont, /* complain_on_overflow */
-         _bfd_elf_rel_vtable_reloc_fn,  /* special_function */
-         "R_ARM_GNU_VTENTRY",   /* name */
-         false,                 /* partial_inplace */
-         0,                     /* src_mask */
-         0,                     /* dst_mask */
-         false),                /* pcrel_offset */
- 
-
-  HOWTO (R_ARM_RREL32,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RREL32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_RABS32,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RABS32",	/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_RPC24,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RPC24",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  HOWTO (R_ARM_RBASE,		/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont,	/* complain_on_overflow */
-	 bfd_elf_generic_reloc,	/* special_function */
-	 "R_ARM_RBASE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-};
-
-static void
-elf32_arm_info_to_howto (abfd, bfd_reloc, elf_reloc)
-     bfd *abfd;
-     arelent *bfd_reloc;
-     Elf32_Internal_Rela *elf_reloc;
-{
-  unsigned int r_type;
-
-  r_type = ELF32_R_TYPE (elf_reloc->r_info);
-  /* fixme: need range test */
-  /* BFD_ASSERT (r_type < (unsigned int) R_ELF32_ARM_MAX); */
-  bfd_reloc->howto = &elf32_arm_howto_table[r_type];
-}
-
-struct elf32_arm_reloc_map
-  {
-    bfd_reloc_code_real_type bfd_reloc_val;
-    unsigned char elf_reloc_val;
-  };
-
-static const struct elf32_arm_reloc_map elf32_arm_reloc_map[] =
-{
-  {BFD_RELOC_NONE, R_ARM_NONE,},
-  {BFD_RELOC_ARM_PCREL_BRANCH, R_ARM_PC24,},
-  {BFD_RELOC_32, R_ARM_ABS32,},
-  {BFD_RELOC_32_PCREL, R_ARM_REL32,},
-  {BFD_RELOC_8, R_ARM_ABS8,},
-  {BFD_RELOC_16, R_ARM_ABS16,},
-  {BFD_RELOC_ARM_OFFSET_IMM, R_ARM_ABS12,},
-  {BFD_RELOC_ARM_THUMB_OFFSET, R_ARM_THM_ABS5,},
-  {BFD_RELOC_THUMB_PCREL_BRANCH23, R_ARM_THM_PC22,},
-  {BFD_RELOC_VTABLE_INHERIT, R_ARM_GNU_VTINHERIT },
-  {BFD_RELOC_VTABLE_ENTRY, R_ARM_GNU_VTENTRY },
-  {BFD_RELOC_NONE, R_ARM_SBREL32,},
-  {BFD_RELOC_NONE, R_ARM_AMP_VCALL9,},
-  {BFD_RELOC_THUMB_PCREL_BRANCH12, R_ARM_THM_PC11,},
-  {BFD_RELOC_THUMB_PCREL_BRANCH9, R_ARM_THM_PC9,}
-};
-
-static reloc_howto_type *
-elf32_arm_reloc_type_lookup (abfd, code)
-     bfd * abfd;
-     bfd_reloc_code_real_type code;
-{
-  unsigned int i;
-
-  for (i = 0;
-     i < sizeof (elf32_arm_reloc_map) / sizeof (struct elf32_arm_reloc_map);
-       i++)
-    {
-      if (elf32_arm_reloc_map[i].bfd_reloc_val == code)
-	return & elf32_arm_howto_table[elf32_arm_reloc_map[i].elf_reloc_val];
-    }
-
-  return NULL;
-}
-
-#define bfd_elf32_arm_allocate_interworking_sections \
-	bfd_elf32_arm_oabi_allocate_interworking_sections
-#define bfd_elf32_arm_get_bfd_for_interworking \
-	bfd_elf32_arm_oabi_get_bfd_for_interworking
-#define bfd_elf32_arm_process_before_allocation \
-	bfd_elf32_arm_oabi_process_before_allocation
-
-#include "elf32-arm.h"
diff --git a/bfd/elfcode.h b/bfd/elfcode.h
deleted file mode 100644
index 22f64886287..00000000000
--- a/bfd/elfcode.h
+++ /dev/null
@@ -1,1452 +0,0 @@
-/* ELF executable support for BFD.
-   Copyright 1991, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
-
-   Written by Fred Fish @ Cygnus Support, from information published
-   in "UNIX System V Release 4, Programmers Guide: ANSI C and
-   Programming Support Tools".  Sufficient support for gdb.
-
-   Rewritten by Mark Eichin @ Cygnus Support, from information
-   published in "System V Application Binary Interface", chapters 4
-   and 5, as well as the various "Processor Supplement" documents
-   derived from it. Added support for assembler and other object file
-   utilities.  Further work done by Ken Raeburn (Cygnus Support), Michael
-   Meissner (Open Software Foundation), and Peter Hoogenboom (University
-   of Utah) to finish and extend this.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Problems and other issues to resolve.
-
-   (1)	BFD expects there to be some fixed number of "sections" in
-        the object file.  I.E. there is a "section_count" variable in the
-	bfd structure which contains the number of sections.  However, ELF
-	supports multiple "views" of a file.  In particular, with current
-	implementations, executable files typically have two tables, a
-	program header table and a section header table, both of which
-	partition the executable.
-
-	In ELF-speak, the "linking view" of the file uses the section header
-	table to access "sections" within the file, and the "execution view"
-	uses the program header table to access "segments" within the file.
-	"Segments" typically may contain all the data from one or more
-	"sections".
-
-	Note that the section header table is optional in ELF executables,
-	but it is this information that is most useful to gdb.  If the
-	section header table is missing, then gdb should probably try
-	to make do with the program header table.  (FIXME)
-
-   (2)  The code in this file is compiled twice, once in 32-bit mode and
-	once in 64-bit mode.  More of it should be made size-independent
-	and moved into elf.c.
-
-   (3)	ELF section symbols are handled rather sloppily now.  This should
-	be cleaned up, and ELF section symbols reconciled with BFD section
-	symbols.
-
-   (4)  We need a published spec for 64-bit ELF.  We've got some stuff here
-	that we're using for SPARC V9 64-bit chips, but don't assume that
-	it's cast in stone.
- */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "elf-bfd.h"
-
-/* Renaming structures, typedefs, macros and functions to be size-specific.  */
-#define Elf_External_Ehdr	NAME(Elf,External_Ehdr)
-#define Elf_External_Sym	NAME(Elf,External_Sym)
-#define Elf_External_Shdr	NAME(Elf,External_Shdr)
-#define Elf_External_Phdr	NAME(Elf,External_Phdr)
-#define Elf_External_Rel	NAME(Elf,External_Rel)
-#define Elf_External_Rela	NAME(Elf,External_Rela)
-#define Elf_External_Dyn	NAME(Elf,External_Dyn)
-
-#define elf_core_file_failing_command	NAME(bfd_elf,core_file_failing_command)
-#define elf_core_file_failing_signal	NAME(bfd_elf,core_file_failing_signal)
-#define elf_core_file_matches_executable_p \
-  NAME(bfd_elf,core_file_matches_executable_p)
-#define elf_object_p			NAME(bfd_elf,object_p)
-#define elf_core_file_p			NAME(bfd_elf,core_file_p)
-#define elf_get_symtab_upper_bound	NAME(bfd_elf,get_symtab_upper_bound)
-#define elf_get_dynamic_symtab_upper_bound \
-  NAME(bfd_elf,get_dynamic_symtab_upper_bound)
-#define elf_swap_reloc_in		NAME(bfd_elf,swap_reloc_in)
-#define elf_swap_reloca_in		NAME(bfd_elf,swap_reloca_in)
-#define elf_swap_reloc_out		NAME(bfd_elf,swap_reloc_out)
-#define elf_swap_reloca_out		NAME(bfd_elf,swap_reloca_out)
-#define elf_swap_symbol_in		NAME(bfd_elf,swap_symbol_in)
-#define elf_swap_symbol_out		NAME(bfd_elf,swap_symbol_out)
-#define elf_swap_phdr_in		NAME(bfd_elf,swap_phdr_in)
-#define elf_swap_phdr_out		NAME(bfd_elf,swap_phdr_out)
-#define elf_swap_dyn_in			NAME(bfd_elf,swap_dyn_in)
-#define elf_swap_dyn_out		NAME(bfd_elf,swap_dyn_out)
-#define elf_get_reloc_upper_bound	NAME(bfd_elf,get_reloc_upper_bound)
-#define elf_canonicalize_reloc		NAME(bfd_elf,canonicalize_reloc)
-#define elf_slurp_symbol_table		NAME(bfd_elf,slurp_symbol_table)
-#define elf_get_symtab			NAME(bfd_elf,get_symtab)
-#define elf_canonicalize_dynamic_symtab \
-  NAME(bfd_elf,canonicalize_dynamic_symtab)
-#define elf_make_empty_symbol		NAME(bfd_elf,make_empty_symbol)
-#define elf_get_symbol_info		NAME(bfd_elf,get_symbol_info)
-#define elf_get_lineno			NAME(bfd_elf,get_lineno)
-#define elf_set_arch_mach		NAME(bfd_elf,set_arch_mach)
-#define elf_find_nearest_line		NAME(bfd_elf,find_nearest_line)
-#define elf_sizeof_headers		NAME(bfd_elf,sizeof_headers)
-#define elf_set_section_contents	NAME(bfd_elf,set_section_contents)
-#define elf_no_info_to_howto		NAME(bfd_elf,no_info_to_howto)
-#define elf_no_info_to_howto_rel	NAME(bfd_elf,no_info_to_howto_rel)
-#define elf_find_section		NAME(bfd_elf,find_section)
-#define elf_bfd_link_add_symbols	NAME(bfd_elf,bfd_link_add_symbols)
-#define elf_add_dynamic_entry		NAME(bfd_elf,add_dynamic_entry)
-#define elf_write_shdrs_and_ehdr	NAME(bfd_elf,write_shdrs_and_ehdr)
-#define elf_write_out_phdrs		NAME(bfd_elf,write_out_phdrs)
-#define elf_link_create_dynamic_sections \
-  NAME(bfd_elf,link_create_dynamic_sections)
-#define elf_link_record_dynamic_symbol  _bfd_elf_link_record_dynamic_symbol
-#define elf_bfd_final_link		NAME(bfd_elf,bfd_final_link)
-#define elf_create_pointer_linker_section NAME(bfd_elf,create_pointer_linker_section)
-#define elf_finish_pointer_linker_section NAME(bfd_elf,finish_pointer_linker_section)
-#define elf_gc_sections			NAME(_bfd_elf,gc_sections)
-#define elf_gc_common_finalize_got_offsets \
-  NAME(_bfd_elf,gc_common_finalize_got_offsets)
-#define elf_gc_common_final_link	NAME(_bfd_elf,gc_common_final_link)
-#define elf_gc_record_vtinherit		NAME(_bfd_elf,gc_record_vtinherit)
-#define elf_gc_record_vtentry		NAME(_bfd_elf,gc_record_vtentry)
-
-#if ARCH_SIZE == 64
-#define ELF_R_INFO(X,Y)	ELF64_R_INFO(X,Y)
-#define ELF_R_SYM(X)	ELF64_R_SYM(X)
-#define ELF_R_TYPE(X)	ELF64_R_TYPE(X)
-#define ELFCLASS	ELFCLASS64
-#define FILE_ALIGN	8
-#define LOG_FILE_ALIGN	3
-#endif
-#if ARCH_SIZE == 32
-#define ELF_R_INFO(X,Y)	ELF32_R_INFO(X,Y)
-#define ELF_R_SYM(X)	ELF32_R_SYM(X)
-#define ELF_R_TYPE(X)	ELF32_R_TYPE(X)
-#define ELFCLASS	ELFCLASS32
-#define FILE_ALIGN	4
-#define LOG_FILE_ALIGN	2
-#endif
-
-/* Static functions */
-
-static void elf_swap_ehdr_in
-  PARAMS ((bfd *, const Elf_External_Ehdr *, Elf_Internal_Ehdr *));
-static void elf_swap_ehdr_out
-  PARAMS ((bfd *, const Elf_Internal_Ehdr *, Elf_External_Ehdr *));
-static void elf_swap_shdr_in
-  PARAMS ((bfd *, const Elf_External_Shdr *, Elf_Internal_Shdr *));
-static void elf_swap_shdr_out
-  PARAMS ((bfd *, const Elf_Internal_Shdr *, Elf_External_Shdr *));
-
-#define elf_stringtab_init _bfd_elf_stringtab_init
-
-#define section_from_elf_index bfd_section_from_elf_index
-
-static boolean elf_slurp_reloc_table
-  PARAMS ((bfd *, asection *, asymbol **, boolean));
-
-static void write_relocs PARAMS ((bfd *, asection *, PTR));
-
-static boolean elf_file_p PARAMS ((Elf_External_Ehdr *));
-
-#ifdef DEBUG
-static void elf_debug_section PARAMS ((int, Elf_Internal_Shdr *));
-static void elf_debug_file PARAMS ((Elf_Internal_Ehdr *));
-static char *elf_symbol_flags PARAMS ((flagword));
-#endif
-
-/* Structure swapping routines */
-
-/* Should perhaps use put_offset, put_word, etc.  For now, the two versions
-   can be handled by explicitly specifying 32 bits or "the long type".  */
-#if ARCH_SIZE == 64
-#define put_word	bfd_h_put_64
-#define put_signed_word	bfd_h_put_signed_64
-#define get_word	bfd_h_get_64
-#define get_signed_word	bfd_h_get_signed_64
-#endif
-#if ARCH_SIZE == 32
-#define put_word	bfd_h_put_32
-#define put_signed_word	bfd_h_put_signed_32
-#define get_word	bfd_h_get_32
-#define get_signed_word	bfd_h_get_signed_32
-#endif
-
-/* Translate an ELF symbol in external format into an ELF symbol in internal
-   format. */
-
-void
-elf_swap_symbol_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Sym *src;
-     Elf_Internal_Sym *dst;
-{
-  dst->st_name = bfd_h_get_32 (abfd, (bfd_byte *) src->st_name);
-  dst->st_value = get_word (abfd, (bfd_byte *) src->st_value);
-  dst->st_size = get_word (abfd, (bfd_byte *) src->st_size);
-  dst->st_info = bfd_h_get_8 (abfd, (bfd_byte *) src->st_info);
-  dst->st_other = bfd_h_get_8 (abfd, (bfd_byte *) src->st_other);
-  dst->st_shndx = bfd_h_get_16 (abfd, (bfd_byte *) src->st_shndx);
-}
-
-/* Translate an ELF symbol in internal format into an ELF symbol in external
-   format. */
-
-void
-elf_swap_symbol_out (abfd, src, cdst)
-     bfd *abfd;
-     const Elf_Internal_Sym *src;
-     PTR cdst;
-{
-  Elf_External_Sym *dst = (Elf_External_Sym *) cdst;
-  bfd_h_put_32 (abfd, src->st_name, dst->st_name);
-  put_word (abfd, src->st_value, dst->st_value);
-  put_word (abfd, src->st_size, dst->st_size);
-  bfd_h_put_8 (abfd, src->st_info, dst->st_info);
-  bfd_h_put_8 (abfd, src->st_other, dst->st_other);
-  bfd_h_put_16 (abfd, src->st_shndx, dst->st_shndx);
-}
-
-
-/* Translate an ELF file header in external format into an ELF file header in
-   internal format. */
-
-static void
-elf_swap_ehdr_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Ehdr *src;
-     Elf_Internal_Ehdr *dst;
-{
-  memcpy (dst->e_ident, src->e_ident, EI_NIDENT);
-  dst->e_type = bfd_h_get_16 (abfd, (bfd_byte *) src->e_type);
-  dst->e_machine = bfd_h_get_16 (abfd, (bfd_byte *) src->e_machine);
-  dst->e_version = bfd_h_get_32 (abfd, (bfd_byte *) src->e_version);
-  dst->e_entry = get_word (abfd, (bfd_byte *) src->e_entry);
-  dst->e_phoff = get_word (abfd, (bfd_byte *) src->e_phoff);
-  dst->e_shoff = get_word (abfd, (bfd_byte *) src->e_shoff);
-  dst->e_flags = bfd_h_get_32 (abfd, (bfd_byte *) src->e_flags);
-  dst->e_ehsize = bfd_h_get_16 (abfd, (bfd_byte *) src->e_ehsize);
-  dst->e_phentsize = bfd_h_get_16 (abfd, (bfd_byte *) src->e_phentsize);
-  dst->e_phnum = bfd_h_get_16 (abfd, (bfd_byte *) src->e_phnum);
-  dst->e_shentsize = bfd_h_get_16 (abfd, (bfd_byte *) src->e_shentsize);
-  dst->e_shnum = bfd_h_get_16 (abfd, (bfd_byte *) src->e_shnum);
-  dst->e_shstrndx = bfd_h_get_16 (abfd, (bfd_byte *) src->e_shstrndx);
-}
-
-/* Translate an ELF file header in internal format into an ELF file header in
-   external format. */
-
-static void
-elf_swap_ehdr_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Ehdr *src;
-     Elf_External_Ehdr *dst;
-{
-  memcpy (dst->e_ident, src->e_ident, EI_NIDENT);
-  /* note that all elements of dst are *arrays of unsigned char* already... */
-  bfd_h_put_16 (abfd, src->e_type, dst->e_type);
-  bfd_h_put_16 (abfd, src->e_machine, dst->e_machine);
-  bfd_h_put_32 (abfd, src->e_version, dst->e_version);
-  put_word (abfd, src->e_entry, dst->e_entry);
-  put_word (abfd, src->e_phoff, dst->e_phoff);
-  put_word (abfd, src->e_shoff, dst->e_shoff);
-  bfd_h_put_32 (abfd, src->e_flags, dst->e_flags);
-  bfd_h_put_16 (abfd, src->e_ehsize, dst->e_ehsize);
-  bfd_h_put_16 (abfd, src->e_phentsize, dst->e_phentsize);
-  bfd_h_put_16 (abfd, src->e_phnum, dst->e_phnum);
-  bfd_h_put_16 (abfd, src->e_shentsize, dst->e_shentsize);
-  bfd_h_put_16 (abfd, src->e_shnum, dst->e_shnum);
-  bfd_h_put_16 (abfd, src->e_shstrndx, dst->e_shstrndx);
-}
-
-
-/* Translate an ELF section header table entry in external format into an
-   ELF section header table entry in internal format. */
-
-static void
-elf_swap_shdr_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Shdr *src;
-     Elf_Internal_Shdr *dst;
-{
-  dst->sh_name = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_name);
-  dst->sh_type = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_type);
-  dst->sh_flags = get_word (abfd, (bfd_byte *) src->sh_flags);
-  dst->sh_addr = get_word (abfd, (bfd_byte *) src->sh_addr);
-  dst->sh_offset = get_word (abfd, (bfd_byte *) src->sh_offset);
-  dst->sh_size = get_word (abfd, (bfd_byte *) src->sh_size);
-  dst->sh_link = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_link);
-  dst->sh_info = bfd_h_get_32 (abfd, (bfd_byte *) src->sh_info);
-  dst->sh_addralign = get_word (abfd, (bfd_byte *) src->sh_addralign);
-  dst->sh_entsize = get_word (abfd, (bfd_byte *) src->sh_entsize);
-  dst->bfd_section = NULL;
-  dst->contents = NULL;
-}
-
-/* Translate an ELF section header table entry in internal format into an
-   ELF section header table entry in external format. */
-
-static void
-elf_swap_shdr_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Shdr *src;
-     Elf_External_Shdr *dst;
-{
-  /* note that all elements of dst are *arrays of unsigned char* already... */
-  bfd_h_put_32 (abfd, src->sh_name, dst->sh_name);
-  bfd_h_put_32 (abfd, src->sh_type, dst->sh_type);
-  put_word (abfd, src->sh_flags, dst->sh_flags);
-  put_word (abfd, src->sh_addr, dst->sh_addr);
-  put_word (abfd, src->sh_offset, dst->sh_offset);
-  put_word (abfd, src->sh_size, dst->sh_size);
-  bfd_h_put_32 (abfd, src->sh_link, dst->sh_link);
-  bfd_h_put_32 (abfd, src->sh_info, dst->sh_info);
-  put_word (abfd, src->sh_addralign, dst->sh_addralign);
-  put_word (abfd, src->sh_entsize, dst->sh_entsize);
-}
-
-
-/* Translate an ELF program header table entry in external format into an
-   ELF program header table entry in internal format. */
-
-void
-elf_swap_phdr_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Phdr *src;
-     Elf_Internal_Phdr *dst;
-{
-  dst->p_type = bfd_h_get_32 (abfd, (bfd_byte *) src->p_type);
-  dst->p_flags = bfd_h_get_32 (abfd, (bfd_byte *) src->p_flags);
-  dst->p_offset = get_word (abfd, (bfd_byte *) src->p_offset);
-  dst->p_vaddr = get_word (abfd, (bfd_byte *) src->p_vaddr);
-  dst->p_paddr = get_word (abfd, (bfd_byte *) src->p_paddr);
-  dst->p_filesz = get_word (abfd, (bfd_byte *) src->p_filesz);
-  dst->p_memsz = get_word (abfd, (bfd_byte *) src->p_memsz);
-  dst->p_align = get_word (abfd, (bfd_byte *) src->p_align);
-}
-
-void
-elf_swap_phdr_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Phdr *src;
-     Elf_External_Phdr *dst;
-{
-  /* note that all elements of dst are *arrays of unsigned char* already... */
-  bfd_h_put_32 (abfd, src->p_type, dst->p_type);
-  put_word (abfd, src->p_offset, dst->p_offset);
-  put_word (abfd, src->p_vaddr, dst->p_vaddr);
-  put_word (abfd, src->p_paddr, dst->p_paddr);
-  put_word (abfd, src->p_filesz, dst->p_filesz);
-  put_word (abfd, src->p_memsz, dst->p_memsz);
-  bfd_h_put_32 (abfd, src->p_flags, dst->p_flags);
-  put_word (abfd, src->p_align, dst->p_align);
-}
-
-/* Translate an ELF reloc from external format to internal format. */
-INLINE void
-elf_swap_reloc_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Rel *src;
-     Elf_Internal_Rel *dst;
-{
-  dst->r_offset = get_word (abfd, (bfd_byte *) src->r_offset);
-  dst->r_info = get_word (abfd, (bfd_byte *) src->r_info);
-}
-
-INLINE void
-elf_swap_reloca_in (abfd, src, dst)
-     bfd *abfd;
-     const Elf_External_Rela *src;
-     Elf_Internal_Rela *dst;
-{
-  dst->r_offset = get_word (abfd, (bfd_byte *) src->r_offset);
-  dst->r_info = get_word (abfd, (bfd_byte *) src->r_info);
-  dst->r_addend = get_signed_word (abfd, (bfd_byte *) src->r_addend);
-}
-
-/* Translate an ELF reloc from internal format to external format. */
-INLINE void
-elf_swap_reloc_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Rel *src;
-     Elf_External_Rel *dst;
-{
-  put_word (abfd, src->r_offset, dst->r_offset);
-  put_word (abfd, src->r_info, dst->r_info);
-}
-
-INLINE void
-elf_swap_reloca_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Rela *src;
-     Elf_External_Rela *dst;
-{
-  put_word (abfd, src->r_offset, dst->r_offset);
-  put_word (abfd, src->r_info, dst->r_info);
-  put_signed_word (abfd, src->r_addend, dst->r_addend);
-}
-
-INLINE void
-elf_swap_dyn_in (abfd, p, dst)
-     bfd *abfd;
-     const PTR p;
-     Elf_Internal_Dyn *dst;
-{
-  const Elf_External_Dyn *src = (const Elf_External_Dyn *) p;
-
-  dst->d_tag = get_word (abfd, src->d_tag);
-  dst->d_un.d_val = get_word (abfd, src->d_un.d_val);
-}
-
-INLINE void
-elf_swap_dyn_out (abfd, src, dst)
-     bfd *abfd;
-     const Elf_Internal_Dyn *src;
-     Elf_External_Dyn *dst;
-{
-  put_word (abfd, src->d_tag, dst->d_tag);
-  put_word (abfd, src->d_un.d_val, dst->d_un.d_val);
-}
-
-/* ELF .o/exec file reading */
-
-
-/* Begin processing a given object.
-
-   First we validate the file by reading in the ELF header and checking
-   the magic number.  */
-
-static INLINE boolean
-elf_file_p (x_ehdrp)
-     Elf_External_Ehdr *x_ehdrp;
-{
-  return ((x_ehdrp->e_ident[EI_MAG0] == ELFMAG0)
-	  && (x_ehdrp->e_ident[EI_MAG1] == ELFMAG1)
-	  && (x_ehdrp->e_ident[EI_MAG2] == ELFMAG2)
-	  && (x_ehdrp->e_ident[EI_MAG3] == ELFMAG3));
-}
-
-/* Check to see if the file associated with ABFD matches the target vector
-   that ABFD points to.
-
-   Note that we may be called several times with the same ABFD, but different
-   target vectors, most of which will not match.  We have to avoid leaving
-   any side effects in ABFD, or any data it points to (like tdata), if the
-   file does not match the target vector.  */
-
-const bfd_target *
-elf_object_p (abfd)
-     bfd *abfd;
-{
-  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form */
-  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form */
-  Elf_External_Shdr x_shdr;	/* Section header table entry, external form */
-  Elf_Internal_Shdr *i_shdrp = NULL; /* Section header table, internal form */
-  unsigned int shindex;
-  char *shstrtab;		/* Internal copy of section header stringtab */
-  struct elf_backend_data *ebd;
-  struct elf_obj_tdata *preserved_tdata = elf_tdata (abfd);
-  struct elf_obj_tdata *new_tdata = NULL;
-  asection *s;
-
-  /* Read in the ELF header in external format.  */
-
-  if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	goto got_wrong_format_error;
-      else
-	goto got_no_match;
-    }
-
-  /* Now check to see if we have a valid ELF file, and one that BFD can
-     make use of.  The magic number must match, the address size ('class')
-     and byte-swapping must match our XVEC entry, and it must have a
-     section header table (FIXME: See comments re sections at top of this
-     file). */
-
-  if ((elf_file_p (&x_ehdr) == false) ||
-      (x_ehdr.e_ident[EI_VERSION] != EV_CURRENT) ||
-      (x_ehdr.e_ident[EI_CLASS] != ELFCLASS))
-    goto got_wrong_format_error;
-
-  /* Check that file's byte order matches xvec's */
-  switch (x_ehdr.e_ident[EI_DATA])
-    {
-    case ELFDATA2MSB:		/* Big-endian */
-      if (! bfd_header_big_endian (abfd))
-	goto got_wrong_format_error;
-      break;
-    case ELFDATA2LSB:		/* Little-endian */
-      if (! bfd_header_little_endian (abfd))
-	goto got_wrong_format_error;
-      break;
-    case ELFDATANONE:		/* No data encoding specified */
-    default:			/* Unknown data encoding specified */
-      goto got_wrong_format_error;
-    }
-
-  /* Allocate an instance of the elf_obj_tdata structure and hook it up to
-     the tdata pointer in the bfd.  */
-
-  new_tdata = ((struct elf_obj_tdata *)
-	       bfd_zalloc (abfd, sizeof (struct elf_obj_tdata)));
-  if (new_tdata == NULL)
-    goto got_no_match;
-  elf_tdata (abfd) = new_tdata;
-
-  /* Now that we know the byte order, swap in the rest of the header */
-  i_ehdrp = elf_elfheader (abfd);
-  elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
-#if DEBUG & 1
-  elf_debug_file (i_ehdrp);
-#endif
-
-  /* Reject ET_CORE (header indicates core file, not object file) */
-  if (i_ehdrp->e_type == ET_CORE)
-    goto got_wrong_format_error;
-
-  /* If there is no section header table, we're hosed. */
-  if (i_ehdrp->e_shoff == 0)
-    goto got_wrong_format_error;
-
-  /* As a simple sanity check, verify that the what BFD thinks is the
-     size of each section header table entry actually matches the size
-     recorded in the file. */
-  if (i_ehdrp->e_shentsize != sizeof (x_shdr))
-    goto got_wrong_format_error;
-
-  ebd = get_elf_backend_data (abfd);
-
-  /* Check that the ELF e_machine field matches what this particular
-     BFD format expects.  */
-  if (ebd->elf_machine_code != i_ehdrp->e_machine
-      && (ebd->elf_machine_alt1 == 0 || i_ehdrp->e_machine != ebd->elf_machine_alt1)
-      && (ebd->elf_machine_alt2 == 0 || i_ehdrp->e_machine != ebd->elf_machine_alt2))
-    {
-      const bfd_target * const *target_ptr;
-
-      if (ebd->elf_machine_code != EM_NONE)
-	goto got_wrong_format_error;
-
-      /* This is the generic ELF target.  Let it match any ELF target
-	 for which we do not have a specific backend.  */
-      for (target_ptr = bfd_target_vector; *target_ptr != NULL; target_ptr++)
-	{
-	  struct elf_backend_data *back;
-
-	  if ((*target_ptr)->flavour != bfd_target_elf_flavour)
-	    continue;
-	  back = (struct elf_backend_data *) (*target_ptr)->backend_data;
-	  if (back->elf_machine_code == i_ehdrp->e_machine
-	      || (back->elf_machine_alt1 != 0
-		  && back->elf_machine_alt1 == i_ehdrp->e_machine)
-	      || (back->elf_machine_alt2 != 0
-		  && back->elf_machine_alt2 == i_ehdrp->e_machine))
-	    {
-	      /* target_ptr is an ELF backend which matches this
-		 object file, so reject the generic ELF target.  */
-	      goto got_wrong_format_error;
-	    }
-	}
-    }
-
-  if (i_ehdrp->e_type == ET_EXEC)
-    abfd->flags |= EXEC_P;
-  else if (i_ehdrp->e_type == ET_DYN)
-    abfd->flags |= DYNAMIC;
-
-  if (i_ehdrp->e_phnum > 0)
-    abfd->flags |= D_PAGED;
-
-  if (! bfd_default_set_arch_mach (abfd, ebd->arch, 0))
-    {
-      /* It's OK if this fails for the generic target.  */
-      if (ebd->elf_machine_code != EM_NONE)
-	goto got_no_match;
-    }
-
-  /* Remember the entry point specified in the ELF file header. */
-  bfd_get_start_address (abfd) = i_ehdrp->e_entry;
-
-  /* Allocate space for a copy of the section header table in
-     internal form, seek to the section header table in the file,
-     read it in, and convert it to internal form.  */
-  i_shdrp = ((Elf_Internal_Shdr *)
-	     bfd_alloc (abfd, sizeof (*i_shdrp) * i_ehdrp->e_shnum));
-  elf_elfsections (abfd) = ((Elf_Internal_Shdr **)
-			    bfd_alloc (abfd,
-				       sizeof (i_shdrp) * i_ehdrp->e_shnum));
-  if (!i_shdrp || !elf_elfsections (abfd))
-    goto got_no_match;
-  if (bfd_seek (abfd, i_ehdrp->e_shoff, SEEK_SET) != 0)
-    goto got_no_match;
-  for (shindex = 0; shindex < i_ehdrp->e_shnum; shindex++)
-    {
-      if (bfd_read ((PTR) & x_shdr, sizeof x_shdr, 1, abfd) != sizeof (x_shdr))
-	goto got_no_match;
-      elf_swap_shdr_in (abfd, &x_shdr, i_shdrp + shindex);
-      elf_elfsections (abfd)[shindex] = i_shdrp + shindex;
-
-      /* If the section is loaded, but not page aligned, clear
-         D_PAGED.  */
-      if ((i_shdrp[shindex].sh_flags & SHF_ALLOC) != 0
-	  && i_shdrp[shindex].sh_type != SHT_NOBITS
-	  && (((i_shdrp[shindex].sh_addr - i_shdrp[shindex].sh_offset)
-	       % ebd->maxpagesize)
-	      != 0))
-	abfd->flags &= ~D_PAGED;
-    }
-  if (i_ehdrp->e_shstrndx)
-    {
-      if (! bfd_section_from_shdr (abfd, i_ehdrp->e_shstrndx))
-	goto got_no_match;
-    }
-
-  /* Read in the program headers.  */
-  if (i_ehdrp->e_phnum == 0)
-    elf_tdata (abfd)->phdr = NULL;
-  else
-    {
-      Elf_Internal_Phdr *i_phdr;
-      unsigned int i;
-
-      elf_tdata (abfd)->phdr = ((Elf_Internal_Phdr *)
-				bfd_alloc (abfd,
-					   (i_ehdrp->e_phnum
-					    * sizeof (Elf_Internal_Phdr))));
-      if (elf_tdata (abfd)->phdr == NULL)
-	goto got_no_match;
-      if (bfd_seek (abfd, i_ehdrp->e_phoff, SEEK_SET) != 0)
-	goto got_no_match;
-      i_phdr = elf_tdata (abfd)->phdr;
-      for (i = 0; i < i_ehdrp->e_phnum; i++, i_phdr++)
-	{
-	  Elf_External_Phdr x_phdr;
-
-	  if (bfd_read ((PTR) &x_phdr, sizeof x_phdr, 1, abfd)
-	      != sizeof x_phdr)
-	    goto got_no_match;
-	  elf_swap_phdr_in (abfd, &x_phdr, i_phdr);
-	}
-    }
-
-  /* Read in the string table containing the names of the sections.  We
-     will need the base pointer to this table later. */
-  /* We read this inline now, so that we don't have to go through
-     bfd_section_from_shdr with it (since this particular strtab is
-     used to find all of the ELF section names.) */
-
-  shstrtab = bfd_elf_get_str_section (abfd, i_ehdrp->e_shstrndx);
-  if (!shstrtab)
-    goto got_no_match;
-
-  /* Once all of the section headers have been read and converted, we
-     can start processing them.  Note that the first section header is
-     a dummy placeholder entry, so we ignore it.  */
-
-  for (shindex = 1; shindex < i_ehdrp->e_shnum; shindex++)
-    {
-      if (! bfd_section_from_shdr (abfd, shindex))
-	goto got_no_match;
-    }
-
-  /* Let the backend double check the format and override global
-     information.  */
-  if (ebd->elf_backend_object_p)
-    {
-      if ((*ebd->elf_backend_object_p) (abfd) == false)
-	goto got_wrong_format_error;
-    }
-
-  /* If we have created any reloc sections that are associated with
-     debugging sections, mark the reloc sections as debugging as well.  */
-  for (s = abfd->sections; s != NULL; s = s->next)
-    {
-      if ((elf_section_data (s)->this_hdr.sh_type == SHT_REL
-	   || elf_section_data (s)->this_hdr.sh_type == SHT_RELA)
-	  && elf_section_data (s)->this_hdr.sh_info > 0)
-	{
-	  unsigned long targ_index;
-	  asection *targ_sec;
-
-	  targ_index = elf_section_data (s)->this_hdr.sh_info;
-	  targ_sec = bfd_section_from_elf_index (abfd, targ_index);
-	  if (targ_sec != NULL
-	      && (targ_sec->flags & SEC_DEBUGGING) != 0)
-	    s->flags |= SEC_DEBUGGING;
-	}
-    }
-
-  return (abfd->xvec);
-
- got_wrong_format_error:
-  bfd_set_error (bfd_error_wrong_format);
- got_no_match:
-  if (new_tdata != NULL
-      && new_tdata->elf_sect_ptr != NULL)
-    bfd_release (abfd, new_tdata->elf_sect_ptr);
-  if (i_shdrp != NULL)
-    bfd_release (abfd, i_shdrp);
-  if (new_tdata != NULL)
-    bfd_release (abfd, new_tdata);
-  elf_tdata (abfd) = preserved_tdata;
-  return (NULL);
-}
-
-/* ELF .o/exec file writing */
-
-/* Write out the relocs.  */
-
-static void
-write_relocs (abfd, sec, data)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-{
-  boolean *failedp = (boolean *) data;
-  Elf_Internal_Shdr *rela_hdr;
-  Elf_External_Rela *outbound_relocas;
-  Elf_External_Rel *outbound_relocs;
-  unsigned int idx;
-  int use_rela_p = get_elf_backend_data (abfd)->use_rela_p;
-  asymbol *last_sym = 0;
-  int last_sym_idx = 0;
-
-  /* If we have already failed, don't do anything.  */
-  if (*failedp)
-    return;
-
-  if ((sec->flags & SEC_RELOC) == 0)
-    return;
-
-  /* The linker backend writes the relocs out itself, and sets the
-     reloc_count field to zero to inhibit writing them here.  Also,
-     sometimes the SEC_RELOC flag gets set even when there aren't any
-     relocs.  */
-  if (sec->reloc_count == 0)
-    return;
-
-  rela_hdr = &elf_section_data (sec)->rel_hdr;
-
-  rela_hdr->sh_size = rela_hdr->sh_entsize * sec->reloc_count;
-  rela_hdr->contents = (PTR) bfd_alloc (abfd, rela_hdr->sh_size);
-  if (rela_hdr->contents == NULL)
-    {
-      *failedp = true;
-      return;
-    }
-
-  /* orelocation has the data, reloc_count has the count... */
-  if (use_rela_p)
-    {
-      outbound_relocas = (Elf_External_Rela *) rela_hdr->contents;
-
-      for (idx = 0; idx < sec->reloc_count; idx++)
-	{
-	  Elf_Internal_Rela dst_rela;
-	  Elf_External_Rela *src_rela;
-	  arelent *ptr;
-	  asymbol *sym;
-	  int n;
-
-	  ptr = sec->orelocation[idx];
-	  src_rela = outbound_relocas + idx;
-
-	  /* The address of an ELF reloc is section relative for an object
-	     file, and absolute for an executable file or shared library.
-	     The address of a BFD reloc is always section relative.  */
-	  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
-	    dst_rela.r_offset = ptr->address;
-	  else
-	    dst_rela.r_offset = ptr->address + sec->vma;
-
-	  sym = *ptr->sym_ptr_ptr;
-	  if (sym == last_sym)
-	    n = last_sym_idx;
-	  else if (bfd_is_abs_section (sym->section) && sym->value == 0)
-	    n = STN_UNDEF;
-	  else
-	    {
-	      last_sym = sym;
-	      n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
-	      if (n < 0)
-		{
-		  *failedp = true;
-		  return;
-		}
-	      last_sym_idx = n;
-	    }
-
-	  if ((*ptr->sym_ptr_ptr)->the_bfd != NULL
-	      && (*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
-	      && ! _bfd_elf_validate_reloc (abfd, ptr))
-	    {
-	      *failedp = true;
-	      return;
-	    }
-
-	  dst_rela.r_info = ELF_R_INFO (n, ptr->howto->type);
-
-	  dst_rela.r_addend = ptr->addend;
-	  elf_swap_reloca_out (abfd, &dst_rela, src_rela);
-	}
-    }
-  else
-    /* REL relocations */
-    {
-      outbound_relocs = (Elf_External_Rel *) rela_hdr->contents;
-
-      for (idx = 0; idx < sec->reloc_count; idx++)
-	{
-	  Elf_Internal_Rel dst_rel;
-	  Elf_External_Rel *src_rel;
-	  arelent *ptr;
-	  int n;
-	  asymbol *sym;
-
-	  ptr = sec->orelocation[idx];
-	  sym = *ptr->sym_ptr_ptr;
-	  src_rel = outbound_relocs + idx;
-
-	  /* The address of an ELF reloc is section relative for an object
-	     file, and absolute for an executable file or shared library.
-	     The address of a BFD reloc is always section relative.  */
-	  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0)
-	    dst_rel.r_offset = ptr->address;
-	  else
-	    dst_rel.r_offset = ptr->address + sec->vma;
-
-	  if (sym == last_sym)
-	    n = last_sym_idx;
-	  else
-	    {
-	      last_sym = sym;
-	      n = _bfd_elf_symbol_from_bfd_symbol (abfd, &sym);
-	      if (n < 0)
-		{
-		  *failedp = true;
-		  return;
-		}
-	      last_sym_idx = n;
-	    }
-
-	  if ((*ptr->sym_ptr_ptr)->the_bfd->xvec != abfd->xvec
-	      && ! _bfd_elf_validate_reloc (abfd, ptr))
-	    {
-	      *failedp = true;
-	      return;
-	    }
-
-	  dst_rel.r_info = ELF_R_INFO (n, ptr->howto->type);
-
-	  elf_swap_reloc_out (abfd, &dst_rel, src_rel);
-	}
-    }
-}
-
-/* Write out the program headers.  */
-
-int
-elf_write_out_phdrs (abfd, phdr, count)
-     bfd *abfd;
-     const Elf_Internal_Phdr *phdr;
-     int count;
-{
-  while (count--)
-    {
-      Elf_External_Phdr extphdr;
-      elf_swap_phdr_out (abfd, phdr, &extphdr);
-      if (bfd_write (&extphdr, sizeof (Elf_External_Phdr), 1, abfd)
-	  != sizeof (Elf_External_Phdr))
-	return -1;
-      phdr++;
-    }
-  return 0;
-}
-
-/* Write out the section headers and the ELF file header.  */
-
-boolean
-elf_write_shdrs_and_ehdr (abfd)
-     bfd *abfd;
-{
-  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form */
-  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form */
-  Elf_External_Shdr *x_shdrp;	/* Section header table, external form */
-  Elf_Internal_Shdr **i_shdrp;	/* Section header table, internal form */
-  unsigned int count;
-
-  i_ehdrp = elf_elfheader (abfd);
-  i_shdrp = elf_elfsections (abfd);
-
-  /* swap the header before spitting it out... */
-
-#if DEBUG & 1
-  elf_debug_file (i_ehdrp);
-#endif
-  elf_swap_ehdr_out (abfd, i_ehdrp, &x_ehdr);
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || (bfd_write ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd)
-	  != sizeof (x_ehdr)))
-    return false;
-
-  /* at this point we've concocted all the ELF sections... */
-  x_shdrp = (Elf_External_Shdr *)
-    bfd_alloc (abfd, sizeof (*x_shdrp) * (i_ehdrp->e_shnum));
-  if (!x_shdrp)
-    return false;
-
-  for (count = 0; count < i_ehdrp->e_shnum; count++)
-    {
-#if DEBUG & 2
-      elf_debug_section (count, i_shdrp[count]);
-#endif
-      elf_swap_shdr_out (abfd, i_shdrp[count], x_shdrp + count);
-    }
-  if (bfd_seek (abfd, (file_ptr) i_ehdrp->e_shoff, SEEK_SET) != 0
-      || (bfd_write ((PTR) x_shdrp, sizeof (*x_shdrp), i_ehdrp->e_shnum, abfd)
-	  != sizeof (*x_shdrp) * i_ehdrp->e_shnum))
-    return false;
-
-  /* need to dump the string table too... */
-
-  return true;
-}
-
-long
-elf_slurp_symbol_table (abfd, symptrs, dynamic)
-     bfd *abfd;
-     asymbol **symptrs;		/* Buffer for generated bfd symbols */
-     boolean dynamic;
-{
-  Elf_Internal_Shdr *hdr;
-  Elf_Internal_Shdr *verhdr;
-  unsigned long symcount;	/* Number of external ELF symbols */
-  elf_symbol_type *sym;		/* Pointer to current bfd symbol */
-  elf_symbol_type *symbase;	/* Buffer for generated bfd symbols */
-  Elf_Internal_Sym i_sym;
-  Elf_External_Sym *x_symp = NULL;
-  Elf_External_Versym *x_versymp = NULL;
-
-  /* Read each raw ELF symbol, converting from external ELF form to
-     internal ELF form, and then using the information to create a
-     canonical bfd symbol table entry.
-
-     Note that we allocate the initial bfd canonical symbol buffer
-     based on a one-to-one mapping of the ELF symbols to canonical
-     symbols.  We actually use all the ELF symbols, so there will be no
-     space left over at the end.  When we have all the symbols, we
-     build the caller's pointer vector. */
-
-  if (! dynamic)
-    {
-      hdr = &elf_tdata (abfd)->symtab_hdr;
-      verhdr = NULL;
-    }
-  else
-    {
-      hdr = &elf_tdata (abfd)->dynsymtab_hdr;
-      if (elf_dynversym (abfd) == 0)
-	verhdr = NULL;
-      else
-	verhdr = &elf_tdata (abfd)->dynversym_hdr;
-      if ((elf_tdata (abfd)->dynverdef_section != 0
-	   && elf_tdata (abfd)->verdef == NULL)
-	  || (elf_tdata (abfd)->dynverref_section != 0
-	      && elf_tdata (abfd)->verref == NULL))
-	{
-	  if (! _bfd_elf_slurp_version_tables (abfd))
-	    return -1;
-	}
-    }
-
-  if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) == -1)
-    return -1;
-
-  symcount = hdr->sh_size / sizeof (Elf_External_Sym);
-
-  if (symcount == 0)
-    sym = symbase = NULL;
-  else
-    {
-      unsigned long i;
-
-      if (bfd_seek (abfd, hdr->sh_offset, SEEK_SET) == -1)
-	return -1;
-
-      symbase = ((elf_symbol_type *)
-		 bfd_zalloc (abfd, symcount * sizeof (elf_symbol_type)));
-      if (symbase == (elf_symbol_type *) NULL)
-	return -1;
-      sym = symbase;
-
-      /* Temporarily allocate room for the raw ELF symbols.  */
-      x_symp = ((Elf_External_Sym *)
-		bfd_malloc (symcount * sizeof (Elf_External_Sym)));
-      if (x_symp == NULL && symcount != 0)
-	goto error_return;
-
-      if (bfd_read ((PTR) x_symp, sizeof (Elf_External_Sym), symcount, abfd)
-	  != symcount * sizeof (Elf_External_Sym))
-	goto error_return;
-
-      /* Read the raw ELF version symbol information.  */
-
-      if (verhdr != NULL
-	  && verhdr->sh_size / sizeof (Elf_External_Versym) != symcount)
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: version count (%ld) does not match symbol count (%ld)"),
-	     abfd->filename,
-	     (long) (verhdr->sh_size / sizeof (Elf_External_Versym)),
-	     symcount);
-
-	  /* Slurp in the symbols without the version information,
-             since that is more helpful than just quitting.  */
-	  verhdr = NULL;
-	}
-
-      if (verhdr != NULL)
-	{
-	  if (bfd_seek (abfd, verhdr->sh_offset, SEEK_SET) != 0)
-	    goto error_return;
-
-	  x_versymp = (Elf_External_Versym *) bfd_malloc (verhdr->sh_size);
-	  if (x_versymp == NULL && verhdr->sh_size != 0)
-	    goto error_return;
-
-	  if (bfd_read ((PTR) x_versymp, 1, verhdr->sh_size, abfd)
-	      != verhdr->sh_size)
-	    goto error_return;
-	}
-
-      /* Skip first symbol, which is a null dummy.  */
-      for (i = 1; i < symcount; i++)
-	{
-	  elf_swap_symbol_in (abfd, x_symp + i, &i_sym);
-	  memcpy (&sym->internal_elf_sym, &i_sym, sizeof (Elf_Internal_Sym));
-#ifdef ELF_KEEP_EXTSYM
-	  memcpy (&sym->native_elf_sym, x_symp + i, sizeof (Elf_External_Sym));
-#endif
-	  sym->symbol.the_bfd = abfd;
-
-	  sym->symbol.name = bfd_elf_string_from_elf_section (abfd,
-							      hdr->sh_link,
-							      i_sym.st_name);
-
-	  sym->symbol.value = i_sym.st_value;
-
-	  if (i_sym.st_shndx > 0 && i_sym.st_shndx < SHN_LORESERVE)
-	    {
-	      sym->symbol.section = section_from_elf_index (abfd,
-							    i_sym.st_shndx);
-	      if (sym->symbol.section == NULL)
-		{
-		  /* This symbol is in a section for which we did not
-		     create a BFD section.  Just use bfd_abs_section,
-		     although it is wrong.  FIXME.  */
-		  sym->symbol.section = bfd_abs_section_ptr;
-		}
-	    }
-	  else if (i_sym.st_shndx == SHN_ABS)
-	    {
-	      sym->symbol.section = bfd_abs_section_ptr;
-	    }
-	  else if (i_sym.st_shndx == SHN_COMMON)
-	    {
-	      sym->symbol.section = bfd_com_section_ptr;
-	      /* Elf puts the alignment into the `value' field, and
-		 the size into the `size' field.  BFD wants to see the
-		 size in the value field, and doesn't care (at the
-		 moment) about the alignment.  */
-	      sym->symbol.value = i_sym.st_size;
-	    }
-	  else if (i_sym.st_shndx == SHN_UNDEF)
-	    {
-	      sym->symbol.section = bfd_und_section_ptr;
-	    }
-	  else
-	    sym->symbol.section = bfd_abs_section_ptr;
-
-	  /* If this is a relocateable file, then the symbol value is
-             already section relative.  */
-	  if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
-	    sym->symbol.value -= sym->symbol.section->vma;
-
-	  switch (ELF_ST_BIND (i_sym.st_info))
-	    {
-	    case STB_LOCAL:
-	      sym->symbol.flags |= BSF_LOCAL;
-	      break;
-	    case STB_GLOBAL:
-	      if (i_sym.st_shndx != SHN_UNDEF
-		  && i_sym.st_shndx != SHN_COMMON)
-		sym->symbol.flags |= BSF_GLOBAL;
-	      break;
-	    case STB_WEAK:
-	      sym->symbol.flags |= BSF_WEAK;
-	      break;
-	    }
-
-	  switch (ELF_ST_TYPE (i_sym.st_info))
-	    {
-	    case STT_SECTION:
-	      sym->symbol.flags |= BSF_SECTION_SYM | BSF_DEBUGGING;
-	      break;
-	    case STT_FILE:
-	      sym->symbol.flags |= BSF_FILE | BSF_DEBUGGING;
-	      break;
-	    case STT_FUNC:
-	      sym->symbol.flags |= BSF_FUNCTION;
-	      break;
-	    case STT_OBJECT:
-	      sym->symbol.flags |= BSF_OBJECT;
-	      break;
-	    }
-
-	  if (dynamic)
-	    sym->symbol.flags |= BSF_DYNAMIC;
-
-	  if (x_versymp != NULL)
-	    {
-	      Elf_Internal_Versym iversym;
-
-	      _bfd_elf_swap_versym_in (abfd, x_versymp + i, &iversym);
-	      sym->version = iversym.vs_vers;
-	    }
-
-	  /* Do some backend-specific processing on this symbol.  */
-	  {
-	    struct elf_backend_data *ebd = get_elf_backend_data (abfd);
-	    if (ebd->elf_backend_symbol_processing)
-	      (*ebd->elf_backend_symbol_processing) (abfd, &sym->symbol);
-	  }
-
-	  sym++;
-	}
-    }
-
-  /* Do some backend-specific processing on this symbol table.  */
-  {
-    struct elf_backend_data *ebd = get_elf_backend_data (abfd);
-    if (ebd->elf_backend_symbol_table_processing)
-      (*ebd->elf_backend_symbol_table_processing) (abfd, symbase, symcount);
-  }
-
-  /* We rely on the zalloc to clear out the final symbol entry.  */
-
-  symcount = sym - symbase;
-
-  /* Fill in the user's symbol pointer vector if needed.  */
-  if (symptrs)
-    {
-      long l = symcount;
-
-      sym = symbase;
-      while (l-- > 0)
-	{
-	  *symptrs++ = &sym->symbol;
-	  sym++;
-	}
-      *symptrs = 0;		/* Final null pointer */
-    }
-
-  if (x_versymp != NULL)
-    free (x_versymp);
-  if (x_symp != NULL)
-    free (x_symp);
-  return symcount;
-error_return:
-  if (x_versymp != NULL)
-    free (x_versymp);
-  if (x_symp != NULL)
-    free (x_symp);
-  return -1;
-}
-
-/* Read in and swap the external relocs.  */
-
-static boolean
-elf_slurp_reloc_table (abfd, asect, symbols, dynamic)
-     bfd *abfd;
-     asection *asect;
-     asymbol **symbols;
-     boolean dynamic;
-{
-  struct elf_backend_data * const ebd = get_elf_backend_data (abfd);
-  struct bfd_elf_section_data * const d = elf_section_data (asect);
-  Elf_Internal_Shdr *rel_hdr;
-  bfd_size_type reloc_count;
-  PTR allocated = NULL;
-  bfd_byte *native_relocs;
-  arelent *relents;
-  arelent *relent;
-  unsigned int i;
-  int entsize;
-
-  if (asect->relocation != NULL)
-    return true;
-
-  if (! dynamic)
-    {
-      if ((asect->flags & SEC_RELOC) == 0
-	  || asect->reloc_count == 0)
-	return true;
-
-      rel_hdr = &d->rel_hdr;
-      reloc_count = asect->reloc_count;
-
-      BFD_ASSERT (asect->rel_filepos == rel_hdr->sh_offset
-		  && reloc_count == rel_hdr->sh_size / rel_hdr->sh_entsize);
-    }
-  else
-    {
-      if (asect->_raw_size == 0)
-	return true;
-
-      rel_hdr = &d->this_hdr;
-      reloc_count = rel_hdr->sh_size / rel_hdr->sh_entsize;
-    }
-
-  allocated = (PTR) bfd_malloc ((size_t) rel_hdr->sh_size);
-  if (allocated == NULL)
-    goto error_return;
-
-  if (bfd_seek (abfd, rel_hdr->sh_offset, SEEK_SET) != 0
-      || (bfd_read (allocated, 1, rel_hdr->sh_size, abfd)
-	  != rel_hdr->sh_size))
-    goto error_return;
-
-  native_relocs = (bfd_byte *) allocated;
-
-  relents = (arelent *) bfd_alloc (abfd, reloc_count * sizeof (arelent));
-  if (relents == NULL)
-    goto error_return;
-
-  entsize = rel_hdr->sh_entsize;
-  BFD_ASSERT (entsize == sizeof (Elf_External_Rel)
-	      || entsize == sizeof (Elf_External_Rela));
-
-  for (i = 0, relent = relents;
-       i < reloc_count;
-       i++, relent++, native_relocs += entsize)
-    {
-      Elf_Internal_Rela rela;
-      Elf_Internal_Rel rel;
-
-      if (entsize == sizeof (Elf_External_Rela))
-	elf_swap_reloca_in (abfd, (Elf_External_Rela *) native_relocs, &rela);
-      else
-	{
-	  elf_swap_reloc_in (abfd, (Elf_External_Rel *) native_relocs, &rel);
-	  rela.r_offset = rel.r_offset;
-	  rela.r_info = rel.r_info;
-	  rela.r_addend = 0;
-	}
-
-      /* The address of an ELF reloc is section relative for an object
-	 file, and absolute for an executable file or shared library.
-	 The address of a normal BFD reloc is always section relative,
-	 and the address of a dynamic reloc is absolute..  */
-      if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0 || dynamic)
-	relent->address = rela.r_offset;
-      else
-	relent->address = rela.r_offset - asect->vma;
-
-      if (ELF_R_SYM (rela.r_info) == 0)
-	relent->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-      else
-	{
-	  asymbol **ps, *s;
-
-	  ps = symbols + ELF_R_SYM (rela.r_info) - 1;
-	  s = *ps;
-
-	  /* Canonicalize ELF section symbols.  FIXME: Why?  */
-	  if ((s->flags & BSF_SECTION_SYM) == 0)
-	    relent->sym_ptr_ptr = ps;
-	  else
-	    relent->sym_ptr_ptr = s->section->symbol_ptr_ptr;
-	}
-
-      relent->addend = rela.r_addend;
-
-      if (entsize == sizeof (Elf_External_Rela))
-	(*ebd->elf_info_to_howto) (abfd, relent, &rela);
-      else
-	(*ebd->elf_info_to_howto_rel) (abfd, relent, &rel);
-    }
-
-  asect->relocation = relents;
-
-  if (allocated != NULL)
-    free (allocated);
-
-  return true;
-
- error_return:
-  if (allocated != NULL)
-    free (allocated);
-  return false;
-}
-
-#ifdef DEBUG
-static void
-elf_debug_section (num, hdr)
-     int num;
-     Elf_Internal_Shdr *hdr;
-{
-  fprintf (stderr, "\nSection#%d '%s' 0x%.8lx\n", num,
-	   hdr->bfd_section != NULL ? hdr->bfd_section->name : "",
-	   (long) hdr);
-  fprintf (stderr,
-	   "sh_name      = %ld\tsh_type      = %ld\tsh_flags     = %ld\n",
-	   (long) hdr->sh_name,
-	   (long) hdr->sh_type,
-	   (long) hdr->sh_flags);
-  fprintf (stderr,
-	   "sh_addr      = %ld\tsh_offset    = %ld\tsh_size      = %ld\n",
-	   (long) hdr->sh_addr,
-	   (long) hdr->sh_offset,
-	   (long) hdr->sh_size);
-  fprintf (stderr,
-	   "sh_link      = %ld\tsh_info      = %ld\tsh_addralign = %ld\n",
-	   (long) hdr->sh_link,
-	   (long) hdr->sh_info,
-	   (long) hdr->sh_addralign);
-  fprintf (stderr, "sh_entsize   = %ld\n",
-	   (long) hdr->sh_entsize);
-  fflush (stderr);
-}
-
-static void
-elf_debug_file (ehdrp)
-     Elf_Internal_Ehdr *ehdrp;
-{
-  fprintf (stderr, "e_entry      = 0x%.8lx\n", (long) ehdrp->e_entry);
-  fprintf (stderr, "e_phoff      = %ld\n", (long) ehdrp->e_phoff);
-  fprintf (stderr, "e_phnum      = %ld\n", (long) ehdrp->e_phnum);
-  fprintf (stderr, "e_phentsize  = %ld\n", (long) ehdrp->e_phentsize);
-  fprintf (stderr, "e_shoff      = %ld\n", (long) ehdrp->e_shoff);
-  fprintf (stderr, "e_shnum      = %ld\n", (long) ehdrp->e_shnum);
-  fprintf (stderr, "e_shentsize  = %ld\n", (long) ehdrp->e_shentsize);
-}
-
-static char *
-elf_symbol_flags (flags)
-     flagword flags;
-{
-  static char buffer[1024];
-
-  buffer[0] = '\0';
-  if (flags & BSF_LOCAL)
-    strcat (buffer, " local");
-
-  if (flags & BSF_GLOBAL)
-    strcat (buffer, " global");
-
-  if (flags & BSF_DEBUGGING)
-    strcat (buffer, " debug");
-
-  if (flags & BSF_FUNCTION)
-    strcat (buffer, " function");
-
-  if (flags & BSF_KEEP)
-    strcat (buffer, " keep");
-
-  if (flags & BSF_KEEP_G)
-    strcat (buffer, " keep_g");
-
-  if (flags & BSF_WEAK)
-    strcat (buffer, " weak");
-
-  if (flags & BSF_SECTION_SYM)
-    strcat (buffer, " section-sym");
-
-  if (flags & BSF_OLD_COMMON)
-    strcat (buffer, " old-common");
-
-  if (flags & BSF_NOT_AT_END)
-    strcat (buffer, " not-at-end");
-
-  if (flags & BSF_CONSTRUCTOR)
-    strcat (buffer, " constructor");
-
-  if (flags & BSF_WARNING)
-    strcat (buffer, " warning");
-
-  if (flags & BSF_INDIRECT)
-    strcat (buffer, " indirect");
-
-  if (flags & BSF_FILE)
-    strcat (buffer, " file");
-
-  if (flags & DYNAMIC)
-    strcat (buffer, " dynamic");
-
-  if (flags & ~(BSF_LOCAL
-		| BSF_GLOBAL
-		| BSF_DEBUGGING
-		| BSF_FUNCTION
-		| BSF_KEEP
-		| BSF_KEEP_G
-		| BSF_WEAK
-		| BSF_SECTION_SYM
-		| BSF_OLD_COMMON
-		| BSF_NOT_AT_END
-		| BSF_CONSTRUCTOR
-		| BSF_WARNING
-		| BSF_INDIRECT
-		| BSF_FILE
-		| BSF_DYNAMIC))
-    strcat (buffer, " unknown-bits");
-
-  return buffer;
-}
-#endif
-
-#include "elfcore.h"
-#include "elflink.h"
-
-/* Size-dependent data and functions.  */
-const struct elf_size_info NAME(_bfd_elf,size_info) = {
-  sizeof (Elf_External_Ehdr),
-  sizeof (Elf_External_Phdr),
-  sizeof (Elf_External_Shdr),
-  sizeof (Elf_External_Rel),
-  sizeof (Elf_External_Rela),
-  sizeof (Elf_External_Sym),
-  sizeof (Elf_External_Dyn),
-  sizeof (Elf_External_Note),
-
-  ARCH_SIZE, FILE_ALIGN,
-  ELFCLASS, EV_CURRENT,
-  elf_write_out_phdrs,
-  elf_write_shdrs_and_ehdr,
-  write_relocs,
-  elf_swap_symbol_out,
-  elf_slurp_reloc_table,
-  elf_slurp_symbol_table,
-  elf_swap_dyn_in
-};
diff --git a/bfd/elfcore.h b/bfd/elfcore.h
deleted file mode 100644
index e4454aac9d0..00000000000
--- a/bfd/elfcore.h
+++ /dev/null
@@ -1,226 +0,0 @@
-/* ELF core file support for BFD.
-   Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-char*
-elf_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return elf_tdata (abfd)->core_command;
-}
-
-int
-elf_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return elf_tdata (abfd)->core_signal;
-}
-
-
-boolean
-elf_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
-{
-  char* corename;
-
-  /* xvecs must match if both are ELF files for the same target. */
-
-  if (core_bfd->xvec != exec_bfd->xvec)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return false;
-    }
-
-  /* See if the name in the corefile matches the executable name. */
-
-  corename = elf_tdata (core_bfd)->core_program;
-  if (corename != NULL)
-    {
-      const char* execname = strrchr (exec_bfd->filename, '/');
-      execname = execname ? execname + 1 : exec_bfd->filename;
-
-      if (strcmp(execname, corename) != 0)
-	return false;
-    }
-
-  return true;
-}
-
-
-/*  Core files are simply standard ELF formatted files that partition
-    the file using the execution view of the file (program header table)
-    rather than the linking view.  In fact, there is no section header
-    table in a core file.
-
-    The process status information (including the contents of the general
-    register set) and the floating point register set are stored in a
-    segment of type PT_NOTE.  We handcraft a couple of extra bfd sections
-    that allow standard bfd access to the general registers (.reg) and the
-    floating point registers (.reg2).
-
- */
-
-const bfd_target *
-elf_core_file_p (abfd)
-     bfd *abfd;
-{
-  Elf_External_Ehdr x_ehdr;	/* Elf file header, external form */
-  Elf_Internal_Ehdr *i_ehdrp;	/* Elf file header, internal form */
-  Elf_Internal_Phdr *i_phdrp;	/* Elf program header, internal form */
-  unsigned int phindex;
-  struct elf_backend_data *ebd;
-
-  /* Read in the ELF header in external format.  */
-  if (bfd_read ((PTR) & x_ehdr, sizeof (x_ehdr), 1, abfd) != sizeof (x_ehdr))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Check the magic number. */
-  if (elf_file_p (&x_ehdr) == false)
-    {
-    wrong:
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* FIXME: Check EI_VERSION here ! */
-
-  /* Check the address size ("class"). */
-  if (x_ehdr.e_ident[EI_CLASS] != ELFCLASS)
-    goto wrong;
-
-  /* Check the byteorder. */
-  switch (x_ehdr.e_ident[EI_DATA])
-    {
-    case ELFDATA2MSB:		/* Big-endian */
-      if (! bfd_big_endian (abfd))
-	goto wrong;
-      break;
-    case ELFDATA2LSB:		/* Little-endian */
-      if (! bfd_little_endian (abfd))
-	goto wrong;
-      break;
-    default:
-      goto wrong;
-    }
-
-  /* Give abfd an elf_obj_tdata. */
-  elf_tdata (abfd) =
-    (struct elf_obj_tdata *) bfd_zalloc (abfd, sizeof (struct elf_obj_tdata));
-  if (elf_tdata (abfd) == NULL)
-    return NULL;
-
-  /* FIXME: from here on down, "goto wrong" will leak memory.  */
-
-  /* Swap in the rest of the header, now that we have the byte order. */
-  i_ehdrp = elf_elfheader (abfd);
-  elf_swap_ehdr_in (abfd, &x_ehdr, i_ehdrp);
-
-#if DEBUG & 1
-  elf_debug_file (i_ehdrp);
-#endif
-
-  ebd = get_elf_backend_data (abfd);
-
-  /* Check that the ELF e_machine field matches what this particular
-     BFD format expects.  */
-
-  if (ebd->elf_machine_code != i_ehdrp->e_machine
-      && (ebd->elf_machine_alt1 == 0
-	  || i_ehdrp->e_machine != ebd->elf_machine_alt1)
-      && (ebd->elf_machine_alt2 == 0
-	  || i_ehdrp->e_machine != ebd->elf_machine_alt2))
-    {
-      const bfd_target * const *target_ptr;
-
-      if (ebd->elf_machine_code != EM_NONE)
-	goto wrong;
-
-      /* This is the generic ELF target.  Let it match any ELF target
-	 for which we do not have a specific backend.  */
-
-      for (target_ptr = bfd_target_vector; *target_ptr != NULL; target_ptr++)
-	{
-	  struct elf_backend_data *back;
-
-	  if ((*target_ptr)->flavour != bfd_target_elf_flavour)
-	    continue;
-	  back = (struct elf_backend_data *) (*target_ptr)->backend_data;
-	  if (back->elf_machine_code == i_ehdrp->e_machine)
-	    {
-	      /* target_ptr is an ELF backend which matches this
-		 object file, so reject the generic ELF target.  */
-	      goto wrong;
-	    }
-	}
-    }
-
-  /* If there is no program header, or the type is not a core file, then
-     we are hosed. */
-  if (i_ehdrp->e_phoff == 0 || i_ehdrp->e_type != ET_CORE)
-    goto wrong;
-
-  /* Does BFD's idea of the phdr size match the size
-     recorded in the file? */
-  if (i_ehdrp->e_phentsize != sizeof (Elf_External_Phdr))
-    goto wrong;
-
-  /* Allocate space for the program headers. */
-  i_phdrp = (Elf_Internal_Phdr *)
-    bfd_alloc (abfd, sizeof (*i_phdrp) * i_ehdrp->e_phnum);
-  if (!i_phdrp)
-    return NULL;
-
-  elf_tdata (abfd)->phdr = i_phdrp;
-
-  /* Read and convert to internal form. */
-  for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
-    {
-      Elf_External_Phdr x_phdr;
-      if (bfd_read ((PTR) &x_phdr, sizeof (x_phdr), 1, abfd)
-	  != sizeof (x_phdr))
-	return NULL;
-
-      elf_swap_phdr_in (abfd, &x_phdr, i_phdrp + phindex);
-    }
-
-  /* Process each program header. */
-  for (phindex = 0; phindex < i_ehdrp->e_phnum; ++phindex)
-    {
-      if (!_bfd_elfcore_section_from_phdr (abfd, i_phdrp + phindex, phindex))
-	return NULL;
-    }
-
-  /* Set the machine architecture. */
-  if (! bfd_default_set_arch_mach (abfd, ebd->arch, 0))
-    {
-      /* It's OK if this fails for the generic target.  */
-      if (ebd->elf_machine_code != EM_NONE)
-	return NULL;
-    }
-
-  /* Save the entry point from the ELF header. */
-  bfd_get_start_address (abfd) = i_ehdrp->e_entry;
-
-  return abfd->xvec;
-}
diff --git a/bfd/elflink.c b/bfd/elflink.c
deleted file mode 100644
index dc0b0428c60..00000000000
--- a/bfd/elflink.c
+++ /dev/null
@@ -1,433 +0,0 @@
-/* ELF linking support for BFD.
-   Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#define ARCH_SIZE 0
-#include "elf-bfd.h"
-
-boolean
-_bfd_elf_create_got_section (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags;
-  register asection *s;
-  struct elf_link_hash_entry *h;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  int ptralign;
-
-  /* This function may be called more than once.  */
-  if (bfd_get_section_by_name (abfd, ".got") != NULL)
-    return true;
-
-  switch (bed->s->arch_size)
-    {
-    case 32: ptralign = 2; break;
-    case 64: ptralign = 3; break;
-    default: abort();
-    }
-
-  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-	   | SEC_LINKER_CREATED);
-
-  s = bfd_make_section (abfd, ".got");
-  if (s == NULL
-      || !bfd_set_section_flags (abfd, s, flags)
-      || !bfd_set_section_alignment (abfd, s, ptralign))
-    return false;
-
-  if (bed->want_got_plt)
-    {
-      s = bfd_make_section (abfd, ".got.plt");
-      if (s == NULL
-	  || !bfd_set_section_flags (abfd, s, flags)
-	  || !bfd_set_section_alignment (abfd, s, ptralign))
-	return false;
-    }
-
-  /* Define the symbol _GLOBAL_OFFSET_TABLE_ at the start of the .got
-     (or .got.plt) section.  We don't do this in the linker script
-     because we don't want to define the symbol if we are not creating
-     a global offset table.  */
-  h = NULL;
-  if (!(_bfd_generic_link_add_one_symbol
-	(info, abfd, "_GLOBAL_OFFSET_TABLE_", BSF_GLOBAL, s,
-	 bed->got_symbol_offset, (const char *) NULL, false,
-	 bed->collect, (struct bfd_link_hash_entry **) &h)))
-    return false;
-  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-  h->type = STT_OBJECT;
-
-  if (info->shared
-      && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
-
-  elf_hash_table (info)->hgot = h;
-
-  /* The first bit of the global offset table is the header.  */
-  s->_raw_size += bed->got_header_size + bed->got_symbol_offset;
-
-  return true;
-}
-
-
-/* Create dynamic sections when linking against a dynamic object.  */
-
-boolean
-_bfd_elf_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags, pltflags;
-  register asection *s;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  int ptralign;
-
-  switch (bed->s->arch_size)
-    {
-    case 32: ptralign = 2; break;
-    case 64: ptralign = 3; break;
-    default: abort();
-    }
-
-  /* We need to create .plt, .rel[a].plt, .got, .got.plt, .dynbss, and
-     .rel[a].bss sections.  */
-
-  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-	   | SEC_LINKER_CREATED);
-
-  pltflags = flags;
-  pltflags |= SEC_CODE;
-  if (bed->plt_not_loaded)
-    pltflags &= ~ (SEC_LOAD | SEC_HAS_CONTENTS);
-  if (bed->plt_readonly)
-    pltflags |= SEC_READONLY;
-
-  s = bfd_make_section (abfd, ".plt");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, pltflags)
-      || ! bfd_set_section_alignment (abfd, s, bed->plt_alignment))
-    return false;
-
-  if (bed->want_plt_sym)
-    {
-      /* Define the symbol _PROCEDURE_LINKAGE_TABLE_ at the start of the
-	 .plt section.  */
-      struct elf_link_hash_entry *h = NULL;
-      if (! (_bfd_generic_link_add_one_symbol
-	     (info, abfd, "_PROCEDURE_LINKAGE_TABLE_", BSF_GLOBAL, s,
-	      (bfd_vma) 0, (const char *) NULL, false,
-	      get_elf_backend_data (abfd)->collect,
-	      (struct bfd_link_hash_entry **) &h)))
-	return false;
-      h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-      h->type = STT_OBJECT;
-
-      if (info->shared
-	  && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-	return false;
-    }
-
-  s = bfd_make_section (abfd, bed->use_rela_p ? ".rela.plt" : ".rel.plt");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-      || ! bfd_set_section_alignment (abfd, s, ptralign))
-    return false;
-
-  if (! _bfd_elf_create_got_section (abfd, info))
-    return false;
-
-  /* The .dynbss section is a place to put symbols which are defined
-     by dynamic objects, are referenced by regular objects, and are
-     not functions.  We must allocate space for them in the process
-     image and use a R_*_COPY reloc to tell the dynamic linker to
-     initialize them at run time.  The linker script puts the .dynbss
-     section into the .bss section of the final image.  */
-  s = bfd_make_section (abfd, ".dynbss");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, SEC_ALLOC))
-    return false;
-
-  /* The .rel[a].bss section holds copy relocs.  This section is not
-     normally needed.  We need to create it here, though, so that the
-     linker will map it to an output section.  We can't just create it
-     only if we need it, because we will not know whether we need it
-     until we have seen all the input files, and the first time the
-     main linker code calls BFD after examining all the input files
-     (size_dynamic_sections) the input sections have already been
-     mapped to the output sections.  If the section turns out not to
-     be needed, we can discard it later.  We will never need this
-     section when generating a shared object, since they do not use
-     copy relocs.  */
-  if (! info->shared)
-    {
-      s = bfd_make_section (abfd, bed->use_rela_p ? ".rela.bss" : ".rel.bss");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-	  || ! bfd_set_section_alignment (abfd, s, ptralign))
-	return false;
-    }
-
-  return true;
-}
-
-
-/* Record a new dynamic symbol.  We record the dynamic symbols as we
-   read the input files, since we need to have a list of all of them
-   before we can determine the final sizes of the output sections.
-   Note that we may actually call this function even though we are not
-   going to output any dynamic symbols; in some cases we know that a
-   symbol should be in the dynamic symbol table, but only if there is
-   one.  */
-
-boolean
-_bfd_elf_link_record_dynamic_symbol (info, h)
-     struct bfd_link_info *info;
-     struct elf_link_hash_entry *h;
-{
-  if (h->dynindx == -1)
-    {
-      struct bfd_strtab_hash *dynstr;
-      char *p, *alc;
-      const char *name;
-      boolean copy;
-      bfd_size_type indx;
-
-      h->dynindx = elf_hash_table (info)->dynsymcount;
-      ++elf_hash_table (info)->dynsymcount;
-
-      dynstr = elf_hash_table (info)->dynstr;
-      if (dynstr == NULL)
-	{
-	  /* Create a strtab to hold the dynamic symbol names.  */
-	  elf_hash_table (info)->dynstr = dynstr = _bfd_elf_stringtab_init ();
-	  if (dynstr == NULL)
-	    return false;
-	}
-
-      /* We don't put any version information in the dynamic string
-         table.  */
-      name = h->root.root.string;
-      p = strchr (name, ELF_VER_CHR);
-      if (p == NULL)
-	{
-	  alc = NULL;
-	  copy = false;
-	}
-      else
-	{
-	  alc = bfd_malloc (p - name + 1);
-	  if (alc == NULL)
-	    return false;
-	  strncpy (alc, name, p - name);
-	  alc[p - name] = '\0';
-	  name = alc;
-	  copy = true;
-	}
-
-      indx = _bfd_stringtab_add (dynstr, name, true, copy);
-
-      if (alc != NULL)
-	free (alc);
-
-      if (indx == (bfd_size_type) -1)
-	return false;
-      h->dynstr_index = indx;
-    }
-
-  return true;
-}
-
-/* Create a special linker section, or return a pointer to a linker section already created  */
-
-elf_linker_section_t *
-_bfd_elf_create_linker_section (abfd, info, which, defaults)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     enum elf_linker_section_enum which;
-     elf_linker_section_t *defaults;
-{
-  bfd *dynobj = elf_hash_table (info)->dynobj;
-  elf_linker_section_t *lsect;
-
-  /* Record the first bfd section that needs the special section */
-  if (!dynobj)
-    dynobj = elf_hash_table (info)->dynobj = abfd;
-
-  /* If this is the first time, create the section */
-  lsect = elf_linker_section (dynobj, which);
-  if (!lsect)
-    {
-      asection *s;
-
-      lsect = (elf_linker_section_t *)
-	bfd_alloc (dynobj, sizeof (elf_linker_section_t));
-
-      *lsect = *defaults;
-      elf_linker_section (dynobj, which) = lsect;
-      lsect->which = which;
-      lsect->hole_written_p = false;
-
-      /* See if the sections already exist */
-      lsect->section = s = bfd_get_section_by_name (dynobj, lsect->name);
-      if (!s || (s->flags & defaults->flags) != defaults->flags)
-	{
-	  lsect->section = s = bfd_make_section_anyway (dynobj, lsect->name);
-
-	  if (s == NULL)
-	    return (elf_linker_section_t *)0;
-
-	  bfd_set_section_flags (dynobj, s, defaults->flags);
-	  bfd_set_section_alignment (dynobj, s, lsect->alignment);
-	}
-      else if (bfd_get_section_alignment (dynobj, s) < lsect->alignment)
-	bfd_set_section_alignment (dynobj, s, lsect->alignment);
-
-      s->_raw_size = align_power (s->_raw_size, lsect->alignment);
-
-      /* Is there a hole we have to provide?  If so check whether the segment is
-	 too big already */
-      if (lsect->hole_size)
-	{
-	  lsect->hole_offset = s->_raw_size;
-	  s->_raw_size += lsect->hole_size;
-	  if (lsect->hole_offset > lsect->max_hole_offset)
-	    {
-	      (*_bfd_error_handler) (_("%s: Section %s is already to large to put hole of %ld bytes in"),
-				     bfd_get_filename (abfd),
-				     lsect->name,
-				     (long)lsect->hole_size);
-
-	      bfd_set_error (bfd_error_bad_value);
-	      return (elf_linker_section_t *)0;
-	    }
-	}
-
-#ifdef DEBUG
-      fprintf (stderr, "Creating section %s, current size = %ld\n",
-	       lsect->name, (long)s->_raw_size);
-#endif
-
-      if (lsect->sym_name)
-	{
-	  struct elf_link_hash_entry *h = NULL;
-#ifdef DEBUG
-	  fprintf (stderr, "Adding %s to section %s\n",
-		   lsect->sym_name,
-		   lsect->name);
-#endif
-	  h = (struct elf_link_hash_entry *)
-	    bfd_link_hash_lookup (info->hash, lsect->sym_name, false, false, false);
-
-	  if ((h == NULL || h->root.type == bfd_link_hash_undefined)
-	      && !(_bfd_generic_link_add_one_symbol (info,
-						     abfd,
-						     lsect->sym_name,
-						     BSF_GLOBAL,
-						     s,
-						     ((lsect->hole_size)
-						      ? s->_raw_size - lsect->hole_size + lsect->sym_offset
-						      : lsect->sym_offset),
-						     (const char *) NULL,
-						     false,
-						     get_elf_backend_data (abfd)->collect,
-						     (struct bfd_link_hash_entry **) &h)))
-	    return (elf_linker_section_t *)0;
-
-	  if ((defaults->which != LINKER_SECTION_SDATA)
-	      && (defaults->which != LINKER_SECTION_SDATA2))
-	    h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_DYNAMIC;
-
-	  h->type = STT_OBJECT;
-	  lsect->sym_hash = h;
-
-	  if (info->shared
-	      && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-	    return (elf_linker_section_t *)0;
-	}
-    }
-
-#if 0
-  /* This does not make sense.  The sections which may exist in the
-     object file have nothing to do with the sections we want to
-     create.  */
-
-  /* Find the related sections if they have been created */
-  if (lsect->bss_name && !lsect->bss_section)
-    lsect->bss_section = bfd_get_section_by_name (dynobj, lsect->bss_name);
-
-  if (lsect->rel_name && !lsect->rel_section)
-    lsect->rel_section = bfd_get_section_by_name (dynobj, lsect->rel_name);
-#endif
-
-  return lsect;
-}
-
-
-/* Find a linker generated pointer with a given addend and type.  */
-
-elf_linker_section_pointers_t *
-_bfd_elf_find_pointer_linker_section (linker_pointers, addend, which)
-     elf_linker_section_pointers_t *linker_pointers;
-     bfd_signed_vma addend;
-     elf_linker_section_enum_t which;
-{
-  for ( ; linker_pointers != NULL; linker_pointers = linker_pointers->next)
-    {
-      if (which == linker_pointers->which && addend == linker_pointers->addend)
-	return linker_pointers;
-    }
-
-  return (elf_linker_section_pointers_t *)0;
-}
-
-
-/* Make the .rela section corresponding to the generated linker section.  */
-
-boolean
-_bfd_elf_make_linker_section_rela (dynobj, lsect, alignment)
-     bfd *dynobj;
-     elf_linker_section_t *lsect;
-     int alignment;
-{
-  if (lsect->rel_section)
-    return true;
-
-  lsect->rel_section = bfd_get_section_by_name (dynobj, lsect->rel_name);
-  if (lsect->rel_section == NULL)
-    {
-      lsect->rel_section = bfd_make_section (dynobj, lsect->rel_name);
-      if (lsect->rel_section == NULL
-	  || ! bfd_set_section_flags (dynobj,
-				      lsect->rel_section,
-				      (SEC_ALLOC
-				       | SEC_LOAD
-				       | SEC_HAS_CONTENTS
-				       | SEC_IN_MEMORY
-				       | SEC_LINKER_CREATED
-				       | SEC_READONLY))
-	  || ! bfd_set_section_alignment (dynobj, lsect->rel_section, alignment))
-	return false;
-    }
-
-  return true;
-}
diff --git a/bfd/elflink.h b/bfd/elflink.h
deleted file mode 100644
index 32bfab0e802..00000000000
--- a/bfd/elflink.h
+++ /dev/null
@@ -1,6150 +0,0 @@
-/* ELF linker support.
-   Copyright 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* ELF linker code.  */
-
-/* This struct is used to pass information to routines called via
-   elf_link_hash_traverse which must return failure.  */
-
-struct elf_info_failed
-{
-  boolean failed;
-  struct bfd_link_info *info;
-};
-
-static boolean elf_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_link_add_archive_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean elf_merge_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, const char *, Elf_Internal_Sym *,
-	   asection **, bfd_vma *, struct elf_link_hash_entry **,
-	   boolean *, boolean *, boolean *));
-static boolean elf_export_symbol
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_fix_symbol_flags
-  PARAMS ((struct elf_link_hash_entry *, struct elf_info_failed *));
-static boolean elf_adjust_dynamic_symbol
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_find_version_dependencies
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_find_version_dependencies
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_assign_sym_version
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_renumber_dynsyms
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_collect_hash_codes
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-
-/* Given an ELF BFD, add symbols to the global hash table as
-   appropriate.  */
-
-boolean
-elf_bfd_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      return elf_link_add_object_symbols (abfd, info);
-    case bfd_archive:
-      return elf_link_add_archive_symbols (abfd, info);
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-}
-
-
-/* Add symbols from an ELF archive file to the linker hash table.  We
-   don't use _bfd_generic_link_add_archive_symbols because of a
-   problem which arises on UnixWare.  The UnixWare libc.so is an
-   archive which includes an entry libc.so.1 which defines a bunch of
-   symbols.  The libc.so archive also includes a number of other
-   object files, which also define symbols, some of which are the same
-   as those defined in libc.so.1.  Correct linking requires that we
-   consider each object file in turn, and include it if it defines any
-   symbols we need.  _bfd_generic_link_add_archive_symbols does not do
-   this; it looks through the list of undefined symbols, and includes
-   any object file which defines them.  When this algorithm is used on
-   UnixWare, it winds up pulling in libc.so.1 early and defining a
-   bunch of symbols.  This means that some of the other objects in the
-   archive are not included in the link, which is incorrect since they
-   precede libc.so.1 in the archive.
-
-   Fortunately, ELF archive handling is simpler than that done by
-   _bfd_generic_link_add_archive_symbols, which has to allow for a.out
-   oddities.  In ELF, if we find a symbol in the archive map, and the
-   symbol is currently undefined, we know that we must pull in that
-   object file.
-
-   Unfortunately, we do have to make multiple passes over the symbol
-   table until nothing further is resolved.  */
-
-static boolean
-elf_link_add_archive_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  symindex c;
-  boolean *defined = NULL;
-  boolean *included = NULL;
-  carsym *symdefs;
-  boolean loop;
-
-  if (! bfd_has_map (abfd))
-    {
-      /* An empty archive is a special case.  */
-      if (bfd_openr_next_archived_file (abfd, (bfd *) NULL) == NULL)
-	return true;
-      bfd_set_error (bfd_error_no_armap);
-      return false;
-    }
-
-  /* Keep track of all symbols we know to be already defined, and all
-     files we know to be already included.  This is to speed up the
-     second and subsequent passes.  */
-  c = bfd_ardata (abfd)->symdef_count;
-  if (c == 0)
-    return true;
-  defined = (boolean *) bfd_malloc (c * sizeof (boolean));
-  included = (boolean *) bfd_malloc (c * sizeof (boolean));
-  if (defined == (boolean *) NULL || included == (boolean *) NULL)
-    goto error_return;
-  memset (defined, 0, c * sizeof (boolean));
-  memset (included, 0, c * sizeof (boolean));
-
-  symdefs = bfd_ardata (abfd)->symdefs;
-
-  do
-    {
-      file_ptr last;
-      symindex i;
-      carsym *symdef;
-      carsym *symdefend;
-
-      loop = false;
-      last = -1;
-
-      symdef = symdefs;
-      symdefend = symdef + c;
-      for (i = 0; symdef < symdefend; symdef++, i++)
-	{
-	  struct elf_link_hash_entry *h;
-	  bfd *element;
-	  struct bfd_link_hash_entry *undefs_tail;
-	  symindex mark;
-
-	  if (defined[i] || included[i])
-	    continue;
-	  if (symdef->file_offset == last)
-	    {
-	      included[i] = true;
-	      continue;
-	    }
-
-	  h = elf_link_hash_lookup (elf_hash_table (info), symdef->name,
-				    false, false, false);
-
-	  if (h == NULL)
-	    {
-	      char *p, *copy;
-
-	      /* If this is a default version (the name contains @@),
-		 look up the symbol again without the version.  The
-		 effect is that references to the symbol without the
-		 version will be matched by the default symbol in the
-		 archive.  */
-
-	      p = strchr (symdef->name, ELF_VER_CHR);
-	      if (p == NULL || p[1] != ELF_VER_CHR)
-		continue;
-
-	      copy = bfd_alloc (abfd, p - symdef->name + 1);
-	      if (copy == NULL)
-		goto error_return;
-	      memcpy (copy, symdef->name, p - symdef->name);
-	      copy[p - symdef->name] = '\0';
-
-	      h = elf_link_hash_lookup (elf_hash_table (info), copy,
-					false, false, false);
-
-	      bfd_release (abfd, copy);
-	    }
-
-	  if (h == NULL)
-	    continue;
-
-	  if (h->root.type != bfd_link_hash_undefined)
-	    {
-	      if (h->root.type != bfd_link_hash_undefweak)
-		defined[i] = true;
-	      continue;
-	    }
-
-	  /* We need to include this archive member.  */
-
-	  element = _bfd_get_elt_at_filepos (abfd, symdef->file_offset);
-	  if (element == (bfd *) NULL)
-	    goto error_return;
-
-	  if (! bfd_check_format (element, bfd_object))
-	    goto error_return;
-
-	  /* Doublecheck that we have not included this object
-	     already--it should be impossible, but there may be
-	     something wrong with the archive.  */
-	  if (element->archive_pass != 0)
-	    {
-	      bfd_set_error (bfd_error_bad_value);
-	      goto error_return;
-	    }
-	  element->archive_pass = 1;
-
-	  undefs_tail = info->hash->undefs_tail;
-
-	  if (! (*info->callbacks->add_archive_element) (info, element,
-							 symdef->name))
-	    goto error_return;
-	  if (! elf_link_add_object_symbols (element, info))
-	    goto error_return;
-
-	  /* If there are any new undefined symbols, we need to make
-	     another pass through the archive in order to see whether
-	     they can be defined.  FIXME: This isn't perfect, because
-	     common symbols wind up on undefs_tail and because an
-	     undefined symbol which is defined later on in this pass
-	     does not require another pass.  This isn't a bug, but it
-	     does make the code less efficient than it could be.  */
-	  if (undefs_tail != info->hash->undefs_tail)
-	    loop = true;
-
-	  /* Look backward to mark all symbols from this object file
-	     which we have already seen in this pass.  */
-	  mark = i;
-	  do
-	    {
-	      included[mark] = true;
-	      if (mark == 0)
-		break;
-	      --mark;
-	    }
-	  while (symdefs[mark].file_offset == symdef->file_offset);
-
-	  /* We mark subsequent symbols from this object file as we go
-	     on through the loop.  */
-	  last = symdef->file_offset;
-	}
-    }
-  while (loop);
-
-  free (defined);
-  free (included);
-
-  return true;
-
- error_return:
-  if (defined != (boolean *) NULL)
-    free (defined);
-  if (included != (boolean *) NULL)
-    free (included);
-  return false;
-}
-
-/* This function is called when we want to define a new symbol.  It
-   handles the various cases which arise when we find a definition in
-   a dynamic object, or when there is already a definition in a
-   dynamic object.  The new symbol is described by NAME, SYM, PSEC,
-   and PVALUE.  We set SYM_HASH to the hash table entry.  We set
-   OVERRIDE if the old symbol is overriding a new definition.  We set
-   TYPE_CHANGE_OK if it is OK for the type to change.  We set
-   SIZE_CHANGE_OK if it is OK for the size to change.  By OK to
-   change, we mean that we shouldn't warn if the type or size does
-   change.  */
-
-static boolean
-elf_merge_symbol (abfd, info, name, sym, psec, pvalue, sym_hash,
-		  override, type_change_ok, size_change_ok)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const char *name;
-     Elf_Internal_Sym *sym;
-     asection **psec;
-     bfd_vma *pvalue;
-     struct elf_link_hash_entry **sym_hash;
-     boolean *override;
-     boolean *type_change_ok;
-     boolean *size_change_ok;
-{
-  asection *sec;
-  struct elf_link_hash_entry *h;
-  int bind;
-  bfd *oldbfd;
-  boolean newdyn, olddyn, olddef, newdef, newdyncommon, olddyncommon;
-
-  *override = false;
-
-  sec = *psec;
-  bind = ELF_ST_BIND (sym->st_info);
-
-  if (! bfd_is_und_section (sec))
-    h = elf_link_hash_lookup (elf_hash_table (info), name, true, false, false);
-  else
-    h = ((struct elf_link_hash_entry *)
-	 bfd_wrapped_link_hash_lookup (abfd, info, name, true, false, false));
-  if (h == NULL)
-    return false;
-  *sym_hash = h;
-
-  /* This code is for coping with dynamic objects, and is only useful
-     if we are doing an ELF link.  */
-  if (info->hash->creator != abfd->xvec)
-    return true;
-
-  /* For merging, we only care about real symbols.  */
-
-  while (h->root.type == bfd_link_hash_indirect
-	 || h->root.type == bfd_link_hash_warning)
-    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
-  /* If we just created the symbol, mark it as being an ELF symbol.
-     Other than that, there is nothing to do--there is no merge issue
-     with a newly defined symbol--so we just return.  */
-
-  if (h->root.type == bfd_link_hash_new)
-    {
-      h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-      return true;
-    }
-
-  /* OLDBFD is a BFD associated with the existing symbol.  */
-
-  switch (h->root.type)
-    {
-    default:
-      oldbfd = NULL;
-      break;
-
-    case bfd_link_hash_undefined:
-    case bfd_link_hash_undefweak:
-      oldbfd = h->root.u.undef.abfd;
-      break;
-
-    case bfd_link_hash_defined:
-    case bfd_link_hash_defweak:
-      oldbfd = h->root.u.def.section->owner;
-      break;
-
-    case bfd_link_hash_common:
-      oldbfd = h->root.u.c.p->section->owner;
-      break;
-    }
-
-  /* NEWDYN and OLDDYN indicate whether the new or old symbol,
-     respectively, is from a dynamic object.  */
-
-  if ((abfd->flags & DYNAMIC) != 0)
-    newdyn = true;
-  else
-    newdyn = false;
-
-  if (oldbfd == NULL || (oldbfd->flags & DYNAMIC) == 0)
-    olddyn = false;
-  else
-    olddyn = true;
-
-  /* NEWDEF and OLDDEF indicate whether the new or old symbol,
-     respectively, appear to be a definition rather than reference.  */
-
-  if (bfd_is_und_section (sec) || bfd_is_com_section (sec))
-    newdef = false;
-  else
-    newdef = true;
-
-  if (h->root.type == bfd_link_hash_undefined
-      || h->root.type == bfd_link_hash_undefweak
-      || h->root.type == bfd_link_hash_common)
-    olddef = false;
-  else
-    olddef = true;
-
-  /* NEWDYNCOMMON and OLDDYNCOMMON indicate whether the new or old
-     symbol, respectively, appears to be a common symbol in a dynamic
-     object.  If a symbol appears in an uninitialized section, and is
-     not weak, and is not a function, then it may be a common symbol
-     which was resolved when the dynamic object was created.  We want
-     to treat such symbols specially, because they raise special
-     considerations when setting the symbol size: if the symbol
-     appears as a common symbol in a regular object, and the size in
-     the regular object is larger, we must make sure that we use the
-     larger size.  This problematic case can always be avoided in C,
-     but it must be handled correctly when using Fortran shared
-     libraries.
-
-     Note that if NEWDYNCOMMON is set, NEWDEF will be set, and
-     likewise for OLDDYNCOMMON and OLDDEF.
-
-     Note that this test is just a heuristic, and that it is quite
-     possible to have an uninitialized symbol in a shared object which
-     is really a definition, rather than a common symbol.  This could
-     lead to some minor confusion when the symbol really is a common
-     symbol in some regular object.  However, I think it will be
-     harmless.  */
-
-  if (newdyn
-      && newdef
-      && (sec->flags & SEC_ALLOC) != 0
-      && (sec->flags & SEC_LOAD) == 0
-      && sym->st_size > 0
-      && bind != STB_WEAK
-      && ELF_ST_TYPE (sym->st_info) != STT_FUNC)
-    newdyncommon = true;
-  else
-    newdyncommon = false;
-
-  if (olddyn
-      && olddef
-      && h->root.type == bfd_link_hash_defined
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-      && (h->root.u.def.section->flags & SEC_ALLOC) != 0
-      && (h->root.u.def.section->flags & SEC_LOAD) == 0
-      && h->size > 0
-      && h->type != STT_FUNC)
-    olddyncommon = true;
-  else
-    olddyncommon = false;
-
-  /* It's OK to change the type if either the existing symbol or the
-     new symbol is weak.  */
-
-  if (h->root.type == bfd_link_hash_defweak
-      || h->root.type == bfd_link_hash_undefweak
-      || bind == STB_WEAK)
-    *type_change_ok = true;
-
-  /* It's OK to change the size if either the existing symbol or the
-     new symbol is weak, or if the old symbol is undefined.  */
-
-  if (*type_change_ok
-      || h->root.type == bfd_link_hash_undefined)
-    *size_change_ok = true;
-
-  /* If both the old and the new symbols look like common symbols in a
-     dynamic object, set the size of the symbol to the larger of the
-     two.  */
-
-  if (olddyncommon
-      && newdyncommon
-      && sym->st_size != h->size)
-    {
-      /* Since we think we have two common symbols, issue a multiple
-         common warning if desired.  Note that we only warn if the
-         size is different.  If the size is the same, we simply let
-         the old symbol override the new one as normally happens with
-         symbols defined in dynamic objects.  */
-
-      if (! ((*info->callbacks->multiple_common)
-	     (info, h->root.root.string, oldbfd, bfd_link_hash_common,
-	      h->size, abfd, bfd_link_hash_common, sym->st_size)))
-	return false;
-
-      if (sym->st_size > h->size)
-	h->size = sym->st_size;
-
-      *size_change_ok = true;
-    }
-
-  /* If we are looking at a dynamic object, and we have found a
-     definition, we need to see if the symbol was already defined by
-     some other object.  If so, we want to use the existing
-     definition, and we do not want to report a multiple symbol
-     definition error; we do this by clobbering *PSEC to be
-     bfd_und_section_ptr.
-
-     We treat a common symbol as a definition if the symbol in the
-     shared library is a function, since common symbols always
-     represent variables; this can cause confusion in principle, but
-     any such confusion would seem to indicate an erroneous program or
-     shared library.  We also permit a common symbol in a regular
-     object to override a weak symbol in a shared object.  */
-
-  if (newdyn
-      && newdef
-      && (olddef
-	  || (h->root.type == bfd_link_hash_common
-	      && (bind == STB_WEAK
-		  || ELF_ST_TYPE (sym->st_info) == STT_FUNC))))
-    {
-      *override = true;
-      newdef = false;
-      newdyncommon = false;
-
-      *psec = sec = bfd_und_section_ptr;
-      *size_change_ok = true;
-
-      /* If we get here when the old symbol is a common symbol, then
-         we are explicitly letting it override a weak symbol or
-         function in a dynamic object, and we don't want to warn about
-         a type change.  If the old symbol is a defined symbol, a type
-         change warning may still be appropriate.  */
-
-      if (h->root.type == bfd_link_hash_common)
-	*type_change_ok = true;
-    }
-
-  /* Handle the special case of an old common symbol merging with a
-     new symbol which looks like a common symbol in a shared object.
-     We change *PSEC and *PVALUE to make the new symbol look like a
-     common symbol, and let _bfd_generic_link_add_one_symbol will do
-     the right thing.  */
-
-  if (newdyncommon
-      && h->root.type == bfd_link_hash_common)
-    {
-      *override = true;
-      newdef = false;
-      newdyncommon = false;
-      *pvalue = sym->st_size;
-      *psec = sec = bfd_com_section_ptr;
-      *size_change_ok = true;
-    }
-
-  /* If the old symbol is from a dynamic object, and the new symbol is
-     a definition which is not from a dynamic object, then the new
-     symbol overrides the old symbol.  Symbols from regular files
-     always take precedence over symbols from dynamic objects, even if
-     they are defined after the dynamic object in the link.
-
-     As above, we again permit a common symbol in a regular object to
-     override a definition in a shared object if the shared object
-     symbol is a function or is weak.  */
-
-  if (! newdyn
-      && (newdef
-	  || (bfd_is_com_section (sec)
-	      && (h->root.type == bfd_link_hash_defweak
-		  || h->type == STT_FUNC)))
-      && olddyn
-      && olddef
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0)
-    {
-      /* Change the hash table entry to undefined, and let
-	 _bfd_generic_link_add_one_symbol do the right thing with the
-	 new definition.  */
-
-      h->root.type = bfd_link_hash_undefined;
-      h->root.u.undef.abfd = h->root.u.def.section->owner;
-      *size_change_ok = true;
-
-      olddef = false;
-      olddyncommon = false;
-
-      /* We again permit a type change when a common symbol may be
-         overriding a function.  */
-
-      if (bfd_is_com_section (sec))
-	*type_change_ok = true;
-
-      /* This union may have been set to be non-NULL when this symbol
-	 was seen in a dynamic object.  We must force the union to be
-	 NULL, so that it is correct for a regular symbol.  */
-
-      h->verinfo.vertree = NULL;
-
-      /* In this special case, if H is the target of an indirection,
-         we want the caller to frob with H rather than with the
-         indirect symbol.  That will permit the caller to redefine the
-         target of the indirection, rather than the indirect symbol
-         itself.  FIXME: This will break the -y option if we store a
-         symbol with a different name.  */
-      *sym_hash = h;
-    }
-
-  /* Handle the special case of a new common symbol merging with an
-     old symbol that looks like it might be a common symbol defined in
-     a shared object.  Note that we have already handled the case in
-     which a new common symbol should simply override the definition
-     in the shared library.  */
-
-  if (! newdyn
-      && bfd_is_com_section (sec)
-      && olddyncommon)
-    {
-      /* It would be best if we could set the hash table entry to a
-	 common symbol, but we don't know what to use for the section
-	 or the alignment.  */
-      if (! ((*info->callbacks->multiple_common)
-	     (info, h->root.root.string, oldbfd, bfd_link_hash_common,
-	      h->size, abfd, bfd_link_hash_common, sym->st_size)))
-	return false;
-
-      /* If the predumed common symbol in the dynamic object is
-         larger, pretend that the new symbol has its size.  */
-
-      if (h->size > *pvalue)
-	*pvalue = h->size;
-
-      /* FIXME: We no longer know the alignment required by the symbol
-	 in the dynamic object, so we just wind up using the one from
-	 the regular object.  */
-
-      olddef = false;
-      olddyncommon = false;
-
-      h->root.type = bfd_link_hash_undefined;
-      h->root.u.undef.abfd = h->root.u.def.section->owner;
-
-      *size_change_ok = true;
-      *type_change_ok = true;
-
-      h->verinfo.vertree = NULL;
-    }
-
-  return true;
-}
-
-/* Add symbols from an ELF object file to the linker hash table.  */
-
-static boolean
-elf_link_add_object_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  boolean (*add_symbol_hook) PARAMS ((bfd *, struct bfd_link_info *,
-				      const Elf_Internal_Sym *,
-				      const char **, flagword *,
-				      asection **, bfd_vma *));
-  boolean (*check_relocs) PARAMS ((bfd *, struct bfd_link_info *,
-				   asection *, const Elf_Internal_Rela *));
-  boolean collect;
-  Elf_Internal_Shdr *hdr;
-  size_t symcount;
-  size_t extsymcount;
-  size_t extsymoff;
-  Elf_External_Sym *buf = NULL;
-  struct elf_link_hash_entry **sym_hash;
-  boolean dynamic;
-  bfd_byte *dynver = NULL;
-  Elf_External_Versym *extversym = NULL;
-  Elf_External_Versym *ever;
-  Elf_External_Dyn *dynbuf = NULL;
-  struct elf_link_hash_entry *weaks;
-  Elf_External_Sym *esym;
-  Elf_External_Sym *esymend;
-
-  add_symbol_hook = get_elf_backend_data (abfd)->elf_add_symbol_hook;
-  collect = get_elf_backend_data (abfd)->collect;
-
-  if ((abfd->flags & DYNAMIC) == 0)
-    dynamic = false;
-  else
-    {
-      dynamic = true;
-
-      /* You can't use -r against a dynamic object.  Also, there's no
-	 hope of using a dynamic object which does not exactly match
-	 the format of the output file.  */
-      if (info->relocateable || info->hash->creator != abfd->xvec)
-	{
-	  bfd_set_error (bfd_error_invalid_operation);
-	  goto error_return;
-	}
-    }
-
-  /* As a GNU extension, any input sections which are named
-     .gnu.warning.SYMBOL are treated as warning symbols for the given
-     symbol.  This differs from .gnu.warning sections, which generate
-     warnings when they are included in an output file.  */
-  if (! info->shared)
-    {
-      asection *s;
-
-      for (s = abfd->sections; s != NULL; s = s->next)
-	{
-	  const char *name;
-
-	  name = bfd_get_section_name (abfd, s);
-	  if (strncmp (name, ".gnu.warning.", sizeof ".gnu.warning." - 1) == 0)
-	    {
-	      char *msg;
-	      bfd_size_type sz;
-
-	      name += sizeof ".gnu.warning." - 1;
-
-	      /* If this is a shared object, then look up the symbol
-		 in the hash table.  If it is there, and it is already
-		 been defined, then we will not be using the entry
-		 from this shared object, so we don't need to warn.
-		 FIXME: If we see the definition in a regular object
-		 later on, we will warn, but we shouldn't.  The only
-		 fix is to keep track of what warnings we are supposed
-		 to emit, and then handle them all at the end of the
-		 link.  */
-	      if (dynamic && abfd->xvec == info->hash->creator)
-		{
-		  struct elf_link_hash_entry *h;
-
-		  h = elf_link_hash_lookup (elf_hash_table (info), name,
-					    false, false, true);
-
-		  /* FIXME: What about bfd_link_hash_common?  */
-		  if (h != NULL
-		      && (h->root.type == bfd_link_hash_defined
-			  || h->root.type == bfd_link_hash_defweak))
-		    {
-		      /* We don't want to issue this warning.  Clobber
-                         the section size so that the warning does not
-                         get copied into the output file.  */
-		      s->_raw_size = 0;
-		      continue;
-		    }
-		}
-
-	      sz = bfd_section_size (abfd, s);
-	      msg = (char *) bfd_alloc (abfd, sz + 1);
-	      if (msg == NULL)
-		goto error_return;
-
-	      if (! bfd_get_section_contents (abfd, s, msg, (file_ptr) 0, sz))
-		goto error_return;
-
-	      msg[sz] = '\0';
-
-	      if (! (_bfd_generic_link_add_one_symbol
-		     (info, abfd, name, BSF_WARNING, s, (bfd_vma) 0, msg,
-		      false, collect, (struct bfd_link_hash_entry **) NULL)))
-		goto error_return;
-
-	      if (! info->relocateable)
-		{
-		  /* Clobber the section size so that the warning does
-                     not get copied into the output file.  */
-		  s->_raw_size = 0;
-		}
-	    }
-	}
-    }
-
-  /* If this is a dynamic object, we always link against the .dynsym
-     symbol table, not the .symtab symbol table.  The dynamic linker
-     will only see the .dynsym symbol table, so there is no reason to
-     look at .symtab for a dynamic object.  */
-
-  if (! dynamic || elf_dynsymtab (abfd) == 0)
-    hdr = &elf_tdata (abfd)->symtab_hdr;
-  else
-    hdr = &elf_tdata (abfd)->dynsymtab_hdr;
-
-  if (dynamic)
-    {
-      /* Read in any version definitions.  */
-
-      if (! _bfd_elf_slurp_version_tables (abfd))
-	goto error_return;
-
-      /* Read in the symbol versions, but don't bother to convert them
-         to internal format.  */
-      if (elf_dynversym (abfd) != 0)
-	{
-	  Elf_Internal_Shdr *versymhdr;
-
-	  versymhdr = &elf_tdata (abfd)->dynversym_hdr;
-	  extversym = (Elf_External_Versym *) bfd_malloc (hdr->sh_size);
-	  if (extversym == NULL)
-	    goto error_return;
-	  if (bfd_seek (abfd, versymhdr->sh_offset, SEEK_SET) != 0
-	      || (bfd_read ((PTR) extversym, 1, versymhdr->sh_size, abfd)
-		  != versymhdr->sh_size))
-	    goto error_return;
-	}
-    }
-
-  symcount = hdr->sh_size / sizeof (Elf_External_Sym);
-
-  /* The sh_info field of the symtab header tells us where the
-     external symbols start.  We don't care about the local symbols at
-     this point.  */
-  if (elf_bad_symtab (abfd))
-    {
-      extsymcount = symcount;
-      extsymoff = 0;
-    }
-  else
-    {
-      extsymcount = symcount - hdr->sh_info;
-      extsymoff = hdr->sh_info;
-    }
-
-  buf = ((Elf_External_Sym *)
-	 bfd_malloc (extsymcount * sizeof (Elf_External_Sym)));
-  if (buf == NULL && extsymcount != 0)
-    goto error_return;
-
-  /* We store a pointer to the hash table entry for each external
-     symbol.  */
-  sym_hash = ((struct elf_link_hash_entry **)
-	      bfd_alloc (abfd,
-			 extsymcount * sizeof (struct elf_link_hash_entry *)));
-  if (sym_hash == NULL)
-    goto error_return;
-  elf_sym_hashes (abfd) = sym_hash;
-
-  if (! dynamic)
-    {
-      /* If we are creating a shared library, create all the dynamic
-         sections immediately.  We need to attach them to something,
-         so we attach them to this BFD, provided it is the right
-         format.  FIXME: If there are no input BFD's of the same
-         format as the output, we can't make a shared library.  */
-      if (info->shared
-	  && ! elf_hash_table (info)->dynamic_sections_created
-	  && abfd->xvec == info->hash->creator)
-	{
-	  if (! elf_link_create_dynamic_sections (abfd, info))
-	    goto error_return;
-	}
-    }
-  else
-    {
-      asection *s;
-      boolean add_needed;
-      const char *name;
-      bfd_size_type oldsize;
-      bfd_size_type strindex;
-
-      /* Find the name to use in a DT_NEEDED entry that refers to this
-	 object.  If the object has a DT_SONAME entry, we use it.
-	 Otherwise, if the generic linker stuck something in
-	 elf_dt_name, we use that.  Otherwise, we just use the file
-	 name.  If the generic linker put a null string into
-	 elf_dt_name, we don't make a DT_NEEDED entry at all, even if
-	 there is a DT_SONAME entry.  */
-      add_needed = true;
-      name = bfd_get_filename (abfd);
-      if (elf_dt_name (abfd) != NULL)
-	{
-	  name = elf_dt_name (abfd);
-	  if (*name == '\0')
-	    add_needed = false;
-	}
-      s = bfd_get_section_by_name (abfd, ".dynamic");
-      if (s != NULL)
-	{
-	  Elf_External_Dyn *extdyn;
-	  Elf_External_Dyn *extdynend;
-	  int elfsec;
-	  unsigned long link;
-
-	  dynbuf = (Elf_External_Dyn *) bfd_malloc ((size_t) s->_raw_size);
-	  if (dynbuf == NULL)
-	    goto error_return;
-
-	  if (! bfd_get_section_contents (abfd, s, (PTR) dynbuf,
-					  (file_ptr) 0, s->_raw_size))
-	    goto error_return;
-
-	  elfsec = _bfd_elf_section_from_bfd_section (abfd, s);
-	  if (elfsec == -1)
-	    goto error_return;
-	  link = elf_elfsections (abfd)[elfsec]->sh_link;
-
-	  extdyn = dynbuf;
-	  extdynend = extdyn + s->_raw_size / sizeof (Elf_External_Dyn);
-	  for (; extdyn < extdynend; extdyn++)
-	    {
-	      Elf_Internal_Dyn dyn;
-
-	      elf_swap_dyn_in (abfd, extdyn, &dyn);
-	      if (dyn.d_tag == DT_SONAME)
-		{
-		  name = bfd_elf_string_from_elf_section (abfd, link,
-							  dyn.d_un.d_val);
-		  if (name == NULL)
-		    goto error_return;
-		}
-	      if (dyn.d_tag == DT_NEEDED)
-		{
-		  struct bfd_link_needed_list *n, **pn;
-		  char *fnm, *anm;
-
-		  n = ((struct bfd_link_needed_list *)
-		       bfd_alloc (abfd, sizeof (struct bfd_link_needed_list)));
-		  fnm = bfd_elf_string_from_elf_section (abfd, link,
-							 dyn.d_un.d_val);
-		  if (n == NULL || fnm == NULL)
-		    goto error_return;
-		  anm = bfd_alloc (abfd, strlen (fnm) + 1);
-		  if (anm == NULL)
-		    goto error_return;
-		  strcpy (anm, fnm);
-		  n->name = anm;
-		  n->by = abfd;
-		  n->next = NULL;
-		  for (pn = &elf_hash_table (info)->needed;
-		       *pn != NULL;
-		       pn = &(*pn)->next)
-		    ;
-		  *pn = n;
-		}
-	    }
-
-	  free (dynbuf);
-	  dynbuf = NULL;
-	}
-
-      /* We do not want to include any of the sections in a dynamic
-	 object in the output file.  We hack by simply clobbering the
-	 list of sections in the BFD.  This could be handled more
-	 cleanly by, say, a new section flag; the existing
-	 SEC_NEVER_LOAD flag is not the one we want, because that one
-	 still implies that the section takes up space in the output
-	 file.  */
-      abfd->sections = NULL;
-      abfd->section_count = 0;
-
-      /* If this is the first dynamic object found in the link, create
-	 the special sections required for dynamic linking.  */
-      if (! elf_hash_table (info)->dynamic_sections_created)
-	{
-	  if (! elf_link_create_dynamic_sections (abfd, info))
-	    goto error_return;
-	}
-
-      if (add_needed)
-	{
-	  /* Add a DT_NEEDED entry for this dynamic object.  */
-	  oldsize = _bfd_stringtab_size (elf_hash_table (info)->dynstr);
-	  strindex = _bfd_stringtab_add (elf_hash_table (info)->dynstr, name,
-					 true, false);
-	  if (strindex == (bfd_size_type) -1)
-	    goto error_return;
-
-	  if (oldsize == _bfd_stringtab_size (elf_hash_table (info)->dynstr))
-	    {
-	      asection *sdyn;
-	      Elf_External_Dyn *dyncon, *dynconend;
-
-	      /* The hash table size did not change, which means that
-		 the dynamic object name was already entered.  If we
-		 have already included this dynamic object in the
-		 link, just ignore it.  There is no reason to include
-		 a particular dynamic object more than once.  */
-	      sdyn = bfd_get_section_by_name (elf_hash_table (info)->dynobj,
-					      ".dynamic");
-	      BFD_ASSERT (sdyn != NULL);
-
-	      dyncon = (Elf_External_Dyn *) sdyn->contents;
-	      dynconend = (Elf_External_Dyn *) (sdyn->contents +
-						sdyn->_raw_size);
-	      for (; dyncon < dynconend; dyncon++)
-		{
-		  Elf_Internal_Dyn dyn;
-
-		  elf_swap_dyn_in (elf_hash_table (info)->dynobj, dyncon,
-				   &dyn);
-		  if (dyn.d_tag == DT_NEEDED
-		      && dyn.d_un.d_val == strindex)
-		    {
-		      if (buf != NULL)
-			free (buf);
-		      if (extversym != NULL)
-			free (extversym);
-		      return true;
-		    }
-		}
-	    }
-
-	  if (! elf_add_dynamic_entry (info, DT_NEEDED, strindex))
-	    goto error_return;
-	}
-
-      /* Save the SONAME, if there is one, because sometimes the
-         linker emulation code will need to know it.  */
-      if (*name == '\0')
-	name = bfd_get_filename (abfd);
-      elf_dt_name (abfd) = name;
-    }
-
-  if (bfd_seek (abfd,
-		hdr->sh_offset + extsymoff * sizeof (Elf_External_Sym),
-		SEEK_SET) != 0
-      || (bfd_read ((PTR) buf, sizeof (Elf_External_Sym), extsymcount, abfd)
-	  != extsymcount * sizeof (Elf_External_Sym)))
-    goto error_return;
-
-  weaks = NULL;
-
-  ever = extversym != NULL ? extversym + extsymoff : NULL;
-  esymend = buf + extsymcount;
-  for (esym = buf;
-       esym < esymend;
-       esym++, sym_hash++, ever = (ever != NULL ? ever + 1 : NULL))
-    {
-      Elf_Internal_Sym sym;
-      int bind;
-      bfd_vma value;
-      asection *sec;
-      flagword flags;
-      const char *name;
-      struct elf_link_hash_entry *h;
-      boolean definition;
-      boolean size_change_ok, type_change_ok;
-      boolean new_weakdef;
-      unsigned int old_alignment;
-
-      elf_swap_symbol_in (abfd, esym, &sym);
-
-      flags = BSF_NO_FLAGS;
-      sec = NULL;
-      value = sym.st_value;
-      *sym_hash = NULL;
-
-      bind = ELF_ST_BIND (sym.st_info);
-      if (bind == STB_LOCAL)
-	{
-	  /* This should be impossible, since ELF requires that all
-	     global symbols follow all local symbols, and that sh_info
-	     point to the first global symbol.  Unfortunatealy, Irix 5
-	     screws this up.  */
-	  continue;
-	}
-      else if (bind == STB_GLOBAL)
-	{
-	  if (sym.st_shndx != SHN_UNDEF
-	      && sym.st_shndx != SHN_COMMON)
-	    flags = BSF_GLOBAL;
-	  else
-	    flags = 0;
-	}
-      else if (bind == STB_WEAK)
-	flags = BSF_WEAK;
-      else
-	{
-	  /* Leave it up to the processor backend.  */
-	}
-
-      if (sym.st_shndx == SHN_UNDEF)
-	sec = bfd_und_section_ptr;
-      else if (sym.st_shndx > 0 && sym.st_shndx < SHN_LORESERVE)
-	{
-	  sec = section_from_elf_index (abfd, sym.st_shndx);
-	  if (sec == NULL)
-	    sec = bfd_abs_section_ptr;
-	  else if ((abfd->flags & (EXEC_P | DYNAMIC)) != 0)
-	    value -= sec->vma;
-	}
-      else if (sym.st_shndx == SHN_ABS)
-	sec = bfd_abs_section_ptr;
-      else if (sym.st_shndx == SHN_COMMON)
-	{
-	  sec = bfd_com_section_ptr;
-	  /* What ELF calls the size we call the value.  What ELF
-	     calls the value we call the alignment.  */
-	  value = sym.st_size;
-	}
-      else
-	{
-	  /* Leave it up to the processor backend.  */
-	}
-
-      name = bfd_elf_string_from_elf_section (abfd, hdr->sh_link, sym.st_name);
-      if (name == (const char *) NULL)
-	goto error_return;
-
-      if (add_symbol_hook)
-	{
-	  if (! (*add_symbol_hook) (abfd, info, &sym, &name, &flags, &sec,
-				    &value))
-	    goto error_return;
-
-	  /* The hook function sets the name to NULL if this symbol
-	     should be skipped for some reason.  */
-	  if (name == (const char *) NULL)
-	    continue;
-	}
-
-      /* Sanity check that all possibilities were handled.  */
-      if (sec == (asection *) NULL)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  goto error_return;
-	}
-
-      if (bfd_is_und_section (sec)
-	  || bfd_is_com_section (sec))
-	definition = false;
-      else
-	definition = true;
-
-      size_change_ok = false;
-      type_change_ok = get_elf_backend_data (abfd)->type_change_ok;
-      old_alignment = 0;
-      if (info->hash->creator->flavour == bfd_target_elf_flavour)
-	{
-	  Elf_Internal_Versym iver;
-	  unsigned int vernum = 0;
-	  boolean override;
-
-	  if (ever != NULL)
-	    {
-	      _bfd_elf_swap_versym_in (abfd, ever, &iver);
-	      vernum = iver.vs_vers & VERSYM_VERSION;
-
-	      /* If this is a hidden symbol, or if it is not version
-                 1, we append the version name to the symbol name.
-                 However, we do not modify a non-hidden absolute
-                 symbol, because it might be the version symbol
-                 itself.  FIXME: What if it isn't?  */
-	      if ((iver.vs_vers & VERSYM_HIDDEN) != 0
-		  || (vernum > 1 && ! bfd_is_abs_section (sec)))
-		{
-		  const char *verstr;
-		  int namelen, newlen;
-		  char *newname, *p;
-
-		  if (sym.st_shndx != SHN_UNDEF)
-		    {
-		      if (vernum > elf_tdata (abfd)->dynverdef_hdr.sh_info)
-			{
-			  (*_bfd_error_handler)
-			    (_("%s: %s: invalid version %u (max %d)"),
-			     bfd_get_filename (abfd), name, vernum,
-			     elf_tdata (abfd)->dynverdef_hdr.sh_info);
-			  bfd_set_error (bfd_error_bad_value);
-			  goto error_return;
-			}
-		      else if (vernum > 1)
-			verstr =
-			  elf_tdata (abfd)->verdef[vernum - 1].vd_nodename;
-		      else
-			verstr = "";
-		    }
-		  else
-		    {
-		      /* We cannot simply test for the number of
-			 entries in the VERNEED section since the
-			 numbers for the needed versions do not start
-			 at 0.  */
-		      Elf_Internal_Verneed *t;
-
-		      verstr = NULL;
-		      for (t = elf_tdata (abfd)->verref;
-			   t != NULL;
-			   t = t->vn_nextref)
-			{
-			  Elf_Internal_Vernaux *a;
-
-			  for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
-			    {
-			      if (a->vna_other == vernum)
-				{
-				  verstr = a->vna_nodename;
-				  break;
-				}
-			    }
-			  if (a != NULL)
-			    break;
-			}
-		      if (verstr == NULL)
-			{
-			  (*_bfd_error_handler)
-			    (_("%s: %s: invalid needed version %d"),
-			     bfd_get_filename (abfd), name, vernum);
-			  bfd_set_error (bfd_error_bad_value);
-			  goto error_return;
-			}
-		    }
-
-		  namelen = strlen (name);
-		  newlen = namelen + strlen (verstr) + 2;
-		  if ((iver.vs_vers & VERSYM_HIDDEN) == 0)
-		    ++newlen;
-
-		  newname = (char *) bfd_alloc (abfd, newlen);
-		  if (newname == NULL)
-		    goto error_return;
-		  strcpy (newname, name);
-		  p = newname + namelen;
-		  *p++ = ELF_VER_CHR;
-		  if ((iver.vs_vers & VERSYM_HIDDEN) == 0)
-		    *p++ = ELF_VER_CHR;
-		  strcpy (p, verstr);
-
-		  name = newname;
-		}
-	    }
-
-	  if (! elf_merge_symbol (abfd, info, name, &sym, &sec, &value,
-				  sym_hash, &override, &type_change_ok,
-				  &size_change_ok))
-	    goto error_return;
-
-	  if (override)
-	    definition = false;
-
-	  h = *sym_hash;
-	  while (h->root.type == bfd_link_hash_indirect
-		 || h->root.type == bfd_link_hash_warning)
-	    h = (struct elf_link_hash_entry *) h->root.u.i.link;
-
-	  /* Remember the old alignment if this is a common symbol, so
-             that we don't reduce the alignment later on.  We can't
-             check later, because _bfd_generic_link_add_one_symbol
-             will set a default for the alignment which we want to
-             override.  */
-	  if (h->root.type == bfd_link_hash_common)
-	    old_alignment = h->root.u.c.p->alignment_power;
-
-	  if (elf_tdata (abfd)->verdef != NULL
-	      && ! override
-	      && vernum > 1
-	      && definition)
-	    h->verinfo.verdef = &elf_tdata (abfd)->verdef[vernum - 1];
-	}
-
-      if (! (_bfd_generic_link_add_one_symbol
-	     (info, abfd, name, flags, sec, value, (const char *) NULL,
-	      false, collect, (struct bfd_link_hash_entry **) sym_hash)))
-	goto error_return;
-
-      h = *sym_hash;
-      while (h->root.type == bfd_link_hash_indirect
-	     || h->root.type == bfd_link_hash_warning)
-	h = (struct elf_link_hash_entry *) h->root.u.i.link;
-      *sym_hash = h;
-
-      new_weakdef = false;
-      if (dynamic
-	  && definition
-	  && (flags & BSF_WEAK) != 0
-	  && ELF_ST_TYPE (sym.st_info) != STT_FUNC
-	  && info->hash->creator->flavour == bfd_target_elf_flavour
-	  && h->weakdef == NULL)
-	{
-	  /* Keep a list of all weak defined non function symbols from
-	     a dynamic object, using the weakdef field.  Later in this
-	     function we will set the weakdef field to the correct
-	     value.  We only put non-function symbols from dynamic
-	     objects on this list, because that happens to be the only
-	     time we need to know the normal symbol corresponding to a
-	     weak symbol, and the information is time consuming to
-	     figure out.  If the weakdef field is not already NULL,
-	     then this symbol was already defined by some previous
-	     dynamic object, and we will be using that previous
-	     definition anyhow.  */
-
-	  h->weakdef = weaks;
-	  weaks = h;
-	  new_weakdef = true;
-	}
-
-      /* Set the alignment of a common symbol.  */
-      if (sym.st_shndx == SHN_COMMON
-	  && h->root.type == bfd_link_hash_common)
-	{
-	  unsigned int align;
-
-	  align = bfd_log2 (sym.st_value);
-	  if (align > old_alignment)
-	    h->root.u.c.p->alignment_power = align;
-	}
-
-      if (info->hash->creator->flavour == bfd_target_elf_flavour)
-	{
-	  int old_flags;
-	  boolean dynsym;
-	  int new_flag;
-
-	  /* Remember the symbol size and type.  */
-	  if (sym.st_size != 0
-	      && (definition || h->size == 0))
-	    {
-	      if (h->size != 0 && h->size != sym.st_size && ! size_change_ok)
-		(*_bfd_error_handler)
-		  (_("Warning: size of symbol `%s' changed from %lu to %lu in %s"),
-		   name, (unsigned long) h->size, (unsigned long) sym.st_size,
-		   bfd_get_filename (abfd));
-
-	      h->size = sym.st_size;
-	    }
-
-	  /* If this is a common symbol, then we always want H->SIZE
-             to be the size of the common symbol.  The code just above
-             won't fix the size if a common symbol becomes larger.  We
-             don't warn about a size change here, because that is
-             covered by --warn-common.  */
-	  if (h->root.type == bfd_link_hash_common)
-	    h->size = h->root.u.c.size;
-
-	  if (ELF_ST_TYPE (sym.st_info) != STT_NOTYPE
-	      && (definition || h->type == STT_NOTYPE))
-	    {
-	      if (h->type != STT_NOTYPE
-		  && h->type != ELF_ST_TYPE (sym.st_info)
-		  && ! type_change_ok)
-		(*_bfd_error_handler)
-		  (_("Warning: type of symbol `%s' changed from %d to %d in %s"),
-		   name, h->type, ELF_ST_TYPE (sym.st_info),
-		   bfd_get_filename (abfd));
-
-	      h->type = ELF_ST_TYPE (sym.st_info);
-	    }
-
-	  if (sym.st_other != 0
-	      && (definition || h->other == 0))
-	    h->other = sym.st_other;
-
-	  /* Set a flag in the hash table entry indicating the type of
-	     reference or definition we just found.  Keep a count of
-	     the number of dynamic symbols we find.  A dynamic symbol
-	     is one which is referenced or defined by both a regular
-	     object and a shared object.  */
-	  old_flags = h->elf_link_hash_flags;
-	  dynsym = false;
-	  if (! dynamic)
-	    {
-	      if (! definition)
-		{
-		  new_flag = ELF_LINK_HASH_REF_REGULAR;
-		  if (bind != STB_WEAK)
-		    new_flag |= ELF_LINK_HASH_REF_REGULAR_NONWEAK;
-		}
-	      else
-		new_flag = ELF_LINK_HASH_DEF_REGULAR;
-	      if (info->shared
-		  || (old_flags & (ELF_LINK_HASH_DEF_DYNAMIC
-				   | ELF_LINK_HASH_REF_DYNAMIC)) != 0)
-		dynsym = true;
-	    }
-	  else
-	    {
-	      if (! definition)
-		new_flag = ELF_LINK_HASH_REF_DYNAMIC;
-	      else
-		new_flag = ELF_LINK_HASH_DEF_DYNAMIC;
-	      if ((old_flags & (ELF_LINK_HASH_DEF_REGULAR
-				| ELF_LINK_HASH_REF_REGULAR)) != 0
-		  || (h->weakdef != NULL
-		      && ! new_weakdef
-		      && h->weakdef->dynindx != -1))
-		dynsym = true;
-	    }
-
-	  h->elf_link_hash_flags |= new_flag;
-
-	  /* If this symbol has a version, and it is the default
-             version, we create an indirect symbol from the default
-             name to the fully decorated name.  This will cause
-             external references which do not specify a version to be
-             bound to this version of the symbol.  */
-	  if (definition)
-	    {
-	      char *p;
-
-	      p = strchr (name, ELF_VER_CHR);
-	      if (p != NULL && p[1] == ELF_VER_CHR)
-		{
-		  char *shortname;
-		  struct elf_link_hash_entry *hi;
-		  boolean override;
-
-		  shortname = bfd_hash_allocate (&info->hash->table,
-						 p - name + 1);
-		  if (shortname == NULL)
-		    goto error_return;
-		  strncpy (shortname, name, p - name);
-		  shortname[p - name] = '\0';
-
-		  /* We are going to create a new symbol.  Merge it
-                     with any existing symbol with this name.  For the
-                     purposes of the merge, act as though we were
-                     defining the symbol we just defined, although we
-                     actually going to define an indirect symbol.  */
-		  type_change_ok = false;
-		  size_change_ok = false;
-		  if (! elf_merge_symbol (abfd, info, shortname, &sym, &sec,
-					  &value, &hi, &override,
-					  &type_change_ok, &size_change_ok))
-		    goto error_return;
-
-		  if (! override)
-		    {
-		      if (! (_bfd_generic_link_add_one_symbol
-			     (info, abfd, shortname, BSF_INDIRECT,
-			      bfd_ind_section_ptr, (bfd_vma) 0, name, false,
-			      collect, (struct bfd_link_hash_entry **) &hi)))
-			goto error_return;
-		    }
-		  else
-		    {
-		      /* In this case the symbol named SHORTNAME is
-                         overriding the indirect symbol we want to
-                         add.  We were planning on making SHORTNAME an
-                         indirect symbol referring to NAME.  SHORTNAME
-                         is the name without a version.  NAME is the
-                         fully versioned name, and it is the default
-                         version.
-
-			 Overriding means that we already saw a
-			 definition for the symbol SHORTNAME in a
-			 regular object, and it is overriding the
-			 symbol defined in the dynamic object.
-
-			 When this happens, we actually want to change
-			 NAME, the symbol we just added, to refer to
-			 SHORTNAME.  This will cause references to
-			 NAME in the shared object to become
-			 references to SHORTNAME in the regular
-			 object.  This is what we expect when we
-			 override a function in a shared object: that
-			 the references in the shared object will be
-			 mapped to the definition in the regular
-			 object.  */
-
-		      while (hi->root.type == bfd_link_hash_indirect
-			     || hi->root.type == bfd_link_hash_warning)
-			hi = (struct elf_link_hash_entry *) hi->root.u.i.link;
-
-		      h->root.type = bfd_link_hash_indirect;
-		      h->root.u.i.link = (struct bfd_link_hash_entry *) hi;
-		      if (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC)
-			{
-			  h->elf_link_hash_flags &=~ ELF_LINK_HASH_DEF_DYNAMIC;
-			  hi->elf_link_hash_flags |= ELF_LINK_HASH_REF_DYNAMIC;
-			  if (hi->elf_link_hash_flags
-			      & (ELF_LINK_HASH_REF_REGULAR
-				 | ELF_LINK_HASH_DEF_REGULAR))
-			    {
-			      if (! _bfd_elf_link_record_dynamic_symbol (info,
-									 hi))
-				goto error_return;
-			    }
-			}
-
-		      /* Now set HI to H, so that the following code
-                         will set the other fields correctly.  */
-		      hi = h;
-		    }
-
-		  /* If there is a duplicate definition somewhere,
-		     then HI may not point to an indirect symbol.  We
-		     will have reported an error to the user in that
-		     case.  */
-
-		  if (hi->root.type == bfd_link_hash_indirect)
-		    {
-		      struct elf_link_hash_entry *ht;
-
-		      /* If the symbol became indirect, then we assume
-			 that we have not seen a definition before.  */
-		      BFD_ASSERT ((hi->elf_link_hash_flags
-				   & (ELF_LINK_HASH_DEF_DYNAMIC
-				      | ELF_LINK_HASH_DEF_REGULAR))
-				  == 0);
-
-		      ht = (struct elf_link_hash_entry *) hi->root.u.i.link;
-
-		      /* Copy down any references that we may have
-			 already seen to the symbol which just became
-			 indirect.  */
-		      ht->elf_link_hash_flags |=
-			(hi->elf_link_hash_flags
-			 & (ELF_LINK_HASH_REF_DYNAMIC
-			    | ELF_LINK_HASH_REF_REGULAR
-			    | ELF_LINK_HASH_REF_REGULAR_NONWEAK));
-
-		      /* Copy over the global and procedure linkage table
-			 offset entries.  These may have been already set
-			 up by a check_relocs routine.  */
-		      if (ht->got.offset == (bfd_vma) -1)
-			{
-			  ht->got.offset = hi->got.offset;
-			  hi->got.offset = (bfd_vma) -1;
-			}
-		      BFD_ASSERT (hi->got.offset == (bfd_vma) -1);
-
-		      if (ht->plt.offset == (bfd_vma) -1)
-			{
-			  ht->plt.offset = hi->plt.offset;
-			  hi->plt.offset = (bfd_vma) -1;
-			}
-		      BFD_ASSERT (hi->plt.offset == (bfd_vma) -1);
-
-		      if (ht->dynindx == -1)
-			{
-			  ht->dynindx = hi->dynindx;
-			  ht->dynstr_index = hi->dynstr_index;
-			  hi->dynindx = -1;
-			  hi->dynstr_index = 0;
-			}
-		      BFD_ASSERT (hi->dynindx == -1);
-
-		      /* FIXME: There may be other information to copy
-			 over for particular targets.  */
-
-		      /* See if the new flags lead us to realize that
-			 the symbol must be dynamic.  */
-		      if (! dynsym)
-			{
-			  if (! dynamic)
-			    {
-			      if (info->shared
-				  || ((hi->elf_link_hash_flags
-				       & ELF_LINK_HASH_REF_DYNAMIC)
-				      != 0))
-				dynsym = true;
-			    }
-			  else
-			    {
-			      if ((hi->elf_link_hash_flags
-				   & ELF_LINK_HASH_REF_REGULAR) != 0)
-				dynsym = true;
-			    }
-			}
-		    }
-
-		  /* We also need to define an indirection from the
-                     nondefault version of the symbol.  */
-
-		  shortname = bfd_hash_allocate (&info->hash->table,
-						 strlen (name));
-		  if (shortname == NULL)
-		    goto error_return;
-		  strncpy (shortname, name, p - name);
-		  strcpy (shortname + (p - name), p + 1);
-
-		  /* Once again, merge with any existing symbol.  */
-		  type_change_ok = false;
-		  size_change_ok = false;
-		  if (! elf_merge_symbol (abfd, info, shortname, &sym, &sec,
-					  &value, &hi, &override,
-					  &type_change_ok, &size_change_ok))
-		    goto error_return;
-
-		  if (override)
-		    {
-		      /* Here SHORTNAME is a versioned name, so we
-                         don't expect to see the type of override we
-                         do in the case above.  */
-		      (*_bfd_error_handler)
-			(_("%s: warning: unexpected redefinition of `%s'"),
-			 bfd_get_filename (abfd), shortname);
-		    }
-		  else
-		    {
-		      if (! (_bfd_generic_link_add_one_symbol
-			     (info, abfd, shortname, BSF_INDIRECT,
-			      bfd_ind_section_ptr, (bfd_vma) 0, name, false,
-			      collect, (struct bfd_link_hash_entry **) &hi)))
-			goto error_return;
-
-		      /* If there is a duplicate definition somewhere,
-                         then HI may not point to an indirect symbol.
-                         We will have reported an error to the user in
-                         that case.  */
-
-		      if (hi->root.type == bfd_link_hash_indirect)
-			{
-			  /* If the symbol became indirect, then we
-                             assume that we have not seen a definition
-                             before.  */
-			  BFD_ASSERT ((hi->elf_link_hash_flags
-				       & (ELF_LINK_HASH_DEF_DYNAMIC
-					  | ELF_LINK_HASH_DEF_REGULAR))
-				      == 0);
-
-			  /* Copy down any references that we may have
-                             already seen to the symbol which just
-                             became indirect.  */
-			  h->elf_link_hash_flags |=
-			    (hi->elf_link_hash_flags
-			     & (ELF_LINK_HASH_REF_DYNAMIC
-				| ELF_LINK_HASH_REF_REGULAR
-				| ELF_LINK_HASH_REF_REGULAR_NONWEAK));
-
-			  /* Copy over the global and procedure linkage
-                             table offset entries.  These may have been
-                             already set up by a check_relocs routine.  */
-			  if (h->got.offset == (bfd_vma) -1)
-			    {
-			      h->got.offset = hi->got.offset;
-			      hi->got.offset = (bfd_vma) -1;
-			    }
-			  BFD_ASSERT (hi->got.offset == (bfd_vma) -1);
-
-			  if (h->plt.offset == (bfd_vma) -1)
-			    {
-			      h->plt.offset = hi->plt.offset;
-			      hi->plt.offset = (bfd_vma) -1;
-			    }
-			  BFD_ASSERT (hi->got.offset == (bfd_vma) -1);
-
-			  if (h->dynindx == -1)
-			    {
-			      h->dynindx = hi->dynindx;
-			      h->dynstr_index = hi->dynstr_index;
-			      hi->dynindx = -1;
-			      hi->dynstr_index = 0;
-			    }
-			  BFD_ASSERT (hi->dynindx == -1);
-
-			  /* FIXME: There may be other information to
-                             copy over for particular targets.  */
-
-			  /* See if the new flags lead us to realize
-                             that the symbol must be dynamic.  */
-			  if (! dynsym)
-			    {
-			      if (! dynamic)
-				{
-				  if (info->shared
-				      || ((hi->elf_link_hash_flags
-					   & ELF_LINK_HASH_REF_DYNAMIC)
-					  != 0))
-				    dynsym = true;
-				}
-			      else
-				{
-				  if ((hi->elf_link_hash_flags
-				       & ELF_LINK_HASH_REF_REGULAR) != 0)
-				    dynsym = true;
-				}
-			    }
-			}
-		    }
-		}
-	    }
-
-	  if (dynsym && h->dynindx == -1)
-	    {
-	      if (! _bfd_elf_link_record_dynamic_symbol (info, h))
-		goto error_return;
-	      if (h->weakdef != NULL
-		  && ! new_weakdef
-		  && h->weakdef->dynindx == -1)
-		{
-		  if (! _bfd_elf_link_record_dynamic_symbol (info,
-							     h->weakdef))
-		    goto error_return;
-		}
-	    }
-	}
-    }
-
-  /* Now set the weakdefs field correctly for all the weak defined
-     symbols we found.  The only way to do this is to search all the
-     symbols.  Since we only need the information for non functions in
-     dynamic objects, that's the only time we actually put anything on
-     the list WEAKS.  We need this information so that if a regular
-     object refers to a symbol defined weakly in a dynamic object, the
-     real symbol in the dynamic object is also put in the dynamic
-     symbols; we also must arrange for both symbols to point to the
-     same memory location.  We could handle the general case of symbol
-     aliasing, but a general symbol alias can only be generated in
-     assembler code, handling it correctly would be very time
-     consuming, and other ELF linkers don't handle general aliasing
-     either.  */
-  while (weaks != NULL)
-    {
-      struct elf_link_hash_entry *hlook;
-      asection *slook;
-      bfd_vma vlook;
-      struct elf_link_hash_entry **hpp;
-      struct elf_link_hash_entry **hppend;
-
-      hlook = weaks;
-      weaks = hlook->weakdef;
-      hlook->weakdef = NULL;
-
-      BFD_ASSERT (hlook->root.type == bfd_link_hash_defined
-		  || hlook->root.type == bfd_link_hash_defweak
-		  || hlook->root.type == bfd_link_hash_common
-		  || hlook->root.type == bfd_link_hash_indirect);
-      slook = hlook->root.u.def.section;
-      vlook = hlook->root.u.def.value;
-
-      hpp = elf_sym_hashes (abfd);
-      hppend = hpp + extsymcount;
-      for (; hpp < hppend; hpp++)
-	{
-	  struct elf_link_hash_entry *h;
-
-	  h = *hpp;
-	  if (h != NULL && h != hlook
-	      && h->root.type == bfd_link_hash_defined
-	      && h->root.u.def.section == slook
-	      && h->root.u.def.value == vlook)
-	    {
-	      hlook->weakdef = h;
-
-	      /* If the weak definition is in the list of dynamic
-		 symbols, make sure the real definition is put there
-		 as well.  */
-	      if (hlook->dynindx != -1
-		  && h->dynindx == -1)
-		{
-		  if (! _bfd_elf_link_record_dynamic_symbol (info, h))
-		    goto error_return;
-		}
-
-	      /* If the real definition is in the list of dynamic
-                 symbols, make sure the weak definition is put there
-                 as well.  If we don't do this, then the dynamic
-                 loader might not merge the entries for the real
-                 definition and the weak definition.  */
-	      if (h->dynindx != -1
-		  && hlook->dynindx == -1)
-		{
-		  if (! _bfd_elf_link_record_dynamic_symbol (info, hlook))
-		    goto error_return;
-		}
-
-	      break;
-	    }
-	}
-    }
-
-  if (buf != NULL)
-    {
-      free (buf);
-      buf = NULL;
-    }
-
-  if (extversym != NULL)
-    {
-      free (extversym);
-      extversym = NULL;
-    }
-
-  /* If this object is the same format as the output object, and it is
-     not a shared library, then let the backend look through the
-     relocs.
-
-     This is required to build global offset table entries and to
-     arrange for dynamic relocs.  It is not required for the
-     particular common case of linking non PIC code, even when linking
-     against shared libraries, but unfortunately there is no way of
-     knowing whether an object file has been compiled PIC or not.
-     Looking through the relocs is not particularly time consuming.
-     The problem is that we must either (1) keep the relocs in memory,
-     which causes the linker to require additional runtime memory or
-     (2) read the relocs twice from the input file, which wastes time.
-     This would be a good case for using mmap.
-
-     I have no idea how to handle linking PIC code into a file of a
-     different format.  It probably can't be done.  */
-  check_relocs = get_elf_backend_data (abfd)->check_relocs;
-  if (! dynamic
-      && abfd->xvec == info->hash->creator
-      && check_relocs != NULL)
-    {
-      asection *o;
-
-      for (o = abfd->sections; o != NULL; o = o->next)
-	{
-	  Elf_Internal_Rela *internal_relocs;
-	  boolean ok;
-
-	  if ((o->flags & SEC_RELOC) == 0
-	      || o->reloc_count == 0
-	      || ((info->strip == strip_all || info->strip == strip_debugger)
-		  && (o->flags & SEC_DEBUGGING) != 0)
-	      || bfd_is_abs_section (o->output_section))
-	    continue;
-
-	  internal_relocs = (NAME(_bfd_elf,link_read_relocs)
-			     (abfd, o, (PTR) NULL,
-			      (Elf_Internal_Rela *) NULL,
-			      info->keep_memory));
-	  if (internal_relocs == NULL)
-	    goto error_return;
-
-	  ok = (*check_relocs) (abfd, info, o, internal_relocs);
-
-	  if (! info->keep_memory)
-	    free (internal_relocs);
-
-	  if (! ok)
-	    goto error_return;
-	}
-    }
-
-  /* If this is a non-traditional, non-relocateable link, try to
-     optimize the handling of the .stab/.stabstr sections.  */
-  if (! dynamic
-      && ! info->relocateable
-      && ! info->traditional_format
-      && info->hash->creator->flavour == bfd_target_elf_flavour
-      && (info->strip != strip_all && info->strip != strip_debugger))
-    {
-      asection *stab, *stabstr;
-
-      stab = bfd_get_section_by_name (abfd, ".stab");
-      if (stab != NULL)
-	{
-	  stabstr = bfd_get_section_by_name (abfd, ".stabstr");
-
-	  if (stabstr != NULL)
-	    {
-	      struct bfd_elf_section_data *secdata;
-
-	      secdata = elf_section_data (stab);
-	      if (! _bfd_link_section_stabs (abfd,
-					     &elf_hash_table (info)->stab_info,
-					     stab, stabstr,
-					     &secdata->stab_info))
-		goto error_return;
-	    }
-	}
-    }
-
-  return true;
-
- error_return:
-  if (buf != NULL)
-    free (buf);
-  if (dynbuf != NULL)
-    free (dynbuf);
-  if (dynver != NULL)
-    free (dynver);
-  if (extversym != NULL)
-    free (extversym);
-  return false;
-}
-
-/* Create some sections which will be filled in with dynamic linking
-   information.  ABFD is an input file which requires dynamic sections
-   to be created.  The dynamic sections take up virtual memory space
-   when the final executable is run, so we need to create them before
-   addresses are assigned to the output sections.  We work out the
-   actual contents and size of these sections later.  */
-
-boolean
-elf_link_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags;
-  register asection *s;
-  struct elf_link_hash_entry *h;
-  struct elf_backend_data *bed;
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    return true;
-
-  /* Make sure that all dynamic sections use the same input BFD.  */
-  if (elf_hash_table (info)->dynobj == NULL)
-    elf_hash_table (info)->dynobj = abfd;
-  else
-    abfd = elf_hash_table (info)->dynobj;
-
-  /* Note that we set the SEC_IN_MEMORY flag for all of these
-     sections.  */
-  flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-	   | SEC_IN_MEMORY | SEC_LINKER_CREATED);
-
-  /* A dynamically linked executable has a .interp section, but a
-     shared library does not.  */
-  if (! info->shared)
-    {
-      s = bfd_make_section (abfd, ".interp");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY))
-	return false;
-    }
-
-  /* Create sections to hold version informations.  These are removed
-     if they are not needed.  */
-  s = bfd_make_section (abfd, ".gnu.version_d");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-      || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
-
-  s = bfd_make_section (abfd, ".gnu.version");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-      || ! bfd_set_section_alignment (abfd, s, 1))
-    return false;
-
-  s = bfd_make_section (abfd, ".gnu.version_r");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-      || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
-
-  s = bfd_make_section (abfd, ".dynsym");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-      || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
-
-  s = bfd_make_section (abfd, ".dynstr");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY))
-    return false;
-
-  /* Create a strtab to hold the dynamic symbol names.  */
-  if (elf_hash_table (info)->dynstr == NULL)
-    {
-      elf_hash_table (info)->dynstr = elf_stringtab_init ();
-      if (elf_hash_table (info)->dynstr == NULL)
-	return false;
-    }
-
-  s = bfd_make_section (abfd, ".dynamic");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags)
-      || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
-
-  /* The special symbol _DYNAMIC is always set to the start of the
-     .dynamic section.  This call occurs before we have processed the
-     symbols for any dynamic object, so we don't have to worry about
-     overriding a dynamic definition.  We could set _DYNAMIC in a
-     linker script, but we only want to define it if we are, in fact,
-     creating a .dynamic section.  We don't want to define it if there
-     is no .dynamic section, since on some ELF platforms the start up
-     code examines it to decide how to initialize the process.  */
-  h = NULL;
-  if (! (_bfd_generic_link_add_one_symbol
-	 (info, abfd, "_DYNAMIC", BSF_GLOBAL, s, (bfd_vma) 0,
-	  (const char *) NULL, false, get_elf_backend_data (abfd)->collect,
-	  (struct bfd_link_hash_entry **) &h)))
-    return false;
-  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-  h->type = STT_OBJECT;
-
-  if (info->shared
-      && ! _bfd_elf_link_record_dynamic_symbol (info, h))
-    return false;
-
-  s = bfd_make_section (abfd, ".hash");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-      || ! bfd_set_section_alignment (abfd, s, LOG_FILE_ALIGN))
-    return false;
-
-  /* Let the backend create the rest of the sections.  This lets the
-     backend set the right flags.  The backend will normally create
-     the .got and .plt sections.  */
-  bed = get_elf_backend_data (abfd);
-  if (! (*bed->elf_backend_create_dynamic_sections) (abfd, info))
-    return false;
-
-  elf_hash_table (info)->dynamic_sections_created = true;
-
-  return true;
-}
-
-/* Add an entry to the .dynamic table.  */
-
-boolean
-elf_add_dynamic_entry (info, tag, val)
-     struct bfd_link_info *info;
-     bfd_vma tag;
-     bfd_vma val;
-{
-  Elf_Internal_Dyn dyn;
-  bfd *dynobj;
-  asection *s;
-  size_t newsize;
-  bfd_byte *newcontents;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  s = bfd_get_section_by_name (dynobj, ".dynamic");
-  BFD_ASSERT (s != NULL);
-
-  newsize = s->_raw_size + sizeof (Elf_External_Dyn);
-  newcontents = (bfd_byte *) bfd_realloc (s->contents, newsize);
-  if (newcontents == NULL)
-    return false;
-
-  dyn.d_tag = tag;
-  dyn.d_un.d_val = val;
-  elf_swap_dyn_out (dynobj, &dyn,
-		    (Elf_External_Dyn *) (newcontents + s->_raw_size));
-
-  s->_raw_size = newsize;
-  s->contents = newcontents;
-
-  return true;
-}
-
-
-/* Read and swap the relocs for a section.  They may have been cached.
-   If the EXTERNAL_RELOCS and INTERNAL_RELOCS arguments are not NULL,
-   they are used as buffers to read into.  They are known to be large
-   enough.  If the INTERNAL_RELOCS relocs argument is NULL, the return
-   value is allocated using either malloc or bfd_alloc, according to
-   the KEEP_MEMORY argument.  */
-
-Elf_Internal_Rela *
-NAME(_bfd_elf,link_read_relocs) (abfd, o, external_relocs, internal_relocs,
-				 keep_memory)
-     bfd *abfd;
-     asection *o;
-     PTR external_relocs;
-     Elf_Internal_Rela *internal_relocs;
-     boolean keep_memory;
-{
-  Elf_Internal_Shdr *rel_hdr;
-  PTR alloc1 = NULL;
-  Elf_Internal_Rela *alloc2 = NULL;
-
-  if (elf_section_data (o)->relocs != NULL)
-    return elf_section_data (o)->relocs;
-
-  if (o->reloc_count == 0)
-    return NULL;
-
-  rel_hdr = &elf_section_data (o)->rel_hdr;
-
-  if (internal_relocs == NULL)
-    {
-      size_t size;
-
-      size = o->reloc_count * sizeof (Elf_Internal_Rela);
-      if (keep_memory)
-	internal_relocs = (Elf_Internal_Rela *) bfd_alloc (abfd, size);
-      else
-	internal_relocs = alloc2 = (Elf_Internal_Rela *) bfd_malloc (size);
-      if (internal_relocs == NULL)
-	goto error_return;
-    }
-
-  if (external_relocs == NULL)
-    {
-      alloc1 = (PTR) bfd_malloc ((size_t) rel_hdr->sh_size);
-      if (alloc1 == NULL)
-	goto error_return;
-      external_relocs = alloc1;
-    }
-
-  if ((bfd_seek (abfd, rel_hdr->sh_offset, SEEK_SET) != 0)
-      || (bfd_read (external_relocs, 1, rel_hdr->sh_size, abfd)
-	  != rel_hdr->sh_size))
-    goto error_return;
-
-  /* Swap in the relocs.  For convenience, we always produce an
-     Elf_Internal_Rela array; if the relocs are Rel, we set the addend
-     to 0.  */
-  if (rel_hdr->sh_entsize == sizeof (Elf_External_Rel))
-    {
-      Elf_External_Rel *erel;
-      Elf_External_Rel *erelend;
-      Elf_Internal_Rela *irela;
-
-      erel = (Elf_External_Rel *) external_relocs;
-      erelend = erel + o->reloc_count;
-      irela = internal_relocs;
-      for (; erel < erelend; erel++, irela++)
-	{
-	  Elf_Internal_Rel irel;
-
-	  elf_swap_reloc_in (abfd, erel, &irel);
-	  irela->r_offset = irel.r_offset;
-	  irela->r_info = irel.r_info;
-	  irela->r_addend = 0;
-	}
-    }
-  else
-    {
-      Elf_External_Rela *erela;
-      Elf_External_Rela *erelaend;
-      Elf_Internal_Rela *irela;
-
-      BFD_ASSERT (rel_hdr->sh_entsize == sizeof (Elf_External_Rela));
-
-      erela = (Elf_External_Rela *) external_relocs;
-      erelaend = erela + o->reloc_count;
-      irela = internal_relocs;
-      for (; erela < erelaend; erela++, irela++)
-	elf_swap_reloca_in (abfd, erela, irela);
-    }
-
-  /* Cache the results for next time, if we can.  */
-  if (keep_memory)
-    elf_section_data (o)->relocs = internal_relocs;
-
-  if (alloc1 != NULL)
-    free (alloc1);
-
-  /* Don't free alloc2, since if it was allocated we are passing it
-     back (under the name of internal_relocs).  */
-
-  return internal_relocs;
-
- error_return:
-  if (alloc1 != NULL)
-    free (alloc1);
-  if (alloc2 != NULL)
-    free (alloc2);
-  return NULL;
-}
-
-
-/* Record an assignment to a symbol made by a linker script.  We need
-   this in case some dynamic object refers to this symbol.  */
-
-/*ARGSUSED*/
-boolean
-NAME(bfd_elf,record_link_assignment) (output_bfd, info, name, provide)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *name;
-     boolean provide;
-{
-  struct elf_link_hash_entry *h;
-
-  if (info->hash->creator->flavour != bfd_target_elf_flavour)
-    return true;
-
-  h = elf_link_hash_lookup (elf_hash_table (info), name, true, true, false);
-  if (h == NULL)
-    return false;
-
-  if (h->root.type == bfd_link_hash_new)
-    h->elf_link_hash_flags &=~ ELF_LINK_NON_ELF;
-
-  /* If this symbol is being provided by the linker script, and it is
-     currently defined by a dynamic object, but not by a regular
-     object, then mark it as undefined so that the generic linker will
-     force the correct value.  */
-  if (provide
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    h->root.type = bfd_link_hash_undefined;
-
-  /* If this symbol is not being provided by the linker script, and it is
-     currently defined by a dynamic object, but not by a regular object,
-     then clear out any version information because the symbol will not be
-     associated with the dynamic object any more.  */
-  if (!provide
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    h->verinfo.verdef = NULL;
-
-  h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-  h->type = STT_OBJECT;
-
-  if (((h->elf_link_hash_flags & (ELF_LINK_HASH_DEF_DYNAMIC
-				  | ELF_LINK_HASH_REF_DYNAMIC)) != 0
-       || info->shared)
-      && h->dynindx == -1)
-    {
-      if (! _bfd_elf_link_record_dynamic_symbol (info, h))
-	return false;
-
-      /* If this is a weak defined symbol, and we know a corresponding
-	 real symbol from the same dynamic object, make sure the real
-	 symbol is also made into a dynamic symbol.  */
-      if (h->weakdef != NULL
-	  && h->weakdef->dynindx == -1)
-	{
-	  if (! _bfd_elf_link_record_dynamic_symbol (info, h->weakdef))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* This structure is used to pass information to
-   elf_link_assign_sym_version.  */
-
-struct elf_assign_sym_version_info
-{
-  /* Output BFD.  */
-  bfd *output_bfd;
-  /* General link information.  */
-  struct bfd_link_info *info;
-  /* Version tree.  */
-  struct bfd_elf_version_tree *verdefs;
-  /* Whether we are exporting all dynamic symbols.  */
-  boolean export_dynamic;
-  /* Whether we removed any symbols from the dynamic symbol table.  */
-  boolean removed_dynamic;
-  /* Whether we had a failure.  */
-  boolean failed;
-};
-
-/* This structure is used to pass information to
-   elf_link_find_version_dependencies.  */
-
-struct elf_find_verdep_info
-{
-  /* Output BFD.  */
-  bfd *output_bfd;
-  /* General link information.  */
-  struct bfd_link_info *info;
-  /* The number of dependencies.  */
-  unsigned int vers;
-  /* Whether we had a failure.  */
-  boolean failed;
-};
-
-/* Array used to determine the number of hash table buckets to use
-   based on the number of symbols there are.  If there are fewer than
-   3 symbols we use 1 bucket, fewer than 17 symbols we use 3 buckets,
-   fewer than 37 we use 17 buckets, and so forth.  We never use more
-   than 32771 buckets.  */
-
-static const size_t elf_buckets[] =
-{
-  1, 3, 17, 37, 67, 97, 131, 197, 263, 521, 1031, 2053, 4099, 8209,
-  16411, 32771, 0
-};
-
-/* Compute bucket count for hashing table.  We do not use a static set
-   of possible tables sizes anymore.  Instead we determine for all
-   possible reasonable sizes of the table the outcome (i.e., the
-   number of collisions etc) and choose the best solution.  The
-   weighting functions are not too simple to allow the table to grow
-   without bounds.  Instead one of the weighting factors is the size.
-   Therefore the result is always a good payoff between few collisions
-   (= short chain lengths) and table size.  */
-static size_t
-compute_bucket_count (info)
-     struct bfd_link_info *info;
-{
-  size_t dynsymcount = elf_hash_table (info)->dynsymcount;
-  size_t best_size;
-  unsigned long int *hashcodes;
-  unsigned long int *hashcodesp;
-  unsigned long int i;
-
-  /* Compute the hash values for all exported symbols.  At the same
-     time store the values in an array so that we could use them for
-     optimizations.  */
-  hashcodes = (unsigned long int *) bfd_malloc (dynsymcount
-						* sizeof (unsigned long int));
-  if (hashcodes == NULL)
-    return 0;
-  hashcodesp = hashcodes;
-
-  /* Put all hash values in HASHCODES.  */
-  elf_link_hash_traverse (elf_hash_table (info),
-			  elf_collect_hash_codes, &hashcodesp);
-
-/* We have a problem here.  The following code to optimize the table
-   size requires an integer type with more the 32 bits.  If
-   BFD_HOST_U_64_BIT is set we know about such a type.  */
-#ifdef BFD_HOST_U_64_BIT
-  if (info->optimize == true)
-    {
-      unsigned long int nsyms = hashcodesp - hashcodes;
-      size_t minsize;
-      size_t maxsize;
-      BFD_HOST_U_64_BIT best_chlen = ~((BFD_HOST_U_64_BIT) 0);
-      unsigned long int *counts ;
-
-      /* Possible optimization parameters: if we have NSYMS symbols we say
-	 that the hashing table must at least have NSYMS/4 and at most
-	 2*NSYMS buckets.  */
-      minsize = nsyms / 4;
-      if (minsize == 0)
-	minsize = 1;
-      best_size = maxsize = nsyms * 2;
-
-      /* Create array where we count the collisions in.  We must use bfd_malloc
-	 since the size could be large.  */
-      counts = (unsigned long int *) bfd_malloc (maxsize
-						 * sizeof (unsigned long int));
-      if (counts == NULL)
-	{
-	  free (hashcodes);
-	  return 0;
-	}
-
-      /* Compute the "optimal" size for the hash table.  The criteria is a
-	 minimal chain length.  The minor criteria is (of course) the size
-	 of the table.  */
-      for (i = minsize; i < maxsize; ++i)
-	{
-	  /* Walk through the array of hashcodes and count the collisions.  */
-	  BFD_HOST_U_64_BIT max;
-	  unsigned long int j;
-	  unsigned long int fact;
-
-	  memset (counts, '\0', i * sizeof (unsigned long int));
-
-	  /* Determine how often each hash bucket is used.  */
-	  for (j = 0; j < nsyms; ++j)
-	    ++counts[hashcodes[j] % i];
-
-	  /* For the weight function we need some information about the
-	     pagesize on the target.  This is information need not be 100%
-	     accurate.  Since this information is not available (so far) we
-	     define it here to a reasonable default value.  If it is crucial
-	     to have a better value some day simply define this value.  */
-# ifndef BFD_TARGET_PAGESIZE
-#  define BFD_TARGET_PAGESIZE	(4096)
-# endif
-
-	  /* We in any case need 2 + NSYMS entries for the size values and
-	     the chains.  */
-	  max = (2 + nsyms) * (ARCH_SIZE / 8);
-
-# if 1
-	  /* Variant 1: optimize for short chains.  We add the squares
-	     of all the chain lengths (which favous many small chain
-	     over a few long chains).  */
-	  for (j = 0; j < i; ++j)
-	    max += counts[j] * counts[j];
-
-	  /* This adds penalties for the overall size of the table.  */
-	  fact = i / (BFD_TARGET_PAGESIZE / (ARCH_SIZE / 8)) + 1;
-	  max *= fact * fact;
-# else
-	  /* Variant 2: Optimize a lot more for small table.  Here we
-	     also add squares of the size but we also add penalties for
-	     empty slots (the +1 term).  */
-	  for (j = 0; j < i; ++j)
-	    max += (1 + counts[j]) * (1 + counts[j]);
-
-	  /* The overall size of the table is considered, but not as
-	     strong as in variant 1, where it is squared.  */
-	  fact = i / (BFD_TARGET_PAGESIZE / (ARCH_SIZE / 8)) + 1;
-	  max *= fact;
-# endif
-
-	  /* Compare with current best results.  */
-	  if (max < best_chlen)
-	    {
-	      best_chlen = max;
-	      best_size = i;
-	    }
-	}
-
-      free (counts);
-    }
-  else
-#endif /* defined (BFD_HOST_U_64_BIT) */
-    {
-      /* This is the fallback solution if no 64bit type is available or if we
-	 are not supposed to spend much time on optimizations.  We select the
-	 bucket count using a fixed set of numbers.  */
-      for (i = 0; elf_buckets[i] != 0; i++)
-	{
-	  best_size = elf_buckets[i];
-	  if (dynsymcount < elf_buckets[i + 1])
-	    break;
-	}
-    }
-
-  /* Free the arrays we needed.  */
-  free (hashcodes);
-
-  return best_size;
-}
-
-/* Set up the sizes and contents of the ELF dynamic sections.  This is
-   called by the ELF linker emulation before_allocation routine.  We
-   must set the sizes of the sections before the linker sets the
-   addresses of the various sections.  */
-
-boolean
-NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
-				     export_dynamic, filter_shlib,
-				     auxiliary_filters, info, sinterpptr,
-				     verdefs)
-     bfd *output_bfd;
-     const char *soname;
-     const char *rpath;
-     boolean export_dynamic;
-     const char *filter_shlib;
-     const char * const *auxiliary_filters;
-     struct bfd_link_info *info;
-     asection **sinterpptr;
-     struct bfd_elf_version_tree *verdefs;
-{
-  bfd_size_type soname_indx;
-  bfd *dynobj;
-  struct elf_backend_data *bed;
-  bfd_size_type old_dynsymcount;
-  struct elf_assign_sym_version_info asvinfo;
-
-  *sinterpptr = NULL;
-
-  soname_indx = (bfd_size_type) -1;
-
-  if (info->hash->creator->flavour != bfd_target_elf_flavour)
-    return true;
-
-  /* The backend may have to create some sections regardless of whether
-     we're dynamic or not.  */
-  bed = get_elf_backend_data (output_bfd);
-  if (bed->elf_backend_always_size_sections
-      && ! (*bed->elf_backend_always_size_sections) (output_bfd, info))
-    return false;
-
-  dynobj = elf_hash_table (info)->dynobj;
-
-  /* If there were no dynamic objects in the link, there is nothing to
-     do here.  */
-  if (dynobj == NULL)
-    return true;
-
-  /* If we are supposed to export all symbols into the dynamic symbol
-     table (this is not the normal case), then do so.  */
-  if (export_dynamic)
-    {
-      struct elf_info_failed eif;
-
-      eif.failed = false;
-      eif.info = info;
-      elf_link_hash_traverse (elf_hash_table (info), elf_export_symbol,
-			      (PTR) &eif);
-      if (eif.failed)
-	return false;
-    }
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      struct elf_info_failed eif;
-      struct elf_link_hash_entry *h;
-      bfd_size_type strsize;
-
-      *sinterpptr = bfd_get_section_by_name (dynobj, ".interp");
-      BFD_ASSERT (*sinterpptr != NULL || info->shared);
-
-      if (soname != NULL)
-	{
-	  soname_indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr,
-					    soname, true, true);
-	  if (soname_indx == (bfd_size_type) -1
-	      || ! elf_add_dynamic_entry (info, DT_SONAME, soname_indx))
-	    return false;
-	}
-
-      if (info->symbolic)
-	{
-	  if (! elf_add_dynamic_entry (info, DT_SYMBOLIC, 0))
-	    return false;
-	}
-
-      if (rpath != NULL)
-	{
-	  bfd_size_type indx;
-
-	  indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr, rpath,
-				     true, true);
-	  if (indx == (bfd_size_type) -1
-	      || ! elf_add_dynamic_entry (info, DT_RPATH, indx))
-	    return false;
-	}
-
-      if (filter_shlib != NULL)
-	{
-	  bfd_size_type indx;
-
-	  indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr,
-				     filter_shlib, true, true);
-	  if (indx == (bfd_size_type) -1
-	      || ! elf_add_dynamic_entry (info, DT_FILTER, indx))
-	    return false;
-	}
-
-      if (auxiliary_filters != NULL)
-	{
-	  const char * const *p;
-
-	  for (p = auxiliary_filters; *p != NULL; p++)
-	    {
-	      bfd_size_type indx;
-
-	      indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr,
-					 *p, true, true);
-	      if (indx == (bfd_size_type) -1
-		  || ! elf_add_dynamic_entry (info, DT_AUXILIARY, indx))
-		return false;
-	    }
-	}
-
-      /* Attach all the symbols to their version information.  */
-      asvinfo.output_bfd = output_bfd;
-      asvinfo.info = info;
-      asvinfo.verdefs = verdefs;
-      asvinfo.export_dynamic = export_dynamic;
-      asvinfo.removed_dynamic = false;
-      asvinfo.failed = false;
-
-      elf_link_hash_traverse (elf_hash_table (info),
-			      elf_link_assign_sym_version,
-			      (PTR) &asvinfo);
-      if (asvinfo.failed)
-	return false;
-
-      /* Find all symbols which were defined in a dynamic object and make
-	 the backend pick a reasonable value for them.  */
-      eif.failed = false;
-      eif.info = info;
-      elf_link_hash_traverse (elf_hash_table (info),
-			      elf_adjust_dynamic_symbol,
-			      (PTR) &eif);
-      if (eif.failed)
-	return false;
-
-      /* Add some entries to the .dynamic section.  We fill in some of the
-	 values later, in elf_bfd_final_link, but we must add the entries
-	 now so that we know the final size of the .dynamic section.  */
-      h =  elf_link_hash_lookup (elf_hash_table (info), "_init", false,
-				false, false);
-      if (h != NULL
-	  && (h->elf_link_hash_flags & (ELF_LINK_HASH_REF_REGULAR
-					| ELF_LINK_HASH_DEF_REGULAR)) != 0)
-	{
-	  if (! elf_add_dynamic_entry (info, DT_INIT, 0))
-	    return false;
-	}
-      h =  elf_link_hash_lookup (elf_hash_table (info), "_fini", false,
-				 false, false);
-      if (h != NULL
-	  && (h->elf_link_hash_flags & (ELF_LINK_HASH_REF_REGULAR
-					| ELF_LINK_HASH_DEF_REGULAR)) != 0)
-	{
-	  if (! elf_add_dynamic_entry (info, DT_FINI, 0))
-	    return false;
-	}
-      strsize = _bfd_stringtab_size (elf_hash_table (info)->dynstr);
-      if (! elf_add_dynamic_entry (info, DT_HASH, 0)
-	  || ! elf_add_dynamic_entry (info, DT_STRTAB, 0)
-	  || ! elf_add_dynamic_entry (info, DT_SYMTAB, 0)
-	  || ! elf_add_dynamic_entry (info, DT_STRSZ, strsize)
-	  || ! elf_add_dynamic_entry (info, DT_SYMENT,
-				      sizeof (Elf_External_Sym)))
-	return false;
-    }
-
-  /* The backend must work out the sizes of all the other dynamic
-     sections.  */
-  old_dynsymcount = elf_hash_table (info)->dynsymcount;
-  if (bed->elf_backend_size_dynamic_sections
-      && ! (*bed->elf_backend_size_dynamic_sections) (output_bfd, info))
-    return false;
-
-  if (elf_hash_table (info)->dynamic_sections_created)
-    {
-      size_t dynsymcount;
-      asection *s;
-      size_t bucketcount = 0;
-      Elf_Internal_Sym isym;
-
-      /* Set up the version definition section.  */
-      s = bfd_get_section_by_name (dynobj, ".gnu.version_d");
-      BFD_ASSERT (s != NULL);
-
-      /* We may have created additional version definitions if we are
-         just linking a regular application.  */
-      verdefs = asvinfo.verdefs;
-
-      if (verdefs == NULL)
-	{
-	  asection **spp;
-
-	  /* Don't include this section in the output file.  */
-	  for (spp = &output_bfd->sections;
-	       *spp != s->output_section;
-	       spp = &(*spp)->next)
-	    ;
-	  *spp = s->output_section->next;
-	  --output_bfd->section_count;
-	}
-      else
-	{
-	  unsigned int cdefs;
-	  bfd_size_type size;
-	  struct bfd_elf_version_tree *t;
-	  bfd_byte *p;
-	  Elf_Internal_Verdef def;
-	  Elf_Internal_Verdaux defaux;
-
-	  if (asvinfo.removed_dynamic)
-	    {
-	      /* Some dynamic symbols were changed to be local
-		 symbols.  In this case, we renumber all of the
-		 dynamic symbols, so that we don't have a hole.  If
-		 the backend changed dynsymcount, then assume that the
-		 new symbols are at the start.  This is the case on
-		 the MIPS.  FIXME: The names of the removed symbols
-		 will still be in the dynamic string table, wasting
-		 space.  */
-	      elf_hash_table (info)->dynsymcount =
-		1 + (elf_hash_table (info)->dynsymcount - old_dynsymcount);
-	      elf_link_hash_traverse (elf_hash_table (info),
-				      elf_link_renumber_dynsyms,
-				      (PTR) info);
-	    }
-
-	  cdefs = 0;
-	  size = 0;
-
-	  /* Make space for the base version.  */
-	  size += sizeof (Elf_External_Verdef);
-	  size += sizeof (Elf_External_Verdaux);
-	  ++cdefs;
-
-	  for (t = verdefs; t != NULL; t = t->next)
-	    {
-	      struct bfd_elf_version_deps *n;
-
-	      size += sizeof (Elf_External_Verdef);
-	      size += sizeof (Elf_External_Verdaux);
-	      ++cdefs;
-
-	      for (n = t->deps; n != NULL; n = n->next)
-		size += sizeof (Elf_External_Verdaux);
-	    }
-
-	  s->_raw_size = size;
-	  s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
-	  if (s->contents == NULL && s->_raw_size != 0)
-	    return false;
-
-	  /* Fill in the version definition section.  */
-
-	  p = s->contents;
-
-	  def.vd_version = VER_DEF_CURRENT;
-	  def.vd_flags = VER_FLG_BASE;
-	  def.vd_ndx = 1;
-	  def.vd_cnt = 1;
-	  def.vd_aux = sizeof (Elf_External_Verdef);
-	  def.vd_next = (sizeof (Elf_External_Verdef)
-			 + sizeof (Elf_External_Verdaux));
-
-	  if (soname_indx != (bfd_size_type) -1)
-	    {
-	      def.vd_hash = bfd_elf_hash ((const unsigned char *) soname);
-	      defaux.vda_name = soname_indx;
-	    }
-	  else
-	    {
-	      const char *name;
-	      bfd_size_type indx;
-
-	      name = output_bfd->filename;
-	      def.vd_hash = bfd_elf_hash ((const unsigned char *) name);
-	      indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr,
-					    name, true, false);
-	      if (indx == (bfd_size_type) -1)
-		return false;
-	      defaux.vda_name = indx;
-	    }
-	  defaux.vda_next = 0;
-
-	  _bfd_elf_swap_verdef_out (output_bfd, &def,
-				    (Elf_External_Verdef *)p);
-	  p += sizeof (Elf_External_Verdef);
-	  _bfd_elf_swap_verdaux_out (output_bfd, &defaux,
-				     (Elf_External_Verdaux *) p);
-	  p += sizeof (Elf_External_Verdaux);
-
-	  for (t = verdefs; t != NULL; t = t->next)
-	    {
-	      unsigned int cdeps;
-	      struct bfd_elf_version_deps *n;
-	      struct elf_link_hash_entry *h;
-
-	      cdeps = 0;
-	      for (n = t->deps; n != NULL; n = n->next)
-		++cdeps;
-
-	      /* Add a symbol representing this version.  */
-	      h = NULL;
-	      if (! (_bfd_generic_link_add_one_symbol
-		     (info, dynobj, t->name, BSF_GLOBAL, bfd_abs_section_ptr,
-		      (bfd_vma) 0, (const char *) NULL, false,
-		      get_elf_backend_data (dynobj)->collect,
-		      (struct bfd_link_hash_entry **) &h)))
-		return false;
-	      h->elf_link_hash_flags &= ~ ELF_LINK_NON_ELF;
-	      h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-	      h->type = STT_OBJECT;
-	      h->verinfo.vertree = t;
-
-	      if (! _bfd_elf_link_record_dynamic_symbol (info, h))
-		return false;
-
-	      def.vd_version = VER_DEF_CURRENT;
-	      def.vd_flags = 0;
-	      if (t->globals == NULL && t->locals == NULL && ! t->used)
-		def.vd_flags |= VER_FLG_WEAK;
-	      def.vd_ndx = t->vernum + 1;
-	      def.vd_cnt = cdeps + 1;
-	      def.vd_hash = bfd_elf_hash ((const unsigned char *) t->name);
-	      def.vd_aux = sizeof (Elf_External_Verdef);
-	      if (t->next != NULL)
-		def.vd_next = (sizeof (Elf_External_Verdef)
-			       + (cdeps + 1) * sizeof (Elf_External_Verdaux));
-	      else
-		def.vd_next = 0;
-
-	      _bfd_elf_swap_verdef_out (output_bfd, &def,
-					(Elf_External_Verdef *) p);
-	      p += sizeof (Elf_External_Verdef);
-
-	      defaux.vda_name = h->dynstr_index;
-	      if (t->deps == NULL)
-		defaux.vda_next = 0;
-	      else
-		defaux.vda_next = sizeof (Elf_External_Verdaux);
-	      t->name_indx = defaux.vda_name;
-
-	      _bfd_elf_swap_verdaux_out (output_bfd, &defaux,
-					 (Elf_External_Verdaux *) p);
-	      p += sizeof (Elf_External_Verdaux);
-
-	      for (n = t->deps; n != NULL; n = n->next)
-		{
-		  if (n->version_needed == NULL)
-		    {
-		      /* This can happen if there was an error in the
-			 version script.  */
-		      defaux.vda_name = 0;
-		    }
-		  else
-		    defaux.vda_name = n->version_needed->name_indx;
-		  if (n->next == NULL)
-		    defaux.vda_next = 0;
-		  else
-		    defaux.vda_next = sizeof (Elf_External_Verdaux);
-
-		  _bfd_elf_swap_verdaux_out (output_bfd, &defaux,
-					     (Elf_External_Verdaux *) p);
-		  p += sizeof (Elf_External_Verdaux);
-		}
-	    }
-
-	  if (! elf_add_dynamic_entry (info, DT_VERDEF, 0)
-	      || ! elf_add_dynamic_entry (info, DT_VERDEFNUM, cdefs))
-	    return false;
-
-	  elf_tdata (output_bfd)->cverdefs = cdefs;
-	}
-
-      /* Work out the size of the version reference section.  */
-
-      s = bfd_get_section_by_name (dynobj, ".gnu.version_r");
-      BFD_ASSERT (s != NULL);
-      {
-	struct elf_find_verdep_info sinfo;
-
-	sinfo.output_bfd = output_bfd;
-	sinfo.info = info;
-	sinfo.vers = elf_tdata (output_bfd)->cverdefs;
-	if (sinfo.vers == 0)
-	  sinfo.vers = 1;
-	sinfo.failed = false;
-
-	elf_link_hash_traverse (elf_hash_table (info),
-				elf_link_find_version_dependencies,
-				(PTR) &sinfo);
-
-	if (elf_tdata (output_bfd)->verref == NULL)
-	  {
-	    asection **spp;
-
-	    /* We don't have any version definitions, so we can just
-               remove the section.  */
-
-	    for (spp = &output_bfd->sections;
-		 *spp != s->output_section;
-		 spp = &(*spp)->next)
-	      ;
-	    *spp = s->output_section->next;
-	    --output_bfd->section_count;
-	  }
-	else
-	  {
-	    Elf_Internal_Verneed *t;
-	    unsigned int size;
-	    unsigned int crefs;
-	    bfd_byte *p;
-
-	    /* Build the version definition section.  */
-	    size = 0;
-	    crefs = 0;
-	    for (t = elf_tdata (output_bfd)->verref;
-		 t != NULL;
-		 t = t->vn_nextref)
-	      {
-		Elf_Internal_Vernaux *a;
-
-		size += sizeof (Elf_External_Verneed);
-		++crefs;
-		for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
-		  size += sizeof (Elf_External_Vernaux);
-	      }
-
-	    s->_raw_size = size;
-	    s->contents = (bfd_byte *) bfd_alloc (output_bfd, size);
-	    if (s->contents == NULL)
-	      return false;
-
-	    p = s->contents;
-	    for (t = elf_tdata (output_bfd)->verref;
-		 t != NULL;
-		 t = t->vn_nextref)
-	      {
-		unsigned int caux;
-		Elf_Internal_Vernaux *a;
-		bfd_size_type indx;
-
-		caux = 0;
-		for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
-		  ++caux;
-
-		t->vn_version = VER_NEED_CURRENT;
-		t->vn_cnt = caux;
-		if (elf_dt_name (t->vn_bfd) != NULL)
-		  indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr,
-					     elf_dt_name (t->vn_bfd),
-					     true, false);
-		else
-		  indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr,
-					     t->vn_bfd->filename, true, false);
-		if (indx == (bfd_size_type) -1)
-		  return false;
-		t->vn_file = indx;
-		t->vn_aux = sizeof (Elf_External_Verneed);
-		if (t->vn_nextref == NULL)
-		  t->vn_next = 0;
-		else
-		  t->vn_next = (sizeof (Elf_External_Verneed)
-				+ caux * sizeof (Elf_External_Vernaux));
-
-		_bfd_elf_swap_verneed_out (output_bfd, t,
-					   (Elf_External_Verneed *) p);
-		p += sizeof (Elf_External_Verneed);
-
-		for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
-		  {
-		    a->vna_hash = bfd_elf_hash ((const unsigned char *)
-						a->vna_nodename);
-		    indx = _bfd_stringtab_add (elf_hash_table (info)->dynstr,
-					       a->vna_nodename, true, false);
-		    if (indx == (bfd_size_type) -1)
-		      return false;
-		    a->vna_name = indx;
-		    if (a->vna_nextptr == NULL)
-		      a->vna_next = 0;
-		    else
-		      a->vna_next = sizeof (Elf_External_Vernaux);
-
-		    _bfd_elf_swap_vernaux_out (output_bfd, a,
-					       (Elf_External_Vernaux *) p);
-		    p += sizeof (Elf_External_Vernaux);
-		  }
-	      }
-
-	    if (! elf_add_dynamic_entry (info, DT_VERNEED, 0)
-		|| ! elf_add_dynamic_entry (info, DT_VERNEEDNUM, crefs))
-	      return false;
-
-	    elf_tdata (output_bfd)->cverrefs = crefs;
-	  }
-      }
-
-      dynsymcount = elf_hash_table (info)->dynsymcount;
-
-      /* Work out the size of the symbol version section.  */
-      s = bfd_get_section_by_name (dynobj, ".gnu.version");
-      BFD_ASSERT (s != NULL);
-      if (dynsymcount == 0
-	  || (verdefs == NULL && elf_tdata (output_bfd)->verref == NULL))
-	{
-	  asection **spp;
-
-	  /* We don't need any symbol versions; just discard the
-             section.  */
-	  for (spp = &output_bfd->sections;
-	       *spp != s->output_section;
-	       spp = &(*spp)->next)
-	    ;
-	  *spp = s->output_section->next;
-	  --output_bfd->section_count;
-	}
-      else
-	{
-	  s->_raw_size = dynsymcount * sizeof (Elf_External_Versym);
-	  s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->_raw_size);
-	  if (s->contents == NULL)
-	    return false;
-
-	  if (! elf_add_dynamic_entry (info, DT_VERSYM, 0))
-	    return false;
-	}
-
-      /* Set the size of the .dynsym and .hash sections.  We counted
-	 the number of dynamic symbols in elf_link_add_object_symbols.
-	 We will build the contents of .dynsym and .hash when we build
-	 the final symbol table, because until then we do not know the
-	 correct value to give the symbols.  We built the .dynstr
-	 section as we went along in elf_link_add_object_symbols.  */
-      s = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size = dynsymcount * sizeof (Elf_External_Sym);
-      s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-
-      /* The first entry in .dynsym is a dummy symbol.  */
-      isym.st_value = 0;
-      isym.st_size = 0;
-      isym.st_name = 0;
-      isym.st_info = 0;
-      isym.st_other = 0;
-      isym.st_shndx = 0;
-      elf_swap_symbol_out (output_bfd, &isym,
-			   (PTR) (Elf_External_Sym *) s->contents);
-
-      /* Compute the size of the hashing table.  As a side effect this
-	 computes the hash values for all the names we export.  */
-      bucketcount = compute_bucket_count (info);
-
-      s = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size = (2 + bucketcount + dynsymcount) * (ARCH_SIZE / 8);
-      s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
-      if (s->contents == NULL)
-	return false;
-      memset (s->contents, 0, (size_t) s->_raw_size);
-
-      put_word (output_bfd, bucketcount, s->contents);
-      put_word (output_bfd, dynsymcount, s->contents + (ARCH_SIZE / 8));
-
-      elf_hash_table (info)->bucketcount = bucketcount;
-
-      s = bfd_get_section_by_name (dynobj, ".dynstr");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size = _bfd_stringtab_size (elf_hash_table (info)->dynstr);
-
-      if (! elf_add_dynamic_entry (info, DT_NULL, 0))
-	return false;
-    }
-
-  return true;
-}
-
-/* Fix up the flags for a symbol.  This handles various cases which
-   can only be fixed after all the input files are seen.  This is
-   currently called by both adjust_dynamic_symbol and
-   assign_sym_version, which is unnecessary but perhaps more robust in
-   the face of future changes.  */
-
-static boolean
-elf_fix_symbol_flags (h, eif)
-     struct elf_link_hash_entry *h;
-     struct elf_info_failed *eif;
-{
-  /* If this symbol was mentioned in a non-ELF file, try to set
-     DEF_REGULAR and REF_REGULAR correctly.  This is the only way to
-     permit a non-ELF file to correctly refer to a symbol defined in
-     an ELF dynamic object.  */
-  if ((h->elf_link_hash_flags & ELF_LINK_NON_ELF) != 0)
-    {
-      if (h->root.type != bfd_link_hash_defined
-	  && h->root.type != bfd_link_hash_defweak)
-	h->elf_link_hash_flags |= (ELF_LINK_HASH_REF_REGULAR
-				   | ELF_LINK_HASH_REF_REGULAR_NONWEAK);
-      else
-	{
-	  if (h->root.u.def.section->owner != NULL
-	      && (bfd_get_flavour (h->root.u.def.section->owner)
-		  == bfd_target_elf_flavour))
-	    h->elf_link_hash_flags |= (ELF_LINK_HASH_REF_REGULAR
-				       | ELF_LINK_HASH_REF_REGULAR_NONWEAK);
-	  else
-	    h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-	}
-
-      if (h->dynindx == -1
-	  && ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-	      || (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0))
-	{
-	  if (! _bfd_elf_link_record_dynamic_symbol (eif->info, h))
-	    {
-	      eif->failed = true;
-	      return false;
-	    }
-	}
-    }
-  else
-    {
-      /* Unfortunately, ELF_LINK_NON_ELF is only correct if the symbol
-         was first seen in a non-ELF file.  Fortunately, if the symbol
-         was first seen in an ELF file, we're probably OK unless the
-         symbol was defined in a non-ELF file.  Catch that case here.
-         FIXME: We're still in trouble if the symbol was first seen in
-         a dynamic object, and then later in a non-ELF regular object.  */
-      if ((h->root.type == bfd_link_hash_defined
-	   || h->root.type == bfd_link_hash_defweak)
-	  && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-	  && (h->root.u.def.section->owner != NULL
-	      ? (bfd_get_flavour (h->root.u.def.section->owner)
-		 != bfd_target_elf_flavour)
-	      : (bfd_is_abs_section (h->root.u.def.section)
-		 && (h->elf_link_hash_flags
-		     & ELF_LINK_HASH_DEF_DYNAMIC) == 0)))
-	h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-    }
-
-  /* If this is a final link, and the symbol was defined as a common
-     symbol in a regular object file, and there was no definition in
-     any dynamic object, then the linker will have allocated space for
-     the symbol in a common section but the ELF_LINK_HASH_DEF_REGULAR
-     flag will not have been set.  */
-  if (h->root.type == bfd_link_hash_defined
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) != 0
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-      && (h->root.u.def.section->owner->flags & DYNAMIC) == 0)
-    h->elf_link_hash_flags |= ELF_LINK_HASH_DEF_REGULAR;
-
-  /* If -Bsymbolic was used (which means to bind references to global
-     symbols to the definition within the shared object), and this
-     symbol was defined in a regular object, then it actually doesn't
-     need a PLT entry.  */
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) != 0
-      && eif->info->shared
-      && eif->info->symbolic
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0)
-    {
-      h->elf_link_hash_flags &=~ ELF_LINK_HASH_NEEDS_PLT;
-      h->plt.offset = (bfd_vma) -1;
-    }
-
-  return true;
-}
-
-/* Make the backend pick a good value for a dynamic symbol.  This is
-   called via elf_link_hash_traverse, and also calls itself
-   recursively.  */
-
-static boolean
-elf_adjust_dynamic_symbol (h, data)
-     struct elf_link_hash_entry *h;
-     PTR data;
-{
-  struct elf_info_failed *eif = (struct elf_info_failed *) data;
-  bfd *dynobj;
-  struct elf_backend_data *bed;
-
-  /* Ignore indirect symbols.  These are added by the versioning code.  */
-  if (h->root.type == bfd_link_hash_indirect)
-    return true;
-
-  /* Fix the symbol flags.  */
-  if (! elf_fix_symbol_flags (h, eif))
-    return false;
-
-  /* If this symbol does not require a PLT entry, and it is not
-     defined by a dynamic object, or is not referenced by a regular
-     object, ignore it.  We do have to handle a weak defined symbol,
-     even if no regular object refers to it, if we decided to add it
-     to the dynamic symbol table.  FIXME: Do we normally need to worry
-     about symbols which are defined by one dynamic object and
-     referenced by another one?  */
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) == 0
-      && ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
-	  || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-	  || ((h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0
-	      && (h->weakdef == NULL || h->weakdef->dynindx == -1))))
-    {
-      h->plt.offset = (bfd_vma) -1;
-      return true;
-    }
-
-  /* If we've already adjusted this symbol, don't do it again.  This
-     can happen via a recursive call.  */
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_DYNAMIC_ADJUSTED) != 0)
-    return true;
-
-  /* Don't look at this symbol again.  Note that we must set this
-     after checking the above conditions, because we may look at a
-     symbol once, decide not to do anything, and then get called
-     recursively later after REF_REGULAR is set below.  */
-  h->elf_link_hash_flags |= ELF_LINK_HASH_DYNAMIC_ADJUSTED;
-
-  /* If this is a weak definition, and we know a real definition, and
-     the real symbol is not itself defined by a regular object file,
-     then get a good value for the real definition.  We handle the
-     real symbol first, for the convenience of the backend routine.
-
-     Note that there is a confusing case here.  If the real definition
-     is defined by a regular object file, we don't get the real symbol
-     from the dynamic object, but we do get the weak symbol.  If the
-     processor backend uses a COPY reloc, then if some routine in the
-     dynamic object changes the real symbol, we will not see that
-     change in the corresponding weak symbol.  This is the way other
-     ELF linkers work as well, and seems to be a result of the shared
-     library model.
-
-     I will clarify this issue.  Most SVR4 shared libraries define the
-     variable _timezone and define timezone as a weak synonym.  The
-     tzset call changes _timezone.  If you write
-       extern int timezone;
-       int _timezone = 5;
-       int main () { tzset (); printf ("%d %d\n", timezone, _timezone); }
-     you might expect that, since timezone is a synonym for _timezone,
-     the same number will print both times.  However, if the processor
-     backend uses a COPY reloc, then actually timezone will be copied
-     into your process image, and, since you define _timezone
-     yourself, _timezone will not.  Thus timezone and _timezone will
-     wind up at different memory locations.  The tzset call will set
-     _timezone, leaving timezone unchanged.  */
-
-  if (h->weakdef != NULL)
-    {
-      struct elf_link_hash_entry *weakdef;
-
-      BFD_ASSERT (h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak);
-      weakdef = h->weakdef;
-      BFD_ASSERT (weakdef->root.type == bfd_link_hash_defined
-		  || weakdef->root.type == bfd_link_hash_defweak);
-      BFD_ASSERT (weakdef->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC);
-      if ((weakdef->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0)
-	{
-	  /* This symbol is defined by a regular object file, so we
-	     will not do anything special.  Clear weakdef for the
-	     convenience of the processor backend.  */
-	  h->weakdef = NULL;
-	}
-      else
-	{
-	  /* There is an implicit reference by a regular object file
-	     via the weak symbol.  */
-	  weakdef->elf_link_hash_flags |= ELF_LINK_HASH_REF_REGULAR;
-	  if (h->weakdef->elf_link_hash_flags
-	      & ELF_LINK_HASH_REF_REGULAR_NONWEAK)
-	    weakdef->elf_link_hash_flags |= ELF_LINK_HASH_REF_REGULAR_NONWEAK;
-	  if (! elf_adjust_dynamic_symbol (weakdef, (PTR) eif))
-	    return false;
-	}
-    }
-
-  /* If a symbol has no type and no size and does not require a PLT
-     entry, then we are probably about to do the wrong thing here: we
-     are probably going to create a COPY reloc for an empty object.
-     This case can arise when a shared object is built with assembly
-     code, and the assembly code fails to set the symbol type.  */
-  if (h->size == 0
-      && h->type == STT_NOTYPE
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_NEEDS_PLT) == 0)
-    (*_bfd_error_handler)
-      (_("warning: type and size of dynamic symbol `%s' are not defined"),
-	 h->root.root.string);
-
-  dynobj = elf_hash_table (eif->info)->dynobj;
-  bed = get_elf_backend_data (dynobj);
-  if (! (*bed->elf_backend_adjust_dynamic_symbol) (eif->info, h))
-    {
-      eif->failed = true;
-      return false;
-    }
-
-  return true;
-}
-
-/* This routine is used to export all defined symbols into the dynamic
-   symbol table.  It is called via elf_link_hash_traverse.  */
-
-static boolean
-elf_export_symbol (h, data)
-     struct elf_link_hash_entry *h;
-     PTR data;
-{
-  struct elf_info_failed *eif = (struct elf_info_failed *) data;
-
-  /* Ignore indirect symbols.  These are added by the versioning code.  */
-  if (h->root.type == bfd_link_hash_indirect)
-    return true;
-
-  if (h->dynindx == -1
-      && (h->elf_link_hash_flags
-	  & (ELF_LINK_HASH_DEF_REGULAR | ELF_LINK_HASH_REF_REGULAR)) != 0)
-    {
-      if (! _bfd_elf_link_record_dynamic_symbol (eif->info, h))
-	{
-	  eif->failed = true;
-	  return false;
-	}
-    }
-
-  return true;
-}
-
-/* Look through the symbols which are defined in other shared
-   libraries and referenced here.  Update the list of version
-   dependencies.  This will be put into the .gnu.version_r section.
-   This function is called via elf_link_hash_traverse.  */
-
-static boolean
-elf_link_find_version_dependencies (h, data)
-     struct elf_link_hash_entry *h;
-     PTR data;
-{
-  struct elf_find_verdep_info *rinfo = (struct elf_find_verdep_info *) data;
-  Elf_Internal_Verneed *t;
-  Elf_Internal_Vernaux *a;
-
-  /* We only care about symbols defined in shared objects with version
-     information.  */
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) == 0
-      || (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) != 0
-      || h->dynindx == -1
-      || h->verinfo.verdef == NULL)
-    return true;
-
-  /* See if we already know about this version.  */
-  for (t = elf_tdata (rinfo->output_bfd)->verref; t != NULL; t = t->vn_nextref)
-    {
-      if (t->vn_bfd != h->verinfo.verdef->vd_bfd)
-	continue;
-
-      for (a = t->vn_auxptr; a != NULL; a = a->vna_nextptr)
-	if (a->vna_nodename == h->verinfo.verdef->vd_nodename)
-	  return true;
-
-      break;
-    }
-
-  /* This is a new version.  Add it to tree we are building.  */
-
-  if (t == NULL)
-    {
-      t = (Elf_Internal_Verneed *) bfd_zalloc (rinfo->output_bfd, sizeof *t);
-      if (t == NULL)
-	{
-	  rinfo->failed = true;
-	  return false;
-	}
-
-      t->vn_bfd = h->verinfo.verdef->vd_bfd;
-      t->vn_nextref = elf_tdata (rinfo->output_bfd)->verref;
-      elf_tdata (rinfo->output_bfd)->verref = t;
-    }
-
-  a = (Elf_Internal_Vernaux *) bfd_zalloc (rinfo->output_bfd, sizeof *a);
-
-  /* Note that we are copying a string pointer here, and testing it
-     above.  If bfd_elf_string_from_elf_section is ever changed to
-     discard the string data when low in memory, this will have to be
-     fixed.  */
-  a->vna_nodename = h->verinfo.verdef->vd_nodename;
-
-  a->vna_flags = h->verinfo.verdef->vd_flags;
-  a->vna_nextptr = t->vn_auxptr;
-
-  h->verinfo.verdef->vd_exp_refno = rinfo->vers;
-  ++rinfo->vers;
-
-  a->vna_other = h->verinfo.verdef->vd_exp_refno + 1;
-
-  t->vn_auxptr = a;
-
-  return true;
-}
-
-/* Figure out appropriate versions for all the symbols.  We may not
-   have the version number script until we have read all of the input
-   files, so until that point we don't know which symbols should be
-   local.  This function is called via elf_link_hash_traverse.  */
-
-static boolean
-elf_link_assign_sym_version (h, data)
-     struct elf_link_hash_entry *h;
-     PTR data;
-{
-  struct elf_assign_sym_version_info *sinfo =
-    (struct elf_assign_sym_version_info *) data;
-  struct bfd_link_info *info = sinfo->info;
-  struct elf_info_failed eif;
-  char *p;
-
-  /* Fix the symbol flags.  */
-  eif.failed = false;
-  eif.info = info;
-  if (! elf_fix_symbol_flags (h, &eif))
-    {
-      if (eif.failed)
-	sinfo->failed = true;
-      return false;
-    }
-
-  /* We only need version numbers for symbols defined in regular
-     objects.  */
-  if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-    return true;
-
-  p = strchr (h->root.root.string, ELF_VER_CHR);
-  if (p != NULL && h->verinfo.vertree == NULL)
-    {
-      struct bfd_elf_version_tree *t;
-      boolean hidden;
-
-      hidden = true;
-
-      /* There are two consecutive ELF_VER_CHR characters if this is
-         not a hidden symbol.  */
-      ++p;
-      if (*p == ELF_VER_CHR)
-	{
-	  hidden = false;
-	  ++p;
-	}
-
-      /* If there is no version string, we can just return out.  */
-      if (*p == '\0')
-	{
-	  if (hidden)
-	    h->elf_link_hash_flags |= ELF_LINK_HIDDEN;
-	  return true;
-	}
-
-      /* Look for the version.  If we find it, it is no longer weak.  */
-      for (t = sinfo->verdefs; t != NULL; t = t->next)
-	{
-	  if (strcmp (t->name, p) == 0)
-	    {
-	      int len;
-	      char *alc;
-	      struct bfd_elf_version_expr *d;
-
-	      len = p - h->root.root.string;
-	      alc = bfd_alloc (sinfo->output_bfd, len);
-	      if (alc == NULL)
-	        return false;
-	      strncpy (alc, h->root.root.string, len - 1);
-	      alc[len - 1] = '\0';
-	      if (alc[len - 2] == ELF_VER_CHR)
-	        alc[len - 2] = '\0';
-
-	      h->verinfo.vertree = t;
-	      t->used = true;
-	      d = NULL;
-
-	      if (t->globals != NULL)
-		{
-		  for (d = t->globals; d != NULL; d = d->next)
-		    if ((*d->match) (d, alc))
-		      break;
-		}
-
-	      /* See if there is anything to force this symbol to
-                 local scope.  */
-	      if (d == NULL && t->locals != NULL)
-		{
-		  for (d = t->locals; d != NULL; d = d->next)
-		    {
-		      if ((*d->match) (d, alc))
-			{
-			  if (h->dynindx != -1
-			      && info->shared
-			      && ! sinfo->export_dynamic)
-			    {
-			      sinfo->removed_dynamic = true;
-			      h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
-			      h->elf_link_hash_flags &=~
-				ELF_LINK_HASH_NEEDS_PLT;
-			      h->dynindx = -1;
-			      h->plt.offset = (bfd_vma) -1;
-			      /* FIXME: The name of the symbol has
-				 already been recorded in the dynamic
-				 string table section.  */
-			    }
-
-			  break;
-			}
-		    }
-		}
-
-	      bfd_release (sinfo->output_bfd, alc);
-	      break;
-	    }
-	}
-
-      /* If we are building an application, we need to create a
-         version node for this version.  */
-      if (t == NULL && ! info->shared)
-	{
-	  struct bfd_elf_version_tree **pp;
-	  int version_index;
-
-	  /* If we aren't going to export this symbol, we don't need
-             to worry about it. */
-	  if (h->dynindx == -1)
-	    return true;
-
-	  t = ((struct bfd_elf_version_tree *)
-	       bfd_alloc (sinfo->output_bfd, sizeof *t));
-	  if (t == NULL)
-	    {
-	      sinfo->failed = true;
-	      return false;
-	    }
-
-	  t->next = NULL;
-	  t->name = p;
-	  t->globals = NULL;
-	  t->locals = NULL;
-	  t->deps = NULL;
-	  t->name_indx = (unsigned int) -1;
-	  t->used = true;
-
-	  version_index = 1;
-	  for (pp = &sinfo->verdefs; *pp != NULL; pp = &(*pp)->next)
-	    ++version_index;
-	  t->vernum = version_index;
-
-	  *pp = t;
-
-	  h->verinfo.vertree = t;
-	}
-      else if (t == NULL)
-	{
-	  /* We could not find the version for a symbol when
-             generating a shared archive.  Return an error.  */
-	  (*_bfd_error_handler)
-	    (_("%s: undefined versioned symbol name %s"),
-	     bfd_get_filename (sinfo->output_bfd), h->root.root.string);
-	  bfd_set_error (bfd_error_bad_value);
-	  sinfo->failed = true;
-	  return false;
-	}
-
-      if (hidden)
-	h->elf_link_hash_flags |= ELF_LINK_HIDDEN;
-    }
-
-  /* If we don't have a version for this symbol, see if we can find
-     something.  */
-  if (h->verinfo.vertree == NULL && sinfo->verdefs != NULL)
-    {
-      struct bfd_elf_version_tree *t;
-      struct bfd_elf_version_tree *deflt;
-      struct bfd_elf_version_expr *d;
-
-      /* See if can find what version this symbol is in.  If the
-         symbol is supposed to be local, then don't actually register
-         it.  */
-      deflt = NULL;
-      for (t = sinfo->verdefs; t != NULL; t = t->next)
-	{
-	  if (t->globals != NULL)
-	    {
-	      for (d = t->globals; d != NULL; d = d->next)
-		{
-		  if ((*d->match) (d, h->root.root.string))
-		    {
-		      h->verinfo.vertree = t;
-		      break;
-		    }
-		}
-
-	      if (d != NULL)
-		break;
-	    }
-
-	  if (t->locals != NULL)
-	    {
-	      for (d = t->locals; d != NULL; d = d->next)
-		{
-		  if (d->pattern[0] == '*' && d->pattern[1] == '\0')
-		    deflt = t;
-		  else if ((*d->match) (d, h->root.root.string))
-		    {
-		      h->verinfo.vertree = t;
-		      if (h->dynindx != -1
-			  && info->shared
-			  && ! sinfo->export_dynamic)
-			{
-			  sinfo->removed_dynamic = true;
-			  h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
-			  h->elf_link_hash_flags &=~ ELF_LINK_HASH_NEEDS_PLT;
-			  h->dynindx = -1;
-			  h->plt.offset = (bfd_vma) -1;
-			  /* FIXME: The name of the symbol has already
-			     been recorded in the dynamic string table
-			     section.  */
-			}
-		      break;
-		    }
-		}
-
-	      if (d != NULL)
-		break;
-	    }
-	}
-
-      if (deflt != NULL && h->verinfo.vertree == NULL)
-	{
-	  h->verinfo.vertree = deflt;
-	  if (h->dynindx != -1
-	      && info->shared
-	      && ! sinfo->export_dynamic)
-	    {
-	      sinfo->removed_dynamic = true;
-	      h->elf_link_hash_flags |= ELF_LINK_FORCED_LOCAL;
-	      h->elf_link_hash_flags &=~ ELF_LINK_HASH_NEEDS_PLT;
-	      h->dynindx = -1;
-	      h->plt.offset = (bfd_vma) -1;
-	      /* FIXME: The name of the symbol has already been
-		 recorded in the dynamic string table section.  */
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* This function is used to renumber the dynamic symbols, if some of
-   them are removed because they are marked as local.  This is called
-   via elf_link_hash_traverse.  */
-
-static boolean
-elf_link_renumber_dynsyms (h, data)
-     struct elf_link_hash_entry *h;
-     PTR data;
-{
-  struct bfd_link_info *info = (struct bfd_link_info *) data;
-
-  if (h->dynindx != -1)
-    {
-      h->dynindx = elf_hash_table (info)->dynsymcount;
-      ++elf_hash_table (info)->dynsymcount;
-    }
-
-  return true;
-}
-
-/* Final phase of ELF linker.  */
-
-/* A structure we use to avoid passing large numbers of arguments.  */
-
-struct elf_final_link_info
-{
-  /* General link information.  */
-  struct bfd_link_info *info;
-  /* Output BFD.  */
-  bfd *output_bfd;
-  /* Symbol string table.  */
-  struct bfd_strtab_hash *symstrtab;
-  /* .dynsym section.  */
-  asection *dynsym_sec;
-  /* .hash section.  */
-  asection *hash_sec;
-  /* symbol version section (.gnu.version).  */
-  asection *symver_sec;
-  /* Buffer large enough to hold contents of any section.  */
-  bfd_byte *contents;
-  /* Buffer large enough to hold external relocs of any section.  */
-  PTR external_relocs;
-  /* Buffer large enough to hold internal relocs of any section.  */
-  Elf_Internal_Rela *internal_relocs;
-  /* Buffer large enough to hold external local symbols of any input
-     BFD.  */
-  Elf_External_Sym *external_syms;
-  /* Buffer large enough to hold internal local symbols of any input
-     BFD.  */
-  Elf_Internal_Sym *internal_syms;
-  /* Array large enough to hold a symbol index for each local symbol
-     of any input BFD.  */
-  long *indices;
-  /* Array large enough to hold a section pointer for each local
-     symbol of any input BFD.  */
-  asection **sections;
-  /* Buffer to hold swapped out symbols.  */
-  Elf_External_Sym *symbuf;
-  /* Number of swapped out symbols in buffer.  */
-  size_t symbuf_count;
-  /* Number of symbols which fit in symbuf.  */
-  size_t symbuf_size;
-};
-
-static boolean elf_link_output_sym
-  PARAMS ((struct elf_final_link_info *, const char *,
-	   Elf_Internal_Sym *, asection *));
-static boolean elf_link_flush_output_syms
-  PARAMS ((struct elf_final_link_info *));
-static boolean elf_link_output_extsym
-  PARAMS ((struct elf_link_hash_entry *, PTR));
-static boolean elf_link_input_bfd
-  PARAMS ((struct elf_final_link_info *, bfd *));
-static boolean elf_reloc_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-
-/* This struct is used to pass information to elf_link_output_extsym.  */
-
-struct elf_outext_info
-{
-  boolean failed;
-  boolean localsyms;
-  struct elf_final_link_info *finfo;
-};
-
-/* Do the final step of an ELF link.  */
-
-boolean
-elf_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  boolean dynamic;
-  bfd *dynobj;
-  struct elf_final_link_info finfo;
-  register asection *o;
-  register struct bfd_link_order *p;
-  register bfd *sub;
-  size_t max_contents_size;
-  size_t max_external_reloc_size;
-  size_t max_internal_reloc_count;
-  size_t max_sym_count;
-  file_ptr off;
-  Elf_Internal_Sym elfsym;
-  unsigned int i;
-  Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Shdr *symstrtab_hdr;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  struct elf_outext_info eoinfo;
-
-  if (info->shared)
-    abfd->flags |= DYNAMIC;
-
-  dynamic = elf_hash_table (info)->dynamic_sections_created;
-  dynobj = elf_hash_table (info)->dynobj;
-
-  finfo.info = info;
-  finfo.output_bfd = abfd;
-  finfo.symstrtab = elf_stringtab_init ();
-  if (finfo.symstrtab == NULL)
-    return false;
-
-  if (! dynamic)
-    {
-      finfo.dynsym_sec = NULL;
-      finfo.hash_sec = NULL;
-      finfo.symver_sec = NULL;
-    }
-  else
-    {
-      finfo.dynsym_sec = bfd_get_section_by_name (dynobj, ".dynsym");
-      finfo.hash_sec = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (finfo.dynsym_sec != NULL && finfo.hash_sec != NULL);
-      finfo.symver_sec = bfd_get_section_by_name (dynobj, ".gnu.version");
-      /* Note that it is OK if symver_sec is NULL.  */
-    }
-
-  finfo.contents = NULL;
-  finfo.external_relocs = NULL;
-  finfo.internal_relocs = NULL;
-  finfo.external_syms = NULL;
-  finfo.internal_syms = NULL;
-  finfo.indices = NULL;
-  finfo.sections = NULL;
-  finfo.symbuf = NULL;
-  finfo.symbuf_count = 0;
-
-  /* Count up the number of relocations we will output for each output
-     section, so that we know the sizes of the reloc sections.  We
-     also figure out some maximum sizes.  */
-  max_contents_size = 0;
-  max_external_reloc_size = 0;
-  max_internal_reloc_count = 0;
-  max_sym_count = 0;
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    {
-      o->reloc_count = 0;
-
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_section_reloc_link_order
-	      || p->type == bfd_symbol_reloc_link_order)
-	    ++o->reloc_count;
-	  else if (p->type == bfd_indirect_link_order)
-	    {
-	      asection *sec;
-
-	      sec = p->u.indirect.section;
-
-	      /* Mark all sections which are to be included in the
-		 link.  This will normally be every section.  We need
-		 to do this so that we can identify any sections which
-		 the linker has decided to not include.  */
-	      sec->linker_mark = true;
-
-	      if (info->relocateable)
-		o->reloc_count += sec->reloc_count;
-
-	      if (sec->_raw_size > max_contents_size)
-		max_contents_size = sec->_raw_size;
-	      if (sec->_cooked_size > max_contents_size)
-		max_contents_size = sec->_cooked_size;
-
-	      /* We are interested in just local symbols, not all
-		 symbols.  */
-	      if (bfd_get_flavour (sec->owner) == bfd_target_elf_flavour
-		  && (sec->owner->flags & DYNAMIC) == 0)
-		{
-		  size_t sym_count;
-
-		  if (elf_bad_symtab (sec->owner))
-		    sym_count = (elf_tdata (sec->owner)->symtab_hdr.sh_size
-				 / sizeof (Elf_External_Sym));
-		  else
-		    sym_count = elf_tdata (sec->owner)->symtab_hdr.sh_info;
-
-		  if (sym_count > max_sym_count)
-		    max_sym_count = sym_count;
-
-		  if ((sec->flags & SEC_RELOC) != 0)
-		    {
-		      size_t ext_size;
-
-		      ext_size = elf_section_data (sec)->rel_hdr.sh_size;
-		      if (ext_size > max_external_reloc_size)
-			max_external_reloc_size = ext_size;
-		      if (sec->reloc_count > max_internal_reloc_count)
-			max_internal_reloc_count = sec->reloc_count;
-		    }
-		}
-	    }
-	}
-
-      if (o->reloc_count > 0)
-	o->flags |= SEC_RELOC;
-      else
-	{
-	  /* Explicitly clear the SEC_RELOC flag.  The linker tends to
-	     set it (this is probably a bug) and if it is set
-	     assign_section_numbers will create a reloc section.  */
-	  o->flags &=~ SEC_RELOC;
-	}
-
-      /* If the SEC_ALLOC flag is not set, force the section VMA to
-	 zero.  This is done in elf_fake_sections as well, but forcing
-	 the VMA to 0 here will ensure that relocs against these
-	 sections are handled correctly.  */
-      if ((o->flags & SEC_ALLOC) == 0
-	  && ! o->user_set_vma)
-	o->vma = 0;
-    }
-
-  /* Figure out the file positions for everything but the symbol table
-     and the relocs.  We set symcount to force assign_section_numbers
-     to create a symbol table.  */
-  bfd_get_symcount (abfd) = info->strip == strip_all ? 0 : 1;
-  BFD_ASSERT (! abfd->output_has_begun);
-  if (! _bfd_elf_compute_section_file_positions (abfd, info))
-    goto error_return;
-
-  /* That created the reloc sections.  Set their sizes, and assign
-     them file positions, and allocate some buffers.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if ((o->flags & SEC_RELOC) != 0)
-	{
-	  Elf_Internal_Shdr *rel_hdr;
-	  register struct elf_link_hash_entry **p, **pend;
-
-	  rel_hdr = &elf_section_data (o)->rel_hdr;
-
-	  rel_hdr->sh_size = rel_hdr->sh_entsize * o->reloc_count;
-
-	  /* The contents field must last into write_object_contents,
-	     so we allocate it with bfd_alloc rather than malloc.  */
-	  rel_hdr->contents = (PTR) bfd_alloc (abfd, rel_hdr->sh_size);
-	  if (rel_hdr->contents == NULL && rel_hdr->sh_size != 0)
-	    goto error_return;
-
-	  p = ((struct elf_link_hash_entry **)
-	       bfd_malloc (o->reloc_count
-			   * sizeof (struct elf_link_hash_entry *)));
-	  if (p == NULL && o->reloc_count != 0)
-	    goto error_return;
-	  elf_section_data (o)->rel_hashes = p;
-	  pend = p + o->reloc_count;
-	  for (; p < pend; p++)
-	    *p = NULL;
-
-	  /* Use the reloc_count field as an index when outputting the
-	     relocs.  */
-	  o->reloc_count = 0;
-	}
-    }
-
-  _bfd_elf_assign_file_positions_for_relocs (abfd);
-
-  /* We have now assigned file positions for all the sections except
-     .symtab and .strtab.  We start the .symtab section at the current
-     file position, and write directly to it.  We build the .strtab
-     section in memory.  */
-  bfd_get_symcount (abfd) = 0;
-  symtab_hdr = &elf_tdata (abfd)->symtab_hdr;
-  /* sh_name is set in prep_headers.  */
-  symtab_hdr->sh_type = SHT_SYMTAB;
-  symtab_hdr->sh_flags = 0;
-  symtab_hdr->sh_addr = 0;
-  symtab_hdr->sh_size = 0;
-  symtab_hdr->sh_entsize = sizeof (Elf_External_Sym);
-  /* sh_link is set in assign_section_numbers.  */
-  /* sh_info is set below.  */
-  /* sh_offset is set just below.  */
-  symtab_hdr->sh_addralign = 4;  /* FIXME: system dependent?  */
-
-  off = elf_tdata (abfd)->next_file_pos;
-  off = _bfd_elf_assign_file_position_for_section (symtab_hdr, off, true);
-
-  /* Note that at this point elf_tdata (abfd)->next_file_pos is
-     incorrect.  We do not yet know the size of the .symtab section.
-     We correct next_file_pos below, after we do know the size.  */
-
-  /* Allocate a buffer to hold swapped out symbols.  This is to avoid
-     continuously seeking to the right position in the file.  */
-  if (! info->keep_memory || max_sym_count < 20)
-    finfo.symbuf_size = 20;
-  else
-    finfo.symbuf_size = max_sym_count;
-  finfo.symbuf = ((Elf_External_Sym *)
-		  bfd_malloc (finfo.symbuf_size * sizeof (Elf_External_Sym)));
-  if (finfo.symbuf == NULL)
-    goto error_return;
-
-  /* Start writing out the symbol table.  The first symbol is always a
-     dummy symbol.  */
-  if (info->strip != strip_all || info->relocateable)
-    {
-      elfsym.st_value = 0;
-      elfsym.st_size = 0;
-      elfsym.st_info = 0;
-      elfsym.st_other = 0;
-      elfsym.st_shndx = SHN_UNDEF;
-      if (! elf_link_output_sym (&finfo, (const char *) NULL,
-				 &elfsym, bfd_und_section_ptr))
-	goto error_return;
-    }
-
-#if 0
-  /* Some standard ELF linkers do this, but we don't because it causes
-     bootstrap comparison failures.  */
-  /* Output a file symbol for the output file as the second symbol.
-     We output this even if we are discarding local symbols, although
-     I'm not sure if this is correct.  */
-  elfsym.st_value = 0;
-  elfsym.st_size = 0;
-  elfsym.st_info = ELF_ST_INFO (STB_LOCAL, STT_FILE);
-  elfsym.st_other = 0;
-  elfsym.st_shndx = SHN_ABS;
-  if (! elf_link_output_sym (&finfo, bfd_get_filename (abfd),
-			     &elfsym, bfd_abs_section_ptr))
-    goto error_return;
-#endif
-
-  /* Output a symbol for each section.  We output these even if we are
-     discarding local symbols, since they are used for relocs.  These
-     symbols have no names.  We store the index of each one in the
-     index field of the section, so that we can find it again when
-     outputting relocs.  */
-  if (info->strip != strip_all || info->relocateable)
-    {
-      elfsym.st_size = 0;
-      elfsym.st_info = ELF_ST_INFO (STB_LOCAL, STT_SECTION);
-      elfsym.st_other = 0;
-      for (i = 1; i < elf_elfheader (abfd)->e_shnum; i++)
-	{
-	  o = section_from_elf_index (abfd, i);
-	  if (o != NULL)
-	    o->target_index = bfd_get_symcount (abfd);
-	  elfsym.st_shndx = i;
-	  if (info->relocateable || o == NULL)
-	    elfsym.st_value = 0;
-	  else
-	    elfsym.st_value = o->vma;
-	  if (! elf_link_output_sym (&finfo, (const char *) NULL,
-				     &elfsym, o))
-	    goto error_return;
-	}
-    }
-
-  /* Allocate some memory to hold information read in from the input
-     files.  */
-  finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
-  finfo.external_relocs = (PTR) bfd_malloc (max_external_reloc_size);
-  finfo.internal_relocs = ((Elf_Internal_Rela *)
-			   bfd_malloc (max_internal_reloc_count
-				       * sizeof (Elf_Internal_Rela)));
-  finfo.external_syms = ((Elf_External_Sym *)
-			 bfd_malloc (max_sym_count
-				     * sizeof (Elf_External_Sym)));
-  finfo.internal_syms = ((Elf_Internal_Sym *)
-			 bfd_malloc (max_sym_count
-				     * sizeof (Elf_Internal_Sym)));
-  finfo.indices = (long *) bfd_malloc (max_sym_count * sizeof (long));
-  finfo.sections = ((asection **)
-		    bfd_malloc (max_sym_count * sizeof (asection *)));
-  if ((finfo.contents == NULL && max_contents_size != 0)
-      || (finfo.external_relocs == NULL && max_external_reloc_size != 0)
-      || (finfo.internal_relocs == NULL && max_internal_reloc_count != 0)
-      || (finfo.external_syms == NULL && max_sym_count != 0)
-      || (finfo.internal_syms == NULL && max_sym_count != 0)
-      || (finfo.indices == NULL && max_sym_count != 0)
-      || (finfo.sections == NULL && max_sym_count != 0))
-    goto error_return;
-
-  /* Since ELF permits relocations to be against local symbols, we
-     must have the local symbols available when we do the relocations.
-     Since we would rather only read the local symbols once, and we
-     would rather not keep them in memory, we handle all the
-     relocations for a single input file at the same time.
-
-     Unfortunately, there is no way to know the total number of local
-     symbols until we have seen all of them, and the local symbol
-     indices precede the global symbol indices.  This means that when
-     we are generating relocateable output, and we see a reloc against
-     a global symbol, we can not know the symbol index until we have
-     finished examining all the local symbols to see which ones we are
-     going to output.  To deal with this, we keep the relocations in
-     memory, and don't output them until the end of the link.  This is
-     an unfortunate waste of memory, but I don't see a good way around
-     it.  Fortunately, it only happens when performing a relocateable
-     link, which is not the common case.  FIXME: If keep_memory is set
-     we could write the relocs out and then read them again; I don't
-     know how bad the memory loss will be.  */
-
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    sub->output_has_begun = false;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order
-	      && (bfd_get_flavour (p->u.indirect.section->owner)
-		  == bfd_target_elf_flavour))
-	    {
-	      sub = p->u.indirect.section->owner;
-	      if (! sub->output_has_begun)
-		{
-		  if (! elf_link_input_bfd (&finfo, sub))
-		    goto error_return;
-		  sub->output_has_begun = true;
-		}
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    {
-	      if (! elf_reloc_link_order (abfd, info, o, p))
-		goto error_return;
-	    }
-	  else
-	    {
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		goto error_return;
-	    }
-	}
-    }
-
-  /* That wrote out all the local symbols.  Finish up the symbol table
-     with the global symbols.  */
-
-  if (info->strip != strip_all && info->shared)
-    {
-      /* Output any global symbols that got converted to local in a
-         version script.  We do this in a separate step since ELF
-         requires all local symbols to appear prior to any global
-         symbols.  FIXME: We should only do this if some global
-         symbols were, in fact, converted to become local.  FIXME:
-         Will this work correctly with the Irix 5 linker?  */
-      eoinfo.failed = false;
-      eoinfo.finfo = &finfo;
-      eoinfo.localsyms = true;
-      elf_link_hash_traverse (elf_hash_table (info), elf_link_output_extsym,
-			      (PTR) &eoinfo);
-      if (eoinfo.failed)
-	return false;
-    }
-
-  /* The sh_info field records the index of the first non local
-     symbol.  */
-  symtab_hdr->sh_info = bfd_get_symcount (abfd);
-  if (dynamic)
-    elf_section_data (finfo.dynsym_sec->output_section)->this_hdr.sh_info = 1;
-
-  /* We get the global symbols from the hash table.  */
-  eoinfo.failed = false;
-  eoinfo.localsyms = false;
-  eoinfo.finfo = &finfo;
-  elf_link_hash_traverse (elf_hash_table (info), elf_link_output_extsym,
-			  (PTR) &eoinfo);
-  if (eoinfo.failed)
-    return false;
-
-  /* Flush all symbols to the file.  */
-  if (! elf_link_flush_output_syms (&finfo))
-    return false;
-
-  /* Now we know the size of the symtab section.  */
-  off += symtab_hdr->sh_size;
-
-  /* Finish up and write out the symbol string table (.strtab)
-     section.  */
-  symstrtab_hdr = &elf_tdata (abfd)->strtab_hdr;
-  /* sh_name was set in prep_headers.  */
-  symstrtab_hdr->sh_type = SHT_STRTAB;
-  symstrtab_hdr->sh_flags = 0;
-  symstrtab_hdr->sh_addr = 0;
-  symstrtab_hdr->sh_size = _bfd_stringtab_size (finfo.symstrtab);
-  symstrtab_hdr->sh_entsize = 0;
-  symstrtab_hdr->sh_link = 0;
-  symstrtab_hdr->sh_info = 0;
-  /* sh_offset is set just below.  */
-  symstrtab_hdr->sh_addralign = 1;
-
-  off = _bfd_elf_assign_file_position_for_section (symstrtab_hdr, off, true);
-  elf_tdata (abfd)->next_file_pos = off;
-
-  if (bfd_get_symcount (abfd) > 0)
-    {
-      if (bfd_seek (abfd, symstrtab_hdr->sh_offset, SEEK_SET) != 0
-	  || ! _bfd_stringtab_emit (abfd, finfo.symstrtab))
-	return false;
-    }
-
-  /* Adjust the relocs to have the correct symbol indices.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      struct elf_link_hash_entry **rel_hash;
-      Elf_Internal_Shdr *rel_hdr;
-
-      if ((o->flags & SEC_RELOC) == 0)
-	continue;
-
-      rel_hash = elf_section_data (o)->rel_hashes;
-      rel_hdr = &elf_section_data (o)->rel_hdr;
-      for (i = 0; i < o->reloc_count; i++, rel_hash++)
-	{
-	  if (*rel_hash == NULL)
-	    continue;
-
-	  BFD_ASSERT ((*rel_hash)->indx >= 0);
-
-	  if (rel_hdr->sh_entsize == sizeof (Elf_External_Rel))
-	    {
-	      Elf_External_Rel *erel;
-	      Elf_Internal_Rel irel;
-
-	      erel = (Elf_External_Rel *) rel_hdr->contents + i;
-	      elf_swap_reloc_in (abfd, erel, &irel);
-	      irel.r_info = ELF_R_INFO ((*rel_hash)->indx,
-					ELF_R_TYPE (irel.r_info));
-	      elf_swap_reloc_out (abfd, &irel, erel);
-	    }
-	  else
-	    {
-	      Elf_External_Rela *erela;
-	      Elf_Internal_Rela irela;
-
-	      BFD_ASSERT (rel_hdr->sh_entsize
-			  == sizeof (Elf_External_Rela));
-
-	      erela = (Elf_External_Rela *) rel_hdr->contents + i;
-	      elf_swap_reloca_in (abfd, erela, &irela);
-	      irela.r_info = ELF_R_INFO ((*rel_hash)->indx,
-					 ELF_R_TYPE (irela.r_info));
-	      elf_swap_reloca_out (abfd, &irela, erela);
-	    }
-	}
-
-      /* Set the reloc_count field to 0 to prevent write_relocs from
-	 trying to swap the relocs out itself.  */
-      o->reloc_count = 0;
-    }
-
-  /* If we are linking against a dynamic object, or generating a
-     shared library, finish up the dynamic linking information.  */
-  if (dynamic)
-    {
-      Elf_External_Dyn *dyncon, *dynconend;
-
-      /* Fix up .dynamic entries.  */
-      o = bfd_get_section_by_name (dynobj, ".dynamic");
-      BFD_ASSERT (o != NULL);
-
-      dyncon = (Elf_External_Dyn *) o->contents;
-      dynconend = (Elf_External_Dyn *) (o->contents + o->_raw_size);
-      for (; dyncon < dynconend; dyncon++)
-	{
-	  Elf_Internal_Dyn dyn;
-	  const char *name;
-	  unsigned int type;
-
-	  elf_swap_dyn_in (dynobj, dyncon, &dyn);
-
-	  switch (dyn.d_tag)
-	    {
-	    default:
-	      break;
-
-	      /* SVR4 linkers seem to set DT_INIT and DT_FINI based on
-                 magic _init and _fini symbols.  This is pretty ugly,
-                 but we are compatible.  */
-	    case DT_INIT:
-	      name = "_init";
-	      goto get_sym;
-	    case DT_FINI:
-	      name = "_fini";
-	    get_sym:
-	      {
-		struct elf_link_hash_entry *h;
-
-		h = elf_link_hash_lookup (elf_hash_table (info), name,
-					  false, false, true);
-		if (h != NULL
-		    && (h->root.type == bfd_link_hash_defined
-			|| h->root.type == bfd_link_hash_defweak))
-		  {
-		    dyn.d_un.d_val = h->root.u.def.value;
-		    o = h->root.u.def.section;
-		    if (o->output_section != NULL)
-		      dyn.d_un.d_val += (o->output_section->vma
-					 + o->output_offset);
-		    else
-		      {
-			/* The symbol is imported from another shared
-			   library and does not apply to this one.  */
-			dyn.d_un.d_val = 0;
-		      }
-
-		    elf_swap_dyn_out (dynobj, &dyn, dyncon);
-		  }
-	      }
-	      break;
-
-	    case DT_HASH:
-	      name = ".hash";
-	      goto get_vma;
-	    case DT_STRTAB:
-	      name = ".dynstr";
-	      goto get_vma;
-	    case DT_SYMTAB:
-	      name = ".dynsym";
-	      goto get_vma;
-	    case DT_VERDEF:
-	      name = ".gnu.version_d";
-	      goto get_vma;
-	    case DT_VERNEED:
-	      name = ".gnu.version_r";
-	      goto get_vma;
-	    case DT_VERSYM:
-	      name = ".gnu.version";
-	    get_vma:
-	      o = bfd_get_section_by_name (abfd, name);
-	      BFD_ASSERT (o != NULL);
-	      dyn.d_un.d_ptr = o->vma;
-	      elf_swap_dyn_out (dynobj, &dyn, dyncon);
-	      break;
-
-	    case DT_REL:
-	    case DT_RELA:
-	    case DT_RELSZ:
-	    case DT_RELASZ:
-	      if (dyn.d_tag == DT_REL || dyn.d_tag == DT_RELSZ)
-		type = SHT_REL;
-	      else
-		type = SHT_RELA;
-	      dyn.d_un.d_val = 0;
-	      for (i = 1; i < elf_elfheader (abfd)->e_shnum; i++)
-		{
-		  Elf_Internal_Shdr *hdr;
-
-		  hdr = elf_elfsections (abfd)[i];
-		  if (hdr->sh_type == type
-		      && (hdr->sh_flags & SHF_ALLOC) != 0)
-		    {
-		      if (dyn.d_tag == DT_RELSZ || dyn.d_tag == DT_RELASZ)
-			dyn.d_un.d_val += hdr->sh_size;
-		      else
-			{
-			  if (dyn.d_un.d_val == 0
-			      || hdr->sh_addr < dyn.d_un.d_val)
-			    dyn.d_un.d_val = hdr->sh_addr;
-			}
-		    }
-		}
-	      elf_swap_dyn_out (dynobj, &dyn, dyncon);
-	      break;
-	    }
-	}
-    }
-
-  /* If we have created any dynamic sections, then output them.  */
-  if (dynobj != NULL)
-    {
-      if (! (*bed->elf_backend_finish_dynamic_sections) (abfd, info))
-	goto error_return;
-
-      for (o = dynobj->sections; o != NULL; o = o->next)
-	{
-	  if ((o->flags & SEC_HAS_CONTENTS) == 0
-	      || o->_raw_size == 0)
-	    continue;
-	  if ((o->flags & SEC_LINKER_CREATED) == 0)
-	    {
-	      /* At this point, we are only interested in sections
-                 created by elf_link_create_dynamic_sections.  */
-	      continue;
-	    }
-	  if ((elf_section_data (o->output_section)->this_hdr.sh_type
-	       != SHT_STRTAB)
-	      || strcmp (bfd_get_section_name (abfd, o), ".dynstr") != 0)
-	    {
-	      if (! bfd_set_section_contents (abfd, o->output_section,
-					      o->contents, o->output_offset,
-					      o->_raw_size))
-		goto error_return;
-	    }
-	  else
-	    {
-	      file_ptr off;
-
-	      /* The contents of the .dynstr section are actually in a
-                 stringtab.  */
-	      off = elf_section_data (o->output_section)->this_hdr.sh_offset;
-	      if (bfd_seek (abfd, off, SEEK_SET) != 0
-		  || ! _bfd_stringtab_emit (abfd,
-					    elf_hash_table (info)->dynstr))
-		goto error_return;
-	    }
-	}
-    }
-
-  /* If we have optimized stabs strings, output them.  */
-  if (elf_hash_table (info)->stab_info != NULL)
-    {
-      if (! _bfd_write_stab_strings (abfd, &elf_hash_table (info)->stab_info))
-	goto error_return;
-    }
-
-  if (finfo.symstrtab != NULL)
-    _bfd_stringtab_free (finfo.symstrtab);
-  if (finfo.contents != NULL)
-    free (finfo.contents);
-  if (finfo.external_relocs != NULL)
-    free (finfo.external_relocs);
-  if (finfo.internal_relocs != NULL)
-    free (finfo.internal_relocs);
-  if (finfo.external_syms != NULL)
-    free (finfo.external_syms);
-  if (finfo.internal_syms != NULL)
-    free (finfo.internal_syms);
-  if (finfo.indices != NULL)
-    free (finfo.indices);
-  if (finfo.sections != NULL)
-    free (finfo.sections);
-  if (finfo.symbuf != NULL)
-    free (finfo.symbuf);
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if ((o->flags & SEC_RELOC) != 0
-	  && elf_section_data (o)->rel_hashes != NULL)
-	free (elf_section_data (o)->rel_hashes);
-    }
-
-  elf_tdata (abfd)->linker = true;
-
-  return true;
-
- error_return:
-  if (finfo.symstrtab != NULL)
-    _bfd_stringtab_free (finfo.symstrtab);
-  if (finfo.contents != NULL)
-    free (finfo.contents);
-  if (finfo.external_relocs != NULL)
-    free (finfo.external_relocs);
-  if (finfo.internal_relocs != NULL)
-    free (finfo.internal_relocs);
-  if (finfo.external_syms != NULL)
-    free (finfo.external_syms);
-  if (finfo.internal_syms != NULL)
-    free (finfo.internal_syms);
-  if (finfo.indices != NULL)
-    free (finfo.indices);
-  if (finfo.sections != NULL)
-    free (finfo.sections);
-  if (finfo.symbuf != NULL)
-    free (finfo.symbuf);
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if ((o->flags & SEC_RELOC) != 0
-	  && elf_section_data (o)->rel_hashes != NULL)
-	free (elf_section_data (o)->rel_hashes);
-    }
-
-  return false;
-}
-
-/* Add a symbol to the output symbol table.  */
-
-static boolean
-elf_link_output_sym (finfo, name, elfsym, input_sec)
-     struct elf_final_link_info *finfo;
-     const char *name;
-     Elf_Internal_Sym *elfsym;
-     asection *input_sec;
-{
-  boolean (*output_symbol_hook) PARAMS ((bfd *,
-					 struct bfd_link_info *info,
-					 const char *,
-					 Elf_Internal_Sym *,
-					 asection *));
-
-  output_symbol_hook = get_elf_backend_data (finfo->output_bfd)->
-    elf_backend_link_output_symbol_hook;
-  if (output_symbol_hook != NULL)
-    {
-      if (! ((*output_symbol_hook)
-	     (finfo->output_bfd, finfo->info, name, elfsym, input_sec)))
-	return false;
-    }
-
-  if (name == (const char *) NULL || *name == '\0')
-    elfsym->st_name = 0;
-  else if (input_sec->flags & SEC_EXCLUDE)
-    elfsym->st_name = 0;
-  else
-    {
-      elfsym->st_name = (unsigned long) _bfd_stringtab_add (finfo->symstrtab,
-							    name, true,
-							    false);
-      if (elfsym->st_name == (unsigned long) -1)
-	return false;
-    }
-
-  if (finfo->symbuf_count >= finfo->symbuf_size)
-    {
-      if (! elf_link_flush_output_syms (finfo))
-	return false;
-    }
-
-  elf_swap_symbol_out (finfo->output_bfd, elfsym,
-		       (PTR) (finfo->symbuf + finfo->symbuf_count));
-  ++finfo->symbuf_count;
-
-  ++ bfd_get_symcount (finfo->output_bfd);
-
-  return true;
-}
-
-/* Flush the output symbols to the file.  */
-
-static boolean
-elf_link_flush_output_syms (finfo)
-     struct elf_final_link_info *finfo;
-{
-  if (finfo->symbuf_count > 0)
-    {
-      Elf_Internal_Shdr *symtab;
-
-      symtab = &elf_tdata (finfo->output_bfd)->symtab_hdr;
-
-      if (bfd_seek (finfo->output_bfd, symtab->sh_offset + symtab->sh_size,
-		    SEEK_SET) != 0
-	  || (bfd_write ((PTR) finfo->symbuf, finfo->symbuf_count,
-			 sizeof (Elf_External_Sym), finfo->output_bfd)
-	      != finfo->symbuf_count * sizeof (Elf_External_Sym)))
-	return false;
-
-      symtab->sh_size += finfo->symbuf_count * sizeof (Elf_External_Sym);
-
-      finfo->symbuf_count = 0;
-    }
-
-  return true;
-}
-
-/* Add an external symbol to the symbol table.  This is called from
-   the hash table traversal routine.  When generating a shared object,
-   we go through the symbol table twice.  The first time we output
-   anything that might have been forced to local scope in a version
-   script.  The second time we output the symbols that are still
-   global symbols.  */
-
-static boolean
-elf_link_output_extsym (h, data)
-     struct elf_link_hash_entry *h;
-     PTR data;
-{
-  struct elf_outext_info *eoinfo = (struct elf_outext_info *) data;
-  struct elf_final_link_info *finfo = eoinfo->finfo;
-  boolean strip;
-  Elf_Internal_Sym sym;
-  asection *input_sec;
-
-  /* Decide whether to output this symbol in this pass.  */
-  if (eoinfo->localsyms)
-    {
-      if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) == 0)
-	return true;
-    }
-  else
-    {
-      if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
-	return true;
-    }
-
-  /* If we are not creating a shared library, and this symbol is
-     referenced by a shared library but is not defined anywhere, then
-     warn that it is undefined.  If we do not do this, the runtime
-     linker will complain that the symbol is undefined when the
-     program is run.  We don't have to worry about symbols that are
-     referenced by regular files, because we will already have issued
-     warnings for them.  */
-  if (! finfo->info->relocateable
-      && ! (finfo->info->shared
-	    && !finfo->info->symbolic
-	    && !finfo->info->no_undefined)
-      && h->root.type == bfd_link_hash_undefined
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    {
-      if (! ((*finfo->info->callbacks->undefined_symbol)
-	     (finfo->info, h->root.root.string, h->root.u.undef.abfd,
-	      (asection *) NULL, 0)))
-	{
-	  eoinfo->failed = true;
-	  return false;
-	}
-    }
-
-  /* We don't want to output symbols that have never been mentioned by
-     a regular file, or that we have been told to strip.  However, if
-     h->indx is set to -2, the symbol is used by a reloc and we must
-     output it.  */
-  if (h->indx == -2)
-    strip = false;
-  else if (((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_DYNAMIC) != 0
-	    || (h->elf_link_hash_flags & ELF_LINK_HASH_REF_DYNAMIC) != 0)
-	   && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0
-	   && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) == 0)
-    strip = true;
-  else if (finfo->info->strip == strip_all
-	   || (finfo->info->strip == strip_some
-	       && bfd_hash_lookup (finfo->info->keep_hash,
-				   h->root.root.string,
-				   false, false) == NULL))
-    strip = true;
-  else
-    strip = false;
-
-  /* If we're stripping it, and it's not a dynamic symbol, there's
-     nothing else to do.  */
-  if (strip && h->dynindx == -1)
-    return true;
-
-  sym.st_value = 0;
-  sym.st_size = h->size;
-  sym.st_other = h->other;
-  if ((h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
-    sym.st_info = ELF_ST_INFO (STB_LOCAL, h->type);
-  else if (h->root.type == bfd_link_hash_undefweak
-	   || h->root.type == bfd_link_hash_defweak)
-    sym.st_info = ELF_ST_INFO (STB_WEAK, h->type);
-  else
-    sym.st_info = ELF_ST_INFO (STB_GLOBAL, h->type);
-
-  switch (h->root.type)
-    {
-    default:
-    case bfd_link_hash_new:
-      abort ();
-      return false;
-
-    case bfd_link_hash_undefined:
-      input_sec = bfd_und_section_ptr;
-      sym.st_shndx = SHN_UNDEF;
-      break;
-
-    case bfd_link_hash_undefweak:
-      input_sec = bfd_und_section_ptr;
-      sym.st_shndx = SHN_UNDEF;
-      break;
-
-    case bfd_link_hash_defined:
-    case bfd_link_hash_defweak:
-      {
-	input_sec = h->root.u.def.section;
-	if (input_sec->output_section != NULL)
-	  {
-	    sym.st_shndx =
-	      _bfd_elf_section_from_bfd_section (finfo->output_bfd,
-						 input_sec->output_section);
-	    if (sym.st_shndx == (unsigned short) -1)
-	      {
-		(*_bfd_error_handler)
-		  (_("%s: could not find output section %s for input section %s"),
-		   bfd_get_filename (finfo->output_bfd),
-		   input_sec->output_section->name,
-		   input_sec->name);
-		eoinfo->failed = true;
-		return false;
-	      }
-
-	    /* ELF symbols in relocateable files are section relative,
-	       but in nonrelocateable files they are virtual
-	       addresses.  */
-	    sym.st_value = h->root.u.def.value + input_sec->output_offset;
-	    if (! finfo->info->relocateable)
-	      sym.st_value += input_sec->output_section->vma;
-	  }
-	else
-	  {
-	    BFD_ASSERT (input_sec->owner == NULL
-			|| (input_sec->owner->flags & DYNAMIC) != 0);
-	    sym.st_shndx = SHN_UNDEF;
-	    input_sec = bfd_und_section_ptr;
-	  }
-      }
-      break;
-
-    case bfd_link_hash_common:
-      input_sec = h->root.u.c.p->section;
-      sym.st_shndx = SHN_COMMON;
-      sym.st_value = 1 << h->root.u.c.p->alignment_power;
-      break;
-
-    case bfd_link_hash_indirect:
-      /* These symbols are created by symbol versioning.  They point
-         to the decorated version of the name.  For example, if the
-         symbol foo@@GNU_1.2 is the default, which should be used when
-         foo is used with no version, then we add an indirect symbol
-         foo which points to foo@@GNU_1.2.  We ignore these symbols,
-         since the indirected symbol is already in the hash table.  If
-         the indirect symbol is non-ELF, fall through and output it.  */
-      if ((h->elf_link_hash_flags & ELF_LINK_NON_ELF) == 0)
-	return true;
-
-      /* Fall through.  */
-    case bfd_link_hash_warning:
-      /* We can't represent these symbols in ELF, although a warning
-         symbol may have come from a .gnu.warning.SYMBOL section.  We
-         just put the target symbol in the hash table.  If the target
-         symbol does not really exist, don't do anything.  */
-      if (h->root.u.i.link->type == bfd_link_hash_new)
-	return true;
-      return (elf_link_output_extsym
-	      ((struct elf_link_hash_entry *) h->root.u.i.link, data));
-    }
-
-  /* Give the processor backend a chance to tweak the symbol value,
-     and also to finish up anything that needs to be done for this
-     symbol.  */
-  if ((h->dynindx != -1
-       || (h->elf_link_hash_flags & ELF_LINK_FORCED_LOCAL) != 0)
-      && elf_hash_table (finfo->info)->dynamic_sections_created)
-    {
-      struct elf_backend_data *bed;
-
-      bed = get_elf_backend_data (finfo->output_bfd);
-      if (! ((*bed->elf_backend_finish_dynamic_symbol)
-	     (finfo->output_bfd, finfo->info, h, &sym)))
-	{
-	  eoinfo->failed = true;
-	  return false;
-	}
-    }
-
-  /* If we are marking the symbol as undefined, and there are no
-     non-weak references to this symbol from a regular object, then
-     mark the symbol as weak undefined.  We can't do this earlier,
-     because it might not be marked as undefined until the
-     finish_dynamic_symbol routine gets through with it.  */
-  if (sym.st_shndx == SHN_UNDEF
-      && sym.st_info == ELF_ST_INFO (STB_GLOBAL, h->type)
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR) != 0
-      && (h->elf_link_hash_flags & ELF_LINK_HASH_REF_REGULAR_NONWEAK) == 0)
-    sym.st_info = ELF_ST_INFO (STB_WEAK, h->type);
-
-  /* If this symbol should be put in the .dynsym section, then put it
-     there now.  We have already know the symbol index.  We also fill
-     in the entry in the .hash section.  */
-  if (h->dynindx != -1
-      && elf_hash_table (finfo->info)->dynamic_sections_created)
-    {
-      size_t bucketcount;
-      size_t bucket;
-      bfd_byte *bucketpos;
-      bfd_vma chain;
-
-      sym.st_name = h->dynstr_index;
-
-      elf_swap_symbol_out (finfo->output_bfd, &sym,
-			   (PTR) (((Elf_External_Sym *)
-				   finfo->dynsym_sec->contents)
-				  + h->dynindx));
-
-      bucketcount = elf_hash_table (finfo->info)->bucketcount;
-      bucket = h->elf_hash_value % bucketcount;
-      bucketpos = ((bfd_byte *) finfo->hash_sec->contents
-		   + (bucket + 2) * (ARCH_SIZE / 8));
-      chain = get_word (finfo->output_bfd, bucketpos);
-      put_word (finfo->output_bfd, h->dynindx, bucketpos);
-      put_word (finfo->output_bfd, chain,
-		((bfd_byte *) finfo->hash_sec->contents
-		 + (bucketcount + 2 + h->dynindx) * (ARCH_SIZE / 8)));
-
-      if (finfo->symver_sec != NULL && finfo->symver_sec->contents != NULL)
-	{
-	  Elf_Internal_Versym iversym;
-
-	  if ((h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR) == 0)
-	    {
-	      if (h->verinfo.verdef == NULL)
-		iversym.vs_vers = 0;
-	      else
-		iversym.vs_vers = h->verinfo.verdef->vd_exp_refno + 1;
-	    }
-	  else
-	    {
-	      if (h->verinfo.vertree == NULL)
-		iversym.vs_vers = 1;
-	      else
-		iversym.vs_vers = h->verinfo.vertree->vernum + 1;
-	    }
-
-	  if ((h->elf_link_hash_flags & ELF_LINK_HIDDEN) != 0)
-	    iversym.vs_vers |= VERSYM_HIDDEN;
-
-	  _bfd_elf_swap_versym_out (finfo->output_bfd, &iversym,
-				    (((Elf_External_Versym *)
-				      finfo->symver_sec->contents)
-				     + h->dynindx));
-	}
-    }
-
-  /* If we're stripping it, then it was just a dynamic symbol, and
-     there's nothing else to do.  */
-  if (strip)
-    return true;
-
-  h->indx = bfd_get_symcount (finfo->output_bfd);
-
-  if (! elf_link_output_sym (finfo, h->root.root.string, &sym, input_sec))
-    {
-      eoinfo->failed = true;
-      return false;
-    }
-
-  return true;
-}
-
-/* Link an input file into the linker output file.  This function
-   handles all the sections and relocations of the input file at once.
-   This is so that we only have to read the local symbols once, and
-   don't have to keep them in memory.  */
-
-static boolean
-elf_link_input_bfd (finfo, input_bfd)
-     struct elf_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  boolean (*relocate_section) PARAMS ((bfd *, struct bfd_link_info *,
-				       bfd *, asection *, bfd_byte *,
-				       Elf_Internal_Rela *,
-				       Elf_Internal_Sym *, asection **));
-  bfd *output_bfd;
-  Elf_Internal_Shdr *symtab_hdr;
-  size_t locsymcount;
-  size_t extsymoff;
-  Elf_External_Sym *external_syms;
-  Elf_External_Sym *esym;
-  Elf_External_Sym *esymend;
-  Elf_Internal_Sym *isym;
-  long *pindex;
-  asection **ppsection;
-  asection *o;
-
-  output_bfd = finfo->output_bfd;
-  relocate_section =
-    get_elf_backend_data (output_bfd)->elf_backend_relocate_section;
-
-  /* If this is a dynamic object, we don't want to do anything here:
-     we don't want the local symbols, and we don't want the section
-     contents.  */
-  if ((input_bfd->flags & DYNAMIC) != 0)
-    return true;
-
-  symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-  if (elf_bad_symtab (input_bfd))
-    {
-      locsymcount = symtab_hdr->sh_size / sizeof (Elf_External_Sym);
-      extsymoff = 0;
-    }
-  else
-    {
-      locsymcount = symtab_hdr->sh_info;
-      extsymoff = symtab_hdr->sh_info;
-    }
-
-  /* Read the local symbols.  */
-  if (symtab_hdr->contents != NULL)
-    external_syms = (Elf_External_Sym *) symtab_hdr->contents;
-  else if (locsymcount == 0)
-    external_syms = NULL;
-  else
-    {
-      external_syms = finfo->external_syms;
-      if (bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-	  || (bfd_read (external_syms, sizeof (Elf_External_Sym),
-			locsymcount, input_bfd)
-	      != locsymcount * sizeof (Elf_External_Sym)))
-	return false;
-    }
-
-  /* Swap in the local symbols and write out the ones which we know
-     are going into the output file.  */
-  esym = external_syms;
-  esymend = esym + locsymcount;
-  isym = finfo->internal_syms;
-  pindex = finfo->indices;
-  ppsection = finfo->sections;
-  for (; esym < esymend; esym++, isym++, pindex++, ppsection++)
-    {
-      asection *isec;
-      const char *name;
-      Elf_Internal_Sym osym;
-
-      elf_swap_symbol_in (input_bfd, esym, isym);
-      *pindex = -1;
-
-      if (elf_bad_symtab (input_bfd))
-	{
-	  if (ELF_ST_BIND (isym->st_info) != STB_LOCAL)
-	    {
-	      *ppsection = NULL;
-	      continue;
-	    }
-	}
-
-      if (isym->st_shndx == SHN_UNDEF)
-	isec = bfd_und_section_ptr;
-      else if (isym->st_shndx > 0 && isym->st_shndx < SHN_LORESERVE)
-	isec = section_from_elf_index (input_bfd, isym->st_shndx);
-      else if (isym->st_shndx == SHN_ABS)
-	isec = bfd_abs_section_ptr;
-      else if (isym->st_shndx == SHN_COMMON)
-	isec = bfd_com_section_ptr;
-      else
-	{
-	  /* Who knows?  */
-	  isec = NULL;
-	}
-
-      *ppsection = isec;
-
-      /* Don't output the first, undefined, symbol.  */
-      if (esym == external_syms)
-	continue;
-
-      /* If we are stripping all symbols, we don't want to output this
-	 one.  */
-      if (finfo->info->strip == strip_all)
-	continue;
-
-      /* We never output section symbols.  Instead, we use the section
-	 symbol of the corresponding section in the output file.  */
-      if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
-	continue;
-
-      /* If we are discarding all local symbols, we don't want to
-	 output this one.  If we are generating a relocateable output
-	 file, then some of the local symbols may be required by
-	 relocs; we output them below as we discover that they are
-	 needed.  */
-      if (finfo->info->discard == discard_all)
-	continue;
-
-      /* If this symbol is defined in a section which we are
-         discarding, we don't need to keep it, but note that
-         linker_mark is only reliable for sections that have contents.
-         For the benefit of the MIPS ELF linker, we check SEC_EXCLUDE
-         as well as linker_mark.  */
-      if (isym->st_shndx > 0
-	  && isym->st_shndx < SHN_LORESERVE
-	  && isec != NULL
-	  && ((! isec->linker_mark && (isec->flags & SEC_HAS_CONTENTS) != 0)
-	      || (! finfo->info->relocateable
-		  && (isec->flags & SEC_EXCLUDE) != 0)))
-	continue;
-
-      /* Get the name of the symbol.  */
-      name = bfd_elf_string_from_elf_section (input_bfd, symtab_hdr->sh_link,
-					      isym->st_name);
-      if (name == NULL)
-	return false;
-
-      /* See if we are discarding symbols with this name.  */
-      if ((finfo->info->strip == strip_some
-	   && (bfd_hash_lookup (finfo->info->keep_hash, name, false, false)
-	       == NULL))
-	  || (finfo->info->discard == discard_l
-	      && bfd_is_local_label_name (input_bfd, name)))
-	continue;
-
-      /* If we get here, we are going to output this symbol.  */
-
-      osym = *isym;
-
-      /* Adjust the section index for the output file.  */
-      osym.st_shndx = _bfd_elf_section_from_bfd_section (output_bfd,
-							 isec->output_section);
-      if (osym.st_shndx == (unsigned short) -1)
-	return false;
-
-      *pindex = bfd_get_symcount (output_bfd);
-
-      /* ELF symbols in relocateable files are section relative, but
-	 in executable files they are virtual addresses.  Note that
-	 this code assumes that all ELF sections have an associated
-	 BFD section with a reasonable value for output_offset; below
-	 we assume that they also have a reasonable value for
-	 output_section.  Any special sections must be set up to meet
-	 these requirements.  */
-      osym.st_value += isec->output_offset;
-      if (! finfo->info->relocateable)
-	osym.st_value += isec->output_section->vma;
-
-      if (! elf_link_output_sym (finfo, name, &osym, isec))
-	return false;
-    }
-
-  /* Relocate the contents of each section.  */
-  for (o = input_bfd->sections; o != NULL; o = o->next)
-    {
-      bfd_byte *contents;
-
-      if (! o->linker_mark)
-	{
-	  /* This section was omitted from the link.  */
-	  continue;
-	}
-
-      if ((o->flags & SEC_HAS_CONTENTS) == 0
-	  || (o->_raw_size == 0 && (o->flags & SEC_RELOC) == 0))
-	continue;
-
-      if ((o->flags & SEC_LINKER_CREATED) != 0)
-	{
-	  /* Section was created by elf_link_create_dynamic_sections
-	     or somesuch.  */
-	  continue;
-	}
-
-      /* Get the contents of the section.  They have been cached by a
-         relaxation routine.  Note that o is a section in an input
-         file, so the contents field will not have been set by any of
-         the routines which work on output files.  */
-      if (elf_section_data (o)->this_hdr.contents != NULL)
-	contents = elf_section_data (o)->this_hdr.contents;
-      else
-	{
-	  contents = finfo->contents;
-	  if (! bfd_get_section_contents (input_bfd, o, contents,
-					  (file_ptr) 0, o->_raw_size))
-	    return false;
-	}
-
-      if ((o->flags & SEC_RELOC) != 0)
-	{
-	  Elf_Internal_Rela *internal_relocs;
-
-	  /* Get the swapped relocs.  */
-	  internal_relocs = (NAME(_bfd_elf,link_read_relocs)
-			     (input_bfd, o, finfo->external_relocs,
-			      finfo->internal_relocs, false));
-	  if (internal_relocs == NULL
-	      && o->reloc_count > 0)
-	    return false;
-
-	  /* Relocate the section by invoking a back end routine.
-
-	     The back end routine is responsible for adjusting the
-	     section contents as necessary, and (if using Rela relocs
-	     and generating a relocateable output file) adjusting the
-	     reloc addend as necessary.
-
-	     The back end routine does not have to worry about setting
-	     the reloc address or the reloc symbol index.
-
-	     The back end routine is given a pointer to the swapped in
-	     internal symbols, and can access the hash table entries
-	     for the external symbols via elf_sym_hashes (input_bfd).
-
-	     When generating relocateable output, the back end routine
-	     must handle STB_LOCAL/STT_SECTION symbols specially.  The
-	     output symbol is going to be a section symbol
-	     corresponding to the output section, which will require
-	     the addend to be adjusted.  */
-
-	  if (! (*relocate_section) (output_bfd, finfo->info,
-				     input_bfd, o, contents,
-				     internal_relocs,
-				     finfo->internal_syms,
-				     finfo->sections))
-	    return false;
-
-	  if (finfo->info->relocateable)
-	    {
-	      Elf_Internal_Rela *irela;
-	      Elf_Internal_Rela *irelaend;
-	      struct elf_link_hash_entry **rel_hash;
-	      Elf_Internal_Shdr *input_rel_hdr;
-	      Elf_Internal_Shdr *output_rel_hdr;
-
-	      /* Adjust the reloc addresses and symbol indices.  */
-
-	      irela = internal_relocs;
-	      irelaend = irela + o->reloc_count;
-	      rel_hash = (elf_section_data (o->output_section)->rel_hashes
-			  + o->output_section->reloc_count);
-	      for (; irela < irelaend; irela++, rel_hash++)
-		{
-		  unsigned long r_symndx;
-		  Elf_Internal_Sym *isym;
-		  asection *sec;
-
-		  irela->r_offset += o->output_offset;
-
-		  r_symndx = ELF_R_SYM (irela->r_info);
-
-		  if (r_symndx == 0)
-		    continue;
-
-		  if (r_symndx >= locsymcount
-		      || (elf_bad_symtab (input_bfd)
-			  && finfo->sections[r_symndx] == NULL))
-		    {
-		      struct elf_link_hash_entry *rh;
-		      long indx;
-
-		      /* This is a reloc against a global symbol.  We
-			 have not yet output all the local symbols, so
-			 we do not know the symbol index of any global
-			 symbol.  We set the rel_hash entry for this
-			 reloc to point to the global hash table entry
-			 for this symbol.  The symbol index is then
-			 set at the end of elf_bfd_final_link.  */
-		      indx = r_symndx - extsymoff;
-		      rh = elf_sym_hashes (input_bfd)[indx];
-		      while (rh->root.type == bfd_link_hash_indirect
-			     || rh->root.type == bfd_link_hash_warning)
-			rh = (struct elf_link_hash_entry *) rh->root.u.i.link;
-
-		      /* Setting the index to -2 tells
-			 elf_link_output_extsym that this symbol is
-			 used by a reloc.  */
-		      BFD_ASSERT (rh->indx < 0);
-		      rh->indx = -2;
-
-		      *rel_hash = rh;
-
-		      continue;
-		    }
-
-		  /* This is a reloc against a local symbol. */
-
-		  *rel_hash = NULL;
-		  isym = finfo->internal_syms + r_symndx;
-		  sec = finfo->sections[r_symndx];
-		  if (ELF_ST_TYPE (isym->st_info) == STT_SECTION)
-		    {
-		      /* I suppose the backend ought to fill in the
-			 section of any STT_SECTION symbol against a
-			 processor specific section.  If we have
-			 discarded a section, the output_section will
-			 be the absolute section.  */
-		      if (sec != NULL
-			  && (bfd_is_abs_section (sec)
-			      || (sec->output_section != NULL
-				  && bfd_is_abs_section (sec->output_section))))
-			r_symndx = 0;
-		      else if (sec == NULL || sec->owner == NULL)
-			{
-			  bfd_set_error (bfd_error_bad_value);
-			  return false;
-			}
-		      else
-			{
-			  r_symndx = sec->output_section->target_index;
-			  BFD_ASSERT (r_symndx != 0);
-			}
-		    }
-		  else
-		    {
-		      if (finfo->indices[r_symndx] == -1)
-			{
-			  unsigned long link;
-			  const char *name;
-			  asection *osec;
-
-			  if (finfo->info->strip == strip_all)
-			    {
-			      /* You can't do ld -r -s.  */
-			      bfd_set_error (bfd_error_invalid_operation);
-			      return false;
-			    }
-
-			  /* This symbol was skipped earlier, but
-			     since it is needed by a reloc, we
-			     must output it now.  */
-			  link = symtab_hdr->sh_link;
-			  name = bfd_elf_string_from_elf_section (input_bfd,
-								  link,
-								  isym->st_name);
-			  if (name == NULL)
-			    return false;
-
-			  osec = sec->output_section;
-			  isym->st_shndx =
-			    _bfd_elf_section_from_bfd_section (output_bfd,
-							       osec);
-			  if (isym->st_shndx == (unsigned short) -1)
-			    return false;
-
-			  isym->st_value += sec->output_offset;
-			  if (! finfo->info->relocateable)
-			    isym->st_value += osec->vma;
-
-			  finfo->indices[r_symndx] = bfd_get_symcount (output_bfd);
-
-			  if (! elf_link_output_sym (finfo, name, isym, sec))
-			    return false;
-			}
-
-		      r_symndx = finfo->indices[r_symndx];
-		    }
-
-		  irela->r_info = ELF_R_INFO (r_symndx,
-					      ELF_R_TYPE (irela->r_info));
-		}
-
-	      /* Swap out the relocs.  */
-	      input_rel_hdr = &elf_section_data (o)->rel_hdr;
-	      output_rel_hdr = &elf_section_data (o->output_section)->rel_hdr;
-	      BFD_ASSERT (output_rel_hdr->sh_entsize
-			  == input_rel_hdr->sh_entsize);
-	      irela = internal_relocs;
-	      irelaend = irela + o->reloc_count;
-	      if (input_rel_hdr->sh_entsize == sizeof (Elf_External_Rel))
-		{
-		  Elf_External_Rel *erel;
-
-		  erel = ((Elf_External_Rel *) output_rel_hdr->contents
-			  + o->output_section->reloc_count);
-		  for (; irela < irelaend; irela++, erel++)
-		    {
-		      Elf_Internal_Rel irel;
-
-		      irel.r_offset = irela->r_offset;
-		      irel.r_info = irela->r_info;
-		      BFD_ASSERT (irela->r_addend == 0);
-		      elf_swap_reloc_out (output_bfd, &irel, erel);
-		    }
-		}
-	      else
-		{
-		  Elf_External_Rela *erela;
-
-		  BFD_ASSERT (input_rel_hdr->sh_entsize
-			      == sizeof (Elf_External_Rela));
-		  erela = ((Elf_External_Rela *) output_rel_hdr->contents
-			   + o->output_section->reloc_count);
-		  for (; irela < irelaend; irela++, erela++)
-		    elf_swap_reloca_out (output_bfd, irela, erela);
-		}
-
-	      o->output_section->reloc_count += o->reloc_count;
-	    }
-	}
-
-      /* Write out the modified section contents.  */
-      if (elf_section_data (o)->stab_info == NULL)
-	{
-	  if (! (o->flags & SEC_EXCLUDE) &&
-	      ! bfd_set_section_contents (output_bfd, o->output_section,
-					  contents, o->output_offset,
-					  (o->_cooked_size != 0
-					   ? o->_cooked_size
-					   : o->_raw_size)))
-	    return false;
-	}
-      else
-	{
-	  if (! (_bfd_write_section_stabs
-		 (output_bfd, &elf_hash_table (finfo->info)->stab_info,
-		  o, &elf_section_data (o)->stab_info, contents)))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-/* Generate a reloc when linking an ELF file.  This is a reloc
-   requested by the linker, and does come from any input file.  This
-   is used to build constructor and destructor tables when linking
-   with -Ur.  */
-
-static boolean
-elf_reloc_link_order (output_bfd, info, output_section, link_order)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     asection *output_section;
-     struct bfd_link_order *link_order;
-{
-  reloc_howto_type *howto;
-  long indx;
-  bfd_vma offset;
-  bfd_vma addend;
-  struct elf_link_hash_entry **rel_hash_ptr;
-  Elf_Internal_Shdr *rel_hdr;
-
-  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
-  if (howto == NULL)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  addend = link_order->u.reloc.p->addend;
-
-  /* Figure out the symbol index.  */
-  rel_hash_ptr = (elf_section_data (output_section)->rel_hashes
-		  + output_section->reloc_count);
-  if (link_order->type == bfd_section_reloc_link_order)
-    {
-      indx = link_order->u.reloc.p->u.section->target_index;
-      BFD_ASSERT (indx != 0);
-      *rel_hash_ptr = NULL;
-    }
-  else
-    {
-      struct elf_link_hash_entry *h;
-
-      /* Treat a reloc against a defined symbol as though it were
-         actually against the section.  */
-      h = ((struct elf_link_hash_entry *)
-	   bfd_wrapped_link_hash_lookup (output_bfd, info,
-					 link_order->u.reloc.p->u.name,
-					 false, false, true));
-      if (h != NULL
-	  && (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak))
-	{
-	  asection *section;
-
-	  section = h->root.u.def.section;
-	  indx = section->output_section->target_index;
-	  *rel_hash_ptr = NULL;
-	  /* It seems that we ought to add the symbol value to the
-             addend here, but in practice it has already been added
-             because it was passed to constructor_callback.  */
-	  addend += section->output_section->vma + section->output_offset;
-	}
-      else if (h != NULL)
-	{
-	  /* Setting the index to -2 tells elf_link_output_extsym that
-	     this symbol is used by a reloc.  */
-	  h->indx = -2;
-	  *rel_hash_ptr = h;
-	  indx = 0;
-	}
-      else
-	{
-	  if (! ((*info->callbacks->unattached_reloc)
-		 (info, link_order->u.reloc.p->u.name, (bfd *) NULL,
-		  (asection *) NULL, (bfd_vma) 0)))
-	    return false;
-	  indx = 0;
-	}
-    }
-
-  /* If this is an inplace reloc, we must write the addend into the
-     object file.  */
-  if (howto->partial_inplace && addend != 0)
-    {
-      bfd_size_type size;
-      bfd_reloc_status_type rstat;
-      bfd_byte *buf;
-      boolean ok;
-
-      size = bfd_get_reloc_size (howto);
-      buf = (bfd_byte *) bfd_zmalloc (size);
-      if (buf == (bfd_byte *) NULL)
-	return false;
-      rstat = _bfd_relocate_contents (howto, output_bfd, addend, buf);
-      switch (rstat)
-	{
-	case bfd_reloc_ok:
-	  break;
-	default:
-	case bfd_reloc_outofrange:
-	  abort ();
-	case bfd_reloc_overflow:
-	  if (! ((*info->callbacks->reloc_overflow)
-		 (info,
-		  (link_order->type == bfd_section_reloc_link_order
-		   ? bfd_section_name (output_bfd,
-				       link_order->u.reloc.p->u.section)
-		   : link_order->u.reloc.p->u.name),
-		  howto->name, addend, (bfd *) NULL, (asection *) NULL,
-		  (bfd_vma) 0)))
-	    {
-	      free (buf);
-	      return false;
-	    }
-	  break;
-	}
-      ok = bfd_set_section_contents (output_bfd, output_section, (PTR) buf,
-				     (file_ptr) link_order->offset, size);
-      free (buf);
-      if (! ok)
-	return false;
-    }
-
-  /* The address of a reloc is relative to the section in a
-     relocateable file, and is a virtual address in an executable
-     file.  */
-  offset = link_order->offset;
-  if (! info->relocateable)
-    offset += output_section->vma;
-
-  rel_hdr = &elf_section_data (output_section)->rel_hdr;
-
-  if (rel_hdr->sh_type == SHT_REL)
-    {
-      Elf_Internal_Rel irel;
-      Elf_External_Rel *erel;
-
-      irel.r_offset = offset;
-      irel.r_info = ELF_R_INFO (indx, howto->type);
-      erel = ((Elf_External_Rel *) rel_hdr->contents
-	      + output_section->reloc_count);
-      elf_swap_reloc_out (output_bfd, &irel, erel);
-    }
-  else
-    {
-      Elf_Internal_Rela irela;
-      Elf_External_Rela *erela;
-
-      irela.r_offset = offset;
-      irela.r_info = ELF_R_INFO (indx, howto->type);
-      irela.r_addend = addend;
-      erela = ((Elf_External_Rela *) rel_hdr->contents
-	       + output_section->reloc_count);
-      elf_swap_reloca_out (output_bfd, &irela, erela);
-    }
-
-  ++output_section->reloc_count;
-
-  return true;
-}
-
-
-/* Allocate a pointer to live in a linker created section.  */
-
-boolean
-elf_create_pointer_linker_section (abfd, info, lsect, h, rel)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     elf_linker_section_t *lsect;
-     struct elf_link_hash_entry *h;
-     const Elf_Internal_Rela *rel;
-{
-  elf_linker_section_pointers_t **ptr_linker_section_ptr = NULL;
-  elf_linker_section_pointers_t *linker_section_ptr;
-  unsigned long r_symndx = ELF_R_SYM (rel->r_info);;
-
-  BFD_ASSERT (lsect != NULL);
-
-  /* Is this a global symbol? */
-  if (h != NULL)
-    {
-      /* Has this symbol already been allocated, if so, our work is done */
-      if (_bfd_elf_find_pointer_linker_section (h->linker_section_pointer,
-						rel->r_addend,
-						lsect->which))
-	return true;
-
-      ptr_linker_section_ptr = &h->linker_section_pointer;
-      /* Make sure this symbol is output as a dynamic symbol.  */
-      if (h->dynindx == -1)
-	{
-	  if (! elf_link_record_dynamic_symbol (info, h))
-	    return false;
-	}
-
-      if (lsect->rel_section)
-	lsect->rel_section->_raw_size += sizeof (Elf_External_Rela);
-    }
-
-  else  /* Allocation of a pointer to a local symbol */
-    {
-      elf_linker_section_pointers_t **ptr = elf_local_ptr_offsets (abfd);
-
-      /* Allocate a table to hold the local symbols if first time */
-      if (!ptr)
-	{
-	  unsigned int num_symbols = elf_tdata (abfd)->symtab_hdr.sh_info;
-	  register unsigned int i;
-
-	  ptr = (elf_linker_section_pointers_t **)
-	    bfd_alloc (abfd, num_symbols * sizeof (elf_linker_section_pointers_t *));
-
-	  if (!ptr)
-	    return false;
-
-	  elf_local_ptr_offsets (abfd) = ptr;
-	  for (i = 0; i < num_symbols; i++)
-	    ptr[i] = (elf_linker_section_pointers_t *)0;
-	}
-
-      /* Has this symbol already been allocated, if so, our work is done */
-      if (_bfd_elf_find_pointer_linker_section (ptr[r_symndx],
-						rel->r_addend,
-						lsect->which))
-	return true;
-
-      ptr_linker_section_ptr = &ptr[r_symndx];
-
-      if (info->shared)
-	{
-	  /* If we are generating a shared object, we need to
-	     output a R_<xxx>_RELATIVE reloc so that the
-	     dynamic linker can adjust this GOT entry.  */
-	  BFD_ASSERT (lsect->rel_section != NULL);
-	  lsect->rel_section->_raw_size += sizeof (Elf_External_Rela);
-	}
-    }
-
-  /* Allocate space for a pointer in the linker section, and allocate a new pointer record
-     from internal memory.  */
-  BFD_ASSERT (ptr_linker_section_ptr != NULL);
-  linker_section_ptr = (elf_linker_section_pointers_t *)
-    bfd_alloc (abfd, sizeof (elf_linker_section_pointers_t));
-
-  if (!linker_section_ptr)
-    return false;
-
-  linker_section_ptr->next = *ptr_linker_section_ptr;
-  linker_section_ptr->addend = rel->r_addend;
-  linker_section_ptr->which = lsect->which;
-  linker_section_ptr->written_address_p = false;
-  *ptr_linker_section_ptr = linker_section_ptr;
-
-#if 0
-  if (lsect->hole_size && lsect->hole_offset < lsect->max_hole_offset)
-    {
-      linker_section_ptr->offset = lsect->section->_raw_size - lsect->hole_size + (ARCH_SIZE / 8);
-      lsect->hole_offset += ARCH_SIZE / 8;
-      lsect->sym_offset  += ARCH_SIZE / 8;
-      if (lsect->sym_hash)	/* Bump up symbol value if needed */
-	{
-	  lsect->sym_hash->root.u.def.value += ARCH_SIZE / 8;
-#ifdef DEBUG
-	  fprintf (stderr, "Bump up %s by %ld, current value = %ld\n",
-		   lsect->sym_hash->root.root.string,
-		   (long)ARCH_SIZE / 8,
-		   (long)lsect->sym_hash->root.u.def.value);
-#endif
-	}
-    }
-  else
-#endif
-    linker_section_ptr->offset = lsect->section->_raw_size;
-
-  lsect->section->_raw_size += ARCH_SIZE / 8;
-
-#ifdef DEBUG
-  fprintf (stderr, "Create pointer in linker section %s, offset = %ld, section size = %ld\n",
-	   lsect->name, (long)linker_section_ptr->offset, (long)lsect->section->_raw_size);
-#endif
-
-  return true;
-}
-
-
-#if ARCH_SIZE==64
-#define bfd_put_ptr(BFD,VAL,ADDR) bfd_put_64 (BFD, VAL, ADDR)
-#endif
-#if ARCH_SIZE==32
-#define bfd_put_ptr(BFD,VAL,ADDR) bfd_put_32 (BFD, VAL, ADDR)
-#endif
-
-/* Fill in the address for a pointer generated in alinker section.  */
-
-bfd_vma
-elf_finish_pointer_linker_section (output_bfd, input_bfd, info, lsect, h, relocation, rel, relative_reloc)
-     bfd *output_bfd;
-     bfd *input_bfd;
-     struct bfd_link_info *info;
-     elf_linker_section_t *lsect;
-     struct elf_link_hash_entry *h;
-     bfd_vma relocation;
-     const Elf_Internal_Rela *rel;
-     int relative_reloc;
-{
-  elf_linker_section_pointers_t *linker_section_ptr;
-
-  BFD_ASSERT (lsect != NULL);
-
-  if (h != NULL)		/* global symbol */
-    {
-      linker_section_ptr = _bfd_elf_find_pointer_linker_section (h->linker_section_pointer,
-								 rel->r_addend,
-								 lsect->which);
-
-      BFD_ASSERT (linker_section_ptr != NULL);
-
-      if (! elf_hash_table (info)->dynamic_sections_created
-	  || (info->shared
-	      && info->symbolic
-	      && (h->elf_link_hash_flags & ELF_LINK_HASH_DEF_REGULAR)))
-	{
-	  /* This is actually a static link, or it is a
-	     -Bsymbolic link and the symbol is defined
-	     locally.  We must initialize this entry in the
-	     global section.
-
-	     When doing a dynamic link, we create a .rela.<xxx>
-	     relocation entry to initialize the value.  This
-	     is done in the finish_dynamic_symbol routine.  */
-	  if (!linker_section_ptr->written_address_p)
-	    {
-	      linker_section_ptr->written_address_p = true;
-	      bfd_put_ptr (output_bfd, relocation + linker_section_ptr->addend,
-			  lsect->section->contents + linker_section_ptr->offset);
-	    }
-	}
-    }
-  else				/* local symbol */
-    {
-      unsigned long r_symndx = ELF_R_SYM (rel->r_info);
-      BFD_ASSERT (elf_local_ptr_offsets (input_bfd) != NULL);
-      BFD_ASSERT (elf_local_ptr_offsets (input_bfd)[r_symndx] != NULL);
-      linker_section_ptr = _bfd_elf_find_pointer_linker_section (elf_local_ptr_offsets (input_bfd)[r_symndx],
-								 rel->r_addend,
-								 lsect->which);
-
-      BFD_ASSERT (linker_section_ptr != NULL);
-
-      /* Write out pointer if it hasn't been rewritten out before */
-      if (!linker_section_ptr->written_address_p)
-	{
-	  linker_section_ptr->written_address_p = true;
-	  bfd_put_ptr (output_bfd, relocation + linker_section_ptr->addend,
-		       lsect->section->contents + linker_section_ptr->offset);
-
-	  if (info->shared)
-	    {
-	      asection *srel = lsect->rel_section;
-	      Elf_Internal_Rela outrel;
-
-	      /* We need to generate a relative reloc for the dynamic linker.  */
-	      if (!srel)
-		lsect->rel_section = srel = bfd_get_section_by_name (elf_hash_table (info)->dynobj,
-								     lsect->rel_name);
-
-	      BFD_ASSERT (srel != NULL);
-
-	      outrel.r_offset = (lsect->section->output_section->vma
-				 + lsect->section->output_offset
-				 + linker_section_ptr->offset);
-	      outrel.r_info = ELF_R_INFO (0, relative_reloc);
-	      outrel.r_addend = 0;
-	      elf_swap_reloca_out (output_bfd, &outrel,
-				   (((Elf_External_Rela *)
-				     lsect->section->contents)
-				    + lsect->section->reloc_count));
-	      ++lsect->section->reloc_count;
-	    }
-	}
-    }
-
-  relocation = (lsect->section->output_offset
-		+ linker_section_ptr->offset
-		- lsect->hole_offset
-		- lsect->sym_offset);
-
-#ifdef DEBUG
-  fprintf (stderr, "Finish pointer in linker section %s, offset = %ld (0x%lx)\n",
-	   lsect->name, (long)relocation, (long)relocation);
-#endif
-
-  /* Subtract out the addend, because it will get added back in by the normal
-     processing.  */
-  return relocation - linker_section_ptr->addend;
-}
-
-/* Garbage collect unused sections.  */
-
-static boolean elf_gc_mark
-  PARAMS ((struct bfd_link_info *info, asection *sec,
-	   asection * (*gc_mark_hook)
-	     PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Rela *,
-		      struct elf_link_hash_entry *, Elf_Internal_Sym *))));
-
-static boolean elf_gc_sweep
-  PARAMS ((struct bfd_link_info *info,
-	   boolean (*gc_sweep_hook)
-	     PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *o,
-		      const Elf_Internal_Rela *relocs))));
-
-static boolean elf_gc_sweep_symbol
-  PARAMS ((struct elf_link_hash_entry *h, PTR idxptr));
-
-static boolean elf_gc_allocate_got_offsets
-  PARAMS ((struct elf_link_hash_entry *h, PTR offarg));
-
-static boolean elf_gc_propagate_vtable_entries_used
-  PARAMS ((struct elf_link_hash_entry *h, PTR dummy));
-
-static boolean elf_gc_smash_unused_vtentry_relocs
-  PARAMS ((struct elf_link_hash_entry *h, PTR dummy));
-
-/* The mark phase of garbage collection.  For a given section, mark
-   it, and all the sections which define symbols to which it refers.  */
-
-static boolean
-elf_gc_mark (info, sec, gc_mark_hook)
-     struct bfd_link_info *info;
-     asection *sec;
-     asection * (*gc_mark_hook)
-       PARAMS ((bfd *, struct bfd_link_info *, Elf_Internal_Rela *,
-		struct elf_link_hash_entry *, Elf_Internal_Sym *));
-{
-  boolean ret = true;
-
-  sec->gc_mark = 1;
-
-  /* Look through the section relocs.  */
-
-  if ((sec->flags & SEC_RELOC) != 0 && sec->reloc_count > 0)
-    {
-      Elf_Internal_Rela *relstart, *rel, *relend;
-      Elf_Internal_Shdr *symtab_hdr;
-      struct elf_link_hash_entry **sym_hashes;
-      size_t nlocsyms;
-      size_t extsymoff;
-      Elf_External_Sym *locsyms, *freesyms = NULL;
-      bfd *input_bfd = sec->owner;
-
-      /* GCFIXME: how to arrange so that relocs and symbols are not
-	 reread continually?  */
-
-      symtab_hdr = &elf_tdata (input_bfd)->symtab_hdr;
-      sym_hashes = elf_sym_hashes (input_bfd);
-
-      /* Read the local symbols.  */
-      if (elf_bad_symtab (input_bfd))
-	{
-	  nlocsyms = symtab_hdr->sh_size / sizeof (Elf_External_Sym);
-          extsymoff = 0;
-	}
-      else
-	extsymoff = nlocsyms = symtab_hdr->sh_info;
-      if (symtab_hdr->contents)
-	locsyms = (Elf_External_Sym *) symtab_hdr->contents;
-      else if (nlocsyms == 0)
-	locsyms = NULL;
-      else
-	{
-	  locsyms = freesyms =
-	    bfd_malloc (nlocsyms * sizeof (Elf_External_Sym));
-	  if (freesyms == NULL
-	      || bfd_seek (input_bfd, symtab_hdr->sh_offset, SEEK_SET) != 0
-	      || (bfd_read (locsyms, sizeof (Elf_External_Sym),
-			    nlocsyms, input_bfd)
-		  != nlocsyms * sizeof (Elf_External_Sym)))
-	    {
-	      ret = false;
-	      goto out1;
-	    }
-	}
-
-      /* Read the relocations.  */
-      relstart = (NAME(_bfd_elf,link_read_relocs)
-		  (sec->owner, sec, NULL, (Elf_Internal_Rela *) NULL,
-		   info->keep_memory));
-      if (relstart == NULL)
-	{
-	  ret = false;
-	  goto out1;
-	}
-      relend = relstart + sec->reloc_count;
-
-      for (rel = relstart; rel < relend; rel++)
-	{
-	  unsigned long r_symndx;
-	  asection *rsec;
-	  struct elf_link_hash_entry *h;
-	  Elf_Internal_Sym s;
-
-	  r_symndx = ELF_R_SYM (rel->r_info);
-	  if (r_symndx == 0)
-	    continue;
-
-	  if (elf_bad_symtab (sec->owner))
-	    {
-	      elf_swap_symbol_in (input_bfd, &locsyms[r_symndx], &s);
-	      if (ELF_ST_BIND (s.st_info) == STB_LOCAL)
-	        rsec = (*gc_mark_hook)(sec->owner, info, rel, NULL, &s);
-	      else
-		{
-	          h = sym_hashes[r_symndx - extsymoff];
-	          rsec = (*gc_mark_hook)(sec->owner, info, rel, h, NULL);
-		}
-	    }
-	  else if (r_symndx >= nlocsyms)
-	    {
-	      h = sym_hashes[r_symndx - extsymoff];
-	      rsec = (*gc_mark_hook)(sec->owner, info, rel, h, NULL);
-	    }
-	  else
-	    {
-	      elf_swap_symbol_in (input_bfd, &locsyms[r_symndx], &s);
-	      rsec = (*gc_mark_hook)(sec->owner, info, rel, NULL, &s);
-	    }
-
-	  if (rsec && !rsec->gc_mark)
-	    if (!elf_gc_mark (info, rsec, gc_mark_hook))
-	      {
-		ret = false;
-		goto out2;
-	      }
-	}
-
-    out2:
-      if (!info->keep_memory)
-	free (relstart);
-    out1:
-      if (freesyms)
-	free (freesyms);
-    }
-
-  return ret;
-}
-
-/* The sweep phase of garbage collection.  Remove all garbage sections.  */
-
-static boolean
-elf_gc_sweep (info, gc_sweep_hook)
-     struct bfd_link_info *info;
-     boolean (*gc_sweep_hook)
-       PARAMS ((bfd *abfd, struct bfd_link_info *info, asection *o,
-		const Elf_Internal_Rela *relocs));
-{
-  bfd *sub;
-
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      asection *o;
-
-      for (o = sub->sections; o != NULL; o = o->next)
-	{
-	  /* Keep special sections.  Keep .debug sections.  */
-	  if ((o->flags & SEC_LINKER_CREATED)
-	      || (o->flags & SEC_DEBUGGING))
-	    o->gc_mark = 1;
-
-	  if (o->gc_mark)
-	    continue;
-
-	  /* Skip sweeping sections already excluded.  */
-	  if (o->flags & SEC_EXCLUDE)
-	    continue;
-
-	  /* Since this is early in the link process, it is simple
-	     to remove a section from the output.  */
-	  o->flags |= SEC_EXCLUDE;
-
-	  /* But we also have to update some of the relocation
-	     info we collected before.  */
-	  if (gc_sweep_hook
-	      && (o->flags & SEC_RELOC) && o->reloc_count > 0)
-	    {
-	      Elf_Internal_Rela *internal_relocs;
-	      boolean r;
-
-	      internal_relocs = (NAME(_bfd_elf,link_read_relocs)
-				 (o->owner, o, NULL, NULL, info->keep_memory));
-	      if (internal_relocs == NULL)
-		return false;
-
-	      r = (*gc_sweep_hook)(o->owner, info, o, internal_relocs);
-
-	      if (!info->keep_memory)
-		free (internal_relocs);
-
-	      if (!r)
-		return false;
-	    }
-	}
-    }
-
-  /* Remove the symbols that were in the swept sections from the dynamic
-     symbol table.  GCFIXME: Anyone know how to get them out of the
-     static symbol table as well?  */
-  {
-    int i = 0;
-
-    elf_link_hash_traverse (elf_hash_table (info),
-			    elf_gc_sweep_symbol,
-			    (PTR) &i);
-
-    elf_hash_table (info)->dynsymcount = i;
-  }
-
-  return true;
-}
-
-/* Sweep symbols in swept sections.  Called via elf_link_hash_traverse.  */
-
-static boolean
-elf_gc_sweep_symbol (h, idxptr)
-     struct elf_link_hash_entry *h;
-     PTR idxptr;
-{
-  int *idx = (int *) idxptr;
-
-  if (h->dynindx != -1
-      && ((h->root.type != bfd_link_hash_defined
-	   && h->root.type != bfd_link_hash_defweak)
-	  || h->root.u.def.section->gc_mark))
-    h->dynindx = (*idx)++;
-
-  return true;
-}
-
-/* Propogate collected vtable information.  This is called through
-   elf_link_hash_traverse.  */
-
-static boolean
-elf_gc_propagate_vtable_entries_used (h, okp)
-     struct elf_link_hash_entry *h;
-     PTR okp;
-{
-  /* Those that are not vtables. */
-  if (h->vtable_parent == NULL)
-    return true;
-
-  /* Those vtables that do not have parents, we cannot merge.  */
-  if (h->vtable_parent == (struct elf_link_hash_entry *) -1)
-    return true;
-
-  /* If we've already been done, exit.  */
-  if (h->vtable_entries_used && h->vtable_entries_used[-1])
-    return true;
-
-  /* Make sure the parent's table is up to date.  */
-  elf_gc_propagate_vtable_entries_used (h->vtable_parent, okp);
-
-  if (h->vtable_entries_used == NULL)
-    {
-      /* None of this table's entries were referenced.  Re-use the
-	 parent's table.  */
-      h->vtable_entries_used = h->vtable_parent->vtable_entries_used;
-      h->vtable_entries_size = h->vtable_parent->vtable_entries_size;
-    }
-  else
-    {
-      size_t n;
-      boolean *cu, *pu;
-
-      /* Or the parent's entries into ours.  */
-      cu = h->vtable_entries_used;
-      cu[-1] = true;
-      pu = h->vtable_parent->vtable_entries_used;
-      if (pu != NULL)
-	{
-	  n = h->vtable_parent->vtable_entries_size / FILE_ALIGN;
-	  while (--n != 0)
-	    {
-	      if (*pu) *cu = true;
-	      pu++, cu++;
-	    }
-	}
-    }
-
-  return true;
-}
-
-static boolean
-elf_gc_smash_unused_vtentry_relocs (h, okp)
-     struct elf_link_hash_entry *h;
-     PTR okp;
-{
-  asection *sec;
-  bfd_vma hstart, hend;
-  Elf_Internal_Rela *relstart, *relend, *rel;
-
-  /* Take care of both those symbols that do not describe vtables as
-     well as those that are not loaded.  */
-  if (h->vtable_parent == NULL)
-    return true;
-
-  BFD_ASSERT (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak);
-
-  sec = h->root.u.def.section;
-  hstart = h->root.u.def.value;
-  hend = hstart + h->size;
-
-  relstart = (NAME(_bfd_elf,link_read_relocs)
-	      (sec->owner, sec, NULL, (Elf_Internal_Rela *) NULL, true));
-  if (!relstart)
-    return *(boolean *)okp = false;
-  relend = relstart + sec->reloc_count;
-
-  for (rel = relstart; rel < relend; ++rel)
-    if (rel->r_offset >= hstart && rel->r_offset < hend)
-      {
-	/* If the entry is in use, do nothing.  */
-	if (h->vtable_entries_used
-	    && (rel->r_offset - hstart) < h->vtable_entries_size)
-	  {
-	    bfd_vma entry = (rel->r_offset - hstart) / FILE_ALIGN;
-	    if (h->vtable_entries_used[entry])
-	      continue;
-	  }
-	/* Otherwise, kill it.  */
-	rel->r_offset = rel->r_info = rel->r_addend = 0;
-      }
-
-  return true;
-}
-
-/* Do mark and sweep of unused sections.  */
-
-boolean
-elf_gc_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  boolean ok = true;
-  bfd *sub;
-  asection * (*gc_mark_hook)
-    PARAMS ((bfd *abfd, struct bfd_link_info *, Elf_Internal_Rela *,
-             struct elf_link_hash_entry *h, Elf_Internal_Sym *));
-
-  if (!get_elf_backend_data (abfd)->can_gc_sections
-      || info->relocateable
-      || elf_hash_table (info)->dynamic_sections_created)
-    return true;
-
-  /* Apply transitive closure to the vtable entry usage info.  */
-  elf_link_hash_traverse (elf_hash_table (info),
-			  elf_gc_propagate_vtable_entries_used,
-			  (PTR) &ok);
-  if (!ok)
-    return false;
-
-  /* Kill the vtable relocations that were not used.  */
-  elf_link_hash_traverse (elf_hash_table (info),
-			  elf_gc_smash_unused_vtentry_relocs,
-			  (PTR) &ok);
-  if (!ok)
-    return false;
-
-  /* Grovel through relocs to find out who stays ...  */
-
-  gc_mark_hook = get_elf_backend_data (abfd)->gc_mark_hook;
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      asection *o;
-      for (o = sub->sections; o != NULL; o = o->next)
-	{
-	  if (o->flags & SEC_KEEP)
-  	    if (!elf_gc_mark (info, o, gc_mark_hook))
-	      return false;
-	}
-    }
-
-  /* ... and mark SEC_EXCLUDE for those that go.  */
-  if (!elf_gc_sweep(info, get_elf_backend_data (abfd)->gc_sweep_hook))
-    return false;
-
-  return true;
-}
-
-/* Called from check_relocs to record the existance of a VTINHERIT reloc.  */
-
-boolean
-elf_gc_record_vtinherit (abfd, sec, h, offset)
-     bfd *abfd;
-     asection *sec;
-     struct elf_link_hash_entry *h;
-     bfd_vma offset;
-{
-  struct elf_link_hash_entry **sym_hashes, **sym_hashes_end;
-  struct elf_link_hash_entry **search, *child;
-  bfd_size_type extsymcount;
-
-  /* The sh_info field of the symtab header tells us where the
-     external symbols start.  We don't care about the local symbols at
-     this point.  */
-  extsymcount = elf_tdata (abfd)->symtab_hdr.sh_size/sizeof (Elf_External_Sym);
-  if (!elf_bad_symtab (abfd))
-    extsymcount -= elf_tdata (abfd)->symtab_hdr.sh_info;
-
-  sym_hashes = elf_sym_hashes (abfd);
-  sym_hashes_end = sym_hashes + extsymcount;
-
-  /* Hunt down the child symbol, which is in this section at the same
-     offset as the relocation.  */
-  for (search = sym_hashes; search != sym_hashes_end; ++search)
-    {
-      if ((child = *search) != NULL
-	  && (child->root.type == bfd_link_hash_defined
-	      || child->root.type == bfd_link_hash_defweak)
-	  && child->root.u.def.section == sec
-	  && child->root.u.def.value == offset)
-	goto win;
-    }
-
-  (*_bfd_error_handler) ("%s: %s+%lu: No symbol found for INHERIT",
-			 bfd_get_filename (abfd), sec->name,
-			 (unsigned long)offset);
-  bfd_set_error (bfd_error_invalid_operation);
-  return false;
-
-win:
-  if (!h)
-    {
-      /* This *should* only be the absolute section.  It could potentially
-	 be that someone has defined a non-global vtable though, which
-	 would be bad.  It isn't worth paging in the local symbols to be
-	 sure though; that case should simply be handled by the assembler.  */
-
-      child->vtable_parent = (struct elf_link_hash_entry *) -1;
-    }
-  else
-    child->vtable_parent = h;
-
-  return true;
-}
-
-/* Called from check_relocs to record the existance of a VTENTRY reloc.  */
-
-boolean
-elf_gc_record_vtentry (abfd, sec, h, addend)
-     bfd *abfd;
-     asection *sec;
-     struct elf_link_hash_entry *h;
-     bfd_vma addend;
-{
-  if (addend >= h->vtable_entries_size)
-    {
-      size_t size, bytes;
-      boolean *ptr = h->vtable_entries_used;
-
-      /* While the symbol is undefined, we have to be prepared to handle
-	 a zero size.  */
-      if (h->root.type == bfd_link_hash_undefined)
-	size = addend;
-      else
-	{
-	  size = h->size;
-	  if (size < addend)
-	    {
-	      /* Oops!  We've got a reference past the defined end of
-		 the table.  This is probably a bug -- shall we warn?  */
-	      size = addend;
-	    }
-	}
-
-      /* Allocate one extra entry for use as a "done" flag for the
-	 consolidation pass.  */
-      bytes = (size / FILE_ALIGN + 1) * sizeof(boolean);
-
-      if (ptr)
-	{
-	  size_t oldbytes;
-
-	  ptr = realloc (ptr-1, bytes);
-	  if (ptr == NULL)
-	    return false;
-
-	  oldbytes = (h->vtable_entries_size/FILE_ALIGN + 1) * sizeof(boolean);
-	  memset (ptr + oldbytes, 0, bytes - oldbytes);
-	}
-      else
-	{
-	  ptr = calloc (1, bytes);
-	  if (ptr == NULL)
-	    return false;
-	}
-
-      /* And arrange for that done flag to be at index -1.  */
-      h->vtable_entries_used = ptr+1;
-      h->vtable_entries_size = size;
-    }
-  h->vtable_entries_used[addend / FILE_ALIGN] = true;
-
-  return true;
-}
-
-/* And an accompanying bit to work out final got entry offsets once
-   we're done.  Should be called from final_link.  */
-
-boolean
-elf_gc_common_finalize_got_offsets (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd *i;
-  struct elf_backend_data *bed = get_elf_backend_data (abfd);
-  bfd_vma gotoff;
-
-  /* The GOT offset is relative to the .got section, but the GOT header is
-     put into the .got.plt section, if the backend uses it.  */
-  if (bed->want_got_plt)
-    gotoff = 0;
-  else
-    gotoff = bed->got_header_size;
-
-  /* Do the local .got entries first.  */
-  for (i = info->input_bfds; i; i = i->link_next)
-    {
-      bfd_signed_vma *local_got = elf_local_got_refcounts (i);
-      bfd_size_type j, locsymcount;
-      Elf_Internal_Shdr *symtab_hdr;
-
-      if (!local_got)
-	continue;
-
-      symtab_hdr = &elf_tdata (i)->symtab_hdr;
-      if (elf_bad_symtab (i))
-	locsymcount = symtab_hdr->sh_size / sizeof (Elf_External_Sym);
-      else
-	locsymcount = symtab_hdr->sh_info;
-
-      for (j = 0; j < locsymcount; ++j)
-	{
-	  if (local_got[j] > 0)
-	    {
-	      local_got[j] = gotoff;
-	      gotoff += ARCH_SIZE / 8;
-	    }
-	  else
-	    local_got[j] = (bfd_vma) -1;
-	}
-    }
-
-  /* Then the global .got and .plt entries.  */
-  elf_link_hash_traverse (elf_hash_table (info),
-			  elf_gc_allocate_got_offsets,
-			  (PTR) &gotoff);
-  return true;
-}
-
-/* We need a special top-level link routine to convert got reference counts
-   to real got offsets.  */
-
-static boolean
-elf_gc_allocate_got_offsets (h, offarg)
-     struct elf_link_hash_entry *h;
-     PTR offarg;
-{
-  bfd_vma *off = (bfd_vma *) offarg;
-
-  if (h->got.refcount > 0)
-    {
-      h->got.offset = off[0];
-      off[0] += ARCH_SIZE / 8;
-    }
-  else
-    h->got.offset = (bfd_vma) -1;
-
-  return true;
-}
-
-/* Many folk need no more in the way of final link than this, once
-   got entry reference counting is enabled.  */
-
-boolean
-elf_gc_common_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  if (!elf_gc_common_finalize_got_offsets (abfd, info))
-    return false;
-
-  /* Invoke the regular ELF backend linker to do all the work.  */
-  return elf_bfd_final_link (abfd, info);
-}
-
-/* This function will be called though elf_link_hash_traverse to store
-   all hash value of the exported symbols in an array.  */
-
-static boolean
-elf_collect_hash_codes (h, data)
-     struct elf_link_hash_entry *h;
-     PTR data;
-{
-  unsigned long **valuep = (unsigned long **) data;
-  const char *name;
-  char *p;
-  unsigned long ha;
-  char *alc = NULL;
-
-  /* Ignore indirect symbols.  These are added by the versioning code.  */
-  if (h->dynindx == -1)
-    return true;
-
-  name = h->root.root.string;
-  p = strchr (name, ELF_VER_CHR);
-  if (p != NULL)
-    {
-      alc = bfd_malloc (p - name + 1);
-      memcpy (alc, name, p - name);
-      alc[p - name] = '\0';
-      name = alc;
-    }
-
-  /* Compute the hash value.  */
-  ha = bfd_elf_hash (name);
-
-  /* Store the found hash value in the array given as the argument.  */
-  *(*valuep)++ = ha;
-
-  /* And store it in the struct so that we can put it in the hash table
-     later.  */
-  h->elf_hash_value = ha;
-
-  if (alc != NULL)
-    free (alc);
-
-  return true;
-}
diff --git a/bfd/elfxx-target.h b/bfd/elfxx-target.h
deleted file mode 100644
index 9acabd1e607..00000000000
--- a/bfd/elfxx-target.h
+++ /dev/null
@@ -1,536 +0,0 @@
-/* Target definitions for NN-bit ELF
-   Copyright 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This structure contains everything that BFD knows about a target.
-   It includes things like its byte order, name, what routines to call
-   to do various operations, etc.  Every BFD points to a target structure
-   with its "xvec" member.
-
-   There are two such structures here:  one for big-endian machines and
-   one for little-endian machines.   */
-
-#define	bfd_elfNN_close_and_cleanup _bfd_elf_close_and_cleanup
-#define bfd_elfNN_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#ifndef bfd_elfNN_get_section_contents
-#define bfd_elfNN_get_section_contents _bfd_generic_get_section_contents
-#endif
-
-#define bfd_elfNN_canonicalize_dynamic_symtab _bfd_elf_canonicalize_dynamic_symtab
-#define bfd_elfNN_canonicalize_reloc	_bfd_elf_canonicalize_reloc
-#ifndef bfd_elfNN_find_nearest_line
-#define bfd_elfNN_find_nearest_line	_bfd_elf_find_nearest_line
-#endif
-#define bfd_elfNN_read_minisymbols	_bfd_elf_read_minisymbols
-#define bfd_elfNN_minisymbol_to_symbol	_bfd_elf_minisymbol_to_symbol
-#define bfd_elfNN_get_dynamic_symtab_upper_bound _bfd_elf_get_dynamic_symtab_upper_bound
-#define bfd_elfNN_get_lineno		_bfd_elf_get_lineno
-#ifndef bfd_elfNN_get_reloc_upper_bound
-#define bfd_elfNN_get_reloc_upper_bound _bfd_elf_get_reloc_upper_bound
-#endif
-#define bfd_elfNN_get_symbol_info	_bfd_elf_get_symbol_info
-#define bfd_elfNN_get_symtab		_bfd_elf_get_symtab
-#define bfd_elfNN_get_symtab_upper_bound _bfd_elf_get_symtab_upper_bound
-#if 0 /* done in elf-bfd.h */
-#define bfd_elfNN_link_record_dynamic_symbol _bfd_elf_link_record_dynamic_symbol
-#endif
-#define bfd_elfNN_make_empty_symbol	_bfd_elf_make_empty_symbol
-#define bfd_elfNN_new_section_hook	_bfd_elf_new_section_hook
-#define bfd_elfNN_set_arch_mach		_bfd_elf_set_arch_mach
-#ifndef bfd_elfNN_set_section_contents
-#define bfd_elfNN_set_section_contents	_bfd_elf_set_section_contents
-#endif
-#define bfd_elfNN_sizeof_headers	_bfd_elf_sizeof_headers
-#define bfd_elfNN_write_object_contents _bfd_elf_write_object_contents
-#define bfd_elfNN_write_corefile_contents _bfd_elf_write_corefile_contents
-
-#define bfd_elfNN_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#ifndef elf_backend_got_symbol_offset
-#define elf_backend_got_symbol_offset (bfd_vma) 0
-#endif
-#ifndef elf_backend_want_got_plt
-#define elf_backend_want_got_plt 0
-#endif
-#ifndef elf_backend_plt_readonly
-#define elf_backend_plt_readonly 0
-#endif
-#ifndef elf_backend_want_plt_sym
-#define elf_backend_want_plt_sym 0
-#endif
-#ifndef elf_backend_plt_not_loaded
-#define elf_backend_plt_not_loaded 0
-#endif
-#ifndef elf_backend_plt_alignment
-#define elf_backend_plt_alignment 2
-#endif
-
-#define bfd_elfNN_bfd_debug_info_start	bfd_void
-#define bfd_elfNN_bfd_debug_info_end	bfd_void
-#define bfd_elfNN_bfd_debug_info_accumulate	(PROTO(void,(*),(bfd*, struct sec *))) bfd_void
-
-#ifndef bfd_elfNN_bfd_get_relocated_section_contents
-#define bfd_elfNN_bfd_get_relocated_section_contents \
- bfd_generic_get_relocated_section_contents
-#endif
-
-#ifndef bfd_elfNN_bfd_relax_section
-#define bfd_elfNN_bfd_relax_section bfd_generic_relax_section
-#endif
-
-#ifndef elf_backend_can_gc_sections
-#define elf_backend_can_gc_sections 0
-#endif
-#ifndef elf_backend_gc_mark_hook
-#define elf_backend_gc_mark_hook	NULL
-#endif
-#ifndef elf_backend_gc_sweep_hook
-#define elf_backend_gc_sweep_hook	NULL
-#endif
-#ifndef bfd_elfNN_bfd_gc_sections
-#define bfd_elfNN_bfd_gc_sections _bfd_elfNN_gc_sections
-#endif
-
-#define bfd_elfNN_bfd_make_debug_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, void *, unsigned long))) bfd_nullvoidptr)
-
-#ifndef bfd_elfNN_bfd_copy_private_symbol_data
-#define bfd_elfNN_bfd_copy_private_symbol_data \
-  _bfd_elf_copy_private_symbol_data
-#endif
-
-#ifndef bfd_elfNN_bfd_copy_private_section_data
-#define bfd_elfNN_bfd_copy_private_section_data \
-  _bfd_elf_copy_private_section_data
-#endif
-#ifndef bfd_elfNN_bfd_copy_private_bfd_data
-#define bfd_elfNN_bfd_copy_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#endif
-#ifndef bfd_elfNN_bfd_print_private_bfd_data
-#define bfd_elfNN_bfd_print_private_bfd_data \
-  _bfd_elf_print_private_bfd_data
-#endif
-#ifndef bfd_elfNN_bfd_merge_private_bfd_data
-#define bfd_elfNN_bfd_merge_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#endif
-#ifndef bfd_elfNN_bfd_set_private_flags
-#define bfd_elfNN_bfd_set_private_flags \
-  ((boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
-#endif
-#ifndef bfd_elfNN_bfd_is_local_label_name
-#define bfd_elfNN_bfd_is_local_label_name _bfd_elf_is_local_label_name
-#endif
-
-#ifndef bfd_elfNN_get_dynamic_reloc_upper_bound
-#define bfd_elfNN_get_dynamic_reloc_upper_bound \
-  _bfd_elf_get_dynamic_reloc_upper_bound
-#endif
-#ifndef bfd_elfNN_canonicalize_dynamic_reloc
-#define bfd_elfNN_canonicalize_dynamic_reloc \
-  _bfd_elf_canonicalize_dynamic_reloc
-#endif
-
-#ifdef elf_backend_relocate_section
-#ifndef bfd_elfNN_bfd_link_hash_table_create
-#define bfd_elfNN_bfd_link_hash_table_create _bfd_elf_link_hash_table_create
-#endif
-#else /* ! defined (elf_backend_relocate_section) */
-/* If no backend relocate_section routine, use the generic linker.  */
-#ifndef bfd_elfNN_bfd_link_hash_table_create
-#define bfd_elfNN_bfd_link_hash_table_create \
-  _bfd_generic_link_hash_table_create
-#endif
-#ifndef bfd_elfNN_bfd_link_add_symbols
-#define bfd_elfNN_bfd_link_add_symbols	_bfd_generic_link_add_symbols
-#endif
-#ifndef bfd_elfNN_bfd_final_link
-#define bfd_elfNN_bfd_final_link	_bfd_generic_final_link
-#endif
-#endif /* ! defined (elf_backend_relocate_section) */
-#ifndef bfd_elfNN_bfd_link_split_section
-#define bfd_elfNN_bfd_link_split_section _bfd_generic_link_split_section
-#endif
-
-#ifndef bfd_elfNN_archive_p
-#define bfd_elfNN_archive_p bfd_generic_archive_p
-#endif
-
-#ifndef bfd_elfNN_write_archive_contents
-#define bfd_elfNN_write_archive_contents _bfd_write_archive_contents
-#endif
-
-#ifndef bfd_elfNN_mkobject
-#define bfd_elfNN_mkobject bfd_elf_mkobject
-#endif
-
-#ifndef bfd_elfNN_mkcorefile
-#define bfd_elfNN_mkcorefile bfd_elf_mkcorefile
-#endif
-
-#ifndef bfd_elfNN_mkarchive
-#define bfd_elfNN_mkarchive _bfd_generic_mkarchive
-#endif
-
-#ifndef elf_symbol_leading_char
-#define elf_symbol_leading_char 0
-#endif
-
-#ifndef elf_info_to_howto
-#define elf_info_to_howto 0
-#endif
-
-#ifndef elf_info_to_howto_rel
-#define elf_info_to_howto_rel 0
-#endif
-
-#ifndef ELF_MAXPAGESIZE
-#define ELF_MAXPAGESIZE 1
-#endif
-
-#ifndef elf_backend_collect
-#define elf_backend_collect false
-#endif
-#ifndef elf_backend_type_change_ok
-#define elf_backend_type_change_ok false
-#endif
-
-#ifndef elf_backend_sym_is_global
-#define elf_backend_sym_is_global	0
-#endif
-#ifndef elf_backend_object_p
-#define elf_backend_object_p		0
-#endif
-#ifndef elf_backend_symbol_processing
-#define elf_backend_symbol_processing	0
-#endif
-#ifndef elf_backend_symbol_table_processing
-#define elf_backend_symbol_table_processing	0
-#endif
-#ifndef elf_backend_get_symbol_type
-#define elf_backend_get_symbol_type 0
-#endif
-#ifndef elf_backend_section_processing
-#define elf_backend_section_processing	0
-#endif
-#ifndef elf_backend_section_from_shdr
-#define elf_backend_section_from_shdr	0
-#endif
-#ifndef elf_backend_fake_sections
-#define elf_backend_fake_sections	0
-#endif
-#ifndef elf_backend_section_from_bfd_section
-#define elf_backend_section_from_bfd_section	0
-#endif
-#ifndef elf_backend_add_symbol_hook
-#define elf_backend_add_symbol_hook	0
-#endif
-#ifndef elf_backend_link_output_symbol_hook
-#define elf_backend_link_output_symbol_hook 0
-#endif
-#ifndef elf_backend_create_dynamic_sections
-#define elf_backend_create_dynamic_sections 0
-#endif
-#ifndef elf_backend_check_relocs
-#define elf_backend_check_relocs	0
-#endif
-#ifndef elf_backend_adjust_dynamic_symbol
-#define elf_backend_adjust_dynamic_symbol 0
-#endif
-#ifndef elf_backend_always_size_sections
-#define elf_backend_always_size_sections 0
-#endif
-#ifndef elf_backend_size_dynamic_sections
-#define elf_backend_size_dynamic_sections 0
-#endif
-#ifndef elf_backend_relocate_section
-#define elf_backend_relocate_section	0
-#endif
-#ifndef elf_backend_finish_dynamic_symbol
-#define elf_backend_finish_dynamic_symbol	0
-#endif
-#ifndef elf_backend_finish_dynamic_sections
-#define elf_backend_finish_dynamic_sections	0
-#endif
-#ifndef elf_backend_begin_write_processing
-#define elf_backend_begin_write_processing	0
-#endif
-#ifndef elf_backend_final_write_processing
-#define elf_backend_final_write_processing	0
-#endif
-#ifndef elf_backend_additional_program_headers
-#define elf_backend_additional_program_headers	0
-#endif
-#ifndef elf_backend_modify_segment_map
-#define elf_backend_modify_segment_map	0
-#endif
-#ifndef elf_backend_ecoff_debug_swap
-#define elf_backend_ecoff_debug_swap	0
-#endif
-#ifndef elf_backend_got_header_size
-#define elf_backend_got_header_size	0
-#endif
-#ifndef elf_backend_plt_header_size
-#define elf_backend_plt_header_size	0
-#endif
-
-#ifndef ELF_MACHINE_ALT1
-#define ELF_MACHINE_ALT1 0
-#endif
-
-#ifndef ELF_MACHINE_ALT2
-#define ELF_MACHINE_ALT2 0
-#endif
-
-#ifndef elf_backend_size_info
-#define elf_backend_size_info _bfd_elfNN_size_info
-#endif
-
-extern const struct elf_size_info _bfd_elfNN_size_info;
-
-static CONST struct elf_backend_data elfNN_bed =
-{
-#ifdef USE_REL
-  0,				/* use_rela_p */
-#else
-  1,				/* use_rela_p */
-#endif
-  ELF_ARCH,			/* arch */
-  ELF_MACHINE_CODE,		/* elf_machine_code */
-  ELF_MAXPAGESIZE,		/* maxpagesize */
-  elf_backend_collect,
-  elf_backend_type_change_ok,
-  elf_info_to_howto,
-  elf_info_to_howto_rel,
-  elf_backend_sym_is_global,
-  elf_backend_object_p,
-  elf_backend_symbol_processing,
-  elf_backend_symbol_table_processing,
-  elf_backend_get_symbol_type,
-  elf_backend_section_processing,
-  elf_backend_section_from_shdr,
-  elf_backend_fake_sections,
-  elf_backend_section_from_bfd_section,
-  elf_backend_add_symbol_hook,
-  elf_backend_link_output_symbol_hook,
-  elf_backend_create_dynamic_sections,
-  elf_backend_check_relocs,
-  elf_backend_adjust_dynamic_symbol,
-  elf_backend_always_size_sections,
-  elf_backend_size_dynamic_sections,
-  elf_backend_relocate_section,
-  elf_backend_finish_dynamic_symbol,
-  elf_backend_finish_dynamic_sections,
-  elf_backend_begin_write_processing,
-  elf_backend_final_write_processing,
-  elf_backend_additional_program_headers,
-  elf_backend_modify_segment_map,
-  elf_backend_gc_mark_hook,
-  elf_backend_gc_sweep_hook,
-  elf_backend_ecoff_debug_swap,
-  ELF_MACHINE_ALT1,
-  ELF_MACHINE_ALT2,
-  &elf_backend_size_info,
-  elf_backend_got_symbol_offset,
-  elf_backend_got_header_size,
-  elf_backend_plt_header_size,
-  elf_backend_want_got_plt,
-  elf_backend_plt_readonly,
-  elf_backend_want_plt_sym,
-  elf_backend_plt_not_loaded,
-  elf_backend_plt_alignment,
-  elf_backend_can_gc_sections
-};
-
-#ifdef TARGET_BIG_SYM
-const bfd_target TARGET_BIG_SYM =
-{
-  /* name: identify kind of target */
-  TARGET_BIG_NAME,
-
-  /* flavour: general indication about file */
-  bfd_target_elf_flavour,
-
-  /* byteorder: data is big endian */
-  BFD_ENDIAN_BIG,
-
-  /* header_byteorder: header is also big endian */
-  BFD_ENDIAN_BIG,
-
-  /* object_flags: mask of all file flags */
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS |
-   DYNAMIC | WP_TEXT | D_PAGED),
-
-  /* section_flags: mask of all section flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY |
-   SEC_CODE | SEC_DATA | SEC_DEBUGGING | SEC_EXCLUDE | SEC_SORT_ENTRIES),
-
-   /* leading_symbol_char: is the first char of a user symbol
-      predictable, and if so what is it */
-  elf_symbol_leading_char,
-
-  /* ar_pad_char: pad character for filenames within an archive header
-     FIXME:  this really has nothing to do with ELF, this is a characteristic
-     of the archiver and/or os and should be independently tunable */
-  '/',
-
-  /* ar_max_namelen: maximum number of characters in an archive header
-     FIXME:  this really has nothing to do with ELF, this is a characteristic
-     of the archiver and should be independently tunable.  This value is
-     a WAG (wild a** guess) */
-  14,
-
-  /* Routines to byte-swap various sized integers from the data sections */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
-
-  /* Routines to byte-swap various sized integers from the file headers */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
-
-  /* bfd_check_format: check the format of a file being read */
-  { _bfd_dummy_target,		/* unknown format */
-    bfd_elfNN_object_p,		/* assembler/linker output (object file) */
-    bfd_elfNN_archive_p,	/* an archive */
-    bfd_elfNN_core_file_p	/* a core file */
-  },
-
-  /* bfd_set_format: set the format of a file being written */
-  { bfd_false,
-    bfd_elfNN_mkobject,
-    bfd_elfNN_mkarchive,
-    bfd_elfNN_mkcorefile
-  },
-
-  /* bfd_write_contents: write cached information into a file being written */
-  { bfd_false,
-    bfd_elfNN_write_object_contents,
-    bfd_elfNN_write_archive_contents,
-    bfd_elfNN_write_corefile_contents,
-  },
-
-      BFD_JUMP_TABLE_GENERIC (bfd_elfNN),
-      BFD_JUMP_TABLE_COPY (bfd_elfNN),
-      BFD_JUMP_TABLE_CORE (bfd_elfNN),
-#ifdef bfd_elfNN_archive_functions
-      BFD_JUMP_TABLE_ARCHIVE (bfd_elfNN_archive),
-#else
-      BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-#endif
-      BFD_JUMP_TABLE_SYMBOLS (bfd_elfNN),
-      BFD_JUMP_TABLE_RELOCS (bfd_elfNN),
-      BFD_JUMP_TABLE_WRITE (bfd_elfNN),
-      BFD_JUMP_TABLE_LINK (bfd_elfNN),
-      BFD_JUMP_TABLE_DYNAMIC (bfd_elfNN),
-
-  /* backend_data: */
-  (PTR) &elfNN_bed,
-};
-#endif
-
-#ifdef TARGET_LITTLE_SYM
-const bfd_target TARGET_LITTLE_SYM =
-{
-  /* name: identify kind of target */
-  TARGET_LITTLE_NAME,
-
-  /* flavour: general indication about file */
-  bfd_target_elf_flavour,
-
-  /* byteorder: data is little endian */
-  BFD_ENDIAN_LITTLE,
-
-  /* header_byteorder: header is also little endian */
-  BFD_ENDIAN_LITTLE,
-
-  /* object_flags: mask of all file flags */
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS |
-   DYNAMIC | WP_TEXT | D_PAGED),
-
-  /* section_flags: mask of all section flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY |
-   SEC_CODE | SEC_DATA | SEC_DEBUGGING | SEC_EXCLUDE | SEC_SORT_ENTRIES),
-
-   /* leading_symbol_char: is the first char of a user symbol
-      predictable, and if so what is it */
-  elf_symbol_leading_char,
-
-  /* ar_pad_char: pad character for filenames within an archive header
-     FIXME:  this really has nothing to do with ELF, this is a characteristic
-     of the archiver and/or os and should be independently tunable */
-  '/',
-
-  /* ar_max_namelen: maximum number of characters in an archive header
-     FIXME:  this really has nothing to do with ELF, this is a characteristic
-     of the archiver and should be independently tunable.  This value is
-     a WAG (wild a** guess) */
-  14,
-
-  /* Routines to byte-swap various sized integers from the data sections */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
-
-  /* Routines to byte-swap various sized integers from the file headers */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
-
-  /* bfd_check_format: check the format of a file being read */
-  { _bfd_dummy_target,		/* unknown format */
-    bfd_elfNN_object_p,		/* assembler/linker output (object file) */
-    bfd_elfNN_archive_p,	/* an archive */
-    bfd_elfNN_core_file_p	/* a core file */
-  },
-
-  /* bfd_set_format: set the format of a file being written */
-  { bfd_false,
-    bfd_elfNN_mkobject,
-    bfd_elfNN_mkarchive,
-    bfd_elfNN_mkcorefile
-  },
-
-  /* bfd_write_contents: write cached information into a file being written */
-  { bfd_false,
-    bfd_elfNN_write_object_contents,
-    bfd_elfNN_write_archive_contents,
-    bfd_elfNN_write_corefile_contents,
-  },
-
-      BFD_JUMP_TABLE_GENERIC (bfd_elfNN),
-      BFD_JUMP_TABLE_COPY (bfd_elfNN),
-      BFD_JUMP_TABLE_CORE (bfd_elfNN),
-#ifdef bfd_elfNN_archive_functions
-      BFD_JUMP_TABLE_ARCHIVE (bfd_elfNN_archive),
-#else
-      BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff),
-#endif
-      BFD_JUMP_TABLE_SYMBOLS (bfd_elfNN),
-      BFD_JUMP_TABLE_RELOCS (bfd_elfNN),
-      BFD_JUMP_TABLE_WRITE (bfd_elfNN),
-      BFD_JUMP_TABLE_LINK (bfd_elfNN),
-      BFD_JUMP_TABLE_DYNAMIC (bfd_elfNN),
-
-  /* backend_data: */
-  (PTR) &elfNN_bed,
-};
-#endif
diff --git a/bfd/epoc-pe-arm.c b/bfd/epoc-pe-arm.c
deleted file mode 100644
index ea89a0b1257..00000000000
--- a/bfd/epoc-pe-arm.c
+++ /dev/null
@@ -1,30 +0,0 @@
-/* BFD back-end for ARM EPOC PE files.
-   Copyright 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_UNDERSCORE    0
-#define USER_LABEL_PREFIX    ""
-
-#define TARGET_LITTLE_SYM    arm_epoc_pe_little_vec
-#define TARGET_LITTLE_NAME   "epoc-pe-arm-little"
-#define TARGET_BIG_SYM       arm_epoc_pe_big_vec
-#define TARGET_BIG_NAME      "epoc-pe-arm-big"
-
-
-#include "pe-arm.c"
-
diff --git a/bfd/epoc-pei-arm.c b/bfd/epoc-pei-arm.c
deleted file mode 100644
index 0f2548d3809..00000000000
--- a/bfd/epoc-pei-arm.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* BFD back-end for ARM EPOC PE IMAGE COFF files.
-   Copyright 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_UNDERSCORE    0
-#define USER_LABEL_PREFIX    ""
-
-#define TARGET_LITTLE_SYM    arm_epoc_pei_little_vec
-#define TARGET_LITTLE_NAME   "epoc-pei-arm-little"
-#define TARGET_BIG_SYM       arm_epoc_pei_big_vec
-#define TARGET_BIG_NAME      "epoc-pei-arm-big"
-
-#include "pei-arm.c"
-
diff --git a/bfd/format.c b/bfd/format.c
deleted file mode 100644
index c9f1f9cd4be..00000000000
--- a/bfd/format.c
+++ /dev/null
@@ -1,342 +0,0 @@
-/* Generic BFD support for file formats.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1999 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	File formats
-
-	A format is a BFD concept of high level file contents type. The
-	formats supported by BFD are: 
-
-	o <<bfd_object>>
-
-	The BFD may contain data, symbols, relocations and debug info.
-
-	o <<bfd_archive>>
-
-	The BFD contains other BFDs and an optional index.
-
-	o <<bfd_core>>
-
-	The BFD contains the result of an executable core dump.
-
-
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/* IMPORT from targets.c.  */
-extern const size_t _bfd_target_vector_entries;
-
-/*
-FUNCTION
-	bfd_check_format
-
-SYNOPSIS
-	boolean bfd_check_format(bfd *abfd, bfd_format format);
-
-DESCRIPTION
-	Verify if the file attached to the BFD @var{abfd} is compatible
-	with the format @var{format} (i.e., one of <<bfd_object>>,
-	<<bfd_archive>> or <<bfd_core>>).
-
-	If the BFD has been set to a specific target before the
-	call, only the named target and format combination is
-	checked. If the target has not been set, or has been set to
-	<<default>>, then all the known target backends is
-	interrogated to determine a match.  If the default target
-	matches, it is used.  If not, exactly one target must recognize
-	the file, or an error results.
-
-	The function returns <<true>> on success, otherwise <<false>>
-	with one of the following error codes:  
-
-	o <<bfd_error_invalid_operation>> -
-	if <<format>> is not one of <<bfd_object>>, <<bfd_archive>> or
-	<<bfd_core>>.
-
-	o <<bfd_error_system_call>> -
-	if an error occured during a read - even some file mismatches
-	can cause bfd_error_system_calls.
-
-	o <<file_not_recognised>> -
-	none of the backends recognised the file format.
-
-	o <<bfd_error_file_ambiguously_recognized>> -
-	more than one backend recognised the file format.
-*/
-
-boolean
-bfd_check_format (abfd, format)
-     bfd *abfd;
-     bfd_format format;
-{
-  return bfd_check_format_matches (abfd, format, NULL);
-}
-
-/*
-FUNCTION
-	bfd_check_format_matches
-
-SYNOPSIS
-	boolean bfd_check_format_matches(bfd *abfd, bfd_format format, char ***matching);
-
-DESCRIPTION
-	Like <<bfd_check_format>>, except when it returns false with
-	<<bfd_errno>> set to <<bfd_error_file_ambiguously_recognized>>.  In that
-	case, if @var{matching} is not NULL, it will be filled in with
-	a NULL-terminated list of the names of the formats that matched,
-	allocated with <<malloc>>.
-	Then the user may choose a format and try again.
-
-	When done with the list that @var{matching} points to, the caller
-	should free it.  
-*/
-
-boolean
-bfd_check_format_matches (abfd, format, matching)
-     bfd *abfd;
-     bfd_format format;
-     char ***matching;
-{
-  extern const bfd_target binary_vec;
-  const bfd_target * const *target, *save_targ, *right_targ;
-  char **matching_vector = NULL;
-  int match_count;
-
-  if (!bfd_read_p (abfd) ||
-      ((int)(abfd->format) < (int)bfd_unknown) ||
-      ((int)(abfd->format) >= (int)bfd_type_end)) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return false;
-  }
-
-  if (abfd->format != bfd_unknown)
-    return (abfd->format == format)? true: false;
-
-
-  /* Since the target type was defaulted, check them 
-     all in the hope that one will be uniquely recognized.  */
-
-  save_targ = abfd->xvec;
-  match_count = 0;
-  if (matching)
-    {
-      matching_vector =
-	(char **) bfd_malloc (sizeof (char *) *
-			      (_bfd_target_vector_entries + 1));
-      if (!matching_vector)
-	return false;
-      matching_vector[0] = NULL;
-      *matching = matching_vector;
-    }
-  right_targ = 0;
-
-
-  /* presume the answer is yes */
-  abfd->format = format;
-
-  /* If the target type was explicitly specified, just check that target.  */
-
-  if (!abfd->target_defaulted) {
-    if (bfd_seek (abfd, (file_ptr)0, SEEK_SET) != 0)	/* rewind! */
-      return false;
-    right_targ = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
-    if (right_targ) {
-      abfd->xvec = right_targ;		/* Set the target as returned */
-      if (matching)
-	free (matching_vector);
-      return true;			/* File position has moved, BTW */
-    }
-
-    /* For a long time the code has dropped through to check all
-       targets if the specified target was wrong.  I don't know why,
-       and I'm reluctant to change it.  However, in the case of an
-       archive, it can cause problems.  If the specified target does
-       not permit archives (e.g., the binary target), then we should
-       not allow some other target to recognize it as an archive, but
-       should instead allow the specified target to recognize it as an
-       object.  When I first made this change, it broke the PE target,
-       because the specified pei-i386 target did not recognize the
-       actual pe-i386 archive.  Since there may be other problems of
-       this sort, I changed this test to check only for the binary
-       target.  */
-
-    if (format == bfd_archive && save_targ == &binary_vec)
-      {
-	abfd->xvec = save_targ;
-	abfd->format = bfd_unknown;
-	if (matching)
-	  free (matching_vector);
-	bfd_set_error (bfd_error_file_not_recognized);
-	return false;
-      }
-  }
-
-  for (target = bfd_target_vector; *target != NULL; target++) {
-    const bfd_target *temp;
-
-    if (*target == &binary_vec)
-      continue;
-
-    abfd->xvec = *target;	/* Change BFD's target temporarily */
-    if (bfd_seek (abfd, (file_ptr)0, SEEK_SET) != 0)
-      return false;
-    /* If _bfd_check_format neglects to set bfd_error, assume bfd_error_wrong_format.
-       We didn't used to even pay any attention to bfd_error, so I suspect
-       that some _bfd_check_format might have this problem.  */
-    bfd_set_error (bfd_error_wrong_format);
-    temp = BFD_SEND_FMT (abfd, _bfd_check_format, (abfd));
-    if (temp) {				/* This format checks out as ok! */
-      right_targ = temp;
-      if (matching)
-	{
-	  matching_vector[match_count] = temp->name;
-	  matching_vector[match_count + 1] = NULL;
-	}
-      match_count++;
-      /* If this is the default target, accept it, even if other targets
-	 might match.  People who want those other targets have to set 
-	 the GNUTARGET variable.  */
-      if (temp == bfd_default_vector[0])
-	{
-	  if (matching)
-	    {
-	      matching_vector[0] = temp->name;
-	      matching_vector[1] = NULL;
-	    }
-	  match_count = 1;
-	  break;
-	}
-#ifdef GNU960
-      /* Big- and little-endian b.out archives look the same, but it doesn't
-       * matter: there is no difference in their headers, and member file byte
-       * orders will (I hope) be handled appropriately by bfd.  Ditto for big
-       * and little coff archives.  And the 4 coff/b.out object formats are
-       * unambiguous.  So accept the first match we find.
-       */
-      break;
-#endif
-    } else if (bfd_get_error () != bfd_error_wrong_format) {
-      abfd->xvec = save_targ;
-      abfd->format = bfd_unknown;
-      if (matching && bfd_get_error () != bfd_error_file_ambiguously_recognized)
-	free (matching_vector);
-      return false;
-    }
-  }
-
-  if (match_count == 1) {
-    abfd->xvec = right_targ;		/* Change BFD's target permanently */
-    if (matching)
-      free (matching_vector);
-    return true;			/* File position has moved, BTW */
-  }
-
-  abfd->xvec = save_targ;		/* Restore original target type */
-  abfd->format = bfd_unknown;		/* Restore original format */
-  if (match_count == 0)
-    {
-      bfd_set_error (bfd_error_file_not_recognized);
-      if (matching)
-	free (matching_vector);
-    }
-  else
-    bfd_set_error (bfd_error_file_ambiguously_recognized);
-  return false;
-}
-
-/*
-FUNCTION
-	bfd_set_format
-
-SYNOPSIS
-	boolean bfd_set_format(bfd *abfd, bfd_format format);
-
-DESCRIPTION
-	This function sets the file format of the BFD @var{abfd} to the
-	format @var{format}. If the target set in the BFD does not
-	support the format requested, the format is invalid, or the BFD
-	is not open for writing, then an error occurs.
-
-*/
-
-boolean
-bfd_set_format (abfd, format)
-     bfd *abfd;
-     bfd_format format;
-{
-
-  if (bfd_read_p (abfd) ||
-      ((int)abfd->format < (int)bfd_unknown) ||
-      ((int)abfd->format >= (int)bfd_type_end)) {
-    bfd_set_error (bfd_error_invalid_operation);
-    return false;
-  }
-
-  if (abfd->format != bfd_unknown)
-    return (abfd->format == format) ? true:false;
-
-  /* presume the answer is yes */
-  abfd->format = format;
-
-  if (!BFD_SEND_FMT (abfd, _bfd_set_format, (abfd))) {
-    abfd->format = bfd_unknown;
-    return false;
-  }
-
-  return true;
-}
-
-
-/*
-FUNCTION
-	bfd_format_string
-
-SYNOPSIS
-	CONST char *bfd_format_string(bfd_format format);
-
-DESCRIPTION
-	Return a pointer to a const string
-	<<invalid>>, <<object>>, <<archive>>, <<core>>, or <<unknown>>,
-	depending upon the value of @var{format}.
-*/
-
-CONST char *
-bfd_format_string (format)
-     bfd_format format;
-{
-  if (((int)format <(int) bfd_unknown) 
-      || ((int)format >=(int) bfd_type_end)) 
-    return "invalid";
-  
-  switch (format) {
-  case bfd_object:
-    return "object";		/* linker/assember/compiler output */
-  case bfd_archive: 
-    return "archive";		/* object archive file */
-  case bfd_core: 
-    return "core";		/* core dump */
-  default: 
-    return "unknown";
-  }
-}
diff --git a/bfd/freebsd.h b/bfd/freebsd.h
deleted file mode 100644
index 8bb19acd7d3..00000000000
--- a/bfd/freebsd.h
+++ /dev/null
@@ -1,110 +0,0 @@
-/* BFD back-end definitions used by all FreeBSD targets.
-   Copyright (C) 1990, 1991, 1992, 1996 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-*/
-
-/* FreeBSD ZMAGIC files never have the header in the text. */
-#define	N_HEADER_IN_TEXT(x)	0
-
-/* ZMAGIC files start at offset 0.  Does not apply to QMAGIC files. */
-#define TEXT_START_ADDR		0
-
-#define N_GETMAGIC_NET(exec) \
-	((exec).a_info & 0xffff)
-#define N_GETMID_NET(exec) \
-	(((exec).a_info >> 16) & 0x3ff)
-#define N_GETFLAG_NET(ex) \
-	(((exec).a_info >> 26) & 0x3f)
-
-#define N_MACHTYPE(exec) \
-	((enum machine_type) \
-	 ((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETMID_NET (exec) : \
-	  ((exec).a_info >> 16) & 0x3ff))
-#define N_FLAGS(exec) \
-	((N_GETMAGIC_NET (exec) == ZMAGIC) ? N_GETFLAG_NET (exec) : \
-	 ((exec).a_info >> 26) & 0x3f)
-
-#define N_SET_INFO(exec, magic, type, flags) \
-	((exec).a_info = ((magic) & 0xffff) \
-	 | (((int)(type) & 0x3ff) << 16) \
-	 | (((flags) & 0x3f) << 26))
-#define N_SET_MACHTYPE(exec, machtype) \
-	((exec).a_info = \
-         ((exec).a_info & 0xfb00ffff) | ((((int)(machtype))&0x3ff) << 16))
-#define N_SET_FLAGS(exec, flags) \
-	((exec).a_info = \
-	 ((exec).a_info & 0x03ffffff) | ((flags & 0x03f) << 26))
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
-
-/* On FreeBSD, the magic number is always in i386 (little-endian)
-   format.  I think.  */
-#define SWAP_MAGIC(ext) bfd_getl32 (ext)
-
-
-#define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
-
-#include "aout-target.h"
-
-/* Write an object file.
-   Section contents have already been written.  We write the
-   file header, symbols, and relocation.  */
-
-static boolean
-MY(write_object_contents) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-#if CHOOSE_RELOC_SIZE
-  CHOOSE_RELOC_SIZE(abfd);
-#else
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-#endif
-
-  /* Magic number, maestro, please!  */
-  switch (bfd_get_arch(abfd)) {
-  case bfd_arch_m68k:
-    if (strcmp (abfd->xvec->name, "a.out-m68k4k-netbsd") == 0)
-      N_SET_MACHTYPE(*execp, M_68K4K_NETBSD);
-    else
-      N_SET_MACHTYPE(*execp, M_68K_NETBSD);
-    break;
-  case bfd_arch_sparc:
-    N_SET_MACHTYPE(*execp, M_SPARC_NETBSD);
-    break;
-  case bfd_arch_i386:
-    N_SET_MACHTYPE(*execp, M_386_NETBSD);
-    break;
-  case bfd_arch_ns32k:
-    N_SET_MACHTYPE(*execp, M_532_NETBSD);
-    break;
-  default:
-    N_SET_MACHTYPE(*execp, M_UNKNOWN);
-    break;
-  }
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
-}
diff --git a/bfd/gen-aout.c b/bfd/gen-aout.c
deleted file mode 100644
index b5ed91a096b..00000000000
--- a/bfd/gen-aout.c
+++ /dev/null
@@ -1,101 +0,0 @@
-/* Generate parameters for an a.out system.
-   Copyright (C) 1990, 91, 92, 93, 94, 98 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "/usr/include/a.out.h"
-#include <stdio.h>
-
-int
-main (argc, argv)
-     int argc; char** argv;
-{
-  struct exec my_exec;
-  int page_size;
-  char *target = "unknown", *arch = "unknown";
-  FILE *file = fopen("gen-aout", "r");
-
-  if (file == NULL) {
-      fprintf(stderr, "Cannot open gen-aout!\n");
-      return -1;
-  }
-  if (fread(&my_exec, sizeof(struct exec), 1, file) != 1) {
-      fprintf(stderr, "Cannot read gen-aout!\n");
-      return -1;
-  }
-
-  target = argv[1];
-  if (target == NULL) {
-      fprintf(stderr, "Usage: gen-aout target_name\n");
-      exit (1);
-  }
-
-#ifdef N_TXTOFF
-  page_size = N_TXTOFF(my_exec);
-  if (page_size == 0)
-    printf("#define N_HEADER_IN_TEXT(x) 1\n");
-  else
-    printf("#define N_HEADER_IN_TEXT(x) 0\n");
-#endif
-
-  printf("#define BYTES_IN_WORD %d\n", sizeof (int));
-  if (my_exec.a_entry == 0) {
-      printf("#define ENTRY_CAN_BE_ZERO\n");
-      printf("#define N_SHARED_LIB(x) 0 /* Avoids warning */\n");
-  }
-  else {
-      printf("/*#define ENTRY_CAN_BE_ZERO*/\n");
-      printf("/*#define N_SHARED_LIB(x) 0*/\n");
-  }
-
-  printf("#define TEXT_START_ADDR %d\n", my_exec.a_entry);
-
-#ifdef PAGSIZ
-  if (page_size == 0)
-    page_size = PAGSIZ;
-#endif
-  if (page_size != 0)
-    printf("#define TARGET_PAGE_SIZE %d\n", page_size);
-  else
-    printf("/* #define TARGET_PAGE_SIZE ??? */\n");
-  printf("#define SEGMENT_SIZE TARGET_PAGE_SIZE\n");
-
-#ifdef vax
-  arch = "vax";
-#endif
-#ifdef m68k
-  arch = "m68k";
-#endif
-  if (arch[0] == '1')
-    {
-      fprintf (stderr, _("warning: preprocessor substituted architecture name inside string;"));
-      fprintf (stderr, _("         fix DEFAULT_ARCH in the output file yourself\n"));
-      arch = "unknown";
-    }
-  printf("#define DEFAULT_ARCH bfd_arch_%s\n", arch);
-
-  printf("\n#define MY(OP) CAT(%s_,OP)\n", target);
-  printf("#define TARGETNAME \"a.out-%s\"\n\n", target);
-
-  printf("#include \"bfd.h\"\n");
-  printf("#include \"sysdep.h\"\n");
-  printf("#include \"libbfd.h\"\n");
-  printf("#include \"libaout.h\"\n");
-  printf("\n#include \"aout-target.h\"\n");
-
-  return 0;
-}
diff --git a/bfd/genlink.h b/bfd/genlink.h
deleted file mode 100644
index 0e0a8de300e..00000000000
--- a/bfd/genlink.h
+++ /dev/null
@@ -1,111 +0,0 @@
-/* genlink.h -- interface to the BFD generic linker
-   Copyright 1993, 1994 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef GENLINK_H
-#define GENLINK_H
-
-/* This header file is internal to BFD.  It describes the internal
-   structures and functions used by the BFD generic linker, in case
-   any of the more specific linkers want to use or call them.  Note
-   that some functions, such as _bfd_generic_link_hash_table_create,
-   are declared in libbfd.h, because they are expected to be widely
-   used.  The functions and structures in this file will probably only
-   be used by a few files besides linker.c itself.  In fact, this file
-   is not particularly complete; I have only put in the interfaces I
-   actually needed.  */
-
-/* The generic linker uses a hash table which is a derived class of
-   the standard linker hash table, just as the other backend specific
-   linkers do.  Do not confuse the generic linker hash table with the
-   standard BFD linker hash table it is built upon.  */
-
-/* Generic linker hash table entries.  */
-
-struct generic_link_hash_entry
-{
-  struct bfd_link_hash_entry root;
-  /* Whether this symbol has been written out.  */
-  boolean written;
-  /* Symbol from input BFD.  */
-  asymbol *sym;
-};
-
-/* Generic linker hash table.  */
-
-struct generic_link_hash_table
-{
-  struct bfd_link_hash_table root;
-};
-
-/* Look up an entry in an generic link hash table.  */
-
-#define _bfd_generic_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct generic_link_hash_entry *) \
-   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy), (follow)))
-
-/* Traverse an generic link hash table.  */
-
-#define _bfd_generic_link_hash_traverse(table, func, info)		\
-  (bfd_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the generic link hash table from the info structure.  This is
-   just a cast.  */
-
-#define _bfd_generic_hash_table(p) \
-  ((struct generic_link_hash_table *) ((p)->hash))
-
-/* The generic linker reads in the asymbol structures for an input BFD
-   and keeps them in the outsymbol and symcount fields.  */
-
-#define _bfd_generic_link_get_symbols(abfd) ((abfd)->outsymbols)
-#define _bfd_generic_link_get_symcount(abfd) ((abfd)->symcount)
-
-/* Add the symbols of input_bfd to the symbols being built for
-   output_bfd.  */
-extern boolean _bfd_generic_link_output_symbols
-  PARAMS ((bfd *output_bfd, bfd *input_bfd, struct bfd_link_info *,
-	   size_t *psymalloc));
-
-/* This structure is used to pass information to
-   _bfd_generic_link_write_global_symbol, which may be called via
-   _bfd_generic_link_hash_traverse.  */
-
-struct generic_write_global_symbol_info
-{
-  struct bfd_link_info *info;
-  bfd *output_bfd;
-  size_t *psymalloc;
-};
-
-/* Write out a single global symbol.  This is expected to be called
-   via _bfd_generic_link_hash_traverse.  The second argument must
-   actually be a struct generic_write_global_symbol_info *.  */
-extern boolean _bfd_generic_link_write_global_symbol
-  PARAMS ((struct generic_link_hash_entry *, PTR));
-
-/* Generic link hash table entry creation routine.  */
-struct bfd_hash_entry *_bfd_generic_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *,
-           const char *));
-
-#endif
diff --git a/bfd/go32stub.h b/bfd/go32stub.h
deleted file mode 100644
index 3e4388c087b..00000000000
--- a/bfd/go32stub.h
+++ /dev/null
@@ -1,128 +0,0 @@
-0x4d,0x5a,0x00,0x00,0x04,0x00,0x00,0x00,0x20,0x00,0x27,0x00,0xff,0xff,0x00,0x00,
-0x60,0x07,0x00,0x00,0x54,0x00,0x00,0x00,0x0d,0x0a,0x73,0x74,0x75,0x62,0x2e,0x68,
-0x20,0x67,0x65,0x6e,0x65,0x72,0x61,0x74,0x65,0x64,0x20,0x66,0x72,0x6f,0x6d,0x20,
-0x73,0x74,0x75,0x62,0x2e,0x61,0x73,0x6d,0x20,0x62,0x79,0x20,0x64,0x6a,0x61,0x73,
-0x6d,0x2c,0x20,0x6f,0x6e,0x20,0x57,0x65,0x64,0x20,0x4a,0x75,0x6e,0x20,0x31,0x31,
-0x20,0x31,0x36,0x3a,0x30,0x39,0x3a,0x31,0x35,0x20,0x31,0x39,0x39,0x37,0x0d,0x0a,
-0x54,0x68,0x65,0x20,0x53,0x54,0x55,0x42,0x2e,0x45,0x58,0x45,0x20,0x73,0x74,0x75,
-0x62,0x20,0x6c,0x6f,0x61,0x64,0x65,0x72,0x20,0x69,0x73,0x20,0x43,0x6f,0x70,0x79,
-0x72,0x69,0x67,0x68,0x74,0x20,0x28,0x43,0x29,0x20,0x31,0x39,0x39,0x33,0x2d,0x31,
-0x39,0x39,0x35,0x20,0x44,0x4a,0x20,0x44,0x65,0x6c,0x6f,0x72,0x69,0x65,0x2e,0x20,
-0x0d,0x0a,0x50,0x65,0x72,0x6d,0x69,0x73,0x73,0x69,0x6f,0x6e,0x20,0x67,0x72,0x61,
-0x6e,0x74,0x65,0x64,0x20,0x74,0x6f,0x20,0x75,0x73,0x65,0x20,0x66,0x6f,0x72,0x20,
-0x61,0x6e,0x79,0x20,0x70,0x75,0x72,0x70,0x6f,0x73,0x65,0x20,0x70,0x72,0x6f,0x76,
-0x69,0x64,0x65,0x64,0x20,0x74,0x68,0x69,0x73,0x20,0x63,0x6f,0x70,0x79,0x72,0x69,
-0x67,0x68,0x74,0x20,0x0d,0x0a,0x72,0x65,0x6d,0x61,0x69,0x6e,0x73,0x20,0x70,0x72,
-0x65,0x73,0x65,0x6e,0x74,0x20,0x61,0x6e,0x64,0x20,0x75,0x6e,0x6d,0x6f,0x64,0x69,
-0x66,0x69,0x65,0x64,0x2e,0x20,0x0d,0x0a,0x54,0x68,0x69,0x73,0x20,0x6f,0x6e,0x6c,
-0x79,0x20,0x61,0x70,0x70,0x6c,0x69,0x65,0x73,0x20,0x74,0x6f,0x20,0x74,0x68,0x65,
-0x20,0x73,0x74,0x75,0x62,0x2c,0x20,0x61,0x6e,0x64,0x20,0x6e,0x6f,0x74,0x20,0x6e,
-0x65,0x63,0x63,0x65,0x73,0x73,0x61,0x72,0x69,0x6c,0x79,0x20,0x74,0x68,0x65,0x20,
-0x77,0x68,0x6f,0x6c,0x65,0x20,0x70,0x72,0x6f,0x67,0x72,0x61,0x6d,0x2e,0x0a,0x0d,
-0x0a,0x24,0x49,0x64,0x3a,0x20,0x73,0x74,0x75,0x62,0x2e,0x61,0x73,0x6d,0x20,0x62,
-0x75,0x69,0x6c,0x74,0x20,0x30,0x36,0x2f,0x31,0x31,0x2f,0x39,0x37,0x20,0x31,0x36,
-0x3a,0x30,0x39,0x3a,0x31,0x35,0x20,0x62,0x79,0x20,0x64,0x6a,0x61,0x73,0x6d,0x20,
-0x24,0x0a,0x0d,0x0a,0x40,0x28,0x23,0x29,0x20,0x73,0x74,0x75,0x62,0x2e,0x61,0x73,
-0x6d,0x20,0x62,0x75,0x69,0x6c,0x74,0x20,0x30,0x36,0x2f,0x31,0x31,0x2f,0x39,0x37,
-0x20,0x31,0x36,0x3a,0x30,0x39,0x3a,0x31,0x35,0x20,0x62,0x79,0x20,0x64,0x6a,0x61,
-0x73,0x6d,0x0a,0x0d,0x0a,0x1a,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x67,0x6f,0x33,0x32,0x73,0x74,0x75,0x62,0x2c,0x20,0x76,0x20,0x32,0x2e,0x30,0x30,
-0x54,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x43,0x57,0x53,0x44,0x50,0x4d,0x49,0x2e,0x45,0x58,0x45,0x00,
-0x00,0x00,0x00,0x00,0x0e,0x1f,0x8c,0x1e,0x24,0x00,0x8c,0x06,0x60,0x07,0xfc,0xb4,
-0x30,0xcd,0x21,0x3c,0x03,0x73,0x06,0xba,0x86,0x05,0xe9,0xb2,0x03,0xa2,0x69,0x08,
-0xbb,0x70,0x08,0xa1,0x20,0x00,0x39,0xc3,0x73,0x02,0x89,0xc3,0x89,0x1e,0x20,0x00,
-0xfe,0xc7,0xb9,0x04,0xff,0xd3,0xeb,0xb4,0x4a,0xcd,0x21,0x73,0x0a,0xd3,0xe3,0xfe,
-0xcf,0x89,0x1e,0x20,0x00,0xeb,0xd9,0x26,0x8e,0x06,0x2c,0x00,0x31,0xff,0x30,0xc0,
-0xa9,0xf2,0xae,0x26,0x81,0x3d,0x50,0x41,0x75,0x15,0xaf,0x26,0x81,0x3d,0x54,0x48,
-0x75,0x0d,0xaf,0x26,0x80,0x3d,0x3d,0x75,0x06,0x47,0x89,0x3e,0x67,0x04,0x4f,0xae,
-0x75,0xdf,0xaf,0x06,0x57,0x31,0xc9,0x74,0x10,0xba,0x5d,0x05,0xe9,0x50,0x03,0x09,
-0xc9,0x75,0xf6,0x41,0xe8,0x92,0x03,0x72,0xf0,0xb8,0x87,0x16,0xcd,0x2f,0x09,0xc0,
-0x75,0xed,0x80,0xe3,0x01,0x74,0xe8,0x89,0x3e,0x00,0x06,0x8c,0x06,0x02,0x06,0x89,
-0x36,0x04,0x06,0x5f,0x07,0xe8,0xd5,0x02,0x89,0x3e,0x2a,0x00,0x89,0x36,0x62,0x07,
-0x80,0x3e,0x2c,0x00,0x00,0x74,0x24,0xb9,0x08,0x00,0xbf,0x2c,0x00,0x8a,0x05,0x47,
-0x08,0xc0,0x74,0x05,0x88,0x07,0x43,0xe2,0xf4,0x66,0xc7,0x07,0x2e,0x45,0x58,0x45,
-0x81,0xc3,0x04,0x00,0xc6,0x07,0x00,0x89,0x1e,0x62,0x07,0xb8,0x00,0x3d,0xba,0x64,
-0x07,0xcd,0x21,0x0f,0x82,0xb4,0x02,0xa3,0x06,0x06,0x89,0xc3,0xb9,0x06,0x00,0xba,
-0xb5,0x07,0xb4,0x3f,0xcd,0x21,0x31,0xd2,0x31,0xc9,0xa1,0xb5,0x07,0x3d,0x4c,0x01,
-0x74,0x1b,0x3d,0x4d,0x5a,0x0f,0x85,0x97,0x02,0x8b,0x16,0xb9,0x07,0xc1,0xe2,0x09,
-0x8b,0x1e,0xb7,0x07,0x09,0xdb,0x74,0x05,0x80,0xee,0x02,0x01,0xda,0x89,0x16,0xbb,
-0x07,0x89,0x0e,0xbd,0x07,0xb8,0x00,0x42,0x8b,0x1e,0x06,0x06,0xcd,0x21,0xb9,0xa8,
-0x00,0xba,0xbf,0x07,0xb4,0x3f,0xcd,0x21,0x3d,0xa8,0x00,0x75,0x06,0x81,0x3e,0xbf,
-0x07,0x4c,0x01,0x0f,0x85,0x5e,0x02,0x66,0xa1,0xe3,0x07,0x66,0xa3,0x10,0x06,0x66,
-0x8b,0x0e,0xbb,0x07,0x66,0xa1,0x03,0x08,0x66,0x01,0xc8,0x66,0xa3,0x08,0x06,0x66,
-0xa1,0x2b,0x08,0x66,0x01,0xc8,0x66,0xa3,0x0c,0x06,0x66,0x8b,0x1e,0x4b,0x08,0x66,
-0xa1,0x4f,0x08,0x66,0x01,0xc3,0x66,0xb8,0x01,0x00,0x01,0x00,0x66,0x39,0xc3,0x73,
-0x03,0x66,0x89,0xc3,0x66,0x81,0xc3,0xff,0xff,0x00,0x00,0x31,0xdb,0x66,0x89,0x1e,
-0x1c,0x00,0xe8,0xe8,0x02,0x8b,0x1e,0x04,0x06,0x09,0xdb,0x74,0x0a,0xb4,0x48,0xcd,
-0x21,0x0f,0x82,0x10,0x02,0x8e,0xc0,0xe8,0xfb,0x02,0xb8,0x01,0x00,0xff,0x1e,0x00,
-0x06,0x0f,0x82,0x08,0x02,0x8c,0x06,0x26,0x00,0x8c,0x0e,0x28,0x00,0x8c,0xd8,0xa3,
-0x22,0x00,0x8e,0xc0,0x31,0xc0,0xb9,0x01,0x00,0xcd,0x31,0x72,0x07,0xa3,0x14,0x06,
-0x31,0xc0,0xcd,0x31,0x0f,0x82,0xea,0x01,0xa3,0x16,0x06,0x66,0x8b,0x0e,0x1c,0x00,
-0xb8,0x01,0x05,0x8b,0x1e,0x1e,0x00,0xcd,0x31,0x0f,0x82,0xda,0x01,0x89,0x1e,0x1a,
-0x06,0x89,0x0e,0x18,0x06,0x89,0x36,0x1a,0x00,0x89,0x3e,0x18,0x00,0xb8,0x07,0x00,
-0x8b,0x1e,0x14,0x06,0x8b,0x0e,0x1a,0x06,0x8b,0x16,0x18,0x06,0xcd,0x31,0xb8,0x09,
-0x00,0x8c,0xc9,0x81,0xe1,0x03,0x00,0xc1,0xe1,0x05,0x51,0x81,0xc9,0x9b,0xc0,0xcd,
-0x31,0xb8,0x08,0x00,0x8b,0x0e,0x1e,0x00,0x49,0xba,0xff,0xff,0xcd,0x31,0xb8,0x07,
-0x00,0x8b,0x1e,0x16,0x06,0x8b,0x0e,0x1a,0x06,0x8b,0x16,0x18,0x06,0xcd,0x31,0xb8,
-0x09,0x00,0x59,0x81,0xc9,0x93,0xc0,0xcd,0x31,0xb8,0x08,0x00,0x8b,0x0e,0x1e,0x00,
-0x49,0xba,0xff,0xff,0xcd,0x31,0xb8,0x00,0x01,0xbb,0x00,0x0f,0xcd,0x31,0x73,0x10,
-0x3d,0x08,0x00,0x0f,0x85,0x65,0x01,0xb8,0x00,0x01,0xcd,0x31,0x0f,0x82,0x5c,0x01,
-0xa3,0x1c,0x06,0x89,0x16,0x1e,0x06,0xc1,0xe3,0x04,0x89,0x1e,0x20,0x06,0x66,0x8b,
-0x36,0x08,0x06,0x66,0x8b,0x3e,0xfb,0x07,0x66,0x8b,0x0e,0xff,0x07,0xe8,0x49,0x00,
-0x66,0x8b,0x36,0x0c,0x06,0x66,0x8b,0x3e,0x23,0x08,0x66,0x8b,0x0e,0x27,0x08,0xe8,
-0x37,0x00,0x8e,0x06,0x16,0x06,0x66,0x8b,0x3e,0x4b,0x08,0x66,0x8b,0x0e,0x4f,0x08,
-0x66,0x31,0xc0,0x66,0xc1,0xe9,0x02,0x67,0xf3,0x66,0xab,0xb4,0x3e,0x8b,0x1e,0x06,
-0x06,0xcd,0x21,0xb8,0x01,0x01,0x8b,0x16,0x1e,0x06,0xcd,0x31,0x1e,0x0f,0xa1,0x8e,
-0x1e,0x16,0x06,0x66,0x64,0xff,0x2e,0x10,0x06,0x66,0x89,0xf0,0x66,0x25,0xff,0x01,
-0x00,0x00,0x66,0x01,0xc1,0x29,0xc6,0x66,0x29,0xc7,0x66,0x89,0x0e,0x26,0x06,0x66,
-0x89,0x3e,0x22,0x06,0xe8,0xfe,0x00,0x89,0x36,0x3e,0x06,0x66,0xc1,0xee,0x10,0x89,
-0x36,0x42,0x06,0x8b,0x1e,0x06,0x06,0x89,0x1e,0x3a,0x06,0xc7,0x06,0x46,0x06,0x00,
-0x42,0xe8,0xf2,0x00,0xa1,0x1c,0x06,0xa3,0x4e,0x06,0xc7,0x06,0x3e,0x06,0x00,0x00,
-0xc6,0x06,0x47,0x06,0x3f,0xa1,0x28,0x06,0x09,0xc0,0x75,0x09,0xa1,0x26,0x06,0x3b,
-0x06,0x20,0x06,0x76,0x03,0xa1,0x20,0x06,0xa3,0x42,0x06,0xe8,0xc8,0x00,0x66,0x31,
-0xc9,0x8b,0x0e,0x46,0x06,0x66,0x8b,0x3e,0x22,0x06,0x66,0x01,0x0e,0x22,0x06,0x66,
-0x29,0x0e,0x26,0x06,0x66,0x31,0xf6,0xc1,0xe9,0x02,0x1e,0x06,0x8e,0x06,0x16,0x06,
-0x8e,0x1e,0x1e,0x06,0x67,0xf3,0x66,0xa5,0x07,0x1f,0x66,0x03,0x0e,0x26,0x06,0x75,
-0xaf,0xc3,0x3c,0x3a,0x74,0x06,0x3c,0x2f,0x74,0x02,0x3c,0x5c,0xc3,0xbe,0x64,0x07,
-0x89,0xf3,0x26,0x8a,0x05,0x47,0x88,0x04,0x38,0xe0,0x74,0x0e,0x08,0xc0,0x74,0x0a,
-0x46,0xe8,0xde,0xff,0x75,0xec,0x89,0xf3,0x74,0xe8,0xc3,0xba,0x26,0x05,0xeb,0x08,
-0xba,0x34,0x05,0xeb,0x03,0xba,0x3e,0x05,0x52,0x8b,0x1e,0x62,0x07,0xc6,0x07,0x24,
-0xbb,0x64,0x07,0xeb,0x1e,0xe8,0xed,0x00,0xba,0x78,0x05,0xeb,0x12,0xba,0x91,0x05,
-0xeb,0x0d,0xba,0xa3,0x05,0xeb,0x08,0xba,0xb5,0x05,0xeb,0x03,0xba,0x78,0x05,0x52,
-0xbb,0x19,0x05,0xe8,0x14,0x00,0x5b,0xe8,0x10,0x00,0xbb,0x42,0x04,0xe8,0x0a,0x00,
-0xb8,0xff,0x4c,0xcd,0x21,0x43,0xb4,0x02,0xcd,0x21,0x8a,0x17,0x80,0xfa,0x24,0x75,
-0xf4,0xc3,0x0d,0x0a,0x24,0x50,0x51,0x57,0x31,0xc0,0xbf,0x2a,0x06,0xb9,0x19,0x00,
-0xf3,0xab,0x5f,0x59,0x58,0xc3,0xb8,0x00,0x03,0xbb,0x21,0x00,0x31,0xc9,0x66,0xbf,
-0x2a,0x06,0x00,0x00,0xcd,0x31,0xc3,0x00,0x00,0x30,0xe4,0xe8,0x5f,0xff,0x89,0xde,
-0x8b,0x3e,0x67,0x04,0xeb,0x18,0xb4,0x3b,0xe8,0x52,0xff,0x81,0xfe,0x64,0x07,0x74,
-0x13,0x8a,0x84,0xff,0xff,0xe8,0x3a,0xff,0x74,0x04,0xc6,0x04,0x5c,0x46,0xe8,0x03,
-0x00,0x72,0xe3,0xc3,0xe8,0x36,0x00,0xbb,0x44,0x00,0x8a,0x07,0x88,0x04,0x43,0x46,
-0x08,0xc0,0x75,0xf6,0x06,0x57,0x1e,0x07,0xe8,0x9a,0xff,0xbb,0x2a,0x06,0x8c,0x9f,
-0x04,0x00,0x89,0x9f,0x02,0x00,0xba,0x64,0x07,0xb8,0x00,0x4b,0xcd,0x21,0x5f,0x07,
-0x72,0x09,0xb4,0x4d,0xcd,0x21,0x2d,0x00,0x03,0xf7,0xd8,0xeb,0x28,0x80,0x3e,0x69,
-0x08,0x05,0x72,0x20,0xb8,0x00,0x58,0xcd,0x21,0xa2,0x67,0x08,0xb8,0x02,0x58,0xcd,
-0x21,0xa2,0x68,0x08,0xb8,0x01,0x58,0xbb,0x80,0x00,0xcd,0x21,0xb8,0x03,0x58,0xbb,
-0x01,0x00,0xcd,0x21,0xc3,0x9c,0x80,0x3e,0x69,0x08,0x05,0x72,0x1a,0x50,0x53,0xb8,
-0x03,0x58,0x8a,0x1e,0x68,0x08,0x30,0xff,0xcd,0x21,0xb8,0x01,0x58,0x8a,0x1e,0x67,
-0x08,0x30,0xff,0xcd,0x21,0x5b,0x58,0x9d,0xc3,0x4c,0x6f,0x61,0x64,0x20,0x65,0x72,
-0x72,0x6f,0x72,0x3a,0x20,0x24,0x3a,0x20,0x63,0x61,0x6e,0x6e,0x6f,0x74,0x20,0x6f,
-0x70,0x65,0x6e,0x24,0x3a,0x20,0x6e,0x6f,0x74,0x20,0x45,0x58,0x45,0x24,0x3a,0x20,
-0x6e,0x6f,0x74,0x20,0x43,0x4f,0x46,0x46,0x20,0x28,0x43,0x68,0x65,0x63,0x6b,0x20,
-0x66,0x6f,0x72,0x20,0x76,0x69,0x72,0x75,0x73,0x65,0x73,0x29,0x24,0x6e,0x6f,0x20,
-0x44,0x50,0x4d,0x49,0x20,0x2d,0x20,0x47,0x65,0x74,0x20,0x63,0x73,0x64,0x70,0x6d,
-0x69,0x2a,0x62,0x2e,0x7a,0x69,0x70,0x24,0x6e,0x6f,0x20,0x44,0x4f,0x53,0x20,0x6d,
-0x65,0x6d,0x6f,0x72,0x79,0x24,0x6e,0x65,0x65,0x64,0x20,0x44,0x4f,0x53,0x20,0x33,
-0x24,0x63,0x61,0x6e,0x27,0x74,0x20,0x73,0x77,0x69,0x74,0x63,0x68,0x20,0x6d,0x6f,
-0x64,0x65,0x24,0x6e,0x6f,0x20,0x44,0x50,0x4d,0x49,0x20,0x73,0x65,0x6c,0x65,0x63,
-0x74,0x6f,0x72,0x73,0x24,0x6e,0x6f,0x20,0x44,0x50,0x4d,0x49,0x20,0x6d,0x65,0x6d,
-0x6f,0x72,0x79,0x24,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,
-0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,
-0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,
-0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90,0x90
diff --git a/bfd/hash.c b/bfd/hash.c
deleted file mode 100644
index 4c6e9877ce4..00000000000
--- a/bfd/hash.c
+++ /dev/null
@@ -1,734 +0,0 @@
-/* hash.c -- hash table routines for BFD
-   Copyright (C) 1993, 94, 95, 1997 Free Software Foundation, Inc.
-   Written by Steve Chamberlain <sac@cygnus.com>
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "objalloc.h"
-
-/*
-SECTION
-	Hash Tables
-
-@cindex Hash tables
-	BFD provides a simple set of hash table functions.  Routines
-	are provided to initialize a hash table, to free a hash table,
-	to look up a string in a hash table and optionally create an
-	entry for it, and to traverse a hash table.  There is
-	currently no routine to delete an string from a hash table.
-
-	The basic hash table does not permit any data to be stored
-	with a string.  However, a hash table is designed to present a
-	base class from which other types of hash tables may be
-	derived.  These derived types may store additional information
-	with the string.  Hash tables were implemented in this way,
-	rather than simply providing a data pointer in a hash table
-	entry, because they were designed for use by the linker back
-	ends.  The linker may create thousands of hash table entries,
-	and the overhead of allocating private data and storing and
-	following pointers becomes noticeable.
-
-	The basic hash table code is in <<hash.c>>.
-
-@menu
-@* Creating and Freeing a Hash Table::
-@* Looking Up or Entering a String::
-@* Traversing a Hash Table::
-@* Deriving a New Hash Table Type::
-@end menu
-
-INODE
-Creating and Freeing a Hash Table, Looking Up or Entering a String, Hash Tables, Hash Tables
-SUBSECTION
-	Creating and freeing a hash table
-
-@findex bfd_hash_table_init
-@findex bfd_hash_table_init_n
-	To create a hash table, create an instance of a <<struct
-	bfd_hash_table>> (defined in <<bfd.h>>) and call
-	<<bfd_hash_table_init>> (if you know approximately how many
-	entries you will need, the function <<bfd_hash_table_init_n>>,
-	which takes a @var{size} argument, may be used).
-	<<bfd_hash_table_init>> returns <<false>> if some sort of
-	error occurs.
-
-@findex bfd_hash_newfunc
-	The function <<bfd_hash_table_init>> take as an argument a
-	function to use to create new entries.  For a basic hash
-	table, use the function <<bfd_hash_newfunc>>.  @xref{Deriving
-	a New Hash Table Type} for why you would want to use a
-	different value for this argument.
-
-@findex bfd_hash_allocate
-	<<bfd_hash_table_init>> will create an objalloc which will be
-	used to allocate new entries.  You may allocate memory on this
-	objalloc using <<bfd_hash_allocate>>.
-
-@findex bfd_hash_table_free
-	Use <<bfd_hash_table_free>> to free up all the memory that has
-	been allocated for a hash table.  This will not free up the
-	<<struct bfd_hash_table>> itself, which you must provide.
-
-INODE
-Looking Up or Entering a String, Traversing a Hash Table, Creating and Freeing a Hash Table, Hash Tables
-SUBSECTION
-	Looking up or entering a string
-
-@findex bfd_hash_lookup
-	The function <<bfd_hash_lookup>> is used both to look up a
-	string in the hash table and to create a new entry.
-
-	If the @var{create} argument is <<false>>, <<bfd_hash_lookup>>
-	will look up a string.  If the string is found, it will
-	returns a pointer to a <<struct bfd_hash_entry>>.  If the
-	string is not found in the table <<bfd_hash_lookup>> will
-	return <<NULL>>.  You should not modify any of the fields in
-	the returns <<struct bfd_hash_entry>>.
-
-	If the @var{create} argument is <<true>>, the string will be
-	entered into the hash table if it is not already there.
-	Either way a pointer to a <<struct bfd_hash_entry>> will be
-	returned, either to the existing structure or to a newly
-	created one.  In this case, a <<NULL>> return means that an
-	error occurred.
-
-	If the @var{create} argument is <<true>>, and a new entry is
-	created, the @var{copy} argument is used to decide whether to
-	copy the string onto the hash table objalloc or not.  If
-	@var{copy} is passed as <<false>>, you must be careful not to
-	deallocate or modify the string as long as the hash table
-	exists.
-
-INODE
-Traversing a Hash Table, Deriving a New Hash Table Type, Looking Up or Entering a String, Hash Tables
-SUBSECTION
-	Traversing a hash table
-
-@findex bfd_hash_traverse
-	The function <<bfd_hash_traverse>> may be used to traverse a
-	hash table, calling a function on each element.  The traversal
-	is done in a random order.
-
-	<<bfd_hash_traverse>> takes as arguments a function and a
-	generic <<void *>> pointer.  The function is called with a
-	hash table entry (a <<struct bfd_hash_entry *>>) and the
-	generic pointer passed to <<bfd_hash_traverse>>.  The function
-	must return a <<boolean>> value, which indicates whether to
-	continue traversing the hash table.  If the function returns
-	<<false>>, <<bfd_hash_traverse>> will stop the traversal and
-	return immediately.
-
-INODE
-Deriving a New Hash Table Type, , Traversing a Hash Table, Hash Tables
-SUBSECTION
-	Deriving a new hash table type
-
-	Many uses of hash tables want to store additional information
-	which each entry in the hash table.  Some also find it
-	convenient to store additional information with the hash table
-	itself.  This may be done using a derived hash table.
-
-	Since C is not an object oriented language, creating a derived
-	hash table requires sticking together some boilerplate
-	routines with a few differences specific to the type of hash
-	table you want to create.
-
-	An example of a derived hash table is the linker hash table.
-	The structures for this are defined in <<bfdlink.h>>.  The
-	functions are in <<linker.c>>.
-
-	You may also derive a hash table from an already derived hash
-	table.  For example, the a.out linker backend code uses a hash
-	table derived from the linker hash table.
-
-@menu
-@* Define the Derived Structures::
-@* Write the Derived Creation Routine::
-@* Write Other Derived Routines::
-@end menu
-
-INODE
-Define the Derived Structures, Write the Derived Creation Routine, Deriving a New Hash Table Type, Deriving a New Hash Table Type
-SUBSUBSECTION
-	Define the derived structures
-
-	You must define a structure for an entry in the hash table,
-	and a structure for the hash table itself.
-
-	The first field in the structure for an entry in the hash
-	table must be of the type used for an entry in the hash table
-	you are deriving from.  If you are deriving from a basic hash
-	table this is <<struct bfd_hash_entry>>, which is defined in
-	<<bfd.h>>.  The first field in the structure for the hash
-	table itself must be of the type of the hash table you are
-	deriving from itself.  If you are deriving from a basic hash
-	table, this is <<struct bfd_hash_table>>.
-
-	For example, the linker hash table defines <<struct
-	bfd_link_hash_entry>> (in <<bfdlink.h>>).  The first field,
-	<<root>>, is of type <<struct bfd_hash_entry>>.  Similarly,
-	the first field in <<struct bfd_link_hash_table>>, <<table>>,
-	is of type <<struct bfd_hash_table>>.
-
-INODE
-Write the Derived Creation Routine, Write Other Derived Routines, Define the Derived Structures, Deriving a New Hash Table Type
-SUBSUBSECTION
-	Write the derived creation routine
-
-	You must write a routine which will create and initialize an
-	entry in the hash table.  This routine is passed as the
-	function argument to <<bfd_hash_table_init>>.
-
-	In order to permit other hash tables to be derived from the
-	hash table you are creating, this routine must be written in a
-	standard way.
-
-	The first argument to the creation routine is a pointer to a
-	hash table entry.  This may be <<NULL>>, in which case the
-	routine should allocate the right amount of space.  Otherwise
-	the space has already been allocated by a hash table type
-	derived from this one.
-
-	After allocating space, the creation routine must call the
-	creation routine of the hash table type it is derived from,
-	passing in a pointer to the space it just allocated.  This
-	will initialize any fields used by the base hash table.
-
-	Finally the creation routine must initialize any local fields
-	for the new hash table type.
-
-	Here is a boilerplate example of a creation routine.
-	@var{function_name} is the name of the routine.
-	@var{entry_type} is the type of an entry in the hash table you
-	are creating.  @var{base_newfunc} is the name of the creation
-	routine of the hash table type your hash table is derived
-	from.
-
-EXAMPLE
-
-.struct bfd_hash_entry *
-.@var{function_name} (entry, table, string)
-.     struct bfd_hash_entry *entry;
-.     struct bfd_hash_table *table;
-.     const char *string;
-.{
-.  struct @var{entry_type} *ret = (@var{entry_type} *) entry;
-.
-. {* Allocate the structure if it has not already been allocated by a
-.    derived class.  *}
-.  if (ret == (@var{entry_type} *) NULL)
-.    {
-.      ret = ((@var{entry_type} *)
-.	      bfd_hash_allocate (table, sizeof (@var{entry_type})));
-.      if (ret == (@var{entry_type} *) NULL)
-.        return NULL;
-.    }
-.
-. {* Call the allocation method of the base class.  *}
-.  ret = ((@var{entry_type} *)
-.	 @var{base_newfunc} ((struct bfd_hash_entry *) ret, table, string));
-.
-. {* Initialize the local fields here.  *}
-.
-.  return (struct bfd_hash_entry *) ret;
-.}
-
-DESCRIPTION
-	The creation routine for the linker hash table, which is in
-	<<linker.c>>, looks just like this example.
-	@var{function_name} is <<_bfd_link_hash_newfunc>>.
-	@var{entry_type} is <<struct bfd_link_hash_entry>>.
-	@var{base_newfunc} is <<bfd_hash_newfunc>>, the creation
-	routine for a basic hash table.
-
-	<<_bfd_link_hash_newfunc>> also initializes the local fields
-	in a linker hash table entry: <<type>>, <<written>> and
-	<<next>>.
-
-INODE
-Write Other Derived Routines, , Write the Derived Creation Routine, Deriving a New Hash Table Type
-SUBSUBSECTION
-	Write other derived routines
-
-	You will want to write other routines for your new hash table,
-	as well.  
-
-	You will want an initialization routine which calls the
-	initialization routine of the hash table you are deriving from
-	and initializes any other local fields.  For the linker hash
-	table, this is <<_bfd_link_hash_table_init>> in <<linker.c>>.
-
-	You will want a lookup routine which calls the lookup routine
-	of the hash table you are deriving from and casts the result.
-	The linker hash table uses <<bfd_link_hash_lookup>> in
-	<<linker.c>> (this actually takes an additional argument which
-	it uses to decide how to return the looked up value).
-
-	You may want a traversal routine.  This should just call the
-	traversal routine of the hash table you are deriving from with
-	appropriate casts.  The linker hash table uses
-	<<bfd_link_hash_traverse>> in <<linker.c>>.
-
-	These routines may simply be defined as macros.  For example,
-	the a.out backend linker hash table, which is derived from the
-	linker hash table, uses macros for the lookup and traversal
-	routines.  These are <<aout_link_hash_lookup>> and
-	<<aout_link_hash_traverse>> in aoutx.h.
-*/
-
-/* The default number of entries to use when creating a hash table.  */
-#define DEFAULT_SIZE (4051)
-
-/* Create a new hash table, given a number of entries.  */
-
-boolean
-bfd_hash_table_init_n (table, newfunc, size)
-     struct bfd_hash_table *table;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-     unsigned int size;
-{
-  unsigned int alloc;
-
-  alloc = size * sizeof (struct bfd_hash_entry *);
-
-  table->memory = (PTR) objalloc_create ();
-  if (table->memory == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  table->table = ((struct bfd_hash_entry **)
-		  objalloc_alloc ((struct objalloc *) table->memory, alloc));
-  if (table->table == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  memset ((PTR) table->table, 0, alloc);
-  table->size = size;
-  table->newfunc = newfunc;
-  return true;
-}
-
-/* Create a new hash table with the default number of entries.  */
-
-boolean
-bfd_hash_table_init (table, newfunc)
-     struct bfd_hash_table *table;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  return bfd_hash_table_init_n (table, newfunc, DEFAULT_SIZE);
-}
-
-/* Free a hash table.  */
-
-void
-bfd_hash_table_free (table)
-     struct bfd_hash_table *table;
-{
-  objalloc_free ((struct objalloc *) table->memory);
-  table->memory = NULL;
-}
-
-/* Look up a string in a hash table.  */
-
-struct bfd_hash_entry *
-bfd_hash_lookup (table, string, create, copy)
-     struct bfd_hash_table *table;
-     const char *string;
-     boolean create;
-     boolean copy;
-{
-  register const unsigned char *s;
-  register unsigned long hash;
-  register unsigned int c;
-  struct bfd_hash_entry *hashp;
-  unsigned int len;
-  unsigned int index;
-  
-  hash = 0;
-  len = 0;
-  s = (const unsigned char *) string;
-  while ((c = *s++) != '\0')
-    {
-      hash += c + (c << 17);
-      hash ^= hash >> 2;
-      ++len;
-    }
-  hash += len + (len << 17);
-  hash ^= hash >> 2;
-
-  index = hash % table->size;
-  for (hashp = table->table[index];
-       hashp != (struct bfd_hash_entry *) NULL;
-       hashp = hashp->next)
-    {
-      if (hashp->hash == hash
-	  && strcmp (hashp->string, string) == 0)
-	return hashp;
-    }
-
-  if (! create)
-    return (struct bfd_hash_entry *) NULL;
-
-  hashp = (*table->newfunc) ((struct bfd_hash_entry *) NULL, table, string);
-  if (hashp == (struct bfd_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) NULL;
-  if (copy)
-    {
-      char *new;
-
-      new = (char *) objalloc_alloc ((struct objalloc *) table->memory,
-				     len + 1);
-      if (!new)
-	{
-	  bfd_set_error (bfd_error_no_memory);
-	  return (struct bfd_hash_entry *) NULL;
-	}
-      strcpy (new, string);
-      string = new;
-    }
-  hashp->string = string;
-  hashp->hash = hash;
-  hashp->next = table->table[index];
-  table->table[index] = hashp;
-
-  return hashp;
-}
-
-/* Replace an entry in a hash table.  */
-
-void
-bfd_hash_replace (table, old, nw)
-     struct bfd_hash_table *table;
-     struct bfd_hash_entry *old;
-     struct bfd_hash_entry *nw;
-{
-  unsigned int index;
-  struct bfd_hash_entry **pph;
-
-  index = old->hash % table->size;
-  for (pph = &table->table[index];
-       (*pph) != (struct bfd_hash_entry *) NULL;
-       pph = &(*pph)->next)
-    {
-      if (*pph == old)
-	{
-	  *pph = nw;
-	  return;
-	}
-    }
-
-  abort ();
-}
-
-/* Base method for creating a new hash table entry.  */
-
-/*ARGSUSED*/
-struct bfd_hash_entry *
-bfd_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  if (entry == (struct bfd_hash_entry *) NULL)
-    entry = ((struct bfd_hash_entry *)
-	     bfd_hash_allocate (table, sizeof (struct bfd_hash_entry)));
-  return entry;
-}
-
-/* Allocate space in a hash table.  */
-
-PTR
-bfd_hash_allocate (table, size)
-     struct bfd_hash_table *table;
-     unsigned int size;
-{
-  PTR ret;
-
-  ret = objalloc_alloc ((struct objalloc *) table->memory, size);
-  if (ret == NULL && size != 0)
-    bfd_set_error (bfd_error_no_memory);
-  return ret;
-}
-
-/* Traverse a hash table.  */
-
-void
-bfd_hash_traverse (table, func, info)
-     struct bfd_hash_table *table;
-     boolean (*func) PARAMS ((struct bfd_hash_entry *, PTR));
-     PTR info;
-{
-  unsigned int i;
-
-  for (i = 0; i < table->size; i++)
-    {
-      struct bfd_hash_entry *p;
-
-      for (p = table->table[i]; p != NULL; p = p->next)
-	{
-	  if (! (*func) (p, info))
-	    return;
-	}
-    }
-}
-
-/* A few different object file formats (a.out, COFF, ELF) use a string
-   table.  These functions support adding strings to a string table,
-   returning the byte offset, and writing out the table.
-
-   Possible improvements:
-   + look for strings matching trailing substrings of other strings
-   + better data structures?  balanced trees?
-   + look at reducing memory use elsewhere -- maybe if we didn't have
-     to construct the entire symbol table at once, we could get by
-     with smaller amounts of VM?  (What effect does that have on the
-     string table reductions?)  */
-
-/* An entry in the strtab hash table.  */
-
-struct strtab_hash_entry
-{
-  struct bfd_hash_entry root;
-  /* Index in string table.  */
-  bfd_size_type index;
-  /* Next string in strtab.  */
-  struct strtab_hash_entry *next;
-};
-
-/* The strtab hash table.  */
-
-struct bfd_strtab_hash
-{
-  struct bfd_hash_table table;
-  /* Size of strtab--also next available index.  */
-  bfd_size_type size;
-  /* First string in strtab.  */
-  struct strtab_hash_entry *first;
-  /* Last string in strtab.  */
-  struct strtab_hash_entry *last;
-  /* Whether to precede strings with a two byte length, as in the
-     XCOFF .debug section.  */
-  boolean xcoff;
-};
-
-static struct bfd_hash_entry *strtab_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-
-/* Routine to create an entry in a strtab.  */
-
-static struct bfd_hash_entry *
-strtab_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct strtab_hash_entry *ret = (struct strtab_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct strtab_hash_entry *) NULL)
-    ret = ((struct strtab_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct strtab_hash_entry)));
-  if (ret == (struct strtab_hash_entry *) NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct strtab_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
-  if (ret)
-    {
-      /* Initialize the local fields.  */
-      ret->index = (bfd_size_type) -1;
-      ret->next = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Look up an entry in an strtab.  */
-
-#define strtab_hash_lookup(t, string, create, copy) \
-  ((struct strtab_hash_entry *) \
-   bfd_hash_lookup (&(t)->table, (string), (create), (copy)))
-
-/* Create a new strtab.  */
-
-struct bfd_strtab_hash *
-_bfd_stringtab_init ()
-{
-  struct bfd_strtab_hash *table;
-
-  table = ((struct bfd_strtab_hash *)
-	   bfd_malloc (sizeof (struct bfd_strtab_hash)));
-  if (table == NULL)
-    return NULL;
-
-  if (! bfd_hash_table_init (&table->table, strtab_hash_newfunc))
-    {
-      free (table);
-      return NULL;
-    }
-
-  table->size = 0;
-  table->first = NULL;
-  table->last = NULL;
-  table->xcoff = false;
-
-  return table;
-}
-
-/* Create a new strtab in which the strings are output in the format
-   used in the XCOFF .debug section: a two byte length precedes each
-   string.  */
-
-struct bfd_strtab_hash *
-_bfd_xcoff_stringtab_init ()
-{
-  struct bfd_strtab_hash *ret;
-
-  ret = _bfd_stringtab_init ();
-  if (ret != NULL)
-    ret->xcoff = true;
-  return ret;
-}
-
-/* Free a strtab.  */
-
-void
-_bfd_stringtab_free (table)
-     struct bfd_strtab_hash *table;
-{
-  bfd_hash_table_free (&table->table);
-  free (table);
-}
-
-/* Get the index of a string in a strtab, adding it if it is not
-   already present.  If HASH is false, we don't really use the hash
-   table, and we don't eliminate duplicate strings.  */
-
-bfd_size_type
-_bfd_stringtab_add (tab, str, hash, copy)
-     struct bfd_strtab_hash *tab;
-     const char *str;
-     boolean hash;
-     boolean copy;
-{
-  register struct strtab_hash_entry *entry;
-
-  if (hash)
-    {
-      entry = strtab_hash_lookup (tab, str, true, copy);
-      if (entry == NULL)
-	return (bfd_size_type) -1;
-    }
-  else
-    {
-      entry = ((struct strtab_hash_entry *)
-	       bfd_hash_allocate (&tab->table,
-				  sizeof (struct strtab_hash_entry)));
-      if (entry == NULL)
-	return (bfd_size_type) -1;
-      if (! copy)
-	entry->root.string = str;
-      else
-	{
-	  char *n;
-
-	  n = (char *) bfd_hash_allocate (&tab->table, strlen (str) + 1);
-	  if (n == NULL)
-	    return (bfd_size_type) -1;
-	  entry->root.string = n;
-	}
-      entry->index = (bfd_size_type) -1;
-      entry->next = NULL;
-    }
-
-  if (entry->index == (bfd_size_type) -1)
-    {
-      entry->index = tab->size;
-      tab->size += strlen (str) + 1;
-      if (tab->xcoff)
-	{
-	  entry->index += 2;
-	  tab->size += 2;
-	}
-      if (tab->first == NULL)
-	tab->first = entry;
-      else
-	tab->last->next = entry;
-      tab->last = entry;
-    }
-
-  return entry->index;
-}
-
-/* Get the number of bytes in a strtab.  */
-
-bfd_size_type
-_bfd_stringtab_size (tab)
-     struct bfd_strtab_hash *tab;
-{
-  return tab->size;
-}
-
-/* Write out a strtab.  ABFD must already be at the right location in
-   the file.  */
-
-boolean
-_bfd_stringtab_emit (abfd, tab)
-     register bfd *abfd;
-     struct bfd_strtab_hash *tab;
-{
-  register boolean xcoff;
-  register struct strtab_hash_entry *entry;
-
-  xcoff = tab->xcoff;
-
-  for (entry = tab->first; entry != NULL; entry = entry->next)
-    {
-      register const char *str;
-      register size_t len;
-
-      str = entry->root.string;
-      len = strlen (str) + 1;
-
-      if (xcoff)
-	{
-	  bfd_byte buf[2];
-
-	  /* The output length includes the null byte.  */
-	  bfd_put_16 (abfd, len, buf);
-	  if (bfd_write ((PTR) buf, 1, 2, abfd) != 2)
-	    return false;
-	}
-
-      if (bfd_write ((PTR) str, 1, len, abfd) != len)
-	return false;
-    }
-
-  return true;
-}
diff --git a/bfd/host-aout.c b/bfd/host-aout.c
deleted file mode 100644
index 99643dcc24e..00000000000
--- a/bfd/host-aout.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* BFD backend for local host's a.out binaries
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-   Written by Cygnus Support.  Probably John Gilmore's fault.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define	ARCH_SIZE	32
-
-/* When porting to a new system, you must supply:
-
-	HOST_PAGE_SIZE		(optional)
-	HOST_SEGMENT_SIZE	(optional -- defaults to page size)
-	HOST_MACHINE_ARCH	(optional)
-	HOST_MACHINE_MACHINE	(optional)
-	HOST_TEXT_START_ADDR	(optional)
-	HOST_STACK_END_ADDR	(not used, except by trad-core ???)
-	HOST_BIG_ENDIAN_P	(required -- define if big-endian)
-
-   in the ./hosts/h-systemname.h file.  */
-
-#ifdef TRAD_HEADER
-#include TRAD_HEADER
-#endif
-
-#ifdef			HOST_PAGE_SIZE
-#define	TARGET_PAGE_SIZE	HOST_PAGE_SIZE
-#endif
-
-#ifdef			HOST_SEGMENT_SIZE
-#define	SEGMENT_SIZE	HOST_SEGMENT_SIZE
-#else
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-#endif
-
-#ifdef			HOST_TEXT_START_ADDR
-#define	TEXT_START_ADDR	HOST_TEXT_START_ADDR
-#endif
-
-#ifdef			HOST_STACK_END_ADDR
-#define	STACK_END_ADDR	HOST_STACK_END_ADDR
-#endif
-
-#ifdef			HOST_BIG_ENDIAN_P
-#define	TARGET_IS_BIG_ENDIAN_P
-#else
-#undef  TARGET_IS_BIG_ENDIAN_P
-#endif
-
-#include "libaout.h"           /* BFD a.out internal data structures */
-#include "aout/aout64.h"
-
-#ifdef HOST_MACHINE_ARCH
-#ifdef HOST_MACHINE_MACHINE
-#define SET_ARCH_MACH(abfd, execp) \
-  bfd_default_set_arch_mach(abfd, HOST_MACHINE_ARCH, HOST_MACHINE_MACHINE)
-#else
-#define SET_ARCH_MACH(abfd, execp) \
-  bfd_default_set_arch_mach(abfd, HOST_MACHINE_ARCH, 0)
-#endif
-#endif /* HOST_MACHINE_ARCH */
-
-#define MY(OP) CAT(host_aout_,OP)
-#define TARGETNAME "a.out"
-
-#include "aout-target.h"
diff --git a/bfd/hosts/alphalinux.h b/bfd/hosts/alphalinux.h
deleted file mode 100644
index d9ba1b7ec6b..00000000000
--- a/bfd/hosts/alphalinux.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Linux dumps "struct task_struct" at the end of the core-file.  This
-   structure is currently 920 bytes long, but we allow up to 1024
-   bytes to allow for some future growth.  */
-#define TRAD_CORE_EXTRA_SIZE_ALLOWED		1024
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
-  ((abfd)->tdata.trad_core_data->u.signal)
diff --git a/bfd/hosts/alphavms.h b/bfd/hosts/alphavms.h
deleted file mode 100644
index eee391a97fb..00000000000
--- a/bfd/hosts/alphavms.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/* alphavms.h -- BFD definitions for an openVMS host
-   Copyright 1996 Free Software Foundation, Inc.
-   Written by Klaus Kämpf (kkaempf@progis.de)
-   of proGIS Softwareentwicklung, Aachen, Germany
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include <stddef.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <ctype.h>
-#include <string.h>
-#include <sys/file.h>
-#include <stdlib.h>
-#include <unixlib.h>
-#include <unixio.h>
-#include <time.h>
-
-#include "bfd.h"
-
-#ifndef BFD_HOST_64_BIT
-/* Make the basic types 64-bit quantities on the host.
-   Also provide the support macros BFD needs.  */
-# ifdef __GNUC__
-#  define	BFD_HOST_64_BIT	long long
-# else
-#  define	BFD_HOST_64_BIT	long
-# endif
-typedef unsigned BFD_HOST_64_BIT uint64_type;
-typedef BFD_HOST_64_BIT int64_type;
-
-# define sprintf_vma(s,x) sprintf (s, "%016lx", x) /* BFD_HOST_64_BIT */
-# define fprintf_vma(f,x) fprintf (f, "%016lx", x) /* BFD_HOST_64_BIT */
-
-# define BYTES_IN_PRINTF_INT 4
-
-/* These must have type unsigned long because they are used as
-   arguments in printf functions.  */
-# define uint64_typeLOW(x) ((unsigned long) (((x) & 0xffffffff))) /* BFD_HOST_64_BIT */
-# define uint64_typeHIGH(x) ((unsigned long) (((x) >> 32) & 0xffffffff)) /* BFD_HOST_64_BIT */
-
-#endif /* BFD_HOST_64_BIT */
-
-#include "fopen-vms.h"
-
-#define NO_FCNTL 1
-
-#ifndef O_ACCMODE
-#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
-#endif
-
-extern int getpagesize PARAMS ((void));
diff --git a/bfd/hosts/decstation.h b/bfd/hosts/decstation.h
deleted file mode 100644
index a80c143d525..00000000000
--- a/bfd/hosts/decstation.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/* Hopefully this should include either machine/param.h (Ultrix) or
-   machine/machparam.h (Mach), whichever is its name on this system.  */
-#include <sys/param.h>
-
-#include <machine/vmparam.h>
-
-#define	HOST_PAGE_SIZE		NBPG
-/* #define	HOST_SEGMENT_SIZE	NBPG -- we use HOST_DATA_START_ADDR */
-#define	HOST_MACHINE_ARCH	bfd_arch_mips
-/* #define	HOST_MACHINE_MACHINE	 */
-
-#define	HOST_TEXT_START_ADDR		USRTEXT
-#define	HOST_DATA_START_ADDR		USRDATA
-#define	HOST_STACK_END_ADDR		USRSTACK
-
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(core_bfd) \
-  ((core_bfd)->tdata.trad_core_data->u.u_arg[0])
diff --git a/bfd/hosts/delta68.h b/bfd/hosts/delta68.h
deleted file mode 100644
index 1a6a6e6f197..00000000000
--- a/bfd/hosts/delta68.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Definitions for a Motorola Delta 3300 box running System V R3.0.
-   Contributed by manfred@lts.sel.alcatel.de.  */
-
-#include <sys/param.h>
-
-/* Definitions used by trad-core.c.  */
-#define	NBPG			NBPC
-#define	HOST_DATA_START_ADDR	u.u_exdata.ux_datorg
-#define	HOST_TEXT_START_ADDR	u.u_exdata.ux_txtorg
-#if 0
-#define	HOST_STACK_END_ADDR	0x40000000
-#else
-/* User's stack, copied from sys/param.h  */
-#define HOST_STACK_END_ADDR	USRSTACK
-#endif
-#define	UPAGES			USIZE
-#define	TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
-  abfd->tdata.trad_core_data->u.u_abort
diff --git a/bfd/hosts/dpx2.h b/bfd/hosts/dpx2.h
deleted file mode 100644
index ea6395f2e5d..00000000000
--- a/bfd/hosts/dpx2.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Definitions that are needed for core files.  Core section sizes for
-   the DPX2 are in bytes.  */
-
-#include <sys/param.h>
-#define NBPG 1
-#define UPAGES (USIZE * NBPP)
-#define HOST_DATA_START_ADDR (u.u_exdata.ux_datorg)
-#define HOST_STACK_END_ADDR (USERSTACK)
diff --git a/bfd/hosts/hp300bsd.h b/bfd/hosts/hp300bsd.h
deleted file mode 100644
index 98287178207..00000000000
--- a/bfd/hosts/hp300bsd.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <sys/param.h>
-#ifdef BSD4_4
-#define NO_CORE_COMMAND
-#endif
-
-#define	HOST_PAGE_SIZE		NBPG
-#define	HOST_SEGMENT_SIZE	NBPG	/* Data seg start addr rounds to NBPG */
-#define	HOST_MACHINE_ARCH	bfd_arch_m68k
-/* #define	HOST_MACHINE_MACHINE	 */
-
-#define	HOST_TEXT_START_ADDR		0
-#define	HOST_STACK_END_ADDR		0xfff00000
-#define	HOST_BIG_ENDIAN_P
diff --git a/bfd/hosts/i386bsd.h b/bfd/hosts/i386bsd.h
deleted file mode 100644
index 8eee3d82fb7..00000000000
--- a/bfd/hosts/i386bsd.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/* Intel 386 running any BSD Unix */
-
-#include <machine/param.h>
-#include <machine/vmparam.h>
-
-/* Recent versions of FreeBSD don't define NBPG.  */
-#ifndef NBPG
-#ifdef PAGE_SIZE
-#define NBPG PAGE_SIZE
-#endif
-#endif
-
-#define	HOST_PAGE_SIZE		NBPG
-#define	HOST_MACHINE_ARCH	bfd_arch_i386
-#define	HOST_TEXT_START_ADDR		USRTEXT
-
-/* Jolitz suggested defining HOST_STACK_END_ADDR to
-   (u.u_kproc.kp_eproc.e_vm.vm_maxsaddr + MAXSSIZ), which should work on
-   both BSDI and 386BSD, but that is believed not to work for BSD 4.4.  */
-
-#ifdef __bsdi__
-/* This seems to be the right thing for BSDI.  */
-#define	HOST_STACK_END_ADDR		USRSTACK
-#define HOST_DATA_START_ADDR ((bfd_vma)u.u_kproc.kp_eproc.e_vm.vm_daddr)
-#else
-/* This seems to be the right thing for 386BSD release 0.1.  */
-#define	HOST_STACK_END_ADDR		(USRSTACK - MAXSSIZ)
-#endif
-
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(core_bfd) \
-  ((core_bfd)->tdata.trad_core_data->u.u_sig)
-#define u_comm u_kproc.kp_proc.p_comm
diff --git a/bfd/hosts/i386linux.h b/bfd/hosts/i386linux.h
deleted file mode 100644
index 13a51f1bd14..00000000000
--- a/bfd/hosts/i386linux.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* Linux writes the task structure at the end of the core file.  Currently it
-   is 2912 bytes.  It is possible that this should be a pickier check, but
-   we should probably not be too picky (the size of the task structure might
-   vary, and if it's not the length we expect it to be, it doesn't affect
-   our ability to process the core file).  So allow 0-4096 extra bytes at
-   the end.  */
-
-#define TRAD_CORE_EXTRA_SIZE_ALLOWED 4096
diff --git a/bfd/hosts/i386mach3.h b/bfd/hosts/i386mach3.h
deleted file mode 100644
index dcc61e3c8e8..00000000000
--- a/bfd/hosts/i386mach3.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#include <machine/vmparam.h>
-#include <sys/param.h>
-
-/* This is an ugly way to hack around the incorrect
- * definition of UPAGES in i386/machparam.h.
- *
- * The definition should specify the size reserved
- * for "struct user" in core files in PAGES,
- * but instead it gives it in 512-byte core-clicks
- * for i386 and i860. UPAGES is used only in trad-core.c.
- */
-#if UPAGES == 16
-#undef  UPAGES
-#define UPAGES 2
-#endif
-
-#if UPAGES != 2
-FIXME!! UPAGES is neither 2 nor 16
-#endif
-
-#define	HOST_PAGE_SIZE		1
-#define	HOST_SEGMENT_SIZE	NBPG
-#define	HOST_MACHINE_ARCH	bfd_arch_i386
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
diff --git a/bfd/hosts/i386sco.h b/bfd/hosts/i386sco.h
deleted file mode 100644
index ec8608c61dd..00000000000
--- a/bfd/hosts/i386sco.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Core file stuff.  At least some, perhaps all, of the following
-   defines work on many more systems than just SCO.  */
-
-#define NBPG NBPC
-#define UPAGES USIZE
-#define HOST_DATA_START_ADDR u.u_exdata.ux_datorg
-#define HOST_STACK_START_ADDR u.u_sub
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
-  ((core_upage(abfd)->u_sysabort != 0) \
-   ? core_upage(abfd)->u_sysabort \
-   : -1)
-
-/* According to the manpage, a version 2 SCO corefile can contain
-   various additional sections (it is cleverly arranged so the u area,
-   data, and stack are first where we can find them).  So without
-   writing lots of code to parse all their headers and stuff, we can't
-   know whether a corefile is bigger than it should be.  */
-
-#define TRAD_CORE_ALLOW_ANY_EXTRA_SIZE 1
diff --git a/bfd/hosts/i860mach3.h b/bfd/hosts/i860mach3.h
deleted file mode 100644
index edd2aa10a7b..00000000000
--- a/bfd/hosts/i860mach3.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* This file was hacked from i386mach3.h   [dolan@ssd.intel.com] */
-
-#include <machine/vmparam.h>
-#include <sys/param.h>
-
-/* This is an ugly way to hack around the incorrect
- * definition of UPAGES in i386/machparam.h.
- *
- * The definition should specify the size reserved
- * for "struct user" in core files in PAGES,
- * but instead it gives it in 512-byte core-clicks
- * for i386 and i860. UPAGES is used only in trad-core.c.
- */
-#if UPAGES == 16
-#undef  UPAGES
-#define UPAGES 2
-#endif
-
-#if UPAGES != 2
-FIXME!! UPAGES is neither 2 nor 16
-#endif
-
-#define	HOST_PAGE_SIZE		1
-#define	HOST_SEGMENT_SIZE	NBPG
-#define	HOST_MACHINE_ARCH	bfd_arch_i860
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
diff --git a/bfd/hosts/m68kaux.h b/bfd/hosts/m68kaux.h
deleted file mode 100644
index 6237755dba5..00000000000
--- a/bfd/hosts/m68kaux.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* Definitions for an Apple Macintosh running A/UX 3.x. */
-
-#include <sys/param.h>
-#include <sys/page.h>
-
-/* Definitions used by trad-core.c.  */
-#define	NBPG			NBPP
-
-#define	HOST_DATA_START_ADDR	u.u_exdata.ux_datorg
-#define	HOST_TEXT_START_ADDR	u.u_exdata.ux_txtorg
-#define	HOST_STACK_END_ADDR	0x100000000
-
-#define	UPAGES			USIZE
-
-#define	TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
-  (abfd->tdata.trad_core_data->u.u_arg[0])
diff --git a/bfd/hosts/m68klinux.h b/bfd/hosts/m68klinux.h
deleted file mode 100644
index 0067dfa6fda..00000000000
--- a/bfd/hosts/m68klinux.h
+++ /dev/null
@@ -1,6 +0,0 @@
-/* Linux dumps "struct task_struct" at the end of the core-file.  This
-   structure is currently 2512 bytes long, but we allow up to 4096
-   bytes to allow for some future growth.  */
-#define TRAD_CORE_EXTRA_SIZE_ALLOWED		4096
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(abfd) \
-  ((abfd)->tdata.trad_core_data->u.signal)
diff --git a/bfd/hosts/m88kmach3.h b/bfd/hosts/m88kmach3.h
deleted file mode 100644
index 421553893ec..00000000000
--- a/bfd/hosts/m88kmach3.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <machine/vmparam.h>
-#include <sys/param.h>
-
-#undef UPAGES
-#define UPAGES 3
-
-#define	HOST_PAGE_SIZE		NBPG
-#define	HOST_SEGMENT_SIZE	NBPG
-#define	HOST_MACHINE_ARCH	bfd_arch_m88k
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
diff --git a/bfd/hosts/mipsbsd.h b/bfd/hosts/mipsbsd.h
deleted file mode 100644
index a2fad21fcf7..00000000000
--- a/bfd/hosts/mipsbsd.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <machine/param.h>
-#include <machine/vmparam.h>
-#undef ALIGN
-
-#define	HOST_PAGE_SIZE		NBPG
-/* #define	HOST_SEGMENT_SIZE	NBPG -- we use HOST_DATA_START_ADDR */
-#define	HOST_MACHINE_ARCH	bfd_arch_mips
-/* #define	HOST_MACHINE_MACHINE	 */
-
-#define	HOST_TEXT_START_ADDR		USRTEXT
-#define	HOST_STACK_END_ADDR		USRSTACK
-#define NO_CORE_COMMAND
diff --git a/bfd/hosts/mipsmach3.h b/bfd/hosts/mipsmach3.h
deleted file mode 100644
index c5c468d3742..00000000000
--- a/bfd/hosts/mipsmach3.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <machine/vmparam.h>
-#include <machine/machparam.h>
-#include <sys/param.h>
-
-#define	HOST_PAGE_SIZE		NBPG
-/* #define	HOST_SEGMENT_SIZE	NBPG  */
-#define	HOST_MACHINE_ARCH	bfd_arch_mips
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_DATA_START_ADDR	USRDATA
-#define	HOST_STACK_END_ADDR	USRSTACK
diff --git a/bfd/hosts/news-mips.h b/bfd/hosts/news-mips.h
deleted file mode 100644
index 9e799bed904..00000000000
--- a/bfd/hosts/news-mips.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/* Sony News running NewsOS 3.2.  */
-
-#include <sys/param.h>
-#include <machine/vmparam.h>
-
-#define HOST_PAGE_SIZE NBPG
-
-#define HOST_MACHINE_ARCH bfd_arch_mips
-
-#define HOST_TEXT_START_ADDR USRTEXT
-#define HOST_DATA_START_ADDR USRDATA
-#define HOST_STACK_END_ADDR USRSTACK
diff --git a/bfd/hosts/news.h b/bfd/hosts/news.h
deleted file mode 100644
index bf7946cdb99..00000000000
--- a/bfd/hosts/news.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/* Sony News running NewsOS 3.2.  */
-
-#include <machine/vmparam.h>
-
-#define HOST_PAGE_SIZE NBPG
-#define HOST_SEGMENT_SIZE NBPG
-#define HOST_MACHINE_ARCH bfd_arch_m68k
-#define HOST_TEXT_START_ADDR 0
-#define HOST_STACK_END_ADDR (KERNBASE - (UPAGES * NBPG))
diff --git a/bfd/hosts/pc532mach.h b/bfd/hosts/pc532mach.h
deleted file mode 100644
index ab96f597edd..00000000000
--- a/bfd/hosts/pc532mach.h
+++ /dev/null
@@ -1,24 +0,0 @@
-#include <machine/vmparam.h>
-#include <sys/param.h>
-
-/* This is an ugly way to hack around the incorrect
- * definition of UPAGES in ns532/machparam.h.
- *
- * The definition should specify the size reserved
- * for "struct user" in core files in PAGES,
- * but instead it gives it in 512-byte core-clicks
- * for ns532, i386 and i860. UPAGES is used only in trad-core.c.
- */
-#if UPAGES == 16
-#undef  UPAGES
-#define UPAGES 2
-#endif
-
-#if UPAGES != 2
-#error UPAGES is neither 2 nor 16
-#endif
-
-#define	HOST_PAGE_SIZE		1
-#define	HOST_SEGMENT_SIZE	NBPG
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
diff --git a/bfd/hosts/riscos.h b/bfd/hosts/riscos.h
deleted file mode 100644
index 8ffa826bdcf..00000000000
--- a/bfd/hosts/riscos.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/* RISC/os 4.52C, and presumably other versions.  */
-
-#include <bsd43/machine/machparam.h>
-#include <bsd43/machine/vmparam.h>
-
-#define NBPG BSD43_NBPG
-#define UPAGES BSD43_UPAGES
-#define HOST_TEXT_START_ADDR BSD43_USRTEXT
-#define HOST_DATA_START_ADDR BSD43_USRDATA
-#define HOST_STACK_END_ADDR BSD43_USRSTACK
diff --git a/bfd/hosts/symmetry.h b/bfd/hosts/symmetry.h
deleted file mode 100644
index 75717b31eb2..00000000000
--- a/bfd/hosts/symmetry.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Symmetry running either dynix 3.1 (bsd) or ptx (sysv).  */
-
-#define NBPG 4096
-#define UPAGES 1
-
-#ifdef _SEQUENT_
-/* ptx */
-#define HOST_TEXT_START_ADDR 0
-#define HOST_STACK_END_ADDR 0x3fffe000
-#define TRAD_CORE_USER_OFFSET ((UPAGES * NBPG) - sizeof (struct user))
-#else
-/* dynix */
-#define HOST_TEXT_START_ADDR 0x1000
-#define HOST_DATA_START_ADDR (NBPG * u.u_tsize)
-#define HOST_STACK_END_ADDR 0x3ffff000
-#define TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(core_bfd) \
-  ((core_bfd)->tdata.trad_core_data->u.u_arg[0])
-#endif
-
-#define TRAD_CORE_DSIZE_INCLUDES_TSIZE
diff --git a/bfd/hosts/tahoe.h b/bfd/hosts/tahoe.h
deleted file mode 100644
index 716cee2a171..00000000000
--- a/bfd/hosts/tahoe.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#define	NO_CORE_COMMAND
-
-#undef	ALIGN			/* They use it, we use it too */
-#include <machine/param.h>
-#undef	ALIGN			/* They use it, we use it too */
-
-#define	HOST_PAGE_SIZE		NBPG
-#define	HOST_MACHINE_ARCH	bfd_arch_tahoe
-
-#define	HOST_TEXT_START_ADDR	0
-#define	HOST_STACK_END_ADDR	(KERNBASE - (UPAGES * NBPG))
-#define	HOST_BIG_ENDIAN_P
diff --git a/bfd/hosts/vaxbsd.h b/bfd/hosts/vaxbsd.h
deleted file mode 100644
index ceb9ccedfaf..00000000000
--- a/bfd/hosts/vaxbsd.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#define	NO_CORE_COMMAND		/* No command name in core file */
-
-#if 0
-#undef	ALIGN			/* They use it, we use it too */
-/* Does not exist on BSD 4.3, it uses machine/machparam.h.
-   Whatever it is, it's included by <sys/param.h>, which trad-core.c,
-   the only place that uses this (I think), already includes.  */
-#include <machine/param.h>
-#endif
-#undef	ALIGN			/* They use it, we use it too */
-
-/* Note that HOST_PAGE_SIZE -- the page size as far as executable files
-   are concerned -- is not the same as NBPG, because of page clustering.  */
-#define	HOST_PAGE_SIZE		1024
-#define	HOST_MACHINE_ARCH	bfd_arch_vax
-
-#define	HOST_TEXT_START_ADDR	0
-#define	HOST_STACK_END_ADDR	(0x80000000 - (UPAGES * NBPG))
-#undef	HOST_BIG_ENDIAN_P
diff --git a/bfd/hosts/vaxult.h b/bfd/hosts/vaxult.h
deleted file mode 100644
index 13731b7479f..00000000000
--- a/bfd/hosts/vaxult.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <machine/param.h>
-#include <machine/vmparam.h>
-#define	HOST_PAGE_SIZE		(NBPG*CLSIZE)
-#define	HOST_MACHINE_ARCH	bfd_arch_vax
-
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
-#undef	HOST_BIG_ENDIAN_P
diff --git a/bfd/hosts/vaxult2.h b/bfd/hosts/vaxult2.h
deleted file mode 100644
index 13731b7479f..00000000000
--- a/bfd/hosts/vaxult2.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <machine/param.h>
-#include <machine/vmparam.h>
-#define	HOST_PAGE_SIZE		(NBPG*CLSIZE)
-#define	HOST_MACHINE_ARCH	bfd_arch_vax
-
-#define	HOST_TEXT_START_ADDR	USRTEXT
-#define	HOST_STACK_END_ADDR	USRSTACK
-#undef	HOST_BIG_ENDIAN_P
diff --git a/bfd/hp300bsd.c b/bfd/hp300bsd.c
deleted file mode 100644
index 5767b18c179..00000000000
--- a/bfd/hp300bsd.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* BFD back-end for HP 9000/300 (68000-based) machines running BSD Unix.
-   Copyright 1992 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGET_IS_BIG_ENDIAN_P
-#define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
-#define ENTRY_CAN_BE_ZERO
-#define N_SHARED_LIB(x) 0 /* Avoids warning */
-#define TEXT_START_ADDR 0
-#define TARGET_PAGE_SIZE 4096
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_m68k
-
-#define MY(OP) CAT(hp300bsd_,OP)
-#define TARGETNAME "a.out-hp300bsd"
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
-
-#include "aout-target.h"
diff --git a/bfd/hp300hpux.c b/bfd/hp300hpux.c
deleted file mode 100644
index 9552318baa8..00000000000
--- a/bfd/hp300hpux.c
+++ /dev/null
@@ -1,870 +0,0 @@
-/* BFD backend for hp-ux 9000/300
-   Copyright (C) 1990, 1991, 1994, 1995 Free Software Foundation, Inc.
-   Written by Glenn Engel.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-
-    hpux native  ------------> |               |
-                               | hp300hpux bfd | ----------> hpux w/gnu ext
-    hpux w/gnu extension ----> |               |
-
-
-    Support for the 9000/[34]00 has several limitations.
-      1. Shared libraries are not supported.
-      2. The output format from this bfd is not usable by native tools.
-
-    The primary motivation for writing this bfd was to allow use of
-    gdb and gcc for host based debugging and not to mimic the hp-ux tools
-    in every detail.  This leads to a significant simplification of the
-    code and a leap in performance.  The decision to not output hp native
-    compatible objects was further strengthened by the fact that the richness
-    of the gcc compiled objects could not be represented without loss of
-    information.  For example, while the hp format supports the concept of
-    secondary symbols, it does not support indirect symbols.  Another
-    reason is to maintain backwards compatibility with older implementations
-    of gcc on hpux which used 'hpxt' to translate .a and .o files into a
-    format which could be readily understood by the gnu linker and gdb.
-    This allows reading hp secondary symbols and converting them into
-    indirect symbols but the reverse it not always possible.
-
-    Another example of differences is that the hp format stores symbol offsets
-    in the object code while the gnu utilities use a field in the
-    relocation record for this.  To support the hp native format, the object
-    code would need to be patched with the offsets when producing .o files.
-
-    The basic technique taken in this implementation is to #include the code
-    from aoutx.h and aout-target.h with appropriate #defines to override
-    code where a unique implementation is needed:
-
-    {
-        #define a bunch of stuff
-        #include <aoutx.h>
-
-        implement a bunch of functions
-
-        #include "aout-target.h"
-    }
-
-    The hp symbol table is a bit different than other a.out targets.  Instead
-    of having an array of nlist items and an array of strings, hp's format
-    has them mixed together in one structure.  In addition, the strings are
-    not null terminated.  It looks something like this:
-
-    nlist element 1
-    string1
-    nlist element 2
-    string2
-    ...
-
-    The whole symbol table is read as one chunk and then we march thru it
-    and convert it to canonical form.  As we march thru the table, we copy
-    the nlist data into the internal form and we compact the strings and null
-    terminate them, using storage from the already allocated symbol table:
-
-    string1
-    null
-    string2
-    null
- */
-
-/* @@ Is this really so different from normal a.out that it needs to include
-   aoutx.h?  We should go through this file sometime and see what can be made
-   more dependent on aout32.o and what might need to be broken off and accessed
-   through the backend_data field.  Or, maybe we really do need such a
-   completely separate implementation.  I don't have time to investigate this
-   much further right now.  [raeburn:19930428.2124EST] */
-/* @@ Also, note that there wind up being two versions of some routines, with
-   different names, only one of which actually gets used.  For example:
-	slurp_symbol_table
-	swap_std_reloc_in
-	slurp_reloc_table
-	get_symtab
-	get_symtab_upper_bound
-	canonicalize_reloc
-	mkobject
-   This should also be fixed.  */
-
-#define TARGETNAME "a.out-hp300hpux"
-#define MY(OP) CAT(hp300hpux_,OP)
-
-#define external_exec hp300hpux_exec_bytes
-#define external_nlist hp300hpux_nlist_bytes
-
-#include "aout/hp300hpux.h"
-
-/* define these so we can compile unused routines in aoutx.h */
-#define e_strx  e_shlib
-#define e_other e_length
-#define e_desc  e_almod
-
-#define AR_PAD_CHAR '/'
-#define TARGET_IS_BIG_ENDIAN_P
-#define DEFAULT_ARCH bfd_arch_m68k
-
-#define MY_get_section_contents aout_32_get_section_contents
-#define MY_slurp_armap bfd_slurp_bsd_armap_f2
-
-/***********************************************/
-/* provide overrides for routines in this file */
-/***********************************************/
-/* these don't use MY because that causes problems within JUMP_TABLE
-   (CAT winds up being expanded recursively, which ANSI C compilers
-   will not do).  */
-#define MY_get_symtab hp300hpux_get_symtab
-#define MY_get_symtab_upper_bound hp300hpux_get_symtab_upper_bound
-#define MY_canonicalize_reloc hp300hpux_canonicalize_reloc
-#define MY_write_object_contents hp300hpux_write_object_contents
-
-#define MY_read_minisymbols _bfd_generic_read_minisymbols
-#define MY_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define MY_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define MY_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define MY_final_link_callback unused
-#define MY_bfd_final_link _bfd_generic_final_link
-
-/* Until and unless we convert the slurp_reloc and slurp_symtab
-   routines in this file, we can not use the default aout
-   free_cached_info routine which assumes that the relocs and symtabs
-   were allocated using malloc.  */
-#define MY_bfd_free_cached_info bfd_true
-
-#define hp300hpux_write_syms aout_32_write_syms
-
-#define MY_callback MY(callback)
-
-#define MY_exec_hdr_flags 0x2
-
-#define NAME_swap_exec_header_in NAME(hp300hpux_32_,swap_exec_header_in)
-
-#define HP_SYMTYPE_UNDEFINED	0x00
-#define HP_SYMTYPE_ABSOLUTE	0x01
-#define HP_SYMTYPE_TEXT		0x02
-#define HP_SYMTYPE_DATA		0x03
-#define HP_SYMTYPE_BSS		0x04
-#define HP_SYMTYPE_COMMON	0x05
-
-#define HP_SYMTYPE_TYPE		0x0F
-#define HP_SYMTYPE_FILENAME	0x1F
-
-#define HP_SYMTYPE_ALIGN	0x10
-#define HP_SYMTYPE_EXTERNAL	0x20
-#define HP_SECONDARY_SYMBOL     0x40
-
-/* RELOCATION DEFINITIONS */
-#define HP_RSEGMENT_TEXT	0x00
-#define HP_RSEGMENT_DATA	0x01
-#define HP_RSEGMENT_BSS		0x02
-#define HP_RSEGMENT_EXTERNAL	0x03
-#define HP_RSEGMENT_PCREL       0x04
-#define HP_RSEGMENT_RDLT        0x05
-#define HP_RSEGMENT_RPLT        0x06
-#define HP_RSEGMENT_NOOP	0x3F
-
-#define HP_RLENGTH_BYTE		0x00
-#define HP_RLENGTH_WORD		0x01
-#define HP_RLENGTH_LONG		0x02
-#define HP_RLENGTH_ALIGN	0x03
-
-#define NAME(x,y) CAT3(hp300hpux,_32_,y)
-#define ARCH_SIZE 32
-
-/* aoutx.h requires definitions for BMAGIC and QMAGIC.  */
-#define BMAGIC HPUX_DOT_O_MAGIC
-#define QMAGIC 0314
-
-#include "aoutx.h"
-
-/* Since the hpux symbol table has nlist elements interspersed with
-   strings and we need to insert som strings for secondary symbols, we
-   give ourselves a little extra padding up front to account for
-   this.  Note that for each non-secondary symbol we process, we gain
-   9 bytes of space for the discarded nlist element (one byte used for
-   null).  SYM_EXTRA_BYTES is the extra space.  */
-#define SYM_EXTRA_BYTES   1024
-
-/* Set parameters about this a.out file that are machine-dependent.
-   This routine is called from some_aout_object_p just before it returns.  */
-static const bfd_target *
-MY (callback) (abfd)
-     bfd *abfd;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  /* Calculate the file positions of the parts of a newly read aout header */
-  obj_textsec (abfd)->_raw_size = N_TXTSIZE (*execp);
-
-  /* The virtual memory addresses of the sections */
-  obj_textsec (abfd)->vma = N_TXTADDR (*execp);
-  obj_datasec (abfd)->vma = N_DATADDR (*execp);
-  obj_bsssec (abfd)->vma = N_BSSADDR (*execp);
-
-  obj_textsec (abfd)->lma = obj_textsec (abfd)->vma;
-  obj_datasec (abfd)->lma = obj_datasec (abfd)->vma;
-  obj_bsssec (abfd)->lma = obj_bsssec (abfd)->vma;
-
-  /* The file offsets of the sections */
-  obj_textsec (abfd)->filepos = N_TXTOFF (*execp);
-  obj_datasec (abfd)->filepos = N_DATOFF (*execp);
-
-  /* The file offsets of the relocation info */
-  obj_textsec (abfd)->rel_filepos = N_TRELOFF (*execp);
-  obj_datasec (abfd)->rel_filepos = N_DRELOFF (*execp);
-
-  /* The file offsets of the string table and symbol table.  */
-  obj_sym_filepos (abfd) = N_SYMOFF (*execp);
-  obj_str_filepos (abfd) = N_STROFF (*execp);
-
-  /* Determine the architecture and machine type of the object file.  */
-#ifdef SET_ARCH_MACH
-  SET_ARCH_MACH (abfd, *execp);
-#else
-  bfd_default_set_arch_mach (abfd, DEFAULT_ARCH, 0);
-#endif
-
-
-  if (obj_aout_subformat (abfd) == gnu_encap_format)
-    {
-      /* The file offsets of the relocation info */
-      obj_textsec (abfd)->rel_filepos = N_GNU_TRELOFF (*execp);
-      obj_datasec (abfd)->rel_filepos = N_GNU_DRELOFF (*execp);
-
-      /* The file offsets of the string table and symbol table.  */
-      obj_sym_filepos (abfd) = N_GNU_SYMOFF (*execp);
-      obj_str_filepos (abfd) = (obj_sym_filepos (abfd) + execp->a_syms);
-
-      abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
-      bfd_get_symcount (abfd) = execp->a_syms / 12;
-      obj_symbol_entry_size (abfd) = 12;
-      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-    }
-
-  return abfd->xvec;
-}
-
-extern boolean aout_32_write_syms PARAMS ((bfd * abfd));
-
-static boolean
-MY (write_object_contents) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-  bfd_size_type text_size;	/* dummy vars */
-  file_ptr text_end;
-
-  memset (&exec_bytes, 0, sizeof (exec_bytes));
-#if CHOOSE_RELOC_SIZE
-  CHOOSE_RELOC_SIZE (abfd);
-#else
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-#endif
-
-  if (adata (abfd).magic == undecided_magic)
-    NAME (aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
-  execp->a_syms = 0;
-
-  execp->a_entry = bfd_get_start_address (abfd);
-
-  execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *
-		     obj_reloc_entry_size (abfd));
-  execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *
-		     obj_reloc_entry_size (abfd));
-
-  N_SET_MACHTYPE (*execp, 0xc);
-  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
-
-  NAME (aout,swap_exec_header_out) (abfd, execp, &exec_bytes);
-
-  /* update fields not covered by default swap_exec_header_out */
-
-  /* this is really the sym table size but we store it in drelocs */
-  bfd_h_put_32 (abfd, bfd_get_symcount (abfd) * 12, exec_bytes.e_drelocs);
-
-  if (bfd_seek (abfd, 0L, false) != 0
-      || (bfd_write ((PTR) & exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-	  != EXEC_BYTES_SIZE))
-    return false;
-
-  /* Write out the symbols, and then the relocs.  We must write out
-       the symbols first so that we know the symbol indices.  */
-
-  if (bfd_get_symcount (abfd) != 0)
-    {
-      /* Skip the relocs to where we want to put the symbols.  */
-      if (bfd_seek (abfd, (file_ptr) N_DRELOFF (*execp) + execp->a_drsize,
-		    SEEK_SET) != 0)
-	return false;
-    }
-
-  if (!MY (write_syms) (abfd))
-    return false;
-
-  if (bfd_get_symcount (abfd) != 0)
-    {
-      if (bfd_seek (abfd, (long) (N_TRELOFF (*execp)), false) != 0)
-	return false;
-      if (!NAME (aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))
-	return false;
-      if (bfd_seek (abfd, (long) (N_DRELOFF (*execp)), false) != 0)
-	return false;
-      if (!NAME (aout,squirt_out_relocs) (abfd, obj_datasec (abfd)))
-	return false;
-    }
-
-  return true;
-}
-
-/* convert the hp symbol type to be the same as aout64.h usage so we */
-/* can piggyback routines in aoutx.h.                                */
-
-static void
-convert_sym_type (sym_pointer, cache_ptr, abfd)
-     struct external_nlist *sym_pointer;
-     aout_symbol_type *cache_ptr;
-     bfd *abfd;
-{
-  int name_type;
-  int new_type;
-
-  name_type = (cache_ptr->type);
-  new_type = 0;
-
-  if ((name_type & HP_SYMTYPE_ALIGN) != 0)
-    {
-      /* iou_error ("aligned symbol encountered: %s", name);*/
-      name_type = 0;
-    }
-
-  if (name_type == HP_SYMTYPE_FILENAME)
-    new_type = N_FN;
-  else
-    {
-      switch (name_type & HP_SYMTYPE_TYPE)
-	{
-	case HP_SYMTYPE_UNDEFINED:
-	  new_type = N_UNDF;
-	  break;
-
-	case HP_SYMTYPE_ABSOLUTE:
-	  new_type = N_ABS;
-	  break;
-
-	case HP_SYMTYPE_TEXT:
-	  new_type = N_TEXT;
-	  break;
-
-	case HP_SYMTYPE_DATA:
-	  new_type = N_DATA;
-	  break;
-
-	case HP_SYMTYPE_BSS:
-	  new_type = N_BSS;
-	  break;
-
-	case HP_SYMTYPE_COMMON:
-	  new_type = N_COMM;
-	  break;
-
-	default:
-	  abort ();
-	  break;
-	}
-      if (name_type & HP_SYMTYPE_EXTERNAL)
-	new_type |= N_EXT;
-
-      if (name_type & HP_SECONDARY_SYMBOL)
-	{
-	  switch (new_type)
-	    {
-	    default:
-	      abort ();
-	    case N_UNDF | N_EXT:
-	      /* If the value is nonzero, then just treat this as a
-                 common symbol.  I don't know if this is correct in
-                 all cases, but it is more correct than treating it as
-                 a weak undefined symbol.  */
-	      if (cache_ptr->symbol.value == 0)
-		new_type = N_WEAKU;
-	      break;
-	    case N_ABS | N_EXT:
-	      new_type = N_WEAKA;
-	      break;
-	    case N_TEXT | N_EXT:
-	      new_type = N_WEAKT;
-	      break;
-	    case N_DATA | N_EXT:
-	      new_type = N_WEAKD;
-	      break;
-	    case N_BSS | N_EXT:
-	      new_type = N_WEAKB;
-	      break;
-	    }
-	}
-    }
-  cache_ptr->type = new_type;
-
-}
-
-
-/*
-DESCRIPTION
-        Swaps the information in an executable header taken from a raw
-        byte stream memory image, into the internal exec_header
-        structure.
-*/
-
-void
-NAME (aout,swap_exec_header_in) (abfd, raw_bytes, execp)
-     bfd *abfd;
-     struct external_exec *raw_bytes;
-     struct internal_exec *execp;
-{
-  struct external_exec *bytes = (struct external_exec *) raw_bytes;
-
-  /* The internal_exec structure has some fields that are unused in this
-     configuration (IE for i960), so ensure that all such uninitialized
-     fields are zero'd out.  There are places where two of these structs
-     are memcmp'd, and thus the contents do matter. */
-  memset (execp, 0, sizeof (struct internal_exec));
-  /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info = bfd_h_get_32 (abfd, bytes->e_info);
-  execp->a_text = GET_WORD (abfd, bytes->e_text);
-  execp->a_data = GET_WORD (abfd, bytes->e_data);
-  execp->a_bss = GET_WORD (abfd, bytes->e_bss);
-  execp->a_syms = GET_WORD (abfd, bytes->e_syms);
-  execp->a_entry = GET_WORD (abfd, bytes->e_entry);
-  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
-  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
-
-  /***************************************************************/
-  /* check the header to see if it was generated by a bfd output */
-  /* this is detected rather bizarely by requiring a bunch of    */
-  /* header fields to be zero and an old unused field (now used) */
-  /* to be set.                                                  */
-  /***************************************************************/
-  do
-    {
-      long syms;
-      struct aout_data_struct *rawptr;
-      if (bfd_h_get_32 (abfd, bytes->e_passize) != 0)
-	break;
-      if (bfd_h_get_32 (abfd, bytes->e_syms) != 0)
-	break;
-      if (bfd_h_get_32 (abfd, bytes->e_supsize) != 0)
-	break;
-
-      syms = bfd_h_get_32 (abfd, bytes->e_drelocs);
-      if (syms == 0)
-	break;
-
-      /* OK, we've passed the test as best as we can determine */
-      execp->a_syms = syms;
-
-      /* allocate storage for where we will store this result */
-      rawptr = (struct aout_data_struct *) bfd_zalloc (abfd, sizeof (*rawptr));
-
-      if (rawptr == NULL)
-	return;
-      abfd->tdata.aout_data = rawptr;
-      obj_aout_subformat (abfd) = gnu_encap_format;
-    }
-  while (0);
-}
-
-
-/* The hp symbol table is a bit different than other a.out targets.  Instead
-   of having an array of nlist items and an array of strings, hp's format
-   has them mixed together in one structure.  In addition, the strings are
-   not null terminated.  It looks something like this:
-
-   nlist element 1
-   string1
-   nlist element 2
-   string2
-   ...
-
-   The whole symbol table is read as one chunk and then we march thru it
-   and convert it to canonical form.  As we march thru the table, we copy
-   the nlist data into the internal form and we compact the strings and null
-   terminate them, using storage from the already allocated symbol table:
-
-   string1
-   null
-   string2
-   null
-   ...
-*/
-
-boolean
-MY (slurp_symbol_table) (abfd)
-     bfd *abfd;
-{
-  bfd_size_type symbol_bytes;
-  struct external_nlist *syms;
-  struct external_nlist *sym_pointer;
-  struct external_nlist *sym_end;
-  char *strings;
-  aout_symbol_type *cached;
-  unsigned num_syms = 0;
-
-  /* If there's no work to be done, don't do any */
-  if (obj_aout_symbols (abfd) != (aout_symbol_type *) NULL)
-    return true;
-  symbol_bytes = exec_hdr (abfd)->a_syms;
-
-  strings = (char *) bfd_alloc (abfd,
-				symbol_bytes + SYM_EXTRA_BYTES);
-  if (!strings)
-    return false;
-  syms = (struct external_nlist *) (strings + SYM_EXTRA_BYTES);
-  if (bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET) != 0
-      || bfd_read ((PTR) syms, symbol_bytes, 1, abfd) != symbol_bytes)
-    {
-      bfd_release (abfd, syms);
-      return false;
-    }
-
-
-  sym_end = (struct external_nlist *) (((char *) syms) + symbol_bytes);
-
-  /* first, march thru the table and figure out how many symbols there are */
-  for (sym_pointer = syms; sym_pointer < sym_end; sym_pointer++, num_syms++)
-    {
-      /* skip over the embedded symbol. */
-      sym_pointer = (struct external_nlist *) (((char *) sym_pointer) +
-					       sym_pointer->e_length[0]);
-    }
-
-  /* now that we know the symbol count, update the bfd header */
-  bfd_get_symcount (abfd) = num_syms;
-
-  cached = ((aout_symbol_type *)
-	    bfd_zalloc (abfd,
-			bfd_get_symcount (abfd) * sizeof (aout_symbol_type)));
-  if (cached == NULL && bfd_get_symcount (abfd) != 0)
-    return false;
-
-  /* as we march thru the hp symbol table, convert it into a list of
-     null terminated strings to hold the symbol names.  Make sure any
-     assignment to the strings pointer is done after we're thru using
-     the nlist so we don't overwrite anything important. */
-
-  /* OK, now walk the new symtable, cacheing symbol properties */
-  {
-    aout_symbol_type *cache_ptr = cached;
-    aout_symbol_type cache_save;
-    /* Run through table and copy values */
-    for (sym_pointer = syms, cache_ptr = cached;
-	 sym_pointer < sym_end; sym_pointer++, cache_ptr++)
-      {
-	unsigned int length;
-	cache_ptr->symbol.the_bfd = abfd;
-	cache_ptr->symbol.value = GET_SWORD (abfd, sym_pointer->e_value);
-	cache_ptr->desc = bfd_get_16 (abfd, sym_pointer->e_almod);
-	cache_ptr->type = bfd_get_8 (abfd, sym_pointer->e_type);
-	cache_ptr->symbol.udata.p = NULL;
-	length = bfd_get_8 (abfd, sym_pointer->e_length);
-	cache_ptr->other = length;	/* other not used, save length here */
-
-	cache_save = *cache_ptr;
-	convert_sym_type (sym_pointer, cache_ptr, abfd);
-	if (!translate_from_native_sym_flags (abfd, cache_ptr))
-	  return false;
-
-	/********************************************************/
-	/* for hpux, the 'lenght' value indicates the length of */
-	/* the symbol name which follows the nlist entry.       */
-	/********************************************************/
-	if (length)
-	  {
-	    /**************************************************************/
-	    /* the hp string is not null terminated so we create a new one*/
-	    /* by copying the string to overlap the just vacated nlist    */
-	    /* structure before it in memory.                             */
-	    /**************************************************************/
-	    cache_ptr->symbol.name = strings;
-	    memcpy (strings, sym_pointer + 1, length);
-	    strings[length] = '\0';
-	    strings += length + 1;
-	  }
-	else
-	  cache_ptr->symbol.name = (char *) NULL;
-
-	/* skip over the embedded symbol. */
-	sym_pointer = (struct external_nlist *) (((char *) sym_pointer) +
-						 length);
-      }
-  }
-
-  obj_aout_symbols (abfd) = cached;
-
-  return true;
-}
-
-
-
-void
-MY (swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct hp300hpux_reloc *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
-{
-  int r_index;
-  int r_extern = 0;
-  unsigned int r_length;
-  int r_pcrel = 0;
-  struct aoutdata *su = &(abfd->tdata.aout_data->a);
-
-  cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
-  r_index = bfd_h_get_16 (abfd, bytes->r_index);
-
-  switch (bytes->r_type[0])
-    {
-    case HP_RSEGMENT_TEXT:
-      r_index = N_TEXT;
-      break;
-    case HP_RSEGMENT_DATA:
-      r_index = N_DATA;
-      break;
-    case HP_RSEGMENT_BSS:
-      r_index = N_BSS;
-      break;
-    case HP_RSEGMENT_EXTERNAL:
-      r_extern = 1;
-      break;
-    case HP_RSEGMENT_PCREL:
-      r_extern = 1;
-      r_pcrel = 1;
-      break;
-    case HP_RSEGMENT_RDLT:
-      break;
-    case HP_RSEGMENT_RPLT:
-      break;
-    case HP_RSEGMENT_NOOP:
-      break;
-    default:
-      abort ();
-      break;
-    }
-
-  switch (bytes->r_length[0])
-    {
-    case HP_RLENGTH_BYTE:
-      r_length = 0;
-      break;
-    case HP_RLENGTH_WORD:
-      r_length = 1;
-      break;
-    case HP_RLENGTH_LONG:
-      r_length = 2;
-      break;
-    default:
-      abort ();
-      break;
-    }
-
-  cache_ptr->howto = howto_table_std + r_length + 4 * r_pcrel;
-  /* FIXME-soon:  Roll baserel, jmptable, relative bits into howto setting */
-
-  /* This macro uses the r_index value computed above */
-  if (r_pcrel && r_extern)
-    {
-      /* The GNU linker assumes any offset from beginning of section */
-      /* is already incorporated into the image while the HP linker  */
-      /* adds this in later.  Add it in now...                       */
-      MOVE_ADDRESS (-cache_ptr->address);
-    }
-  else
-    {
-      MOVE_ADDRESS (0);
-    }
-}
-
-boolean
-MY (slurp_reloc_table) (abfd, asect, symbols)
-     bfd *abfd;
-     sec_ptr asect;
-     asymbol **symbols;
-{
-  unsigned int count;
-  bfd_size_type reloc_size;
-  PTR relocs;
-  arelent *reloc_cache;
-  size_t each_size;
-  struct hp300hpux_reloc *rptr;
-  unsigned int counter;
-  arelent *cache_ptr;
-
-  if (asect->relocation)
-    return true;
-
-  if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
-
-  if (asect == obj_datasec (abfd))
-    {
-      reloc_size = exec_hdr (abfd)->a_drsize;
-      goto doit;
-    }
-
-  if (asect == obj_textsec (abfd))
-    {
-      reloc_size = exec_hdr (abfd)->a_trsize;
-      goto doit;
-    }
-
-  bfd_set_error (bfd_error_invalid_operation);
-  return false;
-
-doit:
-  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
-  each_size = obj_reloc_entry_size (abfd);
-
-  count = reloc_size / each_size;
-
-
-  reloc_cache = (arelent *) bfd_zalloc (abfd, (size_t) (count * sizeof
-							(arelent)));
-  if (!reloc_cache && count != 0)
-    return false;
-
-  relocs = (PTR) bfd_alloc (abfd, reloc_size);
-  if (!relocs && reloc_size != 0)
-    {
-      bfd_release (abfd, reloc_cache);
-      return false;
-    }
-
-  if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size)
-    {
-      bfd_release (abfd, relocs);
-      bfd_release (abfd, reloc_cache);
-      return false;
-    }
-
-  rptr = (struct hp300hpux_reloc *) relocs;
-  counter = 0;
-  cache_ptr = reloc_cache;
-
-  for (; counter < count; counter++, rptr++, cache_ptr++)
-    {
-      MY (swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,
-			      bfd_get_symcount (abfd));
-    }
-
-
-  bfd_release (abfd, relocs);
-  asect->relocation = reloc_cache;
-  asect->reloc_count = count;
-  return true;
-}
-
-
-/************************************************************************/
-/* The following functions are identical to functions in aoutx.h except */
-/* they refer to MY(func) rather than NAME(aout,func) and they also     */
-/* call aout_32 versions if the input file was generated by gcc         */
-/************************************************************************/
-
-long aout_32_get_symtab PARAMS ((bfd * abfd, asymbol ** location));
-long aout_32_get_symtab_upper_bound PARAMS ((bfd * abfd));
-
-long aout_32_canonicalize_reloc PARAMS ((bfd * abfd, sec_ptr section,
-					 arelent ** relptr,
-					 asymbol ** symbols));
-
-long
-MY (get_symtab) (abfd, location)
-     bfd *abfd;
-     asymbol **location;
-{
-  unsigned int counter = 0;
-  aout_symbol_type *symbase;
-
-  if (obj_aout_subformat (abfd) == gnu_encap_format)
-    return aout_32_get_symtab (abfd, location);
-
-  if (!MY (slurp_symbol_table) (abfd))
-    return -1;
-
-  for (symbase = obj_aout_symbols (abfd); counter++ < bfd_get_symcount (abfd);)
-    *(location++) = (asymbol *) (symbase++);
-  *location++ = 0;
-  return bfd_get_symcount (abfd);
-}
-
-long
-MY (get_symtab_upper_bound) (abfd)
-     bfd *abfd;
-{
-  if (obj_aout_subformat (abfd) == gnu_encap_format)
-    return aout_32_get_symtab_upper_bound (abfd);
-  if (!MY (slurp_symbol_table) (abfd))
-    return -1;
-
-  return (bfd_get_symcount (abfd) + 1) * (sizeof (aout_symbol_type *));
-}
-
-
-
-
-long
-MY (canonicalize_reloc) (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count;
-  if (obj_aout_subformat (abfd) == gnu_encap_format)
-    return aout_32_canonicalize_reloc (abfd, section, relptr, symbols);
-
-  if (!(tblptr || MY (slurp_reloc_table) (abfd, section, symbols)))
-    return -1;
-
-  if (section->flags & SEC_CONSTRUCTOR)
-    {
-      arelent_chain *chain = section->constructor_chain;
-      for (count = 0; count < section->reloc_count; count++)
-	{
-	  *relptr++ = &chain->relent;
-	  chain = chain->next;
-	}
-    }
-  else
-    {
-      tblptr = section->relocation;
-
-      for (count = 0; count++ < section->reloc_count;)
-	{
-	  *relptr++ = tblptr++;
-	}
-    }
-  *relptr = 0;
-
-  return section->reloc_count;
-}
-
-
-#include "aout-target.h"
diff --git a/bfd/hppa_stubs.h b/bfd/hppa_stubs.h
deleted file mode 100644
index ee893e8a57b..00000000000
--- a/bfd/hppa_stubs.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* HPPA linker stub instructions  */
-
-/* These are the instructions which the linker may insert into the
-   code stream when building final executables to handle out-of-range
-   calls and argument relocations.  */
-
-#define LDO_M4_R31_R31		0x37ff3ff9	/* ldo -4(%r31),%r31	  */
-#define LDIL_R1			0x20200000	/* ldil XXX,%r1		  */
-#define BE_SR4_R1		0xe0202000	/* be XXX(%sr4,%r1)	  */
-#define COPY_R31_R2          	0x081f0242	/* copy %r31,%r2	  */
-#define BLE_SR4_R0		0xe4002000	/* ble XXX(%sr4,%r0)	  */
-#define BLE_SR4_R1		0xe4202000	/* ble XXX(%sr4,%r1)	  */
-#define BV_N_0_R31		0xebe0c002	/* bv,n 0(%r31)		  */
-#define STW_R31_M8R30		0x6bdf3ff1	/* stw %r31,-8(%r30)	  */
-#define LDW_M8R30_R31		0x4bdf3ff1	/* ldw -8(%r30),%r31	  */
-#define STW_ARG_M16R30		0x6bc03fe1	/* stw %argX,-16(%r30)	  */
-#define LDW_M16R30_ARG		0x4bc03fe1	/* ldw -12(%r30),%argX	  */
-#define STW_ARG_M12R30		0x6bc03fe9	/* stw %argX,-16(%r30)	  */
-#define LDW_M12R30_ARG		0x4bc03fe9	/* ldw -12(%r30),%argX	  */
-#define FSTW_FARG_M16R30	0x27c11200	/* fstws %fargX,-16(%r30) */
-#define FLDW_M16R30_FARG	0x27c11000	/* fldws -16(%r30),%fargX */
-#define FSTD_FARG_M16R30	0x2fc11200	/* fstds %fargX,-16(%r30) */
-#define FLDD_M16R30_FARG	0x2fc11000	/* fldds -16(%r30),%fargX */
diff --git a/bfd/hppabsd-core.c b/bfd/hppabsd-core.c
deleted file mode 100644
index a7c22f519eb..00000000000
--- a/bfd/hppabsd-core.c
+++ /dev/null
@@ -1,303 +0,0 @@
-/* BFD back-end for HPPA BSD core files.
-   Copyright 1993, 94, 95, 97, 1998 Free Software Foundation, Inc.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-
-   Written by the Center for Software Science at the University of Utah
-   and by Cygnus Support. 
-
-   The core file structure for the Utah 4.3BSD and OSF1 ports on the
-   PA is a mix between traditional cores and hpux cores -- just
-   different enough that supporting this format would tend to add
-   gross hacks to trad-core.c or hpux-core.c.  So instead we keep any
-   gross hacks isolated to this file.  */
-   
-
-/* This file can only be compiled on systems which use HPPA-BSD style
-   core files.
-
-   I would not expect this to be of use to any other host/target, but
-   you never know.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#if defined (HOST_HPPABSD)
-
-#include "machine/vmparam.h"
-
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-#include <machine/reg.h>
-#include <sys/user.h>		/* After a.out.h  */
-#include <sys/file.h>
-
-static asection *make_bfd_asection PARAMS ((bfd *, CONST char *,
-					    flagword, bfd_size_type,
-					    file_ptr, unsigned int));
-static asymbol *hppabsd_core_make_empty_symbol PARAMS ((bfd *));
-static const bfd_target *hppabsd_core_core_file_p PARAMS ((bfd *));
-static char *hppabsd_core_core_file_failing_command PARAMS ((bfd *));
-static int hppabsd_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean hppabsd_core_core_file_matches_executable_p
-  PARAMS ((bfd *, bfd *));
-static void swap_abort PARAMS ((void));
-
-/* These are stored in the bfd's tdata.  */
-
-struct hppabsd_core_struct
-  {
-    int sig;
-    char cmd[MAXCOMLEN + 1];
-    asection *data_section;
-    asection *stack_section;
-    asection *reg_section;
-  };
-
-#define core_hdr(bfd) ((bfd)->tdata.hppabsd_core_data)
-#define core_signal(bfd) (core_hdr(bfd)->sig)
-#define core_command(bfd) (core_hdr(bfd)->cmd)
-#define core_datasec(bfd) (core_hdr(bfd)->data_section)
-#define core_stacksec(bfd) (core_hdr(bfd)->stack_section)
-#define core_regsec(bfd) (core_hdr(bfd)->reg_section)
-
-static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, offset, alignment_power)
-     bfd *abfd;
-     CONST char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     file_ptr offset;
-     unsigned int alignment_power;
-{
-  asection *asect;
-
-  asect = bfd_make_section (abfd, name);
-  if (!asect)
-    return NULL;
-
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
-  asect->filepos = offset;
-  asect->alignment_power = alignment_power;
-
-  return asect;
-}
-
-static asymbol *
-hppabsd_core_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
-static const bfd_target *
-hppabsd_core_core_file_p (abfd)
-     bfd *abfd;
-{
-  int val;
-  struct user u;
-  struct hppabsd_core_struct *coredata;
-  int clicksz;
-
-  /* Try to read in the u-area.  We will need information from this
-     to know how to grok the rest of the core structures.  */
-  val = bfd_read ((void *) &u, 1, sizeof u, abfd);
-  if (val != sizeof u)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Get the page size out of the u structure.  This will be different
-     for PA 1.0 machines and PA 1.1 machines.   Yuk!  */
-  clicksz = u.u_pcb.pcb_pgsz;
-
-  /* clicksz must be a power of two >= 2k.  */
-  if (clicksz < 0x800
-      || clicksz != (clicksz & -clicksz))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-
-  /* Sanity checks.  Make sure the size of the core file matches the
-     the size computed from information within the core itself.  */
-  {
-    FILE *stream = bfd_cache_lookup (abfd);
-    struct stat statbuf;
-    if (stream == NULL || fstat (fileno (stream), &statbuf) < 0)
-      {
-	bfd_set_error (bfd_error_system_call);
-	return NULL;
-      }
-    if (NBPG * (UPAGES + u.u_dsize + u.u_ssize) > statbuf.st_size)
-      {
-	bfd_set_error (bfd_error_file_truncated);
-	return NULL;
-      }
-    if (clicksz * (UPAGES + u.u_dsize + u.u_ssize) < statbuf.st_size)
-      {
-	/* The file is too big.  Maybe it's not a core file
-	   or we otherwise have bad values for u_dsize and u_ssize).  */
-	bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-  }
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  coredata = (struct hppabsd_core_struct *)
-    bfd_zalloc (abfd, sizeof (struct hppabsd_core_struct));
-  if (!coredata)
-    return NULL;
-
-  /* Make the core data and available via the tdata part of the BFD.  */
-  abfd->tdata.hppabsd_core_data = coredata;
-
-  /* Create the sections.  */
-  core_stacksec (abfd) = make_bfd_asection (abfd, ".stack",
-					   SEC_ALLOC + SEC_HAS_CONTENTS,
-					   clicksz * u.u_ssize,
-					   NBPG * (USIZE + KSTAKSIZE) 
-					     + clicksz * u.u_dsize, 2);
-  core_stacksec (abfd)->vma = USRSTACK; 
-
-  core_datasec (abfd) = make_bfd_asection (abfd, ".data",
-					  SEC_ALLOC + SEC_LOAD
-					    + SEC_HAS_CONTENTS,
-					  clicksz * u.u_dsize,
-					  NBPG * (USIZE + KSTAKSIZE), 2);
-  core_datasec (abfd)->vma = UDATASEG;
-
-  core_regsec (abfd) = make_bfd_asection (abfd, ".reg",
-					 SEC_HAS_CONTENTS,
-					 KSTAKSIZE * NBPG,
-					 NBPG * USIZE, 2);
-  core_regsec (abfd)->vma = 0;
-
-  strncpy (core_command (abfd), u.u_comm, MAXCOMLEN + 1);
-  core_signal (abfd) = u.u_code;
-  return abfd->xvec;
-}
-
-static char *
-hppabsd_core_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return core_command (abfd);
-}
-
-/* ARGSUSED */
-static int
-hppabsd_core_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_signal (abfd);
-}
-
-/* ARGSUSED */
-static boolean
-hppabsd_core_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  /* There's no way to know this...  */
-  return true;
-}
-
-
-#define hppabsd_core_get_symtab_upper_bound \
-  _bfd_nosymbols_get_symtab_upper_bound
-#define hppabsd_core_get_symtab _bfd_nosymbols_get_symtab
-#define hppabsd_core_print_symbol _bfd_nosymbols_print_symbol
-#define hppabsd_core_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define hppabsd_core_bfd_is_local_label_name \
-  _bfd_nosymbols_bfd_is_local_label_name
-#define hppabsd_core_get_lineno _bfd_nosymbols_get_lineno
-#define hppabsd_core_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define hppabsd_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define hppabsd_core_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define hppabsd_core_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort ()
-{
-  /* This way doesn't require any declaration for ANSI to fuck up.  */
-  abort ();	
-}
-
-#define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target hppabsd_core_vec =
-  {
-    "hppabsd-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_BIG,		/* target byte order */
-    BFD_ENDIAN_BIG,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     hppabsd_core_core_file_p	/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (hppabsd_core),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (hppabsd_core),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
-#endif
diff --git a/bfd/hpux-core.c b/bfd/hpux-core.c
deleted file mode 100644
index 6be709f4999..00000000000
--- a/bfd/hpux-core.c
+++ /dev/null
@@ -1,404 +0,0 @@
-/* BFD back-end for HP/UX core files.
-   Copyright 1993, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
-   Written by Stu Grossman, Cygnus Support.
-   Converted to back-end form by Ian Lance Taylor, Cygnus SUpport
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file can only be compiled on systems which use HP/UX style
-   core files.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#if defined (HOST_HPPAHPUX) || defined (HOST_HP300HPUX) || defined (HOST_HPPAMPEIX)
-
-/* FIXME: sys/core.h doesn't exist for HPUX version 7.  HPUX version
-   5, 6, and 7 core files seem to be standard trad-core.c type core
-   files; can we just use trad-core.c in addition to this file?  */
-
-#include <sys/core.h>
-#include <sys/utsname.h>
-
-#endif /* HOST_HPPAHPUX */
-
-#ifdef HOST_HPPABSD
-
-/* Not a very swift place to put it, but that's where the BSD port
-   puts them.  */
-#include "/hpux/usr/include/sys/core.h"
-
-#endif /* HOST_HPPABSD */
-
-#include <sys/param.h>
-#ifdef HAVE_DIRENT_H
-# include <dirent.h>
-#else
-# ifdef HAVE_SYS_NDIR_H
-#  include <sys/ndir.h>
-# endif
-# ifdef HAVE_SYS_DIR_H
-#  include <sys/dir.h>
-# endif
-# ifdef HAVE_NDIR_H
-#  include <ndir.h>
-# endif
-#endif
-#include <signal.h>
-#include <machine/reg.h>
-#include <sys/user.h>		/* After a.out.h  */
-#include <sys/file.h>
-
-/* Kludge: There's no explicit mechanism provided by sys/core.h to
-   conditionally know whether a proc_info has thread id fields.
-   However, CORE_ANON_SHMEM shows up first at 10.30, which is
-   happily also when meaningful thread id's show up in proc_info. */
-#if defined(CORE_ANON_SHMEM)
-#define PROC_INFO_HAS_THREAD_ID (1)
-#endif
-
-/* This type appears at HP-UX 10.30.  Defining it if not defined
-   by sys/core.h allows us to build for older HP-UX's, and (since
-   it won't be encountered in core-dumps from older HP-UX's) is
-   harmless. */
-#if !defined(CORE_ANON_SHMEM)
-#define CORE_ANON_SHMEM 0x00000200         /* anonymous shared memory */
-#endif
-
-/* These are stored in the bfd's tdata */
-
-/* .lwpid and .user_tid are only valid if PROC_INFO_HAS_THREAD_ID, else they
-   are set to 0.  Also, until HP-UX implements MxN threads, .user_tid and
-   .lwpid are synonymous. */
-struct hpux_core_struct 
-{
-  int sig;
-  int lwpid;               /* Kernel thread ID. */
-  unsigned long user_tid;  /* User thread ID. */
-  char cmd[MAXCOMLEN + 1];
-};
-
-#define core_hdr(bfd) ((bfd)->tdata.hpux_core_data)
-#define core_signal(bfd) (core_hdr(bfd)->sig)
-#define core_command(bfd) (core_hdr(bfd)->cmd)
-#define core_kernel_thread_id(bfd) (core_hdr(bfd)->lwpid)
-#define core_user_thread_id(bfd) (core_hdr(bfd)->user_tid)
-
-static void swap_abort PARAMS ((void));
-
-static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, vma, alignment_power)
-     bfd *abfd;
-     CONST char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     unsigned int alignment_power;
-{
-  asection *asect;
-  char *newname;
-
-  newname = bfd_alloc (abfd, strlen (name) + 1);
-  if (!newname)
-    return NULL;
-
-  strcpy (newname, name);
-
-  asect = bfd_make_section_anyway (abfd, newname);
-  if (!asect)
-    return NULL;
-
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
-  asect->vma = vma;
-  asect->filepos = bfd_tell (abfd);
-  asect->alignment_power = alignment_power;
-
-  return asect;
-}
-
-static asymbol *
-hpux_core_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
-
-/* this function builds a bfd target if the file is a corefile.
-   It returns null or 0 if it finds out thaat it is not a core file.
-   The way it checks this is by looking for allowed 'type' field values.
-   These are declared in sys/core.h
-   There are some values which are 'reserved for future use'. In particular
-   CORE_NONE is actually defined as 0. This may be a catch-all for cases
-   in which the core file is generated by some non-hpux application.
-   (I am just guessing here!)
-*/
-static const bfd_target *
-hpux_core_core_file_p (abfd)
-     bfd *abfd;
-{
-  int  good_sections = 0;
-  int  unknown_sections = 0;
-
-  core_hdr (abfd) = (struct hpux_core_struct *)
-    bfd_zalloc (abfd, sizeof (struct hpux_core_struct));
-  if (!core_hdr (abfd))
-    return NULL;
-
-  while (1)
-    {
-      int val;
-      struct corehead core_header;
-
-      val = bfd_read ((void *) &core_header, 1, sizeof core_header, abfd);
-      if (val <= 0)
-	break;
-      switch (core_header.type)
-	{
-	case CORE_KERNEL:
-	case CORE_FORMAT:
-	  bfd_seek (abfd, core_header.len, SEEK_CUR);	/* Just skip this */
-          good_sections++;
-	  break;
-	case CORE_EXEC:
-	  {
-	    struct proc_exec proc_exec;
-	    if (bfd_read ((void *) &proc_exec, 1, core_header.len, abfd)
-		!= core_header.len)
-	      break;
-	    strncpy (core_command (abfd), proc_exec.cmd, MAXCOMLEN + 1);
-            good_sections++;
-	  }
-	  break;
-	case CORE_PROC:
-	  {
-	    struct proc_info proc_info;
-	    char  secname[100];  /* Of arbitrary size, but plenty large. */
-
-            /* We need to read this section, 'cause we need to determine
-               whether the core-dumped app was threaded before we create
-               any .reg sections. */
-	    if (bfd_read (&proc_info, 1, core_header.len, abfd)
-		!= core_header.len)
-	      break;
-
-              /* However, we also want to create those sections with the
-                 file positioned at the start of the record, it seems. */
-            if (bfd_seek (abfd, -core_header.len, SEEK_CUR) != 0)
-              break;
-
-#if defined(PROC_INFO_HAS_THREAD_ID)
-            core_kernel_thread_id (abfd) = proc_info.lwpid;
-            core_user_thread_id (abfd) = proc_info.user_tid;
-#else
-            core_kernel_thread_id (abfd) = 0;
-            core_user_thread_id (abfd) = 0;
-#endif
-            /* If the program was unthreaded, then we'll just create a
-               .reg section.
-
-               If the program was threaded, then we'll create .reg/XXXXX
-               section for each thread, where XXXXX is a printable
-               representation of the kernel thread id.  We'll also
-               create a .reg section for the thread that was running
-               and signalled at the time of the core-dump (i.e., this
-               is effectively an alias, needed to keep GDB happy.)
-
-               Note that we use `.reg/XXXXX' as opposed to '.regXXXXX'
-               because GDB expects that .reg2 will be the floating-
-               point registers. */
-            if (core_kernel_thread_id (abfd) == 0)
-              {
-                if (!make_bfd_asection (abfd, ".reg",
-                                        SEC_HAS_CONTENTS,
-                                        core_header.len,
-                                        (int) &proc_info - (int) & proc_info.hw_regs,
-                                        2))
-                  return NULL;
-              }
-            else
-              {
-                /* There are threads.  Is this the one that caused the
-                   core-dump?  We'll claim it was the running thread. */
-                if (proc_info.sig != -1)
-                  {
-		    if (!make_bfd_asection (abfd, ".reg",
-					    SEC_HAS_CONTENTS,
-					    core_header.len,
-					    (int) &proc_info - (int) & proc_info.hw_regs,
-					    2))
-		      return NULL;
-                  }
-                /* We always make one of these sections, for every thread. */
-                sprintf (secname, ".reg/%d", core_kernel_thread_id (abfd));
-                if (!make_bfd_asection (abfd, secname,
-                                        SEC_HAS_CONTENTS,
-                                        core_header.len,
-                                        (int) &proc_info - (int) & proc_info.hw_regs,
-                                        2))
-                  return NULL;
-              }
-	    core_signal (abfd) = proc_info.sig;
-            if (bfd_seek (abfd, core_header.len, SEEK_CUR) != 0)
-              break;
-            good_sections++;
-	  }
-	  break;
-
-	case CORE_DATA:
-	case CORE_STACK:
-	case CORE_TEXT:
-	case CORE_MMF:
-	case CORE_SHM:
-	case CORE_ANON_SHMEM:
-	  if (!make_bfd_asection (abfd, ".data",
-				  SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-				  core_header.len, core_header.addr, 2))
-	    return NULL;
-
-	  bfd_seek (abfd, core_header.len, SEEK_CUR);
-          good_sections++;
-	  break;
-
-	case CORE_NONE:
-          /* Let's not punt if we encounter a section of unknown
-             type.  Rather, let's make a note of it.  If we later
-             see that there were also "good" sections, then we'll
-             declare that this a core file, but we'll also warn that
-             it may be incompatible with this gdb.
-             */
-	  unknown_sections++;
-          break;
-       
-         default: return 0; /*unrecognized core file type */
-	}
-    }
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  /* Were there sections of unknown type?  If so, yet there were
-     at least some complete sections of known type, then, issue
-     a warning.  Possibly the core file was generated on a version
-     of HP-UX that is incompatible with that for which this gdb was
-     built.
-     */
-  if ((unknown_sections > 0) && (good_sections > 0))
-    (*_bfd_error_handler)
-      ("%s appears to be a core file,\nbut contains unknown sections.  It may have been created on an incompatible\nversion of HP-UX.  As a result, some information may be unavailable.\n",
-       abfd->filename);
-
-  return abfd->xvec;
-}
-
-static char *
-hpux_core_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return core_command (abfd);
-}
-
-/* ARGSUSED */
-static int
-hpux_core_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_signal (abfd);
-}
-
-/* ARGSUSED */
-static boolean
-hpux_core_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;			/* FIXME, We have no way of telling at this point */
-}
-
-#define hpux_core_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
-#define hpux_core_get_symtab _bfd_nosymbols_get_symtab
-#define hpux_core_print_symbol _bfd_nosymbols_print_symbol
-#define hpux_core_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define hpux_core_bfd_is_local_label_name \
-  _bfd_nosymbols_bfd_is_local_label_name
-#define hpux_core_get_lineno _bfd_nosymbols_get_lineno
-#define hpux_core_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define hpux_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define hpux_core_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define hpux_core_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target hpux_core_vec =
-  {
-    "hpux-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_BIG,		/* target byte order */
-    BFD_ENDIAN_BIG,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     hpux_core_core_file_p	/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (hpux_core),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (hpux_core),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
diff --git a/bfd/i386aout.c b/bfd/i386aout.c
deleted file mode 100644
index d0b2cffef23..00000000000
--- a/bfd/i386aout.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/* BFD back-end for i386 a.out binaries.
-   Copyright 1990, 91, 92, 94, 95, 96, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-/* The only 386 aout system we have here is GO32 from DJ. 
-   These numbers make BFD work with that. If your aout 386 system
-   doesn't work with these, we'll have to split them into different
-   files.  Send me (sac@cygnus.com) the runes to make it work on your
-   system, and I'll stick it in for the next release.  */
-
-#define N_HEADER_IN_TEXT(x) 0
-#define BYTES_IN_WORD 4
-
-#define N_TXTOFF(x) 0x20
-#define N_TXTADDR(x) (N_MAGIC(x)==ZMAGIC ? 0x1020 : 0)
-
-#define N_TXTSIZE(x) ((x).a_text)
-#if 0
-#define N_DATADDR(x) (N_MAGIC(x)==OMAGIC? (N_TXTADDR(x)+(x).a_text) : (SEGMENT_SIZE + ((0x1020+(x).a_text-1) & ~(SEGMENT_SIZE-1))))
-#define NOSUBEXECB
-
-#endif
-#define TARGET_PAGE_SIZE 4096
-#define SEGMENT_SIZE 0x400000
-#define DEFAULT_ARCH bfd_arch_i386
-
-#define MY(OP) CAT(i386aout_,OP)
-#define TARGETNAME "a.out-i386"
-#define NO_WRITE_HEADER_KLUDGE 1
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-#include "libaout.h"
-
-/* Set the machine type correctly.  */
-
-static boolean
-i386aout_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  N_SET_MACHTYPE (*execp, M_386);
-
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-
-  WRITE_HEADERS (abfd, execp);
-
-  return true;
-}
-
-#define MY_write_object_contents i386aout_write_object_contents
-
-static boolean MY(set_sizes)();
-#define MY_backend_data &MY(backend_data)
-static CONST struct aout_backend_data MY(backend_data) = {
-  0,				/* zmagic contiguous */
-  1,				/* text incl header */
-  0,				/* entry is text address */
-  0,				/* exec_hdr_flags */
-  0,				/* text vma? */
-  MY(set_sizes),
-  1,				/* exec header not counted */
-  0,				/* add_dynamic_symbols */
-  0,				/* add_one_symbol */
-  0,				/* link_dynamic_object */
-  0,				/* write_dynamic_symbol */
-  0,				/* check_dynamic_reloc */
-  0				/* finish_dynamic_link */
-};
-
-#include "aout-target.h"
diff --git a/bfd/i386bsd.c b/bfd/i386bsd.c
deleted file mode 100644
index 2328fe3e9e8..00000000000
--- a/bfd/i386bsd.c
+++ /dev/null
@@ -1,46 +0,0 @@
-/* BFD back-end for i386 a.out binaries under BSD.
-   Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This data should be correct for the format used under all the various
-   BSD ports for 386 machines.  */
-
-#define	BYTES_IN_WORD	4
-
-/* ZMAGIC files never have the header in the text.  */
-#define	N_HEADER_IN_TEXT(x)	0
-
-/* ZMAGIC files start at address 0.  This does not apply to QMAGIC.  */
-#define TEXT_START_ADDR 0
-#define N_SHARED_LIB(x) 0
-
-#define	TARGET_PAGE_SIZE	4096
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-
-#define	DEFAULT_ARCH	bfd_arch_i386
-#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
-
-#define MY(OP) CAT(i386bsd_,OP)
-#define TARGETNAME "a.out-i386-bsd"
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
-
-#include "aout-target.h"
diff --git a/bfd/i386dynix.c b/bfd/i386dynix.c
deleted file mode 100644
index ff50a1450a1..00000000000
--- a/bfd/i386dynix.c
+++ /dev/null
@@ -1,80 +0,0 @@
-/* BFD back-end for i386 a.out binaries under dynix.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This BFD is currently only tested with gdb, writing object files
-   may not work.  */
-
-#define BYTES_IN_WORD	4
-
-#define TEXT_START_ADDR 4096
-#define TARGET_PAGE_SIZE	4096
-#define SEGMENT_SIZE	TARGET_PAGE_SIZE
-
-#include "aout/dynix3.h"
-
-#define DEFAULT_ARCH	bfd_arch_i386
-#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
-
-#define MY(OP) CAT(i386dynix_,OP)
-#define TARGETNAME "a.out-i386-dynix"
-#define NAME(x,y) CAT3(i386dynix,_32_,y)
-#define ARCH_SIZE 32
-#define NAME_swap_exec_header_in NAME(i386dynix_32_,swap_exec_header_in)
-#define MY_get_section_contents aout_32_get_section_contents
-
-/* aoutx.h requires definitions for NMAGIC, BMAGIC and QMAGIC.  */
-#define NMAGIC 0
-#define BMAGIC OMAGIC
-#define QMAGIC XMAGIC
-
-#include "aoutx.h"
-
-/* (Ab)use some fields in the internal exec header to be able to read
-   executables that contain shared data.  */
-
-#define a_shdata a_tload
-#define a_shdrsize a_dload
-
-void
-i386dynix_32_swap_exec_header_in (abfd, raw_bytes, execp)
-     bfd *abfd;
-     struct external_exec *raw_bytes;
-     struct internal_exec *execp;
-{
-  struct external_exec *bytes = (struct external_exec *)raw_bytes;
-
-  /* The internal_exec structure has some fields that are unused in this
-     configuration (IE for i960), so ensure that all such uninitialized
-     fields are zero'd out.  There are places where two of these structs
-     are memcmp'd, and thus the contents do matter. */
-  memset ((PTR) execp, 0, sizeof (struct internal_exec));
-  /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info   = bfd_h_get_32 (abfd, bytes->e_info);
-  execp->a_text   = GET_WORD (abfd, bytes->e_text);
-  execp->a_data   = GET_WORD (abfd, bytes->e_data);
-  execp->a_bss    = GET_WORD (abfd, bytes->e_bss);
-  execp->a_syms   = GET_WORD (abfd, bytes->e_syms);
-  execp->a_entry  = GET_WORD (abfd, bytes->e_entry);
-  execp->a_trsize = GET_WORD (abfd, bytes->e_trsize);
-  execp->a_drsize = GET_WORD (abfd, bytes->e_drsize);
-  execp->a_shdata = GET_WORD (abfd, bytes->e_shdata);
-  execp->a_shdrsize = GET_WORD (abfd, bytes->e_shdrsize);
-}
-
-#include "aout-target.h"
diff --git a/bfd/i386freebsd.c b/bfd/i386freebsd.c
deleted file mode 100644
index 7a6371b5df6..00000000000
--- a/bfd/i386freebsd.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* BFD back-end for FreeBSD/386 a.out-ish binaries.
-   Copyright (C) 1990, 1991, 1992, 1996 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#define	BYTES_IN_WORD	4
-#undef TARGET_IS_BIG_ENDIAN_P
-
-#define	TARGET_PAGE_SIZE	4096
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-
-#define	DEFAULT_ARCH	bfd_arch_i386
-#define MACHTYPE_OK(mtype) ((mtype) == M_386_NETBSD || (mtype) == M_UNKNOWN)
-
-#define MY(OP) CAT(i386freebsd_,OP)
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME "a.out-i386-freebsd"
-
-#include "freebsd.h"
diff --git a/bfd/i386linux.c b/bfd/i386linux.c
deleted file mode 100644
index 804bdcd1c1a..00000000000
--- a/bfd/i386linux.c
+++ /dev/null
@@ -1,767 +0,0 @@
-/* BFD back-end for linux flavored i386 a.out binaries.
-   Copyright (C) 1992, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define	TARGET_PAGE_SIZE	4096
-#define ZMAGIC_DISK_BLOCK_SIZE 1024
-#define	SEGMENT_SIZE TARGET_PAGE_SIZE
-#define TEXT_START_ADDR	0x0
-#define N_SHARED_LIB(x) 0
-#define BYTES_IN_WORD 4
-
-#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#define DEFAULT_ARCH bfd_arch_i386
-#define MY(OP) CAT(i386linux_,OP)
-#define TARGETNAME "a.out-i386-linux"
-
-extern const bfd_target MY(vec);
-
-/* We always generate QMAGIC files in preference to ZMAGIC files.  It
-   would be possible to make this a linker option, if that ever
-   becomes important.  */
-
-static void MY_final_link_callback
-  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-static boolean i386linux_bfd_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean i386linux_write_object_contents PARAMS ((bfd *));
-
-static boolean
-i386linux_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  obj_aout_subformat (abfd) = q_magic_format;
-  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
-}
-
-#define MY_bfd_final_link i386linux_bfd_final_link
-
-/* Set the machine type correctly.  */
-
-static boolean
-i386linux_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  N_SET_MACHTYPE (*execp, M_386);
-
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
-}
-
-#define MY_write_object_contents i386linux_write_object_contents
-
-/* Code to link against Linux a.out shared libraries.  */
-
-/* See if a symbol name is a reference to the global offset table.  */
-
-#ifndef GOT_REF_PREFIX
-#define	GOT_REF_PREFIX	"__GOT_"
-#endif
-
-#define IS_GOT_SYM(name) \
-  (strncmp (name, GOT_REF_PREFIX, sizeof GOT_REF_PREFIX - 1) == 0)
-
-/* See if a symbol name is a reference to the procedure linkage table.  */
-
-#ifndef PLT_REF_PREFIX
-#define	PLT_REF_PREFIX	"__PLT_"
-#endif
-
-#define IS_PLT_SYM(name) \
-  (strncmp (name, PLT_REF_PREFIX, sizeof PLT_REF_PREFIX - 1) == 0)
-
-/* This string is used to generate specialized error messages.  */
-
-#ifndef NEEDS_SHRLIB
-#define NEEDS_SHRLIB "__NEEDS_SHRLIB_"
-#endif
-
-/* This special symbol is a set vector that contains a list of
-   pointers to fixup tables.  It will be present in any dynamicly
-   linked file.  The linker generated fixup table should also be added
-   to the list, and it should always appear in the second slot (the
-   first one is a dummy with a magic number that is defined in
-   crt0.o).  */
-
-#ifndef SHARABLE_CONFLICTS
-#define SHARABLE_CONFLICTS "__SHARABLE_CONFLICTS__"
-#endif
-
-/* We keep a list of fixups.  The terminology is a bit strange, but
-   each fixup contains two 32 bit numbers.  A regular fixup contains
-   an address and a pointer, and at runtime we should store the
-   address at the location pointed to by the pointer.  A builtin fixup
-   contains two pointers, and we should read the address using one
-   pointer and store it at the location pointed to by the other
-   pointer.  Builtin fixups come into play when we have duplicate
-   __GOT__ symbols for the same variable.  The builtin fixup will copy
-   the GOT pointer from one over into the other.  */
-
-struct fixup
-{
-  struct fixup *next;
-  struct linux_link_hash_entry *h;
-  bfd_vma value;
-
-  /* Nonzero if this is a jump instruction that needs to be fixed,
-     zero if this is just a pointer */
-  char jump;
-
-  char builtin;
-};
-
-/* We don't need a special hash table entry structure, but we do need
-   to keep some information between linker passes, so we use a special
-   hash table.  */
-
-struct linux_link_hash_entry
-{
-  struct aout_link_hash_entry root;
-};
-
-struct linux_link_hash_table
-{
-  struct aout_link_hash_table root;
-
-  /* First dynamic object found in link.  */
-  bfd *dynobj;
-
-  /* Number of fixups.  */
-  size_t fixup_count;
-
-  /* Number of builtin fixups.  */
-  size_t local_builtins;
-
-  /* List of fixups.  */
-  struct fixup *fixup_list;
-};
-
-static struct bfd_hash_entry *linux_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *linux_link_hash_table_create
-  PARAMS ((bfd *));
-static struct fixup *new_fixup
-  PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
-	   bfd_vma, int));
-static boolean linux_link_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean linux_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-	   bfd_vma, const char *, boolean, boolean,
-	   struct bfd_link_hash_entry **));
-static boolean linux_tally_symbols
-  PARAMS ((struct linux_link_hash_entry *, PTR));
-static boolean linux_finish_dynamic_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Routine to create an entry in an Linux link hash table.  */
-
-static struct bfd_hash_entry *
-linux_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct linux_link_hash_entry *ret = (struct linux_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct linux_link_hash_entry *) NULL)
-    ret = ((struct linux_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
-  if (ret == NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct linux_link_hash_entry *)
-	 NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
-				       table, string));
-  if (ret != NULL)
-    {
-      /* Set local fields; there aren't any.  */
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create a Linux link hash table.  */
-
-static struct bfd_link_hash_table *
-linux_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct linux_link_hash_table *ret;
-
-  ret = ((struct linux_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct linux_link_hash_table)));
-  if (ret == (struct linux_link_hash_table *) NULL)
-    return (struct bfd_link_hash_table *) NULL;
-  if (! NAME(aout,link_hash_table_init) (&ret->root, abfd,
-					 linux_link_hash_newfunc))
-    {
-      free (ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-
-  ret->dynobj = NULL;
-  ret->fixup_count = 0;
-  ret->local_builtins = 0;
-  ret->fixup_list = NULL;
-
-  return &ret->root.root;
-}
-
-/* Look up an entry in a Linux link hash table.  */
-
-#define linux_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct linux_link_hash_entry *) \
-   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
-			  (follow)))
-
-/* Traverse a Linux link hash table.  */
-
-#define linux_link_hash_traverse(table, func, info)			\
-  (aout_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the Linux link hash table from the info structure.  This is
-   just a cast.  */
-
-#define linux_hash_table(p) ((struct linux_link_hash_table *) ((p)->hash))
-
-/* Store the information for a new fixup.  */
-
-static struct fixup *
-new_fixup (info, h, value, builtin)
-     struct bfd_link_info *info;
-     struct linux_link_hash_entry *h;
-     bfd_vma value;
-     int builtin;
-{
-  struct fixup *f;
-
-  f = (struct fixup *) bfd_hash_allocate (&info->hash->table,
-					  sizeof (struct fixup));
-  if (f == NULL)
-    return f;
-  f->next = linux_hash_table (info)->fixup_list;
-  linux_hash_table (info)->fixup_list = f;
-  f->h = h;
-  f->value = value;
-  f->builtin = builtin;
-  f->jump = 0;
-  ++linux_hash_table (info)->fixup_count;
-  return f;
-}
-
-/* We come here once we realize that we are going to link to a shared
-   library.  We need to create a special section that contains the
-   fixup table, and we ultimately need to add a pointer to this into
-   the set vector for SHARABLE_CONFLICTS.  At this point we do not
-   know the size of the section, but that's OK - we just need to
-   create it for now.  */
-
-static boolean
-linux_link_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags;
-  register asection *s;
-
-  /* Note that we set the SEC_IN_MEMORY flag.  */
-  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-
-  /* We choose to use the name ".linux-dynamic" for the fixup table.
-     Why not? */
-  s = bfd_make_section (abfd, ".linux-dynamic");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags)
-      || ! bfd_set_section_alignment (abfd, s, 2))
-    return false;
-  s->_raw_size = 0;
-  s->contents = 0;
-
-  return true;
-}
-
-/* Function to add a single symbol to the linker hash table.  This is
-   a wrapper around _bfd_generic_link_add_one_symbol which handles the
-   tweaking needed for dynamic linking support.  */
-
-static boolean
-linux_add_one_symbol (info, abfd, name, flags, section, value, string,
-		      copy, collect, hashp)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     asection *section;
-     bfd_vma value;
-     const char *string;
-     boolean copy;
-     boolean collect;
-     struct bfd_link_hash_entry **hashp;
-{
-  struct linux_link_hash_entry *h;
-  boolean insert;
-
-  /* Look up and see if we already have this symbol in the hash table.
-     If we do, and the defining entry is from a shared library, we
-     need to create the dynamic sections.
-
-     FIXME: What if abfd->xvec != info->hash->creator?  We may want to
-     be able to link Linux a.out and ELF objects together, but serious
-     confusion is possible.  */
-
-  insert = false;
-
-  if (! info->relocateable
-      && linux_hash_table (info)->dynobj == NULL
-      && strcmp (name, SHARABLE_CONFLICTS) == 0
-      && (flags & BSF_CONSTRUCTOR) != 0
-      && abfd->xvec == info->hash->creator)
-    {
-      if (! linux_link_create_dynamic_sections (abfd, info))
-	return false;
-      linux_hash_table (info)->dynobj = abfd;
-      insert = true;
-    }
-
-  if (bfd_is_abs_section (section)
-      && abfd->xvec == info->hash->creator)
-    {
-      h = linux_link_hash_lookup (linux_hash_table (info), name, false,
-				  false, false);
-      if (h != NULL
-	  && (h->root.root.type == bfd_link_hash_defined
-	      || h->root.root.type == bfd_link_hash_defweak))
-	{
-	  struct fixup *f;
-
-	  if (hashp != NULL)
-	    *hashp = (struct bfd_link_hash_entry *) h;
-
-	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
-	  if (f == NULL)
-	    return false;
-	  f->jump = IS_PLT_SYM (name);
-
-	  return true;
-	}
-    }
-
-  /* Do the usual procedure for adding a symbol.  */
-  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
-					  value, string, copy, collect,
-					  hashp))
-    return false;
-
-  /* Insert a pointer to our table in the set vector.  The dynamic
-     linker requires this information */
-  if (insert)
-    {
-      asection *s;
-
-      /* Here we do our special thing to add the pointer to the
-	 dynamic section in the SHARABLE_CONFLICTS set vector.  */
-      s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-				   ".linux-dynamic");
-      BFD_ASSERT (s != NULL);
-
-      if (! (_bfd_generic_link_add_one_symbol
-	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
-	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, 0, NULL, false, false, NULL)))
-	return false;
-    }
-
-  return true;
-}
-
-/* We will crawl the hash table and come here for every global symbol.
-   We will examine each entry and see if there are indications that we
-   need to add a fixup.  There are two possible cases - one is where
-   you have duplicate definitions of PLT or GOT symbols - these will
-   have already been caught and added as "builtin" fixups.  If we find
-   that the corresponding non PLT/GOT symbol is also present, we
-   convert it to a regular fixup instead.
-
-   This function is called via linux_link_hash_traverse.  */
-
-static boolean
-linux_tally_symbols (h, data)
-     struct linux_link_hash_entry *h;
-     PTR data;
-{
-  struct bfd_link_info *info = (struct bfd_link_info *) data;
-  struct fixup *f, *f1;
-  int is_plt;
-  struct linux_link_hash_entry *h1, *h2;
-  boolean exists;
-
-  if (h->root.root.type == bfd_link_hash_undefined
-      && strncmp (h->root.root.root.string, NEEDS_SHRLIB,
-		  sizeof NEEDS_SHRLIB - 1) == 0)
-    {
-      const char *name;
-      char *p;
-      char *alloc = NULL;
-
-      name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
-      p = strrchr (name, '_');
-      if (p != NULL)
-	alloc = (char *) bfd_malloc (strlen (name) + 1);
-
-      if (p == NULL || alloc == NULL)
-	(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
-			       name);
-      else
-	{
-	  strcpy (alloc, name);
-	  p = strrchr (alloc, '_');
-	  *p++ = '\0';
-	  (*_bfd_error_handler)
-	    (_("Output file requires shared library `%s.so.%s'\n"),
-	     alloc, p);
-	  free (alloc);
-	}
-
-      abort ();
-    }
-
-  /* If this symbol is not a PLT/GOT, we do not even need to look at it */
-  is_plt = IS_PLT_SYM (h->root.root.root.string);
-
-  if (is_plt || IS_GOT_SYM (h->root.root.root.string))
-    {
-      /* Look up this symbol twice.  Once just as a regular lookup,
-	 and then again following all of the indirect links until we
-	 reach a real symbol.  */
-      h1 = linux_link_hash_lookup (linux_hash_table (info),
-				   (h->root.root.root.string
-				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, true);
-      /* h2 does not follow indirect symbols. */
-      h2 = linux_link_hash_lookup (linux_hash_table (info), 
-				   (h->root.root.root.string
-				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, false);
-
-      /* The real symbol must exist but if it is also an ABS symbol,
-	 there is no need to have a fixup.  This is because they both
-	 came from the same library.  If on the other hand, we had to
-	 use an indirect symbol to get to the real symbol, we add the
-	 fixup anyway, since there are cases where these symbols come
-	 from different shared libraries */
-      if (h1 != NULL
-	  && (((h1->root.root.type == bfd_link_hash_defined
-		|| h1->root.root.type == bfd_link_hash_defweak)
-	       && ! bfd_is_abs_section (h1->root.root.u.def.section))
-	      || h2->root.root.type == bfd_link_hash_indirect))
-	{
-	  /* See if there is a "builtin" fixup already present
-	     involving this symbol.  If so, convert it to a regular
-	     fixup.  In the end, this relaxes some of the requirements
-	     about the order of performing fixups.  */
-	  exists = false;
-	  for (f1 = linux_hash_table (info)->fixup_list;
-	       f1 != NULL;
-	       f1 = f1->next)
-	    {
-	      if ((f1->h != h && f1->h != h1)
-		  || (! f1->builtin && ! f1->jump))
-		continue;
-	      if (f1->h == h1)
-		exists = true;
-	      if (! exists
-		  && bfd_is_abs_section (h->root.root.u.def.section))
-		{
-		  f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
-		  f->jump = is_plt;
-		}
-	      f1->h = h1;
-	      f1->jump = is_plt;
-	      f1->builtin = 0;
-	      exists = true;
-	    }
-	  if (! exists
-	      && bfd_is_abs_section (h->root.root.u.def.section))
-	    {
-	      f = new_fixup (info, h1, h->root.root.u.def.value, 0);
-	      if (f == NULL)
-		{
-		  /* FIXME: No way to return error.  */
-		  abort ();
-		}
-	      f->jump = is_plt;
-	    }
-	}
-
-      /* Quick and dirty way of stripping these symbols from the
-	 symtab. */
-      if (bfd_is_abs_section (h->root.root.u.def.section))
-	h->root.written = true;
-    }
-
-  return true;
-}
-
-/* This is called to set the size of the .linux-dynamic section is.
-   It is called by the Linux linker emulation before_allocation
-   routine.  We have finished reading all of the input files, and now
-   we just scan the hash tables to find out how many additional fixups
-   are required.  */
-
-boolean
-bfd_i386linux_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  struct fixup *f;
-  asection *s;
-
-  if (output_bfd->xvec != &MY(vec))
-    return true;
-
-  /* First find the fixups... */
-  linux_link_hash_traverse (linux_hash_table (info),
-			    linux_tally_symbols,
-			    (PTR) info);
-
-  /* If there are builtin fixups, leave room for a marker.  This is
-     used by the dynamic linker so that it knows that all that follow
-     are builtin fixups instead of regular fixups.  */
-  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-    {
-      if (f->builtin)
-	{
-	  ++linux_hash_table (info)->fixup_count;
-	  ++linux_hash_table (info)->local_builtins;
-	  break;
-	}
-    }
-
-  if (linux_hash_table (info)->dynobj == NULL)
-    {
-      if (linux_hash_table (info)->fixup_count > 0)
-	abort ();
-      return true;
-    }
-
-  /* Allocate memory for our fixup table.  We will fill it in later.  */
-  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-			       ".linux-dynamic");
-  if (s != NULL)
-    {
-      s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8;
-      s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
-      if (s->contents == NULL)
-	return false;
-      memset (s->contents, 0, (size_t) s->_raw_size);
-    }
-
-  return true;
-}
-
-/* We come here once we are ready to actually write the fixup table to
-   the output file.  Scan the fixup tables and so forth and generate
-   the stuff we need.  */
-
-static boolean
-linux_finish_dynamic_link (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  asection *s, *os, *is;
-  bfd_byte *fixup_table;
-  struct linux_link_hash_entry *h;
-  struct fixup *f;
-  unsigned int new_addr;
-  int section_offset;
-  unsigned int fixups_written;
-
-  if (linux_hash_table (info)->dynobj == NULL)
-    return true;
-
-  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-			       ".linux-dynamic");
-  BFD_ASSERT (s != NULL);
-  os = s->output_section;
-  fixups_written = 0;
-
-#ifdef LINUX_LINK_DEBUG
-  printf ("Fixup table file offset: %x  VMA: %x\n", 
-	  os->filepos + s->output_offset,
-	  os->vma + s->output_offset);
-#endif
-
-  fixup_table = s->contents;
-  bfd_put_32 (output_bfd, linux_hash_table (info)->fixup_count, fixup_table);
-  fixup_table += 4;
-
-  /* Fill in fixup table.  */
-  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-    {
-      if (f->builtin)
-	continue;
-
-      if (f->h->root.root.type != bfd_link_hash_defined
-	  && f->h->root.root.type != bfd_link_hash_defweak)
-	{
-	  (*_bfd_error_handler)
-	    (_("Symbol %s not defined for fixups\n"),
-	     f->h->root.root.root.string);
-	  continue;
-	}
-
-      is = f->h->root.root.u.def.section;
-      section_offset = is->output_section->vma + is->output_offset;
-      new_addr = f->h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-      printf ("Fixup(%d) %s: %x %x\n",f->jump, f->h->root.root.string,
-	      new_addr, f->value);
-#endif
-
-      if (f->jump)
-	{
-	  /* Relative address */
-	  new_addr = new_addr - (f->value + 5); 
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, f->value + 1, fixup_table);
-	  fixup_table += 4;
-	}
-      else
-	{
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, f->value, fixup_table);
-	  fixup_table += 4;
-	}
-      ++fixups_written;
-    }
-
-  if (linux_hash_table (info)->local_builtins != 0)
-    {
-      /* Special marker so we know to switch to the other type of fixup */
-      bfd_put_32 (output_bfd, 0, fixup_table);
-      fixup_table += 4;
-      bfd_put_32 (output_bfd, 0, fixup_table);
-      fixup_table += 4;
-      ++fixups_written;
-      for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-	{
-	  if (! f->builtin)
-	    continue;
-
-	  if (f->h->root.root.type != bfd_link_hash_defined
-	      && f->h->root.root.type != bfd_link_hash_defweak)
-	    {
-	      (*_bfd_error_handler)
-		(_("Symbol %s not defined for fixups\n"),
-		 f->h->root.root.root.string);
-	      continue;
-	    }
-
-	  is = f->h->root.root.u.def.section;
-	  section_offset = is->output_section->vma + is->output_offset;
-	  new_addr = f->h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-	  printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
-		  new_addr, f->value);
-#endif
-
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, f->value, fixup_table);
-	  fixup_table += 4;
-	  ++fixups_written;
-	}
-  }
-
-  if (linux_hash_table (info)->fixup_count != fixups_written)
-    {
-      (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
-      while (linux_hash_table (info)->fixup_count > fixups_written)
-	{
-	  bfd_put_32 (output_bfd, 0, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, 0, fixup_table);
-	  fixup_table += 4;
-	  ++fixups_written;
-	}
-    }
-
-  h = linux_link_hash_lookup (linux_hash_table (info), 
-			      "__BUILTIN_FIXUPS__",
-			      false, false, false);
-
-  if (h != NULL
-      && (h->root.root.type == bfd_link_hash_defined
-	  || h->root.root.type == bfd_link_hash_defweak))
-    {
-      is = h->root.root.u.def.section;
-      section_offset = is->output_section->vma + is->output_offset;
-      new_addr = h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-      printf ("Builtin fixup table at %x\n", new_addr);
-#endif
-
-      bfd_put_32 (output_bfd, new_addr, fixup_table);
-    }
-  else
-    bfd_put_32 (output_bfd, 0, fixup_table);
-
-  if (bfd_seek (output_bfd, os->filepos + s->output_offset, SEEK_SET) != 0)
-    return false;
-
-  if (bfd_write ((PTR) s->contents, 1, s->_raw_size, output_bfd)
-      != s->_raw_size)
-    return false;
-
-  return true;
-}
-
-#define MY_bfd_link_hash_table_create linux_link_hash_table_create
-#define MY_add_one_symbol linux_add_one_symbol
-#define MY_finish_dynamic_link linux_finish_dynamic_link
-
-#define MY_zmagic_contiguous 1
-
-#include "aout-target.h"
diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c
deleted file mode 100644
index 1f0344ec000..00000000000
--- a/bfd/i386lynx.c
+++ /dev/null
@@ -1,562 +0,0 @@
-/* BFD back-end for i386 a.out binaries under LynxOS.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define BYTES_IN_WORD 4
-#define N_SHARED_LIB(x) 0
-
-#define TEXT_START_ADDR 0
-#define TARGET_PAGE_SIZE 4096
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_i386
-
-#define MY(OP) CAT(i386lynx_aout_,OP)
-#define TARGETNAME "a.out-i386-lynx"
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#ifndef WRITE_HEADERS
-#define WRITE_HEADERS(abfd, execp)					      \
-      {									      \
-	bfd_size_type text_size; /* dummy vars */			      \
-	file_ptr text_end;						      \
-	if (adata(abfd).magic == undecided_magic)			      \
-	  NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);     \
-    									      \
-	execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	      \
-	execp->a_entry = bfd_get_start_address (abfd);			      \
-    									      \
-	execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		      \
-			   obj_reloc_entry_size (abfd));		      \
-	execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		      \
-			   obj_reloc_entry_size (abfd));		      \
-	NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);	      \
-									      \
-	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false;	      \
-	if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)	      \
-	    != EXEC_BYTES_SIZE)						      \
-	  return false;							      \
-	/* Now write out reloc info, followed by syms and strings */	      \
-  									      \
-	if (bfd_get_symcount (abfd) != 0) 				      \
-	    {								      \
-	      if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET)     \
-		  != 0)							      \
-	        return false;						      \
-									      \
-	      if (! NAME(aout,write_syms)(abfd)) return false;		      \
-									      \
-	      if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET)    \
-		  != 0)							      \
-	        return false;						      \
-									      \
-	      if (!NAME(lynx,squirt_out_relocs) (abfd, obj_textsec (abfd)))   \
-		return false;						      \
-	      if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET)    \
-		  != 0)							      \
-	        return 0;						      \
-									      \
-	      if (!NAME(lynx,squirt_out_relocs)(abfd, obj_datasec (abfd)))    \
-		return false;						      \
-	    }								      \
-      }
-#endif
-
-#include "libaout.h"
-#include "aout/aout64.h"
-
-#ifdef LYNX_CORE
-
-char *lynx_core_file_failing_command ();
-int lynx_core_file_failing_signal ();
-boolean lynx_core_file_matches_executable_p ();
-const bfd_target *lynx_core_file_p ();
-
-#define	MY_core_file_failing_command lynx_core_file_failing_command
-#define	MY_core_file_failing_signal lynx_core_file_failing_signal
-#define	MY_core_file_matches_executable_p lynx_core_file_matches_executable_p
-#define	MY_core_file_p lynx_core_file_p
-
-#endif /* LYNX_CORE */
-
-
-#define KEEPIT udata.i
-
-extern reloc_howto_type aout_32_ext_howto_table[];
-extern reloc_howto_type aout_32_std_howto_table[];
-
-/* Standard reloc stuff */
-/* Output standard relocation information to a file in target byte order. */
-
-void
-NAME(lynx,swap_std_reloc_out) (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     struct reloc_std_external *natptr;
-{
-  int r_index;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  int r_extern;
-  unsigned int r_length;
-  int r_pcrel;
-  int r_baserel, r_jmptable, r_relative;
-  unsigned int r_addend;
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD (abfd, g->address, natptr->r_address);
-
-  r_length = g->howto->size;	/* Size as a power of two */
-  r_pcrel = (int) g->howto->pc_relative;	/* Relative to PC? */
-  /* r_baserel, r_jmptable, r_relative???  FIXME-soon */
-  r_baserel = 0;
-  r_jmptable = 0;
-  r_relative = 0;
-
-  r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
-
-  /* name was clobbered by aout_write_syms to be symbol index */
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here
-     */
-
-
-  if (bfd_is_com_section (output_section)
-      || bfd_is_abs_section (output_section)
-      || bfd_is_und_section (output_section))
-    {
-      if (bfd_abs_section_ptr->symbol == sym)
-	{
-	  /* Whoops, looked like an abs symbol, but is really an offset
-	   from the abs section */
-	  r_index = 0;
-	  r_extern = 0;
-	}
-      else
-	{
-	  /* Fill in symbol */
-	  r_extern = 1;
-	  r_index = (*g->sym_ptr_ptr)->KEEPIT;
-	}
-    }
-  else
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_index = output_section->target_index;
-    }
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd))
-    {
-      natptr->r_index[0] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[2] = r_index;
-      natptr->r_type[0] =
-	(r_extern ? RELOC_STD_BITS_EXTERN_BIG : 0)
-	| (r_pcrel ? RELOC_STD_BITS_PCREL_BIG : 0)
-	| (r_baserel ? RELOC_STD_BITS_BASEREL_BIG : 0)
-	| (r_jmptable ? RELOC_STD_BITS_JMPTABLE_BIG : 0)
-	| (r_relative ? RELOC_STD_BITS_RELATIVE_BIG : 0)
-	| (r_length << RELOC_STD_BITS_LENGTH_SH_BIG);
-    }
-  else
-    {
-      natptr->r_index[2] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[0] = r_index;
-      natptr->r_type[0] =
-	(r_extern ? RELOC_STD_BITS_EXTERN_LITTLE : 0)
-	| (r_pcrel ? RELOC_STD_BITS_PCREL_LITTLE : 0)
-	| (r_baserel ? RELOC_STD_BITS_BASEREL_LITTLE : 0)
-	| (r_jmptable ? RELOC_STD_BITS_JMPTABLE_LITTLE : 0)
-	| (r_relative ? RELOC_STD_BITS_RELATIVE_LITTLE : 0)
-	| (r_length << RELOC_STD_BITS_LENGTH_SH_LITTLE);
-    }
-}
-
-
-/* Extended stuff */
-/* Output extended relocation information to a file in target byte order. */
-
-void
-NAME(lynx,swap_ext_reloc_out) (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     register struct reloc_ext_external *natptr;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_type;
-  unsigned int r_addend;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD (abfd, g->address, natptr->r_address);
-
-  r_type = (unsigned int) g->howto->type;
-
-  r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
-
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here
-     */
-
-  if (bfd_is_com_section (output_section)
-      || bfd_is_abs_section (output_section)
-      || bfd_is_und_section (output_section))
-    {
-      if (bfd_abs_section_ptr->symbol == sym)
-	{
-	  /* Whoops, looked like an abs symbol, but is really an offset
-	 from the abs section */
-	  r_index = 0;
-	  r_extern = 0;
-	}
-      else
-	{
-	  r_extern = 1;
-	  r_index = (*g->sym_ptr_ptr)->KEEPIT;
-	}
-    }
-  else
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_index = output_section->target_index;
-    }
-
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd))
-    {
-      natptr->r_index[0] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[2] = r_index;
-      natptr->r_type[0] =
-	(r_extern ? RELOC_EXT_BITS_EXTERN_BIG : 0)
-	| (r_type << RELOC_EXT_BITS_TYPE_SH_BIG);
-    }
-  else
-    {
-      natptr->r_index[2] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[0] = r_index;
-      natptr->r_type[0] =
-	(r_extern ? RELOC_EXT_BITS_EXTERN_LITTLE : 0)
-	| (r_type << RELOC_EXT_BITS_TYPE_SH_LITTLE);
-    }
-
-  PUT_WORD (abfd, r_addend, natptr->r_addend);
-}
-
-/* BFD deals internally with all things based from the section they're
-   in. so, something in 10 bytes into a text section  with a base of
-   50 would have a symbol (.text+10) and know .text vma was 50.
-
-   Aout keeps all it's symbols based from zero, so the symbol would
-   contain 60. This macro subs the base of each section from the value
-   to give the true offset from the section */
-
-
-#define MOVE_ADDRESS(ad)       						\
-  if (r_extern) {							\
-   /* undefined symbol */						\
-     cache_ptr->sym_ptr_ptr = symbols + r_index;			\
-     cache_ptr->addend = ad;						\
-     } else {								\
-    /* defined, section relative. replace symbol with pointer to    	\
-       symbol which points to section  */				\
-    switch (r_index) {							\
-    case N_TEXT:							\
-    case N_TEXT | N_EXT:						\
-      cache_ptr->sym_ptr_ptr  = obj_textsec(abfd)->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad  - su->textsec->vma;			\
-      break;								\
-    case N_DATA:							\
-    case N_DATA | N_EXT:						\
-      cache_ptr->sym_ptr_ptr  = obj_datasec(abfd)->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad - su->datasec->vma;			\
-      break;								\
-    case N_BSS:								\
-    case N_BSS | N_EXT:							\
-      cache_ptr->sym_ptr_ptr  = obj_bsssec(abfd)->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad - su->bsssec->vma;				\
-      break;								\
-    default:								\
-    case N_ABS:								\
-    case N_ABS | N_EXT:							\
-     cache_ptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;	\
-      cache_ptr->addend = ad;						\
-      break;								\
-    }									\
-  }     								\
-
-void
-NAME(lynx,swap_ext_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_ext_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_type;
-  struct aoutdata *su = &(abfd->tdata.aout_data->a);
-
-  cache_ptr->address = (GET_SWORD (abfd, bytes->r_address));
-
-  r_index = bytes->r_index[1];
-  r_extern = (0 != (bytes->r_index[0] & RELOC_EXT_BITS_EXTERN_BIG));
-  r_type = (bytes->r_index[0] & RELOC_EXT_BITS_TYPE_BIG)
-    >> RELOC_EXT_BITS_TYPE_SH_BIG;
-
-  cache_ptr->howto = aout_32_ext_howto_table + r_type;
-  MOVE_ADDRESS (GET_SWORD (abfd, bytes->r_addend));
-}
-
-void
-NAME(lynx,swap_std_reloc_in) (abfd, bytes, cache_ptr, symbols, symcount)
-     bfd *abfd;
-     struct reloc_std_external *bytes;
-     arelent *cache_ptr;
-     asymbol **symbols;
-     bfd_size_type symcount;
-{
-  int r_index;
-  int r_extern;
-  unsigned int r_length;
-  int r_pcrel;
-  int r_baserel, r_jmptable, r_relative;
-  struct aoutdata *su = &(abfd->tdata.aout_data->a);
-
-  cache_ptr->address = bfd_h_get_32 (abfd, bytes->r_address);
-
-  r_index = bytes->r_index[1];
-  r_extern = (0 != (bytes->r_index[0] & RELOC_STD_BITS_EXTERN_BIG));
-  r_pcrel = (0 != (bytes->r_index[0] & RELOC_STD_BITS_PCREL_BIG));
-  r_baserel = (0 != (bytes->r_index[0] & RELOC_STD_BITS_BASEREL_BIG));
-  r_jmptable = (0 != (bytes->r_index[0] & RELOC_STD_BITS_JMPTABLE_BIG));
-  r_relative = (0 != (bytes->r_index[0] & RELOC_STD_BITS_RELATIVE_BIG));
-  r_length = (bytes->r_index[0] & RELOC_STD_BITS_LENGTH_BIG)
-    >> RELOC_STD_BITS_LENGTH_SH_BIG;
-
-  cache_ptr->howto = aout_32_std_howto_table + r_length + 4 * r_pcrel;
-  /* FIXME-soon:  Roll baserel, jmptable, relative bits into howto setting */
-
-  MOVE_ADDRESS (0);
-}
-
-/* Reloc hackery */
-
-boolean
-NAME(lynx,slurp_reloc_table) (abfd, asect, symbols)
-     bfd *abfd;
-     sec_ptr asect;
-     asymbol **symbols;
-{
-  unsigned int count;
-  bfd_size_type reloc_size;
-  PTR relocs;
-  arelent *reloc_cache;
-  size_t each_size;
-
-  if (asect->relocation)
-    return true;
-
-  if (asect->flags & SEC_CONSTRUCTOR)
-    return true;
-
-  if (asect == obj_datasec (abfd))
-    {
-      reloc_size = exec_hdr (abfd)->a_drsize;
-      goto doit;
-    }
-
-  if (asect == obj_textsec (abfd))
-    {
-      reloc_size = exec_hdr (abfd)->a_trsize;
-      goto doit;
-    }
-
-  bfd_set_error (bfd_error_invalid_operation);
-  return false;
-
-doit:
-  if (bfd_seek (abfd, asect->rel_filepos, SEEK_SET) != 0)
-    return false;
-  each_size = obj_reloc_entry_size (abfd);
-
-  count = reloc_size / each_size;
-
-
-  reloc_cache = (arelent *) bfd_malloc (count * sizeof (arelent));
-  if (!reloc_cache && count != 0)
-    return false;
-  memset (reloc_cache, 0, count * sizeof (arelent));
-
-  relocs = (PTR) bfd_alloc (abfd, reloc_size);
-  if (!relocs && reloc_size != 0)
-    {
-      free (reloc_cache);
-      return false;
-    }
-
-  if (bfd_read (relocs, 1, reloc_size, abfd) != reloc_size)
-    {
-      bfd_release (abfd, relocs);
-      free (reloc_cache);
-      return false;
-    }
-
-  if (each_size == RELOC_EXT_SIZE)
-    {
-      register struct reloc_ext_external *rptr = (struct reloc_ext_external *) relocs;
-      unsigned int counter = 0;
-      arelent *cache_ptr = reloc_cache;
-
-      for (; counter < count; counter++, rptr++, cache_ptr++)
-	{
-	  NAME(lynx,swap_ext_reloc_in) (abfd, rptr, cache_ptr, symbols,
-					bfd_get_symcount (abfd));
-	}
-    }
-  else
-    {
-      register struct reloc_std_external *rptr = (struct reloc_std_external *) relocs;
-      unsigned int counter = 0;
-      arelent *cache_ptr = reloc_cache;
-
-      for (; counter < count; counter++, rptr++, cache_ptr++)
-	{
-	  NAME(lynx,swap_std_reloc_in) (abfd, rptr, cache_ptr, symbols,
-					bfd_get_symcount (abfd));
-	}
-
-    }
-
-  bfd_release (abfd, relocs);
-  asect->relocation = reloc_cache;
-  asect->reloc_count = count;
-  return true;
-}
-
-
-
-/* Write out a relocation section into an object file.  */
-
-boolean
-NAME(lynx,squirt_out_relocs) (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  arelent **generic;
-  unsigned char *native, *natptr;
-  size_t each_size;
-
-  unsigned int count = section->reloc_count;
-  size_t natsize;
-
-  if (count == 0)
-    return true;
-
-  each_size = obj_reloc_entry_size (abfd);
-  natsize = each_size * count;
-  native = (unsigned char *) bfd_zalloc (abfd, natsize);
-  if (!native)
-    return false;
-
-  generic = section->orelocation;
-
-  if (each_size == RELOC_EXT_SIZE)
-    {
-      for (natptr = native;
-	   count != 0;
-	   --count, natptr += each_size, ++generic)
-	NAME(lynx,swap_ext_reloc_out) (abfd, *generic, (struct reloc_ext_external *) natptr);
-    }
-  else
-    {
-      for (natptr = native;
-	   count != 0;
-	   --count, natptr += each_size, ++generic)
-	NAME(lynx,swap_std_reloc_out) (abfd, *generic, (struct reloc_std_external *) natptr);
-    }
-
-  if (bfd_write ((PTR) native, 1, natsize, abfd) != natsize)
-    {
-      bfd_release (abfd, native);
-      return false;
-    }
-  bfd_release (abfd, native);
-
-  return true;
-}
-
-/* This is stupid.  This function should be a boolean predicate */
-long
-NAME(lynx,canonicalize_reloc) (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count;
-
-  if (!(tblptr || NAME(lynx,slurp_reloc_table) (abfd, section, symbols)))
-    return -1;
-
-  if (section->flags & SEC_CONSTRUCTOR)
-    {
-      arelent_chain *chain = section->constructor_chain;
-      for (count = 0; count < section->reloc_count; count++)
-	{
-	  *relptr++ = &chain->relent;
-	  chain = chain->next;
-	}
-    }
-  else
-    {
-      tblptr = section->relocation;
-
-      for (count = 0; count++ < section->reloc_count;)
-	{
-	  *relptr++ = tblptr++;
-	}
-    }
-  *relptr = 0;
-
-  return section->reloc_count;
-}
-
-#define MY_canonicalize_reloc NAME(lynx,canonicalize_reloc)
-
-#include "aout-target.h"
diff --git a/bfd/i386mach3.c b/bfd/i386mach3.c
deleted file mode 100644
index eff75824658..00000000000
--- a/bfd/i386mach3.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* BFD back-end for i386 a.out binaries.
-   Copyright (C) 1990, 91, 93, 94, 95, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This is for Mach 3, which uses a.out, not Mach-O.  */
-
-/* There is no magic number or anything which lets us distinguish this target
-   from i386aout or i386bsd.  So this target is only useful if it is the
-   default target.  */
-
-#define	TARGET_PAGE_SIZE	1
-#define	SEGMENT_SIZE	0x1000
-#define TEXT_START_ADDR	0x10000
-#define ARCH 32
-#define BYTES_IN_WORD 4
-/* This macro is only relevant when N_MAGIC(x) == ZMAGIC.  */
-#define N_HEADER_IN_TEXT(x)	1
-
-#define N_TXTSIZE(x)	((x).a_text)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#define DEFAULT_ARCH bfd_arch_i386
-#define MY(OP) CAT(i386mach3_,OP)
-#define TARGETNAME "a.out-mach3"
-
-static boolean MY(set_sizes)();
-#define MY_backend_data &MY(backend_data)
-static CONST struct aout_backend_data MY(backend_data) = {
-  0,				/* zmagic contiguous */
-  1,				/* text incl header */
-  0,				/* entry is text address */
-  0,				/* exec_hdr_flags */
-  0,				/* text vma? */
-  MY(set_sizes),
-  1,				/* exec header not counted */
-  0,				/* add_dynamic_symbols */
-  0,				/* add_one_symbol */
-  0,				/* link_dynamic_object */
-  0,				/* write_dynamic_symbol */
-  0,				/* check_dynamic_reloc */
-  0				/* finish_dynamic_link */
-};
-
-#include "aout-target.h"
diff --git a/bfd/i386msdos.c b/bfd/i386msdos.c
deleted file mode 100644
index c6f24b2ac33..00000000000
--- a/bfd/i386msdos.c
+++ /dev/null
@@ -1,244 +0,0 @@
-/* BFD back-end for MS-DOS executables.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Bryan Ford of the University of Utah.
-
-   Contributed by the Center for Software Science at the
-   University of Utah (pa-gdb-bugs@cs.utah.edu).
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
-
-#if 0
-struct exe_header
-{
-	unsigned short magic;
-	unsigned short bytes_in_last_page;
-	unsigned short npages;	/* number of 512-byte "pages" including this header */
-	unsigned short nrelocs;
-	unsigned short header_paras;	/* number of 16-byte paragraphs in header */
-	unsigned short reserved;
-	unsigned short load_switch;
-	unsigned short ss_ofs;
-	unsigned short sp;
-	unsigned short checksum;
-	unsigned short ip;
-	unsigned short cs_ofs;
-	unsigned short reloc_ofs;
-	unsigned short reserved2;
-	unsigned short something1;
-	unsigned short something2;
-	unsigned short something3;
-};
-#endif
-
-#define EXE_MAGIC	0x5a4d
-#define EXE_LOAD_HIGH	0x0000
-#define EXE_LOAD_LOW	0xffff
-#define EXE_PAGE_SIZE	512
-
-
-static int
-msdos_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-{
-  return 0;
-}
-
-static boolean
-msdos_write_object_contents (abfd)
-     bfd *abfd;
-{
-  static char hdr[EXE_PAGE_SIZE];
-  file_ptr outfile_size = sizeof(hdr);
-  bfd_vma high_vma = 0;
-  asection *sec;
-
-  /* Find the total size of the program on disk and in memory.  */
-  for (sec = abfd->sections; sec != (asection *) NULL; sec = sec->next)
-    {
-      if (bfd_get_section_size_before_reloc (sec) == 0)
-        continue;
-      if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
-        {
-	  bfd_vma sec_vma = bfd_get_section_vma (abfd, sec)
-	  		    + bfd_get_section_size_before_reloc (sec);
-	  if (sec_vma > high_vma)
-	    high_vma = sec_vma;
-	}
-      if (bfd_get_section_flags (abfd, sec) & SEC_LOAD)
-        {
-	  file_ptr sec_end = sizeof(hdr)
-	  		     + bfd_get_section_vma (abfd, sec)
-			     + bfd_get_section_size_before_reloc (sec);
-	  if (sec_end > outfile_size)
-	    outfile_size = sec_end;
-	}
-    }
-
-  /* Make sure the program isn't too big.  */
-  if (high_vma > (bfd_vma)0xffff)
-    {
-      bfd_set_error(bfd_error_file_too_big);
-      return false;
-    }
-
-  /* constants */
-  bfd_h_put_16(abfd, EXE_MAGIC, &hdr[0]);
-  bfd_h_put_16(abfd, EXE_PAGE_SIZE / 16, &hdr[8]);
-  bfd_h_put_16(abfd, EXE_LOAD_LOW, &hdr[12]);
-  bfd_h_put_16(abfd, 0x3e, &hdr[24]);
-  bfd_h_put_16(abfd, 0x0001, &hdr[28]); /* XXX??? */
-  bfd_h_put_16(abfd, 0x30fb, &hdr[30]); /* XXX??? */
-  bfd_h_put_16(abfd, 0x726a, &hdr[32]); /* XXX??? */
-
-  /* bytes in last page (0 = full page) */
-  bfd_h_put_16(abfd, outfile_size & (EXE_PAGE_SIZE - 1), &hdr[2]);
-
-  /* number of pages */
-  bfd_h_put_16(abfd, (outfile_size + EXE_PAGE_SIZE - 1) / EXE_PAGE_SIZE,
-  	       &hdr[4]);
-
-  /* Set the initial stack pointer to the end of the bss.
-     The program's crt0 code must relocate it to a real stack.  */
-  bfd_h_put_16(abfd, high_vma, &hdr[16]);
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || bfd_write (hdr, 1, sizeof(hdr), abfd) != sizeof(hdr))
-    return false;
-
-  return true;
-}
-
-static boolean
-msdos_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-
-  if (count == 0)
-    return true;
-
-  section->filepos = EXE_PAGE_SIZE + bfd_get_section_vma (abfd, section);
-
-  if (bfd_get_section_flags (abfd, section) & SEC_LOAD)
-    {
-      if (bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0
-          || bfd_write (location, 1, count, abfd) != count)
-        return false;
-    }
-
-  return true;
-}
-
-
-
-#define msdos_mkobject aout_32_mkobject
-#define msdos_make_empty_symbol aout_32_make_empty_symbol
-#define msdos_bfd_reloc_type_lookup aout_32_reloc_type_lookup
-
-#define	msdos_close_and_cleanup _bfd_generic_close_and_cleanup
-#define msdos_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define msdos_new_section_hook _bfd_generic_new_section_hook
-#define msdos_get_section_contents _bfd_generic_get_section_contents
-#define msdos_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-#define msdos_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define msdos_bfd_relax_section bfd_generic_relax_section
-#define msdos_bfd_gc_sections bfd_generic_gc_sections
-#define msdos_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define msdos_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define msdos_bfd_final_link _bfd_generic_final_link
-#define msdos_bfd_link_split_section _bfd_generic_link_split_section
-#define msdos_set_arch_mach _bfd_generic_set_arch_mach
-
-#define msdos_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
-#define msdos_get_symtab _bfd_nosymbols_get_symtab
-#define msdos_print_symbol _bfd_nosymbols_print_symbol
-#define msdos_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define msdos_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define msdos_get_lineno _bfd_nosymbols_get_lineno
-#define msdos_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
-#define msdos_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define msdos_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define msdos_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-#define msdos_canonicalize_reloc _bfd_norelocs_canonicalize_reloc
-#define msdos_get_reloc_upper_bound _bfd_norelocs_get_reloc_upper_bound
-#define msdos_32_bfd_link_split_section  _bfd_generic_link_split_section
-
-const bfd_target i386msdos_vec =
-{
-  "msdos",			/* name */
-  bfd_target_msdos_flavour,
-  BFD_ENDIAN_LITTLE,		/* target byte order */
-  BFD_ENDIAN_LITTLE,		/* target headers byte order */
-  (EXEC_P),			/* object flags */
-  (SEC_CODE | SEC_DATA | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
-
-  {
-    _bfd_dummy_target,
-    _bfd_dummy_target,		/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {
-    bfd_false,
-    msdos_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    msdos_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (msdos),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (msdos),
-  BFD_JUMP_TABLE_RELOCS (msdos),
-  BFD_JUMP_TABLE_WRITE (msdos),
-  BFD_JUMP_TABLE_LINK (msdos),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
-
-
diff --git a/bfd/i386netbsd.c b/bfd/i386netbsd.c
deleted file mode 100644
index 327b6f94bbf..00000000000
--- a/bfd/i386netbsd.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* BFD back-end for NetBSD/386 a.out-ish binaries.
-   Copyright (C) 1990, 91, 92, 94, 95, 96, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#define	BYTES_IN_WORD	4
-#undef TARGET_IS_BIG_ENDIAN_P
-
-#define	TARGET_PAGE_SIZE	4096
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-
-#define	DEFAULT_ARCH	bfd_arch_i386
-#define	DEFAULT_MID 	M_386_NETBSD
-
-#define MY(OP) CAT(i386netbsd_,OP)
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME "a.out-i386-netbsd"
-
-#include "netbsd.h"
diff --git a/bfd/i386os9k.c b/bfd/i386os9k.c
deleted file mode 100644
index 2a01f5b2f83..00000000000
--- a/bfd/i386os9k.c
+++ /dev/null
@@ -1,371 +0,0 @@
-/* BFD back-end for os9000 i386 binaries.
-   Copyright 1990, 1991, 1992, 1993, 1994 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "libaout.h"		/* BFD a.out internal data structures */
-#include "os9k.h"
-
-static const bfd_target *os9k_callback PARAMS ((bfd *));
-
-/* Swaps the information in an executable header taken from a raw byte
-   stream memory image, into the internal exec_header structure.  */
-boolean
-os9k_swap_exec_header_in (abfd, raw_bytes, execp)
-     bfd *abfd;
-     mh_com *raw_bytes;
-     struct internal_exec *execp;
-{
-  mh_com *bytes = (mh_com *) raw_bytes;
-  unsigned int dload, dmemsize, dmemstart;
-
-  /* Now fill in fields in the execp, from the bytes in the raw data.  */
-  execp->a_info = bfd_h_get_16 (abfd, bytes->m_sync);
-  execp->a_syms = 0;
-  execp->a_entry = bfd_h_get_32 (abfd, bytes->m_exec);
-  execp->a_talign = 2;
-  execp->a_dalign = 2;
-  execp->a_balign = 2;
-
-  dload = bfd_h_get_32 (abfd, bytes->m_idata);
-  execp->a_data = dload + 8;
-
-  if (bfd_seek (abfd, (file_ptr) dload, SEEK_SET) != 0
-      || (bfd_read (&dmemstart, sizeof (dmemstart), 1, abfd)
-	  != sizeof (dmemstart))
-      || (bfd_read (&dmemsize, sizeof (dmemsize), 1, abfd)
-	  != sizeof (dmemsize)))
-    return false;
-
-  execp->a_tload = 0;
-  execp->a_dload = bfd_h_get_32 (abfd, (unsigned char *) &dmemstart);
-  execp->a_text = dload - execp->a_tload;
-  execp->a_data = bfd_h_get_32 (abfd, (unsigned char *) &dmemsize);
-  execp->a_bss = bfd_h_get_32 (abfd, bytes->m_data) - execp->a_data;
-
-  execp->a_trsize = 0;
-  execp->a_drsize = 0;
-
-  return true;
-}
-
-#if 0
-/* Swaps the information in an internal exec header structure into the
-   supplied buffer ready for writing to disk.  */
-
-PROTO (void, os9k_swap_exec_header_out,
-         (bfd * abfd,
-	  struct internal_exec * execp,
-	  struct mh_com * raw_bytes));
-void
-os9k_swap_exec_header_out (abfd, execp, raw_bytes)
-     bfd *abfd;
-     struct internal_exec *execp;
-     mh_com *raw_bytes;
-{
-  mh_com *bytes = (mh_com *) raw_bytes;
-
-  /* Now fill in fields in the raw data, from the fields in the exec struct. */
-  bfd_h_put_32 (abfd, execp->a_info, bytes->e_info);
-  bfd_h_put_32 (abfd, execp->a_text, bytes->e_text);
-  bfd_h_put_32 (abfd, execp->a_data, bytes->e_data);
-  bfd_h_put_32 (abfd, execp->a_bss, bytes->e_bss);
-  bfd_h_put_32 (abfd, execp->a_syms, bytes->e_syms);
-  bfd_h_put_32 (abfd, execp->a_entry, bytes->e_entry);
-  bfd_h_put_32 (abfd, execp->a_trsize, bytes->e_trsize);
-  bfd_h_put_32 (abfd, execp->a_drsize, bytes->e_drsize);
-  bfd_h_put_32 (abfd, execp->a_tload, bytes->e_tload);
-  bfd_h_put_32 (abfd, execp->a_dload, bytes->e_dload);
-  bytes->e_talign[0] = execp->a_talign;
-  bytes->e_dalign[0] = execp->a_dalign;
-  bytes->e_balign[0] = execp->a_balign;
-  bytes->e_relaxable[0] = execp->a_relaxable;
-}
-
-#endif	/* 0 */
-
-static const bfd_target *
-os9k_object_p (abfd)
-     bfd *abfd;
-{
-  struct internal_exec anexec;
-  mh_com exec_bytes;
-
-  if (bfd_read ((PTR) & exec_bytes, MHCOM_BYTES_SIZE, 1, abfd)
-      != MHCOM_BYTES_SIZE)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  anexec.a_info = bfd_h_get_16 (abfd, exec_bytes.m_sync);
-  if (N_BADMAG (anexec))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  if (! os9k_swap_exec_header_in (abfd, &exec_bytes, &anexec))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  return aout_32_some_aout_object_p (abfd, &anexec, os9k_callback);
-}
-
-
-/* Finish up the opening of a b.out file for reading.  Fill in all the
-   fields that are not handled by common code.  */
-
-static const bfd_target *
-os9k_callback (abfd)
-     bfd *abfd;
-{
-  struct internal_exec *execp = exec_hdr (abfd);
-  unsigned long bss_start;
-
-  /* Architecture and machine type */
-  bfd_set_arch_mach (abfd, bfd_arch_i386, 0);
-
-  /* The positions of the string table and symbol table.  */
-  obj_str_filepos (abfd) = 0;
-  obj_sym_filepos (abfd) = 0;
-
-  /* The alignments of the sections */
-  obj_textsec (abfd)->alignment_power = execp->a_talign;
-  obj_datasec (abfd)->alignment_power = execp->a_dalign;
-  obj_bsssec (abfd)->alignment_power = execp->a_balign;
-
-  /* The starting addresses of the sections.  */
-  obj_textsec (abfd)->vma = execp->a_tload;
-  obj_datasec (abfd)->vma = execp->a_dload;
-
-  /* And reload the sizes, since the aout module zaps them */
-  obj_textsec (abfd)->_raw_size = execp->a_text;
-
-  bss_start = execp->a_dload + execp->a_data;	/* BSS = end of data section */
-  obj_bsssec (abfd)->vma = align_power (bss_start, execp->a_balign);
-
-  /* The file positions of the sections */
-  obj_textsec (abfd)->filepos = execp->a_entry;
-  obj_datasec (abfd)->filepos = execp->a_dload;
-
-  /* The file positions of the relocation info ***
-  obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
-  obj_datasec (abfd)->rel_filepos =  N_DROFF(*execp);
-  */
-
-  adata (abfd).page_size = 1;	/* Not applicable. */
-  adata (abfd).segment_size = 1;/* Not applicable. */
-  adata (abfd).exec_bytes_size = MHCOM_BYTES_SIZE;
-
-  return abfd->xvec;
-}
-
-#if 0
-struct bout_data_struct
-{
-  struct aoutdata a;
-  struct internal_exec e;
-};
-
-static boolean
-os9k_mkobject (abfd)
-     bfd *abfd;
-{
-  struct bout_data_struct *rawptr;
-
-  rawptr = (struct bout_data_struct *) bfd_zalloc (abfd, sizeof (struct bout_data_struct));
-  if (rawptr == NULL)
-    return false;
-
-  abfd->tdata.bout_data = rawptr;
-  exec_hdr (abfd) = &rawptr->e;
-
-  obj_textsec (abfd) = (asection *) NULL;
-  obj_datasec (abfd) = (asection *) NULL;
-  obj_bsssec (abfd) = (asection *) NULL;
-
-  return true;
-}
-
-static boolean
-os9k_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec swapped_hdr;
-
-  if (! aout_32_make_sections (abfd))
-    return false;
-
-  exec_hdr (abfd)->a_info = BMAGIC;
-
-  exec_hdr (abfd)->a_text = obj_textsec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_data = obj_datasec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_bss = obj_bsssec (abfd)->_raw_size;
-  exec_hdr (abfd)->a_syms = bfd_get_symcount (abfd) * sizeof (struct nlist);
-  exec_hdr (abfd)->a_entry = bfd_get_start_address (abfd);
-  exec_hdr (abfd)->a_trsize = ((obj_textsec (abfd)->reloc_count) *
-			       sizeof (struct relocation_info));
-  exec_hdr (abfd)->a_drsize = ((obj_datasec (abfd)->reloc_count) *
-			       sizeof (struct relocation_info));
-
-  exec_hdr (abfd)->a_talign = obj_textsec (abfd)->alignment_power;
-  exec_hdr (abfd)->a_dalign = obj_datasec (abfd)->alignment_power;
-  exec_hdr (abfd)->a_balign = obj_bsssec (abfd)->alignment_power;
-
-  exec_hdr (abfd)->a_tload = obj_textsec (abfd)->vma;
-  exec_hdr (abfd)->a_dload = obj_datasec (abfd)->vma;
-
-  bout_swap_exec_header_out (abfd, exec_hdr (abfd), &swapped_hdr);
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || (bfd_write ((PTR) & swapped_hdr, 1, EXEC_BYTES_SIZE, abfd)
-	  != EXEC_BYTES_SIZE))
-    return false;
-
-  /* Now write out reloc info, followed by syms and strings */
-  if (bfd_get_symcount (abfd) != 0)
-    {
-      if (bfd_seek (abfd, (file_ptr) (N_SYMOFF (*exec_hdr (abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      if (!aout_32_write_syms (abfd))
-	return false;
-
-      if (bfd_seek (abfd, (file_ptr) (N_TROFF (*exec_hdr (abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      if (!b_out_squirt_out_relocs (abfd, obj_textsec (abfd)))
-	return false;
-      if (bfd_seek (abfd, (file_ptr) (N_DROFF (*exec_hdr (abfd))), SEEK_SET)
-	  != 0)
-	return false;
-
-      if (!b_out_squirt_out_relocs (abfd, obj_datasec (abfd)))
-	return false;
-    }
-  return true;
-}
-
-static boolean
-os9k_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     unsigned char *location;
-     file_ptr offset;
-     int count;
-{
-
-  if (abfd->output_has_begun == false)
-    {				/* set by bfd.c handler */
-      if (! aout_32_make_sections (abfd))
-	return false;
-
-      obj_textsec (abfd)->filepos = sizeof (struct internal_exec);
-      obj_datasec (abfd)->filepos = obj_textsec (abfd)->filepos
-	+ obj_textsec (abfd)->_raw_size;
-
-    }
-  /* regardless, once we know what we're doing, we might as well get going */
-  if (bfd_seek (abfd, section->filepos + offset, SEEK_SET) != 0)
-    return false;
-
-  if (count != 0)
-    {
-      return (bfd_write ((PTR) location, 1, count, abfd) == count) ? true : false;
-    }
-  return true;
-}
-#endif	/* 0 */
-
-static int
-os9k_sizeof_headers (ignore_abfd, ignore)
-     bfd *ignore_abfd;
-     boolean ignore;
-{
-  return sizeof (struct internal_exec);
-}
-
-
-/***********************************************************************/
-
-#define aout_32_close_and_cleanup aout_32_bfd_free_cached_info
-
-#define aout_32_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-
-#define aout_32_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define aout_32_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define os9k_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define os9k_bfd_relax_section bfd_generic_relax_section
-#define os9k_bfd_gc_sections bfd_generic_gc_sections
-#define os9k_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define os9k_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define os9k_bfd_final_link _bfd_generic_final_link
-#define os9k_bfd_link_split_section  _bfd_generic_link_split_section
-
-const bfd_target i386os9k_vec =
-{
-  "i386os9k",			/* name */
-  bfd_target_os9k_flavour,
-  BFD_ENDIAN_LITTLE,		/* data byte order is little */
-  BFD_ENDIAN_LITTLE,		/* hdr byte order is little */
-  (HAS_RELOC | EXEC_P | WP_TEXT),	/* object flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),	/* section flags */
-  0,				/* symbol leading char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
-  {_bfd_dummy_target, os9k_object_p,	/* bfd_check_format */
-   bfd_generic_archive_p, _bfd_dummy_target},
-  {bfd_false, bfd_false,	/* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, bfd_false,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (aout_32),
-     BFD_JUMP_TABLE_COPY (_bfd_generic),
-     BFD_JUMP_TABLE_CORE (_bfd_nocore),
-     BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd),
-     BFD_JUMP_TABLE_SYMBOLS (aout_32),
-     BFD_JUMP_TABLE_RELOCS (aout_32),
-     BFD_JUMP_TABLE_WRITE (aout_32),
-     BFD_JUMP_TABLE_LINK (os9k),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0,
-};
diff --git a/bfd/ieee.c b/bfd/ieee.c
deleted file mode 100644
index 126b136d337..00000000000
--- a/bfd/ieee.c
+++ /dev/null
@@ -1,3970 +0,0 @@
-/* BFD back-end for ieee-695 objects.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-
-   Written by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define KEEPMINUSPCININST 0
-
-/* IEEE 695 format is a stream of records, which we parse using a simple one-
-   token (which is one byte in this lexicon) lookahead recursive decent
-   parser.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "ieee.h"
-#include "libieee.h"
-
-#include <ctype.h>
-
-static boolean ieee_write_byte PARAMS ((bfd *, int));
-static boolean ieee_write_2bytes PARAMS ((bfd *, int));
-static boolean ieee_write_int PARAMS ((bfd *, bfd_vma));
-static boolean ieee_write_id PARAMS ((bfd *, const char *));
-static boolean ieee_write_expression
-  PARAMS ((bfd *, bfd_vma, asymbol *, boolean, unsigned int));
-static void ieee_write_int5 PARAMS ((bfd_byte *, bfd_vma));
-static boolean ieee_write_int5_out PARAMS ((bfd *, bfd_vma));
-static boolean ieee_write_section_part PARAMS ((bfd *));
-static boolean do_with_relocs PARAMS ((bfd *, asection *));
-static boolean do_as_repeat PARAMS ((bfd *, asection *));
-static boolean do_without_relocs PARAMS ((bfd *, asection *));
-static boolean ieee_write_external_part PARAMS ((bfd *));
-static boolean ieee_write_data_part PARAMS ((bfd *));
-static boolean ieee_write_debug_part PARAMS ((bfd *));
-static boolean ieee_write_me_part PARAMS ((bfd *));
-static boolean ieee_write_processor PARAMS ((bfd *));
-
-static boolean ieee_slurp_debug PARAMS ((bfd *));
-static boolean ieee_slurp_section_data PARAMS ((bfd *));
-
-/* Functions for writing to ieee files in the strange way that the
-   standard requires. */
-
-static boolean
-ieee_write_byte (abfd, barg)
-     bfd *abfd;
-     int barg;
-{
-  bfd_byte byte;
-
-  byte = barg;
-  if (bfd_write ((PTR) &byte, 1, 1, abfd) != 1)
-    return false;
-  return true;
-}
-
-static boolean
-ieee_write_2bytes (abfd, bytes)
-     bfd *abfd;
-     int bytes;
-{
-  bfd_byte buffer[2];
-
-  buffer[0] = bytes >> 8;
-  buffer[1] = bytes & 0xff;
-  if (bfd_write ((PTR) buffer, 1, 2, abfd) != 2)
-    return false;
-  return true;
-}
-
-static boolean
-ieee_write_int (abfd, value)
-     bfd *abfd;
-     bfd_vma value;
-{
-  if (value <= 127)
-    {
-      if (! ieee_write_byte (abfd, (bfd_byte) value))
-	return false;
-    }
-  else
-    {
-      unsigned int length;
-
-      /* How many significant bytes ? */
-      /* FIXME FOR LONGER INTS */
-      if (value & 0xff000000)
-	length = 4;
-      else if (value & 0x00ff0000)
-	length = 3;
-      else if (value & 0x0000ff00)
-	length = 2;
-      else
-	length = 1;
-
-      if (! ieee_write_byte (abfd,
-			     (bfd_byte) ((int) ieee_number_repeat_start_enum
-					 + length)))
-	return false;
-      switch (length)
-	{
-	case 4:
-	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 24)))
-	    return false;
-	  /* Fall through.  */
-	case 3:
-	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 16)))
-	    return false;
-	  /* Fall through.  */
-	case 2:
-	  if (! ieee_write_byte (abfd, (bfd_byte) (value >> 8)))
-	    return false;
-	  /* Fall through.  */
-	case 1:
-	  if (! ieee_write_byte (abfd, (bfd_byte) (value)))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-static boolean
-ieee_write_id (abfd, id)
-     bfd *abfd;
-     const char *id;
-{
-  size_t length = strlen (id);
-
-  if (length <= 127)
-    {
-      if (! ieee_write_byte (abfd, (bfd_byte) length))
-	return false;
-    }
-  else if (length < 255)
-    {
-      if (! ieee_write_byte (abfd, ieee_extension_length_1_enum)
-	  || ! ieee_write_byte (abfd, (bfd_byte) length))
-	return false;
-    }
-  else if (length < 65535)
-    {
-      if (! ieee_write_byte (abfd, ieee_extension_length_2_enum)
-	  || ! ieee_write_2bytes (abfd, (int) length))
-	return false;
-    }
-  else
-    {
-      (*_bfd_error_handler)
-	(_("%s: string too long (%d chars, max 65535)"),
-	 bfd_get_filename (abfd), length);
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  if (bfd_write ((PTR) id, 1, length, abfd) != length)
-    return false;
-  return true;
-}
-
-/***************************************************************************
-Functions for reading from ieee files in the strange way that the
-standard requires:
-*/
-
-#define this_byte(ieee) *((ieee)->input_p)
-#define next_byte(ieee) ((ieee)->input_p++)
-#define this_byte_and_next(ieee) (*((ieee)->input_p++))
-
-static unsigned short
-read_2bytes (ieee)
-     common_header_type *ieee;
-{
-  unsigned char c1 = this_byte_and_next (ieee);
-  unsigned char c2 = this_byte_and_next (ieee);
-  return (c1 << 8) | c2;
-}
-
-static void
-bfd_get_string (ieee, string, length)
-     common_header_type *ieee;
-     char *string;
-     size_t length;
-{
-  size_t i;
-  for (i = 0; i < length; i++)
-    {
-      string[i] = this_byte_and_next (ieee);
-    }
-}
-
-static char *
-read_id (ieee)
-     common_header_type *ieee;
-{
-  size_t length;
-  char *string;
-  length = this_byte_and_next (ieee);
-  if (length <= 0x7f)
-    {
-      /* Simple string of length 0 to 127 */
-    }
-  else if (length == 0xde)
-    {
-      /* Length is next byte, allowing 0..255 */
-      length = this_byte_and_next (ieee);
-    }
-  else if (length == 0xdf)
-    {
-      /* Length is next two bytes, allowing 0..65535 */
-      length = this_byte_and_next (ieee);
-      length = (length * 256) + this_byte_and_next (ieee);
-    }
-  /* Buy memory and read string */
-  string = bfd_alloc (ieee->abfd, length + 1);
-  if (!string)
-    return NULL;
-  bfd_get_string (ieee, string, length);
-  string[length] = 0;
-  return string;
-}
-
-static boolean
-ieee_write_expression (abfd, value, symbol, pcrel, index)
-     bfd *abfd;
-     bfd_vma value;
-     asymbol *symbol;
-     boolean pcrel;
-     unsigned int index;
-{
-  unsigned int term_count = 0;
-
-  if (value != 0)
-    {
-      if (! ieee_write_int (abfd, value))
-	return false;
-      term_count++;
-    }
-
-  if (bfd_is_com_section (symbol->section)
-      || bfd_is_und_section (symbol->section))
-    {
-      /* Def of a common symbol */
-      if (! ieee_write_byte (abfd, ieee_variable_X_enum)
-	  || ! ieee_write_int (abfd, symbol->value))
-	return false;
-      term_count++;
-    }
-  else if (! bfd_is_abs_section (symbol->section))
-    {
-      /* Ref to defined symbol - */
-
-      if (symbol->flags & BSF_GLOBAL)
-	{
-	  if (! ieee_write_byte (abfd, ieee_variable_I_enum)
-	      || ! ieee_write_int (abfd, symbol->value))
-	    return false;
-	  term_count++;
-	}
-      else if (symbol->flags & (BSF_LOCAL | BSF_SECTION_SYM))
-	{
-	  /* This is a reference to a defined local symbol.  We can
-	     easily do a local as a section+offset.  */
-	  if (! ieee_write_byte (abfd, ieee_variable_R_enum)
-	      || ! ieee_write_byte (abfd,
-				    (bfd_byte) (symbol->section->index
-						+ IEEE_SECTION_NUMBER_BASE)))
-	    return false;
-	  term_count++;
-	  if (symbol->value != 0)
-	    {
-	      if (! ieee_write_int (abfd, symbol->value))
-		return false;
-	      term_count++;
-	    }
-	}
-      else
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: unrecognized symbol `%s' flags 0x%x"),
-	     bfd_get_filename (abfd), bfd_asymbol_name (symbol),
-	     symbol->flags);
-	  bfd_set_error (bfd_error_invalid_operation);
-	  return false;
-	}
-    }
-
-  if (pcrel)
-    {
-      /* subtract the pc from here by asking for PC of this section*/
-      if (! ieee_write_byte (abfd, ieee_variable_P_enum)
-	  || ! ieee_write_byte (abfd,
-				(bfd_byte) (index + IEEE_SECTION_NUMBER_BASE))
-	  || ! ieee_write_byte (abfd, ieee_function_minus_enum))
-	return false;
-    }
-
-  /* Handle the degenerate case of a 0 address.  */
-  if (term_count == 0)
-    {
-      if (! ieee_write_int (abfd, 0))
-	return false;
-    }
-
-  while (term_count > 1)
-    {
-      if (! ieee_write_byte (abfd, ieee_function_plus_enum))
-	return false;
-      term_count--;
-    }
-
-  return true;
-}
-
-/*****************************************************************************/
-
-/*
-writes any integer into the buffer supplied and always takes 5 bytes
-*/
-static void
-ieee_write_int5 (buffer, value)
-     bfd_byte *buffer;
-     bfd_vma value;
-{
-  buffer[0] = (bfd_byte) ieee_number_repeat_4_enum;
-  buffer[1] = (value >> 24) & 0xff;
-  buffer[2] = (value >> 16) & 0xff;
-  buffer[3] = (value >> 8) & 0xff;
-  buffer[4] = (value >> 0) & 0xff;
-}
-
-static boolean
-ieee_write_int5_out (abfd, value)
-     bfd *abfd;
-     bfd_vma value;
-{
-  bfd_byte b[5];
-
-  ieee_write_int5 (b, value);
-  if (bfd_write ((PTR) b, 1, 5, abfd) != 5)
-    return false;
-  return true;
-}
-
-static boolean
-parse_int (ieee, value_ptr)
-     common_header_type *ieee;
-     bfd_vma *value_ptr;
-{
-  int value = this_byte (ieee);
-  int result;
-  if (value >= 0 && value <= 127)
-    {
-      *value_ptr = value;
-      next_byte (ieee);
-      return true;
-    }
-  else if (value >= 0x80 && value <= 0x88)
-    {
-      unsigned int count = value & 0xf;
-      result = 0;
-      next_byte (ieee);
-      while (count)
-	{
-	  result = (result << 8) | this_byte_and_next (ieee);
-	  count--;
-	}
-      *value_ptr = result;
-      return true;
-    }
-  return false;
-}
-
-static int
-parse_i (ieee, ok)
-     common_header_type *ieee;
-     boolean *ok;
-{
-  bfd_vma x;
-  *ok = parse_int (ieee, &x);
-  return x;
-}
-
-static bfd_vma
-must_parse_int (ieee)
-     common_header_type *ieee;
-{
-  bfd_vma result;
-  BFD_ASSERT (parse_int (ieee, &result) == true);
-  return result;
-}
-
-typedef struct
-{
-  bfd_vma value;
-  asection *section;
-  ieee_symbol_index_type symbol;
-} ieee_value_type;
-
-
-#if KEEPMINUSPCININST
-
-#define SRC_MASK(arg) arg
-#define PCREL_OFFSET false
-
-#else
-
-#define SRC_MASK(arg) 0
-#define PCREL_OFFSET true
-
-#endif
-
-static reloc_howto_type abs32_howto =
-  HOWTO (1,
-	 0,
-	 2,
-	 32,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 0,
-	 "abs32",
-	 true,
-	 0xffffffff,
-	 0xffffffff,
-	 false);
-
-static reloc_howto_type abs16_howto =
-  HOWTO (1,
-	 0,
-	 1,
-	 16,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 0,
-	 "abs16",
-	 true,
-	 0x0000ffff,
-	 0x0000ffff,
-	 false);
-
-static reloc_howto_type abs8_howto =
-  HOWTO (1,
-	 0,
-	 0,
-	 8,
-	 false,
-	 0,
-	 complain_overflow_bitfield,
-	 0,
-	 "abs8",
-	 true,
-	 0x000000ff,
-	 0x000000ff,
-	 false);
-
-static reloc_howto_type rel32_howto =
-  HOWTO (1,
-	 0,
-	 2,
-	 32,
-	 true,
-	 0,
-	 complain_overflow_signed,
-	 0,
-	 "rel32",
-	 true,
-	 SRC_MASK (0xffffffff),
-	 0xffffffff,
-	 PCREL_OFFSET);
-
-static reloc_howto_type rel16_howto =
-  HOWTO (1,
-	 0,
-	 1,
-	 16,
-	 true,
-	 0,
-	 complain_overflow_signed,
-	 0,
-	 "rel16",
-	 true,
-	 SRC_MASK (0x0000ffff),
-	 0x0000ffff,
-	 PCREL_OFFSET);
-
-static reloc_howto_type rel8_howto =
-  HOWTO (1,
-	 0,
-	 0,
-	 8,
-	 true,
-	 0,
-	 complain_overflow_signed,
-	 0,
-	 "rel8",
-	 true,
-	 SRC_MASK (0x000000ff),
-	 0x000000ff,
-	 PCREL_OFFSET);
-
-static ieee_symbol_index_type NOSYMBOL = {0, 0};
-
-static void
-parse_expression (ieee, value, symbol, pcrel, extra, section)
-     ieee_data_type *ieee;
-     bfd_vma *value;
-     ieee_symbol_index_type *symbol;
-     boolean *pcrel;
-     unsigned int *extra;
-     asection **section;
-
-{
-#define POS sp[1]
-#define TOS sp[0]
-#define NOS sp[-1]
-#define INC sp++;
-#define DEC sp--;
-
-  boolean loop = true;
-  ieee_value_type stack[10];
-
-  /* The stack pointer always points to the next unused location */
-#define PUSH(x,y,z) TOS.symbol=x;TOS.section=y;TOS.value=z;INC;
-#define POP(x,y,z) DEC;x=TOS.symbol;y=TOS.section;z=TOS.value;
-  ieee_value_type *sp = stack;
-
-  while (loop)
-    {
-      switch (this_byte (&(ieee->h)))
-	{
-	case ieee_variable_P_enum:
-	  /* P variable, current program counter for section n */
-	  {
-	    int section_n;
-	    next_byte (&(ieee->h));
-	    *pcrel = true;
-	    section_n = must_parse_int (&(ieee->h));
-	    PUSH (NOSYMBOL, bfd_abs_section_ptr, 0);
-	    break;
-	  }
-	case ieee_variable_L_enum:
-	  /* L variable  address of section N */
-	  next_byte (&(ieee->h));
-	  PUSH (NOSYMBOL, ieee->section_table[must_parse_int (&(ieee->h))], 0);
-	  break;
-	case ieee_variable_R_enum:
-	  /* R variable, logical address of section module */
-	  /* FIXME, this should be different to L */
-	  next_byte (&(ieee->h));
-	  PUSH (NOSYMBOL, ieee->section_table[must_parse_int (&(ieee->h))], 0);
-	  break;
-	case ieee_variable_S_enum:
-	  /* S variable, size in MAUS of section module */
-	  next_byte (&(ieee->h));
-	  PUSH (NOSYMBOL,
-		0,
-		ieee->section_table[must_parse_int (&(ieee->h))]->_raw_size);
-	  break;
-	case ieee_variable_I_enum:
-	  /* Push the address of variable n */
-	  {
-	    ieee_symbol_index_type sy;
-	    next_byte (&(ieee->h));
-	    sy.index = (int) must_parse_int (&(ieee->h));
-	    sy.letter = 'I';
-
-	    PUSH (sy, bfd_abs_section_ptr, 0);
-	  }
-	  break;
-	case ieee_variable_X_enum:
-	  /* Push the address of external variable n */
-	  {
-	    ieee_symbol_index_type sy;
-	    next_byte (&(ieee->h));
-	    sy.index = (int) (must_parse_int (&(ieee->h)));
-	    sy.letter = 'X';
-
-	    PUSH (sy, bfd_und_section_ptr, 0);
-	  }
-	  break;
-	case ieee_function_minus_enum:
-	  {
-	    bfd_vma value1, value2;
-	    asection *section1, *section_dummy;
-	    ieee_symbol_index_type sy;
-	    next_byte (&(ieee->h));
-
-	    POP (sy, section1, value1);
-	    POP (sy, section_dummy, value2);
-	    PUSH (sy, section1 ? section1 : section_dummy, value2 - value1);
-	  }
-	  break;
-	case ieee_function_plus_enum:
-	  {
-	    bfd_vma value1, value2;
-	    asection *section1;
-	    asection *section2;
-	    ieee_symbol_index_type sy1;
-	    ieee_symbol_index_type sy2;
-	    next_byte (&(ieee->h));
-
-	    POP (sy1, section1, value1);
-	    POP (sy2, section2, value2);
-	    PUSH (sy1.letter ? sy1 : sy2,
-		  bfd_is_abs_section (section1) ? section2 : section1,
-		  value1 + value2);
-	  }
-	  break;
-	default:
-	  {
-	    bfd_vma va;
-	    BFD_ASSERT (this_byte (&(ieee->h)) < (int) ieee_variable_A_enum
-		    || this_byte (&(ieee->h)) > (int) ieee_variable_Z_enum);
-	    if (parse_int (&(ieee->h), &va))
-	      {
-		PUSH (NOSYMBOL, bfd_abs_section_ptr, va);
-	      }
-	    else
-	      {
-		/*
-		  Thats all that we can understand. As far as I can see
-		  there is a bug in the Microtec IEEE output which I'm
-		  using to scan, whereby the comma operator is omitted
-		  sometimes in an expression, giving expressions with too
-		  many terms. We can tell if that's the case by ensuring
-		  that sp == stack here. If not, then we've pushed
-		  something too far, so we keep adding.  */
-
-		while (sp != stack + 1)
-		  {
-		    asection *section1;
-		    ieee_symbol_index_type sy1;
-		    POP (sy1, section1, *extra);
-		  }
-		{
-		  asection *dummy;
-
-		  POP (*symbol, dummy, *value);
-		  if (section)
-		    *section = dummy;
-		}
-
-		loop = false;
-	      }
-	  }
-	}
-    }
-}
-
-
-#define ieee_seek(abfd, offset) \
-  IEEE_DATA(abfd)->h.input_p = IEEE_DATA(abfd)->h.first_byte + offset
-
-#define ieee_pos(abfd) \
-  (IEEE_DATA(abfd)->h.input_p - IEEE_DATA(abfd)->h.first_byte)
-
-static unsigned int last_index;
-static char last_type;		/* is the index for an X or a D */
-
-static ieee_symbol_type *
-get_symbol (abfd,
-	    ieee,
-	    last_symbol,
-	    symbol_count,
-	    pptr,
-	    max_index,
-	    this_type
-)
-     bfd *abfd;
-     ieee_data_type *ieee;
-     ieee_symbol_type *last_symbol;
-     unsigned int *symbol_count;
-     ieee_symbol_type ***pptr;
-     unsigned int *max_index;
-     char this_type
-      ;
-{
-  /* Need a new symbol */
-  unsigned int new_index = must_parse_int (&(ieee->h));
-  if (new_index != last_index || this_type != last_type)
-    {
-      ieee_symbol_type *new_symbol = (ieee_symbol_type *) bfd_alloc (ieee->h.abfd,
-						 sizeof (ieee_symbol_type));
-      if (!new_symbol)
-	return NULL;
-
-      new_symbol->index = new_index;
-      last_index = new_index;
-      (*symbol_count)++;
-      **pptr = new_symbol;
-      *pptr = &new_symbol->next;
-      if (new_index > *max_index)
-	{
-	  *max_index = new_index;
-	}
-      last_type = this_type;
-      new_symbol->symbol.section = bfd_abs_section_ptr;
-      return new_symbol;
-    }
-  return last_symbol;
-}
-
-static boolean
-ieee_slurp_external_symbols (abfd)
-     bfd *abfd;
-{
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  file_ptr offset = ieee->w.r.external_part;
-
-  ieee_symbol_type **prev_symbols_ptr = &ieee->external_symbols;
-  ieee_symbol_type **prev_reference_ptr = &ieee->external_reference;
-  ieee_symbol_type *symbol = (ieee_symbol_type *) NULL;
-  unsigned int symbol_count = 0;
-  boolean loop = true;
-  last_index = 0xffffff;
-  ieee->symbol_table_full = true;
-
-  ieee_seek (abfd, offset);
-
-  while (loop)
-    {
-      switch (this_byte (&(ieee->h)))
-	{
-	case ieee_nn_record:
-	  next_byte (&(ieee->h));
-
-	  symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
-			       &prev_symbols_ptr,
-			       &ieee->external_symbol_max_index, 'I');
-	  if (symbol == NULL)
-	    return false;
-
-	  symbol->symbol.the_bfd = abfd;
-	  symbol->symbol.name = read_id (&(ieee->h));
-	  symbol->symbol.udata.p = (PTR) NULL;
-	  symbol->symbol.flags = BSF_NO_FLAGS;
-	  break;
-	case ieee_external_symbol_enum:
-	  next_byte (&(ieee->h));
-
-	  symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
-			       &prev_symbols_ptr,
-			       &ieee->external_symbol_max_index, 'D');
-	  if (symbol == NULL)
-	    return false;
-
-	  BFD_ASSERT (symbol->index >= ieee->external_symbol_min_index);
-
-	  symbol->symbol.the_bfd = abfd;
-	  symbol->symbol.name = read_id (&(ieee->h));
-	  symbol->symbol.udata.p = (PTR) NULL;
-	  symbol->symbol.flags = BSF_NO_FLAGS;
-	  break;
-	case ieee_attribute_record_enum >> 8:
-	  {
-	    unsigned int symbol_name_index;
-	    unsigned int symbol_type_index;
-	    unsigned int symbol_attribute_def;
-	    bfd_vma value;
-	    switch (read_2bytes (ieee))
-	      {
-	      case ieee_attribute_record_enum:
-		symbol_name_index = must_parse_int (&(ieee->h));
-		symbol_type_index = must_parse_int (&(ieee->h));
-		symbol_attribute_def = must_parse_int (&(ieee->h));
-		switch (symbol_attribute_def)
-		  {
-		  case 8:
-		  case 19:
-		    parse_int (&ieee->h, &value);
-		    break;
-		  default:
-		    (*_bfd_error_handler)
-		      (_("%s: unimplemented ATI record  %u for symbol %u"),
-		       bfd_get_filename (abfd), symbol_attribute_def,
-		       symbol_name_index);
-		    bfd_set_error (bfd_error_bad_value);
-		    return false;
-		    break;
-		  }
-		break;
-	      case ieee_external_reference_info_record_enum:
-		/* Skip over ATX record. */
-		parse_int (&(ieee->h), &value);
-		parse_int (&(ieee->h), &value);
-		parse_int (&(ieee->h), &value);
-		parse_int (&(ieee->h), &value);
-		break;
-	      case ieee_atn_record_enum:
-		/* We may get call optimization information here,
-		   which we just ignore.  The format is
-		   {$F1}${CE}{index}{$00}{$3F}{$3F}{#_of_ASNs} */
-		parse_int (&ieee->h, &value);
-		parse_int (&ieee->h, &value);
-		parse_int (&ieee->h, &value);
-		if (value != 0x3f)
-		  {
-		    (*_bfd_error_handler)
-		      (_("%s: unexpected ATN type %d in external part"),
-			 bfd_get_filename (abfd), (int) value);
-		    bfd_set_error (bfd_error_bad_value);
-		    return false;
-		  }
-		parse_int (&ieee->h, &value);
-		parse_int (&ieee->h, &value);
-		while (value > 0)
-		  {
-		    bfd_vma val1;
-
-		    --value;
-
-		    switch (read_2bytes (ieee))
-		      {
-		      case ieee_asn_record_enum:
-			parse_int (&ieee->h, &val1);
-			parse_int (&ieee->h, &val1);
-			break;
-
-		      default:
-			(*_bfd_error_handler)
-			  (_("%s: unexpected type after ATN"),
-			     bfd_get_filename (abfd));
-			bfd_set_error (bfd_error_bad_value);
-			return false;
-		      }
-		  }
-	      }
-	  }
-	  break;
-	case ieee_value_record_enum >> 8:
-	  {
-	    unsigned int symbol_name_index;
-	    ieee_symbol_index_type symbol_ignore;
-	    boolean pcrel_ignore;
-	    unsigned int extra;
-	    next_byte (&(ieee->h));
-	    next_byte (&(ieee->h));
-
-	    symbol_name_index = must_parse_int (&(ieee->h));
-	    parse_expression (ieee,
-			      &symbol->symbol.value,
-			      &symbol_ignore,
-			      &pcrel_ignore,
-			      &extra,
-			      &symbol->symbol.section);
-
-	    /* Fully linked IEEE-695 files tend to give every symbol
-               an absolute value.  Try to convert that back into a
-               section relative value.  FIXME: This won't always to
-               the right thing.  */
-	    if (bfd_is_abs_section (symbol->symbol.section)
-		&& (abfd->flags & HAS_RELOC) == 0)
-	      {
-		bfd_vma val;
-		asection *s;
-
-		val = symbol->symbol.value;
-		for (s = abfd->sections; s != NULL; s = s->next)
-		  {
-		    if (val >= s->vma && val < s->vma + s->_raw_size)
-		      {
-			symbol->symbol.section = s;
-			symbol->symbol.value -= s->vma;
-			break;
-		      }
-		  }
-	      }
-
-	    symbol->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
-
-	  }
-	  break;
-	case ieee_weak_external_reference_enum:
-	  {
-	    bfd_vma size;
-	    bfd_vma value;
-	    next_byte (&(ieee->h));
-	    /* Throw away the external reference index */
-	    (void) must_parse_int (&(ieee->h));
-	    /* Fetch the default size if not resolved */
-	    size = must_parse_int (&(ieee->h));
-	    /* Fetch the defautlt value if available */
-	    if (parse_int (&(ieee->h), &value) == false)
-	      {
-		value = 0;
-	      }
-	    /* This turns into a common */
-	    symbol->symbol.section = bfd_com_section_ptr;
-	    symbol->symbol.value = size;
-	  }
-	  break;
-
-	case ieee_external_reference_enum:
-	  next_byte (&(ieee->h));
-
-	  symbol = get_symbol (abfd, ieee, symbol, &symbol_count,
-			       &prev_reference_ptr,
-			       &ieee->external_reference_max_index, 'X');
-	  if (symbol == NULL)
-	    return false;
-
-	  symbol->symbol.the_bfd = abfd;
-	  symbol->symbol.name = read_id (&(ieee->h));
-	  symbol->symbol.udata.p = (PTR) NULL;
-	  symbol->symbol.section = bfd_und_section_ptr;
-	  symbol->symbol.value = (bfd_vma) 0;
-	  symbol->symbol.flags = 0;
-
-	  BFD_ASSERT (symbol->index >= ieee->external_reference_min_index);
-	  break;
-
-	default:
-	  loop = false;
-	}
-    }
-
-  if (ieee->external_symbol_max_index != 0)
-    {
-      ieee->external_symbol_count =
-	ieee->external_symbol_max_index -
-	ieee->external_symbol_min_index + 1;
-    }
-  else
-    {
-      ieee->external_symbol_count = 0;
-    }
-
-  if (ieee->external_reference_max_index != 0)
-    {
-      ieee->external_reference_count =
-	ieee->external_reference_max_index -
-	ieee->external_reference_min_index + 1;
-    }
-  else
-    {
-      ieee->external_reference_count = 0;
-    }
-
-  abfd->symcount =
-    ieee->external_reference_count + ieee->external_symbol_count;
-
-  if (symbol_count != abfd->symcount)
-    {
-      /* There are gaps in the table -- */
-      ieee->symbol_table_full = false;
-    }
-
-  *prev_symbols_ptr = (ieee_symbol_type *) NULL;
-  *prev_reference_ptr = (ieee_symbol_type *) NULL;
-
-  return true;
-}
-
-static boolean
-ieee_slurp_symbol_table (abfd)
-     bfd *abfd;
-{
-  if (IEEE_DATA (abfd)->read_symbols == false)
-    {
-      if (! ieee_slurp_external_symbols (abfd))
-	return false;
-      IEEE_DATA (abfd)->read_symbols = true;
-    }
-  return true;
-}
-
-long
-ieee_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  if (! ieee_slurp_symbol_table (abfd))
-    return -1;
-
-  return (abfd->symcount != 0) ?
-    (abfd->symcount + 1) * (sizeof (ieee_symbol_type *)) : 0;
-}
-
-/*
-Move from our internal lists to the canon table, and insert in
-symbol index order
-*/
-
-extern const bfd_target ieee_vec;
-
-long
-ieee_get_symtab (abfd, location)
-     bfd *abfd;
-     asymbol **location;
-{
-  ieee_symbol_type *symp;
-  static bfd dummy_bfd;
-  static asymbol empty_symbol =
-  /* the_bfd, name, value, attr, section */
-  {&dummy_bfd, " ieee empty", (symvalue) 0, BSF_DEBUGGING, bfd_abs_section_ptr};
-
-  if (abfd->symcount)
-    {
-      ieee_data_type *ieee = IEEE_DATA (abfd);
-      dummy_bfd.xvec = &ieee_vec;
-      if (! ieee_slurp_symbol_table (abfd))
-	return -1;
-
-      if (ieee->symbol_table_full == false)
-	{
-	  /* Arrgh - there are gaps in the table, run through and fill them */
-	  /* up with pointers to a null place */
-	  unsigned int i;
-	  for (i = 0; i < abfd->symcount; i++)
-	    {
-	      location[i] = &empty_symbol;
-	    }
-	}
-
-      ieee->external_symbol_base_offset = -ieee->external_symbol_min_index;
-      for (symp = IEEE_DATA (abfd)->external_symbols;
-	   symp != (ieee_symbol_type *) NULL;
-	   symp = symp->next)
-	{
-	  /* Place into table at correct index locations */
-	  location[symp->index + ieee->external_symbol_base_offset] = &symp->symbol;
-	}
-
-      /* The external refs are indexed in a bit */
-      ieee->external_reference_base_offset =
-	-ieee->external_reference_min_index + ieee->external_symbol_count;
-
-      for (symp = IEEE_DATA (abfd)->external_reference;
-	   symp != (ieee_symbol_type *) NULL;
-	   symp = symp->next)
-	{
-	  location[symp->index + ieee->external_reference_base_offset] =
-	    &symp->symbol;
-
-	}
-    }
-  if (abfd->symcount)
-    {
-      location[abfd->symcount] = (asymbol *) NULL;
-    }
-  return abfd->symcount;
-}
-
-static asection *
-get_section_entry (abfd, ieee, index)
-     bfd *abfd;
-     ieee_data_type *ieee;
-     unsigned int index;
-{
-  if (index >= ieee->section_table_size)
-    {
-      unsigned int c, i;
-      asection **n;
-
-      c = ieee->section_table_size;
-      if (c == 0)
-	c = 20;
-      while (c <= index)
-	c *= 2;
-
-      n = ((asection **)
-	   bfd_realloc (ieee->section_table, c * sizeof (asection *)));
-      if (n == NULL)
-	return NULL;
-
-      for (i = ieee->section_table_size; i < c; i++)
-	n[i] = NULL;
-
-      ieee->section_table = n;
-      ieee->section_table_size = c;
-    }
-
-  if (ieee->section_table[index] == (asection *) NULL)
-    {
-      char *tmp = bfd_alloc (abfd, 11);
-      asection *section;
-
-      if (!tmp)
-	return NULL;
-      sprintf (tmp, " fsec%4d", index);
-      section = bfd_make_section (abfd, tmp);
-      ieee->section_table[index] = section;
-      section->flags = SEC_NO_FLAGS;
-      section->target_index = index;
-      ieee->section_table[index] = section;
-    }
-  return ieee->section_table[index];
-}
-
-static void
-ieee_slurp_sections (abfd)
-     bfd *abfd;
-{
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  file_ptr offset = ieee->w.r.section_part;
-  asection *section = (asection *) NULL;
-  char *name;
-
-  if (offset != 0)
-    {
-      bfd_byte section_type[3];
-      ieee_seek (abfd, offset);
-      while (true)
-	{
-	  switch (this_byte (&(ieee->h)))
-	    {
-	    case ieee_section_type_enum:
-	      {
-		unsigned int section_index;
-		next_byte (&(ieee->h));
-		section_index = must_parse_int (&(ieee->h));
-
-		section = get_section_entry (abfd, ieee, section_index);
-
-		section_type[0] = this_byte_and_next (&(ieee->h));
-
-		/* Set minimal section attributes. Attributes are
-		   extended later, based on section contents. */
-
-		switch (section_type[0])
-		  {
-		  case 0xC1:
-		    /* Normal attributes for absolute sections	*/
-		    section_type[1] = this_byte (&(ieee->h));
-		    section->flags = SEC_ALLOC;
-		    switch (section_type[1])
-		      {
-		      case 0xD3:	/* AS Absolute section attributes */
-			next_byte (&(ieee->h));
-			section_type[2] = this_byte (&(ieee->h));
-			switch (section_type[2])
-			  {
-			  case 0xD0:
-			    /* Normal code */
-			    next_byte (&(ieee->h));
-			    section->flags |= SEC_CODE;
-			    break;
-			  case 0xC4:
-			    /* Normal data */
-			    next_byte (&(ieee->h));
-			    section->flags |= SEC_DATA;
-			    break;
-			  case 0xD2:
-			    next_byte (&(ieee->h));
-			    /* Normal rom data */
-			    section->flags |= SEC_ROM | SEC_DATA;
-			    break;
-			  default:
-			    break;
-			  }
-		      }
-		    break;
-		  case 0xC3:	/* Named relocatable sections (type C) */
-		    section_type[1] = this_byte (&(ieee->h));
-		    section->flags = SEC_ALLOC;
-		    switch (section_type[1])
-		      {
-		      case 0xD0:	/* Normal code (CP) */
-			next_byte (&(ieee->h));
-			section->flags |= SEC_CODE;
-			break;
-		      case 0xC4:	/* Normal data (CD) */
-			next_byte (&(ieee->h));
-			section->flags |= SEC_DATA;
-			break;
-		      case 0xD2:	/* Normal rom data (CR) */
-			next_byte (&(ieee->h));
-			section->flags |= SEC_ROM | SEC_DATA;
-			break;
-		      default:
-			break;
-		      }
-		  }
-
-		/* Read section name, use it if non empty. */
-		name = read_id (&ieee->h);
-		if (name[0])
-		  section->name = name;
-
-		/* Skip these fields, which we don't care about */
-		{
-		  bfd_vma parent, brother, context;
-		  parse_int (&(ieee->h), &parent);
-		  parse_int (&(ieee->h), &brother);
-		  parse_int (&(ieee->h), &context);
-		}
-	      }
-	      break;
-	    case ieee_section_alignment_enum:
-	      {
-		unsigned int section_index;
-		bfd_vma value;
-		asection *section;
-		next_byte (&(ieee->h));
-		section_index = must_parse_int (&ieee->h);
-		section = get_section_entry (abfd, ieee, section_index);
-		if (section_index > ieee->section_count)
-		  {
-		    ieee->section_count = section_index;
-		  }
-		section->alignment_power =
-		  bfd_log2 (must_parse_int (&ieee->h));
-		(void) parse_int (&(ieee->h), &value);
-	      }
-	      break;
-	    case ieee_e2_first_byte_enum:
-	      {
-		ieee_record_enum_type t = (ieee_record_enum_type) (read_2bytes (&(ieee->h)));
-
-		switch (t)
-		  {
-		  case ieee_section_size_enum:
-		    section = ieee->section_table[must_parse_int (&(ieee->h))];
-		    section->_raw_size = must_parse_int (&(ieee->h));
-		    break;
-		  case ieee_physical_region_size_enum:
-		    section = ieee->section_table[must_parse_int (&(ieee->h))];
-		    section->_raw_size = must_parse_int (&(ieee->h));
-		    break;
-		  case ieee_region_base_address_enum:
-		    section = ieee->section_table[must_parse_int (&(ieee->h))];
-		    section->vma = must_parse_int (&(ieee->h));
-		    section->lma = section->vma;
-		    break;
-		  case ieee_mau_size_enum:
-		    must_parse_int (&(ieee->h));
-		    must_parse_int (&(ieee->h));
-		    break;
-		  case ieee_m_value_enum:
-		    must_parse_int (&(ieee->h));
-		    must_parse_int (&(ieee->h));
-		    break;
-		  case ieee_section_base_address_enum:
-		    section = ieee->section_table[must_parse_int (&(ieee->h))];
-		    section->vma = must_parse_int (&(ieee->h));
-		    section->lma = section->vma;
-		    break;
-		  case ieee_section_offset_enum:
-		    (void) must_parse_int (&(ieee->h));
-		    (void) must_parse_int (&(ieee->h));
-		    break;
-		  default:
-		    return;
-		  }
-	      }
-	      break;
-	    default:
-	      return;
-	    }
-	}
-    }
-}
-
-/* Make a section for the debugging information, if any.  We don't try
-   to interpret the debugging information; we just point the section
-   at the area in the file so that program which understand can dig it
-   out.  */
-
-static boolean
-ieee_slurp_debug (abfd)
-     bfd *abfd;
-{
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  asection *sec;
-
-  if (ieee->w.r.debug_information_part == 0)
-    return true;
-
-  sec = bfd_make_section (abfd, ".debug");
-  if (sec == NULL)
-    return false;
-  sec->flags |= SEC_DEBUGGING | SEC_HAS_CONTENTS;
-  sec->filepos = ieee->w.r.debug_information_part;
-  sec->_raw_size = ieee->w.r.data_part - ieee->w.r.debug_information_part;
-
-  return true;
-}
-
-/***********************************************************************
-*  archive stuff
-*/
-
-const bfd_target *
-ieee_archive_p (abfd)
-     bfd *abfd;
-{
-  char *library;
-  unsigned int i;
-  unsigned char buffer[512];
-  file_ptr buffer_offset = 0;
-  ieee_ar_data_type *save = abfd->tdata.ieee_ar_data;
-  ieee_ar_data_type *ieee;
-  unsigned int alc_elts;
-  ieee_ar_obstack_type *elts = NULL;
-
-  abfd->tdata.ieee_ar_data =
-    (ieee_ar_data_type *) bfd_alloc (abfd, sizeof (ieee_ar_data_type));
-  if (!abfd->tdata.ieee_ar_data)
-    goto error_return;
-  ieee = IEEE_AR_DATA (abfd);
-
-  /* FIXME: Check return value.  I'm not sure whether it needs to read
-     the entire buffer or not.  */
-  bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
-
-  ieee->h.first_byte = buffer;
-  ieee->h.input_p = buffer;
-
-  ieee->h.abfd = abfd;
-
-  if (this_byte (&(ieee->h)) != Module_Beginning)
-    {
-      abfd->tdata.ieee_ar_data = save;
-      goto error_return;
-    }
-
-  next_byte (&(ieee->h));
-  library = read_id (&(ieee->h));
-  if (strcmp (library, "LIBRARY") != 0)
-    {
-      bfd_release (abfd, ieee);
-      abfd->tdata.ieee_ar_data = save;
-      goto error_return;
-    }
-  /* Throw away the filename */
-  read_id (&(ieee->h));
-
-  ieee->element_count = 0;
-  ieee->element_index = 0;
-
-  next_byte (&(ieee->h));	/* Drop the ad part */
-  must_parse_int (&(ieee->h));	/* And the two dummy numbers */
-  must_parse_int (&(ieee->h));
-
-  alc_elts = 10;
-  elts = (ieee_ar_obstack_type *) bfd_malloc (alc_elts * sizeof *elts);
-  if (elts == NULL)
-    goto error_return;
-
-  /* Read the index of the BB table */
-  while (1)
-    {
-      int rec;
-      ieee_ar_obstack_type *t;
-
-      rec = read_2bytes (&(ieee->h));
-      if (rec != (int) ieee_assign_value_to_variable_enum)
-	break;
-
-      if (ieee->element_count >= alc_elts)
-	{
-	  ieee_ar_obstack_type *n;
-
-	  alc_elts *= 2;
-	  n = ((ieee_ar_obstack_type *)
-	       bfd_realloc (elts, alc_elts * sizeof *elts));
-	  if (n == NULL)
-	    goto error_return;
-	  elts = n;
-	}
-
-      t = &elts[ieee->element_count];
-      ieee->element_count++;
-
-      must_parse_int (&(ieee->h));
-      t->file_offset = must_parse_int (&(ieee->h));
-      t->abfd = (bfd *) NULL;
-
-      /* Make sure that we don't go over the end of the buffer */
-
-      if ((size_t) ieee_pos (abfd) > sizeof (buffer) / 2)
-	{
-	  /* Past half way, reseek and reprime */
-	  buffer_offset += ieee_pos (abfd);
-	  if (bfd_seek (abfd, buffer_offset, SEEK_SET) != 0)
-	    goto error_return;
-	  /* FIXME: Check return value.  I'm not sure whether it needs
-	     to read the entire buffer or not.  */
-	  bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
-	  ieee->h.first_byte = buffer;
-	  ieee->h.input_p = buffer;
-	}
-    }
-
-  ieee->elements = ((ieee_ar_obstack_type *)
-		    bfd_alloc (abfd,
-			       ieee->element_count * sizeof *ieee->elements));
-  if (ieee->elements == NULL)
-    goto error_return;
-  memcpy (ieee->elements, elts,
-	  ieee->element_count * sizeof *ieee->elements);
-  free (elts);
-  elts = NULL;
-
-  /* Now scan the area again, and replace BB offsets with file */
-  /* offsets */
-
-  for (i = 2; i < ieee->element_count; i++)
-    {
-      if (bfd_seek (abfd, ieee->elements[i].file_offset, SEEK_SET) != 0)
-	goto error_return;
-      /* FIXME: Check return value.  I'm not sure whether it needs to
-	 read the entire buffer or not.  */
-      bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
-      ieee->h.first_byte = buffer;
-      ieee->h.input_p = buffer;
-
-      next_byte (&(ieee->h));	/* Drop F8 */
-      next_byte (&(ieee->h));	/* Drop 14 */
-      must_parse_int (&(ieee->h));	/* Drop size of block */
-      if (must_parse_int (&(ieee->h)) != 0)
-	{
-	  /* This object has been deleted */
-	  ieee->elements[i].file_offset = 0;
-	}
-      else
-	{
-	  ieee->elements[i].file_offset = must_parse_int (&(ieee->h));
-	}
-    }
-
-  /*  abfd->has_armap = ;*/
-
-  return abfd->xvec;
-
- error_return:
-  if (elts != NULL)
-    free (elts);
-  return NULL;
-}
-
-static boolean
-ieee_mkobject (abfd)
-     bfd *abfd;
-{
-  abfd->tdata.ieee_data = (ieee_data_type *) bfd_zalloc (abfd, sizeof (ieee_data_type));
-  return abfd->tdata.ieee_data ? true : false;
-}
-
-const bfd_target *
-ieee_object_p (abfd)
-     bfd *abfd;
-{
-  char *processor;
-  unsigned int part;
-  ieee_data_type *ieee;
-  unsigned char buffer[300];
-  ieee_data_type *save = IEEE_DATA (abfd);
-
-  abfd->tdata.ieee_data = 0;
-  ieee_mkobject (abfd);
-
-  ieee = IEEE_DATA (abfd);
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    goto fail;
-  /* Read the first few bytes in to see if it makes sense */
-  /* FIXME: Check return value.  I'm not sure whether it needs to read
-     the entire buffer or not.  */
-  bfd_read ((PTR) buffer, 1, sizeof (buffer), abfd);
-
-  ieee->h.input_p = buffer;
-  if (this_byte_and_next (&(ieee->h)) != Module_Beginning)
-    goto got_wrong_format;
-
-  ieee->read_symbols = false;
-  ieee->read_data = false;
-  ieee->section_count = 0;
-  ieee->external_symbol_max_index = 0;
-  ieee->external_symbol_min_index = IEEE_PUBLIC_BASE;
-  ieee->external_reference_min_index = IEEE_REFERENCE_BASE;
-  ieee->external_reference_max_index = 0;
-  ieee->h.abfd = abfd;
-  ieee->section_table = NULL;
-  ieee->section_table_size = 0;
-
-  processor = ieee->mb.processor = read_id (&(ieee->h));
-  if (strcmp (processor, "LIBRARY") == 0)
-    goto got_wrong_format;
-  ieee->mb.module_name = read_id (&(ieee->h));
-  if (abfd->filename == (CONST char *) NULL)
-    {
-      abfd->filename = ieee->mb.module_name;
-    }
-  /* Determine the architecture and machine type of the object file.
-     */
-  {
-    const bfd_arch_info_type *arch;
-    char family[10];
-
-    /* IEEE does not specify the format of the processor identificaton
-       string, so the compiler is free to put in it whatever it wants.
-       We try here to recognize different processors belonging to the
-       m68k family.  Code for other processors can be added here.  */
-    if ((processor[0] == '6') && (processor[1] == '8'))
-      {
-	if (processor[2] == '3')	    /* 683xx integrated processors */
-	  {
-	    switch (processor[3])
-	      {
-	      case '0':			    /* 68302, 68306, 68307 */
-	      case '2':			    /* 68322, 68328 */
-	      case '5':			    /* 68356 */
-		strcpy (family, "68000");   /* MC68000-based controllers */
-		break;
-
-	      case '3':			    /* 68330, 68331, 68332, 68333,
-					       68334, 68335, 68336, 68338 */
-	      case '6':			    /* 68360 */
-	      case '7':			    /* 68376 */
-		strcpy (family, "68332");   /* CPU32 and CPU32+ */
-		break;
-
-	      case '4':
-		if (processor[4] == '9')    /* 68349 */
-		  strcpy (family, "68030"); /* CPU030 */
-		else		            /* 68340, 68341 */
-		  strcpy (family, "68332"); /* CPU32 and CPU32+ */
-		break;
-
-	      default:			    /* Does not exist yet */
-		strcpy (family, "68332");   /* Guess it will be CPU32 */
-	      }
-	  }
-	else if (toupper (processor[3]) == 'F')   /* 68F333 */
-	  strcpy (family, "68332");	          /* CPU32 */
-	else if ((toupper (processor[3]) == 'C')  /* Embedded controllers */
-		 && ((toupper (processor[2]) == 'E')
-		     || (toupper (processor[2]) == 'H')
-		     || (toupper (processor[2]) == 'L')))
-	  {
-	    strcpy (family, "68");
-	    strncat (family, processor + 4, 7);
-	    family[9] = '\0';
-	  }
-	else				 /* "Regular" processors */
-	  {
-	    strncpy (family, processor, 9);
-	    family[9] = '\0';
-	  }
-      }
-    else if ((strncmp (processor, "cpu32", 5) == 0) /* CPU32 and CPU32+ */
-	     || (strncmp (processor, "CPU32", 5) == 0))
-      strcpy (family, "68332");
-    else
-      {
-	strncpy (family, processor, 9);
-	family[9] = '\0';
-      }
-
-    arch = bfd_scan_arch (family);
-    if (arch == 0)
-      goto got_wrong_format;
-    abfd->arch_info = arch;
-  }
-
-  if (this_byte (&(ieee->h)) != (int) ieee_address_descriptor_enum)
-    {
-      goto fail;
-    }
-  next_byte (&(ieee->h));
-
-  if (parse_int (&(ieee->h), &ieee->ad.number_of_bits_mau) == false)
-    {
-      goto fail;
-    }
-  if (parse_int (&(ieee->h), &ieee->ad.number_of_maus_in_address) == false)
-    {
-      goto fail;
-    }
-
-  /* If there is a byte order info, take it */
-  if (this_byte (&(ieee->h)) == (int) ieee_variable_L_enum ||
-      this_byte (&(ieee->h)) == (int) ieee_variable_M_enum)
-    next_byte (&(ieee->h));
-
-  for (part = 0; part < N_W_VARIABLES; part++)
-    {
-      boolean ok;
-      if (read_2bytes (&(ieee->h)) != (int) ieee_assign_value_to_variable_enum)
-	{
-	  goto fail;
-	}
-      if (this_byte_and_next (&(ieee->h)) != part)
-	{
-	  goto fail;
-	}
-
-      ieee->w.offset[part] = parse_i (&(ieee->h), &ok);
-      if (ok == false)
-	{
-	  goto fail;
-	}
-
-    }
-
-  if (ieee->w.r.external_part != 0)
-    abfd->flags = HAS_SYMS;
-
-  /* By now we know that this is a real IEEE file, we're going to read
-     the whole thing into memory so that we can run up and down it
-     quickly.  We can work out how big the file is from the trailer
-     record */
-
-  IEEE_DATA (abfd)->h.first_byte =
-    (unsigned char *) bfd_alloc (ieee->h.abfd, ieee->w.r.me_record + 1);
-  if (!IEEE_DATA (abfd)->h.first_byte)
-    goto fail;
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    goto fail;
-  /* FIXME: Check return value.  I'm not sure whether it needs to read
-     the entire buffer or not.  */
-  bfd_read ((PTR) (IEEE_DATA (abfd)->h.first_byte), 1,
-	    ieee->w.r.me_record + 1, abfd);
-
-  ieee_slurp_sections (abfd);
-
-  if (! ieee_slurp_debug (abfd))
-    goto fail;
-
-  /* Parse section data to activate file and section flags implied by
-     section contents. */
-
-  if (! ieee_slurp_section_data (abfd))
-    goto fail;
-    
-  return abfd->xvec;
-got_wrong_format:
-  bfd_set_error (bfd_error_wrong_format);
-fail:
-  (void) bfd_release (abfd, ieee);
-  abfd->tdata.ieee_data = save;
-  return (const bfd_target *) NULL;
-}
-
-void
-ieee_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-  if (symbol->name[0] == ' ')
-    ret->name = "* empty table entry ";
-  if (!symbol->section)
-    ret->type = (symbol->flags & BSF_LOCAL) ? 'a' : 'A';
-}
-
-void
-ieee_print_symbol (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) afile;
-
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-    case bfd_print_symbol_more:
-#if 0
-      fprintf (file, "%4x %2x", aout_symbol (symbol)->desc & 0xffff,
-	       aout_symbol (symbol)->other & 0xff);
-#endif
-      BFD_FAIL ();
-      break;
-    case bfd_print_symbol_all:
-      {
-	const char *section_name =
-	  (symbol->section == (asection *) NULL
-	   ? "*abs"
-	   : symbol->section->name);
-	if (symbol->name[0] == ' ')
-	  {
-	    fprintf (file, "* empty table entry ");
-	  }
-	else
-	  {
-	    bfd_print_symbol_vandf ((PTR) file, symbol);
-
-	    fprintf (file, " %-5s %04x %02x %s",
-		     section_name,
-		     (unsigned) ieee_symbol (symbol)->index,
-		     (unsigned) 0,
-		     symbol->name);
-	  }
-      }
-      break;
-    }
-}
-
-static boolean
-do_one (ieee, current_map, location_ptr, s, iterations)
-     ieee_data_type *ieee;
-     ieee_per_section_type *current_map;
-     unsigned char *location_ptr;
-     asection *s;
-     int iterations;
-{
-  switch (this_byte (&(ieee->h)))
-    {
-    case ieee_load_constant_bytes_enum:
-      {
-	unsigned int number_of_maus;
-	unsigned int i;
-	next_byte (&(ieee->h));
-	number_of_maus = must_parse_int (&(ieee->h));
-
-	for (i = 0; i < number_of_maus; i++)
-	  {
-	    location_ptr[current_map->pc++] = this_byte (&(ieee->h));
-	    next_byte (&(ieee->h));
-	  }
-      }
-      break;
-
-    case ieee_load_with_relocation_enum:
-      {
-	boolean loop = true;
-	next_byte (&(ieee->h));
-	while (loop)
-	  {
-	    switch (this_byte (&(ieee->h)))
-	      {
-	      case ieee_variable_R_enum:
-
-	      case ieee_function_signed_open_b_enum:
-	      case ieee_function_unsigned_open_b_enum:
-	      case ieee_function_either_open_b_enum:
-		{
-		  unsigned int extra = 4;
-		  boolean pcrel = false;
-		  asection *section;
-		  ieee_reloc_type *r =
-		  (ieee_reloc_type *) bfd_alloc (ieee->h.abfd,
-						 sizeof (ieee_reloc_type));
-		  if (!r)
-		    return false;
-
-		  *(current_map->reloc_tail_ptr) = r;
-		  current_map->reloc_tail_ptr = &r->next;
-		  r->next = (ieee_reloc_type *) NULL;
-		  next_byte (&(ieee->h));
-/*			    abort();*/
-		  r->relent.sym_ptr_ptr = 0;
-		  parse_expression (ieee,
-				    &r->relent.addend,
-				    &r->symbol,
-				    &pcrel, &extra, &section);
-		  r->relent.address = current_map->pc;
-		  s->flags |= SEC_RELOC;
-		  s->owner->flags |= HAS_RELOC;
-		  s->reloc_count++;
-		  if (r->relent.sym_ptr_ptr == NULL && section != NULL)
-		    r->relent.sym_ptr_ptr = section->symbol_ptr_ptr;
-
-		  if (this_byte (&(ieee->h)) == (int) ieee_comma)
-		    {
-		      next_byte (&(ieee->h));
-		      /* Fetch number of bytes to pad */
-		      extra = must_parse_int (&(ieee->h));
-		    };
-
-		  switch (this_byte (&(ieee->h)))
-		    {
-		    case ieee_function_signed_close_b_enum:
-		      next_byte (&(ieee->h));
-		      break;
-		    case ieee_function_unsigned_close_b_enum:
-		      next_byte (&(ieee->h));
-		      break;
-		    case ieee_function_either_close_b_enum:
-		      next_byte (&(ieee->h));
-		      break;
-		    default:
-		      break;
-		    }
-		  /* Build a relocation entry for this type */
-		  /* If pc rel then stick -ve pc into instruction
-		     and take out of reloc ..
-
-		     I've changed this. It's all too complicated. I
-		     keep 0 in the instruction now.  */
-
-		  switch (extra)
-		    {
-		    case 0:
-		    case 4:
-
-		      if (pcrel == true)
-			{
-#if KEEPMINUSPCININST
-			  bfd_put_32 (ieee->h.abfd, -current_map->pc, location_ptr +
-				      current_map->pc);
-			  r->relent.howto = &rel32_howto;
-			  r->relent.addend -=
-			    current_map->pc;
-#else
-			  bfd_put_32 (ieee->h.abfd, 0, location_ptr +
-				      current_map->pc);
-			  r->relent.howto = &rel32_howto;
-#endif
-			}
-		      else
-			{
-			  bfd_put_32 (ieee->h.abfd, 0, location_ptr +
-				      current_map->pc);
-			  r->relent.howto = &abs32_howto;
-			}
-		      current_map->pc += 4;
-		      break;
-		    case 2:
-		      if (pcrel == true)
-			{
-#if KEEPMINUSPCININST
-			  bfd_put_16 (ieee->h.abfd, (int) (-current_map->pc), location_ptr + current_map->pc);
-			  r->relent.addend -= current_map->pc;
-			  r->relent.howto = &rel16_howto;
-#else
-
-			  bfd_put_16 (ieee->h.abfd, 0, location_ptr + current_map->pc);
-			  r->relent.howto = &rel16_howto;
-#endif
-			}
-
-		      else
-			{
-			  bfd_put_16 (ieee->h.abfd, 0, location_ptr + current_map->pc);
-			  r->relent.howto = &abs16_howto;
-			}
-		      current_map->pc += 2;
-		      break;
-		    case 1:
-		      if (pcrel == true)
-			{
-#if KEEPMINUSPCININST
-			  bfd_put_8 (ieee->h.abfd, (int) (-current_map->pc), location_ptr + current_map->pc);
-			  r->relent.addend -= current_map->pc;
-			  r->relent.howto = &rel8_howto;
-#else
-			  bfd_put_8 (ieee->h.abfd, 0, location_ptr + current_map->pc);
-			  r->relent.howto = &rel8_howto;
-#endif
-			}
-		      else
-			{
-			  bfd_put_8 (ieee->h.abfd, 0, location_ptr + current_map->pc);
-			  r->relent.howto = &abs8_howto;
-			}
-		      current_map->pc += 1;
-		      break;
-
-		    default:
-		      BFD_FAIL ();
-		      return false;
-		    }
-		}
-		break;
-	      default:
-		{
-		  bfd_vma this_size;
-		  if (parse_int (&(ieee->h), &this_size) == true)
-		    {
-		      unsigned int i;
-		      for (i = 0; i < this_size; i++)
-			{
-			  location_ptr[current_map->pc++] = this_byte (&(ieee->h));
-			  next_byte (&(ieee->h));
-			}
-		    }
-		  else
-		    {
-		      loop = false;
-		    }
-		}
-	      }
-
-	    /* Prevent more than the first load-item of an LR record
-	       from being repeated (MRI convention). */
-	    if (iterations != 1)
-	      loop = false;
-	  }
-      }
-    }
-  return true;
-}
-
-/* Read in all the section data and relocation stuff too */
-static boolean
-ieee_slurp_section_data (abfd)
-     bfd *abfd;
-{
-  bfd_byte *location_ptr = (bfd_byte *) NULL;
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  unsigned int section_number;
-
-  ieee_per_section_type *current_map = (ieee_per_section_type *) NULL;
-  asection *s;
-  /* Seek to the start of the data area */
-  if (ieee->read_data == true)
-    return true;
-  ieee->read_data = true;
-  ieee_seek (abfd, ieee->w.r.data_part);
-
-  /* Allocate enough space for all the section contents */
-
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      ieee_per_section_type *per = (ieee_per_section_type *) s->used_by_bfd;
-      if ((s->flags & SEC_DEBUGGING) != 0)
-	continue;
-      per->data = (bfd_byte *) bfd_alloc (ieee->h.abfd, s->_raw_size);
-      if (!per->data)
-	return false;
-      /*SUPPRESS 68*/
-      per->reloc_tail_ptr =
-	(ieee_reloc_type **) & (s->relocation);
-    }
-
-  while (true)
-    {
-      switch (this_byte (&(ieee->h)))
-	{
-	  /* IF we see anything strange then quit */
-	default:
-	  return true;
-
-	case ieee_set_current_section_enum:
-	  next_byte (&(ieee->h));
-	  section_number = must_parse_int (&(ieee->h));
-	  s = ieee->section_table[section_number];
-	  s->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
-	  current_map = (ieee_per_section_type *) s->used_by_bfd;
-	  location_ptr = current_map->data - s->vma;
-	  /* The document I have says that Microtec's compilers reset */
-	  /* this after a sec section, even though the standard says not */
-	  /* to. SO .. */
-	  current_map->pc = s->vma;
-	  break;
-
-	case ieee_e2_first_byte_enum:
-	  next_byte (&(ieee->h));
-	  switch (this_byte (&(ieee->h)))
-	    {
-	    case ieee_set_current_pc_enum & 0xff:
-	      {
-		bfd_vma value;
-		ieee_symbol_index_type symbol;
-		unsigned int extra;
-		boolean pcrel;
-		next_byte (&(ieee->h));
-		must_parse_int (&(ieee->h));	/* Thow away section #*/
-		parse_expression (ieee, &value,
-				  &symbol,
-				  &pcrel, &extra,
-				  0);
-		current_map->pc = value;
-		BFD_ASSERT ((unsigned) (value - s->vma) <= s->_raw_size);
-	      }
-	      break;
-
-	    case ieee_value_starting_address_enum & 0xff:
-	      next_byte (&(ieee->h));
-	      if (this_byte (&(ieee->h)) == ieee_function_either_open_b_enum)
-		next_byte (&(ieee->h));
-	      abfd->start_address = must_parse_int (&(ieee->h));
-	      /* We've got to the end of the data now - */
-	      return true;
-	    default:
-	      BFD_FAIL ();
-	      return false;
-	    }
-	  break;
-	case ieee_repeat_data_enum:
-	  {
-	    /* Repeat the following LD or LR n times - we do this by
-		 remembering the stream pointer before running it and
-		 resetting it and running it n times. We special case
-		 the repetition of a repeat_data/load_constant
-		 */
-
-	    unsigned int iterations;
-	    unsigned char *start;
-	    next_byte (&(ieee->h));
-	    iterations = must_parse_int (&(ieee->h));
-	    start = ieee->h.input_p;
-	    if (start[0] == (int) ieee_load_constant_bytes_enum &&
-		start[1] == 1)
-	      {
-		while (iterations != 0)
-		  {
-		    location_ptr[current_map->pc++] = start[2];
-		    iterations--;
-		  }
-		next_byte (&(ieee->h));
-		next_byte (&(ieee->h));
-		next_byte (&(ieee->h));
-	      }
-	    else
-	      {
-		while (iterations != 0)
-		  {
-		    ieee->h.input_p = start;
-		    if (!do_one (ieee, current_map, location_ptr, s,
-				 iterations))
-		      return false;
-		    iterations--;
-		  }
-	      }
-	  }
-	  break;
-	case ieee_load_constant_bytes_enum:
-	case ieee_load_with_relocation_enum:
-	  {
-	    if (!do_one (ieee, current_map, location_ptr, s, 1))
-	      return false;
-	  }
-	}
-    }
-}
-
-boolean
-ieee_new_section_hook (abfd, newsect)
-     bfd *abfd;
-     asection *newsect;
-{
-  newsect->used_by_bfd = (PTR)
-    bfd_alloc (abfd, sizeof (ieee_per_section_type));
-  if (!newsect->used_by_bfd)
-    return false;
-  ieee_per_section (newsect)->data = (bfd_byte *) NULL;
-  ieee_per_section (newsect)->section = newsect;
-  return true;
-}
-
-long
-ieee_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  if ((asect->flags & SEC_DEBUGGING) != 0)
-    return 0;
-  if (! ieee_slurp_section_data (abfd))
-    return -1;
-  return (asect->reloc_count + 1) * sizeof (arelent *);
-}
-
-static boolean
-ieee_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  ieee_per_section_type *p = (ieee_per_section_type *) section->used_by_bfd;
-  if ((section->flags & SEC_DEBUGGING) != 0)
-    return _bfd_generic_get_section_contents (abfd, section, location,
-					      offset, count);
-  ieee_slurp_section_data (abfd);
-  (void) memcpy ((PTR) location, (PTR) (p->data + offset), (unsigned) count);
-  return true;
-}
-
-long
-ieee_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-/*  ieee_per_section_type *p = (ieee_per_section_type *) section->used_by_bfd;*/
-  ieee_reloc_type *src = (ieee_reloc_type *) (section->relocation);
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-
-  if ((section->flags & SEC_DEBUGGING) != 0)
-    return 0;
-
-  while (src != (ieee_reloc_type *) NULL)
-    {
-      /* Work out which symbol to attach it this reloc to */
-      switch (src->symbol.letter)
-	{
-	case 'I':
-	  src->relent.sym_ptr_ptr =
-	    symbols + src->symbol.index + ieee->external_symbol_base_offset;
-	  break;
-	case 'X':
-	  src->relent.sym_ptr_ptr =
-	    symbols + src->symbol.index + ieee->external_reference_base_offset;
-	  break;
-	case 0:
-	  if (src->relent.sym_ptr_ptr != NULL)
-	    src->relent.sym_ptr_ptr =
-	      src->relent.sym_ptr_ptr[0]->section->symbol_ptr_ptr;
-	  break;
-	default:
-
-	  BFD_FAIL ();
-	}
-      *relptr++ = &src->relent;
-      src = src->next;
-    }
-  *relptr = (arelent *) NULL;
-  return section->reloc_count;
-}
-
-static int
-comp (ap, bp)
-     CONST PTR ap;
-     CONST PTR bp;
-{
-  arelent *a = *((arelent **) ap);
-  arelent *b = *((arelent **) bp);
-  return a->address - b->address;
-}
-
-/* Write the section headers.  */
-
-static boolean
-ieee_write_section_part (abfd)
-     bfd *abfd;
-{
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  asection *s;
-  ieee->w.r.section_part = bfd_tell (abfd);
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      if (! bfd_is_abs_section (s)
-	  && (s->flags & SEC_DEBUGGING) == 0)
-	{
-	  if (! ieee_write_byte (abfd, ieee_section_type_enum)
-	      || ! ieee_write_byte (abfd,
-				    (bfd_byte) (s->index
-						+ IEEE_SECTION_NUMBER_BASE)))
-	    return false;
-
-	  if (abfd->flags & EXEC_P)
-	    {
-	      /* This image is executable, so output absolute sections */
-	      if (! ieee_write_byte (abfd, ieee_variable_A_enum)
-		  || ! ieee_write_byte (abfd, ieee_variable_S_enum))
-		return false;
-	    }
-	  else
-	    {
-	      if (! ieee_write_byte (abfd, ieee_variable_C_enum))
-		return false;
-	    }
-
-	  switch (s->flags & (SEC_CODE | SEC_DATA | SEC_ROM))
-	    {
-	    case SEC_CODE | SEC_LOAD:
-	    case SEC_CODE:
-	      if (! ieee_write_byte (abfd, ieee_variable_P_enum))
-		return false;
-	      break;
-	    case SEC_DATA:
-	    default:
-	      if (! ieee_write_byte (abfd, ieee_variable_D_enum))
-		return false;
-	      break;
-	    case SEC_ROM:
-	    case SEC_ROM | SEC_DATA:
-	    case SEC_ROM | SEC_LOAD:
-	    case SEC_ROM | SEC_DATA | SEC_LOAD:
-	      if (! ieee_write_byte (abfd, ieee_variable_R_enum))
-		return false;
-	    }
-
-
-	  if (! ieee_write_id (abfd, s->name))
-	    return false;
-#if 0
-	  ieee_write_int (abfd, 0);	/* Parent */
-	  ieee_write_int (abfd, 0);	/* Brother */
-	  ieee_write_int (abfd, 0);	/* Context */
-#endif
-	  /* Alignment */
-	  if (! ieee_write_byte (abfd, ieee_section_alignment_enum)
-	      || ! ieee_write_byte (abfd,
-				    (bfd_byte) (s->index
-						+ IEEE_SECTION_NUMBER_BASE))
-	      || ! ieee_write_int (abfd, 1 << s->alignment_power))
-	    return false;
-
-	  /* Size */
-	  if (! ieee_write_2bytes (abfd, ieee_section_size_enum)
-	      || ! ieee_write_byte (abfd,
-				    (bfd_byte) (s->index
-						+ IEEE_SECTION_NUMBER_BASE))
-	      || ! ieee_write_int (abfd, s->_raw_size))
-	    return false;
-	  if (abfd->flags & EXEC_P)
-	    {
-	      /* Relocateable sections don't have asl records */
-	      /* Vma */
-	      if (! ieee_write_2bytes (abfd, ieee_section_base_address_enum)
-		  || ! ieee_write_byte (abfd,
-					((bfd_byte)
-					 (s->index
-					  + IEEE_SECTION_NUMBER_BASE)))
-		  || ! ieee_write_int (abfd, s->lma))
-		return false;
-	    }
-	}
-    }
-
-  return true;
-}
-
-
-static boolean
-do_with_relocs (abfd, s)
-     bfd *abfd;
-     asection *s;
-{
-  unsigned int number_of_maus_in_address =
-    bfd_arch_bits_per_address (abfd) / bfd_arch_bits_per_byte (abfd);
-  unsigned int relocs_to_go = s->reloc_count;
-  bfd_byte *stream = ieee_per_section (s)->data;
-  arelent **p = s->orelocation;
-  bfd_size_type current_byte_index = 0;
-
-  qsort (s->orelocation,
-	 relocs_to_go,
-	 sizeof (arelent **),
-	 comp);
-
-  /* Output the section preheader */
-  if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
-      || ! ieee_write_byte (abfd,
-			    (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE))
-      || ! ieee_write_2bytes (abfd, ieee_set_current_pc_enum)
-      || ! ieee_write_byte (abfd,
-			    (bfd_byte) (s->index + IEEE_SECTION_NUMBER_BASE)))
-    return false;
-  if ((abfd->flags & EXEC_P) != 0 && relocs_to_go == 0)
-    {
-      if (! ieee_write_int (abfd, s->lma))
-	return false;
-    }
-  else
-    {
-      if (! ieee_write_expression (abfd, 0, s->symbol, 0, 0))
-	return false;
-    }
-
-  if (relocs_to_go == 0)
-    {
-      /* If there aren't any relocations then output the load constant
-	 byte opcode rather than the load with relocation opcode */
-
-      while (current_byte_index < s->_raw_size)
-	{
-	  bfd_size_type run;
-	  unsigned int MAXRUN = 127;
-	  run = MAXRUN;
-	  if (run > s->_raw_size - current_byte_index)
-	    {
-	      run = s->_raw_size - current_byte_index;
-	    }
-
-	  if (run != 0)
-	    {
-	      if (! ieee_write_byte (abfd, ieee_load_constant_bytes_enum))
-		return false;
-	      /* Output a stream of bytes */
-	      if (! ieee_write_int (abfd, run))
-		return false;
-	      if (bfd_write ((PTR) (stream + current_byte_index),
-			     1,
-			     run,
-			     abfd)
-		  != run)
-		return false;
-	      current_byte_index += run;
-	    }
-	}
-    }
-  else
-    {
-      if (! ieee_write_byte (abfd, ieee_load_with_relocation_enum))
-	return false;
-
-      /* Output the data stream as the longest sequence of bytes
-	 possible, allowing for the a reasonable packet size and
-	 relocation stuffs.  */
-
-      if ((PTR) stream == (PTR) NULL)
-	{
-	  /* Outputting a section without data, fill it up */
-	  stream = (unsigned char *) (bfd_alloc (abfd, s->_raw_size));
-	  if (!stream)
-	    return false;
-	  memset ((PTR) stream, 0, (size_t) s->_raw_size);
-	}
-      while (current_byte_index < s->_raw_size)
-	{
-	  bfd_size_type run;
-	  unsigned int MAXRUN = 127;
-	  if (relocs_to_go)
-	    {
-	      run = (*p)->address - current_byte_index;
-	      if (run > MAXRUN)
-		run = MAXRUN;
-	    }
-	  else
-	    {
-	      run = MAXRUN;
-	    }
-	  if (run > s->_raw_size - current_byte_index)
-	    {
-	      run = s->_raw_size - current_byte_index;
-	    }
-
-	  if (run != 0)
-	    {
-	      /* Output a stream of bytes */
-	      if (! ieee_write_int (abfd, run))
-		return false;
-	      if (bfd_write ((PTR) (stream + current_byte_index),
-			     1,
-			     run,
-			     abfd)
-		  != run)
-		return false;
-	      current_byte_index += run;
-	    }
-	  /* Output any relocations here */
-	  if (relocs_to_go && (*p) && (*p)->address == current_byte_index)
-	    {
-	      while (relocs_to_go
-		     && (*p) && (*p)->address == current_byte_index)
-		{
-		  arelent *r = *p;
-		  bfd_signed_vma ov;
-
-#if 0
-		  if (r->howto->pc_relative)
-		    {
-		      r->addend += current_byte_index;
-		    }
-#endif
-
-		  switch (r->howto->size)
-		    {
-		    case 2:
-
-		      ov = bfd_get_signed_32 (abfd,
-					      stream + current_byte_index);
-		      current_byte_index += 4;
-		      break;
-		    case 1:
-		      ov = bfd_get_signed_16 (abfd,
-					      stream + current_byte_index);
-		      current_byte_index += 2;
-		      break;
-		    case 0:
-		      ov = bfd_get_signed_8 (abfd,
-					     stream + current_byte_index);
-		      current_byte_index++;
-		      break;
-		    default:
-		      ov = 0;
-		      BFD_FAIL ();
-		      return false;
-		    }
-
-		  ov &= r->howto->src_mask;
-
-		  if (r->howto->pc_relative
-		      && ! r->howto->pcrel_offset)
-		    ov += r->address;
-
-		  if (! ieee_write_byte (abfd,
-					 ieee_function_either_open_b_enum))
-		    return false;
-
-/*		  abort();*/
-
-		  if (r->sym_ptr_ptr != (asymbol **) NULL)
-		    {
-		      if (! ieee_write_expression (abfd, r->addend + ov,
-						   *(r->sym_ptr_ptr),
-						   r->howto->pc_relative,
-						   s->index))
-			return false;
-		    }
-		  else
-		    {
-		      if (! ieee_write_expression (abfd, r->addend + ov,
-						   (asymbol *) NULL,
-						   r->howto->pc_relative,
-						   s->index))
-			return false;
-		    }
-
-		  if (number_of_maus_in_address
-		      != bfd_get_reloc_size (r->howto))
-		    {
-		      if (! ieee_write_int (abfd,
-					    bfd_get_reloc_size (r->howto)))
-			return false;
-		    }
-		  if (! ieee_write_byte (abfd,
-					 ieee_function_either_close_b_enum))
-		    return false;
-
-		  relocs_to_go--;
-		  p++;
-		}
-
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* If there are no relocations in the output section then we can be
-   clever about how we write.  We block items up into a max of 127
-   bytes.  */
-
-static boolean
-do_as_repeat (abfd, s)
-     bfd *abfd;
-     asection *s;
-{
-  if (s->_raw_size)
-    {
-      if (! ieee_write_byte (abfd, ieee_set_current_section_enum)
-	  || ! ieee_write_byte (abfd,
-				(bfd_byte) (s->index
-					    + IEEE_SECTION_NUMBER_BASE))
-	  || ! ieee_write_byte (abfd, ieee_set_current_pc_enum >> 8)
-	  || ! ieee_write_byte (abfd, ieee_set_current_pc_enum & 0xff)
-	  || ! ieee_write_byte (abfd,
-				(bfd_byte) (s->index
-					    + IEEE_SECTION_NUMBER_BASE))
-	  || ! ieee_write_int (abfd, s->lma)
-	  || ! ieee_write_byte (abfd, ieee_repeat_data_enum)
-	  || ! ieee_write_int (abfd, s->_raw_size)
-	  || ! ieee_write_byte (abfd, ieee_load_constant_bytes_enum)
-	  || ! ieee_write_byte (abfd, 1)
-	  || ! ieee_write_byte (abfd, 0))
-	return false;
-    }
-
-  return true;
-}
-
-static boolean
-do_without_relocs (abfd, s)
-     bfd *abfd;
-     asection *s;
-{
-  bfd_byte *stream = ieee_per_section (s)->data;
-
-  if (stream == 0 || ((s->flags & SEC_LOAD) == 0))
-    {
-      if (! do_as_repeat (abfd, s))
-	return false;
-    }
-  else
-    {
-      unsigned int i;
-      for (i = 0; i < s->_raw_size; i++)
-	{
-	  if (stream[i] != 0)
-	    {
-	      if (! do_with_relocs (abfd, s))
-		return false;
-	      return true;
-	    }
-	}
-      if (! do_as_repeat (abfd, s))
-	return false;
-    }
-
-  return true;
-}
-
-
-static unsigned char *output_ptr_start;
-static unsigned char *output_ptr;
-static unsigned char *output_ptr_end;
-static unsigned char *input_ptr_start;
-static unsigned char *input_ptr;
-static unsigned char *input_ptr_end;
-static bfd *input_bfd;
-static bfd *output_bfd;
-static int output_buffer;
-
-static void
-fill ()
-{
-  /* FIXME: Check return value.  I'm not sure whether it needs to read
-     the entire buffer or not.  */
-  bfd_read ((PTR) input_ptr_start, 1, input_ptr_end - input_ptr_start, input_bfd);
-  input_ptr = input_ptr_start;
-}
-static void
-flush ()
-{
-  if (bfd_write ((PTR) (output_ptr_start), 1, output_ptr - output_ptr_start,
-		 output_bfd)
-      != (bfd_size_type) (output_ptr - output_ptr_start))
-    abort ();
-  output_ptr = output_ptr_start;
-  output_buffer++;
-}
-
-#define THIS() ( *input_ptr )
-#define NEXT() { input_ptr++; if (input_ptr == input_ptr_end) fill(); }
-#define OUT(x) { *output_ptr++ = (x); if(output_ptr == output_ptr_end)  flush(); }
-
-static void
-write_int (value)
-     int value;
-{
-  if (value >= 0 && value <= 127)
-    {
-      OUT (value);
-    }
-  else
-    {
-      unsigned int length;
-      /* How many significant bytes ? */
-      /* FIXME FOR LONGER INTS */
-      if (value & 0xff000000)
-	{
-	  length = 4;
-	}
-      else if (value & 0x00ff0000)
-	{
-	  length = 3;
-	}
-      else if (value & 0x0000ff00)
-	{
-	  length = 2;
-	}
-      else
-	length = 1;
-
-      OUT ((int) ieee_number_repeat_start_enum + length);
-      switch (length)
-	{
-	case 4:
-	  OUT (value >> 24);
-	case 3:
-	  OUT (value >> 16);
-	case 2:
-	  OUT (value >> 8);
-	case 1:
-	  OUT (value);
-	}
-
-    }
-}
-
-static void
-copy_id ()
-{
-  int length = THIS ();
-  char ch;
-  OUT (length);
-  NEXT ();
-  while (length--)
-    {
-      ch = THIS ();
-      OUT (ch);
-      NEXT ();
-    }
-}
-
-#define VAR(x) ((x | 0x80))
-static void
-copy_expression ()
-{
-  int stack[10];
-  int *tos = stack;
-  int value = 0;
-  while (1)
-    {
-      switch (THIS ())
-	{
-	case 0x84:
-	  NEXT ();
-	  value = THIS ();
-	  NEXT ();
-	  value = (value << 8) | THIS ();
-	  NEXT ();
-	  value = (value << 8) | THIS ();
-	  NEXT ();
-	  value = (value << 8) | THIS ();
-	  NEXT ();
-	  *tos++ = value;
-	  break;
-	case 0x83:
-	  NEXT ();
-	  value = THIS ();
-	  NEXT ();
-	  value = (value << 8) | THIS ();
-	  NEXT ();
-	  value = (value << 8) | THIS ();
-	  NEXT ();
-	  *tos++ = value;
-	  break;
-	case 0x82:
-	  NEXT ();
-	  value = THIS ();
-	  NEXT ();
-	  value = (value << 8) | THIS ();
-	  NEXT ();
-	  *tos++ = value;
-	  break;
-	case 0x81:
-	  NEXT ();
-	  value = THIS ();
-	  NEXT ();
-	  *tos++ = value;
-	  break;
-	case 0x80:
-	  NEXT ();
-	  *tos++ = 0;
-	  break;
-	default:
-	  if (THIS () > 0x84)
-	    {
-	      /* Not a number, just bug out with the answer */
-	      write_int (*(--tos));
-	      return;
-	    }
-	  *tos++ = THIS ();
-	  NEXT ();
-	  value = 0;
-	  break;
-	case 0xa5:
-	  /* PLUS anything */
-	  {
-	    int value = *(--tos);
-	    value += *(--tos);
-	    *tos++ = value;
-	    NEXT ();
-	  }
-	  break;
-	case VAR ('R'):
-	  {
-	    int section_number;
-	    ieee_data_type *ieee;
-	    asection *s;
-	    NEXT ();
-	    section_number = THIS ();
-
-	    NEXT ();
-	    ieee = IEEE_DATA (input_bfd);
-	    s = ieee->section_table[section_number];
-	    if (s->output_section)
-	      {
-		value = s->output_section->lma;
-	      }
-	    else
-	      {
-		value = 0;
-	      }
-	    value += s->output_offset;
-	    *tos++ = value;
-	    value = 0;
-	  }
-	  break;
-	case 0x90:
-	  {
-	    NEXT ();
-	    write_int (*(--tos));
-	    OUT (0x90);
-	    return;
-
-	  }
-	}
-    }
-
-}
-
-/* Drop the int in the buffer, and copy a null into the gap, which we
-   will overwrite later */
-
-struct output_buffer_struct
-{
-  unsigned char *ptrp;
-  int buffer;
-};
-
-static void
-fill_int (buf)
-     struct output_buffer_struct *buf;
-{
-  if (buf->buffer == output_buffer)
-    {
-      /* Still a chance to output the size */
-      int value = output_ptr - buf->ptrp + 3;
-      buf->ptrp[0] = value >> 24;
-      buf->ptrp[1] = value >> 16;
-      buf->ptrp[2] = value >> 8;
-      buf->ptrp[3] = value >> 0;
-    }
-}
-
-static void
-drop_int (buf)
-     struct output_buffer_struct *buf;
-{
-  int type = THIS ();
-  int ch;
-  if (type <= 0x84)
-    {
-      NEXT ();
-      switch (type)
-	{
-	case 0x84:
-	  ch = THIS ();
-	  NEXT ();
-	case 0x83:
-	  ch = THIS ();
-	  NEXT ();
-	case 0x82:
-	  ch = THIS ();
-	  NEXT ();
-	case 0x81:
-	  ch = THIS ();
-	  NEXT ();
-	case 0x80:
-	  break;
-	}
-    }
-  OUT (0x84);
-  buf->ptrp = output_ptr;
-  buf->buffer = output_buffer;
-  OUT (0);
-  OUT (0);
-  OUT (0);
-  OUT (0);
-}
-
-static void
-copy_int ()
-{
-  int type = THIS ();
-  int ch;
-  if (type <= 0x84)
-    {
-      OUT (type);
-      NEXT ();
-      switch (type)
-	{
-	case 0x84:
-	  ch = THIS ();
-	  NEXT ();
-	  OUT (ch);
-	case 0x83:
-	  ch = THIS ();
-	  NEXT ();
-	  OUT (ch);
-	case 0x82:
-	  ch = THIS ();
-	  NEXT ();
-	  OUT (ch);
-	case 0x81:
-	  ch = THIS ();
-	  NEXT ();
-	  OUT (ch);
-	case 0x80:
-	  break;
-	}
-    }
-}
-
-#define ID copy_id()
-#define INT copy_int()
-#define EXP copy_expression()
-static void copy_till_end ();
-#define INTn(q) copy_int()
-#define EXPn(q) copy_expression()
-
-static void
-f1_record ()
-{
-  int ch;
-  /* ATN record */
-  NEXT ();
-  ch = THIS ();
-  switch (ch)
-    {
-    default:
-      OUT (0xf1);
-      OUT (ch);
-      break;
-    case 0xc9:
-      NEXT ();
-      OUT (0xf1);
-      OUT (0xc9);
-      INT;
-      INT;
-      ch = THIS ();
-      switch (ch)
-	{
-	case 0x16:
-	  NEXT ();
-	  break;
-	case 0x01:
-	  NEXT ();
-	  break;
-	case 0x00:
-	  NEXT ();
-	  INT;
-	  break;
-	case 0x03:
-	  NEXT ();
-	  INT;
-	  break;
-	case 0x13:
-	  EXPn (instruction address);
-	  break;
-	default:
-	  break;
-	}
-      break;
-    case 0xd8:
-      /* EXternal ref */
-      NEXT ();
-      OUT (0xf1);
-      OUT (0xd8);
-      EXP;
-      EXP;
-      EXP;
-      EXP;
-      break;
-    case 0xce:
-      NEXT ();
-      OUT (0xf1);
-      OUT (0xce);
-      INT;
-      INT;
-      ch = THIS ();
-      INT;
-      switch (ch)
-	{
-	case 0x01:
-	  INT;
-	  INT;
-	  break;
-	case 0x02:
-	  INT;
-	  break;
-	case 0x04:
-	  EXPn (external function);
-	  break;
-	case 0x05:
-	  break;
-	case 0x07:
-	  INTn (line number);
-	  INT;
-	case 0x08:
-	  break;
-	case 0x0a:
-	  INTn (locked register);
-	  INT;
-	  break;
-	case 0x3f:
-	  copy_till_end ();
-	  break;
-	case 0x3e:
-	  copy_till_end ();
-	  break;
-	case 0x40:
-	  copy_till_end ();
-	  break;
-	case 0x41:
-	  ID;
-	  break;
-	}
-    }
-
-}
-
-static void
-f0_record ()
-{
-  /* Attribute record */
-  NEXT ();
-  OUT (0xf0);
-  INTn (Symbol name);
-  ID;
-}
-
-static void
-copy_till_end ()
-{
-  int ch = THIS ();
-  while (1)
-    {
-      while (ch <= 0x80)
-	{
-	  OUT (ch);
-	  NEXT ();
-	  ch = THIS ();
-	}
-      switch (ch)
-	{
-	case 0x84:
-	  OUT (THIS ());
-	  NEXT ();
-	case 0x83:
-	  OUT (THIS ());
-	  NEXT ();
-	case 0x82:
-	  OUT (THIS ());
-	  NEXT ();
-	case 0x81:
-	  OUT (THIS ());
-	  NEXT ();
-	  OUT (THIS ());
-	  NEXT ();
-
-	  ch = THIS ();
-	  break;
-	default:
-	  return;
-	}
-    }
-
-}
-
-static void
-f2_record ()
-{
-  NEXT ();
-  OUT (0xf2);
-  INT;
-  NEXT ();
-  OUT (0xce);
-  INT;
-  copy_till_end ();
-}
-
-
-static void block ();
-static void
-f8_record ()
-{
-  int ch;
-  NEXT ();
-  ch = THIS ();
-  switch (ch)
-    {
-    case 0x01:
-    case 0x02:
-    case 0x03:
-      /* Unique typedefs for module */
-      /* GLobal typedefs  */
-      /* High level module scope beginning */
-      {
-	struct output_buffer_struct ob;
-	NEXT ();
-	OUT (0xf8);
-	OUT (ch);
-	drop_int (&ob);
-	ID;
-
-	block ();
-
-	NEXT ();
-	fill_int (&ob);
-	OUT (0xf9);
-      }
-      break;
-    case 0x04:
-      /* Global function */
-      {
-	struct output_buffer_struct ob;
-	NEXT ();
-	OUT (0xf8);
-	OUT (0x04);
-	drop_int (&ob);
-	ID;
-	INTn (stack size);
-	INTn (ret val);
-	EXPn (offset);
-
-	block ();
-
-	NEXT ();
-	OUT (0xf9);
-	EXPn (size of block);
-	fill_int (&ob);
-      }
-      break;
-
-    case 0x05:
-      /* File name for source line numbers */
-      {
-	struct output_buffer_struct ob;
-	NEXT ();
-	OUT (0xf8);
-	OUT (0x05);
-	drop_int (&ob);
-	ID;
-	INTn (year);
-	INTn (month);
-	INTn (day);
-	INTn (hour);
-	INTn (monute);
-	INTn (second);
-	block ();
-	NEXT ();
-	OUT (0xf9);
-	fill_int (&ob);
-      }
-      break;
-
-    case 0x06:
-      /* Local function */
-      {
-	struct output_buffer_struct ob;
-	NEXT ();
-	OUT (0xf8);
-	OUT (0x06);
-	drop_int (&ob);
-	ID;
-	INTn (stack size);
-	INTn (type return);
-	EXPn (offset);
-	block ();
-	NEXT ();
-	OUT (0xf9);
-	EXPn (size);
-	fill_int (&ob);
-      }
-      break;
-
-    case 0x0a:
-      /* Assembler module scope beginning -*/
-      {
-	struct output_buffer_struct ob;
-
-	NEXT ();
-	OUT (0xf8);
-	OUT (0x0a);
-	drop_int (&ob);
-	ID;
-	ID;
-	INT;
-	ID;
-	INT;
-	INT;
-	INT;
-	INT;
-	INT;
-	INT;
-
-	block ();
-
-	NEXT ();
-	OUT (0xf9);
-	fill_int (&ob);
-      }
-      break;
-    case 0x0b:
-      {
-	struct output_buffer_struct ob;
-	NEXT ();
-	OUT (0xf8);
-	OUT (0x0b);
-	drop_int (&ob);
-	ID;
-	INT;
-	INTn (section index);
-	EXPn (offset);
-	INTn (stuff);
-
-	block ();
-
-	OUT (0xf9);
-	NEXT ();
-	EXPn (Size in Maus);
-	fill_int (&ob);
-      }
-      break;
-    }
-}
-
-static void
-e2_record ()
-{
-  OUT (0xe2);
-  NEXT ();
-  OUT (0xce);
-  NEXT ();
-  INT;
-  EXP;
-}
-
-static void
-block ()
-{
-  int ch;
-  while (1)
-    {
-      ch = THIS ();
-      switch (ch)
-	{
-	case 0xe1:
-	case 0xe5:
-	  return;
-	case 0xf9:
-	  return;
-	case 0xf0:
-	  f0_record ();
-	  break;
-	case 0xf1:
-	  f1_record ();
-	  break;
-	case 0xf2:
-	  f2_record ();
-	  break;
-	case 0xf8:
-	  f8_record ();
-	  break;
-	case 0xe2:
-	  e2_record ();
-	  break;
-
-	}
-    }
-}
-
-
-
-/* relocate_debug,
-   moves all the debug information from the source bfd to the output
-   bfd, and relocates any expressions it finds
-*/
-
-static void
-relocate_debug (output, input)
-     bfd *output;
-     bfd *input;
-{
-#define IBS 400
-#define OBS 400
-  unsigned char input_buffer[IBS];
-
-  input_ptr_start = input_ptr = input_buffer;
-  input_ptr_end = input_buffer + IBS;
-  input_bfd = input;
-  /* FIXME: Check return value.  I'm not sure whether it needs to read
-     the entire buffer or not.  */
-  bfd_read ((PTR) input_ptr_start, 1, IBS, input);
-  block ();
-}
-
-/*
-  During linking, we we told about the bfds which made up our
-  contents, we have a list of them. They will still be open, so go to
-  the debug info in each, and copy it out, relocating it as we go.
-*/
-
-static boolean
-ieee_write_debug_part (abfd)
-     bfd *abfd;
-{
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  bfd_chain_type *chain = ieee->chain_root;
-  unsigned char output_buffer[OBS];
-  boolean some_debug = false;
-  file_ptr here = bfd_tell (abfd);
-
-  output_ptr_start = output_ptr = output_buffer;
-  output_ptr_end = output_buffer + OBS;
-  output_ptr = output_buffer;
-  output_bfd = abfd;
-
-  if (chain == (bfd_chain_type *) NULL)
-    {
-      asection *s;
-
-      for (s = abfd->sections; s != NULL; s = s->next)
-	if ((s->flags & SEC_DEBUGGING) != 0)
-	  break;
-      if (s == NULL)
-	{
-	  ieee->w.r.debug_information_part = 0;
-	  return true;
-	}
-
-      ieee->w.r.debug_information_part = here;
-      if (bfd_write (s->contents, 1, s->_raw_size, abfd) != s->_raw_size)
-	return false;
-    }
-  else
-    {
-      while (chain != (bfd_chain_type *) NULL)
-	{
-	  bfd *entry = chain->this;
-	  ieee_data_type *entry_ieee = IEEE_DATA (entry);
-	  if (entry_ieee->w.r.debug_information_part)
-	    {
-	      if (bfd_seek (entry, entry_ieee->w.r.debug_information_part,
-			    SEEK_SET)
-		  != 0)
-		return false;
-	      relocate_debug (abfd, entry);
-	    }
-
-	  chain = chain->next;
-	}
-      if (some_debug)
-	{
-	  ieee->w.r.debug_information_part = here;
-	}
-      else
-	{
-	  ieee->w.r.debug_information_part = 0;
-	}
-
-      flush ();
-    }
-
-  return true;
-}
-
-/* Write the data in an ieee way.  */
-
-static boolean
-ieee_write_data_part (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  ieee->w.r.data_part = bfd_tell (abfd);
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      /* Skip sections that have no loadable contents (.bss,
-         debugging, etc.)  */
-      if ((s->flags & SEC_LOAD) == 0)
-	continue;
-
-      /* Sort the reloc records so we can insert them in the correct
-	 places */
-      if (s->reloc_count != 0)
-	{
-	  if (! do_with_relocs (abfd, s))
-	    return false;
-	}
-      else
-	{
-	  if (! do_without_relocs (abfd, s))
-	    return false;
-	}
-    }
-
-  return true;
-}
-
-
-static boolean
-init_for_output (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      if ((s->flags & SEC_DEBUGGING) != 0)
-	continue;
-      if (s->_raw_size != 0)
-	{
-	  ieee_per_section (s)->data = (bfd_byte *) (bfd_alloc (abfd, s->_raw_size));
-	  if (!ieee_per_section (s)->data)
-	    return false;
-	}
-    }
-  return true;
-}
-
-/** exec and core file sections */
-
-/* set section contents is complicated with IEEE since the format is
-* not a byte image, but a record stream.
-*/
-boolean
-ieee_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if ((section->flags & SEC_DEBUGGING) != 0)
-    {
-      if (section->contents == NULL)
-	{
-	  section->contents = ((unsigned char *)
-			       bfd_alloc (abfd, section->_raw_size));
-	  if (section->contents == NULL)
-	    return false;
-	}
-      /* bfd_set_section_contents has already checked that everything
-         is within range.  */
-      memcpy (section->contents + offset, location, count);
-      return true;
-    }
-
-  if (ieee_per_section (section)->data == (bfd_byte *) NULL)
-    {
-      if (!init_for_output (abfd))
-	return false;
-    }
-  memcpy ((PTR) (ieee_per_section (section)->data + offset),
-	  (PTR) location,
-	  (unsigned int) count);
-  return true;
-}
-
-/* Write the external symbols of a file.  IEEE considers two sorts of
-   external symbols, public, and referenced.  It uses to internal
-   forms to index them as well.  When we write them out we turn their
-   symbol values into indexes from the right base.  */
-
-static boolean
-ieee_write_external_part (abfd)
-     bfd *abfd;
-{
-  asymbol **q;
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-
-  unsigned int reference_index = IEEE_REFERENCE_BASE;
-  unsigned int public_index = IEEE_PUBLIC_BASE + 2;
-  file_ptr here = bfd_tell (abfd);
-  boolean hadone = false;
-  if (abfd->outsymbols != (asymbol **) NULL)
-    {
-
-      for (q = abfd->outsymbols; *q != (asymbol *) NULL; q++)
-	{
-	  asymbol *p = *q;
-	  if (bfd_is_und_section (p->section))
-	    {
-	      /* This must be a symbol reference .. */
-	      if (! ieee_write_byte (abfd, ieee_external_reference_enum)
-		  || ! ieee_write_int (abfd, reference_index)
-		  || ! ieee_write_id (abfd, p->name))
-		return false;
-	      p->value = reference_index;
-	      reference_index++;
-	      hadone = true;
-	    }
-	  else if (bfd_is_com_section (p->section))
-	    {
-	      /* This is a weak reference */
-	      if (! ieee_write_byte (abfd, ieee_external_reference_enum)
-		  || ! ieee_write_int (abfd, reference_index)
-		  || ! ieee_write_id (abfd, p->name)
-		  || ! ieee_write_byte (abfd,
-					ieee_weak_external_reference_enum)
-		  || ! ieee_write_int (abfd, reference_index)
-		  || ! ieee_write_int (abfd, p->value))
-		return false;
-	      p->value = reference_index;
-	      reference_index++;
-	      hadone = true;
-	    }
-	  else if (p->flags & BSF_GLOBAL)
-	    {
-	      /* This must be a symbol definition */
-
-	      if (! ieee_write_byte (abfd, ieee_external_symbol_enum)
-		  || ! ieee_write_int (abfd, public_index)
-		  || ! ieee_write_id (abfd, p->name)
-		  || ! ieee_write_2bytes (abfd, ieee_attribute_record_enum)
-		  || ! ieee_write_int (abfd, public_index)
-		  || ! ieee_write_byte (abfd, 15) /* instruction address */
-		  || ! ieee_write_byte (abfd, 19) /* static symbol */
-		  || ! ieee_write_byte (abfd, 1)) /* one of them */
-		return false;
-
-	      /* Write out the value */
-	      if (! ieee_write_2bytes (abfd, ieee_value_record_enum)
-		  || ! ieee_write_int (abfd, public_index))
-		return false;
-	      if (! bfd_is_abs_section (p->section))
-		{
-		  if (abfd->flags & EXEC_P)
-		    {
-		      /* If fully linked, then output all symbols
-			 relocated */
-		      if (! (ieee_write_int
-			     (abfd,
-			      (p->value
-			       + p->section->output_offset
-			       + p->section->output_section->vma))))
-			return false;
-		    }
-		  else
-		    {
-		      if (! (ieee_write_expression
-			     (abfd,
-			      p->value + p->section->output_offset,
-			      p->section->output_section->symbol,
-			      false, 0)))
-			return false;
-		    }
-		}
-	      else
-		{
-		  if (! ieee_write_expression (abfd,
-					       p->value,
-					       bfd_abs_section_ptr->symbol,
-					       false, 0))
-		    return false;
-		}
-	      p->value = public_index;
-	      public_index++;
-	      hadone = true;
-	    }
-	  else
-	    {
-	      /* This can happen - when there are gaps in the symbols read */
-	      /* from an input ieee file */
-	    }
-	}
-    }
-  if (hadone)
-    ieee->w.r.external_part = here;
-
-  return true;
-}
-
-
-static CONST unsigned char exten[] =
-{
-  0xf0, 0x20, 0x00,
-  0xf1, 0xce, 0x20, 0x00, 37, 3, 3,	/* Set version 3 rev 3   	*/
-  0xf1, 0xce, 0x20, 0x00, 39, 2,/* keep symbol in  original case */
-  0xf1, 0xce, 0x20, 0x00, 38	/* set object type relocateable to x */
-};
-
-static CONST unsigned char envi[] =
-{
-  0xf0, 0x21, 0x00,
-
-/*    0xf1, 0xce, 0x21, 00, 50, 0x82, 0x07, 0xc7, 0x09, 0x11, 0x11,
-    0x19, 0x2c,
-*/
-  0xf1, 0xce, 0x21, 00, 52, 0x00,	/* exec ok */
-
-  0xf1, 0xce, 0x21, 0, 53, 0x03,/* host unix */
-/*    0xf1, 0xce, 0x21, 0, 54, 2,1,1	tool & version # */
-};
-
-static boolean
-ieee_write_me_part (abfd)
-     bfd *abfd;
-{
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  ieee->w.r.trailer_part = bfd_tell (abfd);
-  if (abfd->start_address)
-    {
-      if (! ieee_write_2bytes (abfd, ieee_value_starting_address_enum)
-	  || ! ieee_write_byte (abfd, ieee_function_either_open_b_enum)
-	  || ! ieee_write_int (abfd, abfd->start_address)
-	  || ! ieee_write_byte (abfd, ieee_function_either_close_b_enum))
-	return false;
-    }
-  ieee->w.r.me_record = bfd_tell (abfd);
-  if (! ieee_write_byte (abfd, ieee_module_end_enum))
-    return false;
-  return true;
-}
-
-/* Write out the IEEE processor ID.  */
-
-static boolean
-ieee_write_processor (abfd)
-     bfd *abfd;
-{
-  const bfd_arch_info_type *arch;
-
-  arch = bfd_get_arch_info (abfd);
-  switch (arch->arch)
-    {
-    default:
-      if (! ieee_write_id (abfd, bfd_printable_name (abfd)))
-	return false;
-      break;
-
-    case bfd_arch_a29k:
-      if (! ieee_write_id (abfd, "29000"))
-	return false;
-      break;
-
-    case bfd_arch_h8300:
-      if (! ieee_write_id (abfd, "H8/300"))
-	return false;
-      break;
-
-    case bfd_arch_h8500:
-      if (! ieee_write_id (abfd, "H8/500"))
-	return false;
-      break;
-
-    case bfd_arch_i960:
-      switch (arch->mach)
-	{
-	default:
-	case bfd_mach_i960_core:
-	case bfd_mach_i960_ka_sa:
-	  if (! ieee_write_id (abfd, "80960KA"))
-	    return false;
-	  break;
-
-	case bfd_mach_i960_kb_sb:
-	  if (! ieee_write_id (abfd, "80960KB"))
-	    return false;
-	  break;
-
-	case bfd_mach_i960_ca:
-	  if (! ieee_write_id (abfd, "80960CA"))
-	    return false;
-	  break;
-
-	case bfd_mach_i960_mc:
-	case bfd_mach_i960_xa:
-	  if (! ieee_write_id (abfd, "80960MC"))
-	    return false;
-	  break;
-	}
-      break;
-
-    case bfd_arch_m68k:
-      {
-	const char *id;
-
-	switch (arch->mach)
-	  {
-	  default:		id = "68020"; break;
-	  case bfd_mach_m68000: id = "68000"; break;
-	  case bfd_mach_m68008: id = "68008"; break;
-	  case bfd_mach_m68010: id = "68010"; break;
-	  case bfd_mach_m68020: id = "68020"; break;
-	  case bfd_mach_m68030: id = "68030"; break;
-	  case bfd_mach_m68040: id = "68040"; break;
-	  case bfd_mach_m68060: id = "68060"; break;
-	  case bfd_mach_cpu32:  id = "cpu32"; break;
-	  }
-
-	if (! ieee_write_id (abfd, id))
-	  return false;
-      }
-      break;
-    }
-
-  return true;
-}
-
-boolean
-ieee_write_object_contents (abfd)
-     bfd *abfd;
-{
-  ieee_data_type *ieee = IEEE_DATA (abfd);
-  unsigned int i;
-  file_ptr old;
-
-  /* Fast forward over the header area */
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
-
-  if (! ieee_write_byte (abfd, ieee_module_beginning_enum)
-      || ! ieee_write_processor (abfd)
-      || ! ieee_write_id (abfd, abfd->filename))
-    return false;
-
-  /* Fast forward over the variable bits */
-  if (! ieee_write_byte (abfd, ieee_address_descriptor_enum))
-    return false;
-
-  /* Bits per MAU */
-  if (! ieee_write_byte (abfd, (bfd_byte) (bfd_arch_bits_per_byte (abfd))))
-    return false;
-  /* MAU's per address */
-  if (! ieee_write_byte (abfd,
-			 (bfd_byte) (bfd_arch_bits_per_address (abfd)
-				     / bfd_arch_bits_per_byte (abfd))))
-    return false;
-
-  old = bfd_tell (abfd);
-  if (bfd_seek (abfd, (file_ptr) (8 * N_W_VARIABLES), SEEK_CUR) != 0)
-    return false;
-
-  ieee->w.r.extension_record = bfd_tell (abfd);
-  if (bfd_write ((char *) exten, 1, sizeof (exten), abfd) != sizeof (exten))
-    return false;
-  if (abfd->flags & EXEC_P)
-    {
-      if (! ieee_write_byte (abfd, 0x1)) /* Absolute */
-	return false;
-    }
-  else
-    {
-      if (! ieee_write_byte (abfd, 0x2)) /* Relocateable */
-	return false;
-    }
-
-  ieee->w.r.environmental_record = bfd_tell (abfd);
-  if (bfd_write ((char *) envi, 1, sizeof (envi), abfd) != sizeof (envi))
-    return false;
-
-  /* The HP emulator database requires a timestamp in the file.  */
-  {
-    time_t now;
-    const struct tm *t;
-
-    time (&now);
-    t = (struct tm *) localtime (&now);
-    if (! ieee_write_2bytes (abfd, (int) ieee_atn_record_enum)
-	|| ! ieee_write_byte (abfd, 0x21)
-	|| ! ieee_write_byte (abfd, 0)
-	|| ! ieee_write_byte (abfd, 50)
-	|| ! ieee_write_int (abfd, t->tm_year + 1900)
-	|| ! ieee_write_int (abfd, t->tm_mon + 1)
-	|| ! ieee_write_int (abfd, t->tm_mday)
-	|| ! ieee_write_int (abfd, t->tm_hour)
-	|| ! ieee_write_int (abfd, t->tm_min)
-	|| ! ieee_write_int (abfd, t->tm_sec))
-      return false;
-  }
-
-  output_bfd = abfd;
-
-  flush ();
-
-  if (! ieee_write_section_part (abfd))
-    return false;
-  /* First write the symbols.  This changes their values into table
-    indeces so we cant use it after this point.  */
-  if (! ieee_write_external_part (abfd))
-    return false;
-
-  /*  ieee_write_byte(abfd, ieee_record_seperator_enum);*/
-
-  /*  ieee_write_byte(abfd, ieee_record_seperator_enum);*/
-
-
-  /* Write any debugs we have been told about.  */
-  if (! ieee_write_debug_part (abfd))
-    return false;
-
-  /* Can only write the data once the symbols have been written, since
-     the data contains relocation information which points to the
-     symbols.  */
-  if (! ieee_write_data_part (abfd))
-    return false;
-
-  /* At the end we put the end!  */
-  if (! ieee_write_me_part (abfd))
-    return false;
-
-  /* Generate the header */
-  if (bfd_seek (abfd, old, SEEK_SET) != 0)
-    return false;
-
-  for (i = 0; i < N_W_VARIABLES; i++)
-    {
-      if (! ieee_write_2bytes (abfd, ieee_assign_value_to_variable_enum)
-	  || ! ieee_write_byte (abfd, (bfd_byte) i)
-	  || ! ieee_write_int5_out (abfd, ieee->w.offset[i]))
-	return false;
-    }
-
-  return true;
-}
-
-/* Native-level interface to symbols. */
-
-/* We read the symbols into a buffer, which is discarded when this
-   function exits.  We read the strings into a buffer large enough to
-   hold them all plus all the cached symbol entries. */
-
-asymbol *
-ieee_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  ieee_symbol_type *new =
-    (ieee_symbol_type *) bfd_zmalloc (sizeof (ieee_symbol_type));
-  if (!new)
-    return NULL;
-  new->symbol.the_bfd = abfd;
-  return &new->symbol;
-}
-
-static bfd *
-ieee_openr_next_archived_file (arch, prev)
-     bfd *arch;
-     bfd *prev;
-{
-  ieee_ar_data_type *ar = IEEE_AR_DATA (arch);
-  /* take the next one from the arch state, or reset */
-  if (prev == (bfd *) NULL)
-    {
-      /* Reset the index - the first two entries are bogus*/
-      ar->element_index = 2;
-    }
-  while (true)
-    {
-      ieee_ar_obstack_type *p = ar->elements + ar->element_index;
-      ar->element_index++;
-      if (ar->element_index <= ar->element_count)
-	{
-	  if (p->file_offset != (file_ptr) 0)
-	    {
-	      if (p->abfd == (bfd *) NULL)
-		{
-		  p->abfd = _bfd_create_empty_archive_element_shell (arch);
-		  p->abfd->origin = p->file_offset;
-		}
-	      return p->abfd;
-	    }
-	}
-      else
-	{
-	  bfd_set_error (bfd_error_no_more_archived_files);
-	  return (bfd *) NULL;
-	}
-
-    }
-}
-
-static boolean
-ieee_find_nearest_line (abfd,
-			section,
-			symbols,
-			offset,
-			filename_ptr,
-			functionname_ptr,
-			line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     const char **filename_ptr;
-     const char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  return false;
-}
-
-static int
-ieee_generic_stat_arch_elt (abfd, buf)
-     bfd *abfd;
-     struct stat *buf;
-{
-  ieee_ar_data_type *ar = (ieee_ar_data_type *) NULL;
-  ieee_data_type *ieee;
-
-  if (abfd->my_archive != NULL)
-    ar = abfd->my_archive->tdata.ieee_ar_data;
-  if (ar == (ieee_ar_data_type *) NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  if (IEEE_DATA (abfd) == NULL)
-    {
-      if (ieee_object_p (abfd) == NULL)
-	{
-	  bfd_set_error (bfd_error_wrong_format);
-	  return -1;
-	}
-    }
-
-  ieee = IEEE_DATA (abfd);
-
-  buf->st_size = ieee->w.r.me_record + 1;
-  buf->st_mode = 0644;
-  return 0;
-}
-
-static int
-ieee_sizeof_headers (abfd, x)
-     bfd *abfd;
-     boolean x;
-{
-  return 0;
-}
-
-
-/* The debug info routines are never used.  */
-#if 0
-
-static void
-ieee_bfd_debug_info_start (abfd)
-     bfd *abfd;
-{
-
-}
-
-static void
-ieee_bfd_debug_info_end (abfd)
-     bfd *abfd;
-{
-
-}
-
-
-/* Add this section to the list of sections we have debug info for, to
-   be ready to output it at close time
-   */
-static void
-ieee_bfd_debug_info_accumulate (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  ieee_data_type *ieee = IEEE_DATA (section->owner);
-  ieee_data_type *output_ieee = IEEE_DATA (abfd);
-  /* can only accumulate data from other ieee bfds */
-  if (section->owner->xvec != abfd->xvec)
-    return;
-  /* Only bother once per bfd */
-  if (ieee->done_debug == true)
-    return;
-  ieee->done_debug = true;
-
-  /* Don't bother if there is no debug info */
-  if (ieee->w.r.debug_information_part == 0)
-    return;
-
-
-  /* Add to chain */
-  {
-    bfd_chain_type *n = (bfd_chain_type *) bfd_alloc (abfd, sizeof (bfd_chain_type));
-    if (!n)
-      abort ();		/* FIXME */
-    n->this = section->owner;
-    n->next = (bfd_chain_type *) NULL;
-
-    if (output_ieee->chain_head)
-      {
-	output_ieee->chain_head->next = n;
-      }
-    else
-      {
-	output_ieee->chain_root = n;
-
-      }
-    output_ieee->chain_head = n;
-  }
-}
-
-#endif
-
-#define	ieee_close_and_cleanup _bfd_generic_close_and_cleanup
-#define ieee_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-
-#define ieee_slurp_armap bfd_true
-#define ieee_slurp_extended_name_table bfd_true
-#define ieee_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
-   bfd_true)
-#define ieee_truncate_arname bfd_dont_truncate_arname
-#define ieee_write_armap \
-  ((boolean (*) \
-    PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
-   bfd_true)
-#define ieee_read_ar_hdr bfd_nullvoidptr
-#define ieee_update_armap_timestamp bfd_true
-#define ieee_get_elt_at_index _bfd_generic_get_elt_at_index
-
-#define ieee_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define ieee_get_lineno _bfd_nosymbols_get_lineno
-#define ieee_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define ieee_read_minisymbols _bfd_generic_read_minisymbols
-#define ieee_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define ieee_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define ieee_set_arch_mach _bfd_generic_set_arch_mach
-
-#define ieee_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-#define ieee_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define ieee_bfd_relax_section bfd_generic_relax_section
-#define ieee_bfd_gc_sections bfd_generic_gc_sections
-#define ieee_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define ieee_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define ieee_bfd_final_link _bfd_generic_final_link
-#define ieee_bfd_link_split_section  _bfd_generic_link_split_section
-
-/*SUPPRESS 460 */
-const bfd_target ieee_vec =
-{
-  "ieee",			/* name */
-  bfd_target_ieee_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  '_',				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {_bfd_dummy_target,
-   ieee_object_p,		/* bfd_check_format */
-   ieee_archive_p,
-   _bfd_dummy_target,
-  },
-  {
-    bfd_false,
-    ieee_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false
-  },
-  {
-    bfd_false,
-    ieee_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (ieee),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (ieee),
-  BFD_JUMP_TABLE_SYMBOLS (ieee),
-  BFD_JUMP_TABLE_RELOCS (ieee),
-  BFD_JUMP_TABLE_WRITE (ieee),
-  BFD_JUMP_TABLE_LINK (ieee),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/ihex.c b/bfd/ihex.c
deleted file mode 100644
index b9953d329f5..00000000000
--- a/bfd/ihex.c
+++ /dev/null
@@ -1,1041 +0,0 @@
-/* BFD back-end for Intel Hex objects.
-   Copyright 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This is what Intel Hex files look like:
-
-1. INTEL FORMATS
-
-A. Intel 1
-
-   16-bit address-field format, for files 64k bytes in length or less.
-
-   DATA RECORD
-   Byte 1	Header = colon(:)
-   2..3		The number of data bytes in hex notation
-   4..5		High byte of the record load address
-   6..7		Low byte of the record load address
-   8..9		Record type, must be "00"
-   10..x	Data bytes in hex notation:
-	x = (number of bytes - 1) * 2 + 11
-   x+1..x+2	Checksum in hex notation
-   x+3..x+4	Carriage return, line feed
-
-   END RECORD
-   Byte 1	Header = colon (:)
-   2..3		The byte count, must be "00"
-   4..7		Transfer-address (usually "0000")
-		the jump-to address, execution start address
-   8..9		Record type, must be "01"
-   10..11	Checksum, in hex notation
-   12..13	Carriage return, line feed
-
-B. INTEL 2
-
-   MCS-86 format, using a 20-bit address for files larger than 64K bytes.
-
-   DATA RECORD
-   Byte 1	Header = colon (:)
-   2..3		The byte count of this record, hex notation
-   4..5		High byte of the record load address
-   6..7		Low byte of the record load address
-   8..9		Record type, must be "00"
-   10..x	The data bytes in hex notation:
-	x = (number of data bytes - 1) * 2 + 11
-   x+1..x+2	Checksum in hex notation
-   x+3..x+4	Carriage return, line feed
-
-   EXTENDED ADDRESS RECORD
-   Byte 1	Header = colon(:)
-   2..3		The byte count, must be "02"
-   4..7		Load address, must be "0000"
-   8..9		Record type, must be "02"
-   10..11	High byte of the offset address
-   12..13	Low byte of the offset address
-   14..15	Checksum in hex notation
-   16..17	Carriage return, line feed
-
-   The checksums are the two's complement of the 8-bit sum
-   without carry of the byte count, offset address, and the
-   record type.
-
-   START ADDRESS RECORD
-   Byte 1	Header = colon (:)
-   2..3		The byte count, must be "04"
-   4..7		Load address, must be "0000"
-   8..9		Record type, must be "03"
-   10..13	8086 CS value
-   14..17	8086 IP value
-   18..19	Checksum in hex notation
-   20..21	Carriage return, line feed
-
-Another document reports these additional types:
-
-   EXTENDED LINEAR ADDRESS RECORD
-   Byte 1	Header = colon (:)
-   2..3		The byte count, must be "02"
-   4..7		Load address, must be "0000"
-   8..9		Record type, must be "04"
-   10..13	Upper 16 bits of address of subsequent records
-   14..15	Checksum in hex notation
-   16..17	Carriage return, line feed
-
-   START LINEAR ADDRESS RECORD
-   Byte 1	Header = colon (:)
-   2..3		The byte count, must be "02"
-   4..7		Load address, must be "0000"
-   8..9		Record type, must be "05"
-   10..13	Upper 16 bits of start address
-   14..15	Checksum in hex notation
-   16..17	Carriage return, line feed
-
-The MRI compiler uses this, which is a repeat of type 5:
-
-  EXTENDED START RECORD
-   Byte 1	Header = colon (:)
-   2..3		The byte count, must be "04"
-   4..7		Load address, must be "0000"
-   8..9		Record type, must be "05"
-   10..13	Upper 16 bits of start address
-   14..17	Lower 16 bits of start address
-   18..19	Checksum in hex notation
-   20..21	Carriage return, line feed
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libiberty.h"
-
-#include <ctype.h>
-
-static void ihex_init PARAMS ((void));
-static boolean ihex_mkobject PARAMS ((bfd *));
-static INLINE int ihex_get_byte PARAMS ((bfd *, boolean *));
-static void ihex_bad_byte PARAMS ((bfd *, unsigned int, int, boolean));
-static boolean ihex_scan PARAMS ((bfd *));
-static const bfd_target *ihex_object_p PARAMS ((bfd *));
-static boolean ihex_read_section PARAMS ((bfd *, asection *, bfd_byte *));
-static boolean ihex_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean ihex_set_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean ihex_write_record
-  PARAMS ((bfd *, bfd_size_type, bfd_vma, unsigned int, bfd_byte *));
-static boolean ihex_write_object_contents PARAMS ((bfd *));
-static asymbol *ihex_make_empty_symbol PARAMS ((bfd *));
-static boolean ihex_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static int ihex_sizeof_headers PARAMS ((bfd *, boolean));
-
-/* The number of bytes we put on one line during output.  */
-
-#define CHUNK (21)
-
-/* Macros for converting between hex and binary. */
-
-#define NIBBLE(x) (hex_value (x))
-#define HEX2(buffer) ((NIBBLE ((buffer)[0]) << 4) + NIBBLE ((buffer)[1]))
-#define HEX4(buffer) ((HEX2 (buffer) << 8) + HEX2 ((buffer) + 2))
-#define ISHEX(x) (hex_p (x))
-
-/* When we write out an ihex value, the values can not be output as
-   they are seen.  Instead, we hold them in memory in this structure.  */
-
-struct ihex_data_list
-{
-  struct ihex_data_list *next;
-  bfd_byte *data;
-  bfd_vma where;
-  bfd_size_type size;
-};
-
-/* The ihex tdata information.  */
-
-struct ihex_data_struct
-{
-  struct ihex_data_list *head;
-  struct ihex_data_list *tail;
-};
-
-/* Initialize by filling in the hex conversion array.  */
-
-static void
-ihex_init ()
-{
-  static boolean inited;
-
-  if (! inited)
-    {
-      inited = true;
-      hex_init ();
-    }
-}
-
-/* Create an ihex object.  */
-
-static boolean
-ihex_mkobject (abfd)
-     bfd *abfd;
-{
-  if (abfd->tdata.ihex_data == NULL)
-    {
-      struct ihex_data_struct *tdata;
-
-      tdata = ((struct ihex_data_struct *)
-	       bfd_alloc (abfd, sizeof (struct ihex_data_struct)));
-      if (tdata == NULL)
-	return false;
-      abfd->tdata.ihex_data = tdata;
-      tdata->head = NULL;
-      tdata->tail = NULL;
-    }
-
-  return true;
-}
-
-/* Read a byte from a BFD.  Set *ERRORPTR if an error occurred.
-   Return EOF on error or end of file.  */
-
-static INLINE int
-ihex_get_byte (abfd, errorptr)
-     bfd *abfd;
-     boolean *errorptr;
-{
-  bfd_byte c;
-
-  if (bfd_read (&c, 1, 1, abfd) != 1)
-    {
-      if (bfd_get_error () != bfd_error_file_truncated)
-	*errorptr = true;
-      return EOF;
-    }
-
-  return (int) (c & 0xff);
-}
-
-/* Report a problem in an Intel Hex file.  */
-
-static void
-ihex_bad_byte (abfd, lineno, c, error)
-     bfd *abfd;
-     unsigned int lineno;
-     int c;
-     boolean error;
-{
-  if (c == EOF)
-    {
-      if (! error)
-	bfd_set_error (bfd_error_file_truncated);
-    }
-  else
-    {
-      char buf[10];
-
-      if (! isprint (c))
-	sprintf (buf, "\\%03o", (unsigned int) c);
-      else
-	{
-	  buf[0] = c;
-	  buf[1] = '\0';
-	}
-      (*_bfd_error_handler)
-	(_("%s:%d: unexpected character `%s' in Intel Hex file\n"),
-	 bfd_get_filename (abfd), lineno, buf);
-      bfd_set_error (bfd_error_bad_value);
-    }
-}
-
-/* Read an Intel hex file and turn it into sections.  We create a new
-   section for each contiguous set of bytes.  */
-
-static boolean
-ihex_scan (abfd)
-     bfd *abfd;
-{
-  bfd_vma segbase;
-  bfd_vma extbase;
-  asection *sec;
-  int lineno;
-  boolean error;
-  bfd_byte *buf = NULL;
-  size_t bufsize;
-  int c;
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    goto error_return;
-
-  abfd->start_address = 0;
-
-  segbase = 0;
-  extbase = 0;
-  sec = NULL;
-  lineno = 1;
-  error = false;
-  bufsize = 0;
-  while ((c = ihex_get_byte (abfd, &error)) != EOF)
-    {
-      if (c == '\r')
-	continue;
-      else if (c == '\n')
-	{
-	  ++lineno;
-	  continue;
-	}
-      else if (c != ':')
-	{
-	  ihex_bad_byte (abfd, lineno, c, error);
-	  goto error_return;
-	}
-      else
-	{
-	  file_ptr pos;
-	  char hdr[8];
-	  unsigned int i;
-	  unsigned int len;
-	  bfd_vma addr;
-	  unsigned int type;
-	  unsigned int chars;
-	  unsigned int chksum;
-
-	  /* This is a data record.  */
-
-	  pos = bfd_tell (abfd) - 1;
-
-	  /* Read the header bytes.  */
-
-	  if (bfd_read (hdr, 1, 8, abfd) != 8)
-	    goto error_return;
-
-	  for (i = 0; i < 8; i++)
-	    {
-	      if (! ISHEX (hdr[i]))
-		{
-		  ihex_bad_byte (abfd, lineno, hdr[i], error);
-		  goto error_return;
-		}
-	    }
-
-	  len = HEX2 (hdr);
-	  addr = HEX4 (hdr + 2);
-	  type = HEX2 (hdr + 6);
-
-	  /* Read the data bytes.  */
-
-	  chars = len * 2 + 2;
-	  if (chars >= bufsize)
-	    {
-	      buf = (bfd_byte *) bfd_realloc (buf, chars);
-	      if (buf == NULL)
-		goto error_return;
-	      bufsize = chars;
-	    }
-
-	  if (bfd_read (buf, 1, chars, abfd) != chars)
-	    goto error_return;
-
-	  for (i = 0; i < chars; i++)
-	    {
-	      if (! ISHEX (buf[i]))
-		{
-		  ihex_bad_byte (abfd, lineno, hdr[i], error);
-		  goto error_return;
-		}
-	    }
-
-	  /* Check the checksum.  */
-	  chksum = len + addr + (addr >> 8) + type;
-	  for (i = 0; i < len; i++)
-	    chksum += HEX2 (buf + 2 * i);
-	  if (((- chksum) & 0xff) != (unsigned int) HEX2 (buf + 2 * i))
-	    {
-	      (*_bfd_error_handler)
-		(_("%s:%d: bad checksum in Intel Hex file (expected %u, found %u)"),
-		 bfd_get_filename (abfd), lineno,
-		 (- chksum) & 0xff, (unsigned int) HEX2 (buf + 2 * i));
-	      bfd_set_error (bfd_error_bad_value);
-	      goto error_return;
-	    }
-
-	  switch (type)
-	    {
-	    case 0:
-	      /* This is a data record.  */
-	      if (sec != NULL
-		  && sec->vma + sec->_raw_size == extbase + segbase + addr)
-		{
-		  /* This data goes at the end of the section we are
-                     currently building.  */
-		  sec->_raw_size += len;
-		}
-	      else if (len > 0)
-		{
-		  char secbuf[20];
-		  char *secname;
-
-		  sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
-		  secname = (char *) bfd_alloc (abfd, strlen (secbuf) + 1);
-		  if (secname == NULL)
-		    goto error_return;
-		  strcpy (secname, secbuf);
-		  sec = bfd_make_section (abfd, secname);
-		  if (sec == NULL)
-		    goto error_return;
-		  sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
-		  sec->vma = extbase + segbase + addr;
-		  sec->lma = extbase + segbase + addr;
-		  sec->_raw_size = len;
-		  sec->filepos = pos;
-		}
-	      break;
-
-	    case 1:
-	      /* An end record.  */
-	      if (abfd->start_address == 0)
-		abfd->start_address = addr;
-	      if (buf != NULL)
-		free (buf);
-	      return true;
-
-	    case 2:
-	      /* An extended address record.  */
-	      if (len != 2)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s:%d: bad extended address record length in Intel Hex file"),
-		     bfd_get_filename (abfd), lineno);
-		  bfd_set_error (bfd_error_bad_value);
-		  goto error_return;
-		}
-
-	      segbase = HEX4 (buf) << 4;
-
-	      sec = NULL;
-
-	      break;
-
-	    case 3:
-	      /* An extended start address record.  */
-	      if (len != 4)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s:%d: bad extended start address length in Intel Hex file"),
-		     bfd_get_filename (abfd), lineno);
-		  bfd_set_error (bfd_error_bad_value);
-		  goto error_return;
-		}
-
-	      abfd->start_address += (HEX4 (buf) << 4) + HEX4 (buf + 4);
-
-	      sec = NULL;
-
-	      break;
-
-	    case 4:
-	      /* An extended linear address record.  */
-	      if (len != 2)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s:%d: bad extended linear address record length in Intel Hex file"),
-		     bfd_get_filename (abfd), lineno);
-		  bfd_set_error (bfd_error_bad_value);
-		  goto error_return;
-		}
-
-	      extbase = HEX4 (buf) << 16;
-
-	      sec = NULL;
-
-	      break;
-
-	    case 5:
-	      /* An extended linear start address record.  */
-	      if (len != 2 && len != 4)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s:%d: bad extended linear start address length in Intel Hex file"),
-		     bfd_get_filename (abfd), lineno);
-		  bfd_set_error (bfd_error_bad_value);
-		  goto error_return;
-		}
-
-	      if (len == 2)
-		abfd->start_address += HEX4 (buf) << 16;
-	      else
-		abfd->start_address = (HEX4 (buf) << 16) + HEX4 (buf + 4);
-
-	      sec = NULL;
-
-	      break;
-
-	    default:
-	      (*_bfd_error_handler)
-		(_("%s:%d: unrecognized ihex type %u in Intel Hex file\n"),
-		 bfd_get_filename (abfd), lineno, type);
-	      bfd_set_error (bfd_error_bad_value);
-	      goto error_return;
-	    }
-	}
-    }
-
-  if (error)
-    goto error_return;
-
-  if (buf != NULL)
-    free (buf);
-
-  return true;
-
- error_return:
-  if (buf != NULL)
-    free (buf);
-  return false;
-}
-
-/* Try to recognize an Intel Hex file.  */
-
-static const bfd_target *
-ihex_object_p (abfd)
-     bfd *abfd;
-{
-  bfd_byte b[9];
-  unsigned int i;
-  unsigned int type;
-
-  ihex_init ();
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return NULL;
-  if (bfd_read (b, 1, 9, abfd) != 9)
-    {
-      if (bfd_get_error () == bfd_error_file_truncated)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (b[0] != ':')
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  for (i = 1; i < 9; i++)
-    {
-      if (! ISHEX (b[i]))
-	{
-	  bfd_set_error (bfd_error_wrong_format);
-	  return NULL;
-	}
-    }
-
-  type = HEX2 (b + 7);
-  if (type > 5)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* OK, it looks like it really is an Intel Hex file.  */
-
-  if (! ihex_mkobject (abfd)
-      || ! ihex_scan (abfd))
-    return NULL;
-
-  return abfd->xvec;
-}
-
-/* Read the contents of a section in an Intel Hex file.  */
-
-static boolean
-ihex_read_section (abfd, section, contents)
-     bfd *abfd;
-     asection *section;
-     bfd_byte *contents;
-{
-  int c;
-  bfd_byte *p;
-  bfd_byte *buf = NULL;
-  size_t bufsize;
-  boolean error;
-
-  if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
-    goto error_return;
-
-  p = contents;
-  bufsize = 0;
-  error = false;
-  while ((c = ihex_get_byte (abfd, &error)) != EOF)
-    {
-      char hdr[8];
-      unsigned int len;
-      bfd_vma addr;
-      unsigned int type;
-      unsigned int i;
-
-      if (c == '\r' || c == '\n')
-	continue;
-
-      /* This is called after ihex_scan has succeeded, so we ought to
-         know the exact format.  */
-      BFD_ASSERT (c == ':');
-
-      if (bfd_read (hdr, 1, 8, abfd) != 8)
-	goto error_return;
-
-      len = HEX2 (hdr);
-      addr = HEX4 (hdr + 2);
-      type = HEX2 (hdr + 6);
-
-      /* We should only see type 0 records here.  */
-      if (type != 0)
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: internal error in ihex_read_section"),
-	     bfd_get_filename (abfd));
-	  bfd_set_error (bfd_error_bad_value);
-	  goto error_return;
-	}
-
-      if (len * 2 > bufsize)
-	{
-	  buf = (bfd_byte *) bfd_realloc (buf, len * 2);
-	  if (buf == NULL)
-	    goto error_return;
-	  bufsize = len * 2;
-	}
-
-      if (bfd_read (buf, 1, len * 2, abfd) != len * 2)
-	goto error_return;
-
-      for (i = 0; i < len; i++)
-	*p++ = HEX2 (buf + 2 * i);
-      if ((bfd_size_type) (p - contents) >= section->_raw_size)
-	{
-	  /* We've read everything in the section.  */
-	  if (buf != NULL)
-	    free (buf);
-	  return true;
-	}
-
-      /* Skip the checksum.  */
-      if (bfd_read (buf, 1, 2, abfd) != 2)
-	goto error_return;
-    }
-
-  if ((bfd_size_type) (p - contents) < section->_raw_size)
-    {
-      (*_bfd_error_handler)
-	(_("%s: bad section length in ihex_read_section"),
-	 bfd_get_filename (abfd));
-      bfd_set_error (bfd_error_bad_value);
-      goto error_return;
-    }
-
-  if (buf != NULL)
-    free (buf);
-
-  return true;
-
- error_return:
-  if (buf != NULL)
-    free (buf);
-  return false;
-}
-
-/* Get the contents of a section in an Intel Hex file.  */
-
-static boolean
-ihex_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (section->used_by_bfd == NULL)
-    {
-      section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
-      if (section->used_by_bfd == NULL)
-	return false;
-      if (! ihex_read_section (abfd, section, section->used_by_bfd))
-	return false;
-    }
-
-  memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
-	  (size_t) count);
-
-  return true;
-}
-
-/* Set the contents of a section in an Intel Hex file.  */
-
-static boolean
-ihex_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  struct ihex_data_list *n;
-  bfd_byte *data;
-  struct ihex_data_struct *tdata;
-
-  if (count == 0
-      || (section->flags & SEC_ALLOC) == 0
-      || (section->flags & SEC_LOAD) == 0)
-    return true;
-
-  n = ((struct ihex_data_list *)
-       bfd_alloc (abfd, sizeof (struct ihex_data_list)));
-  if (n == NULL)
-    return false;
-
-  data = (bfd_byte *) bfd_alloc (abfd, count);
-  if (data == NULL)
-    return false;
-  memcpy (data, location, (size_t) count);
-
-  n->data = data;
-  n->where = section->lma + offset;
-  n->size = count;
-
-  /* Sort the records by address.  Optimize for the common case of
-     adding a record to the end of the list.  */
-  tdata = abfd->tdata.ihex_data;
-  if (tdata->tail != NULL
-      && n->where >= tdata->tail->where)
-    {
-      tdata->tail->next = n;
-      n->next = NULL;
-      tdata->tail = n;
-    }
-  else
-    {
-      register struct ihex_data_list **pp;
-
-      for (pp = &tdata->head;
-	   *pp != NULL && (*pp)->where < n->where;
-	   pp = &(*pp)->next)
-	;
-      n->next = *pp;
-      *pp = n;
-      if (n->next == NULL)
-	tdata->tail = n;
-    }
-
-  return true;
-}
-
-/* Write a record out to an Intel Hex file.  */
-
-static boolean
-ihex_write_record (abfd, count, addr, type, data)
-     bfd *abfd;
-     bfd_size_type count;
-     bfd_vma addr;
-     unsigned int type;
-     bfd_byte *data;
-{
-  static const char digs[] = "0123456789ABCDEF";
-  char buf[9 + CHUNK * 2 + 4];
-  char *p;
-  unsigned int chksum;
-  unsigned int i;
-
-#define TOHEX(buf, v) \
-  ((buf)[0] = digs[((v) >> 4) & 0xf], (buf)[1] = digs[(v) & 0xf])
-
-  buf[0] = ':';
-  TOHEX (buf + 1, count);
-  TOHEX (buf + 3, (addr >> 8) & 0xff);
-  TOHEX (buf + 5, addr & 0xff);
-  TOHEX (buf + 7, type);
-
-  chksum = count + addr + (addr >> 8) + type;
-
-  for (i = 0, p = buf + 9; i < count; i++, p += 2, data++)
-    {
-      TOHEX (p, *data);
-      chksum += *data;
-    }
-
-  TOHEX (p, (- chksum) & 0xff);
-  p[2] = '\r';
-  p[3] = '\n';
-
-  if (bfd_write (buf, 1, 9 + count * 2 + 4, abfd) != 9 + count * 2 + 4)
-    return false;
-
-  return true;
-}
-
-/* Write out an Intel Hex file.  */
-
-static boolean
-ihex_write_object_contents (abfd)
-     bfd *abfd;
-{
-  bfd_vma segbase;
-  bfd_vma extbase;
-  struct ihex_data_list *l;
-
-  segbase = 0;
-  extbase = 0;
-  for (l = abfd->tdata.ihex_data->head; l != NULL; l = l->next)
-    {
-      bfd_vma where;
-      bfd_byte *p;
-      bfd_size_type count;
-
-      where = l->where;
-      p = l->data;
-      count = l->size;
-      while (count > 0)
-	{
-	  bfd_size_type now;
-
-	  now = count;
-	  if (now > CHUNK)
-	    now = CHUNK;
-
-	  if (where > segbase + extbase + 0xffff)
-	    {
-	      bfd_byte addr[2];
-
-	      /* We need a new base address.  */
-	      if (where <= 0xfffff)
-		{
-		  /* The addresses should be sorted.  */
-		  BFD_ASSERT (extbase == 0);
-
-		  segbase = where & 0xf0000;
-		  addr[0] = (bfd_byte)(segbase >> 12) & 0xff;
-		  addr[1] = (bfd_byte)(segbase >> 4) & 0xff;
-		  if (! ihex_write_record (abfd, 2, 0, 2, addr))
-		    return false;
-		}
-	      else
-		{
-		  /* The extended address record and the extended
-                     linear address record are combined, at least by
-                     some readers.  We need an extended linear address
-                     record here, so if we've already written out an
-                     extended address record, zero it out to avoid
-                     confusion.  */
-		  if (segbase != 0)
-		    {
-		      addr[0] = 0;
-		      addr[1] = 0;
-		      if (! ihex_write_record (abfd, 2, 0, 2, addr))
-			return false;
-		      segbase = 0;
-		    }
-
-		  extbase = where & 0xffff0000;
-		  if (where > extbase + 0xffff)
-		    {
-		      char buf[20];
-
-		      sprintf_vma (buf, where);
-		      (*_bfd_error_handler)
-			(_("%s: address 0x%s out of range for Intex Hex file"),
-			 bfd_get_filename (abfd), buf);
-		      bfd_set_error (bfd_error_bad_value);
-		      return false;
-		    }
-		  addr[0] = (bfd_byte)(extbase >> 24) & 0xff;
-		  addr[1] = (bfd_byte)(extbase >> 16) & 0xff;
-		  if (! ihex_write_record (abfd, 2, 0, 4, addr))
-		    return false;
-		}
-	    }
-
-	  if (! ihex_write_record (abfd, now, where - (extbase + segbase),
-				   0, p))
-	    return false;
-
-	  where += now;
-	  p += now;
-	  count -= now;
-	}
-    }
-
-  if (abfd->start_address != 0)
-    {
-      bfd_vma start;
-      bfd_byte startbuf[4];
-
-      start = abfd->start_address;
-
-      if (start <= 0xfffff)
-	{
-	  startbuf[0] = (bfd_byte)((start & 0xf0000) >> 12) & 0xff;
-	  startbuf[1] = 0;
-	  startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
-	  startbuf[3] = (bfd_byte)start & 0xff;
-	  if (! ihex_write_record (abfd, 4, 0, 3, startbuf))
-	    return false;
-	}
-      else
-	{
-	  startbuf[0] = (bfd_byte)(start >> 24) & 0xff;
-	  startbuf[1] = (bfd_byte)(start >> 16) & 0xff;
-	  startbuf[2] = (bfd_byte)(start >> 8) & 0xff;
-	  startbuf[3] = (bfd_byte)start & 0xff;
-	  if (! ihex_write_record (abfd, 4, 0, 5, startbuf))
-	    return false;
-	}
-    }
-
-  if (! ihex_write_record (abfd, 0, 0, 1, NULL))
-    return false;
-
-  return true;
-}
-
-/* Make an empty symbol.  This is required only because
-   bfd_make_section_anyway wants to create a symbol for the section.  */
-
-static asymbol *
-ihex_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new;
-
-  new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new != NULL)
-    new->the_bfd = abfd;
-  return new;
-}
-
-/* Set the architecture for the output file.  The architecture is
-   irrelevant, so we ignore errors about unknown architectures.  */
-
-static boolean
-ihex_set_arch_mach (abfd, arch, mach)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long mach;
-{
-  if (! bfd_default_set_arch_mach (abfd, arch, mach))
-    {
-      if (arch != bfd_arch_unknown)
-	return false;
-    }
-  return true;
-}
-
-/* Get the size of the headers, for the linker.  */
-
-/*ARGSUSED*/
-static int
-ihex_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-{
-  return 0;
-}
-
-/* Some random definitions for the target vector.  */
-
-#define	ihex_close_and_cleanup _bfd_generic_close_and_cleanup
-#define ihex_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define ihex_new_section_hook _bfd_generic_new_section_hook
-#define ihex_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define ihex_get_symtab_upper_bound bfd_0l
-#define ihex_get_symtab \
-  ((long (*) PARAMS ((bfd *, asymbol **))) bfd_0l)
-#define ihex_print_symbol _bfd_nosymbols_print_symbol
-#define ihex_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define ihex_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
-#define ihex_get_lineno _bfd_nosymbols_get_lineno
-#define ihex_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define ihex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define ihex_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define ihex_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-#define ihex_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
-#define ihex_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
-#define ihex_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define ihex_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define ihex_bfd_relax_section bfd_generic_relax_section
-#define ihex_bfd_gc_sections bfd_generic_gc_sections
-#define ihex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define ihex_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define ihex_bfd_final_link _bfd_generic_final_link
-#define ihex_bfd_link_split_section _bfd_generic_link_split_section
-
-/* The Intel Hex target vector.  */
-
-const bfd_target ihex_vec =
-{
-  "ihex",			/* name */
-  bfd_target_ihex_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  0,				/* object flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {
-    _bfd_dummy_target,
-    ihex_object_p,		/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {
-    bfd_false,
-    ihex_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    ihex_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (ihex),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (ihex),
-  BFD_JUMP_TABLE_RELOCS (ihex),
-  BFD_JUMP_TABLE_WRITE (ihex),
-  BFD_JUMP_TABLE_LINK (ihex),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/init.c b/bfd/init.c
deleted file mode 100644
index 1fa1d505bee..00000000000
--- a/bfd/init.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* bfd initialization stuff
-   Copyright (C) 1990, 91, 92, 93, 94, 1995 Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/*
-SECTION
-	Initialization
-
-	These are the functions that handle initializing a BFD.
-*/
-
-/*
-FUNCTION
-	bfd_init
-
-SYNOPSIS
-	void bfd_init(void);
-
-DESCRIPTION
-	This routine must be called before any other BFD function to
-	initialize magical internal data structures.
-*/
-
-/* Actually, there is currently nothing for this function to do.
-   However, someday it may be needed, so keep it around.  */
-
-void
-bfd_init ()
-{
-}
diff --git a/bfd/irix-core.c b/bfd/irix-core.c
deleted file mode 100644
index 964ca20eac5..00000000000
--- a/bfd/irix-core.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/* BFD back-end for Irix core files.
-   Copyright 1993, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Stu Grossman, Cygnus Support.
-   Converted to back-end form by Ian Lance Taylor, Cygnus Support
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file can only be compiled on systems which use Irix style core
-   files (namely, Irix 4 and Irix 5, so far).  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#ifdef IRIX_CORE
-
-#include <core.out.h>
-
-struct sgi_core_struct 
-{
-  int sig;
-  char cmd[CORE_NAMESIZE];
-};
-
-#define core_hdr(bfd) ((bfd)->tdata.sgi_core_data)
-#define core_signal(bfd) (core_hdr(bfd)->sig)
-#define core_command(bfd) (core_hdr(bfd)->cmd)
-
-static asection *make_bfd_asection
-  PARAMS ((bfd *, CONST char *, flagword, bfd_size_type, bfd_vma, file_ptr));
-static const bfd_target *irix_core_core_file_p PARAMS ((bfd *));
-static char *irix_core_core_file_failing_command PARAMS ((bfd *));
-static int irix_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean irix_core_core_file_matches_executable_p 
-  PARAMS ((bfd *, bfd *));
-static asymbol *irix_core_make_empty_symbol PARAMS ((bfd *));
-static void swap_abort PARAMS ((void));
-
-static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
-     bfd *abfd;
-     CONST char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     file_ptr filepos;
-{
-  asection *asect;
-
-  asect = bfd_make_section_anyway (abfd, name);
-  if (!asect)
-    return NULL;
-
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
-  asect->vma = vma;
-  asect->filepos = filepos;
-  asect->alignment_power = 4;
-
-  return asect;
-}
-
-static const bfd_target *
-irix_core_core_file_p (abfd)
-     bfd *abfd;
-{
-  int val;
-  int i;
-  char *secname;
-  struct coreout coreout;
-  struct idesc *idg, *idf, *ids;
-
-  val = bfd_read ((PTR)&coreout, 1, sizeof coreout, abfd);
-  if (val != sizeof coreout)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-#ifndef CORE_MAGICN32
-#define CORE_MAGICN32 CORE_MAGIC
-#endif
-  if ((coreout.c_magic != CORE_MAGIC && coreout.c_magic != CORE_MAGICN32)
-      || coreout.c_version != CORE_VERSION1)
-    return 0;
-
-  core_hdr (abfd) = (struct sgi_core_struct *) bfd_zalloc (abfd, sizeof (struct sgi_core_struct));
-  if (!core_hdr (abfd))
-    return NULL;
-
-  strncpy (core_command (abfd), coreout.c_name, CORE_NAMESIZE);
-  core_signal (abfd) = coreout.c_sigcause;
-
-  if (bfd_seek (abfd, coreout.c_vmapoffset, SEEK_SET) != 0)
-    return NULL;
-
-  for (i = 0; i < coreout.c_nvmap; i++)
-    {
-      struct vmap vmap;
-
-      val = bfd_read ((PTR)&vmap, 1, sizeof vmap, abfd);
-      if (val != sizeof vmap)
-	break;
-
-      switch (vmap.v_type)
-	{
-	case VDATA:
-	  secname = ".data";
-	  break;
-	case VSTACK:
-	  secname = ".stack";
-	  break;
-#ifdef VMAPFILE
-	case VMAPFILE:
-	  secname = ".mapfile";
-	  break;
-#endif
-	default:
-	  continue;
-	}
-
-      /* A file offset of zero means that the section is not contained
-	 in the corefile.  */
-      if (vmap.v_offset == 0)
-	continue;
-
-      if (!make_bfd_asection (abfd, secname,
-			      SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS,
-			      vmap.v_len,
-			      vmap.v_vaddr,
-			      vmap.v_offset))
-	return NULL;
-    }
-
-  /* Make sure that the regs are contiguous within the core file. */
-
-  idg = &coreout.c_idesc[I_GPREGS];
-  idf = &coreout.c_idesc[I_FPREGS];
-  ids = &coreout.c_idesc[I_SPECREGS];
-
-  if (idg->i_offset + idg->i_len != idf->i_offset
-      || idf->i_offset + idf->i_len != ids->i_offset)
-    return 0;			/* Can't deal with non-contig regs */
-
-  if (bfd_seek (abfd, idg->i_offset, SEEK_SET) != 0)
-    return NULL;
-
-  make_bfd_asection (abfd, ".reg",
-		     SEC_HAS_CONTENTS,
-		     idg->i_len + idf->i_len + ids->i_len,
-		     0,
-		     idg->i_offset);
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  return abfd->xvec;
-}
-
-static char *
-irix_core_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return core_command (abfd);
-}
-
-static int
-irix_core_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_signal (abfd);
-}
-
-static boolean
-irix_core_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;			/* XXX - FIXME */
-}
-
-static asymbol *
-irix_core_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
-#define irix_core_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
-#define irix_core_get_symtab _bfd_nosymbols_get_symtab
-#define irix_core_print_symbol _bfd_nosymbols_print_symbol
-#define irix_core_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define irix_core_bfd_is_local_label_name \
-  _bfd_nosymbols_bfd_is_local_label_name
-#define irix_core_get_lineno _bfd_nosymbols_get_lineno
-#define irix_core_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define irix_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define irix_core_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define irix_core_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target irix_core_vec =
-  {
-    "irix-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_BIG,		/* target byte order */
-    BFD_ENDIAN_BIG,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     irix_core_core_file_p	/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (irix_core),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (irix_core),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
-
-#endif /* IRIX_CORE */
diff --git a/bfd/libaout.h b/bfd/libaout.h
deleted file mode 100644
index 7001d3dc6d4..00000000000
--- a/bfd/libaout.h
+++ /dev/null
@@ -1,624 +0,0 @@
-/* BFD back-end data structures for a.out (and similar) files.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef LIBAOUT_H
-#define LIBAOUT_H
-
-/* We try to encapsulate the differences in the various a.out file
-   variants in a few routines, and otherwise share large masses of code.
-   This means we only have to fix bugs in one place, most of the time.  */
-
-#include "bfdlink.h"
-
-/* Parameterize the a.out code based on whether it is being built
-   for a 32-bit architecture or a 64-bit architecture.  */
-#if ARCH_SIZE==64
-#define GET_WORD bfd_h_get_64
-#define GET_SWORD bfd_h_get_signed_64
-#define PUT_WORD bfd_h_put_64
-#ifndef NAME
-#define NAME(x,y) CAT3(x,_64_,y)
-#endif
-#define JNAME(x) CAT(x,_64)
-#define BYTES_IN_WORD 8
-#else /* ARCH_SIZE == 32 */
-#define GET_WORD bfd_h_get_32
-#define GET_SWORD bfd_h_get_signed_32
-#define PUT_WORD bfd_h_put_32
-#ifndef NAME
-#define NAME(x,y) CAT3(x,_32_,y)
-#endif
-#define JNAME(x) CAT(x,_32)
-#define BYTES_IN_WORD 4
-#endif /* ARCH_SIZE==32 */
-
-/* Declare at file level, since used in parameter lists, which have
-   weird scope.  */
-struct external_exec;
-struct external_nlist;
-struct reloc_ext_external;
-struct reloc_std_external;
-
-/* a.out backend linker hash table entries.  */
-
-struct aout_link_hash_entry
-{
-  struct bfd_link_hash_entry root;
-  /* Whether this symbol has been written out.  */
-  boolean written;
-  /* Symbol index in output file.  */
-  int indx;
-};
-
-/* a.out backend linker hash table.  */
-
-struct aout_link_hash_table
-{
-  struct bfd_link_hash_table root;
-};
-
-/* Look up an entry in an a.out link hash table.  */
-
-#define aout_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct aout_link_hash_entry *) \
-   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy), (follow)))
-
-/* Traverse an a.out link hash table.  */
-
-#define aout_link_hash_traverse(table, func, info)			\
-  (bfd_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the a.out link hash table from the info structure.  This is
-   just a cast.  */
-
-#define aout_hash_table(p) ((struct aout_link_hash_table *) ((p)->hash))
-
-/* Back-end information for various a.out targets.  */
-struct aout_backend_data
-{
-  /* Are ZMAGIC files mapped contiguously?  If so, the text section may
-     need more padding, if the segment size (granularity for memory access
-     control) is larger than the page size.  */
-  unsigned char zmagic_mapped_contiguous;
-  /* If this flag is set, ZMAGIC/NMAGIC file headers get mapped in with the
-     text section, which starts immediately after the file header.
-     If not, the text section starts on the next page.  */
-  unsigned char text_includes_header;
-
-  /* If this flag is set, then if the entry address is not in the
-     first SEGMENT_SIZE bytes of the text section, it is taken to be
-     the address of the start of the text section.  This can be useful
-     for kernels.  */
-  unsigned char entry_is_text_address;
-
-  /* The value to pass to N_SET_FLAGS.  */
-  unsigned char exec_hdr_flags;
-
-  /* If the text section VMA isn't specified, and we need an absolute
-     address, use this as the default.  If we're producing a relocatable
-     file, zero is always used.  */
-  /* ?? Perhaps a callback would be a better choice?  Will this do anything
-     reasonable for a format that handles multiple CPUs with different
-     load addresses for each?  */
-  bfd_vma default_text_vma;
-
-  /* Callback for setting the page and segment sizes, if they can't be
-     trivially determined from the architecture.  */
-  boolean (*set_sizes) PARAMS ((bfd *));
-
-  /* zmagic files only. For go32, the length of the exec header contributes
-     to the size of the text section in the file for alignment purposes but
-     does *not* get counted in the length of the text section. */
-  unsigned char exec_header_not_counted;
-
-  /* Callback from the add symbols phase of the linker code to handle
-     a dynamic object.  */
-  boolean (*add_dynamic_symbols) PARAMS ((bfd *, struct bfd_link_info *,
-					  struct external_nlist **,
-					  bfd_size_type *, char **));
-
-  /* Callback from the add symbols phase of the linker code to handle
-     adding a single symbol to the global linker hash table.  */
-  boolean (*add_one_symbol) PARAMS ((struct bfd_link_info *, bfd *,
-				     const char *, flagword, asection *,
-				     bfd_vma, const char *, boolean,
-				     boolean,
-				     struct bfd_link_hash_entry **));
-
-  /* Called to handle linking a dynamic object.  */
-  boolean (*link_dynamic_object) PARAMS ((struct bfd_link_info *, bfd *));
-
-  /* Called for each global symbol being written out by the linker.
-     This should write out the dynamic symbol information.  */
-  boolean (*write_dynamic_symbol) PARAMS ((bfd *, struct bfd_link_info *,
-					   struct aout_link_hash_entry *));
-
-  /* If this callback is not NULL, the linker calls it for each reloc.
-     RELOC is a pointer to the unswapped reloc.  If *SKIP is set to
-     true, the reloc will be skipped.  *RELOCATION may be changed to
-     change the effects of the relocation.  */
-  boolean (*check_dynamic_reloc) PARAMS ((struct bfd_link_info *info,
-					  bfd *input_bfd,
-					  asection *input_section,
-					  struct aout_link_hash_entry *h,
-					  PTR reloc, bfd_byte *contents,
-					  boolean *skip,
-					  bfd_vma *relocation));
-
-  /* Called at the end of a link to finish up any dynamic linking
-     information.  */
-  boolean (*finish_dynamic_link) PARAMS ((bfd *, struct bfd_link_info *));
-};
-#define aout_backend_info(abfd) \
-	((CONST struct aout_backend_data *)((abfd)->xvec->backend_data))
-
-/* This is the layout in memory of a "struct exec" while we process it.
-   All 'lengths' are given as a number of bytes.
-   All 'alignments' are for relinkable files only;  an alignment of
-	'n' indicates the corresponding segment must begin at an
-	address that is a multiple of (2**n).  */
-
-struct internal_exec
-{
-    long a_info;		/* Magic number and flags, packed */
-    bfd_vma a_text;		/* length of text, in bytes  */
-    bfd_vma a_data;		/* length of data, in bytes  */
-    bfd_vma a_bss;		/* length of uninitialized data area in mem */
-    bfd_vma a_syms;		/* length of symbol table data in file */
-    bfd_vma a_entry;		/* start address */
-    bfd_vma a_trsize;		/* length of text's relocation info, in bytes */
-    bfd_vma a_drsize;		/* length of data's relocation info, in bytes */
-    /* Added for i960 */
-    bfd_vma a_tload;		/* Text runtime load address */
-    bfd_vma a_dload;		/* Data runtime load address */
-    unsigned char a_talign;	/* Alignment of text segment */
-    unsigned char a_dalign;	/* Alignment of data segment */
-    unsigned char a_balign;	/* Alignment of bss segment */
-    char a_relaxable;           /* Enough info for linker relax */
-};
-
-/* Magic number is written 
-< MSB          >
-3130292827262524232221201918171615141312111009080706050403020100
-< FLAGS        >< MACHINE TYPE ><  MAGIC NUMBER                >
-*/
-/* Magic number for NetBSD is
-<MSB           >
-3130292827262524232221201918171615141312111009080706050403020100
-< FLAGS    >< MACHINE TYPE     ><  MAGIC NUMBER                >
-*/
-
-enum machine_type {
-  M_UNKNOWN = 0,
-  M_68010 = 1,
-  M_68020 = 2,
-  M_SPARC = 3,
-  /* skip a bunch so we don't run into any of suns numbers */
-  /* make these up for the ns32k*/
-  M_NS32032 = (64),		/* ns32032 running ? */
-  M_NS32532 = (64 + 5),		/* ns32532 running mach */
-
-  M_386 = 100,
-  M_29K = 101,          /* AMD 29000 */
-  M_386_DYNIX = 102,	/* Sequent running dynix */
-  M_ARM = 103,		/* Advanced Risc Machines ARM */
-  M_SPARCLET = 131,	/* SPARClet = M_SPARC + 128 */
-  M_386_NETBSD = 134,	/* NetBSD/i386 binary */
-  M_68K_NETBSD = 135,	/* NetBSD/m68k binary */
-  M_68K4K_NETBSD = 136,	/* NetBSD/m68k4k binary */
-  M_532_NETBSD = 137,	/* NetBSD/ns32k binary */
-  M_SPARC_NETBSD = 138,	/* NetBSD/sparc binary */
-  M_PMAX_NETBSD = 139,	/* NetBSD/pmax (MIPS little-endian) binary */
-  M_VAX_NETBSD = 140,	/* NetBSD/vax binary */
-  M_ALPHA_NETBSD = 141,	/* NetBSD/alpha binary */
-  M_ARM6_NETBSD = 143,	/* NetBSD/arm32 binary */
-  M_SPARCLET_1 = 147,	/* 0x93, reserved */
-  M_MIPS1 = 151,        /* MIPS R2000/R3000 binary */
-  M_MIPS2 = 152,        /* MIPS R4000/R6000 binary */
-  M_SPARCLET_2 = 163,	/* 0xa3, reserved */
-  M_SPARCLET_3 = 179,	/* 0xb3, reserved */
-  M_SPARCLET_4 = 195,	/* 0xc3, reserved */
-  M_HP200 = 200,	/* HP 200 (68010) BSD binary */
-  M_HP300 = (300 % 256), /* HP 300 (68020+68881) BSD binary */
-  M_HPUX = (0x20c % 256), /* HP 200/300 HPUX binary */
-  M_SPARCLET_5 = 211,	/* 0xd3, reserved */
-  M_SPARCLET_6 = 227,	/* 0xe3, reserved */
-  /*  M_SPARCLET_7 = 243	/ * 0xf3, reserved */
-  M_SPARCLITE_LE = 243
-};
-
-#define N_DYNAMIC(exec) ((exec).a_info & 0x80000000)
-
-#ifndef N_MAGIC
-# define N_MAGIC(exec) ((exec).a_info & 0xffff)
-#endif
-
-#ifndef N_MACHTYPE
-# define N_MACHTYPE(exec) ((enum machine_type)(((exec).a_info >> 16) & 0xff))
-#endif
-
-#ifndef N_FLAGS
-# define N_FLAGS(exec) (((exec).a_info >> 24) & 0xff)
-#endif
-
-#ifndef N_SET_INFO
-# define N_SET_INFO(exec, magic, type, flags) \
-((exec).a_info = ((magic) & 0xffff) \
- | (((int)(type) & 0xff) << 16) \
- | (((flags) & 0xff) << 24))
-#endif
-
-#ifndef N_SET_DYNAMIC
-# define N_SET_DYNAMIC(exec, dynamic) \
-((exec).a_info = (dynamic) ? ((exec).a_info | 0x80000000) : \
-((exec).a_info & 0x7fffffff))
-#endif
-
-#ifndef N_SET_MAGIC
-# define N_SET_MAGIC(exec, magic) \
-((exec).a_info = (((exec).a_info & 0xffff0000) | ((magic) & 0xffff)))
-#endif
-
-#ifndef N_SET_MACHTYPE
-# define N_SET_MACHTYPE(exec, machtype) \
-((exec).a_info = \
- ((exec).a_info&0xff00ffff) | ((((int)(machtype))&0xff) << 16))
-#endif
-
-#ifndef N_SET_FLAGS
-# define N_SET_FLAGS(exec, flags) \
-((exec).a_info = \
- ((exec).a_info&0x00ffffff) | (((flags) & 0xff) << 24))
-#endif
-
-typedef struct aout_symbol {
-  asymbol symbol;
-  short desc;
-  char other;
-  unsigned char type;
-} aout_symbol_type;
-
-/* The `tdata' struct for all a.out-like object file formats.
-   Various things depend on this struct being around any time an a.out
-   file is being handled.  An example is dbxread.c in GDB.  */
-
-struct aoutdata {
-  struct internal_exec *hdr;		/* exec file header */
-  aout_symbol_type *symbols;		/* symtab for input bfd */
-  
-  /* For ease, we do this */
-  asection *textsec;
-  asection *datasec;
-  asection *bsssec;
-
-  /* We remember these offsets so that after check_file_format, we have
-     no dependencies on the particular format of the exec_hdr.  */
-  file_ptr sym_filepos;
-  file_ptr str_filepos;
-
-  /* Size of a relocation entry in external form */
-  unsigned reloc_entry_size;
-
-  /* Size of a symbol table entry in external form */
-  unsigned symbol_entry_size;
-
-  /* Page size - needed for alignment of demand paged files. */
-  unsigned long page_size;
-
-  /* Segment size - needed for alignment of demand paged files. */
-  unsigned long segment_size;
-
-  /* Zmagic disk block size - need to align the start of the text
-     section in ZMAGIC binaries.  Normally the same as page_size.  */
-  unsigned long zmagic_disk_block_size;
-
-  unsigned exec_bytes_size;
-  unsigned vma_adjusted : 1;
-
-  /* used when a bfd supports several highly similar formats */
-  enum
-    {
-      default_format = 0,
-      /* Used on HP 9000/300 running HP/UX.  See hp300hpux.c.  */
-      gnu_encap_format,
-      /* Used on Linux, 386BSD, etc.  See include/aout/aout64.h.  */
-      q_magic_format
-    } subformat;
-
-  enum
-    {
-      undecided_magic = 0,
-      z_magic,
-      o_magic,
-      n_magic
-    } magic;
-
-  /* A buffer for find_nearest_line.  */
-  char *line_buf;
-
-  /* The external symbol information.  */
-  struct external_nlist *external_syms;
-  bfd_size_type external_sym_count;
-  bfd_window sym_window;
-  char *external_strings;
-  bfd_size_type external_string_size;
-  bfd_window string_window;
-  struct aout_link_hash_entry **sym_hashes;
-
-  /* A pointer for shared library information.  */
-  PTR dynamic_info;
-
-  /* A mapping from local symbols to offsets into the global offset
-     table, used when linking on SunOS.  This is indexed by the symbol
-     index.  */
-  bfd_vma *local_got_offsets;
-};
-
-struct  aout_data_struct {
-    struct aoutdata a;
-    struct internal_exec e;
-};
-
-#define	adata(bfd)		((bfd)->tdata.aout_data->a)
-#define	exec_hdr(bfd)		(adata(bfd).hdr)
-#define	obj_aout_symbols(bfd)	(adata(bfd).symbols)
-#define	obj_textsec(bfd)	(adata(bfd).textsec)
-#define	obj_datasec(bfd)	(adata(bfd).datasec)
-#define	obj_bsssec(bfd)		(adata(bfd).bsssec)
-#define	obj_sym_filepos(bfd)	(adata(bfd).sym_filepos)
-#define	obj_str_filepos(bfd)	(adata(bfd).str_filepos)
-#define	obj_reloc_entry_size(bfd) (adata(bfd).reloc_entry_size)
-#define	obj_symbol_entry_size(bfd) (adata(bfd).symbol_entry_size)
-#define obj_aout_subformat(bfd)	(adata(bfd).subformat)
-#define obj_aout_external_syms(bfd) (adata(bfd).external_syms)
-#define obj_aout_external_sym_count(bfd) (adata(bfd).external_sym_count)
-#define obj_aout_sym_window(bfd) (adata(bfd).sym_window)
-#define obj_aout_external_strings(bfd) (adata(bfd).external_strings)
-#define obj_aout_external_string_size(bfd) (adata(bfd).external_string_size)
-#define obj_aout_string_window(bfd) (adata(bfd).string_window)
-#define obj_aout_sym_hashes(bfd) (adata(bfd).sym_hashes)
-#define obj_aout_dynamic_info(bfd) (adata(bfd).dynamic_info)
-
-/* We take the address of the first element of an asymbol to ensure that the
-   macro is only ever applied to an asymbol */
-#define aout_symbol(asymbol) ((aout_symbol_type *)(&(asymbol)->the_bfd))
-
-/* Information we keep for each a.out section.  This is currently only
-   used by the a.out backend linker.  */
-
-struct aout_section_data_struct
-{
-  /* The unswapped relocation entries for this section.  */
-  PTR relocs;
-};
-
-#define aout_section_data(s) \
-  ((struct aout_section_data_struct *) (s)->used_by_bfd)
-
-#define set_aout_section_data(s,v) \
-  ((s)->used_by_bfd = (PTR)&(v)->relocs)
-
-/* Prototype declarations for functions defined in aoutx.h  */
-
-boolean
-NAME(aout,squirt_out_relocs) PARAMS ((bfd *abfd, asection *section));
-
-boolean
-NAME(aout,make_sections) PARAMS ((bfd *));
-
-const bfd_target *
-NAME(aout,some_aout_object_p) PARAMS ((bfd *abfd,
-				       struct internal_exec *execp,
-				       const bfd_target *(*callback)(bfd *)));
-
-boolean
-NAME(aout,mkobject) PARAMS ((bfd *abfd));
-
-enum machine_type
-NAME(aout,machine_type) PARAMS ((enum bfd_architecture arch,
-				 unsigned long machine,
-				 boolean *unknown));
-
-boolean
-NAME(aout,set_arch_mach) PARAMS ((bfd *abfd, enum bfd_architecture arch,
-		 		  unsigned long machine));
-
-boolean
-NAME(aout,new_section_hook) PARAMS ((bfd *abfd, asection *newsect));
-
-boolean
-NAME(aout,set_section_contents) PARAMS ((bfd *abfd, sec_ptr section,
-			 PTR location, file_ptr offset, bfd_size_type count));
-
-asymbol *
-NAME(aout,make_empty_symbol) PARAMS ((bfd *abfd));
-
-boolean
-NAME(aout,translate_symbol_table) PARAMS ((bfd *, aout_symbol_type *,
-					   struct external_nlist *,
-					   bfd_size_type, char *,
-					   bfd_size_type,
-					   boolean dynamic));
-
-boolean
-NAME(aout,slurp_symbol_table) PARAMS ((bfd *abfd));
-
-boolean
-NAME(aout,write_syms) PARAMS ((bfd *abfd));
-
-void
-NAME(aout,reclaim_symbol_table) PARAMS ((bfd *abfd));
-
-long
-NAME(aout,get_symtab_upper_bound) PARAMS ((bfd *abfd));
-
-long
-NAME(aout,get_symtab) PARAMS ((bfd *abfd, asymbol **location));
-
-void
-NAME(aout,swap_ext_reloc_in) PARAMS ((bfd *, struct reloc_ext_external *,
-				      arelent *, asymbol **, bfd_size_type));
-void
-NAME(aout,swap_std_reloc_in) PARAMS ((bfd *, struct reloc_std_external *,
-				      arelent *, asymbol **, bfd_size_type));
-
-reloc_howto_type *
-NAME(aout,reloc_type_lookup) PARAMS ((bfd *abfd,
-				      bfd_reloc_code_real_type code));
-
-boolean
-NAME(aout,slurp_reloc_table) PARAMS ((bfd *abfd, sec_ptr asect,
-				      asymbol **symbols));
-
-long
-NAME(aout,canonicalize_reloc) PARAMS ((bfd *abfd, sec_ptr section,
-				       arelent **relptr, asymbol **symbols));
-
-long
-NAME(aout,get_reloc_upper_bound) PARAMS ((bfd *abfd, sec_ptr asect));
-
-void
-NAME(aout,reclaim_reloc) PARAMS ((bfd *ignore_abfd, sec_ptr ignore));
-
-alent *
-NAME(aout,get_lineno) PARAMS ((bfd *ignore_abfd, asymbol *ignore_symbol));
-
-void
-NAME(aout,print_symbol) PARAMS ((bfd *ignore_abfd, PTR file,
-			    asymbol *symbol, bfd_print_symbol_type how));
-
-void
-NAME(aout,get_symbol_info) PARAMS ((bfd *ignore_abfd,
-                           asymbol *symbol, symbol_info *ret));
-
-boolean
-NAME(aout,find_nearest_line) PARAMS ((bfd *abfd, asection *section,
-      asymbol **symbols, bfd_vma offset, CONST char **filename_ptr,
-      CONST char **functionname_ptr, unsigned int *line_ptr));
-
-long
-NAME(aout,read_minisymbols) PARAMS ((bfd *, boolean, PTR *, unsigned int *));
-
-asymbol *
-NAME(aout,minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR,
-					 asymbol *));
-
-int
-NAME(aout,sizeof_headers) PARAMS ((bfd *abfd, boolean exec));
-
-boolean
-NAME(aout,adjust_sizes_and_vmas) PARAMS ((bfd *abfd,
-       bfd_size_type *text_size, file_ptr *text_end));
-
-void
-NAME(aout,swap_exec_header_in) PARAMS ((bfd *abfd,
-       struct external_exec *raw_bytes, struct internal_exec *execp));
-
-void
-NAME(aout,swap_exec_header_out) PARAMS ((bfd *abfd,
-       struct internal_exec *execp, struct external_exec *raw_bytes));
-
-struct bfd_hash_entry *
-NAME(aout,link_hash_newfunc)
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-
-boolean
-NAME(aout,link_hash_table_init)
-     PARAMS ((struct aout_link_hash_table *, bfd *,
-	      struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-					  struct bfd_hash_table *,
-					  const char *)));
-
-struct bfd_link_hash_table *
-NAME(aout,link_hash_table_create) PARAMS ((bfd *));
-
-boolean
-NAME(aout,link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
-
-boolean
-NAME(aout,final_link) PARAMS ((bfd *, struct bfd_link_info *,
-			       void (*) (bfd *, file_ptr *, file_ptr *,
-					 file_ptr *)));
-
-boolean
-NAME(aout,bfd_free_cached_info) PARAMS ((bfd *));
-
-/* A.out uses the generic versions of these routines... */
-
-#define	aout_32_get_section_contents	_bfd_generic_get_section_contents
-
-#define	aout_64_get_section_contents	_bfd_generic_get_section_contents
-#ifndef NO_WRITE_HEADER_KLUDGE
-#define NO_WRITE_HEADER_KLUDGE 0
-#endif
-
-#ifndef aout_32_bfd_is_local_label_name
-#define aout_32_bfd_is_local_label_name bfd_generic_is_local_label_name
-#endif
-
-#ifndef WRITE_HEADERS
-#define WRITE_HEADERS(abfd, execp)					      \
-      {									      \
-	bfd_size_type text_size; /* dummy vars */			      \
-	file_ptr text_end;						      \
-	if (adata(abfd).magic == undecided_magic)			      \
-	  NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);     \
-    									      \
-	execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	      \
-	execp->a_entry = bfd_get_start_address (abfd);			      \
-    									      \
-	execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		      \
-			   obj_reloc_entry_size (abfd));		      \
-	execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		      \
-			   obj_reloc_entry_size (abfd));		      \
-	NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);	      \
-									      \
-	if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false;	      \
-	if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)	      \
-	    != EXEC_BYTES_SIZE)						      \
-	  return false;							      \
-	/* Now write out reloc info, followed by syms and strings */	      \
-  									      \
-	if (bfd_get_outsymbols (abfd) != (asymbol **) NULL		      \
-	    && bfd_get_symcount (abfd) != 0) 				      \
-	  {								      \
-	    if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET) != 0) \
-	      return false;						      \
-									      \
-	    if (! NAME(aout,write_syms)(abfd)) return false;		      \
-	  }								      \
-									      \
-	if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET) != 0)    \
-	  return false;						      	      \
-	if (!NAME(aout,squirt_out_relocs) (abfd, obj_textsec (abfd)))         \
-	  return false;						      	      \
-									      \
-	if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET) != 0)    \
-	  return false;						      	      \
-	if (!NAME(aout,squirt_out_relocs)(abfd, obj_datasec (abfd)))          \
-	  return false;						      	      \
-      }									      
-#endif
-
-#endif /* ! defined (LIBAOUT_H) */
diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h
deleted file mode 100644
index cb4a4df1ac2..00000000000
--- a/bfd/libbfd-in.h
+++ /dev/null
@@ -1,538 +0,0 @@
-/* libbfd.h -- Declarations used by bfd library *implementation*.
-   (This include file is not for users of the library.)
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-** NOTE: libbfd.h is a GENERATED file.  Don't change it; instead,
-** change libbfd-in.h or the other BFD source files processed to
-** generate this file.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Align an address upward to a boundary, expressed as a number of bytes.
-   E.g. align to an 8-byte boundary with argument of 8.  Take care never
-   to wrap around if the address is within boundary-1 of the end of the
-   address space.  */
-#define BFD_ALIGN(this, boundary)					\
-  ((((bfd_vma) (this) + (boundary) - 1) >= (bfd_vma) (this))		\
-   ? (((bfd_vma) (this) + ((boundary) - 1)) & (~((boundary)-1)))	\
-   : ~ (bfd_vma) 0)
-
-/* If you want to read and write large blocks, you might want to do it
-   in quanta of this amount */
-#define DEFAULT_BUFFERSIZE 8192
-
-/* Set a tdata field.  Can't use the other macros for this, since they
-   do casts, and casting to the left of assignment isn't portable.  */
-#define set_tdata(bfd, v) ((bfd)->tdata.any = (PTR) (v))
-
-/* If BFD_IN_MEMORY is set for a BFD, then the iostream fields points
-   to an instance of this structure.  */
-
-struct bfd_in_memory
-{
-  /* Size of buffer.  */
-  bfd_size_type size;
-  /* Buffer holding contents of BFD.  */
-  bfd_byte *buffer;
-};
-
-/* tdata for an archive.  For an input archive, cache
-   needs to be free()'d.  For an output archive, symdefs do.  */
-
-struct artdata {
-  file_ptr first_file_filepos;
-  /* Speed up searching the armap */
-  struct ar_cache *cache;
-  bfd *archive_head;            /* Only interesting in output routines */
-  carsym *symdefs;		/* the symdef entries */
-  symindex symdef_count;             /* how many there are */
-  char *extended_names;		/* clever intel extension */
-  /* when more compilers are standard C, this can be a time_t */
-  long  armap_timestamp;	/* Timestamp value written into armap.
-				   This is used for BSD archives to check
-				   that the timestamp is recent enough
-				   for the BSD linker to not complain,
-				   just before we finish writing an
-				   archive.  */
-  file_ptr armap_datepos;	/* Position within archive to seek to
-				   rewrite the date field.  */
-  PTR tdata;			/* Backend specific information.  */
-};
-
-#define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
-
-/* Goes in bfd's arelt_data slot */
-struct areltdata {
-  char * arch_header;			     /* it's actually a string */
-  unsigned int parsed_size;     /* octets of filesize not including ar_hdr */
-  char *filename;			     /* null-terminated */
-};
-
-#define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
-
-extern PTR bfd_malloc PARAMS ((size_t));
-extern PTR bfd_realloc PARAMS ((PTR, size_t));
-extern PTR bfd_zmalloc PARAMS ((size_t));
-
-extern bfd_error_handler_type _bfd_error_handler;
-
-/* These routines allocate and free things on the BFD's objalloc.  */
-
-extern PTR bfd_alloc PARAMS ((bfd *, size_t));
-extern PTR bfd_zalloc PARAMS ((bfd *, size_t));
-extern void bfd_release PARAMS ((bfd *, PTR));
-
-bfd *	_bfd_create_empty_archive_element_shell PARAMS ((bfd *obfd));
-bfd *	_bfd_look_for_bfd_in_cache PARAMS ((bfd *arch_bfd, file_ptr index));
-boolean _bfd_add_bfd_to_archive_cache PARAMS ((bfd *, file_ptr, bfd *));
-boolean	_bfd_generic_mkarchive PARAMS ((bfd *abfd));
-const bfd_target *bfd_generic_archive_p PARAMS ((bfd *abfd));
-boolean	bfd_slurp_armap PARAMS ((bfd *abfd));
-boolean bfd_slurp_bsd_armap_f2 PARAMS ((bfd *abfd));
-#define bfd_slurp_bsd_armap bfd_slurp_armap
-#define bfd_slurp_coff_armap bfd_slurp_armap
-boolean	_bfd_slurp_extended_name_table PARAMS ((bfd *abfd));
-extern boolean _bfd_construct_extended_name_table
-  PARAMS ((bfd *, boolean, char **, bfd_size_type *));
-boolean	_bfd_write_archive_contents PARAMS ((bfd *abfd));
-boolean _bfd_compute_and_write_armap PARAMS ((bfd *, unsigned int elength));
-bfd *_bfd_get_elt_at_filepos PARAMS ((bfd *archive, file_ptr filepos));
-extern bfd *_bfd_generic_get_elt_at_index PARAMS ((bfd *, symindex));
-bfd * _bfd_new_bfd PARAMS ((void));
-
-boolean	bfd_false PARAMS ((bfd *ignore));
-boolean	bfd_true PARAMS ((bfd *ignore));
-PTR	bfd_nullvoidptr PARAMS ((bfd *ignore));
-int	bfd_0 PARAMS ((bfd *ignore));
-unsigned int	bfd_0u PARAMS ((bfd *ignore));
-long	bfd_0l PARAMS ((bfd *ignore));
-long	_bfd_n1 PARAMS ((bfd *ignore));
-void	bfd_void PARAMS ((bfd *ignore));
-
-bfd *_bfd_new_bfd_contained_in PARAMS ((bfd *));
-const bfd_target *_bfd_dummy_target PARAMS ((bfd *abfd));
-
-void	bfd_dont_truncate_arname PARAMS ((bfd *abfd, CONST char *filename,
-					char *hdr));
-void	bfd_bsd_truncate_arname PARAMS ((bfd *abfd, CONST char *filename,
-					char *hdr));
-void	bfd_gnu_truncate_arname PARAMS ((bfd *abfd, CONST char *filename,
-					char *hdr));
-
-boolean	bsd_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				  struct orl *map, unsigned int orl_count, int stridx));
-
-boolean	coff_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				   struct orl *map, unsigned int orl_count, int stridx));
-
-extern PTR _bfd_generic_read_ar_hdr PARAMS ((bfd *));
-
-extern PTR _bfd_generic_read_ar_hdr_mag PARAMS ((bfd *, const char *));
-
-bfd *	bfd_generic_openr_next_archived_file PARAMS ((bfd *archive,
-						     bfd *last_file));
-
-int	bfd_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
-
-#define _bfd_read_ar_hdr(abfd) \
-  BFD_SEND (abfd, _bfd_read_ar_hdr_fn, (abfd))
-
-/* Generic routines to use for BFD_JUMP_TABLE_GENERIC.  Use
-   BFD_JUMP_TABLE_GENERIC (_bfd_generic).  */
-
-#define _bfd_generic_close_and_cleanup bfd_true
-#define _bfd_generic_bfd_free_cached_info bfd_true
-#define _bfd_generic_new_section_hook \
-  ((boolean (*) PARAMS ((bfd *, asection *))) bfd_true)
-extern boolean _bfd_generic_get_section_contents
-  PARAMS ((bfd *, asection *, PTR location, file_ptr offset,
-	   bfd_size_type count));
-extern boolean _bfd_generic_get_section_contents_in_window
-  PARAMS ((bfd *, asection *, bfd_window *, file_ptr, bfd_size_type));
-
-/* Generic routines to use for BFD_JUMP_TABLE_COPY.  Use
-   BFD_JUMP_TABLE_COPY (_bfd_generic).  */
-
-#define _bfd_generic_bfd_copy_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#define _bfd_generic_bfd_merge_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#define _bfd_generic_bfd_set_private_flags \
-  ((boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
-#define _bfd_generic_bfd_copy_private_section_data \
-  ((boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
-#define _bfd_generic_bfd_copy_private_symbol_data \
-  ((boolean (*) PARAMS ((bfd *, asymbol *, bfd *, asymbol *))) bfd_true)
-#define _bfd_generic_bfd_print_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, PTR))) bfd_true)
-
-/* Routines to use for BFD_JUMP_TABLE_CORE when there is no core file
-   support.  Use BFD_JUMP_TABLE_CORE (_bfd_nocore).  */
-
-extern char *_bfd_nocore_core_file_failing_command PARAMS ((bfd *));
-extern int _bfd_nocore_core_file_failing_signal PARAMS ((bfd *));
-extern boolean _bfd_nocore_core_file_matches_executable_p
-  PARAMS ((bfd *, bfd *));
-
-/* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive
-   file support.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive).  */
-
-#define _bfd_noarchive_slurp_armap bfd_false
-#define _bfd_noarchive_slurp_extended_name_table bfd_false
-#define _bfd_noarchive_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
-   bfd_false)
-#define _bfd_noarchive_truncate_arname \
-  ((void (*) PARAMS ((bfd *, const char *, char *))) bfd_void)
-#define _bfd_noarchive_write_armap \
-  ((boolean (*) \
-    PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
-   bfd_false)
-#define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr
-#define _bfd_noarchive_openr_next_archived_file \
-  ((bfd *(*) PARAMS ((bfd *, bfd *))) bfd_nullvoidptr)
-#define _bfd_noarchive_get_elt_at_index \
-  ((bfd *(*) PARAMS ((bfd *, symindex))) bfd_nullvoidptr)
-#define _bfd_noarchive_generic_stat_arch_elt bfd_generic_stat_arch_elt
-#define _bfd_noarchive_update_armap_timestamp bfd_false
-
-/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get BSD style
-   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd).  */
-
-#define _bfd_archive_bsd_slurp_armap bfd_slurp_bsd_armap
-#define _bfd_archive_bsd_slurp_extended_name_table \
-  _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_bsd_construct_extended_name_table
-  PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-#define _bfd_archive_bsd_truncate_arname bfd_bsd_truncate_arname
-#define _bfd_archive_bsd_write_armap bsd_write_armap
-#define _bfd_archive_bsd_read_ar_hdr _bfd_generic_read_ar_hdr
-#define _bfd_archive_bsd_openr_next_archived_file \
-  bfd_generic_openr_next_archived_file
-#define _bfd_archive_bsd_get_elt_at_index _bfd_generic_get_elt_at_index
-#define _bfd_archive_bsd_generic_stat_arch_elt \
-  bfd_generic_stat_arch_elt
-extern boolean _bfd_archive_bsd_update_armap_timestamp PARAMS ((bfd *));
-
-/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get COFF style
-   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff).  */
-
-#define _bfd_archive_coff_slurp_armap bfd_slurp_coff_armap
-#define _bfd_archive_coff_slurp_extended_name_table \
-  _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_coff_construct_extended_name_table
-  PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-#define _bfd_archive_coff_truncate_arname bfd_dont_truncate_arname
-#define _bfd_archive_coff_write_armap coff_write_armap
-#define _bfd_archive_coff_read_ar_hdr _bfd_generic_read_ar_hdr
-#define _bfd_archive_coff_openr_next_archived_file \
-  bfd_generic_openr_next_archived_file
-#define _bfd_archive_coff_get_elt_at_index _bfd_generic_get_elt_at_index
-#define _bfd_archive_coff_generic_stat_arch_elt \
-  bfd_generic_stat_arch_elt
-#define _bfd_archive_coff_update_armap_timestamp bfd_true
-
-/* Routines to use for BFD_JUMP_TABLE_SYMBOLS where there is no symbol
-   support.  Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols).  */
-
-#define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1
-#define _bfd_nosymbols_get_symtab \
-  ((long (*) PARAMS ((bfd *, asymbol **))) _bfd_n1)
-#define _bfd_nosymbols_make_empty_symbol \
-  ((asymbol *(*) PARAMS ((bfd *))) bfd_nullvoidptr)
-#define _bfd_nosymbols_print_symbol \
-  ((void (*) PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type))) bfd_void)
-#define _bfd_nosymbols_get_symbol_info \
-  ((void (*) PARAMS ((bfd *, asymbol *, symbol_info *))) bfd_void)
-#define _bfd_nosymbols_bfd_is_local_label_name \
-  ((boolean (*) PARAMS ((bfd *, const char *))) bfd_false)
-#define _bfd_nosymbols_get_lineno \
-  ((alent *(*) PARAMS ((bfd *, asymbol *))) bfd_nullvoidptr)
-#define _bfd_nosymbols_find_nearest_line \
-  ((boolean (*) \
-    PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **, \
-	     const char **, unsigned int *))) \
-   bfd_false)
-#define _bfd_nosymbols_bfd_make_debug_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, PTR, unsigned long))) bfd_nullvoidptr)
-#define _bfd_nosymbols_read_minisymbols \
-  ((long (*) PARAMS ((bfd *, boolean, PTR *, unsigned int *))) _bfd_n1)
-#define _bfd_nosymbols_minisymbol_to_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, boolean, const PTR, asymbol *))) \
-   bfd_nullvoidptr)
-
-/* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc
-   support.  Use BFD_JUMP_TABLE_RELOCS (_bfd_norelocs).  */
-
-#define _bfd_norelocs_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) _bfd_n1)
-#define _bfd_norelocs_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) _bfd_n1)
-#define _bfd_norelocs_bfd_reloc_type_lookup \
-  ((reloc_howto_type *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) \
-   bfd_nullvoidptr)
-
-/* Routines to use for BFD_JUMP_TABLE_WRITE for targets which may not
-   be written.  Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite).  */
-
-#define _bfd_nowrite_set_arch_mach \
-  ((boolean (*) PARAMS ((bfd *, enum bfd_architecture, unsigned long))) \
-   bfd_false)
-#define _bfd_nowrite_set_section_contents \
-  ((boolean (*) PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type))) \
-   bfd_false)
-
-/* Generic routines to use for BFD_JUMP_TABLE_WRITE.  Use
-   BFD_JUMP_TABLE_WRITE (_bfd_generic).  */
-
-#define _bfd_generic_set_arch_mach bfd_default_set_arch_mach
-extern boolean _bfd_generic_set_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-
-/* Routines to use for BFD_JUMP_TABLE_LINK for targets which do not
-   support linking.  Use BFD_JUMP_TABLE_LINK (_bfd_nolink).  */
-
-#define _bfd_nolink_sizeof_headers ((int (*) PARAMS ((bfd *, boolean))) bfd_0)
-#define _bfd_nolink_bfd_get_relocated_section_contents \
-  ((bfd_byte *(*) \
-    PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, \
-	     bfd_byte *, boolean, asymbol **))) \
-   bfd_nullvoidptr)
-#define _bfd_nolink_bfd_relax_section \
-  ((boolean (*) \
-    PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *))) \
-   bfd_false)
-#define _bfd_nolink_bfd_gc_sections \
-  ((boolean (*) \
-    PARAMS ((bfd *, struct bfd_link_info *))) \
-   bfd_false)
-#define _bfd_nolink_bfd_link_hash_table_create \
-  ((struct bfd_link_hash_table *(*) PARAMS ((bfd *))) bfd_nullvoidptr)
-#define _bfd_nolink_bfd_link_add_symbols \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
-#define _bfd_nolink_bfd_final_link \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
-#define _bfd_nolink_bfd_link_split_section \
-  ((boolean (*) PARAMS ((bfd *, struct sec *))) bfd_false)
-
-/* Routines to use for BFD_JUMP_TABLE_DYNAMIC for targets which do not
-   have dynamic symbols or relocs.  Use BFD_JUMP_TABLE_DYNAMIC
-   (_bfd_nodynamic).  */
-
-#define _bfd_nodynamic_get_dynamic_symtab_upper_bound _bfd_n1
-#define _bfd_nodynamic_canonicalize_dynamic_symtab \
-  ((long (*) PARAMS ((bfd *, asymbol **))) _bfd_n1)
-#define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1
-#define _bfd_nodynamic_canonicalize_dynamic_reloc \
-  ((long (*) PARAMS ((bfd *, arelent **, asymbol **))) _bfd_n1)
-
-/* Generic routine to determine of the given symbol is a local
-   label.  */
-extern boolean bfd_generic_is_local_label_name PARAMS ((bfd *, const char *));
-
-/* Generic minisymbol routines.  */
-extern long _bfd_generic_read_minisymbols
-  PARAMS ((bfd *, boolean, PTR *, unsigned int *));
-extern asymbol *_bfd_generic_minisymbol_to_symbol
-  PARAMS ((bfd *, boolean, const PTR, asymbol *));
-
-/* Find the nearest line using .stab/.stabstr sections.  */
-extern boolean _bfd_stab_section_find_nearest_line
-  PARAMS ((bfd *, asymbol **, asection *, bfd_vma, boolean *, const char **,
-	   const char **, unsigned int *, PTR *));
-
-/* Find the neaderst line using DWARF 1 debugging information.  */
-extern boolean _bfd_dwarf1_find_nearest_line
-  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
-	   const char **, unsigned int *));
-
-/* Find the nearest line using DWARF 2 debugging information.  */
-extern boolean _bfd_dwarf2_find_nearest_line
-  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
-	   const char **, unsigned int *));
-
-/* A routine to create entries for a bfd_link_hash_table.  */
-extern struct bfd_hash_entry *_bfd_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *entry,
-	   struct bfd_hash_table *table,
-	   const char *string));
-
-/* Initialize a bfd_link_hash_table.  */
-extern boolean _bfd_link_hash_table_init
-  PARAMS ((struct bfd_link_hash_table *, bfd *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-
-/* Generic link hash table creation routine.  */
-extern struct bfd_link_hash_table *_bfd_generic_link_hash_table_create
-  PARAMS ((bfd *));
-
-/* Generic add symbol routine.  */
-extern boolean _bfd_generic_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Generic add symbol routine.  This version is used by targets for
-   which the linker must collect constructors and destructors by name,
-   as the collect2 program does.  */
-extern boolean _bfd_generic_link_add_symbols_collect
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Generic archive add symbol routine.  */
-extern boolean _bfd_generic_link_add_archive_symbols
-  PARAMS ((bfd *, struct bfd_link_info *,
-	   boolean (*checkfn) (bfd *, struct bfd_link_info *, boolean *)));
-
-
-
-/* Forward declaration to avoid prototype errors.  */
-typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
-
-/* Generic routine to add a single symbol.  */
-extern boolean _bfd_generic_link_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *name, flagword,
-	   asection *, bfd_vma, const char *, boolean copy,
-	   boolean constructor, struct bfd_link_hash_entry **));
-
-/* Generic link routine.  */
-extern boolean _bfd_generic_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-extern boolean _bfd_generic_link_split_section
-  PARAMS ((bfd *, struct sec *));
-
-/* Generic reloc_link_order processing routine.  */
-extern boolean _bfd_generic_reloc_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-
-/* Default link order processing routine.  */
-extern boolean _bfd_default_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-
-/* Count the number of reloc entries in a link order list.  */
-extern unsigned int _bfd_count_link_order_relocs
-  PARAMS ((struct bfd_link_order *));
-
-/* Final link relocation routine.  */
-extern bfd_reloc_status_type _bfd_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
-	   bfd_vma address, bfd_vma value, bfd_vma addend));
-
-/* Relocate a particular location by a howto and a value.  */
-extern bfd_reloc_status_type _bfd_relocate_contents
-  PARAMS ((reloc_howto_type *, bfd *, bfd_vma, bfd_byte *));
-
-/* Link stabs in sections in the first pass.  */
-
-extern boolean _bfd_link_section_stabs
-  PARAMS ((bfd *, PTR *, asection *, asection *, PTR *));
-
-/* Write out the .stab section when linking stabs in sections.  */
-
-extern boolean _bfd_write_section_stabs
-  PARAMS ((bfd *, PTR *, asection *, PTR *, bfd_byte *));
-
-/* Write out the .stabstr string table when linking stabs in sections.  */
-
-extern boolean _bfd_write_stab_strings PARAMS ((bfd *, PTR *));
-
-/* Find an offset within a .stab section when linking stabs in
-   sections.  */
-
-extern bfd_vma _bfd_stab_section_offset
-  PARAMS ((bfd *, PTR *, asection *, PTR *, bfd_vma));
-
-/* Create a string table.  */
-extern struct bfd_strtab_hash *_bfd_stringtab_init PARAMS ((void));
-
-/* Create an XCOFF .debug section style string table.  */
-extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init PARAMS ((void));
-
-/* Free a string table.  */
-extern void _bfd_stringtab_free PARAMS ((struct bfd_strtab_hash *));
-
-/* Get the size of a string table.  */
-extern bfd_size_type _bfd_stringtab_size PARAMS ((struct bfd_strtab_hash *));
-
-/* Add a string to a string table.  */
-extern bfd_size_type _bfd_stringtab_add
-  PARAMS ((struct bfd_strtab_hash *, const char *, boolean hash,
-	   boolean copy));
-
-/* Write out a string table.  */
-extern boolean _bfd_stringtab_emit PARAMS ((bfd *, struct bfd_strtab_hash *));
-
-/* Macros to tell if bfds are read or write enabled.
-
-   Note that bfds open for read may be scribbled into if the fd passed
-   to bfd_fdopenr is actually open both for read and write
-   simultaneously.  However an output bfd will never be open for
-   read.  Therefore sometimes you want to check bfd_read_p or
-   !bfd_read_p, and only sometimes bfd_write_p.
-*/
-
-#define	bfd_read_p(abfd) ((abfd)->direction == read_direction || (abfd)->direction == both_direction)
-#define	bfd_write_p(abfd) ((abfd)->direction == write_direction || (abfd)->direction == both_direction)
-
-void	bfd_assert PARAMS ((const char*,int));
-
-#define BFD_ASSERT(x) \
-{ if (!(x)) bfd_assert(__FILE__,__LINE__); }
-
-#define BFD_FAIL() \
-{ bfd_assert(__FILE__,__LINE__); }
-
-FILE *	bfd_cache_lookup_worker PARAMS ((bfd *));
-
-extern bfd *bfd_last_cache;
-
-/* List of supported target vectors, and the default vector (if
-   bfd_default_vector[0] is NULL, there is no default).  */
-extern const bfd_target * const bfd_target_vector[];
-extern const bfd_target *bfd_default_vector[];
-
-/* Functions shared by the ECOFF and MIPS ELF backends, which have no
-   other common header files.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct ecoff_find_line;
-#endif
-
-extern boolean _bfd_ecoff_locate_line
-  PARAMS ((bfd *, asection *, bfd_vma, struct ecoff_debug_info * const,
-	   const struct ecoff_debug_swap * const, struct ecoff_find_line *,
-	   const char **, const char **, unsigned int *));
-extern boolean _bfd_ecoff_get_accumulated_pdr PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_sym PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_ss PARAMS ((PTR, bfd_byte *));
-
-extern bfd_vma _bfd_get_gp_value PARAMS ((bfd *));
-extern void _bfd_set_gp_value PARAMS ((bfd *, bfd_vma));
-
-/* Function shared by the COFF and ELF SH backends, which have no
-   other common header files.  */
-
-extern boolean _bfd_sh_align_load_span
-  PARAMS ((bfd *, asection *, bfd_byte *,
-	   boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
-	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, boolean *));
-
-/* And more follows */
-
diff --git a/bfd/libbfd.c b/bfd/libbfd.c
deleted file mode 100644
index 8abd1f58f1c..00000000000
--- a/bfd/libbfd.c
+++ /dev/null
@@ -1,1263 +0,0 @@
-/* Assorted BFD support routines, only used internally.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#ifndef HAVE_GETPAGESIZE
-#define getpagesize() 2048
-#endif
-
-static int real_read PARAMS ((PTR, size_t, size_t, FILE *));
-
-/*
-SECTION
-	Internal functions
-
-DESCRIPTION
-	These routines are used within BFD.
-	They are not intended for export, but are documented here for
-	completeness.
-*/
-
-/* A routine which is used in target vectors for unsupported
-   operations.  */
-
-/*ARGSUSED*/
-boolean
-bfd_false (ignore)
-     bfd *ignore;
-{
-  bfd_set_error (bfd_error_invalid_operation);
-  return false;
-}
-
-/* A routine which is used in target vectors for supported operations
-   which do not actually do anything.  */
-
-/*ARGSUSED*/
-boolean
-bfd_true (ignore)
-     bfd *ignore;
-{
-  return true;
-}
-
-/* A routine which is used in target vectors for unsupported
-   operations which return a pointer value.  */
-
-/*ARGSUSED*/
-PTR
-bfd_nullvoidptr (ignore)
-     bfd *ignore;
-{
-  bfd_set_error (bfd_error_invalid_operation);
-  return NULL;
-}
-
-/*ARGSUSED*/
-int 
-bfd_0 (ignore)
-     bfd *ignore;
-{
-  return 0;
-}
-
-/*ARGSUSED*/
-unsigned int 
-bfd_0u (ignore)
-     bfd *ignore;
-{
-   return 0;
-}
-
-/*ARGUSED*/
-long
-bfd_0l (ignore)
-     bfd *ignore;
-{
-  return 0;
-}
-
-/* A routine which is used in target vectors for unsupported
-   operations which return -1 on error.  */
-
-/*ARGSUSED*/
-long
-_bfd_n1 (ignore_abfd)
-     bfd *ignore_abfd;
-{
-  bfd_set_error (bfd_error_invalid_operation);
-  return -1;
-}
-
-/*ARGSUSED*/
-void 
-bfd_void (ignore)
-     bfd *ignore;
-{
-}
-
-/*ARGSUSED*/
-boolean
-_bfd_nocore_core_file_matches_executable_p (ignore_core_bfd, ignore_exec_bfd)
-     bfd *ignore_core_bfd;
-     bfd *ignore_exec_bfd;
-{
-  bfd_set_error (bfd_error_invalid_operation);
-  return false;
-}
-
-/* Routine to handle core_file_failing_command entry point for targets
-   without core file support.  */
-
-/*ARGSUSED*/
-char *
-_bfd_nocore_core_file_failing_command (ignore_abfd)
-     bfd *ignore_abfd;
-{
-  bfd_set_error (bfd_error_invalid_operation);
-  return (char *)NULL;
-}
-
-/* Routine to handle core_file_failing_signal entry point for targets
-   without core file support.  */
-
-/*ARGSUSED*/
-int
-_bfd_nocore_core_file_failing_signal (ignore_abfd)
-     bfd *ignore_abfd;
-{
-  bfd_set_error (bfd_error_invalid_operation);
-  return 0;
-}
-
-/*ARGSUSED*/
-const bfd_target *
-_bfd_dummy_target (ignore_abfd)
-     bfd *ignore_abfd;
-{
-  bfd_set_error (bfd_error_wrong_format);
-  return 0;
-}
-
-/* Allocate memory using malloc.  */
-
-PTR
-bfd_malloc (size)
-     size_t size;
-{
-  PTR ptr;
-
-  ptr = (PTR) malloc (size);
-  if (ptr == NULL && size != 0)
-    bfd_set_error (bfd_error_no_memory);
-  return ptr;
-}
-
-/* Reallocate memory using realloc.  */
-
-PTR
-bfd_realloc (ptr, size)
-     PTR ptr;
-     size_t size;
-{
-  PTR ret;
-
-  if (ptr == NULL)
-    ret = malloc (size);
-  else
-    ret = realloc (ptr, size);
-
-  if (ret == NULL)
-    bfd_set_error (bfd_error_no_memory);
-
-  return ret;
-}
-
-/* Allocate memory using malloc and clear it.  */
-
-PTR
-bfd_zmalloc (size)
-     size_t size;
-{
-  PTR ptr;
-
-  ptr = (PTR) malloc (size);
-
-  if (size != 0)
-    {
-      if (ptr == NULL)
-	bfd_set_error (bfd_error_no_memory);
-      else
-	memset (ptr, 0, size);
-    }
-
-  return ptr;
-}
-
-/* Some IO code */
-
-
-/* Note that archive entries don't have streams; they share their parent's.
-   This allows someone to play with the iostream behind BFD's back.
-
-   Also, note that the origin pointer points to the beginning of a file's
-   contents (0 for non-archive elements).  For archive entries this is the
-   first octet in the file, NOT the beginning of the archive header. */
-
-static int
-real_read (where, a,b, file)
-     PTR where;
-     size_t a;
-     size_t b;
-     FILE *file;
-{
-  /* FIXME - this looks like an optimization, but it's really to cover
-     up for a feature of some OSs (not solaris - sigh) that
-     ld/pe-dll.c takes advantage of (apparently) when it creates BFDs
-     internally and tries to link against them.  BFD seems to be smart
-     enough to realize there are no symbol records in the "file" that
-     doesn't exist but attempts to read them anyway.  On Solaris,
-     attempting to read zero bytes from a NULL file results in a core
-     dump, but on other platforms it just returns zero bytes read.
-     This makes it to something reasonable. - DJ */
-  if (a == 0 || b == 0)
-    return 0;
-
-#if defined (__VAX) && defined (VMS)
-  /* Apparently fread on Vax VMS does not keep the record length
-     information.  */
-  return read (fileno (file), where, a * b);
-#else
-  return fread (where, a, b, file);
-#endif
-}
-
-/* Return value is amount read (FIXME: how are errors and end of file dealt
-   with?  We never call bfd_set_error, which is probably a mistake).  */
-
-bfd_size_type
-bfd_read (ptr, size, nitems, abfd)
-     PTR ptr;
-     bfd_size_type size;
-     bfd_size_type nitems;
-     bfd *abfd;
-{
-  int nread;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      struct bfd_in_memory *bim;
-      bfd_size_type get;
-
-      bim = (struct bfd_in_memory *) abfd->iostream;
-      get = size * nitems;
-      if (abfd->where + get > bim->size)
-	{
-	  get = bim->size - abfd->where;
-	  bfd_set_error (bfd_error_file_truncated);
-	}
-      memcpy (ptr, bim->buffer + abfd->where, get);
-      abfd->where += get;
-      return get;
-    }
-
-  nread = real_read (ptr, 1, (size_t)(size*nitems), bfd_cache_lookup(abfd));
-  if (nread > 0)
-    abfd->where += nread;
-
-  /* Set bfd_error if we did not read as much data as we expected.
-
-     If the read failed due to an error set the bfd_error_system_call,
-     else set bfd_error_file_truncated.
-
-     A BFD backend may wish to override bfd_error_file_truncated to
-     provide something more useful (eg. no_symbols or wrong_format).  */
-  if (nread < (int)(size * nitems))
-    {
-      if (ferror (bfd_cache_lookup (abfd)))
-	bfd_set_error (bfd_error_system_call);
-      else
-	bfd_set_error (bfd_error_file_truncated);
-    }
-
-  return nread;
-}
-
-/* The window support stuff should probably be broken out into
-   another file....  */
-/* The idea behind the next and refcount fields is that one mapped
-   region can suffice for multiple read-only windows or multiple
-   non-overlapping read-write windows.  It's not implemented yet
-   though.  */
-struct _bfd_window_internal {
-  struct _bfd_window_internal *next;
-  PTR data;
-  bfd_size_type size;
-  int refcount : 31;		/* should be enough... */
-  unsigned mapped : 1;		/* 1 = mmap, 0 = malloc */
-};
-
-void
-bfd_init_window (windowp)
-     bfd_window *windowp;
-{
-  windowp->data = 0;
-  windowp->i = 0;
-  windowp->size = 0;
-}
-
-/* Currently, if USE_MMAP is undefined, none if the window stuff is
-   used.  Okay, so it's mis-named.  At least the command-line option
-   "--without-mmap" is more obvious than "--without-windows" or some
-   such.  */
-#ifdef USE_MMAP
-
-#undef HAVE_MPROTECT /* code's not tested yet */
-
-#if HAVE_MMAP || HAVE_MPROTECT || HAVE_MADVISE
-#include <sys/mman.h>
-#endif
-
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
-static int debug_windows;
-
-void
-bfd_free_window (windowp)
-     bfd_window *windowp;
-{
-  bfd_window_internal *i = windowp->i;
-  windowp->i = 0;
-  windowp->data = 0;
-  if (i == 0)
-    return;
-  i->refcount--;
-  if (debug_windows)
-    fprintf (stderr, "freeing window @%p<%p,%lx,%p>\n",
-	     windowp, windowp->data, windowp->size, windowp->i);
-  if (i->refcount != 0)
-    return;
-
-  if (i->mapped)
-    {
-#ifdef HAVE_MMAP
-      munmap (i->data, i->size);
-      goto no_free;
-#else
-      abort ();
-#endif
-    }
-#ifdef HAVE_MPROTECT
-  mprotect (i->data, i->size, PROT_READ | PROT_WRITE);
-#endif
-  free (i->data);
-#ifdef HAVE_MMAP
- no_free:
-#endif
-  i->data = 0;
-  /* There should be no more references to i at this point.  */
-  free (i);
-}
-
-static int ok_to_map = 1;
-
-boolean
-bfd_get_file_window (abfd, offset, size, windowp, writable)
-     bfd *abfd;
-     file_ptr offset;
-     bfd_size_type size;
-     bfd_window *windowp;
-     boolean writable;
-{
-  static size_t pagesize;
-  bfd_window_internal *i = windowp->i;
-  size_t size_to_alloc = size;
-
-  if (debug_windows)
-    fprintf (stderr, "bfd_get_file_window (%p, %6ld, %6ld, %p<%p,%lx,%p>, %d)",
-	     abfd, (long) offset, (long) size,
-	     windowp, windowp->data, (unsigned long) windowp->size,
-	     windowp->i, writable);
-
-  /* Make sure we know the page size, so we can be friendly to mmap.  */
-  if (pagesize == 0)
-    pagesize = getpagesize ();
-  if (pagesize == 0)
-    abort ();
-
-  if (i == 0)
-    {
-      windowp->i = i = (bfd_window_internal *) bfd_zmalloc (sizeof (bfd_window_internal));
-      if (i == 0)
-	return false;
-      i->data = 0;
-    }
-#ifdef HAVE_MMAP
-  if (ok_to_map
-      && (i->data == 0 || i->mapped == 1)
-      && (abfd->flags & BFD_IN_MEMORY) == 0)
-    {
-      file_ptr file_offset, offset2;
-      size_t real_size;
-      int fd;
-      FILE *f;
-
-      /* Find the real file and the real offset into it.  */
-      while (abfd->my_archive != NULL)
-	{
-	  offset += abfd->origin;
-	  abfd = abfd->my_archive;
-	}
-      f = bfd_cache_lookup (abfd);
-      fd = fileno (f);
-
-      /* Compute offsets and size for mmap and for the user's data.  */
-      offset2 = offset % pagesize;
-      if (offset2 < 0)
-	abort ();
-      file_offset = offset - offset2;
-      real_size = offset + size - file_offset;
-      real_size = real_size + pagesize - 1;
-      real_size -= real_size % pagesize;
-
-      /* If we're re-using a memory region, make sure it's big enough.  */
-      if (i->data && i->size < size)
-	{
-	  munmap (i->data, i->size);
-	  i->data = 0;
-	}
-      i->data = mmap (i->data, real_size,
-		      writable ? PROT_WRITE | PROT_READ : PROT_READ,
-		      (writable
-		       ? MAP_FILE | MAP_PRIVATE
-		       : MAP_FILE | MAP_SHARED),
-		      fd, file_offset);
-      if (i->data == (PTR) -1)
-	{
-	  /* An error happened.  Report it, or try using malloc, or
-	     something.  */
-	  bfd_set_error (bfd_error_system_call);
-	  i->data = 0;
-	  windowp->data = 0;
-	  if (debug_windows)
-	    fprintf (stderr, "\t\tmmap failed!\n");
-	  return false;
-	}
-      if (debug_windows)
-	fprintf (stderr, "\n\tmapped %ld at %p, offset is %ld\n",
-		 (long) real_size, i->data, (long) offset2);
-      i->size = real_size;
-      windowp->data = (PTR) ((bfd_byte *) i->data + offset2);
-      windowp->size = size;
-      i->mapped = 1;
-      return true;
-    }
-  else if (debug_windows)
-    {
-      if (ok_to_map)
-	fprintf (stderr, _("not mapping: data=%lx mapped=%d\n"),
-		 (unsigned long) i->data, (int) i->mapped);
-      else
-	fprintf (stderr, _("not mapping: env var not set\n"));
-    }
-#else
-  ok_to_map = 0;
-#endif
-
-#ifdef HAVE_MPROTECT
-  if (!writable)
-    {
-      size_to_alloc += pagesize - 1;
-      size_to_alloc -= size_to_alloc % pagesize;
-    }
-#endif
-  if (debug_windows)
-    fprintf (stderr, "\n\t%s(%6ld)",
-	     i->data ? "realloc" : " malloc", (long) size_to_alloc);
-  i->data = (PTR) bfd_realloc (i->data, size_to_alloc);
-  if (debug_windows)
-    fprintf (stderr, "\t-> %p\n", i->data);
-  i->refcount = 1;
-  if (i->data == NULL)
-    {
-      if (size_to_alloc == 0)
-	return true;
-      bfd_set_error (bfd_error_no_memory);
-      return false;
-    }
-  if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-    return false;
-  i->size = bfd_read (i->data, size, 1, abfd);
-  if (i->size != size)
-    return false;
-  i->mapped = 0;
-#ifdef HAVE_MPROTECT
-  if (!writable)
-    {
-      if (debug_windows)
-	fprintf (stderr, "\tmprotect (%p, %ld, PROT_READ)\n", i->data,
-		 (long) i->size);
-      mprotect (i->data, i->size, PROT_READ);
-    }
-#endif
-  windowp->data = i->data;
-  windowp->size = i->size;
-  return true;
-}
-
-#endif /* USE_MMAP */
-
-bfd_size_type
-bfd_write (ptr, size, nitems, abfd)
-     CONST PTR ptr;
-     bfd_size_type size;
-     bfd_size_type nitems;
-     bfd *abfd;
-{
-  long nwrote;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      struct bfd_in_memory *bim = (struct bfd_in_memory *) (abfd->iostream);
-      size *= nitems;
-      if (abfd->where + size > bim->size)
-	{
-	  long newsize, oldsize = (bim->size + 127) & ~127;
-	  bim->size = abfd->where + size;
-	  /* Round up to cut down on memory fragmentation */
-	  newsize = (bim->size + 127) & ~127;
-	  if (newsize > oldsize)
-	    {
-	      bim->buffer = bfd_realloc (bim->buffer, newsize);
-	      if (bim->buffer == 0)
-		{
-		  bim->size = 0;
-		  return 0;
-		}
-	    }
-	}
-      memcpy (bim->buffer + abfd->where, ptr, size);
-      abfd->where += size;
-      return size;
-    }
-
-  nwrote = fwrite (ptr, 1, (size_t) (size * nitems),
-		   bfd_cache_lookup (abfd));
-  if (nwrote > 0)
-    abfd->where += nwrote;
-  if ((bfd_size_type) nwrote != size * nitems)
-    {
-#ifdef ENOSPC
-      if (nwrote >= 0)
-	errno = ENOSPC;
-#endif
-      bfd_set_error (bfd_error_system_call);
-    }
-  return nwrote;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_write_bigendian_4byte_int
-
-SYNOPSIS
-	void bfd_write_bigendian_4byte_int(bfd *abfd,  int i);
-
-DESCRIPTION
-	Write a 4 byte integer @var{i} to the output BFD @var{abfd}, in big
-	endian order regardless of what else is going on.  This is useful in
-	archives.
-
-*/
-void
-bfd_write_bigendian_4byte_int (abfd, i)
-     bfd *abfd;
-     int i;
-{
-  bfd_byte buffer[4];
-  bfd_putb32(i, buffer);
-  if (bfd_write((PTR)buffer, 4, 1, abfd) != 4)
-    abort ();
-}
-
-long
-bfd_tell (abfd)
-     bfd *abfd;
-{
-  file_ptr ptr;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    return abfd->where;
-
-  ptr = ftell (bfd_cache_lookup(abfd));
-
-  if (abfd->my_archive)
-    ptr -= abfd->origin;
-  abfd->where = ptr;
-  return ptr;
-}
-
-int
-bfd_flush (abfd)
-     bfd *abfd;
-{
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    return 0;
-  return fflush (bfd_cache_lookup(abfd));
-}
-
-/* Returns 0 for success, negative value for failure (in which case
-   bfd_get_error can retrieve the error code).  */
-int
-bfd_stat (abfd, statbuf)
-     bfd *abfd;
-     struct stat *statbuf;
-{
-  FILE *f;
-  int result;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    abort ();
-
-  f = bfd_cache_lookup (abfd);
-  if (f == NULL)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return -1;
-    }
-  result = fstat (fileno (f), statbuf);
-  if (result < 0)
-    bfd_set_error (bfd_error_system_call);
-  return result;
-}
-
-/* Returns 0 for success, nonzero for failure (in which case bfd_get_error
-   can retrieve the error code).  */
-
-int
-bfd_seek (abfd, position, direction)
-     bfd *abfd;
-     file_ptr position;
-     int direction;
-{
-  int result;
-  FILE *f;
-  file_ptr file_position;
-  /* For the time being, a BFD may not seek to it's end.  The problem
-     is that we don't easily have a way to recognize the end of an
-     element in an archive. */
-
-  BFD_ASSERT (direction == SEEK_SET || direction == SEEK_CUR);
-
-  if (direction == SEEK_CUR && position == 0)
-    return 0;
-
-  if ((abfd->flags & BFD_IN_MEMORY) != 0)
-    {
-      if (direction == SEEK_SET)
-	abfd->where = position;
-      else
-	abfd->where += position;
-      return 0;
-    }
-
-  if (abfd->format != bfd_archive && abfd->my_archive == 0)
-    {
-#if 0
-      /* Explanation for this code: I'm only about 95+% sure that the above
-	 conditions are sufficient and that all i/o calls are properly
-	 adjusting the `where' field.  So this is sort of an `assert'
-	 that the `where' field is correct.  If we can go a while without
-	 tripping the abort, we can probably safely disable this code,
-	 so that the real optimizations happen.  */
-      file_ptr where_am_i_now;
-      where_am_i_now = ftell (bfd_cache_lookup (abfd));
-      if (abfd->my_archive)
-	where_am_i_now -= abfd->origin;
-      if (where_am_i_now != abfd->where)
-	abort ();
-#endif
-      if (direction == SEEK_SET && position == abfd->where)
-	return 0;
-    }
-  else
-    {
-      /* We need something smarter to optimize access to archives.
-	 Currently, anything inside an archive is read via the file
-	 handle for the archive.  Which means that a bfd_seek on one
-	 component affects the `current position' in the archive, as
-	 well as in any other component.
-
-	 It might be sufficient to put a spike through the cache
-	 abstraction, and look to the archive for the file position,
-	 but I think we should try for something cleaner.
-
-	 In the meantime, no optimization for archives.  */
-    }
-
-  f = bfd_cache_lookup (abfd);
-  file_position = position;
-  if (direction == SEEK_SET && abfd->my_archive != NULL)
-    file_position += abfd->origin;
-
-  result = fseek (f, file_position, direction);
-
-  if (result != 0)
-    {
-      int hold_errno = errno;
-
-      /* Force redetermination of `where' field.  */
-      bfd_tell (abfd);
-
-      /* An EINVAL error probably means that the file offset was
-         absurd.  */
-      if (hold_errno == EINVAL)
-	bfd_set_error (bfd_error_file_truncated);
-      else
-	{
-	  bfd_set_error (bfd_error_system_call);
-	  errno = hold_errno;
-	}
-    }
-  else
-    {
-      /* Adjust `where' field.  */
-      if (direction == SEEK_SET)
-	abfd->where = position;
-      else
-	abfd->where += position;
-    }
-  return result;
-}
-
-/** The do-it-yourself (byte) sex-change kit */
-
-/* The middle letter e.g. get<b>short indicates Big or Little endian
-   target machine.  It doesn't matter what the byte order of the host
-   machine is; these routines work for either.  */
-
-/* FIXME: Should these take a count argument?
-   Answer (gnu@cygnus.com):  No, but perhaps they should be inline
-                             functions in swap.h #ifdef __GNUC__. 
-                             Gprof them later and find out.  */
-
-/*
-FUNCTION
-	bfd_put_size
-FUNCTION
-	bfd_get_size
-
-DESCRIPTION
-	These macros as used for reading and writing raw data in
-	sections; each access (except for bytes) is vectored through
-	the target format of the BFD and mangled accordingly. The
-	mangling performs any necessary endian translations and
-	removes alignment restrictions.  Note that types accepted and
-	returned by these macros are identical so they can be swapped
-	around in macros---for example, @file{libaout.h} defines <<GET_WORD>>
-	to either <<bfd_get_32>> or <<bfd_get_64>>.
-
-	In the put routines, @var{val} must be a <<bfd_vma>>.  If we are on a
-	system without prototypes, the caller is responsible for making
-	sure that is true, with a cast if necessary.  We don't cast
-	them in the macro definitions because that would prevent <<lint>>
-	or <<gcc -Wall>> from detecting sins such as passing a pointer.
-	To detect calling these with less than a <<bfd_vma>>, use
-	<<gcc -Wconversion>> on a host with 64 bit <<bfd_vma>>'s.
-
-.
-.{* Byte swapping macros for user section data.  *}
-.
-.#define bfd_put_8(abfd, val, ptr) \
-.                (*((unsigned char *)(ptr)) = (unsigned char)(val))
-.#define bfd_put_signed_8 \
-.		bfd_put_8
-.#define bfd_get_8(abfd, ptr) \
-.                (*(unsigned char *)(ptr))
-.#define bfd_get_signed_8(abfd, ptr) \
-.		((*(unsigned char *)(ptr) ^ 0x80) - 0x80)
-.
-.#define bfd_put_16(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_putx16, ((val),(ptr)))
-.#define bfd_put_signed_16 \
-.		 bfd_put_16
-.#define bfd_get_16(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_getx16, (ptr))
-.#define bfd_get_signed_16(abfd, ptr) \
-.         	 BFD_SEND (abfd, bfd_getx_signed_16, (ptr))
-.
-.#define bfd_put_32(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_putx32, ((val),(ptr)))
-.#define bfd_put_signed_32 \
-.		 bfd_put_32
-.#define bfd_get_32(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_getx32, (ptr))
-.#define bfd_get_signed_32(abfd, ptr) \
-.		 BFD_SEND(abfd, bfd_getx_signed_32, (ptr))
-.
-.#define bfd_put_64(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_putx64, ((val), (ptr)))
-.#define bfd_put_signed_64 \
-.		 bfd_put_64
-.#define bfd_get_64(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_getx64, (ptr))
-.#define bfd_get_signed_64(abfd, ptr) \
-.		 BFD_SEND(abfd, bfd_getx_signed_64, (ptr))
-.
-*/ 
-
-/*
-FUNCTION
-	bfd_h_put_size
-	bfd_h_get_size
-
-DESCRIPTION
-	These macros have the same function as their <<bfd_get_x>>
-	bretheren, except that they are used for removing information
-	for the header records of object files. Believe it or not,
-	some object files keep their header records in big endian
-	order and their data in little endian order.
-.
-.{* Byte swapping macros for file header data.  *}
-.
-.#define bfd_h_put_8(abfd, val, ptr) \
-.		bfd_put_8 (abfd, val, ptr)
-.#define bfd_h_put_signed_8(abfd, val, ptr) \
-.		bfd_put_8 (abfd, val, ptr)
-.#define bfd_h_get_8(abfd, ptr) \
-.		bfd_get_8 (abfd, ptr)
-.#define bfd_h_get_signed_8(abfd, ptr) \
-.		bfd_get_signed_8 (abfd, ptr)
-.
-.#define bfd_h_put_16(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_h_putx16,(val,ptr))
-.#define bfd_h_put_signed_16 \
-.		 bfd_h_put_16
-.#define bfd_h_get_16(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_h_getx16,(ptr))
-.#define bfd_h_get_signed_16(abfd, ptr) \
-.		 BFD_SEND(abfd, bfd_h_getx_signed_16, (ptr))
-.
-.#define bfd_h_put_32(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_h_putx32,(val,ptr))
-.#define bfd_h_put_signed_32 \
-.		 bfd_h_put_32
-.#define bfd_h_get_32(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_h_getx32,(ptr))
-.#define bfd_h_get_signed_32(abfd, ptr) \
-.		 BFD_SEND(abfd, bfd_h_getx_signed_32, (ptr))
-.
-.#define bfd_h_put_64(abfd, val, ptr) \
-.                BFD_SEND(abfd, bfd_h_putx64,(val, ptr))
-.#define bfd_h_put_signed_64 \
-.		 bfd_h_put_64
-.#define bfd_h_get_64(abfd, ptr) \
-.                BFD_SEND(abfd, bfd_h_getx64,(ptr))
-.#define bfd_h_get_signed_64(abfd, ptr) \
-.		 BFD_SEND(abfd, bfd_h_getx_signed_64, (ptr))
-.
-*/ 
-
-/* Sign extension to bfd_signed_vma.  */
-#define COERCE16(x) (((bfd_signed_vma) (x) ^ 0x8000) - 0x8000)
-#define COERCE32(x) \
-  ((bfd_signed_vma) (long) (((unsigned long) (x) ^ 0x80000000) - 0x80000000))
-#define EIGHT_GAZILLION (((BFD_HOST_64_BIT)0x80000000) << 32)
-#define COERCE64(x) \
-  (((bfd_signed_vma) (x) ^ EIGHT_GAZILLION) - EIGHT_GAZILLION)
-
-bfd_vma
-bfd_getb16 (addr)
-     register const bfd_byte *addr;
-{
-  return (addr[0] << 8) | addr[1];
-}
-
-bfd_vma
-bfd_getl16 (addr)
-     register const bfd_byte *addr;
-{
-  return (addr[1] << 8) | addr[0];
-}
-
-bfd_signed_vma
-bfd_getb_signed_16 (addr)
-     register const bfd_byte *addr;
-{
-  return COERCE16((addr[0] << 8) | addr[1]);
-}
-
-bfd_signed_vma
-bfd_getl_signed_16 (addr)
-     register const bfd_byte *addr;
-{
-  return COERCE16((addr[1] << 8) | addr[0]);
-}
-
-void
-bfd_putb16 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
-{
-  addr[0] = (bfd_byte)(data >> 8);
-  addr[1] = (bfd_byte )data;
-}
-
-void
-bfd_putl16 (data, addr)
-     bfd_vma data;             
-     register bfd_byte *addr;
-{
-  addr[0] = (bfd_byte )data;
-  addr[1] = (bfd_byte)(data >> 8);
-}
-
-bfd_vma
-bfd_getb32 (addr)
-     register const bfd_byte *addr;
-{
-  unsigned long v;
-
-  v = (unsigned long) addr[0] << 24;
-  v |= (unsigned long) addr[1] << 16;
-  v |= (unsigned long) addr[2] << 8;
-  v |= (unsigned long) addr[3];
-  return (bfd_vma) v;
-}
-
-bfd_vma
-bfd_getl32 (addr)
-     register const bfd_byte *addr;
-{
-  unsigned long v;
-
-  v = (unsigned long) addr[0];
-  v |= (unsigned long) addr[1] << 8;
-  v |= (unsigned long) addr[2] << 16;
-  v |= (unsigned long) addr[3] << 24;
-  return (bfd_vma) v;
-}
-
-bfd_signed_vma
-bfd_getb_signed_32 (addr)
-     register const bfd_byte *addr;
-{
-  unsigned long v;
-
-  v = (unsigned long) addr[0] << 24;
-  v |= (unsigned long) addr[1] << 16;
-  v |= (unsigned long) addr[2] << 8;
-  v |= (unsigned long) addr[3];
-  return COERCE32 (v);
-}
-
-bfd_signed_vma
-bfd_getl_signed_32 (addr)
-     register const bfd_byte *addr;
-{
-  unsigned long v;
-
-  v = (unsigned long) addr[0];
-  v |= (unsigned long) addr[1] << 8;
-  v |= (unsigned long) addr[2] << 16;
-  v |= (unsigned long) addr[3] << 24;
-  return COERCE32 (v);
-}
-
-bfd_vma
-bfd_getb64 (addr)
-     register const bfd_byte *addr;
-{
-#ifdef BFD64
-  bfd_vma low, high;
-
-  high= ((((((((addr[0]) << 8) |
-              addr[1]) << 8) |
-            addr[2]) << 8) |
-          addr[3]) );
-
-  low = (((((((((bfd_vma)addr[4]) << 8) |
-              addr[5]) << 8) |
-            addr[6]) << 8) |
-          addr[7]));
-
-  return high << 32 | low;
-#else
-  BFD_FAIL();
-  return 0;
-#endif
-}
-
-bfd_vma
-bfd_getl64 (addr)
-     register const bfd_byte *addr;
-{
-#ifdef BFD64
-  bfd_vma low, high;
-  high= (((((((addr[7] << 8) |
-              addr[6]) << 8) |
-            addr[5]) << 8) |
-          addr[4]));
-
-  low = ((((((((bfd_vma)addr[3] << 8) |
-              addr[2]) << 8) |
-            addr[1]) << 8) |
-          addr[0]) );
-
-  return high << 32 | low;
-#else
-  BFD_FAIL();
-  return 0;
-#endif
-
-}
-
-bfd_signed_vma
-bfd_getb_signed_64 (addr)
-     register const bfd_byte *addr;
-{
-#ifdef BFD64
-  bfd_vma low, high;
-
-  high= ((((((((addr[0]) << 8) |
-              addr[1]) << 8) |
-            addr[2]) << 8) |
-          addr[3]) );
-
-  low = (((((((((bfd_vma)addr[4]) << 8) |
-              addr[5]) << 8) |
-            addr[6]) << 8) |
-          addr[7]));
-
-  return COERCE64(high << 32 | low);
-#else
-  BFD_FAIL();
-  return 0;
-#endif
-}
-
-bfd_signed_vma
-bfd_getl_signed_64 (addr)
-     register const bfd_byte *addr;
-{
-#ifdef BFD64
-  bfd_vma low, high;
-  high= (((((((addr[7] << 8) |
-              addr[6]) << 8) |
-            addr[5]) << 8) |
-          addr[4]));
-
-  low = ((((((((bfd_vma)addr[3] << 8) |
-              addr[2]) << 8) |
-            addr[1]) << 8) |
-          addr[0]) );
-
-  return COERCE64(high << 32 | low);
-#else
-  BFD_FAIL();
-  return 0;
-#endif
-}
-
-void
-bfd_putb32 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
-{
-        addr[0] = (bfd_byte)(data >> 24);
-        addr[1] = (bfd_byte)(data >> 16);
-        addr[2] = (bfd_byte)(data >>  8);
-        addr[3] = (bfd_byte)data;
-}
-
-void
-bfd_putl32 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
-{
-        addr[0] = (bfd_byte)data;
-        addr[1] = (bfd_byte)(data >>  8);
-        addr[2] = (bfd_byte)(data >> 16);
-        addr[3] = (bfd_byte)(data >> 24);
-}
-
-void
-bfd_putb64 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
-{
-#ifdef BFD64
-  addr[0] = (bfd_byte)(data >> (7*8));
-  addr[1] = (bfd_byte)(data >> (6*8));
-  addr[2] = (bfd_byte)(data >> (5*8));
-  addr[3] = (bfd_byte)(data >> (4*8));
-  addr[4] = (bfd_byte)(data >> (3*8));
-  addr[5] = (bfd_byte)(data >> (2*8));
-  addr[6] = (bfd_byte)(data >> (1*8));
-  addr[7] = (bfd_byte)(data >> (0*8));
-#else
-  BFD_FAIL();
-#endif
-}
-
-void
-bfd_putl64 (data, addr)
-     bfd_vma data;
-     register bfd_byte *addr;
-{
-#ifdef BFD64
-  addr[7] = (bfd_byte)(data >> (7*8));
-  addr[6] = (bfd_byte)(data >> (6*8));
-  addr[5] = (bfd_byte)(data >> (5*8));
-  addr[4] = (bfd_byte)(data >> (4*8));
-  addr[3] = (bfd_byte)(data >> (3*8));
-  addr[2] = (bfd_byte)(data >> (2*8));
-  addr[1] = (bfd_byte)(data >> (1*8));
-  addr[0] = (bfd_byte)(data >> (0*8));
-#else
-  BFD_FAIL();
-#endif
-}
-
-/* Default implementation */
-
-boolean
-_bfd_generic_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-    if (count == 0)
-        return true;
-    if ((bfd_size_type)(offset+count) > section->_raw_size
-        || bfd_seek(abfd, (file_ptr)(section->filepos + offset), SEEK_SET) == -1
-        || bfd_read(location, (bfd_size_type)1, count, abfd) != count)
-        return (false); /* on error */
-    return (true);
-}
-
-boolean
-_bfd_generic_get_section_contents_in_window (abfd, section, w, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     bfd_window *w;
-     file_ptr offset;
-     bfd_size_type count;
-{
-#ifdef USE_MMAP
-  if (count == 0)
-    return true;
-  if (abfd->xvec->_bfd_get_section_contents != _bfd_generic_get_section_contents)
-    {
-      /* We don't know what changes the bfd's get_section_contents
-	 method may have to make.  So punt trying to map the file
-	 window, and let get_section_contents do its thing.  */
-      /* @@ FIXME : If the internal window has a refcount of 1 and was
-	 allocated with malloc instead of mmap, just reuse it.  */
-      bfd_free_window (w);
-      w->i = (bfd_window_internal *) bfd_zmalloc (sizeof (bfd_window_internal));
-      if (w->i == NULL)
-	return false;
-      w->i->data = (PTR) bfd_malloc ((size_t) count);
-      if (w->i->data == NULL)
-	{
-	  free (w->i);
-	  w->i = NULL;
-	  return false;
-	}
-      w->i->mapped = 0;
-      w->i->refcount = 1;
-      w->size = w->i->size = count;
-      w->data = w->i->data;
-      return bfd_get_section_contents (abfd, section, w->data, offset, count);
-    }
-  if ((bfd_size_type) (offset+count) > section->_raw_size
-      || (bfd_get_file_window (abfd, section->filepos + offset, count, w, true)
-	  == false))
-    return false;
-  return true;
-#else
-  abort ();
-#endif
-}
-
-/* This generic function can only be used in implementations where creating
-   NEW sections is disallowed.  It is useful in patching existing sections
-   in read-write files, though.  See other set_section_contents functions
-   to see why it doesn't work for new sections.  */
-boolean
-_bfd_generic_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (count == 0)
-    return true;
-
-  if (bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) == -1
-      || bfd_write (location, (bfd_size_type) 1, count, abfd) != count)
-    return false;
-
-  return true;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_log2
-
-SYNOPSIS
-	unsigned int bfd_log2(bfd_vma x);
-
-DESCRIPTION
-	Return the log base 2 of the value supplied, rounded up.  E.g., an
-	@var{x} of 1025 returns 11.
-*/
-
-unsigned int
-bfd_log2 (x)
-     bfd_vma x;
-{
-  unsigned int result = 0;
-
-  while ((((bfd_vma) 1) << result) < x)
-    ++result;
-  return result;
-}
-
-boolean
-bfd_generic_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  char locals_prefix = (bfd_get_symbol_leading_char (abfd) == '_') ? 'L' : '.';
-
-  return (name[0] == locals_prefix);
-}
-
diff --git a/bfd/libbfd.h b/bfd/libbfd.h
deleted file mode 100644
index f804bde593c..00000000000
--- a/bfd/libbfd.h
+++ /dev/null
@@ -1,885 +0,0 @@
-/* libbfd.h -- Declarations used by bfd library *implementation*.
-   (This include file is not for users of the library.)
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-** NOTE: libbfd.h is a GENERATED file.  Don't change it; instead,
-** change libbfd-in.h or the other BFD source files processed to
-** generate this file.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Align an address upward to a boundary, expressed as a number of bytes.
-   E.g. align to an 8-byte boundary with argument of 8.  Take care never
-   to wrap around if the address is within boundary-1 of the end of the
-   address space.  */
-#define BFD_ALIGN(this, boundary)					\
-  ((((bfd_vma) (this) + (boundary) - 1) >= (bfd_vma) (this))		\
-   ? (((bfd_vma) (this) + ((boundary) - 1)) & (~((boundary)-1)))	\
-   : ~ (bfd_vma) 0)
-
-/* If you want to read and write large blocks, you might want to do it
-   in quanta of this amount */
-#define DEFAULT_BUFFERSIZE 8192
-
-/* Set a tdata field.  Can't use the other macros for this, since they
-   do casts, and casting to the left of assignment isn't portable.  */
-#define set_tdata(bfd, v) ((bfd)->tdata.any = (PTR) (v))
-
-/* If BFD_IN_MEMORY is set for a BFD, then the iostream fields points
-   to an instance of this structure.  */
-
-struct bfd_in_memory
-{
-  /* Size of buffer.  */
-  bfd_size_type size;
-  /* Buffer holding contents of BFD.  */
-  bfd_byte *buffer;
-};
-
-/* tdata for an archive.  For an input archive, cache
-   needs to be free()'d.  For an output archive, symdefs do.  */
-
-struct artdata {
-  file_ptr first_file_filepos;
-  /* Speed up searching the armap */
-  struct ar_cache *cache;
-  bfd *archive_head;            /* Only interesting in output routines */
-  carsym *symdefs;		/* the symdef entries */
-  symindex symdef_count;             /* how many there are */
-  char *extended_names;		/* clever intel extension */
-  /* when more compilers are standard C, this can be a time_t */
-  long  armap_timestamp;	/* Timestamp value written into armap.
-				   This is used for BSD archives to check
-				   that the timestamp is recent enough
-				   for the BSD linker to not complain,
-				   just before we finish writing an
-				   archive.  */
-  file_ptr armap_datepos;	/* Position within archive to seek to
-				   rewrite the date field.  */
-  PTR tdata;			/* Backend specific information.  */
-};
-
-#define bfd_ardata(bfd) ((bfd)->tdata.aout_ar_data)
-
-/* Goes in bfd's arelt_data slot */
-struct areltdata {
-  char * arch_header;			     /* it's actually a string */
-  unsigned int parsed_size;     /* octets of filesize not including ar_hdr */
-  char *filename;			     /* null-terminated */
-};
-
-#define arelt_size(bfd) (((struct areltdata *)((bfd)->arelt_data))->parsed_size)
-
-extern PTR bfd_malloc PARAMS ((size_t));
-extern PTR bfd_realloc PARAMS ((PTR, size_t));
-extern PTR bfd_zmalloc PARAMS ((size_t));
-
-extern bfd_error_handler_type _bfd_error_handler;
-
-/* These routines allocate and free things on the BFD's objalloc.  */
-
-extern PTR bfd_alloc PARAMS ((bfd *, size_t));
-extern PTR bfd_zalloc PARAMS ((bfd *, size_t));
-extern void bfd_release PARAMS ((bfd *, PTR));
-
-bfd *	_bfd_create_empty_archive_element_shell PARAMS ((bfd *obfd));
-bfd *	_bfd_look_for_bfd_in_cache PARAMS ((bfd *arch_bfd, file_ptr index));
-boolean _bfd_add_bfd_to_archive_cache PARAMS ((bfd *, file_ptr, bfd *));
-boolean	_bfd_generic_mkarchive PARAMS ((bfd *abfd));
-const bfd_target *bfd_generic_archive_p PARAMS ((bfd *abfd));
-boolean	bfd_slurp_armap PARAMS ((bfd *abfd));
-boolean bfd_slurp_bsd_armap_f2 PARAMS ((bfd *abfd));
-#define bfd_slurp_bsd_armap bfd_slurp_armap
-#define bfd_slurp_coff_armap bfd_slurp_armap
-boolean	_bfd_slurp_extended_name_table PARAMS ((bfd *abfd));
-extern boolean _bfd_construct_extended_name_table
-  PARAMS ((bfd *, boolean, char **, bfd_size_type *));
-boolean	_bfd_write_archive_contents PARAMS ((bfd *abfd));
-boolean _bfd_compute_and_write_armap PARAMS ((bfd *, unsigned int elength));
-bfd *_bfd_get_elt_at_filepos PARAMS ((bfd *archive, file_ptr filepos));
-extern bfd *_bfd_generic_get_elt_at_index PARAMS ((bfd *, symindex));
-bfd * _bfd_new_bfd PARAMS ((void));
-
-boolean	bfd_false PARAMS ((bfd *ignore));
-boolean	bfd_true PARAMS ((bfd *ignore));
-PTR	bfd_nullvoidptr PARAMS ((bfd *ignore));
-int	bfd_0 PARAMS ((bfd *ignore));
-unsigned int	bfd_0u PARAMS ((bfd *ignore));
-long	bfd_0l PARAMS ((bfd *ignore));
-long	_bfd_n1 PARAMS ((bfd *ignore));
-void	bfd_void PARAMS ((bfd *ignore));
-
-bfd *_bfd_new_bfd_contained_in PARAMS ((bfd *));
-const bfd_target *_bfd_dummy_target PARAMS ((bfd *abfd));
-
-void	bfd_dont_truncate_arname PARAMS ((bfd *abfd, CONST char *filename,
-					char *hdr));
-void	bfd_bsd_truncate_arname PARAMS ((bfd *abfd, CONST char *filename,
-					char *hdr));
-void	bfd_gnu_truncate_arname PARAMS ((bfd *abfd, CONST char *filename,
-					char *hdr));
-
-boolean	bsd_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				  struct orl *map, unsigned int orl_count, int stridx));
-
-boolean	coff_write_armap PARAMS ((bfd *arch, unsigned int elength,
-				   struct orl *map, unsigned int orl_count, int stridx));
-
-extern PTR _bfd_generic_read_ar_hdr PARAMS ((bfd *));
-
-extern PTR _bfd_generic_read_ar_hdr_mag PARAMS ((bfd *, const char *));
-
-bfd *	bfd_generic_openr_next_archived_file PARAMS ((bfd *archive,
-						     bfd *last_file));
-
-int	bfd_generic_stat_arch_elt PARAMS ((bfd *, struct stat *));
-
-#define _bfd_read_ar_hdr(abfd) \
-  BFD_SEND (abfd, _bfd_read_ar_hdr_fn, (abfd))
-
-/* Generic routines to use for BFD_JUMP_TABLE_GENERIC.  Use
-   BFD_JUMP_TABLE_GENERIC (_bfd_generic).  */
-
-#define _bfd_generic_close_and_cleanup bfd_true
-#define _bfd_generic_bfd_free_cached_info bfd_true
-#define _bfd_generic_new_section_hook \
-  ((boolean (*) PARAMS ((bfd *, asection *))) bfd_true)
-extern boolean _bfd_generic_get_section_contents
-  PARAMS ((bfd *, asection *, PTR location, file_ptr offset,
-	   bfd_size_type count));
-extern boolean _bfd_generic_get_section_contents_in_window
-  PARAMS ((bfd *, asection *, bfd_window *, file_ptr, bfd_size_type));
-
-/* Generic routines to use for BFD_JUMP_TABLE_COPY.  Use
-   BFD_JUMP_TABLE_COPY (_bfd_generic).  */
-
-#define _bfd_generic_bfd_copy_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#define _bfd_generic_bfd_merge_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, bfd *))) bfd_true)
-#define _bfd_generic_bfd_set_private_flags \
-  ((boolean (*) PARAMS ((bfd *, flagword))) bfd_true)
-#define _bfd_generic_bfd_copy_private_section_data \
-  ((boolean (*) PARAMS ((bfd *, asection *, bfd *, asection *))) bfd_true)
-#define _bfd_generic_bfd_copy_private_symbol_data \
-  ((boolean (*) PARAMS ((bfd *, asymbol *, bfd *, asymbol *))) bfd_true)
-#define _bfd_generic_bfd_print_private_bfd_data \
-  ((boolean (*) PARAMS ((bfd *, PTR))) bfd_true)
-
-/* Routines to use for BFD_JUMP_TABLE_CORE when there is no core file
-   support.  Use BFD_JUMP_TABLE_CORE (_bfd_nocore).  */
-
-extern char *_bfd_nocore_core_file_failing_command PARAMS ((bfd *));
-extern int _bfd_nocore_core_file_failing_signal PARAMS ((bfd *));
-extern boolean _bfd_nocore_core_file_matches_executable_p
-  PARAMS ((bfd *, bfd *));
-
-/* Routines to use for BFD_JUMP_TABLE_ARCHIVE when there is no archive
-   file support.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive).  */
-
-#define _bfd_noarchive_slurp_armap bfd_false
-#define _bfd_noarchive_slurp_extended_name_table bfd_false
-#define _bfd_noarchive_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
-   bfd_false)
-#define _bfd_noarchive_truncate_arname \
-  ((void (*) PARAMS ((bfd *, const char *, char *))) bfd_void)
-#define _bfd_noarchive_write_armap \
-  ((boolean (*) \
-    PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
-   bfd_false)
-#define _bfd_noarchive_read_ar_hdr bfd_nullvoidptr
-#define _bfd_noarchive_openr_next_archived_file \
-  ((bfd *(*) PARAMS ((bfd *, bfd *))) bfd_nullvoidptr)
-#define _bfd_noarchive_get_elt_at_index \
-  ((bfd *(*) PARAMS ((bfd *, symindex))) bfd_nullvoidptr)
-#define _bfd_noarchive_generic_stat_arch_elt bfd_generic_stat_arch_elt
-#define _bfd_noarchive_update_armap_timestamp bfd_false
-
-/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get BSD style
-   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_bsd).  */
-
-#define _bfd_archive_bsd_slurp_armap bfd_slurp_bsd_armap
-#define _bfd_archive_bsd_slurp_extended_name_table \
-  _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_bsd_construct_extended_name_table
-  PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-#define _bfd_archive_bsd_truncate_arname bfd_bsd_truncate_arname
-#define _bfd_archive_bsd_write_armap bsd_write_armap
-#define _bfd_archive_bsd_read_ar_hdr _bfd_generic_read_ar_hdr
-#define _bfd_archive_bsd_openr_next_archived_file \
-  bfd_generic_openr_next_archived_file
-#define _bfd_archive_bsd_get_elt_at_index _bfd_generic_get_elt_at_index
-#define _bfd_archive_bsd_generic_stat_arch_elt \
-  bfd_generic_stat_arch_elt
-extern boolean _bfd_archive_bsd_update_armap_timestamp PARAMS ((bfd *));
-
-/* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get COFF style
-   archives.  Use BFD_JUMP_TABLE_ARCHIVE (_bfd_archive_coff).  */
-
-#define _bfd_archive_coff_slurp_armap bfd_slurp_coff_armap
-#define _bfd_archive_coff_slurp_extended_name_table \
-  _bfd_slurp_extended_name_table
-extern boolean _bfd_archive_coff_construct_extended_name_table
-  PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-#define _bfd_archive_coff_truncate_arname bfd_dont_truncate_arname
-#define _bfd_archive_coff_write_armap coff_write_armap
-#define _bfd_archive_coff_read_ar_hdr _bfd_generic_read_ar_hdr
-#define _bfd_archive_coff_openr_next_archived_file \
-  bfd_generic_openr_next_archived_file
-#define _bfd_archive_coff_get_elt_at_index _bfd_generic_get_elt_at_index
-#define _bfd_archive_coff_generic_stat_arch_elt \
-  bfd_generic_stat_arch_elt
-#define _bfd_archive_coff_update_armap_timestamp bfd_true
-
-/* Routines to use for BFD_JUMP_TABLE_SYMBOLS where there is no symbol
-   support.  Use BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols).  */
-
-#define _bfd_nosymbols_get_symtab_upper_bound _bfd_n1
-#define _bfd_nosymbols_get_symtab \
-  ((long (*) PARAMS ((bfd *, asymbol **))) _bfd_n1)
-#define _bfd_nosymbols_make_empty_symbol \
-  ((asymbol *(*) PARAMS ((bfd *))) bfd_nullvoidptr)
-#define _bfd_nosymbols_print_symbol \
-  ((void (*) PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type))) bfd_void)
-#define _bfd_nosymbols_get_symbol_info \
-  ((void (*) PARAMS ((bfd *, asymbol *, symbol_info *))) bfd_void)
-#define _bfd_nosymbols_bfd_is_local_label_name \
-  ((boolean (*) PARAMS ((bfd *, const char *))) bfd_false)
-#define _bfd_nosymbols_get_lineno \
-  ((alent *(*) PARAMS ((bfd *, asymbol *))) bfd_nullvoidptr)
-#define _bfd_nosymbols_find_nearest_line \
-  ((boolean (*) \
-    PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **, \
-	     const char **, unsigned int *))) \
-   bfd_false)
-#define _bfd_nosymbols_bfd_make_debug_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, PTR, unsigned long))) bfd_nullvoidptr)
-#define _bfd_nosymbols_read_minisymbols \
-  ((long (*) PARAMS ((bfd *, boolean, PTR *, unsigned int *))) _bfd_n1)
-#define _bfd_nosymbols_minisymbol_to_symbol \
-  ((asymbol *(*) PARAMS ((bfd *, boolean, const PTR, asymbol *))) \
-   bfd_nullvoidptr)
-
-/* Routines to use for BFD_JUMP_TABLE_RELOCS when there is no reloc
-   support.  Use BFD_JUMP_TABLE_RELOCS (_bfd_norelocs).  */
-
-#define _bfd_norelocs_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) _bfd_n1)
-#define _bfd_norelocs_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) _bfd_n1)
-#define _bfd_norelocs_bfd_reloc_type_lookup \
-  ((reloc_howto_type *(*) PARAMS ((bfd *, bfd_reloc_code_real_type))) \
-   bfd_nullvoidptr)
-
-/* Routines to use for BFD_JUMP_TABLE_WRITE for targets which may not
-   be written.  Use BFD_JUMP_TABLE_WRITE (_bfd_nowrite).  */
-
-#define _bfd_nowrite_set_arch_mach \
-  ((boolean (*) PARAMS ((bfd *, enum bfd_architecture, unsigned long))) \
-   bfd_false)
-#define _bfd_nowrite_set_section_contents \
-  ((boolean (*) PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type))) \
-   bfd_false)
-
-/* Generic routines to use for BFD_JUMP_TABLE_WRITE.  Use
-   BFD_JUMP_TABLE_WRITE (_bfd_generic).  */
-
-#define _bfd_generic_set_arch_mach bfd_default_set_arch_mach
-extern boolean _bfd_generic_set_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-
-/* Routines to use for BFD_JUMP_TABLE_LINK for targets which do not
-   support linking.  Use BFD_JUMP_TABLE_LINK (_bfd_nolink).  */
-
-#define _bfd_nolink_sizeof_headers ((int (*) PARAMS ((bfd *, boolean))) bfd_0)
-#define _bfd_nolink_bfd_get_relocated_section_contents \
-  ((bfd_byte *(*) \
-    PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *, \
-	     bfd_byte *, boolean, asymbol **))) \
-   bfd_nullvoidptr)
-#define _bfd_nolink_bfd_relax_section \
-  ((boolean (*) \
-    PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *))) \
-   bfd_false)
-#define _bfd_nolink_bfd_gc_sections \
-  ((boolean (*) \
-    PARAMS ((bfd *, struct bfd_link_info *))) \
-   bfd_false)
-#define _bfd_nolink_bfd_link_hash_table_create \
-  ((struct bfd_link_hash_table *(*) PARAMS ((bfd *))) bfd_nullvoidptr)
-#define _bfd_nolink_bfd_link_add_symbols \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
-#define _bfd_nolink_bfd_final_link \
-  ((boolean (*) PARAMS ((bfd *, struct bfd_link_info *))) bfd_false)
-#define _bfd_nolink_bfd_link_split_section \
-  ((boolean (*) PARAMS ((bfd *, struct sec *))) bfd_false)
-
-/* Routines to use for BFD_JUMP_TABLE_DYNAMIC for targets which do not
-   have dynamic symbols or relocs.  Use BFD_JUMP_TABLE_DYNAMIC
-   (_bfd_nodynamic).  */
-
-#define _bfd_nodynamic_get_dynamic_symtab_upper_bound _bfd_n1
-#define _bfd_nodynamic_canonicalize_dynamic_symtab \
-  ((long (*) PARAMS ((bfd *, asymbol **))) _bfd_n1)
-#define _bfd_nodynamic_get_dynamic_reloc_upper_bound _bfd_n1
-#define _bfd_nodynamic_canonicalize_dynamic_reloc \
-  ((long (*) PARAMS ((bfd *, arelent **, asymbol **))) _bfd_n1)
-
-/* Generic routine to determine of the given symbol is a local
-   label.  */
-extern boolean bfd_generic_is_local_label_name PARAMS ((bfd *, const char *));
-
-/* Generic minisymbol routines.  */
-extern long _bfd_generic_read_minisymbols
-  PARAMS ((bfd *, boolean, PTR *, unsigned int *));
-extern asymbol *_bfd_generic_minisymbol_to_symbol
-  PARAMS ((bfd *, boolean, const PTR, asymbol *));
-
-/* Find the nearest line using .stab/.stabstr sections.  */
-extern boolean _bfd_stab_section_find_nearest_line
-  PARAMS ((bfd *, asymbol **, asection *, bfd_vma, boolean *, const char **,
-	   const char **, unsigned int *, PTR *));
-
-/* Find the neaderst line using DWARF 1 debugging information.  */
-extern boolean _bfd_dwarf1_find_nearest_line
-  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
-	   const char **, unsigned int *));
-
-/* Find the nearest line using DWARF 2 debugging information.  */
-extern boolean _bfd_dwarf2_find_nearest_line
-  PARAMS ((bfd *, asection *, asymbol **, bfd_vma, const char **,
-	   const char **, unsigned int *));
-
-/* A routine to create entries for a bfd_link_hash_table.  */
-extern struct bfd_hash_entry *_bfd_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *entry,
-	   struct bfd_hash_table *table,
-	   const char *string));
-
-/* Initialize a bfd_link_hash_table.  */
-extern boolean _bfd_link_hash_table_init
-  PARAMS ((struct bfd_link_hash_table *, bfd *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-
-/* Generic link hash table creation routine.  */
-extern struct bfd_link_hash_table *_bfd_generic_link_hash_table_create
-  PARAMS ((bfd *));
-
-/* Generic add symbol routine.  */
-extern boolean _bfd_generic_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Generic add symbol routine.  This version is used by targets for
-   which the linker must collect constructors and destructors by name,
-   as the collect2 program does.  */
-extern boolean _bfd_generic_link_add_symbols_collect
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Generic archive add symbol routine.  */
-extern boolean _bfd_generic_link_add_archive_symbols
-  PARAMS ((bfd *, struct bfd_link_info *,
-	   boolean (*checkfn) (bfd *, struct bfd_link_info *, boolean *)));
-
-
-
-/* Forward declaration to avoid prototype errors.  */
-typedef struct bfd_link_hash_entry _bfd_link_hash_entry;
-
-/* Generic routine to add a single symbol.  */
-extern boolean _bfd_generic_link_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *name, flagword,
-	   asection *, bfd_vma, const char *, boolean copy,
-	   boolean constructor, struct bfd_link_hash_entry **));
-
-/* Generic link routine.  */
-extern boolean _bfd_generic_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-extern boolean _bfd_generic_link_split_section
-  PARAMS ((bfd *, struct sec *));
-
-/* Generic reloc_link_order processing routine.  */
-extern boolean _bfd_generic_reloc_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-
-/* Default link order processing routine.  */
-extern boolean _bfd_default_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-
-/* Count the number of reloc entries in a link order list.  */
-extern unsigned int _bfd_count_link_order_relocs
-  PARAMS ((struct bfd_link_order *));
-
-/* Final link relocation routine.  */
-extern bfd_reloc_status_type _bfd_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *,
-	   bfd_vma address, bfd_vma value, bfd_vma addend));
-
-/* Relocate a particular location by a howto and a value.  */
-extern bfd_reloc_status_type _bfd_relocate_contents
-  PARAMS ((reloc_howto_type *, bfd *, bfd_vma, bfd_byte *));
-
-/* Link stabs in sections in the first pass.  */
-
-extern boolean _bfd_link_section_stabs
-  PARAMS ((bfd *, PTR *, asection *, asection *, PTR *));
-
-/* Write out the .stab section when linking stabs in sections.  */
-
-extern boolean _bfd_write_section_stabs
-  PARAMS ((bfd *, PTR *, asection *, PTR *, bfd_byte *));
-
-/* Write out the .stabstr string table when linking stabs in sections.  */
-
-extern boolean _bfd_write_stab_strings PARAMS ((bfd *, PTR *));
-
-/* Find an offset within a .stab section when linking stabs in
-   sections.  */
-
-extern bfd_vma _bfd_stab_section_offset
-  PARAMS ((bfd *, PTR *, asection *, PTR *, bfd_vma));
-
-/* Create a string table.  */
-extern struct bfd_strtab_hash *_bfd_stringtab_init PARAMS ((void));
-
-/* Create an XCOFF .debug section style string table.  */
-extern struct bfd_strtab_hash *_bfd_xcoff_stringtab_init PARAMS ((void));
-
-/* Free a string table.  */
-extern void _bfd_stringtab_free PARAMS ((struct bfd_strtab_hash *));
-
-/* Get the size of a string table.  */
-extern bfd_size_type _bfd_stringtab_size PARAMS ((struct bfd_strtab_hash *));
-
-/* Add a string to a string table.  */
-extern bfd_size_type _bfd_stringtab_add
-  PARAMS ((struct bfd_strtab_hash *, const char *, boolean hash,
-	   boolean copy));
-
-/* Write out a string table.  */
-extern boolean _bfd_stringtab_emit PARAMS ((bfd *, struct bfd_strtab_hash *));
-
-/* Macros to tell if bfds are read or write enabled.
-
-   Note that bfds open for read may be scribbled into if the fd passed
-   to bfd_fdopenr is actually open both for read and write
-   simultaneously.  However an output bfd will never be open for
-   read.  Therefore sometimes you want to check bfd_read_p or
-   !bfd_read_p, and only sometimes bfd_write_p.
-*/
-
-#define	bfd_read_p(abfd) ((abfd)->direction == read_direction || (abfd)->direction == both_direction)
-#define	bfd_write_p(abfd) ((abfd)->direction == write_direction || (abfd)->direction == both_direction)
-
-void	bfd_assert PARAMS ((const char*,int));
-
-#define BFD_ASSERT(x) \
-{ if (!(x)) bfd_assert(__FILE__,__LINE__); }
-
-#define BFD_FAIL() \
-{ bfd_assert(__FILE__,__LINE__); }
-
-FILE *	bfd_cache_lookup_worker PARAMS ((bfd *));
-
-extern bfd *bfd_last_cache;
-
-/* List of supported target vectors, and the default vector (if
-   bfd_default_vector[0] is NULL, there is no default).  */
-extern const bfd_target * const bfd_target_vector[];
-extern const bfd_target *bfd_default_vector[];
-
-/* Functions shared by the ECOFF and MIPS ELF backends, which have no
-   other common header files.  */
-
-#if defined(__STDC__) || defined(ALMOST_STDC)
-struct ecoff_find_line;
-#endif
-
-extern boolean _bfd_ecoff_locate_line
-  PARAMS ((bfd *, asection *, bfd_vma, struct ecoff_debug_info * const,
-	   const struct ecoff_debug_swap * const, struct ecoff_find_line *,
-	   const char **, const char **, unsigned int *));
-extern boolean _bfd_ecoff_get_accumulated_pdr PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_sym PARAMS ((PTR, bfd_byte *));
-extern boolean _bfd_ecoff_get_accumulated_ss PARAMS ((PTR, bfd_byte *));
-
-extern bfd_vma _bfd_get_gp_value PARAMS ((bfd *));
-extern void _bfd_set_gp_value PARAMS ((bfd *, bfd_vma));
-
-/* Function shared by the COFF and ELF SH backends, which have no
-   other common header files.  */
-
-extern boolean _bfd_sh_align_load_span
-  PARAMS ((bfd *, asection *, bfd_byte *,
-	   boolean (*) (bfd *, asection *, PTR, bfd_byte *, bfd_vma),
-	   PTR, bfd_vma **, bfd_vma *, bfd_vma, bfd_vma, boolean *));
-
-/* And more follows */
-
-void 
-bfd_write_bigendian_4byte_int PARAMS ((bfd *abfd,  int i));
-
-unsigned int 
-bfd_log2 PARAMS ((bfd_vma x));
-
-#define BFD_CACHE_MAX_OPEN 10
-extern bfd *bfd_last_cache;
-
-#define bfd_cache_lookup(x) \
-    ((x)==bfd_last_cache? \
-      (FILE*)(bfd_last_cache->iostream): \
-       bfd_cache_lookup_worker(x))
-boolean 
-bfd_cache_init  PARAMS ((bfd *abfd));
-
-boolean 
-bfd_cache_close  PARAMS ((bfd *abfd));
-
-FILE* 
-bfd_open_file PARAMS ((bfd *abfd));
-
-FILE *
-bfd_cache_lookup_worker PARAMS ((bfd *abfd));
-
-#ifdef _BFD_MAKE_TABLE_bfd_reloc_code_real
-
-static const char *const bfd_reloc_code_real_names[] = { "@@uninitialized@@",
-
-  "BFD_RELOC_64",
-  "BFD_RELOC_32",
-  "BFD_RELOC_26",
-  "BFD_RELOC_24",
-  "BFD_RELOC_16",
-  "BFD_RELOC_14",
-  "BFD_RELOC_8",
-  "BFD_RELOC_64_PCREL",
-  "BFD_RELOC_32_PCREL",
-  "BFD_RELOC_24_PCREL",
-  "BFD_RELOC_16_PCREL",
-  "BFD_RELOC_12_PCREL",
-  "BFD_RELOC_8_PCREL",
-  "BFD_RELOC_32_GOT_PCREL",
-  "BFD_RELOC_16_GOT_PCREL",
-  "BFD_RELOC_8_GOT_PCREL",
-  "BFD_RELOC_32_GOTOFF",
-  "BFD_RELOC_16_GOTOFF",
-  "BFD_RELOC_LO16_GOTOFF",
-  "BFD_RELOC_HI16_GOTOFF",
-  "BFD_RELOC_HI16_S_GOTOFF",
-  "BFD_RELOC_8_GOTOFF",
-  "BFD_RELOC_32_PLT_PCREL",
-  "BFD_RELOC_24_PLT_PCREL",
-  "BFD_RELOC_16_PLT_PCREL",
-  "BFD_RELOC_8_PLT_PCREL",
-  "BFD_RELOC_32_PLTOFF",
-  "BFD_RELOC_16_PLTOFF",
-  "BFD_RELOC_LO16_PLTOFF",
-  "BFD_RELOC_HI16_PLTOFF",
-  "BFD_RELOC_HI16_S_PLTOFF",
-  "BFD_RELOC_8_PLTOFF",
-  "BFD_RELOC_68K_GLOB_DAT",
-  "BFD_RELOC_68K_JMP_SLOT",
-  "BFD_RELOC_68K_RELATIVE",
-  "BFD_RELOC_32_BASEREL",
-  "BFD_RELOC_16_BASEREL",
-  "BFD_RELOC_LO16_BASEREL",
-  "BFD_RELOC_HI16_BASEREL",
-  "BFD_RELOC_HI16_S_BASEREL",
-  "BFD_RELOC_8_BASEREL",
-  "BFD_RELOC_RVA",
-  "BFD_RELOC_8_FFnn",
-  "BFD_RELOC_32_PCREL_S2",
-  "BFD_RELOC_16_PCREL_S2",
-  "BFD_RELOC_23_PCREL_S2",
-  "BFD_RELOC_HI22",
-  "BFD_RELOC_LO10",
-  "BFD_RELOC_GPREL16",
-  "BFD_RELOC_GPREL32",
-  "BFD_RELOC_I960_CALLJ",
-  "BFD_RELOC_NONE",
-  "BFD_RELOC_SPARC_WDISP22",
-  "BFD_RELOC_SPARC22",
-  "BFD_RELOC_SPARC13",
-  "BFD_RELOC_SPARC_GOT10",
-  "BFD_RELOC_SPARC_GOT13",
-  "BFD_RELOC_SPARC_GOT22",
-  "BFD_RELOC_SPARC_PC10",
-  "BFD_RELOC_SPARC_PC22",
-  "BFD_RELOC_SPARC_WPLT30",
-  "BFD_RELOC_SPARC_COPY",
-  "BFD_RELOC_SPARC_GLOB_DAT",
-  "BFD_RELOC_SPARC_JMP_SLOT",
-  "BFD_RELOC_SPARC_RELATIVE",
-  "BFD_RELOC_SPARC_UA32",
-  "BFD_RELOC_SPARC_BASE13",
-  "BFD_RELOC_SPARC_BASE22",
-  "BFD_RELOC_SPARC_10",
-  "BFD_RELOC_SPARC_11",
-  "BFD_RELOC_SPARC_OLO10",
-  "BFD_RELOC_SPARC_HH22",
-  "BFD_RELOC_SPARC_HM10",
-  "BFD_RELOC_SPARC_LM22",
-  "BFD_RELOC_SPARC_PC_HH22",
-  "BFD_RELOC_SPARC_PC_HM10",
-  "BFD_RELOC_SPARC_PC_LM22",
-  "BFD_RELOC_SPARC_WDISP16",
-  "BFD_RELOC_SPARC_WDISP19",
-  "BFD_RELOC_SPARC_7",
-  "BFD_RELOC_SPARC_6",
-  "BFD_RELOC_SPARC_5",
-  "BFD_RELOC_SPARC_PLT64",
-  "BFD_RELOC_SPARC_HIX22",
-  "BFD_RELOC_SPARC_LOX10",
-  "BFD_RELOC_SPARC_H44",
-  "BFD_RELOC_SPARC_M44",
-  "BFD_RELOC_SPARC_L44",
-  "BFD_RELOC_SPARC_REGISTER",
-  "BFD_RELOC_SPARC_REV32",
-  "BFD_RELOC_ALPHA_GPDISP_HI16",
-  "BFD_RELOC_ALPHA_GPDISP_LO16",
-  "BFD_RELOC_ALPHA_GPDISP",
-  "BFD_RELOC_ALPHA_LITERAL",
-  "BFD_RELOC_ALPHA_ELF_LITERAL",
-  "BFD_RELOC_ALPHA_LITUSE",
-  "BFD_RELOC_ALPHA_HINT",
-  "BFD_RELOC_ALPHA_LINKAGE",
-  "BFD_RELOC_ALPHA_CODEADDR",
-  "BFD_RELOC_MIPS_JMP",
-  "BFD_RELOC_MIPS16_JMP",
-  "BFD_RELOC_MIPS16_GPREL",
-  "BFD_RELOC_HI16",
-  "BFD_RELOC_HI16_S",
-  "BFD_RELOC_LO16",
-  "BFD_RELOC_PCREL_HI16_S",
-  "BFD_RELOC_PCREL_LO16",
-  "BFD_RELOC_MIPS_LITERAL",
-  "BFD_RELOC_MIPS_GOT16",
-  "BFD_RELOC_MIPS_CALL16",
-  "BFD_RELOC_MIPS_GOT_HI16",
-  "BFD_RELOC_MIPS_GOT_LO16",
-  "BFD_RELOC_MIPS_CALL_HI16",
-  "BFD_RELOC_MIPS_CALL_LO16",
-
-  "BFD_RELOC_386_GOT32",
-  "BFD_RELOC_386_PLT32",
-  "BFD_RELOC_386_COPY",
-  "BFD_RELOC_386_GLOB_DAT",
-  "BFD_RELOC_386_JUMP_SLOT",
-  "BFD_RELOC_386_RELATIVE",
-  "BFD_RELOC_386_GOTOFF",
-  "BFD_RELOC_386_GOTPC",
-  "BFD_RELOC_NS32K_IMM_8",
-  "BFD_RELOC_NS32K_IMM_16",
-  "BFD_RELOC_NS32K_IMM_32",
-  "BFD_RELOC_NS32K_IMM_8_PCREL",
-  "BFD_RELOC_NS32K_IMM_16_PCREL",
-  "BFD_RELOC_NS32K_IMM_32_PCREL",
-  "BFD_RELOC_NS32K_DISP_8",
-  "BFD_RELOC_NS32K_DISP_16",
-  "BFD_RELOC_NS32K_DISP_32",
-  "BFD_RELOC_NS32K_DISP_8_PCREL",
-  "BFD_RELOC_NS32K_DISP_16_PCREL",
-  "BFD_RELOC_NS32K_DISP_32_PCREL",
-  "BFD_RELOC_PPC_B26",
-  "BFD_RELOC_PPC_BA26",
-  "BFD_RELOC_PPC_TOC16",
-  "BFD_RELOC_PPC_B16",
-  "BFD_RELOC_PPC_B16_BRTAKEN",
-  "BFD_RELOC_PPC_B16_BRNTAKEN",
-  "BFD_RELOC_PPC_BA16",
-  "BFD_RELOC_PPC_BA16_BRTAKEN",
-  "BFD_RELOC_PPC_BA16_BRNTAKEN",
-  "BFD_RELOC_PPC_COPY",
-  "BFD_RELOC_PPC_GLOB_DAT",
-  "BFD_RELOC_PPC_JMP_SLOT",
-  "BFD_RELOC_PPC_RELATIVE",
-  "BFD_RELOC_PPC_LOCAL24PC",
-  "BFD_RELOC_PPC_EMB_NADDR32",
-  "BFD_RELOC_PPC_EMB_NADDR16",
-  "BFD_RELOC_PPC_EMB_NADDR16_LO",
-  "BFD_RELOC_PPC_EMB_NADDR16_HI",
-  "BFD_RELOC_PPC_EMB_NADDR16_HA",
-  "BFD_RELOC_PPC_EMB_SDAI16",
-  "BFD_RELOC_PPC_EMB_SDA2I16",
-  "BFD_RELOC_PPC_EMB_SDA2REL",
-  "BFD_RELOC_PPC_EMB_SDA21",
-  "BFD_RELOC_PPC_EMB_MRKREF",
-  "BFD_RELOC_PPC_EMB_RELSEC16",
-  "BFD_RELOC_PPC_EMB_RELST_LO",
-  "BFD_RELOC_PPC_EMB_RELST_HI",
-  "BFD_RELOC_PPC_EMB_RELST_HA",
-  "BFD_RELOC_PPC_EMB_BIT_FLD",
-  "BFD_RELOC_PPC_EMB_RELSDA",
-  "BFD_RELOC_CTOR",
-  "BFD_RELOC_ARM_PCREL_BRANCH",
-  "BFD_RELOC_ARM_IMMEDIATE",
-  "BFD_RELOC_ARM_OFFSET_IMM",
-  "BFD_RELOC_ARM_SHIFT_IMM",
-  "BFD_RELOC_ARM_SWI",
-  "BFD_RELOC_ARM_MULTI",
-  "BFD_RELOC_ARM_CP_OFF_IMM",
-  "BFD_RELOC_ARM_ADR_IMM",
-  "BFD_RELOC_ARM_LDR_IMM",
-  "BFD_RELOC_ARM_LITERAL",
-  "BFD_RELOC_ARM_IN_POOL",
-  "BFD_RELOC_ARM_OFFSET_IMM8",
-  "BFD_RELOC_ARM_HWLITERAL",
-  "BFD_RELOC_ARM_THUMB_ADD",
-  "BFD_RELOC_ARM_THUMB_IMM",
-  "BFD_RELOC_ARM_THUMB_SHIFT",
-  "BFD_RELOC_ARM_THUMB_OFFSET",
-  "BFD_RELOC_ARM_GOT12",
-  "BFD_RELOC_ARM_GOT32",
-  "BFD_RELOC_ARM_JUMP_SLOT",
-  "BFD_RELOC_ARM_COPY",
-  "BFD_RELOC_ARM_GLOB_DAT",
-  "BFD_RELOC_ARM_PLT32",
-  "BFD_RELOC_ARM_RELATIVE",
-  "BFD_RELOC_ARM_GOTOFF",
-  "BFD_RELOC_ARM_GOTPC",
-  "BFD_RELOC_SH_PCDISP8BY2",
-  "BFD_RELOC_SH_PCDISP12BY2",
-  "BFD_RELOC_SH_IMM4",
-  "BFD_RELOC_SH_IMM4BY2",
-  "BFD_RELOC_SH_IMM4BY4",
-  "BFD_RELOC_SH_IMM8",
-  "BFD_RELOC_SH_IMM8BY2",
-  "BFD_RELOC_SH_IMM8BY4",
-  "BFD_RELOC_SH_PCRELIMM8BY2",
-  "BFD_RELOC_SH_PCRELIMM8BY4",
-  "BFD_RELOC_SH_SWITCH16",
-  "BFD_RELOC_SH_SWITCH32",
-  "BFD_RELOC_SH_USES",
-  "BFD_RELOC_SH_COUNT",
-  "BFD_RELOC_SH_ALIGN",
-  "BFD_RELOC_SH_CODE",
-  "BFD_RELOC_SH_DATA",
-  "BFD_RELOC_SH_LABEL",
-  "BFD_RELOC_THUMB_PCREL_BRANCH9",
-  "BFD_RELOC_THUMB_PCREL_BRANCH12",
-  "BFD_RELOC_THUMB_PCREL_BRANCH23",
-  "BFD_RELOC_ARC_B22_PCREL",
-  "BFD_RELOC_ARC_B26",
-  "BFD_RELOC_D10V_10_PCREL_R",
-  "BFD_RELOC_D10V_10_PCREL_L",
-  "BFD_RELOC_D10V_18",
-  "BFD_RELOC_D10V_18_PCREL",
-  "BFD_RELOC_D30V_6",
-  "BFD_RELOC_D30V_9_PCREL",
-  "BFD_RELOC_D30V_9_PCREL_R",
-  "BFD_RELOC_D30V_15",
-  "BFD_RELOC_D30V_15_PCREL",
-  "BFD_RELOC_D30V_15_PCREL_R",
-  "BFD_RELOC_D30V_21",
-  "BFD_RELOC_D30V_21_PCREL",
-  "BFD_RELOC_D30V_21_PCREL_R",
-  "BFD_RELOC_D30V_32",
-  "BFD_RELOC_D30V_32_PCREL",
-  "BFD_RELOC_M32R_24",
-  "BFD_RELOC_M32R_10_PCREL",
-  "BFD_RELOC_M32R_18_PCREL",
-  "BFD_RELOC_M32R_26_PCREL",
-  "BFD_RELOC_M32R_HI16_ULO",
-  "BFD_RELOC_M32R_HI16_SLO",
-  "BFD_RELOC_M32R_LO16",
-  "BFD_RELOC_M32R_SDA16",
-  "BFD_RELOC_V850_9_PCREL",
-  "BFD_RELOC_V850_22_PCREL",
-  "BFD_RELOC_V850_SDA_16_16_OFFSET",
-  "BFD_RELOC_V850_SDA_15_16_OFFSET",
-  "BFD_RELOC_V850_ZDA_16_16_OFFSET",
-  "BFD_RELOC_V850_ZDA_15_16_OFFSET",
-  "BFD_RELOC_V850_TDA_6_8_OFFSET",
-  "BFD_RELOC_V850_TDA_7_8_OFFSET",
-  "BFD_RELOC_V850_TDA_7_7_OFFSET",
-  "BFD_RELOC_V850_TDA_16_16_OFFSET",
-  "BFD_RELOC_V850_TDA_4_5_OFFSET",
-  "BFD_RELOC_V850_TDA_4_4_OFFSET",
-  "BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET",
-  "BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET",
-  "BFD_RELOC_V850_CALLT_6_7_OFFSET",
-  "BFD_RELOC_V850_CALLT_16_16_OFFSET",
-
-  "BFD_RELOC_MN10300_32_PCREL",
-  "BFD_RELOC_MN10300_16_PCREL",
-  "BFD_RELOC_TIC30_LDP",
-  "BFD_RELOC_FR30_48",
-  "BFD_RELOC_FR30_20",
-  "BFD_RELOC_FR30_6_IN_4",
-  "BFD_RELOC_FR30_8_IN_8",
-  "BFD_RELOC_FR30_9_IN_8",
-  "BFD_RELOC_FR30_10_IN_8",
-  "BFD_RELOC_FR30_9_PCREL",
-  "BFD_RELOC_FR30_12_PCREL",
-  "BFD_RELOC_MCORE_PCREL_IMM8BY4",
-  "BFD_RELOC_MCORE_PCREL_IMM11BY2",
-  "BFD_RELOC_MCORE_PCREL_IMM4BY2",
-  "BFD_RELOC_MCORE_PCREL_32",
-  "BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2",
-  "BFD_RELOC_VTABLE_INHERIT",
-  "BFD_RELOC_VTABLE_ENTRY",
- "@@overflow: BFD_RELOC_UNUSED@@",
-};
-#endif
-
-reloc_howto_type *
-bfd_default_reloc_type_lookup
- PARAMS ((bfd *abfd, bfd_reloc_code_real_type  code));
-
-boolean 
-bfd_generic_relax_section
- PARAMS ((bfd *abfd,
-    asection *section,
-    struct bfd_link_info *,
-    boolean *));
-
-boolean 
-bfd_generic_gc_sections
- PARAMS ((bfd *, struct bfd_link_info *));
-
-bfd_byte *
-
-bfd_generic_get_relocated_section_contents  PARAMS ((bfd *abfd,
-    struct bfd_link_info *link_info,
-    struct bfd_link_order *link_order,
-    bfd_byte *data,
-    boolean relocateable,
-    asymbol **symbols));
-
-extern const bfd_arch_info_type bfd_default_arch_struct;
-boolean 
-bfd_default_set_arch_mach PARAMS ((bfd *abfd,
-    enum bfd_architecture arch,
-    unsigned long mach));
-
-const bfd_arch_info_type *
-bfd_default_compatible
- PARAMS ((const bfd_arch_info_type *a,
-    const bfd_arch_info_type *b));
-
-boolean 
-bfd_default_scan PARAMS ((const struct bfd_arch_info *info, const char *string));
-
-struct elf_internal_shdr *
-bfd_elf_find_section  PARAMS ((bfd *abfd, char *name));
-
diff --git a/bfd/libcoff-in.h b/bfd/libcoff-in.h
deleted file mode 100644
index 0dc2121c981..00000000000
--- a/bfd/libcoff-in.h
+++ /dev/null
@@ -1,529 +0,0 @@
-/* BFD COFF object file private structure.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-** NOTE: libcoff.h is a GENERATED file.  Don't change it; instead,
-** change libcoff-in.h or coffcode.h.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfdlink.h"
-
-/* Object file tdata; access macros */
-
-#define coff_data(bfd)		((bfd)->tdata.coff_obj_data)
-#define exec_hdr(bfd)		(coff_data(bfd)->hdr)
-#define obj_pe(bfd)             (coff_data(bfd)->pe)
-#define obj_symbols(bfd)	(coff_data(bfd)->symbols)
-#define	obj_sym_filepos(bfd)	(coff_data(bfd)->sym_filepos)
-
-#define obj_relocbase(bfd)	(coff_data(bfd)->relocbase)
-#define obj_raw_syments(bfd)	(coff_data(bfd)->raw_syments)
-#define obj_raw_syment_count(bfd)	(coff_data(bfd)->raw_syment_count)
-#define obj_convert(bfd)	(coff_data(bfd)->conversion_table)
-#define obj_conv_table_size(bfd) (coff_data(bfd)->conv_table_size)
-
-#define obj_coff_external_syms(bfd) (coff_data (bfd)->external_syms)
-#define obj_coff_keep_syms(bfd)	(coff_data (bfd)->keep_syms)
-#define obj_coff_strings(bfd)	(coff_data (bfd)->strings)
-#define obj_coff_keep_strings(bfd) (coff_data (bfd)->keep_strings)
-#define obj_coff_sym_hashes(bfd) (coff_data (bfd)->sym_hashes)
-
-#define obj_coff_local_toc_table(bfd) (coff_data(bfd)->local_toc_sym_map)
-
-/* `Tdata' information kept for COFF files.  */
-
-typedef struct coff_tdata
-{
-  struct   coff_symbol_struct *symbols;	/* symtab for input bfd */
-  unsigned int *conversion_table;
-  int conv_table_size;
-  file_ptr sym_filepos;
-
-  struct coff_ptr_struct *raw_syments;
-  unsigned int raw_syment_count;
-
-  /* These are only valid once writing has begun */
-  long int relocbase;
-
-  /* These members communicate important constants about the symbol table
-     to GDB's symbol-reading code.  These `constants' unfortunately vary
-     from coff implementation to implementation...  */
-  unsigned local_n_btmask;
-  unsigned local_n_btshft;
-  unsigned local_n_tmask;
-  unsigned local_n_tshift;
-  unsigned local_symesz;
-  unsigned local_auxesz;
-  unsigned local_linesz;
-
-  /* The unswapped external symbols.  May be NULL.  Read by
-     _bfd_coff_get_external_symbols.  */
-  PTR external_syms;
-  /* If this is true, the external_syms may not be freed.  */
-  boolean keep_syms;
-
-  /* The string table.  May be NULL.  Read by
-     _bfd_coff_read_string_table.  */
-  char *strings;
-  /* If this is true, the strings may not be freed.  */
-  boolean keep_strings;
-
-  /* is this a PE format coff file */
-  int pe;
-  /* Used by the COFF backend linker.  */
-  struct coff_link_hash_entry **sym_hashes;
-
-  /* used by the pe linker for PowerPC */
-  int *local_toc_sym_map;
-
-  struct bfd_link_info *link_info;
-
-  /* Used by coff_find_nearest_line.  */
-  PTR line_info;
-
-  /* Copy of some of the f_flags bits in the COFF filehdr structure,
-     used by ARM code.  */
-  flagword flags;
-
-} coff_data_type;
-
-/* Tdata for pe image files. */
-typedef struct pe_tdata
-{
-  coff_data_type coff;
-  struct internal_extra_pe_aouthdr pe_opthdr;
-  int dll;
-  int has_reloc_section;
-  boolean (*in_reloc_p) PARAMS((bfd *, reloc_howto_type *));
-  flagword real_flags;
-} pe_data_type;
-
-#define pe_data(bfd)		((bfd)->tdata.pe_obj_data)
-
-/* Tdata for XCOFF files.  */
-
-struct xcoff_tdata
-{
-  /* Basic COFF information.  */
-  coff_data_type coff;
-
-  /* True if a large a.out header should be generated.  */
-  boolean full_aouthdr;
-
-  /* TOC value.  */
-  bfd_vma toc;
-
-  /* Index of section holding TOC.  */
-  int sntoc;
-
-  /* Index of section holding entry point.  */
-  int snentry;
-
-  /* .text alignment from optional header.  */
-  int text_align_power;
-
-  /* .data alignment from optional header.  */
-  int data_align_power;
-
-  /* modtype from optional header.  */
-  short modtype;
-
-  /* cputype from optional header.  */
-  short cputype;
-
-  /* maxdata from optional header.  */
-  bfd_size_type maxdata;
-
-  /* maxstack from optional header.  */
-  bfd_size_type maxstack;
-
-  /* Used by the XCOFF backend linker.  */
-  asection **csects;
-  unsigned long *debug_indices;
-  unsigned int import_file_id;
-};
-
-#define xcoff_data(abfd) ((abfd)->tdata.xcoff_obj_data)
-
-/* We take the address of the first element of a asymbol to ensure that the
- * macro is only ever applied to an asymbol.  */
-#define coffsymbol(asymbol) ((coff_symbol_type *)(&((asymbol)->the_bfd)))
-
-/* The used_by_bfd field of a section may be set to a pointer to this
-   structure.  */
-
-struct coff_section_tdata
-{
-  /* The relocs, swapped into COFF internal form.  This may be NULL.  */
-  struct internal_reloc *relocs;
-  /* If this is true, the relocs entry may not be freed.  */
-  boolean keep_relocs;
-  /* The section contents.  This may be NULL.  */
-  bfd_byte *contents;
-  /* If this is true, the contents entry may not be freed.  */
-  boolean keep_contents;
-  /* Information cached by coff_find_nearest_line.  */
-  bfd_vma offset;
-  unsigned int i;
-  const char *function;
-  int line_base;
-  /* A pointer used for .stab linking optimizations.  */
-  PTR stab_info;
-  /* Available for individual backends.  */
-  PTR tdata;
-};
-
-/* An accessor macro for the coff_section_tdata structure.  */
-#define coff_section_data(abfd, sec) \
-  ((struct coff_section_tdata *) (sec)->used_by_bfd)
-
-/* Tdata for sections in XCOFF files.  This is used by the linker.  */
-
-struct xcoff_section_tdata
-{
-  /* Used for XCOFF csects created by the linker; points to the real
-     XCOFF section which contains this csect.  */
-  asection *enclosing;
-  /* The lineno_count field for the enclosing section, because we are
-     going to clobber it there.  */
-  unsigned int lineno_count;
-  /* The first and one past the last symbol indices for symbols used
-     by this csect.  */
-  unsigned long first_symndx;
-  unsigned long last_symndx;
-};
-
-/* An accessor macro the xcoff_section_tdata structure.  */
-#define xcoff_section_data(abfd, sec) \
-  ((struct xcoff_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
-
-/* Tdata for sections in PEI image files.  */
-
-struct pei_section_tdata
-{
-  /* The virtual size of the section.  */
-  bfd_size_type virt_size;
-};
-
-/* An accessor macro for the pei_section_tdata structure.  */
-#define pei_section_data(abfd, sec) \
-  ((struct pei_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
-
-/* COFF linker hash table entries.  */
-
-struct coff_link_hash_entry
-{
-  struct bfd_link_hash_entry root;
-
-  /* Symbol index in output file.  Set to -1 initially.  Set to -2 if
-     there is a reloc against this symbol.  */
-  long indx;
-
-  /* Symbol type.  */
-  unsigned short type;
-
-  /* Symbol class.  */
-  unsigned char class;
-
-  /* Number of auxiliary entries.  */
-  char numaux;
-
-  /* BFD to take auxiliary entries from.  */
-  bfd *auxbfd;
-
-  /* Pointer to array of auxiliary entries, if any.  */
-  union internal_auxent *aux;
-};
-
-/* COFF linker hash table.  */
-
-struct coff_link_hash_table
-{
-  struct bfd_link_hash_table root;
-  /* A pointer to information used to link stabs in sections.  */
-  PTR stab_info;
-};
-
-/* Look up an entry in a COFF linker hash table.  */
-
-#define coff_link_hash_lookup(table, string, create, copy, follow)	\
-  ((struct coff_link_hash_entry *)					\
-   bfd_link_hash_lookup (&(table)->root, (string), (create),		\
-			 (copy), (follow)))
-
-/* Traverse a COFF linker hash table.  */
-
-#define coff_link_hash_traverse(table, func, info)			\
-  (bfd_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the COFF linker hash table from a link_info structure.  */
-
-#define coff_hash_table(p) ((struct coff_link_hash_table *) ((p)->hash))
-
-/* Functions in coffgen.c.  */
-extern const bfd_target *coff_object_p PARAMS ((bfd *));
-extern struct sec *coff_section_from_bfd_index PARAMS ((bfd *, int));
-extern long coff_get_symtab_upper_bound PARAMS ((bfd *));
-extern long coff_get_symtab PARAMS ((bfd *, asymbol **));
-extern int coff_count_linenumbers PARAMS ((bfd *));
-extern struct coff_symbol_struct *coff_symbol_from PARAMS ((bfd *, asymbol *));
-extern boolean coff_renumber_symbols PARAMS ((bfd *, int *));
-extern void coff_mangle_symbols PARAMS ((bfd *));
-extern boolean coff_write_symbols PARAMS ((bfd *));
-extern boolean coff_write_linenumbers PARAMS ((bfd *));
-extern alent *coff_get_lineno PARAMS ((bfd *, asymbol *));
-extern asymbol *coff_section_symbol PARAMS ((bfd *, char *));
-extern boolean _bfd_coff_get_external_symbols PARAMS ((bfd *));
-extern const char *_bfd_coff_read_string_table PARAMS ((bfd *));
-extern boolean _bfd_coff_free_symbols PARAMS ((bfd *));
-extern struct coff_ptr_struct *coff_get_normalized_symtab PARAMS ((bfd *));
-extern long coff_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-extern asymbol *coff_make_empty_symbol PARAMS ((bfd *));
-extern void coff_print_symbol PARAMS ((bfd *, PTR filep, asymbol *,
-				       bfd_print_symbol_type how));
-extern void coff_get_symbol_info PARAMS ((bfd *, asymbol *,
-					  symbol_info *ret));
-extern boolean _bfd_coff_is_local_label_name PARAMS ((bfd *, const char *));
-extern asymbol *coff_bfd_make_debug_symbol PARAMS ((bfd *, PTR,
-						    unsigned long));
-extern boolean coff_find_nearest_line PARAMS ((bfd *,
-					       asection *,
-					       asymbol **,
-					       bfd_vma offset,
-					       CONST char **filename_ptr,
-					       CONST char **functionname_ptr,
-					       unsigned int *line_ptr));
-extern int coff_sizeof_headers PARAMS ((bfd *, boolean reloc));
-extern boolean bfd_coff_reloc16_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean relocateable, asymbol **));
-extern bfd_vma bfd_coff_reloc16_get_value PARAMS ((arelent *,
-						   struct bfd_link_info *,
-						   asection *));
-extern void bfd_perform_slip PARAMS ((bfd *abfd, unsigned int slip,
-				      asection *input_section,
-				      bfd_vma val));
-
-/* Functions and types in cofflink.c.  */
-
-#define STRING_SIZE_SIZE (4)
-
-/* We use a hash table to merge identical enum, struct, and union
-   definitions in the linker.  */
-
-/* Information we keep for a single element (an enum value, a
-   structure or union field) in the debug merge hash table.  */
-
-struct coff_debug_merge_element
-{
-  /* Next element.  */
-  struct coff_debug_merge_element *next;
-
-  /* Name.  */
-  const char *name;
-
-  /* Type.  */
-  unsigned int type;
-
-  /* Symbol index for complex type.  */
-  long tagndx;
-};
-
-/* A linked list of debug merge entries for a given name.  */
-
-struct coff_debug_merge_type
-{
-  /* Next type with the same name.  */
-  struct coff_debug_merge_type *next;
-
-  /* Class of type.  */
-  int class;
-
-  /* Symbol index where this type is defined.  */
-  long indx;
-
-  /* List of elements.  */
-  struct coff_debug_merge_element *elements;
-};
-
-/* Information we store in the debug merge hash table.  */
-
-struct coff_debug_merge_hash_entry
-{
-  struct bfd_hash_entry root;
-
-  /* A list of types with this name.  */
-  struct coff_debug_merge_type *types;
-};
-
-/* The debug merge hash table.  */
-
-struct coff_debug_merge_hash_table
-{
-  struct bfd_hash_table root;
-};
-
-/* Initialize a COFF debug merge hash table.  */
-
-#define coff_debug_merge_hash_table_init(table) \
-  (bfd_hash_table_init (&(table)->root, _bfd_coff_debug_merge_hash_newfunc))
-
-/* Free a COFF debug merge hash table.  */
-
-#define coff_debug_merge_hash_table_free(table) \
-  (bfd_hash_table_free (&(table)->root))
-
-/* Look up an entry in a COFF debug merge hash table.  */
-
-#define coff_debug_merge_hash_lookup(table, string, create, copy) \
-  ((struct coff_debug_merge_hash_entry *) \
-   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-
-/* Information we keep for each section in the output file when doing
-   a relocateable link.  */
-
-struct coff_link_section_info
-{
-  /* The relocs to be output.  */
-  struct internal_reloc *relocs;
-  /* For each reloc against a global symbol whose index was not known
-     when the reloc was handled, the global hash table entry.  */
-  struct coff_link_hash_entry **rel_hashes;
-};
-
-/* Information that we pass around while doing the final link step.  */
-
-struct coff_final_link_info
-{
-  /* General link information.  */
-  struct bfd_link_info *info;
-  /* Output BFD.  */
-  bfd *output_bfd;
-  /* Used to indicate failure in traversal routine.  */
-  boolean failed;
-  /* If doing "task linking" set only during the time when we want the
-     global symbol writer to convert the storage class of defined global
-     symbols from global to static. */
-  boolean global_to_static;
-  /* Hash table for long symbol names.  */
-  struct bfd_strtab_hash *strtab;
-  /* When doing a relocateable link, an array of information kept for
-     each output section, indexed by the target_index field.  */
-  struct coff_link_section_info *section_info;
-  /* Symbol index of last C_FILE symbol (-1 if none).  */
-  long last_file_index;
-  /* Contents of last C_FILE symbol.  */
-  struct internal_syment last_file;
-  /* Symbol index of first aux entry of last .bf symbol with an empty
-     endndx field (-1 if none).  */
-  long last_bf_index;
-  /* Contents of last_bf_index aux entry.  */
-  union internal_auxent last_bf;
-  /* Hash table used to merge debug information.  */
-  struct coff_debug_merge_hash_table debug_merge;
-  /* Buffer large enough to hold swapped symbols of any input file.  */
-  struct internal_syment *internal_syms;
-  /* Buffer large enough to hold sections of symbols of any input file.  */
-  asection **sec_ptrs;
-  /* Buffer large enough to hold output indices of symbols of any
-     input file.  */
-  long *sym_indices;
-  /* Buffer large enough to hold output symbols for any input file.  */
-  bfd_byte *outsyms;
-  /* Buffer large enough to hold external line numbers for any input
-     section.  */
-  bfd_byte *linenos;
-  /* Buffer large enough to hold any input section.  */
-  bfd_byte *contents;
-  /* Buffer large enough to hold external relocs of any input section.  */
-  bfd_byte *external_relocs;
-  /* Buffer large enough to hold swapped relocs of any input section.  */
-  struct internal_reloc *internal_relocs;
-};
-
-extern struct bfd_hash_entry *_bfd_coff_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_link_hash_table_init
-  PARAMS ((struct coff_link_hash_table *, bfd *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-extern struct bfd_link_hash_table *_bfd_coff_link_hash_table_create
-  PARAMS ((bfd *));
-extern const char *_bfd_coff_internal_syment_name
-  PARAMS ((bfd *, const struct internal_syment *, char *));
-extern boolean _bfd_coff_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_coff_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern struct internal_reloc *_bfd_coff_read_internal_relocs
-  PARAMS ((bfd *, asection *, boolean, bfd_byte *, boolean,
-	   struct internal_reloc *));
-extern boolean _bfd_coff_generic_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-
-extern struct bfd_hash_entry *_bfd_coff_debug_merge_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_write_global_sym
-  PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_write_task_globals
-  PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_link_input_bfd
-  PARAMS ((struct coff_final_link_info *, bfd *));
-extern boolean _bfd_coff_reloc_link_order
-  PARAMS ((bfd *, struct coff_final_link_info *, asection *,
-	   struct bfd_link_order *));
-
-
-#define coff_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-/* Functions in xcofflink.c.  */
-
-extern long _bfd_xcoff_get_dynamic_symtab_upper_bound PARAMS ((bfd *));
-extern long _bfd_xcoff_canonicalize_dynamic_symtab
-  PARAMS ((bfd *, asymbol **));
-extern long _bfd_xcoff_get_dynamic_reloc_upper_bound PARAMS ((bfd *));
-extern long _bfd_xcoff_canonicalize_dynamic_reloc
-  PARAMS ((bfd *, arelent **, asymbol **));
-extern struct bfd_link_hash_table *_bfd_xcoff_bfd_link_hash_table_create
-  PARAMS ((bfd *));
-extern boolean _bfd_xcoff_bfd_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_xcoff_bfd_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_ppc_xcoff_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-
-/* Functions in coff-ppc.c.  FIXME: These are called be pe.em in the
-   linker, and so should start with bfd and be declared in bfd.h.  */
-
-extern boolean ppc_allocate_toc_section PARAMS ((struct bfd_link_info *));
-extern boolean ppc_process_before_allocation
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* And more taken from the source .. */
-
diff --git a/bfd/libcoff.h b/bfd/libcoff.h
deleted file mode 100644
index c418a4d4667..00000000000
--- a/bfd/libcoff.h
+++ /dev/null
@@ -1,888 +0,0 @@
-/* BFD COFF object file private structure.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-** NOTE: libcoff.h is a GENERATED file.  Don't change it; instead,
-** change libcoff-in.h or coffcode.h.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfdlink.h"
-
-/* Object file tdata; access macros */
-
-#define coff_data(bfd)		((bfd)->tdata.coff_obj_data)
-#define exec_hdr(bfd)		(coff_data(bfd)->hdr)
-#define obj_pe(bfd)             (coff_data(bfd)->pe)
-#define obj_symbols(bfd)	(coff_data(bfd)->symbols)
-#define	obj_sym_filepos(bfd)	(coff_data(bfd)->sym_filepos)
-
-#define obj_relocbase(bfd)	(coff_data(bfd)->relocbase)
-#define obj_raw_syments(bfd)	(coff_data(bfd)->raw_syments)
-#define obj_raw_syment_count(bfd)	(coff_data(bfd)->raw_syment_count)
-#define obj_convert(bfd)	(coff_data(bfd)->conversion_table)
-#define obj_conv_table_size(bfd) (coff_data(bfd)->conv_table_size)
-
-#define obj_coff_external_syms(bfd) (coff_data (bfd)->external_syms)
-#define obj_coff_keep_syms(bfd)	(coff_data (bfd)->keep_syms)
-#define obj_coff_strings(bfd)	(coff_data (bfd)->strings)
-#define obj_coff_keep_strings(bfd) (coff_data (bfd)->keep_strings)
-#define obj_coff_sym_hashes(bfd) (coff_data (bfd)->sym_hashes)
-
-#define obj_coff_local_toc_table(bfd) (coff_data(bfd)->local_toc_sym_map)
-
-/* `Tdata' information kept for COFF files.  */
-
-typedef struct coff_tdata
-{
-  struct   coff_symbol_struct *symbols;	/* symtab for input bfd */
-  unsigned int *conversion_table;
-  int conv_table_size;
-  file_ptr sym_filepos;
-
-  struct coff_ptr_struct *raw_syments;
-  unsigned int raw_syment_count;
-
-  /* These are only valid once writing has begun */
-  long int relocbase;
-
-  /* These members communicate important constants about the symbol table
-     to GDB's symbol-reading code.  These `constants' unfortunately vary
-     from coff implementation to implementation...  */
-  unsigned local_n_btmask;
-  unsigned local_n_btshft;
-  unsigned local_n_tmask;
-  unsigned local_n_tshift;
-  unsigned local_symesz;
-  unsigned local_auxesz;
-  unsigned local_linesz;
-
-  /* The unswapped external symbols.  May be NULL.  Read by
-     _bfd_coff_get_external_symbols.  */
-  PTR external_syms;
-  /* If this is true, the external_syms may not be freed.  */
-  boolean keep_syms;
-
-  /* The string table.  May be NULL.  Read by
-     _bfd_coff_read_string_table.  */
-  char *strings;
-  /* If this is true, the strings may not be freed.  */
-  boolean keep_strings;
-
-  /* is this a PE format coff file */
-  int pe;
-  /* Used by the COFF backend linker.  */
-  struct coff_link_hash_entry **sym_hashes;
-
-  /* used by the pe linker for PowerPC */
-  int *local_toc_sym_map;
-
-  struct bfd_link_info *link_info;
-
-  /* Used by coff_find_nearest_line.  */
-  PTR line_info;
-
-  /* Copy of some of the f_flags bits in the COFF filehdr structure,
-     used by ARM code.  */
-  flagword flags;
-
-} coff_data_type;
-
-/* Tdata for pe image files. */
-typedef struct pe_tdata
-{
-  coff_data_type coff;
-  struct internal_extra_pe_aouthdr pe_opthdr;
-  int dll;
-  int has_reloc_section;
-  boolean (*in_reloc_p) PARAMS((bfd *, reloc_howto_type *));
-  flagword real_flags;
-} pe_data_type;
-
-#define pe_data(bfd)		((bfd)->tdata.pe_obj_data)
-
-/* Tdata for XCOFF files.  */
-
-struct xcoff_tdata
-{
-  /* Basic COFF information.  */
-  coff_data_type coff;
-
-  /* True if a large a.out header should be generated.  */
-  boolean full_aouthdr;
-
-  /* TOC value.  */
-  bfd_vma toc;
-
-  /* Index of section holding TOC.  */
-  int sntoc;
-
-  /* Index of section holding entry point.  */
-  int snentry;
-
-  /* .text alignment from optional header.  */
-  int text_align_power;
-
-  /* .data alignment from optional header.  */
-  int data_align_power;
-
-  /* modtype from optional header.  */
-  short modtype;
-
-  /* cputype from optional header.  */
-  short cputype;
-
-  /* maxdata from optional header.  */
-  bfd_size_type maxdata;
-
-  /* maxstack from optional header.  */
-  bfd_size_type maxstack;
-
-  /* Used by the XCOFF backend linker.  */
-  asection **csects;
-  unsigned long *debug_indices;
-  unsigned int import_file_id;
-};
-
-#define xcoff_data(abfd) ((abfd)->tdata.xcoff_obj_data)
-
-/* We take the address of the first element of a asymbol to ensure that the
- * macro is only ever applied to an asymbol.  */
-#define coffsymbol(asymbol) ((coff_symbol_type *)(&((asymbol)->the_bfd)))
-
-/* The used_by_bfd field of a section may be set to a pointer to this
-   structure.  */
-
-struct coff_section_tdata
-{
-  /* The relocs, swapped into COFF internal form.  This may be NULL.  */
-  struct internal_reloc *relocs;
-  /* If this is true, the relocs entry may not be freed.  */
-  boolean keep_relocs;
-  /* The section contents.  This may be NULL.  */
-  bfd_byte *contents;
-  /* If this is true, the contents entry may not be freed.  */
-  boolean keep_contents;
-  /* Information cached by coff_find_nearest_line.  */
-  bfd_vma offset;
-  unsigned int i;
-  const char *function;
-  int line_base;
-  /* A pointer used for .stab linking optimizations.  */
-  PTR stab_info;
-  /* Available for individual backends.  */
-  PTR tdata;
-};
-
-/* An accessor macro for the coff_section_tdata structure.  */
-#define coff_section_data(abfd, sec) \
-  ((struct coff_section_tdata *) (sec)->used_by_bfd)
-
-/* Tdata for sections in XCOFF files.  This is used by the linker.  */
-
-struct xcoff_section_tdata
-{
-  /* Used for XCOFF csects created by the linker; points to the real
-     XCOFF section which contains this csect.  */
-  asection *enclosing;
-  /* The lineno_count field for the enclosing section, because we are
-     going to clobber it there.  */
-  unsigned int lineno_count;
-  /* The first and one past the last symbol indices for symbols used
-     by this csect.  */
-  unsigned long first_symndx;
-  unsigned long last_symndx;
-};
-
-/* An accessor macro the xcoff_section_tdata structure.  */
-#define xcoff_section_data(abfd, sec) \
-  ((struct xcoff_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
-
-/* Tdata for sections in PEI image files.  */
-
-struct pei_section_tdata
-{
-  /* The virtual size of the section.  */
-  bfd_size_type virt_size;
-};
-
-/* An accessor macro for the pei_section_tdata structure.  */
-#define pei_section_data(abfd, sec) \
-  ((struct pei_section_tdata *) coff_section_data ((abfd), (sec))->tdata)
-
-/* COFF linker hash table entries.  */
-
-struct coff_link_hash_entry
-{
-  struct bfd_link_hash_entry root;
-
-  /* Symbol index in output file.  Set to -1 initially.  Set to -2 if
-     there is a reloc against this symbol.  */
-  long indx;
-
-  /* Symbol type.  */
-  unsigned short type;
-
-  /* Symbol class.  */
-  unsigned char class;
-
-  /* Number of auxiliary entries.  */
-  char numaux;
-
-  /* BFD to take auxiliary entries from.  */
-  bfd *auxbfd;
-
-  /* Pointer to array of auxiliary entries, if any.  */
-  union internal_auxent *aux;
-};
-
-/* COFF linker hash table.  */
-
-struct coff_link_hash_table
-{
-  struct bfd_link_hash_table root;
-  /* A pointer to information used to link stabs in sections.  */
-  PTR stab_info;
-};
-
-/* Look up an entry in a COFF linker hash table.  */
-
-#define coff_link_hash_lookup(table, string, create, copy, follow)	\
-  ((struct coff_link_hash_entry *)					\
-   bfd_link_hash_lookup (&(table)->root, (string), (create),		\
-			 (copy), (follow)))
-
-/* Traverse a COFF linker hash table.  */
-
-#define coff_link_hash_traverse(table, func, info)			\
-  (bfd_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the COFF linker hash table from a link_info structure.  */
-
-#define coff_hash_table(p) ((struct coff_link_hash_table *) ((p)->hash))
-
-/* Functions in coffgen.c.  */
-extern const bfd_target *coff_object_p PARAMS ((bfd *));
-extern struct sec *coff_section_from_bfd_index PARAMS ((bfd *, int));
-extern long coff_get_symtab_upper_bound PARAMS ((bfd *));
-extern long coff_get_symtab PARAMS ((bfd *, asymbol **));
-extern int coff_count_linenumbers PARAMS ((bfd *));
-extern struct coff_symbol_struct *coff_symbol_from PARAMS ((bfd *, asymbol *));
-extern boolean coff_renumber_symbols PARAMS ((bfd *, int *));
-extern void coff_mangle_symbols PARAMS ((bfd *));
-extern boolean coff_write_symbols PARAMS ((bfd *));
-extern boolean coff_write_linenumbers PARAMS ((bfd *));
-extern alent *coff_get_lineno PARAMS ((bfd *, asymbol *));
-extern asymbol *coff_section_symbol PARAMS ((bfd *, char *));
-extern boolean _bfd_coff_get_external_symbols PARAMS ((bfd *));
-extern const char *_bfd_coff_read_string_table PARAMS ((bfd *));
-extern boolean _bfd_coff_free_symbols PARAMS ((bfd *));
-extern struct coff_ptr_struct *coff_get_normalized_symtab PARAMS ((bfd *));
-extern long coff_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-extern asymbol *coff_make_empty_symbol PARAMS ((bfd *));
-extern void coff_print_symbol PARAMS ((bfd *, PTR filep, asymbol *,
-				       bfd_print_symbol_type how));
-extern void coff_get_symbol_info PARAMS ((bfd *, asymbol *,
-					  symbol_info *ret));
-extern boolean _bfd_coff_is_local_label_name PARAMS ((bfd *, const char *));
-extern asymbol *coff_bfd_make_debug_symbol PARAMS ((bfd *, PTR,
-						    unsigned long));
-extern boolean coff_find_nearest_line PARAMS ((bfd *,
-					       asection *,
-					       asymbol **,
-					       bfd_vma offset,
-					       CONST char **filename_ptr,
-					       CONST char **functionname_ptr,
-					       unsigned int *line_ptr));
-extern int coff_sizeof_headers PARAMS ((bfd *, boolean reloc));
-extern boolean bfd_coff_reloc16_relax_section
-  PARAMS ((bfd *, asection *, struct bfd_link_info *, boolean *));
-extern bfd_byte *bfd_coff_reloc16_get_relocated_section_contents
-  PARAMS ((bfd *, struct bfd_link_info *, struct bfd_link_order *,
-	   bfd_byte *, boolean relocateable, asymbol **));
-extern bfd_vma bfd_coff_reloc16_get_value PARAMS ((arelent *,
-						   struct bfd_link_info *,
-						   asection *));
-extern void bfd_perform_slip PARAMS ((bfd *abfd, unsigned int slip,
-				      asection *input_section,
-				      bfd_vma val));
-
-/* Functions and types in cofflink.c.  */
-
-#define STRING_SIZE_SIZE (4)
-
-/* We use a hash table to merge identical enum, struct, and union
-   definitions in the linker.  */
-
-/* Information we keep for a single element (an enum value, a
-   structure or union field) in the debug merge hash table.  */
-
-struct coff_debug_merge_element
-{
-  /* Next element.  */
-  struct coff_debug_merge_element *next;
-
-  /* Name.  */
-  const char *name;
-
-  /* Type.  */
-  unsigned int type;
-
-  /* Symbol index for complex type.  */
-  long tagndx;
-};
-
-/* A linked list of debug merge entries for a given name.  */
-
-struct coff_debug_merge_type
-{
-  /* Next type with the same name.  */
-  struct coff_debug_merge_type *next;
-
-  /* Class of type.  */
-  int class;
-
-  /* Symbol index where this type is defined.  */
-  long indx;
-
-  /* List of elements.  */
-  struct coff_debug_merge_element *elements;
-};
-
-/* Information we store in the debug merge hash table.  */
-
-struct coff_debug_merge_hash_entry
-{
-  struct bfd_hash_entry root;
-
-  /* A list of types with this name.  */
-  struct coff_debug_merge_type *types;
-};
-
-/* The debug merge hash table.  */
-
-struct coff_debug_merge_hash_table
-{
-  struct bfd_hash_table root;
-};
-
-/* Initialize a COFF debug merge hash table.  */
-
-#define coff_debug_merge_hash_table_init(table) \
-  (bfd_hash_table_init (&(table)->root, _bfd_coff_debug_merge_hash_newfunc))
-
-/* Free a COFF debug merge hash table.  */
-
-#define coff_debug_merge_hash_table_free(table) \
-  (bfd_hash_table_free (&(table)->root))
-
-/* Look up an entry in a COFF debug merge hash table.  */
-
-#define coff_debug_merge_hash_lookup(table, string, create, copy) \
-  ((struct coff_debug_merge_hash_entry *) \
-   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-
-/* Information we keep for each section in the output file when doing
-   a relocateable link.  */
-
-struct coff_link_section_info
-{
-  /* The relocs to be output.  */
-  struct internal_reloc *relocs;
-  /* For each reloc against a global symbol whose index was not known
-     when the reloc was handled, the global hash table entry.  */
-  struct coff_link_hash_entry **rel_hashes;
-};
-
-/* Information that we pass around while doing the final link step.  */
-
-struct coff_final_link_info
-{
-  /* General link information.  */
-  struct bfd_link_info *info;
-  /* Output BFD.  */
-  bfd *output_bfd;
-  /* Used to indicate failure in traversal routine.  */
-  boolean failed;
-  /* If doing "task linking" set only during the time when we want the
-     global symbol writer to convert the storage class of defined global
-     symbols from global to static. */
-  boolean global_to_static;
-  /* Hash table for long symbol names.  */
-  struct bfd_strtab_hash *strtab;
-  /* When doing a relocateable link, an array of information kept for
-     each output section, indexed by the target_index field.  */
-  struct coff_link_section_info *section_info;
-  /* Symbol index of last C_FILE symbol (-1 if none).  */
-  long last_file_index;
-  /* Contents of last C_FILE symbol.  */
-  struct internal_syment last_file;
-  /* Symbol index of first aux entry of last .bf symbol with an empty
-     endndx field (-1 if none).  */
-  long last_bf_index;
-  /* Contents of last_bf_index aux entry.  */
-  union internal_auxent last_bf;
-  /* Hash table used to merge debug information.  */
-  struct coff_debug_merge_hash_table debug_merge;
-  /* Buffer large enough to hold swapped symbols of any input file.  */
-  struct internal_syment *internal_syms;
-  /* Buffer large enough to hold sections of symbols of any input file.  */
-  asection **sec_ptrs;
-  /* Buffer large enough to hold output indices of symbols of any
-     input file.  */
-  long *sym_indices;
-  /* Buffer large enough to hold output symbols for any input file.  */
-  bfd_byte *outsyms;
-  /* Buffer large enough to hold external line numbers for any input
-     section.  */
-  bfd_byte *linenos;
-  /* Buffer large enough to hold any input section.  */
-  bfd_byte *contents;
-  /* Buffer large enough to hold external relocs of any input section.  */
-  bfd_byte *external_relocs;
-  /* Buffer large enough to hold swapped relocs of any input section.  */
-  struct internal_reloc *internal_relocs;
-};
-
-extern struct bfd_hash_entry *_bfd_coff_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_link_hash_table_init
-  PARAMS ((struct coff_link_hash_table *, bfd *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-extern struct bfd_link_hash_table *_bfd_coff_link_hash_table_create
-  PARAMS ((bfd *));
-extern const char *_bfd_coff_internal_syment_name
-  PARAMS ((bfd *, const struct internal_syment *, char *));
-extern boolean _bfd_coff_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_coff_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern struct internal_reloc *_bfd_coff_read_internal_relocs
-  PARAMS ((bfd *, asection *, boolean, bfd_byte *, boolean,
-	   struct internal_reloc *));
-extern boolean _bfd_coff_generic_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-
-extern struct bfd_hash_entry *_bfd_coff_debug_merge_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-extern boolean _bfd_coff_write_global_sym
-  PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_write_task_globals
-  PARAMS ((struct coff_link_hash_entry *, PTR));
-extern boolean _bfd_coff_link_input_bfd
-  PARAMS ((struct coff_final_link_info *, bfd *));
-extern boolean _bfd_coff_reloc_link_order
-  PARAMS ((bfd *, struct coff_final_link_info *, asection *,
-	   struct bfd_link_order *));
-
-
-#define coff_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-/* Functions in xcofflink.c.  */
-
-extern long _bfd_xcoff_get_dynamic_symtab_upper_bound PARAMS ((bfd *));
-extern long _bfd_xcoff_canonicalize_dynamic_symtab
-  PARAMS ((bfd *, asymbol **));
-extern long _bfd_xcoff_get_dynamic_reloc_upper_bound PARAMS ((bfd *));
-extern long _bfd_xcoff_canonicalize_dynamic_reloc
-  PARAMS ((bfd *, arelent **, asymbol **));
-extern struct bfd_link_hash_table *_bfd_xcoff_bfd_link_hash_table_create
-  PARAMS ((bfd *));
-extern boolean _bfd_xcoff_bfd_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_xcoff_bfd_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_ppc_xcoff_relocate_section
-  PARAMS ((bfd *, struct bfd_link_info *, bfd *, asection *, bfd_byte *,
-	   struct internal_reloc *, struct internal_syment *, asection **));
-
-/* Functions in coff-ppc.c.  FIXME: These are called be pe.em in the
-   linker, and so should start with bfd and be declared in bfd.h.  */
-
-extern boolean ppc_allocate_toc_section PARAMS ((struct bfd_link_info *));
-extern boolean ppc_process_before_allocation
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* And more taken from the source .. */
-
-typedef struct coff_ptr_struct
-{
-
-        /* Remembers the offset from the first symbol in the file for
-          this symbol. Generated by coff_renumber_symbols. */
-unsigned int offset;
-
-        /* Should the value of this symbol be renumbered.  Used for
-          XCOFF C_BSTAT symbols.  Set by coff_slurp_symbol_table.  */
-unsigned int fix_value : 1;
-
-        /* Should the tag field of this symbol be renumbered.
-          Created by coff_pointerize_aux. */
-unsigned int fix_tag : 1;
-
-        /* Should the endidx field of this symbol be renumbered.
-          Created by coff_pointerize_aux. */
-unsigned int fix_end : 1;
-
-        /* Should the x_csect.x_scnlen field be renumbered.
-          Created by coff_pointerize_aux. */
-unsigned int fix_scnlen : 1;
-
-        /* Fix up an XCOFF C_BINCL/C_EINCL symbol.  The value is the
-          index into the line number entries.  Set by
-          coff_slurp_symbol_table.  */
-unsigned int fix_line : 1;
-
-        /* The container for the symbol structure as read and translated
-           from the file. */
-
-union {
-   union internal_auxent auxent;
-   struct internal_syment syment;
- } u;
-} combined_entry_type;
-
-
- /* Each canonical asymbol really looks like this: */
-
-typedef struct coff_symbol_struct
-{
-    /* The actual symbol which the rest of BFD works with */
-asymbol symbol;
-
-    /* A pointer to the hidden information for this symbol */
-combined_entry_type *native;
-
-    /* A pointer to the linenumber information for this symbol */
-struct lineno_cache_entry *lineno;
-
-    /* Have the line numbers been relocated yet ? */
-boolean done_lineno;
-} coff_symbol_type;
-typedef struct
-{
-  void (*_bfd_coff_swap_aux_in) PARAMS ((
-       bfd            *abfd,
-       PTR             ext,
-       int             type,
-       int             class,
-       int             indaux,
-       int             numaux,
-       PTR             in));
-
-  void (*_bfd_coff_swap_sym_in) PARAMS ((
-       bfd            *abfd ,
-       PTR             ext,
-       PTR             in));
-
-  void (*_bfd_coff_swap_lineno_in) PARAMS ((
-       bfd            *abfd,
-       PTR            ext,
-       PTR             in));
-
- unsigned int (*_bfd_coff_swap_aux_out) PARAMS ((
-       bfd     *abfd,
-       PTR     in,
-       int     type,
-       int     class,
-       int     indaux,
-       int     numaux,
-       PTR     ext));
-
- unsigned int (*_bfd_coff_swap_sym_out) PARAMS ((
-      bfd      *abfd,
-      PTR      in,
-      PTR      ext));
-
- unsigned int (*_bfd_coff_swap_lineno_out) PARAMS ((
-       bfd     *abfd,
-       PTR     in,
-       PTR     ext));
-
- unsigned int (*_bfd_coff_swap_reloc_out) PARAMS ((
-       bfd     *abfd,
-       PTR     src,
-       PTR     dst));
-
- unsigned int (*_bfd_coff_swap_filehdr_out) PARAMS ((
-       bfd     *abfd,
-       PTR     in,
-       PTR     out));
-
- unsigned int (*_bfd_coff_swap_aouthdr_out) PARAMS ((
-       bfd     *abfd,
-       PTR     in,
-       PTR     out));
-
- unsigned int (*_bfd_coff_swap_scnhdr_out) PARAMS ((
-       bfd     *abfd,
-       PTR     in,
-       PTR     out));
-
- unsigned int _bfd_filhsz;
- unsigned int _bfd_aoutsz;
- unsigned int _bfd_scnhsz;
- unsigned int _bfd_symesz;
- unsigned int _bfd_auxesz;
- unsigned int _bfd_relsz;
- unsigned int _bfd_linesz;
- boolean _bfd_coff_long_filenames;
- boolean _bfd_coff_long_section_names;
- unsigned int _bfd_coff_default_section_alignment_power;
- void (*_bfd_coff_swap_filehdr_in) PARAMS ((
-       bfd     *abfd,
-       PTR     ext,
-       PTR     in));
- void (*_bfd_coff_swap_aouthdr_in) PARAMS ((
-       bfd     *abfd,
-       PTR     ext,
-       PTR     in));
- void (*_bfd_coff_swap_scnhdr_in) PARAMS ((
-       bfd     *abfd,
-       PTR     ext,
-       PTR     in));
- void (*_bfd_coff_swap_reloc_in) PARAMS ((
-       bfd     *abfd,
-       PTR     ext,
-       PTR     in));
- boolean (*_bfd_coff_bad_format_hook) PARAMS ((
-       bfd     *abfd,
-       PTR     internal_filehdr));
- boolean (*_bfd_coff_set_arch_mach_hook) PARAMS ((
-       bfd     *abfd,
-       PTR     internal_filehdr));
- PTR (*_bfd_coff_mkobject_hook) PARAMS ((
-       bfd     *abfd,
-       PTR     internal_filehdr,
-       PTR     internal_aouthdr));
- flagword (*_bfd_styp_to_sec_flags_hook) PARAMS ((
-       bfd     *abfd,
-       PTR     internal_scnhdr,
-       const char *name));
- void (*_bfd_set_alignment_hook) PARAMS ((
-       bfd     *abfd,
-       asection *sec,
-       PTR     internal_scnhdr));
- boolean (*_bfd_coff_slurp_symbol_table) PARAMS ((
-       bfd     *abfd));
- boolean (*_bfd_coff_symname_in_debug) PARAMS ((
-       bfd     *abfd,
-       struct internal_syment *sym));
- boolean (*_bfd_coff_pointerize_aux_hook) PARAMS ((
-       bfd *abfd,
-       combined_entry_type *table_base,
-       combined_entry_type *symbol,
-       unsigned int indaux,
-       combined_entry_type *aux));
- boolean (*_bfd_coff_print_aux) PARAMS ((
-       bfd *abfd,
-       FILE *file,
-       combined_entry_type *table_base,
-       combined_entry_type *symbol,
-       combined_entry_type *aux,
-       unsigned int indaux));
- void (*_bfd_coff_reloc16_extra_cases) PARAMS ((
-       bfd     *abfd,
-       struct bfd_link_info *link_info,
-       struct bfd_link_order *link_order,
-       arelent *reloc,
-       bfd_byte *data,
-       unsigned int *src_ptr,
-       unsigned int *dst_ptr));
- int (*_bfd_coff_reloc16_estimate) PARAMS ((
-       bfd *abfd,
-       asection *input_section,
-       arelent *r,
-       unsigned int shrink,
-       struct bfd_link_info *link_info));
- boolean (*_bfd_coff_sym_is_global) PARAMS ((
-       bfd *abfd,
-       struct internal_syment *));
- boolean (*_bfd_coff_compute_section_file_positions) PARAMS ((
-       bfd *abfd));
- boolean (*_bfd_coff_start_final_link) PARAMS ((
-       bfd *output_bfd,
-       struct bfd_link_info *info));
- boolean (*_bfd_coff_relocate_section) PARAMS ((
-       bfd *output_bfd,
-       struct bfd_link_info *info,
-       bfd *input_bfd,
-       asection *input_section,
-       bfd_byte *contents,
-       struct internal_reloc *relocs,
-       struct internal_syment *syms,
-       asection **sections));
- reloc_howto_type *(*_bfd_coff_rtype_to_howto) PARAMS ((
-       bfd *abfd,
-       asection *sec,
-       struct internal_reloc *rel,
-       struct coff_link_hash_entry *h,
-       struct internal_syment *sym,
-       bfd_vma *addendp));
- boolean (*_bfd_coff_adjust_symndx) PARAMS ((
-       bfd *obfd,
-       struct bfd_link_info *info,
-       bfd *ibfd,
-       asection *sec,
-       struct internal_reloc *reloc,
-       boolean *adjustedp));
- boolean (*_bfd_coff_link_add_one_symbol) PARAMS ((
-       struct bfd_link_info *info,
-       bfd *abfd,
-       const char *name,
-       flagword flags, 
-       asection *section,
-       bfd_vma value,
-       const char *string,
-       boolean copy,
-       boolean collect, 
-       struct bfd_link_hash_entry **hashp));
-
- boolean (*_bfd_coff_link_output_has_begun) PARAMS ((
-       bfd * abfd,
-       struct coff_final_link_info * pfinfo));
- boolean (*_bfd_coff_final_link_postscript) PARAMS ((
-       bfd * abfd,
-       struct coff_final_link_info * pfinfo));
-
-} bfd_coff_backend_data;
-
-#define coff_backend_info(abfd) ((bfd_coff_backend_data *) (abfd)->xvec->backend_data)
-
-#define bfd_coff_swap_aux_in(a,e,t,c,ind,num,i) \
-        ((coff_backend_info (a)->_bfd_coff_swap_aux_in) (a,e,t,c,ind,num,i))
-
-#define bfd_coff_swap_sym_in(a,e,i) \
-        ((coff_backend_info (a)->_bfd_coff_swap_sym_in) (a,e,i))
-
-#define bfd_coff_swap_lineno_in(a,e,i) \
-        ((coff_backend_info ( a)->_bfd_coff_swap_lineno_in) (a,e,i))
-
-#define bfd_coff_swap_reloc_out(abfd, i, o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_out) (abfd, i, o))
-
-#define bfd_coff_swap_lineno_out(abfd, i, o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_lineno_out) (abfd, i, o))
-
-#define bfd_coff_swap_aux_out(a,i,t,c,ind,num,o) \
-        ((coff_backend_info (a)->_bfd_coff_swap_aux_out) (a,i,t,c,ind,num,o))
-
-#define bfd_coff_swap_sym_out(abfd, i,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_sym_out) (abfd, i, o))
-
-#define bfd_coff_swap_scnhdr_out(abfd, i,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_out) (abfd, i, o))
-
-#define bfd_coff_swap_filehdr_out(abfd, i,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_out) (abfd, i, o))
-
-#define bfd_coff_swap_aouthdr_out(abfd, i,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_out) (abfd, i, o))
-
-#define bfd_coff_filhsz(abfd) (coff_backend_info (abfd)->_bfd_filhsz)
-#define bfd_coff_aoutsz(abfd) (coff_backend_info (abfd)->_bfd_aoutsz)
-#define bfd_coff_scnhsz(abfd) (coff_backend_info (abfd)->_bfd_scnhsz)
-#define bfd_coff_symesz(abfd) (coff_backend_info (abfd)->_bfd_symesz)
-#define bfd_coff_auxesz(abfd) (coff_backend_info (abfd)->_bfd_auxesz)
-#define bfd_coff_relsz(abfd)  (coff_backend_info (abfd)->_bfd_relsz)
-#define bfd_coff_linesz(abfd) (coff_backend_info (abfd)->_bfd_linesz)
-#define bfd_coff_long_filenames(abfd) (coff_backend_info (abfd)->_bfd_coff_long_filenames)
-#define bfd_coff_long_section_names(abfd) \
-        (coff_backend_info (abfd)->_bfd_coff_long_section_names)
-#define bfd_coff_default_section_alignment_power(abfd) \
-        (coff_backend_info (abfd)->_bfd_coff_default_section_alignment_power)
-#define bfd_coff_swap_filehdr_in(abfd, i,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_filehdr_in) (abfd, i, o))
-
-#define bfd_coff_swap_aouthdr_in(abfd, i,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_aouthdr_in) (abfd, i, o))
-
-#define bfd_coff_swap_scnhdr_in(abfd, i,o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_scnhdr_in) (abfd, i, o))
-
-#define bfd_coff_swap_reloc_in(abfd, i, o) \
-        ((coff_backend_info (abfd)->_bfd_coff_swap_reloc_in) (abfd, i, o))
-
-#define bfd_coff_bad_format_hook(abfd, filehdr) \
-        ((coff_backend_info (abfd)->_bfd_coff_bad_format_hook) (abfd, filehdr))
-
-#define bfd_coff_set_arch_mach_hook(abfd, filehdr)\
-        ((coff_backend_info (abfd)->_bfd_coff_set_arch_mach_hook) (abfd, filehdr))
-#define bfd_coff_mkobject_hook(abfd, filehdr, aouthdr)\
-        ((coff_backend_info (abfd)->_bfd_coff_mkobject_hook) (abfd, filehdr, aouthdr))
-
-#define bfd_coff_styp_to_sec_flags_hook(abfd, scnhdr, name)\
-        ((coff_backend_info (abfd)->_bfd_styp_to_sec_flags_hook) (abfd, scnhdr, name))
-
-#define bfd_coff_set_alignment_hook(abfd, sec, scnhdr)\
-        ((coff_backend_info (abfd)->_bfd_set_alignment_hook) (abfd, sec, scnhdr))
-
-#define bfd_coff_slurp_symbol_table(abfd)\
-        ((coff_backend_info (abfd)->_bfd_coff_slurp_symbol_table) (abfd))
-
-#define bfd_coff_symname_in_debug(abfd, sym)\
-        ((coff_backend_info (abfd)->_bfd_coff_symname_in_debug) (abfd, sym))
-
-#define bfd_coff_print_aux(abfd, file, base, symbol, aux, indaux)\
-        ((coff_backend_info (abfd)->_bfd_coff_print_aux)\
-         (abfd, file, base, symbol, aux, indaux))
-
-#define bfd_coff_reloc16_extra_cases(abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr)\
-        ((coff_backend_info (abfd)->_bfd_coff_reloc16_extra_cases)\
-         (abfd, link_info, link_order, reloc, data, src_ptr, dst_ptr))
-
-#define bfd_coff_reloc16_estimate(abfd, section, reloc, shrink, link_info)\
-        ((coff_backend_info (abfd)->_bfd_coff_reloc16_estimate)\
-         (abfd, section, reloc, shrink, link_info))
-
-#define bfd_coff_sym_is_global(abfd, sym)\
-        ((coff_backend_info (abfd)->_bfd_coff_sym_is_global)\
-         (abfd, sym))
-
-#define bfd_coff_compute_section_file_positions(abfd)\
-        ((coff_backend_info (abfd)->_bfd_coff_compute_section_file_positions)\
-         (abfd))
-
-#define bfd_coff_start_final_link(obfd, info)\
-        ((coff_backend_info (obfd)->_bfd_coff_start_final_link)\
-         (obfd, info))
-#define bfd_coff_relocate_section(obfd,info,ibfd,o,con,rel,isyms,secs)\
-        ((coff_backend_info (ibfd)->_bfd_coff_relocate_section)\
-         (obfd, info, ibfd, o, con, rel, isyms, secs))
-#define bfd_coff_rtype_to_howto(abfd, sec, rel, h, sym, addendp)\
-        ((coff_backend_info (abfd)->_bfd_coff_rtype_to_howto)\
-         (abfd, sec, rel, h, sym, addendp))
-#define bfd_coff_adjust_symndx(obfd, info, ibfd, sec, rel, adjustedp)\
-        ((coff_backend_info (abfd)->_bfd_coff_adjust_symndx)\
-         (obfd, info, ibfd, sec, rel, adjustedp))
-#define bfd_coff_link_add_one_symbol(info,abfd,name,flags,section,value,string,cp,coll,hashp)\
-        ((coff_backend_info (abfd)->_bfd_coff_link_add_one_symbol)\
-         (info, abfd, name, flags, section, value, string, cp, coll, hashp))
-
-#define bfd_coff_link_output_has_begun(a,p) \
-        ((coff_backend_info (a)->_bfd_coff_link_output_has_begun) (a,p))
-#define bfd_coff_final_link_postscript(a,p) \
-        ((coff_backend_info (a)->_bfd_coff_final_link_postscript) (a,p))
-
diff --git a/bfd/libecoff.h b/bfd/libecoff.h
deleted file mode 100644
index ad269a52f5d..00000000000
--- a/bfd/libecoff.h
+++ /dev/null
@@ -1,357 +0,0 @@
-/* BFD ECOFF object file private structure.
-   Copyright (C) 1993, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfdlink.h"
-
-#ifndef ECOFF_H
-#include "coff/ecoff.h"
-#endif
-
-/* This is the backend information kept for ECOFF files.  This
-   structure is constant for a particular backend.  The first element
-   is the COFF backend data structure, so that ECOFF targets can use
-   the generic COFF code.  */
-
-#define ecoff_backend(abfd) \
-  ((struct ecoff_backend_data *) (abfd)->xvec->backend_data)
-
-struct ecoff_backend_data
-{
-  /* COFF backend information.  This must be the first field.  */
-  bfd_coff_backend_data coff;
-  /* Supported architecture.  */
-  enum bfd_architecture arch;
-  /* Initial portion of armap string.  */
-  const char *armap_start;
-  /* The page boundary used to align sections in a demand-paged
-     executable file.  E.g., 0x1000.  */
-  bfd_vma round;
-  /* True if the .rdata section is part of the text segment, as on the
-     Alpha.  False if .rdata is part of the data segment, as on the
-     MIPS.  */
-  boolean rdata_in_text;
-  /* Bitsize of constructor entries.  */
-  unsigned int constructor_bitsize;
-  /* Reloc to use for constructor entries.  */
-  reloc_howto_type *constructor_reloc;
-  /* How to swap debugging information.  */
-  struct ecoff_debug_swap debug_swap;
-  /* External reloc size.  */
-  bfd_size_type external_reloc_size;
-  /* Reloc swapping functions.  */
-  void (*swap_reloc_in) PARAMS ((bfd *, PTR, struct internal_reloc *));
-  void (*swap_reloc_out) PARAMS ((bfd *, const struct internal_reloc *, PTR));
-  /* Backend reloc tweaking.  */
-  void (*adjust_reloc_in) PARAMS ((bfd *, const struct internal_reloc *,
-				   arelent *));
-  void (*adjust_reloc_out) PARAMS ((bfd *, const arelent *,
-				    struct internal_reloc *));
-  /* Relocate section contents while linking.  */
-  boolean (*relocate_section) PARAMS ((bfd *output_bfd, struct bfd_link_info *,
-				       bfd *input_bfd, asection *input_section,
-				       bfd_byte *contents,
-				       PTR external_relocs));
-  /* Do final adjustments to filehdr and aouthdr.  */
-  boolean (*adjust_headers) PARAMS ((bfd *, struct internal_filehdr *,
-				     struct internal_aouthdr *));
-  /* Read an element from an archive at a given file position.  This
-     is needed because OSF/1 3.2 uses a weird archive format.  */
-  bfd *(*get_elt_at_filepos) PARAMS ((bfd *, file_ptr));
-};
-
-/* This is the target specific information kept for ECOFF files.  */
-
-#define ecoff_data(abfd) ((abfd)->tdata.ecoff_obj_data)
-
-typedef struct ecoff_tdata
-{
-  /* The reloc file position, set by
-     ecoff_compute_section_file_positions.  */
-  file_ptr reloc_filepos;
-
-  /* The symbol table file position, set by _bfd_ecoff_mkobject_hook.  */
-  file_ptr sym_filepos;
-
-  /* The start and end of the text segment.  Only valid for an
-     existing file, not for one we are creating.  */
-  unsigned long text_start;
-  unsigned long text_end;
-
-  /* The cached gp value.  This is used when relocating.  */
-  bfd_vma gp;
-
-  /* The maximum size of objects to optimize using gp.  This is
-     typically set by the -G option to the compiler, assembler or
-     linker.  */
-  unsigned int gp_size;
-
-  /* The register masks.  When linking, all the masks found in the
-     input files are combined into the masks of the output file.
-     These are not all used for all targets, but that's OK, because
-     the relevant ones are the only ones swapped in and out.  */
-  unsigned long gprmask;
-  unsigned long fprmask;
-  unsigned long cprmask[4];
-
-  /* The ECOFF symbolic debugging information.  */
-  struct ecoff_debug_info debug_info;
-
-  /* The unswapped ECOFF symbolic information.  */
-  PTR raw_syments;
-
-  /* The canonical BFD symbols.  */
-  struct ecoff_symbol_struct *canonical_symbols;
-
-  /* A mapping from external symbol numbers to entries in the linker
-     hash table, used when linking.  */
-  struct ecoff_link_hash_entry **sym_hashes;
-
-  /* A mapping from reloc symbol indices to sections, used when
-     linking.  */
-  asection **symndx_to_section;
-
-  /* True if this BFD was written by the backend linker.  */
-  boolean linker;
-
-  /* True if a warning that multiple global pointer values are
-     needed in the output binary was issued already.  */
-  boolean issued_multiple_gp_warning;
-
-  /* Used by find_nearest_line entry point.  The structure could be
-     included directly in this one, but there's no point to wasting
-     the memory just for the infrequently called find_nearest_line.  */
-  struct ecoff_find_line *find_line_info;
-
-  /* Whether the .rdata section is in the text segment for this
-     particular ECOFF file.  This is not valid until
-     ecoff_compute_section_file_positions is called.  */
-  boolean rdata_in_text;
-
-} ecoff_data_type;
-
-/* Each canonical asymbol really looks like this.  */
-
-typedef struct ecoff_symbol_struct
-{
-  /* The actual symbol which the rest of BFD works with */
-  asymbol symbol;
-
-  /* The fdr for this symbol.  */
-  FDR *fdr;
-
-  /* true if this is a local symbol rather than an external one.  */
-  boolean local;
-
-  /* A pointer to the unswapped hidden information for this symbol.
-     This is either a struct sym_ext or a struct ext_ext, depending on
-     the value of the local field above.  */
-  PTR native;
-} ecoff_symbol_type;
-
-/* We take the address of the first element of a asymbol to ensure that the
-   macro is only ever applied to an asymbol.  */
-#define ecoffsymbol(asymbol) ((ecoff_symbol_type *) (&((asymbol)->the_bfd)))
-
-/* We need to save the index of an external symbol when we write it
-   out so that can set the symbol index correctly when we write out
-   the relocs.  */
-#define ecoff_get_sym_index(symbol) ((symbol)->udata.i)
-#define ecoff_set_sym_index(symbol, idx) ((symbol)->udata.i = (idx))
-
-/* When generating MIPS embedded PIC code, the linker relaxes the code
-   to turn PC relative branches into longer code sequences when the PC
-   relative branch is out of range.  This involves reading the relocs
-   in bfd_relax_section as well as in bfd_final_link, and requires the
-   code to keep track of which relocs have been expanded.  A pointer
-   to this structure is put in the used_by_bfd pointer of a section to
-   keep track of this information.  The user_by_bfd pointer will be
-   NULL if the information was not needed.  */
-
-struct ecoff_section_tdata
-{
-  /* The unswapped relocs for this section.  These are stored in
-     memory so the input file does not have to be read twice.  */
-  PTR external_relocs;
-
-  /* The contents of the section.  These bytes may or may not be saved
-     in memory, but if it is this is a pointer to them.  */
-  bfd_byte *contents;
-
-  /* Offset adjustments for PC relative branches.  A number other than
-     1 is an addend for a PC relative branch, or a switch table entry
-     which is the difference of two .text locations; this addend
-     arises because the branch or difference crosses one or more
-     branches which were expanded into a larger code sequence.  A 1
-     means that this branch was itself expanded into a larger code
-     sequence.  1 is not a possible offset, since all offsets must be
-     multiples of the instruction size, which is 4; also, the only
-     relocs with non-zero offsets will be PC relative branches or
-     switch table entries within the same object file.  If this field
-     is NULL, no branches were expanded and no offsets are required.
-     Otherwise there are as many entries as there are relocs in the
-     section, and the entry for any reloc that is not PC relative is
-     zero.  */
-  long *offsets;
-
-  /* When producing an executable (i.e., final, non-relocatable link)
-     on the Alpha, we may need to use multiple global pointer values
-     to span the entire .lita section.  In essence, we allow each
-     input .lita section to have its own gp value.  To support this,
-     we need to keep track of the gp values that we picked for each
-     input .lita section . */
-  bfd_vma gp;
-};
-
-/* An accessor macro for the ecoff_section_tdata structure.  */
-#define ecoff_section_data(abfd, sec) \
-  ((struct ecoff_section_tdata *) (sec)->used_by_bfd)
-
-/* ECOFF linker hash table entries.  */
-
-struct ecoff_link_hash_entry
-{
-  struct bfd_link_hash_entry root;
-  /* Symbol index in output file.  */
-  long indx;
-  /* BFD that ext field value came from.  */
-  bfd *abfd;
-  /* ECOFF external symbol information.  */
-  EXTR esym;
-  /* Nonzero if this symbol has been written out.  */
-  char written;
-  /* Nonzero if this symbol was referred to as small undefined.  */
-  char small;
-};
-
-/* ECOFF linker hash table.  */
-
-struct ecoff_link_hash_table
-{
-  struct bfd_link_hash_table root;
-};
-
-/* Make an ECOFF object.  */
-extern boolean _bfd_ecoff_mkobject PARAMS ((bfd *));
-
-/* Read in the ECOFF symbolic debugging information.  */
-extern boolean _bfd_ecoff_slurp_symbolic_info
-  PARAMS ((bfd *, asection *, struct ecoff_debug_info *));
-
-/* Generic ECOFF BFD backend vectors.  */
-
-extern boolean _bfd_ecoff_write_object_contents PARAMS ((bfd *abfd));
-extern const bfd_target *_bfd_ecoff_archive_p PARAMS ((bfd *abfd));
-
-#define	_bfd_ecoff_close_and_cleanup _bfd_generic_close_and_cleanup
-#define _bfd_ecoff_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-extern boolean _bfd_ecoff_new_section_hook
-  PARAMS ((bfd *, asection *));
-extern boolean _bfd_ecoff_get_section_contents
-  PARAMS ((bfd *, asection *, PTR location, file_ptr, bfd_size_type));
-
-#define _bfd_ecoff_bfd_link_split_section _bfd_generic_link_split_section
-
-extern boolean _bfd_ecoff_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-#define _bfd_ecoff_bfd_copy_private_section_data \
-  _bfd_generic_bfd_copy_private_section_data
-
-#define _bfd_ecoff_bfd_copy_private_symbol_data \
-  _bfd_generic_bfd_copy_private_symbol_data
-
-#define _bfd_ecoff_bfd_print_private_bfd_data \
-  _bfd_generic_bfd_print_private_bfd_data
-
-#define _bfd_ecoff_bfd_merge_private_bfd_data \
-  _bfd_generic_bfd_merge_private_bfd_data
-
-#define _bfd_ecoff_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-extern boolean _bfd_ecoff_slurp_armap PARAMS ((bfd *abfd));
-#define _bfd_ecoff_slurp_extended_name_table _bfd_slurp_extended_name_table
-#define _bfd_ecoff_construct_extended_name_table \
-  _bfd_archive_bsd_construct_extended_name_table
-#define _bfd_ecoff_truncate_arname bfd_dont_truncate_arname
-extern boolean _bfd_ecoff_write_armap
-  PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int));
-#define _bfd_ecoff_read_ar_hdr _bfd_generic_read_ar_hdr
-#define _bfd_ecoff_openr_next_archived_file \
-  bfd_generic_openr_next_archived_file
-#define _bfd_ecoff_get_elt_at_index _bfd_generic_get_elt_at_index
-#define _bfd_ecoff_generic_stat_arch_elt bfd_generic_stat_arch_elt
-#define _bfd_ecoff_update_armap_timestamp bfd_true
-
-extern long _bfd_ecoff_get_symtab_upper_bound PARAMS ((bfd *abfd));
-extern long _bfd_ecoff_get_symtab PARAMS ((bfd *abfd, asymbol **alocation));
-extern asymbol *_bfd_ecoff_make_empty_symbol PARAMS ((bfd *abfd));
-extern void _bfd_ecoff_print_symbol
-  PARAMS ((bfd *, PTR filep, asymbol *, bfd_print_symbol_type));
-extern void _bfd_ecoff_get_symbol_info
-  PARAMS ((bfd *, asymbol *, symbol_info *));
-extern boolean _bfd_ecoff_bfd_is_local_label_name
-  PARAMS ((bfd *, const char *));
-#define _bfd_ecoff_get_lineno _bfd_nosymbols_get_lineno
-extern boolean _bfd_ecoff_find_nearest_line
-  PARAMS ((bfd *, asection *, asymbol **, bfd_vma offset,
-	   const char **filename_ptr, const char **fnname_ptr,
-	   unsigned int *retline_ptr));
-#define _bfd_ecoff_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define _bfd_ecoff_read_minisymbols _bfd_generic_read_minisymbols
-#define _bfd_ecoff_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define _bfd_ecoff_get_reloc_upper_bound coff_get_reloc_upper_bound
-extern long _bfd_ecoff_canonicalize_reloc
-  PARAMS ((bfd *, asection *, arelent **, asymbol **symbols));
-/* ecoff_bfd_reloc_type_lookup defined by backend. */
-
-extern boolean _bfd_ecoff_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long machine));
-extern boolean _bfd_ecoff_set_section_contents
-  PARAMS ((bfd *, asection *, PTR location, file_ptr, bfd_size_type));
-
-extern int _bfd_ecoff_sizeof_headers PARAMS ((bfd *abfd, boolean reloc));
-/* ecoff_bfd_get_relocated_section_contents defined by backend.  */
-/* ecoff_bfd_relax_section defined by backend.  */
-extern struct bfd_link_hash_table *_bfd_ecoff_bfd_link_hash_table_create
-  PARAMS ((bfd *));
-extern boolean _bfd_ecoff_bfd_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-extern boolean _bfd_ecoff_bfd_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Hook functions for the generic COFF section reading code.  */
-
-extern PTR _bfd_ecoff_mkobject_hook PARAMS ((bfd *, PTR filehdr, PTR aouthdr));
-#define _bfd_ecoff_set_alignment_hook \
-  ((void (*) PARAMS ((bfd *, asection *, PTR))) bfd_void)
-extern boolean _bfd_ecoff_set_arch_mach_hook PARAMS ((bfd *abfd, PTR filehdr));
-extern flagword _bfd_ecoff_styp_to_sec_flags
-  PARAMS ((bfd *abfd, PTR hdr, const char *name));
-extern boolean _bfd_ecoff_slurp_symbol_table PARAMS ((bfd *abfd));
-
-/* ECOFF auxiliary information swapping routines.  These are the same
-   for all ECOFF targets, so they are defined in ecofflink.c.  */
-
-extern void _bfd_ecoff_swap_tir_in
-  PARAMS ((int, const struct tir_ext *, TIR *));
-extern void _bfd_ecoff_swap_tir_out
-  PARAMS ((int, const TIR *, struct tir_ext *));
-extern void _bfd_ecoff_swap_rndx_in
-  PARAMS ((int, const struct rndx_ext *, RNDXR *));
-extern void _bfd_ecoff_swap_rndx_out
-  PARAMS ((int, const RNDXR *, struct rndx_ext *));
diff --git a/bfd/libhppa.h b/bfd/libhppa.h
deleted file mode 100644
index 35b40efe86e..00000000000
--- a/bfd/libhppa.h
+++ /dev/null
@@ -1,700 +0,0 @@
-/* HP PA-RISC SOM object file format:  definitions internal to BFD.
-   Copyright (C) 1990, 91, 92, 93, 94 , 95, 1996 Free Software Foundation, Inc.
-
-   Contributed by the Center for Software Science at the
-   University of Utah (pa-gdb-bugs@cs.utah.edu).
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _HPPA_H
-#define _HPPA_H
-
-#define BYTES_IN_WORD 4
-#define PA_PAGESIZE 0x1000
-
-#ifndef INLINE
-#ifdef __GNUC__
-#define INLINE inline
-#else
-#define INLINE
-#endif /* GNU C? */
-#endif /* INLINE */
-
-#if __GNUC__ >= 2 && __GNUC_MINOR__ >= 7
-/* Declare the functions with the unused attribute to avoid warnings.  */
-static INLINE unsigned int assemble_3 (unsigned int)
-     __attribute__ ((__unused__));
-static INLINE void dis_assemble_3 (unsigned int, unsigned int *)
-     __attribute__ ((__unused__));
-static INLINE unsigned int assemble_12 (unsigned int, unsigned int)
-     __attribute__ ((__unused__));
-static INLINE void dis_assemble_12 (unsigned int, unsigned int *,
-				    unsigned int *)
-     __attribute__ ((__unused__));
-static INLINE unsigned long assemble_17 (unsigned int, unsigned int,
-					 unsigned int)
-     __attribute__ ((__unused__));
-static INLINE void dis_assemble_17 (unsigned int, unsigned int *,
-				    unsigned int *, unsigned int *)
-     __attribute__ ((__unused__));
-static INLINE unsigned long assemble_21 (unsigned int)
-     __attribute ((__unused__));
-static INLINE void dis_assemble_21 (unsigned int, unsigned int *)
-     __attribute__ ((__unused__));
-static INLINE unsigned long sign_extend (unsigned int, unsigned int)
-     __attribute__ ((__unused__));
-static INLINE unsigned int ones (int) __attribute ((__unused__));
-static INLINE void sign_unext (unsigned int, unsigned int, unsigned int *)
-     __attribute__ ((__unused__));
-static INLINE unsigned long low_sign_extend (unsigned int, unsigned int)
-     __attribute__ ((__unused__));
-static INLINE void low_sign_unext (unsigned int, unsigned int, unsigned int *)
-     __attribute__ ((__unused__));
-static INLINE unsigned long hppa_field_adjust (unsigned long, unsigned long,
-					       unsigned short)
-     __attribute__ ((__unused__));
-static INLINE char bfd_hppa_insn2fmt (unsigned long)
-     __attribute__ ((__unused__));
-static INLINE  unsigned long hppa_rebuild_insn (bfd *, unsigned long,
-						unsigned long, unsigned long)
-     __attribute__ ((__unused__));
-#endif /* gcc 2.7 or higher */
-
-
-/* The PA instruction set variants.  */
-enum pa_arch {pa10 = 10, pa11 = 11, pa20 = 20};
-
-/* HP PA-RISC relocation types */
-
-enum hppa_reloc_field_selector_type
-  {
-    R_HPPA_FSEL = 0x0,
-    R_HPPA_LSSEL = 0x1,
-    R_HPPA_RSSEL = 0x2,
-    R_HPPA_LSEL = 0x3,
-    R_HPPA_RSEL = 0x4,
-    R_HPPA_LDSEL = 0x5,
-    R_HPPA_RDSEL = 0x6,
-    R_HPPA_LRSEL = 0x7,
-    R_HPPA_RRSEL = 0x8,
-    R_HPPA_NSEL  = 0x9,
-    R_HPPA_NLSEL  = 0xa,
-    R_HPPA_NLRSEL  = 0xb,
-    R_HPPA_PSEL = 0xc,
-    R_HPPA_LPSEL = 0xd,
-    R_HPPA_RPSEL = 0xe,
-    R_HPPA_TSEL = 0xf,
-    R_HPPA_LTSEL = 0x10,
-    R_HPPA_RTSEL = 0x11
-  };
-
-/* /usr/include/reloc.h defines these to constants.  We want to use
-   them in enums, so #undef them before we start using them.  We might
-   be able to fix this another way by simply managing not to include
-   /usr/include/reloc.h, but currently GDB picks up these defines
-   somewhere.  */
-#undef e_fsel
-#undef e_lssel
-#undef e_rssel
-#undef e_lsel
-#undef e_rsel
-#undef e_ldsel
-#undef e_rdsel
-#undef e_lrsel
-#undef e_rrsel
-#undef e_nsel
-#undef e_nlsel
-#undef e_nlrsel
-#undef e_psel
-#undef e_lpsel
-#undef e_rpsel
-#undef e_tsel
-#undef e_ltsel
-#undef e_rtsel
-#undef e_one
-#undef e_two
-#undef e_pcrel
-#undef e_con
-#undef e_plabel
-#undef e_abs
-
-/* for compatibility */
-enum hppa_reloc_field_selector_type_alt
-  {
-    e_fsel = R_HPPA_FSEL,
-    e_lssel = R_HPPA_LSSEL,
-    e_rssel = R_HPPA_RSSEL,
-    e_lsel = R_HPPA_LSEL,
-    e_rsel = R_HPPA_RSEL,
-    e_ldsel = R_HPPA_LDSEL,
-    e_rdsel = R_HPPA_RDSEL,
-    e_lrsel = R_HPPA_LRSEL,
-    e_rrsel = R_HPPA_RRSEL,
-    e_nsel = R_HPPA_NSEL,
-    e_nlsel = R_HPPA_NLSEL,
-    e_nlrsel = R_HPPA_NLRSEL,
-    e_psel = R_HPPA_PSEL,
-    e_lpsel = R_HPPA_LPSEL,
-    e_rpsel = R_HPPA_RPSEL,
-    e_tsel = R_HPPA_TSEL,
-    e_ltsel = R_HPPA_LTSEL,
-    e_rtsel = R_HPPA_RTSEL
-  };
-
-enum hppa_reloc_expr_type
-  {
-    R_HPPA_E_ONE = 0,
-    R_HPPA_E_TWO = 1,
-    R_HPPA_E_PCREL = 2,
-    R_HPPA_E_CON = 3,
-    R_HPPA_E_PLABEL = 7,
-    R_HPPA_E_ABS = 18
-  };
-
-/* for compatibility */
-enum hppa_reloc_expr_type_alt
-  {
-    e_one = R_HPPA_E_ONE,
-    e_two = R_HPPA_E_TWO,
-    e_pcrel = R_HPPA_E_PCREL,
-    e_con = R_HPPA_E_CON,
-    e_plabel = R_HPPA_E_PLABEL,
-    e_abs = R_HPPA_E_ABS
-  };
-
-
-/* Relocations for function calls must be accompanied by parameter
-   relocation bits.  These bits describe exactly where the caller has
-   placed the function's arguments and where it expects to find a return
-   value.
-
-   Both ELF and SOM encode this information within the addend field
-   of the call relocation.  (Note this could break very badly if one
-   was to make a call like bl foo + 0x12345678).
-
-   The high order 10 bits contain parameter relocation information,
-   the low order 22 bits contain the constant offset.  */
-   
-#define HPPA_R_ARG_RELOC(a)	(((a) >> 22) & 0x3FF)
-#define HPPA_R_CONSTANT(a)	((((int)(a)) << 10) >> 10)
-#define HPPA_R_ADDEND(r,c)	(((r) << 22) + ((c) & 0x3FFFFF))
-#define HPPA_WIDE               (0) /* PSW W-bit, need to check! FIXME */
-
-/* These macros get bit fields using HP's numbering (MSB = 0),
- * but note that "MASK" assumes that the LSB bits are what's
- * wanted.
- */
-#ifndef GET_FIELD
-#define GET_FIELD(X, FROM, TO) \
-  ((X) >> (31 - (TO)) & ((1 << ((TO) - (FROM) + 1)) - 1))
-#endif  
-#define GET_BIT( X, WHICH ) \
-  GET_FIELD( X, WHICH, WHICH )
-
-#define MASK( SIZE ) \
-  (~((-1) << SIZE))
-  
-#define CATENATE( X, XSIZE, Y, YSIZE ) \
-  (((X & MASK( XSIZE )) << YSIZE) | (Y & MASK( YSIZE )))
-
-#define ELEVEN( X ) \
-  CATENATE( GET_BIT( X, 10 ), 1, GET_FIELD( X, 0, 9 ), 10)
-  
-/* Some functions to manipulate PA instructions.  */
-
-/* NOTE: these use the HP convention that f{1} is the _left_ most
- *       bit (MSB) of f; they sometimes have to impose an assumption
- *       about the size of a field; and as far as I can tell, most
- *       aren't used.
- */
-
-static INLINE unsigned long
-sign_extend (x, len)
-     unsigned int x, len;
-{
-  return (int)(x >> (len - 1) ? (-1 << len) | x : x);
-}
-
-static INLINE unsigned int
-assemble_3 (x)
-     unsigned int x;
-{
-  return (((x & 1) << 2) | ((x & 6) >> 1)) & 7;
-}
-
-static INLINE void
-dis_assemble_3 (x, r)
-     unsigned int x;
-     unsigned int *r;
-{
-  *r = (((x & 4) >> 2) | ((x & 3) << 1)) & 7;
-}
-
-static INLINE unsigned int      /* PA 2.0 */
-assemble_6 (x, y)
-     unsigned int x, y;
-{
-  return (((x & 0x1) << 5) + (32 - (y & 0x1f)));
-}
-
-static INLINE unsigned int
-assemble_12 (x, y)
-     unsigned int x, y;
-{
-  return CATENATE( CATENATE( y,                1,
-                             GET_BIT( x, 10 ), 1), 2,
-                   GET_FIELD( x, 0, 9 ),           9);
-}
-
-static INLINE void
-dis_assemble_12 (as12, x, y)
-     unsigned int as12;
-     unsigned int *x, *y;
-{
-  *y = (as12 & 0x800) >> 11;
-  *x = ((as12 & 0x3ff) << 1) | ((as12 & 0x400) >> 10);
-}
-
-static INLINE unsigned long     /* PA 2.0 */
-assemble_16 (x, y)
-     unsigned int x, y;
-{
-  /* Depends on PSW W-bit !*/
-  unsigned int temp;
-
-  if( HPPA_WIDE ) {
-      temp = CATENATE( CATENATE( GET_BIT( y, 13 ), 1,
-                                 (GET_BIT( y, 13 )^GET_BIT( x, 0)), 1 ), 2,
-                       CATENATE( (GET_BIT( y, 13 )^GET_BIT( x, 1)), 1,
-                                 GET_FIELD( y, 0, 12 ), 13 ), 14 );
-  }
-  else { 
-      temp = CATENATE( CATENATE( GET_BIT( y, 13 ), 1,
-                                 GET_BIT( y, 13 ), 1 ), 2,
-                       CATENATE( GET_BIT( y, 13 ), 1,
-                                 GET_FIELD( y, 0, 12 ), 13 ), 14 );
-  }
-
-  return sign_extend( temp, 16 );
-}
-
-
-static INLINE unsigned long     /* PA 2.0 */
-assemble_16a (x, y, z)
-     unsigned int x, y, z;
-{
-  /* Depends on PSW W-bit !*/
-  unsigned int temp;
-
-  if( HPPA_WIDE ) {
-      temp = CATENATE( CATENATE( z,                   1,
-                                 (z^GET_BIT( x, 0 )), 1),  2,
-                                 
-                       CATENATE( (z^GET_BIT( x, 1 )), 1,
-                                 y,                   11), 12);
-  }
-  else {
-      temp = CATENATE( CATENATE( z, 1,
-                                 z, 1), 2,
-                       CATENATE( z, 1,
-                                 y, 11), 12);
-
-  }
-
-  return sign_extend( (temp << 2), 16 );
-}
-
-static INLINE unsigned long
-assemble_17 (x, y, z)
-     unsigned int x, y, z;
-{
-  unsigned long temp;
-  int           q;
-
-  temp = CATENATE( CATENATE( z, q,
-                             x, q), q,
-                   CATENATE( GET_BIT( y, 1 ), 1,
-                             GET_FIELD( y, 0, 9 ), 10), 11);
-  
-  return temp;
-}
-
-static INLINE void
-dis_assemble_17 (as17, x, y, z)
-     unsigned int as17;
-     unsigned int *x, *y, *z;
-{
-
-  *z = (as17 & 0x10000) >> 16;
-  *x = (as17 & 0x0f800) >> 11;
-  *y = (((as17 & 0x00400) >> 10) | ((as17 & 0x3ff) << 1)) & 0x7ff;
-}
-
-static INLINE unsigned long
-assemble_21 (x)
-     unsigned int x;
-{
-  unsigned long temp;
-
-  temp = ((x & 1) << 20) |
-    ((x & 0xffe) << 8) |
-    ((x & 0xc000) >> 7) |
-    ((x & 0x1f0000) >> 14) |
-    ((x & 0x003000) >> 12);
-  return temp & 0x1fffff;
-}
-
-static INLINE unsigned long     /* PA 2.0 */
-assemble_22 (a,b,c,d)
-     unsigned int a,b,c,d;
-{
-  unsigned long temp;
-  
-  temp = CATENATE( CATENATE( d, 1,
-                             a, 5 ), 6,
-                   CATENATE( b, 5,
-                             ELEVEN( c ), 11 ), 16 );
-
-  return sign_extend( temp, 22 );
-}
-
-static INLINE void
-dis_assemble_21 (as21, x)
-     unsigned int as21, *x;
-{
-  unsigned long temp;
-
-
-  temp = (as21 & 0x100000) >> 20;
-  temp |= (as21 & 0x0ffe00) >> 8;
-  temp |= (as21 & 0x000180) << 7;
-  temp |= (as21 & 0x00007c) << 14;
-  temp |= (as21 & 0x000003) << 12;
-  *x = temp;
-}
-
-static INLINE unsigned int
-ones (n)
-     int n;
-{
-  unsigned int len_ones;
-  int i;
-
-  i = 0;
-  len_ones = 0;
-  while (i < n)
-    {
-      len_ones = (len_ones << 1) | 1;
-      i++;
-    }
-
-  return len_ones;
-}
-
-static INLINE void
-sign_unext (x, len, result)
-     unsigned int x, len;
-     unsigned int *result;
-{
-  unsigned int len_ones;
-
-  len_ones = ones (len);
-
-  *result = x & len_ones;
-}
-
-static INLINE unsigned long
-low_sign_extend (x, len)
-     unsigned int x, len;
-{
-  return (int)((x & 0x1 ? (-1 << (len - 1)) : 0) | x >> 1);
-}
-
-static INLINE void
-low_sign_unext (x, len, result)
-     unsigned int x, len;
-     unsigned int *result;
-{
-  unsigned int temp;
-  unsigned int sign;
-  unsigned int rest;
-  unsigned int one_bit_at_len;
-  unsigned int len_ones;
-
-  len_ones = ones (len);
-  one_bit_at_len = 1 << (len - 1);
-
-  sign_unext (x, len, &temp);
-  sign = temp & one_bit_at_len;
-  sign >>= (len - 1);
-
-  rest = temp & (len_ones ^ one_bit_at_len);
-  rest <<= 1;
-
-  *result = rest | sign;
-}
-
-/* Handle field selectors for PA instructions.  */
-
-static INLINE unsigned long
-hppa_field_adjust (value, constant_value, r_field)
-     unsigned long value;
-     unsigned long constant_value;
-     unsigned short r_field;
-{
-  switch (r_field)
-    {
-    case e_fsel:		/* F  : no change                      */
-    case e_nsel:		/* N  : no change		       */
-      value += constant_value;
-      break;
-
-    case e_lssel:		/* LS : if (bit 21) then add 0x800
-				   arithmetic shift right 11 bits */
-      value += constant_value;
-      if (value & 0x00000400)
-	value += 0x800;
-      value = (value & 0xfffff800) >> 11;
-      break;
-
-    case e_rssel:		/* RS : Sign extend from bit 21        */
-      value += constant_value;
-      if (value & 0x00000400)
-	value |= 0xfffff800;
-      else
-	value &= 0x7ff;
-      break;
-
-    case e_lsel:		/* L  : Arithmetic shift right 11 bits */
-    case e_nlsel:		/* NL  : Arithmetic shift right 11 bits */
-      value += constant_value;
-      value = (value & 0xfffff800) >> 11;
-      break;
-
-    case e_rsel:		/* R  : Set bits 0-20 to zero          */
-      value += constant_value;
-      value = value & 0x7ff;
-      break;
-
-    case e_ldsel:		/* LD : Add 0x800, arithmetic shift
-				   right 11 bits                  */
-      value += constant_value;
-      value += 0x800;
-      value = (value & 0xfffff800) >> 11;
-      break;
-
-    case e_rdsel:		/* RD : Set bits 0-20 to one           */
-      value += constant_value;
-      value |= 0xfffff800;
-      break;
-
-    case e_lrsel:		/* LR : L with "rounded" constant      */
-    case e_nlrsel:		/* NLR : NL with "rounded" constant      */
-      value = value + ((constant_value + 0x1000) & 0xffffe000);
-      value = (value & 0xfffff800) >> 11;
-      break;
-
-    case e_rrsel:		/* RR : R with "rounded" constant      */
-      value = value + ((constant_value + 0x1000) & 0xffffe000);
-      value = (value & 0x7ff) + constant_value - ((constant_value + 0x1000) & 0xffffe000);
-      break;
-
-    default:
-      abort ();
-    }
-  return value;
-
-}
-
-/* PA-RISC OPCODES */
-#define get_opcode(insn)	((insn) & 0xfc000000) >> 26
-
-/* FIXME: this list is incomplete.  It should also be an enumerated
-   type rather than #defines.  */
-
-#define LDO	0x0d
-#define LDB	0x10
-#define LDH	0x11
-#define LDW	0x12
-#define LDWM	0x13
-#define STB	0x18
-#define STH	0x19
-#define STW	0x1a
-#define STWM	0x1b
-#define COMICLR	0x24
-#define SUBI	0x25
-#define SUBIO	0x25
-#define ADDIT	0x2c
-#define ADDITO	0x2c
-#define ADDI	0x2d
-#define ADDIO	0x2d
-#define LDIL	0x08
-#define ADDIL	0x0a
-
-#define MOVB	0x32
-#define MOVIB	0x33
-#define COMBT	0x20
-#define COMBF	0x22
-#define COMIBT	0x21
-#define COMIBF	0x23
-#define ADDBT	0x28
-#define ADDBF	0x2a
-#define ADDIBT	0x29
-#define ADDIBF	0x2b
-#define BVB	0x30
-#define BB	0x31
-
-#define BL	0x3a
-#define BLE	0x39
-#define BE	0x38
-
-  
-/* Given a machine instruction, return its format.
-
-   FIXME:  opcodes which do not map to a known format
-   should return an error of some sort.  */
-
-static INLINE char
-bfd_hppa_insn2fmt (insn)
-     unsigned long insn;
-{
-  char fmt = -1;
-  unsigned char op = get_opcode (insn);
-  
-  switch (op)
-    {
-    case ADDI:
-    case ADDIT:
-    case SUBI:
-      fmt = 11;
-      break;
-    case MOVB:
-    case MOVIB:
-    case COMBT:
-    case COMBF:
-    case COMIBT:
-    case COMIBF:
-    case ADDBT:
-    case ADDBF:
-    case ADDIBT:
-    case ADDIBF:
-    case BVB:
-    case BB:
-      fmt = 12;
-      break;
-    case LDO:
-    case LDB:
-    case LDH:
-    case LDW:
-    case LDWM:
-    case STB:
-    case STH:
-    case STW:
-    case STWM:
-      fmt = 14;
-      break;
-    case BL:
-    case BE:
-    case BLE:
-      fmt = 17;
-      break;
-    case LDIL:
-    case ADDIL:
-      fmt = 21;
-      break;
-    default:
-      fmt = 32;
-      break;
-    }
-  return fmt;
-}
-
-
-/* Insert VALUE into INSN using R_FORMAT to determine exactly what
-   bits to change.  */
-   
-static INLINE unsigned long
-hppa_rebuild_insn (abfd, insn, value, r_format)
-     bfd *abfd;
-     unsigned long insn;
-     unsigned long value;
-     unsigned long r_format;
-{
-  unsigned long const_part;
-  unsigned long rebuilt_part;
-
-  switch (r_format)
-    {
-    case 11:
-      {
-	unsigned w1, w;
-
-	const_part = insn & 0xffffe002;
-	dis_assemble_12 (value, &w1, &w);
-	rebuilt_part = (w1 << 2) | w;
-	return const_part | rebuilt_part;
-      }
-
-    case 12:
-      {
-	unsigned w1, w;
-
-	const_part = insn & 0xffffe002;
-	dis_assemble_12 (value, &w1, &w);
-	rebuilt_part = (w1 << 2) | w;
-	return const_part | rebuilt_part;
-      }
-
-    case 14:
-      {
-	unsigned int ext;
-	
-	const_part = insn & 0xffffc000;
-	low_sign_unext (value, 14, &ext);
-	return const_part | ext;
-      }
-
-    case 17:
-      {
-	unsigned w1, w2, w;
-
-	const_part = insn & 0xffe0e002;
-	dis_assemble_17 (value, &w1, &w2, &w);
-	rebuilt_part = (w2 << 2) | (w1 << 16) | w;
-	return const_part | rebuilt_part;
-      }
-
-    case 21:
-      {
-	unsigned int w;
-
-	const_part = insn & 0xffe00000;
-	dis_assemble_21 (value, &w);
-	return const_part | w;
-      }
-
-    case 32:
-      const_part = 0;
-      return value;
-
-    default:
-      abort ();
-    }
-  return insn;
-}
-
-#endif /* _HPPA_H */
diff --git a/bfd/libieee.h b/bfd/libieee.h
deleted file mode 100644
index 30e806eaa70..00000000000
--- a/bfd/libieee.h
+++ /dev/null
@@ -1,133 +0,0 @@
-/* IEEE-695 object file formats:  definitions internal to BFD.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-   Written by Cygnus Support.  Mostly Steve Chamberlain's fault.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-typedef struct {
-  unsigned int index:24;
-  char letter;
-} ieee_symbol_index_type;
-
-typedef struct ct {
-  bfd *this;
-  struct ct *next;
-} bfd_chain_type;
-
-typedef struct ieee_symbol 
-{
-  asymbol symbol;
-  struct ieee_symbol *next;
-
-  unsigned int index;
-} ieee_symbol_type;
-
-
-typedef struct ieee_reloc {
-  arelent relent;
-  struct ieee_reloc *next;
-  ieee_symbol_index_type symbol;
-
-} ieee_reloc_type;
-
-#define ieee_symbol(x) ((ieee_symbol_type *)(x))
-
-typedef struct ieee_per_section
-{
-  asection *section;
-  bfd_byte *data;
-  bfd_vma offset;
-  bfd_vma pc;
-  /* For output */
-  file_ptr current_pos;
-  unsigned int current_byte;
-  boolean initialized;
-  ieee_reloc_type **reloc_tail_ptr;
-} ieee_per_section_type;
-
-#define ieee_per_section(x) ((ieee_per_section_type *)((x)->used_by_bfd))
-  
-typedef struct {
-  unsigned  char *input_p;
-  unsigned char *first_byte;
-  bfd *abfd;
-} common_header_type ;
-
-typedef struct ieee_data_struct
-{
-  common_header_type h;
-  boolean read_symbols;
-  boolean read_data;	
-  file_ptr output_cursor;
-  /* Map of section indexes to section ptrs */
-  asection **section_table;
-  unsigned int section_table_size;
-  ieee_address_descriptor_type ad;
-  ieee_module_begin_type mb;
-  ieee_w_variable_type w;
-  
-  unsigned int section_count;
-  
-  unsigned int map_idx;
-  /* List of GLOBAL EXPORT symbols */
-  ieee_symbol_type *external_symbols;
-  /* List of UNDEFINED symbols */
-  ieee_symbol_type *external_reference;
-  
-  /* When the symbols have been canonicalized, they are in a
-    * special order, we remember various bases here.. */
-  unsigned int external_symbol_max_index;
-  unsigned int external_symbol_min_index;
-  unsigned int external_symbol_count;
-  int external_symbol_base_offset;
-  
-  unsigned int external_reference_max_index;
-  unsigned int external_reference_min_index;
-  unsigned int external_reference_count;
-  int external_reference_base_offset;
-  
-
-  boolean symbol_table_full;
-
-  
-boolean done_debug;
-
-
-bfd_chain_type *chain_head;
-bfd_chain_type *chain_root;
-
-} ieee_data_type;
-
-typedef struct {
-  file_ptr file_offset;
-  bfd *abfd;
-} ieee_ar_obstack_type;
-
-typedef struct ieee_ar_data_struct 
-{
-  common_header_type h;
-  ieee_ar_obstack_type *elements;
-  
-  unsigned  int element_index ;
-  unsigned int element_count;
-
-} ieee_ar_data_type;
-
-#define IEEE_DATA(abfd) ((abfd)->tdata.ieee_data)
-#define IEEE_AR_DATA(abfd) ((abfd)->tdata.ieee_ar_data)
-
-#define ptr(abfd) (ieee_data(abfd)->input_p)
diff --git a/bfd/libnlm.h b/bfd/libnlm.h
deleted file mode 100644
index 12d2e4e0cf8..00000000000
--- a/bfd/libnlm.h
+++ /dev/null
@@ -1,264 +0,0 @@
-/* BFD back-end data structures for NLM (NetWare Loadable Modules) files.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef _LIBNLM_H_
-#define _LIBNLM_H_ 1
-
-#ifdef ARCH_SIZE
-#  define NLM_ARCH_SIZE ARCH_SIZE
-#endif
-#include "nlm/common.h"
-#include "nlm/internal.h"
-#include "nlm/external.h"
-
-/* A reloc for an imported NLM symbol.  Normal relocs are associated
-   with sections, and include a symbol.  These relocs are associated
-   with (undefined) symbols, and include a section.  */
-
-struct nlm_relent
-{
-  /* Section of reloc.  */
-  asection *section;
-  /* Reloc info (sym_ptr_ptr field set only when canonicalized).  */
-  arelent reloc;
-};
-
-/* Information we keep for an NLM symbol.  */
-
-typedef struct
-{
-  /* BFD symbol.  */
-  asymbol symbol;
-  /* Number of reloc entries for imported symbol.  */
-  bfd_size_type rcnt;
-  /* Array of reloc information for imported symbol.  */
-  struct nlm_relent *relocs;
-} nlmNAME(symbol_type);
-
-extern boolean nlm_mkobject PARAMS ((bfd *));
-extern boolean nlm_set_arch_mach PARAMS ((bfd *, enum bfd_architecture,
-					  unsigned long));
-
-extern void nlmNAME(get_symbol_info)
-     PARAMS ((bfd *, asymbol *, symbol_info *));
-extern long nlmNAME(get_symtab_upper_bound)
-     PARAMS ((bfd *));
-extern long nlmNAME(get_symtab)
-     PARAMS ((bfd *, asymbol **));
-extern asymbol *nlmNAME(make_empty_symbol)
-     PARAMS ((bfd *));
-extern void nlmNAME(print_symbol)
-     PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-extern long nlmNAME(get_reloc_upper_bound)
-     PARAMS ((bfd *, asection *));
-extern long nlmNAME(canonicalize_reloc)
-     PARAMS ((bfd *, asection *, arelent **, asymbol **));
-extern const bfd_target *nlmNAME(object_p)
-     PARAMS ((bfd *));
-extern boolean nlmNAME(set_arch_mach)
-     PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-extern boolean nlmNAME(set_section_contents)
-     PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-extern boolean nlmNAME(write_object_contents)
-     PARAMS ((bfd *));
-
-/* Some private data is stashed away for future use using the tdata pointer
-   in the bfd structure.  */
-
-struct nlm_obj_tdata
-{
-  /* Actual data, but ref like ptr */
-  Nlm_Internal_Fixed_Header	nlm_fixed_hdr[1];
-  Nlm_Internal_Variable_Header	nlm_variable_hdr[1];
-  Nlm_Internal_Version_Header	nlm_version_hdr[1];
-  Nlm_Internal_Copyright_Header	nlm_copyright_hdr[1];
-  Nlm_Internal_Extended_Header	nlm_extended_hdr[1];
-  Nlm_Internal_Custom_Header	nlm_custom_hdr[1];
-  Nlm_Internal_Cygnus_Ext_Header nlm_cygnus_ext_hdr[1];
-  /* BFD NLM symbols.  */
-  nlmNAME(symbol_type)		*nlm_symbols;
-  /* Lowest text and data VMA values.  */
-  bfd_vma			nlm_text_low;
-  bfd_vma			nlm_data_low;
-  /* Caches for data read from object file.  */
-  arelent *			nlm_reloc_fixups;
-  asection **			nlm_reloc_fixup_secs;
-  /* Backend specific information.  This should probably be a pointer,
-     but that would require yet another entry point to initialize the
-     structure.  */
-  union
-    {
-      struct	/* Alpha backend information.  */
-	{
-	  bfd_vma gp;			/* GP value.  */
-	  bfd_vma lita_address;		/* .lita section address.  */
-	  bfd_size_type lita_size;	/* .lita section size.  */
-	}
-      alpha_backend_data;
-    }
-  backend_data;
-};
-
-#define nlm_tdata(bfd)			((bfd) -> tdata.nlm_obj_data)
-#define nlm_fixed_header(bfd)		(nlm_tdata(bfd) -> nlm_fixed_hdr)
-#define nlm_variable_header(bfd)	(nlm_tdata(bfd) -> nlm_variable_hdr)
-#define nlm_version_header(bfd)		(nlm_tdata(bfd) -> nlm_version_hdr)
-#define nlm_copyright_header(bfd)	(nlm_tdata(bfd) -> nlm_copyright_hdr)
-#define nlm_extended_header(bfd)	(nlm_tdata(bfd) -> nlm_extended_hdr)
-#define nlm_custom_header(bfd)		(nlm_tdata(bfd) -> nlm_custom_hdr)
-#define nlm_cygnus_ext_header(bfd)	(nlm_tdata(bfd) -> nlm_cygnus_ext_hdr)
-#define nlm_get_symbols(bfd)		(nlm_tdata(bfd) -> nlm_symbols)
-#define nlm_set_symbols(bfd, p)		(nlm_tdata(bfd) -> nlm_symbols = (p))
-#define nlm_set_text_low(bfd, i)	(nlm_tdata(bfd) -> nlm_text_low = (i))
-#define nlm_get_text_low(bfd)		(nlm_tdata(bfd) -> nlm_text_low)
-#define nlm_set_data_low(bfd, i)	(nlm_tdata(bfd) -> nlm_data_low = (i))
-#define nlm_get_data_low(bfd)		(nlm_tdata(bfd) -> nlm_data_low)
-#define nlm_relocation_fixups(bfd)	(nlm_tdata(bfd) -> nlm_reloc_fixups)
-#define nlm_relocation_fixup_secs(bfd)	(nlm_tdata(bfd)->nlm_reloc_fixup_secs)
-
-#define nlm_alpha_backend_data(bfd) \
-  (&nlm_tdata (bfd)->backend_data.alpha_backend_data)
-
-/* This is used when writing out the external relocs. */
-
-struct reloc_and_sec
-{
-  arelent *rel;
-  asection *sec;
-};
-
-/* We store some function pointer in the backend structure.  This lets
-   different NLM targets share most of the same code, while providing
-   slightly different code where necessary.  */
-
-struct nlm_backend_data
-{
-  /* Signature for this backend.  */
-  char signature[NLM_SIGNATURE_SIZE];
-  /* Size of the fixed header.  */
-  bfd_size_type fixed_header_size;
-  /* Size of optional prefix for this backend.  Some backend may
-     require this to be a function, but so far a constant is OK.  This
-     is for a prefix which precedes the standard NLM fixed header.  */
-  bfd_size_type optional_prefix_size;
-  /* Architecture.  */
-  enum bfd_architecture arch;
-  /* Machine.  */
-  long mach;
-  /* Some NLM formats do not use the uninitialized data section, so
-     all uninitialized data must be put into the regular data section
-     instead.  */
-  boolean no_uninitialized_data;
-  /* Some NLM formats have a prefix on the file.  If this function is
-     not NULL, it will be called by nlm_object_p.  It should return
-     true if this file could match this format, and it should leave
-     the BFD such that a bfd_read will pick up the fixed header.  */
-  boolean (*nlm_backend_object_p) PARAMS ((bfd *));
-  /* Write out the prefix.  This function may be NULL.  This must
-     write out the same number of bytes as is in the field
-     optional_prefix_size.  */
-  boolean (*nlm_write_prefix) PARAMS ((bfd *));
-  /* Read a relocation fixup from abfd.  The reloc information is
-     machine specific.  The second argument is the symbol if this is
-     an import, or NULL if this is a reloc fixup.  This function
-     should set the third argument to the section which the reloc
-     belongs in, and the fourth argument to the reloc itself; it does
-     not need to fill in the sym_ptr_ptr field for a reloc against an
-     import symbol.  */
-  boolean (*nlm_read_reloc) PARAMS ((bfd *, nlmNAME(symbol_type) *,
-				     asection **, arelent *));
-  /* To make objcopy to an i386 NLM work, the i386 backend needs a
-     chance to work over the relocs.  This is a bit icky.  */
-  boolean (*nlm_mangle_relocs) PARAMS ((bfd *, asection *, PTR data,
-					bfd_vma offset,
-					bfd_size_type count));
-  /* Read an import record from abfd.  It would be nice if this
-     were in a machine-dependent format, but it doesn't seem to be. */
-  boolean (*nlm_read_import) PARAMS ((bfd *, nlmNAME(symbol_type) *));
-  /* Write an import record to abfd. */
-  boolean (*nlm_write_import) PARAMS ((bfd *, asection *, arelent *));
-  /* Set the section for a public symbol.  This may be NULL, in which
-     case a default method will be used.  */
-  boolean (*nlm_set_public_section) PARAMS ((bfd *, nlmNAME(symbol_type) *));
-  /* Get the offset to write out for a public symbol.  This may be
-     NULL, in which case a default method will be used.  */
-  bfd_vma (*nlm_get_public_offset) PARAMS ((bfd *, asymbol *));
-  /* Swap the fixed header in and out */
-  void (*nlm_swap_fhdr_in) PARAMS ((bfd *,
-				    PTR,
-				    Nlm_Internal_Fixed_Header *));
-  void (*nlm_swap_fhdr_out) PARAMS ((bfd *,
-				     struct nlm_internal_fixed_header *,
-				     PTR));
-  /* Write out an external reference.  */
-  boolean (*nlm_write_external) PARAMS ((bfd *, bfd_size_type,
-					 asymbol *,
-					 struct reloc_and_sec *));
-  boolean (*nlm_write_export) PARAMS ((bfd *, asymbol *, bfd_vma));
-};
-
-#define nlm_backend(bfd) \
-  ((struct nlm_backend_data *)((bfd) -> xvec -> backend_data))
-#define nlm_signature(bfd) \
-  (nlm_backend(bfd) -> signature)
-#define nlm_fixed_header_size(bfd) \
-  (nlm_backend(bfd) -> fixed_header_size)
-#define nlm_optional_prefix_size(bfd) \
-  (nlm_backend(bfd) -> optional_prefix_size)
-#define nlm_architecture(bfd) \
-  (nlm_backend(bfd) -> arch)
-#define nlm_machine(bfd) \
-  (nlm_backend(bfd) -> mach)
-#define nlm_no_uninitialized_data(bfd) \
-  (nlm_backend(bfd) -> no_uninitialized_data)
-#define nlm_backend_object_p_func(bfd) \
-  (nlm_backend(bfd) -> nlm_backend_object_p)
-#define nlm_write_prefix_func(bfd) \
-  (nlm_backend(bfd) -> nlm_write_prefix)
-#define nlm_read_reloc_func(bfd) \
-  (nlm_backend(bfd) -> nlm_read_reloc)
-#define nlm_mangle_relocs_func(bfd) \
-  (nlm_backend(bfd) -> nlm_mangle_relocs)
-#define nlm_read_import_func(bfd) \
-  (nlm_backend(bfd) -> nlm_read_import)
-#define nlm_write_import_func(bfd) \
-  (nlm_backend(bfd) -> nlm_write_import)
-#define nlm_set_public_section_func(bfd) \
-  (nlm_backend(bfd) -> nlm_set_public_section)
-#define nlm_get_public_offset_func(bfd) \
-  (nlm_backend(bfd) -> nlm_get_public_offset)
-#define nlm_swap_fixed_header_in_func(bfd) \
-  (nlm_backend(bfd) -> nlm_swap_fhdr_in)
-#define nlm_swap_fixed_header_out_func(bfd) \
-  (nlm_backend(bfd) -> nlm_swap_fhdr_out)
-#define nlm_write_external_func(bfd) \
-  (nlm_backend(bfd) -> nlm_write_external)
-#define nlm_write_export_func(bfd) \
-  (nlm_backend(bfd) -> nlm_write_export)
-
-/* The NLM code, data, and uninitialized sections have no names defined
-   in the NLM, but bfd wants to give them names, so use the traditional
-   UNIX names.  */
-
-#define NLM_CODE_NAME			".text"
-#define NLM_INITIALIZED_DATA_NAME	".data"
-#define NLM_UNINITIALIZED_DATA_NAME	".bss"
-
-#endif /* _LIBNLM_H_ */
diff --git a/bfd/liboasys.h b/bfd/liboasys.h
deleted file mode 100644
index 7f7ea59b5a7..00000000000
--- a/bfd/liboasys.h
+++ /dev/null
@@ -1,82 +0,0 @@
-/* BFD internal declarations for Oasys file format handling.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1997 Free Software Foundation, Inc.
-   Scrawled by Steve Chamberlain of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-typedef struct _oasys_symbol
-{
-  asymbol symbol;
-} oasys_symbol_type;
-
-typedef struct _oasys_reloc {
-  arelent relent;
-  struct _oasys_reloc *next;
-  unsigned int symbol;
-} oasys_reloc_type;
-
-
-#define oasys_symbol(x) ((oasys_symbol_type *)(x))
-#define oasys_per_section(x) ((oasys_per_section_type *)(x->used_by_bfd))
-
-typedef struct _oasys_per_section
-{
-  asection *section;
-  bfd_byte *data;
-  bfd_vma offset;
-  boolean had_vma;
-  oasys_reloc_type **reloc_tail_ptr;
-  bfd_vma pc;
-
-
-  file_ptr current_pos;
-  unsigned int current_byte;
-  boolean initialized;
-} oasys_per_section_type;
-
-#define NSECTIONS 10
-
-typedef struct _oasys_ar_obstack {
-  file_ptr file_offset;
-  bfd *abfd;
-} oasys_ar_obstack_type;
-
-
-typedef struct _oasys_module_info {
-  file_ptr pos;
-  unsigned int size;
-  bfd *abfd;
-  char *name;
-} oasys_module_info_type;
-
-typedef struct _oasys_ar_data {
-  oasys_module_info_type *module;
-  unsigned int module_count;
-  unsigned int module_index;
-} oasys_ar_data_type;
-
-typedef struct _oasys_data {
-  char *strings;
-  asymbol *symbols;
-  unsigned int symbol_string_length;
-  asection *sections[OASYS_MAX_SEC_COUNT];
-  file_ptr first_data_record;
-} oasys_data_type;
-
-#define OASYS_DATA(abfd)	((abfd)->tdata.oasys_obj_data)
-#define OASYS_AR_DATA(abfd)	((abfd)->tdata.oasys_ar_data)
-
diff --git a/bfd/linker.c b/bfd/linker.c
deleted file mode 100644
index 947514c3fbd..00000000000
--- a/bfd/linker.c
+++ /dev/null
@@ -1,2804 +0,0 @@
-/* linker.c -- BFD linker routines
-   Copyright (C) 1993, 94, 95, 96, 97, 1998 Free Software Foundation, Inc.
-   Written by Steve Chamberlain and Ian Lance Taylor, Cygnus Support
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "genlink.h"
-
-/*
-SECTION
-	Linker Functions
-
-@cindex Linker
-	The linker uses three special entry points in the BFD target
-	vector.  It is not necessary to write special routines for
-	these entry points when creating a new BFD back end, since
-	generic versions are provided.  However, writing them can
-	speed up linking and make it use significantly less runtime
-	memory.
-
-	The first routine creates a hash table used by the other
-	routines.  The second routine adds the symbols from an object
-	file to the hash table.  The third routine takes all the
-	object files and links them together to create the output
-	file.  These routines are designed so that the linker proper
-	does not need to know anything about the symbols in the object
-	files that it is linking.  The linker merely arranges the
-	sections as directed by the linker script and lets BFD handle
-	the details of symbols and relocs.
-
-	The second routine and third routines are passed a pointer to
-	a <<struct bfd_link_info>> structure (defined in
-	<<bfdlink.h>>) which holds information relevant to the link,
-	including the linker hash table (which was created by the
-	first routine) and a set of callback functions to the linker
-	proper.
-
-	The generic linker routines are in <<linker.c>>, and use the
-	header file <<genlink.h>>.  As of this writing, the only back
-	ends which have implemented versions of these routines are
-	a.out (in <<aoutx.h>>) and ECOFF (in <<ecoff.c>>).  The a.out
-	routines are used as examples throughout this section.
-
-@menu	
-@* Creating a Linker Hash Table::
-@* Adding Symbols to the Hash Table::
-@* Performing the Final Link::
-@end menu
-
-INODE
-Creating a Linker Hash Table, Adding Symbols to the Hash Table, Linker Functions, Linker Functions
-SUBSECTION
-	Creating a linker hash table
-
-@cindex _bfd_link_hash_table_create in target vector
-@cindex target vector (_bfd_link_hash_table_create)
-	The linker routines must create a hash table, which must be
-	derived from <<struct bfd_link_hash_table>> described in
-	<<bfdlink.c>>.  @xref{Hash Tables} for information on how to
-	create a derived hash table.  This entry point is called using
-	the target vector of the linker output file.
-
-	The <<_bfd_link_hash_table_create>> entry point must allocate
-	and initialize an instance of the desired hash table.  If the
-	back end does not require any additional information to be
-	stored with the entries in the hash table, the entry point may
-	simply create a <<struct bfd_link_hash_table>>.  Most likely,
-	however, some additional information will be needed.
-
-	For example, with each entry in the hash table the a.out
-	linker keeps the index the symbol has in the final output file
-	(this index number is used so that when doing a relocateable
-	link the symbol index used in the output file can be quickly
-	filled in when copying over a reloc).  The a.out linker code
-	defines the required structures and functions for a hash table
-	derived from <<struct bfd_link_hash_table>>.  The a.out linker
-	hash table is created by the function
-	<<NAME(aout,link_hash_table_create)>>; it simply allocates
-	space for the hash table, initializes it, and returns a
-	pointer to it.
-
-	When writing the linker routines for a new back end, you will
-	generally not know exactly which fields will be required until
-	you have finished.  You should simply create a new hash table
-	which defines no additional fields, and then simply add fields
-	as they become necessary.
-
-INODE
-Adding Symbols to the Hash Table, Performing the Final Link, Creating a Linker Hash Table, Linker Functions
-SUBSECTION
-	Adding symbols to the hash table
-
-@cindex _bfd_link_add_symbols in target vector
-@cindex target vector (_bfd_link_add_symbols)
-	The linker proper will call the <<_bfd_link_add_symbols>>
-	entry point for each object file or archive which is to be
-	linked (typically these are the files named on the command
-	line, but some may also come from the linker script).  The
-	entry point is responsible for examining the file.  For an
-	object file, BFD must add any relevant symbol information to
-	the hash table.  For an archive, BFD must determine which
-	elements of the archive should be used and adding them to the
-	link.
-
-	The a.out version of this entry point is
-	<<NAME(aout,link_add_symbols)>>.
-
-@menu
-@* Differing file formats::
-@* Adding symbols from an object file::
-@* Adding symbols from an archive::
-@end menu
-
-INODE
-Differing file formats, Adding symbols from an object file, Adding Symbols to the Hash Table, Adding Symbols to the Hash Table
-SUBSUBSECTION
-	Differing file formats
-
-	Normally all the files involved in a link will be of the same
-	format, but it is also possible to link together different
-	format object files, and the back end must support that.  The
-	<<_bfd_link_add_symbols>> entry point is called via the target
-	vector of the file to be added.  This has an important
-	consequence: the function may not assume that the hash table
-	is the type created by the corresponding
-	<<_bfd_link_hash_table_create>> vector.  All the
-	<<_bfd_link_add_symbols>> function can assume about the hash
-	table is that it is derived from <<struct
-	bfd_link_hash_table>>.
-
-	Sometimes the <<_bfd_link_add_symbols>> function must store
-	some information in the hash table entry to be used by the
-	<<_bfd_final_link>> function.  In such a case the <<creator>>
-	field of the hash table must be checked to make sure that the
-	hash table was created by an object file of the same format.
-
-	The <<_bfd_final_link>> routine must be prepared to handle a
-	hash entry without any extra information added by the
-	<<_bfd_link_add_symbols>> function.  A hash entry without
-	extra information will also occur when the linker script
-	directs the linker to create a symbol.  Note that, regardless
-	of how a hash table entry is added, all the fields will be
-	initialized to some sort of null value by the hash table entry
-	initialization function.
-
-	See <<ecoff_link_add_externals>> for an example of how to
-	check the <<creator>> field before saving information (in this
-	case, the ECOFF external symbol debugging information) in a
-	hash table entry.
-
-INODE
-Adding symbols from an object file, Adding symbols from an archive, Differing file formats, Adding Symbols to the Hash Table
-SUBSUBSECTION
-	Adding symbols from an object file
-
-	When the <<_bfd_link_add_symbols>> routine is passed an object
-	file, it must add all externally visible symbols in that
-	object file to the hash table.  The actual work of adding the
-	symbol to the hash table is normally handled by the function
-	<<_bfd_generic_link_add_one_symbol>>.  The
-	<<_bfd_link_add_symbols>> routine is responsible for reading
-	all the symbols from the object file and passing the correct
-	information to <<_bfd_generic_link_add_one_symbol>>.
-
-	The <<_bfd_link_add_symbols>> routine should not use
-	<<bfd_canonicalize_symtab>> to read the symbols.  The point of
-	providing this routine is to avoid the overhead of converting
-	the symbols into generic <<asymbol>> structures.
-
-@findex _bfd_generic_link_add_one_symbol
-	<<_bfd_generic_link_add_one_symbol>> handles the details of
-	combining common symbols, warning about multiple definitions,
-	and so forth.  It takes arguments which describe the symbol to
-	add, notably symbol flags, a section, and an offset.  The
-	symbol flags include such things as <<BSF_WEAK>> or
-	<<BSF_INDIRECT>>.  The section is a section in the object
-	file, or something like <<bfd_und_section_ptr>> for an undefined
-	symbol or <<bfd_com_section_ptr>> for a common symbol.
-
-	If the <<_bfd_final_link>> routine is also going to need to
-	read the symbol information, the <<_bfd_link_add_symbols>>
-	routine should save it somewhere attached to the object file
-	BFD.  However, the information should only be saved if the
-	<<keep_memory>> field of the <<info>> argument is true, so
-	that the <<-no-keep-memory>> linker switch is effective.
-
-	The a.out function which adds symbols from an object file is
-	<<aout_link_add_object_symbols>>, and most of the interesting
-	work is in <<aout_link_add_symbols>>.  The latter saves
-	pointers to the hash tables entries created by
-	<<_bfd_generic_link_add_one_symbol>> indexed by symbol number,
-	so that the <<_bfd_final_link>> routine does not have to call
-	the hash table lookup routine to locate the entry.
-
-INODE
-Adding symbols from an archive, , Adding symbols from an object file, Adding Symbols to the Hash Table
-SUBSUBSECTION
-	Adding symbols from an archive
-
-	When the <<_bfd_link_add_symbols>> routine is passed an
-	archive, it must look through the symbols defined by the
-	archive and decide which elements of the archive should be
-	included in the link.  For each such element it must call the
-	<<add_archive_element>> linker callback, and it must add the
-	symbols from the object file to the linker hash table.
-
-@findex _bfd_generic_link_add_archive_symbols
-	In most cases the work of looking through the symbols in the
-	archive should be done by the
-	<<_bfd_generic_link_add_archive_symbols>> function.  This
-	function builds a hash table from the archive symbol table and
-	looks through the list of undefined symbols to see which
-	elements should be included.
-	<<_bfd_generic_link_add_archive_symbols>> is passed a function
-	to call to make the final decision about adding an archive
-	element to the link and to do the actual work of adding the
-	symbols to the linker hash table.
-
-	The function passed to
-	<<_bfd_generic_link_add_archive_symbols>> must read the
-	symbols of the archive element and decide whether the archive
-	element should be included in the link.  If the element is to
-	be included, the <<add_archive_element>> linker callback
-	routine must be called with the element as an argument, and
-	the elements symbols must be added to the linker hash table
-	just as though the element had itself been passed to the
-	<<_bfd_link_add_symbols>> function.
-
-	When the a.out <<_bfd_link_add_symbols>> function receives an
-	archive, it calls <<_bfd_generic_link_add_archive_symbols>>
-	passing <<aout_link_check_archive_element>> as the function
-	argument. <<aout_link_check_archive_element>> calls
-	<<aout_link_check_ar_symbols>>.  If the latter decides to add
-	the element (an element is only added if it provides a real,
-	non-common, definition for a previously undefined or common
-	symbol) it calls the <<add_archive_element>> callback and then
-	<<aout_link_check_archive_element>> calls
-	<<aout_link_add_symbols>> to actually add the symbols to the
-	linker hash table.
-
-	The ECOFF back end is unusual in that it does not normally
-	call <<_bfd_generic_link_add_archive_symbols>>, because ECOFF
-	archives already contain a hash table of symbols.  The ECOFF
-	back end searches the archive itself to avoid the overhead of
-	creating a new hash table.
-
-INODE
-Performing the Final Link, , Adding Symbols to the Hash Table, Linker Functions
-SUBSECTION
-	Performing the final link
-
-@cindex _bfd_link_final_link in target vector
-@cindex target vector (_bfd_final_link)
-	When all the input files have been processed, the linker calls
-	the <<_bfd_final_link>> entry point of the output BFD.  This
-	routine is responsible for producing the final output file,
-	which has several aspects.  It must relocate the contents of
-	the input sections and copy the data into the output sections.
-	It must build an output symbol table including any local
-	symbols from the input files and the global symbols from the
-	hash table.  When producing relocateable output, it must
-	modify the input relocs and write them into the output file.
-	There may also be object format dependent work to be done.
-
-	The linker will also call the <<write_object_contents>> entry
-	point when the BFD is closed.  The two entry points must work
-	together in order to produce the correct output file.
-
-	The details of how this works are inevitably dependent upon
-	the specific object file format.  The a.out
-	<<_bfd_final_link>> routine is <<NAME(aout,final_link)>>.
-
-@menu
-@* Information provided by the linker::
-@* Relocating the section contents::
-@* Writing the symbol table::
-@end menu
-
-INODE
-Information provided by the linker, Relocating the section contents, Performing the Final Link, Performing the Final Link
-SUBSUBSECTION
-	Information provided by the linker
-
-	Before the linker calls the <<_bfd_final_link>> entry point,
-	it sets up some data structures for the function to use.
-
-	The <<input_bfds>> field of the <<bfd_link_info>> structure
-	will point to a list of all the input files included in the
-	link.  These files are linked through the <<link_next>> field
-	of the <<bfd>> structure.
-
-	Each section in the output file will have a list of
-	<<link_order>> structures attached to the <<link_order_head>>
-	field (the <<link_order>> structure is defined in
-	<<bfdlink.h>>).  These structures describe how to create the
-	contents of the output section in terms of the contents of
-	various input sections, fill constants, and, eventually, other
-	types of information.  They also describe relocs that must be
-	created by the BFD backend, but do not correspond to any input
-	file; this is used to support -Ur, which builds constructors
-	while generating a relocateable object file.
-
-INODE
-Relocating the section contents, Writing the symbol table, Information provided by the linker, Performing the Final Link
-SUBSUBSECTION
-	Relocating the section contents
-
-	The <<_bfd_final_link>> function should look through the
-	<<link_order>> structures attached to each section of the
-	output file.  Each <<link_order>> structure should either be
-	handled specially, or it should be passed to the function
-	<<_bfd_default_link_order>> which will do the right thing
-	(<<_bfd_default_link_order>> is defined in <<linker.c>>).
-
-	For efficiency, a <<link_order>> of type
-	<<bfd_indirect_link_order>> whose associated section belongs
-	to a BFD of the same format as the output BFD must be handled
-	specially.  This type of <<link_order>> describes part of an
-	output section in terms of a section belonging to one of the
-	input files.  The <<_bfd_final_link>> function should read the
-	contents of the section and any associated relocs, apply the
-	relocs to the section contents, and write out the modified
-	section contents.  If performing a relocateable link, the
-	relocs themselves must also be modified and written out.
-
-@findex _bfd_relocate_contents
-@findex _bfd_final_link_relocate
-	The functions <<_bfd_relocate_contents>> and
-	<<_bfd_final_link_relocate>> provide some general support for
-	performing the actual relocations, notably overflow checking.
-	Their arguments include information about the symbol the
-	relocation is against and a <<reloc_howto_type>> argument
-	which describes the relocation to perform.  These functions
-	are defined in <<reloc.c>>.
-
-	The a.out function which handles reading, relocating, and
-	writing section contents is <<aout_link_input_section>>.  The
-	actual relocation is done in <<aout_link_input_section_std>>
-	and <<aout_link_input_section_ext>>.
-
-INODE
-Writing the symbol table, , Relocating the section contents, Performing the Final Link
-SUBSUBSECTION
-	Writing the symbol table
-
-	The <<_bfd_final_link>> function must gather all the symbols
-	in the input files and write them out.  It must also write out
-	all the symbols in the global hash table.  This must be
-	controlled by the <<strip>> and <<discard>> fields of the
-	<<bfd_link_info>> structure.
-
-	The local symbols of the input files will not have been
-	entered into the linker hash table.  The <<_bfd_final_link>>
-	routine must consider each input file and include the symbols
-	in the output file.  It may be convenient to do this when
-	looking through the <<link_order>> structures, or it may be
-	done by stepping through the <<input_bfds>> list.
-
-	The <<_bfd_final_link>> routine must also traverse the global
-	hash table to gather all the externally visible symbols.  It
-	is possible that most of the externally visible symbols may be
-	written out when considering the symbols of each input file,
-	but it is still necessary to traverse the hash table since the
-	linker script may have defined some symbols that are not in
-	any of the input files.
-
-	The <<strip>> field of the <<bfd_link_info>> structure
-	controls which symbols are written out.  The possible values
-	are listed in <<bfdlink.h>>.  If the value is <<strip_some>>,
-	then the <<keep_hash>> field of the <<bfd_link_info>>
-	structure is a hash table of symbols to keep; each symbol
-	should be looked up in this hash table, and only symbols which
-	are present should be included in the output file.
-
-	If the <<strip>> field of the <<bfd_link_info>> structure
-	permits local symbols to be written out, the <<discard>> field
-	is used to further controls which local symbols are included
-	in the output file.  If the value is <<discard_l>>, then all
-	local symbols which begin with a certain prefix are discarded;
-	this is controlled by the <<bfd_is_local_label_name>> entry point.
-
-	The a.out backend handles symbols by calling
-	<<aout_link_write_symbols>> on each input BFD and then
-	traversing the global hash table with the function
-	<<aout_link_write_other_symbol>>.  It builds a string table
-	while writing out the symbols, which is written to the output
-	file at the end of <<NAME(aout,final_link)>>.
-*/
-
-static boolean generic_link_read_symbols
-  PARAMS ((bfd *));
-static boolean generic_link_add_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean collect));
-static boolean generic_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean collect));
-static boolean generic_link_check_archive_element_no_collect
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean generic_link_check_archive_element_collect
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded));
-static boolean generic_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *pneeded, boolean collect));
-static boolean generic_link_add_symbol_list
-  PARAMS ((bfd *, struct bfd_link_info *, bfd_size_type count, asymbol **,
-	   boolean collect));
-static bfd *hash_entry_bfd PARAMS ((struct bfd_link_hash_entry *));
-static void set_symbol_from_hash
-  PARAMS ((asymbol *, struct bfd_link_hash_entry *));
-static boolean generic_add_output_symbol
-  PARAMS ((bfd *, size_t *psymalloc, asymbol *));
-static boolean default_fill_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *));
-static boolean default_indirect_link_order
-  PARAMS ((bfd *, struct bfd_link_info *, asection *,
-	   struct bfd_link_order *, boolean));
-
-/* The link hash table structure is defined in bfdlink.h.  It provides
-   a base hash table which the backend specific hash tables are built
-   upon.  */
-
-/* Routine to create an entry in the link hash table.  */
-
-struct bfd_hash_entry *
-_bfd_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct bfd_link_hash_entry *ret = (struct bfd_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct bfd_link_hash_entry *) NULL)
-    ret = ((struct bfd_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct bfd_link_hash_entry)));
-  if (ret == (struct bfd_link_hash_entry *) NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct bfd_link_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
-  if (ret)
-    {
-      /* Initialize the local fields.  */
-      ret->type = bfd_link_hash_new;
-      ret->next = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize a link hash table.  The BFD argument is the one
-   responsible for creating this table.  */
-
-boolean
-_bfd_link_hash_table_init (table, abfd, newfunc)
-     struct bfd_link_hash_table *table;
-     bfd *abfd;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  table->creator = abfd->xvec;
-  table->undefs = NULL;
-  table->undefs_tail = NULL;
-  return bfd_hash_table_init (&table->table, newfunc);
-}
-
-/* Look up a symbol in a link hash table.  If follow is true, we
-   follow bfd_link_hash_indirect and bfd_link_hash_warning links to
-   the real symbol.  */
-
-struct bfd_link_hash_entry *
-bfd_link_hash_lookup (table, string, create, copy, follow)
-     struct bfd_link_hash_table *table;
-     const char *string;
-     boolean create;
-     boolean copy;
-     boolean follow;
-{
-  struct bfd_link_hash_entry *ret;
-
-  ret = ((struct bfd_link_hash_entry *)
-	 bfd_hash_lookup (&table->table, string, create, copy));
-
-  if (follow && ret != (struct bfd_link_hash_entry *) NULL)
-    {
-      while (ret->type == bfd_link_hash_indirect
-	     || ret->type == bfd_link_hash_warning)
-	ret = ret->u.i.link;
-    }
-
-  return ret;
-}
-
-/* Look up a symbol in the main linker hash table if the symbol might
-   be wrapped.  This should only be used for references to an
-   undefined symbol, not for definitions of a symbol.  */
-
-struct bfd_link_hash_entry *
-bfd_wrapped_link_hash_lookup (abfd, info, string, create, copy, follow)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     const char *string;
-     boolean create;
-     boolean copy;
-     boolean follow;
-{
-  if (info->wrap_hash != NULL)
-    {
-      const char *l;
-
-      l = string;
-      if (*l == bfd_get_symbol_leading_char (abfd))
-	++l;
-
-#undef WRAP
-#define WRAP "__wrap_"
-
-      if (bfd_hash_lookup (info->wrap_hash, l, false, false) != NULL)
-	{
-	  char *n;
-	  struct bfd_link_hash_entry *h;
-
-	  /* This symbol is being wrapped.  We want to replace all
-             references to SYM with references to __wrap_SYM.  */
-
-	  n = (char *) bfd_malloc (strlen (l) + sizeof WRAP + 1);
-	  if (n == NULL)
-	    return NULL;
-
-	  /* Note that symbol_leading_char may be '\0'.  */
-	  n[0] = bfd_get_symbol_leading_char (abfd);
-	  n[1] = '\0';
-	  strcat (n, WRAP);
-	  strcat (n, l);
-	  h = bfd_link_hash_lookup (info->hash, n, create, true, follow);
-	  free (n);
-	  return h;
-	}
-
-#undef WRAP
-
-#undef REAL
-#define REAL "__real_"
-
-      if (*l == '_'
-	  && strncmp (l, REAL, sizeof REAL - 1) == 0
-	  && bfd_hash_lookup (info->wrap_hash, l + sizeof REAL - 1,
-			      false, false) != NULL)
-	{
-	  char *n;
-	  struct bfd_link_hash_entry *h;
-
-	  /* This is a reference to __real_SYM, where SYM is being
-             wrapped.  We want to replace all references to __real_SYM
-             with references to SYM.  */
-
-	  n = (char *) bfd_malloc (strlen (l + sizeof REAL - 1) + 2);
-	  if (n == NULL)
-	    return NULL;
-
-	  /* Note that symbol_leading_char may be '\0'.  */
-	  n[0] = bfd_get_symbol_leading_char (abfd);
-	  n[1] = '\0';
-	  strcat (n, l + sizeof REAL - 1);
-	  h = bfd_link_hash_lookup (info->hash, n, create, true, follow);
-	  free (n);
-	  return h;
-	}
-
-#undef REAL
-    }
-
-  return bfd_link_hash_lookup (info->hash, string, create, copy, follow);
-}
-
-/* Traverse a generic link hash table.  The only reason this is not a
-   macro is to do better type checking.  This code presumes that an
-   argument passed as a struct bfd_hash_entry * may be caught as a
-   struct bfd_link_hash_entry * with no explicit cast required on the
-   call.  */
-
-void 
-bfd_link_hash_traverse (table, func, info)
-     struct bfd_link_hash_table *table;
-     boolean (*func) PARAMS ((struct bfd_link_hash_entry *, PTR));
-     PTR info;
-{
-  bfd_hash_traverse (&table->table,
-		     ((boolean (*) PARAMS ((struct bfd_hash_entry *, PTR)))
-		      func),
-		     info);
-}
-
-/* Add a symbol to the linker hash table undefs list.  */
-
-INLINE void
-bfd_link_add_undef (table, h)
-     struct bfd_link_hash_table *table;
-     struct bfd_link_hash_entry *h;
-{
-  BFD_ASSERT (h->next == NULL);
-  if (table->undefs_tail != (struct bfd_link_hash_entry *) NULL)
-    table->undefs_tail->next = h;
-  if (table->undefs == (struct bfd_link_hash_entry *) NULL)
-    table->undefs = h;
-  table->undefs_tail = h;
-}
-
-/* Routine to create an entry in an generic link hash table.  */
-
-struct bfd_hash_entry *
-_bfd_generic_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct generic_link_hash_entry *ret =
-    (struct generic_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct generic_link_hash_entry *) NULL)
-    ret = ((struct generic_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct generic_link_hash_entry)));
-  if (ret == (struct generic_link_hash_entry *) NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct generic_link_hash_entry *)
-	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				 table, string));
-
-  if (ret)
-    {
-      /* Set local fields.  */
-      ret->written = false;
-      ret->sym = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create an generic link hash table.  */
-
-struct bfd_link_hash_table *
-_bfd_generic_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct generic_link_hash_table *ret;
-
-  ret = ((struct generic_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct generic_link_hash_table)));
-  if (ret == NULL)
-    return (struct bfd_link_hash_table *) NULL;
-  if (! _bfd_link_hash_table_init (&ret->root, abfd,
-				   _bfd_generic_link_hash_newfunc))
-    {
-      free (ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-  return &ret->root;
-}
-
-/* Grab the symbols for an object file when doing a generic link.  We
-   store the symbols in the outsymbols field.  We need to keep them
-   around for the entire link to ensure that we only read them once.
-   If we read them multiple times, we might wind up with relocs and
-   the hash table pointing to different instances of the symbol
-   structure.  */
-
-static boolean
-generic_link_read_symbols (abfd)
-     bfd *abfd;
-{
-  if (bfd_get_outsymbols (abfd) == (asymbol **) NULL)
-    {
-      long symsize;
-      long symcount;
-
-      symsize = bfd_get_symtab_upper_bound (abfd);
-      if (symsize < 0)
-	return false;
-      bfd_get_outsymbols (abfd) = (asymbol **) bfd_alloc (abfd, symsize);
-      if (bfd_get_outsymbols (abfd) == NULL && symsize != 0)
-	return false;
-      symcount = bfd_canonicalize_symtab (abfd, bfd_get_outsymbols (abfd));
-      if (symcount < 0)
-	return false;
-      bfd_get_symcount (abfd) = symcount;
-    }
-
-  return true;
-}
-
-/* Generic function to add symbols to from an object file to the
-   global hash table.  This version does not automatically collect
-   constructors by name.  */
-
-boolean
-_bfd_generic_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  return generic_link_add_symbols (abfd, info, false);
-}
-
-/* Generic function to add symbols from an object file to the global
-   hash table.  This version automatically collects constructors by
-   name, as the collect2 program does.  It should be used for any
-   target which does not provide some other mechanism for setting up
-   constructors and destructors; these are approximately those targets
-   for which gcc uses collect2 and do not support stabs.  */
-
-boolean
-_bfd_generic_link_add_symbols_collect (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  return generic_link_add_symbols (abfd, info, true);
-}
-
-/* Add symbols from an object file to the global hash table.  */
-
-static boolean
-generic_link_add_symbols (abfd, info, collect)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean collect;
-{
-  boolean ret;
-
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      ret = generic_link_add_object_symbols (abfd, info, collect);
-      break;
-    case bfd_archive:
-      ret = (_bfd_generic_link_add_archive_symbols
-	     (abfd, info,
-	      (collect
-	       ? generic_link_check_archive_element_collect
-	       : generic_link_check_archive_element_no_collect)));
-      break;
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      ret = false;
-    }
-
-  return ret;
-}
-
-/* Add symbols from an object file to the global hash table.  */
-
-static boolean
-generic_link_add_object_symbols (abfd, info, collect)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean collect;
-{
-  if (! generic_link_read_symbols (abfd))
-    return false;
-  return generic_link_add_symbol_list (abfd, info,
-				       _bfd_generic_link_get_symcount (abfd),
-				       _bfd_generic_link_get_symbols (abfd),
-				       collect);
-}
-
-/* We build a hash table of all symbols defined in an archive.  */
-
-/* An archive symbol may be defined by multiple archive elements.
-   This linked list is used to hold the elements.  */
-
-struct archive_list
-{
-  struct archive_list *next;
-  int indx;
-};
-
-/* An entry in an archive hash table.  */
-
-struct archive_hash_entry
-{
-  struct bfd_hash_entry root;
-  /* Where the symbol is defined.  */
-  struct archive_list *defs;
-};
-
-/* An archive hash table itself.  */
-
-struct archive_hash_table
-{
-  struct bfd_hash_table table;
-};
-
-static struct bfd_hash_entry *archive_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean archive_hash_table_init
-  PARAMS ((struct archive_hash_table *,
-	   struct bfd_hash_entry *(*) (struct bfd_hash_entry *,
-				       struct bfd_hash_table *,
-				       const char *)));
-
-/* Create a new entry for an archive hash table.  */
-
-static struct bfd_hash_entry *
-archive_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct archive_hash_entry *ret = (struct archive_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct archive_hash_entry *) NULL)
-    ret = ((struct archive_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct archive_hash_entry)));
-  if (ret == (struct archive_hash_entry *) NULL)
-    return NULL;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct archive_hash_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-
-  if (ret)
-    {
-      /* Initialize the local fields.  */
-      ret->defs = (struct archive_list *) NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Initialize an archive hash table.  */
-
-static boolean
-archive_hash_table_init (table, newfunc)
-     struct archive_hash_table *table;
-     struct bfd_hash_entry *(*newfunc) PARAMS ((struct bfd_hash_entry *,
-						struct bfd_hash_table *,
-						const char *));
-{
-  return bfd_hash_table_init (&table->table, newfunc);
-}
-
-/* Look up an entry in an archive hash table.  */
-
-#define archive_hash_lookup(t, string, create, copy) \
-  ((struct archive_hash_entry *) \
-   bfd_hash_lookup (&(t)->table, (string), (create), (copy)))
-
-/* Allocate space in an archive hash table.  */
-
-#define archive_hash_allocate(t, size) bfd_hash_allocate (&(t)->table, (size))
-
-/* Free an archive hash table.  */
-
-#define archive_hash_table_free(t) bfd_hash_table_free (&(t)->table)
-
-/* Generic function to add symbols from an archive file to the global
-   hash file.  This function presumes that the archive symbol table
-   has already been read in (this is normally done by the
-   bfd_check_format entry point).  It looks through the undefined and
-   common symbols and searches the archive symbol table for them.  If
-   it finds an entry, it includes the associated object file in the
-   link.
-
-   The old linker looked through the archive symbol table for
-   undefined symbols.  We do it the other way around, looking through
-   undefined symbols for symbols defined in the archive.  The
-   advantage of the newer scheme is that we only have to look through
-   the list of undefined symbols once, whereas the old method had to
-   re-search the symbol table each time a new object file was added.
-
-   The CHECKFN argument is used to see if an object file should be
-   included.  CHECKFN should set *PNEEDED to true if the object file
-   should be included, and must also call the bfd_link_info
-   add_archive_element callback function and handle adding the symbols
-   to the global hash table.  CHECKFN should only return false if some
-   sort of error occurs.
-
-   For some formats, such as a.out, it is possible to look through an
-   object file but not actually include it in the link.  The
-   archive_pass field in a BFD is used to avoid checking the symbols
-   of an object files too many times.  When an object is included in
-   the link, archive_pass is set to -1.  If an object is scanned but
-   not included, archive_pass is set to the pass number.  The pass
-   number is incremented each time a new object file is included.  The
-   pass number is used because when a new object file is included it
-   may create new undefined symbols which cause a previously examined
-   object file to be included.  */
-
-boolean
-_bfd_generic_link_add_archive_symbols (abfd, info, checkfn)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean (*checkfn) PARAMS ((bfd *, struct bfd_link_info *,
-				 boolean *pneeded));
-{
-  carsym *arsyms;
-  carsym *arsym_end;
-  register carsym *arsym;
-  int pass;
-  struct archive_hash_table arsym_hash;
-  int indx;
-  struct bfd_link_hash_entry **pundef;
-
-  if (! bfd_has_map (abfd))
-    {
-      /* An empty archive is a special case.  */
-      if (bfd_openr_next_archived_file (abfd, (bfd *) NULL) == NULL)
-	return true;
-      bfd_set_error (bfd_error_no_armap);
-      return false;
-    }
-
-  arsyms = bfd_ardata (abfd)->symdefs;
-  arsym_end = arsyms + bfd_ardata (abfd)->symdef_count;
-
-  /* In order to quickly determine whether an symbol is defined in
-     this archive, we build a hash table of the symbols.  */
-  if (! archive_hash_table_init (&arsym_hash, archive_hash_newfunc))
-    return false;
-  for (arsym = arsyms, indx = 0; arsym < arsym_end; arsym++, indx++)
-    {
-      struct archive_hash_entry *arh;
-      struct archive_list *l, **pp;
-
-      arh = archive_hash_lookup (&arsym_hash, arsym->name, true, false);
-      if (arh == (struct archive_hash_entry *) NULL)
-	goto error_return;
-      l = ((struct archive_list *)
-	   archive_hash_allocate (&arsym_hash, sizeof (struct archive_list)));
-      if (l == NULL)
-	goto error_return;
-      l->indx = indx;
-      for (pp = &arh->defs;
-	   *pp != (struct archive_list *) NULL;
-	   pp = &(*pp)->next)
-	;
-      *pp = l;
-      l->next = NULL;
-    }
-
-  /* The archive_pass field in the archive itself is used to
-     initialize PASS, sine we may search the same archive multiple
-     times.  */
-  pass = abfd->archive_pass + 1;
-
-  /* New undefined symbols are added to the end of the list, so we
-     only need to look through it once.  */
-  pundef = &info->hash->undefs;
-  while (*pundef != (struct bfd_link_hash_entry *) NULL)
-    {
-      struct bfd_link_hash_entry *h;
-      struct archive_hash_entry *arh;
-      struct archive_list *l;
-
-      h = *pundef;
-
-      /* When a symbol is defined, it is not necessarily removed from
-	 the list.  */
-      if (h->type != bfd_link_hash_undefined
-	  && h->type != bfd_link_hash_common)
-	{
-	  /* Remove this entry from the list, for general cleanliness
-	     and because we are going to look through the list again
-	     if we search any more libraries.  We can't remove the
-	     entry if it is the tail, because that would lose any
-	     entries we add to the list later on (it would also cause
-	     us to lose track of whether the symbol has been
-	     referenced).  */
-	  if (*pundef != info->hash->undefs_tail)
-	    *pundef = (*pundef)->next;
-	  else
-	    pundef = &(*pundef)->next;
-	  continue;
-	}
-
-      /* Look for this symbol in the archive symbol map.  */
-      arh = archive_hash_lookup (&arsym_hash, h->root.string, false, false);
-      if (arh == (struct archive_hash_entry *) NULL)
-	{
-	  pundef = &(*pundef)->next;
-	  continue;
-	}
-
-      /* Look at all the objects which define this symbol.  */
-      for (l = arh->defs; l != (struct archive_list *) NULL; l = l->next)
-	{
-	  bfd *element;
-	  boolean needed;
-
-	  /* If the symbol has gotten defined along the way, quit.  */
-	  if (h->type != bfd_link_hash_undefined
-	      && h->type != bfd_link_hash_common)
-	    break;
-
-	  element = bfd_get_elt_at_index (abfd, l->indx);
-	  if (element == (bfd *) NULL)
-	    goto error_return;
-
-	  /* If we've already included this element, or if we've
-	     already checked it on this pass, continue.  */
-	  if (element->archive_pass == -1
-	      || element->archive_pass == pass)
-	    continue;
-
-	  /* If we can't figure this element out, just ignore it.  */
-	  if (! bfd_check_format (element, bfd_object))
-	    {
-	      element->archive_pass = -1;
-	      continue;
-	    }
-
-	  /* CHECKFN will see if this element should be included, and
-	     go ahead and include it if appropriate.  */
-	  if (! (*checkfn) (element, info, &needed))
-	    goto error_return;
-
-	  if (! needed)
-	    element->archive_pass = pass;
-	  else
-	    {
-	      element->archive_pass = -1;
-
-	      /* Increment the pass count to show that we may need to
-		 recheck object files which were already checked.  */
-	      ++pass;
-	    }
-	}
-
-      pundef = &(*pundef)->next;
-    }
-
-  archive_hash_table_free (&arsym_hash);
-
-  /* Save PASS in case we are called again.  */
-  abfd->archive_pass = pass;
-
-  return true;
-
- error_return:
-  archive_hash_table_free (&arsym_hash);
-  return false;
-}
-
-/* See if we should include an archive element.  This version is used
-   when we do not want to automatically collect constructors based on
-   the symbol name, presumably because we have some other mechanism
-   for finding them.  */
-
-static boolean
-generic_link_check_archive_element_no_collect (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  return generic_link_check_archive_element (abfd, info, pneeded, false);
-}
-
-/* See if we should include an archive element.  This version is used
-   when we want to automatically collect constructors based on the
-   symbol name, as collect2 does.  */
-
-static boolean
-generic_link_check_archive_element_collect (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  return generic_link_check_archive_element (abfd, info, pneeded, true);
-}
-
-/* See if we should include an archive element.  Optionally collect
-   constructors.  */
-
-static boolean
-generic_link_check_archive_element (abfd, info, pneeded, collect)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-     boolean collect;
-{
-  asymbol **pp, **ppend;
-
-  *pneeded = false;
-
-  if (! generic_link_read_symbols (abfd))
-    return false;
-
-  pp = _bfd_generic_link_get_symbols (abfd);
-  ppend = pp + _bfd_generic_link_get_symcount (abfd);
-  for (; pp < ppend; pp++)
-    {
-      asymbol *p;
-      struct bfd_link_hash_entry *h;
-
-      p = *pp;
-
-      /* We are only interested in globally visible symbols.  */
-      if (! bfd_is_com_section (p->section)
-	  && (p->flags & (BSF_GLOBAL | BSF_INDIRECT | BSF_WEAK)) == 0)
-	continue;
-
-      /* We are only interested if we know something about this
-	 symbol, and it is undefined or common.  An undefined weak
-	 symbol (type bfd_link_hash_undefweak) is not considered to be
-	 a reference when pulling files out of an archive.  See the
-	 SVR4 ABI, p. 4-27.  */
-      h = bfd_link_hash_lookup (info->hash, bfd_asymbol_name (p), false,
-				false, true);
-      if (h == (struct bfd_link_hash_entry *) NULL
-	  || (h->type != bfd_link_hash_undefined
-	      && h->type != bfd_link_hash_common))
-	continue;
-
-      /* P is a symbol we are looking for.  */
-
-      if (! bfd_is_com_section (p->section))
-	{
-	  bfd_size_type symcount;
-	  asymbol **symbols;
-
-	  /* This object file defines this symbol, so pull it in.  */
-	  if (! (*info->callbacks->add_archive_element) (info, abfd,
-							 bfd_asymbol_name (p)))
-	    return false;
-	  symcount = _bfd_generic_link_get_symcount (abfd);
-	  symbols = _bfd_generic_link_get_symbols (abfd);
-	  if (! generic_link_add_symbol_list (abfd, info, symcount,
-					      symbols, collect))
-	    return false;
-	  *pneeded = true;
-	  return true;
-	}
-
-      /* P is a common symbol.  */
-
-      if (h->type == bfd_link_hash_undefined)
-	{
-	  bfd *symbfd;
-	  bfd_vma size;
-	  unsigned int power;
-
-	  symbfd = h->u.undef.abfd;
-	  if (symbfd == (bfd *) NULL)
-	    {
-	      /* This symbol was created as undefined from outside
-		 BFD.  We assume that we should link in the object
-		 file.  This is for the -u option in the linker.  */
-	      if (! (*info->callbacks->add_archive_element)
-		  (info, abfd, bfd_asymbol_name (p)))
-		return false;
-	      *pneeded = true;
-	      return true;
-	    }
-
-	  /* Turn the symbol into a common symbol but do not link in
-	     the object file.  This is how a.out works.  Object
-	     formats that require different semantics must implement
-	     this function differently.  This symbol is already on the
-	     undefs list.  We add the section to a common section
-	     attached to symbfd to ensure that it is in a BFD which
-	     will be linked in.  */
-	  h->type = bfd_link_hash_common;
-	  h->u.c.p =
-	    ((struct bfd_link_hash_common_entry *)
-	     bfd_hash_allocate (&info->hash->table,
-				sizeof (struct bfd_link_hash_common_entry)));
-	  if (h->u.c.p == NULL)
-	    return false;
-
-	  size = bfd_asymbol_value (p);
-	  h->u.c.size = size;
-
-	  power = bfd_log2 (size);
-	  if (power > 4)
-	    power = 4;
-	  h->u.c.p->alignment_power = power;
-
-	  if (p->section == bfd_com_section_ptr)
-	    h->u.c.p->section = bfd_make_section_old_way (symbfd, "COMMON");
-	  else
-	    h->u.c.p->section = bfd_make_section_old_way (symbfd,
-							  p->section->name);
-	  h->u.c.p->section->flags = SEC_ALLOC;
-	}
-      else
-	{
-	  /* Adjust the size of the common symbol if necessary.  This
-	     is how a.out works.  Object formats that require
-	     different semantics must implement this function
-	     differently.  */
-	  if (bfd_asymbol_value (p) > h->u.c.size)
-	    h->u.c.size = bfd_asymbol_value (p);
-	}
-    }
-
-  /* This archive element is not needed.  */
-  return true;
-}
-
-/* Add the symbols from an object file to the global hash table.  ABFD
-   is the object file.  INFO is the linker information.  SYMBOL_COUNT
-   is the number of symbols.  SYMBOLS is the list of symbols.  COLLECT
-   is true if constructors should be automatically collected by name
-   as is done by collect2.  */
-
-static boolean
-generic_link_add_symbol_list (abfd, info, symbol_count, symbols, collect)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     bfd_size_type symbol_count;
-     asymbol **symbols;
-     boolean collect;
-{
-  asymbol **pp, **ppend;
-
-  pp = symbols;
-  ppend = symbols + symbol_count;
-  for (; pp < ppend; pp++)
-    {
-      asymbol *p;
-
-      p = *pp;
-
-      if ((p->flags & (BSF_INDIRECT
-		       | BSF_WARNING
-		       | BSF_GLOBAL
-		       | BSF_CONSTRUCTOR
-		       | BSF_WEAK)) != 0
-	  || bfd_is_und_section (bfd_get_section (p))
-	  || bfd_is_com_section (bfd_get_section (p))
-	  || bfd_is_ind_section (bfd_get_section (p)))
-	{
-	  const char *name;
-	  const char *string;
-	  struct generic_link_hash_entry *h;
-
-	  name = bfd_asymbol_name (p);
-	  if (((p->flags & BSF_INDIRECT) != 0
-	       || bfd_is_ind_section (p->section))
-	      && pp + 1 < ppend)
-	    {
-	      pp++;
-	      string = bfd_asymbol_name (*pp);
-	    }
-	  else if ((p->flags & BSF_WARNING) != 0
-		   && pp + 1 < ppend)
-	    {
-	      /* The name of P is actually the warning string, and the
-		 next symbol is the one to warn about.  */
-	      string = name;
-	      pp++;
-	      name = bfd_asymbol_name (*pp);
-	    }
-	  else
-	    string = NULL;
-
-	  h = NULL;
-	  if (! (_bfd_generic_link_add_one_symbol
-		 (info, abfd, name, p->flags, bfd_get_section (p),
-		  p->value, string, false, collect,
-		  (struct bfd_link_hash_entry **) &h)))
-	    return false;
-
-	  /* If this is a constructor symbol, and the linker didn't do
-             anything with it, then we want to just pass the symbol
-             through to the output file.  This will happen when
-             linking with -r.  */
-	  if ((p->flags & BSF_CONSTRUCTOR) != 0
-	      && (h == NULL || h->root.type == bfd_link_hash_new))
-	    {
-	      p->udata.p = NULL;
-	      continue;
-	    }
-
-	  /* Save the BFD symbol so that we don't lose any backend
-	     specific information that may be attached to it.  We only
-	     want this one if it gives more information than the
-	     existing one; we don't want to replace a defined symbol
-	     with an undefined one.  This routine may be called with a
-	     hash table other than the generic hash table, so we only
-	     do this if we are certain that the hash table is a
-	     generic one.  */
-	  if (info->hash->creator == abfd->xvec)
-	    {
-	      if (h->sym == (asymbol *) NULL
-		  || (! bfd_is_und_section (bfd_get_section (p))
-		      && (! bfd_is_com_section (bfd_get_section (p))
-			  || bfd_is_und_section (bfd_get_section (h->sym)))))
-		{
-		  h->sym = p;
-		  /* BSF_OLD_COMMON is a hack to support COFF reloc
-		     reading, and it should go away when the COFF
-		     linker is switched to the new version.  */
-		  if (bfd_is_com_section (bfd_get_section (p)))
-		    p->flags |= BSF_OLD_COMMON;
-		}
-	    }
-
-	  /* Store a back pointer from the symbol to the hash
-	     table entry for the benefit of relaxation code until
-	     it gets rewritten to not use asymbol structures.
-	     Setting this is also used to check whether these
-	     symbols were set up by the generic linker.  */
-	  p->udata.p = (PTR) h;
-	}
-    }
-
-  return true;
-}
-
-/* We use a state table to deal with adding symbols from an object
-   file.  The first index into the state table describes the symbol
-   from the object file.  The second index into the state table is the
-   type of the symbol in the hash table.  */
-
-/* The symbol from the object file is turned into one of these row
-   values.  */
-
-enum link_row
-{
-  UNDEF_ROW,		/* Undefined.  */
-  UNDEFW_ROW,		/* Weak undefined.  */
-  DEF_ROW,		/* Defined.  */
-  DEFW_ROW,		/* Weak defined.  */
-  COMMON_ROW,		/* Common.  */
-  INDR_ROW,		/* Indirect.  */
-  WARN_ROW,		/* Warning.  */
-  SET_ROW		/* Member of set.  */
-};
-
-/* apparently needed for Hitachi 3050R(HI-UX/WE2)? */
-#undef FAIL
-
-/* The actions to take in the state table.  */
-
-enum link_action
-{
-  FAIL,		/* Abort. */
-  UND,		/* Mark symbol undefined.  */
-  WEAK,		/* Mark symbol weak undefined.  */
-  DEF,		/* Mark symbol defined.  */
-  DEFW,		/* Mark symbol weak defined.  */
-  COM,		/* Mark symbol common.  */
-  REF,		/* Mark defined symbol referenced.  */
-  CREF,		/* Possibly warn about common reference to defined symbol.  */
-  CDEF,		/* Define existing common symbol.  */
-  NOACT,	/* No action.  */
-  BIG,		/* Mark symbol common using largest size.  */
-  MDEF,		/* Multiple definition error.  */
-  MIND,		/* Multiple indirect symbols.  */
-  IND,		/* Make indirect symbol.  */
-  CIND,		/* Make indirect symbol from existing common symbol.  */
-  SET,		/* Add value to set.  */
-  MWARN,	/* Make warning symbol.  */
-  WARN,		/* Issue warning.  */
-  CWARN,	/* Warn if referenced, else MWARN.  */
-  CYCLE,	/* Repeat with symbol pointed to.  */
-  REFC,		/* Mark indirect symbol referenced and then CYCLE.  */
-  WARNC		/* Issue warning and then CYCLE.  */
-};
-
-/* The state table itself.  The first index is a link_row and the
-   second index is a bfd_link_hash_type.  */
-
-static const enum link_action link_action[8][8] =
-{
-  /* current\prev    new    undef  undefw def    defw   com    indr   warn  */
-  /* UNDEF_ROW 	*/  {UND,   NOACT, UND,   REF,   REF,   NOACT, REFC,  WARNC },
-  /* UNDEFW_ROW	*/  {WEAK,  NOACT, NOACT, REF,   REF,   NOACT, REFC,  WARNC },
-  /* DEF_ROW 	*/  {DEF,   DEF,   DEF,   MDEF,  DEF,   CDEF,  MDEF,  CYCLE },
-  /* DEFW_ROW 	*/  {DEFW,  DEFW,  DEFW,  NOACT, NOACT, NOACT, NOACT, CYCLE },
-  /* COMMON_ROW	*/  {COM,   COM,   COM,   CREF,  CREF,  BIG,   REFC,  WARNC },
-  /* INDR_ROW	*/  {IND,   IND,   IND,   MDEF,  IND,   CIND,  MIND,  CYCLE },
-  /* WARN_ROW   */  {MWARN, WARN,  WARN,  CWARN, CWARN, WARN,  CWARN, MWARN },
-  /* SET_ROW	*/  {SET,   SET,   SET,   SET,   SET,   SET,   CYCLE, CYCLE }
-};
-
-/* Most of the entries in the LINK_ACTION table are straightforward,
-   but a few are somewhat subtle.
-
-   A reference to an indirect symbol (UNDEF_ROW/indr or
-   UNDEFW_ROW/indr) is counted as a reference both to the indirect
-   symbol and to the symbol the indirect symbol points to.
-
-   A reference to a warning symbol (UNDEF_ROW/warn or UNDEFW_ROW/warn)
-   causes the warning to be issued.
-
-   A common definition of an indirect symbol (COMMON_ROW/indr) is
-   treated as a multiple definition error.  Likewise for an indirect
-   definition of a common symbol (INDR_ROW/com).
-
-   An indirect definition of a warning (INDR_ROW/warn) does not cause
-   the warning to be issued.
-
-   If a warning is created for an indirect symbol (WARN_ROW/indr) no
-   warning is created for the symbol the indirect symbol points to.
-
-   Adding an entry to a set does not count as a reference to a set,
-   and no warning is issued (SET_ROW/warn).  */
-
-/* Return the BFD in which a hash entry has been defined, if known.  */
-
-static bfd *
-hash_entry_bfd (h)
-     struct bfd_link_hash_entry *h;
-{
-  while (h->type == bfd_link_hash_warning)
-    h = h->u.i.link;
-  switch (h->type)
-    {
-    default:
-      return NULL;
-    case bfd_link_hash_undefined:
-    case bfd_link_hash_undefweak:
-      return h->u.undef.abfd;
-    case bfd_link_hash_defined:
-    case bfd_link_hash_defweak:
-      return h->u.def.section->owner;
-    case bfd_link_hash_common:
-      return h->u.c.p->section->owner;
-    }
-  /*NOTREACHED*/
-}
-
-/* Add a symbol to the global hash table.
-   ABFD is the BFD the symbol comes from.
-   NAME is the name of the symbol.
-   FLAGS is the BSF_* bits associated with the symbol.
-   SECTION is the section in which the symbol is defined; this may be
-     bfd_und_section_ptr or bfd_com_section_ptr.
-   VALUE is the value of the symbol, relative to the section.
-   STRING is used for either an indirect symbol, in which case it is
-     the name of the symbol to indirect to, or a warning symbol, in
-     which case it is the warning string.
-   COPY is true if NAME or STRING must be copied into locally
-     allocated memory if they need to be saved.
-   COLLECT is true if we should automatically collect gcc constructor
-     or destructor names as collect2 does.
-   HASHP, if not NULL, is a place to store the created hash table
-     entry; if *HASHP is not NULL, the caller has already looked up
-     the hash table entry, and stored it in *HASHP. */
-
-boolean
-_bfd_generic_link_add_one_symbol (info, abfd, name, flags, section, value,
-				  string, copy, collect, hashp)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     asection *section;
-     bfd_vma value;
-     const char *string;
-     boolean copy;
-     boolean collect;
-     struct bfd_link_hash_entry **hashp;
-{
-  enum link_row row;
-  struct bfd_link_hash_entry *h;
-  boolean cycle;
-
-  if (bfd_is_ind_section (section)
-      || (flags & BSF_INDIRECT) != 0)
-    row = INDR_ROW;
-  else if ((flags & BSF_WARNING) != 0)
-    row = WARN_ROW;
-  else if ((flags & BSF_CONSTRUCTOR) != 0)
-    row = SET_ROW;
-  else if (bfd_is_und_section (section))
-    {
-      if ((flags & BSF_WEAK) != 0)
-	row = UNDEFW_ROW;
-      else
-	row = UNDEF_ROW;
-    }
-  else if ((flags & BSF_WEAK) != 0)
-    row = DEFW_ROW;
-  else if (bfd_is_com_section (section))
-    row = COMMON_ROW;
-  else
-    row = DEF_ROW;
-
-  if (hashp != NULL && *hashp != NULL)
-    h = *hashp;
-  else
-    {
-      if (row == UNDEF_ROW || row == UNDEFW_ROW)
-	h = bfd_wrapped_link_hash_lookup (abfd, info, name, true, copy, false);
-      else
-	h = bfd_link_hash_lookup (info->hash, name, true, copy, false);
-      if (h == NULL)
-	{
-	  if (hashp != NULL)
-	    *hashp = NULL;
-	  return false;
-	}
-    }
-
-  if (info->notice_all
-      || (info->notice_hash != (struct bfd_hash_table *) NULL
-	  && (bfd_hash_lookup (info->notice_hash, name, false, false)
-	      != (struct bfd_hash_entry *) NULL)))
-    {
-      if (! (*info->callbacks->notice) (info, h->root.string, abfd, section,
-					value))
-	return false;
-    }
-
-  if (hashp != (struct bfd_link_hash_entry **) NULL)
-    *hashp = h;
-
-  do
-    {
-      enum link_action action;
-
-      cycle = false;
-      action = link_action[(int) row][(int) h->type];
-      switch (action)
-	{
-	case FAIL:
-	  abort ();
-
-	case NOACT:
-	  /* Do nothing.  */
-	  break;
-
-	case UND:
-	  /* Make a new undefined symbol.  */
-	  h->type = bfd_link_hash_undefined;
-	  h->u.undef.abfd = abfd;
-	  bfd_link_add_undef (info->hash, h);
-	  break;
-
-	case WEAK:
-	  /* Make a new weak undefined symbol.  */
-	  h->type = bfd_link_hash_undefweak;
-	  h->u.undef.abfd = abfd;
-	  break;
-
-	case CDEF:
-	  /* We have found a definition for a symbol which was
-	     previously common.  */
-	  BFD_ASSERT (h->type == bfd_link_hash_common);
-	  if (! ((*info->callbacks->multiple_common)
-		 (info, h->root.string,
-		  h->u.c.p->section->owner, bfd_link_hash_common, h->u.c.size,
-		  abfd, bfd_link_hash_defined, (bfd_vma) 0)))
-	    return false;
-	  /* Fall through.  */
-	case DEF:
-	case DEFW:
-	  {
-	    enum bfd_link_hash_type oldtype;
-
-	    /* Define a symbol.  */
-	    oldtype = h->type;
-	    if (action == DEFW)
-	      h->type = bfd_link_hash_defweak;
-	    else
-	      h->type = bfd_link_hash_defined;
-	    h->u.def.section = section;
-	    h->u.def.value = value;
-
-	    /* If we have been asked to, we act like collect2 and
-	       identify all functions that might be global
-	       constructors and destructors and pass them up in a
-	       callback.  We only do this for certain object file
-	       types, since many object file types can handle this
-	       automatically.  */
-	    if (collect && name[0] == '_')
-	      {
-		const char *s;
-
-		/* A constructor or destructor name starts like this:
-		   _+GLOBAL_[_.$][ID][_.$] where the first [_.$] and
-		   the second are the same character (we accept any
-		   character there, in case a new object file format
-		   comes along with even worse naming restrictions).  */
-
-#define CONS_PREFIX "GLOBAL_"
-#define CONS_PREFIX_LEN (sizeof CONS_PREFIX - 1)
-
-		s = name + 1;
-		while (*s == '_')
-		  ++s;
-		if (s[0] == 'G'
-		    && strncmp (s, CONS_PREFIX, CONS_PREFIX_LEN - 1) == 0)
-		  {
-		    char c;
-
-		    c = s[CONS_PREFIX_LEN + 1];
-		    if ((c == 'I' || c == 'D')
-			&& s[CONS_PREFIX_LEN] == s[CONS_PREFIX_LEN + 2])
-		      {
-			/* If this is a definition of a symbol which
-                           was previously weakly defined, we are in
-                           trouble.  We have already added a
-                           constructor entry for the weak defined
-                           symbol, and now we are trying to add one
-                           for the new symbol.  Fortunately, this case
-                           should never arise in practice.  */
-			if (oldtype == bfd_link_hash_defweak)
-			  abort ();
-
-			if (! ((*info->callbacks->constructor)
-			       (info,
-				c == 'I' ? true : false,
-				h->root.string, abfd, section, value)))
-			  return false;
-		      }
-		  }
-	      }
-	  }
-
-	  break;
-
-	case COM:
-	  /* We have found a common definition for a symbol.  */
-	  if (h->type == bfd_link_hash_new)
-	    bfd_link_add_undef (info->hash, h);
-	  h->type = bfd_link_hash_common;
-	  h->u.c.p =
-	    ((struct bfd_link_hash_common_entry *)
-	     bfd_hash_allocate (&info->hash->table,
-				sizeof (struct bfd_link_hash_common_entry)));
-	  if (h->u.c.p == NULL)
-	    return false;
-
-	  h->u.c.size = value;
-
-	  /* Select a default alignment based on the size.  This may
-             be overridden by the caller.  */
-	  {
-	    unsigned int power;
-
-	    power = bfd_log2 (value);
-	    if (power > 4)
-	      power = 4;
-	    h->u.c.p->alignment_power = power;
-	  }
-
-	  /* The section of a common symbol is only used if the common
-             symbol is actually allocated.  It basically provides a
-             hook for the linker script to decide which output section
-             the common symbols should be put in.  In most cases, the
-             section of a common symbol will be bfd_com_section_ptr,
-             the code here will choose a common symbol section named
-             "COMMON", and the linker script will contain *(COMMON) in
-             the appropriate place.  A few targets use separate common
-             sections for small symbols, and they require special
-             handling.  */
-	  if (section == bfd_com_section_ptr)
-	    {
-	      h->u.c.p->section = bfd_make_section_old_way (abfd, "COMMON");
-	      h->u.c.p->section->flags = SEC_ALLOC;
-	    }
-	  else if (section->owner != abfd)
-	    {
-	      h->u.c.p->section = bfd_make_section_old_way (abfd,
-							    section->name);
-	      h->u.c.p->section->flags = SEC_ALLOC;
-	    }
-	  else
-	    h->u.c.p->section = section;
-	  break;
-
-	case REF:
-	  /* A reference to a defined symbol.  */
-	  if (h->next == NULL && info->hash->undefs_tail != h)
-	    h->next = h;
-	  break;
-
-	case BIG:
-	  /* We have found a common definition for a symbol which
-	     already had a common definition.  Use the maximum of the
-	     two sizes.  */
-	  BFD_ASSERT (h->type == bfd_link_hash_common);
-	  if (! ((*info->callbacks->multiple_common)
-		 (info, h->root.string,
-		  h->u.c.p->section->owner, bfd_link_hash_common, h->u.c.size,
-		  abfd, bfd_link_hash_common, value)))
-	    return false;
-	  if (value > h->u.c.size)
-	    {
-	      unsigned int power;
-
-	      h->u.c.size = value;
-
-	      /* Select a default alignment based on the size.  This may
-		 be overridden by the caller.  */
-	      power = bfd_log2 (value);
-	      if (power > 4)
-		power = 4;
-	      h->u.c.p->alignment_power = power;
-	    }
-	  break;
-
-	case CREF:
-	  {
-	    bfd *obfd;
-
-	    /* We have found a common definition for a symbol which
-	       was already defined.  FIXME: It would nice if we could
-	       report the BFD which defined an indirect symbol, but we
-	       don't have anywhere to store the information.  */
-	    if (h->type == bfd_link_hash_defined
-		|| h->type == bfd_link_hash_defweak)
-	      obfd = h->u.def.section->owner;
-	    else
-	      obfd = NULL;
-	    if (! ((*info->callbacks->multiple_common)
-		   (info, h->root.string, obfd, h->type, (bfd_vma) 0,
-		    abfd, bfd_link_hash_common, value)))
-	      return false;
-	  }
-	  break;
-
-	case MIND:
-	  /* Multiple indirect symbols.  This is OK if they both point
-	     to the same symbol.  */
-	  if (strcmp (h->u.i.link->root.string, string) == 0)
-	    break;
-	  /* Fall through.  */
-	case MDEF:
-	  /* Handle a multiple definition.  */
-	  {
-	    asection *msec;
-	    bfd_vma mval;
-
-	    switch (h->type)
-	      {
-	      case bfd_link_hash_defined:
-		msec = h->u.def.section;
-		mval = h->u.def.value;
-		break;
-	      case bfd_link_hash_indirect:
-		msec = bfd_ind_section_ptr;
-		mval = 0;
-		break;
-	      default:
-		abort ();
-	      }
-
-	    /* Ignore a redefinition of an absolute symbol to the same
-               value; it's harmless.  */
-	    if (h->type == bfd_link_hash_defined
-		&& bfd_is_abs_section (msec)
-		&& bfd_is_abs_section (section)
-		&& value == mval)
-	      break;
-
-	    if (! ((*info->callbacks->multiple_definition)
-		   (info, h->root.string, msec->owner, msec, mval, abfd,
-		    section, value)))
-	      return false;
-	  }
-	  break;
-
-	case CIND:
-	  /* Create an indirect symbol from an existing common symbol.  */
-	  BFD_ASSERT (h->type == bfd_link_hash_common);
-	  if (! ((*info->callbacks->multiple_common)
-		 (info, h->root.string,
-		  h->u.c.p->section->owner, bfd_link_hash_common, h->u.c.size,
-		  abfd, bfd_link_hash_indirect, (bfd_vma) 0)))
-	    return false;
-	  /* Fall through.  */
-	case IND:
-	  /* Create an indirect symbol.  */
-	  {
-	    struct bfd_link_hash_entry *inh;
-
-	    /* STRING is the name of the symbol we want to indirect
-	       to.  */
-	    inh = bfd_wrapped_link_hash_lookup (abfd, info, string, true,
-						copy, false);
-	    if (inh == (struct bfd_link_hash_entry *) NULL)
-	      return false;
-	    if (inh->type == bfd_link_hash_new)
-	      {
-		inh->type = bfd_link_hash_undefined;
-		inh->u.undef.abfd = abfd;
-		bfd_link_add_undef (info->hash, inh);
-	      }
-
-	    /* If the indirect symbol has been referenced, we need to
-	       push the reference down to the symbol we are
-	       referencing.  */
-	    if (h->type != bfd_link_hash_new)
-	      {
-		row = UNDEF_ROW;
-		cycle = true;
-	      }
-
-	    h->type = bfd_link_hash_indirect;
-	    h->u.i.link = inh;
-	  }
-	  break;
-
-	case SET:
-	  /* Add an entry to a set.  */
-	  if (! (*info->callbacks->add_to_set) (info, h, BFD_RELOC_CTOR,
-						abfd, section, value))
-	    return false;
-	  break;
-
-	case WARNC:
-	  /* Issue a warning and cycle.  */
-	  if (h->u.i.warning != NULL)
-	    {
-	      if (! (*info->callbacks->warning) (info, h->u.i.warning,
-						 h->root.string, abfd,
-						 (asection *) NULL,
-						 (bfd_vma) 0))
-		return false;
-	      /* Only issue a warning once.  */
-	      h->u.i.warning = NULL;
-	    }
-	  /* Fall through.  */
-	case CYCLE:
-	  /* Try again with the referenced symbol.  */
-	  h = h->u.i.link;
-	  cycle = true;
-	  break;
-
-	case REFC:
-	  /* A reference to an indirect symbol.  */
-	  if (h->next == NULL && info->hash->undefs_tail != h)
-	    h->next = h;
-	  h = h->u.i.link;
-	  cycle = true;
-	  break;
-
-	case WARN:
-	  /* Issue a warning.  */
-	  if (! (*info->callbacks->warning) (info, string, h->root.string,
-					     hash_entry_bfd (h),
-					     (asection *) NULL, (bfd_vma) 0))
-	    return false;
-	  break;
-
-	case CWARN:
-	  /* Warn if this symbol has been referenced already,
-	     otherwise add a warning.  A symbol has been referenced if
-	     the next field is not NULL, or it is the tail of the
-	     undefined symbol list.  The REF case above helps to
-	     ensure this.  */
-	  if (h->next != NULL || info->hash->undefs_tail == h)
-	    {
-	      if (! (*info->callbacks->warning) (info, string, h->root.string,
-						 hash_entry_bfd (h),
-						 (asection *) NULL,
-						 (bfd_vma) 0))
-		return false;
-	      break;
-	    }
-	  /* Fall through.  */
-	case MWARN:
-	  /* Make a warning symbol.  */
-	  {
-	    struct bfd_link_hash_entry *sub;
-
-	    /* STRING is the warning to give.  */
-	    sub = ((struct bfd_link_hash_entry *)
-		   ((*info->hash->table.newfunc)
-		    ((struct bfd_hash_entry *) NULL, &info->hash->table,
-		     h->root.string)));
-	    if (sub == NULL)
-	      return false;
-	    *sub = *h;
-	    sub->type = bfd_link_hash_warning;
-	    sub->u.i.link = h;
-	    if (! copy)
-	      sub->u.i.warning = string;
-	    else
-	      {
-		char *w;
-
-		w = bfd_hash_allocate (&info->hash->table,
-				       strlen (string) + 1);
-		if (w == NULL)
-		  return false;
-		strcpy (w, string);
-		sub->u.i.warning = w;
-	      }
-
-	    bfd_hash_replace (&info->hash->table,
-			      (struct bfd_hash_entry *) h,
-			      (struct bfd_hash_entry *) sub);
-	    if (hashp != NULL)
-	      *hashp = sub;
-	  }
-	  break;
-	}
-    }
-  while (cycle);
-
-  return true;
-}
-
-/* Generic final link routine.  */
-
-boolean
-_bfd_generic_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd *sub;
-  asection *o;
-  struct bfd_link_order *p;
-  size_t outsymalloc;
-  struct generic_write_global_symbol_info wginfo;
-
-  bfd_get_outsymbols (abfd) = (asymbol **) NULL;
-  bfd_get_symcount (abfd) = 0;
-  outsymalloc = 0;
-
-  /* Mark all sections which will be included in the output file.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    for (p = o->link_order_head; p != NULL; p = p->next)
-      if (p->type == bfd_indirect_link_order)
-	p->u.indirect.section->linker_mark = true;
-
-  /* Build the output symbol table.  */
-  for (sub = info->input_bfds; sub != (bfd *) NULL; sub = sub->link_next)
-    if (! _bfd_generic_link_output_symbols (abfd, sub, info, &outsymalloc))
-      return false;
-
-  /* Accumulate the global symbols.  */
-  wginfo.info = info;
-  wginfo.output_bfd = abfd;
-  wginfo.psymalloc = &outsymalloc;
-  _bfd_generic_link_hash_traverse (_bfd_generic_hash_table (info),
-				   _bfd_generic_link_write_global_symbol,
-				   (PTR) &wginfo);
-
-  /* Make sure we have a trailing NULL pointer on OUTSYMBOLS.  We
-     shouldn't really need one, since we have SYMCOUNT, but some old
-     code still expects one.  */
-  if (! generic_add_output_symbol (abfd, &outsymalloc, NULL))
-    return false;
-
-  if (info->relocateable)
-    {
-      /* Allocate space for the output relocs for each section.  */
-      for (o = abfd->sections;
-	   o != (asection *) NULL;
-	   o = o->next)
-	{
-	  o->reloc_count = 0;
-	  for (p = o->link_order_head;
-	       p != (struct bfd_link_order *) NULL;
-	       p = p->next)
-	    {
-	      if (p->type == bfd_section_reloc_link_order
-		  || p->type == bfd_symbol_reloc_link_order)
-		++o->reloc_count;
-	      else if (p->type == bfd_indirect_link_order)
-		{
-		  asection *input_section;
-		  bfd *input_bfd;
-		  long relsize;
-		  arelent **relocs;
-		  asymbol **symbols;
-		  long reloc_count;
-
-		  input_section = p->u.indirect.section;
-		  input_bfd = input_section->owner;
-		  relsize = bfd_get_reloc_upper_bound (input_bfd,
-						       input_section);
-		  if (relsize < 0)
-		    return false;
-		  relocs = (arelent **) bfd_malloc ((size_t) relsize);
-		  if (!relocs && relsize != 0)
-		    return false;
-		  symbols = _bfd_generic_link_get_symbols (input_bfd);
-		  reloc_count = bfd_canonicalize_reloc (input_bfd,
-							input_section,
-							relocs,
-							symbols);
-		  if (reloc_count < 0)
-		    return false;
-		  BFD_ASSERT ((unsigned long) reloc_count
-			      == input_section->reloc_count);
-		  o->reloc_count += reloc_count;
-		  free (relocs);
-		}
-	    }
-	  if (o->reloc_count > 0)
-	    {
-	      o->orelocation = ((arelent **)
-				bfd_alloc (abfd,
-					   (o->reloc_count
-					    * sizeof (arelent *))));
-	      if (!o->orelocation)
-		return false;
-	      o->flags |= SEC_RELOC;
-	      /* Reset the count so that it can be used as an index
-		 when putting in the output relocs.  */
-	      o->reloc_count = 0;
-	    }
-	}
-    }
-
-  /* Handle all the link order information for the sections.  */
-  for (o = abfd->sections;
-       o != (asection *) NULL;
-       o = o->next)
-    {
-      for (p = o->link_order_head;
-	   p != (struct bfd_link_order *) NULL;
-	   p = p->next)
-	{
-	  switch (p->type)
-	    {
-	    case bfd_section_reloc_link_order:
-	    case bfd_symbol_reloc_link_order:
-	      if (! _bfd_generic_reloc_link_order (abfd, info, o, p))
-		return false;
-	      break;
-	    case bfd_indirect_link_order:
-	      if (! default_indirect_link_order (abfd, info, o, p, true))
-		return false;
-	      break;
-	    default:
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		return false;
-	      break;
-	    }
-	}
-    }
-  
-  return true;
-}
-
-/* Add an output symbol to the output BFD.  */
-
-static boolean
-generic_add_output_symbol (output_bfd, psymalloc, sym)
-     bfd *output_bfd;
-     size_t *psymalloc;
-     asymbol *sym;
-{
-  if (bfd_get_symcount (output_bfd) >= *psymalloc)
-    {
-      asymbol **newsyms;
-
-      if (*psymalloc == 0)
-	*psymalloc = 124;
-      else
-	*psymalloc *= 2;
-      newsyms = (asymbol **) bfd_realloc (bfd_get_outsymbols (output_bfd),
-					  *psymalloc * sizeof (asymbol *));
-      if (newsyms == (asymbol **) NULL)
-	return false;
-      bfd_get_outsymbols (output_bfd) = newsyms;
-    }
-
-  bfd_get_outsymbols (output_bfd) [bfd_get_symcount (output_bfd)] = sym;
-  if (sym != NULL)
-    ++ bfd_get_symcount (output_bfd);
-
-  return true;
-}
-
-/* Handle the symbols for an input BFD.  */
-
-boolean
-_bfd_generic_link_output_symbols (output_bfd, input_bfd, info, psymalloc)
-     bfd *output_bfd;
-     bfd *input_bfd;
-     struct bfd_link_info *info;
-     size_t *psymalloc;
-{
-  asymbol **sym_ptr;
-  asymbol **sym_end;
-
-  if (! generic_link_read_symbols (input_bfd))
-    return false;
-
-  /* Create a filename symbol if we are supposed to.  */
-  if (info->create_object_symbols_section != (asection *) NULL)
-    {
-      asection *sec;
-
-      for (sec = input_bfd->sections;
-	   sec != (asection *) NULL;
-	   sec = sec->next)
-	{
-	  if (sec->output_section == info->create_object_symbols_section)
-	    {
-	      asymbol *newsym;
-
-	      newsym = bfd_make_empty_symbol (input_bfd);
-	      if (!newsym)
-		return false;
-	      newsym->name = input_bfd->filename;
-	      newsym->value = 0;
-	      newsym->flags = BSF_LOCAL | BSF_FILE;
-	      newsym->section = sec;
-
-	      if (! generic_add_output_symbol (output_bfd, psymalloc,
-					       newsym))
-		return false;
-
-	      break;
-	    }
-	}
-    }
-
-  /* Adjust the values of the globally visible symbols, and write out
-     local symbols.  */
-  sym_ptr = _bfd_generic_link_get_symbols (input_bfd);
-  sym_end = sym_ptr + _bfd_generic_link_get_symcount (input_bfd);
-  for (; sym_ptr < sym_end; sym_ptr++)
-    {
-      asymbol *sym;
-      struct generic_link_hash_entry *h;
-      boolean output;
-
-      h = (struct generic_link_hash_entry *) NULL;
-      sym = *sym_ptr;
-      if ((sym->flags & (BSF_INDIRECT
-			 | BSF_WARNING
-			 | BSF_GLOBAL
-			 | BSF_CONSTRUCTOR
-			 | BSF_WEAK)) != 0
-	  || bfd_is_und_section (bfd_get_section (sym))
-	  || bfd_is_com_section (bfd_get_section (sym))
-	  || bfd_is_ind_section (bfd_get_section (sym)))
-	{
-	  if (sym->udata.p != NULL)
-	    h = (struct generic_link_hash_entry *) sym->udata.p;
-	  else if ((sym->flags & BSF_CONSTRUCTOR) != 0)
-	    {
-	      /* This case normally means that the main linker code
-                 deliberately ignored this constructor symbol.  We
-                 should just pass it through.  This will screw up if
-                 the constructor symbol is from a different,
-                 non-generic, object file format, but the case will
-                 only arise when linking with -r, which will probably
-                 fail anyhow, since there will be no way to represent
-                 the relocs in the output format being used.  */
-	      h = NULL;
-	    }
-	  else if (bfd_is_und_section (bfd_get_section (sym)))
-	    h = ((struct generic_link_hash_entry *)
-		 bfd_wrapped_link_hash_lookup (output_bfd, info,
-					       bfd_asymbol_name (sym),
-					       false, false, true));
-	  else
-	    h = _bfd_generic_link_hash_lookup (_bfd_generic_hash_table (info),
-					       bfd_asymbol_name (sym),
-					       false, false, true);
-
-	  if (h != (struct generic_link_hash_entry *) NULL)
-	    {
-	      /* Force all references to this symbol to point to
-		 the same area in memory.  It is possible that
-		 this routine will be called with a hash table
-		 other than a generic hash table, so we double
-		 check that.  */
-	      if (info->hash->creator == input_bfd->xvec)
-		{
-		  if (h->sym != (asymbol *) NULL)
-		    *sym_ptr = sym = h->sym;
-		}
-
-	      switch (h->root.type)
-		{
-		default:
-		case bfd_link_hash_new:
-		  abort ();
-		case bfd_link_hash_undefined:
-		  break;
-		case bfd_link_hash_undefweak:
-		  sym->flags |= BSF_WEAK;
-		  break;
-		case bfd_link_hash_indirect:
-		  h = (struct generic_link_hash_entry *) h->root.u.i.link;
-		  /* fall through */
-		case bfd_link_hash_defined:
-		  sym->flags |= BSF_GLOBAL;
-		  sym->flags &=~ BSF_CONSTRUCTOR;
-		  sym->value = h->root.u.def.value;
-		  sym->section = h->root.u.def.section;
-		  break;
-		case bfd_link_hash_defweak:
-		  sym->flags |= BSF_WEAK;
-		  sym->flags &=~ BSF_CONSTRUCTOR;
-		  sym->value = h->root.u.def.value;
-		  sym->section = h->root.u.def.section;
-		  break;
-		case bfd_link_hash_common:
-		  sym->value = h->root.u.c.size;
-		  sym->flags |= BSF_GLOBAL;
-		  if (! bfd_is_com_section (sym->section))
-		    {
-		      BFD_ASSERT (bfd_is_und_section (sym->section));
-		      sym->section = bfd_com_section_ptr;
-		    }
-		  /* We do not set the section of the symbol to
-		     h->root.u.c.p->section.  That value was saved so
-		     that we would know where to allocate the symbol
-		     if it was defined.  In this case the type is
-		     still bfd_link_hash_common, so we did not define
-		     it, so we do not want to use that section.  */
-		  break;
-		}
-	    }
-	}
-
-      /* This switch is straight from the old code in
-	 write_file_locals in ldsym.c.  */
-      if (info->strip == strip_all
-	  || (info->strip == strip_some
-	      && (bfd_hash_lookup (info->keep_hash, bfd_asymbol_name (sym),
-				   false, false)
-		  == (struct bfd_hash_entry *) NULL)))
-	output = false;
-      else if ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0)
-	{
-	  /* If this symbol is marked as occurring now, rather
-	     than at the end, output it now.  This is used for
-	     COFF C_EXT FCN symbols.  FIXME: There must be a
-	     better way.  */
-	  if (bfd_asymbol_bfd (sym) == input_bfd
-	      && (sym->flags & BSF_NOT_AT_END) != 0)
-	    output = true;
-	  else
-	    output = false;
-	}
-      else if (bfd_is_ind_section (sym->section))
-	output = false;
-      else if ((sym->flags & BSF_DEBUGGING) != 0)
-	{
-	  if (info->strip == strip_none)
-	    output = true;
-	  else
-	    output = false;
-	}
-      else if (bfd_is_und_section (sym->section)
-	       || bfd_is_com_section (sym->section))
-	output = false;
-      else if ((sym->flags & BSF_LOCAL) != 0)
-	{
-	  if ((sym->flags & BSF_WARNING) != 0)
-	    output = false;
-	  else
-	    {
-	      switch (info->discard)
-		{
-		default:
-		case discard_all:
-		  output = false;
-		  break;
-		case discard_l:
-		  if (bfd_is_local_label (input_bfd, sym))
-		    output = false;
-		  else
-		    output = true;
-		  break;
-		case discard_none:
-		  output = true;
-		  break;
-		}
-	    }
-	}
-      else if ((sym->flags & BSF_CONSTRUCTOR))
-	{
-	  if (info->strip != strip_all)
-	    output = true;
-	  else
-	    output = false;
-	}
-      else
-	abort ();
-
-      /* If this symbol is in a section which is not being included
-	 in the output file, then we don't want to output the symbol.
-
-	 Gross.  .bss and similar sections won't have the linker_mark
-	 field set.  */
-      if ((sym->section->flags & SEC_HAS_CONTENTS) != 0
-	  && sym->section->linker_mark == false)
-	output = false;
-
-      if (output)
-	{
-	  if (! generic_add_output_symbol (output_bfd, psymalloc, sym))
-	    return false;
-	  if (h != (struct generic_link_hash_entry *) NULL)
-	    h->written = true;
-	}
-    }
-
-  return true;
-}
-
-/* Set the section and value of a generic BFD symbol based on a linker
-   hash table entry.  */
-
-static void
-set_symbol_from_hash (sym, h)
-     asymbol *sym;
-     struct bfd_link_hash_entry *h;
-{
-  switch (h->type)
-    {
-    default:
-      abort ();
-      break;
-    case bfd_link_hash_new:
-      /* This can happen when a constructor symbol is seen but we are
-         not building constructors.  */
-      if (sym->section != NULL)
-	{
-	  BFD_ASSERT ((sym->flags & BSF_CONSTRUCTOR) != 0);
-	}
-      else
-	{
-	  sym->flags |= BSF_CONSTRUCTOR;
-	  sym->section = bfd_abs_section_ptr;
-	  sym->value = 0;
-	}
-      break;
-    case bfd_link_hash_undefined:
-      sym->section = bfd_und_section_ptr;
-      sym->value = 0;
-      break;
-    case bfd_link_hash_undefweak:
-      sym->section = bfd_und_section_ptr;
-      sym->value = 0;
-      sym->flags |= BSF_WEAK;
-      break;
-    case bfd_link_hash_defined:
-      sym->section = h->u.def.section;
-      sym->value = h->u.def.value;
-      break;
-    case bfd_link_hash_defweak:
-      sym->flags |= BSF_WEAK;
-      sym->section = h->u.def.section;
-      sym->value = h->u.def.value;
-      break;
-    case bfd_link_hash_common:
-      sym->value = h->u.c.size;
-      if (sym->section == NULL)
-	sym->section = bfd_com_section_ptr;
-      else if (! bfd_is_com_section (sym->section))
-	{
-	  BFD_ASSERT (bfd_is_und_section (sym->section));
-	  sym->section = bfd_com_section_ptr;
-	}
-      /* Do not set the section; see _bfd_generic_link_output_symbols.  */
-      break;
-    case bfd_link_hash_indirect:
-    case bfd_link_hash_warning:
-      /* FIXME: What should we do here?  */
-      break;
-    }
-}
-
-/* Write out a global symbol, if it hasn't already been written out.
-   This is called for each symbol in the hash table.  */
-
-boolean
-_bfd_generic_link_write_global_symbol (h, data)
-     struct generic_link_hash_entry *h;
-     PTR data;
-{
-  struct generic_write_global_symbol_info *wginfo =
-    (struct generic_write_global_symbol_info *) data;
-  asymbol *sym;
-
-  if (h->written)
-    return true;
-
-  h->written = true;
-
-  if (wginfo->info->strip == strip_all
-      || (wginfo->info->strip == strip_some
-	  && bfd_hash_lookup (wginfo->info->keep_hash, h->root.root.string,
-			      false, false) == NULL))
-    return true;
-
-  if (h->sym != (asymbol *) NULL)
-    sym = h->sym;
-  else
-    {
-      sym = bfd_make_empty_symbol (wginfo->output_bfd);
-      if (!sym)
-	return false;
-      sym->name = h->root.root.string;
-      sym->flags = 0;
-    }
-
-  set_symbol_from_hash (sym, &h->root);
-
-  sym->flags |= BSF_GLOBAL;
-
-  if (! generic_add_output_symbol (wginfo->output_bfd, wginfo->psymalloc,
-				   sym))
-    {
-      /* FIXME: No way to return failure.  */
-      abort ();
-    }
-
-  return true;
-}
-
-/* Create a relocation.  */
-
-boolean
-_bfd_generic_reloc_link_order (abfd, info, sec, link_order)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     struct bfd_link_order *link_order;
-{
-  arelent *r;
-
-  if (! info->relocateable)
-    abort ();
-  if (sec->orelocation == (arelent **) NULL)
-    abort ();
-
-  r = (arelent *) bfd_alloc (abfd, sizeof (arelent));
-  if (r == (arelent *) NULL)
-    return false;
-      
-  r->address = link_order->offset;
-  r->howto = bfd_reloc_type_lookup (abfd, link_order->u.reloc.p->reloc);
-  if (r->howto == 0)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  /* Get the symbol to use for the relocation.  */
-  if (link_order->type == bfd_section_reloc_link_order)
-    r->sym_ptr_ptr = link_order->u.reloc.p->u.section->symbol_ptr_ptr;
-  else
-    {
-      struct generic_link_hash_entry *h;
-
-      h = ((struct generic_link_hash_entry *)
-	   bfd_wrapped_link_hash_lookup (abfd, info,
-					 link_order->u.reloc.p->u.name,
-					 false, false, true));
-      if (h == (struct generic_link_hash_entry *) NULL
-	  || ! h->written)
-	{
-	  if (! ((*info->callbacks->unattached_reloc)
-		 (info, link_order->u.reloc.p->u.name,
-		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
-	    return false;
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      r->sym_ptr_ptr = &h->sym;
-    }
-
-  /* If this is an inplace reloc, write the addend to the object file.
-     Otherwise, store it in the reloc addend.  */
-  if (! r->howto->partial_inplace)
-    r->addend = link_order->u.reloc.p->addend;
-  else
-    {
-      bfd_size_type size;
-      bfd_reloc_status_type rstat;
-      bfd_byte *buf;
-      boolean ok;
-
-      size = bfd_get_reloc_size (r->howto);
-      buf = (bfd_byte *) bfd_zmalloc (size);
-      if (buf == (bfd_byte *) NULL)
-	return false;
-      rstat = _bfd_relocate_contents (r->howto, abfd,
-				      link_order->u.reloc.p->addend, buf);
-      switch (rstat)
-	{
-	case bfd_reloc_ok:
-	  break;
-	default:
-	case bfd_reloc_outofrange:
-	  abort ();
-	case bfd_reloc_overflow:
-	  if (! ((*info->callbacks->reloc_overflow)
-		 (info,
-		  (link_order->type == bfd_section_reloc_link_order
-		   ? bfd_section_name (abfd, link_order->u.reloc.p->u.section)
-		   : link_order->u.reloc.p->u.name),
-		  r->howto->name, link_order->u.reloc.p->addend,
-		  (bfd *) NULL, (asection *) NULL, (bfd_vma) 0)))
-	    {
-	      free (buf);
-	      return false;
-	    }
-	  break;
-	}
-      ok = bfd_set_section_contents (abfd, sec, (PTR) buf,
-				     (file_ptr) link_order->offset, size);
-      free (buf);
-      if (! ok)
-	return false;
-
-      r->addend = 0;
-    }
-
-  sec->orelocation[sec->reloc_count] = r;
-  ++sec->reloc_count;
-
-  return true;
-}
-
-/* Allocate a new link_order for a section.  */
-
-struct bfd_link_order *
-bfd_new_link_order (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  struct bfd_link_order *new;
-
-  new = ((struct bfd_link_order *)
-	 bfd_alloc (abfd, sizeof (struct bfd_link_order)));
-  if (!new)
-    return NULL;
-
-  new->type = bfd_undefined_link_order;
-  new->offset = 0;
-  new->size = 0;
-  new->next = (struct bfd_link_order *) NULL;
-
-  if (section->link_order_tail != (struct bfd_link_order *) NULL)
-    section->link_order_tail->next = new;
-  else
-    section->link_order_head = new;
-  section->link_order_tail = new;
-
-  return new;
-}
-
-/* Default link order processing routine.  Note that we can not handle
-   the reloc_link_order types here, since they depend upon the details
-   of how the particular backends generates relocs.  */
-
-boolean
-_bfd_default_link_order (abfd, info, sec, link_order)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     struct bfd_link_order *link_order;
-{
-  switch (link_order->type)
-    {
-    case bfd_undefined_link_order:
-    case bfd_section_reloc_link_order:
-    case bfd_symbol_reloc_link_order:
-    default:
-      abort ();
-    case bfd_indirect_link_order:
-      return default_indirect_link_order (abfd, info, sec, link_order,
-					  false);
-    case bfd_fill_link_order:
-      return default_fill_link_order (abfd, info, sec, link_order);
-    case bfd_data_link_order:
-      return bfd_set_section_contents (abfd, sec,
-				       (PTR) link_order->u.data.contents,
-				       (file_ptr) link_order->offset,
-				       link_order->size);
-    }
-}
-
-/* Default routine to handle a bfd_fill_link_order.  */
-
-/*ARGSUSED*/
-static boolean
-default_fill_link_order (abfd, info, sec, link_order)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     asection *sec;
-     struct bfd_link_order *link_order;
-{
-  size_t size;
-  char *space;
-  size_t i;
-  int fill;
-  boolean result;
-
-  BFD_ASSERT ((sec->flags & SEC_HAS_CONTENTS) != 0);
-
-  size = (size_t) link_order->size;
-  space = (char *) bfd_malloc (size);
-  if (space == NULL && size != 0)
-    return false;
-
-  fill = link_order->u.fill.value;
-  for (i = 0; i < size; i += 2)
-    space[i] = fill >> 8;
-  for (i = 1; i < size; i += 2)
-    space[i] = fill;
-  result = bfd_set_section_contents (abfd, sec, space,
-				     (file_ptr) link_order->offset,
-				     link_order->size);
-  free (space);
-  return result;
-}
-
-/* Default routine to handle a bfd_indirect_link_order.  */
-
-static boolean
-default_indirect_link_order (output_bfd, info, output_section, link_order,
-			     generic_linker)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     asection *output_section;
-     struct bfd_link_order *link_order;
-     boolean generic_linker;
-{
-  asection *input_section;
-  bfd *input_bfd;
-  bfd_byte *contents = NULL;
-  bfd_byte *new_contents;
-
-  BFD_ASSERT ((output_section->flags & SEC_HAS_CONTENTS) != 0);
-
-  if (link_order->size == 0)
-    return true;
-
-  input_section = link_order->u.indirect.section;
-  input_bfd = input_section->owner;
-
-  BFD_ASSERT (input_section->output_section == output_section);
-  BFD_ASSERT (input_section->output_offset == link_order->offset);
-  BFD_ASSERT (input_section->_cooked_size == link_order->size);
-
-  if (info->relocateable
-      && input_section->reloc_count > 0
-      && output_section->orelocation == (arelent **) NULL)
-    {
-      /* Space has not been allocated for the output relocations.
-	 This can happen when we are called by a specific backend
-	 because somebody is attempting to link together different
-	 types of object files.  Handling this case correctly is
-	 difficult, and sometimes impossible.  */
-      (*_bfd_error_handler)
-	(_("Attempt to do relocateable link with %s input and %s output"),
-	 bfd_get_target (input_bfd), bfd_get_target (output_bfd));
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-
-  if (! generic_linker)
-    {
-      asymbol **sympp;
-      asymbol **symppend;
-
-      /* Get the canonical symbols.  The generic linker will always
-	 have retrieved them by this point, but we are being called by
-	 a specific linker, presumably because we are linking
-	 different types of object files together.  */
-      if (! generic_link_read_symbols (input_bfd))
-	return false;
-
-      /* Since we have been called by a specific linker, rather than
-	 the generic linker, the values of the symbols will not be
-	 right.  They will be the values as seen in the input file,
-	 not the values of the final link.  We need to fix them up
-	 before we can relocate the section.  */
-      sympp = _bfd_generic_link_get_symbols (input_bfd);
-      symppend = sympp + _bfd_generic_link_get_symcount (input_bfd);
-      for (; sympp < symppend; sympp++)
-	{
-	  asymbol *sym;
-	  struct bfd_link_hash_entry *h;
-
-	  sym = *sympp;
-
-	  if ((sym->flags & (BSF_INDIRECT
-			     | BSF_WARNING
-			     | BSF_GLOBAL
-			     | BSF_CONSTRUCTOR
-			     | BSF_WEAK)) != 0
-	      || bfd_is_und_section (bfd_get_section (sym))
-	      || bfd_is_com_section (bfd_get_section (sym))
-	      || bfd_is_ind_section (bfd_get_section (sym)))
-	    {
-	      /* sym->udata may have been set by
-		 generic_link_add_symbol_list.  */
-	      if (sym->udata.p != NULL)
-		h = (struct bfd_link_hash_entry *) sym->udata.p;
-	      else if (bfd_is_und_section (bfd_get_section (sym)))
-		h = bfd_wrapped_link_hash_lookup (output_bfd, info,
-						  bfd_asymbol_name (sym),
-						  false, false, true);
-	      else
-		h = bfd_link_hash_lookup (info->hash,
-					  bfd_asymbol_name (sym),
-					  false, false, true);
-	      if (h != NULL)
-		set_symbol_from_hash (sym, h);
-	    }
-	}	  
-    }
-
-  /* Get and relocate the section contents.  */
-  contents = ((bfd_byte *)
-	      bfd_malloc (bfd_section_size (input_bfd, input_section)));
-  if (contents == NULL && bfd_section_size (input_bfd, input_section) != 0)
-    goto error_return;
-  new_contents = (bfd_get_relocated_section_contents
-		  (output_bfd, info, link_order, contents, info->relocateable,
-		   _bfd_generic_link_get_symbols (input_bfd)));
-  if (!new_contents)
-    goto error_return;
-
-  /* Output the section contents.  */
-  if (! bfd_set_section_contents (output_bfd, output_section,
-				  (PTR) new_contents,
-				  link_order->offset, link_order->size))
-    goto error_return;
-
-  if (contents != NULL)
-    free (contents);
-  return true;
-
- error_return:
-  if (contents != NULL)
-    free (contents);
-  return false;
-}
-
-/* A little routine to count the number of relocs in a link_order
-   list.  */
-
-unsigned int
-_bfd_count_link_order_relocs (link_order)
-     struct bfd_link_order *link_order;
-{
-  register unsigned int c;
-  register struct bfd_link_order *l;
-
-  c = 0;
-  for (l = link_order; l != (struct bfd_link_order *) NULL; l = l->next)
-    {
-      if (l->type == bfd_section_reloc_link_order
-	  || l->type == bfd_symbol_reloc_link_order)
-	++c;
-    }
-
-  return c;
-}
-
-/*
-FUNCTION
-	bfd_link_split_section
-
-SYNOPSIS
-        boolean bfd_link_split_section(bfd *abfd, asection *sec);
-
-DESCRIPTION
-	Return nonzero if @var{sec} should be split during a
-	reloceatable or final link.
-
-.#define bfd_link_split_section(abfd, sec) \
-.       BFD_SEND (abfd, _bfd_link_split_section, (abfd, sec))
-.
-
-*/
-
-
-
-boolean
-_bfd_generic_link_split_section (abfd, sec)
-     bfd *abfd;
-     asection *sec;
-{
-  return false;
-}
diff --git a/bfd/lynx-core.c b/bfd/lynx-core.c
deleted file mode 100644
index 2358177dbc6..00000000000
--- a/bfd/lynx-core.c
+++ /dev/null
@@ -1,233 +0,0 @@
-/* BFD back end for Lynx core files
-   Copyright 1993 Free Software Foundation, Inc.
-   Written by Stu Grossman of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#ifdef LYNX_CORE
-
-#include <sys/conf.h>
-#include <sys/kernel.h>
-/* sys/kernel.h should define this, but doesn't always, sigh. */
-#ifndef __LYNXOS
-#define __LYNXOS
-#endif
-#include <sys/mem.h>
-#include <sys/signal.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <sys/itimer.h>
-#include <sys/file.h>
-#include <sys/proc.h>
-
-/* These are stored in the bfd's tdata */
-
-struct lynx_core_struct 
-{
-  int sig;
-  char cmd[PNMLEN + 1];
-};
-
-#define core_hdr(bfd) ((bfd)->tdata.lynx_core_data)
-#define core_signal(bfd) (core_hdr(bfd)->sig)
-#define core_command(bfd) (core_hdr(bfd)->cmd)
-
-/* Handle Lynx core dump file.  */
-
-static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
-     bfd *abfd;
-     CONST char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     file_ptr filepos;
-{
-  asection *asect;
-  char *newname;
-
-  newname = bfd_alloc (abfd, strlen (name) + 1);
-  if (!newname)
-    return NULL;
-
-  strcpy (newname, name);
-
-  asect = bfd_make_section (abfd, newname);
-  if (!asect)
-    return NULL;
-
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
-  asect->vma = vma;
-  asect->filepos = filepos;
-  asect->alignment_power = 2;
-
-  return asect;
-}
-
-/* ARGSUSED */
-const bfd_target *
-lynx_core_file_p (abfd)
-     bfd *abfd;
-{
-  int val;
-  int secnum;
-  struct pssentry pss;
-  size_t tcontext_size;
-  core_st_t *threadp;
-  int pagesize;
-  asection *newsect;
-
-  pagesize = getpagesize ();	/* Serious cross-target issue here...  This
-				   really needs to come from a system-specific
-				   header file.  */
-
-  /* Get the pss entry from the core file */
-
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
-    return NULL;
-
-  val = bfd_read ((void *)&pss, 1, sizeof pss, abfd);
-  if (val != sizeof pss)
-    {
-      /* Too small to be a core file */
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  core_hdr (abfd) = (struct lynx_core_struct *)
-    bfd_zalloc (abfd, sizeof (struct lynx_core_struct));
-
-  if (!core_hdr (abfd))
-    return NULL;
-
-  strncpy (core_command (abfd), pss.pname, PNMLEN + 1);
-
-  /* Compute the size of the thread contexts */
-
-  tcontext_size = pss.threadcnt * sizeof (core_st_t);
-
-  /* Allocate space for the thread contexts */
-
-  threadp = (core_st_t *)bfd_alloc (abfd, tcontext_size);
-  if (!threadp)
-    return NULL;
-
-  /* Save thread contexts */
-
-  if (bfd_seek (abfd, pagesize, SEEK_SET) != 0)
-    return NULL;
-
-  val = bfd_read ((void *)threadp, pss.threadcnt, sizeof (core_st_t), abfd);
-
-  if (val != tcontext_size)
-    {
-      /* Probably too small to be a core file */
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  
-  core_signal (abfd) = threadp->currsig;
-
-  newsect = make_bfd_asection (abfd, ".stack",
-			       SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-			       pss.ssize,
-			       pss.slimit,
-			       pagesize + tcontext_size);
-  if (!newsect)
-    return NULL;
-
-  newsect = make_bfd_asection (abfd, ".data",
-			       SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-			       pss.data_len + pss.bss_len,
-			       pss.data_start,
-			       pagesize + tcontext_size + pss.ssize
-#if defined (SPARC) || defined (__SPARC__)
-			       /* SPARC Lynx seems to start dumping
-                                  the .data section at a page
-                                  boundary.  It's OK to check a
-                                  #define like SPARC here because this
-                                  file can only be compiled on a Lynx
-                                  host.  */
-			       + pss.data_start % pagesize
-#endif
-			       );
-  if (!newsect)
-    return NULL;
-
-/* And, now for the .reg/XXX pseudo sections.  Each thread has it's own
-   .reg/XXX section, where XXX is the thread id (without leading zeros).  The
-   currently running thread (at the time of the core dump) also has an alias
-   called `.reg' (just to keep GDB happy).  Note that we use `.reg/XXX' as
-   opposed to `.regXXX' because GDB expects that .reg2 will be the floating-
-   point registers.  */
-
-  newsect = make_bfd_asection (abfd, ".reg",
-			       SEC_HAS_CONTENTS,
-			       sizeof (core_st_t),
-			       0,
-			       pagesize);
-  if (!newsect)
-    return NULL;
-
-  for (secnum = 0; secnum < pss.threadcnt; secnum++)
-    {
-      char secname[100];
-
-      sprintf (secname, ".reg/%d", BUILDPID (0, threadp[secnum].tid));
-      newsect = make_bfd_asection (abfd, secname,
-				   SEC_HAS_CONTENTS,
-				   sizeof (core_st_t),
-				   0,
-				   pagesize + secnum * sizeof (core_st_t));
-      if (!newsect)
-	return NULL;
-    }
-
-  return abfd->xvec;
-}
-
-char *
-lynx_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return core_command (abfd);
-}
-
-/* ARGSUSED */
-int
-lynx_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_signal (abfd);
-}
-
-/* ARGSUSED */
-boolean
-lynx_core_file_matches_executable_p  (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;		/* FIXME, We have no way of telling at this point */
-}
-
-#endif /* LYNX_CORE */
diff --git a/bfd/m68k4knetbsd.c b/bfd/m68k4knetbsd.c
deleted file mode 100644
index 943438d2dda..00000000000
--- a/bfd/m68k4knetbsd.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* BFD back-end for NetBSD/m68k a.out-ish binaries.
-   Copyright (C) 1990, 91, 92, 95, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define BYTES_IN_WORD	4
-#define TARGET_IS_BIG_ENDIAN_P
-
-#define TARGET_PAGE_SIZE	0x1000
-
-#define DEFAULT_ARCH	bfd_arch_m68k
-#define DEFAULT_MID 	M_68K4K_NETBSD
-
-#define MY(OP) CAT(m68k4knetbsd_,OP)
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME "a.out-m68k4k-netbsd"
-
-#include "netbsd.h"
diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c
deleted file mode 100644
index c8f47a89fb0..00000000000
--- a/bfd/m68klinux.c
+++ /dev/null
@@ -1,772 +0,0 @@
-/* BFD back-end for linux flavored m68k a.out binaries.
-   Copyright (C) 1992, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define	TARGET_PAGE_SIZE 4096
-#define ZMAGIC_DISK_BLOCK_SIZE 1024
-#define	SEGMENT_SIZE TARGET_PAGE_SIZE
-#define TEXT_START_ADDR	0x0
-#define N_SHARED_LIB(x) 0
-#define BYTES_IN_WORD 4
-
-#define MACHTYPE_OK(mtype) ((mtype) == M_68020 || (mtype) == M_UNKNOWN)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#define TARGET_IS_BIG_ENDIAN_P
-#define DEFAULT_ARCH bfd_arch_m68k
-#define MY(OP) CAT(m68klinux_,OP)
-#define TARGETNAME "a.out-m68k-linux"
-
-extern const bfd_target MY(vec);
-
-/* We always generate QMAGIC files in preference to ZMAGIC files.  It
-   would be possible to make this a linker option, if that ever
-   becomes important.  */
-
-static void MY_final_link_callback
-  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-static boolean m68klinux_bfd_final_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean m68klinux_write_object_contents PARAMS ((bfd *));
-
-static boolean
-m68klinux_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  obj_aout_subformat (abfd) = q_magic_format;
-  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
-}
-
-#define MY_bfd_final_link m68klinux_bfd_final_link
-
-/* Set the machine type correctly.  */
-
-static boolean
-m68klinux_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  N_SET_MACHTYPE (*execp, M_68020);
-
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
-}
-
-#define MY_write_object_contents m68klinux_write_object_contents
-
-/* Code to link against Linux a.out shared libraries.  */
-
-/* See if a symbol name is a reference to the global offset table.  */
-
-#ifndef GOT_REF_PREFIX
-#define	GOT_REF_PREFIX	"__GOT_"
-#endif
-
-#define IS_GOT_SYM(name) \
-  (strncmp (name, GOT_REF_PREFIX, sizeof GOT_REF_PREFIX - 1) == 0)
-
-/* See if a symbol name is a reference to the procedure linkage table.  */
-
-#ifndef PLT_REF_PREFIX
-#define	PLT_REF_PREFIX	"__PLT_"
-#endif
-
-#define IS_PLT_SYM(name) \
-  (strncmp (name, PLT_REF_PREFIX, sizeof PLT_REF_PREFIX - 1) == 0)
-
-/* This string is used to generate specialized error messages.  */
-
-#ifndef NEEDS_SHRLIB
-#define NEEDS_SHRLIB "__NEEDS_SHRLIB_"
-#endif
-
-/* This special symbol is a set vector that contains a list of
-   pointers to fixup tables.  It will be present in any dynamicly
-   linked file.  The linker generated fixup table should also be added
-   to the list, and it should always appear in the second slot (the
-   first one is a dummy with a magic number that is defined in
-   crt0.o).  */
-
-#ifndef SHARABLE_CONFLICTS
-#define SHARABLE_CONFLICTS "__SHARABLE_CONFLICTS__"
-#endif
-
-/* We keep a list of fixups.  The terminology is a bit strange, but
-   each fixup contains two 32 bit numbers.  A regular fixup contains
-   an address and a pointer, and at runtime we should store the
-   address at the location pointed to by the pointer.  A builtin fixup
-   contains two pointers, and we should read the address using one
-   pointer and store it at the location pointed to by the other
-   pointer.  Builtin fixups come into play when we have duplicate
-   __GOT__ symbols for the same variable.  The builtin fixup will copy
-   the GOT pointer from one over into the other.  */
-
-struct fixup
-{
-  struct fixup *next;
-  struct linux_link_hash_entry *h;
-  bfd_vma value;
-
-  /* Nonzero if this is a jump instruction that needs to be fixed,
-     zero if this is just a pointer */
-  char jump;
-
-  char builtin;
-};
-
-/* We don't need a special hash table entry structure, but we do need
-   to keep some information between linker passes, so we use a special
-   hash table.  */
-
-struct linux_link_hash_entry
-{
-  struct aout_link_hash_entry root;
-};
-
-struct linux_link_hash_table
-{
-  struct aout_link_hash_table root;
-
-  /* First dynamic object found in link.  */
-  bfd *dynobj;
-
-  /* Number of fixups.  */
-  size_t fixup_count;
-
-  /* Number of builtin fixups.  */
-  size_t local_builtins;
-
-  /* List of fixups.  */
-  struct fixup *fixup_list;
-};
-
-static struct bfd_hash_entry *linux_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *linux_link_hash_table_create
-  PARAMS ((bfd *));
-static struct fixup *new_fixup
-  PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
-	   bfd_vma, int));
-static boolean linux_link_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean linux_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-	   bfd_vma, const char *, boolean, boolean,
-	   struct bfd_link_hash_entry **));
-static boolean linux_tally_symbols
-  PARAMS ((struct linux_link_hash_entry *, PTR));
-static boolean linux_finish_dynamic_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Routine to create an entry in an Linux link hash table.  */
-
-static struct bfd_hash_entry *
-linux_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct linux_link_hash_entry *ret = (struct linux_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct linux_link_hash_entry *) NULL)
-    ret = ((struct linux_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
-  if (ret == NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct linux_link_hash_entry *)
-	 NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
-				       table, string));
-  if (ret != NULL)
-    {
-      /* Set local fields; there aren't any.  */
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create a Linux link hash table.  */
-
-static struct bfd_link_hash_table *
-linux_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct linux_link_hash_table *ret;
-
-  ret = ((struct linux_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct linux_link_hash_table)));
-  if (ret == (struct linux_link_hash_table *) NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-  if (! NAME(aout,link_hash_table_init) (&ret->root, abfd,
-					 linux_link_hash_newfunc))
-    {
-      free (ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-
-  ret->dynobj = NULL;
-  ret->fixup_count = 0;
-  ret->local_builtins = 0;
-  ret->fixup_list = NULL;
-
-  return &ret->root.root;
-}
-
-/* Look up an entry in a Linux link hash table.  */
-
-#define linux_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct linux_link_hash_entry *) \
-   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
-			  (follow)))
-
-/* Traverse a Linux link hash table.  */
-
-#define linux_link_hash_traverse(table, func, info)			\
-  (aout_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the Linux link hash table from the info structure.  This is
-   just a cast.  */
-
-#define linux_hash_table(p) ((struct linux_link_hash_table *) ((p)->hash))
-
-/* Store the information for a new fixup.  */
-
-static struct fixup *
-new_fixup (info, h, value, builtin)
-     struct bfd_link_info *info;
-     struct linux_link_hash_entry *h;
-     bfd_vma value;
-     int builtin;
-{
-  struct fixup *f;
-
-  f = (struct fixup *) bfd_hash_allocate (&info->hash->table,
-					  sizeof (struct fixup));
-  if (f == NULL)
-    return f;
-  f->next = linux_hash_table (info)->fixup_list;
-  linux_hash_table (info)->fixup_list = f;
-  f->h = h;
-  f->value = value;
-  f->builtin = builtin;
-  f->jump = 0;
-  ++linux_hash_table (info)->fixup_count;
-  return f;
-}
-
-/* We come here once we realize that we are going to link to a shared
-   library.  We need to create a special section that contains the
-   fixup table, and we ultimately need to add a pointer to this into
-   the set vector for SHARABLE_CONFLICTS.  At this point we do not
-   know the size of the section, but that's OK - we just need to
-   create it for now.  */
-
-static boolean
-linux_link_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags;
-  register asection *s;
-
-  /* Note that we set the SEC_IN_MEMORY flag.  */
-  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-
-  /* We choose to use the name ".linux-dynamic" for the fixup table.
-     Why not? */
-  s = bfd_make_section (abfd, ".linux-dynamic");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags)
-      || ! bfd_set_section_alignment (abfd, s, 2))
-    return false;
-  s->_raw_size = 0;
-  s->contents = 0;
-
-  return true;
-}
-
-/* Function to add a single symbol to the linker hash table.  This is
-   a wrapper around _bfd_generic_link_add_one_symbol which handles the
-   tweaking needed for dynamic linking support.  */
-
-static boolean
-linux_add_one_symbol (info, abfd, name, flags, section, value, string,
-		      copy, collect, hashp)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     asection *section;
-     bfd_vma value;
-     const char *string;
-     boolean copy;
-     boolean collect;
-     struct bfd_link_hash_entry **hashp;
-{
-  struct linux_link_hash_entry *h;
-  boolean insert;
-
-  /* Look up and see if we already have this symbol in the hash table.
-     If we do, and the defining entry is from a shared library, we
-     need to create the dynamic sections.
-
-     FIXME: What if abfd->xvec != info->hash->creator?  We may want to
-     be able to link Linux a.out and ELF objects together, but serious
-     confusion is possible.  */
-
-  insert = false;
-
-  if (! info->relocateable
-      && linux_hash_table (info)->dynobj == NULL
-      && strcmp (name, SHARABLE_CONFLICTS) == 0
-      && (flags & BSF_CONSTRUCTOR) != 0
-      && abfd->xvec == info->hash->creator)
-    {
-      if (! linux_link_create_dynamic_sections (abfd, info))
-	return false;
-      linux_hash_table (info)->dynobj = abfd;
-      insert = true;
-    }
-
-  if (bfd_is_abs_section (section)
-      && abfd->xvec == info->hash->creator)
-    {
-      h = linux_link_hash_lookup (linux_hash_table (info), name, false,
-				  false, false);
-      if (h != NULL
-	  && (h->root.root.type == bfd_link_hash_defined
-	      || h->root.root.type == bfd_link_hash_defweak))
-	{
-	  struct fixup *f;
-
-	  if (hashp != NULL)
-	    *hashp = (struct bfd_link_hash_entry *) h;
-
-	  f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
-	  if (f == NULL)
-	    return false;
-	  f->jump = IS_PLT_SYM (name);
-
-	  return true;
-	}
-    }
-
-  /* Do the usual procedure for adding a symbol.  */
-  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
-					  value, string, copy, collect,
-					  hashp))
-    return false;
-
-  /* Insert a pointer to our table in the set vector.  The dynamic
-     linker requires this information */
-  if (insert)
-    {
-      asection *s;
-
-      /* Here we do our special thing to add the pointer to the
-	 dynamic section in the SHARABLE_CONFLICTS set vector.  */
-      s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-				   ".linux-dynamic");
-      BFD_ASSERT (s != NULL);
-
-      if (! (_bfd_generic_link_add_one_symbol
-	     (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
-	      BSF_GLOBAL | BSF_CONSTRUCTOR, s, 0, NULL, false, false, NULL)))
-	return false;
-    }
-
-  return true;
-}
-
-/* We will crawl the hash table and come here for every global symbol.
-   We will examine each entry and see if there are indications that we
-   need to add a fixup.  There are two possible cases - one is where
-   you have duplicate definitions of PLT or GOT symbols - these will
-   have already been caught and added as "builtin" fixups.  If we find
-   that the corresponding non PLT/GOT symbol is also present, we
-   convert it to a regular fixup instead.
-
-   This function is called via linux_link_hash_traverse.  */
-
-static boolean
-linux_tally_symbols (h, data)
-     struct linux_link_hash_entry *h;
-     PTR data;
-{
-  struct bfd_link_info *info = (struct bfd_link_info *) data;
-  struct fixup *f, *f1;
-  int is_plt;
-  struct linux_link_hash_entry *h1, *h2;
-  boolean exists;
-
-  if (h->root.root.type == bfd_link_hash_undefined
-      && strncmp (h->root.root.root.string, NEEDS_SHRLIB,
-		  sizeof NEEDS_SHRLIB - 1) == 0)
-    {
-      const char *name;
-      char *p;
-      char *alloc = NULL;
-
-      name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
-      p = strrchr (name, '_');
-      if (p != NULL)
-	alloc = (char *) bfd_malloc (strlen (name) + 1);
-
-      if (p == NULL || alloc == NULL)
-	(*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
-			       name);
-      else
-	{
-	  strcpy (alloc, name);
-	  p = strrchr (alloc, '_');
-	  *p++ = '\0';
-	  (*_bfd_error_handler)
-	    (_("Output file requires shared library `%s.so.%s'\n"),
-	     alloc, p);
-	  free (alloc);
-	}
-
-      abort ();
-    }
-
-  /* If this symbol is not a PLT/GOT, we do not even need to look at it */
-  is_plt = IS_PLT_SYM (h->root.root.root.string);
-
-  if (is_plt || IS_GOT_SYM (h->root.root.root.string))
-    {
-      /* Look up this symbol twice.  Once just as a regular lookup,
-	 and then again following all of the indirect links until we
-	 reach a real symbol.  */
-      h1 = linux_link_hash_lookup (linux_hash_table (info),
-				   (h->root.root.root.string
-				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, true);
-      /* h2 does not follow indirect symbols. */
-      h2 = linux_link_hash_lookup (linux_hash_table (info), 
-				   (h->root.root.root.string
-				    + sizeof PLT_REF_PREFIX - 1),
-				   false, false, false);
-
-      /* The real symbol must exist but if it is also an ABS symbol,
-	 there is no need to have a fixup.  This is because they both
-	 came from the same library.  If on the other hand, we had to
-	 use an indirect symbol to get to the real symbol, we add the
-	 fixup anyway, since there are cases where these symbols come
-	 from different shared libraries */
-      if (h1 != NULL
-	  && (((h1->root.root.type == bfd_link_hash_defined
-		|| h1->root.root.type == bfd_link_hash_defweak)
-	       && ! bfd_is_abs_section (h1->root.root.u.def.section))
-	      || h2->root.root.type == bfd_link_hash_indirect))
-	{
-	  /* See if there is a "builtin" fixup already present
-	     involving this symbol.  If so, convert it to a regular
-	     fixup.  In the end, this relaxes some of the requirements
-	     about the order of performing fixups.  */
-	  exists = false;
-	  for (f1 = linux_hash_table (info)->fixup_list;
-	       f1 != NULL;
-	       f1 = f1->next)
-	    {
-	      if ((f1->h != h && f1->h != h1)
-		  || (! f1->builtin && ! f1->jump))
-		continue;
-	      if (f1->h == h1)
-		exists = true;
-	      if (! exists
-		  && bfd_is_abs_section (h->root.root.u.def.section))
-		{
-		  f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
-		  f->jump = is_plt;
-		}
-	      f1->h = h1;
-	      f1->jump = is_plt;
-	      f1->builtin = 0;
-	      exists = true;
-	    }
-	  if (! exists
-	      && bfd_is_abs_section (h->root.root.u.def.section))
-	    {
-	      f = new_fixup (info, h1, h->root.root.u.def.value, 0);
-	      if (f == NULL)
-		{
-		  /* FIXME: No way to return error.  */
-		  abort ();
-		}
-	      f->jump = is_plt;
-	    }
-	}
-
-      /* Quick and dirty way of stripping these symbols from the
-	 symtab. */
-      if (bfd_is_abs_section (h->root.root.u.def.section))
-	h->root.written = true;
-    }
-
-  return true;
-}
-
-/* This is called to set the size of the .linux-dynamic section is.
-   It is called by the Linux linker emulation before_allocation
-   routine.  We have finished reading all of the input files, and now
-   we just scan the hash tables to find out how many additional fixups
-   are required.  */
-
-boolean
-bfd_m68klinux_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  struct fixup *f;
-  asection *s;
-
-  if (output_bfd->xvec != &MY(vec))
-    return true;
-
-  /* First find the fixups... */
-  linux_link_hash_traverse (linux_hash_table (info),
-			    linux_tally_symbols,
-			    (PTR) info);
-
-  /* If there are builtin fixups, leave room for a marker.  This is
-     used by the dynamic linker so that it knows that all that follow
-     are builtin fixups instead of regular fixups.  */
-  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-    {
-      if (f->builtin)
-	{
-	  ++linux_hash_table (info)->fixup_count;
-	  ++linux_hash_table (info)->local_builtins;
-	  break;
-	}
-    }
-
-  if (linux_hash_table (info)->dynobj == NULL)
-    {
-      if (linux_hash_table (info)->fixup_count > 0)
-	abort ();
-      return true;
-    }
-
-  /* Allocate memory for our fixup table.  We will fill it in later.  */
-  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-			       ".linux-dynamic");
-  if (s != NULL)
-    {
-      s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8;
-      s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
-      if (s->contents == NULL)
-	{
-	  bfd_set_error (bfd_error_no_memory);
-	  return false;
-	}
-      memset (s->contents, 0, (size_t) s->_raw_size);
-    }
-
-  return true;
-}
-
-/* We come here once we are ready to actually write the fixup table to
-   the output file.  Scan the fixup tables and so forth and generate
-   the stuff we need.  */
-
-static boolean
-linux_finish_dynamic_link (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  asection *s, *os, *is;
-  bfd_byte *fixup_table;
-  struct linux_link_hash_entry *h;
-  struct fixup *f;
-  unsigned int new_addr;
-  int section_offset;
-  unsigned int fixups_written;
-
-  if (linux_hash_table (info)->dynobj == NULL)
-    return true;
-
-  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-			       ".linux-dynamic");
-  BFD_ASSERT (s != NULL);
-  os = s->output_section;
-  fixups_written = 0;
-
-#ifdef LINUX_LINK_DEBUG
-  printf ("Fixup table file offset: %x  VMA: %x\n", 
-	  os->filepos + s->output_offset,
-	  os->vma + s->output_offset);
-#endif
-
-  fixup_table = s->contents;
-  bfd_put_32 (output_bfd, linux_hash_table (info)->fixup_count, fixup_table);
-  fixup_table += 4;
-
-  /* Fill in fixup table.  */
-  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-    {
-      if (f->builtin)
-	continue;
-
-      if (f->h->root.root.type != bfd_link_hash_defined
-	  && f->h->root.root.type != bfd_link_hash_defweak)
-	{
-	  (*_bfd_error_handler)
-	    (_("Symbol %s not defined for fixups\n"),
-	     f->h->root.root.root.string);
-	  continue;
-	}
-
-      is = f->h->root.root.u.def.section;
-      section_offset = is->output_section->vma + is->output_offset;
-      new_addr = f->h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-      printf ("Fixup(%d) %s: %x %x\n",f->jump, f->h->root.root.string,
-	      new_addr, f->value);
-#endif
-
-      if (f->jump)
-	{
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, f->value + 2, fixup_table);
-	  fixup_table += 4;
-	}
-      else
-	{
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, f->value, fixup_table);
-	  fixup_table += 4;
-	}
-      ++fixups_written;
-    }
-
-  if (linux_hash_table (info)->local_builtins != 0)
-    {
-      /* Special marker so we know to switch to the other type of fixup */
-      bfd_put_32 (output_bfd, 0, fixup_table);
-      fixup_table += 4;
-      bfd_put_32 (output_bfd, 0, fixup_table);
-      fixup_table += 4;
-      ++fixups_written;
-      for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-	{
-	  if (! f->builtin)
-	    continue;
-
-	  if (f->h->root.root.type != bfd_link_hash_defined
-	      && f->h->root.root.type != bfd_link_hash_defweak)
-	    {
-	      (*_bfd_error_handler)
-		(_("Symbol %s not defined for fixups\n"),
-		 f->h->root.root.root.string);
-	      continue;
-	    }
-
-	  is = f->h->root.root.u.def.section;
-	  section_offset = is->output_section->vma + is->output_offset;
-	  new_addr = f->h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-	  printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
-		  new_addr, f->value);
-#endif
-
-	  bfd_put_32 (output_bfd, new_addr, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, f->value, fixup_table);
-	  fixup_table += 4;
-	  ++fixups_written;
-	}
-  }
-
-  if (linux_hash_table (info)->fixup_count != fixups_written)
-    {
-      (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
-      while (linux_hash_table (info)->fixup_count > fixups_written)
-	{
-	  bfd_put_32 (output_bfd, 0, fixup_table);
-	  fixup_table += 4;
-	  bfd_put_32 (output_bfd, 0, fixup_table);
-	  fixup_table += 4;
-	  ++fixups_written;
-	}
-    }
-
-  h = linux_link_hash_lookup (linux_hash_table (info), 
-			      "__BUILTIN_FIXUPS__",
-			      false, false, false);
-
-  if (h != NULL
-      && (h->root.root.type == bfd_link_hash_defined
-	  || h->root.root.type == bfd_link_hash_defweak))
-    {
-      is = h->root.root.u.def.section;
-      section_offset = is->output_section->vma + is->output_offset;
-      new_addr = h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-      printf ("Builtin fixup table at %x\n", new_addr);
-#endif
-
-      bfd_put_32 (output_bfd, new_addr, fixup_table);
-    }
-  else
-    bfd_put_32 (output_bfd, 0, fixup_table);
-
-  if (bfd_seek (output_bfd, os->filepos + s->output_offset, SEEK_SET) != 0)
-    return false;
-
-  if (bfd_write ((PTR) s->contents, 1, s->_raw_size, output_bfd)
-      != s->_raw_size)
-    return false;
-
-  return true;
-}
-
-#define MY_bfd_link_hash_table_create linux_link_hash_table_create
-#define MY_add_one_symbol linux_add_one_symbol
-#define MY_finish_dynamic_link linux_finish_dynamic_link
-
-#define MY_zmagic_contiguous 1
-
-#include "aout-target.h"
diff --git a/bfd/m68klynx.c b/bfd/m68klynx.c
deleted file mode 100644
index 7acdfbcad21..00000000000
--- a/bfd/m68klynx.c
+++ /dev/null
@@ -1,54 +0,0 @@
-/* BFD back-end for m68k binaries under LynxOS.
-   Copyright (C) 1990, 1991, 1992 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define BYTES_IN_WORD 4
-#define N_SHARED_LIB(x) 0
-
-#define TEXT_START_ADDR 0
-#define TARGET_PAGE_SIZE 4096
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_m68k
-
-#define MY(OP) CAT(m68klynx_aout_,OP)
-#define TARGETNAME "a.out-m68k-lynx"
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include "libaout.h"
-#include "aout/aout64.h"
-
-#define TARGET_IS_BIG_ENDIAN_P
-
-#ifdef LYNX_CORE
-
-char *lynx_core_file_failing_command();
-int lynx_core_file_failing_signal();
-boolean lynx_core_file_matches_executable_p();
-const bfd_target *lynx_core_file_p();
-
-#define	MY_core_file_failing_command lynx_core_file_failing_command
-#define	MY_core_file_failing_signal lynx_core_file_failing_signal
-#define	MY_core_file_matches_executable_p lynx_core_file_matches_executable_p
-#define	MY_core_file_p lynx_core_file_p
-
-#endif /* LYNX_CORE */
-
-#include "aout-target.h"
diff --git a/bfd/m68knetbsd.c b/bfd/m68knetbsd.c
deleted file mode 100644
index 24d16656539..00000000000
--- a/bfd/m68knetbsd.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* BFD back-end for NetBSD/m68k a.out-ish binaries.
-   Copyright (C) 1990, 91, 92, 94, 95, 97, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define BYTES_IN_WORD	4
-#define TARGET_IS_BIG_ENDIAN_P
-
-/* Our m68k ports use either 4K or 8K pages, but object files always
-   assume 8K page alignment so they will work on all m68k machines. */
-#define TARGET_PAGE_SIZE	0x2000
-
-#define DEFAULT_ARCH	bfd_arch_m68k
-#define DEFAULT_MID 	M_68K_NETBSD
-
-#define MY(OP) CAT(m68knetbsd_,OP)
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME "a.out-m68k-netbsd"
-
-#include "netbsd.h"
diff --git a/bfd/m88kmach3.c b/bfd/m88kmach3.c
deleted file mode 100644
index 7a564087300..00000000000
--- a/bfd/m88kmach3.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* BFD back-end for Motorola m88k a.out (Mach 3) binaries.
-   Copyright (C) 1990, 1991, 1993, 1994 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define	TARGET_PAGE_SIZE	(4096*2)
-#define SEGMENT_SIZE	0x20000
-#define TEXT_START_ADDR	0
-#define BYTES_IN_WORD	4
-#define N_HEADER_IN_TEXT(x)	1 		/* (N_MAGIG(x) == ZMAGIC) */
-#define N_SHARED_LIB(x) 0
-
-#define N_TXTSIZE(x)	((x).a_text)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
-
-#define DEFAULT_ARCH bfd_arch_m88k
-#define MY(OP) CAT(m88kmach3_,OP)
-#define TARGETNAME "a.out-m88k-mach3"
-
-#include "aout-target.h"
diff --git a/bfd/makefile.dos b/bfd/makefile.dos
deleted file mode 100644
index 8a22c6af201..00000000000
--- a/bfd/makefile.dos
+++ /dev/null
@@ -1,49 +0,0 @@
-CFLAGS=-O2
-
-.c.o :
-	gcc $(CFLAGS) -I. -I../include -c $<
-
-all : libbfd.a
-
-targets.o : targets.c
-	gcc $(CFLAGS) -I. -I../include -DSELECT_VECS=&go32coff_vec,&i386aout_vec -DDEFAULT_VECTOR=go32coff_vec -c $*.c
-
-archures.o : archures.c
-	gcc $(CFLAGS) -I. -I../include -DSELECT_ARCHITECTURES=bfd_i386_arch -c $*.c
-
-OBJS = \
-	libbfd.o \
-	opncls.o \
-	bfd.o \
-	archive.o \
-	targets.o \
-	cache.o \
-	archures.o \
-	corefile.o \
-	section.o \
-	format.o \
-	syms.o \
-	reloc.o \
-	init.o \
-	coffgen.o \
-	srec.o \
-	hash.o \
-	linker.o \
-	ecoff.o \
-	ecofflink.o \
-	elf.o \
-	aout32.o \
-	stab-sym.o \
-	i386aout.o \
-	cpu-i386.o \
-	coff-go32.o \
-	cofflink.o \
-	elf32.o \
-	binary.o \
-	tekhex.o \
-	$E
-
-libbfd.a : $(OBJS)
-	-rm libbfd.a
-	ar rvs libbfd.a $(OBJS)
-	ranlib libbfd.a
diff --git a/bfd/makefile.vms b/bfd/makefile.vms
deleted file mode 100644
index ad6b1fff92a..00000000000
--- a/bfd/makefile.vms
+++ /dev/null
@@ -1,75 +0,0 @@
-#
-# Makefile for bfd library under openVMS (Alpha and Vax)
-#
-# For use with gnu-make for vms
-#
-# Created by Klaus K"ampf, kkaempf@rmi.de
-#
-#
-
-CC=cc
-
-ifeq ($(ARCH),ALPHA)
-HOSTFILE=alphavms.h
-TARGETOBJS = cpu-alpha.obj
-else
-HOSTFILE=vaxvms.h
-TARGETOBJS = cpu-vax.obj
-endif
-
-
-OBJS=archive.obj,archures.obj,bfd.obj,cache.obj,coffgen.obj,corefile.obj,\
-  format.obj,init.obj,libbfd.obj,opncls.obj,reloc.obj,section.obj,syms.obj,\
-  targets.obj,hash.obj,linker.obj,elf.obj,srec.obj,binary.obj,tekhex.obj,\
-  ihex.obj,stab-syms.obj,vms.obj,vms-hdr.obj,vms-gsd.obj,vms-tir.obj,\
-  vms-misc.obj,$(TARGETOBJS)
-
-ifeq ($(CC),gcc)
-ifeq ($(ARCH),ALPHA)
-DEFS=/define=(SELECT_VECS="&vms_alpha_vec",SELECT_ARCHITECTURES="&bfd_alpha_arch",\
-"HAVE_vms_alpha_vec=1")
-else
-DEFS=/define=(SELECT_VECS="&vms_vax_vec",SELECT_ARCHITECTURES="&bfd_vax_arch",\
-"HAVE_vms_vax_vec=1","VMS_DEBUG")
-endif
-CFLAGS=/include=([],[-.include])$(DEFS)
-else
-ifeq ($(ARCH),ALPHA)
-DEFS=/define=(SELECT_VECS="&vms_alpha_vec",SELECT_ARCHITECTURES="&bfd_alpha_arch",\
-"HAVE_vms_alpha_vec=1","unlink=remove","const=","VMS_DEBUG",)
-else
-DEFS=/define=(SELECT_VECS="&vms_vax_vec",SELECT_ARCHITECTURES="&bfd_vax_arch",\
-"HAVE_vms_vax_vec=1","unlink=remove","const=","VMS_DEBUG")
-endif
-CFLAGS=/noopt/debug/include=([],[-.include])$(DEFS)/warnings=disable=(missingreturn,implicitfunc,longextern)
-endif
-
-
-libbfd.olb: sysdep.h bfd.h $(OBJS)
-	purge
-	lib/create libbfd $(OBJS)
-
-sysdep.h: [.hosts]$(HOSTFILE) config.h
-	$(CP) $< $@
-
-bfd.h: bfd-in2.h
-	$$ @configure
-
-targmatch.h: bfd.h
-config.h: bfd.h
-
-vms.c: vms.h
-vms-mhd.c: vms.h
-vms-gsd.c: vms.h
-vms-tir.c: vms.h
-vms-misc.c: vms.h
-targets.c: targmatch.h
-
-clean:
-	$$ purge
-	$(RM) libbfd.olb;
-	$(RM) sysdep.h;
-	$(RM) bfd.h;
-	$(RM) targmatch.h;
-	$(RM) config.h;
-	$(RM) *.obj;
diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c
deleted file mode 100644
index e7ba68dde61..00000000000
--- a/bfd/mipsbsd.c
+++ /dev/null
@@ -1,468 +0,0 @@
-/* BFD backend for MIPS BSD (a.out) binaries.
-   Copyright (C) 1993, 94, 95, 97, 1998 Free Software Foundation, Inc.
-   Written by Ralph Campbell.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define BYTES_IN_WORD 4
-/* #define ENTRY_CAN_BE_ZERO */
-#define N_HEADER_IN_TEXT(x) 1
-#define N_SHARED_LIB(x) 0
-#define N_TXTADDR(x) \
-    (N_MAGIC(x) != ZMAGIC ? (x).a_entry :	/* object file or NMAGIC */\
-	    TEXT_START_ADDR + EXEC_BYTES_SIZE	/* no padding */\
-    )
-#define N_DATADDR(x) (N_TXTADDR(x)+N_TXTSIZE(x))
-#define TEXT_START_ADDR 4096
-#define TARGET_PAGE_SIZE 4096
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_mips
-#define MACHTYPE_OK(mtype) ((mtype) == M_UNKNOWN \
-			    || (mtype) == M_MIPS1 || (mtype) == M_MIPS2)
-#define MY_symbol_leading_char '\0'
-
-#define MY(OP) CAT(mipsbsd_,OP)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
-
-#define SET_ARCH_MACH(ABFD, EXEC) \
-  MY(set_arch_mach)(ABFD, N_MACHTYPE (EXEC)); \
-  MY(choose_reloc_size)(ABFD);
-static void MY(set_arch_mach) PARAMS ((bfd *abfd, int machtype));
-static void MY(choose_reloc_size) PARAMS ((bfd *abfd));
-
-#define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
-
-/* We can't use MY(x) here because it leads to a recursive call to CAT
-   when expanded inside JUMP_TABLE.  */
-#define MY_bfd_reloc_type_lookup mipsbsd_reloc_howto_type_lookup
-#define MY_canonicalize_reloc mipsbsd_canonicalize_reloc
-
-#define MY_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define MY_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define MY_final_link_callback unused
-#define MY_bfd_final_link _bfd_generic_final_link
-
-#define MY_backend_data &MY(backend_data)
-#define MY_BFD_TARGET
-
-#include "aout-target.h"
-
-static void
-MY(set_arch_mach) (abfd, machtype)
-     bfd *abfd;
-     int machtype;
-{
-  enum bfd_architecture arch;
-  long machine;
-
-  /* Determine the architecture and machine type of the object file. */
-  switch (machtype) {
-
-  case M_MIPS1:
-    arch = bfd_arch_mips;
-    machine = 3000;
-    break;
-
-  case M_MIPS2:
-    arch = bfd_arch_mips;
-    machine = 4000;
-    break;
-
-  default:
-    arch = bfd_arch_obscure;
-    machine = 0;
-    break;
-  }
-  bfd_set_arch_mach(abfd, arch, machine);  
-}
-
-/* Determine the size of a relocation entry, based on the architecture */
-static void
-MY(choose_reloc_size) (abfd)
-     bfd *abfd;
-{
-  switch (bfd_get_arch(abfd)) {
-  case bfd_arch_sparc:
-  case bfd_arch_a29k:
-  case bfd_arch_mips:
-    obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
-    break;
-  default:
-    obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-    break;
-  }
-}
-
-/* Write an object file in BSD a.out format.
-  Section contents have already been written.  We write the
-  file header, symbols, and relocation.  */
-
-static boolean
-MY(write_object_contents) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  /* Magic number, maestro, please!  */
-  switch (bfd_get_arch(abfd)) {
-  case bfd_arch_m68k:
-    switch (bfd_get_mach(abfd)) {
-    case bfd_mach_m68010:
-      N_SET_MACHTYPE(*execp, M_68010);
-      break;
-    default:
-    case bfd_mach_m68020:
-      N_SET_MACHTYPE(*execp, M_68020);
-      break;
-    }
-    break;
-  case bfd_arch_sparc:
-    N_SET_MACHTYPE(*execp, M_SPARC);
-    break;
-  case bfd_arch_i386:
-    N_SET_MACHTYPE(*execp, M_386);
-    break;
-  case bfd_arch_a29k:
-    N_SET_MACHTYPE(*execp, M_29K);
-    break;
-  case bfd_arch_mips:
-    switch (bfd_get_mach(abfd)) {
-    case 4000:
-    case 6000:
-      N_SET_MACHTYPE(*execp, M_MIPS2);
-      break;
-    default:
-      N_SET_MACHTYPE(*execp, M_MIPS1);
-      break;
-    }
-    break;
-  default:
-    N_SET_MACHTYPE(*execp, M_UNKNOWN);
-  }
-
-  MY(choose_reloc_size)(abfd);
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
-}
-
-/*
- * MIPS relocation types.
- */
-#define MIPS_RELOC_32		0
-#define MIPS_RELOC_JMP		1
-#define MIPS_RELOC_WDISP16	2
-#define MIPS_RELOC_HI16		3
-#define MIPS_RELOC_HI16_S	4
-#define MIPS_RELOC_LO16		5
-
-/*
- * This is only called when performing a BFD_RELOC_MIPS_JMP relocation.
- * The jump destination address is formed from the upper 4 bits of the
- * "current" program counter concatenated with the jump instruction's
- * 26 bit field and two trailing zeros.
- * If the destination address is not in the same segment as the "current"
- * program counter, then we need to signal an error.
- */
-static bfd_reloc_status_type
-mips_fix_jmp_addr (abfd,reloc_entry,symbol,data,input_section,output_bfd)
-     bfd *abfd;
-     arelent *reloc_entry;
-     struct symbol_cache_entry *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-{
-  bfd_vma relocation, pc;
- 
-  /* If this is a partial relocation, just continue. */
-  if (output_bfd != (bfd *)NULL)
-    return bfd_reloc_continue;
-
-  /* If this is an undefined symbol, return error */
-  if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0)
-    return bfd_reloc_undefined;
-
-  /* 
-   * Work out which section the relocation is targetted at and the
-   * initial relocation command value.
-   */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-
-  pc = input_section->output_section->vma + input_section->output_offset +
-    reloc_entry->address + 4;
-
-  if ((relocation & 0xF0000000) != (pc & 0xF0000000))
-    return bfd_reloc_overflow;
-
-  return bfd_reloc_continue;
-}
-
-/*
- * This is only called when performing a BFD_RELOC_HI16_S relocation.
- * We need to see if bit 15 is set in the result. If it is, we add
- * 0x10000 and continue normally. This will compensate for the sign extension
- * when the low bits are added at run time.
- */
-static bfd_reloc_status_type
-mips_fix_hi16_s PARAMS ((bfd *, arelent *, asymbol *, PTR,
-			 asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-mips_fix_hi16_s (abfd, reloc_entry, symbol, data, input_section,
-		 output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
- 
-  /* If this is a partial relocation, just continue. */
-  if (output_bfd != (bfd *)NULL)
-    return bfd_reloc_continue;
-
-  /* If this is an undefined symbol, return error */
-  if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0)
-    return bfd_reloc_undefined;
-
-  /* 
-   * Work out which section the relocation is targetted at and the
-   * initial relocation command value.
-   */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-
-  if (relocation & 0x8000)
-    reloc_entry->addend += 0x10000;
-
-  return bfd_reloc_continue;
-}
-
-static reloc_howto_type mips_howto_table_ext[] = {
-  {MIPS_RELOC_32,      0, 2, 32, false, 0,  complain_overflow_bitfield, 0,
-	"32",       false, 0, 0xffffffff, false},
-  {MIPS_RELOC_JMP,     2, 2, 26, false, 0, complain_overflow_dont,
-	mips_fix_jmp_addr,
-	"MIPS_JMP", false, 0, 0x03ffffff, false},
-  {MIPS_RELOC_WDISP16, 2, 2, 16, true,  0, complain_overflow_signed, 0,
-	"WDISP16",  false, 0, 0x0000ffff, false},
-  {MIPS_RELOC_HI16,   16, 2, 16, false, 0, complain_overflow_bitfield, 0,
-	"HI16",     false, 0, 0x0000ffff, false},
-  {MIPS_RELOC_HI16_S, 16, 2, 16, false, 0, complain_overflow_bitfield,
-        mips_fix_hi16_s,
-        "HI16_S",   false, 0, 0x0000ffff, false},
-  {MIPS_RELOC_LO16,    0, 2, 16, false, 0, complain_overflow_dont, 0,
-	"LO16",     false, 0, 0x0000ffff, false},
-};
-
-static reloc_howto_type *
-MY(reloc_howto_type_lookup) (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-
-  if (bfd_get_arch (abfd) != bfd_arch_mips)
-    return 0;
-
-  switch (code)
-    {
-    case BFD_RELOC_CTOR:
-    case BFD_RELOC_32:
-      return (&mips_howto_table_ext[MIPS_RELOC_32]);
-    case BFD_RELOC_MIPS_JMP:
-      return (&mips_howto_table_ext[MIPS_RELOC_JMP]);
-    case BFD_RELOC_16_PCREL_S2:
-      return (&mips_howto_table_ext[MIPS_RELOC_WDISP16]);
-    case BFD_RELOC_HI16:
-      return (&mips_howto_table_ext[MIPS_RELOC_HI16]);
-    case BFD_RELOC_HI16_S:
-      return (&mips_howto_table_ext[MIPS_RELOC_HI16_S]);
-    case BFD_RELOC_LO16:
-      return (&mips_howto_table_ext[MIPS_RELOC_LO16]);
-    default:
-      return 0;
-    }
-}
-
-/*
- * This is just like the standard aoutx.h version but we need to do our
- * own mapping of external reloc type values to howto entries.
- */
-long
-MY(canonicalize_reloc)(abfd, section, relptr, symbols)
-      bfd *abfd;
-      sec_ptr section;
-      arelent **relptr;
-      asymbol **symbols;
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count, c;
-  extern reloc_howto_type NAME(aout,ext_howto_table)[];
-
-  /* If we have already read in the relocation table, return the values. */
-  if (section->flags & SEC_CONSTRUCTOR) {
-    arelent_chain *chain = section->constructor_chain;
-
-    for (count = 0; count < section->reloc_count; count++) {
-      *relptr++ = &chain->relent;
-      chain = chain->next;
-    }
-    *relptr = 0;
-    return section->reloc_count;
-  }
-  if (tblptr && section->reloc_count) {
-    for (count = 0; count++ < section->reloc_count;) 
-      *relptr++ = tblptr++;
-    *relptr = 0;
-    return section->reloc_count;
-  }
-
-  if (!NAME(aout,slurp_reloc_table)(abfd, section, symbols))
-    return -1;
-  tblptr = section->relocation;
-
-  /* fix up howto entries */
-  for (count = 0; count++ < section->reloc_count;) 
-    {
-      c = tblptr->howto - NAME(aout,ext_howto_table);
-      tblptr->howto = &mips_howto_table_ext[c];
-
-      *relptr++ = tblptr++;
-    }
-  *relptr = 0;
-  return section->reloc_count;
-}
-
-static CONST struct aout_backend_data MY(backend_data) = {
-  0,				/* zmagic contiguous */
-  1,				/* text incl header */
-  0,				/* entry is text address */
-  0,				/* exec_hdr_flags */
-  TARGET_PAGE_SIZE,			/* text vma */
-  MY_set_sizes,
-  0,				/* text size includes exec header */
-  0,				/* add_dynamic_symbols */
-  0,				/* add_one_symbol */
-  0,				/* link_dynamic_object */
-  0,				/* write_dynamic_symbol */
-  0,				/* check_dynamic_reloc */
-  0				/* finish_dynamic_link */
-};
-
-const bfd_target aout_mips_little_vec =
-{
-  "a.out-mips-little",		/* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_LITTLE,		/* target byte order (little) */
-  BFD_ENDIAN_LITTLE,		/* target headers byte order (little) */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  MY_symbol_leading_char,
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-     bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-     bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-    {_bfd_dummy_target, MY_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, MY_core_file_p},
-    {bfd_false, MY_mkobject,	/* bfd_set_format */
-       _bfd_generic_mkarchive, bfd_false},
-    {bfd_false, MY_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (MY),
-     BFD_JUMP_TABLE_COPY (MY),
-     BFD_JUMP_TABLE_CORE (MY),
-     BFD_JUMP_TABLE_ARCHIVE (MY),
-     BFD_JUMP_TABLE_SYMBOLS (MY),
-     BFD_JUMP_TABLE_RELOCS (MY),
-     BFD_JUMP_TABLE_WRITE (MY),
-     BFD_JUMP_TABLE_LINK (MY),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) MY_backend_data,
-};
-
-const bfd_target aout_mips_big_vec =
-{
-  "a.out-mips-big",		/* name */
-  bfd_target_aout_flavour,
-  BFD_ENDIAN_BIG,		/* target byte order (big) */
-  BFD_ENDIAN_BIG,		/* target headers byte order (big) */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_CODE | SEC_DATA),
-  MY_symbol_leading_char,
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-     bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-     bfd_getb16, bfd_getb_signed_16, bfd_putb16, /* hdrs */
-    {_bfd_dummy_target, MY_object_p, /* bfd_check_format */
-       bfd_generic_archive_p, MY_core_file_p},
-    {bfd_false, MY_mkobject,	/* bfd_set_format */
-       _bfd_generic_mkarchive, bfd_false},
-    {bfd_false, MY_write_object_contents, /* bfd_write_contents */
-       _bfd_write_archive_contents, bfd_false},
-
-     BFD_JUMP_TABLE_GENERIC (MY),
-     BFD_JUMP_TABLE_COPY (MY),
-     BFD_JUMP_TABLE_CORE (MY),
-     BFD_JUMP_TABLE_ARCHIVE (MY),
-     BFD_JUMP_TABLE_SYMBOLS (MY),
-     BFD_JUMP_TABLE_RELOCS (MY),
-     BFD_JUMP_TABLE_WRITE (MY),
-     BFD_JUMP_TABLE_LINK (MY),
-     BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) MY_backend_data,
-};
diff --git a/bfd/mpw-config.in b/bfd/mpw-config.in
deleted file mode 100644
index 31addeebdcf..00000000000
--- a/bfd/mpw-config.in
+++ /dev/null
@@ -1,86 +0,0 @@
-# Configuration fragment for BFD.
-
-# This is almost always correct.
-
-Set selarchs "&bfd_{target_cpu}_arch"
-Set defvec ""
-Set selvecs ""
-Set havevecs ""
-
-If "{target_canonical}" =~ /m68k-apple-macos/
-	Set BFD_BACKENDS '"{o}"coff-m68k.c.o "{o}"cofflink.c.o'
-	Set defvec m68kcoff_vec
-	Set selvecs '&m68kcoff_vec'
-	Set havevecs '-d HAVE_m68kcoff_vec'
-
-Else If "{target_canonical}" =~ /powerpc-apple-macos/
-	Set BFD_BACKENDS '"{o}"coff-pmac.c.o "{o}"xcofflink.c.o'
-	Set defvec pmac_xcoff_vec
-	Set selvecs '&pmac_xcoff_vec'
-	Set havevecs '-d HAVE_pmac_xcoff_vec'
-	Set selarchs "&bfd_powerpc_arch"
-
-Else If "{target_canonical}" =~ /i386-\Option-x-go32/
-	Set BFD_BACKENDS '"{o}"coff-i386.c.o'
-	Set defvec i386coff_vec
-	Set selvecs '&i386coff_vec'
-	Set havevecs '-d HAVE_i386coff_vec'
-
-Else If "{target_canonical}" =~ /mips-\Option-x-\Option-x/
-	Set BFD_BACKENDS '"{o}"coff-mips.c.o "{o}"ecoff.c.o "{o}"ecofflink.c.o "{o}"elf32.c.o "{o}"elf32-mips.c.o "{o}"elflink.c.o'
-	Set defvec ecoff_big_vec
-	Set selvecs '&ecoff_big_vec,&ecoff_little_vec,&bfd_elf32_bigmips_vec'
-	Set havevecs '-d HAVE_ecoff_big_vec -d HAVE_ecoff_little_vec -d HAVE_bfd_elf32_bigmips_vec'
-
-Else If "{target_canonical}" =~ /sh-\Option-x-hms/
-	Set BFD_BACKENDS '"{o}"coff-sh.c.o "{o}"cofflink.c.o'
-	Set defvec shcoff_vec
-	Set selvecs '&shcoff_vec,&shlcoff_vec'
-	Set havevecs '-d HAVE_shcoff_vec -d HAVE_shlcoff_vec'
-End If
-
-Set ta `echo {selarchs} | sed -e 's/&bfd_/{o}cpu-/g' -e 's/_arch/.c.o/g'`
-
-Set tdefaults "-d DEFAULT_VECTOR={defvec} -d SELECT_VECS={selvecs} -d SELECT_ARCHITECTURES={selarchs} {havevecs}"
-
-Echo '# From mpw-config.in'				 > "{o}"mk.tmp
-Echo 'WORDSIZE = 32'					>> "{o}"mk.tmp
-Echo 'BFD_MACHINES = ' {ta}				>> "{o}"mk.tmp
-Echo 'BFD_BACKENDS = ' {BFD_BACKENDS}			>> "{o}"mk.tmp
-Echo 'TDEFAULTS = ' {tdefaults}				>> "{o}"mk.tmp
-Echo 'HDEPFILES = '					>> "{o}"mk.tmp
-Echo 'TDEPFILES = '					>> "{o}"mk.tmp
-Echo '# End from mpw-config.in'				>> "{o}"mk.tmp
-
-Echo '/* config.h.  Generated by mpw-configure.  */'	 > "{o}"config.new
-Echo '#include "mpw.h"'					>> "{o}"config.new
-
-MoveIfChange "{o}"config.new "{o}"config.h
-
-# We can only handle 32-bit targets right now.
-
-sed -e 's/@WORDSIZE@/32/' \Option-d
-    -e 's/@wordsize@/32/' \Option-d
-    -e "s/@VERSION@/`Catenate {srcdir}VERSION`/" \Option-d
-    -e 's/@BFD_HOST_64_BIT_DEFINED@/0/' \Option-d
-    -e 's/@BFD_HOST_64_BIT@//' \Option-d
-    -e 's/@BFD_HOST_U_64_BIT@//' \Option-d
-    -e 's/@BFD_HOST_64BIT_LONG@/0/' \Option-d
-    "{srcdir}"bfd-in2.h >"{o}"bfd.h-new
-
-MoveIfChange "{o}"bfd.h-new "{o}"bfd.h
-
-sed -e 's/NN/32/g' "{srcdir}"elfxx-target.h >"{o}"elf32-target.h-new
-MoveIfChange "{o}"elf32-target.h-new "{o}"elf32-target.h
-
-# Pre-expand some macros in coffswap.h, so MPW C doesn't choke.
-
-sed -e 's/^  PUT_AOUTHDR_TSIZE (/  bfd_h_put_32 (/' \Option-d
-    -e 's/^  PUT_AOUTHDR_DSIZE (/  bfd_h_put_32 (/' \Option-d
-    -e 's/^  PUT_AOUTHDR_BSIZE (/  bfd_h_put_32 (/' \Option-d
-    -e 's/^  PUT_AOUTHDR_ENTRY (/  bfd_h_put_32 (/' \Option-d
-    -e 's/^  PUT_AOUTHDR_TEXT_START (/  bfd_h_put_32 (/' \Option-d
-    -e 's/^  PUT_AOUTHDR_DATA_START (/  bfd_h_put_32 (/' \Option-d
-    "{srcdir}"coffswap.h >"{o}"coffswap.h-new
-
-MoveIfChange "{o}"coffswap.h-new "{o}"coffswap.h
diff --git a/bfd/mpw-make.sed b/bfd/mpw-make.sed
deleted file mode 100644
index b2463c72b7f..00000000000
--- a/bfd/mpw-make.sed
+++ /dev/null
@@ -1,81 +0,0 @@
-# Sed commands to finish translating the Unix BFD Makefile into MPW syntax.
-
-# Whack out unused host and target define bits.
-/HDEFINES/s/@HDEFINES@//
-/TDEFINES/s/@TDEFINES@//
-
-# Fix pathnames to include directories.
-/^INCDIR = /s/^INCDIR = .*$/INCDIR = "{topsrcdir}"include/
-/^CSEARCH = /s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/
-
-# Comment out setting of vars, configure script will add these itself.
-/^WORDSIZE =/s/^/#/
-# /^ALL_BACKENDS/s/^/#/
-/^BFD_BACKENDS/s/^/#/
-/^BFD_MACHINES/s/^/#/
-/^TDEFAULTS/s/^/#/
-
-# Remove extra, useless, "all".
-/^all \\Option-f _oldest/,/^$/d
-
-# Remove the Makefile rebuild rule.
-/^Makefile /,/--recheck/d
-
-# Don't do any recursive subdir stuff.
-/ subdir_do/s/{MAKE}/null-command/
-
-/BFD_H/s/^{BFD_H}/#{BFD_H}/
-
-# Add explicit srcdir paths to special files.
-/config.bfd/s/ config.bfd/ "{s}"config.bfd/g
-/targmatch.sed/s/ targmatch.sed/ "{s}"targmatch.sed/g
-
-# Point at include files that are always in the objdir.
-/bfd/s/"{s}"bfd\.h/"{o}"bfd.h/g
-/config/s/"{s}"config\.h/"{o}"config.h/g
-/targmatch/s/"{s}"targmatch\.h/"{o}"targmatch.h/g
-/targmatch/s/^targmatch\.h/"{o}"targmatch.h/
-/elf32-target/s/"{s}"elf32-target\.h/"{o}"elf32-target.h/g
-/elf32-target/s/^elf32-target\.h/"{o}"elf32-target.h/
-/elf64-target/s/"{s}"elf64-target\.h/"{o}"elf64-target.h/g
-/elf64-target/s/^elf64-target\.h/"{o}"elf64-target.h/
-
-/"{s}"{INCDIR}/s/"{s}"{INCDIR}/"{INCDIR}"/g
-
-/dep/s/\.dep/__dep/g
-
-# Removing duplicates is cool but presently unnecessary,
-# so whack this out.
-/^ofiles \\Option-f/,/^$/d
-/ofiles/s/{OFILES} ofiles/{OFILES}/
-/echo ofiles = /d
-/cat ofiles/s/`cat ofiles`/{OFILES}/
-
-# No corefile support.
-/COREFILE/s/@COREFILE@//
-/COREFLAG/s/@COREFLAG@//
-
-# No PIC foolery in this environment.
-/@ALLLIBS@/s/@ALLLIBS@/{TARGETLIB}/
-/@PICLIST@/s/@PICLIST@//
-/@PICFLAG@/s/@PICFLAG@//
-/^{OFILES} \\Option-f stamp-picdir/,/^$/d
-
-# Remove the pic trickery from the default build rule.
-/^\.c\.o \\Option-f /,/End If/c\
-.c.o \\Option-f .c
-
-# MPW Make doesn't know about $<.
-/"{o}"targets.c.o \\Option-f "{s}"targets.c Makefile/,/^$/c\
-"{o}"targets.c.o \\Option-f "{s}"targets.c Makefile\
-	{CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"targets.c -o "{o}"targets.c.o
-
-/"{o}"archures.c.o \\Option-f "{s}"archures.c Makefile/,/^$/c\
-"{o}"archures.c.o \\Option-f "{s}"archures.c Makefile\
-	{CC} @DASH_C_FLAG@ {ALL_CFLAGS} {TDEFAULTS} "{s}"archures.c -o "{o}"archures.c.o
-
-# Remove the .h rebuilding rules, we don't currently have a doc subdir,
-# or a way to build the prototype-hacking tool that's in it.
-/^"{srcdir}"bfd-in2.h \\Option-f /,/^$/d
-/^"{srcdir}"libbfd.h \\Option-f /,/^$/d
-/^"{srcdir}"libcoff.h \\Option-f /,/^$/d
diff --git a/bfd/netbsd-core.c b/bfd/netbsd-core.c
deleted file mode 100644
index 21b184dce3b..00000000000
--- a/bfd/netbsd-core.c
+++ /dev/null
@@ -1,251 +0,0 @@
-/* BFD back end for NetBSD style core files
-   Copyright 1988, 89, 91, 92, 93, 96, 1998 Free Software Foundation, Inc.
-   Written by Paul Kranenburg, EUR
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-#include <sys/core.h>
-
-/*
- * FIXME: On NetBSD/sparc CORE_FPU_OFFSET should be (sizeof(struct trapframe))
- */
-
-struct netbsd_core_struct {
-	struct core core;
-} *rawptr;
-
-/* forward declarations */
-
-static const bfd_target *	netbsd_core_file_p PARAMS ((bfd *abfd));
-static char *		netbsd_core_file_failing_command PARAMS ((bfd *abfd));
-static int 		netbsd_core_file_failing_signal PARAMS ((bfd *abfd));
-static boolean		netbsd_core_file_matches_executable_p
-			 PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-static void		swap_abort PARAMS ((void));
-
-/* Handle NetBSD-style core dump file.  */
-
-/* ARGSUSED */
-static const bfd_target *
-netbsd_core_file_p (abfd)
-     bfd *abfd;
-
-{
-	int		i, val, offset;
-	asection	*asect, *asect2;
-	struct core	core;
-	struct coreseg	coreseg;
-
-	val = bfd_read ((void *)&core, 1, sizeof core, abfd);
-	if (val != sizeof core) {
-		/* Too small to be a core file */
-		bfd_set_error(bfd_error_wrong_format);
-		return 0;
-	}
-
-	if (CORE_GETMAGIC(core) != COREMAGIC) {
-		bfd_set_error(bfd_error_wrong_format);
-		return 0;
-	}
-
-	rawptr = (struct netbsd_core_struct *)
-		bfd_zalloc (abfd, sizeof (struct netbsd_core_struct));
-	if (rawptr == NULL) {
-		bfd_set_error(bfd_error_no_memory);
-		return 0;
-	}
-
-	rawptr->core = core;
-	abfd->tdata.netbsd_core_data = rawptr;
-
-	offset = core.c_hdrsize;
-	for (i = 0; i < core.c_nseg; i++) {
-
-		if (bfd_seek (abfd, offset, SEEK_SET) != 0)
-			goto punt;
-
-		val = bfd_read ((void *)&coreseg, 1, sizeof coreseg, abfd);
-		if (val != sizeof coreseg) {
-			bfd_set_error(bfd_error_file_truncated);
-			goto punt;
-		}
-		if (CORE_GETMAGIC(coreseg) != CORESEGMAGIC) {
-			bfd_set_error(bfd_error_wrong_format);
-			goto punt;
-		}
-
-		offset += core.c_seghdrsize;
-
-		asect = (asection *) bfd_zalloc (abfd, sizeof(asection));
-		if (asect == NULL) {
-			bfd_set_error(bfd_error_no_memory);
-			goto punt;
-		}
-
-		asect->_raw_size = coreseg.c_size;
-		asect->vma = coreseg.c_addr;
-		asect->filepos = offset;
-		asect->alignment_power = 2;
-		asect->next = abfd->sections;
-		abfd->sections = asect;
-		abfd->section_count++;
-		offset += coreseg.c_size;
-
-		switch (CORE_GETFLAG(coreseg)) {
-		case CORE_CPU:
-			asect->name = ".reg";
-			asect->flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-#ifdef CORE_FPU_OFFSET
-			/* Hackish... */
-			asect->_raw_size = CORE_FPU_OFFSET;
-			asect2 = (asection *)bfd_zalloc (abfd,
-							 sizeof (asection));
-			if (asect2 == NULL) {
-				bfd_set_error(bfd_error_no_memory);
-				goto punt;
-			}
-			asect2->_raw_size = coreseg.c_size - CORE_FPU_OFFSET;
-			asect2->vma = 0;
-			asect2->filepos = asect->filepos + CORE_FPU_OFFSET;
-			asect2->alignment_power = 2;
-			asect2->next = abfd->sections;
-			asect2->name = ".reg2";
-			asect2->flags = SEC_ALLOC + SEC_HAS_CONTENTS;
-			abfd->sections = asect2;
-			abfd->section_count++;
-#endif
-
-			break;
-		case CORE_DATA:
-			asect->name = ".data";
-			asect->flags = SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS;
-			break;
-		case CORE_STACK:
-			asect->name = ".stack";
-			asect->flags = SEC_ALLOC+SEC_LOAD+SEC_HAS_CONTENTS;
-			break;
-		}
-	}
-
-	/* OK, we believe you.  You're a core file (sure, sure).  */
-	return abfd->xvec;
-
-punt:	{
-		asection	*anext;
-		for (asect = abfd->sections; asect; asect = anext) {
-			anext = asect->next;
-			free((void *)asect);
-		}
-	}
-	free ((void *)rawptr);
-	abfd->tdata.netbsd_core_data = NULL;
-	abfd->sections = NULL;
-	abfd->section_count = 0;
-	return 0;
-}
-
-static char*
-netbsd_core_file_failing_command (abfd)
-	bfd *abfd;
-{
- /*return core_command (abfd);*/
-  return abfd->tdata.netbsd_core_data->core.c_name;
-}
-
-/* ARGSUSED */
-static int
-netbsd_core_file_failing_signal (abfd)
-	bfd *abfd;
-{
-  /*return core_signal (abfd);*/
-  return abfd->tdata.netbsd_core_data->core.c_signo;
-}
-
-/* ARGSUSED */
-static boolean
-netbsd_core_file_matches_executable_p  (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;		/* FIXME, We have no way of telling at this point */
-}
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target netbsd_core_vec =
-  {
-    "netbsd-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_UNKNOWN,		/* target byte order */
-    BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     netbsd_core_file_p		/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (netbsd),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
diff --git a/bfd/netbsd.h b/bfd/netbsd.h
deleted file mode 100644
index a5482f04312..00000000000
--- a/bfd/netbsd.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/* BFD back-end definitions used by all NetBSD targets.
-   Copyright (C) 1990, 91, 92, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
-
-/* Check for our machine type (part of magic number). */
-#ifndef MACHTYPE_OK
-#define MACHTYPE_OK(m) ((m) == DEFAULT_MID || (m) == M_UNKNOWN)
-#endif
-
-/* This is the normal load address for executables. */
-#define TEXT_START_ADDR		TARGET_PAGE_SIZE
-
-/* NetBSD ZMAGIC has its header in the text segment.  */
-#define N_HEADER_IN_TEXT(x)	1
-
-/* Determine if this is a shared library using the flags. */
-#define N_SHARED_LIB(x) 	(N_DYNAMIC(x))
-
-/* We have 6 bits of flags and 10 bits of machine ID.  */
-#define N_MACHTYPE(exec) \
-	((enum machine_type)(((exec).a_info >> 16) & 0x03ff))
-#define N_FLAGS(exec) \
-	(((exec).a_info >> 26) & 0x3f)
-
-#define N_SET_INFO(exec, magic, type, flags) \
-	((exec).a_info = ((magic) & 0xffff) \
-	 | (((int)(type) & 0x3ff) << 16) \
-	 | (((flags) & 0x3f) << 24))
-#define N_SET_MACHTYPE(exec, machtype) \
-	((exec).a_info = \
-         ((exec).a_info & 0xfb00ffff) | ((((int)(machtype))&0x3ff) << 16))
-#define N_SET_FLAGS(exec, flags) \
-	((exec).a_info = \
-	 ((exec).a_info & 0x03ffffff) | ((flags & 0x03f) << 26))
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"
-
-/* On NetBSD, the magic number is always in ntohl's "network" (big-endian)
-   format.  */
-#define SWAP_MAGIC(ext) bfd_getb32 (ext)
-
-/* On NetBSD, the entry point may be taken to be the start of the text
-   section.  */
-#define MY_entry_is_text_address 1
-
-#define MY_write_object_contents MY(write_object_contents)
-static boolean MY(write_object_contents) PARAMS ((bfd *abfd));
-#define MY_text_includes_header 1
-
-#include "aout-target.h"
-
-/* Write an object file.
-   Section contents have already been written.  We write the
-   file header, symbols, and relocation.  */
-
-static boolean
-MY(write_object_contents) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  /* We must make certain that the magic number has been set.  This
-     will normally have been done by set_section_contents, but only if
-     there actually are some section contents.  */
-  if (! abfd->output_has_begun)
-    {
-      bfd_size_type text_size;
-      file_ptr text_end;
-
-      NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);
-    }
-
-#if CHOOSE_RELOC_SIZE
-  CHOOSE_RELOC_SIZE(abfd);
-#else
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-#endif
-
-  /* Magic number, maestro, please!  */
-  switch (bfd_get_arch(abfd)) {
-  case DEFAULT_ARCH:
-    N_SET_MACHTYPE(*execp, DEFAULT_MID);
-    break;
-  default:
-    N_SET_MACHTYPE(*execp, M_UNKNOWN);
-    break;
-  }
-
-  /* The NetBSD magic number is always big-endian */
-#ifndef TARGET_IS_BIG_ENDIAN_P
-  /* XXX aren't there any macro to change byteorder of a word independent of
-     the host's or target's endianesses?  */
-  execp->a_info
-    = (execp->a_info & 0xff) << 24 | (execp->a_info & 0xff00) << 8
-      | (execp->a_info & 0xff0000) >> 8 | (execp->a_info & 0xff000000) >> 24;
-#endif
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
-}
diff --git a/bfd/newsos3.c b/bfd/newsos3.c
deleted file mode 100644
index 7ec7a75a87c..00000000000
--- a/bfd/newsos3.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/* BFD back-end for NewsOS3 (Sony, 68k) binaries.
-   Copyright (C) 1990, 91, 92, 93, 94 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define	TARGET_PAGE_SIZE	4096
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-#define TEXT_START_ADDR 0
-#define BYTES_IN_WORD 4
-#define MY(OP) CAT(newsos3_,OP)
-#define TARGETNAME "a.out-newsos3"
-#define ENTRY_CAN_BE_ZERO
-#define N_SHARED_LIB(x) 0 /* Avoids warning when compiled with -Wall. */
-#define DEFAULT_ARCH bfd_arch_m68k
-#define TARGET_IS_BIG_ENDIAN_P
-#define N_HEADER_IN_TEXT(x) 0
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#include "aout-target.h"
diff --git a/bfd/nlm-target.h b/bfd/nlm-target.h
deleted file mode 100644
index 6f1d47d8c45..00000000000
--- a/bfd/nlm-target.h
+++ /dev/null
@@ -1,229 +0,0 @@
-/* Target definitions for 32/64-bit NLM (NetWare Loadable Module)
-   Copyright (C) 1993, 94, 95, 1997 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define nlm_core_file_p _bfd_dummy_target
-
-#define nlm_get_symtab_upper_bound nlmNAME(get_symtab_upper_bound)
-#define nlm_get_symtab nlmNAME(get_symtab)
-#define nlm_make_empty_symbol nlmNAME(make_empty_symbol)
-#define nlm_print_symbol nlmNAME(print_symbol)
-#define nlm_get_symbol_info nlmNAME(get_symbol_info)
-#define nlm_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define nlm_get_lineno _bfd_nosymbols_get_lineno
-#define nlm_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define nlm_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define nlm_read_minisymbols _bfd_generic_read_minisymbols
-#define nlm_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define nlm_get_reloc_upper_bound nlmNAME(get_reloc_upper_bound)
-#define nlm_canonicalize_reloc nlmNAME(canonicalize_reloc)
-#define nlm_bfd_reloc_type_lookup bfd_default_reloc_type_lookup
-
-#define nlm_set_section_contents nlmNAME(set_section_contents)
-
-#define nlm_sizeof_headers _bfd_nolink_sizeof_headers
-#define nlm_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define nlm_bfd_relax_section bfd_generic_relax_section
-#define nlm_bfd_gc_sections bfd_generic_gc_sections
-#define nlm_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define nlm_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define nlm_bfd_final_link _bfd_generic_final_link
-#define nlm_bfd_link_split_section _bfd_generic_link_split_section
-
-/* This structure contains everything that BFD knows about a target.
-   It includes things like its byte order, name, what routines to call
-   to do various operations, etc.  Every BFD points to a target structure
-   with its "xvec" member.
-
-   There are two such structures here:  one for big-endian machines and
-   one for little-endian machines.   */
-
-
-#ifdef TARGET_BIG_SYM
-const bfd_target TARGET_BIG_SYM =
-{
-  /* name: identify kind of target */
-  TARGET_BIG_NAME,
-
-  /* flavour: general indication about file */
-  bfd_target_nlm_flavour,
-
-  /* byteorder: data is big endian */
-  BFD_ENDIAN_BIG,
-
-  /* header_byteorder: header is also big endian */
-  BFD_ENDIAN_BIG,
-
-  /* object_flags: mask of all file flags */
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
-   | WP_TEXT),
-  
-  /* section_flags: mask of all section flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY |
-   SEC_CODE | SEC_DATA), 
-
-   /* leading_symbol_char: is the first char of a user symbol
-      predictable, and if so what is it */
-   0,
-
-  /* ar_pad_char: pad character for filenames within an archive header
-     FIXME:  this really has nothing to do with NLM, this is a characteristic
-     of the archiver and/or os and should be independently tunable */
-  '/',
-
-  /* ar_max_namelen: maximum number of characters in an archive header
-     FIXME:  this really has nothing to do with NLM, this is a characteristic
-     of the archiver and should be independently tunable.  This value is
-     a WAG (wild a** guess) */
-  15,
-
-  /* Routines to byte-swap various sized integers from the data sections */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
-
-  /* Routines to byte-swap various sized integers from the file headers */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-    bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-    bfd_getb16, bfd_getb_signed_16, bfd_putb16,
-
-  /* bfd_check_format: check the format of a file being read */
-  { _bfd_dummy_target,		/* unknown format */
-    nlmNAME(object_p),		/* assembler/linker output (object file) */
-    bfd_generic_archive_p,	/* an archive */
-    nlm_core_file_p		/* a core file */
-  },
-
-  /* bfd_set_format: set the format of a file being written */
-  { bfd_false,
-    nlm_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false
-  },
-
-  /* bfd_write_contents: write cached information into a file being written */
-  { bfd_false,
-    nlmNAME(write_object_contents),
-    _bfd_write_archive_contents,
-    bfd_false
-  },
-
-  /* Initialize a jump table with the standard macro.  All names start with
-     "nlm" */
-  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (nlm),
-  BFD_JUMP_TABLE_RELOCS (nlm),
-  BFD_JUMP_TABLE_WRITE (nlm),
-  BFD_JUMP_TABLE_LINK (nlm),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  /* backend_data: */
-  (PTR) TARGET_BACKEND_DATA
-};
-#endif
-
-#ifdef TARGET_LITTLE_SYM
-const bfd_target TARGET_LITTLE_SYM =
-{
-  /* name: identify kind of target */
-  TARGET_LITTLE_NAME,
-
-  /* flavour: general indication about file */
-  bfd_target_nlm_flavour,
-
-  /* byteorder: data is little endian */
-  BFD_ENDIAN_LITTLE,
-
-  /* header_byteorder: header is also little endian */
-  BFD_ENDIAN_LITTLE,
-
-  /* object_flags: mask of all file flags */
-  (HAS_RELOC | EXEC_P | HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS
-   | WP_TEXT),
-  
-  /* section_flags: mask of all section flags */
-  (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_READONLY |
-   SEC_DATA), 
-
-   /* leading_symbol_char: is the first char of a user symbol
-      predictable, and if so what is it */
-   0,
-
-  /* ar_pad_char: pad character for filenames within an archive header
-     FIXME:  this really has nothing to do with NLM, this is a characteristic
-     of the archiver and/or os and should be independently tunable */
-  '/',
-
-  /* ar_max_namelen: maximum number of characters in an archive header
-     FIXME:  this really has nothing to do with NLM, this is a characteristic
-     of the archiver and should be independently tunable.  This value is
-     a WAG (wild a** guess) */
-  15,
-
-  /* Routines to byte-swap various sized integers from the data sections */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
-
-  /* Routines to byte-swap various sized integers from the file headers */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-    bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-    bfd_getl16, bfd_getl_signed_16, bfd_putl16,
-
-  /* bfd_check_format: check the format of a file being read */
-  { _bfd_dummy_target,		/* unknown format */
-    nlmNAME(object_p),		/* assembler/linker output (object file) */
-    bfd_generic_archive_p,	/* an archive */
-    nlm_core_file_p		/* a core file */
-  },
-
-  /* bfd_set_format: set the format of a file being written */
-  { bfd_false,
-    nlm_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false
-  },
-
-  /* bfd_write_contents: write cached information into a file being written */
-  { bfd_false,
-    nlmNAME(write_object_contents),
-    _bfd_write_archive_contents,
-    bfd_false
-  },
-
-  /* Initialize a jump table with the standard macro.  All names start with
-     "nlm" */
-  BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (nlm),
-  BFD_JUMP_TABLE_RELOCS (nlm),
-  BFD_JUMP_TABLE_WRITE (nlm),
-  BFD_JUMP_TABLE_LINK (nlm),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  /* backend_data: */
-  (PTR) TARGET_BACKEND_DATA
-};
-#endif
diff --git a/bfd/nlm.c b/bfd/nlm.c
deleted file mode 100644
index 89c6baa64ef..00000000000
--- a/bfd/nlm.c
+++ /dev/null
@@ -1,55 +0,0 @@
-/* NLM (NetWare Loadable Module) executable support for BFD.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libnlm.h"
-
-/* Make an NLM object.  We just need to allocate the backend
-   information.  */
-
-boolean
-nlm_mkobject (abfd)
-     bfd * abfd;
-{
-  nlm_tdata (abfd) =
-    (struct nlm_obj_tdata *) bfd_zalloc (abfd, sizeof (struct nlm_obj_tdata));
-  if (nlm_tdata (abfd) == NULL)
-    return (false);
-
-  if (nlm_architecture (abfd) != bfd_arch_unknown)
-    bfd_default_set_arch_mach (abfd, nlm_architecture (abfd),
-			       nlm_machine (abfd));
-
-  /* since everything is done at close time, do we need any initialization? */
-  return (true);
-}
-
-/* Set the architecture and machine for an NLM object.  */
-
-boolean
-nlm_set_arch_mach (abfd, arch, machine)
-     bfd * abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  bfd_default_set_arch_mach (abfd, arch, machine);
-  return arch == nlm_architecture (abfd);
-}
diff --git a/bfd/nlm32-alpha.c b/bfd/nlm32-alpha.c
deleted file mode 100644
index 24c8e516762..00000000000
--- a/bfd/nlm32-alpha.c
+++ /dev/null
@@ -1,892 +0,0 @@
-/* Support for 32-bit Alpha NLM (NetWare Loadable Module)
-   Copyright (C) 1993 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file describes the 32 bit Alpha NLM format.  You might think
-   that an Alpha chip would use a 64 bit format, but, for some reason,
-   it doesn't.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define ARCH_SIZE 32
-
-#include "nlm/alpha-ext.h"
-#define Nlm_External_Fixed_Header	Nlm32_alpha_External_Fixed_Header
-
-#include "libnlm.h"
-
-static boolean nlm_alpha_backend_object_p
-  PARAMS ((bfd *));
-static boolean nlm_alpha_write_prefix
-  PARAMS ((bfd *));
-static boolean nlm_alpha_read_reloc
-  PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_alpha_mangle_relocs
-  PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_alpha_read_import
-  PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static boolean nlm_alpha_write_import
-  PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_alpha_set_public_section
-  PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static bfd_vma nlm_alpha_get_public_offset
-  PARAMS ((bfd *, asymbol *));
-static boolean nlm_alpha_write_external
-  PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
-
-/* Alpha NLM's have a prefix header before the standard NLM.  This
-   function reads it in, verifies the version, and seeks the bfd to
-   the location before the regular NLM header.  */
-
-static boolean
-nlm_alpha_backend_object_p (abfd)
-     bfd *abfd;
-{
-  struct nlm32_alpha_external_prefix_header s;
-  bfd_size_type size;
-
-  if (bfd_read ((PTR) &s, sizeof s, 1, abfd) != sizeof s)
-    return false;
-
-  if (bfd_h_get_32 (abfd, s.magic) != NLM32_ALPHA_MAGIC)
-    return false;
-
-  /* FIXME: Should we check the format number?  */
-
-  /* Skip to the end of the header.  */
-  size = bfd_h_get_32 (abfd, s.size);
-  if (bfd_seek (abfd, size, SEEK_SET) != 0)
-    return false;
-
-  return true;
-}
-
-/* Write out the prefix.  */
-
-static boolean
-nlm_alpha_write_prefix (abfd)
-     bfd *abfd;
-{
-  struct nlm32_alpha_external_prefix_header s;
-
-  memset (&s, 0, sizeof s);
-  bfd_h_put_32 (abfd, (bfd_vma) NLM32_ALPHA_MAGIC, s.magic);
-  bfd_h_put_32 (abfd, (bfd_vma) 2, s.format);
-  bfd_h_put_32 (abfd, (bfd_vma) sizeof s, s.size);
-  if (bfd_write ((PTR) &s, sizeof s, 1, abfd) != sizeof s)
-    return false;
-  return true;
-}
-
-/* How to process the various reloc types.  */
-
-static reloc_howto_type nlm32_alpha_howto_table[] =
-{
-  /* Reloc type 0 is ignored by itself.  However, it appears after a
-     GPDISP reloc to identify the location where the low order 16 bits
-     of the gp register are loaded.  */
-  HOWTO (ALPHA_R_IGNORE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "IGNORE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit reference to a symbol.  */
-  HOWTO (ALPHA_R_REFLONG,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "REFLONG",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit reference to a symbol.  */
-  HOWTO (ALPHA_R_REFQUAD,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "REFQUAD",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffffffffffff,	/* src_mask */
-	 0xffffffffffffffff,	/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit GP relative offset.  This is just like REFLONG except
-     that when the value is used the value of the gp register will be
-     added in.  */
-  HOWTO (ALPHA_R_GPREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "GPREL32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Used for an instruction that refers to memory off the GP
-     register.  The offset is 16 bits of the 32 bit instruction.  This
-     reloc always seems to be against the .lita section.  */
-  HOWTO (ALPHA_R_LITERAL,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "LITERAL",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* This reloc only appears immediately following a LITERAL reloc.
-     It identifies a use of the literal.  It seems that the linker can
-     use this to eliminate a portion of the .lita section.  The symbol
-     index is special: 1 means the literal address is in the base
-     register of a memory format instruction; 2 means the literal
-     address is in the byte offset register of a byte-manipulation
-     instruction; 3 means the literal address is in the target
-     register of a jsr instruction.  This does not actually do any
-     relocation.  */
-  HOWTO (ALPHA_R_LITUSE,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "LITUSE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Load the gp register.  This is always used for a ldah instruction
-     which loads the upper 16 bits of the gp register.  The next reloc
-     will be an IGNORE reloc which identifies the location of the lda
-     instruction which loads the lower 16 bits.  The symbol index of
-     the GPDISP instruction appears to actually be the number of bytes
-     between the ldah and lda instructions.  This gives two different
-     ways to determine where the lda instruction is; I don't know why
-     both are used.  The value to use for the relocation is the
-     difference between the GP value and the current location; the
-     load will always be done against a register holding the current
-     address.  */
-  HOWTO (ALPHA_R_GPDISP,	/* type */
-	 16,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "GPDISP",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 21 bit branch.  The native assembler generates these for
-     branches within the text segment, and also fills in the PC
-     relative offset in the instruction.  It seems to me that this
-     reloc, unlike the others, is not partial_inplace.  */
-  HOWTO (ALPHA_R_BRADDR,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 21,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "BRADDR",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0x1fffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A hint for a jump to a register.  */
-  HOWTO (ALPHA_R_HINT,		/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 14,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "HINT",		/* name */
-	 true,			/* partial_inplace */
-	 0x3fff,		/* src_mask */
-	 0x3fff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL64,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "SREL64",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffffffffffff,	/* src_mask */
-	 0xffffffffffffffff,	/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Push a value on the reloc evaluation stack.  */
-  HOWTO (ALPHA_R_OP_PUSH,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "OP_PUSH",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Store the value from the stack at the given address.  Store it in
-     a bitfield of size r_size starting at bit position r_offset.  */
-  HOWTO (ALPHA_R_OP_STORE,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "OP_STORE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0xffffffffffffffff,	/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Subtract the reloc address from the value on the top of the
-     relocation stack.  */
-  HOWTO (ALPHA_R_OP_PSUB,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "OP_PSUB",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Shift the value on the top of the relocation stack right by the
-     given value.  */
-  HOWTO (ALPHA_R_OP_PRSHIFT,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			 /* special_function */
-	 "OP_PRSHIFT",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Adjust the GP value for a new range in the object file.  */
-  HOWTO (ALPHA_R_GPVALUE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "GPVALUE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false)			/* pcrel_offset */
-};
-
-static reloc_howto_type nlm32_alpha_nw_howto =
-  HOWTO (ALPHA_R_NW_RELOC,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "NW_RELOC",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false);		/* pcrel_offset */
-
-/* Read an Alpha NLM reloc.  This routine keeps some static data which
-   it uses when handling local relocs.  This only works correctly
-   because all the local relocs are read at once.  */
-
-static boolean
-nlm_alpha_read_reloc (abfd, sym, secp, rel)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-     asection **secp;
-     arelent *rel;
-{
-  static bfd_vma gp_value;
-  static bfd_vma lita_address;
-  struct nlm32_alpha_external_reloc ext;
-  bfd_vma r_vaddr;
-  long r_symndx;
-  int r_type, r_extern, r_offset, r_size;
-  asection *code_sec, *data_sec;
-
-  /* Read the reloc from the file.  */
-  if (bfd_read (&ext, sizeof ext, 1, abfd) != sizeof ext)
-    return false;
-
-  /* Swap in the reloc information.  */
-  r_vaddr = bfd_h_get_64 (abfd, (bfd_byte *) ext.r_vaddr);
-  r_symndx = bfd_h_get_32 (abfd, (bfd_byte *) ext.r_symndx);
-
-  BFD_ASSERT (bfd_little_endian (abfd));
-
-  r_type = ((ext.r_bits[0] & RELOC_BITS0_TYPE_LITTLE)
-	    >> RELOC_BITS0_TYPE_SH_LITTLE);
-  r_extern = (ext.r_bits[1] & RELOC_BITS1_EXTERN_LITTLE) != 0;
-  r_offset = ((ext.r_bits[1] & RELOC_BITS1_OFFSET_LITTLE)
-	      >> RELOC_BITS1_OFFSET_SH_LITTLE);
-  /* Ignore the reserved bits.  */
-  r_size = ((ext.r_bits[3] & RELOC_BITS3_SIZE_LITTLE)
-	    >> RELOC_BITS3_SIZE_SH_LITTLE);
-
-  /* Fill in the BFD arelent structure.  */
-  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-  if (r_extern)
-    {
-      /* External relocations are only used for imports.  */
-      BFD_ASSERT (sym != NULL);
-      /* We don't need to set sym_ptr_ptr for this case.  It is set in
-	 nlm_canonicalize_reloc.  */
-      rel->sym_ptr_ptr = NULL;
-      rel->addend = 0;
-    }
-  else
-    {
-      /* Internal relocations are only used for local relocation
-	 fixups.  If they are not NW_RELOC or GPDISP or IGNORE, they
-	 must be against .text or .data.  */
-      BFD_ASSERT (r_type == ALPHA_R_NW_RELOC || sym == NULL);
-      if (r_type == ALPHA_R_NW_RELOC
-	  || r_type == ALPHA_R_GPDISP
-	  || r_type == ALPHA_R_IGNORE)
-	{
-	  rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	  rel->addend = 0;
-	}
-      else if (r_symndx == ALPHA_RELOC_SECTION_TEXT)
-	{
-	  rel->sym_ptr_ptr = code_sec->symbol_ptr_ptr;
-	  BFD_ASSERT (bfd_get_section_vma (abfd, code_sec) == 0);
-	  rel->addend = 0;
-	}
-      else if (r_symndx == ALPHA_RELOC_SECTION_DATA)
-	{
-	  rel->sym_ptr_ptr = data_sec->symbol_ptr_ptr;
-	  rel->addend = - bfd_get_section_vma (abfd, data_sec);
-	}
-      else
-	{
-	  BFD_ASSERT (0);
-	  rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	  rel->addend = 0;
-	}
-    }
-
-  /* We use the address to determine whether the reloc is in the .text
-     or .data section.  R_NW_RELOC relocs don't really have a section,
-     so we put them in .text.  */
-  if (r_type == ALPHA_R_NW_RELOC
-      || r_vaddr < bfd_section_size (abfd, code_sec))
-    {
-      *secp = code_sec;
-      rel->address = r_vaddr;
-    }
-  else
-    {
-      *secp = data_sec;
-      rel->address = r_vaddr - bfd_section_size (abfd, code_sec);
-    }
-
-  /* We must adjust the addend based on the type.  */
-  BFD_ASSERT ((r_type >= 0 && r_type <= ALPHA_R_GPVALUE)
-	      || r_type == ALPHA_R_NW_RELOC);
-
-  switch (r_type)
-    {
-    case ALPHA_R_BRADDR:
-    case ALPHA_R_SREL16:
-    case ALPHA_R_SREL32:
-    case ALPHA_R_SREL64:
-      /* The PC relative relocs do not seem to use the section VMA as
-	 a negative addend.  */
-      rel->addend = 0;
-      break;
-
-    case ALPHA_R_GPREL32:
-      /* Copy the gp value for this object file into the addend, to
-	 ensure that we are not confused by the linker.  */
-      if (! r_extern)
-	rel->addend += gp_value;
-      break;
-
-    case ALPHA_R_LITERAL:
-      BFD_ASSERT (! r_extern);
-      rel->addend += lita_address;
-      break;
-
-    case ALPHA_R_LITUSE:
-    case ALPHA_R_GPDISP:
-      /* The LITUSE and GPDISP relocs do not use a symbol, or an
-	 addend, but they do use a special code.  Put this code in the
-	 addend field.  */
-      rel->addend = r_symndx;
-      rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-      break;
-
-    case ALPHA_R_OP_STORE:
-      /* The STORE reloc needs the size and offset fields.  We store
-	 them in the addend.  */
-      BFD_ASSERT (r_offset < 256 && r_size < 256);
-      rel->addend = (r_offset << 8) + r_size;
-      break;
-
-    case ALPHA_R_OP_PUSH:
-    case ALPHA_R_OP_PSUB:
-    case ALPHA_R_OP_PRSHIFT:
-      /* The PUSH, PSUB and PRSHIFT relocs do not actually use an
-	 address.  I believe that the address supplied is really an
-	 addend.  */
-      rel->addend = r_vaddr;
-      break;
-
-    case ALPHA_R_GPVALUE:
-      /* Record the new gp value.  */
-      gp_value += r_symndx;
-      rel->addend = gp_value;
-      break;
-
-    case ALPHA_R_IGNORE:
-      /* If the type is ALPHA_R_IGNORE, make sure this is a reference
-	 to the absolute section so that the reloc is ignored.  For
-	 some reason the address of this reloc type is not adjusted by
-	 the section vma.  We record the gp value for this object file
-	 here, for convenience when doing the GPDISP relocation.  */
-      rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-      rel->address = r_vaddr;
-      rel->addend = gp_value;
-      break;
-
-    case ALPHA_R_NW_RELOC:
-      /* If this is SETGP, we set the addend to 0.  Otherwise we set
-	 the addend to the size of the .lita section (this is
-	 r_symndx) plus 1.  We have already set the address of the
-	 reloc to r_vaddr.  */
-      if (r_size == ALPHA_R_NW_RELOC_SETGP)
-	{
-	  gp_value = r_vaddr;
-	  rel->addend = 0;
-	}
-      else if (r_size == ALPHA_R_NW_RELOC_LITA)
-	{
-	  lita_address = r_vaddr;
-	  rel->addend = r_symndx + 1;
-	}
-      else
-	BFD_ASSERT (0);
-      rel->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-      break;
-
-    default:
-      break;
-    }
-
-  if (r_type == ALPHA_R_NW_RELOC)
-    rel->howto = &nlm32_alpha_nw_howto;
-  else
-    rel->howto = &nlm32_alpha_howto_table[r_type];
-
-  return true;
-}
-
-/* Mangle Alpha NLM relocs for output.  */
-
-static boolean
-nlm_alpha_mangle_relocs (abfd, sec, data, offset, count)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-     bfd_vma offset;
-     bfd_size_type count;
-{
-  return true;
-}
-
-/* Read an ALPHA NLM import record */
-
-static boolean
-nlm_alpha_read_import (abfd, sym)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-{
-  struct nlm_relent *nlm_relocs;	/* relocation records for symbol */
-  bfd_size_type rcount;			/* number of relocs */
-  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* temporary 32-bit value */
-  unsigned char symlength;		/* length of symbol name */
-  char *name;
-
-  if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
-      != sizeof (symlength))
-    return false;
-  sym -> symbol.the_bfd = abfd;
-  name = bfd_alloc (abfd, symlength + 1);
-  if (name == NULL)
-    return false;
-  if (bfd_read (name, symlength, 1, abfd) != symlength)
-    return false;
-  name[symlength] = '\0';
-  sym -> symbol.name = name;
-  sym -> symbol.flags = 0;
-  sym -> symbol.value = 0;
-  sym -> symbol.section = bfd_und_section_ptr;
-  if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-  rcount = bfd_h_get_32 (abfd, temp);
-  nlm_relocs = ((struct nlm_relent *)
-		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
-  if (!nlm_relocs)
-    return false;
-  sym -> relocs = nlm_relocs;
-  sym -> rcnt = 0;
-  while (sym -> rcnt < rcount)
-    {
-      asection *section;
-      
-      if (nlm_alpha_read_reloc (abfd, sym, &section,
-				&nlm_relocs -> reloc)
-	  == false)
-	return false;
-      nlm_relocs -> section = section;
-      nlm_relocs++;
-      sym -> rcnt++;
-    }
-
-  return true;
-}
-
-/* Write an Alpha NLM reloc.  */
-
-static boolean
-nlm_alpha_write_import (abfd, sec, rel)
-     bfd *abfd;
-     asection *sec;
-     arelent *rel;
-{
-  asymbol *sym;
-  bfd_vma r_vaddr;
-  long r_symndx;
-  int r_type, r_extern, r_offset, r_size;
-  struct nlm32_alpha_external_reloc ext;
-
-  sym = *rel->sym_ptr_ptr;
-
-  /* Get values for the relocation fields.  */
-  r_type = rel->howto->type;
-  if (r_type != ALPHA_R_NW_RELOC)
-    {
-      r_vaddr = bfd_get_section_vma (abfd, sec) + rel->address;
-      if ((sec->flags & SEC_CODE) == 0)
-	r_vaddr += bfd_section_size (abfd,
-				     bfd_get_section_by_name (abfd,
-							      NLM_CODE_NAME));
-      if (bfd_is_und_section (bfd_get_section (sym)))
-	{
-	  r_extern = 1;
-	  r_symndx = 0;
-	}
-      else
-	{
-	  r_extern = 0;
-	  if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
-	    r_symndx = ALPHA_RELOC_SECTION_TEXT;
-	  else
-	    r_symndx = ALPHA_RELOC_SECTION_DATA;
-	}
-      r_offset = 0;
-      r_size = 0;
-
-      switch (r_type)
-	{
-	case ALPHA_R_LITUSE:
-	case ALPHA_R_GPDISP:
-	  r_symndx = rel->addend;
-	  break;
-
-	case ALPHA_R_OP_STORE:
-	  r_size = rel->addend & 0xff;
-	  r_offset = (rel->addend >> 8) & 0xff;
-	  break;
-
-	case ALPHA_R_OP_PUSH:
-	case ALPHA_R_OP_PSUB:
-	case ALPHA_R_OP_PRSHIFT:
-	  r_vaddr = rel->addend;
-	  break;
-
-	case ALPHA_R_IGNORE:
-	  r_vaddr = rel->address;
-	  break;
-
-	default:
-	  break;
-	}
-    }
-  else
-    {
-      /* r_type == ALPHA_R_NW_RELOC */
-      r_vaddr = rel->address;
-      if (rel->addend == 0)
-	{
-	  r_symndx = 0;
-	  r_size = ALPHA_R_NW_RELOC_SETGP;
-	}
-      else
-	{
-	  r_symndx = rel->addend - 1;
-	  r_size = ALPHA_R_NW_RELOC_LITA;
-	}
-      r_extern = 0;
-      r_offset = 0;
-    }
-
-  /* Swap out the relocation fields.  */
-  bfd_h_put_64 (abfd, r_vaddr, (bfd_byte *) ext.r_vaddr);
-  bfd_h_put_32 (abfd, r_symndx, (bfd_byte *) ext.r_symndx);
-
-  BFD_ASSERT (bfd_little_endian (abfd));
-
-  ext.r_bits[0] = ((r_type << RELOC_BITS0_TYPE_SH_LITTLE)
-		   & RELOC_BITS0_TYPE_LITTLE);
-  ext.r_bits[1] = ((r_extern ? RELOC_BITS1_EXTERN_LITTLE : 0)
-		   | ((r_offset << RELOC_BITS1_OFFSET_SH_LITTLE)
-		      & RELOC_BITS1_OFFSET_LITTLE));
-  ext.r_bits[2] = 0;
-  ext.r_bits[3] = ((r_size << RELOC_BITS3_SIZE_SH_LITTLE)
-		   & RELOC_BITS3_SIZE_LITTLE);
-
-  /* Write out the relocation.  */
-  if (bfd_write (&ext, sizeof ext, 1, abfd) != sizeof ext)
-    return false;
-
-  return true;
-}
-
-/* Alpha NetWare does not use the high bit to determine whether a
-   public symbol is in the code segment or the data segment.  Instead,
-   it just uses the address.  The set_public_section and
-   get_public_offset routines override the default code which uses the
-   high bit.  */
-
-/* Set the section for a public symbol.  */
-
-static boolean
-nlm_alpha_set_public_section (abfd, sym)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-{
-  asection *code_sec, *data_sec;
-
-  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-  if (sym->symbol.value < bfd_section_size (abfd, code_sec))
-    {
-      sym->symbol.section = code_sec;
-      sym->symbol.flags |= BSF_FUNCTION;
-    }
-  else
-    {
-      sym->symbol.section = data_sec;
-      sym->symbol.value -= bfd_section_size (abfd, code_sec);
-      /* The data segment had better be aligned.  */
-      BFD_ASSERT ((bfd_section_size (abfd, code_sec) & 0xf) == 0);
-    }
-  return true;
-}
-
-/* Get the offset to write out for a public symbol.  */
-
-static bfd_vma
-nlm_alpha_get_public_offset (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
-{
-  return bfd_asymbol_value (sym);
-}
-
-/* Write an Alpha NLM external symbol.  */
-
-static boolean
-nlm_alpha_write_external (abfd, count, sym, relocs)
-     bfd *abfd;
-     bfd_size_type count;
-     asymbol *sym;
-     struct reloc_and_sec *relocs;
-{
-  int i;
-  bfd_byte len;
-  unsigned char temp[NLM_TARGET_LONG_SIZE];
-  arelent r;
-
-  len = strlen (sym->name);
-  if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte))
-      || bfd_write (sym->name, len, 1, abfd) != len)
-    return false;
-
-  bfd_put_32 (abfd, count + 2, temp);
-  if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  /* The first two relocs for each external symbol are the .lita
-     address and the GP value.  */
-  r.sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-  r.howto = &nlm32_alpha_nw_howto;
-
-  r.address = nlm_alpha_backend_data (abfd)->lita_address;
-  r.addend = nlm_alpha_backend_data (abfd)->lita_size + 1;
-  if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false)
-    return false;
-
-  r.address = nlm_alpha_backend_data (abfd)->gp;
-  r.addend = 0;
-  if (nlm_alpha_write_import (abfd, (asection *) NULL, &r) == false)
-    return false;
-
-  for (i = 0; i < count; i++)
-    {
-      if (nlm_alpha_write_import (abfd, relocs[i].sec,
-				  relocs[i].rel) == false)
-	return false;
-    }
-
-  return true;
-}
-
-#include "nlmswap.h"
-
-static const struct nlm_backend_data nlm32_alpha_backend =
-{
-  "NetWare Alpha Module   \032",
-  sizeof (Nlm32_alpha_External_Fixed_Header),
-  sizeof (struct nlm32_alpha_external_prefix_header),
-  bfd_arch_alpha,
-  0,
-  true, /* no uninitialized data permitted by Alpha NetWare.  */
-  nlm_alpha_backend_object_p,
-  nlm_alpha_write_prefix,
-  nlm_alpha_read_reloc,
-  nlm_alpha_mangle_relocs,
-  nlm_alpha_read_import,
-  nlm_alpha_write_import,
-  nlm_alpha_set_public_section,
-  nlm_alpha_get_public_offset,
-  nlm_swap_fixed_header_in,
-  nlm_swap_fixed_header_out,
-  nlm_alpha_write_external,
-  0,	/* write_export */
-};
-
-#define TARGET_LITTLE_NAME		"nlm32-alpha"
-#define TARGET_LITTLE_SYM		nlmNAME(alpha_vec)
-#define TARGET_BACKEND_DATA		&nlm32_alpha_backend
-
-#include "nlm-target.h"
diff --git a/bfd/nlm32-i386.c b/bfd/nlm32-i386.c
deleted file mode 100644
index f16c74d985e..00000000000
--- a/bfd/nlm32-i386.c
+++ /dev/null
@@ -1,451 +0,0 @@
-/* Support for 32-bit i386 NLM (NetWare Loadable Module)
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define ARCH_SIZE 32
-
-#include "nlm/i386-ext.h"
-#define Nlm_External_Fixed_Header	Nlm32_i386_External_Fixed_Header
-
-#include "libnlm.h"
-
-static boolean nlm_i386_read_reloc
-  PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_i386_write_import
-  PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_i386_mangle_relocs
-  PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_i386_read_import
-  PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static boolean nlm_i386_write_external
-  PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
-
-/* Adjust the reloc location by an absolute value.  */
-
-static reloc_howto_type nlm_i386_abs_howto =
-  HOWTO (0,			/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "32",			/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
-
-/* Adjust the reloc location by a PC relative displacement.  */
-
-static reloc_howto_type nlm_i386_pcrel_howto =
-  HOWTO (1,			/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "DISP32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 true);			/* pcrel_offset */
-
-/* Read a NetWare i386 reloc.  */
-
-static boolean
-nlm_i386_read_reloc (abfd, sym, secp, rel)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-     asection **secp;
-     arelent *rel;
-{
-  bfd_byte temp[4];
-  bfd_vma val;
-  const char *name;
-
-  if (bfd_read (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  val = bfd_get_32 (abfd, temp);
-
-  /* The value is an offset into either the code or data segment.
-     This is the location which needs to be adjusted.
-
-     If this is a relocation fixup rather than an imported symbol (the
-     sym argument is NULL) then the high bit is 0 if the location
-     needs to be adjusted by the address of the data segment, or 1 if
-     the location needs to be adjusted by the address of the code
-     segment.  If this is an imported symbol, then the high bit is 0
-     if the location is 0 if the location should be adjusted by the
-     offset to the symbol, or 1 if the location should adjusted by the
-     absolute value of the symbol.
-
-     The second most significant bit is 0 if the value is an offset
-     into the data segment, or 1 if the value is an offset into the
-     code segment.
-
-     All this translates fairly easily into a BFD reloc.  */
-
-  if (sym == NULL)
-    {
-      if ((val & NLM_HIBIT) == 0)
-	name = NLM_INITIALIZED_DATA_NAME;
-      else
-	{
-	  name = NLM_CODE_NAME;
-	  val &=~ NLM_HIBIT;
-	}
-      rel->sym_ptr_ptr = bfd_get_section_by_name (abfd, name)->symbol_ptr_ptr;
-      rel->howto = &nlm_i386_abs_howto;
-    }
-  else
-    {
-      /* In this case we do not need to set the sym_ptr_ptr field.  */
-      rel->sym_ptr_ptr = NULL;
-      if ((val & NLM_HIBIT) == 0)
-	rel->howto = &nlm_i386_pcrel_howto;
-      else
-	{
-	  rel->howto = &nlm_i386_abs_howto;
-	  val &=~ NLM_HIBIT;
-	}
-    }
-
-  if ((val & (NLM_HIBIT >> 1)) == 0)
-    *secp = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-  else
-    {
-      *secp = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-      val &=~ (NLM_HIBIT >> 1);
-    }
-
-  rel->address = val;
-  rel->addend = 0;
-
-  return true;
-}
-
-/* Write a NetWare i386 reloc.  */
-
-static boolean
-nlm_i386_write_import (abfd, sec, rel)
-     bfd *abfd;
-     asection *sec;
-     arelent *rel;
-{
-  asymbol *sym;
-  bfd_vma val;
-  bfd_byte temp[4];
-
-  /* NetWare only supports two kinds of relocs.  We should check
-     special_function here, as well, but at the moment coff-i386
-     relocs uses a special_function which does not affect what we do
-     here.  */
-  if (rel->addend != 0
-      || rel->howto == NULL
-      || rel->howto->rightshift != 0
-      || rel->howto->size != 2
-      || rel->howto->bitsize != 32
-      || rel->howto->bitpos != 0
-      || rel->howto->src_mask != 0xffffffff
-      || rel->howto->dst_mask != 0xffffffff)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  sym = *rel->sym_ptr_ptr;
-
-  /* The value we write out is the offset into the appropriate
-     segment.  This offset is the section vma, adjusted by the vma of
-     the lowest section in that segment, plus the address of the
-     relocation.  */
-  val = bfd_get_section_vma (abfd, sec) + rel->address;
-
-  /* The second most significant bit is 0 if the value is an offset
-     into the data segment, or 1 if the value is an offset into the
-     code segment.  */
-  if (bfd_get_section_flags (abfd, sec) & SEC_CODE)
-    {
-      val -= nlm_get_text_low (abfd);
-      val |= NLM_HIBIT >> 1;
-    }
-  else
-    val -= nlm_get_data_low (abfd);
-
-  if (! bfd_is_und_section (bfd_get_section (sym)))
-    {
-      /* NetWare only supports absolute internal relocs.  */
-      if (rel->howto->pc_relative)
-	{
-	  bfd_set_error (bfd_error_invalid_operation);
-	  return false;
-	}
-
-      /* The high bit is 1 if the reloc is against the code section, 0
-	 if against the data section.  */
-      if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
-	val |= NLM_HIBIT;
-    }
-  else
-    {
-      /* The high bit is 1 if this is an absolute reloc, 0 if it is PC
-	 relative.  */
-      if (! rel->howto->pc_relative)
-	val |= NLM_HIBIT;
-      else
-	{
-	  /* PC relative relocs on NetWare must be pcrel_offset.  */
-	  if (! rel->howto->pcrel_offset)
-	    {
-	      bfd_set_error (bfd_error_invalid_operation);
-	      return false;
-	    }
-	}
-    }
-  
-  bfd_put_32 (abfd, val, temp);
-  if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  return true;
-}
-
-/* I want to be able to use objcopy to turn a i386 a.out or COFF file
-   into a NetWare i386 module.  That means that the relocs from the
-   source file have to be mapped into relocs that apply to the target
-   file.  This function is called by nlm_set_section_contents to give
-   it a chance to rework the relocs.
-
-   This is actually a fairly general concept.  However, this is not a
-   general implementation.  */
-
-static boolean
-nlm_i386_mangle_relocs (abfd, sec, data, offset, count)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-     bfd_vma offset;
-     bfd_size_type count;
-{
-  arelent **rel_ptr_ptr, **rel_end;
-
-  rel_ptr_ptr = sec->orelocation;
-  rel_end = rel_ptr_ptr + sec->reloc_count;
-  for (; rel_ptr_ptr < rel_end; rel_ptr_ptr++)
-    {
-      arelent *rel;
-      asymbol *sym;
-      bfd_vma addend;
-
-      rel = *rel_ptr_ptr;
-      sym = *rel->sym_ptr_ptr;
-
-      /* Note that no serious harm will ensue if we fail to change a
-	 reloc.  We will wind up failing in nlm_i386_write_import.  */
-
-      /* Make sure this reloc is within the data we have.  We only 4
-	 byte relocs here, so we insist on having 4 bytes.  */
-      if (rel->address < offset
-	  || rel->address + 4 > offset + count)
-	continue;
-
-      /* NetWare doesn't support reloc addends, so we get rid of them
-	 here by simply adding them into the object data.  We handle
-	 the symbol value, if any, the same way.  */
-      addend = rel->addend + sym->value;
-
-      /* The value of a symbol is the offset into the section.  If the
-	 symbol is in the .bss segment, we need to include the size of
-	 the data segment in the offset as well.  Fortunately, we know
-	 that at this point the size of the data section is in the NLM
-	 header.  */
-      if (((bfd_get_section_flags (abfd, bfd_get_section (sym))
-	    & SEC_LOAD) == 0)
-	  && ((bfd_get_section_flags (abfd, bfd_get_section (sym))
-	       & SEC_ALLOC) != 0))
-	addend += nlm_fixed_header (abfd)->dataImageSize;
-
-      if (addend != 0
-	  && rel->howto != NULL
-	  && rel->howto->rightshift == 0
-	  && rel->howto->size == 2
-	  && rel->howto->bitsize == 32
-	  && rel->howto->bitpos == 0
-	  && rel->howto->src_mask == 0xffffffff
-	  && rel->howto->dst_mask == 0xffffffff)
-	{
-	  bfd_vma val;
-
-	  val = bfd_get_32 (abfd, (bfd_byte *) data + rel->address - offset);
-	  val += addend;
-	  bfd_put_32 (abfd, val, (bfd_byte *) data + rel->address - offset);
-	  rel->addend = 0;
-	}
-
-      /* NetWare uses a reloc with pcrel_offset set.  We adjust
-	 pc_relative relocs accordingly.  We are going to change the
-	 howto field, so we can only do this if the current one is
-	 compatible.  We should check special_function here, but at
-	 the moment coff-i386 uses a special_function which does not
-	 affect what we are doing here.  */
-      if (rel->howto != NULL
-	  && rel->howto->pc_relative
-	  && ! rel->howto->pcrel_offset
-	  && rel->howto->rightshift == 0
-	  && rel->howto->size == 2
-	  && rel->howto->bitsize == 32
-	  && rel->howto->bitpos == 0
-	  && rel->howto->src_mask == 0xffffffff
-	  && rel->howto->dst_mask == 0xffffffff)
-	{
-	  bfd_vma val;
-
-	  /* When pcrel_offset is not set, it means that the negative
-	     of the address of the memory location is stored in the
-	     memory location.  We must add it back in.  */
-	  val = bfd_get_32 (abfd, (bfd_byte *) data + rel->address - offset);
-	  val += rel->address;
-	  bfd_put_32 (abfd, val, (bfd_byte *) data + rel->address - offset);
-
-	  rel->howto = &nlm_i386_pcrel_howto;
-	}
-    }
-
-  return true;
-}
-
-/* Read a NetWare i386 import record */
-static boolean
-nlm_i386_read_import (abfd, sym)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-{
-  struct nlm_relent *nlm_relocs;	/* relocation records for symbol */
-  bfd_size_type rcount;			/* number of relocs */
-  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* temporary 32-bit value */
-  unsigned char symlength;		/* length of symbol name */
-  char *name;
-
-  if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
-      != sizeof (symlength))
-    return false;
-  sym -> symbol.the_bfd = abfd;
-  name = bfd_alloc (abfd, symlength + 1);
-  if (name == NULL)
-    return false;
-  if (bfd_read (name, symlength, 1, abfd) != symlength)
-    return false;
-  name[symlength] = '\0';
-  sym -> symbol.name = name;
-  sym -> symbol.flags = 0;
-  sym -> symbol.value = 0;
-  sym -> symbol.section = bfd_und_section_ptr;
-  if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-  rcount = bfd_h_get_32 (abfd, temp);
-  nlm_relocs = ((struct nlm_relent *)
-		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
-  if (!nlm_relocs)
-    return false;
-  sym -> relocs = nlm_relocs;
-  sym -> rcnt = 0;
-  while (sym -> rcnt < rcount)
-    {
-      asection *section;
-      
-      if (nlm_i386_read_reloc (abfd, sym, &section,
-			       &nlm_relocs -> reloc)
-	  == false)
-	return false;
-      nlm_relocs -> section = section;
-      nlm_relocs++;
-      sym -> rcnt++;
-    }
-  return true;
-}
-
-/* Write out an external reference.  */
-
-static boolean
-nlm_i386_write_external (abfd, count, sym, relocs)
-     bfd *abfd;
-     bfd_size_type count;
-     asymbol *sym;
-     struct reloc_and_sec *relocs;
-{
-  unsigned int i;
-  bfd_byte len;
-  unsigned char temp[NLM_TARGET_LONG_SIZE];
-
-  len = strlen (sym->name);
-  if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte))
-      || bfd_write (sym->name, len, 1, abfd) != len)
-    return false;
-
-  bfd_put_32 (abfd, count, temp);
-  if (bfd_write (temp, sizeof(temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  for (i = 0; i < count; i++)
-    {
-      if (nlm_i386_write_import (abfd, relocs[i].sec,
-				 relocs[i].rel) == false)
-	return false;
-    }
-
-  return true;
-}
-
-#include "nlmswap.h"
-
-static const struct nlm_backend_data nlm32_i386_backend =
-{
-  "NetWare Loadable Module\032",
-  sizeof (Nlm32_i386_External_Fixed_Header),
-  0,	/* optional_prefix_size */
-  bfd_arch_i386,
-  0,
-  false,
-  0,	/* backend_object_p */
-  0,	/* write_prefix_func */
-  nlm_i386_read_reloc,
-  nlm_i386_mangle_relocs,
-  nlm_i386_read_import,
-  nlm_i386_write_import,
-  0,	/* set_public_section */
-  0,	/* get_public_offset */
-  nlm_swap_fixed_header_in,
-  nlm_swap_fixed_header_out,
-  nlm_i386_write_external,
-  0,	/* write_export */
-};
-
-#define TARGET_LITTLE_NAME		"nlm32-i386"
-#define TARGET_LITTLE_SYM		nlmNAME(i386_vec)
-#define TARGET_BACKEND_DATA		&nlm32_i386_backend
-
-#include "nlm-target.h"
diff --git a/bfd/nlm32-ppc.c b/bfd/nlm32-ppc.c
deleted file mode 100644
index ecf2de8f10b..00000000000
--- a/bfd/nlm32-ppc.c
+++ /dev/null
@@ -1,1045 +0,0 @@
-/* Support for 32-bit PowerPC NLM (NetWare Loadable Module)
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/* The format of a PowerPC NLM changed.  Define OLDFORMAT to get the
-   old format.  */
-
-#define ARCH_SIZE 32
-
-#include "nlm/ppc-ext.h"
-#define Nlm_External_Fixed_Header	Nlm32_powerpc_External_Fixed_Header
-
-#include "libnlm.h"
-
-#ifdef OLDFORMAT
-static boolean nlm_powerpc_backend_object_p
-  PARAMS ((bfd *));
-static boolean nlm_powerpc_write_prefix
-  PARAMS ((bfd *));
-#endif
-
-static boolean nlm_powerpc_read_reloc
-  PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_powerpc_mangle_relocs
-  PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_powerpc_read_import
-  PARAMS ((bfd *, nlmNAME(symbol_type) *));
-
-#ifdef OLDFORMAT
-static boolean nlm_powerpc_write_reloc
-  PARAMS ((bfd *, asection *, arelent *, int));
-#endif
-
-static boolean nlm_powerpc_write_import
-  PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_powerpc_write_external
-  PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
-
-#ifndef OLDFORMAT
-static boolean nlm_powerpc_set_public_section
-  PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static bfd_vma nlm_powerpc_get_public_offset
-  PARAMS ((bfd *, asymbol *));
-#endif
-
-#ifdef OLDFORMAT
-
-/* The prefix header is only used in the old format.  */
-
-/* PowerPC NLM's have a prefix header before the standard NLM.  This
-   function reads it in, verifies the version, and seeks the bfd to
-   the location before the regular NLM header.  */
-
-static boolean
-nlm_powerpc_backend_object_p (abfd)
-     bfd *abfd;
-{
-  struct nlm32_powerpc_external_prefix_header s;
-
-  if (bfd_read ((PTR) &s, sizeof s, 1, abfd) != sizeof s)
-    return false;
-
-  if (memcmp (s.signature, NLM32_POWERPC_SIGNATURE, sizeof s.signature) != 0
-      || bfd_h_get_32 (abfd, s.headerVersion) != NLM32_POWERPC_HEADER_VERSION)
-    return false;
-
-  return true;
-}
-
-/* Write out the prefix.  */
-
-static boolean
-nlm_powerpc_write_prefix (abfd)
-     bfd *abfd;
-{
-  struct nlm32_powerpc_external_prefix_header s;
-
-  memset (&s, 0, sizeof s);
-  memcpy (s.signature, NLM32_POWERPC_SIGNATURE, sizeof s.signature);
-  bfd_h_put_32 (abfd, (bfd_vma) NLM32_POWERPC_HEADER_VERSION, s.headerVersion);
-  bfd_h_put_32 (abfd, (bfd_vma) 0, s.origins);
-
-  /* FIXME: What should we do about the date?  */
-
-  if (bfd_write ((PTR) &s, sizeof s, 1, abfd) != sizeof s)
-    return false;
-
-  return true;
-}
-
-#endif /* OLDFORMAT */
-
-#ifndef OLDFORMAT
-
-/* There is only one type of reloc in a PowerPC NLM.  */
-
-static reloc_howto_type nlm_powerpc_howto =
-  HOWTO (0,			/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,			/* special_function */
-	 "32",			/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false);		/* pcrel_offset */
-
-/* Read a PowerPC NLM reloc.  */
-
-static boolean
-nlm_powerpc_read_reloc (abfd, sym, secp, rel)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-     asection **secp;
-     arelent *rel;
-{
-  bfd_byte temp[4];
-  bfd_vma val;
-  const char *name;
-
-  if (bfd_read (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  val = bfd_get_32 (abfd, temp);
-
-  /* The value is a word offset into either the code or data segment.
-     This is the location which needs to be adjusted.
-
-     The high bit is 0 if the value is an offset into the data
-     segment, or 1 if the value is an offset into the text segment.
-
-     If this is a relocation fixup rather than an imported symbol (the
-     sym argument is NULL), then the second most significant bit is 0
-     if the address of the data segment should be added to the
-     location addressed by the value, or 1 if the address of the text
-     segment should be added.
-
-     If this is an imported symbol, the second most significant bit is
-     not used and must be 0.  */
-
-  if ((val & NLM_HIBIT) == 0)
-    name = NLM_INITIALIZED_DATA_NAME;
-  else
-    {
-      name = NLM_CODE_NAME;
-      val &=~ NLM_HIBIT;
-    }
-  *secp = bfd_get_section_by_name (abfd, name);
-
-  if (sym == NULL)
-    {
-      if ((val & (NLM_HIBIT >> 1)) == 0)
-	name = NLM_INITIALIZED_DATA_NAME;
-      else
-	{
-	  name = NLM_CODE_NAME;
-	  val &=~ (NLM_HIBIT >> 1);
-	}
-      rel->sym_ptr_ptr = bfd_get_section_by_name (abfd, name)->symbol_ptr_ptr;
-    }
-
-  rel->howto = &nlm_powerpc_howto;
-
-  rel->address = val << 2;
-  rel->addend = 0;
-
-  return true;
-}
-
-#else /* OLDFORMAT */
-
-/* This reloc handling is only applicable to the old format.  */
-
-/* How to process the various reloc types.  PowerPC NLMs use XCOFF
-   reloc types, and I have just copied the XCOFF reloc table here.  */
-
-static reloc_howto_type nlm_powerpc_howto_table[] =
-{
-  /* Standard 32 bit relocation.  */
-  HOWTO (0,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_POS",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-  /* 32 bit relocation, but store negative value.  */
-  HOWTO (1,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 -2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_NEG",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-
-  /* 32 bit PC relative relocation.  */
-  HOWTO (2,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 true,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_REL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* 16 bit TOC relative relocation.  */
-  HOWTO (3,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 1,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TOC",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* I don't really know what this is.  */
-  HOWTO (4,	                /* type */                                 
-	 1,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RTB",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* External TOC relative symbol.  */
-  HOWTO (5,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_GL",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Local TOC relative symbol.  */
-  HOWTO (6,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TCL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 7 },
-  
-  /* Non modifiable absolute branch.  */
-  HOWTO (8,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_BA",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0x3fffffc,	        /* src_mask */                             
-	 0x3fffffc,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 9 },
-
-  /* Non modifiable relative branch.  */
-  HOWTO (0xa,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */                   
-	 true,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_BR",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0x3fffffc,	        /* src_mask */                             
-	 0x3fffffc,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 0xb },
-
-  /* Indirect load.  */
-  HOWTO (0xc,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RL",                /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Load address.  */
-  HOWTO (0xd,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RLA",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 0xe },
-  
-  /* Non-relocating reference.  */
-  HOWTO (0xf,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_REF",               /* name */                                 
-	 false,	                /* partial_inplace */                      
-	 0,		        /* src_mask */                             
-	 0,     	   	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  { 0x10 },
-  { 0x11 },
-  
-  /* TOC relative indirect load.  */
-  HOWTO (0x12,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TRL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* TOC relative load address.  */
-  HOWTO (0x13,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_TRLA",              /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable relative branch.  */
-  HOWTO (0x14,	                /* type */                                 
-	 1,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RRTBI",             /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable absolute branch.  */
-  HOWTO (0x15,	                /* type */                                 
-	 1,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RRTBA",             /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,	        /* src_mask */                             
-	 0xffffffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable call absolute indirect.  */
-  HOWTO (0x16,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_CAI",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable call relative.  */
-  HOWTO (0x17,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_REL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch absolute.  */
-  HOWTO (0x18,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RBA",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch absolute.  */
-  HOWTO (0x19,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_RBAC",              /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch relative.  */
-  HOWTO (0x1a,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 26,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_signed, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_REL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false),                /* pcrel_offset */
-  
-  /* Modifiable branch absolute.  */
-  HOWTO (0x1b,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 16,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_REL",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffff,	        /* src_mask */                             
-	 0xffff,        	/* dst_mask */                             
-	 false)                 /* pcrel_offset */
-};
-
-#define HOWTO_COUNT (sizeof nlm_powerpc_howto_table		\
-		     / sizeof nlm_powerpc_howto_table[0])
-
-/* Read a PowerPC NLM reloc.  */
-
-static boolean
-nlm_powerpc_read_reloc (abfd, sym, secp, rel)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-     asection **secp;
-     arelent *rel;
-{
-  struct nlm32_powerpc_external_reloc ext;
-  bfd_vma l_vaddr;
-  unsigned long l_symndx;
-  int l_rtype;
-  int l_rsecnm;
-  asection *code_sec, *data_sec, *bss_sec;
-
-  /* Read the reloc from the file.  */
-  if (bfd_read (&ext, sizeof ext, 1, abfd) != sizeof ext)
-    return false;
-
-  /* Swap in the fields.  */
-  l_vaddr = bfd_h_get_32 (abfd, ext.l_vaddr);
-  l_symndx = bfd_h_get_32 (abfd, ext.l_symndx);
-  l_rtype = bfd_h_get_16 (abfd, ext.l_rtype);
-  l_rsecnm = bfd_h_get_16 (abfd, ext.l_rsecnm);
-
-  /* Get the sections now, for convenience.  */
-  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-  bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
-
-  /* Work out the arelent fields.  */
-  if (sym != NULL)
-    {
-      /* This is an import.  sym_ptr_ptr is filled in by
-	 nlm_canonicalize_reloc.  */
-      rel->sym_ptr_ptr = NULL;
-    }
-  else
-    {
-      asection *sec;
-
-      if (l_symndx == 0)
-	sec = code_sec;
-      else if (l_symndx == 1)
-	sec = data_sec;
-      else if (l_symndx == 2)
-	sec = bss_sec;
-      else
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      rel->sym_ptr_ptr = sec->symbol_ptr_ptr;
-    }
-
-  rel->addend = 0;
-
-  BFD_ASSERT ((l_rtype & 0xff) < HOWTO_COUNT);
-
-  rel->howto = nlm_powerpc_howto_table + (l_rtype & 0xff);
-
-  BFD_ASSERT (rel->howto->name != NULL
-	      && ((l_rtype & 0x8000) != 0
-		  ? (rel->howto->complain_on_overflow
-		     == complain_overflow_signed)
-		  : (rel->howto->complain_on_overflow
-		     == complain_overflow_bitfield))
-	      && ((l_rtype >> 8) & 0x1f) == rel->howto->bitsize - 1);
-
-  if (l_rsecnm == 0)
-    *secp = code_sec;
-  else if (l_rsecnm == 1)
-    {
-      *secp = data_sec;
-      l_vaddr -= bfd_section_size (abfd, code_sec);
-    }
-  else
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  rel->address = l_vaddr;
-
-  return true;
-}
-
-#endif /* OLDFORMAT */
-
-/* Mangle PowerPC NLM relocs for output.  */
-
-static boolean
-nlm_powerpc_mangle_relocs (abfd, sec, data, offset, count)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-     bfd_vma offset;
-     bfd_size_type count;
-{
-  return true;
-}
-
-/* Read a PowerPC NLM import record */
-
-static boolean
-nlm_powerpc_read_import (abfd, sym)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-{
-  struct nlm_relent *nlm_relocs;	/* relocation records for symbol */
-  bfd_size_type rcount;			/* number of relocs */
-  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* temporary 32-bit value */
-  unsigned char symlength;		/* length of symbol name */
-  char *name;
-
-  if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
-      != sizeof (symlength))
-    return (false);
-  sym -> symbol.the_bfd = abfd;
-  name = bfd_alloc (abfd, symlength + 1);
-  if (name == NULL)
-    return false;
-  if (bfd_read (name, symlength, 1, abfd) != symlength)
-    return (false);
-  name[symlength] = '\0';
-  sym -> symbol.name = name;
-  sym -> symbol.flags = 0;
-  sym -> symbol.value = 0;
-  sym -> symbol.section = bfd_und_section_ptr;
-  if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return (false);
-  rcount = bfd_h_get_32 (abfd, temp);
-  nlm_relocs = ((struct nlm_relent *)
-		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
-  if (nlm_relocs == (struct nlm_relent *) NULL)
-    return false;
-  sym -> relocs = nlm_relocs;
-  sym -> rcnt = 0;
-  while (sym -> rcnt < rcount)
-    {
-      asection *section;
-      
-      if (nlm_powerpc_read_reloc (abfd, sym, &section,
-				  &nlm_relocs -> reloc)
-	  == false)
-	return false;
-      nlm_relocs -> section = section;
-      nlm_relocs++;
-      sym -> rcnt++;
-    }
-  return true;
-}
-
-#ifndef OLDFORMAT
-
-/* Write a PowerPC NLM reloc.  */
-
-static boolean
-nlm_powerpc_write_import (abfd, sec, rel)
-     bfd *abfd;
-     asection *sec;
-     arelent *rel;
-{
-  asymbol *sym;
-  bfd_vma val;
-  bfd_byte temp[4];
-
-  /* PowerPC NetWare only supports one kind of reloc.  */
-  if (rel->addend != 0
-      || rel->howto == NULL
-      || rel->howto->rightshift != 0
-      || rel->howto->size != 2
-      || rel->howto->bitsize != 32
-      || rel->howto->bitpos != 0
-      || rel->howto->pc_relative
-      || (rel->howto->src_mask != 0xffffffff && rel->addend != 0)
-      || rel->howto->dst_mask != 0xffffffff)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  sym = *rel->sym_ptr_ptr;
-
-  /* The value we write out is the offset into the appropriate
-     segment, rightshifted by two.  This offset is the section vma,
-     adjusted by the vma of the lowest section in that segment, plus
-     the address of the relocation.  */
-  val = bfd_get_section_vma (abfd, sec) + rel->address;
-  if ((val & 3) != 0)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-  val >>= 2;
-
-  /* The high bit is 0 if the reloc is in the data section, or 1 if
-     the reloc is in the code section.  */
-  if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
-    val -= nlm_get_data_low (abfd);
-  else
-    {
-      val -= nlm_get_text_low (abfd);
-      val |= NLM_HIBIT;
-    }
-    
-  if (! bfd_is_und_section (bfd_get_section (sym)))
-    {
-      /* This is an internal relocation fixup.  The second most
-	 significant bit is 0 if this is a reloc against the data
-	 segment, or 1 if it is a reloc against the text segment.  */
-      if (bfd_get_section_flags (abfd, bfd_get_section (sym)) & SEC_CODE)
-	val |= NLM_HIBIT >> 1;
-    }
-
-  bfd_put_32 (abfd, val, temp);
-  if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  return true;
-}
-
-#else /* OLDFORMAT */
-
-/* This is used for the reloc handling in the old format.  */
-
-/* Write a PowerPC NLM reloc.  */
-
-static boolean
-nlm_powerpc_write_reloc (abfd, sec, rel, indx)
-     bfd *abfd;
-     asection *sec;
-     arelent *rel;
-     int indx;
-{
-  struct nlm32_powerpc_external_reloc ext;
-  asection *code_sec, *data_sec, *bss_sec;
-  asymbol *sym;
-  asection *symsec;
-  unsigned long l_symndx;
-  int l_rtype;
-  int l_rsecnm;
-  reloc_howto_type *howto;
-  bfd_size_type address;
-
-  /* Get the sections now, for convenience.  */
-  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-  bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
-
-  sym = *rel->sym_ptr_ptr;
-  symsec = bfd_get_section (sym);
-  if (indx != -1)
-    {
-      BFD_ASSERT (bfd_is_und_section (symsec));
-      l_symndx = indx + 3;
-    }
-  else
-    {
-      if (symsec == code_sec)
-	l_symndx = 0;
-      else if (symsec == data_sec)
-	l_symndx = 1;
-      else if (symsec == bss_sec)
-	l_symndx = 2;
-      else
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-    }
-
-  bfd_h_put_32 (abfd, (bfd_vma) l_symndx, ext.l_symndx);
-
-  for (howto = nlm_powerpc_howto_table;
-       howto < nlm_powerpc_howto_table + HOWTO_COUNT;
-       howto++)
-    {
-      if (howto->rightshift == rel->howto->rightshift
-	  && howto->size == rel->howto->size
-	  && howto->bitsize == rel->howto->bitsize
-	  && howto->pc_relative == rel->howto->pc_relative
-	  && howto->bitpos == rel->howto->bitpos
-	  && (howto->partial_inplace == rel->howto->partial_inplace
-	      || (! rel->howto->partial_inplace
-		  && rel->addend == 0))
-	  && (howto->src_mask == rel->howto->src_mask
-	      || (rel->howto->src_mask == 0
-		  && rel->addend == 0))
-	  && howto->dst_mask == rel->howto->dst_mask
-	  && howto->pcrel_offset == rel->howto->pcrel_offset)
-	break;
-    }
-  if (howto >= nlm_powerpc_howto_table + HOWTO_COUNT)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  l_rtype = howto->type;
-  if (howto->complain_on_overflow == complain_overflow_signed)
-    l_rtype |= 0x8000;
-  l_rtype |= (howto->bitsize - 1) << 8;
-  bfd_h_put_16 (abfd, (bfd_vma) l_rtype, ext.l_rtype);
-
-  address = rel->address;
-
-  if (sec == code_sec)
-    l_rsecnm = 0;
-  else if (sec == data_sec)
-    {
-      l_rsecnm = 1;
-      address += bfd_section_size (abfd, code_sec);
-    }
-  else
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  bfd_h_put_16 (abfd, (bfd_vma) l_rsecnm, ext.l_rsecnm);
-  bfd_h_put_32 (abfd, (bfd_vma) address, ext.l_vaddr);
-
-  if (bfd_write (&ext, sizeof ext, 1, abfd) != sizeof ext)
-    return false;
-
-  return true;
-}
-
-/* Write a PowerPC NLM import.  */
-
-static boolean
-nlm_powerpc_write_import (abfd, sec, rel)
-     bfd *abfd;
-     asection *sec;
-     arelent *rel;
-{
-  return nlm_powerpc_write_reloc (abfd, sec, rel, -1);
-}
-
-#endif /* OLDFORMAT */
-
-/* Write a PowerPC NLM external symbol.  This routine keeps a static
-   count of the symbol index.  FIXME: I don't know if this is
-   necessary, and the index never gets reset.  */
-
-static boolean
-nlm_powerpc_write_external (abfd, count, sym, relocs)
-     bfd *abfd;
-     bfd_size_type count;
-     asymbol *sym;
-     struct reloc_and_sec *relocs;
-{
-  unsigned int i;
-  bfd_byte len;
-  unsigned char temp[NLM_TARGET_LONG_SIZE];
-#ifdef OLDFORMAT
-  static int indx;
-#endif
-
-  len = strlen (sym->name);
-  if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte))
-      || bfd_write (sym->name, len, 1, abfd) != len)
-    return false;
-
-  bfd_put_32 (abfd, count, temp);
-  if (bfd_write (temp, sizeof(temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  for (i = 0; i < count; i++)
-    {
-#ifndef OLDFORMAT
-      if (! nlm_powerpc_write_import (abfd, relocs[i].sec, relocs[i].rel))
-	return false;
-#else
-      if (! nlm_powerpc_write_reloc (abfd, relocs[i].sec,
-				     relocs[i].rel, indx))
-	return false;
-#endif
-    }
-
-#ifdef OLDFORMAT
-  ++indx;
-#endif
-
-  return true;
-}
-
-#ifndef OLDFORMAT
-
-/* PowerPC Netware uses a word offset, not a byte offset, for public
-   symbols.  */
-
-/* Set the section for a public symbol.  */
-
-static boolean
-nlm_powerpc_set_public_section (abfd, sym)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-{
-  if (sym->symbol.value & NLM_HIBIT)
-    {
-      sym->symbol.value &= ~NLM_HIBIT;
-      sym->symbol.flags |= BSF_FUNCTION;
-      sym->symbol.section =
-	bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-    }
-  else
-    {
-      sym->symbol.section =
-	bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-    }
-
-  sym->symbol.value <<= 2;
-
-  return true;
-}
-
-/* Get the offset to write out for a public symbol.  */
-
-static bfd_vma
-nlm_powerpc_get_public_offset (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
-{
-  bfd_vma offset;
-  asection *sec;
-
-  offset = bfd_asymbol_value (sym);
-  sec = bfd_get_section (sym);
-  if (sec->flags & SEC_CODE)
-    {
-      offset -= nlm_get_text_low (abfd);
-      offset |= NLM_HIBIT;
-    }
-  else if (sec->flags & (SEC_DATA | SEC_ALLOC))
-    {
-      /* SEC_ALLOC is for the .bss section.  */
-      offset -= nlm_get_data_low (abfd);
-    }
-  else
-    {
-      /* We can't handle an exported symbol that is not in the code or
-	 data segment.  */
-      bfd_set_error (bfd_error_invalid_operation);
-      /* FIXME: No way to return error.  */
-      abort ();
-    }
-
-  return offset;
-}
-
-#endif /* ! defined (OLDFORMAT) */
-
-#include "nlmswap.h"
-
-static const struct nlm_backend_data nlm32_powerpc_backend =
-{
-  "NetWare PowerPC Module \032",
-  sizeof (Nlm32_powerpc_External_Fixed_Header),
-#ifndef OLDFORMAT
-  0,	/* optional_prefix_size */
-#else
-  sizeof (struct nlm32_powerpc_external_prefix_header),
-#endif
-  bfd_arch_powerpc,
-  0,
-  false,
-#ifndef OLDFORMAT
-  0,	/* backend_object_p */
-  0,	/* write_prefix */
-#else
-  nlm_powerpc_backend_object_p,
-  nlm_powerpc_write_prefix,
-#endif
-  nlm_powerpc_read_reloc,
-  nlm_powerpc_mangle_relocs,
-  nlm_powerpc_read_import,
-  nlm_powerpc_write_import,
-#ifndef OLDFORMAT
-  nlm_powerpc_set_public_section,
-  nlm_powerpc_get_public_offset,
-#else
-  0,	/* set_public_section */
-  0,	/* get_public_offset */
-#endif
-  nlm_swap_fixed_header_in,
-  nlm_swap_fixed_header_out,
-  nlm_powerpc_write_external,
-  0,	/* write_export */
-};
-
-#define TARGET_BIG_NAME			"nlm32-powerpc"
-#define TARGET_BIG_SYM			nlmNAME(powerpc_vec)
-#define TARGET_BACKEND_DATA		&nlm32_powerpc_backend
-
-#include "nlm-target.h"
diff --git a/bfd/nlm32-sparc.c b/bfd/nlm32-sparc.c
deleted file mode 100644
index 5963adbc70b..00000000000
--- a/bfd/nlm32-sparc.c
+++ /dev/null
@@ -1,440 +0,0 @@
-/* Support for 32-bit SPARC NLM (NetWare Loadable Module)
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define ARCH_SIZE 32
-
-#include "nlm/sparc32-ext.h"
-#define Nlm_External_Fixed_Header	Nlm32_sparc_External_Fixed_Header
-
-#include "libnlm.h"
-
-static boolean nlm_sparc_read_reloc
-  PARAMS ((bfd *, nlmNAME(symbol_type) *, asection **, arelent *));
-static boolean nlm_sparc_write_reloc
-  PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_sparc_mangle_relocs
-  PARAMS ((bfd *, asection *, PTR, bfd_vma, bfd_size_type));
-static boolean nlm_sparc_read_import
-  PARAMS ((bfd *, nlmNAME(symbol_type) *));
-static boolean nlm_sparc_write_import
-  PARAMS ((bfd *, asection *, arelent *));
-static boolean nlm_sparc_write_external
-  PARAMS ((bfd *, bfd_size_type, asymbol *, struct reloc_and_sec *));
-
-enum reloc_type
-  {
-    R_SPARC_NONE = 0,
-    R_SPARC_8,		R_SPARC_16,		R_SPARC_32, 
-    R_SPARC_DISP8,	R_SPARC_DISP16,		R_SPARC_DISP32, 
-    R_SPARC_WDISP30,	R_SPARC_WDISP22,
-    R_SPARC_HI22,	R_SPARC_22,
-    R_SPARC_13,		R_SPARC_LO10,
-    R_SPARC_GOT10,	R_SPARC_GOT13,		R_SPARC_GOT22,
-    R_SPARC_PC10,	R_SPARC_PC22,
-    R_SPARC_WPLT30,
-    R_SPARC_COPY,
-    R_SPARC_GLOB_DAT,	R_SPARC_JMP_SLOT,
-    R_SPARC_RELATIVE,
-    R_SPARC_UA32,
-    R_SPARC_max
-  };
-
-#if 0
-static CONST char *CONST reloc_type_names[] =
-{
-  "R_SPARC_NONE",
-  "R_SPARC_8",		"R_SPARC_16",		"R_SPARC_32",
-  "R_SPARC_DISP8",	"R_SPARC_DISP16",	"R_SPARC_DISP32",
-  "R_SPARC_WDISP30",	"R_SPARC_WDISP22",
-  "R_SPARC_HI22",	"R_SPARC_22",
-  "R_SPARC_13",		"R_SPARC_LO10",
-  "R_SPARC_GOT10",	"R_SPARC_GOT13",	"R_SPARC_GOT22",
-  "R_SPARC_PC10",	"R_SPARC_PC22",
-  "R_SPARC_WPLT30",
-  "R_SPARC_COPY",
-  "R_SPARC_GLOB_DAT",	"R_SPARC_JMP_SLOT",
-  "R_SPARC_RELATIVE",
-  "R_SPARC_UA32",
-};
-#endif
-
-static reloc_howto_type nlm32_sparc_howto_table[] = 
-{
-  HOWTO(R_SPARC_NONE,    0,0, 0,false,0,complain_overflow_dont,    0,"R_SPARC_NONE",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_8,       0,0, 8,false,0,complain_overflow_bitfield,0,"R_SPARC_8",       false,0,0x000000ff,true),
-  HOWTO(R_SPARC_16,      0,1,16,false,0,complain_overflow_bitfield,0,"R_SPARC_16",      false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_32,      0,2,32,false,0,complain_overflow_bitfield,0,"R_SPARC_32",      false,0,0xffffffff,true),
-  HOWTO(R_SPARC_DISP8,   0,0, 8,true, 0,complain_overflow_signed,  0,"R_SPARC_DISP8",   false,0,0x000000ff,true),
-  HOWTO(R_SPARC_DISP16,  0,1,16,true, 0,complain_overflow_signed,  0,"R_SPARC_DISP16",  false,0,0x0000ffff,true),
-  HOWTO(R_SPARC_DISP32,  0,2,32,true, 0,complain_overflow_signed,  0,"R_SPARC_DISP32",  false,0,0x00ffffff,true),
-  HOWTO(R_SPARC_WDISP30, 2,2,30,true, 0,complain_overflow_signed,  0,"R_SPARC_WDISP30", false,0,0x3fffffff,true),
-  HOWTO(R_SPARC_WDISP22, 2,2,22,true, 0,complain_overflow_signed,  0,"R_SPARC_WDISP22", false,0,0x003fffff,true),
-  HOWTO(R_SPARC_HI22,   10,2,22,false,0,complain_overflow_dont,    0,"R_SPARC_HI22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_22,      0,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_22",      false,0,0x003fffff,true),
-  HOWTO(R_SPARC_13,      0,2,13,false,0,complain_overflow_bitfield,0,"R_SPARC_13",      false,0,0x00001fff,true),
-  HOWTO(R_SPARC_LO10,    0,2,10,false,0,complain_overflow_dont,    0,"R_SPARC_LO10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT10,   0,2,10,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT10",   false,0,0x000003ff,true),
-  HOWTO(R_SPARC_GOT13,   0,2,13,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT13",   false,0,0x00001fff,true),
-  HOWTO(R_SPARC_GOT22,  10,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_GOT22",   false,0,0x003fffff,true),
-  HOWTO(R_SPARC_PC10,    0,2,10,false,0,complain_overflow_bitfield,0,"R_SPARC_PC10",    false,0,0x000003ff,true),
-  HOWTO(R_SPARC_PC22,    0,2,22,false,0,complain_overflow_bitfield,0,"R_SPARC_PC22",    false,0,0x003fffff,true),
-  HOWTO(R_SPARC_WPLT30,  0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_WPLT30",  false,0,0x00000000,true),
-  HOWTO(R_SPARC_COPY,    0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_COPY",    false,0,0x00000000,true),
-  HOWTO(R_SPARC_GLOB_DAT,0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_GLOB_DAT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_JMP_SLOT,0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_JMP_SLOT",false,0,0x00000000,true),
-  HOWTO(R_SPARC_RELATIVE,0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_RELATIVE",false,0,0x00000000,true),
-  HOWTO(R_SPARC_UA32,    0,0,00,false,0,complain_overflow_dont,    0,"R_SPARC_UA32",    false,0,0x00000000,true),
-};
-
-/* Read a NetWare sparc reloc.  */
-
-struct nlm32_sparc_reloc_ext {
-  unsigned char offset[4];
-  unsigned char addend[4];
-  unsigned char type[1];
-  unsigned char pad1[3];
-};
-
-static boolean
-nlm_sparc_read_reloc (abfd, sym, secp, rel)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-     asection **secp;
-     arelent *rel;
-{
-  bfd_vma val, addend;
-  unsigned int index;
-  unsigned int type;
-  struct nlm32_sparc_reloc_ext tmp_reloc;
-  asection *code_sec, *data_sec;
-
-  if (bfd_read (&tmp_reloc, 12, 1, abfd) != 12)
-    return false;
-
-  code_sec = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-  data_sec = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-
-  *secp = code_sec;
-
-  val = bfd_get_32 (abfd, tmp_reloc.offset);
-  addend = bfd_get_32 (abfd, tmp_reloc.addend);
-  type = bfd_get_8 (abfd, tmp_reloc.type);
-
-  rel->address = val;
-  rel->addend = addend;
-  rel->howto = NULL;
-
-  for (index = 0;
-       index < sizeof(nlm32_sparc_howto_table) / sizeof(reloc_howto_type);
-       index++)
-    if (nlm32_sparc_howto_table[index].type == type) {
-      rel->howto = &nlm32_sparc_howto_table[index];
-      break;
-    }
-
-#ifdef DEBUG
-  fprintf (stderr, "%s:  address = %08lx, addend = %08lx, type = %d, howto = %08lx\n",
-	   __FUNCTION__, rel->address, rel->addend, type, rel->howto);
-#endif
-  return true;
-
-}
-
-/* Write a NetWare sparc reloc.  */
-
-static boolean
-nlm_sparc_write_reloc (abfd, sec, rel)
-     bfd *abfd;
-     asection *sec;
-     arelent *rel;
-{
-  bfd_vma val;
-  struct nlm32_sparc_reloc_ext tmp_reloc;
-  unsigned int index;
-  int type = -1;
-  reloc_howto_type *tmp;
-
-  
-  for (index = 0;
-       index < sizeof (nlm32_sparc_howto_table) / sizeof(reloc_howto_type);
-       index++) {
-    tmp = &nlm32_sparc_howto_table[index];
-
-    if (tmp->rightshift == rel->howto->rightshift
-	&& tmp->size == rel->howto->size
-	&& tmp->bitsize == rel->howto->bitsize
-	&& tmp->pc_relative == rel->howto->pc_relative
-	&& tmp->bitpos == rel->howto->bitpos
-	&& tmp->src_mask == rel->howto->src_mask
-	&& tmp->dst_mask == rel->howto->dst_mask) {
-      type = tmp->type;
-      break;
-    }
-  }
-  if (type == -1)
-    abort();
-
-  /*
-   * Netware wants a list of relocs for each address.
-   * Format is:
-   *	long	offset
-   *	long	addend
-   *	char	type
-   * That should be it.
-   */
-
-  /* The value we write out is the offset into the appropriate
-     segment.  This offset is the section vma, adjusted by the vma of
-     the lowest section in that segment, plus the address of the
-     relocation.  */
-#if 0
-  val = bfd_get_section_vma (abfd, (*rel->sym_ptr_ptr)->section) + rel->address;
-#else
-  val = bfd_get_section_vma (abfd, sec) + rel->address;
-#endif
-
-#ifdef DEBUG
-  fprintf (stderr, "%s:  val = %08lx, addend = %08lx, type = %d\n",
-	   __FUNCTION__, val, rel->addend, rel->howto->type);
-#endif
-  bfd_put_32 (abfd, val, tmp_reloc.offset);
-  bfd_put_32 (abfd, rel->addend, tmp_reloc.addend);
-  bfd_put_8 (abfd, (short)(rel->howto->type), tmp_reloc.type);
-
-  if (bfd_write (&tmp_reloc, 12, 1, abfd) != 12)
-    return false;
-
-  return true;
-}
-
-/* Mangle relocs for SPARC NetWare.  We can just use the standard
-   SPARC relocs.  */
-
-static boolean
-nlm_sparc_mangle_relocs (abfd, sec, data, offset, count)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-     bfd_vma offset;
-     bfd_size_type count;
-{
-  return true;
-}
-
-/* Read a NetWare sparc import record */
-static boolean
-nlm_sparc_read_import (abfd, sym)
-     bfd *abfd;
-     nlmNAME(symbol_type) *sym;
-{
-  struct nlm_relent *nlm_relocs;	/* relocation records for symbol */
-  bfd_size_type rcount;			/* number of relocs */
-  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* temporary 32-bit value */
-  unsigned char symlength;		/* length of symbol name */
-  char *name;
-  
-  /*
-   * First, read in the number of relocation
-   * entries for this symbol
-   */
-  if (bfd_read ((PTR) temp, 4, 1, abfd) != 4)
-    return false;
-  
-  rcount = bfd_get_32 (abfd, temp);
-  
-  /*
-   * Next, read in the length of the symbol
-   */
-  
-  if (bfd_read ((PTR) &symlength, sizeof (symlength), 1, abfd)
-      != sizeof (symlength))
-    return false;
-  sym -> symbol.the_bfd = abfd;
-  name = bfd_alloc (abfd, symlength + 1);
-  if (name == NULL)
-    return false;
-  
-  /*
-   * Then read in the symbol
-   */
-  
-  if (bfd_read (name, symlength, 1, abfd) != symlength)
-    return false;
-  name[symlength] = '\0';
-  sym -> symbol.name = name;
-  sym -> symbol.flags = 0;
-  sym -> symbol.value = 0;
-  sym -> symbol.section = bfd_und_section_ptr;
-  
-  /*
-   * Next, start reading in the relocs.
-   */
-  
-  nlm_relocs = ((struct nlm_relent *)
-		bfd_alloc (abfd, rcount * sizeof (struct nlm_relent)));
-  if (!nlm_relocs)
-    return false;
-  sym -> relocs = nlm_relocs;
-  sym -> rcnt = 0;
-  while (sym -> rcnt < rcount)
-    {
-      asection *section;
-      
-      if (nlm_sparc_read_reloc (abfd, sym, &section,
-			      &nlm_relocs -> reloc)
-	  == false)
-	return false;
-      nlm_relocs -> section = section;
-      nlm_relocs++;
-      sym -> rcnt++;
-    }
-  return true;
-}
-
-static boolean
-nlm_sparc_write_import (abfd, sec, rel)
-     bfd *abfd;
-     asection *sec;
-     arelent *rel;
-{
-  char temp[4];
-  asection *code, *data, *bss, *symsec;
-  bfd_vma base;
-
-  code = bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-  data = bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-  bss = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
-  symsec = (*rel->sym_ptr_ptr)->section;
-
-  if (symsec == code) {
-    base = 0;
-  } else if (symsec == data) {
-    base = bfd_section_size (abfd, code);
-  } else if (symsec == bss) {
-    base = bfd_section_size (abfd, code) + bfd_section_size (abfd, data);
-  } else
-    base = 0;
-
-#ifdef DEBUG
-  fprintf (stderr, "%s:  <%x, 1>\n\t",
-	   __FUNCTION__, base + (*rel->sym_ptr_ptr)->value);
-#endif
-  bfd_put_32 (abfd, base + (*rel->sym_ptr_ptr)->value, temp);
-  if (bfd_write ((PTR)temp, 4, 1, abfd) != 4)
-    return false;
-  bfd_put_32 (abfd, 1, temp);
-  if (bfd_write ((PTR)temp, 4, 1, abfd) != 4)
-    return false;
-  if (nlm_sparc_write_reloc (abfd, sec, rel) == false)
-    return false;
-  return true;
-}
-
-/* Write out an external reference.  */
-
-static boolean
-nlm_sparc_write_external (abfd, count, sym, relocs)
-     bfd *abfd;
-     bfd_size_type count;
-     asymbol *sym;
-     struct reloc_and_sec *relocs;
-{
-  unsigned int i;
-  bfd_byte len;
-  unsigned char temp[NLM_TARGET_LONG_SIZE];
-
-  bfd_put_32 (abfd, count, temp);
-  if (bfd_write (temp, sizeof(temp), 1, abfd) != sizeof (temp))
-    return false;
-
-  len = strlen (sym->name);
-  if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd) != sizeof(bfd_byte))
-      || bfd_write (sym->name, len, 1, abfd) != len)
-    return false;
-
-  for (i = 0; i < count; i++)
-    {
-      if (nlm_sparc_write_reloc (abfd, relocs[i].sec,
-				 relocs[i].rel) == false)
-	return false;
-    }
-
-  return true;
-}
-
-static boolean
-nlm_sparc_write_export (abfd, sym, value)
-     bfd *abfd;
-     asymbol *sym;
-     bfd_vma value;
-{
-  bfd_byte len;
-  bfd_byte temp[4];
-
-#ifdef DEBUG
-  fprintf (stderr, "%s: <%x, %d, %s>\n",
-	   __FUNCTION__, value, strlen (sym->name), sym->name);
-#endif
-  bfd_put_32 (abfd, value, temp);
-  len = strlen (sym->name);
-
-  if (bfd_write (temp, 4, 1, abfd) != 4
-      || bfd_write (&len, 1, 1, abfd) != 1
-      || bfd_write (sym->name, len, 1, abfd) != len)
-    return false;
-
-  return true;
-}
-
-#undef nlm_swap_fixed_header_in
-#undef nlm_swap_fixed_header_out
-
-#include "nlmswap.h"
-
-static const struct nlm_backend_data nlm32_sparc_backend =
-{
-  "NetWare SPARC Module   \032",
-  sizeof (Nlm32_sparc_External_Fixed_Header),
-  0,	/* optional_prefix_size */
-  bfd_arch_sparc,
-  0,
-  false,
-  0,	/* backend_object_p */
-  0,	/* write_prefix_func */
-  nlm_sparc_read_reloc,
-  nlm_sparc_mangle_relocs,
-  nlm_sparc_read_import,
-  nlm_sparc_write_import,
-  0,	/* set_public_section */
-  0,	/* get_public_offset */
-  nlm_swap_fixed_header_in,
-  nlm_swap_fixed_header_out,
-  nlm_sparc_write_external,
-  nlm_sparc_write_export
-};
-
-#define TARGET_BIG_NAME		"nlm32-sparc"
-#define TARGET_BIG_SYM		nlmNAME(sparc_vec)
-#define TARGET_BACKEND_DATA		&nlm32_sparc_backend
-
-#include "nlm-target.h"
diff --git a/bfd/nlm32.c b/bfd/nlm32.c
deleted file mode 100644
index 4730e4fd349..00000000000
--- a/bfd/nlm32.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* NLM (NetWare Loadable Module) 32-bit executable support for BFD.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define ARCH_SIZE 32
-#include "nlmcode.h"
diff --git a/bfd/nlm64.c b/bfd/nlm64.c
deleted file mode 100644
index 5dcd96a2b3c..00000000000
--- a/bfd/nlm64.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/* NLM (NetWare Loadable Module) 64-bit executable support for BFD.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define ARCH_SIZE 64
-#include "nlmcode.h"
diff --git a/bfd/nlmcode.h b/bfd/nlmcode.h
deleted file mode 100644
index 63ac0c300f7..00000000000
--- a/bfd/nlmcode.h
+++ /dev/null
@@ -1,2056 +0,0 @@
-/* NLM (NetWare Loadable Module) executable support for BFD.
-   Copyright (C) 1993, 94, 95, 1998 Free Software Foundation, Inc.
-
-   Written by Fred Fish @ Cygnus Support, using ELF support as the
-   template.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libnlm.h"
-
-/* The functions in this file do not use the names they appear to use.
-   This file is actually compiled multiple times, once for each size
-   of NLM target we are using.  At each size we use a different name,
-   constructed by the macro nlmNAME.  For example, the function which
-   is named nlm_symbol_type below is actually named nlm32_symbol_type
-   in the final executable.  */
-
-#define Nlm_External_Fixed_Header	NlmNAME(External_Fixed_Header)
-#define Nlm_External_Version_Header	NlmNAME(External_Version_Header)
-#define Nlm_External_Copyright_Header	NlmNAME(External_Copyright_Header)
-#define Nlm_External_Extended_Header	NlmNAME(External_Extended_Header)
-#define Nlm_External_Custom_Header	NlmNAME(External_Custom_Header)
-#define Nlm_External_Cygnus_Ext_Header	NlmNAME(External_Cygnus_Ext_Header)
-
-#define nlm_symbol_type			nlmNAME(symbol_type)
-#define nlm_get_symtab_upper_bound	nlmNAME(get_symtab_upper_bound)
-#define nlm_get_symtab			nlmNAME(get_symtab)
-#define nlm_make_empty_symbol		nlmNAME(make_empty_symbol)
-#define nlm_print_symbol		nlmNAME(print_symbol)
-#define nlm_get_symbol_info		nlmNAME(get_symbol_info)
-#define nlm_get_reloc_upper_bound	nlmNAME(get_reloc_upper_bound)
-#define nlm_canonicalize_reloc		nlmNAME(canonicalize_reloc)
-#define nlm_object_p			nlmNAME(object_p)
-#define nlm_set_section_contents	nlmNAME(set_section_contents)
-#define nlm_write_object_contents	nlmNAME(write_object_contents)
-
-#define nlm_swap_fixed_header_in(abfd,src,dst) \
-  (nlm_swap_fixed_header_in_func(abfd))(abfd,src,dst)
-#define nlm_swap_fixed_header_out(abfd,src,dst) \
-  (nlm_swap_fixed_header_out_func(abfd))(abfd,src,dst)
-
-/* Forward declarations of static functions */
-
-static boolean add_bfd_section
-  PARAMS ((bfd *, char *, file_ptr, bfd_size_type, flagword));
-static boolean nlm_swap_variable_header_in
-  PARAMS ((bfd *));
-static boolean nlm_swap_variable_header_out
-  PARAMS ((bfd *));
-static boolean find_nonzero
-  PARAMS ((PTR, size_t));
-static boolean nlm_swap_auxiliary_headers_in
-  PARAMS ((bfd *));
-static boolean nlm_swap_auxiliary_headers_out
-  PARAMS ((bfd *));
-static boolean nlm_slurp_symbol_table
-  PARAMS ((bfd *));
-static boolean nlm_slurp_reloc_fixups
-  PARAMS ((bfd *));
-static boolean nlm_compute_section_file_positions
-  PARAMS ((bfd *));
-static int nlm_external_reloc_compare
-  PARAMS ((const void *, const void *));
-
-/* Should perhaps use put_offset, put_word, etc.  For now, the two versions
-   can be handled by explicitly specifying 32 bits or "the long type".  */
-#if ARCH_SIZE == 64
-#define put_word	bfd_h_put_64
-#define get_word	bfd_h_get_64
-#endif
-#if ARCH_SIZE == 32
-#define put_word	bfd_h_put_32
-#define get_word	bfd_h_get_32
-#endif
-
-const bfd_target *
-nlm_object_p (abfd)
-     bfd *abfd;
-{
-  struct nlm_obj_tdata *preserved_tdata = nlm_tdata (abfd);
-  boolean (*backend_object_p) PARAMS ((bfd *));
-  PTR x_fxdhdr = NULL;
-  Nlm_Internal_Fixed_Header *i_fxdhdrp;
-  struct nlm_obj_tdata *new_tdata = NULL;
-  const char *signature;
-  enum bfd_architecture arch;
-
-  /* Some NLM formats have a prefix before the standard NLM fixed
-     header.  */
-  backend_object_p = nlm_backend_object_p_func (abfd);
-  if (backend_object_p)
-    {
-      if (!(*backend_object_p) (abfd))
-	goto got_wrong_format_error;
-    }
-
-  /* Read in the fixed length portion of the NLM header in external format.  */
-
-  x_fxdhdr = (PTR) bfd_malloc ((size_t) nlm_fixed_header_size (abfd));
-  if (x_fxdhdr == NULL)
-    goto got_no_match;
-
-  if (bfd_read ((PTR) x_fxdhdr, nlm_fixed_header_size (abfd), 1, abfd) !=
-      nlm_fixed_header_size (abfd))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	goto got_wrong_format_error;
-      else
-	goto got_no_match;
-    }
-
-  /* Allocate an instance of the nlm_obj_tdata structure and hook it up to
-     the tdata pointer in the bfd.  */
-
-  new_tdata = ((struct nlm_obj_tdata *)
-	       bfd_zalloc (abfd, sizeof (struct nlm_obj_tdata)));
-  if (new_tdata == NULL)
-    goto got_no_match;
-
-  nlm_tdata (abfd) = new_tdata;
-
-  i_fxdhdrp = nlm_fixed_header (abfd);
-  nlm_swap_fixed_header_in (abfd, x_fxdhdr, i_fxdhdrp);
-  free (x_fxdhdr);
-  x_fxdhdr = NULL;
-
-  /* Check to see if we have an NLM file for this backend by matching
-     the NLM signature. */
-
-  signature = nlm_signature (abfd);
-  if (signature != NULL
-      && *signature != '\0'
-      && strncmp ((char *) i_fxdhdrp->signature, signature,
-		  NLM_SIGNATURE_SIZE) != 0)
-    goto got_wrong_format_error;
-
-  /* There's no supported way to discover the endianess of an NLM, so test for
-     a sane version number after doing byte swapping appropriate for this
-     XVEC.  (Hack alert!) */
-
-  if (i_fxdhdrp->version > 0xFFFF)
-    goto got_wrong_format_error;
-
-  /* There's no supported way to check for 32 bit versus 64 bit addresses,
-     so ignore this distinction for now.  (FIXME) */
-
-  /* Swap in the rest of the required header.  */
-  if (!nlm_swap_variable_header_in (abfd))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	goto got_wrong_format_error;
-      else
-	goto got_no_match;
-    }
-
-  /* Add the sections supplied by all NLM's, and then read in the
-     auxiliary headers.  Reading the auxiliary headers may create
-     additional sections described in the cygnus_ext header.
-     From this point on we assume that we have an NLM, and do not
-     treat errors as indicating the wrong format.  */
-
-  if (!add_bfd_section (abfd, NLM_CODE_NAME,
-			i_fxdhdrp->codeImageOffset,
-			i_fxdhdrp->codeImageSize,
-			(SEC_CODE | SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-			 | SEC_RELOC))
-      || !add_bfd_section (abfd, NLM_INITIALIZED_DATA_NAME,
-			   i_fxdhdrp->dataImageOffset,
-			   i_fxdhdrp->dataImageSize,
-			   (SEC_DATA | SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-			    | SEC_RELOC))
-      || !add_bfd_section (abfd, NLM_UNINITIALIZED_DATA_NAME,
-			   (file_ptr) 0,
-			   i_fxdhdrp->uninitializedDataSize,
-			   SEC_ALLOC))
-    goto got_no_match;
-
-  if (!nlm_swap_auxiliary_headers_in (abfd))
-    goto got_no_match;
-
-  if (nlm_fixed_header (abfd)->numberOfRelocationFixups != 0
-      || nlm_fixed_header (abfd)->numberOfExternalReferences != 0)
-    abfd->flags |= HAS_RELOC;
-  if (nlm_fixed_header (abfd)->numberOfPublics != 0
-      || nlm_fixed_header (abfd)->numberOfDebugRecords != 0
-      || nlm_fixed_header (abfd)->numberOfExternalReferences != 0)
-    abfd->flags |= HAS_SYMS;
-
-  arch = nlm_architecture (abfd);
-  if (arch != bfd_arch_unknown)
-    bfd_default_set_arch_mach (abfd, arch, (unsigned long) 0);
-
-  abfd->flags |= EXEC_P;
-  bfd_get_start_address (abfd) = nlm_fixed_header (abfd)->codeStartOffset;
-
-  return (abfd->xvec);
-
-got_wrong_format_error:
-  bfd_set_error (bfd_error_wrong_format);
-got_no_match:
-  nlm_tdata (abfd) = preserved_tdata;
-  if (new_tdata != NULL)
-    bfd_release (abfd, new_tdata);
-  if (x_fxdhdr != NULL)
-    free (x_fxdhdr);
-  return (NULL);
-}
-
-/* Add a section to the bfd. */
-
-static boolean
-add_bfd_section (abfd, name, offset, size, flags)
-     bfd *abfd;
-     char *name;
-     file_ptr offset;
-     bfd_size_type size;
-     flagword flags;
-{
-  asection *newsect;
-
-  newsect = bfd_make_section (abfd, name);
-  if (newsect == NULL)
-    {
-      return (false);
-    }
-  newsect->vma = 0;		/* NLM's are relocatable. */
-  newsect->_raw_size = size;
-  newsect->filepos = offset;
-  newsect->flags = flags;
-  newsect->alignment_power = bfd_log2 (0);	/* FIXME */
-  return (true);
-}
-
-/* Read and swap in the variable length header.  All the fields must
-   exist in the NLM, and must exist in the order they are read here. */
-
-static boolean
-nlm_swap_variable_header_in (abfd)
-     bfd *abfd;
-{
-  unsigned char temp[NLM_TARGET_LONG_SIZE];
-
-  /* Read the description length and text members. */
-
-  if (bfd_read ((PTR) & nlm_variable_header (abfd)->descriptionLength,
-		sizeof (nlm_variable_header (abfd)->descriptionLength),
-		1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->descriptionLength))
-    return (false);
-  if (bfd_read ((PTR) nlm_variable_header (abfd)->descriptionText,
-		nlm_variable_header (abfd)->descriptionLength + 1,
-		1, abfd) !=
-      (bfd_size_type) nlm_variable_header (abfd)->descriptionLength + 1)
-    return (false);
-
-  /* Read and convert the stackSize field. */
-
-  if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return (false);
-  nlm_variable_header (abfd)->stackSize = get_word (abfd, (bfd_byte *) temp);
-
-  /* Read and convert the reserved field. */
-
-  if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return (false);
-  nlm_variable_header (abfd)->reserved = get_word (abfd, (bfd_byte *) temp);
-
-  /* Read the oldThreadName field.  This field is a fixed length string. */
-
-  if (bfd_read ((PTR) nlm_variable_header (abfd)->oldThreadName,
-		sizeof (nlm_variable_header (abfd)->oldThreadName),
-		1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->oldThreadName))
-    return (false);
-
-  /* Read the screen name length and text members. */
-
-  if (bfd_read ((PTR) & nlm_variable_header (abfd)->screenNameLength,
-		sizeof (nlm_variable_header (abfd)->screenNameLength),
-		1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->screenNameLength))
-    return (false);
-  if (bfd_read ((PTR) nlm_variable_header (abfd)->screenName,
-		nlm_variable_header (abfd)->screenNameLength + 1,
-		1, abfd) !=
-      (bfd_size_type) nlm_variable_header (abfd)->screenNameLength + 1)
-    return (false);
-
-  /* Read the thread name length and text members. */
-
-  if (bfd_read ((PTR) & nlm_variable_header (abfd)->threadNameLength,
-		sizeof (nlm_variable_header (abfd)->threadNameLength),
-		1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->threadNameLength))
-    return (false);
-  if (bfd_read ((PTR) nlm_variable_header (abfd)->threadName,
-		nlm_variable_header (abfd)->threadNameLength + 1,
-		1, abfd) !=
-      (bfd_size_type) nlm_variable_header (abfd)->threadNameLength + 1)
-    return (false);
-  return (true);
-}
-
-/* Swap and write out the variable length header.  All the fields must
-   exist in the NLM, and must exist in this order.  */
-
-static boolean
-nlm_swap_variable_header_out (abfd)
-     bfd *abfd;
-{
-  unsigned char temp[NLM_TARGET_LONG_SIZE];
-
-  /* Write the description length and text members. */
-
-  if (bfd_write ((PTR) & nlm_variable_header (abfd)->descriptionLength,
-		 sizeof (nlm_variable_header (abfd)->descriptionLength),
-		 1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->descriptionLength))
-    return (false);
-  if (bfd_write ((PTR) nlm_variable_header (abfd)->descriptionText,
-		 nlm_variable_header (abfd)->descriptionLength + 1,
-		 1, abfd) !=
-      (bfd_size_type) nlm_variable_header (abfd)->descriptionLength + 1)
-    return (false);
-
-  /* Convert and write the stackSize field. */
-
-  put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->stackSize,
-	    (bfd_byte *) temp);
-  if (bfd_write ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return (false);
-
-  /* Convert and write the reserved field. */
-
-  put_word (abfd, (bfd_vma) nlm_variable_header (abfd)->reserved,
-	    (bfd_byte *) temp);
-  if (bfd_write ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-    return (false);
-
-  /* Write the oldThreadName field.  This field is a fixed length string. */
-
-  if (bfd_write ((PTR) nlm_variable_header (abfd)->oldThreadName,
-		 sizeof (nlm_variable_header (abfd)->oldThreadName),
-		 1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->oldThreadName))
-    return (false);
-
-  /* Write the screen name length and text members. */
-
-  if (bfd_write ((PTR) & nlm_variable_header (abfd)->screenNameLength,
-		 sizeof (nlm_variable_header (abfd)->screenNameLength),
-		 1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->screenNameLength))
-    return (false);
-  if (bfd_write ((PTR) nlm_variable_header (abfd)->screenName,
-		 nlm_variable_header (abfd)->screenNameLength + 1,
-		 1, abfd) !=
-      (bfd_size_type) nlm_variable_header (abfd)->screenNameLength + 1)
-    return (false);
-
-  /* Write the thread name length and text members. */
-
-  if (bfd_write ((PTR) & nlm_variable_header (abfd)->threadNameLength,
-		 sizeof (nlm_variable_header (abfd)->threadNameLength),
-		 1, abfd) !=
-      sizeof (nlm_variable_header (abfd)->threadNameLength))
-    return (false);
-  if (bfd_write ((PTR) nlm_variable_header (abfd)->threadName,
-		 nlm_variable_header (abfd)->threadNameLength + 1,
-		 1, abfd) !=
-      (bfd_size_type) nlm_variable_header (abfd)->threadNameLength + 1)
-    return (false);
-  return (true);
-}
-
-/* Read and swap in the contents of all the auxiliary headers.  Because of
-   the braindead design, we have to do strcmps on strings of indeterminate
-   length to figure out what each auxiliary header is.  Even worse, we have
-   no way of knowing how many auxiliary headers there are or where the end
-   of the auxiliary headers are, except by finding something that doesn't
-   look like a known auxiliary header.  This means that the first new type
-   of auxiliary header added will break all existing tools that don't
-   recognize it. */
-
-static boolean
-nlm_swap_auxiliary_headers_in (abfd)
-     bfd *abfd;
-{
-  char tempstr[16];
-  long position;
-
-  for (;;)
-    {
-      position = bfd_tell (abfd);
-      if (bfd_read ((PTR) tempstr, sizeof (tempstr), 1, abfd) !=
-	  sizeof (tempstr))
-	return (false);
-      if (bfd_seek (abfd, position, SEEK_SET) == -1)
-	return (false);
-      if (strncmp (tempstr, "VeRsIoN#", 8) == 0)
-	{
-	  Nlm_External_Version_Header thdr;
-	  if (bfd_read ((PTR) & thdr, sizeof (thdr), 1, abfd) != sizeof (thdr))
-	    return (false);
-	  memcpy (nlm_version_header (abfd)->stamp, thdr.stamp,
-		  sizeof (thdr.stamp));
-	  nlm_version_header (abfd)->majorVersion =
-	    get_word (abfd, (bfd_byte *) thdr.majorVersion);
-	  nlm_version_header (abfd)->minorVersion =
-	    get_word (abfd, (bfd_byte *) thdr.minorVersion);
-	  nlm_version_header (abfd)->revision =
-	    get_word (abfd, (bfd_byte *) thdr.revision);
-	  nlm_version_header (abfd)->year =
-	    get_word (abfd, (bfd_byte *) thdr.year);
-	  nlm_version_header (abfd)->month =
-	    get_word (abfd, (bfd_byte *) thdr.month);
-	  nlm_version_header (abfd)->day =
-	    get_word (abfd, (bfd_byte *) thdr.day);
-	}
-      else if (strncmp (tempstr, "MeSsAgEs", 8) == 0)
-	{
-	  Nlm_External_Extended_Header thdr;
-	  if (bfd_read ((PTR) & thdr, sizeof (thdr), 1, abfd) != sizeof (thdr))
-	    return (false);
-	  memcpy (nlm_extended_header (abfd)->stamp, thdr.stamp,
-		  sizeof (thdr.stamp));
-	  nlm_extended_header (abfd)->languageID =
-	    get_word (abfd, (bfd_byte *) thdr.languageID);
-	  nlm_extended_header (abfd)->messageFileOffset =
-	    get_word (abfd, (bfd_byte *) thdr.messageFileOffset);
-	  nlm_extended_header (abfd)->messageFileLength =
-	    get_word (abfd, (bfd_byte *) thdr.messageFileLength);
-	  nlm_extended_header (abfd)->messageCount =
-	    get_word (abfd, (bfd_byte *) thdr.messageCount);
-	  nlm_extended_header (abfd)->helpFileOffset =
-	    get_word (abfd, (bfd_byte *) thdr.helpFileOffset);
-	  nlm_extended_header (abfd)->helpFileLength =
-	    get_word (abfd, (bfd_byte *) thdr.helpFileLength);
-	  nlm_extended_header (abfd)->RPCDataOffset =
-	    get_word (abfd, (bfd_byte *) thdr.RPCDataOffset);
-	  nlm_extended_header (abfd)->RPCDataLength =
-	    get_word (abfd, (bfd_byte *) thdr.RPCDataLength);
-	  nlm_extended_header (abfd)->sharedCodeOffset =
-	    get_word (abfd, (bfd_byte *) thdr.sharedCodeOffset);
-	  nlm_extended_header (abfd)->sharedCodeLength =
-	    get_word (abfd, (bfd_byte *) thdr.sharedCodeLength);
-	  nlm_extended_header (abfd)->sharedDataOffset =
-	    get_word (abfd, (bfd_byte *) thdr.sharedDataOffset);
-	  nlm_extended_header (abfd)->sharedDataLength =
-	    get_word (abfd, (bfd_byte *) thdr.sharedDataLength);
-	  nlm_extended_header (abfd)->sharedRelocationFixupOffset =
-	    get_word (abfd, (bfd_byte *) thdr.sharedRelocationFixupOffset);
-	  nlm_extended_header (abfd)->sharedRelocationFixupCount =
-	    get_word (abfd, (bfd_byte *) thdr.sharedRelocationFixupCount);
-	  nlm_extended_header (abfd)->sharedExternalReferenceOffset =
-	    get_word (abfd, (bfd_byte *) thdr.sharedExternalReferenceOffset);
-	  nlm_extended_header (abfd)->sharedExternalReferenceCount =
-	    get_word (abfd, (bfd_byte *) thdr.sharedExternalReferenceCount);
-	  nlm_extended_header (abfd)->sharedPublicsOffset =
-	    get_word (abfd, (bfd_byte *) thdr.sharedPublicsOffset);
-	  nlm_extended_header (abfd)->sharedPublicsCount =
-	    get_word (abfd, (bfd_byte *) thdr.sharedPublicsCount);
-	  nlm_extended_header (abfd)->sharedDebugRecordOffset =
-	    get_word (abfd, (bfd_byte *) thdr.sharedDebugRecordOffset);
-	  nlm_extended_header (abfd)->sharedDebugRecordCount =
-	    get_word (abfd, (bfd_byte *) thdr.sharedDebugRecordCount);
-	  nlm_extended_header (abfd)->SharedInitializationOffset =
-	    get_word (abfd, (bfd_byte *) thdr.sharedInitializationOffset);
-	  nlm_extended_header (abfd)->SharedExitProcedureOffset =
-	    get_word (abfd, (bfd_byte *) thdr.SharedExitProcedureOffset);
-	  nlm_extended_header (abfd)->productID =
-	    get_word (abfd, (bfd_byte *) thdr.productID);
-	  nlm_extended_header (abfd)->reserved0 =
-	    get_word (abfd, (bfd_byte *) thdr.reserved0);
-	  nlm_extended_header (abfd)->reserved1 =
-	    get_word (abfd, (bfd_byte *) thdr.reserved1);
-	  nlm_extended_header (abfd)->reserved2 =
-	    get_word (abfd, (bfd_byte *) thdr.reserved2);
-	  nlm_extended_header (abfd)->reserved3 =
-	    get_word (abfd, (bfd_byte *) thdr.reserved3);
-	  nlm_extended_header (abfd)->reserved4 =
-	    get_word (abfd, (bfd_byte *) thdr.reserved4);
-	  nlm_extended_header (abfd)->reserved5 =
-	    get_word (abfd, (bfd_byte *) thdr.reserved5);
-	}
-      else if (strncmp (tempstr, "CoPyRiGhT=", 10) == 0)
-	{
-	  if (bfd_read ((PTR) nlm_copyright_header (abfd)->stamp,
-			sizeof (nlm_copyright_header (abfd)->stamp),
-			1, abfd)
-	      != sizeof (nlm_copyright_header (abfd)->stamp))
-	    return (false);
-	  if (bfd_read ((PTR) & (nlm_copyright_header (abfd)
-				 ->copyrightMessageLength),
-			1, 1, abfd) != 1)
-	    return (false);
-	  /* The copyright message is a variable length string. */
-	  if (bfd_read ((PTR) nlm_copyright_header (abfd)->copyrightMessage,
-		    nlm_copyright_header (abfd)->copyrightMessageLength + 1,
-			1, abfd) !=
-	      ((bfd_size_type)
-	       nlm_copyright_header (abfd)->copyrightMessageLength + 1))
-	    return (false);
-	}
-      else if (strncmp (tempstr, "CuStHeAd", 8) == 0)
-	{
-	  Nlm_External_Custom_Header thdr;
-	  bfd_size_type hdrLength;
-	  file_ptr dataOffset;
-	  bfd_size_type dataLength;
-	  char dataStamp[8];
-	  PTR hdr;
-
-	  /* Read the stamp ("CuStHeAd").  */
-	  if (bfd_read ((PTR) thdr.stamp, 1, sizeof (thdr.stamp), abfd)
-	      != sizeof (thdr.stamp))
-	    return false;
-	  /* Read the length of this custom header.  */
-	  if (bfd_read ((PTR) thdr.length, 1, sizeof (thdr.length), abfd)
-	      != sizeof (thdr.length))
-	    return false;
-	  hdrLength = get_word (abfd, (bfd_byte *) thdr.length);
-	  /* Read further fields if we have them.  */
-	  if (hdrLength < NLM_TARGET_LONG_SIZE)
-	    dataOffset = 0;
-	  else
-	    {
-	      if (bfd_read ((PTR) thdr.dataOffset, 1,
-			    sizeof (thdr.dataOffset), abfd)
-		  != sizeof (thdr.dataOffset))
-		return false;
-	      dataOffset = get_word (abfd, (bfd_byte *) thdr.dataOffset);
-	    }
-	  if (hdrLength < 2 * NLM_TARGET_LONG_SIZE)
-	    dataLength = 0;
-	  else
-	    {
-	      if (bfd_read ((PTR) thdr.dataLength, 1,
-			    sizeof (thdr.dataLength), abfd)
-		  != sizeof (thdr.dataLength))
-		return false;
-	      dataLength = get_word (abfd, (bfd_byte *) thdr.dataLength);
-	    }
-	  if (hdrLength < 2 * NLM_TARGET_LONG_SIZE + 8)
-	    memset (dataStamp, 0, sizeof (dataStamp));
-	  else
-	    {
-	      if (bfd_read ((PTR) dataStamp, 1, sizeof (dataStamp), abfd)
-		  != sizeof (dataStamp))
-		return false;
-	    }
-
-	  /* Read the rest of the header, if any.  */
-	  if (hdrLength <= 2 * NLM_TARGET_LONG_SIZE + 8)
-	    {
-	      hdr = NULL;
-	      hdrLength = 0;
-	    }
-	  else
-	    {
-	      hdrLength -= 2 * NLM_TARGET_LONG_SIZE + 8;
-	      hdr = bfd_alloc (abfd, hdrLength);
-	      if (hdr == NULL)
-		return false;
-	      if (bfd_read (hdr, 1, hdrLength, abfd) != hdrLength)
-		return false;
-	    }
-
-	  /* If we have found a Cygnus header, process it.  Otherwise,
-	     just save the associated data without trying to interpret
-	     it.  */
-	  if (strncmp (dataStamp, "CyGnUsEx", 8) == 0)
-	    {
-	      file_ptr pos;
-	      bfd_byte *contents;
-	      bfd_byte *p, *pend;
-
-	      BFD_ASSERT (hdrLength == 0 && hdr == NULL);
-
-	      pos = bfd_tell (abfd);
-	      if (bfd_seek (abfd, dataOffset, SEEK_SET) != 0)
-		return false;
-	      contents = (bfd_byte *) bfd_alloc (abfd, dataLength);
-	      if (contents == NULL)
-		return false;
-	      if (bfd_read (contents, 1, dataLength, abfd) != dataLength)
-		return false;
-	      if (bfd_seek (abfd, pos, SEEK_SET) != 0)
-		return false;
-
-	      memcpy (nlm_cygnus_ext_header (abfd), "CyGnUsEx", 8);
-	      nlm_cygnus_ext_header (abfd)->offset = dataOffset;
-	      nlm_cygnus_ext_header (abfd)->length = dataLength;
-
-	      /* This data this header points to provides a list of
-		 the sections which were in the original object file
-		 which was converted to become an NLM.  We locate
-		 those sections and add them to the BFD.  Note that
-		 this is likely to create a second .text, .data and
-		 .bss section; retrieving the sections by name will
-		 get the actual NLM sections, which is what we want to
-		 happen.  The sections from the original file, which
-		 may be subsets of the NLM section, can only be found
-		 using bfd_map_over_sections.  */
-	      p = contents;
-	      pend = p + dataLength;
-	      while (p < pend)
-		{
-		  char *name;
-		  size_t l;
-		  file_ptr filepos;
-		  bfd_size_type size;
-		  asection *newsec;
-
-		  /* The format of this information is
-		     null terminated section name
-		     zeroes to adjust to 4 byte boundary
-		     4 byte section data file pointer
-		     4 byte section size
-		     */
-
-		  name = (char *) p;
-		  l = strlen (name) + 1;
-		  l = (l + 3) &~ 3;
-		  p += l;
-		  filepos = bfd_h_get_32 (abfd, p);
-		  p += 4;
-		  size = bfd_h_get_32 (abfd, p);
-		  p += 4;
-
-		  newsec = bfd_make_section_anyway (abfd, name);
-		  if (newsec == (asection *) NULL)
-		    return false;
-		  newsec->_raw_size = size;
-		  if (filepos != 0)
-		    {
-		      newsec->filepos = filepos;
-		      newsec->flags |= SEC_HAS_CONTENTS;
-		    }
-		}
-	    }
-	  else
-	    {
-	      memcpy (nlm_custom_header (abfd)->stamp, thdr.stamp,
-		      sizeof (thdr.stamp));
-	      nlm_custom_header (abfd)->hdrLength = hdrLength;
-	      nlm_custom_header (abfd)->dataOffset = dataOffset;
-	      nlm_custom_header (abfd)->dataLength = dataLength;
-	      memcpy (nlm_custom_header (abfd)->dataStamp, dataStamp,
-		      sizeof (dataStamp));
-	      nlm_custom_header (abfd)->hdr = hdr;
-	    }
-	}
-      else
-	{
-	  break;
-	}
-    }
-  return (true);
-}
-
-/* Return whether there is a non-zero byte in a memory block.  */
-
-static boolean
-find_nonzero (buf, size)
-     PTR buf;
-     size_t size;
-{
-  char *p = (char *) buf;
-
-  while (size-- != 0)
-    if (*p++ != 0)
-      return true;
-  return false;
-}
-
-/* Swap out the contents of the auxiliary headers.  We create those
-   auxiliary headers which have been set non-zero.  We do not require
-   the caller to set up the stamp fields.  */
-
-static boolean
-nlm_swap_auxiliary_headers_out (abfd)
-     bfd *abfd;
-{
-  /* Write out the version header if there is one.  */
-  if (find_nonzero ((PTR) nlm_version_header (abfd),
-		    sizeof (Nlm_Internal_Version_Header)))
-    {
-      Nlm_External_Version_Header thdr;
-
-      memcpy (thdr.stamp, "VeRsIoN#", 8);
-      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->majorVersion,
-		(bfd_byte *) thdr.majorVersion);
-      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->minorVersion,
-		(bfd_byte *) thdr.minorVersion);
-      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->revision,
-		(bfd_byte *) thdr.revision);
-      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->year,
-		(bfd_byte *) thdr.year);
-      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->month,
-		(bfd_byte *) thdr.month);
-      put_word (abfd, (bfd_vma) nlm_version_header (abfd)->day,
-		(bfd_byte *) thdr.day);
-      if (bfd_write ((PTR) & thdr, sizeof (thdr), 1, abfd) != sizeof (thdr))
-	return false;
-    }
-
-  /* Write out the extended header if there is one.  */
-  if (find_nonzero ((PTR) nlm_extended_header (abfd),
-		    sizeof (Nlm_Internal_Extended_Header)))
-    {
-      Nlm_External_Extended_Header thdr;
-
-      memcpy (thdr.stamp, "MeSsAgEs", 8);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->languageID,
-		(bfd_byte *) thdr.languageID);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->messageFileOffset,
-		(bfd_byte *) thdr.messageFileOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->messageFileLength,
-		(bfd_byte *) thdr.messageFileLength);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->messageCount,
-		(bfd_byte *) thdr.messageCount);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->helpFileOffset,
-		(bfd_byte *) thdr.helpFileOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->helpFileLength,
-		(bfd_byte *) thdr.helpFileLength);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->RPCDataOffset,
-		(bfd_byte *) thdr.RPCDataOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->RPCDataLength,
-		(bfd_byte *) thdr.RPCDataLength);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->sharedCodeOffset,
-		(bfd_byte *) thdr.sharedCodeOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->sharedCodeLength,
-		(bfd_byte *) thdr.sharedCodeLength);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->sharedDataOffset,
-		(bfd_byte *) thdr.sharedDataOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->sharedDataLength,
-		(bfd_byte *) thdr.sharedDataLength);
-      put_word (abfd,
-	  (bfd_vma) nlm_extended_header (abfd)->sharedRelocationFixupOffset,
-		(bfd_byte *) thdr.sharedRelocationFixupOffset);
-      put_word (abfd,
-	   (bfd_vma) nlm_extended_header (abfd)->sharedRelocationFixupCount,
-		(bfd_byte *) thdr.sharedRelocationFixupCount);
-      put_word (abfd,
-	(bfd_vma) nlm_extended_header (abfd)->sharedExternalReferenceOffset,
-		(bfd_byte *) thdr.sharedExternalReferenceOffset);
-      put_word (abfd,
-	 (bfd_vma) nlm_extended_header (abfd)->sharedExternalReferenceCount,
-		(bfd_byte *) thdr.sharedExternalReferenceCount);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->sharedPublicsOffset,
-		(bfd_byte *) thdr.sharedPublicsOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->sharedPublicsCount,
-		(bfd_byte *) thdr.sharedPublicsCount);
-      put_word (abfd,
-	      (bfd_vma) nlm_extended_header (abfd)->sharedDebugRecordOffset,
-		(bfd_byte *) thdr.sharedDebugRecordOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->sharedDebugRecordCount,
-		(bfd_byte *) thdr.sharedDebugRecordCount);
-      put_word (abfd,
-	   (bfd_vma) nlm_extended_header (abfd)->SharedInitializationOffset,
-		(bfd_byte *) thdr.sharedInitializationOffset);
-      put_word (abfd,
-	    (bfd_vma) nlm_extended_header (abfd)->SharedExitProcedureOffset,
-		(bfd_byte *) thdr.SharedExitProcedureOffset);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->productID,
-		(bfd_byte *) thdr.productID);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->reserved0,
-		(bfd_byte *) thdr.reserved0);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->reserved1,
-		(bfd_byte *) thdr.reserved1);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->reserved2,
-		(bfd_byte *) thdr.reserved2);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->reserved3,
-		(bfd_byte *) thdr.reserved3);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->reserved4,
-		(bfd_byte *) thdr.reserved4);
-      put_word (abfd,
-		(bfd_vma) nlm_extended_header (abfd)->reserved5,
-		(bfd_byte *) thdr.reserved5);
-      if (bfd_write ((PTR) & thdr, sizeof (thdr), 1, abfd) != sizeof (thdr))
-	return false;
-    }
-
-
-  /* Write out the copyright header if there is one.  */
-  if (find_nonzero ((PTR) nlm_copyright_header (abfd),
-		    sizeof (Nlm_Internal_Copyright_Header)))
-    {
-      Nlm_External_Copyright_Header thdr;
-
-      memcpy (thdr.stamp, "CoPyRiGhT=", 10);
-      if (bfd_write ((PTR) thdr.stamp, sizeof (thdr.stamp), 1, abfd)
-	  != sizeof (thdr.stamp))
-	return false;
-      thdr.copyrightMessageLength[0] =
-	nlm_copyright_header (abfd)->copyrightMessageLength;
-      if (bfd_write ((PTR) thdr.copyrightMessageLength, 1, 1, abfd) != 1)
-	return false;
-      /* The copyright message is a variable length string. */
-      if (bfd_write ((PTR) nlm_copyright_header (abfd)->copyrightMessage,
-		     nlm_copyright_header (abfd)->copyrightMessageLength + 1,
-		     1, abfd) !=
-	  ((bfd_size_type)
-	   nlm_copyright_header (abfd)->copyrightMessageLength + 1))
-	return false;
-    }
-
-  /* Write out the custom header if there is one.   */
-  if (find_nonzero ((PTR) nlm_custom_header (abfd),
-		    sizeof (Nlm_Internal_Custom_Header)))
-    {
-      Nlm_External_Custom_Header thdr;
-      boolean ds;
-      bfd_size_type hdrLength;
-
-      ds = find_nonzero ((PTR) nlm_custom_header (abfd)->dataStamp,
-			 sizeof (nlm_custom_header (abfd)->dataStamp));
-      memcpy (thdr.stamp, "CuStHeAd", 8);
-      hdrLength = (2 * NLM_TARGET_LONG_SIZE + (ds ? 8 : 0)
-		   + nlm_custom_header (abfd)->hdrLength);
-      put_word (abfd, hdrLength, thdr.length);
-      put_word (abfd, (bfd_vma) nlm_custom_header (abfd)->dataOffset,
-		thdr.dataOffset);
-      put_word (abfd, (bfd_vma) nlm_custom_header (abfd)->dataLength,
-		thdr.dataLength);
-      if (! ds)
-	{
-	  BFD_ASSERT (nlm_custom_header (abfd)->hdrLength == 0);
-	  if (bfd_write ((PTR) &thdr, 1,
-			 sizeof (thdr) - sizeof (thdr.dataStamp), abfd)
-	      != sizeof (thdr) - sizeof (thdr.dataStamp))
-	    return false;
-	}
-      else
-	{
-	  memcpy (thdr.dataStamp, nlm_custom_header (abfd)->dataStamp,
-		  sizeof (thdr.dataStamp));
-	  if (bfd_write ((PTR) &thdr, sizeof (thdr), 1, abfd) != sizeof (thdr))
-	    return false;
-	  if (bfd_write (nlm_custom_header (abfd)->hdr, 1,
-			 nlm_custom_header (abfd)->hdrLength, abfd)
-	      != nlm_custom_header (abfd)->hdrLength)
-	    return false;
-	}
-    }
-
-  /* Write out the Cygnus debugging header if there is one.  */
-  if (find_nonzero ((PTR) nlm_cygnus_ext_header (abfd),
-		    sizeof (Nlm_Internal_Cygnus_Ext_Header)))
-    {
-      Nlm_External_Custom_Header thdr;
-
-      memcpy (thdr.stamp, "CuStHeAd", 8);
-      put_word (abfd, (bfd_vma) 2 * NLM_TARGET_LONG_SIZE + 8,
-		(bfd_byte *) thdr.length);
-      put_word (abfd, (bfd_vma) nlm_cygnus_ext_header (abfd)->offset,
-		(bfd_byte *) thdr.dataOffset);
-      put_word (abfd, (bfd_vma) nlm_cygnus_ext_header (abfd)->length,
-		(bfd_byte *) thdr.dataLength);
-      memcpy (thdr.dataStamp, "CyGnUsEx", 8);
-      if (bfd_write ((PTR) &thdr, sizeof (thdr), 1, abfd) != sizeof (thdr))
-	return false;
-    }
-
-  return true;
-}
-
-/* We read the NLM's public symbols and use it to generate a bfd symbol
-   table (hey, it's better than nothing) on a one-for-one basis.  Thus
-   use the number of public symbols as the number of bfd symbols we will
-   have once we actually get around to reading them in.
-
-   Return the number of bytes required to hold the symtab vector, based on
-   the count plus 1, since we will NULL terminate the vector allocated based
-   on this size. */
-
-long
-nlm_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  Nlm_Internal_Fixed_Header *i_fxdhdrp;	/* Nlm file header, internal form */
-  long symcount;
-  long symtab_size = 0;
-
-  i_fxdhdrp = nlm_fixed_header (abfd);
-  symcount = (i_fxdhdrp->numberOfPublics
-	      + i_fxdhdrp->numberOfDebugRecords
-	      + i_fxdhdrp->numberOfExternalReferences);
-  symtab_size = (symcount + 1) * (sizeof (asymbol));
-  return (symtab_size);
-}
-
-/* Note that bfd_get_symcount is guaranteed to be zero if slurping the
-   symbol table fails. */
-
-long
-nlm_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  nlm_symbol_type *symbase;
-  bfd_size_type counter = 0;
-
-  if (nlm_slurp_symbol_table (abfd) == false)
-    return -1;
-  symbase = nlm_get_symbols (abfd);
-  while (counter < bfd_get_symcount (abfd))
-    {
-      *alocation++ = &symbase->symbol;
-      symbase++;
-      counter++;
-    }
-  *alocation = (asymbol *) NULL;
-  return bfd_get_symcount (abfd);
-}
-
-/* Make an NLM symbol.  There is nothing special to do here.  */
-
-asymbol *
-nlm_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  nlm_symbol_type *new;
-
-  new = (nlm_symbol_type *) bfd_zalloc (abfd, sizeof (nlm_symbol_type));
-  if (new)
-    new->symbol.the_bfd = abfd;
-  return &new->symbol;
-}
-
-/* Get symbol information.  */
-
-void
-nlm_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-/* Print symbol information.  */
-
-void
-nlm_print_symbol (abfd, afile, symbol, how)
-     bfd *abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) afile;
-
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-    case bfd_print_symbol_more:
-      if (symbol->name)
-	fprintf (file, "%s", symbol->name);
-      break;
-    case bfd_print_symbol_all:
-      bfd_print_symbol_vandf ((PTR) file, symbol);
-      fprintf (file, " %-5s", symbol->section->name);
-      if (symbol->name)
-	fprintf (file, " %s", symbol->name);
-      break;
-    }
-}
-
-/* Slurp in nlm symbol table.
-
-   In the external (in-file) form, NLM export records are variable length,
-   with the following form:
-
-	1 byte		length of the symbol name (N)
-	N bytes		the symbol name
-	4 bytes		the symbol offset from start of it's section
-
-   We also read in the debugging symbols and import records.  Import
-   records are treated as undefined symbols.  As we read the import
-   records we also read in the associated reloc information, which is
-   attached to the symbol.
-
-   The bfd symbols are copied to SYMPTRS.
-
-   When we return, the bfd symcount is either zero or contains the correct
-   number of symbols.
-*/
-
-static boolean
-nlm_slurp_symbol_table (abfd)
-     bfd *abfd;
-{
-  Nlm_Internal_Fixed_Header *i_fxdhdrp;	/* Nlm file header, internal form */
-  bfd_size_type totsymcount;	/* Number of NLM symbols */
-  bfd_size_type symcount;	/* Counter of NLM symbols */
-  nlm_symbol_type *sym;		/* Pointer to current bfd symbol */
-  unsigned char symlength;	/* Symbol length read into here */
-  unsigned char symtype;	/* Type of debugging symbol */
-  bfd_byte temp[NLM_TARGET_LONG_SIZE];	/* Symbol offsets read into here */
-  boolean (*read_import_func) PARAMS ((bfd *, nlm_symbol_type *));
-  boolean (*set_public_section_func) PARAMS ((bfd *, nlm_symbol_type *));
-
-  if (nlm_get_symbols (abfd) != NULL)
-    return (true);
-
-  /* Read each raw NLM symbol, using the information to create a canonical bfd
-     symbol table entry.
-
-     Note that we allocate the initial bfd canonical symbol buffer based on a
-     one-to-one mapping of the NLM symbols to canonical symbols.  We actually
-     use all the NLM symbols, so there will be no space left over at the end.
-     When we have all the symbols, we build the caller's pointer vector. */
-
-  abfd->symcount = 0;
-  i_fxdhdrp = nlm_fixed_header (abfd);
-  totsymcount = (i_fxdhdrp->numberOfPublics
-		 + i_fxdhdrp->numberOfDebugRecords
-		 + i_fxdhdrp->numberOfExternalReferences);
-  if (totsymcount == 0)
-    {
-      return (true);
-    }
-
-  if (bfd_seek (abfd, i_fxdhdrp->publicsOffset, SEEK_SET) == -1)
-    return (false);
-
-  sym = ((nlm_symbol_type *)
-	 bfd_zalloc (abfd, totsymcount * sizeof (nlm_symbol_type)));
-  if (!sym)
-    return false;
-  nlm_set_symbols (abfd, sym);
-
-  /* We use the bfd's symcount directly as the control count, so that early
-     termination of the loop leaves the symcount correct for the symbols that
-     were read. */
-
-  set_public_section_func = nlm_set_public_section_func (abfd);
-  symcount = i_fxdhdrp->numberOfPublics;
-  while (abfd->symcount < symcount)
-    {
-      if (bfd_read ((PTR) & symlength, sizeof (symlength), 1, abfd)
-	  != sizeof (symlength))
-	return (false);
-      sym->symbol.the_bfd = abfd;
-      sym->symbol.name = bfd_alloc (abfd, symlength + 1);
-      if (!sym->symbol.name)
-	return false;
-      if (bfd_read ((PTR) sym->symbol.name, symlength, 1, abfd)
-	  != symlength)
-	return (false);
-      /* Cast away const.  */
-      ((char *) (sym->symbol.name))[symlength] = '\0';
-      if (bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp))
-	return (false);
-      sym->symbol.flags = BSF_GLOBAL | BSF_EXPORT;
-      sym->symbol.value = get_word (abfd, temp);
-      if (set_public_section_func)
-	{
-	  /* Most backends can use the code below, but unfortunately
-	     some use a different scheme.  */
-	  if ((*set_public_section_func) (abfd, sym) == false)
-	    return false;
-	}
-      else
-	{
-	  if (sym->symbol.value & NLM_HIBIT)
-	    {
-	      sym->symbol.value &= ~NLM_HIBIT;
-	      sym->symbol.flags |= BSF_FUNCTION;
-	      sym->symbol.section =
-		bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-	    }
-	  else
-	    {
-	      sym->symbol.section =
-		bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-	    }
-	}
-      sym->rcnt = 0;
-      abfd->symcount++;
-      sym++;
-    }
-
-  /* Read the debugging records.  */
-
-  if (i_fxdhdrp->numberOfDebugRecords > 0)
-    {
-      if (bfd_seek (abfd, i_fxdhdrp->debugInfoOffset, SEEK_SET) == -1)
-	return (false);
-
-      symcount += i_fxdhdrp->numberOfDebugRecords;
-      while (abfd->symcount < symcount)
-	{
-	  if ((bfd_read ((PTR) & symtype, sizeof (symtype), 1, abfd)
-	       != sizeof (symtype))
-	   || bfd_read ((PTR) temp, sizeof (temp), 1, abfd) != sizeof (temp)
-	      || (bfd_read ((PTR) & symlength, sizeof (symlength), 1, abfd)
-		  != sizeof (symlength)))
-	    return false;
-	  sym->symbol.the_bfd = abfd;
-	  sym->symbol.name = bfd_alloc (abfd, symlength + 1);
-	  if (!sym->symbol.name)
-	    return false;
-	  if (bfd_read ((PTR) sym->symbol.name, symlength, 1, abfd)
-	      != symlength)
-	    return (false);
-	  /* Cast away const.  */
-	  ((char *) (sym->symbol.name))[symlength] = '\0';
-	  sym->symbol.flags = BSF_LOCAL;
-	  sym->symbol.value = get_word (abfd, temp);
-	  if (symtype == 0)
-	    {
-	      sym->symbol.section =
-		bfd_get_section_by_name (abfd, NLM_INITIALIZED_DATA_NAME);
-	    }
-	  else if (symtype == 1)
-	    {
-	      sym->symbol.flags |= BSF_FUNCTION;
-	      sym->symbol.section =
-		bfd_get_section_by_name (abfd, NLM_CODE_NAME);
-	    }
-	  else
-	    {
-	      sym->symbol.section = bfd_abs_section_ptr;
-	    }
-	  sym->rcnt = 0;
-	  abfd->symcount++;
-	  sym++;
-	}
-    }
-
-  /* Read in the import records.  We can only do this if we know how
-     to read relocs for this target.  */
-
-  read_import_func = nlm_read_import_func (abfd);
-  if (read_import_func != NULL)
-    {
-      if (bfd_seek (abfd, i_fxdhdrp->externalReferencesOffset, SEEK_SET)
-	  == -1)
-	return (false);
-
-      symcount += i_fxdhdrp->numberOfExternalReferences;
-      while (abfd->symcount < symcount)
-	{
-	  if ((*read_import_func) (abfd, sym) == false)
-	    return false;
-	  sym++;
-	  abfd->symcount++;
-	}
-    }
-
-  return (true);
-}
-
-/* Get the relocs for an NLM file.  There are two types of relocs.
-   Imports are relocs against symbols defined in other NLM files.  We
-   treat these as relocs against global symbols.  Relocation fixups
-   are internal relocs.
-
-   The actual format used to store the relocs is machine specific.  */
-
-/* Read in the relocation fixup information.  This is stored in
-   nlm_relocation_fixups, an array of arelent structures, and
-   nlm_relocation_fixup_secs, an array of section pointers.  The
-   section pointers are needed because the relocs are not sorted by
-   section.  */
-
-static boolean
-nlm_slurp_reloc_fixups (abfd)
-     bfd *abfd;
-{
-  boolean (*read_func) PARAMS ((bfd *, nlm_symbol_type *, asection **,
-				arelent *));
-  bfd_size_type count;
-  arelent *rels;
-  asection **secs;
-
-  if (nlm_relocation_fixups (abfd) != NULL)
-    return true;
-  read_func = nlm_read_reloc_func (abfd);
-  if (read_func == NULL)
-    return true;
-
-  if (bfd_seek (abfd, nlm_fixed_header (abfd)->relocationFixupOffset,
-		SEEK_SET) != 0)
-    return false;
-
-  count = nlm_fixed_header (abfd)->numberOfRelocationFixups;
-  rels = (arelent *) bfd_alloc (abfd, count * sizeof (arelent));
-  secs = (asection **) bfd_alloc (abfd, count * sizeof (asection *));
-  if ((rels == NULL || secs == NULL) && count != 0)
-    return false;
-  nlm_relocation_fixups (abfd) = rels;
-  nlm_relocation_fixup_secs (abfd) = secs;
-
-  /* We have to read piece by piece, because we don't know how large
-     the machine specific reloc information is.  */
-  while (count-- != 0)
-    {
-      if ((*read_func) (abfd, (nlm_symbol_type *) NULL, secs, rels) == false)
-	{
-	  nlm_relocation_fixups (abfd) = NULL;
-	  nlm_relocation_fixup_secs (abfd) = NULL;
-	  return false;
-	}
-      ++secs;
-      ++rels;
-    }
-
-  return true;
-}
-
-/* Get the number of relocs.  This really just returns an upper bound,
-   since it does not attempt to distinguish them based on the section.
-   That will be handled when they are actually read.  */
-
-long
-nlm_get_reloc_upper_bound (abfd, sec)
-     bfd *abfd;
-     asection *sec;
-{
-  nlm_symbol_type *syms;
-  bfd_size_type count;
-  unsigned int ret;
-
-  /* If we don't know how to read relocs, just return 0.  */
-  if (nlm_read_reloc_func (abfd) == NULL)
-    return -1;
-  /* Make sure we have either the code or the data section.  */
-  if ((bfd_get_section_flags (abfd, sec) & (SEC_CODE | SEC_DATA)) == 0)
-    return 0;
-
-  syms = nlm_get_symbols (abfd);
-  if (syms == NULL)
-    {
-      if (nlm_slurp_symbol_table (abfd) == false)
-	return -1;
-      syms = nlm_get_symbols (abfd);
-    }
-
-  ret = nlm_fixed_header (abfd)->numberOfRelocationFixups;
-
-  count = bfd_get_symcount (abfd);
-  while (count-- != 0)
-    {
-      ret += syms->rcnt;
-      ++syms;
-    }
-
-  return (ret + 1) * sizeof (arelent *);
-}
-
-/* Get the relocs themselves.  */
-
-long
-nlm_canonicalize_reloc (abfd, sec, relptr, symbols)
-     bfd *abfd;
-     asection *sec;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *rels;
-  asection **secs;
-  bfd_size_type count, i;
-  unsigned int ret;
-
-  /* Get the relocation fixups.  */
-  rels = nlm_relocation_fixups (abfd);
-  if (rels == NULL)
-    {
-      if (nlm_slurp_reloc_fixups (abfd) == false)
-	return -1;
-      rels = nlm_relocation_fixups (abfd);
-    }
-  secs = nlm_relocation_fixup_secs (abfd);
-
-  ret = 0;
-  count = nlm_fixed_header (abfd)->numberOfRelocationFixups;
-  for (i = 0; i < count; i++, rels++, secs++)
-    {
-      if (*secs == sec)
-	{
-	  *relptr++ = rels;
-	  ++ret;
-	}
-    }
-
-  /* Get the import symbols.  */
-  count = bfd_get_symcount (abfd);
-  for (i = 0; i < count; i++, symbols++)
-    {
-      asymbol *sym;
-
-      sym = *symbols;
-      if (bfd_asymbol_flavour (sym) == bfd_target_nlm_flavour)
-	{
-	  nlm_symbol_type *nlm_sym;
-	  bfd_size_type j;
-
-	  nlm_sym = (nlm_symbol_type *) sym;
-	  for (j = 0; j < nlm_sym->rcnt; j++)
-	    {
-	      if (nlm_sym->relocs[j].section == sec)
-		{
-		  *relptr = &nlm_sym->relocs[j].reloc;
-		  (*relptr)->sym_ptr_ptr = symbols;
-		  ++relptr;
-		  ++ret;
-		}
-	    }
-	}
-    }
-
-  *relptr = NULL;
-
-  return ret;
-}
-
-/* Compute the section file positions for an NLM file.  All variable
-   length data in the file headers must be set before this function is
-   called.  If the variable length data is changed later, the
-   resulting object file will be incorrect.  Unfortunately, there is
-   no way to check this.
-
-   This routine also sets the Size and Offset fields in the fixed
-   header.
-
-   It also looks over the symbols and moves any common symbols into
-   the .bss section; NLM has no way to represent a common symbol.
-   This approach means that either the symbols must already have been
-   set at this point, or there must be no common symbols.  We need to
-   move the symbols at this point so that mangle_relocs can see the
-   final values.  */
-
-static boolean
-nlm_compute_section_file_positions (abfd)
-     bfd *abfd;
-{
-  file_ptr sofar;
-  asection *sec;
-  bfd_vma text, data, bss;
-  bfd_vma text_low, data_low;
-  unsigned int text_align, data_align, other_align;
-  file_ptr text_ptr, data_ptr, other_ptr;
-  asection *bss_sec;
-  asymbol **sym_ptr_ptr;
-
-  if (abfd->output_has_begun == true)
-    return true;
-
-  /* Make sure we have a section to hold uninitialized data.  */
-  bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
-  if (bss_sec == NULL)
-    {
-      if (!add_bfd_section (abfd, NLM_UNINITIALIZED_DATA_NAME,
-			    (file_ptr) 0, (bfd_size_type) 0,
-			    SEC_ALLOC))
-	return false;
-      bss_sec = bfd_get_section_by_name (abfd, NLM_UNINITIALIZED_DATA_NAME);
-    }
-
-  abfd->output_has_begun = true;
-
-  /* The fixed header.  */
-  sofar = nlm_optional_prefix_size (abfd) + nlm_fixed_header_size (abfd);
-
-  /* The variable header.  */
-  sofar += (sizeof (nlm_variable_header (abfd)->descriptionLength)
-	    + nlm_variable_header (abfd)->descriptionLength + 1
-	    + NLM_TARGET_LONG_SIZE	/* stackSize */
-	    + NLM_TARGET_LONG_SIZE	/* reserved */
-	    + sizeof (nlm_variable_header (abfd)->oldThreadName)
-	    + sizeof (nlm_variable_header (abfd)->screenNameLength)
-	    + nlm_variable_header (abfd)->screenNameLength + 1
-	    + sizeof (nlm_variable_header (abfd)->threadNameLength)
-	    + nlm_variable_header (abfd)->threadNameLength + 1);
-
-  /* The auxiliary headers.  */
-  if (find_nonzero ((PTR) nlm_version_header (abfd),
-		    sizeof (Nlm_Internal_Version_Header)))
-    sofar += sizeof (Nlm_External_Version_Header);
-  if (find_nonzero ((PTR) nlm_extended_header (abfd),
-		    sizeof (Nlm_Internal_Extended_Header)))
-    sofar += sizeof (Nlm_External_Extended_Header);
-  if (find_nonzero ((PTR) nlm_copyright_header (abfd),
-		    sizeof (Nlm_Internal_Copyright_Header)))
-    sofar += (sizeof (Nlm_External_Copyright_Header)
-	      + nlm_copyright_header (abfd)->copyrightMessageLength + 1);
-  if (find_nonzero ((PTR) nlm_custom_header (abfd),
-		    sizeof (Nlm_Internal_Custom_Header)))
-    sofar += (sizeof (Nlm_External_Custom_Header)
-	      + nlm_custom_header (abfd)->hdrLength);
-  if (find_nonzero ((PTR) nlm_cygnus_ext_header (abfd),
-		    sizeof (Nlm_Internal_Cygnus_Ext_Header)))
-    sofar += sizeof (Nlm_External_Custom_Header);
-
-  /* Compute the section file positions in two passes.  First get the
-     sizes of the text and data sections, and then set the file
-     positions.  This code aligns the sections in the file using the
-     same alignment restrictions that apply to the sections in memory;
-     this may not be necessary.  */
-  text = 0;
-  text_low = (bfd_vma) - 1;
-  text_align = 0;
-  data = 0;
-  data_low = (bfd_vma) - 1;
-  data_align = 0;
-  bss = 0;
-  other_align = 0;
-  for (sec = abfd->sections; sec != (asection *) NULL; sec = sec->next)
-    {
-      flagword f;
-
-      sec->_raw_size = BFD_ALIGN (sec->_raw_size, 1 << sec->alignment_power);
-
-      f = bfd_get_section_flags (abfd, sec);
-      if (f & SEC_CODE)
-	{
-	  text += sec->_raw_size;
-	  if (bfd_get_section_vma (abfd, sec) < text_low)
-	    text_low = bfd_get_section_vma (abfd, sec);
-	  if (sec->alignment_power > text_align)
-	    text_align = sec->alignment_power;
-	}
-      else if (f & SEC_DATA)
-	{
-	  data += sec->_raw_size;
-	  if (bfd_get_section_vma (abfd, sec) < data_low)
-	    data_low = bfd_get_section_vma (abfd, sec);
-	  if (sec->alignment_power > data_align)
-	    data_align = sec->alignment_power;
-	}
-      else if (f & SEC_HAS_CONTENTS)
-	{
-	  if (sec->alignment_power > other_align)
-	    other_align = sec->alignment_power;
-	}
-      else if (f & SEC_ALLOC)
-	bss += sec->_raw_size;
-    }
-
-  nlm_set_text_low (abfd, text_low);
-  nlm_set_data_low (abfd, data_low);
-
-  if (nlm_no_uninitialized_data (abfd))
-    {
-      /* This NetWare format does not use uninitialized data.  We must
-	 increase the size of the data section.  We will never wind up
-	 writing those file locations, so they will remain zero.  */
-      data += bss;
-      bss = 0;
-    }
-
-  text_ptr = BFD_ALIGN (sofar, 1 << text_align);
-  data_ptr = BFD_ALIGN (text_ptr + text, 1 << data_align);
-  other_ptr = BFD_ALIGN (data_ptr + data, 1 << other_align);
-
-  /* Fill in some fields in the header for which we now have the
-     information.  */
-  nlm_fixed_header (abfd)->codeImageOffset = text_ptr;
-  nlm_fixed_header (abfd)->codeImageSize = text;
-  nlm_fixed_header (abfd)->dataImageOffset = data_ptr;
-  nlm_fixed_header (abfd)->dataImageSize = data;
-  nlm_fixed_header (abfd)->uninitializedDataSize = bss;
-
-  for (sec = abfd->sections; sec != (asection *) NULL; sec = sec->next)
-    {
-      flagword f;
-
-      f = bfd_get_section_flags (abfd, sec);
-
-      if (f & SEC_CODE)
-	{
-	  sec->filepos = text_ptr;
-	  text_ptr += sec->_raw_size;
-	}
-      else if (f & SEC_DATA)
-	{
-	  sec->filepos = data_ptr;
-	  data_ptr += sec->_raw_size;
-	}
-      else if (f & SEC_HAS_CONTENTS)
-	{
-	  sec->filepos = other_ptr;
-	  other_ptr += sec->_raw_size;
-	}
-    }
-
-  nlm_fixed_header (abfd)->relocationFixupOffset = other_ptr;
-
-  /* Move all common symbols into the .bss section.  */
-
-  sym_ptr_ptr = bfd_get_outsymbols (abfd);
-  if (sym_ptr_ptr != NULL)
-    {
-      asymbol **sym_end;
-      bfd_vma add;
-
-      sym_end = sym_ptr_ptr + bfd_get_symcount (abfd);
-      add = 0;
-      for (; sym_ptr_ptr < sym_end; sym_ptr_ptr++)
-	{
-	  asymbol *sym;
-	  bfd_vma size;
-
-	  sym = *sym_ptr_ptr;
-
-	  if (!bfd_is_com_section (bfd_get_section (sym)))
-	    continue;
-
-	  /* Put the common symbol in the .bss section, and increase
-	     the size of the .bss section by the size of the common
-	     symbol (which is the old value of the symbol).  */
-	  sym->section = bss_sec;
-	  size = sym->value;
-	  sym->value = bss_sec->_raw_size + add;
-	  add += size;
-	  add = BFD_ALIGN (add, 1 << bss_sec->alignment_power);
-	}
-      if (add != 0)
-	{
-	  if (nlm_no_uninitialized_data (abfd))
-	    {
-	      /* We could handle this case, but so far it hasn't been
-		 necessary.  */
-	      abort ();
-	    }
-	  nlm_fixed_header (abfd)->uninitializedDataSize += add;
-	  bss_sec->_raw_size += add;
-	}
-    }
-
-  return true;
-}
-
-/* Set the contents of a section.  To do this we need to know where
-   the section is going to be located in the output file.  That means
-   that the sizes of all the sections must be set, and all the
-   variable size header information must be known.  */
-
-boolean
-nlm_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (abfd->output_has_begun == false
-      && nlm_compute_section_file_positions (abfd) == false)
-    return false;
-
-  if (count == 0)
-    return true;
-
-  /* i386 NetWare has a very restricted set of relocs.  In order for
-     objcopy to work, the NLM i386 backend needs a chance to rework
-     the section contents so that its set of relocs will work.  If all
-     the relocs are already acceptable, this will not do anything.  */
-  if (section->reloc_count != 0)
-    {
-      boolean (*mangle_relocs_func) PARAMS ((bfd *, asection *, PTR,
-					     bfd_vma, bfd_size_type));
-
-      mangle_relocs_func = nlm_mangle_relocs_func (abfd);
-      if (mangle_relocs_func != NULL)
-	{
-	  if (!(*mangle_relocs_func) (abfd, section, location,
-				      (bfd_vma) offset, count))
-	    return false;
-	}
-    }
-
-  if (bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) != 0
-      || bfd_write (location, 1, count, abfd) != count)
-    return false;
-
-  return true;
-}
-
-/* We need to sort a list of relocs associated with sections when we
-   write out the external relocs.  */
-
-static int
-nlm_external_reloc_compare (p1, p2)
-     const void *p1;
-     const void *p2;
-{
-  const struct reloc_and_sec *r1 = (const struct reloc_and_sec *) p1;
-  const struct reloc_and_sec *r2 = (const struct reloc_and_sec *) p2;
-  int cmp;
-
-  cmp = strcmp ((*r1->rel->sym_ptr_ptr)->name,
-		(*r2->rel->sym_ptr_ptr)->name);
-  if (cmp != 0)
-    return cmp;
-
-  /* We sort by address within symbol to make the sort more stable and
-     increase the chances that different hosts will generate bit for
-     bit equivalent results.  */
-  return (int) (r1->rel->address - r2->rel->address);
-}
-
-/* Write out an NLM file.  We write out the information in this order:
-     fixed header
-     variable header
-     auxiliary headers
-     code sections
-     data sections
-     other sections (custom data, messages, help, shared NLM, RPC,
-     		     module dependencies)
-     relocation fixups
-     external references (imports)
-     public symbols (exports)
-     debugging records
-   This is similar to the order used by the NetWare tools; the
-   difference is that NetWare puts the sections other than code, data
-   and custom data at the end of the NLM.  It is convenient for us to
-   know where the sections are going to be before worrying about the
-   size of the other information.
-
-   By the time this function is called, all the section data should
-   have been output using set_section_contents.  Note that custom
-   data, the message file, the help file, the shared NLM file, the RPC
-   data, and the module dependencies are all considered to be
-   sections; the caller is responsible for filling in the offset and
-   length fields in the NLM headers.  The relocation fixups and
-   imports are both obtained from the list of relocs attached to each
-   section.  The exports and debugging records are obtained from the
-   list of outsymbols.  */
-
-boolean
-nlm_write_object_contents (abfd)
-     bfd *abfd;
-{
-  asection *sec;
-  boolean (*write_import_func) PARAMS ((bfd *, asection *, arelent *));
-  bfd_size_type external_reloc_count, internal_reloc_count, i, c;
-  struct reloc_and_sec *external_relocs;
-  asymbol **sym_ptr_ptr;
-  file_ptr last;
-  boolean (*write_prefix_func) PARAMS ((bfd *));
-  unsigned char *fixed_header = NULL;
-
-  fixed_header = ((unsigned char *)
-		  bfd_malloc ((size_t) nlm_fixed_header_size (abfd)));
-  if (fixed_header == NULL)
-    goto error_return;
-
-  if (abfd->output_has_begun == false
-      && nlm_compute_section_file_positions (abfd) == false)
-    goto error_return;
-
-  /* Write out the variable length headers.  */
-  if (bfd_seek (abfd,
-	     nlm_optional_prefix_size (abfd) + nlm_fixed_header_size (abfd),
-		SEEK_SET) != 0)
-    goto error_return;
-  if (nlm_swap_variable_header_out (abfd) == false
-      || nlm_swap_auxiliary_headers_out (abfd) == false)
-    {
-      bfd_set_error (bfd_error_system_call);
-      goto error_return;
-    }
-
-  /* A weak check on whether the section file positions were
-     reasonable.  */
-  if (bfd_tell (abfd) > nlm_fixed_header (abfd)->codeImageOffset)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      goto error_return;
-    }
-
-  /* Advance to the relocs.  */
-  if (bfd_seek (abfd, nlm_fixed_header (abfd)->relocationFixupOffset,
-		SEEK_SET) != 0)
-    goto error_return;
-
-  /* The format of the relocation entries is dependent upon the
-     particular target.  We use an external routine to write the reloc
-     out.  */
-  write_import_func = nlm_write_import_func (abfd);
-
-  /* Write out the internal relocation fixups.  While we're looping
-     over the relocs, we also count the external relocs, which is
-     needed when they are written out below.  */
-  internal_reloc_count = 0;
-  external_reloc_count = 0;
-  for (sec = abfd->sections; sec != (asection *) NULL; sec = sec->next)
-    {
-      arelent **rel_ptr_ptr, **rel_end;
-
-      if (sec->reloc_count == 0)
-	continue;
-
-      /* We can only represent relocs within a code or data
-	 section.  We ignore them for a debugging section.  */
-      if ((bfd_get_section_flags (abfd, sec) & (SEC_CODE | SEC_DATA)) == 0)
-	continue;
-
-      /* We need to know how to write out imports */
-      if (write_import_func == NULL)
-	{
-	  bfd_set_error (bfd_error_invalid_operation);
-	  goto error_return;
-	}
-
-      rel_ptr_ptr = sec->orelocation;
-      rel_end = rel_ptr_ptr + sec->reloc_count;
-      for (; rel_ptr_ptr < rel_end; rel_ptr_ptr++)
-	{
-	  arelent *rel;
-	  asymbol *sym;
-
-	  rel = *rel_ptr_ptr;
-	  sym = *rel->sym_ptr_ptr;
-
-	  if (! bfd_is_und_section (bfd_get_section (sym)))
-	    {
-	      ++internal_reloc_count;
-	      if ((*write_import_func) (abfd, sec, rel) == false)
-		goto error_return;
-	    }
-	  else
-	    ++external_reloc_count;
-	}
-    }
-  nlm_fixed_header (abfd)->numberOfRelocationFixups = internal_reloc_count;
-
-  /* Write out the imports (relocs against external symbols).  These
-     are output as a symbol name followed by all the relocs for that
-     symbol, so we must first gather together all the relocs against
-     external symbols and sort them.  */
-  external_relocs =
-    (struct reloc_and_sec *) bfd_alloc (abfd,
-					(external_reloc_count
-					 * sizeof (struct reloc_and_sec)));
-  if (external_relocs == (struct reloc_and_sec *) NULL)
-    goto error_return;
-  i = 0;
-  for (sec = abfd->sections; sec != (asection *) NULL; sec = sec->next)
-    {
-      arelent **rel_ptr_ptr, **rel_end;
-
-      if (sec->reloc_count == 0)
-	continue;
-
-      rel_ptr_ptr = sec->orelocation;
-      rel_end = rel_ptr_ptr + sec->reloc_count;
-      for (; rel_ptr_ptr < rel_end; rel_ptr_ptr++)
-	{
-	  arelent *rel;
-	  asymbol *sym;
-
-	  rel = *rel_ptr_ptr;
-	  sym = *rel->sym_ptr_ptr;
-
-	  if (! bfd_is_und_section (bfd_get_section (sym)))
-	    continue;
-
-	  external_relocs[i].rel = rel;
-	  external_relocs[i].sec = sec;
-	  ++i;
-	}
-    }
-
-  BFD_ASSERT (i == external_reloc_count);
-
-  /* Sort the external relocs by name.  */
-  qsort ((PTR) external_relocs, (size_t) external_reloc_count,
-	 sizeof (struct reloc_and_sec), nlm_external_reloc_compare);
-
-  /* Write out the external relocs.  */
-  nlm_fixed_header (abfd)->externalReferencesOffset = bfd_tell (abfd);
-  c = 0;
-  i = 0;
-  while (i < external_reloc_count)
-    {
-      arelent *rel;
-      asymbol *sym;
-      bfd_size_type j, cnt;
-
-      ++c;
-
-      rel = external_relocs[i].rel;
-      sym = *rel->sym_ptr_ptr;
-
-      cnt = 0;
-      for (j = i;
-	   (j < external_reloc_count
-	    && *external_relocs[j].rel->sym_ptr_ptr == sym);
-	   j++)
-	++cnt;
-
-      if ((*nlm_write_external_func (abfd)) (abfd, cnt, sym,
-					     &external_relocs[i])
-	  == false)
-	goto error_return;
-
-      i += cnt;
-    }
-
-  nlm_fixed_header (abfd)->numberOfExternalReferences = c;
-
-  /* Write out the public symbols (exports).  */
-  sym_ptr_ptr = bfd_get_outsymbols (abfd);
-  if (sym_ptr_ptr != (asymbol **) NULL)
-    {
-      bfd_vma (*get_public_offset_func) PARAMS ((bfd *, asymbol *));
-      boolean (*write_export_func) PARAMS ((bfd *, asymbol *, bfd_vma));
-
-      asymbol **sym_end;
-
-      nlm_fixed_header (abfd)->publicsOffset = bfd_tell (abfd);
-      get_public_offset_func = nlm_get_public_offset_func (abfd);
-      write_export_func = nlm_write_export_func (abfd);
-      c = 0;
-      sym_end = sym_ptr_ptr + bfd_get_symcount (abfd);
-      for (; sym_ptr_ptr < sym_end; sym_ptr_ptr++)
-	{
-	  asymbol *sym;
-	  bfd_byte len;
-	  bfd_vma offset;
-	  bfd_byte temp[NLM_TARGET_LONG_SIZE];
-
-	  sym = *sym_ptr_ptr;
-
-	  if ((sym->flags & (BSF_EXPORT | BSF_GLOBAL)) == 0
-	      || bfd_is_und_section (bfd_get_section (sym)))
-	    continue;
-
-	  ++c;
-
-	  if (get_public_offset_func)
-	    {
-	      /* Most backends can use the code below, but
-		 unfortunately some use a different scheme.  */
-	      offset = (*get_public_offset_func) (abfd, sym);
-	    }
-	  else
-	    {
-	      offset = bfd_asymbol_value (sym);
-	      sec = sym->section;
-	      if (sec->flags & SEC_CODE)
-		{
-		  offset -= nlm_get_text_low (abfd);
-		  offset |= NLM_HIBIT;
-		}
-	      else if (sec->flags & (SEC_DATA | SEC_ALLOC))
-		{
-		  /* SEC_ALLOC is for the .bss section.  */
-		  offset -= nlm_get_data_low (abfd);
-		}
-	      else
-		{
-		  /* We can't handle an exported symbol that is not in
-		     the code or data segment.  */
-		  bfd_set_error (bfd_error_invalid_operation);
-		  goto error_return;
-		}
-	    }
-
-	  if (write_export_func)
-	    {
-	      if ((*write_export_func) (abfd, sym, offset) == false)
-		goto error_return;
-	    }
-	  else
-	    {
-	      len = strlen (sym->name);
-	      if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd)
-		   != sizeof (bfd_byte))
-		  || bfd_write (sym->name, len, 1, abfd) != len)
-		goto error_return;
-
-	      put_word (abfd, offset, temp);
-	      if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-		goto error_return;
-	    }
-	}
-      nlm_fixed_header (abfd)->numberOfPublics = c;
-
-      /* Write out the debugging records.  The NLM conversion program
-	 wants to be able to inhibit this, so as a special hack if
-	 debugInfoOffset is set to -1 we don't write any debugging
-	 information.  This can not be handled by fiddling with the
-	 symbol table, because exported symbols appear in both the
-	 exported symbol list and the debugging information.  */
-      if (nlm_fixed_header (abfd)->debugInfoOffset == (file_ptr) - 1)
-	{
-	  nlm_fixed_header (abfd)->debugInfoOffset = 0;
-	  nlm_fixed_header (abfd)->numberOfDebugRecords = 0;
-	}
-      else
-	{
-	  nlm_fixed_header (abfd)->debugInfoOffset = bfd_tell (abfd);
-	  c = 0;
-	  sym_ptr_ptr = bfd_get_outsymbols (abfd);
-	  sym_end = sym_ptr_ptr + bfd_get_symcount (abfd);
-	  for (; sym_ptr_ptr < sym_end; sym_ptr_ptr++)
-	    {
-	      asymbol *sym;
-	      bfd_byte type, len;
-	      bfd_vma offset;
-	      bfd_byte temp[NLM_TARGET_LONG_SIZE];
-
-	      sym = *sym_ptr_ptr;
-
-	      /* The NLM notion of a debugging symbol is actually what
-		 BFD calls a local or global symbol.  What BFD calls a
-		 debugging symbol NLM does not understand at all.  */
-	      if ((sym->flags & (BSF_LOCAL | BSF_GLOBAL | BSF_EXPORT)) == 0
-		  || (sym->flags & BSF_DEBUGGING) != 0
-		  || bfd_is_und_section (bfd_get_section (sym)))
-		continue;
-
-	      ++c;
-
-	      offset = bfd_asymbol_value (sym);
-	      sec = sym->section;
-	      if (sec->flags & SEC_CODE)
-		{
-		  offset -= nlm_get_text_low (abfd);
-		  type = 1;
-		}
-	      else if (sec->flags & (SEC_DATA | SEC_ALLOC))
-		{
-		  /* SEC_ALLOC is for the .bss section.  */
-		  offset -= nlm_get_data_low (abfd);
-		  type = 0;
-		}
-	      else
-		type = 2;
-
-	      /* The type is 0 for data, 1 for code, 2 for absolute.  */
-	      if (bfd_write (&type, sizeof (bfd_byte), 1, abfd)
-		  != sizeof (bfd_byte))
-		goto error_return;
-
-	      put_word (abfd, offset, temp);
-	      if (bfd_write (temp, sizeof (temp), 1, abfd) != sizeof (temp))
-		goto error_return;
-
-	      len = strlen (sym->name);
-	      if ((bfd_write (&len, sizeof (bfd_byte), 1, abfd)
-		   != sizeof (bfd_byte))
-		  || bfd_write (sym->name, len, 1, abfd) != len)
-		goto error_return;
-	    }
-	  nlm_fixed_header (abfd)->numberOfDebugRecords = c;
-	}
-    }
-
-  /* NLMLINK fills in offset values even if there is no data, so we do
-     the same.  */
-  last = bfd_tell (abfd);
-  if (nlm_fixed_header (abfd)->codeImageOffset == 0)
-    nlm_fixed_header (abfd)->codeImageOffset = last;
-  if (nlm_fixed_header (abfd)->dataImageOffset == 0)
-    nlm_fixed_header (abfd)->dataImageOffset = last;
-  if (nlm_fixed_header (abfd)->customDataOffset == 0)
-    nlm_fixed_header (abfd)->customDataOffset = last;
-  if (nlm_fixed_header (abfd)->moduleDependencyOffset == 0)
-    nlm_fixed_header (abfd)->moduleDependencyOffset = last;
-  if (nlm_fixed_header (abfd)->relocationFixupOffset == 0)
-    nlm_fixed_header (abfd)->relocationFixupOffset = last;
-  if (nlm_fixed_header (abfd)->externalReferencesOffset == 0)
-    nlm_fixed_header (abfd)->externalReferencesOffset = last;
-  if (nlm_fixed_header (abfd)->publicsOffset == 0)
-    nlm_fixed_header (abfd)->publicsOffset = last;
-  if (nlm_fixed_header (abfd)->debugInfoOffset == 0)
-    nlm_fixed_header (abfd)->debugInfoOffset = last;
-
-  /* At this point everything has been written out except the fixed
-     header.  */
-  memcpy (nlm_fixed_header (abfd)->signature, nlm_signature (abfd),
-	  NLM_SIGNATURE_SIZE);
-  nlm_fixed_header (abfd)->version = NLM_HEADER_VERSION;
-  nlm_fixed_header (abfd)->codeStartOffset =
-    (bfd_get_start_address (abfd)
-     - nlm_get_text_low (abfd));
-
-  /* We have no convenient way for the caller to pass in the exit
-     procedure or the check unload procedure, so the caller must set
-     the values in the header to the values of the symbols.  */
-  nlm_fixed_header (abfd)->exitProcedureOffset -= nlm_get_text_low (abfd);
-  if (nlm_fixed_header (abfd)->checkUnloadProcedureOffset != 0)
-    nlm_fixed_header (abfd)->checkUnloadProcedureOffset -=
-      nlm_get_text_low (abfd);
-
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
-    goto error_return;
-
-  write_prefix_func = nlm_write_prefix_func (abfd);
-  if (write_prefix_func)
-    {
-      if ((*write_prefix_func) (abfd) == false)
-	goto error_return;
-    }
-
-  BFD_ASSERT ((bfd_size_type) bfd_tell (abfd)
-	      == nlm_optional_prefix_size (abfd));
-
-  nlm_swap_fixed_header_out (abfd, nlm_fixed_header (abfd), fixed_header);
-  if (bfd_write (fixed_header, nlm_fixed_header_size (abfd), 1, abfd)
-      != nlm_fixed_header_size (abfd))
-    goto error_return;
-
-  if (fixed_header != NULL)
-    free (fixed_header);
-  return true;
-
-error_return:
-  if (fixed_header != NULL)
-    free (fixed_header);
-  return false;
-}
diff --git a/bfd/nlmswap.h b/bfd/nlmswap.h
deleted file mode 100644
index 5a9ce7268d0..00000000000
--- a/bfd/nlmswap.h
+++ /dev/null
@@ -1,157 +0,0 @@
-/* NLM (NetWare Loadable Module) swapping routines for BFD.
-   Copyright (C) 1993 Free Software Foundation, Inc.
-
-   Written by Fred Fish @ Cygnus Support, using ELF support as the
-   template.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Although this is a header file, it defines functions.  It is
-   included by NLM backends to define swapping functions that vary
-   from one NLM to another.  The backend code must arrange for
-   Nlm_External_xxxx to be defined appropriately, and can then include
-   this file to get the swapping routines.
-
-   At the moment this is only needed for one structure, the fixed NLM
-   file header.  */
-
-static void nlm_swap_fixed_header_in PARAMS ((bfd *, PTR,
-					      Nlm_Internal_Fixed_Header *));
-static void nlm_swap_fixed_header_out PARAMS ((bfd *,
-					       Nlm_Internal_Fixed_Header *,
-					       PTR));
-
-/* Translate an NLM fixed length file header in external format into an NLM
-   file header in internal format. */
-
-static void
-nlm_swap_fixed_header_in (abfd, realsrc, dst)
-     bfd *abfd;
-     PTR realsrc;
-     Nlm_Internal_Fixed_Header *dst;
-{
-  Nlm_External_Fixed_Header *src = (Nlm_External_Fixed_Header *) realsrc;
-  memcpy (dst->signature, src->signature, NLM_SIGNATURE_SIZE);
-  memcpy (dst->moduleName, src->moduleName, NLM_MODULE_NAME_SIZE);
-  dst->version =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->version);
-  dst->codeImageOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->codeImageOffset);
-  dst->codeImageSize =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->codeImageSize);
-  dst->dataImageOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->dataImageOffset);
-  dst->dataImageSize =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->dataImageSize);
-  dst->uninitializedDataSize =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->uninitializedDataSize);
-  dst->customDataOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->customDataOffset);
-  dst->customDataSize =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->customDataSize);
-  dst->moduleDependencyOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->moduleDependencyOffset);
-  dst->numberOfModuleDependencies =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->numberOfModuleDependencies);
-  dst->relocationFixupOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->relocationFixupOffset);
-  dst->numberOfRelocationFixups =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->numberOfRelocationFixups);
-  dst->externalReferencesOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->externalReferencesOffset);
-  dst->numberOfExternalReferences =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->numberOfExternalReferences);
-  dst->publicsOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->publicsOffset);
-  dst->numberOfPublics =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->numberOfPublics);
-  dst->debugInfoOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->debugInfoOffset);
-  dst->numberOfDebugRecords =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->numberOfDebugRecords);
-  dst->codeStartOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->codeStartOffset);
-  dst->exitProcedureOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->exitProcedureOffset);
-  dst->checkUnloadProcedureOffset =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->checkUnloadProcedureOffset);
-  dst->moduleType =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->moduleType);
-  dst->flags =
-    bfd_h_get_32 (abfd, (bfd_byte *) src->flags);
-}
-
-/* Translate an NLM fixed length file header in internal format into
-   an NLM file header in external format. */
-
-static void
-nlm_swap_fixed_header_out (abfd, src, realdst)
-     bfd *abfd;
-     Nlm_Internal_Fixed_Header *src;
-     PTR realdst;
-{
-  Nlm_External_Fixed_Header *dst = (Nlm_External_Fixed_Header *) realdst;
-  memset (dst, 0, sizeof *dst);
-  memcpy (dst->signature, src->signature, NLM_SIGNATURE_SIZE);
-  memcpy (dst->moduleName, src->moduleName, NLM_MODULE_NAME_SIZE);
-  bfd_h_put_32 (abfd, (bfd_vma) src->version,
-		(bfd_byte *) dst->version);
-  bfd_h_put_32 (abfd, (bfd_vma) src->codeImageOffset,
-		(bfd_byte *) dst->codeImageOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->codeImageSize,
-		(bfd_byte *) dst->codeImageSize);
-  bfd_h_put_32 (abfd, (bfd_vma) src->dataImageOffset,
-		(bfd_byte *) dst->dataImageOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->dataImageSize,
-		(bfd_byte *) dst->dataImageSize);
-  bfd_h_put_32 (abfd, (bfd_vma) src->uninitializedDataSize,
-		(bfd_byte *) dst->uninitializedDataSize);
-  bfd_h_put_32 (abfd, (bfd_vma) src->customDataOffset,
-		(bfd_byte *) dst->customDataOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->customDataSize,
-		(bfd_byte *) dst->customDataSize);
-  bfd_h_put_32 (abfd, (bfd_vma) src->moduleDependencyOffset,
-		(bfd_byte *) dst->moduleDependencyOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->numberOfModuleDependencies,
-		(bfd_byte *) dst->numberOfModuleDependencies);
-  bfd_h_put_32 (abfd, (bfd_vma) src->relocationFixupOffset,
-		(bfd_byte *) dst->relocationFixupOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->numberOfRelocationFixups,
-		(bfd_byte *) dst->numberOfRelocationFixups);
-  bfd_h_put_32 (abfd, (bfd_vma) src->externalReferencesOffset,
-		(bfd_byte *) dst->externalReferencesOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->numberOfExternalReferences,
-		(bfd_byte *) dst->numberOfExternalReferences);
-  bfd_h_put_32 (abfd, (bfd_vma) src->publicsOffset,
-		(bfd_byte *) dst->publicsOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->numberOfPublics,
-		(bfd_byte *) dst->numberOfPublics);
-  bfd_h_put_32 (abfd, (bfd_vma) src->debugInfoOffset,
-		(bfd_byte *) dst->debugInfoOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->numberOfDebugRecords,
-		(bfd_byte *) dst->numberOfDebugRecords);
-  bfd_h_put_32 (abfd, (bfd_vma) src->codeStartOffset,
-		(bfd_byte *) dst->codeStartOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->exitProcedureOffset,
-		(bfd_byte *) dst->exitProcedureOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->checkUnloadProcedureOffset,
-		(bfd_byte *) dst->checkUnloadProcedureOffset);
-  bfd_h_put_32 (abfd, (bfd_vma) src->moduleType,
-		(bfd_byte *) dst->moduleType);
-  bfd_h_put_32 (abfd, (bfd_vma) src->flags,
-		(bfd_byte *) dst->flags);
-}
diff --git a/bfd/ns32k.h b/bfd/ns32k.h
deleted file mode 100644
index d63ba096219..00000000000
--- a/bfd/ns32k.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/* Header file for ns32k routines.
-   Copyright 1996 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-extern bfd_reloc_status_type _bfd_ns32k_relocate_contents
-  PARAMS ((reloc_howto_type *, bfd *, bfd_vma, bfd_byte *));
-
-extern bfd_reloc_status_type _bfd_do_ns32k_reloc_contents
-  PARAMS ((reloc_howto_type *, bfd *, bfd_vma, bfd_byte *,
-	   long (*) PARAMS ((bfd_byte *, long, long)),
-	   int (*) PARAMS ((long, bfd_byte *, long, long))));
-
-extern bfd_reloc_status_type _bfd_ns32k_final_link_relocate
-  PARAMS ((reloc_howto_type *, bfd *, asection *, bfd_byte *, bfd_vma,
-	   bfd_vma, bfd_vma));
-
-extern long _bfd_ns32k_get_displacement PARAMS ((bfd_byte *, long, long));
-extern long _bfd_ns32k_get_immediate PARAMS ((bfd_byte *, long, long));
-extern int _bfd_ns32k_put_displacement PARAMS ((long, bfd_byte *, long, long));
-extern int _bfd_ns32k_put_immediate PARAMS ((long, bfd_byte *, long, long));
-
-extern bfd_reloc_status_type _bfd_ns32k_reloc_disp
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-extern bfd_reloc_status_type _bfd_ns32k_reloc_imm
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
diff --git a/bfd/ns32knetbsd.c b/bfd/ns32knetbsd.c
deleted file mode 100644
index a22356df6e1..00000000000
--- a/bfd/ns32knetbsd.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* BFD back-end for NetBSD/ns32k a.out-ish binaries.
-   Copyright (C) 1990, 91, 92, 94, 95, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#define	BYTES_IN_WORD	4
-#undef TARGET_IS_BIG_ENDIAN_P
-
-#define	TARGET_PAGE_SIZE	4096
-#define	SEGMENT_SIZE	4096
-
-#define	DEFAULT_ARCH	bfd_arch_ns32k
-#define	DEFAULT_MID 	M_532_NETBSD
-
-#define MY(OP) CAT(pc532netbsd_,OP)
-
-#define NAME(x,y) CAT3(ns32kaout,_32_,y)
-
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME "a.out-ns32k-netbsd"
-
-#define ns32kaout_32_get_section_contents aout_32_get_section_contents
-
-#define MY_text_includes_header 1
-
-/* We can`t use the MYNS macro here for cpp reasons too subtle
- * for me -- IWD
- */
-#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
-
-#include "bfd.h"		/* To ensure following declaration is OK */
-
-CONST struct reloc_howto_struct *
-MY_bfd_reloc_type_lookup
-  PARAMS((bfd *abfd AND
-	  bfd_reloc_code_real_type code));
-
-
-#include "netbsd.h"
diff --git a/bfd/oasys.c b/bfd/oasys.c
deleted file mode 100644
index b51560e47fa..00000000000
--- a/bfd/oasys.c
+++ /dev/null
@@ -1,1535 +0,0 @@
-/* BFD back-end for oasys objects.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support, <sac@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define UNDERSCORE_HACK 1
-#include "bfd.h"
-#include "sysdep.h"
-#include <ctype.h>
-#include "libbfd.h"
-#include "oasys.h"
-#include "liboasys.h"
-
-/* XXX - FIXME.  offsetof belongs in the system-specific files in
-   ../include/sys. */
-/* Define offsetof for those systems which lack it */
-
-#ifndef offsetof
-#define offsetof(type, identifier) (size_t) &(((type *) 0)->identifier)
-#endif
-
-static boolean oasys_read_record PARAMS ((bfd *,
-					  oasys_record_union_type *));
-static boolean oasys_write_sections PARAMS ((bfd *));
-static boolean oasys_write_record PARAMS ((bfd *,
-					   oasys_record_enum_type,
-					   oasys_record_union_type *,
-					   size_t));
-static boolean oasys_write_syms PARAMS ((bfd *));
-static boolean oasys_write_header PARAMS ((bfd *));
-static boolean oasys_write_end PARAMS ((bfd *));
-static boolean oasys_write_data PARAMS ((bfd *));
-
-/* Read in all the section data and relocation stuff too */
-PROTO (static boolean, oasys_slurp_section_data, (bfd * CONST abfd));
-
-static boolean
-oasys_read_record (abfd, record)
-     bfd *abfd;
-     oasys_record_union_type *record;
-{
-  if (bfd_read ((PTR) record, 1, sizeof (record->header), abfd)
-      != sizeof (record->header))
-    return false;
-
-  if ((size_t) record->header.length <= (size_t) sizeof (record->header))
-    return true;
-  if (bfd_read ((PTR) (((char *) record) + sizeof (record->header)),
-		1, record->header.length - sizeof (record->header),
-		abfd)
-      != record->header.length - sizeof (record->header))
-    return false;
-  return true;
-}
-static size_t
-oasys_string_length (record)
-     oasys_record_union_type *record;
-{
-  return record->header.length
-    - ((char *) record->symbol.name - (char *) record);
-}
-
-/*****************************************************************************/
-
-/*
-
-Slurp the symbol table by reading in all the records at the start file
-till we get to the first section record.
-
-We'll sort the symbolss into  two lists, defined and undefined. The
-undefined symbols will be placed into the table according to their
-refno.
-
-We do this by placing all undefined symbols at the front of the table
-moving in, and the defined symbols at the end of the table moving back.
-
-*/
-
-static boolean
-oasys_slurp_symbol_table (abfd)
-     bfd *CONST abfd;
-{
-  oasys_record_union_type record;
-  oasys_data_type *data = OASYS_DATA (abfd);
-  boolean loop = true;
-  asymbol *dest_defined;
-  asymbol *dest;
-  char *string_ptr;
-
-
-  if (data->symbols != (asymbol *) NULL)
-    {
-      return true;
-    }
-  /* Buy enough memory for all the symbols and all the names */
-  data->symbols =
-    (asymbol *) bfd_alloc (abfd, sizeof (asymbol) * abfd->symcount);
-#ifdef UNDERSCORE_HACK
-  /* buy 1 more char for each symbol to keep the underscore in*/
-  data->strings = bfd_alloc (abfd, data->symbol_string_length +
-			     abfd->symcount);
-#else
-  data->strings = bfd_alloc (abfd, data->symbol_string_length);
-#endif
-  if (!data->symbols || !data->strings)
-    return false;
-
-  dest_defined = data->symbols + abfd->symcount - 1;
-
-  string_ptr = data->strings;
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return false;
-  while (loop)
-    {
-
-      if (! oasys_read_record (abfd, &record))
-	return false;
-      switch (record.header.type)
-	{
-	case oasys_record_is_header_enum:
-	  break;
-	case oasys_record_is_local_enum:
-	case oasys_record_is_symbol_enum:
-	  {
-	    int flag = record.header.type == (int) oasys_record_is_local_enum ?
-	    (BSF_LOCAL) : (BSF_GLOBAL | BSF_EXPORT);
-
-
-	    size_t length = oasys_string_length (&record);
-	    switch (record.symbol.relb & RELOCATION_TYPE_BITS)
-	      {
-	      case RELOCATION_TYPE_ABS:
-		dest = dest_defined--;
-		dest->section = bfd_abs_section_ptr;
-		dest->flags = 0;
-
-		break;
-	      case RELOCATION_TYPE_REL:
-		dest = dest_defined--;
-		dest->section =
-		  OASYS_DATA (abfd)->sections[record.symbol.relb &
-					      RELOCATION_SECT_BITS];
-		if (record.header.type == (int) oasys_record_is_local_enum)
-		  {
-		    dest->flags = BSF_LOCAL;
-		    if (dest->section == (asection *) (~0))
-		      {
-			/* It seems that sometimes internal symbols are tied up, but
-		       still get output, even though there is no
-		       section */
-			dest->section = 0;
-		      }
-		  }
-		else
-		  {
-
-		    dest->flags = flag;
-		  }
-		break;
-	      case RELOCATION_TYPE_UND:
-		dest = data->symbols + bfd_h_get_16 (abfd, record.symbol.refno);
-		dest->section = bfd_und_section_ptr;
-		break;
-	      case RELOCATION_TYPE_COM:
-		dest = dest_defined--;
-		dest->name = string_ptr;
-		dest->the_bfd = abfd;
-
-		dest->section = bfd_com_section_ptr;
-
-		break;
-	      default:
-		dest = dest_defined--;
-		BFD_ASSERT (0);
-		break;
-	      }
-	    dest->name = string_ptr;
-	    dest->the_bfd = abfd;
-	    dest->udata.p = (PTR) NULL;
-	    dest->value = bfd_h_get_32 (abfd, record.symbol.value);
-
-#ifdef UNDERSCORE_HACK
-	    if (record.symbol.name[0] != '_')
-	      {
-		string_ptr[0] = '_';
-		string_ptr++;
-	      }
-#endif
-	    memcpy (string_ptr, record.symbol.name, length);
-
-
-	    string_ptr[length] = 0;
-	    string_ptr += length + 1;
-	  }
-	  break;
-	default:
-	  loop = false;
-	}
-    }
-  return true;
-}
-
-static long
-oasys_get_symtab_upper_bound (abfd)
-     bfd *CONST abfd;
-{
-  if (! oasys_slurp_symbol_table (abfd))
-    return -1;
-
-  return (abfd->symcount + 1) * (sizeof (oasys_symbol_type *));
-}
-
-/*
-*/
-
-extern const bfd_target oasys_vec;
-
-long
-oasys_get_symtab (abfd, location)
-     bfd *abfd;
-     asymbol **location;
-{
-  asymbol *symbase;
-  unsigned int counter;
-  if (oasys_slurp_symbol_table (abfd) == false)
-    {
-      return -1;
-    }
-  symbase = OASYS_DATA (abfd)->symbols;
-  for (counter = 0; counter < abfd->symcount; counter++)
-    {
-      *(location++) = symbase++;
-    }
-  *location = 0;
-  return abfd->symcount;
-}
-
-/***********************************************************************
-*  archive stuff
-*/
-
-static const bfd_target *
-oasys_archive_p (abfd)
-     bfd *abfd;
-{
-  oasys_archive_header_type header;
-  oasys_extarchive_header_type header_ext;
-  unsigned int i;
-  file_ptr filepos;
-
-  if (bfd_seek (abfd, (file_ptr) 0, false) != 0
-      || (bfd_read ((PTR) & header_ext, 1, sizeof (header_ext), abfd)
-	  != sizeof (header_ext)))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  header.version = bfd_h_get_32 (abfd, header_ext.version);
-  header.mod_count = bfd_h_get_32 (abfd, header_ext.mod_count);
-  header.mod_tbl_offset = bfd_h_get_32 (abfd, header_ext.mod_tbl_offset);
-  header.sym_tbl_size = bfd_h_get_32 (abfd, header_ext.sym_tbl_size);
-  header.sym_count = bfd_h_get_32 (abfd, header_ext.sym_count);
-  header.sym_tbl_offset = bfd_h_get_32 (abfd, header_ext.sym_tbl_offset);
-  header.xref_count = bfd_h_get_32 (abfd, header_ext.xref_count);
-  header.xref_lst_offset = bfd_h_get_32 (abfd, header_ext.xref_lst_offset);
-
-  /*
-    There isn't a magic number in an Oasys archive, so the best we
-    can do to verify reasnableness is to make sure that the values in
-    the header are too weird
-    */
-
-  if (header.version > 10000 ||
-      header.mod_count > 10000 ||
-      header.sym_count > 100000 ||
-      header.xref_count > 100000)
-    return (const bfd_target *) NULL;
-
-  /*
-    That all worked, let's buy the space for the header and read in
-    the headers.
-    */
-  {
-    oasys_ar_data_type *ar =
-    (oasys_ar_data_type *) bfd_alloc (abfd, sizeof (oasys_ar_data_type));
-
-    oasys_module_info_type *module =
-    (oasys_module_info_type *)
-    bfd_alloc (abfd, sizeof (oasys_module_info_type) * header.mod_count);
-    oasys_module_table_type record;
-
-    if (!ar || !module)
-      return NULL;
-
-    abfd->tdata.oasys_ar_data = ar;
-    ar->module = module;
-    ar->module_count = header.mod_count;
-
-    filepos = header.mod_tbl_offset;
-    for (i = 0; i < header.mod_count; i++)
-      {
-	if (bfd_seek (abfd, filepos, SEEK_SET) != 0)
-	  return NULL;
-
-	/* There are two ways of specifying the archive header */
-
-	if (0)
-	  {
-	    oasys_extmodule_table_type_a_type record_ext;
-	    if (bfd_read ((PTR) & record_ext, 1, sizeof (record_ext), abfd)
-		!= sizeof (record_ext))
-	      return NULL;
-
-	    record.mod_size = bfd_h_get_32 (abfd, record_ext.mod_size);
-	    record.file_offset = bfd_h_get_32 (abfd, record_ext.file_offset);
-
-	    record.dep_count = bfd_h_get_32 (abfd, record_ext.dep_count);
-	    record.depee_count = bfd_h_get_32 (abfd, record_ext.depee_count);
-	    record.sect_count = bfd_h_get_32 (abfd, record_ext.sect_count);
-
-	    module[i].name = bfd_alloc (abfd, 33);
-	    if (!module[i].name)
-	      return NULL;
-
-	    memcpy (module[i].name, record_ext.mod_name, 33);
-	    filepos +=
-	      sizeof (record_ext) +
-	      record.dep_count * 4 +
-	      record.depee_count * 4 +
-	      record.sect_count * 8 + 187;
-	  }
-	else
-	  {
-	    oasys_extmodule_table_type_b_type record_ext;
-	    if (bfd_read ((PTR) & record_ext, 1, sizeof (record_ext), abfd)
-		!= sizeof (record_ext))
-	      return NULL;
-
-	    record.mod_size = bfd_h_get_32 (abfd, record_ext.mod_size);
-	    record.file_offset = bfd_h_get_32 (abfd, record_ext.file_offset);
-
-	    record.dep_count = bfd_h_get_32 (abfd, record_ext.dep_count);
-	    record.depee_count = bfd_h_get_32 (abfd, record_ext.depee_count);
-	    record.sect_count = bfd_h_get_32 (abfd, record_ext.sect_count);
-	    record.module_name_size = bfd_h_get_32 (abfd, record_ext.mod_name_length);
-
-	    module[i].name = bfd_alloc (abfd, record.module_name_size + 1);
-	    if (!module[i].name)
-	      return NULL;
-	    if (bfd_read ((PTR) module[i].name, 1, record.module_name_size,
-			  abfd)
-		!= record.module_name_size)
-	      return NULL;
-	    module[i].name[record.module_name_size] = 0;
-	    filepos +=
-	      sizeof (record_ext) +
-	      record.dep_count * 4 +
-	      record.module_name_size + 1;
-
-	  }
-
-
-	module[i].size = record.mod_size;
-	module[i].pos = record.file_offset;
-	module[i].abfd = 0;
-      }
-
-  }
-  return abfd->xvec;
-}
-
-static boolean
-oasys_mkobject (abfd)
-     bfd *abfd;
-{
-
-  abfd->tdata.oasys_obj_data = (oasys_data_type *) bfd_alloc (abfd, sizeof (oasys_data_type));
-  return abfd->tdata.oasys_obj_data ? true : false;
-}
-
-#define MAX_SECS 16
-static const bfd_target *
-oasys_object_p (abfd)
-     bfd *abfd;
-{
-  oasys_data_type *oasys;
-  oasys_data_type *save = OASYS_DATA (abfd);
-  boolean loop = true;
-  boolean had_usefull = false;
-
-  abfd->tdata.oasys_obj_data = 0;
-  oasys_mkobject (abfd);
-  oasys = OASYS_DATA (abfd);
-  memset ((PTR) oasys->sections, 0xff, sizeof (oasys->sections));
-
-  /* Point to the start of the file */
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    goto fail;
-  oasys->symbol_string_length = 0;
-  /* Inspect the records, but only keep the section info -
-     remember the size of the symbols
-     */
-  oasys->first_data_record = 0;
-  while (loop)
-    {
-      oasys_record_union_type record;
-      if (! oasys_read_record (abfd, &record))
-	goto fail;
-      if ((size_t) record.header.length < (size_t) sizeof (record.header))
-	goto fail;
-
-
-      switch ((oasys_record_enum_type) (record.header.type))
-	{
-	case oasys_record_is_header_enum:
-	  had_usefull = true;
-	  break;
-	case oasys_record_is_symbol_enum:
-	case oasys_record_is_local_enum:
-	  /* Count symbols and remember their size for a future malloc   */
-	  abfd->symcount++;
-	  oasys->symbol_string_length += 1 + oasys_string_length (&record);
-	  had_usefull = true;
-	  break;
-	case oasys_record_is_section_enum:
-	  {
-	    asection *s;
-	    char *buffer;
-	    unsigned int section_number;
-	    if (record.section.header.length != sizeof (record.section))
-	      {
-		goto fail;
-	      }
-	    buffer = bfd_alloc (abfd, 3);
-	    if (!buffer)
-	      goto fail;
-	    section_number = record.section.relb & RELOCATION_SECT_BITS;
-	    sprintf (buffer, "%u", section_number);
-	    s = bfd_make_section (abfd, buffer);
-	    oasys->sections[section_number] = s;
-	    switch (record.section.relb & RELOCATION_TYPE_BITS)
-	      {
-	      case RELOCATION_TYPE_ABS:
-	      case RELOCATION_TYPE_REL:
-		break;
-	      case RELOCATION_TYPE_UND:
-	      case RELOCATION_TYPE_COM:
-		BFD_FAIL ();
-	      }
-
-	    s->_raw_size = bfd_h_get_32 (abfd, record.section.value);
-	    s->vma = bfd_h_get_32 (abfd, record.section.vma);
-	    s->flags = 0;
-	    had_usefull = true;
-	  }
-	  break;
-	case oasys_record_is_data_enum:
-	  oasys->first_data_record = bfd_tell (abfd) - record.header.length;
-	case oasys_record_is_debug_enum:
-	case oasys_record_is_module_enum:
-	case oasys_record_is_named_section_enum:
-	case oasys_record_is_end_enum:
-	  if (had_usefull == false)
-	    goto fail;
-	  loop = false;
-	  break;
-	default:
-	  goto fail;
-	}
-    }
-  oasys->symbols = (asymbol *) NULL;
-  /*
-    Oasys support several architectures, but I can't see a simple way
-    to discover which one is in a particular file - we'll guess
-    */
-  bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
-  if (abfd->symcount != 0)
-    {
-      abfd->flags |= HAS_SYMS;
-    }
-
-  /*
-    We don't know if a section has data until we've read it..
-    */
-
-  oasys_slurp_section_data (abfd);
-
-
-  return abfd->xvec;
-
-fail:
-  (void) bfd_release (abfd, oasys);
-  abfd->tdata.oasys_obj_data = save;
-  return (const bfd_target *) NULL;
-}
-
-
-static void
-oasys_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-  if (!symbol->section)
-    ret->type = (symbol->flags & BSF_LOCAL) ? 'a' : 'A';
-}
-
-static void
-oasys_print_symbol (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) afile;
-
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-    case bfd_print_symbol_more:
-      fprintf (file, "%s", symbol->name);
-      break;
-    case bfd_print_symbol_all:
-      {
-	CONST char *section_name = symbol->section == (asection *) NULL ?
-	(CONST char *) "*abs" : symbol->section->name;
-
-	bfd_print_symbol_vandf ((PTR) file, symbol);
-
-	fprintf (file, " %-5s %s",
-		 section_name,
-		 symbol->name);
-      }
-      break;
-    }
-}
-/*
- The howto table is build using the top two bits of a reloc byte to
- index into it. The bits are PCREL,WORD/LONG
-*/
-static reloc_howto_type howto_table[] =
-{
-
-  HOWTO (0, 0, 1, 16, false, 0, complain_overflow_bitfield, 0, "abs16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (0, 0, 2, 32, false, 0, complain_overflow_bitfield, 0, "abs32", true, 0xffffffff, 0xffffffff, false),
-  HOWTO (0, 0, 1, 16, true, 0, complain_overflow_signed, 0, "pcrel16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (0, 0, 2, 32, true, 0, complain_overflow_signed, 0, "pcrel32", true, 0xffffffff, 0xffffffff, false)
-};
-
-/* Read in all the section data and relocation stuff too */
-static boolean
-oasys_slurp_section_data (abfd)
-     bfd *CONST abfd;
-{
-  oasys_record_union_type record;
-  oasys_data_type *data = OASYS_DATA (abfd);
-  boolean loop = true;
-
-  oasys_per_section_type *per;
-
-  asection *s;
-
-  /* See if the data has been slurped already .. */
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      per = oasys_per_section (s);
-      if (per->initialized == true)
-	return true;
-    }
-
-  if (data->first_data_record == 0)
-    return true;
-
-  if (bfd_seek (abfd, data->first_data_record, SEEK_SET) != 0)
-    return false;
-  while (loop)
-    {
-      if (! oasys_read_record (abfd, &record))
-	return false;
-      switch (record.header.type)
-	{
-	case oasys_record_is_header_enum:
-	  break;
-	case oasys_record_is_data_enum:
-	  {
-
-	    bfd_byte *src = record.data.data;
-	    bfd_byte *end_src = ((bfd_byte *) & record) + record.header.length;
-	    bfd_byte *dst_ptr;
-	    bfd_byte *dst_base_ptr;
-	    unsigned int relbit;
-	    unsigned int count;
-	    asection *section =
-	    data->sections[record.data.relb & RELOCATION_SECT_BITS];
-	    bfd_vma dst_offset;
-
-	    per = oasys_per_section (section);
-
-	    if (per->initialized == false)
-	      {
-		per->data = (bfd_byte *) bfd_zalloc (abfd, section->_raw_size);
-		if (!per->data)
-		  return false;
-		per->reloc_tail_ptr = (oasys_reloc_type **) & (section->relocation);
-		per->had_vma = false;
-		per->initialized = true;
-		section->reloc_count = 0;
-		section->flags = SEC_ALLOC;
-	      }
-
-	    dst_offset = bfd_h_get_32 (abfd, record.data.addr);
-	    if (per->had_vma == false)
-	      {
-		/* Take the first vma we see as the base */
-		section->vma = dst_offset;
-		per->had_vma = true;
-	      }
-
-	    dst_offset -= section->vma;
-
-	    dst_base_ptr = oasys_per_section (section)->data;
-	    dst_ptr = oasys_per_section (section)->data +
-	      dst_offset;
-
-	    if (src < end_src)
-	      {
-		section->flags |= SEC_LOAD | SEC_HAS_CONTENTS;
-	      }
-	    while (src < end_src)
-	      {
-		unsigned char mod_byte = *src++;
-		size_t gap = end_src - src;
-
-		count = 8;
-		if (mod_byte == 0 && gap >= 8)
-		  {
-		    dst_ptr[0] = src[0];
-		    dst_ptr[1] = src[1];
-		    dst_ptr[2] = src[2];
-		    dst_ptr[3] = src[3];
-		    dst_ptr[4] = src[4];
-		    dst_ptr[5] = src[5];
-		    dst_ptr[6] = src[6];
-		    dst_ptr[7] = src[7];
-		    dst_ptr += 8;
-		    src += 8;
-		  }
-		else
-		  {
-		    for (relbit = 1; count-- != 0 && src < end_src; relbit <<= 1)
-		      {
-			if (relbit & mod_byte)
-			  {
-			    unsigned char reloc = *src;
-			    /* This item needs to be relocated */
-			    switch (reloc & RELOCATION_TYPE_BITS)
-			      {
-			      case RELOCATION_TYPE_ABS:
-
-				break;
-
-			      case RELOCATION_TYPE_REL:
-				{
-				  /* Relocate the item relative to the section */
-				  oasys_reloc_type *r =
-				  (oasys_reloc_type *)
-				  bfd_alloc (abfd,
-					     sizeof (oasys_reloc_type));
-				  if (!r)
-				    return false;
-				  *(per->reloc_tail_ptr) = r;
-				  per->reloc_tail_ptr = &r->next;
-				  r->next = (oasys_reloc_type *) NULL;
-				  /* Reference to undefined symbol */
-				  src++;
-				  /* There is no symbol */
-				  r->symbol = 0;
-				  /* Work out the howto */
-				  abort ();
-#if 0
-				  r->relent.section =
-				    data->sections[reloc &
-						   RELOCATION_SECT_BITS];
-
-				  r->relent.addend = -
-				    r->relent.section->vma;
-#endif
-				  r->relent.address = dst_ptr - dst_base_ptr;
-				  r->relent.howto = &howto_table[reloc >> 6];
-				  r->relent.sym_ptr_ptr = (asymbol **) NULL;
-				  section->reloc_count++;
-
-				  /* Fake up the data to look like it's got the -ve pc in it, this makes
-				       it much easier to convert into other formats. This is done by
-				       hitting the addend.
-				       */
-				  if (r->relent.howto->pc_relative == true)
-				    {
-				      r->relent.addend -= dst_ptr - dst_base_ptr;
-				    }
-
-
-				}
-				break;
-
-
-			      case RELOCATION_TYPE_UND:
-				{
-				  oasys_reloc_type *r =
-				  (oasys_reloc_type *)
-				  bfd_alloc (abfd,
-					     sizeof (oasys_reloc_type));
-				  if (!r)
-				    return false;
-				  *(per->reloc_tail_ptr) = r;
-				  per->reloc_tail_ptr = &r->next;
-				  r->next = (oasys_reloc_type *) NULL;
-				  /* Reference to undefined symbol */
-				  src++;
-				  /* Get symbol number */
-				  r->symbol = (src[0] << 8) | src[1];
-				  /* Work out the howto */
-				  abort ();
-
-#if 0
-				  r->relent.section = (asection
-						       *) NULL;
-#endif
-				  r->relent.addend = 0;
-				  r->relent.address = dst_ptr - dst_base_ptr;
-				  r->relent.howto = &howto_table[reloc >> 6];
-				  r->relent.sym_ptr_ptr = (asymbol **) NULL;
-				  section->reloc_count++;
-
-				  src += 2;
-				  /* Fake up the data to look like it's got the -ve pc in it, this makes
-				       it much easier to convert into other formats. This is done by
-				       hitting the addend.
-				       */
-				  if (r->relent.howto->pc_relative == true)
-				    {
-				      r->relent.addend -= dst_ptr - dst_base_ptr;
-				    }
-
-
-
-				}
-				break;
-			      case RELOCATION_TYPE_COM:
-				BFD_FAIL ();
-			      }
-			  }
-			*dst_ptr++ = *src++;
-		      }
-		  }
-	      }
-	  }
-	  break;
-	case oasys_record_is_local_enum:
-	case oasys_record_is_symbol_enum:
-	case oasys_record_is_section_enum:
-	  break;
-	default:
-	  loop = false;
-	}
-    }
-
-  return true;
-
-}
-
-static boolean
-oasys_new_section_hook (abfd, newsect)
-     bfd *abfd;
-     asection *newsect;
-{
-  newsect->used_by_bfd = (PTR)
-    bfd_alloc (abfd, sizeof (oasys_per_section_type));
-  if (!newsect->used_by_bfd)
-    return false;
-  oasys_per_section (newsect)->data = (bfd_byte *) NULL;
-  oasys_per_section (newsect)->section = newsect;
-  oasys_per_section (newsect)->offset = 0;
-  oasys_per_section (newsect)->initialized = false;
-  newsect->alignment_power = 1;
-  /* Turn the section string into an index */
-
-  sscanf (newsect->name, "%u", &newsect->target_index);
-
-  return true;
-}
-
-
-static long
-oasys_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  if (! oasys_slurp_section_data (abfd))
-    return -1;
-  return (asect->reloc_count + 1) * sizeof (arelent *);
-}
-
-static boolean
-oasys_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  oasys_per_section_type *p = (oasys_per_section_type *) section->used_by_bfd;
-  oasys_slurp_section_data (abfd);
-  if (p->initialized == false)
-    {
-      (void) memset (location, 0, (int) count);
-    }
-  else
-    {
-      (void) memcpy (location, (PTR) (p->data + offset), (int) count);
-    }
-  return true;
-}
-
-
-long
-oasys_canonicalize_reloc (ignore_abfd, section, relptr, symbols)
-     bfd *ignore_abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  unsigned int reloc_count = 0;
-  oasys_reloc_type *src = (oasys_reloc_type *) (section->relocation);
-  while (src != (oasys_reloc_type *) NULL)
-    {
-      abort ();
-
-#if 0
-      if (src->relent.section == (asection *) NULL)
-	{
-	  src->relent.sym_ptr_ptr = symbols + src->symbol;
-	}
-#endif
-
-      *relptr++ = &src->relent;
-      src = src->next;
-      reloc_count++;
-    }
-  *relptr = (arelent *) NULL;
-  return section->reloc_count = reloc_count;
-}
-
-
-
-
-/* Writing */
-
-
-/* Calculate the checksum and write one record */
-static boolean
-oasys_write_record (abfd, type, record, size)
-     bfd *abfd;
-     oasys_record_enum_type type;
-     oasys_record_union_type *record;
-     size_t size;
-{
-  int checksum;
-  size_t i;
-  unsigned char *ptr;
-
-  record->header.length = size;
-  record->header.type = (int) type;
-  record->header.check_sum = 0;
-  record->header.fill = 0;
-  ptr = (unsigned char *) &record->pad[0];
-  checksum = 0;
-  for (i = 0; i < size; i++)
-    {
-      checksum += *ptr++;
-    }
-  record->header.check_sum = 0xff & (-checksum);
-  if (bfd_write ((PTR) record, 1, size, abfd) != size)
-    return false;
-  return true;
-}
-
-
-/* Write out all the symbols */
-static boolean
-oasys_write_syms (abfd)
-     bfd *abfd;
-{
-  unsigned int count;
-  asymbol **generic = bfd_get_outsymbols (abfd);
-  unsigned int index = 0;
-  for (count = 0; count < bfd_get_symcount (abfd); count++)
-    {
-
-      oasys_symbol_record_type symbol;
-      asymbol *CONST g = generic[count];
-
-      CONST char *src = g->name;
-      char *dst = symbol.name;
-      unsigned int l = 0;
-
-      if (bfd_is_com_section (g->section))
-	{
-	  symbol.relb = RELOCATION_TYPE_COM;
-	  bfd_h_put_16 (abfd, index, symbol.refno);
-	  index++;
-	}
-      else if (bfd_is_abs_section (g->section))
-	{
-	  symbol.relb = RELOCATION_TYPE_ABS;
-	  bfd_h_put_16 (abfd, 0, symbol.refno);
-
-	}
-      else if (bfd_is_und_section (g->section))
-	{
-	  symbol.relb = RELOCATION_TYPE_UND;
-	  bfd_h_put_16 (abfd, index, symbol.refno);
-	  /* Overload the value field with the output index number */
-	  index++;
-	}
-      else if (g->flags & BSF_DEBUGGING)
-	{
-	  /* throw it away */
-	  continue;
-	}
-      else
-	{
-	  if (g->section == (asection *) NULL)
-	    {
-	      /* Sometime, the oasys tools give out a symbol with illegal
-	   bits in it, we'll output it in the same broken way */
-
-	      symbol.relb = RELOCATION_TYPE_REL | 0;
-	    }
-	  else
-	    {
-	      symbol.relb = RELOCATION_TYPE_REL | g->section->output_section->target_index;
-	    }
-	  bfd_h_put_16 (abfd, 0, symbol.refno);
-	}
-#ifdef UNDERSCORE_HACK
-      if (src[l] == '_')
-	dst[l++] = '.';
-#endif
-      while (src[l])
-	{
-	  dst[l] = src[l];
-	  l++;
-	}
-
-      bfd_h_put_32 (abfd, g->value, symbol.value);
-
-
-      if (g->flags & BSF_LOCAL)
-	{
-	  if (! oasys_write_record (abfd,
-				    oasys_record_is_local_enum,
-				    (oasys_record_union_type *) & symbol,
-				    offsetof (oasys_symbol_record_type,
-					      name[0]) + l))
-	    return false;
-	}
-      else
-	{
-	  if (! oasys_write_record (abfd,
-				    oasys_record_is_symbol_enum,
-				    (oasys_record_union_type *) & symbol,
-				    offsetof (oasys_symbol_record_type,
-					      name[0]) + l))
-	    return false;
-	}
-      g->value = index - 1;
-    }
-
-  return true;
-}
-
-
- /* Write a section header for each section */
-static boolean
-oasys_write_sections (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  static oasys_section_record_type out;
-
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      if (!isdigit ((unsigned char) s->name[0]))
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: can not represent section `%s' in oasys"),
-	     bfd_get_filename (abfd), s->name);
-	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
-	}
-      out.relb = RELOCATION_TYPE_REL | s->target_index;
-      bfd_h_put_32 (abfd, s->_cooked_size, out.value);
-      bfd_h_put_32 (abfd, s->vma, out.vma);
-
-      if (! oasys_write_record (abfd,
-				oasys_record_is_section_enum,
-				(oasys_record_union_type *) & out,
-				sizeof (out)))
-	return false;
-    }
-  return true;
-}
-
-static boolean
-oasys_write_header (abfd)
-     bfd *abfd;
-{
-  /* Create and write the header */
-  oasys_header_record_type r;
-  size_t length = strlen (abfd->filename);
-  if (length > (size_t) sizeof (r.module_name))
-    {
-      length = sizeof (r.module_name);
-    }
-
-  (void) memcpy (r.module_name,
-		 abfd->filename,
-		 length);
-  (void) memset (r.module_name + length,
-		 ' ',
-		 sizeof (r.module_name) - length);
-
-  r.version_number = OASYS_VERSION_NUMBER;
-  r.rev_number = OASYS_REV_NUMBER;
-  if (! oasys_write_record (abfd,
-			    oasys_record_is_header_enum,
-			    (oasys_record_union_type *) & r,
-			    offsetof (oasys_header_record_type,
-				      description[0])))
-    return false;
-
-  return true;
-}
-
-static boolean
-oasys_write_end (abfd)
-     bfd *abfd;
-{
-  oasys_end_record_type end;
-  unsigned char null = 0;
-  end.relb = RELOCATION_TYPE_ABS;
-  bfd_h_put_32 (abfd, abfd->start_address, end.entry);
-  bfd_h_put_16 (abfd, 0, end.fill);
-  end.zero = 0;
-  if (! oasys_write_record (abfd,
-			    oasys_record_is_end_enum,
-			    (oasys_record_union_type *) & end,
-			    sizeof (end)))
-    return false;
-  if (bfd_write ((PTR) & null, 1, 1, abfd) != 1)
-    return false;
-  return true;
-}
-
-static int
-comp (ap, bp)
-     CONST PTR ap;
-     CONST PTR bp;
-{
-  arelent *a = *((arelent **) ap);
-  arelent *b = *((arelent **) bp);
-  return a->address - b->address;
-}
-
-/*
- Writing data..
-
-*/
-static boolean
-oasys_write_data (abfd)
-     bfd *abfd;
-{
-  asection *s;
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      if (s->flags & SEC_LOAD)
-	{
-	  bfd_byte *raw_data = oasys_per_section (s)->data;
-	  oasys_data_record_type processed_data;
-	  bfd_size_type current_byte_index = 0;
-	  unsigned int relocs_to_go = s->reloc_count;
-	  arelent **p = s->orelocation;
-	  if (s->reloc_count != 0)
-	    {
-/* Sort the reloc records so it's easy to insert the relocs into the
-	   data */
-
-	      qsort (s->orelocation,
-		     s->reloc_count,
-		     sizeof (arelent **),
-		     comp);
-	    }
-	  current_byte_index = 0;
-	  processed_data.relb = s->target_index | RELOCATION_TYPE_REL;
-
-	  while (current_byte_index < s->_cooked_size)
-	    {
-	      /* Scan forwards by eight bytes or however much is left and see if
-	       there are any relocations going on */
-	      bfd_byte *mod = &processed_data.data[0];
-	      bfd_byte *dst = &processed_data.data[1];
-
-	      unsigned int i = 0;
-	      *mod = 0;
-
-
-	      bfd_h_put_32 (abfd, s->vma + current_byte_index,
-			    processed_data.addr);
-
-	      /* Don't start a relocation unless you're sure you can finish it
- 	       within the same data record.  The worst case relocation is a
- 	       4-byte relocatable value which is split across two modification
- 	       bytes (1 relocation byte + 2 symbol reference bytes + 2 data +
- 	       1 modification byte + 2 data = 8 bytes total).  That's where
- 	       the magic number 8 comes from.
- 	    */
-	      while (current_byte_index < s->_raw_size && dst <=
-		     &processed_data.data[sizeof (processed_data.data) - 8])
-		{
-
-
-		  if (relocs_to_go != 0)
-		    {
-		      arelent *r = *p;
-		      reloc_howto_type *const how = r->howto;
-		      /* There is a relocation, is it for this byte ? */
-		      if (r->address == current_byte_index)
-			{
-			  unsigned char rel_byte;
-
-			  p++;
-			  relocs_to_go--;
-
-			  *mod |= (1 << i);
-			  if (how->pc_relative)
-			    {
-			      rel_byte = RELOCATION_PCREL_BIT;
-
-			      /* Also patch the raw data so that it doesn't have
-			 the -ve stuff any more */
-			      if (how->size != 2)
-				{
-				  bfd_put_16 (abfd,
-					      bfd_get_16 (abfd, raw_data) +
-					      current_byte_index, raw_data);
-				}
-
-			      else
-				{
-				  bfd_put_32 (abfd,
-					      bfd_get_32 (abfd, raw_data) +
-					      current_byte_index, raw_data);
-				}
-			    }
-			  else
-			    {
-			      rel_byte = 0;
-			    }
-			  if (how->size == 2)
-			    {
-			      rel_byte |= RELOCATION_32BIT_BIT;
-			    }
-
-			  /* Is this a section relative relocation, or a symbol
-		       relative relocation ? */
-			  abort ();
-
-#if 0
-			  if (r->section != (asection *) NULL)
-			    {
-			      /* The relent has a section attached, so it must be section
-			     relative */
-			      rel_byte |= RELOCATION_TYPE_REL;
-			      rel_byte |= r->section->output_section->target_index;
-			      *dst++ = rel_byte;
-			    }
-			  else
-#endif
-			    {
-			      asymbol *p = *(r->sym_ptr_ptr);
-
-			      /* If this symbol has a section attached, then it
-			     has already been resolved.  Change from a symbol
-			     ref to a section ref */
-			      if (p->section != (asection *) NULL)
-				{
-				  rel_byte |= RELOCATION_TYPE_REL;
-				  rel_byte |=
-				    p->section->output_section->target_index;
-				  *dst++ = rel_byte;
-				}
-			      else
-				{
-				  rel_byte |= RELOCATION_TYPE_UND;
-				  *dst++ = rel_byte;
-				  /* Next two bytes are a symbol index - we can get
-			       this from the symbol value which has been zapped
-			       into the symbol index in the table when the
-			       symbol table was written
-			       */
-				  *dst++ = p->value >> 8;
-				  *dst++ = p->value;
-				}
-			    }
-#define ADVANCE { if (++i >= 8) { i = 0; mod = dst++; *mod = 0; } current_byte_index++; }
-			  /* relocations never occur from an unloadable section,
-		       so we can assume that raw_data is not NULL
-		     */
-			  *dst++ = *raw_data++;
-			  ADVANCE
-			    * dst++ = *raw_data++;
-			  ADVANCE
-			    if (how->size == 2)
-			    {
-			      *dst++ = *raw_data++;
-			      ADVANCE
-				* dst++ = *raw_data++;
-			      ADVANCE
-			    }
-			  continue;
-			}
-		    }
-		  /* If this is coming from an unloadable section then copy
-		   zeros */
-		  if (raw_data == NULL)
-		    {
-		      *dst++ = 0;
-		    }
-		  else
-		    {
-		      *dst++ = *raw_data++;
-		    }
-		  ADVANCE
-		}
-
-	      /* Don't write a useless null modification byte */
-	      if (dst == mod + 1)
-		{
-		  --dst;
-		}
-
-	      if (! oasys_write_record (abfd,
-					oasys_record_is_data_enum,
-					((oasys_record_union_type *)
-					 & processed_data),
-					dst - (bfd_byte *) & processed_data))
-		return false;
-	    }
-	}
-    }
-
-  return true;
-}
-
-static boolean
-oasys_write_object_contents (abfd)
-     bfd *abfd;
-{
-  if (! oasys_write_header (abfd))
-    return false;
-  if (! oasys_write_syms (abfd))
-    return false;
-  if (! oasys_write_sections (abfd))
-    return false;
-  if (! oasys_write_data (abfd))
-    return false;
-  if (! oasys_write_end (abfd))
-    return false;
-  return true;
-}
-
-
-
-
-/** exec and core file sections */
-
-/* set section contents is complicated with OASYS since the format is
-* not a byte image, but a record stream.
-*/
-static boolean
-oasys_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (count != 0)
-    {
-      if (oasys_per_section (section)->data == (bfd_byte *) NULL)
-	{
-	  oasys_per_section (section)->data =
-	    (bfd_byte *) (bfd_alloc (abfd, section->_cooked_size));
-	  if (!oasys_per_section (section)->data)
-	    return false;
-	}
-      (void) memcpy ((PTR) (oasys_per_section (section)->data + offset),
-		     location,
-		     (size_t) count);
-    }
-  return true;
-}
-
-
-
-/* Native-level interface to symbols. */
-
-/* We read the symbols into a buffer, which is discarded when this
-function exits.  We read the strings into a buffer large enough to
-hold them all plus all the cached symbol entries. */
-
-static asymbol *
-oasys_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-
-  oasys_symbol_type *new =
-  (oasys_symbol_type *) bfd_zalloc (abfd, sizeof (oasys_symbol_type));
-  if (!new)
-    return NULL;
-  new->symbol.the_bfd = abfd;
-  return &new->symbol;
-}
-
-
-
-
-/* User should have checked the file flags; perhaps we should return
-BFD_NO_MORE_SYMBOLS if there are none? */
-
-static bfd *
-oasys_openr_next_archived_file (arch, prev)
-     bfd *arch;
-     bfd *prev;
-{
-  oasys_ar_data_type *ar = OASYS_AR_DATA (arch);
-  oasys_module_info_type *p;
-  /* take the next one from the arch state, or reset */
-  if (prev == (bfd *) NULL)
-    {
-      /* Reset the index - the first two entries are bogus*/
-      ar->module_index = 0;
-    }
-
-  p = ar->module + ar->module_index;
-  ar->module_index++;
-
-  if (ar->module_index <= ar->module_count)
-    {
-      if (p->abfd == (bfd *) NULL)
-	{
-	  p->abfd = _bfd_create_empty_archive_element_shell (arch);
-	  p->abfd->origin = p->pos;
-	  p->abfd->filename = p->name;
-
-	  /* Fixup a pointer to this element for the member */
-	  p->abfd->arelt_data = (PTR) p;
-	}
-      return p->abfd;
-    }
-  else
-    {
-      bfd_set_error (bfd_error_no_more_archived_files);
-      return (bfd *) NULL;
-    }
-}
-
-static boolean
-oasys_find_nearest_line (abfd,
-			 section,
-			 symbols,
-			 offset,
-			 filename_ptr,
-			 functionname_ptr,
-			 line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     char **filename_ptr;
-     char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  return false;
-
-}
-
-static int
-oasys_generic_stat_arch_elt (abfd, buf)
-     bfd *abfd;
-     struct stat *buf;
-{
-  oasys_module_info_type *mod = (oasys_module_info_type *) abfd->arelt_data;
-  if (mod == (oasys_module_info_type *) NULL)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-  else
-    {
-      buf->st_size = mod->size;
-      buf->st_mode = 0666;
-      return 0;
-    }
-}
-
-static int
-oasys_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-{
-  return 0;
-}
-
-#define	oasys_close_and_cleanup _bfd_generic_close_and_cleanup
-#define oasys_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-
-#define oasys_slurp_armap bfd_true
-#define oasys_slurp_extended_name_table bfd_true
-#define oasys_construct_extended_name_table \
-  ((boolean (*) PARAMS ((bfd *, char **, bfd_size_type *, const char **))) \
-   bfd_true)
-#define oasys_truncate_arname bfd_dont_truncate_arname
-#define oasys_write_armap \
-  ((boolean (*) \
-    PARAMS ((bfd *, unsigned int, struct orl *, unsigned int, int))) \
-   bfd_true)
-#define oasys_read_ar_hdr bfd_nullvoidptr
-#define oasys_get_elt_at_index _bfd_generic_get_elt_at_index
-#define oasys_update_armap_timestamp bfd_true
-
-#define oasys_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define oasys_get_lineno _bfd_nosymbols_get_lineno
-#define oasys_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define oasys_read_minisymbols _bfd_generic_read_minisymbols
-#define oasys_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define oasys_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define oasys_set_arch_mach bfd_default_set_arch_mach
-
-#define oasys_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define oasys_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define oasys_bfd_relax_section bfd_generic_relax_section
-#define oasys_bfd_gc_sections bfd_generic_gc_sections
-#define oasys_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define oasys_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define oasys_bfd_final_link _bfd_generic_final_link
-#define oasys_bfd_link_split_section _bfd_generic_link_split_section
-
-/*SUPPRESS 460 */
-const bfd_target oasys_vec =
-{
-  "oasys",			/* name */
-  bfd_target_oasys_flavour,
-  BFD_ENDIAN_BIG,		/* target byte order */
-  BFD_ENDIAN_BIG,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {_bfd_dummy_target,
-   oasys_object_p,		/* bfd_check_format */
-   oasys_archive_p,
-   _bfd_dummy_target,
-  },
-  {				/* bfd_set_format */
-    bfd_false,
-    oasys_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    oasys_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (oasys),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (oasys),
-  BFD_JUMP_TABLE_SYMBOLS (oasys),
-  BFD_JUMP_TABLE_RELOCS (oasys),
-  BFD_JUMP_TABLE_WRITE (oasys),
-  BFD_JUMP_TABLE_LINK (oasys),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/opncls.c b/bfd/opncls.c
deleted file mode 100644
index 8f10135d267..00000000000
--- a/bfd/opncls.c
+++ /dev/null
@@ -1,683 +0,0 @@
-/* opncls.c -- open and close a BFD.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997
-   Free Software Foundation, Inc.
-
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "objalloc.h"
-#include "libbfd.h"
-
-#ifndef S_IXUSR
-#define S_IXUSR 0100	/* Execute by owner.  */
-#endif
-#ifndef S_IXGRP
-#define S_IXGRP 0010	/* Execute by group.  */
-#endif
-#ifndef S_IXOTH
-#define S_IXOTH 0001	/* Execute by others.  */
-#endif
-
-/* fdopen is a loser -- we should use stdio exclusively.  Unfortunately
-   if we do that we can't use fcntl.  */
-
-/* FIXME: This is no longer used.  */
-long _bfd_chunksize = -1;
-
-/* Return a new BFD.  All BFD's are allocated through this routine.  */
-
-bfd *
-_bfd_new_bfd ()
-{
-  bfd *nbfd;
-
-  nbfd = (bfd *) bfd_zmalloc (sizeof (bfd));
-  if (nbfd == NULL)
-    return NULL;
-
-  nbfd->memory = (PTR) objalloc_create ();
-  if (nbfd->memory == NULL)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return NULL;
-    }
-
-  nbfd->arch_info = &bfd_default_arch_struct;
-
-  nbfd->direction = no_direction;
-  nbfd->iostream = NULL;
-  nbfd->where = 0;
-  nbfd->sections = (asection *) NULL;
-  nbfd->format = bfd_unknown;
-  nbfd->my_archive = (bfd *) NULL;
-  nbfd->origin = 0;				
-  nbfd->opened_once = false;
-  nbfd->output_has_begun = false;
-  nbfd->section_count = 0;
-  nbfd->usrdata = (PTR) NULL;
-  nbfd->cacheable = false;
-  nbfd->flags = BFD_NO_FLAGS;
-  nbfd->mtime_set = false;
-
-  return nbfd;
-}
-
-/* Allocate a new BFD as a member of archive OBFD.  */
-
-bfd *
-_bfd_new_bfd_contained_in (obfd)
-     bfd *obfd;
-{
-  bfd *nbfd;
-
-  nbfd = _bfd_new_bfd ();
-  nbfd->xvec = obfd->xvec;
-  nbfd->my_archive = obfd;
-  nbfd->direction = read_direction;
-  nbfd->target_defaulted = obfd->target_defaulted;
-  return nbfd;
-}
-
-/*
-SECTION
-	Opening and closing BFDs
-
-*/
-
-/*
-FUNCTION
-	bfd_openr
-
-SYNOPSIS
-        bfd *bfd_openr(CONST char *filename, CONST char *target);
-
-DESCRIPTION
-	Open the file @var{filename} (using <<fopen>>) with the target
-	@var{target}.  Return a pointer to the created BFD.
-
-	Calls <<bfd_find_target>>, so @var{target} is interpreted as by
-	that function.
-
-	If <<NULL>> is returned then an error has occured.   Possible errors
-	are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> or <<system_call>> error.
-*/
-
-bfd *
-bfd_openr (filename, target)
-     CONST char *filename;
-     CONST char *target;
-{
-  bfd *nbfd;
-  const bfd_target *target_vec;
-
-  nbfd = _bfd_new_bfd ();
-  if (nbfd == NULL)
-    return NULL;
-
-  target_vec = bfd_find_target (target, nbfd);
-  if (target_vec == NULL)
-    {
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      bfd_set_error (bfd_error_invalid_target);
-      return NULL;
-    }
-
-  nbfd->filename = filename;
-  nbfd->direction = read_direction;
-
-  if (bfd_open_file (nbfd) == NULL)
-    {
-      /* File didn't exist, or some such */
-      bfd_set_error (bfd_error_system_call);
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-    }
-
-  return nbfd;
-}
-
-/* Don't try to `optimize' this function:
-
-   o - We lock using stack space so that interrupting the locking
-       won't cause a storage leak.
-   o - We open the file stream last, since we don't want to have to
-       close it if anything goes wrong.  Closing the stream means closing
-       the file descriptor too, even though we didn't open it.
- */
-/*
-FUNCTION
-         bfd_fdopenr
-
-SYNOPSIS
-         bfd *bfd_fdopenr(CONST char *filename, CONST char *target, int fd);
-
-DESCRIPTION
-         <<bfd_fdopenr>> is to <<bfd_fopenr>> much like <<fdopen>> is to <<fopen>>.
-	 It opens a BFD on a file already described by the @var{fd}
-	 supplied.
-
-	 When the file is later <<bfd_close>>d, the file descriptor will be closed.
-
-	 If the caller desires that this file descriptor be cached by BFD
-	 (opened as needed, closed as needed to free descriptors for
-	 other opens), with the supplied @var{fd} used as an initial
-	 file descriptor (but subject to closure at any time), call
-	 bfd_set_cacheable(bfd, 1) on the returned BFD.  The default is to
-	 assume no cacheing; the file descriptor will remain open until
-	 <<bfd_close>>, and will not be affected by BFD operations on other
-	 files.
-
-         Possible errors are <<bfd_error_no_memory>>, <<bfd_error_invalid_target>> and <<bfd_error_system_call>>.
-*/
-
-bfd *
-bfd_fdopenr (filename, target, fd)
-     CONST char *filename;
-     CONST char *target;
-     int fd;
-{
-  bfd *nbfd;
-  const bfd_target *target_vec;
-  int fdflags;
-
-  bfd_set_error (bfd_error_system_call);
-#if ! defined(HAVE_FCNTL) || ! defined(F_GETFL)
-  fdflags = O_RDWR;			/* Assume full access */
-#else
-  fdflags = fcntl (fd, F_GETFL, NULL);
-#endif
-  if (fdflags == -1) return NULL;
-
-  nbfd = _bfd_new_bfd ();
-  if (nbfd == NULL)
-    return NULL;
-
-  target_vec = bfd_find_target (target, nbfd);
-  if (target_vec == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_target);
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-    }
-
-#ifndef HAVE_FDOPEN
-  nbfd->iostream = (PTR) fopen (filename, FOPEN_RB);
-#else
-  /* (O_ACCMODE) parens are to avoid Ultrix header file bug */
-  switch (fdflags & (O_ACCMODE))
-    {
-    case O_RDONLY: nbfd->iostream = (PTR) fdopen (fd, FOPEN_RB);   break;
-    case O_WRONLY: nbfd->iostream = (PTR) fdopen (fd, FOPEN_RUB);  break;
-    case O_RDWR:   nbfd->iostream = (PTR) fdopen (fd, FOPEN_RUB);  break;
-    default: abort ();
-    }
-#endif
-
-  if (nbfd->iostream == NULL)
-    {
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-    }
-
-  /* OK, put everything where it belongs */
-
-  nbfd->filename = filename;
-
-  /* As a special case we allow a FD open for read/write to
-     be written through, although doing so requires that we end
-     the previous clause with a preposition.  */
-  /* (O_ACCMODE) parens are to avoid Ultrix header file bug */
-  switch (fdflags & O_ACCMODE)
-    {
-    case O_RDONLY: nbfd->direction = read_direction; break;
-    case O_WRONLY: nbfd->direction = write_direction; break;
-    case O_RDWR: nbfd->direction = both_direction; break;
-    default: abort ();
-    }
-
-  if (! bfd_cache_init (nbfd))
-    {
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-    }
-  nbfd->opened_once = true;
-
-  return nbfd;
-}
-
-/*
-FUNCTION
-	bfd_openstreamr
-
-SYNOPSIS
-	bfd *bfd_openstreamr(const char *, const char *, PTR);
-
-DESCRIPTION
-
-	Open a BFD for read access on an existing stdio stream.  When
-	the BFD is passed to <<bfd_close>>, the stream will be closed.
-*/
-
-bfd *
-bfd_openstreamr (filename, target, streamarg)
-     const char *filename;
-     const char *target;
-     PTR streamarg;
-{
-  FILE *stream = (FILE *) streamarg;
-  bfd *nbfd;
-  const bfd_target *target_vec;
-
-  nbfd = _bfd_new_bfd ();
-  if (nbfd == NULL)
-    return NULL;
-
-  target_vec = bfd_find_target (target, nbfd);
-  if (target_vec == NULL)
-    {
-      bfd_set_error (bfd_error_invalid_target);
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-    }
-
-  nbfd->iostream = (PTR) stream;
-  nbfd->filename = filename;
-  nbfd->direction = read_direction;
-				
-  if (! bfd_cache_init (nbfd))
-    {
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-    }
-
-  return nbfd;
-}
-
-/** bfd_openw -- open for writing.
-  Returns a pointer to a freshly-allocated BFD on success, or NULL.
-
-  See comment by bfd_fdopenr before you try to modify this function. */
-
-/*
-FUNCTION
-	bfd_openw
-
-SYNOPSIS
-	bfd *bfd_openw(CONST char *filename, CONST char *target);
-
-DESCRIPTION
-	Create a BFD, associated with file @var{filename}, using the
-	file format @var{target}, and return a pointer to it.
-
-	Possible errors are <<bfd_error_system_call>>, <<bfd_error_no_memory>>,
-	<<bfd_error_invalid_target>>.
-*/
-
-bfd *
-bfd_openw (filename, target)
-     CONST char *filename;
-     CONST char *target;
-{
-  bfd *nbfd;
-  const bfd_target *target_vec;
-
-  bfd_set_error (bfd_error_system_call);
-
-  /* nbfd has to point to head of malloc'ed block so that bfd_close may
-     reclaim it correctly. */
-
-  nbfd = _bfd_new_bfd ();
-  if (nbfd == NULL)
-    return NULL;
-
-  target_vec = bfd_find_target (target, nbfd);
-  if (target_vec == NULL)
-    {
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-    }
-
-  nbfd->filename = filename;
-  nbfd->direction = write_direction;
-
-  if (bfd_open_file (nbfd) == NULL)
-    {
-      bfd_set_error (bfd_error_system_call);	/* File not writeable, etc */
-      objalloc_free ((struct objalloc *) nbfd->memory);
-      free (nbfd);
-      return NULL;
-  }
-
-  return nbfd;
-}
-
-/*
-
-FUNCTION
-	bfd_close
-
-SYNOPSIS
-	boolean bfd_close(bfd *abfd);
-
-DESCRIPTION
-
-	Close a BFD. If the BFD was open for writing,
-	then pending operations are completed and the file written out
-	and closed. If the created file is executable, then
-	<<chmod>> is called to mark it as such.
-
-	All memory attached to the BFD is released.
-
-	The file descriptor associated with the BFD is closed (even
-	if it was passed in to BFD by <<bfd_fdopenr>>).
-
-RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.
-*/
-
-
-boolean
-bfd_close (abfd)
-     bfd *abfd;
-{
-  boolean ret;
-
-  if (!bfd_read_p (abfd))
-    {
-      if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
-	return false;
-    }
-
-  if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
-    return false;
-
-  ret = bfd_cache_close (abfd);
-
-  /* If the file was open for writing and is now executable,
-     make it so */
-  if (ret
-      && abfd->direction == write_direction
-      && abfd->flags & EXEC_P)
-    {
-      struct stat buf;
-
-      if (stat (abfd->filename, &buf) == 0)
-	{
- 	  int mask = umask (0);
-	  umask (mask);
-	  chmod (abfd->filename,
-		 (0777
-		  & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
-	}
-    }
-
-  objalloc_free ((struct objalloc *) abfd->memory);
-  free (abfd);
-
-  return ret;
-}
-
-/*
-FUNCTION
-	bfd_close_all_done
-
-SYNOPSIS
-	boolean bfd_close_all_done(bfd *);
-
-DESCRIPTION
-	Close a BFD.  Differs from <<bfd_close>>
-	since it does not complete any pending operations.  This
-	routine would be used if the application had just used BFD for
-	swapping and didn't want to use any of the writing code.
-
-	If the created file is executable, then <<chmod>> is called
-	to mark it as such.
-
-	All memory attached to the BFD is released.
-
-RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.
-
-*/
-
-boolean
-bfd_close_all_done (abfd)
-     bfd *abfd;
-{
-  boolean ret;
-
-  ret = bfd_cache_close (abfd);
-
-  /* If the file was open for writing and is now executable,
-     make it so */
-  if (ret
-      && abfd->direction == write_direction
-      && abfd->flags & EXEC_P)
-    {
-      struct stat buf;
-
-      if (stat (abfd->filename, &buf) == 0)
-	{
-	  int mask = umask (0);
-	  umask (mask);
-	  chmod (abfd->filename,
-		 (0x777
-		  & (buf.st_mode | ((S_IXUSR | S_IXGRP | S_IXOTH) &~ mask))));
-	}
-    }
-
-  objalloc_free ((struct objalloc *) abfd->memory);
-  free (abfd);
-
-  return ret;
-}
-
-/*
-FUNCTION
-	bfd_create
-
-SYNOPSIS
-	bfd *bfd_create(CONST char *filename, bfd *templ);
-
-DESCRIPTION
-	Create a new BFD in the manner of
-	<<bfd_openw>>, but without opening a file. The new BFD
-	takes the target from the target used by @var{template}. The
-	format is always set to <<bfd_object>>.
-
-*/
-
-bfd *
-bfd_create (filename, templ)
-     CONST char *filename;
-     bfd *templ;
-{
-  bfd *nbfd;
-
-  nbfd = _bfd_new_bfd ();
-  if (nbfd == NULL)
-    return NULL;
-  nbfd->filename = filename;
-  if (templ)
-    nbfd->xvec = templ->xvec;
-  nbfd->direction = no_direction;
-  bfd_set_format (nbfd, bfd_object);
-  return nbfd;
-}
-
-/*
-FUNCTION
-	bfd_make_writable
-
-SYNOPSIS
-	boolean bfd_make_writable(bfd *abfd);
-
-DESCRIPTION
-	Takes a BFD as created by <<bfd_create>> and converts it
-	into one like as returned by <<bfd_openw>>.  It does this
-	by converting the BFD to BFD_IN_MEMORY.  It's assumed that
-	you will call <<bfd_make_readable>> on this bfd later.
-
-RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.
-*/
-
-boolean
-bfd_make_writable(abfd)
-     bfd *abfd;
-{
-  struct bfd_in_memory *bim;
-
-  if (abfd->direction != no_direction)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  bim = (struct bfd_in_memory *) bfd_malloc (sizeof (struct bfd_in_memory));
-  abfd->iostream = (PTR) bim;
-  /* bfd_write will grow these as needed */
-  bim->size = 0;
-  bim->buffer = 0;
-
-  abfd->flags |= BFD_IN_MEMORY;
-  abfd->direction = write_direction;
-  abfd->where = 0;
-
-  return true;
-}
-
-/*
-FUNCTION
-	bfd_make_readable
-
-SYNOPSIS
-	boolean bfd_make_readable(bfd *abfd);
-
-DESCRIPTION
-	Takes a BFD as created by <<bfd_create>> and
-	<<bfd_make_writable>> and converts it into one like as
-	returned by <<bfd_openr>>.  It does this by writing the
-	contents out to the memory buffer, then reversing the
-	direction.
-
-RETURNS
-	<<true>> is returned if all is ok, otherwise <<false>>.  */
-
-boolean
-bfd_make_readable(abfd)
-     bfd *abfd;
-{
-  if (abfd->direction != write_direction || !(abfd->flags & BFD_IN_MEMORY))
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  if (! BFD_SEND_FMT (abfd, _bfd_write_contents, (abfd)))
-    return false;
-
-  if (! BFD_SEND (abfd, _close_and_cleanup, (abfd)))
-    return false;
-
-
-  abfd->arch_info = &bfd_default_arch_struct;
-
-  abfd->where = 0;
-  abfd->sections = (asection *) NULL;
-  abfd->format = bfd_unknown;
-  abfd->my_archive = (bfd *) NULL;
-  abfd->origin = 0;				
-  abfd->opened_once = false;
-  abfd->output_has_begun = false;
-  abfd->section_count = 0;
-  abfd->usrdata = (PTR) NULL;
-  abfd->cacheable = false;
-  abfd->flags = BFD_IN_MEMORY;
-  abfd->mtime_set = false;
-
-  abfd->target_defaulted = true;
-  abfd->direction = read_direction;
-  abfd->sections = 0;
-  abfd->symcount = 0;
-  abfd->outsymbols = 0;
-  abfd->tdata.any = 0;
-
-  bfd_check_format(abfd, bfd_object);
-
-  return true;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_alloc
-
-SYNOPSIS
-	PTR bfd_alloc (bfd *abfd, size_t wanted);
-
-DESCRIPTION
-	Allocate a block of @var{wanted} bytes of memory attached to
-	<<abfd>> and return a pointer to it.
-*/
-
-
-PTR
-bfd_alloc (abfd, size)
-     bfd *abfd;
-     size_t size;
-{
-  PTR ret;
-
-  ret = objalloc_alloc (abfd->memory, (unsigned long) size);
-  if (ret == NULL)
-    bfd_set_error (bfd_error_no_memory);
-  return ret;
-}
-
-PTR
-bfd_zalloc (abfd, size)
-     bfd *abfd;
-     size_t size;
-{
-  PTR res;
-
-  res = bfd_alloc (abfd, size);
-  if (res)
-    memset (res, 0, size);
-  return res;
-}
-
-/* Free a block allocated for a BFD.  */
-
-void
-bfd_release (abfd, block)
-     bfd *abfd;
-     PTR block;
-{
-  objalloc_free_block ((struct objalloc *) abfd->memory, block);
-}
diff --git a/bfd/osf-core.c b/bfd/osf-core.c
deleted file mode 100644
index 671f4af495c..00000000000
--- a/bfd/osf-core.c
+++ /dev/null
@@ -1,254 +0,0 @@
-/* BFD back-end for OSF/1 core files.
-   Copyright 1993, 94, 95, 97, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file can only be compiled on systems which use OSF/1 style
-   core files.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include <sys/user.h>
-#include <sys/core.h>
-
-/* forward declarations */
-
-static asection *
-make_bfd_asection PARAMS ((bfd *, CONST char *, flagword, bfd_size_type,
-			   bfd_vma, file_ptr));
-static asymbol *
-osf_core_make_empty_symbol PARAMS ((bfd *));
-static const bfd_target *
-osf_core_core_file_p PARAMS ((bfd *));
-static char *
-osf_core_core_file_failing_command PARAMS ((bfd *));
-static int
-osf_core_core_file_failing_signal PARAMS ((bfd *));
-static boolean
-osf_core_core_file_matches_executable_p PARAMS ((bfd *, bfd *));
-static void
-swap_abort PARAMS ((void));
-
-/* These are stored in the bfd's tdata */
-
-struct osf_core_struct 
-{
-  int sig;
-  char cmd[MAXCOMLEN + 1];
-};
-
-#define core_hdr(bfd) ((bfd)->tdata.osf_core_data)
-#define core_signal(bfd) (core_hdr(bfd)->sig)
-#define core_command(bfd) (core_hdr(bfd)->cmd)
-
-static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
-     bfd *abfd;
-     CONST char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     file_ptr filepos;
-{
-  asection *asect;
-
-  asect = bfd_make_section_anyway (abfd, name);
-  if (!asect)
-    return NULL;
-
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
-  asect->vma = vma;
-  asect->filepos = filepos;
-  asect->alignment_power = 8;
-
-  return asect;
-}
-
-static asymbol *
-osf_core_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
-static const bfd_target *
-osf_core_core_file_p (abfd)
-     bfd *abfd;
-{
-  int val;
-  int i;
-  char *secname;
-  struct core_filehdr core_header;
-
-  val = bfd_read ((PTR)&core_header, 1, sizeof core_header, abfd);
-  if (val != sizeof core_header)
-    return NULL;
-
-  if (strncmp (core_header.magic, "Core", 4) != 0)
-    return NULL;
-
-  core_hdr (abfd) = (struct osf_core_struct *)
-    bfd_zalloc (abfd, sizeof (struct osf_core_struct));
-  if (!core_hdr (abfd))
-    return NULL;
-
-  strncpy (core_command (abfd), core_header.name, MAXCOMLEN + 1);
-  core_signal (abfd) = core_header.signo;
-
-  for (i = 0; i < core_header.nscns; i++)
-    {
-      struct core_scnhdr core_scnhdr;
-      flagword flags;
-
-      val = bfd_read ((PTR)&core_scnhdr, 1, sizeof core_scnhdr, abfd);
-      if (val != sizeof core_scnhdr)
-	break;
-
-      /* Skip empty sections.  */
-      if (core_scnhdr.size == 0 || core_scnhdr.scnptr == 0)
-	continue;
-
-      switch (core_scnhdr.scntype)
-	{
-	case SCNRGN:
-	  secname = ".data";
-	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-	  break;
-	case SCNSTACK:
-	  secname = ".stack";
-	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-	  break;
-	case SCNREGS:
-	  secname = ".reg";
-	  flags = SEC_HAS_CONTENTS;
-	  break;
-	default:
-	  (*_bfd_error_handler) (_("Unhandled OSF/1 core file section type %d\n"),
-				 core_scnhdr.scntype);
-	  continue;
-	}
-
-      if (!make_bfd_asection (abfd, secname, flags,
-			      (bfd_size_type) core_scnhdr.size,
-			      (bfd_vma) core_scnhdr.vaddr,
-			      (file_ptr) core_scnhdr.scnptr))
-	return NULL;
-    }
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  return abfd->xvec;
-}
-
-static char *
-osf_core_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  return core_command (abfd);
-}
-
-/* ARGSUSED */
-static int
-osf_core_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_signal (abfd);
-}
-
-/* ARGSUSED */
-static boolean
-osf_core_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;		/* FIXME, We have no way of telling at this point */
-}
-
-#define osf_core_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
-#define osf_core_get_symtab _bfd_nosymbols_get_symtab
-#define osf_core_print_symbol _bfd_nosymbols_print_symbol
-#define osf_core_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define osf_core_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
-#define osf_core_get_lineno _bfd_nosymbols_get_lineno
-#define osf_core_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define osf_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define osf_core_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define osf_core_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target osf_core_vec =
-  {
-    "osf-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_BIG,		/* target byte order */
-    BFD_ENDIAN_BIG,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     osf_core_core_file_p	/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (osf_core),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (osf_core),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c
deleted file mode 100644
index 73f4ac49e82..00000000000
--- a/bfd/pc532-mach.c
+++ /dev/null
@@ -1,121 +0,0 @@
-/* BFD back-end for Mach3/532 a.out-ish binaries.
-   Copyright (C) 1990, 1991, 1992, 1994 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* Written by Ian Dall
- *            19-Apr-94
- *
- * Formerly part of aout-pc532-mach.c. Split out to allow more
- * flexibility with multiple formats.
- *
- */
-/* This architecture has N_TXTOFF and N_TXTADDR defined as if
- * N_HEADER_IN_TEXT, but the a_text entry (text size) does not include the
- * space for the header. So we have N_HEADER_IN_TEXT defined to
- * 1 and specially define our own N_TXTSIZE
- */
-
-#define N_HEADER_IN_TEXT(x) 1
-#define N_TXTSIZE(x) ((x).a_text)
-
-
-#define TEXT_START_ADDR 0x10000       /* from old ld */
-#define TARGET_PAGE_SIZE 0x1000       /* from old ld,  032 & 532 are really 512/4k */
-
-/* Use a_entry of 0 to distinguish object files from OMAGIC executables */
-#define N_TXTADDR(x) \
-  (N_MAGIC(x) == OMAGIC ? \
-   ((x).a_entry < TEXT_START_ADDR? 0: TEXT_START_ADDR): \
-   (N_MAGIC(x) == NMAGIC? TEXT_START_ADDR: \
-    TEXT_START_ADDR + EXEC_BYTES_SIZE))
-
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-
-#define N_SHARED_LIB(x) 0
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_ns32k
-  
-#define MY(OP) CAT(pc532machaout_,OP)
-
-/* Must be the same as aout-ns32k.c */
-#define NAME(x,y) CAT3(ns32kaout,_32_,y)
-
-#define TARGETNAME "a.out-pc532-mach"
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libaout.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-
-/* We can`t use the MYNS macro here for cpp reasons too subtle for me -- IWD */
-
-#define MY_bfd_reloc_type_lookup ns32kaout_bfd_reloc_type_lookup
-
-/* libaout doesn't use NAME for these ... */
-
-#define MY_get_section_contents aout_32_get_section_contents
-
-#define MY_text_includes_header 1
-
-#define MY_exec_header_not_counted 1
-     
-#define MYNSX(OP) CAT(ns32kaout_,OP)
-reloc_howto_type *
-MYNSX(bfd_reloc_type_lookup)
-  PARAMS((bfd *abfd AND
-	  bfd_reloc_code_real_type code));
-
-boolean
-MYNSX(write_object_contents)
-  PARAMS((bfd *abfd));
-
-static boolean
-MY(write_object_contents) (abfd)
-bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-  
-#if CHOOSE_RELOC_SIZE
-  CHOOSE_RELOC_SIZE(abfd);
-#else
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-#endif
-  
-  BFD_ASSERT (bfd_get_arch (abfd) == bfd_arch_ns32k);
-  switch (bfd_get_mach (abfd))
-    {
-    case 32032:
-      N_SET_MACHTYPE (*execp, M_NS32032);
-      break;
-    case 32532:
-    default:
-      N_SET_MACHTYPE (*execp, M_NS32532);
-      break;
-    }
-  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
-  
-  WRITE_HEADERS(abfd, execp);
-  
-  return true;
-}
-
-#define MY_write_object_contents MY(write_object_contents)
-
-#include "aout-target.h"
diff --git a/bfd/pe-arm.c b/bfd/pe-arm.c
deleted file mode 100644
index d315888f1da..00000000000
--- a/bfd/pe-arm.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* BFD back-end for ARM PECOFF files.
-   Copyright 1995, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#ifndef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM    armpe_little_vec
-#define TARGET_LITTLE_NAME   "pe-arm-little"
-#define TARGET_BIG_SYM       armpe_big_vec
-#define TARGET_BIG_NAME      "pe-arm-big"
-#endif
-
-#define COFF_WITH_PE
-#define PCRELOFFSET          true
-#define COFF_LONG_SECTION_NAMES
-
-#include "coff-arm.c"
diff --git a/bfd/pe-i386.c b/bfd/pe-i386.c
deleted file mode 100644
index bcdbe444994..00000000000
--- a/bfd/pe-i386.c
+++ /dev/null
@@ -1,31 +0,0 @@
-/* BFD back-end for Intel 386 PECOFF files.
-   Copyright 1995 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-
-#define TARGET_SYM i386pe_vec
-#define TARGET_NAME "pe-i386"
-#define COFF_WITH_PE
-#define PCRELOFFSET true
-#define TARGET_UNDERSCORE '_'
-#define COFF_LONG_SECTION_NAMES
-
-#include "coff-i386.c"
diff --git a/bfd/pe-mcore.c b/bfd/pe-mcore.c
deleted file mode 100644
index 8119f815895..00000000000
--- a/bfd/pe-mcore.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* BFD back-end for MCore PECOFF files.
-   Copyright 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#ifndef TARGET_BIG_SYM
-#define TARGET_BIG_SYM       mcore_pe_big_vec
-#define TARGET_BIG_NAME      "pe-mcore-big"
-#define TARGET_LITTLE_SYM    mcore_pe_little_vec
-#define TARGET_LITTLE_NAME   "pe-mcore-little"
-#endif
-
-#define COFF_WITH_PE
-#define PCRELOFFSET          true
-#define COFF_LONG_SECTION_NAMES
-
-#define MCORE_PE
-
-#include "coff-mcore.c"
diff --git a/bfd/pe-ppc.c b/bfd/pe-ppc.c
deleted file mode 100644
index a2bac04ac6f..00000000000
--- a/bfd/pe-ppc.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/* BFD back-end for PowerPC PECOFF files.
-   Copyright 1995 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-
-#define E_FILENMLEN     18
-
-#define PPC_PE
-
-#define TARGET_LITTLE_SYM   bfd_powerpcle_pe_vec
-#define TARGET_LITTLE_NAME "pe-powerpcle"
-
-#define TARGET_BIG_SYM      bfd_powerpc_pe_vec
-#define TARGET_BIG_NAME    "pe-powerpc"
-
-#define COFF_WITH_PE
-
-#define COFF_LONG_SECTION_NAMES
-
-/* FIXME: verify PCRELOFFSET is always false */
-
-#include "coff-ppc.c"
diff --git a/bfd/pei-arm.c b/bfd/pei-arm.c
deleted file mode 100644
index 4ba5b3a5cd0..00000000000
--- a/bfd/pei-arm.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* BFD back-end for arm PE IMAGE COFF files.
-   Copyright 1995, 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#ifndef TARGET_LITTLE_SYM
-#define TARGET_LITTLE_SYM  armpei_little_vec
-#define TARGET_LITTLE_NAME "pei-arm-little"
-#define TARGET_BIG_SYM     armpei_big_vec
-#define TARGET_BIG_NAME    "pei-arm-big"
-#endif
-
-#define IMAGE_BASE         NT_IMAGE_BASE
-#define COFF_IMAGE_WITH_PE
-#define COFF_WITH_PE
-#define PCRELOFFSET        true
-#define COFF_LONG_SECTION_NAMES
-
-#include "coff-arm.c"
diff --git a/bfd/pei-i386.c b/bfd/pei-i386.c
deleted file mode 100644
index 8b52968370e..00000000000
--- a/bfd/pei-i386.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/* BFD back-end for Intel 386 PE IMAGE COFF files.
-   Copyright 1995 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#define TARGET_SYM i386pei_vec
-#define TARGET_NAME "pei-i386"
-#define IMAGE_BASE NT_IMAGE_BASE
-#define COFF_IMAGE_WITH_PE
-#define COFF_WITH_PE
-#define PCRELOFFSET true
-#define TARGET_UNDERSCORE '_'
-#define COFF_LONG_SECTION_NAMES
-
-#include "coff-i386.c"
-
-
-
diff --git a/bfd/pei-mcore.c b/bfd/pei-mcore.c
deleted file mode 100644
index d4a872cdfcb..00000000000
--- a/bfd/pei-mcore.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/* BFD back-end for MCore PECOFF files.
-   Copyright 1999 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#ifndef TARGET_BIG_SYM
-#define TARGET_BIG_SYM       mcore_pei_big_vec
-#define TARGET_BIG_NAME      "pei-mcore-big"
-#define TARGET_LITTLE_SYM    mcore_pei_little_vec
-#define TARGET_LITTLE_NAME   "pei-mcore-little"
-#endif
-
-#define IMAGE_BASE         NT_IMAGE_BASE
-#define COFF_IMAGE_WITH_PE
-#define COFF_WITH_PE
-#define PCRELOFFSET        true
-#define COFF_LONG_SECTION_NAMES
-
-#define MCORE_PE
-
-#include "coff-mcore.c"
diff --git a/bfd/pei-ppc.c b/bfd/pei-ppc.c
deleted file mode 100644
index 839bc0f64af..00000000000
--- a/bfd/pei-ppc.c
+++ /dev/null
@@ -1,47 +0,0 @@
-/* BFD back-end for PowerPC PE IMAGE COFF files.
-   Copyright 1995 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-/* setting up for a PE environment stolen directly from the i386 structure */
-#define E_FILNMLEN	18	/* # characters in a file name		*/
-
-#define PPC_PE
-
-#define TARGET_LITTLE_SYM   bfd_powerpcle_pei_vec
-#define TARGET_LITTLE_NAME "pei-powerpcle"
-
-#define TARGET_BIG_SYM      bfd_powerpc_pei_vec
-#define TARGET_BIG_NAME    "pei-powerpc"
-
-#define IMAGE_BASE          NT_IMAGE_BASE
-
-#define COFF_IMAGE_WITH_PE
-#define COFF_WITH_PE
-
-#define COFF_LONG_SECTION_NAMES
-
-/* FIXME: Verify PCRELOFFSET is always false */
-
-#include "coff-ppc.c"
-
-
-
diff --git a/bfd/peicode.h b/bfd/peicode.h
deleted file mode 100644
index 79d16e5abe9..00000000000
--- a/bfd/peicode.h
+++ /dev/null
@@ -1,2144 +0,0 @@
-/* Support for the generic parts of most COFF variants, for BFD.
-   Copyright 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-Most of this hacked by  Steve Chamberlain,
-			sac@cygnus.com
-*/
-
-/* Hey look, some documentation [and in a place you expect to find it]!
-
-   The main reference for the pei format is "Microsoft Portable Executable
-   and Common Object File Format Specification 4.1".  Get it if you need to
-   do some serious hacking on this code.
-
-   Another reference:
-   "Peering Inside the PE: A Tour of the Win32 Portable Executable
-   File Format", MSJ 1994, Volume 9.
-
-   The *sole* difference between the pe format and the pei format is that the
-   latter has an MSDOS 2.0 .exe header on the front that prints the message
-   "This app must be run under Windows." (or some such).
-   (FIXME: Whether that statement is *really* true or not is unknown.
-   Are there more subtle differences between pe and pei formats?
-   For now assume there aren't.  If you find one, then for God sakes
-   document it here!)
-
-   The Microsoft docs use the word "image" instead of "executable" because
-   the former can also refer to a DLL (shared library).  Confusion can arise
-   because the `i' in `pei' also refers to "image".  The `pe' format can
-   also create images (i.e. executables), it's just that to run on a win32
-   system you need to use the pei format.
-
-   FIXME: Please add more docs here so the next poor fool that has to hack
-   on this code has a chance of getting something accomplished without
-   wasting too much time.
-*/
-
-#ifdef coff_bfd_print_private_bfd_data
-static boolean (*pe_saved_coff_bfd_print_private_bfd_data)
-     PARAMS ((bfd *, PTR))
-     = coff_bfd_print_private_bfd_data;
-#undef coff_bfd_print_private_bfd_data
-#else
-static boolean (*pe_saved_coff_bfd_print_private_bfd_data)
-     PARAMS ((bfd *, PTR))
-     = NULL;
-#endif
-#define coff_bfd_print_private_bfd_data pe_print_private_bfd_data
-
-#define coff_mkobject      pe_mkobject
-#define coff_mkobject_hook pe_mkobject_hook
-
-#ifndef GET_FCN_LNNOPTR
-#define GET_FCN_LNNOPTR(abfd, ext) \
-     bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
-#endif
-
-#ifndef GET_FCN_ENDNDX
-#define GET_FCN_ENDNDX(abfd, ext)  \
-	bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_endndx)
-#endif
-
-#ifndef PUT_FCN_LNNOPTR
-#define PUT_FCN_LNNOPTR(abfd, in, ext)  bfd_h_put_32(abfd,  in, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_lnnoptr)
-#endif
-#ifndef PUT_FCN_ENDNDX
-#define PUT_FCN_ENDNDX(abfd, in, ext) bfd_h_put_32(abfd, in, (bfd_byte *) ext->x_sym.x_fcnary.x_fcn.x_endndx)
-#endif
-#ifndef GET_LNSZ_LNNO
-#define GET_LNSZ_LNNO(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_lnno)
-#endif
-#ifndef GET_LNSZ_SIZE
-#define GET_LNSZ_SIZE(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) ext->x_sym.x_misc.x_lnsz.x_size)
-#endif
-#ifndef PUT_LNSZ_LNNO
-#define PUT_LNSZ_LNNO(abfd, in, ext) bfd_h_put_16(abfd, in, (bfd_byte *)ext->x_sym.x_misc.x_lnsz.x_lnno)
-#endif
-#ifndef PUT_LNSZ_SIZE
-#define PUT_LNSZ_SIZE(abfd, in, ext) bfd_h_put_16(abfd, in, (bfd_byte*) ext->x_sym.x_misc.x_lnsz.x_size)
-#endif
-#ifndef GET_SCN_SCNLEN
-#define GET_SCN_SCNLEN(abfd,  ext) bfd_h_get_32(abfd, (bfd_byte *) ext->x_scn.x_scnlen)
-#endif
-#ifndef GET_SCN_NRELOC
-#define GET_SCN_NRELOC(abfd,  ext) bfd_h_get_16(abfd, (bfd_byte *)ext->x_scn.x_nreloc)
-#endif
-#ifndef GET_SCN_NLINNO
-#define GET_SCN_NLINNO(abfd, ext)  bfd_h_get_16(abfd, (bfd_byte *)ext->x_scn.x_nlinno)
-#endif
-#ifndef PUT_SCN_SCNLEN
-#define PUT_SCN_SCNLEN(abfd,in, ext) bfd_h_put_32(abfd, in, (bfd_byte *) ext->x_scn.x_scnlen)
-#endif
-#ifndef PUT_SCN_NRELOC
-#define PUT_SCN_NRELOC(abfd,in, ext) bfd_h_put_16(abfd, in, (bfd_byte *)ext->x_scn.x_nreloc)
-#endif
-#ifndef PUT_SCN_NLINNO
-#define PUT_SCN_NLINNO(abfd,in, ext)  bfd_h_put_16(abfd,in, (bfd_byte  *) ext->x_scn.x_nlinno)
-#endif
-#ifndef GET_LINENO_LNNO
-#define GET_LINENO_LNNO(abfd, ext) bfd_h_get_16(abfd, (bfd_byte *) (ext->l_lnno));
-#endif
-#ifndef PUT_LINENO_LNNO
-#define PUT_LINENO_LNNO(abfd,val, ext) bfd_h_put_16(abfd,val,  (bfd_byte *) (ext->l_lnno));
-#endif
-
-/* The f_symptr field in the filehdr is sometimes 64 bits.  */
-#ifndef GET_FILEHDR_SYMPTR
-#define GET_FILEHDR_SYMPTR bfd_h_get_32
-#endif
-#ifndef PUT_FILEHDR_SYMPTR
-#define PUT_FILEHDR_SYMPTR bfd_h_put_32
-#endif
-
-/* Some fields in the aouthdr are sometimes 64 bits.  */
-#ifndef GET_AOUTHDR_TSIZE
-#define GET_AOUTHDR_TSIZE bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_TSIZE
-#define PUT_AOUTHDR_TSIZE bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_DSIZE
-#define GET_AOUTHDR_DSIZE bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_DSIZE
-#define PUT_AOUTHDR_DSIZE bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_BSIZE
-#define GET_AOUTHDR_BSIZE bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_BSIZE
-#define PUT_AOUTHDR_BSIZE bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_ENTRY
-#define GET_AOUTHDR_ENTRY bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_ENTRY
-#define PUT_AOUTHDR_ENTRY bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_TEXT_START
-#define GET_AOUTHDR_TEXT_START bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_TEXT_START
-#define PUT_AOUTHDR_TEXT_START bfd_h_put_32
-#endif
-#ifndef GET_AOUTHDR_DATA_START
-#define GET_AOUTHDR_DATA_START bfd_h_get_32
-#endif
-#ifndef PUT_AOUTHDR_DATA_START
-#define PUT_AOUTHDR_DATA_START bfd_h_put_32
-#endif
-
-/* Some fields in the scnhdr are sometimes 64 bits.  */
-#ifndef GET_SCNHDR_PADDR
-#define GET_SCNHDR_PADDR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_PADDR
-#define PUT_SCNHDR_PADDR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_VADDR
-#define GET_SCNHDR_VADDR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_VADDR
-#define PUT_SCNHDR_VADDR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_SIZE
-#define GET_SCNHDR_SIZE bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_SIZE
-#define PUT_SCNHDR_SIZE bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_SCNPTR
-#define GET_SCNHDR_SCNPTR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_SCNPTR
-#define PUT_SCNHDR_SCNPTR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_RELPTR
-#define GET_SCNHDR_RELPTR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_RELPTR
-#define PUT_SCNHDR_RELPTR bfd_h_put_32
-#endif
-#ifndef GET_SCNHDR_LNNOPTR
-#define GET_SCNHDR_LNNOPTR bfd_h_get_32
-#endif
-#ifndef PUT_SCNHDR_LNNOPTR
-#define PUT_SCNHDR_LNNOPTR bfd_h_put_32
-#endif
-
-static void coff_swap_reloc_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_reloc_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_filehdr_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_filehdr_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_sym_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_sym_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_aux_in PARAMS ((bfd *, PTR, int, int, int, int, PTR));
-static unsigned int coff_swap_aux_out
-  PARAMS ((bfd *, PTR, int, int, int, int, PTR));
-static void coff_swap_lineno_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_lineno_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_aouthdr_in PARAMS ((bfd *, PTR, PTR));
-static void add_data_entry
-  PARAMS ((bfd *, struct internal_extra_pe_aouthdr *, int, char *, bfd_vma));
-static unsigned int coff_swap_aouthdr_out PARAMS ((bfd *, PTR, PTR));
-static void coff_swap_scnhdr_in PARAMS ((bfd *, PTR, PTR));
-static unsigned int coff_swap_scnhdr_out PARAMS ((bfd *, PTR, PTR));
-static boolean pe_print_idata PARAMS ((bfd *, PTR));
-static boolean pe_print_edata PARAMS ((bfd *, PTR));
-static boolean pe_print_pdata PARAMS ((bfd *, PTR));
-static boolean pe_print_reloc PARAMS ((bfd *, PTR));
-static boolean pe_print_private_bfd_data PARAMS ((bfd *, PTR));
-static boolean pe_mkobject PARAMS ((bfd *));
-static PTR pe_mkobject_hook PARAMS ((bfd *, PTR, PTR));
-static boolean pe_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-
-/**********************************************************************/
-
-static void
-coff_swap_reloc_in (abfd, src, dst)
-     bfd *abfd;
-     PTR src;
-     PTR dst;
-{
-  RELOC *reloc_src = (RELOC *) src;
-  struct internal_reloc *reloc_dst = (struct internal_reloc *) dst;
-
-  reloc_dst->r_vaddr = bfd_h_get_32(abfd, (bfd_byte *)reloc_src->r_vaddr);
-  reloc_dst->r_symndx = bfd_h_get_signed_32(abfd, (bfd_byte *) reloc_src->r_symndx);
-
-  reloc_dst->r_type = bfd_h_get_16(abfd, (bfd_byte *) reloc_src->r_type);
-
-#ifdef SWAP_IN_RELOC_OFFSET
-  reloc_dst->r_offset = SWAP_IN_RELOC_OFFSET(abfd,
-					     (bfd_byte *) reloc_src->r_offset);
-#endif
-}
-
-
-static unsigned int
-coff_swap_reloc_out (abfd, src, dst)
-     bfd       *abfd;
-     PTR	src;
-     PTR	dst;
-{
-  struct internal_reloc *reloc_src = (struct internal_reloc *)src;
-  struct external_reloc *reloc_dst = (struct external_reloc *)dst;
-  bfd_h_put_32(abfd, reloc_src->r_vaddr, (bfd_byte *) reloc_dst->r_vaddr);
-  bfd_h_put_32(abfd, reloc_src->r_symndx, (bfd_byte *) reloc_dst->r_symndx);
-
-  bfd_h_put_16(abfd, reloc_src->r_type, (bfd_byte *)
-	       reloc_dst->r_type);
-
-#ifdef SWAP_OUT_RELOC_OFFSET
-  SWAP_OUT_RELOC_OFFSET(abfd,
-			reloc_src->r_offset,
-			(bfd_byte *) reloc_dst->r_offset);
-#endif
-#ifdef SWAP_OUT_RELOC_EXTRA
-  SWAP_OUT_RELOC_EXTRA(abfd,reloc_src, reloc_dst);
-#endif
-  return RELSZ;
-}
-
-
-static void
-coff_swap_filehdr_in (abfd, src, dst)
-     bfd            *abfd;
-     PTR	     src;
-     PTR	     dst;
-{
-  FILHDR *filehdr_src = (FILHDR *) src;
-  struct internal_filehdr *filehdr_dst = (struct internal_filehdr *) dst;
-  filehdr_dst->f_magic = bfd_h_get_16(abfd, (bfd_byte *) filehdr_src->f_magic);
-  filehdr_dst->f_nscns = bfd_h_get_16(abfd, (bfd_byte *)filehdr_src-> f_nscns);
-  filehdr_dst->f_timdat = bfd_h_get_32(abfd, (bfd_byte *)filehdr_src-> f_timdat);
-
-  filehdr_dst->f_nsyms = bfd_h_get_32(abfd, (bfd_byte *)filehdr_src-> f_nsyms);
-  filehdr_dst->f_flags = bfd_h_get_16(abfd, (bfd_byte *)filehdr_src-> f_flags);
-  filehdr_dst->f_symptr = bfd_h_get_32 (abfd, (bfd_byte *) filehdr_src->f_symptr);
-
-  /* Other people's tools sometimes generate headers with an nsyms but
-     a zero symptr.  */
-  if (filehdr_dst->f_nsyms != 0 && filehdr_dst->f_symptr == 0)
-    {
-      filehdr_dst->f_nsyms = 0;
-      filehdr_dst->f_flags |= F_LSYMS;
-    }
-
-  filehdr_dst->f_opthdr = bfd_h_get_16(abfd, 
-				       (bfd_byte *)filehdr_src-> f_opthdr);
-}
-
-#ifdef COFF_IMAGE_WITH_PE
-
-static  unsigned int
-coff_swap_filehdr_out (abfd, in, out)
-     bfd       *abfd;
-     PTR	in;
-     PTR	out;
-{
-  int idx;
-  struct internal_filehdr *filehdr_in = (struct internal_filehdr *)in;
-  FILHDR *filehdr_out = (FILHDR *)out;
-
-  if (pe_data (abfd)->has_reloc_section)
-    filehdr_in->f_flags &= ~F_RELFLG;
-
-  if (pe_data (abfd)->dll)
-    filehdr_in->f_flags |= F_DLL;
-
-  filehdr_in->pe.e_magic    = DOSMAGIC;
-  filehdr_in->pe.e_cblp     = 0x90;
-  filehdr_in->pe.e_cp       = 0x3;
-  filehdr_in->pe.e_crlc     = 0x0;
-  filehdr_in->pe.e_cparhdr  = 0x4;
-  filehdr_in->pe.e_minalloc = 0x0;
-  filehdr_in->pe.e_maxalloc = 0xffff;
-  filehdr_in->pe.e_ss       = 0x0;
-  filehdr_in->pe.e_sp       = 0xb8;
-  filehdr_in->pe.e_csum     = 0x0;
-  filehdr_in->pe.e_ip       = 0x0;
-  filehdr_in->pe.e_cs       = 0x0;
-  filehdr_in->pe.e_lfarlc   = 0x40;
-  filehdr_in->pe.e_ovno     = 0x0;
-
-  for (idx=0; idx < 4; idx++)
-    filehdr_in->pe.e_res[idx] = 0x0;
-
-  filehdr_in->pe.e_oemid   = 0x0;
-  filehdr_in->pe.e_oeminfo = 0x0;
-
-  for (idx=0; idx < 10; idx++)
-    filehdr_in->pe.e_res2[idx] = 0x0;
-
-  filehdr_in->pe.e_lfanew = 0x80;
-
-  /* this next collection of data are mostly just characters.  It appears
-     to be constant within the headers put on NT exes */
-  filehdr_in->pe.dos_message[0]  = 0x0eba1f0e;
-  filehdr_in->pe.dos_message[1]  = 0xcd09b400;
-  filehdr_in->pe.dos_message[2]  = 0x4c01b821;
-  filehdr_in->pe.dos_message[3]  = 0x685421cd;
-  filehdr_in->pe.dos_message[4]  = 0x70207369;
-  filehdr_in->pe.dos_message[5]  = 0x72676f72;
-  filehdr_in->pe.dos_message[6]  = 0x63206d61;
-  filehdr_in->pe.dos_message[7]  = 0x6f6e6e61;
-  filehdr_in->pe.dos_message[8]  = 0x65622074;
-  filehdr_in->pe.dos_message[9]  = 0x6e757220;
-  filehdr_in->pe.dos_message[10] = 0x206e6920;
-  filehdr_in->pe.dos_message[11] = 0x20534f44;
-  filehdr_in->pe.dos_message[12] = 0x65646f6d;
-  filehdr_in->pe.dos_message[13] = 0x0a0d0d2e;
-  filehdr_in->pe.dos_message[14] = 0x24;
-  filehdr_in->pe.dos_message[15] = 0x0;
-  filehdr_in->pe.nt_signature = NT_SIGNATURE;
-
-
-
-  bfd_h_put_16(abfd, filehdr_in->f_magic, (bfd_byte *) filehdr_out->f_magic);
-  bfd_h_put_16(abfd, filehdr_in->f_nscns, (bfd_byte *) filehdr_out->f_nscns);
-
-  bfd_h_put_32(abfd, time (0), (bfd_byte *) filehdr_out->f_timdat);
-  PUT_FILEHDR_SYMPTR (abfd, (bfd_vma) filehdr_in->f_symptr,
-		      (bfd_byte *) filehdr_out->f_symptr);
-  bfd_h_put_32(abfd, filehdr_in->f_nsyms, (bfd_byte *) filehdr_out->f_nsyms);
-  bfd_h_put_16(abfd, filehdr_in->f_opthdr, (bfd_byte *) filehdr_out->f_opthdr);
-  bfd_h_put_16(abfd, filehdr_in->f_flags, (bfd_byte *) filehdr_out->f_flags);
-
-  /* put in extra dos header stuff.  This data remains essentially
-     constant, it just has to be tacked on to the beginning of all exes 
-     for NT */
-  bfd_h_put_16(abfd, filehdr_in->pe.e_magic, (bfd_byte *) filehdr_out->e_magic);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_cblp, (bfd_byte *) filehdr_out->e_cblp);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_cp, (bfd_byte *) filehdr_out->e_cp);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_crlc, (bfd_byte *) filehdr_out->e_crlc);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_cparhdr, 
-	       (bfd_byte *) filehdr_out->e_cparhdr);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_minalloc, 
-	       (bfd_byte *) filehdr_out->e_minalloc);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_maxalloc, 
-	       (bfd_byte *) filehdr_out->e_maxalloc);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_ss, (bfd_byte *) filehdr_out->e_ss);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_sp, (bfd_byte *) filehdr_out->e_sp);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_csum, (bfd_byte *) filehdr_out->e_csum);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_ip, (bfd_byte *) filehdr_out->e_ip);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_cs, (bfd_byte *) filehdr_out->e_cs);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_lfarlc, (bfd_byte *) filehdr_out->e_lfarlc);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_ovno, (bfd_byte *) filehdr_out->e_ovno);
-  {
-    int idx;
-    for (idx=0; idx < 4; idx++)
-      bfd_h_put_16(abfd, filehdr_in->pe.e_res[idx], 
-		   (bfd_byte *) filehdr_out->e_res[idx]);
-  }
-  bfd_h_put_16(abfd, filehdr_in->pe.e_oemid, (bfd_byte *) filehdr_out->e_oemid);
-  bfd_h_put_16(abfd, filehdr_in->pe.e_oeminfo,
-	       (bfd_byte *) filehdr_out->e_oeminfo);
-  {
-    int idx;
-    for (idx=0; idx < 10; idx++)
-      bfd_h_put_16(abfd, filehdr_in->pe.e_res2[idx],
-		   (bfd_byte *) filehdr_out->e_res2[idx]);
-  }
-  bfd_h_put_32(abfd, filehdr_in->pe.e_lfanew, (bfd_byte *) filehdr_out->e_lfanew);
-
-  {
-    int idx;
-    for (idx=0; idx < 16; idx++)
-      bfd_h_put_32(abfd, filehdr_in->pe.dos_message[idx],
-		   (bfd_byte *) filehdr_out->dos_message[idx]);
-  }
-
-  /* also put in the NT signature */
-  bfd_h_put_32(abfd, filehdr_in->pe.nt_signature, 
-	       (bfd_byte *) filehdr_out->nt_signature);
-
-
-
-
-  return FILHSZ;
-}
-#else
-
-static  unsigned int
-coff_swap_filehdr_out (abfd, in, out)
-     bfd       *abfd;
-     PTR	in;
-     PTR	out;
-{
-  struct internal_filehdr *filehdr_in = (struct internal_filehdr *)in;
-  FILHDR *filehdr_out = (FILHDR *)out;
-
-  bfd_h_put_16(abfd, filehdr_in->f_magic, (bfd_byte *) filehdr_out->f_magic);
-  bfd_h_put_16(abfd, filehdr_in->f_nscns, (bfd_byte *) filehdr_out->f_nscns);
-  bfd_h_put_32(abfd, filehdr_in->f_timdat, (bfd_byte *) filehdr_out->f_timdat);
-  PUT_FILEHDR_SYMPTR (abfd, (bfd_vma) filehdr_in->f_symptr,
-		      (bfd_byte *) filehdr_out->f_symptr);
-  bfd_h_put_32(abfd, filehdr_in->f_nsyms, (bfd_byte *) filehdr_out->f_nsyms);
-  bfd_h_put_16(abfd, filehdr_in->f_opthdr, (bfd_byte *) filehdr_out->f_opthdr);
-  bfd_h_put_16(abfd, filehdr_in->f_flags, (bfd_byte *) filehdr_out->f_flags);
-
-  return FILHSZ;
-}
-
-#endif
-
-
-static void
-coff_swap_sym_in (abfd, ext1, in1)
-     bfd            *abfd;
-     PTR ext1;
-     PTR in1;
-{
-  SYMENT *ext = (SYMENT *)ext1;
-  struct internal_syment      *in = (struct internal_syment *)in1;
-
-  if( ext->e.e_name[0] == 0) {
-    in->_n._n_n._n_zeroes = 0;
-    in->_n._n_n._n_offset = bfd_h_get_32(abfd, (bfd_byte *) ext->e.e.e_offset);
-  }
-  else {
-#if SYMNMLEN != E_SYMNMLEN
-    -> Error, we need to cope with truncating or extending SYMNMLEN!;
-#else
-    memcpy(in->_n._n_name, ext->e.e_name, SYMNMLEN);
-#endif
-  }
-
-  in->n_value = bfd_h_get_32(abfd, (bfd_byte *) ext->e_value); 
-  in->n_scnum = bfd_h_get_16(abfd, (bfd_byte *) ext->e_scnum);
-  if (sizeof(ext->e_type) == 2){
-    in->n_type = bfd_h_get_16(abfd, (bfd_byte *) ext->e_type);
-  }
-  else {
-    in->n_type = bfd_h_get_32(abfd, (bfd_byte *) ext->e_type);
-  }
-  in->n_sclass = bfd_h_get_8(abfd, ext->e_sclass);
-  in->n_numaux = bfd_h_get_8(abfd, ext->e_numaux);
-
-  /* The section symbols for the .idata$ sections have class 0x68
-     (C_SECTION), which MS documentation indicates is a section
-     symbol.  Unfortunately, the value field in the symbol is simply a
-     copy of the .idata section's flags rather than something useful.
-     When these symbols are encountered, change the value to 0 so that
-     they will be handled somewhat correctly in the bfd code.  */
-  if (in->n_sclass == C_SECTION)
-    {
-      in->n_value = 0x0;
-
-      /* FIXME: This is clearly wrong.  The problem seems to be that
-         undefined C_SECTION symbols appear in the first object of a
-         MS generated .lib file, and the symbols are not defined
-         anywhere.  */
-      in->n_scnum = 1;
-
-      /* I have tried setting the class to 3 and using the following
-	 to set the section number.  This will put the address of the
-	 pointer to the string kernel32.dll at addresses 0 and 0x10
-	 off start of idata section which is not correct */
-      /*    if (strcmp (in->_n._n_name, ".idata$4") == 0) */
-      /*      in->n_scnum = 3; */
-      /*    else */
-      /*      in->n_scnum = 2; */
-    }
-
-#ifdef coff_swap_sym_in_hook
-  coff_swap_sym_in_hook(abfd, ext1, in1);
-#endif
-}
-
-static unsigned int
-coff_swap_sym_out (abfd, inp, extp)
-     bfd       *abfd;
-     PTR	inp;
-     PTR	extp;
-{
-  struct internal_syment *in = (struct internal_syment *)inp;
-  SYMENT *ext =(SYMENT *)extp;
-  if(in->_n._n_name[0] == 0) {
-    bfd_h_put_32(abfd, 0, (bfd_byte *) ext->e.e.e_zeroes);
-    bfd_h_put_32(abfd, in->_n._n_n._n_offset, (bfd_byte *)  ext->e.e.e_offset);
-  }
-  else {
-#if SYMNMLEN != E_SYMNMLEN
-    -> Error, we need to cope with truncating or extending SYMNMLEN!;
-#else
-    memcpy(ext->e.e_name, in->_n._n_name, SYMNMLEN);
-#endif
-  }
-
-  bfd_h_put_32(abfd,  in->n_value , (bfd_byte *) ext->e_value);
-  bfd_h_put_16(abfd,  in->n_scnum , (bfd_byte *) ext->e_scnum);
-  if (sizeof(ext->e_type) == 2)
-    {
-      bfd_h_put_16(abfd,  in->n_type , (bfd_byte *) ext->e_type);
-    }
-  else
-    {
-      bfd_h_put_32(abfd,  in->n_type , (bfd_byte *) ext->e_type);
-    }
-  bfd_h_put_8(abfd,  in->n_sclass , ext->e_sclass);
-  bfd_h_put_8(abfd,  in->n_numaux , ext->e_numaux);
-
-  return SYMESZ;
-}
-
-static void
-coff_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
-     bfd            *abfd;
-     PTR 	      ext1;
-     int             type;
-     int             class;
-     int	      indx;
-     int	      numaux;
-     PTR 	      in1;
-{
-  AUXENT    *ext = (AUXENT *)ext1;
-  union internal_auxent *in = (union internal_auxent *)in1;
-
-  switch (class) {
-  case C_FILE:
-    if (ext->x_file.x_fname[0] == 0) {
-      in->x_file.x_n.x_zeroes = 0;
-      in->x_file.x_n.x_offset = 
-	bfd_h_get_32(abfd, (bfd_byte *) ext->x_file.x_n.x_offset);
-    } else {
-#if FILNMLEN != E_FILNMLEN
-      -> Error, we need to cope with truncating or extending FILNMLEN!;
-#else
-      memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN);
-#endif
-    }
-    return;
-
-
-  case C_STAT:
-#ifdef C_LEAFSTAT
-  case C_LEAFSTAT:
-#endif
-  case C_HIDDEN:
-    if (type == T_NULL) {
-      in->x_scn.x_scnlen = GET_SCN_SCNLEN(abfd, ext);
-      in->x_scn.x_nreloc = GET_SCN_NRELOC(abfd, ext);
-      in->x_scn.x_nlinno = GET_SCN_NLINNO(abfd, ext);
-      in->x_scn.x_checksum = bfd_h_get_32 (abfd,
-					   (bfd_byte *) ext->x_scn.x_checksum);
-      in->x_scn.x_associated =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_scn.x_associated);
-      in->x_scn.x_comdat = bfd_h_get_8 (abfd,
-					(bfd_byte *) ext->x_scn.x_comdat);
-      return;
-    }
-    break;
-  }
-
-  in->x_sym.x_tagndx.l = bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_tagndx);
-#ifndef NO_TVNDX
-  in->x_sym.x_tvndx = bfd_h_get_16(abfd, (bfd_byte *) ext->x_sym.x_tvndx);
-#endif
-
-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-    {
-      in->x_sym.x_fcnary.x_fcn.x_lnnoptr = GET_FCN_LNNOPTR (abfd, ext);
-      in->x_sym.x_fcnary.x_fcn.x_endndx.l = GET_FCN_ENDNDX (abfd, ext);
-    }
-  else
-    {
-#if DIMNUM != E_DIMNUM
- #error we need to cope with truncating or extending DIMNUM
-#endif
-      in->x_sym.x_fcnary.x_ary.x_dimen[0] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
-      in->x_sym.x_fcnary.x_ary.x_dimen[1] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
-      in->x_sym.x_fcnary.x_ary.x_dimen[2] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
-      in->x_sym.x_fcnary.x_ary.x_dimen[3] =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
-    }
-
-  if (ISFCN(type)) {
-    in->x_sym.x_misc.x_fsize = bfd_h_get_32(abfd, (bfd_byte *) ext->x_sym.x_misc.x_fsize);
-  }
-  else {
-    in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO(abfd, ext);
-    in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE(abfd, ext);
-  }
-}
-
-static unsigned int
-coff_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
-     bfd   *abfd;
-     PTR 	inp;
-     int   type;
-     int   class;
-     int   indx;
-     int   numaux;
-     PTR	extp;
-{
-  union internal_auxent *in = (union internal_auxent *)inp;
-  AUXENT *ext = (AUXENT *)extp;
-
-  memset((PTR)ext, 0, AUXESZ);
-  switch (class) {
-  case C_FILE:
-    if (in->x_file.x_fname[0] == 0) {
-      bfd_h_put_32(abfd, 0, (bfd_byte *) ext->x_file.x_n.x_zeroes);
-      bfd_h_put_32(abfd,
-	      in->x_file.x_n.x_offset,
-	      (bfd_byte *) ext->x_file.x_n.x_offset);
-    }
-    else {
-#if FILNMLEN != E_FILNMLEN
-      -> Error, we need to cope with truncating or extending FILNMLEN!;
-#else
-      memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN);
-#endif
-    }
-    return AUXESZ;
-
-
-  case C_STAT:
-#ifdef C_LEAFSTAT
-  case C_LEAFSTAT:
-#endif
-  case C_HIDDEN:
-    if (type == T_NULL) {
-      PUT_SCN_SCNLEN(abfd, in->x_scn.x_scnlen, ext);
-      PUT_SCN_NRELOC(abfd, in->x_scn.x_nreloc, ext);
-      PUT_SCN_NLINNO(abfd, in->x_scn.x_nlinno, ext);
-      bfd_h_put_32 (abfd, in->x_scn.x_checksum,
-		    (bfd_byte *) ext->x_scn.x_checksum);
-      bfd_h_put_16 (abfd, in->x_scn.x_associated,
-		    (bfd_byte *) ext->x_scn.x_associated);
-      bfd_h_put_8 (abfd, in->x_scn.x_comdat,
-		   (bfd_byte *) ext->x_scn.x_comdat);
-      return AUXESZ;
-    }
-    break;
-  }
-
-  bfd_h_put_32(abfd, in->x_sym.x_tagndx.l, (bfd_byte *) ext->x_sym.x_tagndx);
-#ifndef NO_TVNDX
-  bfd_h_put_16(abfd, in->x_sym.x_tvndx , (bfd_byte *) ext->x_sym.x_tvndx);
-#endif
-
-  if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
-    {
-      PUT_FCN_LNNOPTR(abfd,  in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext);
-      PUT_FCN_ENDNDX(abfd,  in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
-    }
-  else
-    {
-#if DIMNUM != E_DIMNUM
- #error we need to cope with truncating or extending DIMNUM
-#endif
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[0],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[0]);
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[1],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[1]);
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[2],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[2]);
-      bfd_h_put_16 (abfd, in->x_sym.x_fcnary.x_ary.x_dimen[3],
-		    (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
-    }
-
-  if (ISFCN (type))
-    bfd_h_put_32 (abfd, in->x_sym.x_misc.x_fsize,
-	     (bfd_byte *)  ext->x_sym.x_misc.x_fsize);
-  else
-    {
-      PUT_LNSZ_LNNO (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
-      PUT_LNSZ_SIZE (abfd, in->x_sym.x_misc.x_lnsz.x_size, ext);
-    }
-
-  return AUXESZ;
-}
-
-
-static void
-coff_swap_lineno_in (abfd, ext1, in1)
-     bfd            *abfd;
-     PTR ext1;
-     PTR in1;
-{
-  LINENO *ext = (LINENO *)ext1;
-  struct internal_lineno      *in = (struct internal_lineno *)in1;
-
-  in->l_addr.l_symndx = bfd_h_get_32(abfd, (bfd_byte *) ext->l_addr.l_symndx);
-  in->l_lnno = GET_LINENO_LNNO(abfd, ext);
-}
-
-static unsigned int
-coff_swap_lineno_out (abfd, inp, outp)
-     bfd       *abfd;
-     PTR	inp;
-     PTR	outp;
-{
-  struct internal_lineno *in = (struct internal_lineno *)inp;
-  struct external_lineno *ext = (struct external_lineno *)outp;
-  bfd_h_put_32(abfd, in->l_addr.l_symndx, (bfd_byte *)
-	  ext->l_addr.l_symndx);
-
-  PUT_LINENO_LNNO (abfd, in->l_lnno, ext);
-  return LINESZ;
-}
-
-
-
-static void
-coff_swap_aouthdr_in (abfd, aouthdr_ext1, aouthdr_int1)
-     bfd            *abfd;
-     PTR aouthdr_ext1;
-     PTR aouthdr_int1;
-{
-  struct internal_extra_pe_aouthdr *a;
-  PEAOUTHDR *src = (PEAOUTHDR *)(aouthdr_ext1);
-  AOUTHDR        *aouthdr_ext = (AOUTHDR *) aouthdr_ext1;
-  struct internal_aouthdr *aouthdr_int = (struct internal_aouthdr *)aouthdr_int1;
-
-  aouthdr_int->magic = bfd_h_get_16(abfd, (bfd_byte *) aouthdr_ext->magic);
-  aouthdr_int->vstamp = bfd_h_get_16(abfd, (bfd_byte *) aouthdr_ext->vstamp);
-  aouthdr_int->tsize =
-    GET_AOUTHDR_TSIZE (abfd, (bfd_byte *) aouthdr_ext->tsize);
-  aouthdr_int->dsize =
-    GET_AOUTHDR_DSIZE (abfd, (bfd_byte *) aouthdr_ext->dsize);
-  aouthdr_int->bsize =
-    GET_AOUTHDR_BSIZE (abfd, (bfd_byte *) aouthdr_ext->bsize);
-  aouthdr_int->entry =
-    GET_AOUTHDR_ENTRY (abfd, (bfd_byte *) aouthdr_ext->entry);
-  aouthdr_int->text_start =
-    GET_AOUTHDR_TEXT_START (abfd, (bfd_byte *) aouthdr_ext->text_start);
-  aouthdr_int->data_start =
-    GET_AOUTHDR_DATA_START (abfd, (bfd_byte *) aouthdr_ext->data_start);
-
-  a = &aouthdr_int->pe;
-  a->ImageBase = bfd_h_get_32 (abfd, (bfd_byte *) src->ImageBase);
-  a->SectionAlignment = bfd_h_get_32 (abfd, (bfd_byte *) src->SectionAlignment);
-  a->FileAlignment = bfd_h_get_32 (abfd, (bfd_byte *) src->FileAlignment);
-  a->MajorOperatingSystemVersion = 
-    bfd_h_get_16 (abfd, (bfd_byte *) src->MajorOperatingSystemVersion);
-  a->MinorOperatingSystemVersion = 
-    bfd_h_get_16 (abfd, (bfd_byte *) src->MinorOperatingSystemVersion);
-  a->MajorImageVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MajorImageVersion);
-  a->MinorImageVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MinorImageVersion);
-  a->MajorSubsystemVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MajorSubsystemVersion);
-  a->MinorSubsystemVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MinorSubsystemVersion);
-  a->Reserved1 = bfd_h_get_32 (abfd, (bfd_byte *) src->Reserved1);
-  a->SizeOfImage = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfImage);
-  a->SizeOfHeaders = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfHeaders);
-  a->CheckSum = bfd_h_get_32 (abfd, (bfd_byte *) src->CheckSum);
-  a->Subsystem = bfd_h_get_16 (abfd, (bfd_byte *) src->Subsystem);
-  a->DllCharacteristics = bfd_h_get_16 (abfd, (bfd_byte *) src->DllCharacteristics);
-  a->SizeOfStackReserve = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfStackReserve);
-  a->SizeOfStackCommit = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfStackCommit);
-  a->SizeOfHeapReserve = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfHeapReserve);
-  a->SizeOfHeapCommit = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfHeapCommit);
-  a->LoaderFlags = bfd_h_get_32 (abfd, (bfd_byte *) src->LoaderFlags);
-  a->NumberOfRvaAndSizes = bfd_h_get_32 (abfd, (bfd_byte *) src->NumberOfRvaAndSizes);
-
-  {
-    int idx;
-    for (idx=0; idx < 16; idx++)
-      {
-	a->DataDirectory[idx].VirtualAddress =
-	  bfd_h_get_32 (abfd, (bfd_byte *) src->DataDirectory[idx][0]);
-	a->DataDirectory[idx].Size =
-	  bfd_h_get_32 (abfd, (bfd_byte *) src->DataDirectory[idx][1]);
-      }
-  }
-
-  if (aouthdr_int->entry)
-    {
-      aouthdr_int->entry += a->ImageBase;
-      aouthdr_int->entry &= 0xffffffff;
-    }
-  if (aouthdr_int->tsize) 
-    {
-      aouthdr_int->text_start += a->ImageBase;
-      aouthdr_int->text_start &= 0xffffffff;
-    }
-  if (aouthdr_int->dsize) 
-    {
-      aouthdr_int->data_start += a->ImageBase;
-      aouthdr_int->data_start &= 0xffffffff;
-    }
-
-#ifdef POWERPC_LE_PE
-  /* These three fields are normally set up by ppc_relocate_section.
-     In the case of reading a file in, we can pick them up from
-     the DataDirectory.
-  */
-  first_thunk_address = a->DataDirectory[12].VirtualAddress ;
-  thunk_size = a->DataDirectory[12].Size;
-  import_table_size = a->DataDirectory[1].Size;
-#endif
-}
-
-
-static void add_data_entry (abfd, aout, idx, name, base)
-     bfd *abfd;
-     struct internal_extra_pe_aouthdr *aout;
-     int idx;
-     char *name;
-     bfd_vma base;
-{
-  asection *sec = bfd_get_section_by_name (abfd, name);
-
-  /* add import directory information if it exists */
-  if ((sec != NULL)
-      && (coff_section_data (abfd, sec) != NULL)
-      && (pei_section_data (abfd, sec) != NULL))
-    {
-      aout->DataDirectory[idx].VirtualAddress = (sec->vma - base) & 0xffffffff;
-      aout->DataDirectory[idx].Size = pei_section_data (abfd, sec)->virt_size;
-      sec->flags |= SEC_DATA;
-    }
-}
-
-static unsigned int
-coff_swap_aouthdr_out (abfd, in, out)
-     bfd       *abfd;
-     PTR	in;
-     PTR	out;
-{
-  struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *)in;
-  struct internal_extra_pe_aouthdr *extra = &pe_data (abfd)->pe_opthdr;
-  PEAOUTHDR *aouthdr_out = (PEAOUTHDR *)out;
-
-  bfd_vma sa = extra->SectionAlignment;
-  bfd_vma fa = extra->FileAlignment;
-  bfd_vma ib = extra->ImageBase ;
-
-  if (aouthdr_in->tsize) 
-    {
-      aouthdr_in->text_start -= ib;
-      aouthdr_in->text_start &= 0xffffffff;
-    }
-  if (aouthdr_in->dsize) 
-    {
-      aouthdr_in->data_start -= ib;
-      aouthdr_in->data_start &= 0xffffffff;
-    }
-  if (aouthdr_in->entry) 
-    {
-      aouthdr_in->entry -= ib;
-      aouthdr_in->entry &= 0xffffffff;
-    }
-
-#define FA(x)  (((x) + fa -1 ) & (- fa))
-#define SA(x)  (((x) + sa -1 ) & (- sa))
-
-  /* We like to have the sizes aligned */
-
-  aouthdr_in->bsize = FA (aouthdr_in->bsize);
-
-
-  extra->NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES;
-
-  /* first null out all data directory entries .. */
-  memset (extra->DataDirectory, sizeof (extra->DataDirectory), 0);
-
-  add_data_entry (abfd, extra, 0, ".edata", ib);
-  add_data_entry (abfd, extra, 1, ".idata", ib);
-  add_data_entry (abfd, extra, 2, ".rsrc" ,ib);
-
-#ifdef POWERPC_LE_PE
-  /* FIXME: do other PE platforms use this? */
-  add_data_entry (abfd, extra, 3, ".pdata" ,ib);
-#endif
-
-  add_data_entry (abfd, extra, 5, ".reloc", ib);
-
-#ifdef POWERPC_LE_PE
-  /* On the PPC NT system, this field is set up as follows. It is
-     not an "officially" reserved field, so it currently has no title.
-     first_thunk_address is idata$5, and the thunk_size is the size
-     of the idata$5 chunk of the idata section.
-  */
-  extra->DataDirectory[12].VirtualAddress = first_thunk_address;
-  extra->DataDirectory[12].Size = thunk_size;
-
-  /* On the PPC NT system, the size of the directory entry is not the
-     size of the entire section. It's actually offset to the end of 
-     the idata$3 component of the idata section. This is the size of
-     the entire import table. (also known as the start of idata$4)
-  */
-  extra->DataDirectory[1].Size = import_table_size;
-#endif
-
-  {
-    asection *sec;
-    bfd_vma dsize= 0;
-    bfd_vma isize = SA(abfd->sections->filepos);
-    bfd_vma tsize= 0;
-
-    for (sec = abfd->sections; sec; sec = sec->next)
-      {
-	int rounded = FA(sec->_raw_size);
-
-	if (sec->flags & SEC_DATA) 
-	  dsize += rounded;
-	if (sec->flags & SEC_CODE)
-	  tsize += rounded;
-	isize += SA(rounded);
-      }
-
-    aouthdr_in->dsize = dsize;
-    aouthdr_in->tsize = tsize;
-    extra->SizeOfImage = isize;
-  }
-
-  extra->SizeOfHeaders = abfd->sections->filepos;
-  bfd_h_put_16(abfd, aouthdr_in->magic, (bfd_byte *) aouthdr_out->standard.magic);
-
-#ifdef POWERPC_LE_PE
-  /* this little piece of magic sets the "linker version" field to 2.60 */
-  bfd_h_put_16(abfd, 2  + 60 * 256, (bfd_byte *) aouthdr_out->standard.vstamp);
-#else
-  /* this little piece of magic sets the "linker version" field to 2.55 */
-  bfd_h_put_16(abfd, 2  + 55 * 256, (bfd_byte *) aouthdr_out->standard.vstamp);
-#endif
-
-  PUT_AOUTHDR_TSIZE (abfd, aouthdr_in->tsize, (bfd_byte *) aouthdr_out->standard.tsize);
-  PUT_AOUTHDR_DSIZE (abfd, aouthdr_in->dsize, (bfd_byte *) aouthdr_out->standard.dsize);
-  PUT_AOUTHDR_BSIZE (abfd, aouthdr_in->bsize, (bfd_byte *) aouthdr_out->standard.bsize);
-  PUT_AOUTHDR_ENTRY (abfd, aouthdr_in->entry, (bfd_byte *) aouthdr_out->standard.entry);
-  PUT_AOUTHDR_TEXT_START (abfd, aouthdr_in->text_start,
-			  (bfd_byte *) aouthdr_out->standard.text_start);
-
-  PUT_AOUTHDR_DATA_START (abfd, aouthdr_in->data_start,
-			  (bfd_byte *) aouthdr_out->standard.data_start);
-
-
-  bfd_h_put_32 (abfd, extra->ImageBase, 
-		(bfd_byte *) aouthdr_out->ImageBase);
-  bfd_h_put_32 (abfd, extra->SectionAlignment,
-		(bfd_byte *) aouthdr_out->SectionAlignment);
-  bfd_h_put_32 (abfd, extra->FileAlignment,
-		(bfd_byte *) aouthdr_out->FileAlignment);
-  bfd_h_put_16 (abfd, extra->MajorOperatingSystemVersion,
-		(bfd_byte *) aouthdr_out->MajorOperatingSystemVersion);
-  bfd_h_put_16 (abfd, extra->MinorOperatingSystemVersion,
-		(bfd_byte *) aouthdr_out->MinorOperatingSystemVersion);
-  bfd_h_put_16 (abfd, extra->MajorImageVersion,
-		(bfd_byte *) aouthdr_out->MajorImageVersion);
-  bfd_h_put_16 (abfd, extra->MinorImageVersion,
-		(bfd_byte *) aouthdr_out->MinorImageVersion);
-  bfd_h_put_16 (abfd, extra->MajorSubsystemVersion,
-		(bfd_byte *) aouthdr_out->MajorSubsystemVersion);
-  bfd_h_put_16 (abfd, extra->MinorSubsystemVersion,
-		(bfd_byte *) aouthdr_out->MinorSubsystemVersion);
-  bfd_h_put_32 (abfd, extra->Reserved1,
-		(bfd_byte *) aouthdr_out->Reserved1);
-  bfd_h_put_32 (abfd, extra->SizeOfImage,
-		(bfd_byte *) aouthdr_out->SizeOfImage);
-  bfd_h_put_32 (abfd, extra->SizeOfHeaders,
-		(bfd_byte *) aouthdr_out->SizeOfHeaders);
-  bfd_h_put_32 (abfd, extra->CheckSum,
-		(bfd_byte *) aouthdr_out->CheckSum);
-  bfd_h_put_16 (abfd, extra->Subsystem,
-		(bfd_byte *) aouthdr_out->Subsystem);
-  bfd_h_put_16 (abfd, extra->DllCharacteristics,
-		(bfd_byte *) aouthdr_out->DllCharacteristics);
-  bfd_h_put_32 (abfd, extra->SizeOfStackReserve,
-		(bfd_byte *) aouthdr_out->SizeOfStackReserve);
-  bfd_h_put_32 (abfd, extra->SizeOfStackCommit,
-		(bfd_byte *) aouthdr_out->SizeOfStackCommit);
-  bfd_h_put_32 (abfd, extra->SizeOfHeapReserve,
-		(bfd_byte *) aouthdr_out->SizeOfHeapReserve);
-  bfd_h_put_32 (abfd, extra->SizeOfHeapCommit,
-		(bfd_byte *) aouthdr_out->SizeOfHeapCommit);
-  bfd_h_put_32 (abfd, extra->LoaderFlags,
-		(bfd_byte *) aouthdr_out->LoaderFlags);
-  bfd_h_put_32 (abfd, extra->NumberOfRvaAndSizes,
-		(bfd_byte *) aouthdr_out->NumberOfRvaAndSizes);
-  {
-    int idx;
-    for (idx=0; idx < 16; idx++)
-      {
-	bfd_h_put_32 (abfd, extra->DataDirectory[idx].VirtualAddress,
-		      (bfd_byte *) aouthdr_out->DataDirectory[idx][0]);
-	bfd_h_put_32 (abfd, extra->DataDirectory[idx].Size,
-		      (bfd_byte *) aouthdr_out->DataDirectory[idx][1]);
-      }
-  }
-
-  return AOUTSZ;
-}
-
-static void
-    coff_swap_scnhdr_in (abfd, ext, in)
-      bfd            *abfd;
-  PTR	     ext;
-  PTR	     in;
-{
-  SCNHDR *scnhdr_ext = (SCNHDR *) ext;
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
-
-  memcpy(scnhdr_int->s_name, scnhdr_ext->s_name, sizeof(scnhdr_int->s_name));
-  scnhdr_int->s_vaddr =
-    GET_SCNHDR_VADDR (abfd, (bfd_byte *) scnhdr_ext->s_vaddr);
-  scnhdr_int->s_paddr =
-    GET_SCNHDR_PADDR (abfd, (bfd_byte *) scnhdr_ext->s_paddr);
-  scnhdr_int->s_size =
-    GET_SCNHDR_SIZE (abfd, (bfd_byte *) scnhdr_ext->s_size);
-  scnhdr_int->s_scnptr =
-    GET_SCNHDR_SCNPTR (abfd, (bfd_byte *) scnhdr_ext->s_scnptr);
-  scnhdr_int->s_relptr =
-    GET_SCNHDR_RELPTR (abfd, (bfd_byte *) scnhdr_ext->s_relptr);
-  scnhdr_int->s_lnnoptr =
-    GET_SCNHDR_LNNOPTR (abfd, (bfd_byte *) scnhdr_ext->s_lnnoptr);
-  scnhdr_int->s_flags = bfd_h_get_32(abfd, (bfd_byte *) scnhdr_ext->s_flags);
-
-  scnhdr_int->s_nreloc = bfd_h_get_16(abfd, (bfd_byte *) scnhdr_ext->s_nreloc);
-  scnhdr_int->s_nlnno = bfd_h_get_16(abfd, (bfd_byte *) scnhdr_ext->s_nlnno);
-
-  if (scnhdr_int->s_vaddr != 0) 
-    {
-      scnhdr_int->s_vaddr += pe_data (abfd)->pe_opthdr.ImageBase;
-      scnhdr_int->s_vaddr &= 0xffffffff;
-    }
-  if (strcmp (scnhdr_int->s_name, _BSS) == 0) 
-    {
-      scnhdr_int->s_size = scnhdr_int->s_paddr;
-      scnhdr_int->s_paddr = 0;
-    }
-}
-
-static unsigned int
-coff_swap_scnhdr_out (abfd, in, out)
-     bfd       *abfd;
-     PTR	in;
-     PTR	out;
-{
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *)in;
-  SCNHDR *scnhdr_ext = (SCNHDR *)out;
-  unsigned int ret = SCNHSZ;
-  bfd_vma ps;
-  bfd_vma ss;
-
-  memcpy(scnhdr_ext->s_name, scnhdr_int->s_name, sizeof(scnhdr_int->s_name));
-
-  PUT_SCNHDR_VADDR (abfd, 
-		    ((scnhdr_int->s_vaddr 
-		      - pe_data(abfd)->pe_opthdr.ImageBase)
-		     & 0xffffffff),
-		    (bfd_byte *) scnhdr_ext->s_vaddr);
-
-  /* NT wants the size data to be rounded up to the next NT_FILE_ALIGNMENT
-     value except for the BSS section, its s_size should be 0 */
-
-
-  if (strcmp (scnhdr_int->s_name, _BSS) == 0) 
-    {
-      ps = scnhdr_int->s_size;
-      ss = 0;
-    }
-  else
-    {
-      ps = scnhdr_int->s_paddr;
-      ss = scnhdr_int->s_size;
-    }
-
-  PUT_SCNHDR_SIZE (abfd, ss,
-		   (bfd_byte *) scnhdr_ext->s_size);
-
-
-  PUT_SCNHDR_PADDR (abfd, ps, (bfd_byte *) scnhdr_ext->s_paddr);
-
-  PUT_SCNHDR_SCNPTR (abfd, scnhdr_int->s_scnptr,
-		     (bfd_byte *) scnhdr_ext->s_scnptr);
-  PUT_SCNHDR_RELPTR (abfd, scnhdr_int->s_relptr,
-		     (bfd_byte *) scnhdr_ext->s_relptr);
-  PUT_SCNHDR_LNNOPTR (abfd, scnhdr_int->s_lnnoptr,
-		      (bfd_byte *) scnhdr_ext->s_lnnoptr);
-
-  /* Extra flags must be set when dealing with NT.  All sections should also
-     have the IMAGE_SCN_MEM_READ (0x40000000) flag set.  In addition, the
-     .text section must have IMAGE_SCN_MEM_EXECUTE (0x20000000) and the data
-     sections (.idata, .data, .bss, .CRT) must have IMAGE_SCN_MEM_WRITE set
-     (this is especially important when dealing with the .idata section since
-     the addresses for routines from .dlls must be overwritten).  If .reloc
-     section data is ever generated, we must add IMAGE_SCN_MEM_DISCARDABLE
-     (0x02000000).  Also, the resource data should also be read and
-     writable.  */
-
-  /* FIXME: alignment is also encoded in this field, at least on ppc (krk) */
-  /* FIXME: even worse, I don't see how to get the original alignment field*/
-  /*        back...                                                        */
-
-  /* FIXME: Basing this on section names is bogus.  Also, this should
-     be in sec_to_styp_flags.  */
-
-  {
-    int flags = scnhdr_int->s_flags;
-    if (strcmp (scnhdr_int->s_name, ".data")  == 0 ||
-	strcmp (scnhdr_int->s_name, ".CRT")   == 0 ||
-	strcmp (scnhdr_int->s_name, ".bss")   == 0)
-      flags |= IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE;
-    else if (strcmp (scnhdr_int->s_name, ".text") == 0)
-      flags |= IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_EXECUTE;
-    else if (strcmp (scnhdr_int->s_name, ".reloc") == 0)
-      flags = (SEC_DATA | IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_DISCARDABLE
-	       | IMAGE_SCN_MEM_SHARED);
-    else if (strcmp (scnhdr_int->s_name, ".idata") == 0)
-      flags = IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE | SEC_DATA;     
-    else if (strcmp (scnhdr_int->s_name, ".rdata") == 0
-	     || strcmp (scnhdr_int->s_name, ".edata") == 0)
-      flags =  IMAGE_SCN_MEM_READ | SEC_DATA;     
-    else if (strcmp (scnhdr_int->s_name, ".pdata") == 0)
-      flags = IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_ALIGN_4BYTES |
-			  IMAGE_SCN_MEM_READ ;
-    /* Remember this field is a max of 8 chars, so the null is _not_ there
-       for an 8 character name like ".reldata". (yep. Stupid bug) */
-    else if (strncmp (scnhdr_int->s_name, ".reldata", 8) == 0)
-      flags =  IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_ALIGN_8BYTES |
-	       IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE ;
-    else if (strcmp (scnhdr_int->s_name, ".ydata") == 0)
-      flags =  IMAGE_SCN_CNT_INITIALIZED_DATA | IMAGE_SCN_ALIGN_8BYTES |
-	       IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_WRITE ;
-    else if (strncmp (scnhdr_int->s_name, ".drectve", 8) == 0)
-      flags =  IMAGE_SCN_LNK_INFO | IMAGE_SCN_LNK_REMOVE ;
-    else if (strncmp (scnhdr_int->s_name, ".stab", 5) == 0)
-      flags |= (IMAGE_SCN_LNK_INFO | IMAGE_SCN_MEM_DISCARDABLE
-		| IMAGE_SCN_MEM_SHARED | IMAGE_SCN_MEM_READ);
-    else if (strcmp (scnhdr_int->s_name, ".rsrc")  == 0)
-      flags |= IMAGE_SCN_MEM_READ | IMAGE_SCN_MEM_SHARED;
-    else
-      flags |= IMAGE_SCN_MEM_READ;
-
-    bfd_h_put_32(abfd, flags, (bfd_byte *) scnhdr_ext->s_flags);
-  }
-
-  if (scnhdr_int->s_nlnno <= 0xffff)
-    bfd_h_put_16(abfd, scnhdr_int->s_nlnno, (bfd_byte *) scnhdr_ext->s_nlnno);
-  else
-    {
-      (*_bfd_error_handler) (_("%s: line number overflow: 0x%lx > 0xffff"),
-			     bfd_get_filename (abfd),
-			     scnhdr_int->s_nlnno);
-      bfd_set_error (bfd_error_file_truncated);
-      bfd_h_put_16 (abfd, 0xffff, (bfd_byte *) scnhdr_ext->s_nlnno);
-      ret = 0;
-    }
-  if (scnhdr_int->s_nreloc <= 0xffff)
-    bfd_h_put_16(abfd, scnhdr_int->s_nreloc, (bfd_byte *) scnhdr_ext->s_nreloc);
-  else
-    {
-      (*_bfd_error_handler) (_("%s: reloc overflow: 0x%lx > 0xffff"),
-			     bfd_get_filename (abfd),
-			     scnhdr_int->s_nreloc);
-      bfd_set_error (bfd_error_file_truncated);
-      bfd_h_put_16 (abfd, 0xffff, (bfd_byte *) scnhdr_ext->s_nreloc);
-      ret = 0;
-    }
-  return ret;
-}
-
-static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] = 
-{
-  N_ ("Export Directory [.edata (or where ever we found it)]"),
-  N_ ("Import Directory [parts of .idata]"),
-  N_ ("Resource Directory [.rsrc]"),
-  N_ ("Exception Directory [.pdata]"),
-  N_ ("Security Directory"),
-  N_ ("Base Relocation Directory [.reloc]"),
-  N_ ("Debug Directory"),
-  N_ ("Description Directory"),
-  N_ ("Special Directory"),
-  N_ ("Thread Storage Directory [.tls]"),
-  N_ ("Load Configuration Directory"),
-  N_ ("Bound Import Directory"),
-  N_ ("Import Address Table Directory"),
-  N_ ("Reserved"),
-  N_ ("Reserved"),
-  N_ ("Reserved")
-};
-
-/**********************************************************************/
-static boolean
-pe_print_idata(abfd, vfile)
-     bfd *abfd;
-     PTR vfile;
-{
-  FILE *file = (FILE *) vfile;
-  bfd_byte *data = 0;
-  asection *section = bfd_get_section_by_name (abfd, ".idata");
-  unsigned long adj;
-
-#ifdef POWERPC_LE_PE
-  asection *rel_section = bfd_get_section_by_name (abfd, ".reldata");
-#endif
-
-  bfd_size_type datasize;
-  bfd_size_type dataoff;
-  bfd_size_type secsize;
-  bfd_size_type i;
-  bfd_size_type start, stop;
-  int onaline = 20;
-
-  pe_data_type *pe = pe_data (abfd);
-  struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
-
-  if (section != NULL)
-    {
-      datasize = bfd_section_size (abfd, section);
-      dataoff = 0;
-
-      if (datasize == 0)
-	return true;
-    }
-  else
-    {
-      bfd_vma addr, size;
-
-      addr = extra->DataDirectory[1].VirtualAddress;
-      size = extra->DataDirectory[1].Size;
-
-      if (addr == 0 || size == 0)
-	return true;
-
-      for (section = abfd->sections; section != NULL; section = section->next)
-	{
-	  if (section->vma - extra->ImageBase <= addr
-	      && ((section->vma - extra->ImageBase
-		   + bfd_section_size (abfd, section))
-		  >= addr + size))
-	    break;
-	}
-      if (section == NULL)
-	return true;
-
-      /* For some reason the import table size is not reliable.  The
-         import data will extend past the indicated size, and before
-         the indicated address.  */
-      dataoff = addr - (section->vma - extra->ImageBase);
-      datasize = size;
-    }
-
-#ifdef POWERPC_LE_PE
-  if (rel_section != 0 && bfd_section_size (abfd, rel_section) != 0)
-    {
-      /* The toc address can be found by taking the starting address,
-	 which on the PPC locates a function descriptor. The descriptor
-	 consists of the function code starting address followed by the
-	 address of the toc. The starting address we get from the bfd,
-	 and the descriptor is supposed to be in the .reldata section. 
-      */
-
-      bfd_vma loadable_toc_address;
-      bfd_vma toc_address;
-      bfd_vma start_address;
-      bfd_byte *data = 0;
-      int offset;
-      data = (bfd_byte *) bfd_malloc ((size_t) bfd_section_size (abfd, 
-								 rel_section));
-      if (data == NULL && bfd_section_size (abfd, rel_section) != 0)
-	return false;
-
-      datasize = bfd_section_size (abfd, rel_section);
-  
-      bfd_get_section_contents (abfd, 
-				rel_section, 
-				(PTR) data, 0, 
-				bfd_section_size (abfd, rel_section));
-
-      offset = abfd->start_address - rel_section->vma;
-
-      start_address = bfd_get_32(abfd, data+offset);
-      loadable_toc_address = bfd_get_32(abfd, data+offset+4);
-      toc_address = loadable_toc_address - 32768;
-
-      fprintf(file,
-	      _("\nFunction descriptor located at the start address: %04lx\n"),
-	      (unsigned long int) (abfd->start_address));
-      fprintf (file,
-	       _("\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"), 
-	       start_address, loadable_toc_address, toc_address);
-    }
-  else 
-    {
-      fprintf(file,
-	      _("\nNo reldata section! Function descriptor not decoded.\n"));
-    }
-#endif
-
-  fprintf(file,
-	  _("\nThe Import Tables (interpreted .idata section contents)\n"));
-  fprintf(file,
-	  _(" vma:            Hint    Time      Forward  DLL       First\n"));
-  fprintf(file,
-	  _("                 Table   Stamp     Chain    Name      Thunk\n"));
-
-  secsize = bfd_section_size (abfd, section);
-  data = (bfd_byte *) bfd_malloc (secsize);
-  if (data == NULL && secsize != 0)
-    return false;
-
-  if (! bfd_get_section_contents (abfd, section, (PTR) data, 0, secsize))
-    return false;
-
-  adj = (extra->ImageBase - section->vma) & 0xffffffff;
-
-  start = dataoff;
-  stop = dataoff + datasize;
-  for (i = start; i < stop; i += onaline)
-    {
-      bfd_vma hint_addr;
-      bfd_vma time_stamp;
-      bfd_vma forward_chain;
-      bfd_vma dll_name;
-      bfd_vma first_thunk;
-      int idx = 0;
-      bfd_size_type j;
-      char *dll;
-
-      fprintf (file,
-	       " %08lx\t", 
-	       (unsigned long int) (i + section->vma + dataoff));
-      
-      if (i+20 > stop)
-	{
-	  /* check stuff */
-	  ;
-	}
-      
-      hint_addr = bfd_get_32(abfd, data+i);
-      time_stamp = bfd_get_32(abfd, data+i+4);
-      forward_chain = bfd_get_32(abfd, data+i+8);
-      dll_name = bfd_get_32(abfd, data+i+12);
-      first_thunk = bfd_get_32(abfd, data+i+16);
-      
-      fprintf(file, "%08lx %08lx %08lx %08lx %08lx\n",
-	      hint_addr,
-	      time_stamp,
-	      forward_chain,
-	      dll_name,
-	      first_thunk);
-
-      if (hint_addr == 0 && first_thunk == 0)
-	break;
-
-      /* the image base is present in the section->vma */
-      dll = (char *) data + dll_name + adj;
-      fprintf(file, _("\n\tDLL Name: %s\n"), dll);
-
-      if (hint_addr != 0)
-	{
-	  fprintf (file, _("\tvma:  Hint/Ord Member-Name\n"));
-
-	  idx = hint_addr + adj;
-
-	  for (j = 0; j < stop; j += 4)
-	    {
-	      unsigned long member = bfd_get_32 (abfd, data + idx + j);
-
-	      if (member == 0)
-		break;
-	      if (member & 0x80000000)
-		fprintf (file, "\t%04lx\t %4lu", member,
-			 member & 0x7fffffff);
-	      else
-		{
-		  int ordinal;
-		  char *member_name;
-
-		  ordinal = bfd_get_16 (abfd, data + member + adj);
-		  member_name = (char *) data + member + adj + 2;
-		  fprintf (file, "\t%04lx\t %4d  %s",
-			   member, ordinal, member_name);
-		}
-
-	      /* If the time stamp is not zero, the import address
-                 table holds actual addresses.  */
-	      if (time_stamp != 0
-		  && first_thunk != 0
-		  && first_thunk != hint_addr)
-		fprintf (file, "\t%04lx",
-			 bfd_get_32 (abfd, data + first_thunk + adj + j));
-
-	      fprintf (file, "\n");
-	    }
-	}
-
-      if (hint_addr != first_thunk && time_stamp == 0)
-	{
-	  int differ = 0;
-	  int idx2;
-
-	  idx2 = first_thunk + adj;
-
-	  for (j=0;j<stop;j+=4)
-	    {
-	      int ordinal;
-	      char *member_name;
-	      bfd_vma hint_member = 0;
-	      bfd_vma iat_member;
-
-	      if (hint_addr != 0)
-		hint_member = bfd_get_32 (abfd, data + idx + j);
-	      iat_member = bfd_get_32 (abfd, data + idx2 + j);
-
-	      if (hint_addr == 0 && iat_member == 0)
-		break;
-
-	      if (hint_addr == 0 || hint_member != iat_member)
-		{
-		  if (differ == 0)
-		    {
-		      fprintf (file, 
-			       _("\tThe Import Address Table (difference found)\n"));
-		      fprintf(file, _("\tvma:  Hint/Ord Member-Name\n"));
-		      differ = 1;
-		    }
-		  if (iat_member == 0)
-		    {
-		      fprintf(file,
-			      _("\t>>> Ran out of IAT members!\n"));
-		    }
-		  else 
-		    {
-		      ordinal = bfd_get_16(abfd,
-					   data + iat_member + adj);
-		      member_name = (char *) data + iat_member + adj + 2;
-		      fprintf(file, "\t%04lx\t %4d  %s\n",
-			      iat_member, ordinal, member_name);
-		    }
-		}
-
-	      if (hint_addr != 0 && hint_member == 0)
-		break;
-	    }
-	  if (differ == 0)
-	    {
-	      fprintf(file,
-		      _("\tThe Import Address Table is identical\n"));
-	    }
-	}
-
-      fprintf(file, "\n");
-
-    }
-
-  free (data);
-
-  return true;
-}
-
-static boolean
-pe_print_edata (abfd, vfile)
-     bfd *abfd;
-     PTR vfile;
-{
-  FILE *file = (FILE *) vfile;
-  bfd_byte *data = 0;
-  asection *section = bfd_get_section_by_name (abfd, ".edata");
-
-  bfd_size_type datasize;
-  bfd_size_type dataoff;
-  bfd_size_type i;
-
-  int adj;
-  struct EDT_type 
-    {
-      long export_flags;             /* reserved - should be zero */
-      long time_stamp;
-      short major_ver;
-      short minor_ver;
-      bfd_vma name;                  /* rva - relative to image base */
-      long base;                     /* ordinal base */
-      unsigned long num_functions;   /* Number in the export address table */
-      unsigned long num_names;       /* Number in the name pointer table */
-      bfd_vma eat_addr;    /* rva to the export address table */
-      bfd_vma npt_addr;        /* rva to the Export Name Pointer Table */
-      bfd_vma ot_addr; /* rva to the Ordinal Table */
-    } edt;
-
-  pe_data_type *pe = pe_data (abfd);
-  struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
-
-  if (section != NULL)
-    {
-      datasize = bfd_section_size (abfd, section);
-      dataoff = 0;
-    }
-  else
-    {
-      bfd_vma addr, size;
-
-      addr = extra->DataDirectory[0].VirtualAddress;
-      size = extra->DataDirectory[0].Size;
-
-      if (addr == 0 || size == 0)
-	return true;
-
-      for (section = abfd->sections; section != NULL; section = section->next)
-	{
-	  if (section->vma - extra->ImageBase <= addr
-	      && ((section->vma - extra->ImageBase
-		   + bfd_section_size (abfd, section))
-		  >= addr + size))
-	    break;
-	}
-      if (section == NULL)
-	return true;
-
-      datasize = size;
-      dataoff = addr - (section->vma - extra->ImageBase);
-    }
-
-  data = (bfd_byte *) bfd_malloc (datasize);
-  if (data == NULL && datasize != 0)
-    return false;
-
-  if (! bfd_get_section_contents (abfd, section, (PTR) data, dataoff,
-				  datasize))
-    return false;
-
-  /* Go get Export Directory Table */
-  edt.export_flags   = bfd_get_32(abfd, data+0); 
-  edt.time_stamp     = bfd_get_32(abfd, data+4);
-  edt.major_ver      = bfd_get_16(abfd, data+8);
-  edt.minor_ver      = bfd_get_16(abfd, data+10);
-  edt.name           = bfd_get_32(abfd, data+12);
-  edt.base           = bfd_get_32(abfd, data+16);
-  edt.num_functions  = bfd_get_32(abfd, data+20); 
-  edt.num_names      = bfd_get_32(abfd, data+24); 
-  edt.eat_addr       = bfd_get_32(abfd, data+28);
-  edt.npt_addr       = bfd_get_32(abfd, data+32); 
-  edt.ot_addr        = bfd_get_32(abfd, data+36);
-
-  adj = (extra->ImageBase - (section->vma + dataoff)) & 0xffffffff;
-
-
-  /* Dump the EDT first first */
-  fprintf(file,
-	  _("\nThe Export Tables (interpreted .edata section contents)\n\n"));
-
-  fprintf(file,
-	  _("Export Flags \t\t\t%lx\n"), (unsigned long) edt.export_flags);
-
-  fprintf(file,
-	  _("Time/Date stamp \t\t%lx\n"), (unsigned long) edt.time_stamp);
-
-  fprintf(file,
-	  _("Major/Minor \t\t\t%d/%d\n"), edt.major_ver, edt.minor_ver);
-
-  fprintf (file,
-	   _("Name \t\t\t\t"));
-  fprintf_vma (file, edt.name);
-  fprintf (file,
-	   " %s\n", data + edt.name + adj);
-
-  fprintf(file,
-	  _("Ordinal Base \t\t\t%ld\n"), edt.base);
-
-  fprintf(file,
-	  _("Number in:\n"));
-
-  fprintf(file,
-	  _("\tExport Address Table \t\t%lx\n"),
-	  edt.num_functions);
-
-  fprintf(file,
-	  _("\t[Name Pointer/Ordinal] Table\t%lu\n"), edt.num_names);
-
-  fprintf(file,
-	  _("Table Addresses\n"));
-
-  fprintf (file,
-	   _("\tExport Address Table \t\t"));
-  fprintf_vma (file, edt.eat_addr);
-  fprintf (file, "\n");
-
-  fprintf (file,
-	  _("\tName Pointer Table \t\t"));
-  fprintf_vma (file, edt.npt_addr);
-  fprintf (file, "\n");
-
-  fprintf (file,
-	   _("\tOrdinal Table \t\t\t"));
-  fprintf_vma (file, edt.ot_addr);
-  fprintf (file, "\n");
-
-  
-  /* The next table to find si the Export Address Table. It's basically
-     a list of pointers that either locate a function in this dll, or
-     forward the call to another dll. Something like:
-      typedef union 
-      {
-        long export_rva;
-        long forwarder_rva;
-      } export_address_table_entry;
-  */
-
-  fprintf(file,
-	  _("\nExport Address Table -- Ordinal Base %ld\n"),
-	  edt.base);
-
-  for (i = 0; i < edt.num_functions; ++i)
-    {
-      bfd_vma eat_member = bfd_get_32 (abfd, 
-				       data + edt.eat_addr + (i * 4) + adj);
-      bfd_vma eat_actual = (extra->ImageBase + eat_member) & 0xffffffff;
-      bfd_vma edata_start = bfd_get_section_vma (abfd,section) + dataoff;
-      bfd_vma edata_end = edata_start + datasize;
-
-      if (eat_member == 0)
-	continue;
-
-      if (edata_start < eat_actual && eat_actual < edata_end) 
-	{
-	  /* this rva is to a name (forwarding function) in our section */
-	  /* Should locate a function descriptor */
-	  fprintf(file,
-		  "\t[%4ld] +base[%4ld] %04lx %s -- %s\n", 
-		  (long) i, (long) (i + edt.base), eat_member,
-		  "Forwarder RVA", data + eat_member + adj);
-	}
-      else
-	{
-	  /* Should locate a function descriptor in the reldata section */
-	  fprintf(file,
-		  "\t[%4ld] +base[%4ld] %04lx %s\n", 
-		  (long) i, (long) (i + edt.base), eat_member, "Export RVA");
-	}
-    }
-
-  /* The Export Name Pointer Table is paired with the Export Ordinal Table */
-  /* Dump them in parallel for clarity */
-  fprintf(file,
-	  _("\n[Ordinal/Name Pointer] Table\n"));
-
-  for (i = 0; i < edt.num_names; ++i)
-    {
-      bfd_vma name_ptr = bfd_get_32(abfd, 
-				    data + 
-				    edt.npt_addr
-				    + (i*4) + adj);
-      
-      char *name = (char *) data + name_ptr + adj;
-
-      bfd_vma ord = bfd_get_16(abfd, 
-				    data + 
-				    edt.ot_addr
-				    + (i*2) + adj);
-      fprintf(file,
-	      "\t[%4ld] %s\n", (long) ord, name);
-
-    }
-
-  free (data);
-
-  return true;
-}
-
-static boolean
-pe_print_pdata (abfd, vfile)
-     bfd  *abfd;
-     PTR vfile;
-{
-  FILE *file = (FILE *) vfile;
-  bfd_byte *data = 0;
-  asection *section = bfd_get_section_by_name (abfd, ".pdata");
-  bfd_size_type datasize = 0;
-  bfd_size_type i;
-  bfd_size_type start, stop;
-  int onaline = 20;
-
-  if (section == 0)
-    return true;
-
-  stop = bfd_section_size (abfd, section);
-  if ((stop % onaline) != 0)
-    fprintf (file, _("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
-	     (long)stop, onaline);
-
-  fprintf(file,
-	  _("\nThe Function Table (interpreted .pdata section contents)\n"));
-  fprintf(file,
-	  _(" vma:\t\tBegin    End      EH       EH       PrologEnd\n"));
-  fprintf(file,
-	  _("     \t\tAddress  Address  Handler  Data     Address\n"));
-
-  if (bfd_section_size (abfd, section) == 0)
-    return true;
-
-  data = (bfd_byte *) bfd_malloc ((size_t) bfd_section_size (abfd, section));
-  datasize = bfd_section_size (abfd, section);
-  if (data == NULL && datasize != 0)
-    return false;
-
-  bfd_get_section_contents (abfd, 
-			    section, 
-			    (PTR) data, 0, 
-			    bfd_section_size (abfd, section));
-
-  start = 0;
-
-  for (i = start; i < stop; i += onaline)
-    {
-      bfd_vma begin_addr;
-      bfd_vma end_addr;
-      bfd_vma eh_handler;
-      bfd_vma eh_data;
-      bfd_vma prolog_end_addr;
-
-      if (i+20 > stop)
-	  break;
-      
-      begin_addr = bfd_get_32(abfd, data+i);
-      end_addr = bfd_get_32(abfd, data+i+4);
-      eh_handler = bfd_get_32(abfd, data+i+8);
-      eh_data = bfd_get_32(abfd, data+i+12);
-      prolog_end_addr = bfd_get_32(abfd, data+i+16);
-      
-      if (begin_addr == 0 && end_addr == 0 && eh_handler == 0
-	  && eh_data == 0 && prolog_end_addr == 0)
-	{
-	  /* We are probably into the padding of the
-	     section now */
-	  break;
-	}
-
-      fprintf (file,
-	       " %08lx\t", 
-	       (unsigned long int) (i + section->vma));
-
-      fprintf(file, "%08lx %08lx %08lx %08lx %08lx",
-	      begin_addr,
-	      end_addr,
-	      eh_handler,
-	      eh_data,
-	      prolog_end_addr);
-
-#ifdef POWERPC_LE_PE
-      if (eh_handler == 0 && eh_data != 0)
-	{
-	  /* Special bits here, although the meaning may */
-	  /* be a little mysterious. The only one I know */
-	  /* for sure is 0x03.                           */
-	  /* Code Significance                           */
-	  /* 0x00 None                                   */
-	  /* 0x01 Register Save Millicode                */
-	  /* 0x02 Register Restore Millicode             */
-	  /* 0x03 Glue Code Sequence                     */
-	  switch (eh_data)
-	    {
-	    case 0x01:
-	      fprintf(file, _(" Register save millicode"));
-	      break;
-	    case 0x02:
-	      fprintf(file, _(" Register restore millicode"));
-	      break;
-	    case 0x03:
-	      fprintf(file, _(" Glue code sequence"));
-	      break;
-	    default:
-	      break;
-	    }
-	}
-#endif	   
-      fprintf(file, "\n");
-    }
-
-  free (data);
-
-  return true;
-}
-
-static const char *tbl[6] =
-{
-"ABSOLUTE",
-"HIGH",
-"LOW",
-"HIGHLOW",
-"HIGHADJ",
-"MIPS_JMPADDR"
-};
-
-static boolean
-pe_print_reloc (abfd, vfile)
-     bfd *abfd;
-     PTR vfile;
-{
-  FILE *file = (FILE *) vfile;
-  bfd_byte *data = 0;
-  asection *section = bfd_get_section_by_name (abfd, ".reloc");
-  bfd_size_type datasize = 0;
-  bfd_size_type i;
-  bfd_size_type start, stop;
-
-  if (section == 0)
-    return true;
-
-  if (bfd_section_size (abfd, section) == 0)
-    return true;
-
-  fprintf(file,
-	  _("\n\nPE File Base Relocations (interpreted .reloc section contents)\n"));
-
-  data = (bfd_byte *) bfd_malloc ((size_t) bfd_section_size (abfd, section));
-  datasize = bfd_section_size (abfd, section);
-  if (data == NULL && datasize != 0)
-    return false;
-
-  bfd_get_section_contents (abfd, 
-			    section, 
-			    (PTR) data, 0, 
-			    bfd_section_size (abfd, section));
-
-  start = 0;
-
-  stop = bfd_section_size (abfd, section);
-
-  for (i = start; i < stop;)
-    {
-      int j;
-      bfd_vma virtual_address;
-      long number, size;
-
-      /* The .reloc section is a sequence of blocks, with a header consisting
-	 of two 32 bit quantities, followed by a number of 16 bit entries */
-
-      virtual_address = bfd_get_32(abfd, data+i);
-      size = bfd_get_32(abfd, data+i+4);
-      number = (size - 8) / 2;
-
-      if (size == 0) 
-	{
-	  break;
-	}
-
-      fprintf (file,
-	       _("\nVirtual Address: %08lx Chunk size %ld (0x%lx) Number of fixups %ld\n"),
-	       virtual_address, size, size, number);
-
-      for (j = 0; j < number; ++j)
-	{
-	  unsigned short e = bfd_get_16(abfd, data + i + 8 + j*2);
-	  int t =   (e & 0xF000) >> 12;
-	  int off = e & 0x0FFF;
-
-	  if (t > 5) 
-	    abort();
-
-	  fprintf(file,
-		  _("\treloc %4d offset %4x [%4lx] %s\n"), 
-		  j, off, (long) (off + virtual_address), tbl[t]);
-	  
-	}
-      i += size;
-    }
-
-  free (data);
-
-  return true;
-}
-
-static boolean
-pe_print_private_bfd_data (abfd, vfile)
-     bfd *abfd;
-     PTR vfile;
-{
-  FILE *file = (FILE *) vfile;
-  int j;
-  pe_data_type *pe = pe_data (abfd);
-  struct internal_extra_pe_aouthdr *i = &pe->pe_opthdr;
-
-  /* The MS dumpbin program reportedly ands with 0xff0f before
-     printing the characteristics field.  Not sure why.  No reason to
-     emulate it here.  */
-  fprintf (file, _("\nCharacteristics 0x%x\n"), pe->real_flags);
-#undef PF
-#define PF(x, y)    if (pe->real_flags & x) { fprintf (file, "\t%s\n", y); }
-  PF (F_RELFLG, "relocations stripped");
-  PF (F_EXEC, "executable");
-  PF (F_LNNO, "line numbers stripped");
-  PF (F_LSYMS, "symbols stripped");
-  PF (0x80, "little endian");
-  PF (F_AR32WR, "32 bit words");
-  PF (0x200, "debugging information removed");
-  PF (0x1000, "system file");
-  PF (F_DLL, "DLL");
-  PF (0x8000, "big endian");
-#undef PF
-
-  fprintf (file,"\nImageBase\t\t");
-  fprintf_vma (file, i->ImageBase);
-  fprintf (file,"\nSectionAlignment\t");
-  fprintf_vma (file, i->SectionAlignment);
-  fprintf (file,"\nFileAlignment\t\t");
-  fprintf_vma (file, i->FileAlignment);
-  fprintf (file,"\nMajorOSystemVersion\t%d\n", i->MajorOperatingSystemVersion);
-  fprintf (file,"MinorOSystemVersion\t%d\n", i->MinorOperatingSystemVersion);
-  fprintf (file,"MajorImageVersion\t%d\n", i->MajorImageVersion);
-  fprintf (file,"MinorImageVersion\t%d\n", i->MinorImageVersion);
-  fprintf (file,"MajorSubsystemVersion\t%d\n", i->MajorSubsystemVersion);
-  fprintf (file,"MinorSubsystemVersion\t%d\n", i->MinorSubsystemVersion);
-  fprintf (file,"Reserved1\t\t%08lx\n", i->Reserved1);
-  fprintf (file,"SizeOfImage\t\t%08lx\n", i->SizeOfImage);
-  fprintf (file,"SizeOfHeaders\t\t%08lx\n", i->SizeOfHeaders);
-  fprintf (file,"CheckSum\t\t%08lx\n", i->CheckSum);
-  fprintf (file,"Subsystem\t\t%08x\n", i->Subsystem);
-  fprintf (file,"DllCharacteristics\t%08x\n", i->DllCharacteristics);
-  fprintf (file,"SizeOfStackReserve\t");
-  fprintf_vma (file, i->SizeOfStackReserve);
-  fprintf (file,"\nSizeOfStackCommit\t");
-  fprintf_vma (file, i->SizeOfStackCommit);
-  fprintf (file,"\nSizeOfHeapReserve\t");
-  fprintf_vma (file, i->SizeOfHeapReserve);
-  fprintf (file,"\nSizeOfHeapCommit\t");
-  fprintf_vma (file, i->SizeOfHeapCommit);
-  fprintf (file,"\nLoaderFlags\t\t%08lx\n", i->LoaderFlags);
-  fprintf (file,"NumberOfRvaAndSizes\t%08lx\n", i->NumberOfRvaAndSizes);
-
-  fprintf (file,"\nThe Data Directory\n");
-  for (j = 0; j < IMAGE_NUMBEROF_DIRECTORY_ENTRIES; j++) 
-    {
-      fprintf (file, "Entry %1x ", j);
-      fprintf_vma (file, i->DataDirectory[j].VirtualAddress);
-      fprintf (file, " %08lx ", i->DataDirectory[j].Size);
-      fprintf (file, "%s\n", dir_names[j]);
-    }
-
-  pe_print_idata (abfd, vfile);
-  pe_print_edata (abfd, vfile);
-  pe_print_pdata (abfd, vfile);
-  pe_print_reloc (abfd, vfile);
-
-  if (pe_saved_coff_bfd_print_private_bfd_data != NULL)
-    {
-      fputc ('\n', file);
-  
-      return pe_saved_coff_bfd_print_private_bfd_data (abfd, vfile);
-    }
-
-  return true;
-}
-
-static boolean
-pe_mkobject (abfd)
-     bfd * abfd;
-{
-  pe_data_type *pe;
-  abfd->tdata.pe_obj_data = 
-    (struct pe_tdata *) bfd_zalloc (abfd, sizeof (pe_data_type));
-
-  if (abfd->tdata.pe_obj_data == 0)
-    return false;
-
-  pe = pe_data (abfd);
-
-  pe->coff.pe = 1;
-  pe->in_reloc_p = in_reloc_p;
-  return true;
-}
-
-/* Create the COFF backend specific information.  */
-static PTR
-pe_mkobject_hook (abfd, filehdr, aouthdr)
-     bfd * abfd;
-     PTR filehdr;
-     PTR aouthdr;
-{
-  struct internal_filehdr *internal_f = (struct internal_filehdr *) filehdr;
-  pe_data_type *pe;
-
-  if (pe_mkobject (abfd) == false)
-    return NULL;
-
-  pe = pe_data (abfd);
-  pe->coff.sym_filepos = internal_f->f_symptr;
-  /* These members communicate important constants about the symbol
-     table to GDB's symbol-reading code.  These `constants'
-     unfortunately vary among coff implementations...  */
-  pe->coff.local_n_btmask = N_BTMASK;
-  pe->coff.local_n_btshft = N_BTSHFT;
-  pe->coff.local_n_tmask = N_TMASK;
-  pe->coff.local_n_tshift = N_TSHIFT;
-  pe->coff.local_symesz = SYMESZ;
-  pe->coff.local_auxesz = AUXESZ;
-  pe->coff.local_linesz = LINESZ;
-
-  obj_raw_syment_count (abfd) =
-    obj_conv_table_size (abfd) =
-      internal_f->f_nsyms;
-
-  pe->real_flags = internal_f->f_flags;
-
-  if ((internal_f->f_flags & F_DLL) != 0)
-    pe->dll = 1;
-
-#ifdef COFF_IMAGE_WITH_PE
-  if (aouthdr) 
-    pe->pe_opthdr = ((struct internal_aouthdr *)aouthdr)->pe;
-#endif
-
-#ifdef ARM 
-  if (! _bfd_coff_arm_set_private_flags (abfd, internal_f->f_flags))
-    coff_data (abfd) ->flags = 0;
-#endif
-  
-  return (PTR) pe;
-}
-
-
-
-/* Copy any private info we understand from the input bfd
-   to the output bfd.  */
-
-#ifdef coff_bfd_copy_private_bfd_data
-static boolean (*pe_saved_coff_bfd_copy_private_bfd_data)
-     PARAMS ((bfd *, bfd *))
-     = coff_bfd_copy_private_bfd_data;
-#undef coff_bfd_copy_private_bfd_data
-#else
-static boolean (*pe_saved_coff_bfd_copy_private_bfd_data)
-     PARAMS ((bfd *, bfd *))
-     = NULL;
-#endif
-#define coff_bfd_copy_private_bfd_data pe_bfd_copy_private_bfd_data
-
-static boolean
-pe_bfd_copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd, *obfd;
-{
-  /* One day we may try to grok other private data.  */
-  if (ibfd->xvec->flavour != bfd_target_coff_flavour
-      || obfd->xvec->flavour != bfd_target_coff_flavour)
-    return true;
-
-  pe_data (obfd)->pe_opthdr = pe_data (ibfd)->pe_opthdr;
-  pe_data (obfd)->dll = pe_data (ibfd)->dll;
-
-  if (pe_saved_coff_bfd_copy_private_bfd_data)
-    return pe_saved_coff_bfd_copy_private_bfd_data (ibfd, obfd);
-  
-  return true;
-}
-
-#ifdef COFF_IMAGE_WITH_PE
-
-/* Copy private section data.  */
-
-#define coff_bfd_copy_private_section_data pe_bfd_copy_private_section_data
-
-static boolean pe_bfd_copy_private_section_data
-  PARAMS ((bfd *, asection *, bfd *, asection *));
-
-static boolean
-pe_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
-     bfd *ibfd;
-     asection *isec;
-     bfd *obfd;
-     asection *osec;
-{
-  if (bfd_get_flavour (ibfd) != bfd_target_coff_flavour
-      || bfd_get_flavour (obfd) != bfd_target_coff_flavour)
-    return true;
-
-  if (coff_section_data (ibfd, isec) != NULL
-      && pei_section_data (ibfd, isec) != NULL)
-    {
-      if (coff_section_data (obfd, osec) == NULL)
-	{
-	  osec->used_by_bfd =
-	    (PTR) bfd_zalloc (obfd, sizeof (struct coff_section_tdata));
-	  if (osec->used_by_bfd == NULL)
-	    return false;
-	}
-      if (pei_section_data (obfd, osec) == NULL)
-	{
-	  coff_section_data (obfd, osec)->tdata =
-	    (PTR) bfd_zalloc (obfd, sizeof (struct pei_section_tdata));
-	  if (coff_section_data (obfd, osec)->tdata == NULL)
-	    return false;
-	}
-      pei_section_data (obfd, osec)->virt_size =
-	pei_section_data (ibfd, isec)->virt_size;
-    }
-
-  return true;
-}
-
-#endif
diff --git a/bfd/po/Make-in b/bfd/po/Make-in
deleted file mode 100644
index 0552db1feef..00000000000
--- a/bfd/po/Make-in
+++ /dev/null
@@ -1,251 +0,0 @@
-# Makefile for program source directory in GNU NLS utilities package.
-# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
-#
-# This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
-# but which still want to provide support for the GNU gettext functionality.
-# Please note that the actual code is *not* freely available.
-
-PACKAGE = @PACKAGE@
-VERSION = @VERSION@
-
-SHELL = /bin/sh
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
-gnulocaledir = $(prefix)/share/locale
-gettextsrcdir = $(prefix)/share/gettext/po
-subdir = po
-
-INSTALL = @INSTALL@
-INSTALL_DATA = @INSTALL_DATA@
-MKINSTALLDIRS = @MKINSTALLDIRS@
-
-CC = @CC@
-GENCAT = @GENCAT@
-GMSGFMT = PATH=../src:$$PATH @GMSGFMT@
-MSGFMT = @MSGFMT@
-XGETTEXT = PATH=../src:$$PATH @XGETTEXT@
-MSGMERGE = PATH=../src:$$PATH msgmerge
-
-DEFS = @DEFS@
-CFLAGS = @CFLAGS@
-CPPFLAGS = @CPPFLAGS@
-
-INCLUDES = -I.. -I$(top_srcdir)/intl
-
-COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS)
-
-SOURCES = cat-id-tbl.c
-POFILES = @POFILES@
-GMOFILES = @GMOFILES@
-DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \
-stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES)
-
-POTFILES = \
-
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-INSTOBJEXT = @INSTOBJEXT@
-
-.SUFFIXES:
-.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
-
-.c.o:
-	$(COMPILE) $<
-
-.po.pox:
-	$(MAKE) $(PACKAGE).pot
-	$(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox
-
-.po.mo:
-	$(MSGFMT) -o $@ $<
-
-.po.gmo:
-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
-	  && rm -f $$file && $(GMSGFMT) -o $$file $<
-
-.po.cat:
-	sed -f ../intl/po2msg.sed < $< > $*.msg \
-	  && rm -f $@ && $(GENCAT) $@ $*.msg
-
-
-all: all-@USE_NLS@
-
-all-yes: $(CATALOGS) @MAINT@ $(PACKAGE).pot
-all-no:
-
-$(srcdir)/$(PACKAGE).pot: $(POTFILES)
-	$(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \
-	  --add-comments --keyword=_ --keyword=N_ \
-	  --files-from=$(srcdir)/POTFILES.in
-	rm -f $(srcdir)/$(PACKAGE).pot
-	mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot
-
-$(srcdir)/cat-id-tbl.c: stamp-cat-id; @:
-$(srcdir)/stamp-cat-id: $(PACKAGE).pot
-	rm -f cat-id-tbl.tmp
-	sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \
-		| sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp
-	if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \
-	  rm cat-id-tbl.tmp; \
-	else \
-	  echo cat-id-tbl.c changed; \
-	  rm -f $(srcdir)/cat-id-tbl.c; \
-	  mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \
-	fi
-	cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id
-
-
-install: install-exec install-data
-install-exec:
-install-info:
-install-data: install-data-@USE_NLS@
-install-data-no: all
-install-data-yes: all
-	if test -r $(MKINSTALLDIRS); then \
-	  $(MKINSTALLDIRS) $(datadir); \
-	else \
-	  $(top_srcdir)/mkinstalldirs $(datadir); \
-	fi
-	@catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  case "$$cat" in \
-	    *.gmo) destdir=$(gnulocaledir);; \
-	    *)     destdir=$(localedir);; \
-	  esac; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  dir=$$destdir/$$lang/LC_MESSAGES; \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $$dir; \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $$dir; \
-	  fi; \
-	  if test -r $$cat; then \
-	    $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  else \
-	    $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \
-	    echo "installing $(srcdir)/$$cat as" \
-		 "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \
-	  fi; \
-	  if test -r $$cat.m; then \
-	    $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	    echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	  else \
-	    if test -r $(srcdir)/$$cat.m ; then \
-	      $(INSTALL_DATA) $(srcdir)/$$cat.m \
-		$$dir/$(PACKAGE)$(INSTOBJEXT).m; \
-	      echo "installing $(srcdir)/$$cat as" \
-		   "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \
-	    else \
-	      true; \
-	    fi; \
-	  fi; \
-	done
-	if test "$(PACKAGE)" = "gettext"; then \
-	  if test -r $(MKINSTALLDIRS); then \
-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
-	  else \
-	    $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
-	  fi; \
-	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
-			  $(gettextsrcdir)/Makefile.in.in; \
-	else \
-	  : ; \
-	fi
-
-# Define this as empty until I found a useful application.
-installcheck:
-
-uninstall:
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
-	done
-	rm -f $(gettextsrcdir)/po-Makefile.in.in
-
-check: all
-
-cat-id-tbl.o: ../intl/libgettext.h
-
-dvi info tags TAGS ID:
-
-mostlyclean:
-	rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp
-	rm -fr *.o
-
-clean: mostlyclean
-
-distclean: clean
-	rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m
-
-maintainer-clean: distclean
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
-	rm -f $(GMOFILES)
-
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
-dist distdir: update-po $(DISTFILES)
-	dists="$(DISTFILES)"; \
-	for file in $$dists; do \
-	  ln $(srcdir)/$$file $(distdir) 2> /dev/null \
-	    || cp -p $(srcdir)/$$file $(distdir); \
-	done
-
-update-po: Makefile
-	$(MAKE) $(PACKAGE).pot
-	PATH=`pwd`/../src:$$PATH; \
-	cd $(srcdir); \
-	catalogs='$(CATALOGS)'; \
-	for cat in $$catalogs; do \
-	  cat=`basename $$cat`; \
-	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
-	  mv $$lang.po $$lang.old.po; \
-	  echo "$$lang:"; \
-	  if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \
-	    rm -f $$lang.old.po; \
-	  else \
-	    echo "msgmerge for $$cat failed!"; \
-	    rm -f $$lang.po; \
-	    mv $$lang.old.po $$lang.po; \
-	  fi; \
-	done
-
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-POTFILES.in: @MAINT@ ../Makefile
-	cd .. && $(MAKE) po/POTFILES.in
-
-Makefile: Make-in ../config.status POTFILES
-	cd .. \
-	  && CONFIG_FILES=$(subdir)/Makefile.in:$(subdir)/Make-in \
-	     CONFIG_HEADERS= $(SHELL) ./config.status
-
-# Tell versions [3.59,3.63) of GNU make not to export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/bfd/po/POTFILES.in b/bfd/po/POTFILES.in
deleted file mode 100644
index ae4996698e6..00000000000
--- a/bfd/po/POTFILES.in
+++ /dev/null
@@ -1,264 +0,0 @@
-archures.c
-bfd-in2.h
-aix386-core.c
-aout-adobe.c
-aout-arm.c
-aout-encap.c
-aout-ns32k.c
-aout-sparcle.c
-aout-target.h
-aout-tic30.c
-aout0.c
-aout32.c
-aout64.c
-aoutf1.h
-aoutx.h
-archive.c
-bfd-in.h
-bfd.c
-binary.c
-bout.c
-cache.c
-cf-i386lynx.c
-cf-m68klynx.c
-cf-sparclynx.c
-cisco-core.c
-coff-a29k.c
-coff-alpha.c
-coff-apollo.c
-coff-arm.c
-coff-aux.c
-coff-go32.c
-coff-h8300.c
-coff-h8500.c
-coff-i386.c
-coff-i860.c
-coff-i960.c
-coff-m68k.c
-coff-m88k.c
-coff-mcore.c
-coff-mips.c
-coff-pmac.c
-coff-ppc.c
-coff-rs6000.c
-coff-sh.c
-coff-sparc.c
-coff-stgo32.c
-coff-svm68k.c
-coff-tic30.c
-coff-tic80.c
-coff-u68k.c
-coff-w65.c
-coff-we32k.c
-coff-z8k.c
-coffcode.h
-coffgen.c
-cofflink.c
-coffswap.h
-cpu-m10300.c
-cpu-m32r.c
-cpu-mips.c
-corefile.c
-cpu-a29k.c
-cpu-alpha.c
-cpu-arc.c
-cpu-arm.c
-cpu-d10v.c
-cpu-d30v.c
-cpu-fr30.c
-cpu-h8300.c
-cpu-h8500.c
-cpu-hppa.c
-cpu-i386.c
-cpu-i860.c
-cpu-i960.c
-cpu-m10200.c
-cpu-sh.c
-elf-m10300.c
-cpu-m68k.c
-cpu-m88k.c
-cpu-mcore.c
-elf32-m32r.c
-cpu-ns32k.c
-cpu-powerpc.c
-cpu-rs6000.c
-libbfd.h
-cpu-sparc.c
-cpu-tic30.c
-cpu-tic80.c
-cpu-v850.c
-cpu-vax.c
-elf32-mips.c
-cpu-w65.c
-cpu-we32k.c
-cpu-z8k.c
-demo64.c
-dwarf1.c
-dwarf2.c
-ecoff.c
-ecofflink.c
-ecoffswap.h
-elf-bfd.h
-elf-m10200.c
-libhppa.h
-elf.c
-elf32-arc.c
-elf32-arm.h
-elf32-d10v.c
-elf32-d30v.c
-elf32-fr30.c
-elf32-gen.c
-elf32-hppa.c
-elf32-hppa.h
-elf32-i386.c
-elf32-i860.c
-reloc.c
-elf32-m68k.c
-elf32-m88k.c
-elf32-mcore.c
-targets.c
-elf32-ppc.c
-elf32-sh.c
-elf32-sparc.c
-elf32-v850.c
-elf32.c
-elf64-alpha.c
-elf64-gen.c
-elf64-mips.c
-elf64-sparc.c
-elf64.c
-elfarm-nabi.c
-elfarm-oabi.c
-elfcode.h
-elfcore.h
-elflink.c
-elflink.h
-elfxx-target.h
-epoc-pe-arm.c
-epoc-pei-arm.c
-format.c
-freebsd.h
-gen-aout.c
-genlink.h
-go32stub.h
-hash.c
-host-aout.c
-hp300bsd.c
-hp300hpux.c
-hppa_stubs.h
-hppabsd-core.c
-hpux-core.c
-i386aout.c
-i386bsd.c
-i386dynix.c
-i386freebsd.c
-i386linux.c
-i386lynx.c
-i386mach3.c
-i386msdos.c
-i386netbsd.c
-i386os9k.c
-ieee.c
-ihex.c
-init.c
-irix-core.c
-libaout.h
-libbfd-in.h
-libbfd.c
-libcoff-in.h
-libcoff.h
-libecoff.h
-libieee.h
-libnlm.h
-liboasys.h
-linker.c
-lynx-core.c
-m68k4knetbsd.c
-m68klinux.c
-m68klynx.c
-m68knetbsd.c
-doc/chew.c
-m88kmach3.c
-mipsbsd.c
-netbsd-core.c
-netbsd.h
-newsos3.c
-nlm-target.h
-nlm.c
-nlm32-alpha.c
-nlm32-i386.c
-nlm32-ppc.c
-nlm32-sparc.c
-nlm32.c
-nlm64.c
-nlmcode.h
-nlmswap.h
-ns32k.h
-ns32knetbsd.c
-oasys.c
-opncls.c
-osf-core.c
-pc532-mach.c
-pe-arm.c
-pe-i386.c
-pe-mcore.c
-pe-ppc.c
-pei-arm.c
-pei-i386.c
-pei-mcore.c
-pei-ppc.c
-peicode.h
-ppcboot.c
-ptrace-core.c
-reloc16.c
-riscix.c
-rs6000-core.c
-sco5-core.c
-section.c
-som.c
-som.h
-sparclinux.c
-sparclynx.c
-sparcnetbsd.c
-srec.c
-stab-syms.c
-stabs.c
-sunos.c
-syms.c
-sysdep.h
-tekhex.c
-trad-core.c
-vaxnetbsd.c
-versados.c
-vms-gsd.c
-vms-hdr.c
-vms-misc.c
-vms-tir.c
-vms.c
-vms.h
-xcofflink.c
-hosts/alphalinux.h
-hosts/alphavms.h
-hosts/decstation.h
-hosts/delta68.h
-hosts/dpx2.h
-hosts/hp300bsd.h
-hosts/i386bsd.h
-hosts/i386linux.h
-hosts/i386mach3.h
-hosts/i386sco.h
-hosts/i860mach3.h
-hosts/m68kaux.h
-hosts/m68klinux.h
-hosts/m88kmach3.h
-hosts/mipsbsd.h
-hosts/mipsmach3.h
-hosts/news-mips.h
-hosts/news.h
-hosts/pc532mach.h
-hosts/riscos.h
-hosts/symmetry.h
-hosts/tahoe.h
-hosts/vaxbsd.h
-hosts/vaxult.h
-hosts/vaxult2.h
diff --git a/bfd/po/bfd.pot b/bfd/po/bfd.pot
deleted file mode 100644
index f7ffbb47b01..00000000000
--- a/bfd/po/bfd.pot
+++ /dev/null
@@ -1,632 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-04-18 18:26-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: ENCODING\n"
-
-#: aout-adobe.c:182
-#, c-format
-msgid "%s: Unknown section type in a.out.adobe file: %x\n"
-msgstr ""
-
-#: aoutx.h:1237 aoutx.h:1651
-#, c-format
-msgid "%s: can not represent section `%s' in a.out object file format"
-msgstr ""
-
-#: aoutx.h:1621
-#, c-format
-msgid ""
-"%s: can not represent section for symbol `%s' in a.out object file format"
-msgstr ""
-
-#: aoutx.h:1623
-msgid "*unknown*"
-msgstr ""
-
-#: aoutx.h:3667
-#, c-format
-msgid "%s: relocateable link from %s to %s not supported"
-msgstr ""
-
-#: archive.c:1716
-msgid "Warning: writing archive was slow: rewriting timestamp\n"
-msgstr ""
-
-#: archive.c:1987
-msgid "Reading archive file mod timestamp"
-msgstr ""
-
-#. FIXME: bfd can't call perror.
-#: archive.c:2011
-msgid "Writing updated armap timestamp"
-msgstr ""
-
-#: bfd.c:274
-msgid "No error"
-msgstr ""
-
-#: bfd.c:275
-msgid "System call error"
-msgstr ""
-
-#: bfd.c:276
-msgid "Invalid bfd target"
-msgstr ""
-
-#: bfd.c:277
-msgid "File in wrong format"
-msgstr ""
-
-#: bfd.c:278
-msgid "Invalid operation"
-msgstr ""
-
-#: bfd.c:279
-msgid "Memory exhausted"
-msgstr ""
-
-#: bfd.c:280
-msgid "No symbols"
-msgstr ""
-
-#: bfd.c:281
-msgid "Archive has no index; run ranlib to add one"
-msgstr ""
-
-#: bfd.c:282
-msgid "No more archived files"
-msgstr ""
-
-#: bfd.c:283
-msgid "Malformed archive"
-msgstr ""
-
-#: bfd.c:284
-msgid "File format not recognized"
-msgstr ""
-
-#: bfd.c:285
-msgid "File format is ambiguous"
-msgstr ""
-
-#: bfd.c:286
-msgid "Section has no contents"
-msgstr ""
-
-#: bfd.c:287
-msgid "Nonrepresentable section on output"
-msgstr ""
-
-#: bfd.c:288
-msgid "Symbol needs debug section which does not exist"
-msgstr ""
-
-#: bfd.c:289
-msgid "Bad value"
-msgstr ""
-
-#: bfd.c:290
-msgid "File truncated"
-msgstr ""
-
-#: bfd.c:291
-msgid "File too big"
-msgstr ""
-
-#: bfd.c:292
-msgid "#<Invalid error code>"
-msgstr ""
-
-#: bfd.c:679
-#, c-format
-msgid "bfd assertion fail %s:%d"
-msgstr ""
-
-#: binary.c:298
-#, c-format
-msgid "Warning: Writing section `%s' to huge (ie negative) file offset 0x%lx."
-msgstr ""
-
-#: coff-a29k.c:121
-msgid "Missing IHCONST"
-msgstr ""
-
-#: coff-a29k.c:181
-msgid "Missing IHIHALF"
-msgstr ""
-
-#: coff-a29k.c:213
-msgid "Unrecognized reloc"
-msgstr ""
-
-#: coff-a29k.c:406
-msgid "missing IHCONST reloc"
-msgstr ""
-
-#: coff-a29k.c:497
-msgid "missing IHIHALF reloc"
-msgstr ""
-
-#: coff-alpha.c:880 coff-alpha.c:917
-msgid "GP relative relocation used when GP not defined"
-msgstr ""
-
-#: coff-alpha.c:1486 elf64-alpha.c:4051
-msgid "using multiple gp values"
-msgstr ""
-
-#: coff-alpha.c:1992 coff-mips.c:1435 elf32-mips.c:5175
-msgid "GP relative relocation when GP not defined"
-msgstr ""
-
-#: coff-arm.c:884
-#, c-format
-msgid "%s: unable to find THUMB glue '%s' for `%s'"
-msgstr ""
-
-#: coff-arm.c:913
-#, c-format
-msgid "%s: unable to find ARM glue '%s' for `%s'"
-msgstr ""
-
-#: coff-arm.c:1192 coff-arm.c:1286
-#, c-format
-msgid "%s(%s): warning: interworking not enabled."
-msgstr ""
-
-#: coff-arm.c:1196
-#, c-format
-msgid "  first occurrence: %s: arm call to thumb"
-msgstr ""
-
-#: coff-arm.c:1290
-#, c-format
-msgid "  first occurrence: %s: thumb call to arm"
-msgstr ""
-
-#: coff-arm.c:1293
-msgid "  consider relinking with --support-old-code enabled"
-msgstr ""
-
-#: coff-arm.c:1581 coff-tic80.c:682 cofflink.c:2722
-#, c-format
-msgid "%s: bad reloc address 0x%lx in section `%s'"
-msgstr ""
-
-#: coff-arm.c:2036
-#, c-format
-msgid "%s: ERROR: compiled for APCS-%d whereas target %s uses APCS-%d"
-msgstr ""
-
-#: coff-arm.c:2051
-#, c-format
-msgid ""
-"%s: ERROR: passes floats in float registers whereas target %s uses integer "
-"registers"
-msgstr ""
-
-#: coff-arm.c:2054
-#, c-format
-msgid ""
-"%s: ERROR: passes floats in integer registers whereas target %s uses float "
-"registers"
-msgstr ""
-
-#: coff-arm.c:2069
-#, c-format
-msgid ""
-"%s: ERROR: compiled as position independent code, whereas target %s is "
-"absolute position"
-msgstr ""
-
-#: coff-arm.c:2072
-#, c-format
-msgid ""
-"%s: ERROR: compiled as absolute position code, whereas target %s is position "
-"independent"
-msgstr ""
-
-#: coff-arm.c:2101
-#, c-format
-msgid "Warning: input file %s supports interworking, whereas %s does not."
-msgstr ""
-
-#: coff-arm.c:2104
-#, c-format
-msgid "Warning: input file %s does not support interworking, whereas %s does."
-msgstr ""
-
-#: coff-arm.c:2132
-#, c-format
-msgid "private flags = %x:"
-msgstr ""
-
-#: coff-arm.c:2140
-msgid " [floats passed in float registers]"
-msgstr ""
-
-#: coff-arm.c:2142
-msgid " [floats passed in integer registers]"
-msgstr ""
-
-#: coff-arm.c:2145
-msgid " [position independent]"
-msgstr ""
-
-#: coff-arm.c:2147
-msgid " [absolute position]"
-msgstr ""
-
-#: coff-arm.c:2151
-msgid " [interworking flag not initialised]"
-msgstr ""
-
-#: coff-arm.c:2153
-msgid " [interworking supported]"
-msgstr ""
-
-#: coff-arm.c:2155
-msgid " [interworking not supported]"
-msgstr ""
-
-#: coff-arm.c:2204
-#, c-format
-msgid ""
-"Warning: Not setting interworking flag of %s, since it has already been "
-"specified as non-interworking"
-msgstr ""
-
-#: coff-arm.c:2208
-#, c-format
-msgid "Warning: Clearing the interworking flag of %s due to outside request"
-msgstr ""
-
-#: coff-i960.c:135 coff-i960.c:484
-msgid "uncertain calling convention for non-COFF symbol"
-msgstr ""
-
-#: coff-mips.c:875 elf32-mips.c:1183
-msgid "GP relative relocation when _gp not defined"
-msgstr ""
-
-#: coff-mips.c:2433
-msgid "unsupported reloc type"
-msgstr ""
-
-#. No other sections should appear in -membedded-pic
-#. code.
-#: coff-mips.c:2470
-msgid "reloc against unsupported section"
-msgstr ""
-
-#: coff-mips.c:2478
-msgid "reloc not properly aligned"
-msgstr ""
-
-#: coff-tic80.c:445
-#, c-format
-msgid "Unrecognized reloc type 0x%x"
-msgstr ""
-
-#: coff-w65.c:383
-#, c-format
-msgid "ignoring reloc %s\n"
-msgstr ""
-
-#: coffcode.h:3413
-#, c-format
-msgid "%s: warning: illegal symbol index %ld in line numbers"
-msgstr ""
-
-#: coffcode.h:3427
-#, c-format
-msgid "%s: warning: duplicate line number information for `%s'"
-msgstr ""
-
-#: coffcode.h:3748
-#, c-format
-msgid "%s: Unrecognized storage class %d for %s symbol `%s'"
-msgstr ""
-
-#: coffcode.h:3932
-#, c-format
-msgid "%s: warning: illegal symbol index %ld in relocs"
-msgstr ""
-
-#: coffcode.h:3970
-#, c-format
-msgid "%s: illegal relocation type %d at address 0x%lx"
-msgstr ""
-
-#: coffgen.c:1607
-#, c-format
-msgid "%s: bad string table size %lu"
-msgstr ""
-
-#: cofflink.c:423
-#, c-format
-msgid "Warning: type of symbol `%s' changed from %d to %d in %s"
-msgstr ""
-
-#: cofflink.c:2093
-#, c-format
-msgid "%s: relocs in section `%s', but it has no contents"
-msgstr ""
-
-#: coffswap.h:879
-#, c-format
-msgid "%s: warning: %s: line number overflow: 0x%lx > 0xffff"
-msgstr ""
-
-#: coffswap.h:892
-#, c-format
-msgid "%s: %s: reloc overflow: 0x%lx > 0xffff"
-msgstr ""
-
-#: dwarf2.c:420
-msgid "Dwarf Error: Can't find .debug_abbrev section."
-msgstr ""
-
-#: dwarf2.c:438
-#, c-format
-msgid "Dwarf Error: Abbrev offset (%u) bigger than abbrev size (%u)."
-msgstr ""
-
-#: dwarf2.c:614
-#, c-format
-msgid "Dwarf Error: Invalid or unhandled FORM value: %d."
-msgstr ""
-
-#: dwarf2.c:720
-msgid "Dwarf Error: Can't find .debug_line section."
-msgstr ""
-
-#: dwarf2.c:881
-msgid "Dwarf Error: mangled line number section."
-msgstr ""
-
-#: dwarf2.c:1054 dwarf2.c:1201
-#, c-format
-msgid "Dwarf Error: Could not find abbrev number %d."
-msgstr ""
-
-#: dwarf2.c:1162
-#, c-format
-msgid ""
-"Dwarf Error: found dwarf version '%hu', this reader only handles version 2 "
-"information."
-msgstr ""
-
-#: dwarf2.c:1169
-#, c-format
-msgid ""
-"Dwarf Error: found address size '%u', this reader can not handle sizes "
-"greater than '%u'."
-msgstr ""
-
-#: dwarf2.c:1192
-#, c-format
-msgid "Dwarf Error: Bad abbrev number: %d."
-msgstr ""
-
-#: ecoff.c:1308
-#, c-format
-msgid "Unknown basic type %d"
-msgstr ""
-
-#: ecoff.c:1580
-#, c-format
-msgid ""
-"\n"
-"      End+1 symbol: %ld"
-msgstr ""
-
-#: ecoff.c:1587 ecoff.c:1590
-#, c-format
-msgid ""
-"\n"
-"      First symbol: %ld"
-msgstr ""
-
-#: ecoff.c:1602
-#, c-format
-msgid ""
-"\n"
-"      End+1 symbol: %-7ld   Type:  %s"
-msgstr ""
-
-#: ecoff.c:1609
-#, c-format
-msgid ""
-"\n"
-"      Local symbol: %ld"
-msgstr ""
-
-#: ecoff.c:1617
-#, c-format
-msgid ""
-"\n"
-"      struct; End+1 symbol: %ld"
-msgstr ""
-
-#: ecoff.c:1622
-#, c-format
-msgid ""
-"\n"
-"      union; End+1 symbol: %ld"
-msgstr ""
-
-#: ecoff.c:1627
-#, c-format
-msgid ""
-"\n"
-"      enum; End+1 symbol: %ld"
-msgstr ""
-
-#: ecoff.c:1633
-#, c-format
-msgid ""
-"\n"
-"      Type: %s"
-msgstr ""
-
-#: elf-m10200.c:455 elf-m10300.c:667 elf32-d10v.c:490 elf32-fr30.c:650
-#: elf32-m32r.c:1157 elf32-v850.c:1674
-msgid "internal error: out of range error"
-msgstr ""
-
-#: elf-m10200.c:459 elf-m10300.c:671 elf32-d10v.c:494 elf32-fr30.c:654
-#: elf32-m32r.c:1161 elf32-v850.c:1678
-msgid "internal error: unsupported relocation error"
-msgstr ""
-
-#: elf-m10200.c:463 elf-m10300.c:675 elf32-d10v.c:498 elf32-m32r.c:1165
-msgid "internal error: dangerous error"
-msgstr ""
-
-#: elf-m10200.c:467 elf-m10300.c:679 elf32-d10v.c:502 elf32-fr30.c:662
-#: elf32-m32r.c:1169 elf32-v850.c:1698
-msgid "internal error: unknown error"
-msgstr ""
-
-#: elf.c:320
-#, c-format
-msgid "%s: invalid string offset %u >= %lu for section `%s'"
-msgstr ""
-
-#: elf.c:543
-msgid ""
-"\n"
-"Program Header:\n"
-msgstr ""
-
-#: elf.c:591
-msgid ""
-"\n"
-"Dynamic Section:\n"
-msgstr ""
-
-#: elf.c:693
-msgid ""
-"\n"
-"Version definitions:\n"
-msgstr ""
-
-#: elf.c:716
-msgid ""
-"\n"
-"Version References:\n"
-msgstr ""
-
-#: elf.c:721
-#, c-format
-msgid "  required from %s:\n"
-msgstr ""
-
-#: elf.c:1882
-#, c-format
-msgid ""
-"creating section symbol, name = %s, value = 0x%.8lx, index = %d, section = "
-"0x%.8lx\n"
-msgstr ""
-
-#: elf.c:2481
-#, c-format
-msgid "%s: Not enough room for program headers (allocated %u, need %u)"
-msgstr ""
-
-#: elf.c:2584
-#, c-format
-msgid "%s: Not enough room for program headers, try linking with -N"
-msgstr ""
-
-#: elf.c:2710
-#, c-format
-msgid "Error: First section in segment (%s) starts at 0x%x"
-msgstr ""
-
-#: elf.c:2713
-#, c-format
-msgid "       whereas segment starts at 0x%x"
-msgstr ""
-
-#: elf.c:2983
-#, c-format
-msgid "%s: warning: allocated section `%s' not in segment"
-msgstr ""
-
-#: elf.c:3350
-#, c-format
-msgid "%s: symbol `%s' required but not present"
-msgstr ""
-
-#: elf.c:3359
-#, c-format
-msgid ""
-"elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = "
-"0x%.8lx%s\n"
-msgstr ""
-
-#: elf.c:3501
-#, c-format
-msgid "%s: warning: Empty loadable segment detected\n"
-msgstr ""
-
-#: elf.c:4774
-#, c-format
-msgid "%s: unsupported relocation type %s"
-msgstr ""
-
-#: elf32-fr30.c:658 elf32-v850.c:1682
-msgid "internal error: dangerous relocation"
-msgstr ""
-
-#: elf32-hppa.c:1215
-msgid "Unsupported call to hppa_elf_reloc"
-msgstr ""
-
-#: elf32-i386.c:1293
-#, c-format
-msgid ""
-"%s: warning: unresolvable relocation against symbol `%s' from %s section"
-msgstr ""
-
-#: elf32-m32r.c:808
-msgid "SDA relocation when _SDA_BASE_ not defined"
-msgstr ""
-
-#: elf32-m32r.c:892 elf32-ppc.c:3071
-#, c-format
-msgid "%s: unknown relocation type %d"
-msgstr ""
-
-#: elf32-m32r.c:1100
-#, c-format
-msgid "%s: The target (%s) of an %s relocation is in the wrong section (%s)"
-msgstr ""
-
-#: elf32-m32r.c:1906
-#, c-format
-msgid "%s: Instruction set mismatch with previous modules"
-msgstr ""
-
-#: elf32-m32r.c:1929
-#, c-format
-msgid "private flags = %lx"
-msgstr ""
-
-#: elf32-m32r.c:1934
-msgid ": m32r instructions"
-msgstr ""
-
diff --git a/bfd/ppcboot.c b/bfd/ppcboot.c
deleted file mode 100644
index cbda407ea33..00000000000
--- a/bfd/ppcboot.c
+++ /dev/null
@@ -1,535 +0,0 @@
-/* BFD back-end for PPCbug boot records.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Michael Meissner, Cygnus Support, <meissner@cygnus.com>
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This is a BFD backend which may be used to write PowerPCBug boot objects.
-   It may only be used for output, not input.  The intention is that this may
-   be used as an output format for objcopy in order to generate raw binary
-   data.
-
-   This is very simple.  The only complication is that the real data
-   will start at some address X, and in some cases we will not want to
-   include X zeroes just to get to that point.  Since the start
-   address is not meaningful for this object file format, we use it
-   instead to indicate the number of zeroes to skip at the start of
-   the file.  objcopy cooperates by specially setting the start
-   address to zero by default.  */
-
-#include <ctype.h>
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-/* PPCbug location structure */
-typedef struct ppcboot_location {
-  bfd_byte	ind;
-  bfd_byte	head;
-  bfd_byte	sector;
-  bfd_byte	cylinder;
-} ppcboot_location_t;
-
-/* PPCbug partition table layout */
-typedef struct ppcboot_partition {
-  ppcboot_location_t	partition_begin;	/* partition begin */
-  ppcboot_location_t	partition_end;		/* partition end */
-  bfd_byte		sector_begin[4];	/* 32-bit start RBA (zero-based), little endian */
-  bfd_byte		sector_length[4];	/* 32-bit RBA count (one-based), little endian */
-} ppcboot_partition_t;
-
-/* PPCbug boot layout.  */
-typedef struct ppcboot_hdr {
-  bfd_byte		pc_compatibility[446];	/* x86 instruction field */
-  ppcboot_partition_t	partition[4];		/* partition information */
-  bfd_byte		signature[2];		/* 0x55 and 0xaa */
-  bfd_byte		entry_offset[4];	/* entry point offset, little endian */
-  bfd_byte		length[4];		/* load image length, little endian */
-  bfd_byte		flags;			/* flag field */
-  bfd_byte		os_id;			/* OS_ID */
-  char			partition_name[32];	/* partition name */
-  bfd_byte		reserved1[470];		/* reserved */
-} ppcboot_hdr_t;
-
-/* Signature bytes for last 2 bytes of the 512 byte record */
-#define SIGNATURE0 0x55
-#define SIGNATURE1 0xaa
-
-/* PowerPC boot type */
-#define PPC_IND 0x41
-
-/* Information needed for ppcboot header */
-typedef struct ppcboot_data {
-  ppcboot_hdr_t	header;				/* raw header */
-  asection *sec;				/* single section */
-} ppcboot_data_t;
-
-/* Any bfd we create by reading a ppcboot file has three symbols:
-   a start symbol, an end symbol, and an absolute length symbol.  */
-#define PPCBOOT_SYMS 3
-
-static boolean ppcboot_mkobject PARAMS ((bfd *));
-static const bfd_target *ppcboot_object_p PARAMS ((bfd *));
-static boolean ppcboot_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean ppcboot_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static long ppcboot_get_symtab_upper_bound PARAMS ((bfd *));
-static char *mangle_name PARAMS ((bfd *, char *));
-static long ppcboot_get_symtab PARAMS ((bfd *, asymbol **));
-static asymbol *ppcboot_make_empty_symbol PARAMS ((bfd *));
-static void ppcboot_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static boolean ppcboot_set_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static int ppcboot_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean ppcboot_bfd_print_private_bfd_data PARAMS ((bfd *, PTR));
-
-#define ppcboot_set_tdata(abfd, ptr) ((abfd)->tdata.any = (PTR) (ptr))
-#define ppcboot_get_tdata(abfd) ((ppcboot_data_t *) ((abfd)->tdata.any))
-
-/* Create a ppcboot object.  Invoked via bfd_set_format.  */
-
-static boolean
-ppcboot_mkobject (abfd)
-     bfd *abfd;
-{
-  if (!ppcboot_get_tdata (abfd))
-    ppcboot_set_tdata (abfd, bfd_zalloc (abfd, sizeof (ppcboot_data_t)));
-
-  return true;
-}
-
-
-/* Set the architecture to PowerPC */
-static boolean
-ppcboot_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  if (arch == bfd_arch_unknown)
-    arch = bfd_arch_powerpc;
-
-  else if (arch != bfd_arch_powerpc)
-    return false;
-
-  return bfd_default_set_arch_mach (abfd, arch, machine);
-}
-
-
-/* Any file may be considered to be a ppcboot file, provided the target
-   was not defaulted.  That is, it must be explicitly specified as
-   being ppcboot.  */
-
-static const bfd_target *
-ppcboot_object_p (abfd)
-     bfd *abfd;
-{
-  struct stat statbuf;
-  asection *sec;
-  ppcboot_hdr_t hdr;
-  size_t i;
-  ppcboot_data_t *tdata;
-
-  BFD_ASSERT (sizeof (ppcboot_hdr_t) == 1024);
-
-  if (abfd->target_defaulted)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Find the file size.  */
-  if (bfd_stat (abfd, &statbuf) < 0)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return NULL;
-    }
-
-  if ((size_t) statbuf.st_size < sizeof (ppcboot_hdr_t))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (bfd_read ((PTR) &hdr, sizeof (hdr), 1, abfd) != sizeof (hdr))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-
-      return NULL;
-    }
-
-  /* Now do some basic checks.  */
-  for (i = 0; i < sizeof (hdr.pc_compatibility); i++)
-    if (hdr.pc_compatibility[i])
-      {
-	bfd_set_error (bfd_error_wrong_format);
-	return NULL;
-      }
-
-  if (hdr.signature[0] != SIGNATURE0 || hdr.signature[1] != SIGNATURE1)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (hdr.partition[0].partition_end.ind != PPC_IND)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  abfd->symcount = PPCBOOT_SYMS;
-
-  /* One data section.  */
-  sec = bfd_make_section (abfd, ".data");
-  if (sec == NULL)
-    return NULL;
-  sec->flags = SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_CODE | SEC_HAS_CONTENTS;
-  sec->vma = 0;
-  sec->_raw_size = statbuf.st_size - sizeof (ppcboot_hdr_t);
-  sec->filepos = sizeof (ppcboot_hdr_t);
-
-  ppcboot_mkobject (abfd);
-  tdata = ppcboot_get_tdata (abfd);
-  tdata->sec = sec;
-  memcpy ((PTR) &tdata->header, (PTR) &hdr, sizeof (ppcboot_hdr_t));
-
-  ppcboot_set_arch_mach (abfd, bfd_arch_powerpc, 0);
-  return abfd->xvec;
-}
-
-#define ppcboot_close_and_cleanup _bfd_generic_close_and_cleanup
-#define ppcboot_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define ppcboot_new_section_hook _bfd_generic_new_section_hook
-
-
-/* Get contents of the only section.  */
-
-static boolean
-ppcboot_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (bfd_seek (abfd, offset + sizeof(ppcboot_hdr_t), SEEK_SET) != 0
-      || bfd_read (location, 1, count, abfd) != count)
-    return false;
-  return true;
-}
-
-
-/* Return the amount of memory needed to read the symbol table.  */
-
-static long
-ppcboot_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  return (PPCBOOT_SYMS + 1) * sizeof (asymbol *);
-}
-
-
-/* Create a symbol name based on the bfd's filename.  */
-
-static char *
-mangle_name (abfd, suffix)
-     bfd *abfd;
-     char *suffix;
-{
-  int size;
-  char *buf;
-  char *p;
-
-  size = (strlen (bfd_get_filename (abfd))
-	  + strlen (suffix)
-	  + sizeof "_ppcboot__");
-
-  buf = (char *) bfd_alloc (abfd, size);
-  if (buf == NULL)
-    return "";
-
-  sprintf (buf, "_ppcboot_%s_%s", bfd_get_filename (abfd), suffix);
-
-  /* Change any non-alphanumeric characters to underscores.  */
-  for (p = buf; *p; p++)
-    if (! isalnum ((unsigned char) *p))
-      *p = '_';
-
-  return buf;
-}
-
-
-/* Return the symbol table.  */
-
-static long
-ppcboot_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  asection *sec = ppcboot_get_tdata (abfd)->sec;
-  asymbol *syms;
-  unsigned int i;
-
-  syms = (asymbol *) bfd_alloc (abfd, PPCBOOT_SYMS * sizeof (asymbol));
-  if (syms == NULL)
-    return false;
-
-  /* Start symbol.  */
-  syms[0].the_bfd = abfd;
-  syms[0].name = mangle_name (abfd, "start");
-  syms[0].value = 0;
-  syms[0].flags = BSF_GLOBAL;
-  syms[0].section = sec;
-  syms[0].udata.p = NULL;
-
-  /* End symbol.  */
-  syms[1].the_bfd = abfd;
-  syms[1].name = mangle_name (abfd, "end");
-  syms[1].value = sec->_raw_size;
-  syms[1].flags = BSF_GLOBAL;
-  syms[1].section = sec;
-  syms[1].udata.p = NULL;
-
-  /* Size symbol.  */
-  syms[2].the_bfd = abfd;
-  syms[2].name = mangle_name (abfd, "size");
-  syms[2].value = sec->_raw_size;
-  syms[2].flags = BSF_GLOBAL;
-  syms[2].section = bfd_abs_section_ptr;
-  syms[2].udata.p = NULL;
-
-  for (i = 0; i < PPCBOOT_SYMS; i++)
-    *alocation++ = syms++;
-  *alocation = NULL;
-
-  return PPCBOOT_SYMS;
-}
-
-
-/* Make an empty symbol.  */
-
-static asymbol *
-ppcboot_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  return (asymbol *) bfd_alloc (abfd, sizeof (asymbol));
-}
-
-
-#define ppcboot_print_symbol _bfd_nosymbols_print_symbol
-
-/* Get information about a symbol.  */
-
-static void
-ppcboot_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-#define ppcboot_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define ppcboot_get_lineno _bfd_nosymbols_get_lineno
-#define ppcboot_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define ppcboot_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define ppcboot_read_minisymbols _bfd_generic_read_minisymbols
-#define ppcboot_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define ppcboot_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
-#define ppcboot_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
-#define ppcboot_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-/* Write section contents of a ppcboot file.  */
-
-static boolean
-ppcboot_set_section_contents (abfd, sec, data, offset, size)
-     bfd *abfd;
-     asection *sec;
-     PTR data;
-     file_ptr offset;
-     bfd_size_type size;
-{
-  if (! abfd->output_has_begun)
-    {
-      bfd_vma low;
-      asection *s;
-
-      /* The lowest section VMA sets the virtual address of the start
-         of the file.  We use the set the file position of all the
-         sections.  */
-      low = abfd->sections->vma;
-      for (s = abfd->sections->next; s != NULL; s = s->next)
-	if (s->vma < low)
-	  low = s->vma;
-
-      for (s = abfd->sections; s != NULL; s = s->next)
-	s->filepos = s->vma - low;
-
-      abfd->output_has_begun = true;
-    }
-
-  return _bfd_generic_set_section_contents (abfd, sec, data, offset, size);
-}
-
-
-static int
-ppcboot_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-{
-  return sizeof (ppcboot_hdr_t);
-}
-
-
-/* Print out the program headers.  */
-
-static boolean
-ppcboot_bfd_print_private_bfd_data (abfd, farg)
-     bfd *abfd;
-     PTR farg;
-{
-  FILE *f = (FILE *)farg;
-  ppcboot_data_t *tdata = ppcboot_get_tdata (abfd);
-  long entry_offset = bfd_getl_signed_32 ((PTR) tdata->header.entry_offset);
-  long length = bfd_getl_signed_32 ((PTR) tdata->header.length);
-  int i;
-
-  fprintf (f, _("\nppcboot header:\n"));
-  fprintf (f, _("Entry offset        = 0x%.8lx (%ld)\n"), entry_offset, entry_offset);
-  fprintf (f, _("Length              = 0x%.8lx (%ld)\n"), length, length);
-
-  if (tdata->header.flags)
-    fprintf (f, _("Flag field          = 0x%.2x\n"), tdata->header.flags);
-
-  if (tdata->header.os_id)
-    fprintf (f, "OS_ID               = 0x%.2x\n", tdata->header.os_id);
-
-  if (tdata->header.partition_name)
-    fprintf (f, _("Partition name      = \"%s\"\n"), tdata->header.partition_name);
-
-  for (i = 0; i < 4; i++)
-    {
-      long sector_begin  = bfd_getl_signed_32 ((PTR) tdata->header.partition[i].sector_begin);
-      long sector_length = bfd_getl_signed_32 ((PTR) tdata->header.partition[i].sector_length);
-
-      /* Skip all 0 entries */
-      if (!tdata->header.partition[i].partition_begin.ind
-	  && !tdata->header.partition[i].partition_begin.head
-	  && !tdata->header.partition[i].partition_begin.sector
-	  && !tdata->header.partition[i].partition_begin.cylinder
-	  && !tdata->header.partition[i].partition_end.ind
-	  && !tdata->header.partition[i].partition_end.head
-	  && !tdata->header.partition[i].partition_end.sector
-	  && !tdata->header.partition[i].partition_end.cylinder
-	  && !sector_begin && !sector_length)
-	continue;
-
-      fprintf (f, _("\nPartition[%d] start  = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"), i,
-	       tdata->header.partition[i].partition_begin.ind,
-	       tdata->header.partition[i].partition_begin.head,
-	       tdata->header.partition[i].partition_begin.sector,
-	       tdata->header.partition[i].partition_begin.cylinder);
-
-      fprintf (f, _("Partition[%d] end    = { 0x%.2x, 0x%.2x, 0x%.2x, 0x%.2x }\n"), i,
-	       tdata->header.partition[i].partition_end.ind,
-	       tdata->header.partition[i].partition_end.head,
-	       tdata->header.partition[i].partition_end.sector,
-	       tdata->header.partition[i].partition_end.cylinder);
-
-      fprintf (f, _("Partition[%d] sector = 0x%.8lx (%ld)\n"), i, sector_begin, sector_begin);
-      fprintf (f, _("Partition[%d] length = 0x%.8lx (%ld)\n"), i, sector_length, sector_length);
-    }
-
-  fprintf (f, "\n");
-  return true;
-}
-
-
-#define ppcboot_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define ppcboot_bfd_relax_section bfd_generic_relax_section
-#define ppcboot_bfd_gc_sections bfd_generic_gc_sections
-#define ppcboot_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define ppcboot_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define ppcboot_bfd_final_link _bfd_generic_final_link
-#define ppcboot_bfd_link_split_section _bfd_generic_link_split_section
-#define ppcboot_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define ppcboot_bfd_copy_private_bfd_data _bfd_generic_bfd_copy_private_bfd_data
-#define ppcboot_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
-#define ppcboot_bfd_copy_private_section_data _bfd_generic_bfd_copy_private_section_data
-#define ppcboot_bfd_copy_private_symbol_data _bfd_generic_bfd_copy_private_symbol_data
-#define ppcboot_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-#define ppcboot_bfd_print_private_bfd_dat ppcboot_bfd_print_private_bfd_data
-
-const bfd_target ppcboot_vec =
-{
-  "ppcboot",			/* name */
-  bfd_target_unknown_flavour,	/* flavour */
-  BFD_ENDIAN_BIG,		/* byteorder is big endian for code */
-  BFD_ENDIAN_LITTLE,		/* header_byteorder */
-  EXEC_P,			/* object_flags */
-  (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE | SEC_DATA
-   | SEC_ROM | SEC_HAS_CONTENTS), /* section_flags */
-  0,				/* symbol_leading_char */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,	/* hdrs */
-  {				/* bfd_check_format */
-    _bfd_dummy_target,
-    ppcboot_object_p,		/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {				/* bfd_set_format */
-    bfd_false,
-    ppcboot_mkobject,
-    bfd_false,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    bfd_true,
-    bfd_false,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (ppcboot),
-  BFD_JUMP_TABLE_COPY (ppcboot),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (ppcboot),
-  BFD_JUMP_TABLE_RELOCS (ppcboot),
-  BFD_JUMP_TABLE_WRITE (ppcboot),
-  BFD_JUMP_TABLE_LINK (ppcboot),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  NULL
-};
diff --git a/bfd/ptrace-core.c b/bfd/ptrace-core.c
deleted file mode 100644
index 2b4fdbbd01f..00000000000
--- a/bfd/ptrace-core.c
+++ /dev/null
@@ -1,230 +0,0 @@
-/* BFD backend for core files which use the ptrace_user structure
-   Copyright 1993, 94, 95, 96, 1998 Free Software Foundation, Inc.
-   The structure of this file is based on trad-core.c written by John Gilmore
-   of Cygnus Support.
-   Modified to work with the ptrace_user structure by Kevin A. Buettner.
-   (Longterm it may be better to merge this file with trad-core.c)
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifdef PTRACE_CORE
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-#include <sys/ptrace.h>
-
-
-struct trad_core_struct
-  {
-    asection *data_section;
-    asection *stack_section;
-    asection *reg_section;
-    struct ptrace_user u;
-  };
-
-#define core_upage(bfd) (&((bfd)->tdata.trad_core_data->u))
-#define core_datasec(bfd) ((bfd)->tdata.trad_core_data->data_section)
-#define core_stacksec(bfd) ((bfd)->tdata.trad_core_data->stack_section)
-#define core_regsec(bfd) ((bfd)->tdata.trad_core_data->reg_section)
-
-/* forward declarations */
-
-const bfd_target *ptrace_unix_core_file_p PARAMS ((bfd *abfd));
-char *		ptrace_unix_core_file_failing_command PARAMS ((bfd *abfd));
-int		ptrace_unix_core_file_failing_signal PARAMS ((bfd *abfd));
-boolean		ptrace_unix_core_file_matches_executable_p
-			 PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-static void	swap_abort PARAMS ((void));
-
-/* ARGSUSED */
-const bfd_target *
-ptrace_unix_core_file_p (abfd)
-     bfd *abfd;
-
-{
-  int val;
-  struct ptrace_user u;
-  struct trad_core_struct *rawptr;
-
-  val = bfd_read ((void *)&u, 1, sizeof u, abfd);
-  if (val != sizeof u || u.pt_magic != _BCS_PTRACE_MAGIC 
-      || u.pt_rev != _BCS_PTRACE_REV)
-    {
-      /* Too small to be a core file */
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  /* Allocate both the upage and the struct core_data at once, so
-     a single free() will free them both.  */
-  rawptr = (struct trad_core_struct *)
-		bfd_zalloc (abfd, sizeof (struct trad_core_struct));
-
-  if (rawptr == NULL)
-    return 0;
-  
-  abfd->tdata.trad_core_data = rawptr;
-
-  rawptr->u = u; /*Copy the uarea into the tdata part of the bfd */
-
-  /* Create the sections.  This is raunchy, but bfd_close wants to free
-     them separately.  */
-
-  core_stacksec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_stacksec (abfd) == NULL)
-    return NULL;
-  core_datasec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_datasec (abfd) == NULL)
-    return NULL;
-  core_regsec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_regsec (abfd) == NULL)
-    return NULL;
-
-  core_stacksec (abfd)->name = ".stack";
-  core_datasec (abfd)->name = ".data";
-  core_regsec (abfd)->name = ".reg";
-
-  /* FIXME:  Need to worry about shared memory, library data, and library
-     text.  I don't think that any of these things are supported on the
-     system on which I am developing this for though. */
-
-
-  core_stacksec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-  core_datasec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-  core_regsec (abfd)->flags = SEC_HAS_CONTENTS;
-
-  core_datasec (abfd)->_raw_size =  u.pt_dsize;
-  core_stacksec (abfd)->_raw_size = u.pt_ssize;
-  core_regsec (abfd)->_raw_size = sizeof(u);
-
-  core_datasec (abfd)->vma = u.pt_o_data_start;
-  core_stacksec (abfd)->vma = USRSTACK - u.pt_ssize;
-  core_regsec (abfd)->vma = 0 - sizeof(u);	/* see trad-core.c */
-
-  core_datasec (abfd)->filepos = (int) u.pt_dataptr;
-  core_stacksec (abfd)->filepos = (int) (u.pt_dataptr + u.pt_dsize);
-  core_regsec (abfd)->filepos = 0; /* Register segment is ptrace_user */
-
-  /* Align to word at least */
-  core_stacksec (abfd)->alignment_power = 2;
-  core_datasec (abfd)->alignment_power = 2;
-  core_regsec (abfd)->alignment_power = 2;
-
-  abfd->sections = core_stacksec (abfd);
-  core_stacksec (abfd)->next = core_datasec (abfd);
-  core_datasec (abfd)->next = core_regsec (abfd);
-  abfd->section_count = 3;
-
-  return abfd->xvec;
-}
-
-char *
-ptrace_unix_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  char *com = abfd->tdata.trad_core_data->u.pt_comm;
-  if (*com)
-    return com;
-  else
-    return 0;
-}
-
-/* ARGSUSED */
-int
-ptrace_unix_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return abfd->tdata.trad_core_data->u.pt_sigframe.sig_num;
-}
-
-/* ARGSUSED */
-boolean
-ptrace_unix_core_file_matches_executable_p  (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  /* FIXME: Use pt_timdat field of the ptrace_user structure to match 
-     the date of the executable */
-  return true;
-}
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target ptrace_core_vec =
-  {
-    "trad-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_UNKNOWN,		/* target byte order */
-    BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     ptrace_unix_core_file_p	/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (ptrace_unix),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
-
-#endif /* PTRACE_CORE */
diff --git a/bfd/reloc.c b/bfd/reloc.c
deleted file mode 100644
index 888581493b4..00000000000
--- a/bfd/reloc.c
+++ /dev/null
@@ -1,2842 +0,0 @@
-/* BFD support for handling relocation entries.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	Relocations
-
-	BFD maintains relocations in much the same way it maintains
-	symbols: they are left alone until required, then read in
-	en-mass and translated into an internal form.  A common
-	routine <<bfd_perform_relocation>> acts upon the
-	canonical form to do the fixup.
-
-	Relocations are maintained on a per section basis,
-	while symbols are maintained on a per BFD basis.
-
-	All that a back end has to do to fit the BFD interface is to create
-	a <<struct reloc_cache_entry>> for each relocation
-	in a particular section, and fill in the right bits of the structures.
-
-@menu
-@* typedef arelent::
-@* howto manager::
-@end menu
-
-*/
-
-/* DO compile in the reloc_code name table from libbfd.h.  */
-#define _BFD_MAKE_TABLE_bfd_reloc_code_real
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-/*
-DOCDD
-INODE
-	typedef arelent, howto manager, Relocations, Relocations
-
-SUBSECTION
-	typedef arelent
-
-	This is the structure of a relocation entry:
-
-CODE_FRAGMENT
-.
-.typedef enum bfd_reloc_status
-.{
-.       {* No errors detected *}
-.  bfd_reloc_ok,
-.
-.       {* The relocation was performed, but there was an overflow. *}
-.  bfd_reloc_overflow,
-.
-.       {* The address to relocate was not within the section supplied. *}
-.  bfd_reloc_outofrange,
-.
-.       {* Used by special functions *}
-.  bfd_reloc_continue,
-.
-.       {* Unsupported relocation size requested. *}
-.  bfd_reloc_notsupported,
-.
-.       {* Unused *}
-.  bfd_reloc_other,
-.
-.       {* The symbol to relocate against was undefined. *}
-.  bfd_reloc_undefined,
-.
-.       {* The relocation was performed, but may not be ok - presently
-.          generated only when linking i960 coff files with i960 b.out
-.          symbols.  If this type is returned, the error_message argument
-.          to bfd_perform_relocation will be set.  *}
-.  bfd_reloc_dangerous
-. }
-. bfd_reloc_status_type;
-.
-.
-.typedef struct reloc_cache_entry
-.{
-.       {* A pointer into the canonical table of pointers  *}
-.  struct symbol_cache_entry **sym_ptr_ptr;
-.
-.       {* offset in section *}
-.  bfd_size_type address;
-.
-.       {* addend for relocation value *}
-.  bfd_vma addend;
-.
-.       {* Pointer to how to perform the required relocation *}
-.  reloc_howto_type *howto;
-.
-.} arelent;
-
-*/
-
-/*
-DESCRIPTION
-
-        Here is a description of each of the fields within an <<arelent>>:
-
-        o <<sym_ptr_ptr>>
-
-        The symbol table pointer points to a pointer to the symbol
-        associated with the relocation request.  It is
-        the pointer into the table returned by the back end's
-        <<get_symtab>> action. @xref{Symbols}. The symbol is referenced
-        through a pointer to a pointer so that tools like the linker
-        can fix up all the symbols of the same name by modifying only
-        one pointer. The relocation routine looks in the symbol and
-        uses the base of the section the symbol is attached to and the
-        value of the symbol as the initial relocation offset. If the
-        symbol pointer is zero, then the section provided is looked up.
-
-        o <<address>>
-
-        The <<address>> field gives the offset in bytes from the base of
-        the section data which owns the relocation record to the first
-        byte of relocatable information. The actual data relocated
-        will be relative to this point; for example, a relocation
-        type which modifies the bottom two bytes of a four byte word
-        would not touch the first byte pointed to in a big endian
-        world.
-
-	o <<addend>>
-
-	The <<addend>> is a value provided by the back end to be added (!)
-	to the relocation offset. Its interpretation is dependent upon
-	the howto. For example, on the 68k the code:
-
-
-|        char foo[];
-|        main()
-|                {
-|                return foo[0x12345678];
-|                }
-
-        Could be compiled into:
-
-|        linkw fp,#-4
-|        moveb @@#12345678,d0
-|        extbl d0
-|        unlk fp
-|        rts
-
-
-        This could create a reloc pointing to <<foo>>, but leave the
-        offset in the data, something like:
-
-
-|RELOCATION RECORDS FOR [.text]:
-|offset   type      value
-|00000006 32        _foo
-|
-|00000000 4e56 fffc          ; linkw fp,#-4
-|00000004 1039 1234 5678     ; moveb @@#12345678,d0
-|0000000a 49c0               ; extbl d0
-|0000000c 4e5e               ; unlk fp
-|0000000e 4e75               ; rts
-
-
-        Using coff and an 88k, some instructions don't have enough
-        space in them to represent the full address range, and
-        pointers have to be loaded in two parts. So you'd get something like:
-
-
-|        or.u     r13,r0,hi16(_foo+0x12345678)
-|        ld.b     r2,r13,lo16(_foo+0x12345678)
-|        jmp      r1
-
-
-        This should create two relocs, both pointing to <<_foo>>, and with
-        0x12340000 in their addend field. The data would consist of:
-
-
-|RELOCATION RECORDS FOR [.text]:
-|offset   type      value
-|00000002 HVRT16    _foo+0x12340000
-|00000006 LVRT16    _foo+0x12340000
-|
-|00000000 5da05678           ; or.u r13,r0,0x5678
-|00000004 1c4d5678           ; ld.b r2,r13,0x5678
-|00000008 f400c001           ; jmp r1
-
-
-        The relocation routine digs out the value from the data, adds
-        it to the addend to get the original offset, and then adds the
-        value of <<_foo>>. Note that all 32 bits have to be kept around
-        somewhere, to cope with carry from bit 15 to bit 16.
-
-        One further example is the sparc and the a.out format. The
-        sparc has a similar problem to the 88k, in that some
-        instructions don't have room for an entire offset, but on the
-        sparc the parts are created in odd sized lumps. The designers of
-        the a.out format chose to not use the data within the section
-        for storing part of the offset; all the offset is kept within
-        the reloc. Anything in the data should be ignored.
-
-|        save %sp,-112,%sp
-|        sethi %hi(_foo+0x12345678),%g2
-|        ldsb [%g2+%lo(_foo+0x12345678)],%i0
-|        ret
-|        restore
-
-        Both relocs contain a pointer to <<foo>>, and the offsets
-        contain junk.
-
-
-|RELOCATION RECORDS FOR [.text]:
-|offset   type      value
-|00000004 HI22      _foo+0x12345678
-|00000008 LO10      _foo+0x12345678
-|
-|00000000 9de3bf90     ; save %sp,-112,%sp
-|00000004 05000000     ; sethi %hi(_foo+0),%g2
-|00000008 f048a000     ; ldsb [%g2+%lo(_foo+0)],%i0
-|0000000c 81c7e008     ; ret
-|00000010 81e80000     ; restore
-
-
-        o <<howto>>
-
-        The <<howto>> field can be imagined as a
-        relocation instruction. It is a pointer to a structure which
-        contains information on what to do with all of the other
-        information in the reloc record and data section. A back end
-        would normally have a relocation instruction set and turn
-        relocations into pointers to the correct structure on input -
-        but it would be possible to create each howto field on demand.
-
-*/
-
-/*
-SUBSUBSECTION
-	<<enum complain_overflow>>
-
-	Indicates what sort of overflow checking should be done when
-	performing a relocation.
-
-CODE_FRAGMENT
-.
-.enum complain_overflow
-.{
-.	{* Do not complain on overflow. *}
-.  complain_overflow_dont,
-.
-.	{* Complain if the bitfield overflows, whether it is considered
-.	   as signed or unsigned. *}
-.  complain_overflow_bitfield,
-.
-.	{* Complain if the value overflows when considered as signed
-.	   number. *}
-.  complain_overflow_signed,
-.
-.	{* Complain if the value overflows when considered as an
-.	   unsigned number. *}
-.  complain_overflow_unsigned
-.};
-
-*/
-
-/*
-SUBSUBSECTION
-        <<reloc_howto_type>>
-
-        The <<reloc_howto_type>> is a structure which contains all the
-        information that libbfd needs to know to tie up a back end's data.
-
-CODE_FRAGMENT
-.struct symbol_cache_entry;		{* Forward declaration *}
-.
-.struct reloc_howto_struct
-.{
-.       {*  The type field has mainly a documentary use - the back end can
-.           do what it wants with it, though normally the back end's
-.           external idea of what a reloc number is stored
-.           in this field. For example, a PC relative word relocation
-.           in a coff environment has the type 023 - because that's
-.           what the outside world calls a R_PCRWORD reloc. *}
-.  unsigned int type;
-.
-.       {*  The value the final relocation is shifted right by. This drops
-.           unwanted data from the relocation.  *}
-.  unsigned int rightshift;
-.
-.	{*  The size of the item to be relocated.  This is *not* a
-.	    power-of-two measure.  To get the number of bytes operated
-.	    on by a type of relocation, use bfd_get_reloc_size.  *}
-.  int size;
-.
-.       {*  The number of bits in the item to be relocated.  This is used
-.	    when doing overflow checking.  *}
-.  unsigned int bitsize;
-.
-.       {*  Notes that the relocation is relative to the location in the
-.           data section of the addend. The relocation function will
-.           subtract from the relocation value the address of the location
-.           being relocated. *}
-.  boolean pc_relative;
-.
-.	{*  The bit position of the reloc value in the destination.
-.	    The relocated value is left shifted by this amount. *}
-.  unsigned int bitpos;
-.
-.	{* What type of overflow error should be checked for when
-.	   relocating. *}
-.  enum complain_overflow complain_on_overflow;
-.
-.       {* If this field is non null, then the supplied function is
-.          called rather than the normal function. This allows really
-.          strange relocation methods to be accomodated (e.g., i960 callj
-.          instructions). *}
-.  bfd_reloc_status_type (*special_function)
-.				    PARAMS ((bfd *abfd,
-.					     arelent *reloc_entry,
-.                                            struct symbol_cache_entry *symbol,
-.                                            PTR data,
-.                                            asection *input_section,
-.                                            bfd *output_bfd,
-.                                            char **error_message));
-.
-.       {* The textual name of the relocation type. *}
-.  char *name;
-.
-.       {* When performing a partial link, some formats must modify the
-.          relocations rather than the data - this flag signals this.*}
-.  boolean partial_inplace;
-.
-.       {* The src_mask selects which parts of the read in data
-.          are to be used in the relocation sum.  E.g., if this was an 8 bit
-.          bit of data which we read and relocated, this would be
-.          0x000000ff. When we have relocs which have an addend, such as
-.          sun4 extended relocs, the value in the offset part of a
-.          relocating field is garbage so we never use it. In this case
-.          the mask would be 0x00000000. *}
-.  bfd_vma src_mask;
-.
-.       {* The dst_mask selects which parts of the instruction are replaced
-.          into the instruction. In most cases src_mask == dst_mask,
-.          except in the above special case, where dst_mask would be
-.          0x000000ff, and src_mask would be 0x00000000.   *}
-.  bfd_vma dst_mask;
-.
-.       {* When some formats create PC relative instructions, they leave
-.          the value of the pc of the place being relocated in the offset
-.          slot of the instruction, so that a PC relative relocation can
-.          be made just by adding in an ordinary offset (e.g., sun3 a.out).
-.          Some formats leave the displacement part of an instruction
-.          empty (e.g., m88k bcs); this flag signals the fact.*}
-.  boolean pcrel_offset;
-.
-.};
-
-*/
-
-/*
-FUNCTION
-	The HOWTO Macro
-
-DESCRIPTION
-	The HOWTO define is horrible and will go away.
-
-
-.#define HOWTO(C, R,S,B, P, BI, O, SF, NAME, INPLACE, MASKSRC, MASKDST, PC) \
-.  {(unsigned)C,R,S,B, P, BI, O,SF,NAME,INPLACE,MASKSRC,MASKDST,PC}
-
-DESCRIPTION
-	And will be replaced with the totally magic way. But for the
-	moment, we are compatible, so do it this way.
-
-
-.#define NEWHOWTO( FUNCTION, NAME,SIZE,REL,IN) HOWTO(0,0,SIZE,0,REL,0,complain_overflow_dont,FUNCTION, NAME,false,0,0,IN)
-.
-DESCRIPTION
-	Helper routine to turn a symbol into a relocation value.
-
-.#define HOWTO_PREPARE(relocation, symbol)      \
-.  {                                            \
-.  if (symbol != (asymbol *)NULL) {             \
-.    if (bfd_is_com_section (symbol->section)) { \
-.      relocation = 0;                          \
-.    }                                          \
-.    else {                                     \
-.      relocation = symbol->value;              \
-.    }                                          \
-.  }                                            \
-.}
-
-*/
-
-/*
-FUNCTION
-	bfd_get_reloc_size
-
-SYNOPSIS
-	unsigned int bfd_get_reloc_size (reloc_howto_type *);
-
-DESCRIPTION
-	For a reloc_howto_type that operates on a fixed number of bytes,
-	this returns the number of bytes operated on.
- */
-
-unsigned int
-bfd_get_reloc_size (howto)
-     reloc_howto_type *howto;
-{
-  switch (howto->size)
-    {
-    case 0: return 1;
-    case 1: return 2;
-    case 2: return 4;
-    case 3: return 0;
-    case 4: return 8;
-    case 8: return 16;
-    case -2: return 4;
-    default: abort ();
-    }
-}
-
-/*
-TYPEDEF
-	arelent_chain
-
-DESCRIPTION
-
-	How relocs are tied together in an <<asection>>:
-
-.typedef struct relent_chain {
-.  arelent relent;
-.  struct   relent_chain *next;
-.} arelent_chain;
-
-*/
-
-/* N_ONES produces N one bits, without overflowing machine arithmetic.  */
-#define N_ONES(n) (((((bfd_vma) 1 << ((n) - 1)) - 1) << 1) | 1)
-
-/*
-FUNCTION
-	bfd_check_overflow
-
-SYNOPSIS
-	bfd_reloc_status_type
-		bfd_check_overflow
-			(enum complain_overflow how,
-			 unsigned int bitsize,
-			 unsigned int rightshift,
-			 unsigned int addrsize,
-			 bfd_vma relocation);
-
-DESCRIPTION
-	Perform overflow checking on @var{relocation} which has
-	@var{bitsize} significant bits and will be shifted right by
-	@var{rightshift} bits, on a machine with addresses containing
-	@var{addrsize} significant bits.  The result is either of
-	@code{bfd_reloc_ok} or @code{bfd_reloc_overflow}.
-
-*/
-
-bfd_reloc_status_type
-bfd_check_overflow (how, bitsize, rightshift, addrsize, relocation)
-     enum complain_overflow how;
-     unsigned int bitsize;
-     unsigned int rightshift;
-     unsigned int addrsize;
-     bfd_vma relocation;
-{
-  bfd_vma fieldmask, addrmask, signmask, ss, a;
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-
-  a = relocation;
-
-  /* Note: BITSIZE should always be <= ADDRSIZE, but in case it's not,
-     we'll be permissive: extra bits in the field mask will
-     automatically extend the address mask for purposes of the
-     overflow check.  */
-  fieldmask = N_ONES (bitsize);
-  addrmask = N_ONES (addrsize) | fieldmask;
-
-  switch (how)
-    {
-    case complain_overflow_dont:
-      break;
-
-    case complain_overflow_signed:
-      /* If any sign bits are set, all sign bits must be set.  That
-         is, A must be a valid negative address after shifting.  */
-      a = (a & addrmask) >> rightshift;
-      signmask = ~ (fieldmask >> 1);
-      ss = a & signmask;
-      if (ss != 0 && ss != ((addrmask >> rightshift) & signmask))
-	flag = bfd_reloc_overflow;
-      break;
-
-    case complain_overflow_unsigned:
-      /* We have an overflow if the address does not fit in the field.  */
-      a = (a & addrmask) >> rightshift;
-      if ((a & ~ fieldmask) != 0)
-	flag = bfd_reloc_overflow;
-      break;
-
-    case complain_overflow_bitfield:
-      /* Bitfields are sometimes signed, sometimes unsigned.  We
-         overflow if the value has some, but not all, bits set outside
-         the field, or if it has any bits set outside the field but
-         the sign bit is not set.  */
-      a >>= rightshift;
-      if ((a & ~ fieldmask) != 0)
-	{
-	  signmask = (fieldmask >> 1) + 1;
-	  ss = (signmask << rightshift) - 1;
-	  if ((ss | relocation) != ~ (bfd_vma) 0)
-	    flag = bfd_reloc_overflow;
-	}
-      break;
-
-    default:
-      abort ();
-    }
-
-  return flag;
-}
-
-/*
-FUNCTION
-	bfd_perform_relocation
-
-SYNOPSIS
-	bfd_reloc_status_type
-                bfd_perform_relocation
-                        (bfd *abfd,
-                         arelent *reloc_entry,
-                         PTR data,
-                         asection *input_section,
-                         bfd *output_bfd,
-			 char **error_message);
-
-DESCRIPTION
-	If @var{output_bfd} is supplied to this function, the
-	generated image will be relocatable; the relocations are
-	copied to the output file after they have been changed to
-	reflect the new state of the world. There are two ways of
-	reflecting the results of partial linkage in an output file:
-	by modifying the output data in place, and by modifying the
-	relocation record.  Some native formats (e.g., basic a.out and
-	basic coff) have no way of specifying an addend in the
-	relocation type, so the addend has to go in the output data.
-	This is no big deal since in these formats the output data
-	slot will always be big enough for the addend. Complex reloc
-	types with addends were invented to solve just this problem.
-	The @var{error_message} argument is set to an error message if
-	this return @code{bfd_reloc_dangerous}.
-
-*/
-
-
-bfd_reloc_status_type
-bfd_perform_relocation (abfd, reloc_entry, data, input_section, output_bfd,
-			error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  bfd_size_type addr = reloc_entry->address;
-  bfd_vma output_base = 0;
-  reloc_howto_type *howto = reloc_entry->howto;
-  asection *reloc_target_output_section;
-  asymbol *symbol;
-
-  symbol = *(reloc_entry->sym_ptr_ptr);
-  if (bfd_is_abs_section (symbol->section)
-      && output_bfd != (bfd *) NULL)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* If we are not producing relocateable output, return an error if
-     the symbol is not defined.  An undefined weak symbol is
-     considered to have a value of zero (SVR4 ABI, p. 4-27).  */
-  if (bfd_is_und_section (symbol->section)
-      && (symbol->flags & BSF_WEAK) == 0
-      && output_bfd == (bfd *) NULL)
-    flag = bfd_reloc_undefined;
-
-  /* If there is a function supplied to handle this relocation type,
-     call it.  It'll return `bfd_reloc_continue' if further processing
-     can be done.  */
-  if (howto->special_function)
-    {
-      bfd_reloc_status_type cont;
-      cont = howto->special_function (abfd, reloc_entry, symbol, data,
-				      input_section, output_bfd,
-				      error_message);
-      if (cont != bfd_reloc_continue)
-	return cont;
-    }
-
-  /* Is the address of the relocation really within the section?  */
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Work out which section the relocation is targetted at and the
-     initial relocation command value.  */
-
-  /* Get symbol value.  (Common symbols are special.)  */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-
-  reloc_target_output_section = symbol->section->output_section;
-
-  /* Convert input-section-relative symbol value to absolute.  */
-  if (output_bfd && howto->partial_inplace == false)
-    output_base = 0;
-  else
-    output_base = reloc_target_output_section->vma;
-
-  relocation += output_base + symbol->section->output_offset;
-
-  /* Add in supplied addend.  */
-  relocation += reloc_entry->addend;
-
-  /* Here the variable relocation holds the final address of the
-     symbol we are relocating against, plus any addend.  */
-
-  if (howto->pc_relative == true)
-    {
-      /* This is a PC relative relocation.  We want to set RELOCATION
-	 to the distance between the address of the symbol and the
-	 location.  RELOCATION is already the address of the symbol.
-
-	 We start by subtracting the address of the section containing
-	 the location.
-
-	 If pcrel_offset is set, we must further subtract the position
-	 of the location within the section.  Some targets arrange for
-	 the addend to be the negative of the position of the location
-	 within the section; for example, i386-aout does this.  For
-	 i386-aout, pcrel_offset is false.  Some other targets do not
-	 include the position of the location; for example, m88kbcs,
-	 or ELF.  For those targets, pcrel_offset is true.
-
-	 If we are producing relocateable output, then we must ensure
-	 that this reloc will be correctly computed when the final
-	 relocation is done.  If pcrel_offset is false we want to wind
-	 up with the negative of the location within the section,
-	 which means we must adjust the existing addend by the change
-	 in the location within the section.  If pcrel_offset is true
-	 we do not want to adjust the existing addend at all.
-
-	 FIXME: This seems logical to me, but for the case of
-	 producing relocateable output it is not what the code
-	 actually does.  I don't want to change it, because it seems
-	 far too likely that something will break.  */
-
-      relocation -=
-	input_section->output_section->vma + input_section->output_offset;
-
-      if (howto->pcrel_offset == true)
-	relocation -= reloc_entry->address;
-    }
-
-  if (output_bfd != (bfd *) NULL)
-    {
-      if (howto->partial_inplace == false)
-	{
-	  /* This is a partial relocation, and we want to apply the relocation
-	     to the reloc entry rather than the raw data. Modify the reloc
-	     inplace to reflect what we now know.  */
-	  reloc_entry->addend = relocation;
-	  reloc_entry->address += input_section->output_offset;
-	  return flag;
-	}
-      else
-	{
-	  /* This is a partial relocation, but inplace, so modify the
-	     reloc record a bit.
-
-	     If we've relocated with a symbol with a section, change
-	     into a ref to the section belonging to the symbol.  */
-
-	  reloc_entry->address += input_section->output_offset;
-
-	  /* WTF?? */
-	  if (abfd->xvec->flavour == bfd_target_coff_flavour
-	      && strcmp (abfd->xvec->name, "aixcoff-rs6000") != 0
-	      && strcmp (abfd->xvec->name, "xcoff-powermac") != 0
-	      && strcmp (abfd->xvec->name, "coff-Intel-little") != 0
-	      && strcmp (abfd->xvec->name, "coff-Intel-big") != 0)
-	    {
-#if 1
-	      /* For m68k-coff, the addend was being subtracted twice during
-		 relocation with -r.  Removing the line below this comment
-		 fixes that problem; see PR 2953.
-
-However, Ian wrote the following, regarding removing the line below,
-which explains why it is still enabled:  --djm
-
-If you put a patch like that into BFD you need to check all the COFF
-linkers.  I am fairly certain that patch will break coff-i386 (e.g.,
-SCO); see coff_i386_reloc in coff-i386.c where I worked around the
-problem in a different way.  There may very well be a reason that the
-code works as it does.
-
-Hmmm.  The first obvious point is that bfd_perform_relocation should
-not have any tests that depend upon the flavour.  It's seem like
-entirely the wrong place for such a thing.  The second obvious point
-is that the current code ignores the reloc addend when producing
-relocateable output for COFF.  That's peculiar.  In fact, I really
-have no idea what the point of the line you want to remove is.
-
-A typical COFF reloc subtracts the old value of the symbol and adds in
-the new value to the location in the object file (if it's a pc
-relative reloc it adds the difference between the symbol value and the
-location).  When relocating we need to preserve that property.
-
-BFD handles this by setting the addend to the negative of the old
-value of the symbol.  Unfortunately it handles common symbols in a
-non-standard way (it doesn't subtract the old value) but that's a
-different story (we can't change it without losing backward
-compatibility with old object files) (coff-i386 does subtract the old
-value, to be compatible with existing coff-i386 targets, like SCO).
-
-So everything works fine when not producing relocateable output.  When
-we are producing relocateable output, logically we should do exactly
-what we do when not producing relocateable output.  Therefore, your
-patch is correct.  In fact, it should probably always just set
-reloc_entry->addend to 0 for all cases, since it is, in fact, going to
-add the value into the object file.  This won't hurt the COFF code,
-which doesn't use the addend; I'm not sure what it will do to other
-formats (the thing to check for would be whether any formats both use
-the addend and set partial_inplace).
-
-When I wanted to make coff-i386 produce relocateable output, I ran
-into the problem that you are running into: I wanted to remove that
-line.  Rather than risk it, I made the coff-i386 relocs use a special
-function; it's coff_i386_reloc in coff-i386.c.  The function
-specifically adds the addend field into the object file, knowing that
-bfd_perform_relocation is not going to.  If you remove that line, then
-coff-i386.c will wind up adding the addend field in twice.  It's
-trivial to fix; it just needs to be done.
-
-The problem with removing the line is just that it may break some
-working code.  With BFD it's hard to be sure of anything.  The right
-way to deal with this is simply to build and test at least all the
-supported COFF targets.  It should be straightforward if time and disk
-space consuming.  For each target:
-    1) build the linker
-    2) generate some executable, and link it using -r (I would
-       probably use paranoia.o and link against newlib/libc.a, which
-       for all the supported targets would be available in
-       /usr/cygnus/progressive/H-host/target/lib/libc.a).
-    3) make the change to reloc.c
-    4) rebuild the linker
-    5) repeat step 2
-    6) if the resulting object files are the same, you have at least
-       made it no worse
-    7) if they are different you have to figure out which version is
-       right
-*/
-	      relocation -= reloc_entry->addend;
-#endif
-	      reloc_entry->addend = 0;
-	    }
-	  else
-	    {
-	      reloc_entry->addend = relocation;
-	    }
-	}
-    }
-  else
-    {
-      reloc_entry->addend = 0;
-    }
-
-  /* FIXME: This overflow checking is incomplete, because the value
-     might have overflowed before we get here.  For a correct check we
-     need to compute the value in a size larger than bitsize, but we
-     can't reasonably do that for a reloc the same size as a host
-     machine word.
-     FIXME: We should also do overflow checking on the result after
-     adding in the value contained in the object file.  */
-  if (howto->complain_on_overflow != complain_overflow_dont
-      && flag == bfd_reloc_ok)
-    flag = bfd_check_overflow (howto->complain_on_overflow,
-			       howto->bitsize,
-			       howto->rightshift,
-			       bfd_arch_bits_per_address (abfd),
-			       relocation);
-
-  /*
-    Either we are relocating all the way, or we don't want to apply
-    the relocation to the reloc entry (probably because there isn't
-    any room in the output format to describe addends to relocs)
-    */
-
-  /* The cast to bfd_vma avoids a bug in the Alpha OSF/1 C compiler
-     (OSF version 1.3, compiler version 3.11).  It miscompiles the
-     following program:
-
-     struct str
-     {
-       unsigned int i0;
-     } s = { 0 };
-
-     int
-     main ()
-     {
-       unsigned long x;
-
-       x = 0x100000000;
-       x <<= (unsigned long) s.i0;
-       if (x == 0)
-	 printf ("failed\n");
-       else
-	 printf ("succeeded (%lx)\n", x);
-     }
-     */
-
-  relocation >>= (bfd_vma) howto->rightshift;
-
-  /* Shift everything up to where it's going to be used */
-
-  relocation <<= (bfd_vma) howto->bitpos;
-
-  /* Wait for the day when all have the mask in them */
-
-  /* What we do:
-     i instruction to be left alone
-     o offset within instruction
-     r relocation offset to apply
-     S src mask
-     D dst mask
-     N ~dst mask
-     A part 1
-     B part 2
-     R result
-
-     Do this:
-     i i i i i o o o o o        from bfd_get<size>
-     and           S S S S S    to get the size offset we want
-     +   r r r r r r r r r r  to get the final value to place
-     and           D D D D D  to chop to right size
-     -----------------------
-     A A A A A
-     And this:
-     ...   i i i i i o o o o o  from bfd_get<size>
-     and   N N N N N            get instruction
-     -----------------------
-     ...   B B B B B
-
-     And then:
-     B B B B B
-     or              A A A A A
-     -----------------------
-     R R R R R R R R R R        put into bfd_put<size>
-     */
-
-#define DOIT(x) \
-  x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) +  relocation) & howto->dst_mask))
-
-  switch (howto->size)
-    {
-    case 0:
-      {
-	char x = bfd_get_8 (abfd, (char *) data + addr);
-	DOIT (x);
-	bfd_put_8 (abfd, x, (unsigned char *) data + addr);
-      }
-      break;
-
-    case 1:
-      {
-	short x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
-	DOIT (x);
-	bfd_put_16 (abfd, x, (unsigned char *) data + addr);
-      }
-      break;
-    case 2:
-      {
-	long x = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-	DOIT (x);
-	bfd_put_32 (abfd, x, (bfd_byte *) data + addr);
-      }
-      break;
-    case -2:
-      {
-	long x = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-	relocation = -relocation;
-	DOIT (x);
-	bfd_put_32 (abfd, x, (bfd_byte *) data + addr);
-      }
-      break;
-
-    case -1:
-      {
-	long x = bfd_get_16 (abfd, (bfd_byte *) data + addr);
-	relocation = -relocation;
-	DOIT (x);
-	bfd_put_16 (abfd, x, (bfd_byte *) data + addr);
-      }
-      break;
-
-    case 3:
-      /* Do nothing */
-      break;
-
-    case 4:
-#ifdef BFD64
-      {
-	bfd_vma x = bfd_get_64 (abfd, (bfd_byte *) data + addr);
-	DOIT (x);
-	bfd_put_64 (abfd, x, (bfd_byte *) data + addr);
-      }
-#else
-      abort ();
-#endif
-      break;
-    default:
-      return bfd_reloc_other;
-    }
-
-  return flag;
-}
-
-/*
-FUNCTION
-	bfd_install_relocation
-
-SYNOPSIS
-	bfd_reloc_status_type
-                bfd_install_relocation
-                        (bfd *abfd,
-                         arelent *reloc_entry,
-                         PTR data, bfd_vma data_start,
-                         asection *input_section,
-			 char **error_message);
-
-DESCRIPTION
-	This looks remarkably like <<bfd_perform_relocation>>, except it
-	does not expect that the section contents have been filled in.
-	I.e., it's suitable for use when creating, rather than applying
-	a relocation.
-
-	For now, this function should be considered reserved for the
-	assembler.
-
-*/
-
-
-bfd_reloc_status_type
-bfd_install_relocation (abfd, reloc_entry, data_start, data_start_offset,
-			input_section, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     PTR data_start;
-     bfd_vma data_start_offset;
-     asection *input_section;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  bfd_size_type addr = reloc_entry->address;
-  bfd_vma output_base = 0;
-  reloc_howto_type *howto = reloc_entry->howto;
-  asection *reloc_target_output_section;
-  asymbol *symbol;
-  bfd_byte *data;
-
-  symbol = *(reloc_entry->sym_ptr_ptr);
-  if (bfd_is_abs_section (symbol->section))
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-
-  /* If there is a function supplied to handle this relocation type,
-     call it.  It'll return `bfd_reloc_continue' if further processing
-     can be done.  */
-  if (howto->special_function)
-    {
-      bfd_reloc_status_type cont;
-  
-      /* XXX - The special_function calls haven't been fixed up to deal
-	 with creating new relocations and section contents.  */
-      cont = howto->special_function (abfd, reloc_entry, symbol,
-				      /* XXX - Non-portable! */
-				      ((bfd_byte *) data_start
-				       - data_start_offset),
-				      input_section, abfd, error_message);
-      if (cont != bfd_reloc_continue)
-	return cont;
-    }
-
-  /* Is the address of the relocation really within the section?  */
-  if (reloc_entry->address > input_section->_cooked_size)
-    return bfd_reloc_outofrange;
-
-  /* Work out which section the relocation is targetted at and the
-     initial relocation command value.  */
-
-  /* Get symbol value.  (Common symbols are special.)  */
-  if (bfd_is_com_section (symbol->section))
-    relocation = 0;
-  else
-    relocation = symbol->value;
-
-  reloc_target_output_section = symbol->section->output_section;
-
-  /* Convert input-section-relative symbol value to absolute.  */
-  if (howto->partial_inplace == false)
-    output_base = 0;
-  else
-    output_base = reloc_target_output_section->vma;
-
-  relocation += output_base + symbol->section->output_offset;
-
-  /* Add in supplied addend.  */
-  relocation += reloc_entry->addend;
-
-  /* Here the variable relocation holds the final address of the
-     symbol we are relocating against, plus any addend.  */
-
-  if (howto->pc_relative == true)
-    {
-      /* This is a PC relative relocation.  We want to set RELOCATION
-	 to the distance between the address of the symbol and the
-	 location.  RELOCATION is already the address of the symbol.
-
-	 We start by subtracting the address of the section containing
-	 the location.
-
-	 If pcrel_offset is set, we must further subtract the position
-	 of the location within the section.  Some targets arrange for
-	 the addend to be the negative of the position of the location
-	 within the section; for example, i386-aout does this.  For
-	 i386-aout, pcrel_offset is false.  Some other targets do not
-	 include the position of the location; for example, m88kbcs,
-	 or ELF.  For those targets, pcrel_offset is true.
-
-	 If we are producing relocateable output, then we must ensure
-	 that this reloc will be correctly computed when the final
-	 relocation is done.  If pcrel_offset is false we want to wind
-	 up with the negative of the location within the section,
-	 which means we must adjust the existing addend by the change
-	 in the location within the section.  If pcrel_offset is true
-	 we do not want to adjust the existing addend at all.
-
-	 FIXME: This seems logical to me, but for the case of
-	 producing relocateable output it is not what the code
-	 actually does.  I don't want to change it, because it seems
-	 far too likely that something will break.  */
-
-      relocation -=
-	input_section->output_section->vma + input_section->output_offset;
-
-      if (howto->pcrel_offset == true && howto->partial_inplace == true)
-	relocation -= reloc_entry->address;
-    }
-
-  if (howto->partial_inplace == false)
-    {
-      /* This is a partial relocation, and we want to apply the relocation
-	 to the reloc entry rather than the raw data. Modify the reloc
-	 inplace to reflect what we now know.  */
-      reloc_entry->addend = relocation;
-      reloc_entry->address += input_section->output_offset;
-      return flag;
-    }
-  else
-    {
-      /* This is a partial relocation, but inplace, so modify the
-	 reloc record a bit.
-
-	 If we've relocated with a symbol with a section, change
-	 into a ref to the section belonging to the symbol.  */
-
-      reloc_entry->address += input_section->output_offset;
-
-      /* WTF?? */
-      if (abfd->xvec->flavour == bfd_target_coff_flavour
-	  && strcmp (abfd->xvec->name, "aixcoff-rs6000") != 0
-	  && strcmp (abfd->xvec->name, "xcoff-powermac") != 0
-	  && strcmp (abfd->xvec->name, "coff-Intel-little") != 0
-	  && strcmp (abfd->xvec->name, "coff-Intel-big") != 0)
-	{
-#if 1
-/* For m68k-coff, the addend was being subtracted twice during
-   relocation with -r.  Removing the line below this comment
-   fixes that problem; see PR 2953.
-
-However, Ian wrote the following, regarding removing the line below,
-which explains why it is still enabled:  --djm
-
-If you put a patch like that into BFD you need to check all the COFF
-linkers.  I am fairly certain that patch will break coff-i386 (e.g.,
-SCO); see coff_i386_reloc in coff-i386.c where I worked around the
-problem in a different way.  There may very well be a reason that the
-code works as it does.
-
-Hmmm.  The first obvious point is that bfd_install_relocation should
-not have any tests that depend upon the flavour.  It's seem like
-entirely the wrong place for such a thing.  The second obvious point
-is that the current code ignores the reloc addend when producing
-relocateable output for COFF.  That's peculiar.  In fact, I really
-have no idea what the point of the line you want to remove is.
-
-A typical COFF reloc subtracts the old value of the symbol and adds in
-the new value to the location in the object file (if it's a pc
-relative reloc it adds the difference between the symbol value and the
-location).  When relocating we need to preserve that property.
-
-BFD handles this by setting the addend to the negative of the old
-value of the symbol.  Unfortunately it handles common symbols in a
-non-standard way (it doesn't subtract the old value) but that's a
-different story (we can't change it without losing backward
-compatibility with old object files) (coff-i386 does subtract the old
-value, to be compatible with existing coff-i386 targets, like SCO).
-
-So everything works fine when not producing relocateable output.  When
-we are producing relocateable output, logically we should do exactly
-what we do when not producing relocateable output.  Therefore, your
-patch is correct.  In fact, it should probably always just set
-reloc_entry->addend to 0 for all cases, since it is, in fact, going to
-add the value into the object file.  This won't hurt the COFF code,
-which doesn't use the addend; I'm not sure what it will do to other
-formats (the thing to check for would be whether any formats both use
-the addend and set partial_inplace).
-
-When I wanted to make coff-i386 produce relocateable output, I ran
-into the problem that you are running into: I wanted to remove that
-line.  Rather than risk it, I made the coff-i386 relocs use a special
-function; it's coff_i386_reloc in coff-i386.c.  The function
-specifically adds the addend field into the object file, knowing that
-bfd_install_relocation is not going to.  If you remove that line, then
-coff-i386.c will wind up adding the addend field in twice.  It's
-trivial to fix; it just needs to be done.
-
-The problem with removing the line is just that it may break some
-working code.  With BFD it's hard to be sure of anything.  The right
-way to deal with this is simply to build and test at least all the
-supported COFF targets.  It should be straightforward if time and disk
-space consuming.  For each target:
-    1) build the linker
-    2) generate some executable, and link it using -r (I would
-       probably use paranoia.o and link against newlib/libc.a, which
-       for all the supported targets would be available in
-       /usr/cygnus/progressive/H-host/target/lib/libc.a).
-    3) make the change to reloc.c
-    4) rebuild the linker
-    5) repeat step 2
-    6) if the resulting object files are the same, you have at least
-       made it no worse
-    7) if they are different you have to figure out which version is
-       right
-*/
-	  relocation -= reloc_entry->addend;
-#endif
-	  reloc_entry->addend = 0;
-	}
-      else
-	{
-	  reloc_entry->addend = relocation;
-	}
-    }
-
-  /* FIXME: This overflow checking is incomplete, because the value
-     might have overflowed before we get here.  For a correct check we
-     need to compute the value in a size larger than bitsize, but we
-     can't reasonably do that for a reloc the same size as a host
-     machine word.
-     FIXME: We should also do overflow checking on the result after
-     adding in the value contained in the object file.  */
-  if (howto->complain_on_overflow != complain_overflow_dont)
-    flag = bfd_check_overflow (howto->complain_on_overflow,
-			       howto->bitsize,
-			       howto->rightshift,
-			       bfd_arch_bits_per_address (abfd),
-			       relocation);
-
-  /*
-    Either we are relocating all the way, or we don't want to apply
-    the relocation to the reloc entry (probably because there isn't
-    any room in the output format to describe addends to relocs)
-    */
-
-  /* The cast to bfd_vma avoids a bug in the Alpha OSF/1 C compiler
-     (OSF version 1.3, compiler version 3.11).  It miscompiles the
-     following program:
-
-     struct str
-     {
-       unsigned int i0;
-     } s = { 0 };
-
-     int
-     main ()
-     {
-       unsigned long x;
-
-       x = 0x100000000;
-       x <<= (unsigned long) s.i0;
-       if (x == 0)
-	 printf ("failed\n");
-       else
-	 printf ("succeeded (%lx)\n", x);
-     }
-     */
-
-  relocation >>= (bfd_vma) howto->rightshift;
-
-  /* Shift everything up to where it's going to be used */
-
-  relocation <<= (bfd_vma) howto->bitpos;
-
-  /* Wait for the day when all have the mask in them */
-
-  /* What we do:
-     i instruction to be left alone
-     o offset within instruction
-     r relocation offset to apply
-     S src mask
-     D dst mask
-     N ~dst mask
-     A part 1
-     B part 2
-     R result
-
-     Do this:
-     i i i i i o o o o o        from bfd_get<size>
-     and           S S S S S    to get the size offset we want
-     +   r r r r r r r r r r  to get the final value to place
-     and           D D D D D  to chop to right size
-     -----------------------
-     A A A A A
-     And this:
-     ...   i i i i i o o o o o  from bfd_get<size>
-     and   N N N N N            get instruction
-     -----------------------
-     ...   B B B B B
-
-     And then:
-     B B B B B
-     or              A A A A A
-     -----------------------
-     R R R R R R R R R R        put into bfd_put<size>
-     */
-
-#define DOIT(x) \
-  x = ( (x & ~howto->dst_mask) | (((x & howto->src_mask) +  relocation) & howto->dst_mask))
-
-  data = (bfd_byte *) data_start + (addr - data_start_offset);
-
-  switch (howto->size)
-    {
-    case 0:
-      {
-	char x = bfd_get_8 (abfd, (char *) data);
-	DOIT (x);
-	bfd_put_8 (abfd, x, (unsigned char *) data);
-      }
-      break;
-
-    case 1:
-      {
-	short x = bfd_get_16 (abfd, (bfd_byte *) data);
-	DOIT (x);
-	bfd_put_16 (abfd, x, (unsigned char *) data);
-      }
-      break;
-    case 2:
-      {
-	long x = bfd_get_32 (abfd, (bfd_byte *) data);
-	DOIT (x);
-	bfd_put_32 (abfd, x, (bfd_byte *) data);
-      }
-      break;
-    case -2:
-      {
-	long x = bfd_get_32 (abfd, (bfd_byte *) data);
-	relocation = -relocation;
-	DOIT (x);
-	bfd_put_32 (abfd, x, (bfd_byte *) data);
-      }
-      break;
-
-    case 3:
-      /* Do nothing */
-      break;
-
-    case 4:
-      {
-	bfd_vma x = bfd_get_64 (abfd, (bfd_byte *) data);
-	DOIT (x);
-	bfd_put_64 (abfd, x, (bfd_byte *) data);
-      }
-      break;
-    default:
-      return bfd_reloc_other;
-    }
-
-  return flag;
-}
-
-/* This relocation routine is used by some of the backend linkers.
-   They do not construct asymbol or arelent structures, so there is no
-   reason for them to use bfd_perform_relocation.  Also,
-   bfd_perform_relocation is so hacked up it is easier to write a new
-   function than to try to deal with it.
-
-   This routine does a final relocation.  Whether it is useful for a
-   relocateable link depends upon how the object format defines
-   relocations.
-
-   FIXME: This routine ignores any special_function in the HOWTO,
-   since the existing special_function values have been written for
-   bfd_perform_relocation.
-
-   HOWTO is the reloc howto information.
-   INPUT_BFD is the BFD which the reloc applies to.
-   INPUT_SECTION is the section which the reloc applies to.
-   CONTENTS is the contents of the section.
-   ADDRESS is the address of the reloc within INPUT_SECTION.
-   VALUE is the value of the symbol the reloc refers to.
-   ADDEND is the addend of the reloc.  */
-
-bfd_reloc_status_type
-_bfd_final_link_relocate (howto, input_bfd, input_section, contents, address,
-			  value, addend)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     bfd_vma address;
-     bfd_vma value;
-     bfd_vma addend;
-{
-  bfd_vma relocation;
-
-  /* Sanity check the address.  */
-  if (address > input_section->_raw_size)
-    return bfd_reloc_outofrange;
-
-  /* This function assumes that we are dealing with a basic relocation
-     against a symbol.  We want to compute the value of the symbol to
-     relocate to.  This is just VALUE, the value of the symbol, plus
-     ADDEND, any addend associated with the reloc.  */
-  relocation = value + addend;
-
-  /* If the relocation is PC relative, we want to set RELOCATION to
-     the distance between the symbol (currently in RELOCATION) and the
-     location we are relocating.  Some targets (e.g., i386-aout)
-     arrange for the contents of the section to be the negative of the
-     offset of the location within the section; for such targets
-     pcrel_offset is false.  Other targets (e.g., m88kbcs or ELF)
-     simply leave the contents of the section as zero; for such
-     targets pcrel_offset is true.  If pcrel_offset is false we do not
-     need to subtract out the offset of the location within the
-     section (which is just ADDRESS).  */
-  if (howto->pc_relative)
-    {
-      relocation -= (input_section->output_section->vma
-		     + input_section->output_offset);
-      if (howto->pcrel_offset)
-	relocation -= address;
-    }
-
-  return _bfd_relocate_contents (howto, input_bfd, relocation,
-				 contents + address);
-}
-
-/* Relocate a given location using a given value and howto.  */
-
-bfd_reloc_status_type
-_bfd_relocate_contents (howto, input_bfd, relocation, location)
-     reloc_howto_type *howto;
-     bfd *input_bfd;
-     bfd_vma relocation;
-     bfd_byte *location;
-{
-  int size;
-  bfd_vma x;
-  boolean overflow;
-  unsigned int rightshift = howto->rightshift;
-  unsigned int bitpos = howto->bitpos;
-
-  /* If the size is negative, negate RELOCATION.  This isn't very
-     general.  */
-  if (howto->size < 0)
-    relocation = -relocation;
-
-  /* Get the value we are going to relocate.  */
-  size = bfd_get_reloc_size (howto);
-  switch (size)
-    {
-    default:
-    case 0:
-      abort ();
-    case 1:
-      x = bfd_get_8 (input_bfd, location);
-      break;
-    case 2:
-      x = bfd_get_16 (input_bfd, location);
-      break;
-    case 4:
-      x = bfd_get_32 (input_bfd, location);
-      break;
-    case 8:
-#ifdef BFD64
-      x = bfd_get_64 (input_bfd, location);
-#else
-      abort ();
-#endif
-      break;
-    }
-
-  /* Check for overflow.  FIXME: We may drop bits during the addition
-     which we don't check for.  We must either check at every single
-     operation, which would be tedious, or we must do the computations
-     in a type larger than bfd_vma, which would be inefficient.  */
-  overflow = false;
-  if (howto->complain_on_overflow != complain_overflow_dont)
-    {
-      bfd_vma addrmask, fieldmask, signmask, ss;
-      bfd_vma a, b, sum;
-
-      /* Get the values to be added together.  For signed and unsigned
-         relocations, we assume that all values should be truncated to
-         the size of an address.  For bitfields, all the bits matter.
-         See also bfd_check_overflow.  */
-      fieldmask = N_ONES (howto->bitsize);
-      addrmask = N_ONES (bfd_arch_bits_per_address (input_bfd)) | fieldmask;
-      a = relocation;
-      b = x & howto->src_mask;
-
-      switch (howto->complain_on_overflow)
-	{
-	case complain_overflow_signed:
-	  a = (a & addrmask) >> rightshift;
-
-	  /* If any sign bits are set, all sign bits must be set.
-	     That is, A must be a valid negative address after
-	     shifting.  */
-	  signmask = ~ (fieldmask >> 1);
-	  ss = a & signmask;
-	  if (ss != 0 && ss != ((addrmask >> rightshift) & signmask))
-	    overflow = true;
-
-	  /* We only need this next bit of code if the sign bit of B
-             is below the sign bit of A.  This would only happen if
-             SRC_MASK had fewer bits than BITSIZE.  Note that if
-             SRC_MASK has more bits than BITSIZE, we can get into
-             trouble; we would need to verify that B is in range, as
-             we do for A above.  */
-	  signmask = ((~ howto->src_mask) >> 1) & howto->src_mask;
-	  if ((b & signmask) != 0)
-	    {
-	      /* Set all the bits above the sign bit.  */
-	      b -= signmask <<= 1;
-	    }
-
-	  b = (b & addrmask) >> bitpos;
-
-	  /* Now we can do the addition.  */
-	  sum = a + b;
-
-	  /* See if the result has the correct sign.  Bits above the
-             sign bit are junk now; ignore them.  If the sum is
-             positive, make sure we did not have all negative inputs;
-             if the sum is negative, make sure we did not have all
-             positive inputs.  The test below looks only at the sign
-             bits, and it really just
-	         SIGN (A) == SIGN (B) && SIGN (A) != SIGN (SUM)
-	     */
-	  signmask = (fieldmask >> 1) + 1;
-	  if (((~ (a ^ b)) & (a ^ sum)) & signmask)
-	    overflow = true;
-
-	  break;
-
-	case complain_overflow_unsigned:
-	  /* Checking for an unsigned overflow is relatively easy:
-             trim the addresses and add, and trim the result as well.
-             Overflow is normally indicated when the result does not
-             fit in the field.  However, we also need to consider the
-             case when, e.g., fieldmask is 0x7fffffff or smaller, an
-             input is 0x80000000, and bfd_vma is only 32 bits; then we
-             will get sum == 0, but there is an overflow, since the
-             inputs did not fit in the field.  Instead of doing a
-             separate test, we can check for this by or-ing in the
-             operands when testing for the sum overflowing its final
-             field.  */
-	  a = (a & addrmask) >> rightshift;
-	  b = (b & addrmask) >> bitpos;
-	  sum = (a + b) & addrmask;
-	  if ((a | b | sum) & ~ fieldmask)
-	    overflow = true;
-
-	  break;
-
-	case complain_overflow_bitfield:
-	  /* Much like unsigned, except no trimming with addrmask.  In
-             addition, the sum overflows if there is a carry out of
-             the bfd_vma, i.e., the sum is less than either input
-             operand.  */
-	  a >>= rightshift;
-	  b >>= bitpos;
-
-	  /* Bitfields are sometimes used for signed numbers; for
-             example, a 13-bit field sometimes represents values in
-             0..8191 and sometimes represents values in -4096..4095.
-             If the field is signed and a is -4095 (0x1001) and b is
-             -1 (0x1fff), the sum is -4096 (0x1000), but (0x1001 +
-             0x1fff is 0x3000).  It's not clear how to handle this
-             everywhere, since there is not way to know how many bits
-             are significant in the relocation, but the original code
-             assumed that it was fully sign extended, and we will keep
-             that assumption.  */
-	  signmask = (fieldmask >> 1) + 1;
-
-	  if ((a & ~ fieldmask) != 0)
-	    {
-	      /* Some bits out of the field are set.  This might not
-                 be a problem: if this is a signed bitfield, it is OK
-                 iff all the high bits are set, including the sign
-                 bit.  We'll try setting all but the most significant
-                 bit in the original relocation value: if this is all
-                 ones, we are OK, assuming a signed bitfield.  */
-	      ss = (signmask << rightshift) - 1;
-	      if ((ss | relocation) != ~ (bfd_vma) 0)
-		overflow = true;
-	      a &= fieldmask;
-	    }
-
-	  /* We just assume (b & ~ fieldmask) == 0.  */
-
-	  sum = a + b;
-	  if (sum < a || (sum & ~ fieldmask) != 0)
-	    {
-	      /* There was a carry out, or the field overflow.  Test
-                 for signed operands again.  Here is the overflow test
-                 is as for complain_overflow_signed.  */
-	      if (((~ (a ^ b)) & (a ^ sum)) & signmask)
-		overflow = true;
-	    }
-
-	  break;
-
-	default:
-	  abort ();
-	}
-    }
-
-  /* Put RELOCATION in the right bits.  */
-  relocation >>= (bfd_vma) rightshift;
-  relocation <<= (bfd_vma) bitpos;
-
-  /* Add RELOCATION to the right bits of X.  */
-  x = ((x & ~howto->dst_mask)
-       | (((x & howto->src_mask) + relocation) & howto->dst_mask));
-
-  /* Put the relocated value back in the object file.  */
-  switch (size)
-    {
-    default:
-    case 0:
-      abort ();
-    case 1:
-      bfd_put_8 (input_bfd, x, location);
-      break;
-    case 2:
-      bfd_put_16 (input_bfd, x, location);
-      break;
-    case 4:
-      bfd_put_32 (input_bfd, x, location);
-      break;
-    case 8:
-#ifdef BFD64
-      bfd_put_64 (input_bfd, x, location);
-#else
-      abort ();
-#endif
-      break;
-    }
-
-  return overflow ? bfd_reloc_overflow : bfd_reloc_ok;
-}
-
-/*
-DOCDD
-INODE
-	howto manager,  , typedef arelent, Relocations
-
-SECTION
-	The howto manager
-
-	When an application wants to create a relocation, but doesn't
-	know what the target machine might call it, it can find out by
-	using this bit of code.
-
-*/
-
-/*
-TYPEDEF
-	bfd_reloc_code_type
-
-DESCRIPTION
-	The insides of a reloc code.  The idea is that, eventually, there
-	will be one enumerator for every type of relocation we ever do.
-	Pass one of these values to <<bfd_reloc_type_lookup>>, and it'll
-	return a howto pointer.
-
-	This does mean that the application must determine the correct
-	enumerator value; you can't get a howto pointer from a random set
-	of attributes.
-
-SENUM
-   bfd_reloc_code_real
-
-ENUM
-  BFD_RELOC_64
-ENUMX
-  BFD_RELOC_32
-ENUMX
-  BFD_RELOC_26
-ENUMX
-  BFD_RELOC_24
-ENUMX
-  BFD_RELOC_16
-ENUMX
-  BFD_RELOC_14
-ENUMX
-  BFD_RELOC_8
-ENUMDOC
-  Basic absolute relocations of N bits.
-
-ENUM
-  BFD_RELOC_64_PCREL
-ENUMX
-  BFD_RELOC_32_PCREL
-ENUMX
-  BFD_RELOC_24_PCREL
-ENUMX
-  BFD_RELOC_16_PCREL
-ENUMX
-  BFD_RELOC_12_PCREL
-ENUMX
-  BFD_RELOC_8_PCREL
-ENUMDOC
-  PC-relative relocations.  Sometimes these are relative to the address
-of the relocation itself; sometimes they are relative to the start of
-the section containing the relocation.  It depends on the specific target.
-
-The 24-bit relocation is used in some Intel 960 configurations.
-
-ENUM
-  BFD_RELOC_32_GOT_PCREL
-ENUMX
-  BFD_RELOC_16_GOT_PCREL
-ENUMX
-  BFD_RELOC_8_GOT_PCREL
-ENUMX
-  BFD_RELOC_32_GOTOFF
-ENUMX
-  BFD_RELOC_16_GOTOFF
-ENUMX
-  BFD_RELOC_LO16_GOTOFF
-ENUMX
-  BFD_RELOC_HI16_GOTOFF
-ENUMX
-  BFD_RELOC_HI16_S_GOTOFF
-ENUMX
-  BFD_RELOC_8_GOTOFF
-ENUMX
-  BFD_RELOC_32_PLT_PCREL
-ENUMX
-  BFD_RELOC_24_PLT_PCREL
-ENUMX
-  BFD_RELOC_16_PLT_PCREL
-ENUMX
-  BFD_RELOC_8_PLT_PCREL
-ENUMX
-  BFD_RELOC_32_PLTOFF
-ENUMX
-  BFD_RELOC_16_PLTOFF
-ENUMX
-  BFD_RELOC_LO16_PLTOFF
-ENUMX
-  BFD_RELOC_HI16_PLTOFF
-ENUMX
-  BFD_RELOC_HI16_S_PLTOFF
-ENUMX
-  BFD_RELOC_8_PLTOFF
-ENUMDOC
-  For ELF.
-
-ENUM
-  BFD_RELOC_68K_GLOB_DAT
-ENUMX
-  BFD_RELOC_68K_JMP_SLOT
-ENUMX
-  BFD_RELOC_68K_RELATIVE
-ENUMDOC
-  Relocations used by 68K ELF.
-
-ENUM
-  BFD_RELOC_32_BASEREL
-ENUMX
-  BFD_RELOC_16_BASEREL
-ENUMX
-  BFD_RELOC_LO16_BASEREL
-ENUMX
-  BFD_RELOC_HI16_BASEREL
-ENUMX
-  BFD_RELOC_HI16_S_BASEREL
-ENUMX
-  BFD_RELOC_8_BASEREL
-ENUMX
-  BFD_RELOC_RVA
-ENUMDOC
-  Linkage-table relative.
-
-ENUM
-  BFD_RELOC_8_FFnn
-ENUMDOC
-  Absolute 8-bit relocation, but used to form an address like 0xFFnn.
-
-ENUM
-  BFD_RELOC_32_PCREL_S2
-ENUMX
-  BFD_RELOC_16_PCREL_S2
-ENUMX
-  BFD_RELOC_23_PCREL_S2
-ENUMDOC
-  These PC-relative relocations are stored as word displacements --
-i.e., byte displacements shifted right two bits.  The 30-bit word
-displacement (<<32_PCREL_S2>> -- 32 bits, shifted 2) is used on the
-SPARC.  (SPARC tools generally refer to this as <<WDISP30>>.)  The
-signed 16-bit displacement is used on the MIPS, and the 23-bit
-displacement is used on the Alpha.
-
-ENUM
-  BFD_RELOC_HI22
-ENUMX
-  BFD_RELOC_LO10
-ENUMDOC
-  High 22 bits and low 10 bits of 32-bit value, placed into lower bits of
-the target word.  These are used on the SPARC.
-
-ENUM
-  BFD_RELOC_GPREL16
-ENUMX
-  BFD_RELOC_GPREL32
-ENUMDOC
-  For systems that allocate a Global Pointer register, these are
-displacements off that register.  These relocation types are
-handled specially, because the value the register will have is
-decided relatively late.
-
-
-ENUM
-  BFD_RELOC_I960_CALLJ
-ENUMDOC
-  Reloc types used for i960/b.out.
-
-ENUM
-  BFD_RELOC_NONE
-ENUMX
-  BFD_RELOC_SPARC_WDISP22
-ENUMX
-  BFD_RELOC_SPARC22
-ENUMX
-  BFD_RELOC_SPARC13
-ENUMX
-  BFD_RELOC_SPARC_GOT10
-ENUMX
-  BFD_RELOC_SPARC_GOT13
-ENUMX
-  BFD_RELOC_SPARC_GOT22
-ENUMX
-  BFD_RELOC_SPARC_PC10
-ENUMX
-  BFD_RELOC_SPARC_PC22
-ENUMX
-  BFD_RELOC_SPARC_WPLT30
-ENUMX
-  BFD_RELOC_SPARC_COPY
-ENUMX
-  BFD_RELOC_SPARC_GLOB_DAT
-ENUMX
-  BFD_RELOC_SPARC_JMP_SLOT
-ENUMX
-  BFD_RELOC_SPARC_RELATIVE
-ENUMX
-  BFD_RELOC_SPARC_UA32
-ENUMDOC
-  SPARC ELF relocations.  There is probably some overlap with other
-  relocation types already defined.
-
-ENUM
-  BFD_RELOC_SPARC_BASE13
-ENUMX
-  BFD_RELOC_SPARC_BASE22
-ENUMDOC
-  I think these are specific to SPARC a.out (e.g., Sun 4).
-
-ENUMEQ
-  BFD_RELOC_SPARC_64
-  BFD_RELOC_64
-ENUMX
-  BFD_RELOC_SPARC_10
-ENUMX
-  BFD_RELOC_SPARC_11
-ENUMX
-  BFD_RELOC_SPARC_OLO10
-ENUMX
-  BFD_RELOC_SPARC_HH22
-ENUMX
-  BFD_RELOC_SPARC_HM10
-ENUMX
-  BFD_RELOC_SPARC_LM22
-ENUMX
-  BFD_RELOC_SPARC_PC_HH22
-ENUMX
-  BFD_RELOC_SPARC_PC_HM10
-ENUMX
-  BFD_RELOC_SPARC_PC_LM22
-ENUMX
-  BFD_RELOC_SPARC_WDISP16
-ENUMX
-  BFD_RELOC_SPARC_WDISP19
-ENUMX
-  BFD_RELOC_SPARC_7
-ENUMX
-  BFD_RELOC_SPARC_6
-ENUMX
-  BFD_RELOC_SPARC_5
-ENUMEQX
-  BFD_RELOC_SPARC_DISP64
-  BFD_RELOC_64_PCREL
-ENUMX
-  BFD_RELOC_SPARC_PLT64
-ENUMX
-  BFD_RELOC_SPARC_HIX22
-ENUMX
-  BFD_RELOC_SPARC_LOX10
-ENUMX
-  BFD_RELOC_SPARC_H44
-ENUMX
-  BFD_RELOC_SPARC_M44
-ENUMX
-  BFD_RELOC_SPARC_L44
-ENUMX
-  BFD_RELOC_SPARC_REGISTER
-ENUMDOC
-  SPARC64 relocations
-
-ENUM
-  BFD_RELOC_SPARC_REV32
-ENUMDOC
-  SPARC little endian relocation
-
-ENUM
-  BFD_RELOC_ALPHA_GPDISP_HI16
-ENUMDOC
-  Alpha ECOFF and ELF relocations.  Some of these treat the symbol or
-     "addend" in some special way.
-  For GPDISP_HI16 ("gpdisp") relocations, the symbol is ignored when
-     writing; when reading, it will be the absolute section symbol.  The
-     addend is the displacement in bytes of the "lda" instruction from
-     the "ldah" instruction (which is at the address of this reloc).
-ENUM
-  BFD_RELOC_ALPHA_GPDISP_LO16
-ENUMDOC
-  For GPDISP_LO16 ("ignore") relocations, the symbol is handled as
-     with GPDISP_HI16 relocs.  The addend is ignored when writing the
-     relocations out, and is filled in with the file's GP value on
-     reading, for convenience.
-
-ENUM
-  BFD_RELOC_ALPHA_GPDISP
-ENUMDOC
-  The ELF GPDISP relocation is exactly the same as the GPDISP_HI16
-     relocation except that there is no accompanying GPDISP_LO16
-     relocation.
-
-ENUM
-  BFD_RELOC_ALPHA_LITERAL
-ENUMX
-  BFD_RELOC_ALPHA_ELF_LITERAL
-ENUMX
-  BFD_RELOC_ALPHA_LITUSE
-ENUMDOC
-  The Alpha LITERAL/LITUSE relocs are produced by a symbol reference;
-     the assembler turns it into a LDQ instruction to load the address of
-     the symbol, and then fills in a register in the real instruction.
-
-     The LITERAL reloc, at the LDQ instruction, refers to the .lita
-     section symbol.  The addend is ignored when writing, but is filled
-     in with the file's GP value on reading, for convenience, as with the
-     GPDISP_LO16 reloc.
-
-     The ELF_LITERAL reloc is somewhere between 16_GOTOFF and GPDISP_LO16.
-     It should refer to the symbol to be referenced, as with 16_GOTOFF,
-     but it generates output not based on the position within the .got
-     section, but relative to the GP value chosen for the file during the
-     final link stage.
-
-     The LITUSE reloc, on the instruction using the loaded address, gives
-     information to the linker that it might be able to use to optimize
-     away some literal section references.  The symbol is ignored (read
-     as the absolute section symbol), and the "addend" indicates the type
-     of instruction using the register:
-              1 - "memory" fmt insn
-              2 - byte-manipulation (byte offset reg)
-              3 - jsr (target of branch)
-
-     The GNU linker currently doesn't do any of this optimizing.
-
-ENUM
-  BFD_RELOC_ALPHA_HINT
-ENUMDOC
-  The HINT relocation indicates a value that should be filled into the
-     "hint" field of a jmp/jsr/ret instruction, for possible branch-
-     prediction logic which may be provided on some processors.
-
-ENUM
-  BFD_RELOC_ALPHA_LINKAGE
-ENUMDOC
-  The LINKAGE relocation outputs a linkage pair in the object file,
-     which is filled by the linker.
-
-ENUM
-  BFD_RELOC_ALPHA_CODEADDR
-ENUMDOC
-  The CODEADDR relocation outputs a STO_CA in the object file,
-     which is filled by the linker.
-
-ENUM
-  BFD_RELOC_MIPS_JMP
-ENUMDOC
-  Bits 27..2 of the relocation address shifted right 2 bits;
-     simple reloc otherwise.
-
-ENUM
-  BFD_RELOC_MIPS16_JMP
-ENUMDOC
-  The MIPS16 jump instruction.
-
-ENUM
-  BFD_RELOC_MIPS16_GPREL
-ENUMDOC
-  MIPS16 GP relative reloc.
-
-ENUM
-  BFD_RELOC_HI16
-ENUMDOC
-  High 16 bits of 32-bit value; simple reloc.
-ENUM
-  BFD_RELOC_HI16_S
-ENUMDOC
-  High 16 bits of 32-bit value but the low 16 bits will be sign
-     extended and added to form the final result.  If the low 16
-     bits form a negative number, we need to add one to the high value
-     to compensate for the borrow when the low bits are added.
-ENUM
-  BFD_RELOC_LO16
-ENUMDOC
-  Low 16 bits.
-ENUM
-  BFD_RELOC_PCREL_HI16_S
-ENUMDOC
-  Like BFD_RELOC_HI16_S, but PC relative.
-ENUM
-  BFD_RELOC_PCREL_LO16
-ENUMDOC
-  Like BFD_RELOC_LO16, but PC relative.
-
-ENUMEQ
-  BFD_RELOC_MIPS_GPREL
-  BFD_RELOC_GPREL16
-ENUMDOC
-  Relocation relative to the global pointer.
-
-ENUM
-  BFD_RELOC_MIPS_LITERAL
-ENUMDOC
-  Relocation against a MIPS literal section.
-
-ENUM
-  BFD_RELOC_MIPS_GOT16
-ENUMX
-  BFD_RELOC_MIPS_CALL16
-ENUMEQX
-  BFD_RELOC_MIPS_GPREL32
-  BFD_RELOC_GPREL32
-ENUMX
-  BFD_RELOC_MIPS_GOT_HI16
-ENUMX
-  BFD_RELOC_MIPS_GOT_LO16
-ENUMX
-  BFD_RELOC_MIPS_CALL_HI16
-ENUMX
-  BFD_RELOC_MIPS_CALL_LO16
-COMMENT
-ENUMDOC
-  MIPS ELF relocations.
-
-COMMENT
-
-ENUM
-  BFD_RELOC_386_GOT32
-ENUMX
-  BFD_RELOC_386_PLT32
-ENUMX
-  BFD_RELOC_386_COPY
-ENUMX
-  BFD_RELOC_386_GLOB_DAT
-ENUMX
-  BFD_RELOC_386_JUMP_SLOT
-ENUMX
-  BFD_RELOC_386_RELATIVE
-ENUMX
-  BFD_RELOC_386_GOTOFF
-ENUMX
-  BFD_RELOC_386_GOTPC
-ENUMDOC
-  i386/elf relocations
-
-ENUM
-  BFD_RELOC_NS32K_IMM_8
-ENUMX
-  BFD_RELOC_NS32K_IMM_16
-ENUMX
-  BFD_RELOC_NS32K_IMM_32
-ENUMX
-  BFD_RELOC_NS32K_IMM_8_PCREL
-ENUMX
-  BFD_RELOC_NS32K_IMM_16_PCREL
-ENUMX
-  BFD_RELOC_NS32K_IMM_32_PCREL
-ENUMX
-  BFD_RELOC_NS32K_DISP_8
-ENUMX
-  BFD_RELOC_NS32K_DISP_16
-ENUMX
-  BFD_RELOC_NS32K_DISP_32
-ENUMX
-  BFD_RELOC_NS32K_DISP_8_PCREL
-ENUMX
-  BFD_RELOC_NS32K_DISP_16_PCREL
-ENUMX
-  BFD_RELOC_NS32K_DISP_32_PCREL
-ENUMDOC
-  ns32k relocations
-
-ENUM
-  BFD_RELOC_PPC_B26
-ENUMX
-  BFD_RELOC_PPC_BA26
-ENUMX
-  BFD_RELOC_PPC_TOC16
-ENUMX
-  BFD_RELOC_PPC_B16
-ENUMX
-  BFD_RELOC_PPC_B16_BRTAKEN
-ENUMX
-  BFD_RELOC_PPC_B16_BRNTAKEN
-ENUMX
-  BFD_RELOC_PPC_BA16
-ENUMX
-  BFD_RELOC_PPC_BA16_BRTAKEN
-ENUMX
-  BFD_RELOC_PPC_BA16_BRNTAKEN
-ENUMX
-  BFD_RELOC_PPC_COPY
-ENUMX
-  BFD_RELOC_PPC_GLOB_DAT
-ENUMX
-  BFD_RELOC_PPC_JMP_SLOT
-ENUMX
-  BFD_RELOC_PPC_RELATIVE
-ENUMX
-  BFD_RELOC_PPC_LOCAL24PC
-ENUMX
-  BFD_RELOC_PPC_EMB_NADDR32
-ENUMX
-  BFD_RELOC_PPC_EMB_NADDR16
-ENUMX
-  BFD_RELOC_PPC_EMB_NADDR16_LO
-ENUMX
-  BFD_RELOC_PPC_EMB_NADDR16_HI
-ENUMX
-  BFD_RELOC_PPC_EMB_NADDR16_HA
-ENUMX
-  BFD_RELOC_PPC_EMB_SDAI16
-ENUMX
-  BFD_RELOC_PPC_EMB_SDA2I16
-ENUMX
-  BFD_RELOC_PPC_EMB_SDA2REL
-ENUMX
-  BFD_RELOC_PPC_EMB_SDA21
-ENUMX
-  BFD_RELOC_PPC_EMB_MRKREF
-ENUMX
-  BFD_RELOC_PPC_EMB_RELSEC16
-ENUMX
-  BFD_RELOC_PPC_EMB_RELST_LO
-ENUMX
-  BFD_RELOC_PPC_EMB_RELST_HI
-ENUMX
-  BFD_RELOC_PPC_EMB_RELST_HA
-ENUMX
-  BFD_RELOC_PPC_EMB_BIT_FLD
-ENUMX
-  BFD_RELOC_PPC_EMB_RELSDA
-ENUMDOC
-  Power(rs6000) and PowerPC relocations.
-
-ENUM
-  BFD_RELOC_CTOR
-ENUMDOC
-  The type of reloc used to build a contructor table - at the moment
-  probably a 32 bit wide absolute relocation, but the target can choose.
-  It generally does map to one of the other relocation types.
-
-ENUM
-  BFD_RELOC_ARM_PCREL_BRANCH
-ENUMDOC
-  ARM 26 bit pc-relative branch.  The lowest two bits must be zero and are
-  not stored in the instruction.
-ENUM
-  BFD_RELOC_ARM_IMMEDIATE
-ENUMX
-  BFD_RELOC_ARM_OFFSET_IMM
-ENUMX
-  BFD_RELOC_ARM_SHIFT_IMM
-ENUMX
-  BFD_RELOC_ARM_SWI
-ENUMX
-  BFD_RELOC_ARM_MULTI
-ENUMX
-  BFD_RELOC_ARM_CP_OFF_IMM
-ENUMX
-  BFD_RELOC_ARM_ADR_IMM
-ENUMX
-  BFD_RELOC_ARM_LDR_IMM
-ENUMX
-  BFD_RELOC_ARM_LITERAL
-ENUMX
-  BFD_RELOC_ARM_IN_POOL
-ENUMX
-  BFD_RELOC_ARM_OFFSET_IMM8
-ENUMX
-  BFD_RELOC_ARM_HWLITERAL
-ENUMX
-  BFD_RELOC_ARM_THUMB_ADD
-ENUMX
-  BFD_RELOC_ARM_THUMB_IMM
-ENUMX
-  BFD_RELOC_ARM_THUMB_SHIFT
-ENUMX
-  BFD_RELOC_ARM_THUMB_OFFSET
-ENUMX
-  BFD_RELOC_ARM_GOT12
-ENUMX
-  BFD_RELOC_ARM_GOT32
-ENUMX
-  BFD_RELOC_ARM_JUMP_SLOT
-ENUMX
-  BFD_RELOC_ARM_COPY
-ENUMX
-  BFD_RELOC_ARM_GLOB_DAT
-ENUMX
-  BFD_RELOC_ARM_PLT32
-ENUMX
-  BFD_RELOC_ARM_RELATIVE
-ENUMX
-  BFD_RELOC_ARM_GOTOFF
-ENUMX
-  BFD_RELOC_ARM_GOTPC
-ENUMDOC
-  These relocs are only used within the ARM assembler.  They are not
-  (at present) written to any object files.
-
-ENUM
-  BFD_RELOC_SH_PCDISP8BY2
-ENUMX
-  BFD_RELOC_SH_PCDISP12BY2
-ENUMX
-  BFD_RELOC_SH_IMM4
-ENUMX
-  BFD_RELOC_SH_IMM4BY2
-ENUMX
-  BFD_RELOC_SH_IMM4BY4
-ENUMX
-  BFD_RELOC_SH_IMM8
-ENUMX
-  BFD_RELOC_SH_IMM8BY2
-ENUMX
-  BFD_RELOC_SH_IMM8BY4
-ENUMX
-  BFD_RELOC_SH_PCRELIMM8BY2
-ENUMX
-  BFD_RELOC_SH_PCRELIMM8BY4
-ENUMX
-  BFD_RELOC_SH_SWITCH16
-ENUMX
-  BFD_RELOC_SH_SWITCH32
-ENUMX
-  BFD_RELOC_SH_USES
-ENUMX
-  BFD_RELOC_SH_COUNT
-ENUMX
-  BFD_RELOC_SH_ALIGN
-ENUMX
-  BFD_RELOC_SH_CODE
-ENUMX
-  BFD_RELOC_SH_DATA
-ENUMX
-  BFD_RELOC_SH_LABEL
-ENUMDOC
-  Hitachi SH relocs.  Not all of these appear in object files.
-
-ENUM
-  BFD_RELOC_THUMB_PCREL_BRANCH9
-ENUMX
-  BFD_RELOC_THUMB_PCREL_BRANCH12
-ENUMX
-  BFD_RELOC_THUMB_PCREL_BRANCH23
-ENUMDOC
-  Thumb 23-, 12- and 9-bit pc-relative branches.  The lowest bit must
-  be zero and is not stored in the instruction.
-
-ENUM
-  BFD_RELOC_ARC_B22_PCREL
-ENUMDOC
-  Argonaut RISC Core (ARC) relocs.
-  ARC 22 bit pc-relative branch.  The lowest two bits must be zero and are
-  not stored in the instruction.  The high 20 bits are installed in bits 26
-  through 7 of the instruction.
-ENUM
-  BFD_RELOC_ARC_B26
-ENUMDOC
-  ARC 26 bit absolute branch.  The lowest two bits must be zero and are not
-  stored in the instruction.  The high 24 bits are installed in bits 23
-  through 0.
-
-ENUM
-  BFD_RELOC_D10V_10_PCREL_R
-ENUMDOC
-  Mitsubishi D10V relocs.
-  This is a 10-bit reloc with the right 2 bits
-  assumed to be 0.
-ENUM
-  BFD_RELOC_D10V_10_PCREL_L
-ENUMDOC
-  Mitsubishi D10V relocs.
-  This is a 10-bit reloc with the right 2 bits
-  assumed to be 0.  This is the same as the previous reloc
-  except it is in the left container, i.e.,
-  shifted left 15 bits.
-ENUM
-  BFD_RELOC_D10V_18
-ENUMDOC
-  This is an 18-bit reloc with the right 2 bits
-  assumed to be 0.
-ENUM
-  BFD_RELOC_D10V_18_PCREL
-ENUMDOC
-  This is an 18-bit reloc with the right 2 bits
-  assumed to be 0.
-
-ENUM
-  BFD_RELOC_D30V_6
-ENUMDOC
-  Mitsubishi D30V relocs.
-  This is a 6-bit absolute reloc.
-ENUM
-  BFD_RELOC_D30V_9_PCREL
-ENUMDOC
-  This is a 6-bit pc-relative reloc with 
-  the right 3 bits assumed to be 0.  
-ENUM
-  BFD_RELOC_D30V_9_PCREL_R
-ENUMDOC
-  This is a 6-bit pc-relative reloc with 
-  the right 3 bits assumed to be 0. Same
-  as the previous reloc but on the right side
-  of the container.  
-ENUM
-  BFD_RELOC_D30V_15
-ENUMDOC
-  This is a 12-bit absolute reloc with the 
-  right 3 bitsassumed to be 0.  
-ENUM
-  BFD_RELOC_D30V_15_PCREL
-ENUMDOC
-  This is a 12-bit pc-relative reloc with 
-  the right 3 bits assumed to be 0.  
-ENUM
-  BFD_RELOC_D30V_15_PCREL_R
-ENUMDOC
-  This is a 12-bit pc-relative reloc with 
-  the right 3 bits assumed to be 0. Same
-  as the previous reloc but on the right side
-  of the container.  
-ENUM
-  BFD_RELOC_D30V_21
-ENUMDOC
-  This is an 18-bit absolute reloc with 
-  the right 3 bits assumed to be 0.
-ENUM
-  BFD_RELOC_D30V_21_PCREL
-ENUMDOC
-  This is an 18-bit pc-relative reloc with 
-  the right 3 bits assumed to be 0.
-ENUM
-  BFD_RELOC_D30V_21_PCREL_R
-ENUMDOC
-  This is an 18-bit pc-relative reloc with 
-  the right 3 bits assumed to be 0. Same
-  as the previous reloc but on the right side
-  of the container.
-ENUM
-  BFD_RELOC_D30V_32
-ENUMDOC
-  This is a 32-bit absolute reloc.
-ENUM
-  BFD_RELOC_D30V_32_PCREL
-ENUMDOC
-  This is a 32-bit pc-relative reloc.
-
-ENUM
-  BFD_RELOC_M32R_24
-ENUMDOC
-  Mitsubishi M32R relocs.
-  This is a 24 bit absolute address.
-ENUM
-  BFD_RELOC_M32R_10_PCREL
-ENUMDOC
-  This is a 10-bit pc-relative reloc with the right 2 bits assumed to be 0.
-ENUM
-  BFD_RELOC_M32R_18_PCREL
-ENUMDOC
-  This is an 18-bit reloc with the right 2 bits assumed to be 0.
-ENUM
-  BFD_RELOC_M32R_26_PCREL
-ENUMDOC
-  This is a 26-bit reloc with the right 2 bits assumed to be 0.
-ENUM
-  BFD_RELOC_M32R_HI16_ULO
-ENUMDOC
-  This is a 16-bit reloc containing the high 16 bits of an address
-  used when the lower 16 bits are treated as unsigned.
-ENUM
-  BFD_RELOC_M32R_HI16_SLO
-ENUMDOC
-  This is a 16-bit reloc containing the high 16 bits of an address
-  used when the lower 16 bits are treated as signed.
-ENUM
-  BFD_RELOC_M32R_LO16
-ENUMDOC
-  This is a 16-bit reloc containing the lower 16 bits of an address.
-ENUM
-  BFD_RELOC_M32R_SDA16
-ENUMDOC
-  This is a 16-bit reloc containing the small data area offset for use in
-  add3, load, and store instructions.
-
-ENUM
-  BFD_RELOC_V850_9_PCREL
-ENUMDOC
-  This is a 9-bit reloc
-ENUM
-  BFD_RELOC_V850_22_PCREL
-ENUMDOC
-  This is a 22-bit reloc
-
-ENUM
-  BFD_RELOC_V850_SDA_16_16_OFFSET
-ENUMDOC
-  This is a 16 bit offset from the short data area pointer.
-ENUM
-  BFD_RELOC_V850_SDA_15_16_OFFSET
-ENUMDOC
-  This is a 16 bit offset (of which only 15 bits are used) from the
-  short data area pointer.
-ENUM
-  BFD_RELOC_V850_ZDA_16_16_OFFSET
-ENUMDOC
-  This is a 16 bit offset from the zero data area pointer.
-ENUM
-  BFD_RELOC_V850_ZDA_15_16_OFFSET
-ENUMDOC
-  This is a 16 bit offset (of which only 15 bits are used) from the
-  zero data area pointer.
-ENUM
-  BFD_RELOC_V850_TDA_6_8_OFFSET
-ENUMDOC
-  This is an 8 bit offset (of which only 6 bits are used) from the
-  tiny data area pointer.
-ENUM
-  BFD_RELOC_V850_TDA_7_8_OFFSET
-ENUMDOC
-  This is an 8bit offset (of which only 7 bits are used) from the tiny
-  data area pointer.
-ENUM
-  BFD_RELOC_V850_TDA_7_7_OFFSET
-ENUMDOC
-  This is a 7 bit offset from the tiny data area pointer.
-ENUM
-  BFD_RELOC_V850_TDA_16_16_OFFSET
-ENUMDOC
-  This is a 16 bit offset from the tiny data area pointer.
-COMMENT
-ENUM
-  BFD_RELOC_V850_TDA_4_5_OFFSET
-ENUMDOC
-  This is a 5 bit offset (of which only 4 bits are used) from the tiny
-  data area pointer.
-ENUM
-  BFD_RELOC_V850_TDA_4_4_OFFSET
-ENUMDOC
-  This is a 4 bit offset from the tiny data area pointer.
-ENUM
-  BFD_RELOC_V850_SDA_16_16_SPLIT_OFFSET
-ENUMDOC
-  This is a 16 bit offset from the short data area pointer, with the
-  bits placed non-contigously in the instruction.
-ENUM
-  BFD_RELOC_V850_ZDA_16_16_SPLIT_OFFSET
-ENUMDOC
-  This is a 16 bit offset from the zero data area pointer, with the
-  bits placed non-contigously in the instruction.
-ENUM
-  BFD_RELOC_V850_CALLT_6_7_OFFSET
-ENUMDOC
-  This is a 6 bit offset from the call table base pointer.
-ENUM
-  BFD_RELOC_V850_CALLT_16_16_OFFSET
-ENUMDOC
-  This is a 16 bit offset from the call table base pointer.
-COMMENT
-
-ENUM
-  BFD_RELOC_MN10300_32_PCREL
-ENUMDOC
-  This is a 32bit pcrel reloc for the mn10300, offset by two bytes in the
-  instruction.
-ENUM
-  BFD_RELOC_MN10300_16_PCREL
-ENUMDOC
-  This is a 16bit pcrel reloc for the mn10300, offset by two bytes in the
-  instruction.
-
-ENUM
-  BFD_RELOC_TIC30_LDP
-ENUMDOC
-  This is a 8bit DP reloc for the tms320c30, where the most
-  significant 8 bits of a 24 bit word are placed into the least
-  significant 8 bits of the opcode.
-
-ENUM
-  BFD_RELOC_FR30_48
-ENUMDOC
-  This is a 48 bit reloc for the FR30 that stores 32 bits.
-ENUM
-  BFD_RELOC_FR30_20
-ENUMDOC
-  This is a 32 bit reloc for the FR30 that stores 20 bits split up into
-  two sections.
-ENUM
-  BFD_RELOC_FR30_6_IN_4
-ENUMDOC
-  This is a 16 bit reloc for the FR30 that stores a 6 bit word offset in
-  4 bits.
-ENUM
-  BFD_RELOC_FR30_8_IN_8
-ENUMDOC
-  This is a 16 bit reloc for the FR30 that stores an 8 bit byte offset
-  into 8 bits.
-ENUM
-  BFD_RELOC_FR30_9_IN_8
-ENUMDOC
-  This is a 16 bit reloc for the FR30 that stores a 9 bit short offset
-  into 8 bits.
-ENUM
-  BFD_RELOC_FR30_10_IN_8
-ENUMDOC
-  This is a 16 bit reloc for the FR30 that stores a 10 bit word offset
-  into 8 bits.
-ENUM
-  BFD_RELOC_FR30_9_PCREL
-ENUMDOC
-  This is a 16 bit reloc for the FR30 that stores a 9 bit pc relative
-  short offset into 8 bits.
-ENUM
-  BFD_RELOC_FR30_12_PCREL
-ENUMDOC
-  This is a 16 bit reloc for the FR30 that stores a 12 bit pc relative
-  short offset into 11 bits.
-  
-ENUM
-  BFD_RELOC_MCORE_PCREL_IMM8BY4
-ENUMX
-  BFD_RELOC_MCORE_PCREL_IMM11BY2
-ENUMX
-  BFD_RELOC_MCORE_PCREL_IMM4BY2
-ENUMX
-  BFD_RELOC_MCORE_PCREL_32
-ENUMX
-  BFD_RELOC_MCORE_PCREL_JSR_IMM11BY2
-ENUMDOC
-  Motorola Mcore relocations.
-  
-ENUM
-  BFD_RELOC_VTABLE_INHERIT
-ENUMX
-  BFD_RELOC_VTABLE_ENTRY
-ENUMDOC
-  These two relocations are used by the linker to determine which of 
-  the entries in a C++ virtual function table are actually used.  When
-  the --gc-sections option is given, the linker will zero out the entries
-  that are not used, so that the code for those functions need not be
-  included in the output.
-
-  VTABLE_INHERIT is a zero-space relocation used to describe to the
-  linker the inheritence tree of a C++ virtual function table.  The
-  relocation's symbol should be the parent class' vtable, and the
-  relocation should be located at the child vtable.
-
-  VTABLE_ENTRY is a zero-space relocation that describes the use of a
-  virtual function table entry.  The reloc's symbol should refer to the
-  table of the class mentioned in the code.  Off of that base, an offset
-  describes the entry that is being used.  For Rela hosts, this offset 
-  is stored in the reloc's addend.  For Rel hosts, we are forced to put
-  this offset in the reloc's section offset.
-
-ENDSENUM
-  BFD_RELOC_UNUSED
-CODE_FRAGMENT
-.
-.typedef enum bfd_reloc_code_real bfd_reloc_code_real_type;
-*/
-
-
-/*
-FUNCTION
-	bfd_reloc_type_lookup
-
-SYNOPSIS
-	reloc_howto_type *
-	bfd_reloc_type_lookup (bfd *abfd, bfd_reloc_code_real_type code);
-
-DESCRIPTION
-	Return a pointer to a howto structure which, when
-	invoked, will perform the relocation @var{code} on data from the
-	architecture noted.
-
-*/
-
-
-reloc_howto_type *
-bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  return BFD_SEND (abfd, reloc_type_lookup, (abfd, code));
-}
-
-static reloc_howto_type bfd_howto_32 =
-HOWTO (0, 00, 2, 32, false, 0, complain_overflow_bitfield, 0, "VRT32", false, 0xffffffff, 0xffffffff, true);
-
-
-/*
-INTERNAL_FUNCTION
-	bfd_default_reloc_type_lookup
-
-SYNOPSIS
-	reloc_howto_type *bfd_default_reloc_type_lookup
-	(bfd *abfd, bfd_reloc_code_real_type  code);
-
-DESCRIPTION
-	Provides a default relocation lookup routine for any architecture.
-
-
-*/
-
-reloc_howto_type *
-bfd_default_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  switch (code)
-    {
-    case BFD_RELOC_CTOR:
-      /* The type of reloc used in a ctor, which will be as wide as the
-	 address - so either a 64, 32, or 16 bitter.  */
-      switch (bfd_get_arch_info (abfd)->bits_per_address)
-	{
-	case 64:
-	  BFD_FAIL ();
-	case 32:
-	  return &bfd_howto_32;
-	case 16:
-	  BFD_FAIL ();
-	default:
-	  BFD_FAIL ();
-	}
-    default:
-      BFD_FAIL ();
-    }
-  return (reloc_howto_type *) NULL;
-}
-
-/*
-FUNCTION
-	bfd_get_reloc_code_name
-
-SYNOPSIS
-	const char *bfd_get_reloc_code_name (bfd_reloc_code_real_type code);
-
-DESCRIPTION
-	Provides a printable name for the supplied relocation code.
-	Useful mainly for printing error messages.
-*/
-
-const char *
-bfd_get_reloc_code_name (code)
-     bfd_reloc_code_real_type code;
-{
-  if (code > BFD_RELOC_UNUSED)
-    return 0;
-  return bfd_reloc_code_real_names[(int)code];
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_generic_relax_section
-
-SYNOPSIS
-	boolean bfd_generic_relax_section
-	 (bfd *abfd,
-	  asection *section,
-	  struct bfd_link_info *,
-	  boolean *);
-
-DESCRIPTION
-	Provides default handling for relaxing for back ends which
-	don't do relaxing -- i.e., does nothing.
-*/
-
-/*ARGSUSED*/
-boolean
-bfd_generic_relax_section (abfd, section, link_info, again)
-     bfd *abfd;
-     asection *section;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  *again = false;
-  return true;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_generic_gc_sections
-
-SYNOPSIS
-	boolean bfd_generic_gc_sections
-	 (bfd *, struct bfd_link_info *);
-
-DESCRIPTION
-	Provides default handling for relaxing for back ends which
-	don't do section gc -- i.e., does nothing.
-*/
-
-/*ARGSUSED*/
-boolean
-bfd_generic_gc_sections (abfd, link_info)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-{
-  return true;
-}
-
-/*
-INTERNAL_FUNCTION
-	bfd_generic_get_relocated_section_contents
-
-SYNOPSIS
-	bfd_byte *
-	   bfd_generic_get_relocated_section_contents (bfd *abfd,
-	     struct bfd_link_info *link_info,
-	     struct bfd_link_order *link_order,
-	     bfd_byte *data,
-	     boolean relocateable,
-	     asymbol **symbols);
-
-DESCRIPTION
-	Provides default handling of relocation effort for back ends
-	which can't be bothered to do it efficiently.
-
-*/
-
-bfd_byte *
-bfd_generic_get_relocated_section_contents (abfd, link_info, link_order, data,
-					    relocateable, symbols)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  /* Get enough memory to hold the stuff */
-  bfd *input_bfd = link_order->u.indirect.section->owner;
-  asection *input_section = link_order->u.indirect.section;
-
-  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
-  arelent **reloc_vector = NULL;
-  long reloc_count;
-
-  if (reloc_size < 0)
-    goto error_return;
-
-  reloc_vector = (arelent **) bfd_malloc ((size_t) reloc_size);
-  if (reloc_vector == NULL && reloc_size != 0)
-    goto error_return;
-
-  /* read in the section */
-  if (!bfd_get_section_contents (input_bfd,
-				 input_section,
-				 (PTR) data,
-				 0,
-				 input_section->_raw_size))
-    goto error_return;
-
-  /* We're not relaxing the section, so just copy the size info */
-  input_section->_cooked_size = input_section->_raw_size;
-  input_section->reloc_done = true;
-
-  reloc_count = bfd_canonicalize_reloc (input_bfd,
-					input_section,
-					reloc_vector,
-					symbols);
-  if (reloc_count < 0)
-    goto error_return;
-
-  if (reloc_count > 0)
-    {
-      arelent **parent;
-      for (parent = reloc_vector; *parent != (arelent *) NULL;
-	   parent++)
-	{
-	  char *error_message = (char *) NULL;
-	  bfd_reloc_status_type r =
-	    bfd_perform_relocation (input_bfd,
-				    *parent,
-				    (PTR) data,
-				    input_section,
-				    relocateable ? abfd : (bfd *) NULL,
-				    &error_message);
-
-	  if (relocateable)
-	    {
-	      asection *os = input_section->output_section;
-
-	      /* A partial link, so keep the relocs */
-	      os->orelocation[os->reloc_count] = *parent;
-	      os->reloc_count++;
-	    }
-
-	  if (r != bfd_reloc_ok)
-	    {
-	      switch (r)
-		{
-		case bfd_reloc_undefined:
-		  if (!((*link_info->callbacks->undefined_symbol)
-			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-			 input_bfd, input_section, (*parent)->address)))
-		    goto error_return;
-		  break;
-		case bfd_reloc_dangerous:
-		  BFD_ASSERT (error_message != (char *) NULL);
-		  if (!((*link_info->callbacks->reloc_dangerous)
-			(link_info, error_message, input_bfd, input_section,
-			 (*parent)->address)))
-		    goto error_return;
-		  break;
-		case bfd_reloc_overflow:
-		  if (!((*link_info->callbacks->reloc_overflow)
-			(link_info, bfd_asymbol_name (*(*parent)->sym_ptr_ptr),
-			 (*parent)->howto->name, (*parent)->addend,
-			 input_bfd, input_section, (*parent)->address)))
-		    goto error_return;
-		  break;
-		case bfd_reloc_outofrange:
-		default:
-		  abort ();
-		  break;
-		}
-
-	    }
-	}
-    }
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return data;
-
-error_return:
-  if (reloc_vector != NULL)
-    free (reloc_vector);
-  return NULL;
-}
diff --git a/bfd/reloc16.c b/bfd/reloc16.c
deleted file mode 100644
index 7e7952ed506..00000000000
--- a/bfd/reloc16.c
+++ /dev/null
@@ -1,334 +0,0 @@
-/* 8 and 16 bit COFF relocation functions, for BFD.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* 
-Most of this hacked by  Steve Chamberlain,
-			sac@cygnus.com 
-*/
-
-/* These routines are used by coff-h8300 and coff-z8k to do
-   relocation.
-
-   FIXME: This code should be rewritten to support the new COFF
-   linker.  Basically, they need to deal with COFF relocs rather than
-   BFD generic relocs.  They should store the relocs in some location
-   where coff_link_input_bfd can find them (and coff_link_input_bfd
-   should be changed to use this location rather than rereading the
-   file) (unless info->keep_memory is false, in which case they should
-   free up the relocs after dealing with them).  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "genlink.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-bfd_vma
-bfd_coff_reloc16_get_value (reloc, link_info, input_section)
-     arelent *reloc;
-     struct bfd_link_info *link_info;
-     asection *input_section;
-{
-  bfd_vma value;
-  asymbol *symbol = *(reloc->sym_ptr_ptr);
-  /* A symbol holds a pointer to a section, and an offset from the
-     base of the section.  To relocate, we find where the section will
-     live in the output and add that in */
-
-  if (bfd_is_und_section (symbol->section)
-      || bfd_is_com_section (symbol->section))
-    {
-      struct bfd_link_hash_entry *h;
-
-      /* The symbol is undefined in this BFD.  Look it up in the
-	 global linker hash table.  FIXME: This should be changed when
-	 we convert this stuff to use a specific final_link function
-	 and change the interface to bfd_relax_section to not require
-	 the generic symbols.  */
-      h = bfd_wrapped_link_hash_lookup (input_section->owner, link_info,
-					bfd_asymbol_name (symbol),
-					false, false, true);
-      if (h != (struct bfd_link_hash_entry *) NULL
-	  && (h->type == bfd_link_hash_defined
-	      || h->type == bfd_link_hash_defweak))
-	value = (h->u.def.value
-		 + h->u.def.section->output_section->vma
-		 + h->u.def.section->output_offset);
-      else if (h != (struct bfd_link_hash_entry *) NULL
-	       && h->type == bfd_link_hash_common)
-	value = h->u.c.size;
-      else
-	{
-	  if (! ((*link_info->callbacks->undefined_symbol)
-		 (link_info, bfd_asymbol_name (symbol),
-		  input_section->owner, input_section, reloc->address)))
-	    abort ();
-	  value = 0;
-	}
-    }
-  else 
-    {
-      value = symbol->value +
-	symbol->section->output_offset +
-	  symbol->section->output_section->vma;
-    }
-  
-  /* Add the value contained in the relocation */
-  value += reloc->addend;
-  
-  return value;
-}
-
-void
-bfd_perform_slip(abfd, slip, input_section, value)
-     bfd *abfd;
-     unsigned int slip;
-     asection *input_section;
-     bfd_vma value;
-{
-  asymbol **s;
-
-  s = _bfd_generic_link_get_symbols (abfd);
-  BFD_ASSERT (s != (asymbol **) NULL);
-
-  /* Find all symbols past this point, and make them know
-     what's happened */
-  while (*s) 
-    {
-      asymbol *p = *s;
-      if (p->section == input_section) 
-	{
-	  /* This was pointing into this section, so mangle it */
-	  if (p->value > value)
-	    {
-	      p->value -= slip;
-	      if (p->udata.p != NULL)
-		{
-		  struct generic_link_hash_entry *h;
-
-		  h = (struct generic_link_hash_entry *) p->udata.p;
-		  BFD_ASSERT (h->root.type == bfd_link_hash_defined
-			      || h->root.type == bfd_link_hash_defweak);
-		  h->root.u.def.value -= slip;
-		  BFD_ASSERT (h->root.u.def.value == p->value);
-		}
-	    }
-	}
-      s++;
-    }    
-}
-
-boolean 
-bfd_coff_reloc16_relax_section (abfd, i, link_info, again)
-     bfd *abfd;
-     asection *i;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-  /* Get enough memory to hold the stuff */
-  bfd *input_bfd = i->owner;
-  asection *input_section = i;
-  int *shrinks;
-  int shrink = 0;
-  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
-  arelent **reloc_vector = NULL;
-  long reloc_count;
-
-  /* We only do global relaxation once.  It is not safe to do it multiple
-     times (see discussion of the "shrinks" array below).  */
-  *again = false;
-
-  if (reloc_size < 0)
-    return false;
-
-  reloc_vector = (arelent **) bfd_malloc (reloc_size);
-  if (!reloc_vector && reloc_size > 0)
-    return false;
-
-  /* Get the relocs and think about them */
-  reloc_count =
-    bfd_canonicalize_reloc (input_bfd, input_section, reloc_vector,
-			    _bfd_generic_link_get_symbols (input_bfd));
-  if (reloc_count < 0)
-    {
-      free (reloc_vector);
-      return false;
-    }
-
-  /* The reloc16.c and related relaxing code is very simple, the price
-     for that simplicity is we can only call this function once for
-     each section.
-
-     So, to get the best results within that limitation, we do multiple
-     relaxing passes over each section here.  That involves keeping track
-     of the "shrink" at each reloc in the section.  This allows us to
-     accurately determine the relative location of two relocs within
-     this section.
-
-     In theory, if we kept the "shrinks" array for each section for the
-     entire link, we could use the generic relaxing code in the linker
-     and get better results, particularly for jsr->bsr and 24->16 bit
-     memory reference relaxations.  */
-     
-  if (reloc_count > 0)
-    {
-      int another_pass = 0;
-
-      /* Allocate and initialize the shrinks array for this section.  */
-      shrinks = (int *) bfd_malloc (reloc_count * sizeof (int));
-      memset (shrinks, 0, reloc_count * sizeof (int));
-
-      /* Loop until nothing changes in this section.  */
-      do {
-	arelent **parent;
-	unsigned int i;
-	long j;
-
-	another_pass = 0;
-
-	for (i = 0, parent = reloc_vector; *parent; parent++, i++) 
-	  {
-	    /* Let the target/machine dependent code examine each reloc
-	       in this section and attempt to shrink it.  */
-	    shrink = bfd_coff_reloc16_estimate (abfd, input_section, *parent,
-						shrinks[i], link_info);
-
-	    /* If it shrunk, note it in the shrinks array and set up for
-	       another pass.  */
-	    if (shrink != shrinks[i])
-	      {
-	        another_pass = 1;
-		for (j = i + 1; j < reloc_count; j++)
-		  shrinks[j] += shrink - shrinks[i];
-	      }
-	  }
-  
-      } while (another_pass);
-
-      free((char *)shrinks);
-    }
-
-  input_section->_cooked_size -= shrink;  
-  free((char *)reloc_vector);
-  return true;
-}
-
-bfd_byte *
-bfd_coff_reloc16_get_relocated_section_contents(in_abfd,
-						link_info,
-						link_order,
-						data,
-						relocateable,
-						symbols)
-     bfd *in_abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-  /* Get enough memory to hold the stuff */
-  bfd *input_bfd = link_order->u.indirect.section->owner;
-  asection *input_section = link_order->u.indirect.section;
-  long reloc_size = bfd_get_reloc_upper_bound (input_bfd, input_section);
-  arelent **reloc_vector;
-  long reloc_count;
-
-  if (reloc_size < 0)
-    return NULL;
-
-  /* If producing relocateable output, don't bother to relax.  */
-  if (relocateable)
-    return bfd_generic_get_relocated_section_contents (in_abfd, link_info,
-						       link_order,
-						       data, relocateable,
-						       symbols);
-
-  /* read in the section */
-  if (! bfd_get_section_contents(input_bfd,
-				 input_section,
-				 data,
-				 0,
-				 input_section->_raw_size))
-    return NULL;
-  
-  
-  reloc_vector = (arelent **) bfd_malloc((size_t) reloc_size);
-  if (!reloc_vector && reloc_size != 0)
-    return NULL;
-  
-  reloc_count = bfd_canonicalize_reloc (input_bfd, 
-					input_section,
-					reloc_vector,
-					symbols);
-  if (reloc_count < 0)
-    {
-      free (reloc_vector);
-      return NULL;
-    }
-    
-  if (reloc_count > 0)
-    {
-      arelent **parent = reloc_vector;
-      arelent *reloc ;
-      unsigned int dst_address = 0;
-      unsigned int src_address = 0;
-      unsigned int run;
-      unsigned int idx;
-    
-      /* Find how long a run we can do */
-      while (dst_address < link_order->size) 
-	{
-	  reloc = *parent;
-	  if (reloc) 
-	    {
-	      /* Note that the relaxing didn't tie up the addresses in the
-		 relocation, so we use the original address to work out the
-		 run of non-relocated data */
-	      run = reloc->address - src_address;
-	      parent++;
-	    }
-	  else 
-	    {
-	      run = link_order->size - dst_address;
-	    }
-	  /* Copy the bytes */
-	  for (idx = 0; idx < run; idx++)
-	    {
-	      data[dst_address++] = data[src_address++];
-	    }
-    
-	  /* Now do the relocation */
-    
-	  if (reloc) 
-	    {
-	      bfd_coff_reloc16_extra_cases (input_bfd, link_info, link_order,
-					    reloc, data, &src_address,
-					    &dst_address);
-	    }    
-	}
-    }
-  free((char *)reloc_vector);
-  return data;
-}
-
diff --git a/bfd/riscix.c b/bfd/riscix.c
deleted file mode 100644
index f5ab49a692c..00000000000
--- a/bfd/riscix.c
+++ /dev/null
@@ -1,644 +0,0 @@
-/* BFD back-end for RISC iX (Acorn, arm) binaries.
-   Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
-   Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
-   
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-/* RISC iX overloads the MAGIC field to indicate more than just the usual
-   [ZNO]MAGIC values.  Also included are squeezing information and
-   shared library usage.  */
-
-/* The following come from the man page.  */
-#define SHLIBLEN 60
-
-#define MF_IMPURE       00200
-#define MF_SQUEEZED     01000
-#define MF_USES_SL      02000
-#define MF_IS_SL        04000
-
-/* Common combinations.  */
-#define IMAGIC          (MF_IMPURE|ZMAGIC)      /* Demand load (impure text) */
-#define SPOMAGIC        (MF_USES_SL|OMAGIC)     /* OMAGIC with large header */
-                                        /* -- may contain a ref to a */
-                                        /* shared lib required by the */
-                                        /* object. */
-#define SLOMAGIC        (MF_IS_SL|OMAGIC) /* A reference to a shared library */
-                                          /* The text portion of the object */
-                                          /* contains "overflow text" from */
-                                          /* the shared library to be linked */
-                                          /* in with an object */
-#define QMAGIC          (MF_SQUEEZED|ZMAGIC)    /* Sqeezed demand paged. */
-                                          /* NOTE: This interpretation of */
-                                          /* QMAGIC seems to be at variance */
-                                          /* With that used on other */
-                                          /* architectures. */
-#define SPZMAGIC        (MF_USES_SL|ZMAGIC)     /* program which uses sl */
-#define SPQMAGIC        (MF_USES_SL|QMAGIC)     /* sqeezed ditto */
-#define SLZMAGIC        (MF_IS_SL|ZMAGIC)       /* shared lib part of prog */
-#define SLPZMAGIC       (MF_USES_SL|SLZMAGIC)   /* sl which uses another */
-
-#define N_SHARED_LIB(x) ((x).a_info & MF_USES_SL)
-
-/* Only a pure OMAGIC file has the minimal header */
-#define N_TXTOFF(x)                     \
- ((x).a_info == OMAGIC ? 32             \
-  : (N_MAGIC(x) == ZMAGIC) ? TARGET_PAGE_SIZE  \
-  : 999)
-
-#define N_TXTADDR(x)                                                         \
-  (N_MAGIC(x) != ZMAGIC ? 0 /* object file or NMAGIC */                      \
-   /* Programs with shared libs are loaded at the first page after all the   \
-      text segments of the shared library programs.  Without looking this    \
-      up we can't know exactly what the address will be.  A reasonable guess \
-      is that a_entry will be in the first page of the executable.  */       \
-   : N_SHARED_LIB(x) ? ((x).a_entry & ~(TARGET_PAGE_SIZE - 1))                      \
-   : TEXT_START_ADDR)
-
-#define N_SYMOFF(x) \
-  (N_TXTOFF (x) + (x).a_text + (x).a_data + (x).a_trsize + (x).a_drsize)
-
-#define N_STROFF(x) (N_SYMOFF (x) + (x).a_syms)
-
-#define TEXT_START_ADDR 32768
-#define TARGET_PAGE_SIZE 32768
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_arm
-
-#define MY(OP) CAT(riscix_,OP)
-#define TARGETNAME "a.out-riscix"
-#define N_BADMAG(x) ((((x).a_info & ~007200) != ZMAGIC) && \
-                     (((x).a_info & ~006000) != OMAGIC) && \
-                     ((x).a_info != NMAGIC))
-#define N_MAGIC(x) ((x).a_info & ~07200)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#define WRITE_HEADERS(abfd, execp)					   \
-  {									   \
-    bfd_size_type text_size; /* dummy vars */				   \
-    file_ptr text_end;							   \
-    if (adata(abfd).magic == undecided_magic)				   \
-      NAME(aout,adjust_sizes_and_vmas) (abfd, &text_size, &text_end);	   \
-    									   \
-    execp->a_syms = bfd_get_symcount (abfd) * EXTERNAL_NLIST_SIZE;	   \
-    execp->a_entry = bfd_get_start_address (abfd);			   \
-    									   \
-    execp->a_trsize = ((obj_textsec (abfd)->reloc_count) *		   \
-		       obj_reloc_entry_size (abfd));			   \
-    execp->a_drsize = ((obj_datasec (abfd)->reloc_count) *		   \
-		       obj_reloc_entry_size (abfd));			   \
-    NAME(aout,swap_exec_header_out) (abfd, execp, &exec_bytes);		   \
-    									   \
-    if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0) return false;	   \
-    if (bfd_write ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)		   \
-	!= EXEC_BYTES_SIZE)						   \
-      return false;							   \
-    /* Now write out reloc info, followed by syms and strings */	   \
-									   \
-    if (bfd_get_outsymbols (abfd) != (asymbol **) NULL			   \
-	&& bfd_get_symcount (abfd) != 0)				   \
-      {									   \
-	if (bfd_seek (abfd, (file_ptr)(N_SYMOFF(*execp)), SEEK_SET) != 0)  \
-	  return false;							   \
-									   \
-	if (! NAME(aout,write_syms)(abfd)) return false;		   \
-									   \
-	if (bfd_seek (abfd, (file_ptr)(N_TRELOFF(*execp)), SEEK_SET) != 0) \
-	  return false;							   \
-									   \
-	if (! riscix_squirt_out_relocs (abfd, obj_textsec (abfd)))	   \
-	  return false;							   \
-	if (bfd_seek (abfd, (file_ptr)(N_DRELOFF(*execp)), SEEK_SET) != 0) \
-	  return false;							   \
-									   \
-	if (!NAME(aout,squirt_out_relocs)(abfd, obj_datasec (abfd)))	   \
-	  return false;							   \
-      }									   \
-  }
-
-#include "libaout.h"
-#include "aout/aout64.h"
-
-static bfd_reloc_status_type
-riscix_fix_pcrel_26_done PARAMS ((bfd *, arelent *, asymbol *, PTR,
-				  asection *, bfd *, char **));
-
-static bfd_reloc_status_type
-riscix_fix_pcrel_26 PARAMS ((bfd *, arelent *, asymbol *, PTR,
-			     asection *, bfd *, char **));
-
-static reloc_howto_type riscix_std_reloc_howto[] = {
-  /* type              rs size bsz  pcrel bitpos ovrf                     sf name     part_inpl readmask  setmask    pcdone */
-  HOWTO( 0,              0,  0,   8,  false, 0, complain_overflow_bitfield,0,"8",        true, 0x000000ff,0x000000ff, false),
-  HOWTO( 1,              0,  1,   16, false, 0, complain_overflow_bitfield,0,"16",        true, 0x0000ffff,0x0000ffff, false),
-  HOWTO( 2,              0,  2,   32, false, 0, complain_overflow_bitfield,0,"32",        true, 0xffffffff,0xffffffff, false),
-  HOWTO( 3,              2,  3,   26, true, 0, complain_overflow_signed,  riscix_fix_pcrel_26 , "ARM26",      true, 0x00ffffff,0x00ffffff, false),
-  HOWTO( 4,              0,  0,   8,  true,  0, complain_overflow_signed,  0,"DISP8",     true, 0x000000ff,0x000000ff, true),
-  HOWTO( 5,              0,  1,   16, true,  0, complain_overflow_signed,  0,"DISP16",    true, 0x0000ffff,0x0000ffff, true),
-  HOWTO( 6,              0,  2,   32, true,  0, complain_overflow_signed,  0,"DISP32",    true, 0xffffffff,0xffffffff, true),
-  HOWTO( 7,              2,  3,   26, false, 0, complain_overflow_signed,  riscix_fix_pcrel_26_done, "ARM26D",true,0x00ffffff,0x00ffffff, false),
-  {-1},
-  HOWTO( 9,              0, -1,   16, false, 0, complain_overflow_bitfield,0,"NEG16",        true, 0x0000ffff,0x0000ffff, false),
-  HOWTO( 10,              0, -2,   32, false, 0, complain_overflow_bitfield,0,"NEG32",        true, 0xffffffff,0xffffffff, false)
-};
-
-#define RISCIX_TABLE_SIZE \
-  (sizeof (riscix_std_reloc_howto) / sizeof (reloc_howto_type))
-
-
-static bfd_reloc_status_type
-riscix_fix_pcrel_26_done (abfd, reloc_entry, symbol, data, input_section,
-			  output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  /* This is dead simple at present.  */
-  return bfd_reloc_ok;
-}
-
-static bfd_reloc_status_type
-riscix_fix_pcrel_26 (abfd, reloc_entry, symbol, data, input_section,
-		     output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  bfd_vma relocation;
-  bfd_size_type addr = reloc_entry->address;
-  long target = bfd_get_32 (abfd, (bfd_byte *) data + addr);
-  bfd_reloc_status_type flag = bfd_reloc_ok;
-  
-  /* If this is an undefined symbol, return error */
-  if (symbol->section == &bfd_und_section
-      && (symbol->flags & BSF_WEAK) == 0)
-    return output_bfd ? bfd_reloc_continue : bfd_reloc_undefined;
-
-  /* If the sections are different, and we are doing a partial relocation,
-     just ignore it for now.  */
-  if (symbol->section->name != input_section->name
-      && output_bfd != (bfd *)NULL)
-    return bfd_reloc_continue;
-
-  relocation = (target & 0x00ffffff) << 2;
-  relocation = (relocation ^ 0x02000000) - 0x02000000; /* Sign extend */
-  relocation += symbol->value;
-  relocation += symbol->section->output_section->vma;
-  relocation += symbol->section->output_offset;
-  relocation += reloc_entry->addend;
-  relocation -= input_section->output_section->vma;
-  relocation -= input_section->output_offset;
-  relocation -= addr;
-  if (relocation & 3)
-    return bfd_reloc_overflow;
-
-  /* Check for overflow */
-  if (relocation & 0x02000000)
-    {
-      if ((relocation & ~ (bfd_vma) 0x03ffffff) != ~ (bfd_vma) 0x03ffffff)
-	flag = bfd_reloc_overflow;
-    }
-  else if (relocation & ~0x03ffffff)
-    flag = bfd_reloc_overflow;
-
-  target &= ~0x00ffffff;
-  target |= (relocation >> 2) & 0x00ffffff;
-  bfd_put_32 (abfd, target, (bfd_byte *) data + addr);
-
-  /* Now the ARM magic... Change the reloc type so that it is marked as done.
-     Strictly this is only necessary if we are doing a partial relocation.  */
-  reloc_entry->howto = &riscix_std_reloc_howto[7];
-  
-  return flag;
-}
-
-reloc_howto_type *
-DEFUN(riscix_reloc_type_lookup,(abfd,code),
-      bfd *abfd AND
-      bfd_reloc_code_real_type code)
-{
-#define ASTD(i,j)       case i: return &riscix_std_reloc_howto[j]
-  if (code == BFD_RELOC_CTOR)
-    switch (bfd_get_arch_info (abfd)->bits_per_address)
-      {
-      case 32:
-        code = BFD_RELOC_32;
-        break;
-      default: return (reloc_howto_type *) NULL;
-      }
-
-  switch (code)
-    {
-      ASTD (BFD_RELOC_16, 1);
-      ASTD (BFD_RELOC_32, 2);
-      ASTD (BFD_RELOC_ARM_PCREL_BRANCH, 3);
-      ASTD (BFD_RELOC_8_PCREL, 4);
-      ASTD (BFD_RELOC_16_PCREL, 5);
-      ASTD (BFD_RELOC_32_PCREL, 6);
-    default: return (reloc_howto_type *) NULL;
-    }
-}
-
-#define MY_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define MY_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define MY_final_link_callback should_not_be_used
-#define MY_bfd_final_link _bfd_generic_final_link
-
-#define MY_bfd_reloc_type_lookup riscix_reloc_type_lookup
-#define MY_canonicalize_reloc riscix_canonicalize_reloc
-#define MY_object_p riscix_object_p
-
-static const bfd_target *riscix_callback PARAMS ((bfd *));
-
-void
-riscix_swap_std_reloc_out (abfd, g, natptr)
-     bfd *abfd;
-     arelent *g;
-     struct reloc_std_external *natptr;
-{
-  int r_index;
-  asymbol *sym = *(g->sym_ptr_ptr);
-  int r_extern;
-  int r_length;
-  int r_pcrel;
-  int r_neg = 0;	/* Negative relocs use the BASEREL bit.  */
-  asection *output_section = sym->section->output_section;
-
-  PUT_WORD(abfd, g->address, natptr->r_address);
-
-  r_length = g->howto->size ;   /* Size as a power of two */
-  if (r_length < 0)
-    {
-      r_length = -r_length;
-      r_neg = 1;
-    }
-
-  r_pcrel  = (int) g->howto->pc_relative; /* Relative to PC? */
-
-  /* For RISC iX, in pc-relative relocs the r_pcrel bit means that the
-     relocation has been done already (Only for the 26-bit one I think)???!!!
-     */
-  
-  if (r_length == 3)
-    r_pcrel = r_pcrel ? 0 : 1;
-  
-
-#if 0
-  /* For a standard reloc, the addend is in the object file.  */
-  r_addend = g->addend + (*(g->sym_ptr_ptr))->section->output_section->vma;
-#endif
-
-  /* name was clobbered by aout_write_syms to be symbol index */
-
-  /* If this relocation is relative to a symbol then set the
-     r_index to the symbols index, and the r_extern bit.
-
-     Absolute symbols can come in in two ways, either as an offset
-     from the abs section, or as a symbol which has an abs value.
-     check for that here
-     */
-
-  if (bfd_is_com_section (output_section)
-      || output_section == &bfd_abs_section
-      || output_section == &bfd_und_section)
-    {
-      if (bfd_abs_section.symbol == sym)
-	{
-	  /* Whoops, looked like an abs symbol, but is really an offset
-	     from the abs section */
-	  r_index = 0;
-	  r_extern = 0;
-	}
-      else
-	{
-	  /* Fill in symbol */
-	  r_extern = 1;
-	  r_index = (*g->sym_ptr_ptr)->udata.i;
-	}
-    }
-  else
-    {
-      /* Just an ordinary section */
-      r_extern = 0;
-      r_index  = output_section->target_index;
-    }
-
-  /* now the fun stuff */
-  if (bfd_header_big_endian (abfd))
-    {
-      natptr->r_index[0] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[2] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_BIG: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_BIG: 0)
-	 | (r_neg    ?   RELOC_STD_BITS_BASEREL_BIG: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_BIG));
-    }
-  else
-    {
-      natptr->r_index[2] = r_index >> 16;
-      natptr->r_index[1] = r_index >> 8;
-      natptr->r_index[0] = r_index;
-      natptr->r_type[0] =
-	(  (r_extern ?   RELOC_STD_BITS_EXTERN_LITTLE: 0)
-	 | (r_pcrel  ?   RELOC_STD_BITS_PCREL_LITTLE: 0)
-	 | (r_neg    ?   RELOC_STD_BITS_BASEREL_LITTLE: 0)
-	 | (r_length <<  RELOC_STD_BITS_LENGTH_SH_LITTLE));
-    }
-}
-
-boolean
-riscix_squirt_out_relocs (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-  arelent **generic;
-  unsigned char *native, *natptr;
-  size_t each_size;
-  
-  unsigned int count = section->reloc_count;
-  size_t natsize;
-
-  if (count == 0) return true;
-
-  each_size = obj_reloc_entry_size (abfd);
-  natsize = each_size * count;
-  native = (unsigned char *) bfd_zalloc (abfd, natsize);
-  if (!native)
-    return false;
-
-  generic = section->orelocation;
-
-  for (natptr = native;
-       count != 0;
-       --count, natptr += each_size, ++generic)
-    riscix_swap_std_reloc_out (abfd, *generic,
-			       (struct reloc_std_external *) natptr);
-
-  if ( bfd_write ((PTR) native, 1, natsize, abfd) != natsize)
-    {
-      bfd_release(abfd, native);
-      return false;
-    }
-
-  bfd_release (abfd, native);
-  return true;
-}
-
-
-/*
- * This is just like the standard aoutx.h version but we need to do our
- * own mapping of external reloc type values to howto entries.
- */
-long
-MY(canonicalize_reloc)(abfd, section, relptr, symbols)
-      bfd *abfd;
-      sec_ptr section;
-      arelent **relptr;
-      asymbol **symbols;
-{
-  arelent *tblptr = section->relocation;
-  unsigned int count, c;
-  extern reloc_howto_type NAME(aout,std_howto_table)[];
-
-  /* If we have already read in the relocation table, return the values. */
-  if (section->flags & SEC_CONSTRUCTOR) {
-    arelent_chain *chain = section->constructor_chain;
-
-    for (count = 0; count < section->reloc_count; count++) {
-      *relptr++ = &chain->relent;
-      chain = chain->next;
-    }
-    *relptr = 0;
-    return section->reloc_count;
-  }
-  if (tblptr && section->reloc_count) {
-    for (count = 0; count++ < section->reloc_count;)
-      *relptr++ = tblptr++;
-    *relptr = 0;
-    return section->reloc_count;
-  }
-
-  if (!NAME(aout,slurp_reloc_table)(abfd, section, symbols))
-    return -1;
-  tblptr = section->relocation;
-
-  /* fix up howto entries */
-  for (count = 0; count++ < section->reloc_count;)
-    {
-      c = tblptr->howto - NAME(aout,std_howto_table);
-      BFD_ASSERT (c < RISCIX_TABLE_SIZE);
-      tblptr->howto = &riscix_std_reloc_howto[c];
-
-      *relptr++ = tblptr++;
-    }
-  *relptr = 0;
-  return section->reloc_count;
-}
-
-/* This is the same as NAME(aout,some_aout_object_p), but has different 
-   expansions of the macro definitions.  */
-
-const bfd_target *
-riscix_some_aout_object_p (abfd, execp, callback_to_real_object_p)
-     bfd *abfd;
-     struct internal_exec *execp;
-     const bfd_target *(*callback_to_real_object_p) PARAMS ((bfd *));
-{
-  struct aout_data_struct *rawptr, *oldrawptr;
-  const bfd_target *result;
-
-  rawptr = ((struct aout_data_struct  *) 
-	    bfd_zalloc (abfd, sizeof (struct aout_data_struct )));
-
-  if (rawptr == NULL)
-    return 0;
-
-  oldrawptr = abfd->tdata.aout_data;
-  abfd->tdata.aout_data = rawptr;
-
-  /* Copy the contents of the old tdata struct.
-     In particular, we want the subformat, since for hpux it was set in
-     hp300hpux.c:swap_exec_header_in and will be used in
-     hp300hpux.c:callback.  */
-  if (oldrawptr != NULL)
-    *abfd->tdata.aout_data = *oldrawptr;
-
-  abfd->tdata.aout_data->a.hdr = &rawptr->e;
-  *(abfd->tdata.aout_data->a.hdr) = *execp;     /* Copy in the internal_exec
-						   struct */
-  execp = abfd->tdata.aout_data->a.hdr;
-
-  /* Set the file flags */
-  abfd->flags = BFD_NO_FLAGS;
-  if (execp->a_drsize || execp->a_trsize)
-    abfd->flags |= HAS_RELOC;
-  /* Setting of EXEC_P has been deferred to the bottom of this function */
-  if (execp->a_syms)
-    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
-  if (N_DYNAMIC(*execp))
-    abfd->flags |= DYNAMIC;
-
-								  
-  if ((execp->a_info & MF_SQUEEZED) != 0) /* Squeezed files aren't supported 
-					     (yet)! */
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  else if ((execp->a_info & MF_IS_SL) != 0)	/* Nor are shared libraries */
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  else if (N_MAGIC (*execp) == ZMAGIC)
-    {
-      abfd->flags |= D_PAGED | WP_TEXT;
-      adata (abfd).magic = z_magic;
-    }
-  else if (N_MAGIC (*execp) == NMAGIC)
-    {
-      abfd->flags |= WP_TEXT;
-      adata (abfd).magic = n_magic;
-    }
-  else if (N_MAGIC (*execp) == OMAGIC)
-    adata (abfd).magic = o_magic;
-  else
-    {
-      /* Should have been checked with N_BADMAG before this routine
-         was called.  */
-      abort ();
-    }
-
-  bfd_get_start_address (abfd) = execp->a_entry;
-
-  obj_aout_symbols (abfd) = (aout_symbol_type *)NULL;
-  bfd_get_symcount (abfd) = execp->a_syms / sizeof (struct external_nlist);
-
-  /* The default relocation entry size is that of traditional V7 Unix.  */
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-
-  /* The default symbol entry size is that of traditional Unix. */
-  obj_symbol_entry_size (abfd) = EXTERNAL_NLIST_SIZE;
-
-  obj_aout_external_syms (abfd) = NULL;
-  obj_aout_external_strings (abfd) = NULL;
-  obj_aout_sym_hashes (abfd) = NULL;
-
-  if (! NAME(aout,make_sections) (abfd))
-    return NULL;
-
-  obj_datasec (abfd)->_raw_size = execp->a_data;
-  obj_bsssec (abfd)->_raw_size = execp->a_bss;
-
-  obj_textsec (abfd)->flags =
-    (execp->a_trsize != 0
-     ? (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS | SEC_RELOC)
-     : (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS));
-  obj_datasec (abfd)->flags =
-    (execp->a_drsize != 0
-     ? (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS | SEC_RELOC)
-     : (SEC_ALLOC | SEC_LOAD | SEC_DATA | SEC_HAS_CONTENTS));
-  obj_bsssec (abfd)->flags = SEC_ALLOC;
-
-  result = (*callback_to_real_object_p)(abfd);
-
-#if defined(MACH) || defined(STAT_FOR_EXEC)
-  /* The original heuristic doesn't work in some important cases. The
-   * a.out file has no information about the text start address. For
-   * files (like kernels) linked to non-standard addresses (ld -Ttext
-   * nnn) the entry point may not be between the default text start
-   * (obj_textsec(abfd)->vma) and (obj_textsec(abfd)->vma) + text size
-   * This is not just a mach issue. Many kernels are loaded at non
-   * standard addresses.
-   */
-  {
-    struct stat stat_buf;
-    if (abfd->iostream != NULL
-	&& (abfd->flags & BFD_IN_MEMORY) == 0
-        && (fstat(fileno((FILE *) (abfd->iostream)), &stat_buf) == 0)
-        && ((stat_buf.st_mode & 0111) != 0))
-      abfd->flags |= EXEC_P;
-  }
-#else /* ! MACH */
-  /* Now that the segment addresses have been worked out, take a better
-     guess at whether the file is executable.  If the entry point
-     is within the text segment, assume it is.  (This makes files
-     executable even if their entry point address is 0, as long as
-     their text starts at zero.)
-
-     At some point we should probably break down and stat the file and
-     declare it executable if (one of) its 'x' bits are on...  */
-  if ((execp->a_entry >= obj_textsec(abfd)->vma) &&
-      (execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->_raw_size))
-    abfd->flags |= EXEC_P;
-#endif /* MACH */
-  if (result)
-    {
-    }
-  else
-    {
-      free (rawptr);
-      abfd->tdata.aout_data = oldrawptr;
-    }
-  return result;
-}
-
-
-static const bfd_target *
-MY(object_p) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;      /* Raw exec header from file */
-  struct internal_exec exec;            /* Cleaned-up exec header */
-  const bfd_target *target;
-
-  if (bfd_read ((PTR) &exec_bytes, 1, EXEC_BYTES_SIZE, abfd)
-      != EXEC_BYTES_SIZE) {
-    if (bfd_get_error () != bfd_error_system_call)
-      bfd_set_error (bfd_error_wrong_format);
-    return 0;
-  }
-
-  exec.a_info = bfd_h_get_32 (abfd, exec_bytes.e_info);
-
-  if (N_BADMAG (exec)) return 0;
-#ifdef MACHTYPE_OK
-  if (!(MACHTYPE_OK (N_MACHTYPE (exec)))) return 0;
-#endif
-
-  NAME(aout,swap_exec_header_in)(abfd, &exec_bytes, &exec);
-
-  target = riscix_some_aout_object_p (abfd, &exec, MY(callback));
-
-  return target;
-}
-
-
-#include "aout-target.h"
diff --git a/bfd/rs6000-core.c b/bfd/rs6000-core.c
deleted file mode 100644
index b20555f5d38..00000000000
--- a/bfd/rs6000-core.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/* IBM RS/6000 "XCOFF" back-end for BFD.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   FIXME: Can someone provide a transliteration of this name into ASCII?
-   Using the following chars caused a compiler warning on HIUX (so I replaced
-   them with octal escapes), and isn't useful without an understanding of what
-   character set it is.
-   Written by Metin G. Ozisik, Mimi Ph\373\364ng-Th\345o V\365, 
-     and John Gilmore.
-   Archive support from Damon A. Permezel.
-   Contributed by IBM Corporation and Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This port currently only handles reading object files, except when
-   compiled on an RS/6000 host.  -- no archive support, no core files.
-   In all cases, it does not support writing.
-
-   FIXMEmgo comments are left from Metin Ozisik's original port.
-
-   This is in a separate file from coff-rs6000.c, because it includes
-   system include files that conflict with coff/rs6000.h.
-  */
-
-/* Internalcoff.h and coffcode.h modify themselves based on this flag.  */
-#define RS6000COFF_C 1
-
-/* The AIX 4.1 kernel is obviously compiled with -D_LONG_LONG, so
-   we have to define _LONG_LONG for older versions of gcc to get the
-   proper alignments in the user structure.  */
-#if defined(_AIX41) && !defined(_LONG_LONG)
-#define _LONG_LONG
-#endif
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#ifdef AIX_CORE
-
-/* AOUTHDR is defined by the above.  We need another defn of it, from the
-   system include files.  Punt the old one and get us a new name for the
-   typedef in the system include files.  */
-#ifdef AOUTHDR
-#undef AOUTHDR
-#endif
-#define	AOUTHDR	second_AOUTHDR
-
-#undef	SCNHDR
-
-
-/* ------------------------------------------------------------------------ */
-/*	Support for core file stuff.. 					    */
-/* ------------------------------------------------------------------------ */
-
-#include <sys/user.h>
-#include <sys/ldr.h>
-#include <sys/core.h>
-
-
-/* Number of special purpose registers supported by gdb.  This value
-   should match `tm.h' in gdb directory.  Clean this mess up and use
-   the macros in sys/reg.h.  FIXMEmgo. */
-
-#define	NUM_OF_SPEC_REGS  7
-
-#define	core_hdr(bfd)		(((Rs6kCorData*)(bfd->tdata.any))->hdr)
-
-/* AIX 4.1 Changed the names and locations of a few items in the core file,
-   this seems to be the quickest easiet way to deal with it. 
-
-   Note however that encoding magic addresses (STACK_END_ADDR) is going
-   to be _very_ fragile.  But I don't see any easy way to get that info
-   right now.  */
-#ifdef CORE_VERSION_1
-#define CORE_DATA_SIZE_FIELD c_u.U_dsize
-#define CORE_COMM_FIELD c_u.U_comm
-#define SAVE_FIELD c_mst
-#define	STACK_END_ADDR 0x2ff23000
-#else
-#define CORE_DATA_SIZE_FIELD c_u.u_dsize
-#define CORE_COMM_FIELD c_u.u_comm
-#define SAVE_FIELD c_u.u_save
-#define	STACK_END_ADDR 0x2ff80000
-#endif
-
-/* These are stored in the bfd's tdata */
-typedef struct {
-  struct core_dump hdr;		/* core file header */
-} Rs6kCorData;
-
-static asection *make_bfd_asection PARAMS ((bfd *, CONST char *, flagword,
-					    bfd_size_type, bfd_vma, file_ptr));
-
-static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
-     bfd *abfd;
-     CONST char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     file_ptr filepos;
-{
-  asection *asect;
-
-  asect = bfd_make_section_anyway (abfd, name);
-  if (!asect)
-    return NULL;
-
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
-  asect->vma = vma;
-  asect->filepos = filepos;
-  asect->alignment_power = 8;
-
-  return asect;
-}
-
-/* Decide if a given bfd represents a `core' file or not. There really is no
-   magic number or anything like, in rs6000coff. */
-
-const bfd_target *
-rs6000coff_core_p (abfd)
-     bfd *abfd;
-{
-  struct core_dump coredata;
-  struct stat statbuf;
-  bfd_size_type nread;
-  char *tmpptr;
-
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
-    return NULL;
-
-  nread = bfd_read (&coredata, 1, sizeof (struct core_dump), abfd);
-  if (nread != sizeof (struct core_dump))
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (bfd_stat (abfd, &statbuf) < 0)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return NULL;
-    }
-
-  /* If the core file ulimit is too small, the system will first
-     omit the data segment, then omit the stack, then decline to
-     dump core altogether (as far as I know UBLOCK_VALID and LE_VALID
-     are always set) (this is based on experimentation on AIX 3.2).
-     Now, the thing is that GDB users will be surprised
-     if segments just silently don't appear (well, maybe they would
-     think to check "info files", I don't know).
-
-     For the data segment, we have no choice but to keep going if it's
-     not there, since the default behavior is not to dump it (regardless
-     of the ulimit, it's based on SA_FULLDUMP).  But for the stack segment,
-     if it's not there, we refuse to have anything to do with this core
-     file.  The usefulness of a core dump without a stack segment is pretty
-     limited anyway.  */
-     
-  if (!(coredata.c_flag & UBLOCK_VALID)
-      || !(coredata.c_flag & LE_VALID))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (!(coredata.c_flag & USTACK_VALID))
-    {
-      bfd_set_error (bfd_error_file_truncated);
-      return NULL;
-    }
-
-  /* Don't check the core file size for a full core, AIX 4.1 includes
-     additional shared library sections in a full core.  */
-  if (!(coredata.c_flag & (FULL_CORE | CORE_TRUNC))
-      && ((bfd_vma)coredata.c_stack + coredata.c_size) != statbuf.st_size)
-    {
-      /* If the size is wrong, it means we're misinterpreting something.  */
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Sanity check on the c_tab field.  */
-  if ((u_long) coredata.c_tab < sizeof coredata ||
-      (u_long) coredata.c_tab >= statbuf.st_size ||
-      (long) coredata.c_tab >= (long)coredata.c_stack)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Issue warning if the core file was truncated during writing.  */
-  if (coredata.c_flag & CORE_TRUNC)
-    (*_bfd_error_handler) (_("%s: warning core file truncated"),
-			   bfd_get_filename (abfd));
-
-  /* Allocate core file header.  */
-  tmpptr = (char*) bfd_zalloc (abfd, sizeof (Rs6kCorData));
-  if (!tmpptr)
-    return NULL;
-      
-  set_tdata (abfd, tmpptr);
-
-  /* Copy core file header.  */
-  core_hdr (abfd) = coredata;
-
-  /* .stack section. */
-  if (!make_bfd_asection (abfd, ".stack",
-  			  SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
-			  (bfd_size_type) coredata.c_size,
-			  (bfd_vma) (STACK_END_ADDR - coredata.c_size),
-			  (file_ptr) coredata.c_stack))
-    return NULL;
-
-  /* .reg section for GPRs and special registers. */
-  if (!make_bfd_asection (abfd, ".reg",
-  			  SEC_HAS_CONTENTS,
-			  (bfd_size_type) ((32 + NUM_OF_SPEC_REGS) * 4),
-			  (bfd_vma) 0,
-			  (file_ptr) ((char *) &coredata.SAVE_FIELD
-				      - (char *) &coredata)))
-    return NULL;
-
-  /* .reg2 section for FPRs (floating point registers). */
-  if (!make_bfd_asection (abfd, ".reg2",
-  			  SEC_HAS_CONTENTS,
-			  (bfd_size_type) 8 * 32,	/* 32 FPRs. */
-			  (bfd_vma) 0,
-			  (file_ptr) ((char *) &coredata.SAVE_FIELD.fpr[0]
-				      - (char *) &coredata)))
-    return NULL;
-
-  /* .ldinfo section.
-     To actually find out how long this section is in this particular
-     core dump would require going down the whole list of struct ld_info's.
-     See if we can just fake it.  */
-  if (!make_bfd_asection (abfd, ".ldinfo",
-  			  SEC_HAS_CONTENTS,
-			  (bfd_size_type) 0x7fffffff,
-			  (bfd_vma) 0,
-			  (file_ptr) coredata.c_tab))
-    return NULL;
-
-#ifndef CORE_VERSION_1
-  /* .data section if present.
-     AIX 3 dumps the complete data section and sets FULL_CORE if the
-     ulimit is large enough, otherwise the data section is omitted.
-     AIX 4 sets FULL_CORE even if the core file is truncated, we have
-     to examine coredata.c_datasize below to find out the actual size of
-     the .data section.  */
-  if (coredata.c_flag & FULL_CORE)
-    {
-      if (!make_bfd_asection (abfd, ".data",
-			      SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
-			      (bfd_size_type) coredata.CORE_DATA_SIZE_FIELD,
-			      (bfd_vma)
-				CDATA_ADDR (coredata.CORE_DATA_SIZE_FIELD),
-			      (file_ptr) coredata.c_stack + coredata.c_size))
-	return NULL;
-    }
-#endif
-
-#ifdef CORE_VERSION_1
-  /* AIX 4 adds data sections from loaded objects to the core file,
-     which can be found by examining ldinfo, and anonymously mmapped
-     regions.  */
-  {
-    struct ld_info ldinfo;
-    bfd_size_type ldinfo_size;
-    file_ptr ldinfo_offset = (file_ptr) coredata.c_tab;
-
-    /* .data section from executable.  */
-    if (coredata.c_datasize)
-      {
-	if (!make_bfd_asection (abfd, ".data",
-				SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
-				(bfd_size_type) coredata.c_datasize,
-				(bfd_vma)
-				  CDATA_ADDR (coredata.CORE_DATA_SIZE_FIELD),
-				(file_ptr) coredata.c_data))
-	  return NULL;
-      }
-
-    /* .data sections from loaded objects.  */
-    ldinfo_size = (char *) &ldinfo.ldinfo_filename[0]
-		  - (char *) &ldinfo.ldinfo_next;
-    while (1)
-      {
-	if (bfd_seek (abfd, ldinfo_offset, SEEK_SET) != 0)
-	  return NULL;
-	if (bfd_read (&ldinfo, ldinfo_size, 1, abfd) != ldinfo_size)
-	  return NULL;
-	if (ldinfo.ldinfo_core)
-	  {
-	    if (!make_bfd_asection (abfd, ".data",
-				    SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
-				    (bfd_size_type) ldinfo.ldinfo_datasize,
-				    (bfd_vma) ldinfo.ldinfo_dataorg,
-				    (file_ptr) ldinfo.ldinfo_core))
-	      return NULL;
-	  }
-	if (ldinfo.ldinfo_next == 0)
-	  break;
-	ldinfo_offset += ldinfo.ldinfo_next;
-      }
-
-    /* .vmdata sections from anonymously mmapped regions.  */
-    if (coredata.c_vmregions)
-      {
-	int i;
-
-	if (bfd_seek (abfd, (file_ptr) coredata.c_vmm, SEEK_SET) != 0)
-	  return NULL;
-
-	for (i = 0; i < coredata.c_vmregions; i++)
-	  {
-	    struct vm_info vminfo;
-
-	    if (bfd_read (&vminfo, sizeof (vminfo), 1, abfd) != sizeof (vminfo))
-	      return NULL;
-	    if (vminfo.vminfo_offset)
-	      {
-		if (!make_bfd_asection (abfd, ".vmdata",
-					SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS,
-					(bfd_size_type) vminfo.vminfo_size,
-					(bfd_vma) vminfo.vminfo_addr,
-					(file_ptr) vminfo.vminfo_offset))
-		  return NULL;
-	      }
-	  }
-      }
-  }
-#endif
-
-  return abfd->xvec;				/* this is garbage for now. */
-}
-
-
-
-/* return `true' if given core is from the given executable.. */
-boolean
-rs6000coff_core_file_matches_executable_p (core_bfd, exec_bfd)
-     bfd *core_bfd;
-     bfd *exec_bfd;
-{
-  struct core_dump coredata;
-  struct ld_info ldinfo;
-  bfd_size_type size;
-  char *path, *s;
-  size_t alloc;
-  const char *str1, *str2;
-  boolean ret;
-
-  if (bfd_seek (core_bfd, 0, SEEK_SET) != 0
-      || bfd_read (&coredata, sizeof coredata, 1, core_bfd) != sizeof coredata)
-    return false;
-
-  if (bfd_seek (core_bfd, (long) coredata.c_tab, SEEK_SET) != 0)
-    return false;
-
-  size = (char *) &ldinfo.ldinfo_filename[0] - (char *) &ldinfo.ldinfo_next;
-  if (bfd_read (&ldinfo, size, 1, core_bfd) != size)
-    return false;
-
-  alloc = 100;
-  path = bfd_malloc (alloc);
-  if (path == NULL)
-    return false;
-  s = path;
-
-  while (1)
-    {
-      if (bfd_read (s, 1, 1, core_bfd) != 1)
-	{
-	  free (path);
-	  return false;
-	}
-      if (*s == '\0')
-	break;
-      ++s;
-      if (s == path + alloc)
-	{
-	  char *n;
-
-	  alloc *= 2;
-	  n = bfd_realloc (path, alloc);
-	  if (n == NULL)
-	    {
-	      free (path);
-	      return false;
-	    }
-	  s = n + (path - s);
-	  path = n;
-	}
-    }
-  
-  str1 = strrchr (path, '/');
-  str2 = strrchr (exec_bfd->filename, '/');
-
-  /* step over character '/' */
-  str1 = str1 != NULL ? str1 + 1 : path;
-  str2 = str2 != NULL ? str2 + 1 : exec_bfd->filename;
-
-  if (strcmp (str1, str2) == 0)
-    ret = true;
-  else
-    ret = false;
-
-  free (path);
-
-  return ret;
-}
-
-char *
-rs6000coff_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  char *com = core_hdr (abfd).CORE_COMM_FIELD;
-  if (*com)
-    return com;
-  else
-    return 0;
-}
-
-int
-rs6000coff_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-  return core_hdr (abfd).c_signo;
-}
-
-
-boolean
-rs6000coff_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-    if (count == 0)
-	return true;
-
-    /* Reading a core file's sections will be slightly different. For the
-       rest of them we can use bfd_generic_get_section_contents () I suppose. */
-    /* Make sure this routine works for any bfd and any section. FIXMEmgo. */
-
-    if (abfd->format == bfd_core && strcmp (section->name, ".reg") == 0) {
-
-      struct mstsave mstatus;
-      int    regoffset = (char*)&mstatus.gpr[0] - (char*)&mstatus;
-
-      /* Assert that the only way this code will be executed is reading the
-         whole section. */
-      if (offset || count != (sizeof(mstatus.gpr) + (4 * NUM_OF_SPEC_REGS)))
-        (*_bfd_error_handler)
-	  (_("ERROR! in rs6000coff_get_section_contents()\n"));
-
-      /* for `.reg' section, `filepos' is a pointer to the `mstsave' structure
-         in the core file. */
-
-      /* read GPR's into the location. */
-      if ( bfd_seek(abfd, section->filepos + regoffset, SEEK_SET) == -1
-	|| bfd_read(location, sizeof (mstatus.gpr), 1, abfd) != sizeof (mstatus.gpr))
-	return (false); /* on error */
-
-      /* increment location to the beginning of special registers in the section,
-         reset register offset value to the beginning of first special register
-	 in mstsave structure, and read special registers. */
-
-      location = (PTR) ((char*)location + sizeof (mstatus.gpr));
-      regoffset = (char*)&mstatus.iar - (char*)&mstatus;
-
-      if ( bfd_seek(abfd, section->filepos + regoffset, SEEK_SET) == -1
-	|| bfd_read(location, 4 * NUM_OF_SPEC_REGS, 1, abfd) != 
-							4 * NUM_OF_SPEC_REGS)
-	return (false); /* on error */
-      
-      /* increment location address, and read the special registers.. */
-      /* FIXMEmgo */
-      return (true);
-    }
-
-    /* else, use default bfd section content transfer. */
-    else
-      return _bfd_generic_get_section_contents 
-      			(abfd, section, location, offset, count);
-}
-
-#endif /* AIX_CORE */
diff --git a/bfd/sco5-core.c b/bfd/sco5-core.c
deleted file mode 100644
index f10c8f139f6..00000000000
--- a/bfd/sco5-core.c
+++ /dev/null
@@ -1,429 +0,0 @@
-/* BFD back end for SCO5 core files (U-area and raw sections)
-   Copyright 1998 Free Software Foundation, Inc.
-   Written by Jouke Numan <jnuman@hiscom.nl>
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-
-#include <sys/user.h>           /* After a.out.h  */
-#include <sys/paccess.h>
-#include <sys/region.h>
-
-struct sco5_core_struct
-{
-  struct user u;
-};
-
-/* forward declarations */
-
-static asection *
-make_bfd_asection PARAMS ((bfd *, const char *, flagword, bfd_size_type,
-                           bfd_vma, file_ptr));
-static asymbol *sco5_core_make_empty_symbol PARAMS ((bfd *));
-static struct user *read_uarea PARAMS ((bfd *, int));
-const bfd_target *sco5_core_file_p PARAMS ((bfd *abfd));
-char *sco5_core_file_failing_command PARAMS ((bfd *abfd));
-int sco5_core_file_failing_signal PARAMS ((bfd *abfd));
-boolean sco5_core_file_matches_executable_p PARAMS ((bfd *core_bfd,
-						     bfd *exec_bfd));
-static void swap_abort PARAMS ((void));
-
-static asection *
-make_bfd_asection (abfd, name, flags, _raw_size, vma, filepos)
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     bfd_size_type _raw_size;
-     bfd_vma vma;
-     file_ptr filepos;
-{
-  asection *asect;
-
-  asect = bfd_make_section_anyway (abfd, name);
-  if (!asect)
-    return NULL;
-  asect->flags = flags;
-  asect->_raw_size = _raw_size;
-  asect->vma = vma;
-  asect->filepos = filepos;
-  asect->alignment_power = 2;
-
-  return asect;
-}
-
-static asymbol *
-sco5_core_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
- 
-static struct user *
-read_uarea(abfd, filepos)
-     bfd *abfd;
-     int filepos;
-
-{
-  struct sco5_core_struct *rawptr;
-
-  rawptr = ((struct sco5_core_struct *)
-	    bfd_zmalloc (sizeof (struct sco5_core_struct)));
-  if (rawptr == NULL)
-    return NULL;
-
-  abfd->tdata.sco5_core_data = rawptr;
-
-  if ((bfd_seek (abfd, filepos, SEEK_SET) != 0)
-      || (bfd_read ((void *)&rawptr->u, 1, sizeof rawptr->u, abfd)
-	  != sizeof rawptr->u))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* Sanity check perhaps??? */
-  if (rawptr->u.u_dsize > 0x1000000)    /* Remember, it's in pages... */
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  if (rawptr->u.u_ssize > 0x1000000)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-  return &rawptr->u;
-}
-
-/* ARGSUSED */
-const bfd_target *
-sco5_core_file_p (abfd)
-     bfd *abfd;
-{
-  int coffset_siz, val, nsecs, cheadoffs;
-  int coresize;
-  struct user *u;
-  struct coreoffsets coffsets;
-  struct coresecthead chead;
-  char *secname;
-  flagword flags;
-
-  /* Read coreoffsets region at end of core (see core(FP)) */
-
-  {
-    FILE *stream = bfd_cache_lookup (abfd);
-    struct stat statbuf;
-    if (stream == NULL)
-      return NULL;
-    if (fstat (fileno (stream), &statbuf) < 0)
-      {
-        bfd_set_error (bfd_error_system_call);
-        return NULL;
-      }
-    coresize = statbuf.st_size;
-  }
-  /* Last long in core is sizeof struct coreoffsets, read it */
-  if ((bfd_seek (abfd, coresize-sizeof coffset_siz, SEEK_SET) != 0)
-      || (bfd_read ((void *)&coffset_siz, 1, sizeof coffset_siz, abfd)
-	  != sizeof coffset_siz) )
-    {
-      bfd_set_error (bfd_error_wrong_format); 
-      return NULL;
-    }
-
-  /* Use it to seek start of coreoffsets region, read it and determine
-     validity */
-  if ((bfd_seek (abfd, coresize-coffset_siz, SEEK_SET) != 0)
-      || (bfd_read ((void *)&coffsets, 1, sizeof coffsets, abfd)
-	  != sizeof coffsets)
-      || ((coffsets.u_info != 1) && (coffsets.u_info != C_VERSION)))
-    {
-      bfd_set_error (bfd_error_wrong_format); 
-      return NULL;
-    }
-
-
-  if (coffsets.u_info == 1) 
-    { 
-      /* Old version, no section heads, read info from user struct */
-
-      u = read_uarea(abfd, coffsets.u_user);
-      if (! u)
-          return NULL;
-
-      if (!make_bfd_asection (abfd, ".reg", SEC_HAS_CONTENTS, 
-                              (bfd_size_type) coffsets.u_usize,
-                              0 - (bfd_vma) u->u_ar0,
-                              (file_ptr) coffsets.u_user))
-        return NULL;
-    
-      if (!make_bfd_asection (abfd, ".data", 
-			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS,
-                              ((bfd_size_type) u->u_exdata.ux_dsize
-			       + u->u_exdata.ux_bsize),
-                              (bfd_vma) u->u_exdata.ux_datorg,
-                              (file_ptr) coffsets.u_data))
-        return NULL;
-    
-      if (!make_bfd_asection (abfd, ".stack", 
-			      SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS, 
-                              (bfd_size_type) u->u_ssize * NBPC,
-                              (bfd_vma) u->u_sub,
-                              (file_ptr) coffsets.u_stack))
-        return NULL;
-
-      return abfd->xvec;		/* Done for version 1 */
-    }      
-
-  /* Immediately before coreoffsets region is a long with offset in core
-     to first coresecthead (CORES_OFFSETS), the long before this is the
-     number of section heads in the list. Read both longs and read the
-     coresecthead and check its validity */
-    
-  if ((bfd_seek (abfd, 
-		 coresize - coffset_siz - 2 * sizeof coffset_siz, 
-		 SEEK_SET) != 0)
-      || (bfd_read ((void *)&nsecs, 1, sizeof nsecs, abfd) != sizeof nsecs)
-      || (bfd_read ((void *)&cheadoffs, 1, sizeof cheadoffs, abfd)
-	  != sizeof cheadoffs)
-      || (bfd_seek (abfd, cheadoffs, SEEK_SET) != 0)
-      || (bfd_read ((void *)&chead, 1, sizeof chead, abfd) != sizeof chead)
-      || (chead.cs_stype != CORES_OFFSETS)
-      || (chead.cs_x.csx_magic != COREMAGIC_NUMBER))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  /* Now loop over all regions and map them */
-  nsecs--;				/* We've seen CORES_OFFSETS already */
-  for (; nsecs; nsecs--) 
-    {
-      if ((bfd_seek (abfd, chead.cs_hseek, SEEK_SET) != 0)
-	  || bfd_read ((void *)&chead, 1, sizeof chead, abfd) != sizeof chead)
-        {
-          bfd_set_error (bfd_error_wrong_format); 
-          return NULL;
-        }
-
-      switch (chead.cs_stype) 
-	{
-	case CORES_MAGIC:			/* Core header, check magic */
-	  if (chead.cs_x.csx_magic != COREMAGIC_NUMBER)
-	    {
-	      bfd_set_error (bfd_error_wrong_format);
-	      return NULL;
-	    }
-	  secname = NULL;
-	  nsecs++;				/* MAGIC not in section cnt!*/
-	  break;
-	case CORES_UAREA:			/* U-area, read in tdata */
-	  u = read_uarea(abfd, chead.cs_sseek);
-	  if (! u)
-	    return NULL;
-
-          /* This is tricky.  As the "register section", we give them
-	     the entire upage and stack.  u.u_ar0 points to where
-	     "register 0" is stored.  There are two tricks with this,
-	     though.  One is that the rest of the registers might be
-	     at positive or negative (or both) displacements from
-	     *u_ar0.  The other is that u_ar0 is sometimes an absolute
-	     address in kernel memory, and on other systems it is an
-	     offset from the beginning of the `struct user'.
-	
-	     As a practical matter, we don't know where the registers
-	     actually are, so we have to pass the whole area to GDB.
-	     We encode the value of u_ar0 by setting the .regs section
-	     up so that its virtual memory address 0 is at the place
-	     pointed to by u_ar0 (by setting the vma of the start of
-	     the section to -u_ar0).  GDB uses this info to locate the
-	     regs, using minor trickery to get around the
-	     offset-or-absolute-addr problem. */
-
-	  chead.cs_vaddr = 0 - (bfd_vma) u->u_ar0;
-
-
-          secname = ".reg";
-          flags = SEC_HAS_CONTENTS;
-
-          break;
-	case CORES_PREGION:			/* A program region, map it */
-	  switch (chead.cs_x.csx_preg.csxp_rtyp)
-	    {
-	    case PT_DATA:
-	      secname = ".data";  	/* Data region.          */
-	      break;
-	    case PT_STACK:
-	      secname = ".stack"; 	/* Stack region.         */
-	      break;
-	    case PT_SHMEM:
-	      secname = ".shmem"; 	/* Shared memory         */
-	      break;
-	    case PT_LIBDAT:
-	      secname = ".libdat";	/* Shared library data   */
-	      break;
-	    case PT_V86:
-	      secname = ".virt86";	/* Virtual 8086 mode     */
-	      break;
-	    case PT_SHFIL:
-	      secname = ".mmfile";	/* Memory mapped file    */
-	      break;
-	    case PT_XDATA0:
-	      secname = ".Xdat0"; 	/* XENIX data region, virtual 0 */
-	      break;
-	    default:
-	      secname = "";
-	    }
-	  flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-	  break;
-	case CORES_PROC:			/* struct proc */
-	case CORES_ITIMER:			/* interval timers */
-	case CORES_SCOUTSNAME:			/* struct scoutsname */
-	  secname = NULL;	/* Ignore these */
-	  break;
-        default:
-          (*_bfd_error_handler) ("Unhandled SCO core file section type %d\n",
-                                 chead.cs_stype);
-          continue;
-        }
-
-      if (secname
-	  && !make_bfd_asection (abfd, secname, flags,
-				 (bfd_size_type) chead.cs_vsize,
-				 (bfd_vma) chead.cs_vaddr,
-				 (file_ptr) chead.cs_sseek))
-        return NULL;
-
-    }
-
-  return abfd->xvec;
-
-}
-
-char *
-sco5_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-  char *com = abfd->tdata.sco5_core_data->u.u_comm;
-  if (*com)
-    return com;
-  else
-    return NULL;
-}
-
-/* ARGSUSED */
-int
-sco5_core_file_failing_signal (ignore_abfd)
-     bfd *ignore_abfd;
-{
-  return ((ignore_abfd->tdata.sco5_core_data->u.u_sysabort != 0) 
-	  ? ignore_abfd->tdata.sco5_core_data->u.u_sysabort 
-	  : -1);
-}
-
-/* ARGSUSED */
-boolean
-sco5_core_file_matches_executable_p  (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;          /* FIXME, We have no way of telling at this point */
-}
-
-#define sco5_core_get_symtab_upper_bound _bfd_nosymbols_get_symtab_upper_bound
-#define sco5_core_get_symtab _bfd_nosymbols_get_symtab
-#define sco5_core_print_symbol _bfd_nosymbols_print_symbol
-#define sco5_core_get_symbol_info _bfd_nosymbols_get_symbol_info
-#define sco5_core_bfd_is_local_label_name _bfd_nosymbols_bfd_is_local_label_name
-#define sco5_core_get_lineno _bfd_nosymbols_get_lineno
-#define sco5_core_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define sco5_core_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define sco5_core_read_minisymbols _bfd_nosymbols_read_minisymbols
-#define sco5_core_minisymbol_to_symbol _bfd_nosymbols_minisymbol_to_symbol
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define NO_GET  ((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define NO_PUT  ((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target sco5_core_vec =
-  {
-    "sco5-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_LITTLE,         /* target byte order */
-    BFD_ENDIAN_LITTLE,         /* target headers byte order */
-    (HAS_RELOC | EXEC_P |       /* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,                                                     /* symbol prefix */
-    ' ',                                                   /* ar_pad_char */
-    16,                                                    /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,      /* 16 bit hdrs */
-
-    {                           /* bfd_check_format */
-     _bfd_dummy_target,         /* unknown format */
-     _bfd_dummy_target,         /* object file */
-     _bfd_dummy_target,         /* archive */
-     sco5_core_file_p      	/* a core file */
-    },
-    {                           /* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {                           /* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (sco5),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (sco5_core),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0                     /* backend_data */
-};
diff --git a/bfd/section.c b/bfd/section.c
deleted file mode 100644
index 18778b5362f..00000000000
--- a/bfd/section.c
+++ /dev/null
@@ -1,1075 +0,0 @@
-/* Object file "section" support for the BFD library.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	Sections
-
-	The raw data contained within a BFD is maintained through the
-	section abstraction.  A single BFD may have any number of
-	sections.  It keeps hold of them by pointing to the first;
-	each one points to the next in the list.
-
-	Sections are supported in BFD in <<section.c>>.
-
-@menu
-@* Section Input::
-@* Section Output::
-@* typedef asection::
-@* section prototypes::
-@end menu
-
-INODE
-Section Input, Section Output, Sections, Sections
-SUBSECTION
-	Section input
-
-	When a BFD is opened for reading, the section structures are
-	created and attached to the BFD.
-
-	Each section has a name which describes the section in the
-	outside world---for example, <<a.out>> would contain at least
-	three sections, called <<.text>>, <<.data>> and <<.bss>>.
-
-	Names need not be unique; for example a COFF file may have several
-	sections named <<.data>>.
-
-	Sometimes a BFD will contain more than the ``natural'' number of
-	sections. A back end may attach other sections containing
-	constructor data, or an application may add a section (using
-	<<bfd_make_section>>) to the sections attached to an already open
-	BFD. For example, the linker creates an extra section
-	<<COMMON>> for each input file's BFD to hold information about
-	common storage.
-
-	The raw data is not necessarily read in when
-	the section descriptor is created. Some targets may leave the
-	data in place until a <<bfd_get_section_contents>> call is
-	made. Other back ends may read in all the data at once.  For
-	example, an S-record file has to be read once to determine the
-	size of the data. An IEEE-695 file doesn't contain raw data in
-	sections, but data and relocation expressions intermixed, so
-	the data area has to be parsed to get out the data and
-	relocations.
-
-INODE
-Section Output, typedef asection, Section Input, Sections
-
-SUBSECTION
-	Section output
-
-	To write a new object style BFD, the various sections to be
-	written have to be created. They are attached to the BFD in
-	the same way as input sections; data is written to the
-	sections using <<bfd_set_section_contents>>.
-
-	Any program that creates or combines sections (e.g., the assembler
-	and linker) must use the <<asection>> fields <<output_section>> and
-	<<output_offset>> to indicate the file sections to which each
-	section must be written.  (If the section is being created from
-	scratch, <<output_section>> should probably point to the section
-	itself and <<output_offset>> should probably be zero.)
-
-	The data to be written comes from input sections attached
-	(via <<output_section>> pointers) to
-	the output sections.  The output section structure can be
-	considered a filter for the input section: the output section
-	determines the vma of the output data and the name, but the
-	input section determines the offset into the output section of
-	the data to be written.
-
-	E.g., to create a section "O", starting at 0x100, 0x123 long,
-	containing two subsections, "A" at offset 0x0 (i.e., at vma
-	0x100) and "B" at offset 0x20 (i.e., at vma 0x120) the <<asection>>
-	structures would look like:
-
-|   section name          "A"
-|     output_offset   0x00
-|     size            0x20
-|     output_section ----------->  section name    "O"
-|                             |    vma             0x100
-|   section name          "B" |    size            0x123
-|     output_offset   0x20    |
-|     size            0x103   |
-|     output_section  --------|
-
-
-SUBSECTION
-	Link orders
-
-	The data within a section is stored in a @dfn{link_order}.
-	These are much like the fixups in <<gas>>.  The link_order
-	abstraction allows a section to grow and shrink within itself.
-
-	A link_order knows how big it is, and which is the next
-	link_order and where the raw data for it is; it also points to
-	a list of relocations which apply to it.
-
-	The link_order is used by the linker to perform relaxing on
-	final code.  The compiler creates code which is as big as
-	necessary to make it work without relaxing, and the user can
-	select whether to relax.  Sometimes relaxing takes a lot of
-	time.  The linker runs around the relocations to see if any
-	are attached to data which can be shrunk, if so it does it on
-	a link_order by link_order basis.
-
-*/
-
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-
-/*
-DOCDD
-INODE
-typedef asection, section prototypes, Section Output, Sections
-SUBSECTION
-	typedef asection
-
-	Here is the section structure:
-
-CODE_FRAGMENT
-.
-.typedef struct sec
-.{
-.        {* The name of the section; the name isn't a copy, the pointer is
-.        the same as that passed to bfd_make_section. *}
-.
-.    CONST char *name;
-.
-.        {* Which section is it; 0..nth.      *}
-.
-.   int index;
-.
-.        {* The next section in the list belonging to the BFD, or NULL. *}
-.
-.    struct sec *next;
-.
-.        {* The field flags contains attributes of the section. Some
-.           flags are read in from the object file, and some are
-.           synthesized from other information.  *}
-.
-.    flagword flags;
-.
-.#define SEC_NO_FLAGS   0x000
-.
-.        {* Tells the OS to allocate space for this section when loading.
-.           This is clear for a section containing debug information
-.           only. *}
-.#define SEC_ALLOC      0x001
-.
-.        {* Tells the OS to load the section from the file when loading.
-.           This is clear for a .bss section. *}
-.#define SEC_LOAD       0x002
-.
-.        {* The section contains data still to be relocated, so there is
-.           some relocation information too. *}
-.#define SEC_RELOC      0x004
-.
-.#if 0   {* Obsolete ? *}
-.#define SEC_BALIGN     0x008
-.#endif
-.
-.        {* A signal to the OS that the section contains read only
-.          data. *}
-.#define SEC_READONLY   0x010
-.
-.        {* The section contains code only. *}
-.#define SEC_CODE       0x020
-.
-.        {* The section contains data only. *}
-.#define SEC_DATA       0x040
-.
-.        {* The section will reside in ROM. *}
-.#define SEC_ROM        0x080
-.
-.        {* The section contains constructor information. This section
-.           type is used by the linker to create lists of constructors and
-.           destructors used by <<g++>>. When a back end sees a symbol
-.           which should be used in a constructor list, it creates a new
-.           section for the type of name (e.g., <<__CTOR_LIST__>>), attaches
-.           the symbol to it, and builds a relocation. To build the lists
-.           of constructors, all the linker has to do is catenate all the
-.           sections called <<__CTOR_LIST__>> and relocate the data
-.           contained within - exactly the operations it would peform on
-.           standard data. *}
-.#define SEC_CONSTRUCTOR 0x100
-.
-.        {* The section is a constructor, and should be placed at the
-.          end of the text, data, or bss section(?). *}
-.#define SEC_CONSTRUCTOR_TEXT 0x1100
-.#define SEC_CONSTRUCTOR_DATA 0x2100
-.#define SEC_CONSTRUCTOR_BSS  0x3100
-.
-.        {* The section has contents - a data section could be
-.           <<SEC_ALLOC>> | <<SEC_HAS_CONTENTS>>; a debug section could be
-.           <<SEC_HAS_CONTENTS>> *}
-.#define SEC_HAS_CONTENTS 0x200
-.
-.        {* An instruction to the linker to not output the section
-.           even if it has information which would normally be written. *}
-.#define SEC_NEVER_LOAD 0x400
-.
-.        {* The section is a COFF shared library section.  This flag is
-.           only for the linker.  If this type of section appears in
-.           the input file, the linker must copy it to the output file
-.           without changing the vma or size.  FIXME: Although this
-.           was originally intended to be general, it really is COFF
-.           specific (and the flag was renamed to indicate this).  It
-.           might be cleaner to have some more general mechanism to
-.           allow the back end to control what the linker does with
-.           sections. *}
-.#define SEC_COFF_SHARED_LIBRARY 0x800
-.
-.        {* The section contains common symbols (symbols may be defined
-.           multiple times, the value of a symbol is the amount of
-.           space it requires, and the largest symbol value is the one
-.           used).  Most targets have exactly one of these (which we
-.	    translate to bfd_com_section_ptr), but ECOFF has two. *}
-.#define SEC_IS_COMMON 0x8000
-.
-.        {* The section contains only debugging information.  For
-.           example, this is set for ELF .debug and .stab sections.
-.           strip tests this flag to see if a section can be
-.           discarded. *}
-.#define SEC_DEBUGGING 0x10000
-.
-.        {* The contents of this section are held in memory pointed to
-.           by the contents field.  This is checked by
-.           bfd_get_section_contents, and the data is retrieved from
-.           memory if appropriate.  *}
-.#define SEC_IN_MEMORY 0x20000
-.
-.        {* The contents of this section are to be excluded by the
-.	    linker for executable and shared objects unless those
-.	    objects are to be further relocated.  *}
-.#define SEC_EXCLUDE 0x40000
-.
-.	{* The contents of this section are to be sorted by the
-.	   based on the address specified in the associated symbol
-.	   table.  *}
-.#define SEC_SORT_ENTRIES 0x80000
-.
-.	{* When linking, duplicate sections of the same name should be
-.	   discarded, rather than being combined into a single section as
-.	   is usually done.  This is similar to how common symbols are
-.	   handled.  See SEC_LINK_DUPLICATES below.  *}
-.#define SEC_LINK_ONCE 0x100000
-.
-.	{* If SEC_LINK_ONCE is set, this bitfield describes how the linker
-.	   should handle duplicate sections.  *}
-.#define SEC_LINK_DUPLICATES 0x600000
-.
-.	{* This value for SEC_LINK_DUPLICATES means that duplicate
-.	   sections with the same name should simply be discarded. *}
-.#define SEC_LINK_DUPLICATES_DISCARD 0x0
-.
-.	{* This value for SEC_LINK_DUPLICATES means that the linker
-.	   should warn if there are any duplicate sections, although
-.	   it should still only link one copy.  *}
-.#define SEC_LINK_DUPLICATES_ONE_ONLY 0x200000
-.
-.	{* This value for SEC_LINK_DUPLICATES means that the linker
-.	   should warn if any duplicate sections are a different size.  *}
-.#define SEC_LINK_DUPLICATES_SAME_SIZE 0x400000
-.
-.	{* This value for SEC_LINK_DUPLICATES means that the linker
-.	   should warn if any duplicate sections contain different
-.	   contents.  *}
-.#define SEC_LINK_DUPLICATES_SAME_CONTENTS 0x600000
-.
-.	{* This section was created by the linker as part of dynamic
-.	   relocation or other arcane processing.  It is skipped when
-.	   going through the first-pass output, trusting that someone
-.	   else up the line will take care of it later.  *}
-.#define SEC_LINKER_CREATED 0x800000
-.
-.	{* This section should not be subject to garbage collection.  *}
-.#define SEC_KEEP 0x1000000
-.
-.	{*  End of section flags.  *}
-.
-.	{* Some internal packed boolean fields.  *}
-.
-.	{* See the vma field.  *}
-.	unsigned int user_set_vma : 1;
-.
-.	{* Whether relocations have been processed.  *}
-.	unsigned int reloc_done : 1;
-.
-.	{* A mark flag used by some of the linker backends.  *}
-.	unsigned int linker_mark : 1;
-.
-.	{* A mark flag used by some linker backends for garbage collection.  *}
-.	unsigned int gc_mark : 1;
-.
-.	{* End of internal packed boolean fields.  *}
-.
-.       {*  The virtual memory address of the section - where it will be
-.           at run time.  The symbols are relocated against this.  The
-.	    user_set_vma flag is maintained by bfd; if it's not set, the
-.	    backend can assign addresses (for example, in <<a.out>>, where
-.	    the default address for <<.data>> is dependent on the specific
-.	    target and various flags).  *}
-.
-.   bfd_vma vma;
-.
-.       {*  The load address of the section - where it would be in a
-.           rom image; really only used for writing section header
-.	    information. *}
-.
-.   bfd_vma lma;
-.
-.        {* The size of the section in bytes, as it will be output.
-.           contains a value even if the section has no contents (e.g., the
-.           size of <<.bss>>). This will be filled in after relocation *}
-.
-.   bfd_size_type _cooked_size;
-.
-.        {* The original size on disk of the section, in bytes.  Normally this
-.	    value is the same as the size, but if some relaxing has
-.	    been done, then this value will be bigger.  *}
-.
-.   bfd_size_type _raw_size;
-.
-.        {* If this section is going to be output, then this value is the
-.           offset into the output section of the first byte in the input
-.           section. E.g., if this was going to start at the 100th byte in
-.           the output section, this value would be 100. *}
-.
-.   bfd_vma output_offset;
-.
-.        {* The output section through which to map on output. *}
-.
-.   struct sec *output_section;
-.
-.        {* The alignment requirement of the section, as an exponent of 2 -
-.           e.g., 3 aligns to 2^3 (or 8). *}
-.
-.   unsigned int alignment_power;
-.
-.        {* If an input section, a pointer to a vector of relocation
-.           records for the data in this section. *}
-.
-.   struct reloc_cache_entry *relocation;
-.
-.        {* If an output section, a pointer to a vector of pointers to
-.           relocation records for the data in this section. *}
-.
-.   struct reloc_cache_entry **orelocation;
-.
-.        {* The number of relocation records in one of the above  *}
-.
-.   unsigned reloc_count;
-.
-.        {* Information below is back end specific - and not always used
-.           or updated.  *}
-.
-.        {* File position of section data    *}
-.
-.   file_ptr filepos;
-.
-.        {* File position of relocation info *}
-.
-.   file_ptr rel_filepos;
-.
-.        {* File position of line data       *}
-.
-.   file_ptr line_filepos;
-.
-.        {* Pointer to data for applications *}
-.
-.   PTR userdata;
-.
-.        {* If the SEC_IN_MEMORY flag is set, this points to the actual
-.           contents.  *}
-.   unsigned char *contents;
-.
-.        {* Attached line number information *}
-.
-.   alent *lineno;
-.
-.        {* Number of line number records   *}
-.
-.   unsigned int lineno_count;
-.
-.        {* When a section is being output, this value changes as more
-.           linenumbers are written out *}
-.
-.   file_ptr moving_line_filepos;
-.
-.        {* What the section number is in the target world  *}
-.
-.   int target_index;
-.
-.   PTR used_by_bfd;
-.
-.        {* If this is a constructor section then here is a list of the
-.           relocations created to relocate items within it. *}
-.
-.   struct relent_chain *constructor_chain;
-.
-.        {* The BFD which owns the section. *}
-.
-.   bfd *owner;
-.
-.	 {* A symbol which points at this section only *}
-.   struct symbol_cache_entry *symbol;
-.   struct symbol_cache_entry **symbol_ptr_ptr;
-.
-.   struct bfd_link_order *link_order_head;
-.   struct bfd_link_order *link_order_tail;
-.} asection ;
-.
-.    {* These sections are global, and are managed by BFD.  The application
-.       and target back end are not permitted to change the values in
-.	these sections.  New code should use the section_ptr macros rather
-.       than referring directly to the const sections.  The const sections
-.       may eventually vanish.  *}
-.#define BFD_ABS_SECTION_NAME "*ABS*"
-.#define BFD_UND_SECTION_NAME "*UND*"
-.#define BFD_COM_SECTION_NAME "*COM*"
-.#define BFD_IND_SECTION_NAME "*IND*"
-.
-.    {* the absolute section *}
-.extern const asection bfd_abs_section;
-.#define bfd_abs_section_ptr ((asection *) &bfd_abs_section)
-.#define bfd_is_abs_section(sec) ((sec) == bfd_abs_section_ptr)
-.    {* Pointer to the undefined section *}
-.extern const asection bfd_und_section;
-.#define bfd_und_section_ptr ((asection *) &bfd_und_section)
-.#define bfd_is_und_section(sec) ((sec) == bfd_und_section_ptr)
-.    {* Pointer to the common section *}
-.extern const asection bfd_com_section;
-.#define bfd_com_section_ptr ((asection *) &bfd_com_section)
-.    {* Pointer to the indirect section *}
-.extern const asection bfd_ind_section;
-.#define bfd_ind_section_ptr ((asection *) &bfd_ind_section)
-.#define bfd_is_ind_section(sec) ((sec) == bfd_ind_section_ptr)
-.
-.extern const struct symbol_cache_entry * const bfd_abs_symbol;
-.extern const struct symbol_cache_entry * const bfd_com_symbol;
-.extern const struct symbol_cache_entry * const bfd_und_symbol;
-.extern const struct symbol_cache_entry * const bfd_ind_symbol;
-.#define bfd_get_section_size_before_reloc(section) \
-.     (section->reloc_done ? (abort(),1): (section)->_raw_size)
-.#define bfd_get_section_size_after_reloc(section) \
-.     ((section->reloc_done) ? (section)->_cooked_size: (abort(),1))
-*/
-
-/* These symbols are global, not specific to any BFD.  Therefore, anything
-   that tries to change them is broken, and should be repaired.  */
-static const asymbol global_syms[] =
-{
- /* the_bfd, name, value, attr, section [, udata] */
-  {0, BFD_COM_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_com_section},
-  {0, BFD_UND_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_und_section},
-  {0, BFD_ABS_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_abs_section},
-  {0, BFD_IND_SECTION_NAME, 0, BSF_SECTION_SYM, (asection *) &bfd_ind_section},
-};
-
-#define STD_SECTION(SEC, FLAGS, SYM, NAME, IDX)	\
-  const asymbol * const SYM = (asymbol *) &global_syms[IDX]; \
-  const asection SEC = \
-    { NAME, 0, 0, FLAGS, 0, 0, 0, 0, 0, 0, 0, 0, 0, (asection *) &SEC, \
-      0, 0, 0, 0, 0, 0, 0, 0,  0, 0, 0, 0, 0, 0, 0, 0, \
-      (asymbol *) &global_syms[IDX], (asymbol **) &SYM, 0, 0 }
-
-STD_SECTION (bfd_com_section, SEC_IS_COMMON, bfd_com_symbol,
-	     BFD_COM_SECTION_NAME, 0);
-STD_SECTION (bfd_und_section, 0, bfd_und_symbol, BFD_UND_SECTION_NAME, 1);
-STD_SECTION (bfd_abs_section, 0, bfd_abs_symbol, BFD_ABS_SECTION_NAME, 2);
-STD_SECTION (bfd_ind_section, 0, bfd_ind_symbol, BFD_IND_SECTION_NAME, 3);
-#undef STD_SECTION
-
-/*
-DOCDD
-INODE
-section prototypes,  , typedef asection, Sections
-SUBSECTION
-	Section prototypes
-
-These are the functions exported by the section handling part of BFD.
-*/
-
-/*
-FUNCTION
-	bfd_get_section_by_name
-
-SYNOPSIS
-	asection *bfd_get_section_by_name(bfd *abfd, CONST char *name);
-
-DESCRIPTION
-	Run through @var{abfd} and return the one of the
-	<<asection>>s whose name matches @var{name}, otherwise <<NULL>>.
-	@xref{Sections}, for more information.
-
-	This should only be used in special cases; the normal way to process
-	all sections of a given name is to use <<bfd_map_over_sections>> and
-	<<strcmp>> on the name (or better yet, base it on the section flags
-	or something else) for each section.
-*/
-
-asection *
-bfd_get_section_by_name (abfd, name)
-     bfd *abfd;
-     CONST char *name;
-{
-  asection *sect;
-
-  for (sect = abfd->sections; sect != NULL; sect = sect->next)
-    if (!strcmp (sect->name, name))
-      return sect;
-  return NULL;
-}
-
-
-/*
-FUNCTION
-	bfd_make_section_old_way
-
-SYNOPSIS
-	asection *bfd_make_section_old_way(bfd *abfd, CONST char *name);
-
-DESCRIPTION
-	Create a new empty section called @var{name}
-	and attach it to the end of the chain of sections for the
-	BFD @var{abfd}. An attempt to create a section with a name which
-	is already in use returns its pointer without changing the
-	section chain.
-
-	It has the funny name since this is the way it used to be
-	before it was rewritten....
-
-	Possible errors are:
-	o <<bfd_error_invalid_operation>> -
-	If output has already started for this BFD.
-	o <<bfd_error_no_memory>> -
-	If memory allocation fails.
-
-*/
-
-
-asection *
-bfd_make_section_old_way (abfd, name)
-     bfd *abfd;
-     CONST char *name;
-{
-  asection *sec = bfd_get_section_by_name (abfd, name);
-  if (sec == (asection *) NULL)
-    {
-      sec = bfd_make_section (abfd, name);
-    }
-  return sec;
-}
-
-/*
-FUNCTION
-	bfd_make_section_anyway
-
-SYNOPSIS
-	asection *bfd_make_section_anyway(bfd *abfd, CONST char *name);
-
-DESCRIPTION
-   Create a new empty section called @var{name} and attach it to the end of
-   the chain of sections for @var{abfd}.  Create a new section even if there
-   is already a section with that name.
-
-   Return <<NULL>> and set <<bfd_error>> on error; possible errors are:
-   o <<bfd_error_invalid_operation>> - If output has already started for @var{abfd}.
-   o <<bfd_error_no_memory>> - If memory allocation fails.
-*/
-
-sec_ptr
-bfd_make_section_anyway (abfd, name)
-     bfd *abfd;
-     CONST char *name;
-{
-  asection *newsect;
-  asection **prev = &abfd->sections;
-  asection *sect = abfd->sections;
-
-  if (abfd->output_has_begun)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return NULL;
-    }
-
-  while (sect)
-    {
-      prev = &sect->next;
-      sect = sect->next;
-    }
-
-  newsect = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (newsect == NULL)
-    return NULL;
-
-  newsect->name = name;
-  newsect->index = abfd->section_count++;
-  newsect->flags = SEC_NO_FLAGS;
-
-  newsect->userdata = NULL;
-  newsect->contents = NULL;
-  newsect->next = (asection *) NULL;
-  newsect->relocation = (arelent *) NULL;
-  newsect->reloc_count = 0;
-  newsect->line_filepos = 0;
-  newsect->owner = abfd;
-
-  /* Create a symbol whos only job is to point to this section. This is
-     useful for things like relocs which are relative to the base of a
-     section.  */
-  newsect->symbol = bfd_make_empty_symbol (abfd);
-  if (newsect->symbol == NULL)
-    return NULL;
-  newsect->symbol->name = name;
-  newsect->symbol->value = 0;
-  newsect->symbol->section = newsect;
-  newsect->symbol->flags = BSF_SECTION_SYM;
-
-  newsect->symbol_ptr_ptr = &newsect->symbol;
-
-  if (BFD_SEND (abfd, _new_section_hook, (abfd, newsect)) != true)
-    {
-      free (newsect);
-      return NULL;
-    }
-
-  *prev = newsect;
-  return newsect;
-}
-
-/*
-FUNCTION
-	bfd_make_section
-
-SYNOPSIS
-	asection *bfd_make_section(bfd *, CONST char *name);
-
-DESCRIPTION
-   Like <<bfd_make_section_anyway>>, but return <<NULL>> (without calling
-   bfd_set_error ()) without changing the section chain if there is already a
-   section named @var{name}.  If there is an error, return <<NULL>> and set
-   <<bfd_error>>.
-*/
-
-asection *
-bfd_make_section (abfd, name)
-     bfd *abfd;
-     CONST char *name;
-{
-  asection *sect = abfd->sections;
-
-  if (strcmp (name, BFD_ABS_SECTION_NAME) == 0)
-    {
-      return bfd_abs_section_ptr;
-    }
-  if (strcmp (name, BFD_COM_SECTION_NAME) == 0)
-    {
-      return bfd_com_section_ptr;
-    }
-  if (strcmp (name, BFD_UND_SECTION_NAME) == 0)
-    {
-      return bfd_und_section_ptr;
-    }
-
-  if (strcmp (name, BFD_IND_SECTION_NAME) == 0)
-    {
-      return bfd_ind_section_ptr;
-    }
-
-  while (sect)
-    {
-      if (!strcmp (sect->name, name))
-	return NULL;
-      sect = sect->next;
-    }
-
-  /* The name is not already used; go ahead and make a new section.  */
-  return bfd_make_section_anyway (abfd, name);
-}
-
-
-/*
-FUNCTION
-	bfd_set_section_flags
-
-SYNOPSIS
-	boolean bfd_set_section_flags(bfd *abfd, asection *sec, flagword flags);
-
-DESCRIPTION
-	Set the attributes of the section @var{sec} in the BFD
-	@var{abfd} to the value @var{flags}. Return <<true>> on success,
-	<<false>> on error. Possible error returns are:
-
-	o <<bfd_error_invalid_operation>> -
-	The section cannot have one or more of the attributes
-	requested. For example, a .bss section in <<a.out>> may not
-	have the <<SEC_HAS_CONTENTS>> field set.
-
-*/
-
-/*ARGSUSED*/
-boolean
-bfd_set_section_flags (abfd, section, flags)
-     bfd *abfd;
-     sec_ptr section;
-     flagword flags;
-{
-#if 0
-  /* If you try to copy a text section from an input file (where it
-     has the SEC_CODE flag set) to an output file, this loses big if
-     the bfd_applicable_section_flags (abfd) doesn't have the SEC_CODE
-     set - which it doesn't, at least not for a.out.  FIXME */
-
-  if ((flags & bfd_applicable_section_flags (abfd)) != flags)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-#endif
-
-  section->flags = flags;
-  return true;
-}
-
-
-/*
-FUNCTION
-	bfd_map_over_sections
-
-SYNOPSIS
-	void bfd_map_over_sections(bfd *abfd,
-				   void (*func)(bfd *abfd,
-						asection *sect,
-						PTR obj),
-				   PTR obj);
-
-DESCRIPTION
-	Call the provided function @var{func} for each section
-	attached to the BFD @var{abfd}, passing @var{obj} as an
-	argument. The function will be called as if by
-
-|	func(abfd, the_section, obj);
-
-	This is the prefered method for iterating over sections; an
-	alternative would be to use a loop:
-
-|	   section *p;
-|	   for (p = abfd->sections; p != NULL; p = p->next)
-|	      func(abfd, p, ...)
-
-
-*/
-
-/*VARARGS2*/
-void
-bfd_map_over_sections (abfd, operation, user_storage)
-     bfd *abfd;
-     void (*operation) PARAMS ((bfd * abfd, asection * sect, PTR obj));
-     PTR user_storage;
-{
-  asection *sect;
-  unsigned int i = 0;
-
-  for (sect = abfd->sections; sect != NULL; i++, sect = sect->next)
-    (*operation) (abfd, sect, user_storage);
-
-  if (i != abfd->section_count)	/* Debugging */
-    abort ();
-}
-
-
-/*
-FUNCTION
-	bfd_set_section_size
-
-SYNOPSIS
-	boolean bfd_set_section_size(bfd *abfd, asection *sec, bfd_size_type val);
-
-DESCRIPTION
-	Set @var{sec} to the size @var{val}. If the operation is
-	ok, then <<true>> is returned, else <<false>>.
-
-	Possible error returns:
-	o <<bfd_error_invalid_operation>> -
-	Writing has started to the BFD, so setting the size is invalid.
-
-*/
-
-boolean
-bfd_set_section_size (abfd, ptr, val)
-     bfd *abfd;
-     sec_ptr ptr;
-     bfd_size_type val;
-{
-  /* Once you've started writing to any section you cannot create or change
-     the size of any others. */
-
-  if (abfd->output_has_begun)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  ptr->_cooked_size = val;
-  ptr->_raw_size = val;
-
-  return true;
-}
-
-/*
-FUNCTION
-	bfd_set_section_contents
-
-SYNOPSIS
-	boolean bfd_set_section_contents
-         (bfd *abfd,
-         asection *section,
-         PTR data,
-         file_ptr offset,
-         bfd_size_type count);
-
-
-DESCRIPTION
-	Sets the contents of the section @var{section} in BFD
-	@var{abfd} to the data starting in memory at @var{data}. The
-	data is written to the output section starting at offset
-	@var{offset} for @var{count} bytes.
-
-
-
-	Normally <<true>> is returned, else <<false>>. Possible error
-	returns are:
-	o <<bfd_error_no_contents>> -
-	The output section does not have the <<SEC_HAS_CONTENTS>>
-	attribute, so nothing can be written to it.
-	o and some more too
-
-	This routine is front end to the back end function
-	<<_bfd_set_section_contents>>.
-
-
-*/
-
-#define bfd_get_section_size_now(abfd,sec) \
-(sec->reloc_done \
- ? bfd_get_section_size_after_reloc (sec) \
- : bfd_get_section_size_before_reloc (sec))
-
-boolean
-bfd_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  bfd_size_type sz;
-
-  if (!(bfd_get_section_flags (abfd, section) & SEC_HAS_CONTENTS))
-    {
-      bfd_set_error (bfd_error_no_contents);
-      return (false);
-    }
-
-  if (offset < 0)
-    {
-    bad_val:
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-  sz = bfd_get_section_size_now (abfd, section);
-  if ((bfd_size_type) offset > sz
-      || count > sz
-      || offset + count > sz)
-    goto bad_val;
-
-  switch (abfd->direction)
-    {
-    case read_direction:
-    case no_direction:
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-
-    case write_direction:
-      break;
-
-    case both_direction:
-      /* File is opened for update. `output_has_begun' some time ago when
-	   the file was created.  Do not recompute sections sizes or alignments
-	   in _bfd_set_section_content.  */
-      abfd->output_has_begun = true;
-      break;
-    }
-
-  if (BFD_SEND (abfd, _bfd_set_section_contents,
-		(abfd, section, location, offset, count)))
-    {
-      abfd->output_has_begun = true;
-      return true;
-    }
-
-  return false;
-}
-
-/*
-FUNCTION
-	bfd_get_section_contents
-
-SYNOPSIS
-	boolean bfd_get_section_contents
-        (bfd *abfd, asection *section, PTR location,
-         file_ptr offset, bfd_size_type count);
-
-DESCRIPTION
-	Read data from @var{section} in BFD @var{abfd}
-	into memory starting at @var{location}. The data is read at an
-	offset of @var{offset} from the start of the input section,
-	and is read for @var{count} bytes.
-
-	If the contents of a constructor with the <<SEC_CONSTRUCTOR>>
-	flag set are requested or if the section does not have the
-	<<SEC_HAS_CONTENTS>> flag set, then the @var{location} is filled
-	with zeroes. If no errors occur, <<true>> is returned, else
-	<<false>>.
-
-
-
-*/
-boolean
-bfd_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  bfd_size_type sz;
-
-  if (section->flags & SEC_CONSTRUCTOR)
-    {
-      memset (location, 0, (unsigned) count);
-      return true;
-    }
-
-  if (offset < 0)
-    {
-    bad_val:
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-  /* Even if reloc_done is true, this function reads unrelocated
-     contents, so we want the raw size.  */
-  sz = section->_raw_size;
-  if ((bfd_size_type) offset > sz || count > sz || offset + count > sz)
-    goto bad_val;
-
-  if (count == 0)
-    /* Don't bother.  */
-    return true;
-
-  if ((section->flags & SEC_HAS_CONTENTS) == 0)
-    {
-      memset (location, 0, (unsigned) count);
-      return true;
-    }
-
-  if ((section->flags & SEC_IN_MEMORY) != 0)
-    {
-      memcpy (location, section->contents + offset, (size_t) count);
-      return true;
-    }
-
-  return BFD_SEND (abfd, _bfd_get_section_contents,
-		   (abfd, section, location, offset, count));
-}
-
-/*
-FUNCTION
-	bfd_copy_private_section_data
-
-SYNOPSIS
-	boolean bfd_copy_private_section_data(bfd *ibfd, asection *isec, bfd *obfd, asection *osec);
-
-DESCRIPTION
-	Copy private section information from @var{isec} in the BFD
-	@var{ibfd} to the section @var{osec} in the BFD @var{obfd}.
-	Return <<true>> on success, <<false>> on error.  Possible error
-	returns are:
-
-	o <<bfd_error_no_memory>> -
-	Not enough memory exists to create private data for @var{osec}.
-
-.#define bfd_copy_private_section_data(ibfd, isection, obfd, osection) \
-.     BFD_SEND (obfd, _bfd_copy_private_section_data, \
-.		(ibfd, isection, obfd, osection))
-*/
-
-/*
-FUNCTION
-	_bfd_strip_section_from_output
-
-SYNOPSIS
-	void _bfd_strip_section_from_output
-	(asection *section);
-
-DESCRIPTION
-	Remove @var{section} from the output.  If the output section becomes
-	empty, remove it from the output bfd.
-*/
-void
-_bfd_strip_section_from_output (s)
-     asection *s;
-{
-  asection **spp, *os;
-  struct bfd_link_order *p, *pp;
-
-  os = s->output_section;
-  for (p = os->link_order_head, pp = NULL; p != NULL; pp = p, p = p->next)
-    if (p->type == bfd_indirect_link_order
-	&& p->u.indirect.section == s)
-      {
-	/* Excise the input section.  */
-	if (pp)
-	  pp->next = p->next;
-	else
-	  os->link_order_head = p->next;
-	if (!p->next)
-	  os->link_order_tail = pp;
-
-	if (!os->link_order_head)
-	  {
-	    /* Excise the output section.  */
-	    for (spp = &os->owner->sections; *spp; spp = &(*spp)->next)
-	      if (*spp == os)
-		{
-		  *spp = os->next;
-		  os->owner->section_count--;
-		  break;
-		}
-	  }
-	break;
-      }
-}
diff --git a/bfd/som.c b/bfd/som.c
deleted file mode 100644
index b5786b51ed7..00000000000
--- a/bfd/som.c
+++ /dev/null
@@ -1,6264 +0,0 @@
-/* bfd back-end for HP PA-RISC SOM objects.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-
-   Contributed by the Center for Software Science at the
-   University of Utah (pa-gdb-bugs@cs.utah.edu).
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF) || defined(HOST_HPPAMPEIX)
-
-#include "libbfd.h"
-#include "som.h"
-
-#include <sys/param.h>
-#include <signal.h>
-#include <machine/reg.h>
-#include <sys/file.h>
-#include <ctype.h>
-
-/* Magic not defined in standard HP-UX header files until 8.0 */
-
-#ifndef CPU_PA_RISC1_0
-#define CPU_PA_RISC1_0 0x20B
-#endif /* CPU_PA_RISC1_0 */
-
-#ifndef CPU_PA_RISC1_1
-#define CPU_PA_RISC1_1 0x210
-#endif /* CPU_PA_RISC1_1 */
-
-#ifndef CPU_PA_RISC2_0
-#define CPU_PA_RISC2_0 0x214
-#endif /* CPU_PA_RISC2_0 */
-
-#ifndef _PA_RISC1_0_ID
-#define _PA_RISC1_0_ID CPU_PA_RISC1_0
-#endif /* _PA_RISC1_0_ID */
-
-#ifndef _PA_RISC1_1_ID
-#define _PA_RISC1_1_ID CPU_PA_RISC1_1
-#endif /* _PA_RISC1_1_ID */
-
-#ifndef _PA_RISC2_0_ID
-#define _PA_RISC2_0_ID CPU_PA_RISC2_0
-#endif /* _PA_RISC2_0_ID */
-
-#ifndef _PA_RISC_MAXID
-#define _PA_RISC_MAXID	0x2FF
-#endif /* _PA_RISC_MAXID */
-
-#ifndef _PA_RISC_ID
-#define _PA_RISC_ID(__m_num)		\
-    (((__m_num) == _PA_RISC1_0_ID) ||	\
-     ((__m_num) >= _PA_RISC1_1_ID && (__m_num) <= _PA_RISC_MAXID))
-#endif /* _PA_RISC_ID */
-
-
-/* HIUX in it's infinite stupidity changed the names for several "well
-   known" constants.  Work around such braindamage.  Try the HPUX version
-   first, then the HIUX version, and finally provide a default.  */
-#ifdef HPUX_AUX_ID
-#define EXEC_AUX_ID HPUX_AUX_ID
-#endif
-
-#if !defined (EXEC_AUX_ID) && defined (HIUX_AUX_ID)
-#define EXEC_AUX_ID HIUX_AUX_ID
-#endif
-
-#ifndef EXEC_AUX_ID
-#define EXEC_AUX_ID 0
-#endif
-
-/* Size (in chars) of the temporary buffers used during fixup and string
-   table writes.   */
-   
-#define SOM_TMP_BUFSIZE 8192
-
-/* Size of the hash table in archives.  */
-#define SOM_LST_HASH_SIZE 31
-
-/* Max number of SOMs to be found in an archive.  */
-#define SOM_LST_MODULE_LIMIT 1024
-
-/* Generic alignment macro.  */
-#define SOM_ALIGN(val, alignment) \
-  (((val) + (alignment) - 1) & ~((alignment) - 1))
-
-/* SOM allows any one of the four previous relocations to be reused
-   with a "R_PREV_FIXUP" relocation entry.  Since R_PREV_FIXUP
-   relocations are always a single byte, using a R_PREV_FIXUP instead
-   of some multi-byte relocation makes object files smaller. 
-
-   Note one side effect of using a R_PREV_FIXUP is the relocation that
-   is being repeated moves to the front of the queue.  */
-struct reloc_queue
-  {
-    unsigned char *reloc;
-    unsigned int size;
-  } reloc_queue[4];
-
-/* This fully describes the symbol types which may be attached to
-   an EXPORT or IMPORT directive.  Only SOM uses this formation
-   (ELF has no need for it).  */
-typedef enum
-{
-  SYMBOL_TYPE_UNKNOWN,
-  SYMBOL_TYPE_ABSOLUTE,
-  SYMBOL_TYPE_CODE,
-  SYMBOL_TYPE_DATA,
-  SYMBOL_TYPE_ENTRY,
-  SYMBOL_TYPE_MILLICODE,
-  SYMBOL_TYPE_PLABEL,
-  SYMBOL_TYPE_PRI_PROG,
-  SYMBOL_TYPE_SEC_PROG,
-} pa_symbol_type;
-
-struct section_to_type
-{
-  char *section;
-  char type;
-};
-
-/* Assorted symbol information that needs to be derived from the BFD symbol
-   and/or the BFD backend private symbol data.  */
-struct som_misc_symbol_info
-{
-  unsigned int symbol_type;
-  unsigned int symbol_scope;
-  unsigned int arg_reloc;
-  unsigned int symbol_info;
-  unsigned int symbol_value;
-  unsigned int priv_level;
-};
-
-/* Forward declarations */
-
-static boolean som_mkobject PARAMS ((bfd *));
-static const bfd_target * som_object_setup PARAMS ((bfd *,
-						    struct header *,
-						    struct som_exec_auxhdr *,
-						    unsigned long));
-static boolean setup_sections PARAMS ((bfd *, struct header *, unsigned long));
-static const bfd_target * som_object_p PARAMS ((bfd *));
-static boolean som_write_object_contents PARAMS ((bfd *));
-static boolean som_slurp_string_table PARAMS ((bfd *));
-static unsigned int som_slurp_symbol_table PARAMS ((bfd *));
-static long som_get_symtab_upper_bound PARAMS ((bfd *));
-static long som_canonicalize_reloc PARAMS ((bfd *, sec_ptr,
-					    arelent **, asymbol **));
-static long som_get_reloc_upper_bound PARAMS ((bfd *, sec_ptr));
-static unsigned int som_set_reloc_info PARAMS ((unsigned char *, unsigned int,
-						arelent *, asection *,
-						asymbol **, boolean));
-static boolean som_slurp_reloc_table PARAMS ((bfd *, asection *,
-					      asymbol **, boolean));
-static long som_get_symtab PARAMS ((bfd *, asymbol **));
-static asymbol * som_make_empty_symbol PARAMS ((bfd *));
-static void som_print_symbol PARAMS ((bfd *, PTR,
-				      asymbol *, bfd_print_symbol_type));
-static boolean som_new_section_hook PARAMS ((bfd *, asection *));
-static boolean som_bfd_copy_private_symbol_data PARAMS ((bfd *, asymbol *,
-							  bfd *, asymbol *));
-static boolean som_bfd_copy_private_section_data PARAMS ((bfd *, asection *,
-							  bfd *, asection *));
-static boolean som_bfd_copy_private_bfd_data PARAMS ((bfd *, bfd *));
-#define som_bfd_merge_private_bfd_data _bfd_generic_bfd_merge_private_bfd_data
-#define som_bfd_set_private_flags _bfd_generic_bfd_set_private_flags
-static boolean som_bfd_is_local_label_name PARAMS ((bfd *, const char *));
-static boolean som_set_section_contents PARAMS ((bfd *, sec_ptr, PTR,
-						 file_ptr, bfd_size_type));
-static boolean som_get_section_contents PARAMS ((bfd *, sec_ptr, PTR,
-						 file_ptr, bfd_size_type));
-static boolean som_set_arch_mach PARAMS ((bfd *, enum bfd_architecture,
-					  unsigned long));
-static boolean som_find_nearest_line PARAMS ((bfd *, asection *,
-					      asymbol **, bfd_vma,
-					      CONST char **,
-					      CONST char **,
-					      unsigned int *));
-static void som_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static asection * bfd_section_from_som_symbol PARAMS ((bfd *, 
-					struct symbol_dictionary_record *));
-static int log2 PARAMS ((unsigned int));
-static bfd_reloc_status_type hppa_som_reloc PARAMS ((bfd *, arelent *,
-						     asymbol *, PTR,
-						     asection *, bfd *,
-						     char **));
-static void som_initialize_reloc_queue PARAMS ((struct reloc_queue *));
-static void som_reloc_queue_insert PARAMS ((unsigned char *, unsigned int,
-					    struct reloc_queue *));
-static void som_reloc_queue_fix PARAMS ((struct reloc_queue *, unsigned int));
-static int som_reloc_queue_find PARAMS ((unsigned char *, unsigned int,
-					 struct reloc_queue *));
-static unsigned char * try_prev_fixup PARAMS ((bfd *, int *, unsigned char *,
-					       unsigned int,
-					       struct reloc_queue *));
-
-static unsigned char * som_reloc_skip PARAMS ((bfd *, unsigned int,
-					       unsigned char *, unsigned int *,
-					       struct reloc_queue *));
-static unsigned char * som_reloc_addend PARAMS ((bfd *, int, unsigned char *,
-					         unsigned int *,
-						 struct reloc_queue *));
-static unsigned char * som_reloc_call PARAMS ((bfd *, unsigned char *,
-					       unsigned int *,
-					       arelent *, int,
-					       struct reloc_queue *));
-static unsigned long som_count_spaces PARAMS ((bfd *));
-static unsigned long som_count_subspaces PARAMS ((bfd *));
-static int compare_syms PARAMS ((const void *, const void *));
-static int compare_subspaces PARAMS ((const void *, const void *));
-static unsigned long som_compute_checksum PARAMS ((bfd *));
-static boolean som_prep_headers PARAMS ((bfd *));
-static int som_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean som_finish_writing PARAMS ((bfd *));
-static boolean som_build_and_write_symbol_table PARAMS ((bfd *));
-static void som_prep_for_fixups PARAMS ((bfd *, asymbol **, unsigned long));
-static boolean som_write_fixups PARAMS ((bfd *, unsigned long, unsigned int *));
-static boolean som_write_space_strings PARAMS ((bfd *, unsigned long,
-						unsigned int *));
-static boolean som_write_symbol_strings PARAMS ((bfd *, unsigned long,
-						 asymbol **, unsigned int,
-						 unsigned *,
-						 COMPUNIT *));
-static boolean som_begin_writing PARAMS ((bfd *));
-static reloc_howto_type * som_bfd_reloc_type_lookup
-	PARAMS ((bfd *, bfd_reloc_code_real_type));
-static char som_section_type PARAMS ((const char *));
-static int som_decode_symclass PARAMS ((asymbol *));
-static boolean som_bfd_count_ar_symbols PARAMS ((bfd *, struct lst_header *,
-						 symindex *));
-
-static boolean som_bfd_fill_in_ar_symbols PARAMS ((bfd *, struct lst_header *,
-						   carsym **syms));
-static boolean som_slurp_armap PARAMS ((bfd *));
-static boolean som_write_armap PARAMS ((bfd *, unsigned int, struct orl *,
-					unsigned int, int));
-static void som_bfd_derive_misc_symbol_info PARAMS ((bfd *, asymbol *,
-					     struct som_misc_symbol_info *));
-static boolean som_bfd_prep_for_ar_write PARAMS ((bfd *, unsigned int *,
-						  unsigned int *));
-static unsigned int som_bfd_ar_symbol_hash PARAMS ((asymbol *));
-static boolean som_bfd_ar_write_symbol_stuff PARAMS ((bfd *, unsigned int,
-						      unsigned int,
-						      struct lst_header,
-						      unsigned int));
-static boolean som_is_space PARAMS ((asection *));
-static boolean som_is_subspace PARAMS ((asection *));
-static boolean som_is_container PARAMS ((asection *, asection *));
-static boolean som_bfd_free_cached_info PARAMS ((bfd *));
-static boolean som_bfd_link_split_section PARAMS ((bfd *, asection *));
-	
-/* Map SOM section names to POSIX/BSD single-character symbol types.
-
-   This table includes all the standard subspaces as defined in the 
-   current "PRO ABI for PA-RISC Systems", $UNWIND$ which for 
-   some reason was left out, and sections specific to embedded stabs.  */
-
-static const struct section_to_type stt[] = {
-  {"$TEXT$", 't'},
-  {"$SHLIB_INFO$", 't'},
-  {"$MILLICODE$", 't'},
-  {"$LIT$", 't'},
-  {"$CODE$", 't'},
-  {"$UNWIND_START$", 't'},
-  {"$UNWIND$", 't'},
-  {"$PRIVATE$", 'd'},
-  {"$PLT$", 'd'},
-  {"$SHLIB_DATA$", 'd'},
-  {"$DATA$", 'd'},
-  {"$SHORTDATA$", 'g'},
-  {"$DLT$", 'd'},
-  {"$GLOBAL$", 'g'},
-  {"$SHORTBSS$", 's'},
-  {"$BSS$", 'b'},
-  {"$GDB_STRINGS$", 'N'},
-  {"$GDB_SYMBOLS$", 'N'},
-  {0, 0}
-};
-
-/* About the relocation formatting table...
-
-   There are 256 entries in the table, one for each possible
-   relocation opcode available in SOM.  We index the table by
-   the relocation opcode.  The names and operations are those
-   defined by a.out_800 (4).
-
-   Right now this table is only used to count and perform minimal
-   processing on relocation streams so that they can be internalized
-   into BFD and symbolically printed by utilities.  To make actual use 
-   of them would be much more difficult, BFD's concept of relocations
-   is far too simple to handle SOM relocations.  The basic assumption
-   that a relocation can be completely processed independent of other
-   relocations before an object file is written is invalid for SOM.
-
-   The SOM relocations are meant to be processed as a stream, they
-   specify copying of data from the input section to the output section
-   while possibly modifying the data in some manner.  They also can 
-   specify that a variable number of zeros or uninitialized data be
-   inserted on in the output segment at the current offset.  Some
-   relocations specify that some previous relocation be re-applied at
-   the current location in the input/output sections.  And finally a number
-   of relocations have effects on other sections (R_ENTRY, R_EXIT,
-   R_UNWIND_AUX and a variety of others).  There isn't even enough room
-   in the BFD relocation data structure to store enough information to
-   perform all the relocations.
-
-   Each entry in the table has three fields. 
-
-   The first entry is an index into this "class" of relocations.  This
-   index can then be used as a variable within the relocation itself.
-
-   The second field is a format string which actually controls processing
-   of the relocation.  It uses a simple postfix machine to do calculations
-   based on variables/constants found in the string and the relocation
-   stream.  
-
-   The third field specifys whether or not this relocation may use 
-   a constant (V) from the previous R_DATA_OVERRIDE rather than a constant
-   stored in the instruction.
-
-   Variables:  
-  
-   L = input space byte count
-   D = index into class of relocations
-   M = output space byte count
-   N = statement number (unused?)
-   O = stack operation
-   R = parameter relocation bits
-   S = symbol index
-   T = first 32 bits of stack unwind information
-   U = second 32 bits of stack unwind information
-   V = a literal constant (usually used in the next relocation)
-   P = a previous relocation
-  
-   Lower case letters (starting with 'b') refer to following 
-   bytes in the relocation stream.  'b' is the next 1 byte,
-   c is the next 2 bytes, d is the next 3 bytes, etc...  
-   This is the variable part of the relocation entries that
-   makes our life a living hell.
-
-   numerical constants are also used in the format string.  Note
-   the constants are represented in decimal. 
-
-   '+', "*" and "=" represents the obvious postfix operators.
-   '<' represents a left shift. 
-
-   Stack Operations:
-
-   Parameter Relocation Bits:
-
-   Unwind Entries:  
-   
-   Previous Relocations:  The index field represents which in the queue
-   of 4 previous fixups should be re-applied.
-
-   Literal Constants:  These are generally used to represent addend
-   parts of relocations when these constants are not stored in the
-   fields of the instructions themselves.  For example the instruction
-   addil foo-$global$-0x1234 would use an override for "0x1234" rather
-   than storing it into the addil itself.  */
-
-struct fixup_format
-{
-  int D;
-  char *format;
-};
-
-static const struct fixup_format som_fixup_formats[256] =
-{
-  /* R_NO_RELOCATION */
-  0,   "LD1+4*=",       /* 0x00 */
-  1,   "LD1+4*=",	/* 0x01 */
-  2,   "LD1+4*=",	/* 0x02 */
-  3,   "LD1+4*=",	/* 0x03 */
-  4,   "LD1+4*=",	/* 0x04 */
-  5,   "LD1+4*=",	/* 0x05 */
-  6,   "LD1+4*=",	/* 0x06 */
-  7,   "LD1+4*=",	/* 0x07 */
-  8,   "LD1+4*=",	/* 0x08 */
-  9,   "LD1+4*=",	/* 0x09 */
-  10,  "LD1+4*=",	/* 0x0a */
-  11,  "LD1+4*=",	/* 0x0b */
-  12,  "LD1+4*=",	/* 0x0c */
-  13,  "LD1+4*=",	/* 0x0d */
-  14,  "LD1+4*=",	/* 0x0e */
-  15,  "LD1+4*=",	/* 0x0f */
-  16,  "LD1+4*=",	/* 0x10 */
-  17,  "LD1+4*=",	/* 0x11 */
-  18,  "LD1+4*=",	/* 0x12 */
-  19,  "LD1+4*=",	/* 0x13 */
-  20,  "LD1+4*=",	/* 0x14 */
-  21,  "LD1+4*=",	/* 0x15 */
-  22,  "LD1+4*=",	/* 0x16 */
-  23,  "LD1+4*=",	/* 0x17 */
-  0,   "LD8<b+1+4*=",	/* 0x18 */
-  1,   "LD8<b+1+4*=",	/* 0x19 */
-  2,   "LD8<b+1+4*=",	/* 0x1a */
-  3,   "LD8<b+1+4*=",	/* 0x1b */
-  0,   "LD16<c+1+4*=",	/* 0x1c */
-  1,   "LD16<c+1+4*=",	/* 0x1d */
-  2,   "LD16<c+1+4*=",	/* 0x1e */
-  0,   "Ld1+=",         /* 0x1f */
-  /* R_ZEROES */
-  0,    "Lb1+4*=",	/* 0x20 */
-  1,    "Ld1+=",	/* 0x21 */
-  /* R_UNINIT */
-  0,    "Lb1+4*=",	/* 0x22 */
-  1,    "Ld1+=",	/* 0x23 */
-  /* R_RELOCATION */
-  0,    "L4=",          /* 0x24 */
-  /* R_DATA_ONE_SYMBOL */
-  0,    "L4=Sb=",	/* 0x25 */
-  1,    "L4=Sd=",	/* 0x26 */
-  /* R_DATA_PLEBEL */
-  0,    "L4=Sb=",	/* 0x27 */
-  1,    "L4=Sd=",	/* 0x28 */
-  /* R_SPACE_REF */
-  0,    "L4=",          /* 0x29 */
-  /* R_REPEATED_INIT */
-  0,    "L4=Mb1+4*=",	/* 0x2a */
-  1,    "Lb4*=Mb1+L*=",	/* 0x2b */
-  2,    "Lb4*=Md1+4*=",	/* 0x2c */
-  3,    "Ld1+=Me1+=",	/* 0x2d */
-  /* R_SHORT_PCREL_MODE */
-  0,   	"",	        /* 0x2e */
-  /* R_LONG_PCREL_MODE */
-  0,   	"",	        /* 0x2f */
-  /* R_PCREL_CALL */
-  0,    "L4=RD=Sb=",	/* 0x30 */
-  1,    "L4=RD=Sb=",	/* 0x31 */
-  2,    "L4=RD=Sb=",	/* 0x32 */
-  3,    "L4=RD=Sb=",	/* 0x33 */
-  4,    "L4=RD=Sb=",	/* 0x34 */
-  5,    "L4=RD=Sb=",	/* 0x35 */
-  6,    "L4=RD=Sb=",	/* 0x36 */
-  7,    "L4=RD=Sb=",	/* 0x37 */
-  8,    "L4=RD=Sb=",	/* 0x38 */
-  9,    "L4=RD=Sb=",	/* 0x39 */
-  0,    "L4=RD8<b+=Sb=",/* 0x3a */
-  1,    "L4=RD8<b+=Sb=",/* 0x3b */
-  0,    "L4=RD8<b+=Sd=",/* 0x3c */
-  1,    "L4=RD8<b+=Sd=",/* 0x3d */
-  /* R_RESERVED */
-  0,    "",	        /* 0x3e */
-  0,    "",	        /* 0x3f */
-  /* R_ABS_CALL */
-  0,    "L4=RD=Sb=",	/* 0x40 */
-  1,    "L4=RD=Sb=",	/* 0x41 */
-  2,    "L4=RD=Sb=",	/* 0x42 */
-  3,    "L4=RD=Sb=",	/* 0x43 */
-  4,    "L4=RD=Sb=",	/* 0x44 */
-  5,    "L4=RD=Sb=",	/* 0x45 */
-  6,    "L4=RD=Sb=",	/* 0x46 */
-  7,    "L4=RD=Sb=",	/* 0x47 */
-  8,    "L4=RD=Sb=",	/* 0x48 */
-  9,    "L4=RD=Sb=",	/* 0x49 */
-  0,    "L4=RD8<b+=Sb=",/* 0x4a */
-  1,    "L4=RD8<b+=Sb=",/* 0x4b */
-  0,    "L4=RD8<b+=Sd=",/* 0x4c */
-  1,    "L4=RD8<b+=Sd=",/* 0x4d */
-  /* R_RESERVED */
-  0,     "",	        /* 0x4e */
-  0,     "",	        /* 0x4f */
-  /* R_DP_RELATIVE */
-  0,    "L4=SD=",	/* 0x50 */
-  1,    "L4=SD=",	/* 0x51 */
-  2,    "L4=SD=",	/* 0x52 */
-  3,    "L4=SD=",	/* 0x53 */
-  4,    "L4=SD=",	/* 0x54 */
-  5,    "L4=SD=",	/* 0x55 */
-  6,    "L4=SD=",	/* 0x56 */
-  7,    "L4=SD=",	/* 0x57 */
-  8,    "L4=SD=",	/* 0x58 */
-  9,    "L4=SD=",	/* 0x59 */
-  10,   "L4=SD=",	/* 0x5a */
-  11,   "L4=SD=",	/* 0x5b */
-  12,   "L4=SD=",	/* 0x5c */
-  13,   "L4=SD=",	/* 0x5d */
-  14,   "L4=SD=",	/* 0x5e */
-  15,   "L4=SD=",	/* 0x5f */
-  16,   "L4=SD=",	/* 0x60 */
-  17,   "L4=SD=",	/* 0x61 */
-  18,   "L4=SD=",	/* 0x62 */
-  19,   "L4=SD=",	/* 0x63 */
-  20,   "L4=SD=",	/* 0x64 */
-  21,   "L4=SD=",	/* 0x65 */
-  22,   "L4=SD=",	/* 0x66 */
-  23,   "L4=SD=",	/* 0x67 */
-  24,   "L4=SD=",	/* 0x68 */
-  25,   "L4=SD=",	/* 0x69 */
-  26,   "L4=SD=",	/* 0x6a */
-  27,   "L4=SD=",	/* 0x6b */
-  28,   "L4=SD=",	/* 0x6c */
-  29,   "L4=SD=",	/* 0x6d */
-  30,   "L4=SD=",	/* 0x6e */
-  31,   "L4=SD=",	/* 0x6f */
-  32,   "L4=Sb=",	/* 0x70 */
-  33,   "L4=Sd=",	/* 0x71 */
-  /* R_RESERVED */
-  0,    "",	        /* 0x72 */
-  0,    "",	        /* 0x73 */
-  0,    "",	        /* 0x74 */
-  0,    "",	        /* 0x75 */
-  0,    "",	        /* 0x76 */
-  0,    "",      	/* 0x77 */
-  /* R_DLT_REL */
-  0,    "L4=Sb=",	/* 0x78 */
-  1,    "L4=Sd=",	/* 0x79 */
-  /* R_RESERVED */
-  0,    "",        	/* 0x7a */
-  0,    "",	        /* 0x7b */
-  0,    "",	        /* 0x7c */
-  0,    "",	        /* 0x7d */
-  0,    "",	        /* 0x7e */
-  0,    "",	        /* 0x7f */
-  /* R_CODE_ONE_SYMBOL */
-  0,    "L4=SD=",	/* 0x80 */
-  1,    "L4=SD=",	/* 0x81 */
-  2,    "L4=SD=",	/* 0x82 */
-  3,    "L4=SD=",	/* 0x83 */
-  4,    "L4=SD=",	/* 0x84 */
-  5,    "L4=SD=",	/* 0x85 */
-  6,    "L4=SD=",	/* 0x86 */
-  7,    "L4=SD=",	/* 0x87 */
-  8,    "L4=SD=",	/* 0x88 */
-  9,    "L4=SD=",	/* 0x89 */
-  10,   "L4=SD=",	/* 0x8q */
-  11,   "L4=SD=",	/* 0x8b */
-  12,   "L4=SD=",	/* 0x8c */
-  13,   "L4=SD=",	/* 0x8d */
-  14,   "L4=SD=",	/* 0x8e */
-  15,   "L4=SD=",	/* 0x8f */
-  16,   "L4=SD=",	/* 0x90 */
-  17,   "L4=SD=",	/* 0x91 */
-  18,   "L4=SD=",	/* 0x92 */
-  19,   "L4=SD=",	/* 0x93 */
-  20,   "L4=SD=",	/* 0x94 */
-  21,   "L4=SD=",	/* 0x95 */
-  22,   "L4=SD=",	/* 0x96 */
-  23,   "L4=SD=",	/* 0x97 */
-  24,   "L4=SD=",	/* 0x98 */
-  25,   "L4=SD=",	/* 0x99 */
-  26,   "L4=SD=",	/* 0x9a */
-  27,   "L4=SD=",	/* 0x9b */
-  28,   "L4=SD=",	/* 0x9c */
-  29,   "L4=SD=",	/* 0x9d */
-  30,   "L4=SD=",	/* 0x9e */
-  31,   "L4=SD=",	/* 0x9f */
-  32,   "L4=Sb=",	/* 0xa0 */
-  33,   "L4=Sd=",	/* 0xa1 */
-  /* R_RESERVED */
-  0,    "",	        /* 0xa2 */
-  0,    "",	        /* 0xa3 */
-  0,    "",	        /* 0xa4 */
-  0,    "",	        /* 0xa5 */
-  0,    "",	        /* 0xa6 */
-  0,    "",	        /* 0xa7 */
-  0,    "",	        /* 0xa8 */
-  0,    "",	        /* 0xa9 */
-  0,    "",	        /* 0xaa */
-  0,    "",	        /* 0xab */
-  0,    "",	        /* 0xac */
-  0,    "",	        /* 0xad */
-  /* R_MILLI_REL */
-  0,    "L4=Sb=",	/* 0xae */
-  1,    "L4=Sd=",	/* 0xaf */
-  /* R_CODE_PLABEL */
-  0,    "L4=Sb=",	/* 0xb0 */
-  1,    "L4=Sd=",	/* 0xb1 */
-  /* R_BREAKPOINT */
-  0,    "L4=",	        /* 0xb2 */
-  /* R_ENTRY */
-  0,    "Te=Ue=",       /* 0xb3 */
-  1,    "Uf=",	        /* 0xb4 */
-  /* R_ALT_ENTRY */
-  0,    "",	        /* 0xb5 */
-  /* R_EXIT */
-  0,    "",		/* 0xb6 */
-  /* R_BEGIN_TRY */
-  0,    "",	        /* 0xb7 */
-  /* R_END_TRY */
-  0,    "R0=",	        /* 0xb8 */
-  1,    "Rb4*=",	/* 0xb9 */
-  2,    "Rd4*=",	/* 0xba */
-  /* R_BEGIN_BRTAB */
-  0,    "",	        /* 0xbb */
-  /* R_END_BRTAB */
-  0,    "",	        /* 0xbc */
-  /* R_STATEMENT */
-  0,    "Nb=",	        /* 0xbd */
-  1,    "Nc=",	        /* 0xbe */
-  2,    "Nd=",	        /* 0xbf */
-  /* R_DATA_EXPR */
-  0,    "L4=",	        /* 0xc0 */
-  /* R_CODE_EXPR */
-  0,    "L4=",	        /* 0xc1 */
-  /* R_FSEL */
-  0,    "",		/* 0xc2 */
-  /* R_LSEL */
-  0,    "",		/* 0xc3 */
-  /* R_RSEL */
-  0,    "",		/* 0xc4 */
-  /* R_N_MODE */
-  0,    "",		/* 0xc5 */
-  /* R_S_MODE */
-  0,    "",		/* 0xc6 */
-  /* R_D_MODE */
-  0,    "",		/* 0xc7 */
-  /* R_R_MODE */
-  0,    "",		/* 0xc8 */
-  /* R_DATA_OVERRIDE */
-  0,    "V0=",	        /* 0xc9 */
-  1,    "Vb=",	        /* 0xca */
-  2,    "Vc=",	        /* 0xcb */
-  3,    "Vd=",	        /* 0xcc */
-  4,    "Ve=",	        /* 0xcd */
-  /* R_TRANSLATED */
-  0,    "",	        /* 0xce */
-  /* R_RESERVED */
-  0,    "",	        /* 0xcf */
-  /* R_COMP1 */
-  0,    "Ob=",	        /* 0xd0 */
-  /* R_COMP2 */
-  0,    "Ob=Sd=",	/* 0xd1 */
-  /* R_COMP3 */
-  0,    "Ob=Ve=",	/* 0xd2 */
-  /* R_PREV_FIXUP */
-  0,    "P",   	        /* 0xd3 */
-  1,    "P",	        /* 0xd4 */
-  2,    "P",	        /* 0xd5 */
-  3,    "P",	        /* 0xd6 */
-  /* R_SEC_STMT */
-  0,	"",		/* 0xd7 */
-  /* R_N0SEL */
-  0,	"",		/* 0xd8 */
-  /* R_N1SEL */
-  0,	"",		/* 0xd9 */
-  /* R_LINETAB */
-  0,	"",		/* 0xda */
-  /* R_LINETAB_ESC */
-  0,	"",		/* 0xdb */
-  /* R_LTP_OVERRIDE */
-  0,	"",		/* 0xdc */
-  /* R_COMMENT */
-  0,	"",		/* 0xdd */
-  /* R_RESERVED */
-  0,	"",		/* 0xde */
-  0,	"",		/* 0xdf */
-  0,	"",		/* 0xe0 */
-  0,	"",		/* 0xe1 */
-  0,	"",		/* 0xe2 */
-  0,	"",		/* 0xe3 */
-  0,	"",		/* 0xe4 */
-  0,	"",		/* 0xe5 */
-  0,	"",		/* 0xe6 */
-  0,	"",		/* 0xe7 */
-  0,	"",		/* 0xe8 */
-  0,	"",		/* 0xe9 */
-  0,	"",		/* 0xea */
-  0,	"",		/* 0xeb */
-  0,	"",		/* 0xec */
-  0,	"",		/* 0xed */
-  0,	"",		/* 0xee */
-  0,	"",		/* 0xef */
-  0,	"",		/* 0xf0 */
-  0,	"",		/* 0xf1 */
-  0,	"",		/* 0xf2 */
-  0,	"",		/* 0xf3 */
-  0,	"",		/* 0xf4 */
-  0,	"",		/* 0xf5 */
-  0,	"",		/* 0xf6 */
-  0,	"",		/* 0xf7 */
-  0,	"",		/* 0xf8 */
-  0,	"",		/* 0xf9 */
-  0,	"",		/* 0xfa */
-  0,	"",		/* 0xfb */
-  0,	"",		/* 0xfc */
-  0,	"",		/* 0xfd */
-  0,	"",		/* 0xfe */
-  0,	"",		/* 0xff */
-};
-
-static const int comp1_opcodes[] =
-{
-  0x00,
-  0x40,
-  0x41,
-  0x42,
-  0x43,
-  0x44,
-  0x45,
-  0x46,
-  0x47,
-  0x48,
-  0x49,
-  0x4a,
-  0x4b,
-  0x60,
-  0x80,
-  0xa0,
-  0xc0,
-  -1
-};
-
-static const int comp2_opcodes[] =
-{
-  0x00,
-  0x80,
-  0x82,
-  0xc0,
-  -1
-};
-
-static const int comp3_opcodes[] =
-{
-  0x00,
-  0x02,
-  -1
-};
-
-/* These apparently are not in older versions of hpux reloc.h (hpux7).  */
-#ifndef R_DLT_REL
-#define R_DLT_REL 0x78
-#endif
-
-#ifndef R_AUX_UNWIND
-#define R_AUX_UNWIND 0xcf
-#endif
-
-#ifndef R_SEC_STMT
-#define R_SEC_STMT 0xd7
-#endif
-
-/* And these first appeared in hpux10.  */
-#ifndef R_SHORT_PCREL_MODE
-#define R_SHORT_PCREL_MODE 0x3e
-#endif
-
-#ifndef R_LONG_PCREL_MODE
-#define R_LONG_PCREL_MODE 0x3f
-#endif
-
-#ifndef R_N0SEL
-#define R_N0SEL 0xd8
-#endif
-
-#ifndef R_N1SEL
-#define R_N1SEL 0xd9
-#endif
-
-#ifndef R_LINETAB
-#define R_LINETAB 0xda
-#endif
-
-#ifndef R_LINETAB_ESC
-#define R_LINETAB_ESC 0xdb
-#endif
-
-#ifndef R_LTP_OVERRIDE
-#define R_LTP_OVERRIDE 0xdc
-#endif
-
-#ifndef R_COMMENT
-#define R_COMMENT 0xdd
-#endif
-
-static reloc_howto_type som_hppa_howto_table[] =
-{
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_NO_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_NO_RELOCATION"},
-  {R_ZEROES, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ZEROES"},
-  {R_ZEROES, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ZEROES"},
-  {R_UNINIT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_UNINIT"},
-  {R_UNINIT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_UNINIT"},
-  {R_RELOCATION, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RELOCATION"},
-  {R_DATA_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_ONE_SYMBOL"},
-  {R_DATA_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_ONE_SYMBOL"},
-  {R_DATA_PLABEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_PLABEL"},
-  {R_DATA_PLABEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_PLABEL"},
-  {R_SPACE_REF, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_SPACE_REF"},
-  {R_REPEATED_INIT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "REPEATED_INIT"},
-  {R_REPEATED_INIT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "REPEATED_INIT"},
-  {R_REPEATED_INIT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "REPEATED_INIT"},
-  {R_REPEATED_INIT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "REPEATED_INIT"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_PCREL_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PCREL_CALL"},
-  {R_SHORT_PCREL_MODE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_SHORT_PCREL_MODE"},
-  {R_LONG_PCREL_MODE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_LONG_PCREL_MODE"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_ABS_CALL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ABS_CALL"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_DP_RELATIVE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DP_RELATIVE"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_DLT_REL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DLT_REL"},
-  {R_DLT_REL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DLT_REL"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_CODE_ONE_SYMBOL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_ONE_SYMBOL"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_MILLI_REL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_MILLI_REL"},
-  {R_MILLI_REL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_MILLI_REL"},
-  {R_CODE_PLABEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_PLABEL"},
-  {R_CODE_PLABEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_PLABEL"},
-  {R_BREAKPOINT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_BREAKPOINT"},
-  {R_ENTRY, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ENTRY"},
-  {R_ENTRY, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ENTRY"},
-  {R_ALT_ENTRY, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_ALT_ENTRY"},
-  {R_EXIT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_EXIT"},
-  {R_BEGIN_TRY, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_BEGIN_TRY"},
-  {R_END_TRY, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_END_TRY"},
-  {R_END_TRY, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_END_TRY"},
-  {R_END_TRY, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_END_TRY"},
-  {R_BEGIN_BRTAB, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_BEGIN_BRTAB"},
-  {R_END_BRTAB, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_END_BRTAB"},
-  {R_STATEMENT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_STATEMENT"},
-  {R_STATEMENT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_STATEMENT"},
-  {R_STATEMENT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_STATEMENT"},
-  {R_DATA_EXPR, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_EXPR"},
-  {R_CODE_EXPR, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_CODE_EXPR"},
-  {R_FSEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_FSEL"},
-  {R_LSEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_LSEL"},
-  {R_RSEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RSEL"},
-  {R_N_MODE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_N_MODE"},
-  {R_S_MODE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_S_MODE"},
-  {R_D_MODE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_D_MODE"},
-  {R_R_MODE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_R_MODE"},
-  {R_DATA_OVERRIDE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_OVERRIDE"},
-  {R_DATA_OVERRIDE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_OVERRIDE"},
-  {R_DATA_OVERRIDE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_OVERRIDE"},
-  {R_DATA_OVERRIDE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_OVERRIDE"},
-  {R_DATA_OVERRIDE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_DATA_OVERRIDE"},
-  {R_TRANSLATED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_TRANSLATED"},
-  {R_AUX_UNWIND, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_AUX_UNWIND"},
-  {R_COMP1, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_COMP1"},
-  {R_COMP2, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_COMP2"},
-  {R_COMP3, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_COMP3"},
-  {R_PREV_FIXUP, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PREV_FIXUP"},
-  {R_PREV_FIXUP, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PREV_FIXUP"},
-  {R_PREV_FIXUP, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PREV_FIXUP"},
-  {R_PREV_FIXUP, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_PREV_FIXUP"},
-  {R_SEC_STMT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_SEC_STMT"},
-  {R_N0SEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_N0SEL"},
-  {R_N1SEL, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_N1SEL"},
-  {R_LINETAB, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_LINETAB"},
-  {R_LINETAB_ESC, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_LINETAB_ESC"},
-  {R_LTP_OVERRIDE, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_LTP_OVERRIDE"},
-  {R_COMMENT, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_COMMENT"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"},
-  {R_RESERVED, 0, 0, 32, false, 0, 0, hppa_som_reloc, "R_RESERVED"}};
-  
-/* Initialize the SOM relocation queue.  By definition the queue holds
-   the last four multibyte fixups.  */
-  
-static void
-som_initialize_reloc_queue (queue)
-     struct reloc_queue *queue;
-{
-  queue[0].reloc = NULL;
-  queue[0].size = 0;
-  queue[1].reloc = NULL;
-  queue[1].size = 0;
-  queue[2].reloc = NULL;
-  queue[2].size = 0;
-  queue[3].reloc = NULL;
-  queue[3].size = 0;
-}
-
-/* Insert a new relocation into the relocation queue.  */
-
-static void
-som_reloc_queue_insert (p, size, queue)
-     unsigned char *p;
-     unsigned int size;
-     struct reloc_queue *queue;
-{
-  queue[3].reloc = queue[2].reloc;
-  queue[3].size = queue[2].size;
-  queue[2].reloc = queue[1].reloc;
-  queue[2].size = queue[1].size;
-  queue[1].reloc = queue[0].reloc;
-  queue[1].size = queue[0].size;
-  queue[0].reloc = p;
-  queue[0].size = size;
-}
-
-/* When an entry in the relocation queue is reused, the entry moves
-   to the front of the queue.  */
-
-static void
-som_reloc_queue_fix (queue, index)
-     struct reloc_queue *queue;
-     unsigned int index;
-{
-  if (index == 0)
-    return;
-
-  if (index == 1)
-    {
-      unsigned char *tmp1 = queue[0].reloc;
-      unsigned int tmp2 = queue[0].size;
-      queue[0].reloc = queue[1].reloc;
-      queue[0].size = queue[1].size;
-      queue[1].reloc = tmp1;
-      queue[1].size = tmp2;
-      return;
-    }
-
-  if (index == 2)
-    {
-      unsigned char *tmp1 = queue[0].reloc;
-      unsigned int tmp2 = queue[0].size;
-      queue[0].reloc = queue[2].reloc;
-      queue[0].size = queue[2].size;
-      queue[2].reloc = queue[1].reloc;
-      queue[2].size = queue[1].size;
-      queue[1].reloc = tmp1;
-      queue[1].size = tmp2;
-      return;
-    }
-
-  if (index == 3)
-    {
-      unsigned char *tmp1 = queue[0].reloc;
-      unsigned int tmp2 = queue[0].size;
-      queue[0].reloc = queue[3].reloc;
-      queue[0].size = queue[3].size;
-      queue[3].reloc = queue[2].reloc;
-      queue[3].size = queue[2].size;
-      queue[2].reloc = queue[1].reloc;
-      queue[2].size = queue[1].size;
-      queue[1].reloc = tmp1;
-      queue[1].size = tmp2;
-      return;
-    }
-  abort();
-}
-
-/* Search for a particular relocation in the relocation queue.  */
-
-static int
-som_reloc_queue_find (p, size, queue)
-     unsigned char *p;
-     unsigned int size;
-     struct reloc_queue *queue;
-{
-  if (queue[0].reloc && !memcmp (p, queue[0].reloc, size)
-      && size == queue[0].size)
-    return 0;
-  if (queue[1].reloc && !memcmp (p, queue[1].reloc, size)
-      && size == queue[1].size)
-    return 1;
-  if (queue[2].reloc && !memcmp (p, queue[2].reloc, size)
-      && size == queue[2].size)
-    return 2;
-  if (queue[3].reloc && !memcmp (p, queue[3].reloc, size)
-      && size == queue[3].size)
-    return 3;
-  return -1;
-}
-
-static unsigned char *
-try_prev_fixup (abfd, subspace_reloc_sizep, p, size, queue)
-     bfd *abfd;
-     int *subspace_reloc_sizep;
-     unsigned char *p;
-     unsigned int size;
-     struct reloc_queue *queue;
-{
-  int queue_index = som_reloc_queue_find (p, size, queue);
-
-  if (queue_index != -1)
-    {
-      /* Found this in a previous fixup.  Undo the fixup we
-	 just built and use R_PREV_FIXUP instead.  We saved 
-	 a total of size - 1 bytes in the fixup stream.  */
-      bfd_put_8 (abfd, R_PREV_FIXUP + queue_index, p);
-      p += 1;
-      *subspace_reloc_sizep += 1;
-      som_reloc_queue_fix (queue, queue_index);
-    }
-  else
-    {
-      som_reloc_queue_insert (p, size, queue);
-      *subspace_reloc_sizep += size;
-      p += size;
-    }
-  return p;
-}
-
-/* Emit the proper R_NO_RELOCATION fixups to map the next SKIP
-   bytes without any relocation.  Update the size of the subspace
-   relocation stream via SUBSPACE_RELOC_SIZE_P; also return the 
-   current pointer into the relocation stream.  */
-
-static unsigned char *
-som_reloc_skip (abfd, skip, p, subspace_reloc_sizep, queue)
-     bfd *abfd;
-     unsigned int skip;
-     unsigned char *p;
-     unsigned int *subspace_reloc_sizep;
-     struct reloc_queue *queue;
-{
-  /* Use a 4 byte R_NO_RELOCATION entry with a maximal value
-     then R_PREV_FIXUPs to get the difference down to a
-     reasonable size.  */
-  if (skip >= 0x1000000)
-    {
-      skip -= 0x1000000;
-      bfd_put_8 (abfd, R_NO_RELOCATION + 31, p);
-      bfd_put_8 (abfd, 0xff, p + 1);
-      bfd_put_16 (abfd, 0xffff, p + 2);
-      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 4, queue);
-      while (skip >= 0x1000000)
-	{
-	  skip -= 0x1000000;
-	  bfd_put_8 (abfd, R_PREV_FIXUP, p);
-	  p++;
-	  *subspace_reloc_sizep += 1;
-	  /* No need to adjust queue here since we are repeating the
-	     most recent fixup.  */
-	}
-    }
-  
-  /* The difference must be less than 0x1000000.  Use one 
-     more R_NO_RELOCATION entry to get to the right difference.  */
-  if ((skip & 3) == 0 && skip <= 0xc0000 && skip > 0)
-    {
-      /* Difference can be handled in a simple single-byte
-	 R_NO_RELOCATION entry.  */
-      if (skip <= 0x60)
-	{
-	  bfd_put_8 (abfd, R_NO_RELOCATION + (skip >> 2) - 1, p);
-	  *subspace_reloc_sizep += 1;
-	  p++;
-	}
-      /* Handle it with a two byte R_NO_RELOCATION entry.  */
-      else if (skip <= 0x1000)
-	{
-	  bfd_put_8 (abfd, R_NO_RELOCATION + 24 + (((skip >> 2) - 1) >> 8), p);
-	  bfd_put_8 (abfd, (skip >> 2) - 1, p + 1);
-	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue);
-	}
-      /* Handle it with a three byte R_NO_RELOCATION entry.  */
-      else
-	{
-	  bfd_put_8 (abfd, R_NO_RELOCATION + 28 + (((skip >> 2) - 1) >> 16), p);
-	  bfd_put_16 (abfd, (skip >> 2) - 1, p + 1);
-	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 3, queue);
-	}
-    }
-  /* Ugh.  Punt and use a 4 byte entry.  */
-  else if (skip > 0)
-    {
-      bfd_put_8 (abfd, R_NO_RELOCATION + 31, p);
-      bfd_put_8 (abfd, (skip - 1) >> 16, p + 1);
-      bfd_put_16 (abfd, skip - 1, p + 2);
-      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 4, queue);
-    }
-  return p;
-}
-
-/* Emit the proper R_DATA_OVERRIDE fixups to handle a nonzero addend
-   from a BFD relocation.  Update the size of the subspace relocation
-   stream via SUBSPACE_RELOC_SIZE_P; also return the current pointer
-   into the relocation stream.  */
-
-static unsigned char *
-som_reloc_addend (abfd, addend, p, subspace_reloc_sizep, queue)
-     bfd *abfd;
-     int addend;
-     unsigned char *p;
-     unsigned int *subspace_reloc_sizep;
-     struct reloc_queue *queue;
-{
-  if ((unsigned)(addend) + 0x80 < 0x100)
-    {
-      bfd_put_8 (abfd, R_DATA_OVERRIDE + 1, p);
-      bfd_put_8 (abfd, addend, p + 1);
-      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue); 
-    }
-  else if ((unsigned) (addend) + 0x8000 < 0x10000)
-    {
-      bfd_put_8 (abfd, R_DATA_OVERRIDE + 2, p);
-      bfd_put_16 (abfd, addend, p + 1);
-      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 3, queue);
-    }
-  else if ((unsigned) (addend) + 0x800000 < 0x1000000)
-    {
-      bfd_put_8 (abfd, R_DATA_OVERRIDE + 3, p);
-      bfd_put_8 (abfd, addend >> 16, p + 1);
-      bfd_put_16 (abfd, addend, p + 2);
-      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 4, queue);
-    }
-  else
-    {
-      bfd_put_8 (abfd, R_DATA_OVERRIDE + 4, p);
-      bfd_put_32 (abfd, addend, p + 1);
-      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 5, queue);
-    }
-  return p;
-}
-
-/* Handle a single function call relocation.  */
-
-static unsigned char *
-som_reloc_call (abfd, p, subspace_reloc_sizep, bfd_reloc, sym_num, queue)
-     bfd *abfd;
-     unsigned char *p;
-     unsigned int *subspace_reloc_sizep;
-     arelent *bfd_reloc;
-     int sym_num;
-     struct reloc_queue *queue;
-{
-  int arg_bits = HPPA_R_ARG_RELOC (bfd_reloc->addend);
-  int rtn_bits = arg_bits & 0x3;
-  int type, done = 0;
-  
-  /* You'll never believe all this is necessary to handle relocations
-     for function calls.  Having to compute and pack the argument
-     relocation bits is the real nightmare.
-     
-     If you're interested in how this works, just forget it.  You really
-     do not want to know about this braindamage.  */
-
-  /* First see if this can be done with a "simple" relocation.  Simple
-     relocations have a symbol number < 0x100 and have simple encodings
-     of argument relocations.  */
-
-  if (sym_num < 0x100)
-    {
-      switch (arg_bits)
-	{
-	case 0:
-	case 1:
-	  type = 0;
-	  break;
-	case 1 << 8:
-	case 1 << 8 | 1:
-	  type = 1;
-	  break;
-	case 1 << 8 | 1 << 6:
-	case 1 << 8 | 1 << 6 | 1:
-	  type = 2;
-	  break;
-	case 1 << 8 | 1 << 6 | 1 << 4:
-	case 1 << 8 | 1 << 6 | 1 << 4 | 1:
-	  type = 3;
-	  break;
-	case 1 << 8 | 1 << 6 | 1 << 4 | 1 << 2:
-	case 1 << 8 | 1 << 6 | 1 << 4 | 1 << 2 | 1:
-	  type = 4;
-	  break;
-	default:
-	  /* Not one of the easy encodings.  This will have to be
-	     handled by the more complex code below.  */
-	  type = -1;
-	  break;
-	}
-      if (type != -1)
-	{
-	  /* Account for the return value too.  */
-	  if (rtn_bits)
-	    type += 5;
-
-	  /* Emit a 2 byte relocation.  Then see if it can be handled
-	     with a relocation which is already in the relocation queue.  */
-	  bfd_put_8 (abfd, bfd_reloc->howto->type + type, p);
-	  bfd_put_8 (abfd, sym_num, p + 1);
-	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue);
-	  done = 1;
-	}
-    }
-  
-  /* If this could not be handled with a simple relocation, then do a hard
-     one.  Hard relocations occur if the symbol number was too high or if
-     the encoding of argument relocation bits is too complex.  */
-  if (! done)
-    {
-      /* Don't ask about these magic sequences.  I took them straight
-	 from gas-1.36 which took them from the a.out man page.  */
-      type = rtn_bits;
-      if ((arg_bits >> 6 & 0xf) == 0xe)
-	type += 9 * 40;
-      else
-	type += (3 * (arg_bits >> 8 & 3) + (arg_bits >> 6 & 3)) * 40;
-      if ((arg_bits >> 2 & 0xf) == 0xe)
-	type += 9 * 4;
-      else
-	type += (3 * (arg_bits >> 4 & 3) + (arg_bits >> 2 & 3)) * 4;
-      
-      /* Output the first two bytes of the relocation.  These describe
-	 the length of the relocation and encoding style.  */
-      bfd_put_8 (abfd, bfd_reloc->howto->type + 10
-		 + 2 * (sym_num >= 0x100) + (type >= 0x100),
-		 p);
-      bfd_put_8 (abfd, type, p + 1);
-      
-      /* Now output the symbol index and see if this bizarre relocation
-	 just happened to be in the relocation queue.  */
-      if (sym_num < 0x100)
-	{
-	  bfd_put_8 (abfd, sym_num, p + 2);
-	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 3, queue);
-	}
-      else
-	{
-	  bfd_put_8 (abfd, sym_num >> 16, p + 2);
-	  bfd_put_16 (abfd, sym_num, p + 3);
-	  p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 5, queue);
-	}
-    }
-  return p;
-}
-
-
-/* Return the logarithm of X, base 2, considering X unsigned. 
-   Abort -1 if X is not a power or two or is zero.  */
-
-static int
-log2 (x)
-     unsigned int x;
-{
-  int log = 0;
-
-  /* Test for 0 or a power of 2.  */
-  if (x == 0 || x != (x & -x))
-    return -1;
-
-  while ((x >>= 1) != 0)
-    log++;
-  return log;
-}
-
-static bfd_reloc_status_type
-hppa_som_reloc (abfd, reloc_entry, symbol_in, data,
-		input_section, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc_entry;
-     asymbol *symbol_in;
-     PTR data;
-     asection *input_section;
-     bfd *output_bfd;
-     char **error_message;
-{
-  if (output_bfd)
-    {
-      reloc_entry->address += input_section->output_offset;
-      return bfd_reloc_ok;
-    }
-  return bfd_reloc_ok;
-}
-
-/* Given a generic HPPA relocation type, the instruction format,
-   and a field selector, return one or more appropriate SOM relocations.  */
-
-int **
-hppa_som_gen_reloc_type (abfd, base_type, format, field, sym_diff, sym)
-     bfd *abfd;
-     int base_type;
-     int format;
-     enum hppa_reloc_field_selector_type_alt field;
-     int sym_diff;
-     asymbol *sym;
-{
-  int *final_type, **final_types;
-
-  final_types = (int **) bfd_alloc (abfd, sizeof (int *) * 6);
-  final_type = (int *) bfd_alloc (abfd, sizeof (int));
-  if (!final_types || !final_type)
-    return NULL;
-
-  /* The field selector may require additional relocations to be 
-     generated.  It's impossible to know at this moment if additional
-     relocations will be needed, so we make them.  The code to actually
-     write the relocation/fixup stream is responsible for removing
-     any redundant relocations.  */
-  switch (field)
-    {
-      case e_fsel:
-      case e_psel:
-      case e_lpsel:
-      case e_rpsel:
-	final_types[0] = final_type;
-	final_types[1] = NULL;
-	final_types[2] = NULL;
-	*final_type = base_type;
-	break;
-
-      case e_tsel:
-      case e_ltsel:
-      case e_rtsel:
-	final_types[0] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[0])
-	  return NULL;
-	if (field == e_tsel)
-	  *final_types[0] = R_FSEL;
-	else if (field == e_ltsel)
-	  *final_types[0] = R_LSEL;
-	else
-	  *final_types[0] = R_RSEL;
-	final_types[1] = final_type;
-	final_types[2] = NULL;
-	*final_type = base_type;
-	break;
-
-      case e_lssel:
-      case e_rssel:
-	final_types[0] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[0])
-	  return NULL;
-	*final_types[0] = R_S_MODE;
-	final_types[1] = final_type;
-	final_types[2] = NULL;
-	*final_type = base_type;
-	break;
-
-      case e_lsel:
-      case e_rsel:
-	final_types[0] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[0])
-	  return NULL;
-	*final_types[0] = R_N_MODE;
-	final_types[1] = final_type;
-	final_types[2] = NULL;
-	*final_type = base_type;
-	break;
-
-      case e_ldsel:
-      case e_rdsel:
-	final_types[0] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[0])
-	  return NULL;
-	*final_types[0] = R_D_MODE;
-	final_types[1] = final_type;
-	final_types[2] = NULL;
-	*final_type = base_type;
-	break;
-
-      case e_lrsel:
-      case e_rrsel:
-	final_types[0] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[0])
-	  return NULL;
-	*final_types[0] = R_R_MODE;
-	final_types[1] = final_type;
-	final_types[2] = NULL;
-	*final_type = base_type;
-	break;
-
-      case e_nsel:
-	final_types[0] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[0])
-	  return NULL;
-	*final_types[0] = R_N1SEL;
-	final_types[1] = final_type;
-	final_types[2] = NULL;
-	*final_type = base_type;
-	break;
-
-      case e_nlsel:
-      case e_nlrsel:
-	final_types[0] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[0])
-	  return NULL;
-	*final_types[0] = R_N0SEL;
-	final_types[1] = (int *) bfd_alloc (abfd, sizeof (int));
-	if (!final_types[1])
-	  return NULL;
-	if (field == e_nlsel)
-	  *final_types[1] = R_N_MODE;
-	else
-	  *final_types[1] = R_R_MODE;
-	final_types[2] = final_type;
-	final_types[3] = NULL;
-	*final_type = base_type;
-	break;
-    }
-  
-  switch (base_type)
-    {
-    case R_HPPA:
-      /* The difference of two symbols needs *very* special handling.  */
-      if (sym_diff)
-	{
-	  final_types[0] = (int *)bfd_alloc (abfd, sizeof (int));
-	  final_types[1] = (int *)bfd_alloc (abfd, sizeof (int));
-	  final_types[2] = (int *)bfd_alloc (abfd, sizeof (int));
-	  final_types[3] = (int *)bfd_alloc (abfd, sizeof (int));
-	  if (!final_types[0] || !final_types[1] || !final_types[2])
-            return NULL;
-	  if (field == e_fsel)
-	    *final_types[0] = R_FSEL;
-	  else if (field == e_rsel)
-	    *final_types[0] = R_RSEL;
-	  else if (field == e_lsel)
-	    *final_types[0] = R_LSEL;
-	  *final_types[1] = R_COMP2;
-	  *final_types[2] = R_COMP2;
-	  *final_types[3] = R_COMP1;
-	  final_types[4] = final_type;
-	  if (format == 32)
-	    *final_types[4] = R_DATA_EXPR;
-	  else
-	    *final_types[4] = R_CODE_EXPR;
-	  final_types[5] = NULL;
-	  break;
-	}
-      /* PLABELs get their own relocation type.  */
-      else if (field == e_psel
-	  || field == e_lpsel
-	  || field == e_rpsel)
-	{
-	  /* A PLABEL relocation that has a size of 32 bits must
-	     be a R_DATA_PLABEL.  All others are R_CODE_PLABELs.  */
-	  if (format == 32)
-	    *final_type = R_DATA_PLABEL;
-	  else
-	    *final_type = R_CODE_PLABEL;
-	}
-      /* PIC stuff.  */
-      else if (field == e_tsel
-	  || field == e_ltsel
-	  || field == e_rtsel)
-	*final_type = R_DLT_REL;
-      /* A relocation in the data space is always a full 32bits.  */
-      else if (format == 32)
-	{
-	  *final_type = R_DATA_ONE_SYMBOL;
-
-	  /* If there's no SOM symbol type associated with this BFD
-	     symbol, then set the symbol type to ST_DATA.
-
-	     Only do this if the type is going to default later when
-	     we write the object file.
-
-	     This is done so that the linker never encounters an
-	     R_DATA_ONE_SYMBOL reloc involving an ST_CODE symbol.
-
-	     This allows the compiler to generate exception handling
-	     tables.
-
-	     Note that one day we may need to also emit BEGIN_BRTAB and
-	     END_BRTAB to prevent the linker from optimizing away insns
-	     in exception handling regions.  */
-	  if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN
-	      && (sym->flags & BSF_SECTION_SYM) == 0
-	      && (sym->flags & BSF_FUNCTION) == 0
-	      && ! bfd_is_com_section (sym->section))
-	    som_symbol_data (sym)->som_type = SYMBOL_TYPE_DATA;
-	}
-      break;
-
-
-    case R_HPPA_GOTOFF:
-      /* More PLABEL special cases.  */
-      if (field == e_psel
-	  || field == e_lpsel
-	  || field == e_rpsel)
-	*final_type = R_DATA_PLABEL;
-      break;
-
-    case R_HPPA_COMPLEX:
-      /* The difference of two symbols needs *very* special handling.  */
-      if (sym_diff)
-	{
-	  final_types[0] = (int *)bfd_alloc (abfd, sizeof (int));
-	  final_types[1] = (int *)bfd_alloc (abfd, sizeof (int));
-	  final_types[2] = (int *)bfd_alloc (abfd, sizeof (int));
-	  final_types[3] = (int *)bfd_alloc (abfd, sizeof (int));
-	  if (!final_types[0] || !final_types[1] || !final_types[2])
-            return NULL;
-	  if (field == e_fsel)
-	    *final_types[0] = R_FSEL;
-	  else if (field == e_rsel)
-	    *final_types[0] = R_RSEL;
-	  else if (field == e_lsel)
-	    *final_types[0] = R_LSEL;
-	  *final_types[1] = R_COMP2;
-	  *final_types[2] = R_COMP2;
-	  *final_types[3] = R_COMP1;
-	  final_types[4] = final_type;
-	  if (format == 32)
-	    *final_types[4] = R_DATA_EXPR;
-	  else
-	    *final_types[4] = R_CODE_EXPR;
-	  final_types[5] = NULL;
-	  break;
-	}
-      else
-	break;
-
-    case R_HPPA_NONE:
-    case R_HPPA_ABS_CALL:
-    case R_HPPA_PCREL_CALL:
-      /* Right now we can default all these.  */
-      break;
-    }
-  return final_types;
-}
-
-/* Return the address of the correct entry in the PA SOM relocation
-   howto table.  */
-
-/*ARGSUSED*/
-static reloc_howto_type *
-som_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  if ((int) code < (int) R_NO_RELOCATION + 255)
-    {
-      BFD_ASSERT ((int) som_hppa_howto_table[(int) code].type == (int) code);
-      return &som_hppa_howto_table[(int) code];
-    }
-
-  return (reloc_howto_type *) 0;
-}
-
-/* Perform some initialization for an object.  Save results of this
-   initialization in the BFD.  */
-
-static const bfd_target *
-som_object_setup (abfd, file_hdrp, aux_hdrp, current_offset)
-     bfd *abfd;
-     struct header *file_hdrp;
-     struct som_exec_auxhdr *aux_hdrp;
-     unsigned long current_offset;
-{
-  asection *section;
-  int found;
-
-  /* som_mkobject will set bfd_error if som_mkobject fails.  */
-  if (som_mkobject (abfd) != true)
-    return 0;
-
-  /* Set BFD flags based on what information is available in the SOM.  */
-  abfd->flags = BFD_NO_FLAGS;
-  if (file_hdrp->symbol_total)
-    abfd->flags |= HAS_LINENO | HAS_DEBUG | HAS_SYMS | HAS_LOCALS;
-
-  switch (file_hdrp->a_magic)
-    {
-    case DEMAND_MAGIC:
-      abfd->flags |= (D_PAGED | WP_TEXT | EXEC_P);
-      break;
-    case SHARE_MAGIC:
-      abfd->flags |= (WP_TEXT | EXEC_P);
-      break;
-    case EXEC_MAGIC:
-      abfd->flags |= (EXEC_P);
-      break;
-    case RELOC_MAGIC:
-      abfd->flags |= HAS_RELOC;
-      break;
-#ifdef SHL_MAGIC
-    case SHL_MAGIC:
-#endif
-#ifdef DL_MAGIC
-    case DL_MAGIC:
-#endif
-      abfd->flags |= DYNAMIC;
-      break;
-
-    default:
-      break;
-    }
-
-  /* Allocate space to hold the saved exec header information.  */
-  obj_som_exec_data (abfd) = (struct som_exec_data *)
-    bfd_zalloc (abfd, sizeof (struct som_exec_data ));
-  if (obj_som_exec_data (abfd) == NULL)
-    return NULL;
-
-  /* The braindamaged OSF1 linker switched exec_flags and exec_entry!
-
-     We used to identify OSF1 binaries based on NEW_VERSION_ID, but
-     apparently the latest HPUX linker is using NEW_VERSION_ID now.
-
-     It's about time, OSF has used the new id since at least 1992;
-     HPUX didn't start till nearly 1995!.
-    
-     The new approach examines the entry field.  If it's zero or not 4
-     byte aligned then it's not a proper code address and we guess it's
-     really the executable flags.  */
-  found = 0;
-  for (section = abfd->sections; section; section = section->next)
-    {
-      if ((section->flags & SEC_CODE) == 0)
-	continue;
-      if (aux_hdrp->exec_entry >= section->vma
-	  && aux_hdrp->exec_entry < section->vma + section->_cooked_size)
-	found = 1;
-    }
-  if (aux_hdrp->exec_entry == 0
-      || (aux_hdrp->exec_entry & 0x3) != 0
-      || ! found)
-    {
-      bfd_get_start_address (abfd) = aux_hdrp->exec_flags;
-      obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_entry;
-    }
-  else
-    {
-      bfd_get_start_address (abfd) = aux_hdrp->exec_entry + current_offset;
-      obj_som_exec_data (abfd)->exec_flags = aux_hdrp->exec_flags;
-    }
-
-  bfd_default_set_arch_mach (abfd, bfd_arch_hppa, pa10);
-  bfd_get_symcount (abfd) = file_hdrp->symbol_total;
-
-  /* Initialize the saved symbol table and string table to NULL.  
-     Save important offsets and sizes from the SOM header into
-     the BFD.  */
-  obj_som_stringtab (abfd) = (char  *) NULL;
-  obj_som_symtab (abfd) = (som_symbol_type *) NULL;
-  obj_som_sorted_syms (abfd) = NULL;
-  obj_som_stringtab_size (abfd) = file_hdrp->symbol_strings_size;
-  obj_som_sym_filepos (abfd) = file_hdrp->symbol_location + current_offset;
-  obj_som_str_filepos (abfd) = (file_hdrp->symbol_strings_location
-				+ current_offset);
-  obj_som_reloc_filepos (abfd) = (file_hdrp->fixup_request_location
-				  + current_offset);
-  obj_som_exec_data (abfd)->system_id = file_hdrp->system_id;
-
-  return abfd->xvec;
-}
-
-/* Convert all of the space and subspace info into BFD sections.  Each space
-   contains a number of subspaces, which in turn describe the mapping between
-   regions of the exec file, and the address space that the program runs in.
-   BFD sections which correspond to spaces will overlap the sections for the
-   associated subspaces.  */
-
-static boolean
-setup_sections (abfd, file_hdr, current_offset)
-     bfd *abfd;
-     struct header *file_hdr;
-     unsigned long current_offset;
-{
-  char *space_strings;
-  unsigned int space_index, i;
-  unsigned int total_subspaces = 0;
-  asection **subspace_sections, *section;
-
-  /* First, read in space names */
-
-  space_strings = bfd_malloc (file_hdr->space_strings_size);
-  if (!space_strings && file_hdr->space_strings_size != 0)
-    goto error_return;
-
-  if (bfd_seek (abfd, current_offset + file_hdr->space_strings_location, 
-  		SEEK_SET) < 0)
-    goto error_return;
-  if (bfd_read (space_strings, 1, file_hdr->space_strings_size, abfd)
-      != file_hdr->space_strings_size)
-    goto error_return;
-
-  /* Loop over all of the space dictionaries, building up sections */
-  for (space_index = 0; space_index < file_hdr->space_total; space_index++)
-    {
-      struct space_dictionary_record space;
-      struct subspace_dictionary_record subspace, save_subspace;
-      int subspace_index;
-      asection *space_asect;
-      char *newname;
-
-      /* Read the space dictionary element */
-      if (bfd_seek (abfd,
-		    (current_offset + file_hdr->space_location
-		     + space_index * sizeof space),
-		    SEEK_SET) < 0)
-	goto error_return;
-      if (bfd_read (&space, 1, sizeof space, abfd) != sizeof space)
-	goto error_return;
-
-      /* Setup the space name string */
-      space.name.n_name = space.name.n_strx + space_strings;
-
-      /* Make a section out of it */
-      newname = bfd_alloc (abfd, strlen (space.name.n_name) + 1);
-      if (!newname)
-	goto error_return;
-      strcpy (newname, space.name.n_name);
-			   
-      space_asect = bfd_make_section_anyway (abfd, newname);
-      if (!space_asect)
-	goto error_return;
-
-       if (space.is_loadable == 0)
-	space_asect->flags |= SEC_DEBUGGING;
-
-      /* Set up all the attributes for the space.  */
-      if (bfd_som_set_section_attributes (space_asect, space.is_defined,
-					  space.is_private, space.sort_key,
-					  space.space_number) == false)
-	goto error_return;
-
-      /* If the space has no subspaces, then we're done.  */
-      if (space.subspace_quantity == 0)
-	continue;
-
-      /* Now, read in the first subspace for this space */
-      if (bfd_seek (abfd,
-		    (current_offset + file_hdr->subspace_location
-		     + space.subspace_index * sizeof subspace),
-		    SEEK_SET) < 0)
-	goto error_return;
-      if (bfd_read (&subspace, 1, sizeof subspace, abfd) != sizeof subspace)
-	goto error_return;
-      /* Seek back to the start of the subspaces for loop below */
-      if (bfd_seek (abfd,
-		    (current_offset + file_hdr->subspace_location
-		     + space.subspace_index * sizeof subspace),
-		    SEEK_SET) < 0)
-	goto error_return;
-
-      /* Setup the start address and file loc from the first subspace record */
-      space_asect->vma = subspace.subspace_start;
-      space_asect->filepos = subspace.file_loc_init_value + current_offset;
-      space_asect->alignment_power = log2 (subspace.alignment);
-      if (space_asect->alignment_power == -1)
-	goto error_return;
-
-      /* Initialize save_subspace so we can reliably determine if this
-	 loop placed any useful values into it.  */
-      memset (&save_subspace, 0, sizeof (struct subspace_dictionary_record));
-
-      /* Loop over the rest of the subspaces, building up more sections */
-      for (subspace_index = 0; subspace_index < space.subspace_quantity;
-	   subspace_index++)
-	{
-	  asection *subspace_asect;
-
-	  /* Read in the next subspace */
-	  if (bfd_read (&subspace, 1, sizeof subspace, abfd)
-	      != sizeof subspace)
-	    goto error_return;
-
-	  /* Setup the subspace name string */
-	  subspace.name.n_name = subspace.name.n_strx + space_strings;
-
-	  newname = bfd_alloc (abfd, strlen (subspace.name.n_name) + 1);
-	  if (!newname)
-	    goto error_return;
-	  strcpy (newname, subspace.name.n_name);
-
-	  /* Make a section out of this subspace */
-	  subspace_asect = bfd_make_section_anyway (abfd, newname);
-	  if (!subspace_asect)
-	    goto error_return;
-
-	  /* Store private information about the section.  */
-	  if (bfd_som_set_subsection_attributes (subspace_asect, space_asect,
-						 subspace.access_control_bits,
-						 subspace.sort_key,
-						 subspace.quadrant) == false)
-	    goto error_return;
-
-	  /* Keep an easy mapping between subspaces and sections. 
-	     Note we do not necessarily read the subspaces in the
-	     same order in which they appear in the object file.
-
-	     So to make the target index come out correctly, we
-	     store the location of the subspace header in target
-	     index, then sort using the location of the subspace
-	     header as the key.  Then we can assign correct
-	     subspace indices.  */
-	  total_subspaces++;
-	  subspace_asect->target_index = bfd_tell (abfd) - sizeof (subspace);
-
-	  /* Set SEC_READONLY and SEC_CODE/SEC_DATA as specified
-	     by the access_control_bits in the subspace header.  */
-	  switch (subspace.access_control_bits >> 4)
-	    {
-	    /* Readonly data.  */  
-	    case 0x0:
-	      subspace_asect->flags |= SEC_DATA | SEC_READONLY;
-	      break;
-
-	    /* Normal data.  */  
-	    case 0x1:
-	      subspace_asect->flags |= SEC_DATA;
-	      break;
-
-	    /* Readonly code and the gateways.
-	       Gateways have other attributes which do not map
-	       into anything BFD knows about.  */
-	    case 0x2:
-	    case 0x4:
-	    case 0x5:
-	    case 0x6:
-	    case 0x7:
-	      subspace_asect->flags |= SEC_CODE | SEC_READONLY;
-	      break;
-
-	    /* dynamic (writable) code.  */
-	    case 0x3:
-	      subspace_asect->flags |= SEC_CODE;
-	      break;
-	    }
-	  
-	  if (subspace.dup_common || subspace.is_common) 
-	    subspace_asect->flags |= SEC_IS_COMMON;
-	  else if (subspace.subspace_length > 0)
-	    subspace_asect->flags |= SEC_HAS_CONTENTS;
-
-	  if (subspace.is_loadable)
-	    subspace_asect->flags |= SEC_ALLOC | SEC_LOAD;
-	  else
-	    subspace_asect->flags |= SEC_DEBUGGING;
-
-	  if (subspace.code_only)
-	    subspace_asect->flags |= SEC_CODE;
-
-	  /* Both file_loc_init_value and initialization_length will
-	     be zero for a BSS like subspace.  */
-	  if (subspace.file_loc_init_value == 0
-	      && subspace.initialization_length == 0)
-	    subspace_asect->flags &= ~(SEC_DATA | SEC_LOAD | SEC_HAS_CONTENTS);
-
-	  /* This subspace has relocations.
-	     The fixup_request_quantity is a byte count for the number of
-	     entries in the relocation stream; it is not the actual number
-	     of relocations in the subspace.  */
-	  if (subspace.fixup_request_quantity != 0)
-	    {
-	      subspace_asect->flags |= SEC_RELOC;
-	      subspace_asect->rel_filepos = subspace.fixup_request_index;
-	      som_section_data (subspace_asect)->reloc_size
-		= subspace.fixup_request_quantity;
-	      /* We can not determine this yet.  When we read in the 
-		 relocation table the correct value will be filled in.  */
-	      subspace_asect->reloc_count = -1;
-	    }
-
-	  /* Update save_subspace if appropriate.  */
-	  if (subspace.file_loc_init_value > save_subspace.file_loc_init_value)
-	    save_subspace = subspace;
-
-	  subspace_asect->vma = subspace.subspace_start;
-	  subspace_asect->_cooked_size = subspace.subspace_length;
-	  subspace_asect->_raw_size = subspace.subspace_length;
-	  subspace_asect->filepos = (subspace.file_loc_init_value
-				     + current_offset);
-	  subspace_asect->alignment_power = log2 (subspace.alignment);
-	  if (subspace_asect->alignment_power == -1)
-	    goto error_return;
-	}
-
-      /* This can happen for a .o which defines symbols in otherwise
-         empty subspaces.  */
-      if (!save_subspace.file_loc_init_value)
-	{
-	  space_asect->_cooked_size = 0;
-	  space_asect->_raw_size = 0;
-	}
-      else
-	{
-	  /* Setup the sizes for the space section based upon the info in the
-	     last subspace of the space.  */
-	  space_asect->_cooked_size = (save_subspace.subspace_start
-				       - space_asect->vma
-				       + save_subspace.subspace_length);
-	  space_asect->_raw_size = (save_subspace.file_loc_init_value
-				    - space_asect->filepos
-				    + save_subspace.initialization_length);
-	}
-    }
-  /* Now that we've read in all the subspace records, we need to assign
-     a target index to each subspace.  */
-  subspace_sections = (asection **) bfd_malloc (total_subspaces
-						* sizeof (asection *));
-  if (subspace_sections == NULL)
-    goto error_return;
-
-  for (i = 0, section = abfd->sections; section; section = section->next)
-    {
-      if (!som_is_subspace (section))
-	continue;
-
-      subspace_sections[i] = section;
-      i++;
-    }
-  qsort (subspace_sections, total_subspaces,
-	 sizeof (asection *), compare_subspaces);
-  
-  /* subspace_sections is now sorted in the order in which the subspaces
-     appear in the object file.  Assign an index to each one now.  */
-  for (i = 0; i < total_subspaces; i++)
-    subspace_sections[i]->target_index = i;
-
-  if (space_strings != NULL)
-    free (space_strings);
-
-  if (subspace_sections != NULL)
-    free (subspace_sections);
-
-  return true;
-
- error_return:
-  if (space_strings != NULL)
-    free (space_strings);
-
-  if (subspace_sections != NULL)
-    free (subspace_sections);
-  return false;
-}
-
-/* Read in a SOM object and make it into a BFD.  */
-
-static const bfd_target *
-som_object_p (abfd)
-     bfd *abfd;
-{
-  struct header file_hdr;
-  struct som_exec_auxhdr aux_hdr;
-  unsigned long current_offset = 0;
-  struct lst_header lst_header;
-  struct som_entry som_entry;
-#define ENTRY_SIZE sizeof(struct som_entry)
-
-  if (bfd_read ((PTR) & file_hdr, 1, FILE_HDR_SIZE, abfd) != FILE_HDR_SIZE)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  if (!_PA_RISC_ID (file_hdr.system_id))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  switch (file_hdr.a_magic)
-    {
-    case RELOC_MAGIC:
-    case EXEC_MAGIC:
-    case SHARE_MAGIC:
-    case DEMAND_MAGIC:
-#ifdef DL_MAGIC
-    case DL_MAGIC:
-#endif
-#ifdef SHL_MAGIC
-    case SHL_MAGIC:
-#endif
-#ifdef SHARED_MAGIC_CNX
-    case SHARED_MAGIC_CNX:
-#endif
-      break;
-
-#ifdef EXECLIBMAGIC
-    case EXECLIBMAGIC:
-      /* Read the lst header and determine where the SOM directory begins */
-
-      if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) < 0)
-        {
-          if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_wrong_format);
-          return 0;
-        }
-
-      if (bfd_read ((PTR) & lst_header, 1, SLSTHDR, abfd) != SLSTHDR)
-        {
-          if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_wrong_format);
-          return 0;
-        }
-
-      /* Position to and read the first directory entry */
-
-      if (bfd_seek (abfd, lst_header.dir_loc, SEEK_SET) < 0)
-        {
-          if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_wrong_format);
-          return 0;
-        }
-
-      if (bfd_read ((PTR) & som_entry, 1, ENTRY_SIZE, abfd) != ENTRY_SIZE)
-        {
-          if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_wrong_format);
-          return 0;
-        }
-
-      /* Now position to the first SOM */
-
-      if (bfd_seek (abfd, som_entry.location, SEEK_SET) < 0)
-        {
-          if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_wrong_format);
-          return 0;
-        }
-
-      current_offset = som_entry.location;
-
-      /* And finally, re-read the som header */
-
-      if (bfd_read ((PTR) & file_hdr, 1, FILE_HDR_SIZE, abfd) != FILE_HDR_SIZE)
-        {
-          if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_wrong_format);
-          return 0;
-        }
-
-      break;
-#endif
-
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  if (file_hdr.version_id != VERSION_ID
-      && file_hdr.version_id != NEW_VERSION_ID)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  /* If the aux_header_size field in the file header is zero, then this
-     object is an incomplete executable (a .o file).  Do not try to read
-     a non-existant auxiliary header.  */
-  memset (&aux_hdr, 0, sizeof (struct som_exec_auxhdr));
-  if (file_hdr.aux_header_size != 0)
-    {
-      if (bfd_read ((PTR) & aux_hdr, 1, AUX_HDR_SIZE, abfd) != AUX_HDR_SIZE)
-	{
-	  if (bfd_get_error () != bfd_error_system_call)
-	    bfd_set_error (bfd_error_wrong_format);
-	  return 0;
-	}
-    }
-
-  if (!setup_sections (abfd, &file_hdr, current_offset))
-    {
-      /* setup_sections does not bubble up a bfd error code.  */
-      bfd_set_error (bfd_error_bad_value);
-      return 0;
-    }
-
-  /* This appears to be a valid SOM object.  Do some initialization.  */
-  return som_object_setup (abfd, &file_hdr, &aux_hdr, current_offset);
-}
-
-/* Create a SOM object.  */
-
-static boolean
-som_mkobject (abfd)
-     bfd *abfd;
-{
-  /* Allocate memory to hold backend information.  */
-  abfd->tdata.som_data = (struct som_data_struct *)
-    bfd_zalloc (abfd, sizeof (struct som_data_struct));
-  if (abfd->tdata.som_data == NULL)
-    return false;
-  return true;
-}
-
-/* Initialize some information in the file header.  This routine makes
-   not attempt at doing the right thing for a full executable; it
-   is only meant to handle relocatable objects.  */
-
-static boolean
-som_prep_headers (abfd)
-     bfd *abfd;
-{
-  struct header *file_hdr;
-  asection *section;
-
-  /* Make and attach a file header to the BFD.  */
-  file_hdr = (struct header *) bfd_zalloc (abfd, sizeof (struct header));
-  if (file_hdr == NULL)
-    return false;
-  obj_som_file_hdr (abfd) = file_hdr;
-
-  if (abfd->flags & (EXEC_P | DYNAMIC))
-    {
-
-      /* Make and attach an exec header to the BFD.  */
-      obj_som_exec_hdr (abfd) = (struct som_exec_auxhdr *)
-	bfd_zalloc (abfd, sizeof (struct som_exec_auxhdr));
-      if (obj_som_exec_hdr (abfd) == NULL)
-	return false;
-
-      if (abfd->flags & D_PAGED)
-	file_hdr->a_magic = DEMAND_MAGIC;
-      else if (abfd->flags & WP_TEXT)
-	file_hdr->a_magic = SHARE_MAGIC;
-#ifdef SHL_MAGIC
-      else if (abfd->flags & DYNAMIC)
-	file_hdr->a_magic = SHL_MAGIC;
-#endif
-      else
-	file_hdr->a_magic = EXEC_MAGIC;
-    }
-  else
-    file_hdr->a_magic = RELOC_MAGIC;
-
-  /* Only new format SOM is supported.  */
-  file_hdr->version_id = NEW_VERSION_ID;
-
-  /* These fields are optional, and embedding timestamps is not always
-     a wise thing to do, it makes comparing objects during a multi-stage
-     bootstrap difficult.  */
-  file_hdr->file_time.secs = 0;
-  file_hdr->file_time.nanosecs = 0; 
-
-  file_hdr->entry_space = 0;
-  file_hdr->entry_subspace = 0;
-  file_hdr->entry_offset = 0;
-  file_hdr->presumed_dp = 0;
-
-  /* Now iterate over the sections translating information from
-     BFD sections to SOM spaces/subspaces.  */
-
-  for (section = abfd->sections; section != NULL; section = section->next)
-    {
-      /* Ignore anything which has not been marked as a space or
-	 subspace.  */
-      if (!som_is_space (section) && !som_is_subspace (section))
-	continue;
-      
-      if (som_is_space (section))
-	{
-	  /* Allocate space for the space dictionary.  */
-	  som_section_data (section)->space_dict
-	    = (struct space_dictionary_record *)
-	      bfd_zalloc (abfd, sizeof (struct space_dictionary_record));
-	  if (som_section_data (section)->space_dict == NULL)
-	    return false;
-	  /* Set space attributes.  Note most attributes of SOM spaces
-	     are set based on the subspaces it contains.  */
-	  som_section_data (section)->space_dict->loader_fix_index = -1;
-	  som_section_data (section)->space_dict->init_pointer_index = -1;
-
-	  /* Set more attributes that were stuffed away in private data.  */
-	  som_section_data (section)->space_dict->sort_key = 
-	    som_section_data (section)->copy_data->sort_key;
-	  som_section_data (section)->space_dict->is_defined = 
-	    som_section_data (section)->copy_data->is_defined;
-	  som_section_data (section)->space_dict->is_private = 
-	    som_section_data (section)->copy_data->is_private;
-	  som_section_data (section)->space_dict->space_number =
-	    som_section_data (section)->copy_data->space_number;
-	}
-      else
-	{
-	  /* Allocate space for the subspace dictionary.  */
-	  som_section_data (section)->subspace_dict
-	    = (struct subspace_dictionary_record *)
-	      bfd_zalloc (abfd, sizeof (struct subspace_dictionary_record));
-	  if (som_section_data (section)->subspace_dict == NULL)
-	    return false;
-
-	  /* Set subspace attributes.  Basic stuff is done here, additional
-	     attributes are filled in later as more information becomes
-	     available.  */
-	  if (section->flags & SEC_IS_COMMON)
-	    {
-	      som_section_data (section)->subspace_dict->dup_common = 1;
-	      som_section_data (section)->subspace_dict->is_common = 1;
-	    }
-
-	  if (section->flags & SEC_ALLOC)
-	    som_section_data (section)->subspace_dict->is_loadable = 1;
-
-	  if (section->flags & SEC_CODE)
-	    som_section_data (section)->subspace_dict->code_only = 1;
-
-	  som_section_data (section)->subspace_dict->subspace_start = 
-	    section->vma;
-	  som_section_data (section)->subspace_dict->subspace_length =
-	    bfd_section_size (abfd, section);
-	  som_section_data (section)->subspace_dict->initialization_length =
-	    bfd_section_size (abfd, section);
-	  som_section_data (section)->subspace_dict->alignment = 
-	    1 << section->alignment_power;
-
-	  /* Set more attributes that were stuffed away in private data.  */
-	  som_section_data (section)->subspace_dict->sort_key =
-	    som_section_data (section)->copy_data->sort_key;
-	  som_section_data (section)->subspace_dict->access_control_bits =
-	    som_section_data (section)->copy_data->access_control_bits;
-	  som_section_data (section)->subspace_dict->quadrant =
-	    som_section_data (section)->copy_data->quadrant;
-	}
-    }
-  return true;
-}
-
-/* Return true if the given section is a SOM space, false otherwise.  */
-
-static boolean
-som_is_space (section)
-     asection *section;
-{
-  /* If no copy data is available, then it's neither a space nor a
-     subspace.  */
-  if (som_section_data (section)->copy_data == NULL)
-    return false;
-
-  /* If the containing space isn't the same as the given section,
-     then this isn't a space.  */
-  if (som_section_data (section)->copy_data->container != section
-      && (som_section_data (section)->copy_data->container->output_section
-	  != section))
-    return false;
-
-  /* OK.  Must be a space.  */
-  return true;
-}
-
-/* Return true if the given section is a SOM subspace, false otherwise.  */
-
-static boolean
-som_is_subspace (section)
-     asection *section;
-{
-  /* If no copy data is available, then it's neither a space nor a
-     subspace.  */
-  if (som_section_data (section)->copy_data == NULL)
-    return false;
-
-  /* If the containing space is the same as the given section,
-     then this isn't a subspace.  */
-  if (som_section_data (section)->copy_data->container == section
-      || (som_section_data (section)->copy_data->container->output_section
-	  == section))
-    return false;
-
-  /* OK.  Must be a subspace.  */
-  return true;
-}
-
-/* Return true if the given space containins the given subspace.  It
-   is safe to assume space really is a space, and subspace really
-   is a subspace.  */
-
-static boolean
-som_is_container (space, subspace)
-     asection *space, *subspace;
-{
-  return (som_section_data (subspace)->copy_data->container == space
-	  || (som_section_data (subspace)->copy_data->container->output_section
-	      == space));
-}
-
-/* Count and return the number of spaces attached to the given BFD.  */
-
-static unsigned long
-som_count_spaces (abfd)
-     bfd *abfd;
-{
-  int count = 0;
-  asection *section;
-
-  for (section = abfd->sections; section != NULL; section = section->next)
-      count += som_is_space (section);
-
-  return count;
-}
-
-/* Count the number of subspaces attached to the given BFD.  */
-
-static unsigned long
-som_count_subspaces (abfd)
-     bfd *abfd;
-{
-  int count = 0;
-  asection *section;
-
-  for (section = abfd->sections; section != NULL; section = section->next)
-    count += som_is_subspace (section);
-
-  return count;
-}
-
-/* Return -1, 0, 1 indicating the relative ordering of sym1 and sym2.
-
-   We desire symbols to be ordered starting with the symbol with the
-   highest relocation count down to the symbol with the lowest relocation
-   count.  Doing so compacts the relocation stream.  */
-
-static int
-compare_syms (arg1, arg2)
-     const PTR arg1;
-     const PTR arg2;
-
-{
-  asymbol **sym1 = (asymbol **) arg1;
-  asymbol **sym2 = (asymbol **) arg2;
-  unsigned int count1, count2;
-  
-  /* Get relocation count for each symbol.  Note that the count
-     is stored in the udata pointer for section symbols!  */
-  if ((*sym1)->flags & BSF_SECTION_SYM)
-    count1 = (*sym1)->udata.i;
-  else
-    count1 = som_symbol_data (*sym1)->reloc_count;
-
-  if ((*sym2)->flags & BSF_SECTION_SYM)
-    count2 = (*sym2)->udata.i;
-  else
-    count2 = som_symbol_data (*sym2)->reloc_count;
-
-  /* Return the appropriate value.  */
-  if (count1 < count2)
-    return 1;
-  else if (count1 > count2)
-    return -1;
-  return 0;
-}
-
-/* Return -1, 0, 1 indicating the relative ordering of subspace1
-   and subspace.  */
-
-static int
-compare_subspaces (arg1, arg2)
-     const PTR arg1;
-     const PTR arg2;
-
-{
-  asection **subspace1 = (asection **) arg1;
-  asection **subspace2 = (asection **) arg2;
-  unsigned int count1, count2;
-  
-  if ((*subspace1)->target_index < (*subspace2)->target_index)
-    return -1;
-  else if ((*subspace2)->target_index < (*subspace1)->target_index)
-    return 1;
-  else
-    return 0;
-}
-
-/* Perform various work in preparation for emitting the fixup stream.  */
-
-static void
-som_prep_for_fixups (abfd, syms, num_syms)
-     bfd *abfd;
-     asymbol **syms;
-     unsigned long num_syms;
-{
-  int i;
-  asection *section;
-  asymbol **sorted_syms;
-
-  /* Most SOM relocations involving a symbol have a length which is
-     dependent on the index of the symbol.  So symbols which are
-     used often in relocations should have a small index.  */
-
-  /* First initialize the counters for each symbol.  */
-  for (i = 0; i < num_syms; i++)
-    {
-      /* Handle a section symbol; these have no pointers back to the
-	 SOM symbol info.  So we just use the udata field to hold the
-	 relocation count.  */
-      if (som_symbol_data (syms[i]) == NULL
-	  || syms[i]->flags & BSF_SECTION_SYM)
-	{
-	  syms[i]->flags |= BSF_SECTION_SYM;
-	  syms[i]->udata.i = 0;
-	}
-      else
-	som_symbol_data (syms[i])->reloc_count = 0;
-    }
-
-  /* Now that the counters are initialized, make a weighted count
-     of how often a given symbol is used in a relocation.  */
-  for (section = abfd->sections; section != NULL; section = section->next)
-    {
-      int i;
-
-      /* Does this section have any relocations?  */
-      if (section->reloc_count <= 0)
-	continue;
-
-      /* Walk through each relocation for this section.  */
-      for (i = 1; i < section->reloc_count; i++)
-	{
-	  arelent *reloc = section->orelocation[i];
-	  int scale;
-
-	  /* A relocation against a symbol in the *ABS* section really
-	     does not have a symbol.  Likewise if the symbol isn't associated
-	     with any section.  */
-	  if (reloc->sym_ptr_ptr == NULL
-	      || bfd_is_abs_section ((*reloc->sym_ptr_ptr)->section))
-	    continue;
-
-	  /* Scaling to encourage symbols involved in R_DP_RELATIVE 
-	     and R_CODE_ONE_SYMBOL relocations to come first.  These
-	     two relocations have single byte versions if the symbol
-	     index is very small.  */
-	  if (reloc->howto->type == R_DP_RELATIVE
-	      || reloc->howto->type == R_CODE_ONE_SYMBOL)
-	    scale = 2;
-	  else
-	    scale = 1;
-
-	  /* Handle section symbols by storing the count in the udata
-	     field.  It will not be used and the count is very important
-	     for these symbols.  */
-	  if ((*reloc->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
-	    {
-	      (*reloc->sym_ptr_ptr)->udata.i =
-		(*reloc->sym_ptr_ptr)->udata.i + scale;
-	      continue;
-	    }
-
-	  /* A normal symbol.  Increment the count.  */
-	  som_symbol_data (*reloc->sym_ptr_ptr)->reloc_count += scale;
-	}
-    }
-
-  /* Sort a copy of the symbol table, rather than the canonical
-     output symbol table.  */
-  sorted_syms = (asymbol **) bfd_zalloc (abfd, num_syms * sizeof (asymbol *));
-  memcpy (sorted_syms, syms, num_syms * sizeof (asymbol *));
-  qsort (sorted_syms, num_syms, sizeof (asymbol *), compare_syms);
-  obj_som_sorted_syms (abfd) = sorted_syms;
-
-  /* Compute the symbol indexes, they will be needed by the relocation
-     code.  */
-  for (i = 0; i < num_syms; i++)
-    {
-      /* A section symbol.  Again, there is no pointer to backend symbol
-	 information, so we reuse the udata field again.  */
-      if (sorted_syms[i]->flags & BSF_SECTION_SYM)
-	sorted_syms[i]->udata.i = i;
-      else
-        som_symbol_data (sorted_syms[i])->index = i;
-    }
-}
-
-static boolean
-som_write_fixups (abfd, current_offset, total_reloc_sizep)
-     bfd *abfd;
-     unsigned long current_offset;
-     unsigned int *total_reloc_sizep;
-{
-  unsigned int i, j;
-  /* Chunk of memory that we can use as buffer space, then throw
-     away.  */
-  unsigned char tmp_space[SOM_TMP_BUFSIZE];
-  unsigned char *p;
-  unsigned int total_reloc_size = 0;
-  unsigned int subspace_reloc_size = 0;
-  unsigned int num_spaces = obj_som_file_hdr (abfd)->space_total;
-  asection *section = abfd->sections;
-
-  memset (tmp_space, 0, SOM_TMP_BUFSIZE);
-  p = tmp_space;
-
-  /* All the fixups for a particular subspace are emitted in a single
-     stream.  All the subspaces for a particular space are emitted
-     as a single stream.
-
-     So, to get all the locations correct one must iterate through all the
-     spaces, for each space iterate through its subspaces and output a
-     fixups stream.  */
-  for (i = 0; i < num_spaces; i++)
-    {
-      asection *subsection;
-
-      /* Find a space.  */
-      while (!som_is_space (section))
-	section = section->next;
-
-      /* Now iterate through each of its subspaces.  */
-      for (subsection = abfd->sections;
-	   subsection != NULL;
-	   subsection = subsection->next)
-	{
-	  int reloc_offset, current_rounding_mode;
-
-	  /* Find a subspace of this space.  */
-	  if (!som_is_subspace (subsection)
-	      || !som_is_container (section, subsection))
-	    continue;
-
-	  /* If this subspace does not have real data, then we are
-	     finised with it.  */
-	  if ((subsection->flags & SEC_HAS_CONTENTS) == 0)
-	    {
-	      som_section_data (subsection)->subspace_dict->fixup_request_index
-		= -1;
-	      continue;
-	    }
-
-	  /* This subspace has some relocations.  Put the relocation stream
-	     index into the subspace record.  */
-	  som_section_data (subsection)->subspace_dict->fixup_request_index
-	    = total_reloc_size;
-
-	  /* To make life easier start over with a clean slate for 
-	     each subspace.  Seek to the start of the relocation stream
-	     for this subspace in preparation for writing out its fixup
-	     stream.  */
-	  if (bfd_seek (abfd, current_offset + total_reloc_size, SEEK_SET) < 0)
-	    return false;
-
-	  /* Buffer space has already been allocated.  Just perform some
-	     initialization here.  */
-	  p = tmp_space;
-	  subspace_reloc_size = 0;
-	  reloc_offset = 0;
-	  som_initialize_reloc_queue (reloc_queue);
-	  current_rounding_mode = R_N_MODE;
-
-	  /* Translate each BFD relocation into one or more SOM 
-	     relocations.  */
-	  for (j = 0; j < subsection->reloc_count; j++)
-	    {
-	      arelent *bfd_reloc = subsection->orelocation[j];
-	      unsigned int skip;
-	      int sym_num;
-
-	      /* Get the symbol number.  Remember it's stored in a 
-		 special place for section symbols.  */
-	      if ((*bfd_reloc->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
-		sym_num = (*bfd_reloc->sym_ptr_ptr)->udata.i;
-	      else
-		sym_num = som_symbol_data (*bfd_reloc->sym_ptr_ptr)->index;
-	      
-	      /* If there is not enough room for the next couple relocations,
-		 then dump the current buffer contents now.  Also reinitialize
-		 the relocation queue. 
-
-		 No single BFD relocation could ever translate into more
-		 than 100 bytes of SOM relocations (20bytes is probably the
-		 upper limit, but leave lots of space for growth).  */
-	      if (p - tmp_space + 100 > SOM_TMP_BUFSIZE)
-		{
-		  if (bfd_write ((PTR) tmp_space, p - tmp_space, 1, abfd)
-		      != p - tmp_space)
-		    return false;
-
-		  p = tmp_space;
-		  som_initialize_reloc_queue (reloc_queue);
-		}
-
-	      /* Emit R_NO_RELOCATION fixups to map any bytes which were
-		 skipped.  */
-	      skip = bfd_reloc->address - reloc_offset;
-	      p = som_reloc_skip (abfd, skip, p,
-				  &subspace_reloc_size, reloc_queue);
-
-	      /* Update reloc_offset for the next iteration.
-
-		 Many relocations do not consume input bytes.  They
-		 are markers, or set state necessary to perform some
-		 later relocation.  */
-	      switch (bfd_reloc->howto->type)
-		{
-		case R_ENTRY:
-		case R_ALT_ENTRY:
-		case R_EXIT:
-		case R_N_MODE:
-		case R_S_MODE:
-		case R_D_MODE:
-		case R_R_MODE:
-		case R_FSEL:
-		case R_LSEL:
-		case R_RSEL:
-		case R_COMP1:
-		case R_COMP2:
-		case R_BEGIN_BRTAB:
-		case R_END_BRTAB:
-		case R_BEGIN_TRY:
-		case R_END_TRY:
-		case R_N0SEL:
-		case R_N1SEL:
-		  reloc_offset = bfd_reloc->address;
-		  break;
-
-		default:
-		  reloc_offset = bfd_reloc->address + 4;
-		  break;
-		}
-
-	      /* Now the actual relocation we care about.  */
-	      switch (bfd_reloc->howto->type)
-		{
-		case R_PCREL_CALL:
-		case R_ABS_CALL:
-		  p = som_reloc_call (abfd, p, &subspace_reloc_size,
-				      bfd_reloc, sym_num, reloc_queue);
-		  break;
-
-		case R_CODE_ONE_SYMBOL:
-		case R_DP_RELATIVE:
-		  /* Account for any addend.  */
-		  if (bfd_reloc->addend)
-		    p = som_reloc_addend (abfd, bfd_reloc->addend, p, 
-					  &subspace_reloc_size, reloc_queue);
-
-		  if (sym_num < 0x20)
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type + sym_num, p);
-		      subspace_reloc_size += 1;
-		      p += 1;
-		    }
-		  else if (sym_num < 0x100)
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type + 32, p);
-		      bfd_put_8 (abfd, sym_num, p + 1);
-		      p = try_prev_fixup (abfd, &subspace_reloc_size, p,
-					  2, reloc_queue);
-		    }
-		  else if (sym_num < 0x10000000)
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type + 33, p);
-		      bfd_put_8 (abfd, sym_num >> 16, p + 1);
-		      bfd_put_16 (abfd, sym_num, p + 2); 
-		      p = try_prev_fixup (abfd, &subspace_reloc_size,
-					  p, 4, reloc_queue);
-		    }
-		  else
-		    abort ();
-		  break;
-
-		case R_DATA_ONE_SYMBOL:
-		case R_DATA_PLABEL:
-		case R_CODE_PLABEL:
-		case R_DLT_REL:
-		  /* Account for any addend using R_DATA_OVERRIDE.  */
-		  if (bfd_reloc->howto->type != R_DATA_ONE_SYMBOL
-		      && bfd_reloc->addend)
-		    p = som_reloc_addend (abfd, bfd_reloc->addend, p, 
-					  &subspace_reloc_size, reloc_queue);
-
-		  if (sym_num < 0x100)
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type, p);
-		      bfd_put_8 (abfd, sym_num, p + 1);
-		      p = try_prev_fixup (abfd, &subspace_reloc_size, p,
-					  2, reloc_queue);
-		    }
-		  else if (sym_num < 0x10000000)
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type + 1, p);
-		      bfd_put_8 (abfd, sym_num >> 16, p + 1);
-		      bfd_put_16 (abfd, sym_num, p + 2); 
-		      p = try_prev_fixup (abfd, &subspace_reloc_size,
-					  p, 4, reloc_queue);
-		    }
-		  else
-		    abort ();
-		  break;
-
-		case R_ENTRY:
-		  {
-		    int tmp;
-		    arelent *tmp_reloc = NULL;
-		    bfd_put_8 (abfd, R_ENTRY, p);
-
-		    /* R_ENTRY relocations have 64 bits of associated
-		       data.  Unfortunately the addend field of a bfd
-		       relocation is only 32 bits.  So, we split up
-		       the 64bit unwind information and store part in
-		       the R_ENTRY relocation, and the rest in the R_EXIT
-		       relocation.  */
-		    bfd_put_32 (abfd, bfd_reloc->addend, p + 1);
-		
-		    /* Find the next R_EXIT relocation.  */
-		    for (tmp = j; tmp < subsection->reloc_count; tmp++)
-		      {
-		        tmp_reloc = subsection->orelocation[tmp];
-			if (tmp_reloc->howto->type == R_EXIT)
-			  break;
-		      }
-
-		    if (tmp == subsection->reloc_count)
-		      abort ();
-
-		    bfd_put_32 (abfd, tmp_reloc->addend, p + 5);
-		    p = try_prev_fixup (abfd, &subspace_reloc_size,
-					p, 9, reloc_queue);
-		    break;
-		  }
-		  
-		case R_N_MODE:
-		case R_S_MODE:
-		case R_D_MODE:
-		case R_R_MODE:
-		  /* If this relocation requests the current rounding
-		     mode, then it is redundant.  */
-		  if (bfd_reloc->howto->type != current_rounding_mode)
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type, p);
-		      subspace_reloc_size += 1;
-		      p += 1;
-		      current_rounding_mode = bfd_reloc->howto->type;
-		    }
-		  break;
-
-		case R_EXIT:
-		case R_ALT_ENTRY:
-		case R_FSEL:
-		case R_LSEL:
-		case R_RSEL:
-		case R_BEGIN_BRTAB:
-		case R_END_BRTAB:
-		case R_BEGIN_TRY:
-		case R_N0SEL:
-		case R_N1SEL:
-		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
-		  subspace_reloc_size += 1;
-		  p += 1;
-		  break;
-
-		case R_END_TRY:
-		  /* The end of a exception handling region.  The reloc's
-		     addend contains the offset of the exception handling
-		     code.  */
-		  if (bfd_reloc->addend == 0)
-		    bfd_put_8 (abfd, bfd_reloc->howto->type, p);
-		  else if (bfd_reloc->addend < 1024)
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type + 1, p);
-		      bfd_put_8 (abfd, bfd_reloc->addend / 4, p + 1);
-		      p = try_prev_fixup (abfd, &subspace_reloc_size,
-					  p, 2, reloc_queue);
-		    }
-		  else
-		    {
-		      bfd_put_8 (abfd, bfd_reloc->howto->type + 2, p);
-		      bfd_put_8 (abfd, (bfd_reloc->addend / 4) >> 16, p + 1);
-		      bfd_put_16 (abfd, bfd_reloc->addend / 4, p + 2);
-		      p = try_prev_fixup (abfd, &subspace_reloc_size,
-					  p, 4, reloc_queue);
-		    }
-		  break;
-		      
-		case R_COMP1:
-		  /* The only time we generate R_COMP1, R_COMP2 and 
-		     R_CODE_EXPR relocs is for the difference of two
-		     symbols.  Hence we can cheat here.  */
-		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
-		  bfd_put_8 (abfd, 0x44, p + 1);
-		  p = try_prev_fixup (abfd, &subspace_reloc_size,
-				      p, 2, reloc_queue);
-		  break;
-
-		case R_COMP2:
-		  /* The only time we generate R_COMP1, R_COMP2 and 
-		     R_CODE_EXPR relocs is for the difference of two
-		     symbols.  Hence we can cheat here.  */
-		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
-		  bfd_put_8 (abfd, 0x80, p + 1);
-		  bfd_put_8 (abfd, sym_num >> 16, p + 2);
-		  bfd_put_16 (abfd, sym_num, p + 3);
-		  p = try_prev_fixup (abfd, &subspace_reloc_size,
-				      p, 5, reloc_queue);
-		  break;
-
-		case R_CODE_EXPR:
-		case R_DATA_EXPR:
-		  /* The only time we generate R_COMP1, R_COMP2 and 
-		     R_CODE_EXPR relocs is for the difference of two
-		     symbols.  Hence we can cheat here.  */
-		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
-		  subspace_reloc_size += 1;
-		  p += 1;
-		  break;
-
-		/* Put a "R_RESERVED" relocation in the stream if
-		   we hit something we do not understand.  The linker
-		   will complain loudly if this ever happens.  */
-		default:
-		  bfd_put_8 (abfd, 0xff, p);
-		  subspace_reloc_size += 1;
-		  p += 1;
-		  break;
-		}
-	    }
-
-	  /* Last BFD relocation for a subspace has been processed.
-	     Map the rest of the subspace with R_NO_RELOCATION fixups.  */
-	  p = som_reloc_skip (abfd, bfd_section_size (abfd, subsection) 
-			              - reloc_offset,
-			      p, &subspace_reloc_size, reloc_queue);
-
-	  /* Scribble out the relocations.  */
-	  if (bfd_write ((PTR) tmp_space, p - tmp_space, 1, abfd)
-	      != p - tmp_space)
-	    return false;
-	  p = tmp_space;
-
-	  total_reloc_size += subspace_reloc_size;
-	  som_section_data (subsection)->subspace_dict->fixup_request_quantity
-	    = subspace_reloc_size;
-	}
-      section = section->next;
-    }
-  *total_reloc_sizep = total_reloc_size;
-  return true;
-}
-
-/* Write out the space/subspace string table.  */
-
-static boolean
-som_write_space_strings (abfd, current_offset, string_sizep)
-     bfd *abfd;
-     unsigned long current_offset;
-     unsigned int *string_sizep;
-{
-  /* Chunk of memory that we can use as buffer space, then throw
-     away.  */
-  unsigned char tmp_space[SOM_TMP_BUFSIZE];
-  unsigned char *p;
-  unsigned int strings_size = 0;
-  asection *section;
-
-  memset (tmp_space, 0, SOM_TMP_BUFSIZE);
-  p = tmp_space;
-
-  /* Seek to the start of the space strings in preparation for writing
-     them out.  */
-  if (bfd_seek (abfd, current_offset, SEEK_SET) < 0)
-    return false;
-
-  /* Walk through all the spaces and subspaces (order is not important)
-     building up and writing string table entries for their names.  */
-  for (section = abfd->sections; section != NULL; section = section->next)
-    {
-      int length;
-
-      /* Only work with space/subspaces; avoid any other sections
-	 which might have been made (.text for example).  */
-      if (!som_is_space (section) && !som_is_subspace (section))
-	continue;
-
-      /* Get the length of the space/subspace name.  */
-      length = strlen (section->name);
-
-      /* If there is not enough room for the next entry, then dump the
-	 current buffer contents now.  Each entry will take 4 bytes to
-	 hold the string length + the string itself + null terminator.  */
-      if (p - tmp_space + 5 + length > SOM_TMP_BUFSIZE)
-	{
-	  if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
-	      != p - tmp_space) 
-	    return false;
-	  /* Reset to beginning of the buffer space.  */
-	  p = tmp_space;
-	}
-
-      /* First element in a string table entry is the length of the
-	 string.  Alignment issues are already handled.  */
-      bfd_put_32 (abfd, length, p);
-      p += 4;
-      strings_size += 4;
-
-      /* Record the index in the space/subspace records.  */
-      if (som_is_space (section))
-	som_section_data (section)->space_dict->name.n_strx = strings_size;
-      else
-	som_section_data (section)->subspace_dict->name.n_strx = strings_size;
-
-      /* Next comes the string itself + a null terminator.  */
-      strcpy (p, section->name);
-      p += length + 1;
-      strings_size += length + 1;
-
-      /* Always align up to the next word boundary.  */
-      while (strings_size % 4)
-	{
-	  bfd_put_8 (abfd, 0, p);
-	  p++;
-	  strings_size++;
-	}
-    }
-
-  /* Done with the space/subspace strings.  Write out any information
-     contained in a partial block.  */
-  if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd) != p - tmp_space)
-    return false;
-  *string_sizep = strings_size;
-  return true;
-}
-
-/* Write out the symbol string table.  */
-
-static boolean
-som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
-			  compilation_unit)
-     bfd *abfd;
-     unsigned long current_offset;
-     asymbol **syms;
-     unsigned int num_syms;
-     unsigned int *string_sizep;
-     COMPUNIT *compilation_unit;
-{
-  unsigned int i;
-  
-  /* Chunk of memory that we can use as buffer space, then throw
-     away.  */
-  unsigned char tmp_space[SOM_TMP_BUFSIZE];
-  unsigned char *p;
-  unsigned int strings_size = 0;
-  unsigned char *comp[4];
-
-  /* This gets a bit gruesome because of the compilation unit.  The
-     strings within the compilation unit are part of the symbol
-     strings, but don't have symbol_dictionary entries.  So, manually
-     write them and update the compliation unit header.  On input, the
-     compilation unit header contains local copies of the strings.
-     Move them aside.  */
-  if (compilation_unit)
-    {
-      comp[0] = compilation_unit->name.n_name;
-      comp[1] = compilation_unit->language_name.n_name;
-      comp[2] = compilation_unit->product_id.n_name;
-      comp[3] = compilation_unit->version_id.n_name;
-    }
-
-  memset (tmp_space, 0, SOM_TMP_BUFSIZE);
-  p = tmp_space;
-
-  /* Seek to the start of the space strings in preparation for writing
-     them out.  */
-  if (bfd_seek (abfd, current_offset, SEEK_SET) < 0)
-    return false;
-
-  if (compilation_unit)
-    {
-      for (i = 0; i < 4; i++)
-	{
-	  int length = strlen (comp[i]);
-
-	  /* If there is not enough room for the next entry, then dump
-	     the current buffer contents now.  */
-	  if (p - tmp_space + 5 + length > SOM_TMP_BUFSIZE)
-	    {
-	      if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
-		  != p - tmp_space)
-		return false;
-	      /* Reset to beginning of the buffer space.  */
-	      p = tmp_space;
-	    }
-
-	  /* First element in a string table entry is the length of
-	     the string.  This must always be 4 byte aligned.  This is
-	     also an appropriate time to fill in the string index
-	     field in the symbol table entry.  */
-	  bfd_put_32 (abfd, length, p);
-	  strings_size += 4;
-	  p += 4;
-
-	  /* Next comes the string itself + a null terminator.  */
-	  strcpy (p, comp[i]);
-
-	  switch (i)
-	    {
-	    case 0:	
-	      obj_som_compilation_unit (abfd)->name.n_strx = strings_size;
-	      break;
-	    case 1:
-	      obj_som_compilation_unit (abfd)->language_name.n_strx = 
-		strings_size;
-	      break;
-	    case 2:
-	      obj_som_compilation_unit (abfd)->product_id.n_strx = 
-		strings_size;
-	      break;
-	    case 3:
-	      obj_som_compilation_unit (abfd)->version_id.n_strx = 
-		strings_size;
-	      break;
-	    }
-
-	  p += length + 1;
-	  strings_size += length + 1;
-
-	  /* Always align up to the next word boundary.  */
-	  while (strings_size % 4)
-	    {
-	      bfd_put_8 (abfd, 0, p);
-	      strings_size++;
-	      p++;
-	    }
-	}
-    }
-
-  for (i = 0; i < num_syms; i++)
-    {
-      int length = strlen (syms[i]->name);
-
-      /* If there is not enough room for the next entry, then dump the
-	 current buffer contents now.  */
-     if (p - tmp_space + 5 + length > SOM_TMP_BUFSIZE)
-	{
-	  if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
-	      != p - tmp_space)
-	    return false;
-	  /* Reset to beginning of the buffer space.  */
-	  p = tmp_space;
-	}
-
-      /* First element in a string table entry is the length of the
-	 string.  This must always be 4 byte aligned.  This is also
-	 an appropriate time to fill in the string index field in the
-	 symbol table entry.  */
-      bfd_put_32 (abfd, length, p);
-      strings_size += 4;
-      p += 4;
-
-      /* Next comes the string itself + a null terminator.  */
-      strcpy (p, syms[i]->name);
-
-      som_symbol_data(syms[i])->stringtab_offset = strings_size;
-      p += length + 1;
-      strings_size += length + 1;
-
-      /* Always align up to the next word boundary.  */
-      while (strings_size % 4)
-        {
-	  bfd_put_8 (abfd, 0, p);
-	  strings_size++;
-	  p++;
-        }
-    }
-
-  /* Scribble out any partial block.  */
-  if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd) != p - tmp_space)
-    return false;
-
-  *string_sizep = strings_size;
-  return true;
-}
-
-/* Compute variable information to be placed in the SOM headers, 
-   space/subspace dictionaries, relocation streams, etc.  Begin
-   writing parts of the object file.  */
-
-static boolean 
-som_begin_writing (abfd)
-     bfd *abfd;
-{
-  unsigned long current_offset = 0;
-  int strings_size = 0;
-  unsigned int total_reloc_size = 0;
-  unsigned long num_spaces, num_subspaces, i;
-  asection *section;
-  unsigned int total_subspaces = 0;
-  struct som_exec_auxhdr *exec_header = NULL;
-
-  /* The file header will always be first in an object file, 
-     everything else can be in random locations.  To keep things
-     "simple" BFD will lay out the object file in the manner suggested
-     by the PRO ABI for PA-RISC Systems.  */
-
-  /* Before any output can really begin offsets for all the major
-     portions of the object file must be computed.  So, starting
-     with the initial file header compute (and sometimes write)
-     each portion of the object file.  */
-
-  /* Make room for the file header, it's contents are not complete
-     yet, so it can not be written at this time.  */
-  current_offset += sizeof (struct header);  
-
-  /* Any auxiliary headers will follow the file header.  Right now
-     we support only the copyright and version headers.  */
-  obj_som_file_hdr (abfd)->aux_header_location = current_offset;
-  obj_som_file_hdr (abfd)->aux_header_size = 0;
-  if (abfd->flags & (EXEC_P | DYNAMIC))
-    {
-      /* Parts of the exec header will be filled in later, so
-	 delay writing the header itself.  Fill in the defaults,
-	 and write it later.  */
-      current_offset += sizeof (struct som_exec_auxhdr);
-      obj_som_file_hdr (abfd)->aux_header_size
-	+= sizeof (struct som_exec_auxhdr);
-      exec_header = obj_som_exec_hdr (abfd);
-      exec_header->som_auxhdr.type = EXEC_AUX_ID;
-      exec_header->som_auxhdr.length = 40;
-    }
-  if (obj_som_version_hdr (abfd) != NULL)
-    {
-      unsigned int len;
-
-      if (bfd_seek (abfd, current_offset, SEEK_SET) < 0)
-	return false;
-
-      /* Write the aux_id structure and the string length.  */
-      len = sizeof (struct aux_id) + sizeof (unsigned int);
-      obj_som_file_hdr (abfd)->aux_header_size += len;
-      current_offset += len;
-      if (bfd_write ((PTR) obj_som_version_hdr (abfd), len, 1, abfd) != len)
-	return false;
-
-      /* Write the version string.  */
-      len = obj_som_version_hdr (abfd)->header_id.length - sizeof (int);
-      obj_som_file_hdr (abfd)->aux_header_size += len;
-      current_offset += len;
-      if (bfd_write ((PTR) obj_som_version_hdr (abfd)->user_string,
-		     len, 1, abfd) != len)
-	return false;
-    }
-
-  if (obj_som_copyright_hdr (abfd) != NULL)
-    {
-      unsigned int len;
-
-      if (bfd_seek (abfd, current_offset, SEEK_SET) < 0)
-	return false;
-
-      /* Write the aux_id structure and the string length.  */
-      len = sizeof (struct aux_id) + sizeof (unsigned int);
-      obj_som_file_hdr (abfd)->aux_header_size += len;
-      current_offset += len;
-      if (bfd_write ((PTR) obj_som_copyright_hdr (abfd), len, 1, abfd) != len)
-	return false;
-
-      /* Write the copyright string.  */
-      len = obj_som_copyright_hdr (abfd)->header_id.length - sizeof (int);
-      obj_som_file_hdr (abfd)->aux_header_size += len;
-      current_offset += len;
-      if (bfd_write ((PTR) obj_som_copyright_hdr (abfd)->copyright,
-		     len, 1, abfd) != len)
-	return false;
-    }
-
-  /* Next comes the initialization pointers; we have no initialization
-     pointers, so current offset does not change.  */
-  obj_som_file_hdr (abfd)->init_array_location = current_offset;
-  obj_som_file_hdr (abfd)->init_array_total = 0;
-
-  /* Next are the space records.  These are fixed length records.
-
-     Count the number of spaces to determine how much room is needed
-     in the object file for the space records.
-
-     The names of the spaces are stored in a separate string table,
-     and the index for each space into the string table is computed
-     below.  Therefore, it is not possible to write the space headers
-     at this time.  */
-  num_spaces = som_count_spaces (abfd);
-  obj_som_file_hdr (abfd)->space_location = current_offset;
-  obj_som_file_hdr (abfd)->space_total = num_spaces;
-  current_offset += num_spaces * sizeof (struct space_dictionary_record);
-
-  /* Next are the subspace records.  These are fixed length records.
-
-     Count the number of subspaes to determine how much room is needed
-     in the object file for the subspace records.
-
-     A variety if fields in the subspace record are still unknown at
-     this time (index into string table, fixup stream location/size, etc).  */
-  num_subspaces = som_count_subspaces (abfd);
-  obj_som_file_hdr (abfd)->subspace_location = current_offset;
-  obj_som_file_hdr (abfd)->subspace_total = num_subspaces;
-  current_offset += num_subspaces * sizeof (struct subspace_dictionary_record);
-
-  /* Next is the string table for the space/subspace names.  We will
-     build and write the string table on the fly.  At the same time
-     we will fill in the space/subspace name index fields.  */
-
-  /* The string table needs to be aligned on a word boundary.  */
-  if (current_offset % 4)
-    current_offset += (4 - (current_offset % 4));
-
-  /* Mark the offset of the space/subspace string table in the 
-     file header.  */
-  obj_som_file_hdr (abfd)->space_strings_location = current_offset;
-
-  /* Scribble out the space strings.  */
-  if (som_write_space_strings (abfd, current_offset, &strings_size) == false)
-    return false;
-
-  /* Record total string table size in the header and update the
-     current offset.  */
-  obj_som_file_hdr (abfd)->space_strings_size = strings_size;
-  current_offset += strings_size;
-
-  /* Next is the compilation unit. */
-  obj_som_file_hdr (abfd)->compiler_location = current_offset;
-  obj_som_file_hdr (abfd)->compiler_total = 0;
-  if (obj_som_compilation_unit (abfd)) 
-    {
-      obj_som_file_hdr (abfd)->compiler_total = 1;
-      current_offset += COMPUNITSZ; 
-    }
-
-  /* Now compute the file positions for the loadable subspaces, taking
-     care to make sure everything stays properly aligned.  */
-
-  section = abfd->sections;
-  for (i = 0; i < num_spaces; i++)
-    {
-      asection *subsection;
-      int first_subspace;
-      unsigned int subspace_offset = 0;
-
-      /* Find a space.  */
-      while (!som_is_space (section))
-	section = section->next;
-
-      first_subspace = 1;
-      /* Now look for all its subspaces.  */
-      for (subsection = abfd->sections;
-	   subsection != NULL;
-	   subsection = subsection->next)
-	{
-
-	  if (!som_is_subspace (subsection)
-	      || !som_is_container (section, subsection)
-	      || (subsection->flags & SEC_ALLOC) == 0)
-	    continue;
-
-	  /* If this is the first subspace in the space, and we are
-	     building an executable, then take care to make sure all
-	     the alignments are correct and update the exec header.  */
-	  if (first_subspace
-	      && (abfd->flags & (EXEC_P | DYNAMIC)))
-	    {
-	      /* Demand paged executables have each space aligned to a
-		 page boundary.  Sharable executables (write-protected
-		 text) have just the private (aka data & bss) space aligned
-		 to a page boundary.  Ugh.  Not true for HPUX.
-
-		 The HPUX kernel requires the text to always be page aligned
-		 within the file regardless of the executable's type.  */
-	      if (abfd->flags & (D_PAGED | DYNAMIC)
-		  || (subsection->flags & SEC_CODE)
-		  || ((abfd->flags & WP_TEXT)
-		      && (subsection->flags & SEC_DATA)))
-		current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
-
-	      /* Update the exec header.  */
-	      if (subsection->flags & SEC_CODE && exec_header->exec_tfile == 0)
-		{
-		  exec_header->exec_tmem = section->vma;
-		  exec_header->exec_tfile = current_offset;
-		}
-	      if (subsection->flags & SEC_DATA && exec_header->exec_dfile == 0)
-		{
-		  exec_header->exec_dmem = section->vma;
-		  exec_header->exec_dfile = current_offset;
-		}
-
-	      /* Keep track of exactly where we are within a particular
-		 space.  This is necessary as the braindamaged HPUX
-		 loader will create holes between subspaces *and* 
-		 subspace alignments are *NOT* preserved.  What a crock.  */
-	      subspace_offset = subsection->vma;
-
-	      /* Only do this for the first subspace within each space.  */
-	      first_subspace = 0;
-	    }
-	  else if (abfd->flags & (EXEC_P | DYNAMIC))
-	    {
-	      /* The braindamaged HPUX loader may have created a hole
-		 between two subspaces.  It is *not* sufficient to use
-		 the alignment specifications within the subspaces to
-		 account for these holes -- I've run into at least one
-		 case where the loader left one code subspace unaligned
-		 in a final executable.
-
-		 To combat this we keep a current offset within each space,
-		 and use the subspace vma fields to detect and preserve
-		 holes.  What a crock!
-
-		 ps.  This is not necessary for unloadable space/subspaces.  */
-	      current_offset += subsection->vma - subspace_offset;
-	      if (subsection->flags & SEC_CODE)
-		exec_header->exec_tsize += subsection->vma - subspace_offset;
-	      else
-		exec_header->exec_dsize += subsection->vma - subspace_offset;
-	      subspace_offset += subsection->vma - subspace_offset;
-	    }
-
-
-	  subsection->target_index = total_subspaces++;
-	  /* This is real data to be loaded from the file.  */
-	  if (subsection->flags & SEC_LOAD)
-	    {
-	      /* Update the size of the code & data.  */
-	      if (abfd->flags & (EXEC_P | DYNAMIC)
-		  && subsection->flags & SEC_CODE)
-		exec_header->exec_tsize += subsection->_cooked_size;
-	      else if (abfd->flags & (EXEC_P | DYNAMIC)
-		       && subsection->flags & SEC_DATA)
-		exec_header->exec_dsize += subsection->_cooked_size;
-	      som_section_data (subsection)->subspace_dict->file_loc_init_value
-		= current_offset;
-	      subsection->filepos = current_offset;
-	      current_offset += bfd_section_size (abfd, subsection); 
-	      subspace_offset += bfd_section_size (abfd, subsection);
-	    }
-	  /* Looks like uninitialized data.  */
-	  else
-	    {
-	      /* Update the size of the bss section.  */
-	      if (abfd->flags & (EXEC_P | DYNAMIC))
-		exec_header->exec_bsize += subsection->_cooked_size;
-
-	      som_section_data (subsection)->subspace_dict->file_loc_init_value
-		= 0;
-	      som_section_data (subsection)->subspace_dict->
-		initialization_length = 0;
-	    }
-	}
-      /* Goto the next section.  */
-      section = section->next; 
-    }
-
-  /* Finally compute the file positions for unloadable subspaces.
-     If building an executable, start the unloadable stuff on its
-     own page.  */
-
-  if (abfd->flags & (EXEC_P | DYNAMIC))
-    current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
-
-  obj_som_file_hdr (abfd)->unloadable_sp_location = current_offset;
-  section = abfd->sections;
-  for (i = 0; i < num_spaces; i++)
-    {
-      asection *subsection;
-
-      /* Find a space.  */
-      while (!som_is_space (section))
-	section = section->next;
-
-      if (abfd->flags & (EXEC_P | DYNAMIC))
-	current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
-
-      /* Now look for all its subspaces.  */
-      for (subsection = abfd->sections;
-	   subsection != NULL;
-	   subsection = subsection->next)
-	{
-	  
-	  if (!som_is_subspace (subsection)
-	      || !som_is_container (section, subsection)
-	      || (subsection->flags & SEC_ALLOC) != 0)
-	    continue;
-
-	  subsection->target_index = total_subspaces++;
-	  /* This is real data to be loaded from the file.  */
-	  if ((subsection->flags & SEC_LOAD) == 0)
-	    {
-	      som_section_data (subsection)->subspace_dict->file_loc_init_value
-		= current_offset;
-	      subsection->filepos = current_offset;
-	      current_offset += bfd_section_size (abfd, subsection); 
-	    }
-	  /* Looks like uninitialized data.  */
-	  else
-	    {
-	      som_section_data (subsection)->subspace_dict->file_loc_init_value
-		= 0;
-	      som_section_data (subsection)->subspace_dict->
-		initialization_length = bfd_section_size (abfd, subsection);
-	    }
-	}
-      /* Goto the next section.  */
-      section = section->next; 
-    }
-
-  /* If building an executable, then make sure to seek to and write
-     one byte at the end of the file to make sure any necessary
-     zeros are filled in.  Ugh.  */
-  if (abfd->flags & (EXEC_P | DYNAMIC))
-    current_offset = SOM_ALIGN (current_offset, PA_PAGESIZE);
-  if (bfd_seek (abfd, current_offset - 1, SEEK_SET) < 0)
-    return false;
-  if (bfd_write ((PTR) "", 1, 1, abfd) != 1)
-    return false;
-
-  obj_som_file_hdr (abfd)->unloadable_sp_size
-    = current_offset - obj_som_file_hdr (abfd)->unloadable_sp_location;
-
-  /* Loader fixups are not supported in any way shape or form.  */
-  obj_som_file_hdr (abfd)->loader_fixup_location = 0;
-  obj_som_file_hdr (abfd)->loader_fixup_total = 0;
-
-  /* Done.  Store the total size of the SOM so far.  */
-  obj_som_file_hdr (abfd)->som_length = current_offset;
-
-  return true;
-}
-
-/* Finally, scribble out the various headers to the disk.  */
-
-static boolean
-som_finish_writing (abfd)
-     bfd *abfd;
-{
-  int num_spaces = som_count_spaces (abfd);
-  asymbol **syms = bfd_get_outsymbols (abfd);
-  int i, num_syms, strings_size;
-  int subspace_index = 0;
-  file_ptr location;
-  asection *section;
-  unsigned long current_offset;
-  unsigned int total_reloc_size;
-
-  /* Next is the symbol table.  These are fixed length records.
-
-     Count the number of symbols to determine how much room is needed
-     in the object file for the symbol table.
-
-     The names of the symbols are stored in a separate string table,
-     and the index for each symbol name into the string table is computed
-     below.  Therefore, it is not possible to write the symbol table
-     at this time. 
-
-     These used to be output before the subspace contents, but they
-     were moved here to work around a stupid bug in the hpux linker
-     (fixed in hpux10).  */
-  current_offset = obj_som_file_hdr (abfd)->som_length;
-
-  /* Make sure we're on a word boundary.  */
-  if (current_offset % 4)
-    current_offset += (4 - (current_offset % 4)); 
-
-  num_syms = bfd_get_symcount (abfd);
-  obj_som_file_hdr (abfd)->symbol_location = current_offset;
-  obj_som_file_hdr (abfd)->symbol_total = num_syms;
-  current_offset += num_syms * sizeof (struct symbol_dictionary_record);
-
-  /* Next are the symbol strings.
-     Align them to a word boundary.  */
-  if (current_offset % 4)
-    current_offset += (4 - (current_offset % 4));
-  obj_som_file_hdr (abfd)->symbol_strings_location = current_offset;
-
-  /* Scribble out the symbol strings.  */
-  if (som_write_symbol_strings (abfd, current_offset, syms,
-				num_syms, &strings_size,
-				obj_som_compilation_unit (abfd))
-      == false)
-    return false;
-
-  /* Record total string table size in header and update the
-     current offset.  */
-  obj_som_file_hdr (abfd)->symbol_strings_size = strings_size;
-  current_offset += strings_size;
-
-  /* Do prep work before handling fixups.  */
-  som_prep_for_fixups (abfd,
-		       bfd_get_outsymbols (abfd),
-		       bfd_get_symcount (abfd));
-
-  /* At the end of the file is the fixup stream which starts on a
-     word boundary.  */
-  if (current_offset % 4)
-    current_offset += (4 - (current_offset % 4)); 
-  obj_som_file_hdr (abfd)->fixup_request_location = current_offset;
-
-  /* Write the fixups and update fields in subspace headers which
-     relate to the fixup stream.  */
-  if (som_write_fixups (abfd, current_offset, &total_reloc_size) == false)
-    return false;
-
-  /* Record the total size of the fixup stream in the file header.  */
-  obj_som_file_hdr (abfd)->fixup_request_total = total_reloc_size;
-
-  /* Done.  Store the total size of the SOM.  */
-  obj_som_file_hdr (abfd)->som_length = current_offset + total_reloc_size;
- 
-  /* Now that the symbol table information is complete, build and
-     write the symbol table.  */
-  if (som_build_and_write_symbol_table (abfd) == false)
-    return false;
-
-  /* Subspaces are written first so that we can set up information
-     about them in their containing spaces as the subspace is written.  */
-
-  /* Seek to the start of the subspace dictionary records.  */
-  location = obj_som_file_hdr (abfd)->subspace_location;
-  if (bfd_seek (abfd, location, SEEK_SET) < 0)
-    return false;
-
-  section = abfd->sections;
-  /* Now for each loadable space write out records for its subspaces.  */
-  for (i = 0; i < num_spaces; i++)
-    {
-      asection *subsection;
-
-      /* Find a space.  */
-      while (!som_is_space (section))
-	section = section->next;
-
-      /* Now look for all its subspaces.  */
-      for (subsection = abfd->sections;
-	   subsection != NULL;
-	   subsection = subsection->next)
-	{
-	  
-	  /* Skip any section which does not correspond to a space
-	     or subspace.  Or does not have SEC_ALLOC set (and therefore
-	     has no real bits on the disk).  */
-	  if (!som_is_subspace (subsection)
-	      || !som_is_container (section, subsection)
-	      || (subsection->flags & SEC_ALLOC) == 0)
-	    continue;
-
-	  /* If this is the first subspace for this space, then save
-	     the index of the subspace in its containing space.  Also
-	     set "is_loadable" in the containing space.  */
-
-	  if (som_section_data (section)->space_dict->subspace_quantity == 0)
-	    {
-	      som_section_data (section)->space_dict->is_loadable = 1;
-	      som_section_data (section)->space_dict->subspace_index
-		= subspace_index;
-	    }
-
-	  /* Increment the number of subspaces seen and the number of
-	     subspaces contained within the current space.  */
-	  subspace_index++;
-	  som_section_data (section)->space_dict->subspace_quantity++;
-
-	  /* Mark the index of the current space within the subspace's
-	     dictionary record.  */
-	  som_section_data (subsection)->subspace_dict->space_index = i;
-	  
-	  /* Dump the current subspace header.  */
-	  if (bfd_write ((PTR) som_section_data (subsection)->subspace_dict,
-			 sizeof (struct subspace_dictionary_record), 1, abfd)
-	      != sizeof (struct subspace_dictionary_record))
-	    return false;
-	}
-      /* Goto the next section.  */
-      section = section->next; 
-    }
-
-  /* Now repeat the process for unloadable subspaces.  */
-  section = abfd->sections;
-  /* Now for each space write out records for its subspaces.  */
-  for (i = 0; i < num_spaces; i++)
-    {
-      asection *subsection;
-
-      /* Find a space.  */
-      while (!som_is_space (section))
-	section = section->next;
-
-      /* Now look for all its subspaces.  */
-      for (subsection = abfd->sections;
-	   subsection != NULL;
-	   subsection = subsection->next)
-	{
-	  
-	  /* Skip any section which does not correspond to a space or
-	     subspace, or which SEC_ALLOC set (and therefore handled
-	     in the loadable spaces/subspaces code above).  */
-
-	  if (!som_is_subspace (subsection)
-	      || !som_is_container (section, subsection)
-	      || (subsection->flags & SEC_ALLOC) != 0)
-	    continue;
-
-	  /* If this is the first subspace for this space, then save
-	     the index of the subspace in its containing space.  Clear
-	     "is_loadable".  */
-
-	  if (som_section_data (section)->space_dict->subspace_quantity == 0)
-	    {
-	      som_section_data (section)->space_dict->is_loadable = 0;
-	      som_section_data (section)->space_dict->subspace_index
-		= subspace_index;
-	    }
-
-	  /* Increment the number of subspaces seen and the number of
-	     subspaces contained within the current space.  */
-	  som_section_data (section)->space_dict->subspace_quantity++;
-	  subspace_index++; 
-
-	  /* Mark the index of the current space within the subspace's
-	     dictionary record.  */
-	  som_section_data (subsection)->subspace_dict->space_index = i;
-	  
-	  /* Dump this subspace header.  */
-	  if (bfd_write ((PTR) som_section_data (subsection)->subspace_dict,
-			 sizeof (struct subspace_dictionary_record), 1, abfd)
-	      != sizeof (struct subspace_dictionary_record))
-	    return false;
-	}
-      /* Goto the next section.  */
-      section = section->next; 
-    }
-
-  /* All the subspace dictiondary records are written, and all the
-     fields are set up in the space dictionary records.
-
-     Seek to the right location and start writing the space
-     dictionary records.  */
-  location = obj_som_file_hdr (abfd)->space_location;
-  if (bfd_seek (abfd, location, SEEK_SET) < 0)
-    return false;
-
-  section = abfd->sections;
-  for (i = 0; i < num_spaces; i++)
-    {
-
-      /* Find a space.  */
-      while (!som_is_space (section))
-	section = section->next;
-
-      /* Dump its header  */
-      if (bfd_write ((PTR) som_section_data (section)->space_dict,
-		     sizeof (struct space_dictionary_record), 1, abfd)
-	  != sizeof (struct space_dictionary_record))
-	return false;
-
-      /* Goto the next section.  */
-      section = section->next;
-    }
-
-  /* Write the compilation unit record if there is one.  */
-  if (obj_som_compilation_unit (abfd))
-    {
-      location = obj_som_file_hdr (abfd)->compiler_location;
-      if (bfd_seek (abfd, location, SEEK_SET) < 0)
-        return false;
-
-      if (bfd_write ((PTR) obj_som_compilation_unit (abfd),
-		     COMPUNITSZ, 1, abfd) != COMPUNITSZ)
-        return false;
-    }
-
-  /* Setting of the system_id has to happen very late now that copying of
-     BFD private data happens *after* section contents are set.  */
-  if (abfd->flags & (EXEC_P | DYNAMIC))
-    obj_som_file_hdr(abfd)->system_id = obj_som_exec_data (abfd)->system_id;
-  else if (bfd_get_mach (abfd) == pa20)
-    obj_som_file_hdr(abfd)->system_id = CPU_PA_RISC2_0;
-  else if (bfd_get_mach (abfd) == pa11)
-    obj_som_file_hdr(abfd)->system_id = CPU_PA_RISC1_1;
-  else
-    obj_som_file_hdr(abfd)->system_id = CPU_PA_RISC1_0;
-
-  /* Compute the checksum for the file header just before writing
-     the header to disk.  */
-  obj_som_file_hdr (abfd)->checksum = som_compute_checksum (abfd);
-
-  /* Only thing left to do is write out the file header.  It is always
-     at location zero.  Seek there and write it.  */
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) < 0)
-    return false;
-  if (bfd_write ((PTR) obj_som_file_hdr (abfd),
-		 sizeof (struct header), 1, abfd)
-      != sizeof (struct header))
-    return false;
-
-  /* Now write the exec header.  */
-  if (abfd->flags & (EXEC_P | DYNAMIC))
-    {
-      long tmp, som_length;
-      struct som_exec_auxhdr *exec_header;
-
-      exec_header = obj_som_exec_hdr (abfd);
-      exec_header->exec_entry = bfd_get_start_address (abfd);
-      exec_header->exec_flags = obj_som_exec_data (abfd)->exec_flags;
-
-      /* Oh joys.  Ram some of the BSS data into the DATA section
-	 to be compatable with how the hp linker makes objects
-	 (saves memory space).  */
-      tmp = exec_header->exec_dsize;
-      tmp = SOM_ALIGN (tmp, PA_PAGESIZE);
-      exec_header->exec_bsize -= (tmp - exec_header->exec_dsize);
-      if (exec_header->exec_bsize < 0)
-	exec_header->exec_bsize = 0;
-      exec_header->exec_dsize = tmp;
-
-      /* Now perform some sanity checks.  The idea is to catch bogons now and
-	 inform the user, instead of silently generating a bogus file.  */
-      som_length = obj_som_file_hdr (abfd)->som_length;
-      if (exec_header->exec_tfile + exec_header->exec_tsize > som_length
-	  || exec_header->exec_dfile + exec_header->exec_dsize > som_length)
-	{
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-
-      if (bfd_seek (abfd, obj_som_file_hdr (abfd)->aux_header_location,
-		    SEEK_SET) < 0)
-	return false;
-
-      if (bfd_write ((PTR) exec_header, AUX_HDR_SIZE, 1, abfd)
-	  != AUX_HDR_SIZE)
-	return false;
-    }
-  return true;
-}
-
-/* Compute and return the checksum for a SOM file header.  */
-
-static unsigned long
-som_compute_checksum (abfd)
-     bfd *abfd;
-{
-  unsigned long checksum, count, i;
-  unsigned long *buffer = (unsigned long *) obj_som_file_hdr (abfd);
-
-  checksum = 0;
-  count = sizeof (struct header) / sizeof (unsigned long);
-  for (i = 0; i < count; i++)
-    checksum ^= *(buffer + i);
-
-  return checksum;
-}
-
-static void
-som_bfd_derive_misc_symbol_info (abfd, sym, info)
-     bfd *abfd;
-     asymbol *sym;
-     struct som_misc_symbol_info *info;
-{
-  /* Initialize.  */
-  memset (info, 0, sizeof (struct som_misc_symbol_info));
-
-  /* The HP SOM linker requires detailed type information about
-     all symbols (including undefined symbols!).  Unfortunately,
-     the type specified in an import/export statement does not
-     always match what the linker wants.  Severe braindamage.  */
-	 
-  /* Section symbols will not have a SOM symbol type assigned to
-     them yet.  Assign all section symbols type ST_DATA.  */
-  if (sym->flags & BSF_SECTION_SYM)
-    info->symbol_type = ST_DATA;
-  else
-    {
-      /* Common symbols must have scope SS_UNSAT and type
-	 ST_STORAGE or the linker will choke.  */
-      if (bfd_is_com_section (sym->section))
-	{
-	  info->symbol_scope = SS_UNSAT;
-	  info->symbol_type = ST_STORAGE;
-	}
-
-      /* It is possible to have a symbol without an associated
-	 type.  This happens if the user imported the symbol
-	 without a type and the symbol was never defined
-	 locally.  If BSF_FUNCTION is set for this symbol, then
-	 assign it type ST_CODE (the HP linker requires undefined
-	 external functions to have type ST_CODE rather than ST_ENTRY).  */
-      else if ((som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN
-		|| som_symbol_data (sym)->som_type == SYMBOL_TYPE_CODE)
-	       && bfd_is_und_section (sym->section)
-	       && sym->flags & BSF_FUNCTION)
-	info->symbol_type = ST_CODE;
-
-      /* Handle function symbols which were defined in this file.
-	 They should have type ST_ENTRY.  Also retrieve the argument
-	 relocation bits from the SOM backend information.  */
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_ENTRY
-	       || (som_symbol_data (sym)->som_type == SYMBOL_TYPE_CODE
-		   && (sym->flags & BSF_FUNCTION))
-	       || (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN
-		   && (sym->flags & BSF_FUNCTION)))
-	{
-	  info->symbol_type = ST_ENTRY;
-	  info->arg_reloc = som_symbol_data (sym)->tc_data.ap.hppa_arg_reloc;
-	  info->priv_level= som_symbol_data (sym)->tc_data.ap.hppa_priv_level;
-	}
-
-      /* For unknown symbols set the symbol's type based on the symbol's
-	 section (ST_DATA for DATA sections, ST_CODE for CODE sections).  */
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN)
-	{
-	  if (sym->section->flags & SEC_CODE)
-	    info->symbol_type = ST_CODE;
-	  else
-	    info->symbol_type = ST_DATA;
-	}
-  
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN)
-	info->symbol_type = ST_DATA;
-
-      /* From now on it's a very simple mapping.  */
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_ABSOLUTE)
-	info->symbol_type = ST_ABSOLUTE;
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_CODE)
-	info->symbol_type = ST_CODE;
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_DATA)
-	info->symbol_type = ST_DATA;
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_MILLICODE)
-	info->symbol_type = ST_MILLICODE;
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_PLABEL)
-	info->symbol_type = ST_PLABEL;
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_PRI_PROG)
-	info->symbol_type = ST_PRI_PROG;
-      else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_SEC_PROG)
-	info->symbol_type = ST_SEC_PROG;
-    }
-	
-  /* Now handle the symbol's scope.  Exported data which is not
-     in the common section has scope SS_UNIVERSAL.  Note scope
-     of common symbols was handled earlier!  */
-  if (bfd_is_und_section (sym->section))
-    info->symbol_scope = SS_UNSAT;
-  else if (sym->flags & BSF_EXPORT && ! bfd_is_com_section (sym->section))
-    info->symbol_scope = SS_UNIVERSAL;
-  /* Anything else which is not in the common section has scope
-     SS_LOCAL.  */
-  else if (! bfd_is_com_section (sym->section))
-    info->symbol_scope = SS_LOCAL;
-
-  /* Now set the symbol_info field.  It has no real meaning
-     for undefined or common symbols, but the HP linker will
-     choke if it's not set to some "reasonable" value.  We
-     use zero as a reasonable value.  */
-  if (bfd_is_com_section (sym->section)
-      || bfd_is_und_section (sym->section)
-      || bfd_is_abs_section (sym->section))
-    info->symbol_info = 0;
-  /* For all other symbols, the symbol_info field contains the 
-     subspace index of the space this symbol is contained in.  */
-  else
-    info->symbol_info = sym->section->target_index;
-
-  /* Set the symbol's value.  */
-  info->symbol_value = sym->value + sym->section->vma;
-}
-
-/* Build and write, in one big chunk, the entire symbol table for
-   this BFD.  */
-
-static boolean
-som_build_and_write_symbol_table (abfd)
-     bfd *abfd;
-{
-  unsigned int num_syms = bfd_get_symcount (abfd);
-  file_ptr symtab_location = obj_som_file_hdr (abfd)->symbol_location;
-  asymbol **bfd_syms = obj_som_sorted_syms (abfd);
-  struct symbol_dictionary_record *som_symtab = NULL;
-  int i, symtab_size;
-
-  /* Compute total symbol table size and allocate a chunk of memory
-     to hold the symbol table as we build it.  */
-  symtab_size = num_syms * sizeof (struct symbol_dictionary_record);
-  som_symtab = (struct symbol_dictionary_record *) bfd_malloc (symtab_size);
-  if (som_symtab == NULL && symtab_size != 0)
-    goto error_return;
-  memset (som_symtab, 0, symtab_size);
-
-  /* Walk over each symbol.  */
-  for (i = 0; i < num_syms; i++)
-    {
-      struct som_misc_symbol_info info;
-
-      /* This is really an index into the symbol strings table.  
-	 By the time we get here, the index has already been 
-	 computed and stored into the name field in the BFD symbol.  */
-      som_symtab[i].name.n_strx = som_symbol_data(bfd_syms[i])->stringtab_offset;
-
-      /* Derive SOM information from the BFD symbol.  */
-      som_bfd_derive_misc_symbol_info (abfd, bfd_syms[i], &info);
-
-      /* Now use it.  */
-      som_symtab[i].symbol_type = info.symbol_type;
-      som_symtab[i].symbol_scope = info.symbol_scope;
-      som_symtab[i].arg_reloc = info.arg_reloc;
-      som_symtab[i].symbol_info = info.symbol_info;
-      som_symtab[i].xleast = 3;
-      som_symtab[i].symbol_value = info.symbol_value | info.priv_level;
-    }
-
-  /* Everything is ready, seek to the right location and
-     scribble out the symbol table.  */
-  if (bfd_seek (abfd, symtab_location, SEEK_SET) != 0)
-    return false;
-
-  if (bfd_write ((PTR) som_symtab, symtab_size, 1, abfd) != symtab_size)
-    goto error_return;
-
-  if (som_symtab != NULL)
-    free (som_symtab);
-  return true;
- error_return:
-  if (som_symtab != NULL)
-    free (som_symtab);
-  return false;
-}
-
-/* Write an object in SOM format.  */  
-
-static boolean
-som_write_object_contents (abfd)
-     bfd *abfd;
-{
-  if (abfd->output_has_begun == false)
-    {
-      /* Set up fixed parts of the file, space, and subspace headers.
-	 Notify the world that output has begun.  */
-      som_prep_headers (abfd);
-      abfd->output_has_begun = true;
-      /* Start writing the object file.  This include all the string
-	 tables, fixup streams, and other portions of the object file.  */
-      som_begin_writing (abfd);
-    }
-
-  return (som_finish_writing (abfd));
-}
-
-
-/* Read and save the string table associated with the given BFD.  */
-
-static boolean
-som_slurp_string_table (abfd)
-     bfd *abfd;
-{
-  char *stringtab;
-
-  /* Use the saved version if its available.  */
-  if (obj_som_stringtab (abfd) != NULL)
-    return true;
-
-  /* I don't think this can currently happen, and I'm not sure it should
-     really be an error, but it's better than getting unpredictable results
-     from the host's malloc when passed a size of zero.  */
-  if (obj_som_stringtab_size (abfd) == 0)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return false;
-    }
-
-  /* Allocate and read in the string table.  */
-  stringtab = bfd_malloc (obj_som_stringtab_size (abfd));
-  if (stringtab == NULL)
-    return false;
-  memset (stringtab, 0, obj_som_stringtab_size (abfd));
-
-  if (bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET) < 0)
-    return false;
-  
-  if (bfd_read (stringtab, obj_som_stringtab_size (abfd), 1, abfd)
-      != obj_som_stringtab_size (abfd))
-    return false;
-
-  /* Save our results and return success. */
-  obj_som_stringtab (abfd) = stringtab;
-  return true;
-}
-
-/* Return the amount of data (in bytes) required to hold the symbol
-   table for this object.  */
-
-static long
-som_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  if (!som_slurp_symbol_table (abfd))
-    return -1;
-
-  return (bfd_get_symcount (abfd) + 1) * (sizeof (asymbol *));
-}
-
-/* Convert from a SOM subspace index to a BFD section.  */
-
-static asection *
-bfd_section_from_som_symbol (abfd, symbol)
-     bfd *abfd;
-     struct symbol_dictionary_record *symbol;
-{
-  asection *section;
-
-  /* The meaning of the symbol_info field changes for functions
-     within executables.  So only use the quick symbol_info mapping for
-     incomplete objects and non-function symbols in executables.  */
-  if ((abfd->flags & (EXEC_P | DYNAMIC)) == 0
-      || (symbol->symbol_type != ST_ENTRY
-	  && symbol->symbol_type != ST_PRI_PROG
-	  && symbol->symbol_type != ST_SEC_PROG
-	  && symbol->symbol_type != ST_MILLICODE))
-    {
-      unsigned int index = symbol->symbol_info;
-      for (section = abfd->sections; section != NULL; section = section->next)
-	if (section->target_index == index && som_is_subspace (section))
-	  return section;
-
-      /* Could be a symbol from an external library (such as an OMOS
-	 shared library).  Don't abort.  */
-      return bfd_abs_section_ptr;
-
-    }
-  else
-    {
-      unsigned int value = symbol->symbol_value;
-
-      /* For executables we will have to use the symbol's address and
-	 find out what section would contain that address.   Yuk.  */
-      for (section = abfd->sections; section; section = section->next)
-	{
-	  if (value >= section->vma
-	      && value <= section->vma + section->_cooked_size
-	      && som_is_subspace (section))
-	    return section;
-	}
-
-      /* Could be a symbol from an external library (such as an OMOS
-	 shared library).  Don't abort.  */
-      return bfd_abs_section_ptr;
-
-    }
-}
-
-/* Read and save the symbol table associated with the given BFD.  */
-
-static unsigned int
-som_slurp_symbol_table (abfd)
-     bfd *abfd;
-{
-  int symbol_count = bfd_get_symcount (abfd);
-  int symsize = sizeof (struct symbol_dictionary_record);
-  char *stringtab;
-  struct symbol_dictionary_record *buf = NULL, *bufp, *endbufp;
-  som_symbol_type *sym, *symbase;
-
-  /* Return saved value if it exists.  */
-  if (obj_som_symtab (abfd) != NULL)
-    goto successful_return;
-
-  /* Special case.  This is *not* an error.  */
-  if (symbol_count == 0)
-    goto successful_return;
-
-  if (!som_slurp_string_table (abfd))
-    goto error_return;
-
-  stringtab = obj_som_stringtab (abfd);
-
-  symbase = ((som_symbol_type *)
-	     bfd_malloc (symbol_count * sizeof (som_symbol_type)));
-  if (symbase == NULL)
-    goto error_return;
-  memset (symbase, 0, symbol_count * sizeof (som_symbol_type));
-
-  /* Read in the external SOM representation.  */
-  buf = bfd_malloc (symbol_count * symsize);
-  if (buf == NULL && symbol_count * symsize != 0)
-    goto error_return;
-  if (bfd_seek (abfd, obj_som_sym_filepos (abfd), SEEK_SET) < 0)
-    goto error_return;
-  if (bfd_read (buf, symbol_count * symsize, 1, abfd) 
-      != symbol_count * symsize)
-    goto error_return;
-
-  /* Iterate over all the symbols and internalize them.  */
-  endbufp = buf + symbol_count;
-  for (bufp = buf, sym = symbase; bufp < endbufp; ++bufp)
-    {
-
-      /* I don't think we care about these.  */
-      if (bufp->symbol_type == ST_SYM_EXT
-	  || bufp->symbol_type == ST_ARG_EXT)
-	continue;
-
-      /* Set some private data we care about.  */
-      if (bufp->symbol_type == ST_NULL)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_UNKNOWN;
-      else if (bufp->symbol_type == ST_ABSOLUTE)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_ABSOLUTE;
-      else if (bufp->symbol_type == ST_DATA)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_DATA;
-      else if (bufp->symbol_type == ST_CODE)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_CODE;
-      else if (bufp->symbol_type == ST_PRI_PROG)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_PRI_PROG;
-      else if (bufp->symbol_type == ST_SEC_PROG)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_SEC_PROG;
-      else if (bufp->symbol_type == ST_ENTRY)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_ENTRY;
-      else if (bufp->symbol_type == ST_MILLICODE)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_MILLICODE;
-      else if (bufp->symbol_type == ST_PLABEL)
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_PLABEL;
-      else
-	som_symbol_data (sym)->som_type = SYMBOL_TYPE_UNKNOWN;
-      som_symbol_data (sym)->tc_data.ap.hppa_arg_reloc = bufp->arg_reloc;
-
-      /* Some reasonable defaults.  */
-      sym->symbol.the_bfd = abfd;
-      sym->symbol.name = bufp->name.n_strx + stringtab;
-      sym->symbol.value = bufp->symbol_value;
-      sym->symbol.section = 0;
-      sym->symbol.flags = 0;
-
-      switch (bufp->symbol_type)
-	{
-	case ST_ENTRY:
-	case ST_MILLICODE:
-	  sym->symbol.flags |= BSF_FUNCTION;
-	  som_symbol_data (sym)->tc_data.ap.hppa_priv_level =
-	    sym->symbol.value & 0x3;
-	  sym->symbol.value &= ~0x3;
-	  break;
-
-	case ST_STUB:
-	case ST_CODE:
-	case ST_PRI_PROG:
-	case ST_SEC_PROG:
-	  som_symbol_data (sym)->tc_data.ap.hppa_priv_level =
-	    sym->symbol.value & 0x3;
-	  sym->symbol.value &= ~0x3;
-	  /* If the symbol's scope is ST_UNSAT, then these are
-	     undefined function symbols.  */
-	  if (bufp->symbol_scope == SS_UNSAT)
-	    sym->symbol.flags |= BSF_FUNCTION;
-	     
-
-	default:
-	  break;
-	}
-
-      /* Handle scoping and section information.  */
-      switch (bufp->symbol_scope)
-	{
-	/* symbol_info field is undefined for SS_EXTERNAL and SS_UNSAT symbols,
-	   so the section associated with this symbol can't be known.  */
-	case SS_EXTERNAL:
-	  if (bufp->symbol_type != ST_STORAGE)
-	    sym->symbol.section = bfd_und_section_ptr;
-	  else
-	    sym->symbol.section = bfd_com_section_ptr;
-	  sym->symbol.flags |= (BSF_EXPORT | BSF_GLOBAL);
-	  break;
-
-	case SS_UNSAT:
-	  if (bufp->symbol_type != ST_STORAGE)
-	    sym->symbol.section = bfd_und_section_ptr;
-	  else
-	    sym->symbol.section = bfd_com_section_ptr;
-	  break;
-
-	case SS_UNIVERSAL:
-	  sym->symbol.flags |= (BSF_EXPORT | BSF_GLOBAL);
-	  sym->symbol.section = bfd_section_from_som_symbol (abfd, bufp);
-	  sym->symbol.value -= sym->symbol.section->vma;
-	  break;
-
-#if 0
-	/* SS_GLOBAL and SS_LOCAL are two names for the same thing.
-	   Sound dumb?  It is.  */
-	case SS_GLOBAL:
-#endif
-	case SS_LOCAL:
-	  sym->symbol.flags |= BSF_LOCAL;
-	  sym->symbol.section = bfd_section_from_som_symbol (abfd, bufp);
-	  sym->symbol.value -= sym->symbol.section->vma;
-	  break;
-	}
-
-      /* Mark section symbols and symbols used by the debugger.
-	 Note $START$ is a magic code symbol, NOT a section symbol.  */
-      if (sym->symbol.name[0] == '$'
-	  && sym->symbol.name[strlen (sym->symbol.name) - 1] == '$'
-	  && !strcmp (sym->symbol.name, sym->symbol.section->name))
-	sym->symbol.flags |= BSF_SECTION_SYM;
-      else if (!strncmp (sym->symbol.name, "L$0\002", 4))
-	{
-	  sym->symbol.flags |= BSF_SECTION_SYM;
-	  sym->symbol.name = sym->symbol.section->name;
-	}
-      else if (!strncmp (sym->symbol.name, "L$0\001", 4))
-	sym->symbol.flags |= BSF_DEBUGGING;
-
-      /* Note increment at bottom of loop, since we skip some symbols
-         we can not include it as part of the for statement.  */
-      sym++;
-    }
-
-  /* We modify the symbol count to record the number of BFD symbols we
-     created.  */
-  bfd_get_symcount (abfd) = sym - symbase;
-
-  /* Save our results and return success.  */
-  obj_som_symtab (abfd) = symbase;
- successful_return:
-  if (buf != NULL)
-    free (buf);
-  return (true);
-
- error_return:
-  if (buf != NULL)
-    free (buf);
-  return false;
-}
-
-/* Canonicalize a SOM symbol table.  Return the number of entries
-   in the symbol table.  */
-
-static long
-som_get_symtab (abfd, location)
-     bfd *abfd;
-     asymbol **location;
-{
-  int i;
-  som_symbol_type *symbase;
-
-  if (!som_slurp_symbol_table (abfd))
-    return -1;
-
-  i = bfd_get_symcount (abfd);
-  symbase = obj_som_symtab (abfd);
-
-  for (; i > 0; i--, location++, symbase++)
-    *location = &symbase->symbol;
-
-  /* Final null pointer.  */
-  *location = 0;
-  return (bfd_get_symcount (abfd));
-}
-
-/* Make a SOM symbol.  There is nothing special to do here.  */
-
-static asymbol *
-som_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  som_symbol_type *new =
-  (som_symbol_type *) bfd_zalloc (abfd, sizeof (som_symbol_type));
-  if (new == NULL)
-    return 0;
-  new->symbol.the_bfd = abfd;
-
-  return &new->symbol;
-}
-
-/* Print symbol information.  */
-
-static void
-som_print_symbol (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) afile;
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-    case bfd_print_symbol_more:
-      fprintf (file, "som ");
-      fprintf_vma (file, symbol->value);
-      fprintf (file, " %lx", (long) symbol->flags);
-      break;
-    case bfd_print_symbol_all:
-      {
-	CONST char *section_name;
-	section_name = symbol->section ? symbol->section->name : "(*none*)";
-	bfd_print_symbol_vandf ((PTR) file, symbol);
-	fprintf (file, " %s\t%s", section_name, symbol->name);
-	break;
-      }
-    }
-}
-
-static boolean
-som_bfd_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-  return (name[0] == 'L' && name[1] == '$');
-}
-
-/* Count or process variable-length SOM fixup records.
-
-   To avoid code duplication we use this code both to compute the number
-   of relocations requested by a stream, and to internalize the stream.
-
-   When computing the number of relocations requested by a stream the
-   variables rptr, section, and symbols have no meaning.
-
-   Return the number of relocations requested by the fixup stream.  When
-   not just counting 
-
-   This needs at least two or three more passes to get it cleaned up.  */
-
-static unsigned int
-som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
-     unsigned char *fixup;
-     unsigned int end;
-     arelent *internal_relocs;
-     asection *section;
-     asymbol **symbols;
-     boolean just_count;
-{
-  unsigned int op, varname, deallocate_contents = 0;
-  unsigned char *end_fixups = &fixup[end];
-  const struct fixup_format *fp;
-  char *cp;
-  unsigned char *save_fixup;
-  int variables[26], stack[20], c, v, count, prev_fixup, *sp, saved_unwind_bits;
-  const int *subop;
-  arelent *rptr= internal_relocs;
-  unsigned int offset = 0;
-
-#define	var(c)		variables[(c) - 'A']
-#define	push(v)		(*sp++ = (v))
-#define	pop()		(*--sp)
-#define	emptystack()	(sp == stack)
-
-  som_initialize_reloc_queue (reloc_queue);
-  memset (variables, 0, sizeof (variables));
-  memset (stack, 0, sizeof (stack));
-  count = 0;
-  prev_fixup = 0;
-  saved_unwind_bits = 0;
-  sp = stack;
-
-  while (fixup < end_fixups)
-    {
-
-      /* Save pointer to the start of this fixup.  We'll use
-	 it later to determine if it is necessary to put this fixup
-	 on the queue.  */
-      save_fixup = fixup;
-
-      /* Get the fixup code and its associated format.  */
-      op = *fixup++;
-      fp = &som_fixup_formats[op];
-
-      /* Handle a request for a previous fixup.  */
-      if (*fp->format == 'P')
-	{
-	  /* Get pointer to the beginning of the prev fixup, move
-	     the repeated fixup to the head of the queue.  */
-	  fixup = reloc_queue[fp->D].reloc;
-	  som_reloc_queue_fix (reloc_queue, fp->D);
-	  prev_fixup = 1;
-
-	  /* Get the fixup code and its associated format.  */
-	  op = *fixup++;
-	  fp = &som_fixup_formats[op];
-	}
-
-      /* If this fixup will be passed to BFD, set some reasonable defaults.  */
-      if (! just_count
-	  && som_hppa_howto_table[op].type != R_NO_RELOCATION
-	  && som_hppa_howto_table[op].type != R_DATA_OVERRIDE)
-	{
-	  rptr->address = offset;
-	  rptr->howto = &som_hppa_howto_table[op];
-	  rptr->addend = 0;
-	  rptr->sym_ptr_ptr = bfd_abs_section_ptr->symbol_ptr_ptr;
-	}
-
-      /* Set default input length to 0.  Get the opcode class index
-	 into D.  */
-      var ('L') = 0;
-      var ('D') = fp->D;
-      var ('U') = saved_unwind_bits;
-
-      /* Get the opcode format.  */
-      cp = fp->format;
-
-      /* Process the format string.  Parsing happens in two phases,
-	 parse RHS, then assign to LHS.  Repeat until no more 
-	 characters in the format string.  */
-      while (*cp)
-	{
-	  /* The variable this pass is going to compute a value for.  */
-	  varname = *cp++;
-
-	  /* Start processing RHS.  Continue until a NULL or '=' is found.  */
-	  do
-	    {
-	      c = *cp++;
-
-	      /* If this is a variable, push it on the stack.  */
-	      if (isupper (c))
-		push (var (c));
-
-	      /* If this is a lower case letter, then it represents
-		 additional data from the fixup stream to be pushed onto
-		 the stack.  */
-	      else if (islower (c))
-		{
-		  int bits = (c - 'a') * 8;
-		  for (v = 0; c > 'a'; --c)
-		    v = (v << 8) | *fixup++;
-		  if (varname == 'V')
-		    v = sign_extend (v, bits);
-		  push (v);
-		}
-
-	      /* A decimal constant.  Push it on the stack.  */
-	      else if (isdigit (c))
-		{
-		  v = c - '0';
-		  while (isdigit (*cp))
-		    v = (v * 10) + (*cp++ - '0');
-		  push (v);
-		}
-	      else
-
-		/* An operator.  Pop two two values from the stack and
-		   use them as operands to the given operation.  Push
-		   the result of the operation back on the stack.  */
-		switch (c)
-		  {
-		  case '+':
-		    v = pop ();
-		    v += pop ();
-		    push (v);
-		    break;
-		  case '*':
-		    v = pop ();
-		    v *= pop ();
-		    push (v);
-		    break;
-		  case '<':
-		    v = pop ();
-		    v = pop () << v;
-		    push (v);
-		    break;
-		  default:
-		    abort ();
-		  }
-	    }
-	  while (*cp && *cp != '=');
-
-	  /* Move over the equal operator.  */
-	  cp++;
-
-	  /* Pop the RHS off the stack.  */
-	  c = pop ();
-
-	  /* Perform the assignment.  */
-	  var (varname) = c;
-
-	  /* Handle side effects. and special 'O' stack cases.  */
-	  switch (varname)
-	    {
-	    /* Consume some bytes from the input space.  */
-	    case 'L':
-	      offset += c;
-	      break;
-	    /* A symbol to use in the relocation.  Make a note
-	       of this if we are not just counting.  */
-	    case 'S':
-	      if (! just_count)
-		rptr->sym_ptr_ptr = &symbols[c];
-	      break;
-	    /* Argument relocation bits for a function call.  */
-	    case 'R':
-	      if (! just_count)
-		{
-		  unsigned int tmp = var ('R');
-		  rptr->addend = 0;
-
-		  if ((som_hppa_howto_table[op].type == R_PCREL_CALL
-		       && R_PCREL_CALL + 10 > op)
-		      || (som_hppa_howto_table[op].type == R_ABS_CALL
-			  && R_ABS_CALL + 10 > op))
-		    {
-		      /* Simple encoding.  */
-		      if (tmp > 4)
-			{
-			  tmp -= 5;
-			  rptr->addend |= 1;
-			}
-		      if (tmp == 4)
-			rptr->addend |= 1 << 8 | 1 << 6 | 1 << 4 | 1 << 2;
-		      else if (tmp == 3)
-			rptr->addend |= 1 << 8 | 1 << 6 | 1 << 4;
-		      else if (tmp == 2)
-			rptr->addend |= 1 << 8 | 1 << 6;
-		      else if (tmp == 1)
-			rptr->addend |= 1 << 8;
-		    }
-		  else
-		    {
-		      unsigned int tmp1, tmp2;
-
-		      /* First part is easy -- low order two bits are
-			 directly copied, then shifted away.  */
-		      rptr->addend = tmp & 0x3;
-		      tmp >>= 2;
-
-		      /* Diving the result by 10 gives us the second
-			 part.  If it is 9, then the first two words
-			 are a double precision paramater, else it is
-			 3 * the first arg bits + the 2nd arg bits.  */
-		      tmp1 = tmp / 10;
-		      tmp -= tmp1 * 10;
-		      if (tmp1 == 9)
-			rptr->addend += (0xe << 6);
-		      else
-			{
-			  /* Get the two pieces.  */
-			  tmp2 = tmp1 / 3;
-			  tmp1 -= tmp2 * 3;
-			  /* Put them in the addend.  */
-			  rptr->addend += (tmp2 << 8) + (tmp1 << 6);
-			}
-
-		      /* What's left is the third part.  It's unpacked
-			 just like the second.  */
-		      if (tmp == 9)
-			rptr->addend += (0xe << 2);
-		      else
-			{
-			  tmp2 = tmp / 3;
-			  tmp -= tmp2 * 3;
-			  rptr->addend += (tmp2 << 4) + (tmp << 2);
-			}
-		    }
-		  rptr->addend = HPPA_R_ADDEND (rptr->addend, 0);
-		}
-	      break;
-	    /* Handle the linker expression stack.  */
-	    case 'O':
-	      switch (op)
-		{
-		case R_COMP1:
-		  subop = comp1_opcodes;
-		  break;
-		case R_COMP2:
-		  subop = comp2_opcodes;
-		  break;
-		case R_COMP3:
-		  subop = comp3_opcodes;
-		  break;
-		default:
-		  abort ();
-		}
-	      while (*subop <= (unsigned char) c)
-		++subop;
-	      --subop;
-	      break;
-	    /* The lower 32unwind bits must be persistent.  */
-	    case 'U':
-	      saved_unwind_bits = var ('U');
-	      break;
-
-	    default:
-	      break;
-	    }
-	}
-
-      /* If we used a previous fixup, clean up after it.  */
-      if (prev_fixup)
-	{
-	  fixup = save_fixup + 1;
-	  prev_fixup = 0;
-	}
-      /* Queue it.  */
-      else if (fixup > save_fixup + 1)
-	som_reloc_queue_insert (save_fixup, fixup - save_fixup, reloc_queue);
-
-      /* We do not pass R_DATA_OVERRIDE or R_NO_RELOCATION 
-	 fixups to BFD.  */
-      if (som_hppa_howto_table[op].type != R_DATA_OVERRIDE
-	  && som_hppa_howto_table[op].type != R_NO_RELOCATION)
-	{
-	  /* Done with a single reloction. Loop back to the top.  */
-	  if (! just_count)
-	    {
-	      if (som_hppa_howto_table[op].type == R_ENTRY)
-		rptr->addend = var ('T');
-	      else if (som_hppa_howto_table[op].type == R_EXIT)
-		rptr->addend = var ('U');
-	      else if (som_hppa_howto_table[op].type == R_PCREL_CALL
-		       || som_hppa_howto_table[op].type == R_ABS_CALL)
-		;
-	      else if (som_hppa_howto_table[op].type == R_DATA_ONE_SYMBOL)
-		{
-		  unsigned addend = var ('V');
-
-		  /* Try what was specified in R_DATA_OVERRIDE first
-		     (if anything).  Then the hard way using the
-		     section contents.  */
-		  rptr->addend = var ('V');
-
-		  if (rptr->addend == 0 && !section->contents)
-		    {
-		      /* Got to read the damn contents first.  We don't
-		         bother saving the contents (yet).  Add it one
-			 day if the need arises.  */
-		      section->contents = bfd_malloc (section->_raw_size);
-		      if (section->contents == NULL)
-			return -1;
-
-		      deallocate_contents = 1;
-		      bfd_get_section_contents (section->owner,
-						section,
-						section->contents,
-						0,
-						section->_raw_size);
-		    }
-		  else if (rptr->addend == 0)
-		    rptr->addend = bfd_get_32 (section->owner,
-					       (section->contents
-						+ offset - var ('L')));
-			
-		}
-	      else
-		rptr->addend = var ('V');
-	      rptr++;
-	    }
-	  count++;
-	  /* Now that we've handled a "full" relocation, reset
-	     some state.  */
-	  memset (variables, 0, sizeof (variables));
-	  memset (stack, 0, sizeof (stack));
-	}
-    }
-  if (deallocate_contents)
-    free (section->contents);
-
-  return count;
-
-#undef var
-#undef push
-#undef pop
-#undef emptystack
-}
-
-/* Read in the relocs (aka fixups in SOM terms) for a section. 
-
-   som_get_reloc_upper_bound calls this routine with JUST_COUNT 
-   set to true to indicate it only needs a count of the number
-   of actual relocations.  */
-
-static boolean
-som_slurp_reloc_table (abfd, section, symbols, just_count)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     boolean just_count;
-{
-  char *external_relocs;
-  unsigned int fixup_stream_size;
-  arelent *internal_relocs;
-  unsigned int num_relocs;
-
-  fixup_stream_size = som_section_data (section)->reloc_size;
-  /* If there were no relocations, then there is nothing to do.  */
-  if (section->reloc_count == 0)
-    return true;
-
-  /* If reloc_count is -1, then the relocation stream has not been 
-     parsed.  We must do so now to know how many relocations exist.  */
-  if (section->reloc_count == -1)
-    {
-      external_relocs = (char *) bfd_malloc (fixup_stream_size);
-      if (external_relocs == (char *) NULL)
-	return false;
-      /* Read in the external forms. */
-      if (bfd_seek (abfd,
-		    obj_som_reloc_filepos (abfd) + section->rel_filepos,
-		    SEEK_SET)
-	  != 0)
-	return false;
-      if (bfd_read (external_relocs, 1, fixup_stream_size, abfd)
-	  != fixup_stream_size)
-	return false;
-
-      /* Let callers know how many relocations found.
-	 also save the relocation stream as we will
-	 need it again.  */
-      section->reloc_count = som_set_reloc_info (external_relocs,
-						 fixup_stream_size,
-						 NULL, NULL, NULL, true);
-
-      som_section_data (section)->reloc_stream = external_relocs;
-    }
-
-  /* If the caller only wanted a count, then return now.  */
-  if (just_count)
-    return true;
-
-  num_relocs = section->reloc_count;
-  external_relocs = som_section_data (section)->reloc_stream;
-  /* Return saved information about the relocations if it is available.  */
-  if (section->relocation != (arelent *) NULL)
-    return true;
-
-  internal_relocs = (arelent *) 
-    bfd_zalloc (abfd, (num_relocs * sizeof (arelent)));
-  if (internal_relocs == (arelent *) NULL)
-    return false;
-
-  /* Process and internalize the relocations.  */
-  som_set_reloc_info (external_relocs, fixup_stream_size,
-		      internal_relocs, section, symbols, false);
-
-  /* We're done with the external relocations.  Free them.  */
-  free (external_relocs);
-  som_section_data (section)->reloc_stream = NULL;
-
-  /* Save our results and return success.  */
-  section->relocation = internal_relocs;
-  return (true);
-}
-
-/* Return the number of bytes required to store the relocation
-   information associated with the given section.  */ 
-
-static long
-som_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  /* If section has relocations, then read in the relocation stream
-     and parse it to determine how many relocations exist.  */
-  if (asect->flags & SEC_RELOC)
-    {
-      if (! som_slurp_reloc_table (abfd, asect, NULL, true))
-	return -1;
-      return (asect->reloc_count + 1) * sizeof (arelent *);
-    }
-  /* There are no relocations.  */
-  return 0;
-}
-
-/* Convert relocations from SOM (external) form into BFD internal
-   form.  Return the number of relocations.  */
-
-static long
-som_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  arelent *tblptr;
-  int count;
-
-  if (som_slurp_reloc_table (abfd, section, symbols, false) == false)
-    return -1;
-
-  count = section->reloc_count;
-  tblptr = section->relocation;
-
-  while (count--)
-    *relptr++ = tblptr++;
-
-  *relptr = (arelent *) NULL;
-  return section->reloc_count;
-}
-
-extern const bfd_target som_vec;
-
-/* A hook to set up object file dependent section information.  */
-
-static boolean
-som_new_section_hook (abfd, newsect)
-     bfd *abfd;
-     asection *newsect;
-{
-  newsect->used_by_bfd =
-    (PTR) bfd_zalloc (abfd, sizeof (struct som_section_data_struct));
-  if (!newsect->used_by_bfd)
-    return false;
-  newsect->alignment_power = 3;
-
-  /* We allow more than three sections internally */
-  return true;
-}
-
-/* Copy any private info we understand from the input symbol
-   to the output symbol.  */
-
-static boolean
-som_bfd_copy_private_symbol_data (ibfd, isymbol, obfd, osymbol)
-     bfd *ibfd;
-     asymbol *isymbol;
-     bfd *obfd;
-     asymbol *osymbol;
-{
-  struct som_symbol *input_symbol = (struct som_symbol *) isymbol;
-  struct som_symbol *output_symbol = (struct som_symbol *) osymbol;
-
-  /* One day we may try to grok other private data.  */
-  if (ibfd->xvec->flavour != bfd_target_som_flavour
-      || obfd->xvec->flavour != bfd_target_som_flavour)
-    return false;
-
-  /* The only private information we need to copy is the argument relocation
-     bits.  */
-  output_symbol->tc_data.ap.hppa_arg_reloc =
-    input_symbol->tc_data.ap.hppa_arg_reloc;
-
-  return true;
-}
-
-/* Copy any private info we understand from the input section
-   to the output section.  */
-static boolean
-som_bfd_copy_private_section_data (ibfd, isection, obfd, osection)
-     bfd *ibfd;
-     asection *isection;
-     bfd *obfd;
-     asection *osection;
-{
-  /* One day we may try to grok other private data.  */
-  if (ibfd->xvec->flavour != bfd_target_som_flavour
-      || obfd->xvec->flavour != bfd_target_som_flavour
-      || (!som_is_space (isection) && !som_is_subspace (isection)))
-    return true;
-
-  som_section_data (osection)->copy_data
-    = (struct som_copyable_section_data_struct *)
-      bfd_zalloc (obfd, sizeof (struct som_copyable_section_data_struct));
-  if (som_section_data (osection)->copy_data == NULL)
-    return false;
-
-  memcpy (som_section_data (osection)->copy_data,
-	  som_section_data (isection)->copy_data,
-	  sizeof (struct som_copyable_section_data_struct));
-
-  /* Reparent if necessary.  */
-  if (som_section_data (osection)->copy_data->container)
-    som_section_data (osection)->copy_data->container =
-      som_section_data (osection)->copy_data->container->output_section;
-
-  return true;
-}
-
-/* Copy any private info we understand from the input bfd
-   to the output bfd.  */
-
-static boolean
-som_bfd_copy_private_bfd_data (ibfd, obfd)
-     bfd *ibfd, *obfd;
-{
-  /* One day we may try to grok other private data.  */
-  if (ibfd->xvec->flavour != bfd_target_som_flavour
-      || obfd->xvec->flavour != bfd_target_som_flavour)
-    return true;
-
-  /* Allocate some memory to hold the data we need.  */
-  obj_som_exec_data (obfd) = (struct som_exec_data *)
-    bfd_zalloc (obfd, sizeof (struct som_exec_data));
-  if (obj_som_exec_data (obfd) == NULL)
-    return false;
-
-  /* Now copy the data.  */
-  memcpy (obj_som_exec_data (obfd), obj_som_exec_data (ibfd),
-	  sizeof (struct som_exec_data));
-
-  return true;
-}
-
-/* Set backend info for sections which can not be described
-   in the BFD data structures.  */
-
-boolean
-bfd_som_set_section_attributes (section, defined, private, sort_key, spnum)
-     asection *section;
-     int defined;
-     int private;
-     unsigned int sort_key;
-     int spnum;
-{
-  /* Allocate memory to hold the magic information.  */
-  if (som_section_data (section)->copy_data == NULL)
-    {
-      som_section_data (section)->copy_data
-	= (struct som_copyable_section_data_struct *)
-	  bfd_zalloc (section->owner,
-		      sizeof (struct som_copyable_section_data_struct));
-      if (som_section_data (section)->copy_data == NULL)
-	return false;
-    }
-  som_section_data (section)->copy_data->sort_key = sort_key;
-  som_section_data (section)->copy_data->is_defined = defined;
-  som_section_data (section)->copy_data->is_private = private;
-  som_section_data (section)->copy_data->container = section;
-  som_section_data (section)->copy_data->space_number = spnum;
-  return true;
-}
-
-/* Set backend info for subsections which can not be described 
-   in the BFD data structures.  */
-
-boolean
-bfd_som_set_subsection_attributes (section, container, access,
-				   sort_key, quadrant)
-     asection *section;
-     asection *container;
-     int access;
-     unsigned int sort_key;
-     int quadrant;
-{
-  /* Allocate memory to hold the magic information.  */
-  if (som_section_data (section)->copy_data == NULL)
-    {
-      som_section_data (section)->copy_data
-	= (struct som_copyable_section_data_struct *)
-	  bfd_zalloc (section->owner,
-		      sizeof (struct som_copyable_section_data_struct));
-      if (som_section_data (section)->copy_data == NULL)
-	return false;
-    }
-  som_section_data (section)->copy_data->sort_key = sort_key;
-  som_section_data (section)->copy_data->access_control_bits = access;
-  som_section_data (section)->copy_data->quadrant = quadrant;
-  som_section_data (section)->copy_data->container = container;
-  return true;
-}
-
-/* Set the full SOM symbol type.  SOM needs far more symbol information
-   than any other object file format I'm aware of.  It is mandatory
-   to be able to know if a symbol is an entry point, millicode, data,
-   code, absolute, storage request, or procedure label.  If you get
-   the symbol type wrong your program will not link.  */
-
-void
-bfd_som_set_symbol_type (symbol, type)
-     asymbol *symbol;
-     unsigned int type;
-{
-  som_symbol_data (symbol)->som_type = type;
-}
-
-/* Attach an auxiliary header to the BFD backend so that it may be
-   written into the object file.  */
-boolean
-bfd_som_attach_aux_hdr (abfd, type, string)
-     bfd *abfd;
-     int type;
-     char *string;
-{
-  if (type == VERSION_AUX_ID)
-    {
-      int len = strlen (string);
-      int pad = 0;
-
-      if (len % 4)
-	pad = (4 - (len % 4));
-      obj_som_version_hdr (abfd) = (struct user_string_aux_hdr *)
-	bfd_zalloc (abfd, sizeof (struct aux_id)
-			      + sizeof (unsigned int) + len + pad);
-      if (!obj_som_version_hdr (abfd))
-	return false;
-      obj_som_version_hdr (abfd)->header_id.type = VERSION_AUX_ID;
-      obj_som_version_hdr (abfd)->header_id.length = len + pad;
-      obj_som_version_hdr (abfd)->header_id.length += sizeof (int);
-      obj_som_version_hdr (abfd)->string_length = len;
-      strncpy (obj_som_version_hdr (abfd)->user_string, string, len);
-    }
-  else if (type == COPYRIGHT_AUX_ID)
-    {
-      int len = strlen (string);
-      int pad = 0;
-
-      if (len % 4)
-	pad = (4 - (len % 4));
-      obj_som_copyright_hdr (abfd) = (struct copyright_aux_hdr *)
-	bfd_zalloc (abfd, sizeof (struct aux_id)
-			    + sizeof (unsigned int) + len + pad);
-      if (!obj_som_copyright_hdr (abfd))
-	return false;
-      obj_som_copyright_hdr (abfd)->header_id.type = COPYRIGHT_AUX_ID;
-      obj_som_copyright_hdr (abfd)->header_id.length = len + pad;
-      obj_som_copyright_hdr (abfd)->header_id.length += sizeof (int);
-      obj_som_copyright_hdr (abfd)->string_length = len;
-      strcpy (obj_som_copyright_hdr (abfd)->copyright, string);
-    }
-  return true;
-}
-
-/* Attach an compilation unit header to the BFD backend so that it may be
-   written into the object file.  */
-
-boolean
-bfd_som_attach_compilation_unit (abfd, name, language_name, product_id,
-                                 version_id)
-     bfd *abfd;
-     const char *name;
-     const char *language_name;
-     const char *product_id;
-     const char *version_id;
-{
-  COMPUNIT *n = (COMPUNIT *) bfd_zalloc (abfd, COMPUNITSZ);
-  if (n == NULL)
-    return false;
-
-#define STRDUP(f) \
-  if (f != NULL) \
-    { \
-      n->f.n_name = bfd_alloc (abfd, strlen (f) + 1); \
-      if (n->f.n_name == NULL) \
-	return false; \
-      strcpy (n->f.n_name, f); \
-    }
-
-  STRDUP (name);
-  STRDUP (language_name);
-  STRDUP (product_id);
-  STRDUP (version_id);
-
-#undef STRDUP
-
-  obj_som_compilation_unit (abfd) = n;
-
-  return true;
-}
-
-static boolean
-som_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (count == 0 || ((section->flags & SEC_HAS_CONTENTS) == 0))
-    return true;
-  if ((bfd_size_type)(offset+count) > section->_raw_size
-      || bfd_seek (abfd, (file_ptr)(section->filepos + offset), SEEK_SET) == -1
-      || bfd_read (location, (bfd_size_type)1, count, abfd) != count)
-    return (false); /* on error */
-  return (true);
-}
-
-static boolean
-som_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (abfd->output_has_begun == false)
-    {
-      /* Set up fixed parts of the file, space, and subspace headers.
-	 Notify the world that output has begun.  */
-      som_prep_headers (abfd);
-      abfd->output_has_begun = true;
-      /* Start writing the object file.  This include all the string
-	 tables, fixup streams, and other portions of the object file.  */
-      som_begin_writing (abfd);
-    }
-
-  /* Only write subspaces which have "real" contents (eg. the contents
-     are not generated at run time by the OS).  */
-  if (!som_is_subspace (section)
-      || ((section->flags & SEC_HAS_CONTENTS) == 0))
-    return true;
-
-  /* Seek to the proper offset within the object file and write the
-     data.  */
-  offset += som_section_data (section)->subspace_dict->file_loc_init_value; 
-  if (bfd_seek (abfd, offset, SEEK_SET) == -1)
-    return false;
-
-  if (bfd_write ((PTR) location, 1, count, abfd) != count)
-    return false;
-  return true;
-}
-
-static boolean
-som_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  /* Allow any architecture to be supported by the SOM backend */
-  return bfd_default_set_arch_mach (abfd, arch, machine);
-}
-
-static boolean
-som_find_nearest_line (abfd, section, symbols, offset, filename_ptr,
-			functionname_ptr, line_ptr)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     CONST char **filename_ptr;
-     CONST char **functionname_ptr;
-     unsigned int *line_ptr;
-{
-  return (false);
-}
-
-static int
-som_sizeof_headers (abfd, reloc)
-     bfd *abfd;
-     boolean reloc;
-{
-  (*_bfd_error_handler) (_("som_sizeof_headers unimplemented"));
-  fflush (stderr);
-  abort ();
-  return (0);
-}
-
-/* Return the single-character symbol type corresponding to
-   SOM section S, or '?' for an unknown SOM section.  */
-
-static char
-som_section_type (s)
-     const char *s;
-{
-  const struct section_to_type *t;
-
-  for (t = &stt[0]; t->section; t++)
-    if (!strcmp (s, t->section))
-      return t->type;
-  return '?';
-}
-
-static int
-som_decode_symclass (symbol)
-     asymbol *symbol;
-{
-  char c;
-
-  if (bfd_is_com_section (symbol->section))
-    return 'C';
-  if (bfd_is_und_section (symbol->section))
-    return 'U';
-  if (bfd_is_ind_section (symbol->section))
-    return 'I';
-  if (!(symbol->flags & (BSF_GLOBAL|BSF_LOCAL)))
-    return '?';
-
-  if (bfd_is_abs_section (symbol->section)
-      || (som_symbol_data (symbol) != NULL
-	  && som_symbol_data (symbol)->som_type == SYMBOL_TYPE_ABSOLUTE))
-    c = 'a';
-  else if (symbol->section)
-    c = som_section_type (symbol->section->name);
-  else
-    return '?';
-  if (symbol->flags & BSF_GLOBAL)
-    c = toupper (c);
-  return c;
-}
-
-/* Return information about SOM symbol SYMBOL in RET.  */
-
-static void
-som_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  ret->type = som_decode_symclass (symbol);
-  if (ret->type != 'U')
-    ret->value = symbol->value+symbol->section->vma;
-  else
-    ret->value = 0;
-  ret->name = symbol->name;
-}
-
-/* Count the number of symbols in the archive symbol table.  Necessary
-   so that we can allocate space for all the carsyms at once.  */
-
-static boolean
-som_bfd_count_ar_symbols (abfd, lst_header, count)
-     bfd *abfd;
-     struct lst_header *lst_header;
-     symindex *count;
-{
-  unsigned int i;
-  unsigned int *hash_table = NULL;
-  file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
-
-  hash_table = 
-    (unsigned int *) bfd_malloc (lst_header->hash_size
-				 * sizeof (unsigned int));
-  if (hash_table == NULL && lst_header->hash_size != 0)
-    goto error_return;
-
-  /* Don't forget to initialize the counter!  */
-  *count = 0;
-
-  /* Read in the hash table.  The has table is an array of 32bit file offsets
-     which point to the hash chains.  */
-  if (bfd_read ((PTR) hash_table, lst_header->hash_size, 4, abfd)
-      != lst_header->hash_size * 4)
-    goto error_return;
-
-  /* Walk each chain counting the number of symbols found on that particular
-     chain.  */
-  for (i = 0; i < lst_header->hash_size; i++)
-    {
-      struct lst_symbol_record lst_symbol;
-
-      /* An empty chain has zero as it's file offset.  */
-      if (hash_table[i] == 0)
-	continue;
-
-      /* Seek to the first symbol in this hash chain.  */
-      if (bfd_seek (abfd, lst_filepos + hash_table[i], SEEK_SET) < 0)
-	goto error_return;
-
-      /* Read in this symbol and update the counter.  */
-      if (bfd_read ((PTR) & lst_symbol, 1, sizeof (lst_symbol), abfd)
-	  != sizeof (lst_symbol))
-	goto error_return;
-
-      (*count)++;
-
-      /* Now iterate through the rest of the symbols on this chain.  */
-      while (lst_symbol.next_entry)
-	{
-
-	  /* Seek to the next symbol.  */
-	  if (bfd_seek (abfd, lst_filepos + lst_symbol.next_entry, SEEK_SET)
-	      < 0)
-	    goto error_return;
-
-	  /* Read the symbol in and update the counter.  */
-	  if (bfd_read ((PTR) & lst_symbol, 1, sizeof (lst_symbol), abfd)
-	      != sizeof (lst_symbol))
-	    goto error_return;
-
-	  (*count)++;
-	}
-    }
-  if (hash_table != NULL)
-    free (hash_table);
-  return true;
-
- error_return:
-  if (hash_table != NULL)
-    free (hash_table);
-  return false;
-}
-
-/* Fill in the canonical archive symbols (SYMS) from the archive described
-   by ABFD and LST_HEADER.  */
-
-static boolean
-som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
-     bfd *abfd;
-     struct lst_header *lst_header;
-     carsym **syms;
-{
-  unsigned int i, len;
-  carsym *set = syms[0];
-  unsigned int *hash_table = NULL;
-  struct som_entry *som_dict = NULL;
-  file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
-
-  hash_table = 
-    (unsigned int *) bfd_malloc (lst_header->hash_size
-				 * sizeof (unsigned int));
-  if (hash_table == NULL && lst_header->hash_size != 0)
-    goto error_return;
-
-  som_dict =
-    (struct som_entry *) bfd_malloc (lst_header->module_count
-				     * sizeof (struct som_entry));
-  if (som_dict == NULL && lst_header->module_count != 0)
-    goto error_return;
-
-  /* Read in the hash table.  The has table is an array of 32bit file offsets
-     which point to the hash chains.  */
-  if (bfd_read ((PTR) hash_table, lst_header->hash_size, 4, abfd)
-      != lst_header->hash_size * 4)
-    goto error_return;
-
-  /* Seek to and read in the SOM dictionary.  We will need this to fill
-     in the carsym's filepos field.  */
-  if (bfd_seek (abfd, lst_filepos + lst_header->dir_loc, SEEK_SET) < 0)
-    goto error_return;
-
-  if (bfd_read ((PTR) som_dict, lst_header->module_count, 
-		sizeof (struct som_entry), abfd)
-      != lst_header->module_count * sizeof (struct som_entry))
-    goto error_return;
-
-  /* Walk each chain filling in the carsyms as we go along.  */
-  for (i = 0; i < lst_header->hash_size; i++)
-    {
-      struct lst_symbol_record lst_symbol;
-
-      /* An empty chain has zero as it's file offset.  */
-      if (hash_table[i] == 0)
-	continue;
-
-      /* Seek to and read the first symbol on the chain.  */
-      if (bfd_seek (abfd, lst_filepos + hash_table[i], SEEK_SET) < 0)
-	goto error_return;
-
-      if (bfd_read ((PTR) & lst_symbol, 1, sizeof (lst_symbol), abfd)
-	  != sizeof (lst_symbol))
-	goto error_return;
-
-      /* Get the name of the symbol, first get the length which is stored
-	 as a 32bit integer just before the symbol.
-
-	 One might ask why we don't just read in the entire string table
-	 and index into it.  Well, according to the SOM ABI the string
-	 index can point *anywhere* in the archive to save space, so just
-	 using the string table would not be safe.  */
-      if (bfd_seek (abfd, lst_filepos + lst_header->string_loc
-			    + lst_symbol.name.n_strx - 4, SEEK_SET) < 0)
-	goto error_return;
-
-      if (bfd_read (&len, 1, 4, abfd) != 4)
-	goto error_return;
-
-      /* Allocate space for the name and null terminate it too.  */
-      set->name = bfd_zalloc (abfd, len + 1);
-      if (!set->name)
-	goto error_return;
-      if (bfd_read (set->name, 1, len, abfd) != len)
-	goto error_return;
-
-      set->name[len] = 0;
-
-      /* Fill in the file offset.  Note that the "location" field points
-	 to the SOM itself, not the ar_hdr in front of it.  */
-      set->file_offset = som_dict[lst_symbol.som_index].location
-			  - sizeof (struct ar_hdr);
-
-      /* Go to the next symbol.  */
-      set++;
-
-      /* Iterate through the rest of the chain.  */
-      while (lst_symbol.next_entry)
-	{
-	  /* Seek to the next symbol and read it in.  */
-	  if (bfd_seek (abfd, lst_filepos + lst_symbol.next_entry, SEEK_SET) <0)
-	    goto error_return;
-
-	  if (bfd_read ((PTR) & lst_symbol, 1, sizeof (lst_symbol), abfd)
-	      != sizeof (lst_symbol))
-	    goto error_return;
-
-	  /* Seek to the name length & string and read them in.  */
-	  if (bfd_seek (abfd, lst_filepos + lst_header->string_loc 
-				+ lst_symbol.name.n_strx - 4, SEEK_SET) < 0)
-	    goto error_return;
-
-	  if (bfd_read (&len, 1, 4, abfd) != 4)
-	    goto error_return;
-
-	  /* Allocate space for the name and null terminate it too.  */
-	  set->name = bfd_zalloc (abfd, len + 1);
-	  if (!set->name)
-	    goto error_return;
-
-	  if (bfd_read (set->name, 1, len, abfd) != len)
-	    goto error_return;
-	  set->name[len] = 0;
-
-	  /* Fill in the file offset.  Note that the "location" field points
-	     to the SOM itself, not the ar_hdr in front of it.  */
-	  set->file_offset = som_dict[lst_symbol.som_index].location
-			       - sizeof (struct ar_hdr);
-
-	  /* Go on to the next symbol.  */
-	  set++;
-	}
-    }
-  /* If we haven't died by now, then we successfully read the entire 
-     archive symbol table.  */
-  if (hash_table != NULL)
-    free (hash_table);
-  if (som_dict != NULL)
-    free (som_dict);
-  return true;
-
- error_return:
-  if (hash_table != NULL)
-    free (hash_table);
-  if (som_dict != NULL)
-    free (som_dict);
-  return false;
-}
-
-/* Read in the LST from the archive.  */
-static boolean
-som_slurp_armap (abfd)
-     bfd *abfd;
-{
-  struct lst_header lst_header;
-  struct ar_hdr ar_header;
-  unsigned int parsed_size;
-  struct artdata *ardata = bfd_ardata (abfd);
-  char nextname[17];
-  int i = bfd_read ((PTR) nextname, 1, 16, abfd);
-
-  /* Special cases.  */
-  if (i == 0)
-    return true;
-  if (i != 16)
-    return false;
-
-  if (bfd_seek (abfd, (file_ptr) - 16, SEEK_CUR) < 0)
-    return false;
-
-  /* For archives without .o files there is no symbol table.  */
-  if (strncmp (nextname, "/               ", 16))
-    {
-      bfd_has_map (abfd) = false;
-      return true;
-    }
-
-  /* Read in and sanity check the archive header.  */
-  if (bfd_read ((PTR) &ar_header, 1, sizeof (struct ar_hdr), abfd)
-      != sizeof (struct ar_hdr))
-    return false;
-
-  if (strncmp (ar_header.ar_fmag, ARFMAG, 2))
-    {
-      bfd_set_error (bfd_error_malformed_archive);
-      return false;
-    }
-
-  /* How big is the archive symbol table entry?  */
-  errno = 0;
-  parsed_size = strtol (ar_header.ar_size, NULL, 10);
-  if (errno != 0)
-    {
-      bfd_set_error (bfd_error_malformed_archive);
-      return false;
-    }
-
-  /* Save off the file offset of the first real user data.  */
-  ardata->first_file_filepos = bfd_tell (abfd) + parsed_size;
-
-  /* Read in the library symbol table.  We'll make heavy use of this
-     in just a minute.  */
-  if (bfd_read ((PTR) & lst_header, 1, sizeof (struct lst_header), abfd)
-      != sizeof (struct lst_header))
-    return false;
-
-  /* Sanity check.  */
-  if (lst_header.a_magic != LIBMAGIC)
-    {
-      bfd_set_error (bfd_error_malformed_archive);
-      return false;
-    }
-
-  /* Count the number of symbols in the library symbol table.  */
-  if (som_bfd_count_ar_symbols (abfd, &lst_header, &ardata->symdef_count)
-      == false)
-    return false;
-
-  /* Get back to the start of the library symbol table.  */
-  if (bfd_seek (abfd, ardata->first_file_filepos - parsed_size 
-			+ sizeof (struct lst_header), SEEK_SET) < 0)
-    return false;
-
-  /* Initializae the cache and allocate space for the library symbols.  */
-  ardata->cache = 0;
-  ardata->symdefs = (carsym *) bfd_alloc (abfd,
-					  (ardata->symdef_count
-					   * sizeof (carsym)));
-  if (!ardata->symdefs)
-    return false;
-
-  /* Now fill in the canonical archive symbols.  */
-  if (som_bfd_fill_in_ar_symbols (abfd, &lst_header, &ardata->symdefs)
-      == false)
-    return false;
-
-  /* Seek back to the "first" file in the archive.  Note the "first"
-     file may be the extended name table.  */
-  if (bfd_seek (abfd, ardata->first_file_filepos, SEEK_SET) < 0)
-    return false;
-
-  /* Notify the generic archive code that we have a symbol map.  */
-  bfd_has_map (abfd) = true;
-  return true;
-}
-
-/* Begin preparing to write a SOM library symbol table.
-
-   As part of the prep work we need to determine the number of symbols
-   and the size of the associated string section.  */
-
-static boolean
-som_bfd_prep_for_ar_write (abfd, num_syms, stringsize)
-     bfd *abfd;
-     unsigned int *num_syms, *stringsize;
-{
-  bfd *curr_bfd = abfd->archive_head;
-
-  /* Some initialization.  */
-  *num_syms = 0;
-  *stringsize = 0;
-
-  /* Iterate over each BFD within this archive.  */
-  while (curr_bfd != NULL)
-    {
-      unsigned int curr_count, i;
-      som_symbol_type *sym;
-
-      /* Don't bother for non-SOM objects.  */
-      if (curr_bfd->format != bfd_object
-	  || curr_bfd->xvec->flavour != bfd_target_som_flavour)
-	{
-	  curr_bfd = curr_bfd->next;
-	  continue;
-	}
-
-      /* Make sure the symbol table has been read, then snag a pointer
-	 to it.  It's a little slimey to grab the symbols via obj_som_symtab,
-	 but doing so avoids allocating lots of extra memory.  */
-      if (som_slurp_symbol_table (curr_bfd) == false)
-	return false;
-
-      sym = obj_som_symtab (curr_bfd);
-      curr_count = bfd_get_symcount (curr_bfd);
-
-      /* Examine each symbol to determine if it belongs in the
-	 library symbol table.  */
-      for (i = 0; i < curr_count; i++, sym++)
-	{
-	  struct som_misc_symbol_info info;
-
-	  /* Derive SOM information from the BFD symbol.  */
-	  som_bfd_derive_misc_symbol_info (curr_bfd, &sym->symbol, &info);
-
-	  /* Should we include this symbol?  */
-	  if (info.symbol_type == ST_NULL
-	      || info.symbol_type == ST_SYM_EXT
-	      || info.symbol_type == ST_ARG_EXT)
-	    continue;
-
-	  /* Only global symbols and unsatisfied commons.  */
-	  if (info.symbol_scope != SS_UNIVERSAL
-	      && info.symbol_type != ST_STORAGE)
-	    continue;
-
-	  /* Do no include undefined symbols.  */
-	  if (bfd_is_und_section (sym->symbol.section))
-	    continue;
-
-	  /* Bump the various counters, being careful to honor
-	     alignment considerations in the string table.  */
-	  (*num_syms)++;
-	  *stringsize = *stringsize + strlen (sym->symbol.name) + 5;
-	  while (*stringsize % 4)
-	    (*stringsize)++;
-	}
-
-      curr_bfd = curr_bfd->next;
-    }
-  return true;
-}
-
-/* Hash a symbol name based on the hashing algorithm presented in the
-   SOM ABI.  */
-static unsigned int
-som_bfd_ar_symbol_hash (symbol)
-     asymbol *symbol;
-{
-  unsigned int len = strlen (symbol->name);
-
-  /* Names with length 1 are special.  */
-  if (len == 1)
-    return 0x1000100 | (symbol->name[0] << 16) | symbol->name[0];
-
-  return ((len & 0x7f) << 24) | (symbol->name[1] << 16)
-	  | (symbol->name[len-2] << 8) | symbol->name[len-1];
-}
-
-/* Do the bulk of the work required to write the SOM library
-   symbol table.  */
-   
-static boolean
-som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
-     bfd *abfd;
-     unsigned int nsyms, string_size;
-     struct lst_header lst;
-     unsigned elength;
-{
-  file_ptr lst_filepos;
-  char *strings = NULL, *p;
-  struct lst_symbol_record *lst_syms = NULL, *curr_lst_sym;
-  bfd *curr_bfd;
-  unsigned int *hash_table = NULL;
-  struct som_entry *som_dict = NULL;
-  struct lst_symbol_record **last_hash_entry = NULL;
-  unsigned int curr_som_offset, som_index = 0;
-
-  hash_table =
-    (unsigned int *) bfd_malloc (lst.hash_size * sizeof (unsigned int));
-  if (hash_table == NULL && lst.hash_size != 0)
-    goto error_return;
-  som_dict =
-    (struct som_entry *) bfd_malloc (lst.module_count
-				     * sizeof (struct som_entry));
-  if (som_dict == NULL && lst.module_count != 0)
-    goto error_return;
-
-  last_hash_entry =
-    ((struct lst_symbol_record **)
-     bfd_malloc (lst.hash_size * sizeof (struct lst_symbol_record *)));
-  if (last_hash_entry == NULL && lst.hash_size != 0)
-    goto error_return;
-
-  /* Lots of fields are file positions relative to the start
-     of the lst record.  So save its location.  */
-  lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
-
-  /* Some initialization.  */
-  memset (hash_table, 0, 4 * lst.hash_size);
-  memset (som_dict, 0, lst.module_count * sizeof (struct som_entry));
-  memset (last_hash_entry, 0, 	
-	  lst.hash_size * sizeof (struct lst_symbol_record *));
-
-  /* Symbols have som_index fields, so we have to keep track of the
-     index of each SOM in the archive.
-
-     The SOM dictionary has (among other things) the absolute file
-     position for the SOM which a particular dictionary entry
-     describes.  We have to compute that information as we iterate
-     through the SOMs/symbols.  */
-  som_index = 0;
-
-  /* We add in the size of the archive header twice as the location
-     in the SOM dictionary is the actual offset of the SOM, not the
-     archive header before the SOM.  */
-  curr_som_offset = 8 + 2 * sizeof (struct ar_hdr) + lst.file_end;
-
-  /* Make room for the archive header and the contents of the
-     extended string table.  Note that elength includes the size
-     of the archive header for the extended name table!  */
-  if (elength)
-    curr_som_offset += elength;
-
-  /* Make sure we're properly aligned.  */
-  curr_som_offset = (curr_som_offset + 0x1) & ~0x1;
-
-  /* FIXME should be done with buffers just like everything else... */
-  lst_syms = bfd_malloc (nsyms * sizeof (struct lst_symbol_record));
-  if (lst_syms == NULL && nsyms != 0)
-    goto error_return;
-  strings = bfd_malloc (string_size);
-  if (strings == NULL && string_size != 0)
-    goto error_return;
-
-  p = strings;
-  curr_lst_sym = lst_syms;
-
-  curr_bfd = abfd->archive_head;
-  while (curr_bfd != NULL)
-    {
-      unsigned int curr_count, i;
-      som_symbol_type *sym;
-
-      /* Don't bother for non-SOM objects.  */
-      if (curr_bfd->format != bfd_object
-	  || curr_bfd->xvec->flavour != bfd_target_som_flavour)
-	{
-	  curr_bfd = curr_bfd->next;
-	  continue;
-	}
-
-      /* Make sure the symbol table has been read, then snag a pointer
-	 to it.  It's a little slimey to grab the symbols via obj_som_symtab,
-	 but doing so avoids allocating lots of extra memory.  */
-      if (som_slurp_symbol_table (curr_bfd) == false)
-	goto error_return;
-
-      sym = obj_som_symtab (curr_bfd);
-      curr_count = bfd_get_symcount (curr_bfd);
-
-      for (i = 0; i < curr_count; i++, sym++)
-	{
-	  struct som_misc_symbol_info info;
-
-	  /* Derive SOM information from the BFD symbol.  */
-	  som_bfd_derive_misc_symbol_info (curr_bfd, &sym->symbol, &info);
-
-	  /* Should we include this symbol?  */
-	  if (info.symbol_type == ST_NULL
-	      || info.symbol_type == ST_SYM_EXT
-	      || info.symbol_type == ST_ARG_EXT)
-	    continue;
-
-	  /* Only global symbols and unsatisfied commons.  */
-	  if (info.symbol_scope != SS_UNIVERSAL
-	      && info.symbol_type != ST_STORAGE)
-	    continue;
-
-	  /* Do no include undefined symbols.  */
-	  if (bfd_is_und_section (sym->symbol.section))
-	    continue;
-
-	  /* If this is the first symbol from this SOM, then update
-	     the SOM dictionary too.  */
-	  if (som_dict[som_index].location == 0)
-	    {
-	      som_dict[som_index].location = curr_som_offset;
-	      som_dict[som_index].length = arelt_size (curr_bfd);
-	    }
-
-	  /* Fill in the lst symbol record.  */
-	  curr_lst_sym->hidden = 0;
-	  curr_lst_sym->secondary_def = 0;
-	  curr_lst_sym->symbol_type = info.symbol_type;
-	  curr_lst_sym->symbol_scope = info.symbol_scope;
-	  curr_lst_sym->check_level = 0;
-	  curr_lst_sym->must_qualify = 0;
-	  curr_lst_sym->initially_frozen = 0;
-	  curr_lst_sym->memory_resident = 0;
-	  curr_lst_sym->is_common = bfd_is_com_section (sym->symbol.section);
-	  curr_lst_sym->dup_common = 0;
-	  curr_lst_sym->xleast = 3;
-	  curr_lst_sym->arg_reloc = info.arg_reloc;
-	  curr_lst_sym->name.n_strx = p - strings + 4;
-	  curr_lst_sym->qualifier_name.n_strx = 0;
-	  curr_lst_sym->symbol_info = info.symbol_info;
-	  curr_lst_sym->symbol_value = info.symbol_value | info.priv_level;
-	  curr_lst_sym->symbol_descriptor = 0;
-	  curr_lst_sym->reserved = 0;
-	  curr_lst_sym->som_index = som_index;
-	  curr_lst_sym->symbol_key = som_bfd_ar_symbol_hash (&sym->symbol);
-	  curr_lst_sym->next_entry = 0;
-
-	  /* Insert into the hash table.  */
-	  if (hash_table[curr_lst_sym->symbol_key % lst.hash_size])
-	    {
-	      struct lst_symbol_record *tmp;
-
-	      /* There is already something at the head of this hash chain,
-		 so tack this symbol onto the end of the chain.  */
-	      tmp = last_hash_entry[curr_lst_sym->symbol_key % lst.hash_size];
-	      tmp->next_entry
-		= (curr_lst_sym - lst_syms) * sizeof (struct lst_symbol_record)
-		  + lst.hash_size * 4 
-		  + lst.module_count * sizeof (struct som_entry)
-		  + sizeof (struct lst_header);
-	    }
-	  else
-	    {
-	      /* First entry in this hash chain.  */
-	      hash_table[curr_lst_sym->symbol_key % lst.hash_size]
-		= (curr_lst_sym - lst_syms) * sizeof (struct lst_symbol_record)
-		  + lst.hash_size * 4 
-		  + lst.module_count * sizeof (struct som_entry)
-		  + sizeof (struct lst_header);
-	    }
-
-	  /* Keep track of the last symbol we added to this chain so we can
-	     easily update its next_entry pointer.  */
-	  last_hash_entry[curr_lst_sym->symbol_key % lst.hash_size]
-	    = curr_lst_sym;
-
-
-	  /* Update the string table.  */
-	  bfd_put_32 (abfd, strlen (sym->symbol.name), p);
-	  p += 4;
-	  strcpy (p, sym->symbol.name);
-	  p += strlen (sym->symbol.name) + 1;
-	  while ((int)p % 4)
-	    {
-	      bfd_put_8 (abfd, 0, p);
-	      p++;
-	    }
-
-	  /* Head to the next symbol.  */
-	  curr_lst_sym++;
-	}
-
-      /* Keep track of where each SOM will finally reside; then look
-	 at the next BFD.  */
-      curr_som_offset += arelt_size (curr_bfd) + sizeof (struct ar_hdr);
- 
-      /* A particular object in the archive may have an odd length; the
-	 linker requires objects begin on an even boundary.  So round
-	 up the current offset as necessary.  */
-      curr_som_offset = (curr_som_offset + 0x1) & ~0x1;
-      curr_bfd = curr_bfd->next;
-      som_index++;
-    }
-
-  /* Now scribble out the hash table.  */
-  if (bfd_write ((PTR) hash_table, lst.hash_size, 4, abfd)
-      != lst.hash_size * 4)
-    goto error_return;
-
-  /* Then the SOM dictionary.  */
-  if (bfd_write ((PTR) som_dict, lst.module_count,
-		 sizeof (struct som_entry), abfd)
-      != lst.module_count * sizeof (struct som_entry))
-    goto error_return;
-
-  /* The library symbols.  */
-  if (bfd_write ((PTR) lst_syms, nsyms, sizeof (struct lst_symbol_record), abfd)
-      != nsyms * sizeof (struct lst_symbol_record))
-    goto error_return;
-
-  /* And finally the strings.  */
-  if (bfd_write ((PTR) strings, string_size, 1, abfd) != string_size)
-    goto error_return;
-
-  if (hash_table != NULL)
-    free (hash_table);
-  if (som_dict != NULL)
-    free (som_dict);
-  if (last_hash_entry != NULL)
-    free (last_hash_entry);
-  if (lst_syms != NULL)
-    free (lst_syms);
-  if (strings != NULL)
-    free (strings);
-  return true;
-
- error_return:
-  if (hash_table != NULL)
-    free (hash_table);
-  if (som_dict != NULL)
-    free (som_dict);
-  if (last_hash_entry != NULL)
-    free (last_hash_entry);
-  if (lst_syms != NULL)
-    free (lst_syms);
-  if (strings != NULL)
-    free (strings);
-
-  return false;
-}
-
-/* Write out the LST for the archive.
-
-   You'll never believe this is really how armaps are handled in SOM...  */
-
-/*ARGSUSED*/
-static boolean
-som_write_armap (abfd, elength, map, orl_count, stridx)
-     bfd *abfd;
-     unsigned int elength;
-     struct orl *map;
-     unsigned int orl_count;
-     int stridx;
-{
-  bfd *curr_bfd;
-  struct stat statbuf;
-  unsigned int i, lst_size, nsyms, stringsize;
-  struct ar_hdr hdr;
-  struct lst_header lst;
-  int *p;
- 
-  /* We'll use this for the archive's date and mode later.  */
-  if (stat (abfd->filename, &statbuf) != 0)
-    {
-      bfd_set_error (bfd_error_system_call);
-      return false;
-    }
-  /* Fudge factor.  */
-  bfd_ardata (abfd)->armap_timestamp = statbuf.st_mtime + 60;
-
-  /* Account for the lst header first.  */
-  lst_size = sizeof (struct lst_header);
-
-  /* Start building the LST header.  */
-  /* FIXME:  Do we need to examine each element to determine the
-     largest id number?  */
-  lst.system_id = CPU_PA_RISC1_0;
-  lst.a_magic = LIBMAGIC;
-  lst.version_id = VERSION_ID;
-  lst.file_time.secs = 0;
-  lst.file_time.nanosecs = 0;
-
-  lst.hash_loc = lst_size;
-  lst.hash_size = SOM_LST_HASH_SIZE;
-
-  /* Hash table is a SOM_LST_HASH_SIZE 32bit offsets.  */
-  lst_size += 4 * SOM_LST_HASH_SIZE;
-
-  /* We need to count the number of SOMs in this archive.  */
-  curr_bfd = abfd->archive_head;
-  lst.module_count = 0;
-  while (curr_bfd != NULL)
-    {
-      /* Only true SOM objects count.  */
-      if (curr_bfd->format == bfd_object
-	  && curr_bfd->xvec->flavour == bfd_target_som_flavour)
-	lst.module_count++;
-      curr_bfd = curr_bfd->next;
-    }
-  lst.module_limit = lst.module_count;
-  lst.dir_loc = lst_size;
-  lst_size += sizeof (struct som_entry) * lst.module_count;
-
-  /* We don't support import/export tables, auxiliary headers,
-     or free lists yet.  Make the linker work a little harder
-     to make our life easier.  */
-
-  lst.export_loc = 0;
-  lst.export_count = 0;
-  lst.import_loc = 0;
-  lst.aux_loc = 0;
-  lst.aux_size = 0;
-
-  /* Count how many symbols we will have on the hash chains and the
-     size of the associated string table.  */
-  if (som_bfd_prep_for_ar_write (abfd, &nsyms, &stringsize) == false)
-    return false;
-
-  lst_size += sizeof (struct lst_symbol_record) * nsyms;
-
-  /* For the string table.  One day we might actually use this info
-     to avoid small seeks/reads when reading archives.  */
-  lst.string_loc = lst_size;
-  lst.string_size = stringsize;
-  lst_size += stringsize;
-
-  /* SOM ABI says this must be zero.  */
-  lst.free_list = 0;
-  lst.file_end = lst_size;
-
-  /* Compute the checksum.  Must happen after the entire lst header
-     has filled in.  */
-  p = (int *)&lst;
-  lst.checksum = 0;
-  for (i = 0; i < sizeof (struct lst_header)/sizeof (int) - 1; i++)
-    lst.checksum ^= *p++;
-
-  sprintf (hdr.ar_name, "/               ");
-  sprintf (hdr.ar_date, "%ld", bfd_ardata (abfd)->armap_timestamp);
-  sprintf (hdr.ar_uid, "%ld", (long) getuid ());
-  sprintf (hdr.ar_gid, "%ld", (long) getgid ());
-  sprintf (hdr.ar_mode, "%-8o", (unsigned int) statbuf.st_mode);
-  sprintf (hdr.ar_size, "%-10d", (int) lst_size);
-  hdr.ar_fmag[0] = '`';
-  hdr.ar_fmag[1] = '\012';
-
-  /* Turn any nulls into spaces.  */
-  for (i = 0; i < sizeof (struct ar_hdr); i++)
-    if (((char *) (&hdr))[i] == '\0')
-      (((char *) (&hdr))[i]) = ' ';
-
-  /* Scribble out the ar header.  */
-  if (bfd_write ((PTR) &hdr, 1, sizeof (struct ar_hdr), abfd)
-      != sizeof (struct ar_hdr))
-    return false;
-
-  /* Now scribble out the lst header.  */
-  if (bfd_write ((PTR) &lst, 1, sizeof (struct lst_header), abfd)
-      != sizeof (struct lst_header))
-    return false;
-
-  /* Build and write the armap.  */
-  if (som_bfd_ar_write_symbol_stuff (abfd, nsyms, stringsize, lst, elength)
-      == false)
-    return false;
-  
-  /* Done.  */
-  return true;
-}
-
-/* Free all information we have cached for this BFD.  We can always
-   read it again later if we need it.  */
-
-static boolean
-som_bfd_free_cached_info (abfd)
-     bfd *abfd;
-{
-  asection *o;
-
-  if (bfd_get_format (abfd) != bfd_object)
-    return true;
-
-#define FREE(x) if (x != NULL) { free (x); x = NULL; }
-  /* Free the native string and symbol tables.  */
-  FREE (obj_som_symtab (abfd));
-  FREE (obj_som_stringtab (abfd));
-  for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    {
-      /* Free the native relocations.  */
-      o->reloc_count = -1;
-      FREE (som_section_data (o)->reloc_stream);
-      /* Free the generic relocations.  */
-      FREE (o->relocation);
-    }
-#undef FREE
-
-  return true;
-}
-
-/* End of miscellaneous support functions. */
-
-/* Linker support functions.  */
-static boolean
-som_bfd_link_split_section (abfd, sec)
-     bfd *abfd;
-     asection *sec;
-{
-  return (som_is_subspace (sec) && sec->_raw_size > 240000);
-}
-
-#define	som_close_and_cleanup		som_bfd_free_cached_info
-
-#define som_read_ar_hdr			_bfd_generic_read_ar_hdr
-#define som_openr_next_archived_file	bfd_generic_openr_next_archived_file
-#define som_get_elt_at_index		_bfd_generic_get_elt_at_index
-#define som_generic_stat_arch_elt	bfd_generic_stat_arch_elt
-#define som_truncate_arname		bfd_bsd_truncate_arname
-#define som_slurp_extended_name_table	_bfd_slurp_extended_name_table
-#define som_construct_extended_name_table \
-  _bfd_archive_coff_construct_extended_name_table
-#define som_update_armap_timestamp	bfd_true
-#define som_bfd_print_private_bfd_data  _bfd_generic_bfd_print_private_bfd_data
-
-#define som_get_lineno                  _bfd_nosymbols_get_lineno
-#define som_bfd_make_debug_symbol	_bfd_nosymbols_bfd_make_debug_symbol
-#define som_read_minisymbols		_bfd_generic_read_minisymbols
-#define som_minisymbol_to_symbol	_bfd_generic_minisymbol_to_symbol
-#define som_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define som_bfd_get_relocated_section_contents \
- bfd_generic_get_relocated_section_contents
-#define som_bfd_relax_section bfd_generic_relax_section
-#define som_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define som_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define som_bfd_final_link _bfd_generic_final_link
-
-#define som_bfd_gc_sections		bfd_generic_gc_sections
-
-
-const bfd_target som_vec =
-{
-  "som",			/* name */
-  bfd_target_som_flavour,
-  BFD_ENDIAN_BIG,		/* target byte order */
-  BFD_ENDIAN_BIG,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED | DYNAMIC),
-  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),		/* section flags */
-
-/* leading_symbol_char: is the first char of a user symbol
-   predictable, and if so what is it */
-  0,
-  '/',				/* ar_pad_char */
-  14,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-  {_bfd_dummy_target,
-   som_object_p,		/* bfd_check_format */
-   bfd_generic_archive_p,
-   _bfd_dummy_target
-  },
-  {
-    bfd_false,
-    som_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false
-  },
-  {
-    bfd_false,
-    som_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-#undef som
-
-  BFD_JUMP_TABLE_GENERIC (som),
-  BFD_JUMP_TABLE_COPY (som),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (som),
-  BFD_JUMP_TABLE_SYMBOLS (som),
-  BFD_JUMP_TABLE_RELOCS (som),
-  BFD_JUMP_TABLE_WRITE (som),
-  BFD_JUMP_TABLE_LINK (som),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
-
-#endif /* HOST_HPPAHPUX || HOST_HPPABSD || HOST_HPPAOSF */
diff --git a/bfd/som.h b/bfd/som.h
deleted file mode 100644
index af378042189..00000000000
--- a/bfd/som.h
+++ /dev/null
@@ -1,237 +0,0 @@
-/* HP PA-RISC SOM object file format:  definitions internal to BFD.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1998
-   Free Software Foundation, Inc.
-
-   Contributed by the Center for Software Science at the
-   University of Utah (pa-gdb-bugs@cs.utah.edu).
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-   02111-1307, USA.  */
-
-#ifndef _SOM_H
-#define _SOM_H
-
-#include "libhppa.h"
-
-#include <a.out.h>
-#include <lst.h>
-#include <ar.h>
-
-/* The SOM BFD backend doesn't currently use anything from these
-   two include files, but it's likely to need them in the future.  */
-#ifdef R_DLT_REL
-#include <shl.h>
-#include <dl.h>
-#endif
-
-#if defined(HOST_HPPABSD) || defined (HOST_HPPAOSF)
-/* BSD uses a completely different scheme for object file identification.
-   so for now, define _PA_RISC_ID to accept any random value for a model
-   number.  */
-#undef _PA_RISC_ID
-#define _PA_RISC_ID(__m_num) 1
-#endif /* HOST_HPPABSD */
-
-#define FILE_HDR_SIZE sizeof(struct header)
-#define AUX_HDR_SIZE sizeof(struct som_exec_auxhdr)
-
-typedef struct som_symbol
-  {
-    asymbol symbol;
-    unsigned int som_type;
-
-    /* Structured like the ELF tc_data union.  Allows more code sharing
-       in GAS this way.  */
-    union
-      {
-	struct
-	{
-	  unsigned int hppa_arg_reloc;
-	  unsigned int hppa_priv_level;
-	} ap;
-	PTR any;
-      }
-    tc_data;
-
-    /* Index of this symbol in the symbol table.  Only used when
-       building relocation streams for incomplete objects.  */
-    int index;
-
-    /* How many times this symbol is used in a relocation.  By sorting
-       the symbols from most used to least used we can significantly
-       reduce the size of the relocation stream for incomplete objects.  */
-    int reloc_count;
-
-    /* During object file writing, the offset of the name of this symbol
-       in the SOM string table. */
-    int stringtab_offset;
-  }
-som_symbol_type;
-
-/* A structure containing all the magic information stored in a BFD's
-   private data which needs to be copied during an objcopy/strip run.  */
-struct som_exec_data
-  {
-    /* Sort-of a magic number.  BSD uses it to distinguish between
-       native executables and hpux executables.  */
-    short system_id;
-
-    /* Magic exec flags.  These control things like whether or not
-       null pointer dereferencing is allowed and the like.  */
-    long exec_flags;
-
-    /* Add more stuff here as needed.  Good examples of information
-       we might want to pass would be presumed_dp, entry_* and maybe
-       others from the file header.  */
-  };
-
-struct somdata
-  {
-    /* All the magic information about an executable which lives
-       in the private BFD structure and needs to be copied from
-       the input bfd to the output bfd during a objcopy/strip.  */
-    struct som_exec_data *exec_data;
-
-    /* These three fields are only used when writing files and are
-       generated from scratch.  They need not be copied for objcopy
-       or strip to work.  */
-    struct header *file_hdr;
-    struct copyright_aux_hdr *copyright_aux_hdr;
-    struct user_string_aux_hdr *version_aux_hdr;
-    struct som_exec_auxhdr *exec_hdr;
-    COMPUNIT *comp_unit;
-
-    /* Pointers to a saved copy of the symbol and string tables.  These
-       need not be copied for objcopy or strip to work.  */
-    som_symbol_type *symtab;
-    char *stringtab;
-    asymbol **sorted_syms;
-
-    /* We remember these offsets so that after check_file_format, we have
-       no dependencies on the particular format of the exec_hdr.
-       These offsets need not be copied for objcopy or strip to work.  */
-
-    file_ptr sym_filepos;
-    file_ptr str_filepos;
-    file_ptr reloc_filepos;
-    unsigned stringtab_size;
-  };
-
-struct som_data_struct
-  {
-    struct somdata a;
-  };
-
-/* Substructure of som_section_data_struct used to hold information
-   which can't be represented by the generic BFD section structure,
-   but which must be copied during objcopy or strip.  */
-struct som_copyable_section_data_struct
-  {
-    /* Various fields in space and subspace headers that we need
-       to pass around.  */
-    unsigned int sort_key : 8;
-    unsigned int access_control_bits : 7;
-    unsigned int is_defined : 1;
-    unsigned int is_private : 1;
-    unsigned int quadrant : 2;
-
-    /* For subspaces, this points to the section which represents the
-       space in which the subspace is contained.  For spaces it points
-       back to the section for this space.  */
-    asection *container;
-
-    /* The user-specified space number.  It is wrong to use this as
-       an index since duplicates and holes are allowed.  */
-    int space_number;
-
-    /* Add more stuff here as needed.  Good examples of information
-       we might want to pass would be initialization pointers, 
-       and the many subspace flags we do not represent yet.  */
-  };
-
-/* Used to keep extra SOM specific information for a given section.
-
-   reloc_size holds the size of the relocation stream, note this
-   is very different from the number of relocations as SOM relocations
-   are variable length. 
-
-   reloc_stream is the actual stream of relocation entries.  */
-
-struct som_section_data_struct
-  {
-    struct som_copyable_section_data_struct *copy_data;
-    unsigned int reloc_size;
-    char *reloc_stream;
-    struct space_dictionary_record *space_dict;
-    struct subspace_dictionary_record *subspace_dict;
-  };
-
-#define somdata(bfd)			((bfd)->tdata.som_data->a)
-#define obj_som_exec_data(bfd)		(somdata(bfd).exec_data)
-#define obj_som_file_hdr(bfd)		(somdata(bfd).file_hdr)
-#define obj_som_exec_hdr(bfd)		(somdata(bfd).exec_hdr)
-#define obj_som_copyright_hdr(bfd)	(somdata(bfd).copyright_aux_hdr)
-#define obj_som_version_hdr(bfd)	(somdata(bfd).version_aux_hdr)
-#define obj_som_compilation_unit(bfd)	(somdata(bfd).comp_unit)
-#define obj_som_symtab(bfd)		(somdata(bfd).symtab)
-#define obj_som_stringtab(bfd)		(somdata(bfd).stringtab)
-#define obj_som_sym_filepos(bfd)	(somdata(bfd).sym_filepos)
-#define obj_som_str_filepos(bfd)	(somdata(bfd).str_filepos)
-#define obj_som_stringtab_size(bfd)	(somdata(bfd).stringtab_size)
-#define obj_som_reloc_filepos(bfd)	(somdata(bfd).reloc_filepos)
-#define obj_som_sorted_syms(bfd)	(somdata(bfd).sorted_syms)
-#define som_section_data(sec) \
-  ((struct som_section_data_struct *)sec->used_by_bfd)
-#define som_symbol_data(symbol)		((som_symbol_type *) symbol)
-
-
-/* Defines groups of basic relocations.  FIXME:  These should
-   be the only basic relocations created by GAS.  The rest
-   should be internal to the BFD backend.
-
-   The idea is both SOM and ELF define these basic relocation
-   types so they map into a SOM or ELF specific reloation as
-   appropriate.  This allows GAS to share much more code 
-   between the two object formats.  */
-
-#define R_HPPA_NONE			R_NO_RELOCATION
-#define	R_HPPA				R_CODE_ONE_SYMBOL
-#define	R_HPPA_PCREL_CALL		R_PCREL_CALL
-#define R_HPPA_ABS_CALL			R_ABS_CALL
-#define	R_HPPA_GOTOFF			R_DP_RELATIVE
-#define R_HPPA_ENTRY			R_ENTRY
-#define R_HPPA_EXIT			R_EXIT
-#define R_HPPA_COMPLEX			R_COMP1
-#define R_HPPA_BEGIN_BRTAB		R_BEGIN_BRTAB
-#define R_HPPA_END_BRTAB		R_END_BRTAB
-#define R_HPPA_BEGIN_TRY		R_BEGIN_TRY
-#define R_HPPA_END_TRY			R_END_TRY
-
-/* Exported functions, mostly for use by GAS.  */
-boolean bfd_som_set_section_attributes PARAMS ((asection *, int, int,
-						unsigned int, int));
-boolean bfd_som_set_subsection_attributes PARAMS ((asection *, asection *,
-						   int, unsigned int, int));
-void bfd_som_set_symbol_type PARAMS ((asymbol *, unsigned int));
-boolean bfd_som_attach_aux_hdr PARAMS ((bfd *, int, char *));
-int ** hppa_som_gen_reloc_type
-  PARAMS ((bfd *, int, int, enum hppa_reloc_field_selector_type_alt,
-	   int, asymbol *));
-boolean bfd_som_attach_compilation_unit
-  PARAMS ((bfd *, const char *, const char *, const char *, const char *));
-
-#endif /* _SOM_H */
diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c
deleted file mode 100644
index 86d4e7e9444..00000000000
--- a/bfd/sparclinux.c
+++ /dev/null
@@ -1,770 +0,0 @@
-/* BFD back-end for linux flavored sparc a.out binaries.
-   Copyright (C) 1992, 93, 94, 95, 96, 1997, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-USA.  */
-
-#define TARGET_PAGE_SIZE        4096
-#define ZMAGIC_DISK_BLOCK_SIZE 1024
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define TEXT_START_ADDR        0x0
-#define N_SHARED_LIB(x) 0
-#define BYTES_IN_WORD 4
-
-#define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_UNKNOWN)
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#define DEFAULT_ARCH bfd_arch_sparc
-#define MY(OP) CAT(sparclinux_,OP)
-#define TARGETNAME "a.out-sparc-linux"
-
-extern const bfd_target MY(vec);
-
-/* We always generate QMAGIC files in preference to ZMAGIC files.  It
-   would be possible to make this a linker option, if that ever
-   becomes important.  */
-
-static void MY_final_link_callback
-  PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *));
-
-static boolean sparclinux_bfd_final_link
-  PARAMS ((bfd *abfd, struct bfd_link_info *info));
-
-static boolean
-sparclinux_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  obj_aout_subformat (abfd) = q_magic_format;
-  return NAME(aout,final_link) (abfd, info, MY_final_link_callback);
-}
-
-#define MY_bfd_final_link sparclinux_bfd_final_link
-
-/* Set the machine type correctly.  */
-
-static boolean sparclinux_write_object_contents PARAMS ((bfd *abfd));
-
-static boolean
-sparclinux_write_object_contents (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  N_SET_MACHTYPE (*execp, M_SPARC);
-
-  obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-
-  WRITE_HEADERS(abfd, execp);
-
-  return true;
-}
-
-#define MY_write_object_contents sparclinux_write_object_contents
-/* Code to link against Linux a.out shared libraries.  */
-
-/* See if a symbol name is a reference to the global offset table.  */
-
-#ifndef GOT_REF_PREFIX
-#define        GOT_REF_PREFIX  "__GOT_"
-#endif
-
-#define IS_GOT_SYM(name) \
-  (strncmp (name, GOT_REF_PREFIX, sizeof GOT_REF_PREFIX - 1) == 0)
-
-/* See if a symbol name is a reference to the procedure linkage table. */
-
-#ifndef PLT_REF_PREFIX
-#define        PLT_REF_PREFIX  "__PLT_"
-#endif
-
-#define IS_PLT_SYM(name) \
-  (strncmp (name, PLT_REF_PREFIX, sizeof PLT_REF_PREFIX - 1) == 0)
-
-/* This string is used to generate specialized error messages.  */
-
-#ifndef NEEDS_SHRLIB
-#define NEEDS_SHRLIB "__NEEDS_SHRLIB_"
-#endif
-
-/* This special symbol is a set vector that contains a list of
-   pointers to fixup tables.  It will be present in any dynamicly
-   linked file.  The linker generated fixup table should also be added
-   to the list, and it should always appear in the second slot (the
-   first one is a dummy with a magic number that is defined in
-   crt0.o).  */
-
-#ifndef SHARABLE_CONFLICTS
-#define SHARABLE_CONFLICTS "__SHARABLE_CONFLICTS__"
-#endif
-
-/* We keep a list of fixups.  The terminology is a bit strange, but
-   each fixup contains two 32 bit numbers.  A regular fixup contains
-   an address and a pointer, and at runtime we should store the
-   address at the location pointed to by the pointer.  A builtin fixup
-   contains two pointers, and we should read the address using one
-   pointer and store it at the location pointed to by the other
-   pointer.  Builtin fixups come into play when we have duplicate
-   __GOT__ symbols for the same variable.  The builtin fixup will copy
-   the GOT pointer from one over into the other.  */
-
-struct fixup
-{
-  struct fixup *next;
-  struct linux_link_hash_entry *h;
-  bfd_vma value;
-
-  /* Nonzero if this is a jump instruction that needs to be fixed,
-     zero if this is just a pointer */
-  char jump;
-
-  char builtin;
-};
-
-/* We don't need a special hash table entry structure, but we do need
-   to keep some information between linker passes, so we use a special
-   hash table.  */
-
-struct linux_link_hash_entry
-{
-  struct aout_link_hash_entry root;
-};
-
-struct linux_link_hash_table
-{
-  struct aout_link_hash_table root;
-
-  /* First dynamic object found in link.  */
-  bfd *dynobj;
-
-  /* Number of fixups.  */
-  size_t fixup_count;
-
-  /* Number of builtin fixups.  */
-  size_t local_builtins;
-
-  /* List of fixups.  */
-  struct fixup *fixup_list;
-};
-
-static struct bfd_hash_entry *linux_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *linux_link_hash_table_create
-  PARAMS ((bfd *));
-static struct fixup *new_fixup
-  PARAMS ((struct bfd_link_info *, struct linux_link_hash_entry *,
-          bfd_vma, int));
-static boolean linux_link_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean linux_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-          bfd_vma, const char *, boolean, boolean,
-          struct bfd_link_hash_entry **));
-static boolean linux_tally_symbols
-  PARAMS ((struct linux_link_hash_entry *, PTR));
-static boolean linux_finish_dynamic_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-/* Routine to create an entry in an Linux link hash table.  */
-
-static struct bfd_hash_entry *
-linux_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct linux_link_hash_entry *ret = (struct linux_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct linux_link_hash_entry *) NULL)
-    ret = ((struct linux_link_hash_entry *)
-          bfd_hash_allocate (table, sizeof (struct linux_link_hash_entry)));
-  if (ret == NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct linux_link_hash_entry *)
-        NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
-                                      table, string));
-  if (ret != NULL)
-    {
-      /* Set local fields; there aren't any.  */
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create a Linux link hash table.  */
-
-static struct bfd_link_hash_table *
-linux_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct linux_link_hash_table *ret;
-
-  ret = ((struct linux_link_hash_table *)
-        bfd_alloc (abfd, sizeof (struct linux_link_hash_table)));
-  if (ret == (struct linux_link_hash_table *) NULL)
-    return (struct bfd_link_hash_table *) NULL;
-  if (! NAME(aout,link_hash_table_init) (&ret->root, abfd,
-                                        linux_link_hash_newfunc))
-    {
-      free (ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-
-  ret->dynobj = NULL;
-  ret->fixup_count = 0;
-  ret->local_builtins = 0;
-  ret->fixup_list = NULL;
-
-  return &ret->root.root;
-}
-
-/* Look up an entry in a Linux link hash table.  */
-
-#define linux_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct linux_link_hash_entry *) \
-   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
-                         (follow)))
-
-/* Traverse a Linux link hash table.  */
-
-#define linux_link_hash_traverse(table, func, info)                    \
-  (aout_link_hash_traverse                                             \
-   (&(table)->root,                                                    \
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func), \
-    (info)))
-
-/* Get the Linux link hash table from the info structure.  This is
-   just a cast.  */
-
-#define linux_hash_table(p) ((struct linux_link_hash_table *) ((p)->hash))
-
-/* Store the information for a new fixup.  */
-
-static struct fixup *
-new_fixup (info, h, value, builtin)
-     struct bfd_link_info *info;
-     struct linux_link_hash_entry *h;
-     bfd_vma value;
-     int builtin;
-{
-  struct fixup *f;
-
-  f = (struct fixup *) bfd_hash_allocate (&info->hash->table,
-                                         sizeof (struct fixup));
-  if (f == NULL)
-    return f;
-  f->next = linux_hash_table (info)->fixup_list;
-  linux_hash_table (info)->fixup_list = f;
-  f->h = h;
-  f->value = value;
-  f->builtin = builtin;
-  f->jump = 0;
-  ++linux_hash_table (info)->fixup_count;
-  return f;
-}
-
-/* We come here once we realize that we are going to link to a shared
-   library.  We need to create a special section that contains the
-   fixup table, and we ultimately need to add a pointer to this into
-   the set vector for SHARABLE_CONFLICTS.  At this point we do not
-   know the size of the section, but that's OK - we just need to
-   create it for now.  */
-
-static boolean
-linux_link_create_dynamic_sections (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  flagword flags;
-  register asection *s;
-
-  /* Note that we set the SEC_IN_MEMORY flag.  */
-  flags = SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-
-  /* We choose to use the name ".linux-dynamic" for the fixup table.
-     Why not? */
-  s = bfd_make_section (abfd, ".linux-dynamic");
-  if (s == NULL
-      || ! bfd_set_section_flags (abfd, s, flags)
-      || ! bfd_set_section_alignment (abfd, s, 2))
-    return false;
-  s->_raw_size = 0;
-  s->contents = 0;
-
-  return true;
-}
-
-/* Function to add a single symbol to the linker hash table.  This is
-   a wrapper around _bfd_generic_link_add_one_symbol which handles the
-   tweaking needed for dynamic linking support.  */
-
-static boolean
-linux_add_one_symbol (info, abfd, name, flags, section, value, string,
-                     copy, collect, hashp)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     asection *section;
-     bfd_vma value;
-     const char *string;
-     boolean copy;
-     boolean collect;
-     struct bfd_link_hash_entry **hashp;
-{
-  struct linux_link_hash_entry *h;
-  boolean insert;
-
-  /* Look up and see if we already have this symbol in the hash table.
-     If we do, and the defining entry is from a shared library, we
-     need to create the dynamic sections.
-
-     FIXME: What if abfd->xvec != info->hash->creator?  We may want to
-     be able to link Linux a.out and ELF objects together, but serious
-     confusion is possible.  */
-
-  insert = false;
-
-  if (! info->relocateable
-      && linux_hash_table (info)->dynobj == NULL
-      && strcmp (name, SHARABLE_CONFLICTS) == 0
-      && (flags & BSF_CONSTRUCTOR) != 0
-      && abfd->xvec == info->hash->creator)
-    {
-      if (! linux_link_create_dynamic_sections (abfd, info))
-       return false;
-      linux_hash_table (info)->dynobj = abfd;
-      insert = true;
-    }
-
-  if (bfd_is_abs_section (section)
-      && abfd->xvec == info->hash->creator)
-    {
-      h = linux_link_hash_lookup (linux_hash_table (info), name, false,
-                                 false, false);
-      if (h != NULL
-         && (h->root.root.type == bfd_link_hash_defined
-             || h->root.root.type == bfd_link_hash_defweak))
-       {
-         struct fixup *f;
-
-         if (hashp != NULL)
-           *hashp = (struct bfd_link_hash_entry *) h;
-
-         f = new_fixup (info, h, value, ! IS_PLT_SYM (name));
-         if (f == NULL)
-           return false;
-         f->jump = IS_PLT_SYM (name);
-
-         return true;
-       }
-    }
-
-  /* Do the usual procedure for adding a symbol.  */
-  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
-                                         value, string, copy, collect,
-                                         hashp))
-    return false;
-
-  /* Insert a pointer to our table in the set vector.  The dynamic
-     linker requires this information */
-  if (insert)
-    {
-      asection *s;
-
-      /* Here we do our special thing to add the pointer to the
-        dynamic section in the SHARABLE_CONFLICTS set vector.  */
-      s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-                                  ".linux-dynamic");
-      BFD_ASSERT (s != NULL);
-
-      if (! (_bfd_generic_link_add_one_symbol
-            (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS,
-             BSF_GLOBAL | BSF_CONSTRUCTOR, s, 0, NULL, false, false, NULL)))
-       return false;
-    }
-
-  return true;
-}
-
-/* We will crawl the hash table and come here for every global symbol.
-   We will examine each entry and see if there are indications that we
-   need to add a fixup.  There are two possible cases - one is where
-   you have duplicate definitions of PLT or GOT symbols - these will
-   have already been caught and added as "builtin" fixups.  If we find
-   that the corresponding non PLT/GOT symbol is also present, we
-   convert it to a regular fixup instead.
-
-   This function is called via linux_link_hash_traverse.  */
-
-static boolean
-linux_tally_symbols (h, data)
-     struct linux_link_hash_entry *h;
-     PTR data;
-{
-  struct bfd_link_info *info = (struct bfd_link_info *) data;
-  struct fixup *f, *f1;
-  int is_plt;
-  struct linux_link_hash_entry *h1, *h2;
-  boolean exists;
-
-  if (h->root.root.type == bfd_link_hash_undefined
-      && strncmp (h->root.root.root.string, NEEDS_SHRLIB,
-                 sizeof NEEDS_SHRLIB - 1) == 0)
-    {
-      const char *name;
-      char *p;
-      char *alloc = NULL;
-
-      name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1;
-      p = strrchr (name, '_');
-      if (p != NULL)
-       alloc = (char *) bfd_malloc (strlen (name) + 1);
-
-      if (p == NULL || alloc == NULL)
-       (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"),
-                              name);
-      else
-       {
-         strcpy (alloc, name);
-         p = strrchr (alloc, '_');
-         *p++ = '\0';
-         (*_bfd_error_handler)
-           (_("Output file requires shared library `%s.so.%s'\n"),
-            alloc, p);
-         free (alloc);
-       }
-
-      abort ();
-    }
-
-  /* If this symbol is not a PLT/GOT, we do not even need to look at
-     it.  */
-  is_plt = IS_PLT_SYM (h->root.root.root.string);
-
-  if (is_plt || IS_GOT_SYM (h->root.root.root.string))
-    {
-      /* Look up this symbol twice.  Once just as a regular lookup,
-        and then again following all of the indirect links until we
-        reach a real symbol.  */
-      h1 = linux_link_hash_lookup (linux_hash_table (info),
-                                  (h->root.root.root.string
-                                   + sizeof PLT_REF_PREFIX - 1),
-                                  false, false, true);
-      /* h2 does not follow indirect symbols. */
-      h2 = linux_link_hash_lookup (linux_hash_table (info),
-                                  (h->root.root.root.string
-                                   + sizeof PLT_REF_PREFIX - 1),
-                                  false, false, false);
-
-      /* The real symbol must exist but if it is also an ABS symbol,
-        there is no need to have a fixup.  This is because they both
-        came from the same library.  If on the other hand, we had to
-        use an indirect symbol to get to the real symbol, we add the
-        fixup anyway, since there are cases where these symbols come
-        from different shared libraries */
-      if (h1 != NULL
-         && (((h1->root.root.type == bfd_link_hash_defined
-               || h1->root.root.type == bfd_link_hash_defweak)
-              && ! bfd_is_abs_section (h1->root.root.u.def.section))
-             || h2->root.root.type == bfd_link_hash_indirect))
-       {
-         /* See if there is a "builtin" fixup already present
-            involving this symbol.  If so, convert it to a regular
-            fixup.  In the end, this relaxes some of the requirements
-            about the order of performing fixups.  */
-         exists = false;
-         for (f1 = linux_hash_table (info)->fixup_list;
-              f1 != NULL;
-              f1 = f1->next)
-           {
-             if ((f1->h != h && f1->h != h1)
-                 || (! f1->builtin && ! f1->jump))
-               continue;
-             if (f1->h == h1)
-              exists = true;
-             if (! exists
-                 && bfd_is_abs_section (h->root.root.u.def.section))
-               {
-                 f = new_fixup (info, h1, f1->h->root.root.u.def.value, 0);
-                 f->jump = is_plt;
-               }
-             f1->h = h1;
-             f1->jump = is_plt;
-             f1->builtin = 0;
-             exists = true;
-           }
-         if (! exists
-             && bfd_is_abs_section (h->root.root.u.def.section))
-           {
-             f = new_fixup (info, h1, h->root.root.u.def.value, 0);
-             if (f == NULL)
-               {
-                 /* FIXME: No way to return error.  */
-                 abort ();
-               }
-             f->jump = is_plt;
-           }
-       }
-
-      /* Quick and dirty way of stripping these symbols from the
-        symtab. */
-      if (bfd_is_abs_section (h->root.root.u.def.section))
-       h->root.written = true;
-    }
-
-  return true;
-}
-
-/* This is called to set the size of the .linux-dynamic section is.
-   It is called by the Linux linker emulation before_allocation
-   routine.  We have finished reading all of the input files, and now
-   we just scan the hash tables to find out how many additional fixups
-   are required.  */
-
-boolean
-bfd_sparclinux_size_dynamic_sections (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  struct fixup *f;
-  asection *s;
-
-  if (output_bfd->xvec != &MY(vec))
-    return true;
-
-  /* First find the fixups... */
-  linux_link_hash_traverse (linux_hash_table (info),
-                           linux_tally_symbols,
-                           (PTR) info);
-
-  /* If there are builtin fixups, leave room for a marker.  This is
-     used by the dynamic linker so that it knows that all that follow
-     are builtin fixups instead of regular fixups.  */
-  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-    {
-      if (f->builtin)
-       {
-         ++linux_hash_table (info)->fixup_count;
-         ++linux_hash_table (info)->local_builtins;
-         break;
-       }
-    }
-
-  if (linux_hash_table (info)->dynobj == NULL)
-    {
-      if (linux_hash_table (info)->fixup_count > 0)
-      abort ();
-      return true;
-    }
-
-  /* Allocate memory for our fixup table.  We will fill it in later.  */
-  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-                              ".linux-dynamic");
-  if (s != NULL)
-    {
-      s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8;
-      s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
-      if (s->contents == NULL)
-       return false;
-      memset (s->contents, 0, (size_t) s->_raw_size);
-    }
-
-  return true;
-}
-
-/* We come here once we are ready to actually write the fixup table to
-   the output file.  Scan the fixup tables and so forth and generate
-   the stuff we need.  */
-
-static boolean
-linux_finish_dynamic_link (output_bfd, info)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-{
-  asection *s, *os, *is;
-  bfd_byte *fixup_table;
-  struct linux_link_hash_entry *h;
-  struct fixup *f;
-  unsigned int new_addr;
-  int section_offset;
-  unsigned int fixups_written;
-
-  if (linux_hash_table (info)->dynobj == NULL)
-    return true;
-
-  s = bfd_get_section_by_name (linux_hash_table (info)->dynobj,
-                              ".linux-dynamic");
-  BFD_ASSERT (s != NULL);
-  os = s->output_section;
-  fixups_written = 0;
-
-#ifdef LINUX_LINK_DEBUG
-  printf ("Fixup table file offset: %x  VMA: %x\n",
-         os->filepos + s->output_offset,
-         os->vma + s->output_offset);
-#endif
-
-  fixup_table = s->contents;
-  bfd_put_32 (output_bfd, linux_hash_table (info)->fixup_count, fixup_table);
-  fixup_table += 4;
-
-  /* Fill in fixup table.  */
-  for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-    {
-      if (f->builtin)
-       continue;
-
-      if (f->h->root.root.type != bfd_link_hash_defined
-         && f->h->root.root.type != bfd_link_hash_defweak)
-       {
-         (*_bfd_error_handler)
-           (_("Symbol %s not defined for fixups\n"),
-            f->h->root.root.root.string);
-         continue;
-       }
-
-      is = f->h->root.root.u.def.section;
-      section_offset = is->output_section->vma + is->output_offset;
-      new_addr = f->h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-      printf ("Fixup(%d) %s: %x %x\n",f->jump, f->h->root.root.string,
-             new_addr, f->value);
-#endif
-
-      if (f->jump)
-       {
-         /* Relative address */
-         new_addr = new_addr - (f->value + 5);
-	 bfd_put_32 (output_bfd, new_addr, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, f->value + 1, fixup_table);
-         fixup_table += 4;
-       }
-      else
-       {
-         bfd_put_32 (output_bfd, new_addr, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, f->value, fixup_table);
-         fixup_table += 4;
-       }
-      ++fixups_written;
-    }
-
-  if (linux_hash_table (info)->local_builtins != 0)
-    {
-      /* Special marker so we know to switch to the other type of fixup */
-      bfd_put_32 (output_bfd, 0, fixup_table);
-      fixup_table += 4;
-      bfd_put_32 (output_bfd, 0, fixup_table);
-      fixup_table += 4;
-      ++fixups_written;
-      for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next)
-       {
-         if (! f->builtin)
-           continue;
-
-         if (f->h->root.root.type != bfd_link_hash_defined
-             && f->h->root.root.type != bfd_link_hash_defweak)
-           {
-             (*_bfd_error_handler)
-               (_("Symbol %s not defined for fixups\n"),
-                f->h->root.root.root.string);
-             continue;
-           }
-
-         is = f->h->root.root.u.def.section;
-         section_offset = is->output_section->vma + is->output_offset;
-         new_addr = f->h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-         printf ("Fixup(B) %s: %x %x\n", f->h->root.root.string,
-                 new_addr, f->value);
-#endif
-
-         bfd_put_32 (output_bfd, new_addr, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, f->value, fixup_table);
-         fixup_table += 4;
-         ++fixups_written;
-       }
-  }
-
-  if (linux_hash_table (info)->fixup_count != fixups_written)
-    {
-      (*_bfd_error_handler) (_("Warning: fixup count mismatch\n"));
-      while (linux_hash_table (info)->fixup_count > fixups_written)
-       {
-         bfd_put_32 (output_bfd, 0, fixup_table);
-         fixup_table += 4;
-         bfd_put_32 (output_bfd, 0, fixup_table);
-         fixup_table += 4;
-         ++fixups_written;
-       }
-    }
-
-  h = linux_link_hash_lookup (linux_hash_table (info),
-                             "__BUILTIN_FIXUPS__",
-                             false, false, false);
-
-  if (h != NULL
-      && (h->root.root.type == bfd_link_hash_defined
-         || h->root.root.type == bfd_link_hash_defweak))
-    {
-      is = h->root.root.u.def.section;
-      section_offset = is->output_section->vma + is->output_offset;
-      new_addr = h->root.root.u.def.value + section_offset;
-
-#ifdef LINUX_LINK_DEBUG
-      printf ("Builtin fixup table at %x\n", new_addr);
-#endif
-
-      bfd_put_32 (output_bfd, new_addr, fixup_table);
-    }
-  else
-    bfd_put_32 (output_bfd, 0, fixup_table);
-
-  if (bfd_seek (output_bfd, os->filepos + s->output_offset, SEEK_SET) != 0)
-    return false;
-
-  if (bfd_write ((PTR) s->contents, 1, s->_raw_size, output_bfd)
-      != s->_raw_size)
-    return false;
-
-  return true;
-}
-
-#define MY_bfd_link_hash_table_create linux_link_hash_table_create
-#define MY_add_one_symbol linux_add_one_symbol
-#define MY_finish_dynamic_link linux_finish_dynamic_link
-
-#define MY_zmagic_contiguous 1
-
-#include "aout-target.h"
diff --git a/bfd/sparclynx.c b/bfd/sparclynx.c
deleted file mode 100644
index dbfcae55cbe..00000000000
--- a/bfd/sparclynx.c
+++ /dev/null
@@ -1,266 +0,0 @@
-/* BFD support for Sparc binaries under LynxOS.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 97, 1998
-   Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#if 0
-#define BYTES_IN_WORD 4
-#define N_SHARED_LIB(x) 0
-
-#define TEXT_START_ADDR 0
-#define TARGET_PAGE_SIZE 4096
-#define SEGMENT_SIZE TARGET_PAGE_SIZE
-#define DEFAULT_ARCH bfd_arch_sparc
-
-#endif
-
-#define MY(OP) CAT(sparclynx_aout_,OP)
-#define TARGETNAME "a.out-sparc-lynx"
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-
-#include "aout/sun4.h"
-#include "libaout.h"		/* BFD a.out internal data structures */
-
-#include "aout/aout64.h"
-#include "aout/stab_gnu.h"
-#include "aout/ar.h"
-
-/* This is needed to reject a NewsOS file, e.g. in
-   gdb/testsuite/gdb.t10/crossload.exp. <kingdon@cygnus.com>
-   I needed to add M_UNKNOWN to recognize a 68000 object, so this will
-   probably no longer reject a NewsOS object.  <ian@cygnus.com>. */
-#define MACHTYPE_OK(mtype) ((mtype) == M_UNKNOWN \
-			    || (mtype) == M_68010 \
-			    || (mtype) == M_68020 \
-			    || (mtype) == M_SPARC)
-
-/*
-The file @code{aoutf1.h} contains the code for BFD's
-a.out back end. Control over the generated back end is given by these
-two preprocessor names:
-@table @code
-@item ARCH_SIZE
-This value should be either 32 or 64, depending upon the size of an
-int in the target format. It changes the sizes of the structs which
-perform the memory/disk mapping of structures.
-
-The 64 bit backend may only be used if the host compiler supports 64
-ints (eg long long with gcc), by defining the name @code{BFD_HOST_64_BIT} in @code{bfd.h}.
-With this name defined, @emph{all} bfd operations are performed with 64bit
-arithmetic, not just those to a 64bit target.
-
-@item TARGETNAME
-The name put into the target vector.
-@item
-@end table
-
-*/
-
-/*SUPPRESS558*/
-/*SUPPRESS529*/
-
-void
-NAME(lynx,set_arch_mach) (abfd, machtype)
-     bfd *abfd;
-     int machtype;
-{
-  /* Determine the architecture and machine type of the object file.  */
-  enum bfd_architecture arch;
-  long machine;
-  switch (machtype)
-    {
-
-    case M_UNKNOWN:
-      /* Some Sun3s make magic numbers without cpu types in them, so
-	 we'll default to the 68000. */
-      arch = bfd_arch_m68k;
-      machine = bfd_mach_m68000;
-      break;
-
-    case M_68010:
-    case M_HP200:
-      arch = bfd_arch_m68k;
-      machine = bfd_mach_m68010;
-      break;
-
-    case M_68020:
-    case M_HP300:
-      arch = bfd_arch_m68k;
-      machine = bfd_mach_m68020;
-      break;
-
-    case M_SPARC:
-      arch = bfd_arch_sparc;
-      machine = 0;
-      break;
-
-    case M_386:
-    case M_386_DYNIX:
-      arch = bfd_arch_i386;
-      machine = 0;
-      break;
-
-    case M_29K:
-      arch = bfd_arch_a29k;
-      machine = 0;
-      break;
-
-    case M_HPUX:
-      arch = bfd_arch_m68k;
-      machine = 0;
-      break;
-
-    default:
-      arch = bfd_arch_obscure;
-      machine = 0;
-      break;
-    }
-  bfd_set_arch_mach (abfd, arch, machine);
-}
-
-#define SET_ARCH_MACH(ABFD, EXEC) \
-  NAME(lynx,set_arch_mach)(ABFD, N_MACHTYPE (EXEC)); \
-  choose_reloc_size(ABFD);
-
-/* Determine the size of a relocation entry, based on the architecture */
-static void
-choose_reloc_size (abfd)
-     bfd *abfd;
-{
-  switch (bfd_get_arch (abfd))
-    {
-    case bfd_arch_sparc:
-    case bfd_arch_a29k:
-      obj_reloc_entry_size (abfd) = RELOC_EXT_SIZE;
-      break;
-    default:
-      obj_reloc_entry_size (abfd) = RELOC_STD_SIZE;
-      break;
-    }
-}
-
-/* Write an object file in LynxOS format.
-  Section contents have already been written.  We write the
-  file header, symbols, and relocation.  */
-
-static boolean
-NAME(aout,sparclynx_write_object_contents) (abfd)
-     bfd *abfd;
-{
-  struct external_exec exec_bytes;
-  struct internal_exec *execp = exec_hdr (abfd);
-
-  /* Magic number, maestro, please!  */
-  switch (bfd_get_arch (abfd))
-    {
-    case bfd_arch_m68k:
-      switch (bfd_get_mach (abfd))
-	{
-	case bfd_mach_m68010:
-	  N_SET_MACHTYPE (*execp, M_68010);
-	  break;
-	default:
-	case bfd_mach_m68020:
-	  N_SET_MACHTYPE (*execp, M_68020);
-	  break;
-	}
-      break;
-    case bfd_arch_sparc:
-      N_SET_MACHTYPE (*execp, M_SPARC);
-      break;
-    case bfd_arch_i386:
-      N_SET_MACHTYPE (*execp, M_386);
-      break;
-    case bfd_arch_a29k:
-      N_SET_MACHTYPE (*execp, M_29K);
-      break;
-    default:
-      N_SET_MACHTYPE (*execp, M_UNKNOWN);
-    }
-
-  choose_reloc_size (abfd);
-
-  N_SET_FLAGS (*execp, aout_backend_info (abfd)->exec_hdr_flags);
-
-  WRITE_HEADERS (abfd, execp);
-
-  return true;
-}
-
-#define MY_set_sizes sparclynx_set_sizes
-static boolean
-sparclynx_set_sizes (abfd)
-     bfd *abfd;
-{
-  switch (bfd_get_arch (abfd))
-    {
-    default:
-      return false;
-    case bfd_arch_sparc:
-      adata (abfd).page_size = 0x2000;
-      adata (abfd).segment_size = 0x2000;
-      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
-    case bfd_arch_m68k:
-      adata (abfd).page_size = 0x2000;
-      adata (abfd).segment_size = 0x20000;
-      adata (abfd).exec_bytes_size = EXEC_BYTES_SIZE;
-      return true;
-    }
-}
-
-static CONST struct aout_backend_data sparclynx_aout_backend =
-{
-  0, 1, 0, 1, 0, sparclynx_set_sizes, 0,
-  0,				/* add_dynamic_symbols */
-  0,				/* add_one_symbol */
-  0,				/* link_dynamic_object */
-  0,				/* write_dynamic_symbol */
-  0,				/* check_dynamic_reloc */
-  0				/* finish_dynamic_link */
-};
-
-
-#define MY_bfd_debug_info_start		bfd_void
-#define MY_bfd_debug_info_end		bfd_void
-#define MY_bfd_debug_info_accumulate	\
-			(void (*) PARAMS ((bfd *, struct sec *))) bfd_void
-
-#define MY_write_object_contents	NAME(aout,sparclynx_write_object_contents)
-#define MY_backend_data			&sparclynx_aout_backend
-
-#define TARGET_IS_BIG_ENDIAN_P
-
-#ifdef LYNX_CORE
-
-char *lynx_core_file_failing_command ();
-int lynx_core_file_failing_signal ();
-boolean lynx_core_file_matches_executable_p ();
-const bfd_target *lynx_core_file_p ();
-
-#define	MY_core_file_failing_command lynx_core_file_failing_command
-#define	MY_core_file_failing_signal lynx_core_file_failing_signal
-#define	MY_core_file_matches_executable_p lynx_core_file_matches_executable_p
-#define	MY_core_file_p lynx_core_file_p
-
-#endif /* LYNX_CORE */
-
-#include "aout-target.h"
diff --git a/bfd/sparcnetbsd.c b/bfd/sparcnetbsd.c
deleted file mode 100644
index 4277bb8914d..00000000000
--- a/bfd/sparcnetbsd.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/* BFD back-end for NetBSD/sparc a.out-ish binaries.
-   Copyright (C) 1990, 91, 92, 94, 95, 97, 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define BYTES_IN_WORD	4
-#define TARGET_IS_BIG_ENDIAN_P
-
-/* SPARC chips use either 4K or 8K pages, but object files always
-   assume 8K page alignment so they will work on either one. */
-#define TARGET_PAGE_SIZE 0x2000
-
-#define DEFAULT_ARCH	bfd_arch_sparc
-#define DEFAULT_MID 	M_SPARC_NETBSD
-
-#define MY(OP) CAT(sparcnetbsd_,OP)
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME "a.out-sparc-netbsd"
-
-#include "netbsd.h"
diff --git a/bfd/srec.c b/bfd/srec.c
deleted file mode 100644
index 70d2f96175e..00000000000
--- a/bfd/srec.c
+++ /dev/null
@@ -1,1377 +0,0 @@
-/* BFD back-end for s-record objects.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
-   Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SUBSECTION
-	S-Record handling
-
-DESCRIPTION
-	
-	Ordinary S-Records cannot hold anything but addresses and
-	data, so that's all that we implement.
-
-	The only interesting thing is that S-Records may come out of
-	order and there is no header, so an initial scan is required
-	to discover the minimum and maximum addresses used to create
-	the vma and size of the only section we create.  We
-	arbitrarily call this section ".text".
-
-	When bfd_get_section_contents is called the file is read
-	again, and this time the data is placed into a bfd_alloc'd
-	area.
-
-	Any number of sections may be created for output, we save them
-	up and output them when it's time to close the bfd.
-
-	An s record looks like:
-	
-EXAMPLE
-	S<type><length><address><data><checksum>
-	
-DESCRIPTION
-	Where
-	o length
-	is the number of bytes following upto the checksum. Note that
-	this is not the number of chars following, since it takes two
-	chars to represent a byte.
-	o type
-	is one of:
-	0) header record
-	1) two byte address data record
-	2) three byte address data record
-	3) four byte address data record
-	7) four byte address termination record
-	8) three byte address termination record
-	9) two byte address termination record
-	
-	o address
-	is the start address of the data following, or in the case of
-	a termination record, the start address of the image
-	o data
-	is the data.
-	o checksum
-	is the sum of all the raw byte data in the record, from the length
-	upwards, modulo 256 and subtracted from 255.
-
-
-SUBSECTION
-	Symbol S-Record handling
-
-DESCRIPTION
-	Some ICE equipment understands an addition to the standard
-	S-Record format; symbols and their addresses can be sent
-	before the data.
-
-	The format of this is:
-	($$ <modulename>
-		(<space> <symbol> <address>)*)
-	$$
-
-	so a short symbol table could look like:
-
-EXAMPLE
-	$$ flash.x
-	$$ flash.c
-	  _port6 $0
-	  _delay $4
-	  _start $14
-	  _etext $8036
-	  _edata $8036
- 	  _end $8036
-	$$
-
-DESCRIPTION
-	We allow symbols to be anywhere in the data stream - the module names
-	are always ignored.
-		
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libiberty.h"
-#include <ctype.h>
-
-static void srec_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static void srec_print_symbol
- PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static void srec_init PARAMS ((void));
-static boolean srec_mkobject PARAMS ((bfd *));
-static int srec_get_byte PARAMS ((bfd *, boolean *));
-static void srec_bad_byte PARAMS ((bfd *, unsigned int, int, boolean));
-static boolean srec_scan PARAMS ((bfd *));
-static const bfd_target *srec_object_p PARAMS ((bfd *));
-static const bfd_target *symbolsrec_object_p PARAMS ((bfd *));
-static boolean srec_read_section PARAMS ((bfd *, asection *, bfd_byte *));
-
-static boolean srec_write_record PARAMS ((bfd *, int, bfd_vma,
-					  const bfd_byte *,
-					  const bfd_byte *));
-static boolean srec_write_header PARAMS ((bfd *));
-static boolean srec_write_symbols PARAMS ((bfd *));
-static boolean srec_new_symbol PARAMS ((bfd *, const char *, bfd_vma));
-static boolean srec_get_section_contents
-  PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static boolean srec_set_arch_mach
-  PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean srec_set_section_contents
-  PARAMS ((bfd *, sec_ptr, PTR, file_ptr, bfd_size_type));
-static boolean internal_srec_write_object_contents PARAMS ((bfd *, int));
-static boolean srec_write_object_contents PARAMS ((bfd *));
-static boolean symbolsrec_write_object_contents PARAMS ((bfd *));
-static int srec_sizeof_headers PARAMS ((bfd *, boolean));
-static asymbol *srec_make_empty_symbol PARAMS ((bfd *));
-static long srec_get_symtab_upper_bound PARAMS ((bfd *));
-static long srec_get_symtab PARAMS ((bfd *, asymbol **));
-
-/* Macros for converting between hex and binary. */
-
-static CONST char digs[] = "0123456789ABCDEF";
-
-#define NIBBLE(x) hex_value(x)
-#define HEX(buffer) ((NIBBLE((buffer)[0])<<4) + NIBBLE((buffer)[1]))
-#define TOHEX(d, x, ch) \
-	d[1] = digs[(x) & 0xf]; \
-	d[0] = digs[((x)>>4)&0xf]; \
-	ch += ((x) & 0xff);
-#define	ISHEX(x)  hex_p(x)
-
-/* Initialize by filling in the hex conversion array. */
-
-static void
-srec_init ()
-{
-  static boolean inited = false;
-
-  if (inited == false)
-    {
-      inited = true;
-      hex_init ();
-    }
-}
-
-/* The maximum number of bytes on a line is FF */
-#define MAXCHUNK 0xff
-/* The number of bytes we fit onto a line on output */
-#define CHUNK 21
-
-/* When writing an S-record file, the S-records can not be output as
-   they are seen.  This structure is used to hold them in memory.  */
-
-struct srec_data_list_struct
-{
-  struct srec_data_list_struct *next;
-  bfd_byte *data;
-  bfd_vma where;
-  bfd_size_type size;
-};
-
-typedef struct srec_data_list_struct srec_data_list_type;
-
-/* When scanning the S-record file, a linked list of srec_symbol
-   structures is built to represent the symbol table (if there is
-   one).  */
-
-struct srec_symbol
-{
-  struct srec_symbol *next;
-  const char *name;
-  bfd_vma val;
-};
-
-/* The S-record tdata information.  */
-
-typedef struct srec_data_struct
-  {
-    srec_data_list_type *head;
-    srec_data_list_type *tail;
-    unsigned int type;
-    struct srec_symbol *symbols;
-    struct srec_symbol *symtail;
-    asymbol *csymbols;
-  }
-tdata_type;
-
-static boolean srec_write_section PARAMS ((bfd *, tdata_type *,
-					   srec_data_list_type *));
-static boolean srec_write_terminator PARAMS ((bfd *, tdata_type *));
-
-/* Set up the S-record tdata information.  */
-
-static boolean
-srec_mkobject (abfd)
-     bfd *abfd;
-{
-  srec_init ();
-
-  if (abfd->tdata.srec_data == NULL)
-    {
-      tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
-      if (tdata == NULL)
-	return false;
-      abfd->tdata.srec_data = tdata;
-      tdata->type = 1;
-      tdata->head = NULL;
-      tdata->tail = NULL;
-      tdata->symbols = NULL;
-      tdata->symtail = NULL;
-      tdata->csymbols = NULL;
-    }
-
-  return true;
-}
-
-/* Read a byte from an S record file.  Set *ERRORPTR if an error
-   occurred.  Return EOF on error or end of file.  */
-
-static int
-srec_get_byte (abfd, errorptr)
-     bfd *abfd;
-     boolean *errorptr;
-{
-  bfd_byte c;
-
-  if (bfd_read (&c, 1, 1, abfd) != 1)
-    {
-      if (bfd_get_error () != bfd_error_file_truncated)
-	*errorptr = true;
-      return EOF;
-    }
-
-  return (int) (c & 0xff);
-}
-
-/* Report a problem in an S record file.  FIXME: This probably should
-   not call fprintf, but we really do need some mechanism for printing
-   error messages.  */
-
-static void
-srec_bad_byte (abfd, lineno, c, error)
-     bfd *abfd;
-     unsigned int lineno;
-     int c;
-     boolean error;
-{
-  if (c == EOF)
-    {
-      if (! error)
-	bfd_set_error (bfd_error_file_truncated);
-    }
-  else
-    {
-      char buf[10];
-
-      if (! isprint (c))
-	sprintf (buf, "\\%03o", (unsigned int) c);
-      else
-	{
-	  buf[0] = c;
-	  buf[1] = '\0';
-	}
-      (*_bfd_error_handler)
-	(_("%s:%d: Unexpected character `%s' in S-record file\n"),
-	 bfd_get_filename (abfd), lineno, buf);
-      bfd_set_error (bfd_error_bad_value);
-    }
-}
-
-/* Add a new symbol found in an S-record file.  */
-
-static boolean
-srec_new_symbol (abfd, name, val)
-     bfd *abfd;
-     const char *name;
-     bfd_vma val;
-{
-  struct srec_symbol *n;
-
-  n = (struct srec_symbol *) bfd_alloc (abfd, sizeof (struct srec_symbol));
-  if (n == NULL)
-    return false;
-
-  n->name = name;
-  n->val = val;
-
-  if (abfd->tdata.srec_data->symbols == NULL)
-    abfd->tdata.srec_data->symbols = n;
-  else
-    abfd->tdata.srec_data->symtail->next = n;
-  abfd->tdata.srec_data->symtail = n;
-  n->next = NULL;
-
-  ++abfd->symcount;
-
-  return true;
-}
-
-/* Read the S record file and turn it into sections.  We create a new
-   section for each contiguous set of bytes.  */
-
-static boolean
-srec_scan (abfd)
-     bfd *abfd;
-{
-  int c;
-  unsigned int lineno = 1;
-  boolean error = false;
-  bfd_byte *buf = NULL;
-  size_t bufsize = 0;
-  asection *sec = NULL;
-  char *symbuf = NULL;
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    goto error_return;
-
-  while ((c = srec_get_byte (abfd, &error)) != EOF)
-    {
-      /* We only build sections from contiguous S-records, so if this
-         is not an S-record, then stop building a section.  */
-      if (c != 'S' && c != '\r' && c != '\n')
-	sec = NULL;
-
-      switch (c)
-	{
-	default:
-	  srec_bad_byte (abfd, lineno, c, error);
-	  goto error_return;
-
-	case '\n':
-	  ++lineno;
-	  break;
-
-	case '\r':
-	  break;
-
-	case '$':
-	  /* Starting a module name, which we ignore.  */
-	  while ((c = srec_get_byte (abfd, &error)) != '\n'
-		 && c != EOF)
-	    ;
-	  if (c == EOF)
-	    {
-	      srec_bad_byte (abfd, lineno, c, error);
-	      goto error_return;
-	    }
-
-	  ++lineno;
-
-	  break;
-
-	case ' ':
-	  do
-	    {
-	      unsigned int alc;
-	      char *p, *symname;
-	      bfd_vma symval;
-
-	      /* Starting a symbol definition.  */
-	      while ((c = srec_get_byte (abfd, &error)) != EOF
-		     && (c == ' ' || c == '\t'))
-		;
-
-	      if (c == '\n' || c == '\r')
-		break;
-
-	      if (c == EOF)
-		{
-		  srec_bad_byte (abfd, lineno, c, error);
-		  goto error_return;
-		}
-
-	      alc = 10;
-	      symbuf = (char *) bfd_malloc (alc + 1);
-	      if (symbuf == NULL)
-		goto error_return;
-
-	      p = symbuf;
-
-	      *p++ = c;
-	      while ((c = srec_get_byte (abfd, &error)) != EOF
-		     && ! isspace (c))
-		{
-		  if ((unsigned int) (p - symbuf) >= alc)
-		    {
-		      char *n;
-
-		      alc *= 2;
-		      n = (char *) bfd_realloc (symbuf, alc + 1);
-		      if (n == NULL)
-			goto error_return;
-		      p = n + (p - symbuf);
-		      symbuf = n;
-		    }
-
-		  *p++ = c;
-		}
-
-	      if (c == EOF)
-		{
-		  srec_bad_byte (abfd, lineno, c, error);
-		  goto error_return;
-		}
-
-	      *p++ = '\0';
-	      symname = bfd_alloc (abfd, p - symbuf);
-	      if (symname == NULL)
-		goto error_return;
-	      strcpy (symname, symbuf);
-	      free (symbuf);
-	      symbuf = NULL;
-
-	      while ((c = srec_get_byte (abfd, &error)) != EOF
-		     && (c == ' ' || c == '\t'))
-		;
-	      if (c == EOF)
-		{
-		  srec_bad_byte (abfd, lineno, c, error);
-		  goto error_return;
-		}
-
-	      /* Skip a dollar sign before the hex value.  */
-	      if (c == '$')
-		{
-		  c = srec_get_byte (abfd, &error);
-		  if (c == EOF)
-		    {
-		      srec_bad_byte (abfd, lineno, c, error);
-		      goto error_return;
-		    }
-		}
-
-	      symval = 0;
-	      while (ISHEX (c))
-		{
-		  symval <<= 4;
-		  symval += NIBBLE (c);
-		  c = srec_get_byte (abfd, &error);
-		}
-
-	      if (! srec_new_symbol (abfd, symname, symval))
-		goto error_return;
-	    }
-	  while (c == ' ' || c == '\t');
-
-	  if (c == '\n')
-	    ++lineno;
-	  else if (c != '\r')
-	    {
-	      srec_bad_byte (abfd, lineno, c, error);
-	      goto error_return;
-	    }
-
-	  break;
-    
-	case 'S':
-	  {
-	    file_ptr pos;
-	    char hdr[3];
-	    unsigned int bytes;
-	    bfd_vma address;
-	    bfd_byte *data;
-
-	    /* Starting an S-record.  */
-
-	    pos = bfd_tell (abfd) - 1;
-
-	    if (bfd_read (hdr, 1, 3, abfd) != 3)
-	      goto error_return;
-
-	    if (! ISHEX (hdr[1]) || ! ISHEX (hdr[2]))
-	      {
-		if (! ISHEX (hdr[1]))
-		  c = hdr[1];
-		else
-		  c = hdr[2];
-		srec_bad_byte (abfd, lineno, c, error);
-		goto error_return;
-	      }
-
-	    bytes = HEX (hdr + 1);
-	    if (bytes * 2 > bufsize)
-	      {
-		if (buf != NULL)
-		  free (buf);
-		buf = (bfd_byte *) bfd_malloc (bytes * 2);
-		if (buf == NULL)
-		  goto error_return;
-		bufsize = bytes * 2;
-	      }
-
-	    if (bfd_read (buf, 1, bytes * 2, abfd) != bytes * 2)
-	      goto error_return;
-
-	    /* Ignore the checksum byte.  */
-	    --bytes;
-
-	    address = 0;
-	    data = buf;
-	    switch (hdr[0])
-	      {
-	      case '0':
-	      case '5':
-		/* Prologue--ignore the file name, but stop building a
-                   section at this point.  */
-		sec = NULL;
-		break;
-
-	      case '3':
-		address = HEX (data);
-		data += 2;
-		--bytes;
-		/* Fall through.  */
-	      case '2':
-		address = (address << 8) | HEX (data);
-		data += 2;
-		--bytes;
-		/* Fall through.  */
-	      case '1':
-		address = (address << 8) | HEX (data);
-		data += 2;
-		address = (address << 8) | HEX (data);
-		data += 2;
-		bytes -= 2;
-
-		if (sec != NULL
-		    && sec->vma + sec->_raw_size == address)
-		  {
-		    /* This data goes at the end of the section we are
-                       currently building.  */
-		    sec->_raw_size += bytes;
-		  }
-		else
-		  {
-		    char secbuf[20];
-		    char *secname;
-
-		    sprintf (secbuf, ".sec%d", bfd_count_sections (abfd) + 1);
-		    secname = (char *) bfd_alloc (abfd, strlen (secbuf) + 1);
-		    strcpy (secname, secbuf);
-		    sec = bfd_make_section (abfd, secname);
-		    if (sec == NULL)
-		      goto error_return;
-		    sec->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
-		    sec->vma = address;
-		    sec->lma = address;
-		    sec->_raw_size = bytes;
-		    sec->filepos = pos;
-		  }
-
-		break;
-
-	      case '7':
-		address = HEX (data);
-		data += 2;
-		/* Fall through.  */
-	      case '8':
-		address = (address << 8) | HEX (data);
-		data += 2;
-		/* Fall through.  */
-	      case '9':
-		address = (address << 8) | HEX (data);
-		data += 2;
-		address = (address << 8) | HEX (data);
-		data += 2;
-
-		/* This is a termination record.  */
-		abfd->start_address = address;
-
-		if (buf != NULL)
-		  free (buf);
-
-		return true;
-	      }
-	  }
-	  break;
-	}
-    }
-
-  if (error)
-    goto error_return;
-
-  if (buf != NULL)
-    free (buf);
-
-  return true;
-
- error_return:
-  if (symbuf != NULL)
-    free (symbuf);
-  if (buf != NULL)
-    free (buf);
-  return false;
-}
-
-/* Check whether an existing file is an S-record file.  */
-
-static const bfd_target *
-srec_object_p (abfd)
-     bfd *abfd;
-{
-  bfd_byte b[4];
-
-  srec_init ();
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || bfd_read (b, 1, 4, abfd) != 4)
-    return NULL;
-
-  if (b[0] != 'S' || !ISHEX (b[1]) || !ISHEX (b[2]) || !ISHEX (b[3]))
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (! srec_mkobject (abfd)
-      || ! srec_scan (abfd))
-    return NULL;
-
-  if (abfd->symcount > 0)
-    abfd->flags |= HAS_SYMS;
-
-  return abfd->xvec;
-}
-
-/* Check whether an existing file is an S-record file with symbols.  */
-
-static const bfd_target *
-symbolsrec_object_p (abfd)
-     bfd *abfd;
-{
-  char b[2];
-
-  srec_init ();
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || bfd_read (b, 1, 2, abfd) != 2)
-    return NULL;
-
-  if (b[0] != '$' || b[1] != '$')
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (! srec_mkobject (abfd)
-      || ! srec_scan (abfd))
-    return NULL;
-
-  if (abfd->symcount > 0)
-    abfd->flags |= HAS_SYMS;
-
-  return abfd->xvec;
-}
-
-/* Read in the contents of a section in an S-record file.  */
-
-static boolean
-srec_read_section (abfd, section, contents)
-     bfd *abfd;
-     asection *section;
-     bfd_byte *contents;
-{
-  int c;
-  bfd_size_type sofar = 0;
-  boolean error = false;
-  bfd_byte *buf = NULL;
-  size_t bufsize = 0;
-
-  if (bfd_seek (abfd, section->filepos, SEEK_SET) != 0)
-    goto error_return;
-
-  while ((c = srec_get_byte (abfd, &error)) != EOF)
-    {
-      bfd_byte hdr[3];
-      unsigned int bytes;
-      bfd_vma address;
-      bfd_byte *data;
-
-      if (c == '\r' || c == '\n')
-	continue;
-
-      /* This is called after srec_scan has already been called, so we
-         ought to know the exact format.  */
-      BFD_ASSERT (c == 'S');
-
-      if (bfd_read (hdr, 1, 3, abfd) != 3)
-	goto error_return;
-
-      BFD_ASSERT (ISHEX (hdr[1]) && ISHEX (hdr[2]));
-
-      bytes = HEX (hdr + 1);
-
-      if (bytes * 2 > bufsize)
-	{
-	  if (buf != NULL)
-	    free (buf);
-	  buf = (bfd_byte *) bfd_malloc (bytes * 2);
-	  if (buf == NULL)
-	    goto error_return;
-	  bufsize = bytes * 2;
-	}
-
-      if (bfd_read (buf, 1, bytes * 2, abfd) != bytes * 2)
-	goto error_return;
-
-      address = 0;
-      data = buf;
-      switch (hdr[0])
-	{
-	default:
-	  BFD_ASSERT (sofar == section->_raw_size);
-	  if (buf != NULL)
-	    free (buf);
-	  return true;
-
-	case '3':
-	  address = HEX (data);
-	  data += 2;
-	  --bytes;
-	  /* Fall through.  */
-	case '2':
-	  address = (address << 8) | HEX (data);
-	  data += 2;
-	  --bytes;
-	  /* Fall through.  */
-	case '1':
-	  address = (address << 8) | HEX (data);
-	  data += 2;
-	  address = (address << 8) | HEX (data);
-	  data += 2;
-	  bytes -= 2;
-
-	  if (address != section->vma + sofar)
-	    {
-	      /* We've come to the end of this section.  */
-	      BFD_ASSERT (sofar == section->_raw_size);
-	      if (buf != NULL)
-		free (buf);
-	      return true;
-	    }
-
-	  /* Don't consider checksum.  */
-	  --bytes;
-
-	  while (bytes-- != 0)
-	    {
-	      contents[sofar] = HEX (data);
-	      data += 2;
-	      ++sofar;
-	    }
-
-	  break;
-	}
-    }
-
-  if (error)
-    goto error_return;
-
-  BFD_ASSERT (sofar == section->_raw_size);
-
-  if (buf != NULL)
-    free (buf);
-
-  return true;
-
- error_return:
-  if (buf != NULL)
-    free (buf);
-  return false;
-}
-
-/* Get the contents of a section in an S-record file.  */
-
-static boolean
-srec_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (section->used_by_bfd == NULL)
-    {
-      section->used_by_bfd = bfd_alloc (abfd, section->_raw_size);
-      if (section->used_by_bfd == NULL
-	  && section->_raw_size != 0)
-	return false;
-
-      if (! srec_read_section (abfd, section, section->used_by_bfd))
-	return false;
-    }
-
-  memcpy (location, (bfd_byte *) section->used_by_bfd + offset,
-	  (size_t) count);
-
-  return true;
-}
-
-/* Set the architecture.  We accept an unknown architecture here.  */
-
-static boolean
-srec_set_arch_mach (abfd, arch, mach)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long mach;
-{
-  if (arch == bfd_arch_unknown)
-    {
-      abfd->arch_info = &bfd_default_arch_struct;
-      return true;
-    }
-  return bfd_default_set_arch_mach (abfd, arch, mach);
-}
-
-/* we have to save up all the Srecords for a splurge before output */
-
-static boolean
-srec_set_section_contents (abfd, section, location, offset, bytes_to_do)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type bytes_to_do;
-{
-  tdata_type *tdata = abfd->tdata.srec_data;
-  register srec_data_list_type *entry;
-
-  entry = ((srec_data_list_type *)
-	   bfd_alloc (abfd, sizeof (srec_data_list_type)));
-  if (entry == NULL)
-    return false;
-
-  if (bytes_to_do
-      && (section->flags & SEC_ALLOC)
-      && (section->flags & SEC_LOAD))
-    {
-      bfd_byte *data = (bfd_byte *) bfd_alloc (abfd, bytes_to_do);
-      if (data == NULL)
-	return false;
-      memcpy ((PTR) data, location, (size_t) bytes_to_do);
-
-      if ((section->lma + offset + bytes_to_do - 1) <= 0xffff)
-	{
-
-	}
-      else if ((section->lma + offset + bytes_to_do - 1) <= 0xffffff
-	       && tdata->type <= 2)
-	{
-	  tdata->type = 2;
-	}
-      else
-	{
-	  tdata->type = 3;
-	}
-
-      entry->data = data;
-      entry->where = section->lma + offset;
-      entry->size = bytes_to_do;
-
-      /* Sort the records by address.  Optimize for the common case of
-         adding a record to the end of the list.  */
-      if (tdata->tail != NULL
-	  && entry->where >= tdata->tail->where)
-	{
-	  tdata->tail->next = entry;
-	  entry->next = NULL;
-	  tdata->tail = entry;
-	}
-      else
-	{
-	  register srec_data_list_type **look;
-
-	  for (look = &tdata->head;
-	       *look != NULL && (*look)->where < entry->where;
-	       look = &(*look)->next)
-	    ;
-	  entry->next = *look;
-	  *look = entry;
-	  if (entry->next == NULL)
-	    tdata->tail = entry;
-	}
-    }
-  return true;
-}
-
-/* Write a record of type, of the supplied number of bytes. The
-   supplied bytes and length don't have a checksum. That's worked out
-   here
-*/
-static boolean
-srec_write_record (abfd, type, address, data, end)
-     bfd *abfd;
-     int type;
-     bfd_vma address;
-     const bfd_byte *data;
-     const bfd_byte *end;
-{
-  char buffer[MAXCHUNK];
-  unsigned int check_sum = 0;
-  CONST bfd_byte *src = data;
-  char *dst = buffer;
-  char *length;
-  bfd_size_type wrlen;
-
-  *dst++ = 'S';
-  *dst++ = '0' + type;
-
-  length = dst;
-  dst += 2;			/* leave room for dst*/
-
-  switch (type)
-    {
-    case 3:
-    case 7:
-      TOHEX (dst, (address >> 24), check_sum);
-      dst += 2;
-    case 8:
-    case 2:
-      TOHEX (dst, (address >> 16), check_sum);
-      dst += 2;
-    case 9:
-    case 1:
-    case 0:
-      TOHEX (dst, (address >> 8), check_sum);
-      dst += 2;
-      TOHEX (dst, (address), check_sum);
-      dst += 2;
-      break;
-
-    }
-  for (src = data; src < end; src++)
-    {
-      TOHEX (dst, *src, check_sum);
-      dst += 2;
-    }
-
-  /* Fill in the length */
-  TOHEX (length, (dst - length) / 2, check_sum);
-  check_sum &= 0xff;
-  check_sum = 255 - check_sum;
-  TOHEX (dst, check_sum, check_sum);
-  dst += 2;
-
-  *dst++ = '\r';
-  *dst++ = '\n';
-  wrlen = dst - buffer;
-  if (bfd_write ((PTR) buffer, 1, wrlen, abfd) != wrlen)
-    return false;
-  return true;
-}
-
-
-
-static boolean
-srec_write_header (abfd)
-     bfd *abfd;
-{
-  bfd_byte buffer[MAXCHUNK];
-  bfd_byte *dst = buffer;
-  unsigned int i;
-
-  /* I'll put an arbitary 40 char limit on header size */
-  for (i = 0; i < 40 && abfd->filename[i]; i++)
-    {
-      *dst++ = abfd->filename[i];
-    }
-  return srec_write_record (abfd, 0, 0, buffer, dst);
-}
-
-static boolean
-srec_write_section (abfd, tdata, list)
-     bfd *abfd;
-     tdata_type *tdata;
-     srec_data_list_type *list;
-{
-  unsigned int bytes_written = 0;
-  bfd_byte *location = list->data;
-
-  while (bytes_written < list->size)
-    {
-      bfd_vma address;
-
-      unsigned int bytes_this_chunk = list->size - bytes_written;
-
-      if (bytes_this_chunk > CHUNK)
-	{
-	  bytes_this_chunk = CHUNK;
-	}
-
-      address = list->where + bytes_written;
-
-      if (! srec_write_record (abfd,
-			       tdata->type,
-			       address,
-			       location,
-			       location + bytes_this_chunk))
-	return false;
-
-      bytes_written += bytes_this_chunk;
-      location += bytes_this_chunk;
-    }
-
-  return true;
-}
-
-static boolean
-srec_write_terminator (abfd, tdata)
-     bfd *abfd;
-     tdata_type *tdata;
-{
-  bfd_byte buffer[2];
-
-  return srec_write_record (abfd, 10 - tdata->type,
-			    abfd->start_address, buffer, buffer);
-}
-
-
-
-static boolean
-srec_write_symbols (abfd)
-     bfd *abfd;
-{
-  char buffer[MAXCHUNK];
-  /* Dump out the symbols of a bfd */
-  int i;
-  int count = bfd_get_symcount (abfd);
-
-  if (count)
-    {
-      size_t len;
-      asymbol **table = bfd_get_outsymbols (abfd);
-      sprintf (buffer, "$$ %s\r\n", abfd->filename);
-
-      len = strlen (buffer);
-      if (bfd_write (buffer, len, 1, abfd) != len)
-	return false;
-
-      for (i = 0; i < count; i++)
-	{
-	  asymbol *s = table[i];
-	  if (! bfd_is_local_label (abfd, s)
-	      && (s->flags & BSF_DEBUGGING) == 0)
-	    {
-	      /* Just dump out non debug symbols */
-	      bfd_size_type l;
-	      char buf2[40], *p;
-
-	      sprintf_vma (buf2,
-			   s->value + s->section->output_section->lma
-			   + s->section->output_offset);
-	      p = buf2;
-	      while (p[0] == '0' && p[1] != 0)
-		p++;
-	      sprintf (buffer, "  %s $%s\r\n", s->name, p);
-	      l = strlen (buffer);
-	      if (bfd_write (buffer, l, 1, abfd) != l)
-		return false;
-	    }
-	}
-      sprintf (buffer, "$$ \r\n");
-      len = strlen (buffer);
-      if (bfd_write (buffer, len, 1, abfd) != len)
-	return false;
-    }
-
-  return true;
-}
-
-static boolean
-internal_srec_write_object_contents (abfd, symbols)
-     bfd *abfd;
-     int symbols;
-{
-  tdata_type *tdata = abfd->tdata.srec_data;
-  srec_data_list_type *list;
-
-  if (symbols)
-    {
-      if (! srec_write_symbols (abfd))
-	return false;
-    }
-
-  if (! srec_write_header (abfd))
-    return false;
-
-  /* Now wander though all the sections provided and output them */
-  list = tdata->head;
-
-  while (list != (srec_data_list_type *) NULL)
-    {
-      if (! srec_write_section (abfd, tdata, list))
-	return false;
-      list = list->next;
-    }
-  return srec_write_terminator (abfd, tdata);
-}
-
-static boolean
-srec_write_object_contents (abfd)
-     bfd *abfd;
-{
-  return internal_srec_write_object_contents (abfd, 0);
-}
-
-static boolean
-symbolsrec_write_object_contents (abfd)
-     bfd *abfd;
-{
-  return internal_srec_write_object_contents (abfd, 1);
-}
-
-/*ARGSUSED*/
-static int
-srec_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-{
-  return 0;
-}
-
-static asymbol *
-srec_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
-/* Return the amount of memory needed to read the symbol table.  */
-
-static long
-srec_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
-}
-
-/* Return the symbol table.  */
-
-static long
-srec_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  unsigned int symcount = bfd_get_symcount (abfd);
-  asymbol *csymbols;
-  unsigned int i;
-
-  csymbols = abfd->tdata.srec_data->csymbols;
-  if (csymbols == NULL)
-    {
-      asymbol *c;
-      struct srec_symbol *s;
-
-      csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol));
-      if (csymbols == NULL && symcount != 0)
-	return false;
-      abfd->tdata.srec_data->csymbols = csymbols;
-
-      for (s = abfd->tdata.srec_data->symbols, c = csymbols;
-	   s != NULL;
-	   s = s->next, ++c)
-	{
-	  c->the_bfd = abfd;
-	  c->name = s->name;
-	  c->value = s->val;
-	  c->flags = BSF_GLOBAL;
-	  c->section = bfd_abs_section_ptr;
-	  c->udata.p = NULL;
-	}
-    }
-	
-  for (i = 0; i < symcount; i++)
-    *alocation++ = csymbols++;
-  *alocation = NULL;
-
-  return symcount;
-}
-
-/*ARGSUSED*/
-static void
-srec_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-/*ARGSUSED*/
-static void
-srec_print_symbol (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) afile;
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-    default:
-      bfd_print_symbol_vandf ((PTR) file, symbol);
-      fprintf (file, " %-5s %s",
-	       symbol->section->name,
-	       symbol->name);
-
-    }
-}
-
-#define	srec_close_and_cleanup _bfd_generic_close_and_cleanup
-#define srec_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define srec_new_section_hook _bfd_generic_new_section_hook
-
-#define srec_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define srec_get_lineno _bfd_nosymbols_get_lineno
-#define srec_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define srec_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define srec_read_minisymbols _bfd_generic_read_minisymbols
-#define srec_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define srec_get_reloc_upper_bound \
-  ((long (*) PARAMS ((bfd *, asection *))) bfd_0l)
-#define srec_canonicalize_reloc \
-  ((long (*) PARAMS ((bfd *, asection *, arelent **, asymbol **))) bfd_0l)
-#define srec_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define srec_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-#define srec_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define srec_bfd_relax_section bfd_generic_relax_section
-#define srec_bfd_gc_sections bfd_generic_gc_sections
-#define srec_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define srec_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define srec_bfd_final_link _bfd_generic_final_link
-#define srec_bfd_link_split_section _bfd_generic_link_split_section
-
-const bfd_target srec_vec =
-{
-  "srec",			/* name */
-  bfd_target_srec_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {
-    _bfd_dummy_target,
-    srec_object_p,		/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {
-    bfd_false,
-    srec_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    srec_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (srec),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (srec),
-  BFD_JUMP_TABLE_RELOCS (srec),
-  BFD_JUMP_TABLE_WRITE (srec),
-  BFD_JUMP_TABLE_LINK (srec),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
-
-
-
-const bfd_target symbolsrec_vec =
-{
-  "symbolsrec",			/* name */
-  bfd_target_srec_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {
-    _bfd_dummy_target,
-    symbolsrec_object_p,	/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {
-    bfd_false,
-    srec_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    symbolsrec_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (srec),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (srec),
-  BFD_JUMP_TABLE_RELOCS (srec),
-  BFD_JUMP_TABLE_WRITE (srec),
-  BFD_JUMP_TABLE_LINK (srec),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/stab-syms.c b/bfd/stab-syms.c
deleted file mode 100644
index f4fe6c8ba3c..00000000000
--- a/bfd/stab-syms.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/* Table of stab names for the BFD library.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 1996 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-
-#define ARCH_SIZE 32		/* Value doesn't matter. */
-#include "libaout.h"
-#include "aout/aout64.h"
-
-/* Ignore duplicate stab codes; just return the string for the first
-   one.  */
-#define __define_stab(NAME, CODE, STRING) __define_name(CODE, STRING)
-#define __define_stab_duplicate(NAME, CODE, STRING)
-
-/* These are not really stab symbols, but it is
-   convenient to have them here for the sake of nm.
-   For completeness, we could also add N_TEXT etc, but those
-   are never needed, since nm treats those specially. */
-#define EXTRA_SYMBOLS \
-  __define_name (N_SETA, "SETA")/* Absolute set element symbol */ \
-  __define_name (N_SETT, "SETT")/* Text set element symbol */ \
-  __define_name (N_SETD, "SETD")/* Data set element symbol */ \
-  __define_name (N_SETB, "SETB")/* Bss set element symbol */ \
-  __define_name (N_SETV, "SETV")/* Pointer to set vector in data area. */ \
-  __define_name (N_INDR, "INDR") \
-  __define_name (N_WARNING, "WARNING")
-
-const char *
-bfd_get_stab_name (code)
-     int code;
-{
-  switch (code)
-    {
-#define __define_name(val, str) case val: return str;
-#include "aout/stab.def"
-      EXTRA_SYMBOLS
-    }
-
-  return (const char *) 0;
-}
diff --git a/bfd/stabs.c b/bfd/stabs.c
deleted file mode 100644
index ffc000d499e..00000000000
--- a/bfd/stabs.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/* Stabs in sections linking support.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/* This file contains support for linking stabs in sections, as used
-   on COFF and ELF.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "aout/stab_gnu.h"
-
-#include <ctype.h>
-
-/* Stabs entries use a 12 byte format:
-     4 byte string table index
-     1 byte stab type
-     1 byte stab other field
-     2 byte stab desc field
-     4 byte stab value
-   FIXME: This will have to change for a 64 bit object format.
-
-   The stabs symbols are divided into compilation units.  For the
-   first entry in each unit, the type of 0, the value is the length of
-   the string table for this unit, and the desc field is the number of
-   stabs symbols for this unit.  */
-
-#define STRDXOFF (0)
-#define TYPEOFF (4)
-#define OTHEROFF (5)
-#define DESCOFF (6)
-#define VALOFF (8)
-#define STABSIZE (12)
-
-/* A hash table used for header files with N_BINCL entries.  */
-
-struct stab_link_includes_table
-{
-  struct bfd_hash_table root;
-};
-
-/* A linked list of totals that we have found for a particular header
-   file.  */
-
-struct stab_link_includes_totals
-{
-  struct stab_link_includes_totals *next;
-  bfd_vma total;
-};
-
-/* An entry in the header file hash table.  */
-
-struct stab_link_includes_entry
-{
-  struct bfd_hash_entry root;
-  /* List of totals we have found for this file.  */
-  struct stab_link_includes_totals *totals;
-};
-
-/* Look up an entry in an the header file hash table.  */
-
-#define stab_link_includes_lookup(table, string, create, copy) \
-  ((struct stab_link_includes_entry *) \
-   bfd_hash_lookup (&(table)->root, (string), (create), (copy)))
-
-/* This structure is used to hold a list of N_BINCL symbols, some of
-   which might be converted into N_EXCL symbols.  */
-
-struct stab_excl_list
-{
-  /* The next symbol to convert.  */
-  struct stab_excl_list *next;
-  /* The offset to this symbol in the section contents.  */
-  bfd_size_type offset;
-  /* The value to use for the symbol.  */
-  bfd_vma val;
-  /* The type of this symbol (N_BINCL or N_EXCL).  */
-  int type;
-};
-
-/* This structure is stored with each .stab section.  */
-
-struct stab_section_info
-{
-  /* This is a linked list of N_BINCL symbols which should be
-     converted into N_EXCL symbols.  */
-  struct stab_excl_list *excls;
-
-  /* This is used to map input stab offsets within their sections
-     to output stab offsets, to take into account stabs that have
-     been deleted.  If it is NULL, the output offsets are the same
-     as the input offsets, because no stabs have been deleted from
-     this section.  Otherwise the i'th entry is the number of
-     bytes of stabs that have been deleted prior to the i'th
-     stab. */
-  bfd_size_type *cumulative_skips;
-
-  /* This is an array of string indices.  For each stab symbol, we
-     store the string index here.  If a stab symbol should not be
-     included in the final output, the string index is -1.  */
-  bfd_size_type stridxs[1];
-};
-
-/* This structure is used to keep track of stabs in sections
-   information while linking.  */
-
-struct stab_info
-{
-  /* A hash table used to hold stabs strings.  */
-  struct bfd_strtab_hash *strings;
-  /* The header file hash table.  */
-  struct stab_link_includes_table includes;
-  /* The first .stabstr section.  */
-  asection *stabstr;
-};
-
-static struct bfd_hash_entry *stab_link_includes_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-
-/* The function to create a new entry in the header file hash table.  */
-
-static struct bfd_hash_entry *
-stab_link_includes_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct stab_link_includes_entry *ret =
-    (struct stab_link_includes_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct stab_link_includes_entry *) NULL)
-    ret = ((struct stab_link_includes_entry *)
-	   bfd_hash_allocate (table,
-			      sizeof (struct stab_link_includes_entry)));
-  if (ret == (struct stab_link_includes_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct stab_link_includes_entry *)
-	 bfd_hash_newfunc ((struct bfd_hash_entry *) ret, table, string));
-  if (ret)
-    {
-      /* Set local fields.  */
-      ret->totals = NULL;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* This function is called for each input file from the add_symbols
-   pass of the linker.  */
-
-boolean
-_bfd_link_section_stabs (abfd, psinfo, stabsec, stabstrsec, psecinfo)
-     bfd *abfd;
-     PTR *psinfo;
-     asection *stabsec;
-     asection *stabstrsec;
-     PTR *psecinfo;
-{
-  boolean first;
-  struct stab_info *sinfo;
-  bfd_size_type count;
-  struct stab_section_info *secinfo;
-  bfd_byte *stabbuf = NULL;
-  bfd_byte *stabstrbuf = NULL;
-  bfd_byte *sym, *symend;
-  bfd_size_type stroff, next_stroff, skip;
-  bfd_size_type *pstridx;
-
-  if (stabsec->_raw_size == 0
-      || stabstrsec->_raw_size == 0)
-    {
-      /* This file does not contain stabs debugging information.  */
-      return true;
-    }
-
-  if (stabsec->_raw_size % STABSIZE != 0)
-    {
-      /* Something is wrong with the format of these stab symbols.
-         Don't try to optimize them.  */
-      return true;
-    }
-
-  if ((stabstrsec->flags & SEC_RELOC) != 0)
-    {
-      /* We shouldn't see relocations in the strings, and we aren't
-         prepared to handle them.  */
-      return true;
-    }
-
-  if ((stabsec->output_section != NULL
-       && bfd_is_abs_section (stabsec->output_section))
-      || (stabstrsec->output_section != NULL
-	  && bfd_is_abs_section (stabstrsec->output_section)))
-    {
-      /* At least one of the sections is being discarded from the
-         link, so we should just ignore them.  */
-      return true;
-    }
-
-  first = false;
-
-  if (*psinfo == NULL)
-    {
-      /* Initialize the stabs information we need to keep track of.  */
-      first = true;
-      *psinfo = (PTR) bfd_alloc (abfd, sizeof (struct stab_info));
-      if (*psinfo == NULL)
-	goto error_return;
-      sinfo = (struct stab_info *) *psinfo;
-      sinfo->strings = _bfd_stringtab_init ();
-      if (sinfo->strings == NULL)
-	goto error_return;
-      if (! bfd_hash_table_init_n (&sinfo->includes.root,
-				   stab_link_includes_newfunc,
-				   251))
-	goto error_return;
-      sinfo->stabstr = bfd_make_section_anyway (abfd, ".stabstr");
-      sinfo->stabstr->flags |= SEC_HAS_CONTENTS | SEC_READONLY | SEC_DEBUGGING;
-    }
-
-  sinfo = (struct stab_info *) *psinfo;
-
-  /* Initialize the information we are going to store for this .stab
-     section.  */
-
-  count = stabsec->_raw_size / STABSIZE;
-
-  *psecinfo = bfd_alloc (abfd,
-			 (sizeof (struct stab_section_info)
-			  + (count - 1) * sizeof (bfd_size_type)));
-  if (*psecinfo == NULL)
-    goto error_return;
-
-  secinfo = (struct stab_section_info *) *psecinfo;
-  secinfo->excls = NULL;
-  secinfo->cumulative_skips = NULL;
-  memset (secinfo->stridxs, 0, count * sizeof (bfd_size_type));
-
-  /* Read the stabs information from abfd.  */
-
-  stabbuf = (bfd_byte *) bfd_malloc (stabsec->_raw_size);
-  stabstrbuf = (bfd_byte *) bfd_malloc (stabstrsec->_raw_size);
-  if (stabbuf == NULL || stabstrbuf == NULL)
-    goto error_return;
-
-  if (! bfd_get_section_contents (abfd, stabsec, stabbuf, 0,
-				  stabsec->_raw_size)
-      || ! bfd_get_section_contents (abfd, stabstrsec, stabstrbuf, 0,
-				     stabstrsec->_raw_size))
-    goto error_return;
-
-  /* Look through the stabs symbols, work out the new string indices,
-     and identify N_BINCL symbols which can be eliminated.  */
-
-  stroff = 0;
-  next_stroff = 0;
-  skip = 0;
-
-  symend = stabbuf + stabsec->_raw_size;
-  for (sym = stabbuf, pstridx = secinfo->stridxs;
-       sym < symend;
-       sym += STABSIZE, ++pstridx)
-    {
-      int type;
-      const char *string;
-
-      if (*pstridx != 0)
-	{
-	  /* This symbol has already been handled by an N_BINCL pass.  */
-	  continue;
-	}
-
-      type = sym[TYPEOFF];
-
-      if (type == 0)
-	{
-	  /* Special type 0 stabs indicate the offset to the next
-             string table.  We only copy the very first one.  */
-	  stroff = next_stroff;
-	  next_stroff += bfd_get_32 (abfd, sym + 8);
-	  if (! first)
-	    {
-	      *pstridx = (bfd_size_type) -1;
-	      ++skip;
-	      continue;
-	    }
-	  first = false;
-	}
-
-      /* Store the string in the hash table, and record the index.  */
-      string = ((char *) stabstrbuf
-		+ stroff
-		+ bfd_get_32 (abfd, sym + STRDXOFF));
-      *pstridx = _bfd_stringtab_add (sinfo->strings, string, true, true);
-
-      /* An N_BINCL symbol indicates the start of the stabs entries
-	 for a header file.  We need to scan ahead to the next N_EINCL
-	 symbol, ignoring nesting, adding up all the characters in the
-	 symbol names, not including the file numbers in types (the
-	 first number after an open parenthesis).  */
-      if (type == N_BINCL)
-	{
-	  bfd_vma val;
-	  int nest;
-	  bfd_byte *incl_sym;
-	  struct stab_link_includes_entry *incl_entry;
-	  struct stab_link_includes_totals *t;
-	  struct stab_excl_list *ne;
-
-	  val = 0;
-	  nest = 0;
-	  for (incl_sym = sym + STABSIZE;
-	       incl_sym < symend;
-	       incl_sym += STABSIZE)
-	    {
-	      int incl_type;
-
-	      incl_type = incl_sym[TYPEOFF];
-	      if (incl_type == 0)
-		break;
-	      else if (incl_type == N_EINCL)
-		{
-		  if (nest == 0)
-		    break;
-		  --nest;
-		}
-	      else if (incl_type == N_BINCL)
-		++nest;
-	      else if (nest == 0)
-		{
-		  const char *str;
-
-		  str = ((char *) stabstrbuf
-			 + stroff
-			 + bfd_get_32 (abfd, incl_sym + STRDXOFF));
-		  for (; *str != '\0'; str++)
-		    {
-		      val += *str;
-		      if (*str == '(')
-			{
-			  /* Skip the file number.  */
-			  ++str;
-			  while (isdigit ((unsigned char) *str))
-			    ++str;
-			  --str;
-			}
-		    }
-		}
-	    }
-
-	  /* If we have already included a header file with the same
-	     value, then replaced this one with an N_EXCL symbol.  */
-	  incl_entry = stab_link_includes_lookup (&sinfo->includes, string,
-						  true, true);
-	  if (incl_entry == NULL)
-	    goto error_return;
-
-	  for (t = incl_entry->totals; t != NULL; t = t->next)
-	    if (t->total == val)
-	      break;
-
-	  /* Record this symbol, so that we can set the value
-             correctly.  */
-	  ne = (struct stab_excl_list *) bfd_alloc (abfd, sizeof *ne);
-	  if (ne == NULL)
-	    goto error_return;
-	  ne->offset = sym - stabbuf;
-	  ne->val = val;
-	  ne->type = N_BINCL;
-	  ne->next = secinfo->excls;
-	  secinfo->excls = ne;
-
-	  if (t == NULL)
-	    {
-	      /* This is the first time we have seen this header file
-		 with this set of stabs strings.  */
-	      t = ((struct stab_link_includes_totals *)
-		   bfd_hash_allocate (&sinfo->includes.root, sizeof *t));
-	      if (t == NULL)
-		goto error_return;
-	      t->total = val;
-	      t->next = incl_entry->totals;
-	      incl_entry->totals = t;
-	    }
-	  else
-	    {
-	      bfd_size_type *incl_pstridx;
-
-	      /* We have seen this header file before.  Tell the final
-		 pass to change the type to N_EXCL.  */
-	      ne->type = N_EXCL;
-
-	      /* Mark the skipped symbols.  */
-
-	      nest = 0;
-	      for (incl_sym = sym + STABSIZE, incl_pstridx = pstridx + 1;
-		   incl_sym < symend;
-		   incl_sym += STABSIZE, ++incl_pstridx)
-		{
-		  int incl_type;
-
-		  incl_type = incl_sym[TYPEOFF];
-
-		  if (incl_type == N_EINCL)
-		    {
-		      if (nest == 0)
-			{
-			  *incl_pstridx = (bfd_size_type) -1;
-			  ++skip;
-			  break;
-			}
-		      --nest;
-		    }
-		  else if (incl_type == N_BINCL)
-		    ++nest;
-		  else if (nest == 0)
-		    {
-		      *incl_pstridx = (bfd_size_type) -1;
-		      ++skip;
-		    }
-		}
-	    }
-	}
-    }
-
-  free (stabbuf);
-  stabbuf = NULL;
-  free (stabstrbuf);
-  stabstrbuf = NULL;
-
-  /* We need to set the section sizes such that the linker will
-     compute the output section sizes correctly.  We set the .stab
-     size to not include the entries we don't want.  We set
-     SEC_EXCLUDE for the .stabstr section, so that it will be dropped
-     from the link.  We record the size of the strtab in the first
-     .stabstr section we saw, and make sure we don't set SEC_EXCLUDE
-     for that section.  */
-  stabsec->_cooked_size = (count - skip) * STABSIZE;
-  if (stabsec->_cooked_size == 0)
-    stabsec->flags |= SEC_EXCLUDE;
-  stabstrsec->flags |= SEC_EXCLUDE;
-  sinfo->stabstr->_cooked_size = _bfd_stringtab_size (sinfo->strings);
-
-  /* Calculate the `cumulative_skips' array now that stabs have been
-     deleted for this section. */
-
-  if (skip != 0)
-    {
-      bfd_size_type i, offset;
-      bfd_size_type *pskips;
-
-      secinfo->cumulative_skips =
-	(bfd_size_type *) bfd_alloc (abfd, count * sizeof (bfd_size_type));
-      if (secinfo->cumulative_skips == NULL)
-	goto error_return;
-
-      pskips = secinfo->cumulative_skips;
-      pstridx = secinfo->stridxs;
-      offset = 0;
-
-      for (i = 0; i < count; i++, pskips++, pstridx++)
-	{
-	  *pskips = offset;
-	  if (*pstridx == (bfd_size_type) -1)
-	    offset += STABSIZE;
-	}
-
-      BFD_ASSERT (offset != 0);
-    }
-
-  return true;
-
- error_return:
-  if (stabbuf != NULL)
-    free (stabbuf);
-  if (stabstrbuf != NULL)
-    free (stabstrbuf);
-  return false;
-}
-
-/* Write out the stab section.  This is called with the relocated
-   contents.  */
-
-boolean
-_bfd_write_section_stabs (output_bfd, psinfo, stabsec, psecinfo, contents)
-     bfd *output_bfd;
-     PTR *psinfo;
-     asection *stabsec;
-     PTR *psecinfo;
-     bfd_byte *contents;
-{
-  struct stab_info *sinfo;
-  struct stab_section_info *secinfo;
-  struct stab_excl_list *e;
-  bfd_byte *sym, *tosym, *symend;
-  bfd_size_type *pstridx;
-
-  sinfo = (struct stab_info *) *psinfo;
-  secinfo = (struct stab_section_info *) *psecinfo;
-
-  if (secinfo == NULL)
-    return bfd_set_section_contents (output_bfd, stabsec->output_section,
-				     contents, stabsec->output_offset,
-				     stabsec->_raw_size);
-
-  /* Handle each N_BINCL entry.  */
-  for (e = secinfo->excls; e != NULL; e = e->next)
-    {
-      bfd_byte *excl_sym;
-
-      BFD_ASSERT (e->offset < stabsec->_raw_size);
-      excl_sym = contents + e->offset;
-      bfd_put_32 (output_bfd, e->val, excl_sym + VALOFF);
-      excl_sym[TYPEOFF] = e->type;
-    }
-
-  /* Copy over all the stabs symbols, omitting the ones we don't want,
-     and correcting the string indices for those we do want.  */
-  tosym = contents;
-  symend = contents + stabsec->_raw_size;
-  for (sym = contents, pstridx = secinfo->stridxs;
-       sym < symend;
-       sym += STABSIZE, ++pstridx)
-    {
-      if (*pstridx != (bfd_size_type) -1)
-	{
-	  if (tosym != sym)
-	    memcpy (tosym, sym, STABSIZE);
-	  bfd_put_32 (output_bfd, *pstridx, tosym + STRDXOFF);
-
-	  if (sym[TYPEOFF] == 0)
-	    {
-	      /* This is the header symbol for the stabs section.  We
-                 don't really need one, since we have merged all the
-                 input stabs sections into one, but we generate one
-                 for the benefit of readers which expect to see one.  */
-	      BFD_ASSERT (sym == contents);
-	      bfd_put_32 (output_bfd, _bfd_stringtab_size (sinfo->strings),
-			  tosym + VALOFF);
-	      bfd_put_16 (output_bfd,
-			  stabsec->output_section->_raw_size / STABSIZE - 1,
-			  tosym + DESCOFF);
-	    }
-
-	  tosym += STABSIZE;
-	}
-    }
-
-  BFD_ASSERT ((bfd_size_type) (tosym - contents) == stabsec->_cooked_size);
-
-  return bfd_set_section_contents (output_bfd, stabsec->output_section,
-				   contents, stabsec->output_offset,
-				   stabsec->_cooked_size);
-}
-
-/* Write out the .stabstr section.  */
-
-boolean
-_bfd_write_stab_strings (output_bfd, psinfo)
-     bfd *output_bfd;
-     PTR *psinfo;
-{
-  struct stab_info *sinfo;
-
-  sinfo = (struct stab_info *) *psinfo;
-
-  if (sinfo == NULL)
-    return true;
-
-  if (bfd_is_abs_section (sinfo->stabstr->output_section))
-    {
-      /* The section was discarded from the link.  */
-      return true;
-    }
-
-  BFD_ASSERT ((sinfo->stabstr->output_offset
-	       + _bfd_stringtab_size (sinfo->strings))
-	      <= sinfo->stabstr->output_section->_raw_size);
-
-  if (bfd_seek (output_bfd,
-		(sinfo->stabstr->output_section->filepos
-		 + sinfo->stabstr->output_offset),
-		SEEK_SET) != 0)
-    return false;
-
-  if (! _bfd_stringtab_emit (output_bfd, sinfo->strings))
-    return false;
-
-  /* We no longer need the stabs information.  */
-  _bfd_stringtab_free (sinfo->strings);
-  bfd_hash_table_free (&sinfo->includes.root);
-
-  return true;
-}
-
-/* Adjust an address in the .stab section.  Given OFFSET within
-   STABSEC, this returns the new offset in the adjusted stab section,
-   or -1 if the address refers to a stab which has been removed.  */
-
-bfd_vma
-_bfd_stab_section_offset (output_bfd, psinfo, stabsec, psecinfo, offset)
-     bfd *output_bfd;
-     PTR *psinfo;
-     asection *stabsec;
-     PTR *psecinfo;
-     bfd_vma offset;
-{
-  struct stab_section_info *secinfo;
-
-  secinfo = (struct stab_section_info *) *psecinfo;
-
-  if (secinfo == NULL)
-    return offset;
-
-  if (offset >= stabsec->_raw_size)
-    return offset - (stabsec->_cooked_size - stabsec->_raw_size);
-
-  if (secinfo->cumulative_skips)
-    {
-      bfd_vma i;
-
-      i = offset / STABSIZE;
-
-      if (secinfo->stridxs [i] == (bfd_size_type) -1)
-	return (bfd_vma) -1;
-
-      return offset - secinfo->cumulative_skips [i];
-    }
-
-  return offset;
-}
diff --git a/bfd/stamp-h.in b/bfd/stamp-h.in
deleted file mode 100644
index 9788f70238c..00000000000
--- a/bfd/stamp-h.in
+++ /dev/null
@@ -1 +0,0 @@
-timestamp
diff --git a/bfd/sunos.c b/bfd/sunos.c
deleted file mode 100644
index e34f87803cf..00000000000
--- a/bfd/sunos.c
+++ /dev/null
@@ -1,2948 +0,0 @@
-/* BFD backend for SunOS binaries.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#define TARGETNAME "a.out-sunos-big"
-#define MY(OP) CAT(sunos_big_,OP)
-
-#include "bfd.h"
-#include "bfdlink.h"
-#include "libaout.h"
-
-/* Static routines defined in this file.  */
-
-static boolean sunos_read_dynamic_info PARAMS ((bfd *));
-static long sunos_get_dynamic_symtab_upper_bound PARAMS ((bfd *));
-static boolean sunos_slurp_dynamic_symtab PARAMS ((bfd *));
-static long sunos_canonicalize_dynamic_symtab PARAMS ((bfd *, asymbol **));
-static long sunos_get_dynamic_reloc_upper_bound PARAMS ((bfd *));
-static long sunos_canonicalize_dynamic_reloc
-  PARAMS ((bfd *, arelent **, asymbol **));
-static struct bfd_hash_entry *sunos_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *sunos_link_hash_table_create
-  PARAMS ((bfd *));
-static boolean sunos_create_dynamic_sections
-  PARAMS ((bfd *, struct bfd_link_info *, boolean));
-static boolean sunos_add_dynamic_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, struct external_nlist **,
-	   bfd_size_type *, char **));
-static boolean sunos_add_one_symbol
-  PARAMS ((struct bfd_link_info *, bfd *, const char *, flagword, asection *,
-	   bfd_vma, const char *, boolean, boolean,
-	   struct bfd_link_hash_entry **));
-static boolean sunos_scan_relocs
-  PARAMS ((struct bfd_link_info *, bfd *, asection *, bfd_size_type));
-static boolean sunos_scan_std_relocs
-  PARAMS ((struct bfd_link_info *, bfd *, asection *,
-	   const struct reloc_std_external *, bfd_size_type));
-static boolean sunos_scan_ext_relocs
-  PARAMS ((struct bfd_link_info *, bfd *, asection *,
-	   const struct reloc_ext_external *, bfd_size_type));
-static boolean sunos_link_dynamic_object
-  PARAMS ((struct bfd_link_info *, bfd *));
-static boolean sunos_write_dynamic_symbol
-  PARAMS ((bfd *, struct bfd_link_info *, struct aout_link_hash_entry *));
-static boolean sunos_check_dynamic_reloc
-  PARAMS ((struct bfd_link_info *, bfd *, asection *,
-	   struct aout_link_hash_entry *, PTR, bfd_byte *, boolean *,
-	   bfd_vma *));
-static boolean sunos_finish_dynamic_link
-  PARAMS ((bfd *, struct bfd_link_info *));
-
-#define MY_get_dynamic_symtab_upper_bound sunos_get_dynamic_symtab_upper_bound
-#define MY_canonicalize_dynamic_symtab sunos_canonicalize_dynamic_symtab
-#define MY_get_dynamic_reloc_upper_bound sunos_get_dynamic_reloc_upper_bound
-#define MY_canonicalize_dynamic_reloc sunos_canonicalize_dynamic_reloc
-#define MY_bfd_link_hash_table_create sunos_link_hash_table_create
-#define MY_add_dynamic_symbols sunos_add_dynamic_symbols
-#define MY_add_one_symbol sunos_add_one_symbol
-#define MY_link_dynamic_object sunos_link_dynamic_object
-#define MY_write_dynamic_symbol sunos_write_dynamic_symbol
-#define MY_check_dynamic_reloc sunos_check_dynamic_reloc
-#define MY_finish_dynamic_link sunos_finish_dynamic_link
-
-/* ??? Where should this go?  */
-#define MACHTYPE_OK(mtype) \
-  (((mtype) == M_SPARC && bfd_lookup_arch (bfd_arch_sparc, 0) != NULL) \
-   || ((mtype) == M_SPARCLET \
-       && bfd_lookup_arch (bfd_arch_sparc, bfd_mach_sparc_sparclet) != NULL) \
-   || ((mtype) == M_SPARCLITE_LE \
-       && bfd_lookup_arch (bfd_arch_sparc, bfd_mach_sparc_sparclet) != NULL) \
-   || (((mtype) == M_UNKNOWN || (mtype) == M_68010 || (mtype) == M_68020) \
-       && bfd_lookup_arch (bfd_arch_m68k, 0) != NULL))
-
-/* Include the usual a.out support.  */
-#include "aoutf1.h"
-
-/* The SunOS 4.1.4 /usr/include/locale.h defines valid as a macro.  */
-#undef valid
-
-/* SunOS shared library support.  We store a pointer to this structure
-   in obj_aout_dynamic_info (abfd).  */
-
-struct sunos_dynamic_info
-{
-  /* Whether we found any dynamic information.  */
-  boolean valid;
-  /* Dynamic information.  */
-  struct internal_sun4_dynamic_link dyninfo;
-  /* Number of dynamic symbols.  */
-  unsigned long dynsym_count;
-  /* Read in nlists for dynamic symbols.  */
-  struct external_nlist *dynsym;
-  /* asymbol structures for dynamic symbols.  */
-  aout_symbol_type *canonical_dynsym;
-  /* Read in dynamic string table.  */
-  char *dynstr;
-  /* Number of dynamic relocs.  */
-  unsigned long dynrel_count;
-  /* Read in dynamic relocs.  This may be reloc_std_external or
-     reloc_ext_external.  */
-  PTR dynrel;
-  /* arelent structures for dynamic relocs.  */
-  arelent *canonical_dynrel;
-};
-
-/* The hash table of dynamic symbols is composed of two word entries.
-   See include/aout/sun4.h for details.  */
-
-#define HASH_ENTRY_SIZE (2 * BYTES_IN_WORD)
-
-/* Read in the basic dynamic information.  This locates the __DYNAMIC
-   structure and uses it to find the dynamic_link structure.  It
-   creates and saves a sunos_dynamic_info structure.  If it can't find
-   __DYNAMIC, it sets the valid field of the sunos_dynamic_info
-   structure to false to avoid doing this work again.  */
-
-static boolean
-sunos_read_dynamic_info (abfd)
-     bfd *abfd;
-{
-  struct sunos_dynamic_info *info;
-  asection *dynsec;
-  bfd_vma dynoff;
-  struct external_sun4_dynamic dyninfo;
-  unsigned long dynver;
-  struct external_sun4_dynamic_link linkinfo;
-
-  if (obj_aout_dynamic_info (abfd) != (PTR) NULL)
-    return true;
-
-  if ((abfd->flags & DYNAMIC) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  info = ((struct sunos_dynamic_info *)
-	  bfd_zalloc (abfd, sizeof (struct sunos_dynamic_info)));
-  if (!info)
-    return false;
-  info->valid = false;
-  info->dynsym = NULL;
-  info->dynstr = NULL;
-  info->canonical_dynsym = NULL;
-  info->dynrel = NULL;
-  info->canonical_dynrel = NULL;
-  obj_aout_dynamic_info (abfd) = (PTR) info;
-
-  /* This code used to look for the __DYNAMIC symbol to locate the dynamic
-     linking information.
-     However this inhibits recovering the dynamic symbols from a
-     stripped object file, so blindly assume that the dynamic linking
-     information is located at the start of the data section.
-     We could verify this assumption later by looking through the dynamic
-     symbols for the __DYNAMIC symbol.  */
-  if ((abfd->flags & DYNAMIC) == 0)
-    return true;
-  if (! bfd_get_section_contents (abfd, obj_datasec (abfd), (PTR) &dyninfo,
-				  (file_ptr) 0, sizeof dyninfo))
-    return true;
-
-  dynver = GET_WORD (abfd, dyninfo.ld_version);
-  if (dynver != 2 && dynver != 3)
-    return true;
-
-  dynoff = GET_WORD (abfd, dyninfo.ld);
-
-  /* dynoff is a virtual address.  It is probably always in the .data
-     section, but this code should work even if it moves.  */
-  if (dynoff < bfd_get_section_vma (abfd, obj_datasec (abfd)))
-    dynsec = obj_textsec (abfd);
-  else
-    dynsec = obj_datasec (abfd);
-  dynoff -= bfd_get_section_vma (abfd, dynsec);
-  if (dynoff > bfd_section_size (abfd, dynsec))
-    return true;
-
-  /* This executable appears to be dynamically linked in a way that we
-     can understand.  */
-  if (! bfd_get_section_contents (abfd, dynsec, (PTR) &linkinfo, dynoff,
-				  (bfd_size_type) sizeof linkinfo))
-    return true;
-
-  /* Swap in the dynamic link information.  */
-  info->dyninfo.ld_loaded = GET_WORD (abfd, linkinfo.ld_loaded);
-  info->dyninfo.ld_need = GET_WORD (abfd, linkinfo.ld_need);
-  info->dyninfo.ld_rules = GET_WORD (abfd, linkinfo.ld_rules);
-  info->dyninfo.ld_got = GET_WORD (abfd, linkinfo.ld_got);
-  info->dyninfo.ld_plt = GET_WORD (abfd, linkinfo.ld_plt);
-  info->dyninfo.ld_rel = GET_WORD (abfd, linkinfo.ld_rel);
-  info->dyninfo.ld_hash = GET_WORD (abfd, linkinfo.ld_hash);
-  info->dyninfo.ld_stab = GET_WORD (abfd, linkinfo.ld_stab);
-  info->dyninfo.ld_stab_hash = GET_WORD (abfd, linkinfo.ld_stab_hash);
-  info->dyninfo.ld_buckets = GET_WORD (abfd, linkinfo.ld_buckets);
-  info->dyninfo.ld_symbols = GET_WORD (abfd, linkinfo.ld_symbols);
-  info->dyninfo.ld_symb_size = GET_WORD (abfd, linkinfo.ld_symb_size);
-  info->dyninfo.ld_text = GET_WORD (abfd, linkinfo.ld_text);
-  info->dyninfo.ld_plt_sz = GET_WORD (abfd, linkinfo.ld_plt_sz);
-
-  /* Reportedly the addresses need to be offset by the size of the
-     exec header in an NMAGIC file.  */
-  if (adata (abfd).magic == n_magic)
-    {
-      unsigned long exec_bytes_size = adata (abfd).exec_bytes_size;
-
-      info->dyninfo.ld_need += exec_bytes_size;
-      info->dyninfo.ld_rules += exec_bytes_size;
-      info->dyninfo.ld_rel += exec_bytes_size;
-      info->dyninfo.ld_hash += exec_bytes_size;
-      info->dyninfo.ld_stab += exec_bytes_size;
-      info->dyninfo.ld_symbols += exec_bytes_size;
-    }
-
-  /* The only way to get the size of the symbol information appears to
-     be to determine the distance between it and the string table.  */
-  info->dynsym_count = ((info->dyninfo.ld_symbols - info->dyninfo.ld_stab)
-			/ EXTERNAL_NLIST_SIZE);
-  BFD_ASSERT (info->dynsym_count * EXTERNAL_NLIST_SIZE
-	      == (unsigned long) (info->dyninfo.ld_symbols
-				  - info->dyninfo.ld_stab));
-
-  /* Similarly, the relocs end at the hash table.  */
-  info->dynrel_count = ((info->dyninfo.ld_hash - info->dyninfo.ld_rel)
-			/ obj_reloc_entry_size (abfd));
-  BFD_ASSERT (info->dynrel_count * obj_reloc_entry_size (abfd)
-	      == (unsigned long) (info->dyninfo.ld_hash
-				  - info->dyninfo.ld_rel));
-
-  info->valid = true;
-
-  return true;
-}
-
-/* Return the amount of memory required for the dynamic symbols.  */
-
-static long
-sunos_get_dynamic_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  struct sunos_dynamic_info *info;
-
-  if (! sunos_read_dynamic_info (abfd))
-    return -1;
-
-  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
-  if (! info->valid)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-  return (info->dynsym_count + 1) * sizeof (asymbol *);
-}
-
-/* Read the external dynamic symbols.  */
-
-static boolean
-sunos_slurp_dynamic_symtab (abfd)
-     bfd *abfd;
-{
-  struct sunos_dynamic_info *info;
-
-  /* Get the general dynamic information.  */
-  if (obj_aout_dynamic_info (abfd) == NULL)
-    {
-      if (! sunos_read_dynamic_info (abfd))
-	  return false;
-    }
-
-  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
-  if (! info->valid)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return false;
-    }
-
-  /* Get the dynamic nlist structures.  */
-  if (info->dynsym == (struct external_nlist *) NULL)
-    {
-      info->dynsym = ((struct external_nlist *)
-		      bfd_alloc (abfd,
-				 (info->dynsym_count
-				  * EXTERNAL_NLIST_SIZE)));
-      if (info->dynsym == NULL && info->dynsym_count != 0)
-	return false;
-      if (bfd_seek (abfd, info->dyninfo.ld_stab, SEEK_SET) != 0
-	  || (bfd_read ((PTR) info->dynsym, info->dynsym_count,
-			EXTERNAL_NLIST_SIZE, abfd)
-	      != info->dynsym_count * EXTERNAL_NLIST_SIZE))
-	{
-	  if (info->dynsym != NULL)
-	    {
-	      bfd_release (abfd, info->dynsym);
-	      info->dynsym = NULL;
-	    }
-	  return false;
-	}
-    }
-
-  /* Get the dynamic strings.  */
-  if (info->dynstr == (char *) NULL)
-    {
-      info->dynstr = (char *) bfd_alloc (abfd, info->dyninfo.ld_symb_size);
-      if (info->dynstr == NULL && info->dyninfo.ld_symb_size != 0)
-	return false;
-      if (bfd_seek (abfd, info->dyninfo.ld_symbols, SEEK_SET) != 0
-	  || (bfd_read ((PTR) info->dynstr, 1, info->dyninfo.ld_symb_size,
-			abfd)
-	      != info->dyninfo.ld_symb_size))
-	{
-	  if (info->dynstr != NULL)
-	    {
-	      bfd_release (abfd, info->dynstr);
-	      info->dynstr = NULL;
-	    }
-	  return false;
-	}
-    }
-
-  return true;
-}
-
-/* Read in the dynamic symbols.  */
-
-static long
-sunos_canonicalize_dynamic_symtab (abfd, storage)
-     bfd *abfd;
-     asymbol **storage;
-{
-  struct sunos_dynamic_info *info;
-  unsigned long i;
-
-  if (! sunos_slurp_dynamic_symtab (abfd))
-    return -1;
-
-  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
-
-#ifdef CHECK_DYNAMIC_HASH
-  /* Check my understanding of the dynamic hash table by making sure
-     that each symbol can be located in the hash table.  */
-  {
-    bfd_size_type table_size;
-    bfd_byte *table;
-    bfd_size_type i;
-
-    if (info->dyninfo.ld_buckets > info->dynsym_count)
-      abort ();
-    table_size = info->dyninfo.ld_stab - info->dyninfo.ld_hash;
-    table = (bfd_byte *) bfd_malloc (table_size);
-    if (table == NULL && table_size != 0)
-      abort ();
-    if (bfd_seek (abfd, info->dyninfo.ld_hash, SEEK_SET) != 0
-	|| bfd_read ((PTR) table, 1, table_size, abfd) != table_size)
-      abort ();
-    for (i = 0; i < info->dynsym_count; i++)
-      {
-	unsigned char *name;
-	unsigned long hash;
-
-	name = ((unsigned char *) info->dynstr
-		+ GET_WORD (abfd, info->dynsym[i].e_strx));
-	hash = 0;
-	while (*name != '\0')
-	  hash = (hash << 1) + *name++;
-	hash &= 0x7fffffff;
-	hash %= info->dyninfo.ld_buckets;
-	while (GET_WORD (abfd, table + hash * HASH_ENTRY_SIZE) != i)
-	  {
-	    hash = GET_WORD (abfd,
-			     table + hash * HASH_ENTRY_SIZE + BYTES_IN_WORD);
-	    if (hash == 0 || hash >= table_size / HASH_ENTRY_SIZE)
-	      abort ();
-	  }
-      }
-    free (table);
-  }
-#endif /* CHECK_DYNAMIC_HASH */
-
-  /* Get the asymbol structures corresponding to the dynamic nlist
-     structures.  */
-  if (info->canonical_dynsym == (aout_symbol_type *) NULL)
-    {
-      info->canonical_dynsym = ((aout_symbol_type *)
-				bfd_alloc (abfd,
-					   (info->dynsym_count
-					    * sizeof (aout_symbol_type))));
-      if (info->canonical_dynsym == NULL && info->dynsym_count != 0)
-	return -1;
-
-      if (! aout_32_translate_symbol_table (abfd, info->canonical_dynsym,
-					    info->dynsym, info->dynsym_count,
-					    info->dynstr,
-					    info->dyninfo.ld_symb_size,
-					    true))
-	{
-	  if (info->canonical_dynsym != NULL)
-	    {
-	      bfd_release (abfd, info->canonical_dynsym);
-	      info->canonical_dynsym = NULL;
-	    }
-	  return -1;
-	}
-    }
-
-  /* Return pointers to the dynamic asymbol structures.  */
-  for (i = 0; i < info->dynsym_count; i++)
-    *storage++ = (asymbol *) (info->canonical_dynsym + i);
-  *storage = NULL;
-
-  return info->dynsym_count;
-}
-
-/* Return the amount of memory required for the dynamic relocs.  */
-
-static long
-sunos_get_dynamic_reloc_upper_bound (abfd)
-     bfd *abfd;
-{
-  struct sunos_dynamic_info *info;
-
-  if (! sunos_read_dynamic_info (abfd))
-    return -1;
-
-  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
-  if (! info->valid)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-  return (info->dynrel_count + 1) * sizeof (arelent *);
-}
-
-/* Read in the dynamic relocs.  */
-
-static long
-sunos_canonicalize_dynamic_reloc (abfd, storage, syms)
-     bfd *abfd;
-     arelent **storage;
-     asymbol **syms;
-{
-  struct sunos_dynamic_info *info;
-  unsigned long i;
-
-  /* Get the general dynamic information.  */
-  if (obj_aout_dynamic_info (abfd) == (PTR) NULL)
-    {
-      if (! sunos_read_dynamic_info (abfd))
-	return -1;
-    }
-
-  info = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
-  if (! info->valid)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-  /* Get the dynamic reloc information.  */
-  if (info->dynrel == NULL)
-    {
-      info->dynrel = (PTR) bfd_alloc (abfd,
-				      (info->dynrel_count
-				       * obj_reloc_entry_size (abfd)));
-      if (info->dynrel == NULL && info->dynrel_count != 0)
-	return -1;
-      if (bfd_seek (abfd, info->dyninfo.ld_rel, SEEK_SET) != 0
-	  || (bfd_read ((PTR) info->dynrel, info->dynrel_count,
-			obj_reloc_entry_size (abfd), abfd)
-	      != info->dynrel_count * obj_reloc_entry_size (abfd)))
-	{
-	  if (info->dynrel != NULL)
-	    {
-	      bfd_release (abfd, info->dynrel);
-	      info->dynrel = NULL;
-	    }
-	  return -1;
-	}
-    }
-
-  /* Get the arelent structures corresponding to the dynamic reloc
-     information.  */
-  if (info->canonical_dynrel == (arelent *) NULL)
-    {
-      arelent *to;
-
-      info->canonical_dynrel = ((arelent *)
-				bfd_alloc (abfd,
-					   (info->dynrel_count
-					    * sizeof (arelent))));
-      if (info->canonical_dynrel == NULL && info->dynrel_count != 0)
-	return -1;
-      
-      to = info->canonical_dynrel;
-
-      if (obj_reloc_entry_size (abfd) == RELOC_EXT_SIZE)
-	{
-	  register struct reloc_ext_external *p;
-	  struct reloc_ext_external *pend;
-
-	  p = (struct reloc_ext_external *) info->dynrel;
-	  pend = p + info->dynrel_count;
-	  for (; p < pend; p++, to++)
-	    NAME(aout,swap_ext_reloc_in) (abfd, p, to, syms,
-					  info->dynsym_count);
-	}
-      else
-	{
-	  register struct reloc_std_external *p;
-	  struct reloc_std_external *pend;
-
-	  p = (struct reloc_std_external *) info->dynrel;
-	  pend = p + info->dynrel_count;
-	  for (; p < pend; p++, to++)
-	    NAME(aout,swap_std_reloc_in) (abfd, p, to, syms,
-					  info->dynsym_count);
-	}
-    }
-
-  /* Return pointers to the dynamic arelent structures.  */
-  for (i = 0; i < info->dynrel_count; i++)
-    *storage++ = info->canonical_dynrel + i;
-  *storage = NULL;
-
-  return info->dynrel_count;
-}
-
-/* Code to handle linking of SunOS shared libraries.  */
-
-/* A SPARC procedure linkage table entry is 12 bytes.  The first entry
-   in the table is a jump which is filled in by the runtime linker.
-   The remaining entries are branches back to the first entry,
-   followed by an index into the relocation table encoded to look like
-   a sethi of %g0.  */
-
-#define SPARC_PLT_ENTRY_SIZE (12)
-
-static const bfd_byte sparc_plt_first_entry[SPARC_PLT_ENTRY_SIZE] =
-{
-  /* sethi %hi(0),%g1; address filled in by runtime linker.  */
-  0x3, 0, 0, 0,
-  /* jmp %g1; offset filled in by runtime linker.  */
-  0x81, 0xc0, 0x60, 0,
-  /* nop */
-  0x1, 0, 0, 0
-};
-
-/* save %sp, -96, %sp */
-#define SPARC_PLT_ENTRY_WORD0 0x9de3bfa0
-/* call; address filled in later.  */
-#define SPARC_PLT_ENTRY_WORD1 0x40000000
-/* sethi; reloc index filled in later.  */
-#define SPARC_PLT_ENTRY_WORD2 0x01000000
-
-/* This sequence is used when for the jump table entry to a defined
-   symbol in a complete executable.  It is used when linking PIC
-   compiled code which is not being put into a shared library.  */
-/* sethi <address to be filled in later>, %g1 */
-#define SPARC_PLT_PIC_WORD0 0x03000000
-/* jmp %g1 + <address to be filled in later> */
-#define SPARC_PLT_PIC_WORD1 0x81c06000
-/* nop */
-#define SPARC_PLT_PIC_WORD2 0x01000000
-
-/* An m68k procedure linkage table entry is 8 bytes.  The first entry
-   in the table is a jump which is filled in the by the runtime
-   linker.  The remaining entries are branches back to the first
-   entry, followed by a two byte index into the relocation table.  */
-
-#define M68K_PLT_ENTRY_SIZE (8)
-
-static const bfd_byte m68k_plt_first_entry[M68K_PLT_ENTRY_SIZE] =
-{
-  /* jmps @# */
-  0x4e, 0xf9,
-  /* Filled in by runtime linker with a magic address.  */
-  0, 0, 0, 0,
-  /* Not used?  */
-  0, 0
-};
-
-/* bsrl */
-#define M68K_PLT_ENTRY_WORD0 (0x61ff)
-/* Remaining words filled in later.  */
-
-/* An entry in the SunOS linker hash table.  */
-
-struct sunos_link_hash_entry
-{
-  struct aout_link_hash_entry root;
-
-  /* If this is a dynamic symbol, this is its index into the dynamic
-     symbol table.  This is initialized to -1.  As the linker looks at
-     the input files, it changes this to -2 if it will be added to the
-     dynamic symbol table.  After all the input files have been seen,
-     the linker will know whether to build a dynamic symbol table; if
-     it does build one, this becomes the index into the table.  */
-  long dynindx;
-
-  /* If this is a dynamic symbol, this is the index of the name in the
-     dynamic symbol string table.  */
-  long dynstr_index;
-
-  /* The offset into the global offset table used for this symbol.  If
-     the symbol does not require a GOT entry, this is 0.  */
-  bfd_vma got_offset;
-
-  /* The offset into the procedure linkage table used for this symbol.
-     If the symbol does not require a PLT entry, this is 0.  */
-  bfd_vma plt_offset;
-
-  /* Some linker flags.  */
-  unsigned char flags;
-  /* Symbol is referenced by a regular object.  */
-#define SUNOS_REF_REGULAR 01
-  /* Symbol is defined by a regular object.  */
-#define SUNOS_DEF_REGULAR 02
-  /* Symbol is referenced by a dynamic object.  */
-#define SUNOS_REF_DYNAMIC 04
-  /* Symbol is defined by a dynamic object.  */
-#define SUNOS_DEF_DYNAMIC 010
-  /* Symbol is a constructor symbol in a regular object.  */
-#define SUNOS_CONSTRUCTOR 020
-};
-
-/* The SunOS linker hash table.  */
-
-struct sunos_link_hash_table
-{
-  struct aout_link_hash_table root;
-
-  /* The object which holds the dynamic sections.  */
-  bfd *dynobj;
-
-  /* Whether we have created the dynamic sections.  */
-  boolean dynamic_sections_created;
-
-  /* Whether we need the dynamic sections.  */
-  boolean dynamic_sections_needed;
-
-  /* Whether we need the .got table.  */
-  boolean got_needed;
-
-  /* The number of dynamic symbols.  */
-  size_t dynsymcount;
-
-  /* The number of buckets in the hash table.  */
-  size_t bucketcount;
-
-  /* The list of dynamic objects needed by dynamic objects included in
-     the link.  */
-  struct bfd_link_needed_list *needed;
-
-  /* The offset of __GLOBAL_OFFSET_TABLE_ into the .got section.  */
-  bfd_vma got_base;
-};
-
-/* Routine to create an entry in an SunOS link hash table.  */
-
-static struct bfd_hash_entry *
-sunos_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct sunos_link_hash_entry *ret = (struct sunos_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct sunos_link_hash_entry *) NULL)
-    ret = ((struct sunos_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct sunos_link_hash_entry)));
-  if (ret == (struct sunos_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct sunos_link_hash_entry *)
-	 NAME(aout,link_hash_newfunc) ((struct bfd_hash_entry *) ret,
-				       table, string));
-  if (ret != NULL)
-    {
-      /* Set local fields.  */
-      ret->dynindx = -1;
-      ret->dynstr_index = -1;
-      ret->got_offset = 0;
-      ret->plt_offset = 0;
-      ret->flags = 0;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create a SunOS link hash table.  */
-
-static struct bfd_link_hash_table *
-sunos_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct sunos_link_hash_table *ret;
-
-  ret = ((struct sunos_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct sunos_link_hash_table)));
-  if (ret == (struct sunos_link_hash_table *) NULL)
-    return (struct bfd_link_hash_table *) NULL;
-  if (! NAME(aout,link_hash_table_init) (&ret->root, abfd,
-					 sunos_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-
-  ret->dynobj = NULL;
-  ret->dynamic_sections_created = false;
-  ret->dynamic_sections_needed = false;
-  ret->got_needed = false;
-  ret->dynsymcount = 0;
-  ret->bucketcount = 0;
-  ret->needed = NULL;
-  ret->got_base = 0;
-
-  return &ret->root.root;
-}
-
-/* Look up an entry in an SunOS link hash table.  */
-
-#define sunos_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct sunos_link_hash_entry *) \
-   aout_link_hash_lookup (&(table)->root, (string), (create), (copy),\
-			  (follow)))
-
-/* Traverse a SunOS link hash table.  */
-
-#define sunos_link_hash_traverse(table, func, info)			\
-  (aout_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct aout_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the SunOS link hash table from the info structure.  This is
-   just a cast.  */
-
-#define sunos_hash_table(p) ((struct sunos_link_hash_table *) ((p)->hash))
-
-static boolean sunos_scan_dynamic_symbol
-  PARAMS ((struct sunos_link_hash_entry *, PTR));
-
-/* Create the dynamic sections needed if we are linking against a
-   dynamic object, or if we are linking PIC compiled code.  ABFD is a
-   bfd we can attach the dynamic sections to.  The linker script will
-   look for these special sections names and put them in the right
-   place in the output file.  See include/aout/sun4.h for more details
-   of the dynamic linking information.  */
-
-static boolean
-sunos_create_dynamic_sections (abfd, info, needed)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean needed;
-{
-  asection *s;
-
-  if (! sunos_hash_table (info)->dynamic_sections_created)
-    {
-      flagword flags;
-
-      sunos_hash_table (info)->dynobj = abfd;
-
-      flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY
-	       | SEC_LINKER_CREATED);
-
-      /* The .dynamic section holds the basic dynamic information: the
-	 sun4_dynamic structure, the dynamic debugger information, and
-	 the sun4_dynamic_link structure.  */
-      s = bfd_make_section (abfd, ".dynamic");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      /* The .got section holds the global offset table.  The address
-	 is put in the ld_got field.  */
-      s = bfd_make_section (abfd, ".got");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      /* The .plt section holds the procedure linkage table.  The
-	 address is put in the ld_plt field.  */
-      s = bfd_make_section (abfd, ".plt");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_CODE)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      /* The .dynrel section holds the dynamic relocs.  The address is
-	 put in the ld_rel field.  */
-      s = bfd_make_section (abfd, ".dynrel");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      /* The .hash section holds the dynamic hash table.  The address
-	 is put in the ld_hash field.  */
-      s = bfd_make_section (abfd, ".hash");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      /* The .dynsym section holds the dynamic symbols.  The address
-	 is put in the ld_stab field.  */
-      s = bfd_make_section (abfd, ".dynsym");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      /* The .dynstr section holds the dynamic symbol string table.
-	 The address is put in the ld_symbols field.  */
-      s = bfd_make_section (abfd, ".dynstr");
-      if (s == NULL
-	  || ! bfd_set_section_flags (abfd, s, flags | SEC_READONLY)
-	  || ! bfd_set_section_alignment (abfd, s, 2))
-	return false;
-
-      sunos_hash_table (info)->dynamic_sections_created = true;
-    }
-
-  if ((needed && ! sunos_hash_table (info)->dynamic_sections_needed)
-      || info->shared)
-    {
-      bfd *dynobj;
-
-      dynobj = sunos_hash_table (info)->dynobj;
-
-      s = bfd_get_section_by_name (dynobj, ".got");
-      if (s->_raw_size == 0)
-	s->_raw_size = BYTES_IN_WORD;
-
-      sunos_hash_table (info)->dynamic_sections_needed = true;
-      sunos_hash_table (info)->got_needed = true;
-    }
-
-  return true;
-}
-
-/* Add dynamic symbols during a link.  This is called by the a.out
-   backend linker for each object it encounters.  */
-
-static boolean
-sunos_add_dynamic_symbols (abfd, info, symsp, sym_countp, stringsp)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     struct external_nlist **symsp;
-     bfd_size_type *sym_countp;
-     char **stringsp;
-{
-  asection *s;
-  bfd *dynobj;
-  struct sunos_dynamic_info *dinfo;
-  unsigned long need;
-
-  /* Make sure we have all the required sections.  */
-  if (info->hash->creator == abfd->xvec)
-    {
-      if (! sunos_create_dynamic_sections (abfd, info,
-					   (((abfd->flags & DYNAMIC) != 0
-					     && ! info->relocateable)
-					    ? true
-					    : false)))
-	return false;
-    }
-
-  /* There is nothing else to do for a normal object.  */
-  if ((abfd->flags & DYNAMIC) == 0)
-    return true;
-
-  dynobj = sunos_hash_table (info)->dynobj;
-
-  /* We do not want to include the sections in a dynamic object in the
-     output file.  We hack by simply clobbering the list of sections
-     in the BFD.  This could be handled more cleanly by, say, a new
-     section flag; the existing SEC_NEVER_LOAD flag is not the one we
-     want, because that one still implies that the section takes up
-     space in the output file.  If this is the first object we have
-     seen, we must preserve the dynamic sections we just created.  */
-  if (abfd != dynobj)
-    abfd->sections = NULL;
-  else
-    {
-      asection *s;
-
-      for (s = abfd->sections;
-	   (s->flags & SEC_LINKER_CREATED) == 0;
-	   s = s->next)
-	;
-      abfd->sections = s;
-    }
-
-  /* The native linker seems to just ignore dynamic objects when -r is
-     used.  */
-  if (info->relocateable)
-    return true;
-
-  /* There's no hope of using a dynamic object which does not exactly
-     match the format of the output file.  */
-  if (info->hash->creator != abfd->xvec)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  /* Make sure we have a .need and a .rules sections.  These are only
-     needed if there really is a dynamic object in the link, so they
-     are not added by sunos_create_dynamic_sections.  */
-  if (bfd_get_section_by_name (dynobj, ".need") == NULL)
-    {
-      /* The .need section holds the list of names of shared objets
-	 which must be included at runtime.  The address of this
-	 section is put in the ld_need field.  */
-      s = bfd_make_section (dynobj, ".need");
-      if (s == NULL
-	  || ! bfd_set_section_flags (dynobj, s,
-				      (SEC_ALLOC
-				       | SEC_LOAD
-				       | SEC_HAS_CONTENTS
-				       | SEC_IN_MEMORY
-				       | SEC_READONLY))
-	  || ! bfd_set_section_alignment (dynobj, s, 2))
-	return false;
-    }
-
-  if (bfd_get_section_by_name (dynobj, ".rules") == NULL)
-    {
-      /* The .rules section holds the path to search for shared
-	 objects.  The address of this section is put in the ld_rules
-	 field.  */
-      s = bfd_make_section (dynobj, ".rules");
-      if (s == NULL
-	  || ! bfd_set_section_flags (dynobj, s,
-				      (SEC_ALLOC
-				       | SEC_LOAD
-				       | SEC_HAS_CONTENTS
-				       | SEC_IN_MEMORY
-				       | SEC_READONLY))
-	  || ! bfd_set_section_alignment (dynobj, s, 2))
-	return false;
-    }
-
-  /* Pick up the dynamic symbols and return them to the caller.  */
-  if (! sunos_slurp_dynamic_symtab (abfd))
-    return false;
-
-  dinfo = (struct sunos_dynamic_info *) obj_aout_dynamic_info (abfd);
-  *symsp = dinfo->dynsym;
-  *sym_countp = dinfo->dynsym_count;
-  *stringsp = dinfo->dynstr;
-
-  /* Record information about any other objects needed by this one.  */
-  need = dinfo->dyninfo.ld_need;
-  while (need != 0)
-    {
-      bfd_byte buf[16];
-      unsigned long name, flags;
-      unsigned short major_vno, minor_vno;
-      struct bfd_link_needed_list *needed, **pp;
-      char *namebuf, *p;
-      size_t alc;
-      bfd_byte b;
-      char *namecopy;
-
-      if (bfd_seek (abfd, need, SEEK_SET) != 0
-	  || bfd_read (buf, 1, 16, abfd) != 16)
-	return false;
-
-      /* For the format of an ld_need entry, see aout/sun4.h.  We
-         should probably define structs for this manipulation.  */
-
-      name = bfd_get_32 (abfd, buf);
-      flags = bfd_get_32 (abfd, buf + 4);
-      major_vno = (unsigned short)bfd_get_16 (abfd, buf + 8);
-      minor_vno = (unsigned short)bfd_get_16 (abfd, buf + 10);
-      need = bfd_get_32 (abfd, buf + 12);
-
-      needed = ((struct bfd_link_needed_list *)
-		bfd_alloc (abfd, sizeof (struct bfd_link_needed_list)));
-      if (needed == NULL)
-	return false;
-      needed->by = abfd;
-
-      /* We return the name as [-l]name[.maj][.min].  */
-      alc = 30;
-      namebuf = (char *) bfd_malloc (alc + 1);
-      if (namebuf == NULL)
-	return false;
-      p = namebuf;
-
-      if ((flags & 0x80000000) != 0)
-	{
-	  *p++ = '-';
-	  *p++ = 'l';
-	}
-      if (bfd_seek (abfd, name, SEEK_SET) != 0)
-	{
-	  free (namebuf);
-	  return false;
-	}
-
-      do
-	{
-	  if (bfd_read (&b, 1, 1, abfd) != 1)
-	    {
-	      free (namebuf);
-	      return false;
-	    }
-
-	  if ((size_t) (p - namebuf) >= alc)
-	    {
-	      char *n;
-
-	      alc *= 2;
-	      n = (char *) bfd_realloc (namebuf, alc + 1);
-	      if (n == NULL)
-		{
-		  free (namebuf);
-		  return false;
-		}
-	      p = n + (p - namebuf);
-	      namebuf = n;
-	    }
-
-	  *p++ = b;
-	}
-      while (b != '\0');
-
-      if (major_vno == 0)
-	*p = '\0';
-      else
-	{
-	  char majbuf[30];
-	  char minbuf[30];
-
-	  sprintf (majbuf, ".%d", major_vno);
-	  if (minor_vno == 0)
-	    minbuf[0] = '\0';
-	  else
-	    sprintf (minbuf, ".%d", minor_vno);
-
-	  if ((p - namebuf) + strlen (majbuf) + strlen (minbuf) >= alc)
-	    {
-	      char *n;
-
-	      alc = (p - namebuf) + strlen (majbuf) + strlen (minbuf);
-	      n = (char *) bfd_realloc (namebuf, alc + 1);
-	      if (n == NULL)
-		{
-		  free (namebuf);
-		  return false;
-		}
-	      p = n + (p - namebuf);
-	      namebuf = n;
-	    }
-
-	  strcpy (p, majbuf);
-	  strcat (p, minbuf);
-	}
-
-      namecopy = bfd_alloc (abfd, strlen (namebuf) + 1);
-      if (namecopy == NULL)
-	{
-	  free (namebuf);
-	  return false;
-	}
-      strcpy (namecopy, namebuf);
-      free (namebuf);
-      needed->name = namecopy;
-
-      needed->next = NULL;
-
-      for (pp = &sunos_hash_table (info)->needed;
-	   *pp != NULL;
-	   pp = &(*pp)->next)
-	;
-      *pp = needed;
-    }
-
-  return true;
-}
-
-/* Function to add a single symbol to the linker hash table.  This is
-   a wrapper around _bfd_generic_link_add_one_symbol which handles the
-   tweaking needed for dynamic linking support.  */
-
-static boolean
-sunos_add_one_symbol (info, abfd, name, flags, section, value, string,
-		      copy, collect, hashp)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     const char *name;
-     flagword flags;
-     asection *section;
-     bfd_vma value;
-     const char *string;
-     boolean copy;
-     boolean collect;
-     struct bfd_link_hash_entry **hashp;
-{
-  struct sunos_link_hash_entry *h;
-  int new_flag;
-
-  if ((flags & (BSF_INDIRECT | BSF_WARNING | BSF_CONSTRUCTOR)) != 0
-      || ! bfd_is_und_section (section))
-    h = sunos_link_hash_lookup (sunos_hash_table (info), name, true, copy,
-				false);
-  else
-    h = ((struct sunos_link_hash_entry *)
-	 bfd_wrapped_link_hash_lookup (abfd, info, name, true, copy, false));
-  if (h == NULL)
-    return false;
-
-  if (hashp != NULL)
-    *hashp = (struct bfd_link_hash_entry *) h;
-
-  /* Treat a common symbol in a dynamic object as defined in the .bss
-     section of the dynamic object.  We don't want to allocate space
-     for it in our process image.  */
-  if ((abfd->flags & DYNAMIC) != 0
-      && bfd_is_com_section (section))
-    section = obj_bsssec (abfd);
-
-  if (! bfd_is_und_section (section)
-      && h->root.root.type != bfd_link_hash_new
-      && h->root.root.type != bfd_link_hash_undefined
-      && h->root.root.type != bfd_link_hash_defweak)
-    {
-      /* We are defining the symbol, and it is already defined.  This
-	 is a potential multiple definition error.  */
-      if ((abfd->flags & DYNAMIC) != 0)
-	{
-	  /* The definition we are adding is from a dynamic object.
-	     We do not want this new definition to override the
-	     existing definition, so we pretend it is just a
-	     reference.  */
-	  section = bfd_und_section_ptr;
-	}
-      else if (h->root.root.type == bfd_link_hash_defined
-	       && h->root.root.u.def.section->owner != NULL
-	       && (h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
-	{
-	  /* The existing definition is from a dynamic object.  We
-	     want to override it with the definition we just found.
-	     Clobber the existing definition.  */
-	  h->root.root.type = bfd_link_hash_undefined;
-	  h->root.root.u.undef.abfd = h->root.root.u.def.section->owner;
-	}
-      else if (h->root.root.type == bfd_link_hash_common
-	       && (h->root.root.u.c.p->section->owner->flags & DYNAMIC) != 0)
-	{
-	  /* The existing definition is from a dynamic object.  We
-	     want to override it with the definition we just found.
-	     Clobber the existing definition.  We can't set it to new,
-	     because it is on the undefined list.  */
-	  h->root.root.type = bfd_link_hash_undefined;
-	  h->root.root.u.undef.abfd = h->root.root.u.c.p->section->owner;
-	}
-    }
-
-  if ((abfd->flags & DYNAMIC) != 0
-      && abfd->xvec == info->hash->creator
-      && (h->flags & SUNOS_CONSTRUCTOR) != 0)
-    {
-      /* The existing symbol is a constructor symbol, and this symbol
-         is from a dynamic object.  A constructor symbol is actually a
-         definition, although the type will be bfd_link_hash_undefined
-         at this point.  We want to ignore the definition from the
-         dynamic object.  */
-      section = bfd_und_section_ptr;
-    }
-  else if ((flags & BSF_CONSTRUCTOR) != 0
-	   && (abfd->flags & DYNAMIC) == 0
-	   && h->root.root.type == bfd_link_hash_defined
-	   && h->root.root.u.def.section->owner != NULL
-	   && (h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
-    {
-      /* The existing symbol is defined by a dynamic object, and this
-         is a constructor symbol.  As above, we want to force the use
-         of the constructor symbol from the regular object.  */
-      h->root.root.type = bfd_link_hash_new;
-    }
-
-  /* Do the usual procedure for adding a symbol.  */
-  if (! _bfd_generic_link_add_one_symbol (info, abfd, name, flags, section,
-					  value, string, copy, collect,
-					  hashp))
-    return false;
-
-  if (abfd->xvec == info->hash->creator)
-    {
-      /* Set a flag in the hash table entry indicating the type of
-	 reference or definition we just found.  Keep a count of the
-	 number of dynamic symbols we find.  A dynamic symbol is one
-	 which is referenced or defined by both a regular object and a
-	 shared object.  */
-      if ((abfd->flags & DYNAMIC) == 0)
-	{
-	  if (bfd_is_und_section (section))
-	    new_flag = SUNOS_REF_REGULAR;
-	  else
-	    new_flag = SUNOS_DEF_REGULAR;
-	}
-      else
-	{
-	  if (bfd_is_und_section (section))
-	    new_flag = SUNOS_REF_DYNAMIC;
-	  else
-	    new_flag = SUNOS_DEF_DYNAMIC;
-	}
-      h->flags |= new_flag;
-
-      if (h->dynindx == -1
-	  && (h->flags & (SUNOS_DEF_REGULAR | SUNOS_REF_REGULAR)) != 0)
-	{
-	  ++sunos_hash_table (info)->dynsymcount;
-	  h->dynindx = -2;
-	}
-
-      if ((flags & BSF_CONSTRUCTOR) != 0
-	  && (abfd->flags & DYNAMIC) == 0)
-	h->flags |= SUNOS_CONSTRUCTOR;
-    }
-
-  return true;
-}
-
-/* Return the list of objects needed by BFD.  */
-
-/*ARGSUSED*/
-struct bfd_link_needed_list *
-bfd_sunos_get_needed_list (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  if (info->hash->creator != &MY(vec))
-    return NULL;
-  return sunos_hash_table (info)->needed;
-}
-
-/* Record an assignment made to a symbol by a linker script.  We need
-   this in case some dynamic object refers to this symbol.  */
-
-boolean
-bfd_sunos_record_link_assignment (output_bfd, info, name)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *name;
-{
-  struct sunos_link_hash_entry *h;
-
-  if (output_bfd->xvec != &MY(vec))
-    return true;
-
-  /* This is called after we have examined all the input objects.  If
-     the symbol does not exist, it merely means that no object refers
-     to it, and we can just ignore it at this point.  */
-  h = sunos_link_hash_lookup (sunos_hash_table (info), name,
-			      false, false, false);
-  if (h == NULL)
-    return true;
-
-  /* In a shared library, the __DYNAMIC symbol does not appear in the
-     dynamic symbol table.  */
-  if (! info->shared || strcmp (name, "__DYNAMIC") != 0)
-    {
-      h->flags |= SUNOS_DEF_REGULAR;
-
-      if (h->dynindx == -1)
-	{
-	  ++sunos_hash_table (info)->dynsymcount;
-	  h->dynindx = -2;
-	}
-    }
-
-  return true;
-}
-
-/* Set up the sizes and contents of the dynamic sections created in
-   sunos_add_dynamic_symbols.  This is called by the SunOS linker
-   emulation before_allocation routine.  We must set the sizes of the
-   sections before the linker sets the addresses of the various
-   sections.  This unfortunately requires reading all the relocs so
-   that we can work out which ones need to become dynamic relocs.  If
-   info->keep_memory is true, we keep the relocs in memory; otherwise,
-   we discard them, and will read them again later.  */
-
-boolean
-bfd_sunos_size_dynamic_sections (output_bfd, info, sdynptr, sneedptr,
-				 srulesptr)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     asection **sdynptr;
-     asection **sneedptr;
-     asection **srulesptr;
-{
-  bfd *dynobj;
-  size_t dynsymcount;
-  struct sunos_link_hash_entry *h;
-  asection *s;
-  size_t bucketcount;
-  size_t hashalloc;
-  size_t i;
-  bfd *sub;
-
-  *sdynptr = NULL;
-  *sneedptr = NULL;
-  *srulesptr = NULL;
-
-  if (info->relocateable)
-    return true;
-
-  if (output_bfd->xvec != &MY(vec))
-    return true;
-
-  /* Look through all the input BFD's and read their relocs.  It would
-     be better if we didn't have to do this, but there is no other way
-     to determine the number of dynamic relocs we need, and, more
-     importantly, there is no other way to know which symbols should
-     get an entry in the procedure linkage table.  */
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      if ((sub->flags & DYNAMIC) == 0
-	  && sub->xvec == output_bfd->xvec)
-	{
-	  if (! sunos_scan_relocs (info, sub, obj_textsec (sub),
-				   exec_hdr (sub)->a_trsize)
-	      || ! sunos_scan_relocs (info, sub, obj_datasec (sub),
-				      exec_hdr (sub)->a_drsize))
-	    return false;
-	}
-    }
-
-  dynobj = sunos_hash_table (info)->dynobj;
-  dynsymcount = sunos_hash_table (info)->dynsymcount;
-
-  /* If there were no dynamic objects in the link, and we don't need
-     to build a global offset table, there is nothing to do here.  */
-  if (! sunos_hash_table (info)->dynamic_sections_needed
-      && ! sunos_hash_table (info)->got_needed)
-    return true;
-
-  /* If __GLOBAL_OFFSET_TABLE_ was mentioned, define it.  */
-  h = sunos_link_hash_lookup (sunos_hash_table (info),
-			      "__GLOBAL_OFFSET_TABLE_", false, false, false);
-  if (h != NULL && (h->flags & SUNOS_REF_REGULAR) != 0)
-    {
-      h->flags |= SUNOS_DEF_REGULAR;
-      if (h->dynindx == -1)
-	{
-	  ++sunos_hash_table (info)->dynsymcount;
-	  h->dynindx = -2;
-	}
-      h->root.root.type = bfd_link_hash_defined;
-      h->root.root.u.def.section = bfd_get_section_by_name (dynobj, ".got");
-
-      /* If the .got section is more than 0x1000 bytes, we set
-         __GLOBAL_OFFSET_TABLE_ to be 0x1000 bytes into the section,
-         so that 13 bit relocations have a greater chance of working.  */
-      s = bfd_get_section_by_name (dynobj, ".got");
-      BFD_ASSERT (s != NULL);
-      if (s->_raw_size >= 0x1000)
-	h->root.root.u.def.value = 0x1000;
-      else
-	h->root.root.u.def.value = 0;
-
-      sunos_hash_table (info)->got_base = h->root.root.u.def.value;
-    }
-
-  /* If there are any shared objects in the link, then we need to set
-     up the dynamic linking information.  */
-  if (sunos_hash_table (info)->dynamic_sections_needed)
-    {
-      *sdynptr = bfd_get_section_by_name (dynobj, ".dynamic");
-
-      /* The .dynamic section is always the same size.  */
-      s = *sdynptr;
-      BFD_ASSERT (s != NULL);
-      s->_raw_size = (sizeof (struct external_sun4_dynamic)
-		      + EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE
-		      + sizeof (struct external_sun4_dynamic_link));
-
-      /* Set the size of the .dynsym and .hash sections.  We counted
-	 the number of dynamic symbols as we read the input files.  We
-	 will build the dynamic symbol table (.dynsym) and the hash
-	 table (.hash) when we build the final symbol table, because
-	 until then we do not know the correct value to give the
-	 symbols.  We build the dynamic symbol string table (.dynstr)
-	 in a traversal of the symbol table using
-	 sunos_scan_dynamic_symbol.  */
-      s = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (s != NULL);
-      s->_raw_size = dynsymcount * sizeof (struct external_nlist);
-      s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size);
-      if (s->contents == NULL && s->_raw_size != 0)
-	return false;
-      
-      /* The number of buckets is just the number of symbols divided
-	 by four.  To compute the final size of the hash table, we
-	 must actually compute the hash table.  Normally we need
-	 exactly as many entries in the hash table as there are
-	 dynamic symbols, but if some of the buckets are not used we
-	 will need additional entries.  In the worst case, every
-	 symbol will hash to the same bucket, and we will need
-	 BUCKETCOUNT - 1 extra entries.  */
-      if (dynsymcount >= 4)
-	bucketcount = dynsymcount / 4;
-      else if (dynsymcount > 0)
-	bucketcount = dynsymcount;
-      else
-	bucketcount = 1;
-      s = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (s != NULL);
-      hashalloc = (dynsymcount + bucketcount - 1) * HASH_ENTRY_SIZE;
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, hashalloc);
-      if (s->contents == NULL && dynsymcount > 0)
-	return false;
-      memset (s->contents, 0, hashalloc);
-      for (i = 0; i < bucketcount; i++)
-	PUT_WORD (output_bfd, (bfd_vma) -1, s->contents + i * HASH_ENTRY_SIZE);
-      s->_raw_size = bucketcount * HASH_ENTRY_SIZE;
-
-      sunos_hash_table (info)->bucketcount = bucketcount;
-
-      /* Scan all the symbols, place them in the dynamic symbol table,
-	 and build the dynamic hash table.  We reuse dynsymcount as a
-	 counter for the number of symbols we have added so far.  */
-      sunos_hash_table (info)->dynsymcount = 0;
-      sunos_link_hash_traverse (sunos_hash_table (info),
-				sunos_scan_dynamic_symbol,
-				(PTR) info);
-      BFD_ASSERT (sunos_hash_table (info)->dynsymcount == dynsymcount);
-
-      /* The SunOS native linker seems to align the total size of the
-	 symbol strings to a multiple of 8.  I don't know if this is
-	 important, but it can't hurt much.  */
-      s = bfd_get_section_by_name (dynobj, ".dynstr");
-      BFD_ASSERT (s != NULL);
-      if ((s->_raw_size & 7) != 0)
-	{
-	  bfd_size_type add;
-	  bfd_byte *contents;
-
-	  add = 8 - (s->_raw_size & 7);
-	  contents = (bfd_byte *) bfd_realloc (s->contents,
-					       (size_t) (s->_raw_size + add));
-	  if (contents == NULL)
-	    return false;
-	  memset (contents + s->_raw_size, 0, (size_t) add);
-	  s->contents = contents;
-	  s->_raw_size += add;
-	}
-    }
-
-  /* Now that we have worked out the sizes of the procedure linkage
-     table and the dynamic relocs, allocate storage for them.  */
-  s = bfd_get_section_by_name (dynobj, ".plt");
-  BFD_ASSERT (s != NULL);
-  if (s->_raw_size != 0)
-    {
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL)
-	return false;
-
-      /* Fill in the first entry in the table.  */
-      switch (bfd_get_arch (dynobj))
-	{
-	case bfd_arch_sparc:
-	  memcpy (s->contents, sparc_plt_first_entry, SPARC_PLT_ENTRY_SIZE);
-	  break;
-
-	case bfd_arch_m68k:
-	  memcpy (s->contents, m68k_plt_first_entry, M68K_PLT_ENTRY_SIZE);
-	  break;
-
-	default:
-	  abort ();
-	}
-    }
-
-  s = bfd_get_section_by_name (dynobj, ".dynrel");
-  if (s->_raw_size != 0)
-    {
-      s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-      if (s->contents == NULL)
-	return false;
-    }
-  /* We use the reloc_count field to keep track of how many of the
-     relocs we have output so far.  */
-  s->reloc_count = 0;
-
-  /* Make space for the global offset table.  */
-  s = bfd_get_section_by_name (dynobj, ".got");
-  s->contents = (bfd_byte *) bfd_alloc (dynobj, s->_raw_size);
-  if (s->contents == NULL)
-    return false;
-
-  *sneedptr = bfd_get_section_by_name (dynobj, ".need");
-  *srulesptr = bfd_get_section_by_name (dynobj, ".rules");
-
-  return true;
-}
-
-/* Scan the relocs for an input section.  */
-
-static boolean
-sunos_scan_relocs (info, abfd, sec, rel_size)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     asection *sec;
-     bfd_size_type rel_size;
-{
-  PTR relocs;
-  PTR free_relocs = NULL;
-
-  if (rel_size == 0)
-    return true;
-
-  if (! info->keep_memory)
-    relocs = free_relocs = bfd_malloc ((size_t) rel_size);
-  else
-    {
-      struct aout_section_data_struct *n;
-
-      n = ((struct aout_section_data_struct *)
-	   bfd_alloc (abfd, sizeof (struct aout_section_data_struct)));
-      if (n == NULL)
-	relocs = NULL;
-      else
-	{
-	  set_aout_section_data (sec, n);
-	  relocs = bfd_malloc ((size_t) rel_size);
-	  aout_section_data (sec)->relocs = relocs;
-	}
-    }
-  if (relocs == NULL)
-    return false;
-
-  if (bfd_seek (abfd, sec->rel_filepos, SEEK_SET) != 0
-      || bfd_read (relocs, 1, rel_size, abfd) != rel_size)
-    goto error_return;
-
-  if (obj_reloc_entry_size (abfd) == RELOC_STD_SIZE)
-    {
-      if (! sunos_scan_std_relocs (info, abfd, sec,
-				   (struct reloc_std_external *) relocs,
-				   rel_size))
-	goto error_return;
-    }
-  else
-    {
-      if (! sunos_scan_ext_relocs (info, abfd, sec,
-				   (struct reloc_ext_external *) relocs,
-				   rel_size))
-	goto error_return;
-    }
-
-  if (free_relocs != NULL)
-    free (free_relocs);
-
-  return true;
-
- error_return:
-  if (free_relocs != NULL)
-    free (free_relocs);
-  return false;
-}
-
-/* Scan the relocs for an input section using standard relocs.  We
-   need to figure out what to do for each reloc against a dynamic
-   symbol.  If the symbol is in the .text section, an entry is made in
-   the procedure linkage table.  Note that this will do the wrong
-   thing if the symbol is actually data; I don't think the Sun 3
-   native linker handles this case correctly either.  If the symbol is
-   not in the .text section, we must preserve the reloc as a dynamic
-   reloc.  FIXME: We should also handle the PIC relocs here by
-   building global offset table entries.  */
-
-static boolean
-sunos_scan_std_relocs (info, abfd, sec, relocs, rel_size)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     asection *sec;
-     const struct reloc_std_external *relocs;
-     bfd_size_type rel_size;
-{
-  bfd *dynobj;
-  asection *splt = NULL;
-  asection *srel = NULL;
-  struct sunos_link_hash_entry **sym_hashes;
-  const struct reloc_std_external *rel, *relend;
-
-  /* We only know how to handle m68k plt entries.  */
-  if (bfd_get_arch (abfd) != bfd_arch_m68k)
-    {
-      bfd_set_error (bfd_error_invalid_target);
-      return false;
-    }
-
-  dynobj = NULL;
-
-  sym_hashes = (struct sunos_link_hash_entry **) obj_aout_sym_hashes (abfd);
-
-  relend = relocs + rel_size / RELOC_STD_SIZE;
-  for (rel = relocs; rel < relend; rel++)
-    {
-      int r_index;
-      struct sunos_link_hash_entry *h;
-
-      /* We only want relocs against external symbols.  */
-      if (bfd_header_big_endian (abfd))
-	{
-	  if ((rel->r_type[0] & RELOC_STD_BITS_EXTERN_BIG) == 0)
-	    continue;
-	}
-      else
-	{
-	  if ((rel->r_type[0] & RELOC_STD_BITS_EXTERN_LITTLE) == 0)
-	    continue;
-	}
-
-      /* Get the symbol index.  */
-      if (bfd_header_big_endian (abfd))
-	r_index = ((rel->r_index[0] << 16)
-		   | (rel->r_index[1] << 8)
-		   | rel->r_index[2]);
-      else
-	r_index = ((rel->r_index[2] << 16)
-		   | (rel->r_index[1] << 8)
-		   | rel->r_index[0]);
-
-      /* Get the hash table entry.  */
-      h = sym_hashes[r_index];
-      if (h == NULL)
-	{
-	  /* This should not normally happen, but it will in any case
-	     be caught in the relocation phase.  */
-	  continue;
-	}
-
-      /* At this point common symbols have already been allocated, so
-	 we don't have to worry about them.  We need to consider that
-	 we may have already seen this symbol and marked it undefined;
-	 if the symbol is really undefined, then SUNOS_DEF_DYNAMIC
-	 will be zero.  */
-      if (h->root.root.type != bfd_link_hash_defined
-	  && h->root.root.type != bfd_link_hash_defweak
-	  && h->root.root.type != bfd_link_hash_undefined)
-	continue;
-
-      if ((h->flags & SUNOS_DEF_DYNAMIC) == 0
-	  || (h->flags & SUNOS_DEF_REGULAR) != 0)
-	continue;
-
-      if (dynobj == NULL)
-	{
-	  asection *sgot;
-
-	  if (! sunos_create_dynamic_sections (abfd, info, false))
-	    return false;
-	  dynobj = sunos_hash_table (info)->dynobj;
-	  splt = bfd_get_section_by_name (dynobj, ".plt");
-	  srel = bfd_get_section_by_name (dynobj, ".dynrel");
-	  BFD_ASSERT (splt != NULL && srel != NULL);
-
-	  sgot = bfd_get_section_by_name (dynobj, ".got");
-	  BFD_ASSERT (sgot != NULL);
-	  if (sgot->_raw_size == 0)
-	    sgot->_raw_size = BYTES_IN_WORD;
-	  sunos_hash_table (info)->got_needed = true;
-	}
-
-      BFD_ASSERT ((h->flags & SUNOS_REF_REGULAR) != 0);
-      BFD_ASSERT (h->plt_offset != 0
-		  || ((h->root.root.type == bfd_link_hash_defined
-		       || h->root.root.type == bfd_link_hash_defweak)
-		      ? (h->root.root.u.def.section->owner->flags
-			 & DYNAMIC) != 0
-		      : (h->root.root.u.undef.abfd->flags & DYNAMIC) != 0));
-
-      /* This reloc is against a symbol defined only by a dynamic
-	 object.  */
-
-      if (h->root.root.type == bfd_link_hash_undefined)
-	{
-	  /* Presumably this symbol was marked as being undefined by
-	     an earlier reloc.  */
-	  srel->_raw_size += RELOC_STD_SIZE;
-	}
-      else if ((h->root.root.u.def.section->flags & SEC_CODE) == 0)
-	{
-	  bfd *sub;
-
-	  /* This reloc is not in the .text section.  It must be
-	     copied into the dynamic relocs.  We mark the symbol as
-	     being undefined.  */
-	  srel->_raw_size += RELOC_STD_SIZE;
-	  sub = h->root.root.u.def.section->owner;
-	  h->root.root.type = bfd_link_hash_undefined;
-	  h->root.root.u.undef.abfd = sub;
-	}
-      else
-	{
-	  /* This symbol is in the .text section.  We must give it an
-	     entry in the procedure linkage table, if we have not
-	     already done so.  We change the definition of the symbol
-	     to the .plt section; this will cause relocs against it to
-	     be handled correctly.  */
-	  if (h->plt_offset == 0)
-	    {
-	      if (splt->_raw_size == 0)
-		splt->_raw_size = M68K_PLT_ENTRY_SIZE;
-	      h->plt_offset = splt->_raw_size;
-
-	      if ((h->flags & SUNOS_DEF_REGULAR) == 0)
-		{
-		  h->root.root.u.def.section = splt;
-		  h->root.root.u.def.value = splt->_raw_size;
-		}
-
-	      splt->_raw_size += M68K_PLT_ENTRY_SIZE;
-
-	      /* We may also need a dynamic reloc entry.  */
-	      if ((h->flags & SUNOS_DEF_REGULAR) == 0)
-		srel->_raw_size += RELOC_STD_SIZE;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* Scan the relocs for an input section using extended relocs.  We
-   need to figure out what to do for each reloc against a dynamic
-   symbol.  If the reloc is a WDISP30, and the symbol is in the .text
-   section, an entry is made in the procedure linkage table.
-   Otherwise, we must preserve the reloc as a dynamic reloc.  */
-
-static boolean
-sunos_scan_ext_relocs (info, abfd, sec, relocs, rel_size)
-     struct bfd_link_info *info;
-     bfd *abfd;
-     asection *sec;
-     const struct reloc_ext_external *relocs;
-     bfd_size_type rel_size;
-{
-  bfd *dynobj;
-  struct sunos_link_hash_entry **sym_hashes;
-  const struct reloc_ext_external *rel, *relend;
-  asection *splt = NULL;
-  asection *sgot = NULL;
-  asection *srel = NULL;
-
-  /* We only know how to handle SPARC plt entries.  */
-  if (bfd_get_arch (abfd) != bfd_arch_sparc)
-    {
-      bfd_set_error (bfd_error_invalid_target);
-      return false;
-    }
-
-  dynobj = NULL;
-
-  sym_hashes = (struct sunos_link_hash_entry **) obj_aout_sym_hashes (abfd);
-
-  relend = relocs + rel_size / RELOC_EXT_SIZE;
-  for (rel = relocs; rel < relend; rel++)
-    {
-      unsigned int r_index;
-      int r_extern;
-      int r_type;
-      struct sunos_link_hash_entry *h = NULL;
-
-      /* Swap in the reloc information.  */
-      if (bfd_header_big_endian (abfd))
-	{
-	  r_index = ((rel->r_index[0] << 16)
-		     | (rel->r_index[1] << 8)
-		     | rel->r_index[2]);
-	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_BIG));
-	  r_type = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
-		    >> RELOC_EXT_BITS_TYPE_SH_BIG);
-	}
-      else
-	{
-	  r_index = ((rel->r_index[2] << 16)
-		     | (rel->r_index[1] << 8)
-		     | rel->r_index[0]);
-	  r_extern = (0 != (rel->r_type[0] & RELOC_EXT_BITS_EXTERN_LITTLE));
-	  r_type = ((rel->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
-		    >> RELOC_EXT_BITS_TYPE_SH_LITTLE);
-	}
-
-      if (r_extern)
-	{
-	  h = sym_hashes[r_index];
-	  if (h == NULL)
-	    {
-	      /* This should not normally happen, but it will in any
-		 case be caught in the relocation phase.  */
-	      continue;
-	    }
-	}
-
-      /* If this is a base relative reloc, we need to make an entry in
-         the .got section.  */
-      if (r_type == RELOC_BASE10
-	  || r_type == RELOC_BASE13
-	  || r_type == RELOC_BASE22)
-	{
-	  if (dynobj == NULL)
-	    {
-	      if (! sunos_create_dynamic_sections (abfd, info, false))
-		return false;
-	      dynobj = sunos_hash_table (info)->dynobj;
-	      splt = bfd_get_section_by_name (dynobj, ".plt");
-	      sgot = bfd_get_section_by_name (dynobj, ".got");
-	      srel = bfd_get_section_by_name (dynobj, ".dynrel");
-	      BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
-
-	      /* Make sure we have an initial entry in the .got table.  */
-	      if (sgot->_raw_size == 0)
-		sgot->_raw_size = BYTES_IN_WORD;
-	      sunos_hash_table (info)->got_needed = true;
-	    }
-
-	  if (r_extern)
-	    {
-	      if (h->got_offset != 0)
-		continue;
-
-	      h->got_offset = sgot->_raw_size;
-	    }
-	  else
-	    {
-	      if (r_index >= bfd_get_symcount (abfd))
-		{
-		  /* This is abnormal, but should be caught in the
-		     relocation phase.  */
-		  continue;
-		}
-
-	      if (adata (abfd).local_got_offsets == NULL)
-		{
-		  adata (abfd).local_got_offsets =
-		    (bfd_vma *) bfd_zalloc (abfd,
-					    (bfd_get_symcount (abfd)
-					     * sizeof (bfd_vma)));
-		  if (adata (abfd).local_got_offsets == NULL)
-		    return false;
-		}
-
-	      if (adata (abfd).local_got_offsets[r_index] != 0)
-		continue;
-
-	      adata (abfd).local_got_offsets[r_index] = sgot->_raw_size;
-	    }
-
-	  sgot->_raw_size += BYTES_IN_WORD;
-
-	  /* If we are making a shared library, or if the symbol is
-	     defined by a dynamic object, we will need a dynamic reloc
-	     entry.  */
-	  if (info->shared
-	      || (h != NULL
-		  && (h->flags & SUNOS_DEF_DYNAMIC) != 0
-		  && (h->flags & SUNOS_DEF_REGULAR) == 0))
-	    srel->_raw_size += RELOC_EXT_SIZE;
-
-	  continue;
-	}
-
-      /* Otherwise, we are only interested in relocs against symbols
-         defined in dynamic objects but not in regular objects.  We
-         only need to consider relocs against external symbols.  */
-      if (! r_extern)
-	{
-	  /* But, if we are creating a shared library, we need to
-             generate an absolute reloc.  */
-	  if (info->shared)
-	    {
-	      if (dynobj == NULL)
-		{
-		  if (! sunos_create_dynamic_sections (abfd, info, true))
-		    return false;
-		  dynobj = sunos_hash_table (info)->dynobj;
-		  splt = bfd_get_section_by_name (dynobj, ".plt");
-		  sgot = bfd_get_section_by_name (dynobj, ".got");
-		  srel = bfd_get_section_by_name (dynobj, ".dynrel");
-		  BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
-		}
-
-	      srel->_raw_size += RELOC_EXT_SIZE;
-	    }
-
-	  continue;
-	}
-
-      /* At this point common symbols have already been allocated, so
-	 we don't have to worry about them.  We need to consider that
-	 we may have already seen this symbol and marked it undefined;
-	 if the symbol is really undefined, then SUNOS_DEF_DYNAMIC
-	 will be zero.  */
-      if (h->root.root.type != bfd_link_hash_defined
-	  && h->root.root.type != bfd_link_hash_defweak
-	  && h->root.root.type != bfd_link_hash_undefined)
-	continue;
-
-      if (r_type != RELOC_JMP_TBL
-	  && ! info->shared
-	  && ((h->flags & SUNOS_DEF_DYNAMIC) == 0
-	      || (h->flags & SUNOS_DEF_REGULAR) != 0))
-	continue;
-
-      if (r_type == RELOC_JMP_TBL
-	  && ! info->shared
-	  && (h->flags & SUNOS_DEF_DYNAMIC) == 0
-	  && (h->flags & SUNOS_DEF_REGULAR) == 0)
-	{
-	  /* This symbol is apparently undefined.  Don't do anything
-             here; just let the relocation routine report an undefined
-             symbol.  */
-	  continue;
-	}
-
-      if (strcmp (h->root.root.root.string, "__GLOBAL_OFFSET_TABLE_") == 0)
-	continue;
-
-      if (dynobj == NULL)
-	{
-	  if (! sunos_create_dynamic_sections (abfd, info, false))
-	    return false;
-	  dynobj = sunos_hash_table (info)->dynobj;
-	  splt = bfd_get_section_by_name (dynobj, ".plt");
-	  sgot = bfd_get_section_by_name (dynobj, ".got");
-	  srel = bfd_get_section_by_name (dynobj, ".dynrel");
-	  BFD_ASSERT (splt != NULL && sgot != NULL && srel != NULL);
-
-	  /* Make sure we have an initial entry in the .got table.  */
-	  if (sgot->_raw_size == 0)
-	    sgot->_raw_size = BYTES_IN_WORD;
-	  sunos_hash_table (info)->got_needed = true;
-	}
-
-      BFD_ASSERT (r_type == RELOC_JMP_TBL
-		  || info->shared
-		  || (h->flags & SUNOS_REF_REGULAR) != 0);
-      BFD_ASSERT (r_type == RELOC_JMP_TBL
-		  || info->shared
-		  || h->plt_offset != 0
-		  || ((h->root.root.type == bfd_link_hash_defined
-		       || h->root.root.type == bfd_link_hash_defweak)
-		      ? (h->root.root.u.def.section->owner->flags
-			 & DYNAMIC) != 0
-		      : (h->root.root.u.undef.abfd->flags & DYNAMIC) != 0));
-
-      /* This reloc is against a symbol defined only by a dynamic
-	 object, or it is a jump table reloc from PIC compiled code.  */
-
-      if (r_type != RELOC_JMP_TBL
-	  && h->root.root.type == bfd_link_hash_undefined)
-	{
-	  /* Presumably this symbol was marked as being undefined by
-	     an earlier reloc.  */
-	  srel->_raw_size += RELOC_EXT_SIZE;
-	}
-      else if (r_type != RELOC_JMP_TBL
-	       && (h->root.root.u.def.section->flags & SEC_CODE) == 0)
-	{
-	  bfd *sub;
-
-	  /* This reloc is not in the .text section.  It must be
-	     copied into the dynamic relocs.  We mark the symbol as
-	     being undefined.  */
-	  srel->_raw_size += RELOC_EXT_SIZE;
-	  if ((h->flags & SUNOS_DEF_REGULAR) == 0)
-	    {
-	      sub = h->root.root.u.def.section->owner;
-	      h->root.root.type = bfd_link_hash_undefined;
-	      h->root.root.u.undef.abfd = sub;
-	    }
-	}
-      else
-	{
-	  /* This symbol is in the .text section.  We must give it an
-	     entry in the procedure linkage table, if we have not
-	     already done so.  We change the definition of the symbol
-	     to the .plt section; this will cause relocs against it to
-	     be handled correctly.  */
-	  if (h->plt_offset == 0)
-	    {
-	      if (splt->_raw_size == 0)
-		splt->_raw_size = SPARC_PLT_ENTRY_SIZE;
-	      h->plt_offset = splt->_raw_size;
-
-	      if ((h->flags & SUNOS_DEF_REGULAR) == 0)
-		{
-		  if (h->root.root.type == bfd_link_hash_undefined)
-		    h->root.root.type = bfd_link_hash_defined;
-		  h->root.root.u.def.section = splt;
-		  h->root.root.u.def.value = splt->_raw_size;
-		}
-
-	      splt->_raw_size += SPARC_PLT_ENTRY_SIZE;
-
-	      /* We will also need a dynamic reloc entry, unless this
-                 is a JMP_TBL reloc produced by linking PIC compiled
-                 code, and we are not making a shared library.  */
-	      if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
-		srel->_raw_size += RELOC_EXT_SIZE;
-	    }
-
-	  /* If we are creating a shared library, we need to copy over
-             any reloc other than a jump table reloc.  */
-	  if (info->shared && r_type != RELOC_JMP_TBL)
-	    srel->_raw_size += RELOC_EXT_SIZE;
-	}
-    }
-
-  return true;
-}
-
-/* Build the hash table of dynamic symbols, and to mark as written all
-   symbols from dynamic objects which we do not plan to write out.  */
-
-static boolean
-sunos_scan_dynamic_symbol (h, data)
-     struct sunos_link_hash_entry *h;
-     PTR data;
-{
-  struct bfd_link_info *info = (struct bfd_link_info *) data;
-
-  /* Set the written flag for symbols we do not want to write out as
-     part of the regular symbol table.  This is all symbols which are
-     not defined in a regular object file.  For some reason symbols
-     which are referenced by a regular object and defined by a dynamic
-     object do not seem to show up in the regular symbol table.  It is
-     possible for a symbol to have only SUNOS_REF_REGULAR set here, it
-     is an undefined symbol which was turned into a common symbol
-     because it was found in an archive object which was not included
-     in the link.  */
-  if ((h->flags & SUNOS_DEF_REGULAR) == 0
-      && (h->flags & SUNOS_DEF_DYNAMIC) != 0
-      && strcmp (h->root.root.root.string, "__DYNAMIC") != 0)
-    h->root.written = true;
-
-  /* If this symbol is defined by a dynamic object and referenced by a
-     regular object, see whether we gave it a reasonable value while
-     scanning the relocs.  */
-
-  if ((h->flags & SUNOS_DEF_REGULAR) == 0
-      && (h->flags & SUNOS_DEF_DYNAMIC) != 0
-      && (h->flags & SUNOS_REF_REGULAR) != 0)
-    {
-      if ((h->root.root.type == bfd_link_hash_defined
-	   || h->root.root.type == bfd_link_hash_defweak)
-	  && ((h->root.root.u.def.section->owner->flags & DYNAMIC) != 0)
-	  && h->root.root.u.def.section->output_section == NULL)
-	{
-	  bfd *sub;
-
-	  /* This symbol is currently defined in a dynamic section
-	     which is not being put into the output file.  This
-	     implies that there is no reloc against the symbol.  I'm
-	     not sure why this case would ever occur.  In any case, we
-	     change the symbol to be undefined.  */
-	  sub = h->root.root.u.def.section->owner;
-	  h->root.root.type = bfd_link_hash_undefined;
-	  h->root.root.u.undef.abfd = sub;
-	}
-    }
-
-  /* If this symbol is defined or referenced by a regular file, add it
-     to the dynamic symbols.  */
-  if ((h->flags & (SUNOS_DEF_REGULAR | SUNOS_REF_REGULAR)) != 0)
-    {
-      asection *s;
-      size_t len;
-      bfd_byte *contents;
-      unsigned char *name;
-      unsigned long hash;
-      bfd *dynobj;
-
-      BFD_ASSERT (h->dynindx == -2);
-
-      dynobj = sunos_hash_table (info)->dynobj;
-
-      h->dynindx = sunos_hash_table (info)->dynsymcount;
-      ++sunos_hash_table (info)->dynsymcount;
-
-      len = strlen (h->root.root.root.string);
-
-      /* We don't bother to construct a BFD hash table for the strings
-	 which are the names of the dynamic symbols.  Using a hash
-	 table for the regular symbols is beneficial, because the
-	 regular symbols includes the debugging symbols, which have
-	 long names and are often duplicated in several object files.
-	 There are no debugging symbols in the dynamic symbols.  */
-      s = bfd_get_section_by_name (dynobj, ".dynstr");
-      BFD_ASSERT (s != NULL);
-      contents = (bfd_byte *) bfd_realloc (s->contents,
-					   s->_raw_size + len + 1);
-      if (contents == NULL)
-	return false;
-      s->contents = contents;
-
-      h->dynstr_index = s->_raw_size;
-      strcpy ((char *) contents + s->_raw_size, h->root.root.root.string);
-      s->_raw_size += len + 1;
-
-      /* Add it to the dynamic hash table.  */
-      name = (unsigned char *) h->root.root.root.string;
-      hash = 0;
-      while (*name != '\0')
-	hash = (hash << 1) + *name++;
-      hash &= 0x7fffffff;
-      hash %= sunos_hash_table (info)->bucketcount;
-
-      s = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (s != NULL);
-
-      if (GET_SWORD (dynobj, s->contents + hash * HASH_ENTRY_SIZE) == -1)
-	PUT_WORD (dynobj, h->dynindx, s->contents + hash * HASH_ENTRY_SIZE);
-      else
-	{
-	  bfd_vma next;
-
-	  next = GET_WORD (dynobj,
-			   (s->contents
-			    + hash * HASH_ENTRY_SIZE
-			    + BYTES_IN_WORD));
-	  PUT_WORD (dynobj, s->_raw_size / HASH_ENTRY_SIZE,
-		    s->contents + hash * HASH_ENTRY_SIZE + BYTES_IN_WORD);
-	  PUT_WORD (dynobj, h->dynindx, s->contents + s->_raw_size);
-	  PUT_WORD (dynobj, next, s->contents + s->_raw_size + BYTES_IN_WORD);
-	  s->_raw_size += HASH_ENTRY_SIZE;
-	}
-    }
-
-  return true;
-}
-
-/* Link a dynamic object.  We actually don't have anything to do at
-   this point.  This entry point exists to prevent the regular linker
-   code from doing anything with the object.  */
-
-/*ARGSUSED*/
-static boolean
-sunos_link_dynamic_object (info, abfd)
-     struct bfd_link_info *info;
-     bfd *abfd;
-{
-  return true;
-}
-
-/* Write out a dynamic symbol.  This is called by the final traversal
-   over the symbol table.  */
-
-static boolean
-sunos_write_dynamic_symbol (output_bfd, info, harg)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct aout_link_hash_entry *harg;
-{
-  struct sunos_link_hash_entry *h = (struct sunos_link_hash_entry *) harg;
-  int type;
-  bfd_vma val;
-  asection *s;
-  struct external_nlist *outsym;
-
-  /* If this symbol is in the procedure linkage table, fill in the
-     table entry.  */
-  if (h->plt_offset != 0)
-    {
-      bfd *dynobj;
-      asection *splt;
-      bfd_byte *p;
-      asection *s;
-      bfd_vma r_address;
-
-      dynobj = sunos_hash_table (info)->dynobj;
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      p = splt->contents + h->plt_offset;
-
-      s = bfd_get_section_by_name (dynobj, ".dynrel");
-
-      r_address = (splt->output_section->vma
-		   + splt->output_offset
-		   + h->plt_offset);
-
-      switch (bfd_get_arch (output_bfd))
-	{
-	case bfd_arch_sparc:
-	  if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
-	    {
-	      bfd_put_32 (output_bfd, SPARC_PLT_ENTRY_WORD0, p);
-	      bfd_put_32 (output_bfd,
-			  (SPARC_PLT_ENTRY_WORD1
-			   + (((- (h->plt_offset + 4) >> 2)
-			       & 0x3fffffff))),
-			  p + 4);
-	      bfd_put_32 (output_bfd, SPARC_PLT_ENTRY_WORD2 + s->reloc_count,
-			  p + 8);
-	    }
-	  else
-	    {
-	      bfd_vma val;
-
-	      val = (h->root.root.u.def.section->output_section->vma
-		     + h->root.root.u.def.section->output_offset
-		     + h->root.root.u.def.value);
-	      bfd_put_32 (output_bfd,
-			  SPARC_PLT_PIC_WORD0 + ((val >> 10) & 0x3fffff),
-			  p);
-	      bfd_put_32 (output_bfd,
-			  SPARC_PLT_PIC_WORD1 + (val & 0x3ff),
-			  p + 4);
-	      bfd_put_32 (output_bfd, SPARC_PLT_PIC_WORD2, p + 8);
-	    }
-	  break;
-
-	case bfd_arch_m68k:
-	  if (! info->shared && (h->flags & SUNOS_DEF_REGULAR) != 0)
-	    abort ();
-	  bfd_put_16 (output_bfd, M68K_PLT_ENTRY_WORD0, p);
-	  bfd_put_32 (output_bfd, (- (h->plt_offset + 2)), p + 2);
-	  bfd_put_16 (output_bfd, s->reloc_count, p + 6);
-	  r_address += 2;
-	  break;
-
-	default:
-	  abort ();
-	}
-
-      /* We also need to add a jump table reloc, unless this is the
-         result of a JMP_TBL reloc from PIC compiled code.  */
-      if (info->shared || (h->flags & SUNOS_DEF_REGULAR) == 0)
-	{
-	  BFD_ASSERT (h->dynindx >= 0);
-	  BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj)
-		      < s->_raw_size);
-	  p = s->contents + s->reloc_count * obj_reloc_entry_size (output_bfd);
-	  if (obj_reloc_entry_size (output_bfd) == RELOC_STD_SIZE)
-	    {
-	      struct reloc_std_external *srel;
-
-	      srel = (struct reloc_std_external *) p;
-	      PUT_WORD (output_bfd, r_address, srel->r_address);
-	      if (bfd_header_big_endian (output_bfd))
-		{
-		  srel->r_index[0] = (bfd_byte)(h->dynindx >> 16);
-		  srel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
-		  srel->r_index[2] = (bfd_byte)(h->dynindx);
-		  srel->r_type[0] = (RELOC_STD_BITS_EXTERN_BIG
-				     | RELOC_STD_BITS_JMPTABLE_BIG);
-		}
-	      else
-		{
-		  srel->r_index[2] = (bfd_byte)(h->dynindx >> 16);
-		  srel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
-		  srel->r_index[0] = (bfd_byte)h->dynindx;
-		  srel->r_type[0] = (RELOC_STD_BITS_EXTERN_LITTLE
-				     | RELOC_STD_BITS_JMPTABLE_LITTLE);
-		}
-	    }
-	  else
-	    {
-	      struct reloc_ext_external *erel;
-
-	      erel = (struct reloc_ext_external *) p;
-	      PUT_WORD (output_bfd, r_address, erel->r_address);
-	      if (bfd_header_big_endian (output_bfd))
-		{
-		  erel->r_index[0] = (bfd_byte)(h->dynindx >> 16);
-		  erel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
-		  erel->r_index[2] = (bfd_byte)h->dynindx;
-		  erel->r_type[0] =
-		    (RELOC_EXT_BITS_EXTERN_BIG
-		     | (RELOC_JMP_SLOT << RELOC_EXT_BITS_TYPE_SH_BIG));
-		}
-	      else
-		{
-		  erel->r_index[2] = (bfd_byte)(h->dynindx >> 16);
-		  erel->r_index[1] = (bfd_byte)(h->dynindx >> 8);
-		  erel->r_index[0] = (bfd_byte)h->dynindx;
-		  erel->r_type[0] =
-		    (RELOC_EXT_BITS_EXTERN_LITTLE
-		     | (RELOC_JMP_SLOT << RELOC_EXT_BITS_TYPE_SH_LITTLE));
-		}
-	      PUT_WORD (output_bfd, (bfd_vma) 0, erel->r_addend);
-	    }
-
-	  ++s->reloc_count;
-	}
-    }
-
-  /* If this is not a dynamic symbol, we don't have to do anything
-     else.  We only check this after handling the PLT entry, because
-     we can have a PLT entry for a nondynamic symbol when linking PIC
-     compiled code from a regular object.  */
-  if (h->dynindx < 0)
-    return true;
-
-  switch (h->root.root.type)
-    {
-    default:
-    case bfd_link_hash_new:
-      abort ();
-      /* Avoid variable not initialized warnings.  */
-      return true;
-    case bfd_link_hash_undefined:
-      type = N_UNDF | N_EXT;
-      val = 0;
-      break;
-    case bfd_link_hash_defined:
-    case bfd_link_hash_defweak:
-      {
-	asection *sec;
-	asection *output_section;
-
-	sec = h->root.root.u.def.section;
-	output_section = sec->output_section;
-	BFD_ASSERT (bfd_is_abs_section (output_section)
-		    || output_section->owner == output_bfd);
-	if (h->plt_offset != 0
-	    && (h->flags & SUNOS_DEF_REGULAR) == 0)
-	  {
-	    type = N_UNDF | N_EXT;
-	    val = 0;
-	  }
-	else
-	  {
-	    if (output_section == obj_textsec (output_bfd))
-	      type = (h->root.root.type == bfd_link_hash_defined
-		      ? N_TEXT
-		      : N_WEAKT);
-	    else if (output_section == obj_datasec (output_bfd))
-	      type = (h->root.root.type == bfd_link_hash_defined
-		      ? N_DATA
-		      : N_WEAKD);
-	    else if (output_section == obj_bsssec (output_bfd))
-	      type = (h->root.root.type == bfd_link_hash_defined
-		      ? N_BSS
-		      : N_WEAKB);
-	    else
-	      type = (h->root.root.type == bfd_link_hash_defined
-		      ? N_ABS
-		      : N_WEAKA);
-	    type |= N_EXT;
-	    val = (h->root.root.u.def.value
-		   + output_section->vma
-		   + sec->output_offset);
-	  }
-      }
-      break;
-    case bfd_link_hash_common:
-      type = N_UNDF | N_EXT;
-      val = h->root.root.u.c.size;
-      break;
-    case bfd_link_hash_undefweak:
-      type = N_WEAKU;
-      val = 0;
-      break;
-    case bfd_link_hash_indirect:
-    case bfd_link_hash_warning:
-      /* FIXME: Ignore these for now.  The circumstances under which
-	 they should be written out are not clear to me.  */
-      return true;
-    }
-
-  s = bfd_get_section_by_name (sunos_hash_table (info)->dynobj, ".dynsym");
-  BFD_ASSERT (s != NULL);
-  outsym = ((struct external_nlist *)
-	    (s->contents + h->dynindx * EXTERNAL_NLIST_SIZE));
-
-  bfd_h_put_8 (output_bfd, type, outsym->e_type);
-  bfd_h_put_8 (output_bfd, 0, outsym->e_other);
-
-  /* FIXME: The native linker doesn't use 0 for desc.  It seems to use
-     one less than the desc value in the shared library, although that
-     seems unlikely.  */
-  bfd_h_put_16 (output_bfd, 0, outsym->e_desc);
-
-  PUT_WORD (output_bfd, h->dynstr_index, outsym->e_strx);
-  PUT_WORD (output_bfd, val, outsym->e_value);
-
-  return true;
-}
-
-/* This is called for each reloc against an external symbol.  If this
-   is a reloc which are are going to copy as a dynamic reloc, then
-   copy it over, and tell the caller to not bother processing this
-   reloc.  */
-
-/*ARGSUSED*/
-static boolean
-sunos_check_dynamic_reloc (info, input_bfd, input_section, harg, reloc,
-			   contents, skip, relocationp)
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     struct aout_link_hash_entry *harg;
-     PTR reloc;
-     bfd_byte *contents;
-     boolean *skip;
-     bfd_vma *relocationp;
-{
-  struct sunos_link_hash_entry *h = (struct sunos_link_hash_entry *) harg;
-  bfd *dynobj;
-  boolean baserel;
-  boolean jmptbl;
-  boolean pcrel;
-  asection *s;
-  bfd_byte *p;
-  long indx;
-
-  *skip = false;
-
-  dynobj = sunos_hash_table (info)->dynobj;
-
-  if (h != NULL
-      && h->plt_offset != 0
-      && (info->shared
-	  || (h->flags & SUNOS_DEF_REGULAR) == 0))
-    {
-      asection *splt;
-
-      /* Redirect the relocation to the PLT entry.  */
-      splt = bfd_get_section_by_name (dynobj, ".plt");
-      *relocationp = (splt->output_section->vma
-		      + splt->output_offset
-		      + h->plt_offset);
-    }
-
-  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
-    {
-      struct reloc_std_external *srel;
-
-      srel = (struct reloc_std_external *) reloc;
-      if (bfd_header_big_endian (input_bfd))
-	{
-	  baserel = (0 != (srel->r_type[0] & RELOC_STD_BITS_BASEREL_BIG));
-	  jmptbl = (0 != (srel->r_type[0] & RELOC_STD_BITS_JMPTABLE_BIG));
-	  pcrel = (0 != (srel->r_type[0] & RELOC_STD_BITS_PCREL_BIG));
-	}
-      else
-	{
-	  baserel = (0 != (srel->r_type[0] & RELOC_STD_BITS_BASEREL_LITTLE));
-	  jmptbl = (0 != (srel->r_type[0] & RELOC_STD_BITS_JMPTABLE_LITTLE));
-	  pcrel = (0 != (srel->r_type[0] & RELOC_STD_BITS_PCREL_LITTLE));
-	}
-    }
-  else
-    {
-      struct reloc_ext_external *erel;
-      int r_type;
-
-      erel = (struct reloc_ext_external *) reloc;
-      if (bfd_header_big_endian (input_bfd))
-	r_type = ((erel->r_type[0] & RELOC_EXT_BITS_TYPE_BIG)
-		  >> RELOC_EXT_BITS_TYPE_SH_BIG);
-      else
-	r_type = ((erel->r_type[0] & RELOC_EXT_BITS_TYPE_LITTLE)
-		  >> RELOC_EXT_BITS_TYPE_SH_LITTLE);
-      baserel = (r_type == RELOC_BASE10
-		 || r_type == RELOC_BASE13
-		 || r_type == RELOC_BASE22);
-      jmptbl = r_type == RELOC_JMP_TBL;
-      pcrel = (r_type == RELOC_DISP8
-	       || r_type == RELOC_DISP16
-	       || r_type == RELOC_DISP32
-	       || r_type == RELOC_WDISP30
-	       || r_type == RELOC_WDISP22);
-      /* We don't consider the PC10 and PC22 types to be PC relative,
-         because they are pcrel_offset.  */
-    }
-
-  if (baserel)
-    {
-      bfd_vma *got_offsetp;
-      asection *sgot;
-
-      if (h != NULL)
-	got_offsetp = &h->got_offset;
-      else if (adata (input_bfd).local_got_offsets == NULL)
-	got_offsetp = NULL;
-      else
-	{
-	  struct reloc_std_external *srel;
-	  int r_index;
-
-	  srel = (struct reloc_std_external *) reloc;
-	  if (obj_reloc_entry_size (input_bfd) == RELOC_STD_SIZE)
-	    {
-	      if (bfd_header_big_endian (input_bfd))
-		r_index = ((srel->r_index[0] << 16)
-			   | (srel->r_index[1] << 8)
-			   | srel->r_index[2]);
-	      else
-		r_index = ((srel->r_index[2] << 16)
-			   | (srel->r_index[1] << 8)
-			   | srel->r_index[0]);
-	    }
-	  else
-	    {
-	      struct reloc_ext_external *erel;
-
-	      erel = (struct reloc_ext_external *) reloc;
-	      if (bfd_header_big_endian (input_bfd))
-		r_index = ((erel->r_index[0] << 16)
-			   | (erel->r_index[1] << 8)
-			   | erel->r_index[2]);
-	      else
-		r_index = ((erel->r_index[2] << 16)
-			   | (erel->r_index[1] << 8)
-			   | erel->r_index[0]);
-	    }
-
-	  got_offsetp = adata (input_bfd).local_got_offsets + r_index;
-	}
-
-      BFD_ASSERT (got_offsetp != NULL && *got_offsetp != 0);
-
-      sgot = bfd_get_section_by_name (dynobj, ".got");
-
-      /* We set the least significant bit to indicate whether we have
-	 already initialized the GOT entry.  */
-      if ((*got_offsetp & 1) == 0)
-	{
-	  if (h == NULL
-	      || (! info->shared
-		  && ((h->flags & SUNOS_DEF_DYNAMIC) == 0
-		      || (h->flags & SUNOS_DEF_REGULAR) != 0)))
-	    PUT_WORD (dynobj, *relocationp, sgot->contents + *got_offsetp);
-	  else
-	    PUT_WORD (dynobj, 0, sgot->contents + *got_offsetp);
-
-	  if (info->shared
-	      || (h != NULL
-		  && (h->flags & SUNOS_DEF_DYNAMIC) != 0
-		  && (h->flags & SUNOS_DEF_REGULAR) == 0))
-	    {
-	      /* We need to create a GLOB_DAT or 32 reloc to tell the
-                 dynamic linker to fill in this entry in the table.  */
-
-	      s = bfd_get_section_by_name (dynobj, ".dynrel");
-	      BFD_ASSERT (s != NULL);
-	      BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj)
-			  < s->_raw_size);
-
-	      p = (s->contents
-		   + s->reloc_count * obj_reloc_entry_size (dynobj));
-
-	      if (h != NULL)
-		indx = h->dynindx;
-	      else
-		indx = 0;
-
-	      if (obj_reloc_entry_size (dynobj) == RELOC_STD_SIZE)
-		{
-		  struct reloc_std_external *srel;
-
-		  srel = (struct reloc_std_external *) p;
-		  PUT_WORD (dynobj,
-			    (*got_offsetp
-			     + sgot->output_section->vma
-			     + sgot->output_offset),
-			    srel->r_address);
-		  if (bfd_header_big_endian (dynobj))
-		    {
-		      srel->r_index[0] = (bfd_byte)(indx >> 16);
-		      srel->r_index[1] = (bfd_byte)(indx >> 8);
-		      srel->r_index[2] = (bfd_byte)indx;
-		      if (h == NULL)
-			srel->r_type[0] = 2 << RELOC_STD_BITS_LENGTH_SH_BIG;
-		      else
-			srel->r_type[0] =
-			  (RELOC_STD_BITS_EXTERN_BIG
-			   | RELOC_STD_BITS_BASEREL_BIG
-			   | RELOC_STD_BITS_RELATIVE_BIG
-			   | (2 << RELOC_STD_BITS_LENGTH_SH_BIG));
-		    }
-		  else
-		    {
-		      srel->r_index[2] = (bfd_byte)(indx >> 16);
-		      srel->r_index[1] = (bfd_byte)(indx >> 8);
-		      srel->r_index[0] = (bfd_byte)indx;
-		      if (h == NULL)
-			srel->r_type[0] = 2 << RELOC_STD_BITS_LENGTH_SH_LITTLE;
-		      else
-			srel->r_type[0] =
-			  (RELOC_STD_BITS_EXTERN_LITTLE
-			   | RELOC_STD_BITS_BASEREL_LITTLE
-			   | RELOC_STD_BITS_RELATIVE_LITTLE
-			   | (2 << RELOC_STD_BITS_LENGTH_SH_LITTLE));
-		    }
-		}
-	      else
-		{
-		  struct reloc_ext_external *erel;
-
-		  erel = (struct reloc_ext_external *) p;
-		  PUT_WORD (dynobj,
-			    (*got_offsetp
-			     + sgot->output_section->vma
-			     + sgot->output_offset),
-			    erel->r_address);
-		  if (bfd_header_big_endian (dynobj))
-		    {
-		      erel->r_index[0] = (bfd_byte)(indx >> 16);
-		      erel->r_index[1] = (bfd_byte)(indx >> 8);
-		      erel->r_index[2] = (bfd_byte)indx;
-		      if (h == NULL)
-			erel->r_type[0] =
-			  RELOC_32 << RELOC_EXT_BITS_TYPE_SH_BIG;
-		      else
-			erel->r_type[0] =
-			  (RELOC_EXT_BITS_EXTERN_BIG
-			   | (RELOC_GLOB_DAT << RELOC_EXT_BITS_TYPE_SH_BIG));
-		    }
-		  else
-		    {
-		      erel->r_index[2] = (bfd_byte)(indx >> 16);
-		      erel->r_index[1] = (bfd_byte)(indx >> 8);
-		      erel->r_index[0] = (bfd_byte)indx;
-		      if (h == NULL)
-			erel->r_type[0] =
-			  RELOC_32 << RELOC_EXT_BITS_TYPE_SH_LITTLE;
-		      else
-			erel->r_type[0] =
-			  (RELOC_EXT_BITS_EXTERN_LITTLE
-			   | (RELOC_GLOB_DAT
-			      << RELOC_EXT_BITS_TYPE_SH_LITTLE));
-		    }
-		  PUT_WORD (dynobj, 0, erel->r_addend);
-		}
-
-	      ++s->reloc_count;
-	    }
-
-	  *got_offsetp |= 1;
-	}
-
-      *relocationp = (sgot->vma
-		      + (*got_offsetp &~ 1)
-		      - sunos_hash_table (info)->got_base);
-
-      /* There is nothing else to do for a base relative reloc.  */
-      return true;
-    }
-
-  if (! sunos_hash_table (info)->dynamic_sections_needed)
-    return true;
-  if (! info->shared)
-    {
-      if (h == NULL
-	  || h->dynindx == -1
-	  || h->root.root.type != bfd_link_hash_undefined
-	  || (h->flags & SUNOS_DEF_REGULAR) != 0
-	  || (h->flags & SUNOS_DEF_DYNAMIC) == 0
-	  || (h->root.root.u.undef.abfd->flags & DYNAMIC) == 0)
-	return true;
-    }
-  else
-    {
-      if (h != NULL
-	  && (h->dynindx == -1
-	      || jmptbl
-	      || strcmp (h->root.root.root.string,
-			 "__GLOBAL_OFFSET_TABLE_") == 0))
-	return true;
-    }
-
-  /* It looks like this is a reloc we are supposed to copy.  */
-
-  s = bfd_get_section_by_name (dynobj, ".dynrel");
-  BFD_ASSERT (s != NULL);
-  BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj) < s->_raw_size);
-
-  p = s->contents + s->reloc_count * obj_reloc_entry_size (dynobj);
-
-  /* Copy the reloc over.  */
-  memcpy (p, reloc, obj_reloc_entry_size (dynobj));
-
-  if (h != NULL)
-    indx = h->dynindx;
-  else
-    indx = 0;
-
-  /* Adjust the address and symbol index.  */
-  if (obj_reloc_entry_size (dynobj) == RELOC_STD_SIZE)
-    {
-      struct reloc_std_external *srel;
-
-      srel = (struct reloc_std_external *) p;
-      PUT_WORD (dynobj,
-		(GET_WORD (dynobj, srel->r_address)
-		 + input_section->output_section->vma
-		 + input_section->output_offset),
-		srel->r_address);
-      if (bfd_header_big_endian (dynobj))
-	{
-	  srel->r_index[0] = (bfd_byte)(indx >> 16);
-	  srel->r_index[1] = (bfd_byte)(indx >> 8);
-	  srel->r_index[2] = (bfd_byte)indx;
-	}
-      else
-	{
-	  srel->r_index[2] = (bfd_byte)(indx >> 16);
-	  srel->r_index[1] = (bfd_byte)(indx >> 8);
-	  srel->r_index[0] = (bfd_byte)indx;
-	}
-      /* FIXME: We may have to change the addend for a PC relative
-         reloc.  */
-    }
-  else
-    {
-      struct reloc_ext_external *erel;
-
-      erel = (struct reloc_ext_external *) p;
-      PUT_WORD (dynobj,
-		(GET_WORD (dynobj, erel->r_address)
-		 + input_section->output_section->vma
-		 + input_section->output_offset),
-		erel->r_address);
-      if (bfd_header_big_endian (dynobj))
-	{
-	  erel->r_index[0] = (bfd_byte)(indx >> 16);
-	  erel->r_index[1] = (bfd_byte)(indx >> 8);
-	  erel->r_index[2] = (bfd_byte)indx;
-	}
-      else
-	{
-	  erel->r_index[2] = (bfd_byte)(indx >> 16);
-	  erel->r_index[1] = (bfd_byte)(indx >> 8);
-	  erel->r_index[0] = (bfd_byte)indx;
-	}
-      if (pcrel && h != NULL)
-	{
-	  /* Adjust the addend for the change in address.  */
-	  PUT_WORD (dynobj,
-		    (GET_WORD (dynobj, erel->r_addend)
-		     - (input_section->output_section->vma
-			+ input_section->output_offset
-			- input_section->vma)),
-		    erel->r_addend);
-	}
-    }
-
-  ++s->reloc_count;
-
-  if (h != NULL)
-    *skip = true;
-
-  return true;
-}
-
-/* Finish up the dynamic linking information.  */
-
-static boolean
-sunos_finish_dynamic_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd *dynobj;
-  asection *o;
-  asection *s;
-  asection *sdyn;
-
-  if (! sunos_hash_table (info)->dynamic_sections_needed
-      && ! sunos_hash_table (info)->got_needed)
-    return true;
-
-  dynobj = sunos_hash_table (info)->dynobj;
-
-  sdyn = bfd_get_section_by_name (dynobj, ".dynamic");
-  BFD_ASSERT (sdyn != NULL);
-
-  /* Finish up the .need section.  The linker emulation code filled it
-     in, but with offsets from the start of the section instead of
-     real addresses.  Now that we know the section location, we can
-     fill in the final values.  */
-  s = bfd_get_section_by_name (dynobj, ".need");
-  if (s != NULL && s->_raw_size != 0)
-    {
-      file_ptr filepos;
-      bfd_byte *p;
-
-      filepos = s->output_section->filepos + s->output_offset;
-      p = s->contents;
-      while (1)
-	{
-	  bfd_vma val;
-
-	  PUT_WORD (dynobj, GET_WORD (dynobj, p) + filepos, p);
-	  val = GET_WORD (dynobj, p + 12);
-	  if (val == 0)
-	    break;
-	  PUT_WORD (dynobj, val + filepos, p + 12);
-	  p += 16;
-	}
-    }
-
-  /* The first entry in the .got section is the address of the
-     dynamic information, unless this is a shared library.  */
-  s = bfd_get_section_by_name (dynobj, ".got");
-  BFD_ASSERT (s != NULL);
-  if (info->shared || sdyn->_raw_size == 0)
-    PUT_WORD (dynobj, 0, s->contents);
-  else
-    PUT_WORD (dynobj, sdyn->output_section->vma + sdyn->output_offset,
-	      s->contents);
-
-  for (o = dynobj->sections; o != NULL; o = o->next)
-    {
-      if ((o->flags & SEC_HAS_CONTENTS) != 0
-	  && o->contents != NULL)
-	{
-	  BFD_ASSERT (o->output_section != NULL
-		      && o->output_section->owner == abfd);
-	  if (! bfd_set_section_contents (abfd, o->output_section,
-					  o->contents, o->output_offset,
-					  o->_raw_size))
-	    return false;
-	}
-    }
-
-  if (sdyn->_raw_size > 0)
-    {
-      struct external_sun4_dynamic esd;
-      struct external_sun4_dynamic_link esdl;
-
-      /* Finish up the dynamic link information.  */
-      PUT_WORD (dynobj, (bfd_vma) 3, esd.ld_version);
-      PUT_WORD (dynobj,
-		sdyn->output_section->vma + sdyn->output_offset + sizeof esd,
-		esd.ldd);
-      PUT_WORD (dynobj,
-		(sdyn->output_section->vma
-		 + sdyn->output_offset
-		 + sizeof esd
-		 + EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE),
-		esd.ld);
-
-      if (! bfd_set_section_contents (abfd, sdyn->output_section, &esd,
-				      sdyn->output_offset, sizeof esd))
-	return false;
-
-      PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_loaded);
-
-      s = bfd_get_section_by_name (dynobj, ".need");
-      if (s == NULL || s->_raw_size == 0)
-	PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_need);
-      else
-	PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
-		  esdl.ld_need);
-
-      s = bfd_get_section_by_name (dynobj, ".rules");
-      if (s == NULL || s->_raw_size == 0)
-	PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_rules);
-      else
-	PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
-		  esdl.ld_rules);
-
-      s = bfd_get_section_by_name (dynobj, ".got");
-      BFD_ASSERT (s != NULL);
-      PUT_WORD (dynobj, s->output_section->vma + s->output_offset,
-		esdl.ld_got);
-
-      s = bfd_get_section_by_name (dynobj, ".plt");
-      BFD_ASSERT (s != NULL);
-      PUT_WORD (dynobj, s->output_section->vma + s->output_offset,
-		esdl.ld_plt);
-      PUT_WORD (dynobj, s->_raw_size, esdl.ld_plt_sz);
-
-      s = bfd_get_section_by_name (dynobj, ".dynrel");
-      BFD_ASSERT (s != NULL);
-      BFD_ASSERT (s->reloc_count * obj_reloc_entry_size (dynobj)
-		  == s->_raw_size);
-      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
-		esdl.ld_rel);
-
-      s = bfd_get_section_by_name (dynobj, ".hash");
-      BFD_ASSERT (s != NULL);
-      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
-		esdl.ld_hash);
-
-      s = bfd_get_section_by_name (dynobj, ".dynsym");
-      BFD_ASSERT (s != NULL);
-      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
-		esdl.ld_stab);
-
-      PUT_WORD (dynobj, (bfd_vma) 0, esdl.ld_stab_hash);
-
-      PUT_WORD (dynobj, (bfd_vma) sunos_hash_table (info)->bucketcount,
-		esdl.ld_buckets);
-
-      s = bfd_get_section_by_name (dynobj, ".dynstr");
-      BFD_ASSERT (s != NULL);
-      PUT_WORD (dynobj, s->output_section->filepos + s->output_offset,
-		esdl.ld_symbols);
-      PUT_WORD (dynobj, s->_raw_size, esdl.ld_symb_size);
-
-      /* The size of the text area is the size of the .text section
-	 rounded up to a page boundary.  FIXME: Should the page size be
-	 conditional on something?  */
-      PUT_WORD (dynobj,
-		BFD_ALIGN (obj_textsec (abfd)->_raw_size, 0x2000),
-		esdl.ld_text);
-  
-      if (! bfd_set_section_contents (abfd, sdyn->output_section, &esdl,
-				      (sdyn->output_offset
-				       + sizeof esd
-				       + EXTERNAL_SUN4_DYNAMIC_DEBUGGER_SIZE),
-				      sizeof esdl))
-	return false;
-
-      abfd->flags |= DYNAMIC;
-    }
-
-  return true;
-}
diff --git a/bfd/syms.c b/bfd/syms.c
deleted file mode 100644
index f69d1f21fa4..00000000000
--- a/bfd/syms.c
+++ /dev/null
@@ -1,1253 +0,0 @@
-/* Generic symbol-table support for the BFD library.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SECTION
-	Symbols
-
-	BFD tries to maintain as much symbol information as it can when
-	it moves information from file to file. BFD passes information
-	to applications though the <<asymbol>> structure. When the
-	application requests the symbol table, BFD reads the table in
-	the native form and translates parts of it into the internal
-	format. To maintain more than the information passed to
-	applications, some targets keep some information ``behind the
-	scenes'' in a structure only the particular back end knows
-	about. For example, the coff back end keeps the original
-	symbol table structure as well as the canonical structure when
-	a BFD is read in. On output, the coff back end can reconstruct
-	the output symbol table so that no information is lost, even
-	information unique to coff which BFD doesn't know or
-	understand. If a coff symbol table were read, but were written
-	through an a.out back end, all the coff specific information
-	would be lost. The symbol table of a BFD
-	is not necessarily read in until a canonicalize request is
-	made. Then the BFD back end fills in a table provided by the
-	application with pointers to the canonical information.  To
-	output symbols, the application provides BFD with a table of
-	pointers to pointers to <<asymbol>>s. This allows applications
-	like the linker to output a symbol as it was read, since the ``behind
-	the scenes'' information will be still available.
-@menu
-@* Reading Symbols::
-@* Writing Symbols::
-@* Mini Symbols::
-@* typedef asymbol::
-@* symbol handling functions::
-@end menu
-
-INODE
-Reading Symbols, Writing Symbols, Symbols, Symbols
-SUBSECTION
-	Reading symbols
-
-	There are two stages to reading a symbol table from a BFD:
-	allocating storage, and the actual reading process. This is an
-	excerpt from an application which reads the symbol table:
-
-|	  long storage_needed;
-|	  asymbol **symbol_table;
-|	  long number_of_symbols;
-|	  long i;
-|
-|	  storage_needed = bfd_get_symtab_upper_bound (abfd);
-|
-|         if (storage_needed < 0)
-|           FAIL
-|
-|	  if (storage_needed == 0) {
-|	     return ;
-|	  }
-|	  symbol_table = (asymbol **) xmalloc (storage_needed);
-|	    ...
-|	  number_of_symbols =
-|	     bfd_canonicalize_symtab (abfd, symbol_table);
-|
-|         if (number_of_symbols < 0)
-|           FAIL
-|
-|	  for (i = 0; i < number_of_symbols; i++) {
-|	     process_symbol (symbol_table[i]);
-|	  }
-
-	All storage for the symbols themselves is in an objalloc
-	connected to the BFD; it is freed when the BFD is closed.
-
-
-INODE
-Writing Symbols, Mini Symbols, Reading Symbols, Symbols
-SUBSECTION
-	Writing symbols
-
-	Writing of a symbol table is automatic when a BFD open for
-	writing is closed. The application attaches a vector of
-	pointers to pointers to symbols to the BFD being written, and
-	fills in the symbol count. The close and cleanup code reads
-	through the table provided and performs all the necessary
-	operations. The BFD output code must always be provided with an
-	``owned'' symbol: one which has come from another BFD, or one
-	which has been created using <<bfd_make_empty_symbol>>.  Here is an
-	example showing the creation of a symbol table with only one element:
-
-|	#include "bfd.h"
-|	main()
-|	{
-|	  bfd *abfd;
-|	  asymbol *ptrs[2];
-|	  asymbol *new;
-|
-|	  abfd = bfd_openw("foo","a.out-sunos-big");
-|	  bfd_set_format(abfd, bfd_object);
-|	  new = bfd_make_empty_symbol(abfd);
-|	  new->name = "dummy_symbol";
-|	  new->section = bfd_make_section_old_way(abfd, ".text");
-|	  new->flags = BSF_GLOBAL;
-|	  new->value = 0x12345;
-|
-|	  ptrs[0] = new;
-|	  ptrs[1] = (asymbol *)0;
-|
-|	  bfd_set_symtab(abfd, ptrs, 1);
-|	  bfd_close(abfd);
-|	}
-|
-|	./makesym
-|	nm foo
-|	00012345 A dummy_symbol
-
-	Many formats cannot represent arbitary symbol information; for
- 	instance, the <<a.out>> object format does not allow an
-	arbitary number of sections. A symbol pointing to a section
-	which is not one  of <<.text>>, <<.data>> or <<.bss>> cannot
-	be described.
-
-INODE
-Mini Symbols, typedef asymbol, Writing Symbols, Symbols
-SUBSECTION
-	Mini Symbols
-
-	Mini symbols provide read-only access to the symbol table.
-	They use less memory space, but require more time to access.
-	They can be useful for tools like nm or objdump, which may
-	have to handle symbol tables of extremely large executables.
-
-	The <<bfd_read_minisymbols>> function will read the symbols
-	into memory in an internal form.  It will return a <<void *>>
-	pointer to a block of memory, a symbol count, and the size of
-	each symbol.  The pointer is allocated using <<malloc>>, and
-	should be freed by the caller when it is no longer needed.
-
-	The function <<bfd_minisymbol_to_symbol>> will take a pointer
-	to a minisymbol, and a pointer to a structure returned by
-	<<bfd_make_empty_symbol>>, and return a <<asymbol>> structure.
-	The return value may or may not be the same as the value from
-	<<bfd_make_empty_symbol>> which was passed in.
-
-*/
-
-
-
-/*
-DOCDD
-INODE
-typedef asymbol, symbol handling functions, Mini Symbols, Symbols
-
-*/
-/*
-SUBSECTION
-	typedef asymbol
-
-	An <<asymbol>> has the form:
-
-*/
-
-/*
-CODE_FRAGMENT
-
-.
-.typedef struct symbol_cache_entry
-.{
-.	{* A pointer to the BFD which owns the symbol. This information
-.	   is necessary so that a back end can work out what additional
-.   	   information (invisible to the application writer) is carried
-.	   with the symbol.
-.
-.	   This field is *almost* redundant, since you can use section->owner
-.	   instead, except that some symbols point to the global sections
-.	   bfd_{abs,com,und}_section.  This could be fixed by making
-.	   these globals be per-bfd (or per-target-flavor).  FIXME. *}
-.
-.  struct _bfd *the_bfd; {* Use bfd_asymbol_bfd(sym) to access this field. *}
-.
-.	{* The text of the symbol. The name is left alone, and not copied; the
-.	   application may not alter it. *}
-.  CONST char *name;
-.
-.	{* The value of the symbol.  This really should be a union of a
-.          numeric value with a pointer, since some flags indicate that
-.          a pointer to another symbol is stored here.  *}
-.  symvalue value;
-.
-.	{* Attributes of a symbol: *}
-.
-.#define BSF_NO_FLAGS    0x00
-.
-.	{* The symbol has local scope; <<static>> in <<C>>. The value
-. 	   is the offset into the section of the data. *}
-.#define BSF_LOCAL	0x01
-.
-.	{* The symbol has global scope; initialized data in <<C>>. The
-.	   value is the offset into the section of the data. *}
-.#define BSF_GLOBAL	0x02
-.
-.	{* The symbol has global scope and is exported. The value is
-.	   the offset into the section of the data. *}
-.#define BSF_EXPORT	BSF_GLOBAL {* no real difference *}
-.
-.	{* A normal C symbol would be one of:
-.	   <<BSF_LOCAL>>, <<BSF_FORT_COMM>>,  <<BSF_UNDEFINED>> or
-.	   <<BSF_GLOBAL>> *}
-.
-.	{* The symbol is a debugging record. The value has an arbitary
-.	   meaning. *}
-.#define BSF_DEBUGGING	0x08
-.
-.	{* The symbol denotes a function entry point.  Used in ELF,
-.	   perhaps others someday.  *}
-.#define BSF_FUNCTION    0x10
-.
-.	{* Used by the linker. *}
-.#define BSF_KEEP        0x20
-.#define BSF_KEEP_G      0x40
-.
-.	{* A weak global symbol, overridable without warnings by
-.	   a regular global symbol of the same name.  *}
-.#define BSF_WEAK        0x80
-.
-.       {* This symbol was created to point to a section, e.g. ELF's
-.	   STT_SECTION symbols.  *}
-.#define BSF_SECTION_SYM 0x100
-.
-.	{* The symbol used to be a common symbol, but now it is
-.	   allocated. *}
-.#define BSF_OLD_COMMON  0x200
-.
-.	{* The default value for common data. *}
-.#define BFD_FORT_COMM_DEFAULT_VALUE 0
-.
-.	{* In some files the type of a symbol sometimes alters its
-.	   location in an output file - ie in coff a <<ISFCN>> symbol
-.	   which is also <<C_EXT>> symbol appears where it was
-.	   declared and not at the end of a section.  This bit is set
-.  	   by the target BFD part to convey this information. *}
-.
-.#define BSF_NOT_AT_END    0x400
-.
-.	{* Signal that the symbol is the label of constructor section. *}
-.#define BSF_CONSTRUCTOR   0x800
-.
-.	{* Signal that the symbol is a warning symbol.  The name is a
-.	   warning.  The name of the next symbol is the one to warn about;
-.	   if a reference is made to a symbol with the same name as the next
-.	   symbol, a warning is issued by the linker. *}
-.#define BSF_WARNING       0x1000
-.
-.	{* Signal that the symbol is indirect.  This symbol is an indirect
-.	   pointer to the symbol with the same name as the next symbol. *}
-.#define BSF_INDIRECT      0x2000
-.
-.	{* BSF_FILE marks symbols that contain a file name.  This is used
-.	   for ELF STT_FILE symbols.  *}
-.#define BSF_FILE          0x4000
-.
-.	{* Symbol is from dynamic linking information.  *}
-.#define BSF_DYNAMIC	   0x8000
-.
-.       {* The symbol denotes a data object.  Used in ELF, and perhaps
-.          others someday.  *}
-.#define BSF_OBJECT	   0x10000
-.
-.  flagword flags;
-.
-.	{* A pointer to the section to which this symbol is
-.	   relative.  This will always be non NULL, there are special
-.          sections for undefined and absolute symbols.  *}
-.  struct sec *section;
-.
-.	{* Back end special data.  *}
-.  union
-.    {
-.      PTR p;
-.      bfd_vma i;
-.    } udata;
-.
-.} asymbol;
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "bfdlink.h"
-#include "aout/stab_gnu.h"
-
-static char coff_section_type PARAMS ((const char *));
-
-/*
-DOCDD
-INODE
-symbol handling functions,  , typedef asymbol, Symbols
-SUBSECTION
-	Symbol handling functions
-*/
-
-/*
-FUNCTION
-	bfd_get_symtab_upper_bound
-
-DESCRIPTION
-	Return the number of bytes required to store a vector of pointers
-	to <<asymbols>> for all the symbols in the BFD @var{abfd},
-	including a terminal NULL pointer. If there are no symbols in
-	the BFD, then return 0.  If an error occurs, return -1.
-
-.#define bfd_get_symtab_upper_bound(abfd) \
-.     BFD_SEND (abfd, _bfd_get_symtab_upper_bound, (abfd))
-
-*/
-
-/*
-FUNCTION
-	bfd_is_local_label
-
-SYNOPSIS
-        boolean bfd_is_local_label(bfd *abfd, asymbol *sym);
-
-DESCRIPTION
-	Return true if the given symbol @var{sym} in the BFD @var{abfd} is
-	a compiler generated local label, else return false.
-*/
-
-boolean
-bfd_is_local_label (abfd, sym)
-     bfd *abfd;
-     asymbol *sym;
-{
-  if ((sym->flags & (BSF_GLOBAL | BSF_WEAK)) != 0)
-    return false;
-  if (sym->name == NULL)
-    return false;
-  return bfd_is_local_label_name (abfd, sym->name);
-}
-
-/*
-FUNCTION
-	bfd_is_local_label_name
-
-SYNOPSIS
-        boolean bfd_is_local_label_name(bfd *abfd, const char *name);
-
-DESCRIPTION
-	Return true if a symbol with the name @var{name} in the BFD
-	@var{abfd} is a compiler generated local label, else return
-	false.  This just checks whether the name has the form of a
-	local label.
-
-.#define bfd_is_local_label_name(abfd, name) \
-.     BFD_SEND (abfd, _bfd_is_local_label_name, (abfd, name))
-*/
-
-/*
-FUNCTION
-	bfd_canonicalize_symtab
-
-DESCRIPTION
-	Read the symbols from the BFD @var{abfd}, and fills in
-	the vector @var{location} with pointers to the symbols and
-	a trailing NULL.
-	Return the actual number of symbol pointers, not
-	including the NULL.
-
-
-.#define bfd_canonicalize_symtab(abfd, location) \
-.     BFD_SEND (abfd, _bfd_canonicalize_symtab,\
-.                  (abfd, location))
-
-*/
-
-
-/*
-FUNCTION
-	bfd_set_symtab
-
-SYNOPSIS
-	boolean bfd_set_symtab (bfd *abfd, asymbol **location, unsigned int count);
-
-DESCRIPTION
-	Arrange that when the output BFD @var{abfd} is closed,
-	the table @var{location} of @var{count} pointers to symbols
-	will be written.
-*/
-
-boolean
-bfd_set_symtab (abfd, location, symcount)
-     bfd *abfd;
-     asymbol **location;
-     unsigned int symcount;
-{
-  if ((abfd->format != bfd_object) || (bfd_read_p (abfd)))
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  bfd_get_outsymbols (abfd) = location;
-  bfd_get_symcount (abfd) = symcount;
-  return true;
-}
-
-/*
-FUNCTION
-	bfd_print_symbol_vandf
-
-SYNOPSIS
-	void bfd_print_symbol_vandf(PTR file, asymbol *symbol);
-
-DESCRIPTION
-	Print the value and flags of the @var{symbol} supplied to the
-	stream @var{file}.
-*/
-void
-bfd_print_symbol_vandf (arg, symbol)
-     PTR arg;
-     asymbol *symbol;
-{
-  FILE *file = (FILE *) arg;
-  flagword type = symbol->flags;
-  if (symbol->section != (asection *) NULL)
-    {
-      fprintf_vma (file, symbol->value + symbol->section->vma);
-    }
-  else
-    {
-      fprintf_vma (file, symbol->value);
-    }
-
-  /* This presumes that a symbol can not be both BSF_DEBUGGING and
-     BSF_DYNAMIC, nor more than one of BSF_FUNCTION, BSF_FILE, and
-     BSF_OBJECT.  */
-  fprintf (file, " %c%c%c%c%c%c%c",
-	   ((type & BSF_LOCAL)
-	    ? (type & BSF_GLOBAL) ? '!' : 'l'
-	    : (type & BSF_GLOBAL) ? 'g' : ' '),
-	   (type & BSF_WEAK) ? 'w' : ' ',
-	   (type & BSF_CONSTRUCTOR) ? 'C' : ' ',
-	   (type & BSF_WARNING) ? 'W' : ' ',
-	   (type & BSF_INDIRECT) ? 'I' : ' ',
-	   (type & BSF_DEBUGGING) ? 'd' : (type & BSF_DYNAMIC) ? 'D' : ' ',
-	   ((type & BSF_FUNCTION)
-	    ? 'F'
-	    : ((type & BSF_FILE)
-	       ? 'f'
-	       : ((type & BSF_OBJECT) ? 'O' : ' '))));
-}
-
-
-/*
-FUNCTION
-	bfd_make_empty_symbol
-
-DESCRIPTION
-	Create a new <<asymbol>> structure for the BFD @var{abfd}
-	and return a pointer to it.
-
-	This routine is necessary because each back end has private
-	information surrounding the <<asymbol>>. Building your own
-	<<asymbol>> and pointing to it will not create the private
-	information, and will cause problems later on.
-
-.#define bfd_make_empty_symbol(abfd) \
-.     BFD_SEND (abfd, _bfd_make_empty_symbol, (abfd))
-*/
-
-/*
-FUNCTION
-	bfd_make_debug_symbol
-
-DESCRIPTION
-	Create a new <<asymbol>> structure for the BFD @var{abfd},
-	to be used as a debugging symbol.  Further details of its use have
-	yet to be worked out.
-
-.#define bfd_make_debug_symbol(abfd,ptr,size) \
-.        BFD_SEND (abfd, _bfd_make_debug_symbol, (abfd, ptr, size))
-*/
-
-struct section_to_type
-{
-  CONST char *section;
-  char type;
-};
-
-/* Map section names to POSIX/BSD single-character symbol types.
-   This table is probably incomplete.  It is sorted for convenience of
-   adding entries.  Since it is so short, a linear search is used.  */
-static CONST struct section_to_type stt[] =
-{
-  {"*DEBUG*", 'N'},
-  {".bss", 'b'},
-  {"zerovars", 'b'},		/* MRI .bss */
-  {".data", 'd'},
-  {"vars", 'd'},		/* MRI .data */
-  {".rdata", 'r'},		/* Read only data.  */
-  {".rodata", 'r'},		/* Read only data.  */
-  {".sbss", 's'},		/* Small BSS (uninitialized data).  */
-  {".scommon", 'c'},		/* Small common.  */
-  {".sdata", 'g'},		/* Small initialized data.  */
-  {".text", 't'},
-  {"code", 't'},		/* MRI .text */
-  {0, 0}
-};
-
-/* Return the single-character symbol type corresponding to
-   section S, or '?' for an unknown COFF section.  
-
-   Check for any leading string which matches, so .text5 returns
-   't' as well as .text */
-
-static char
-coff_section_type (s)
-     const char *s;
-{
-  CONST struct section_to_type *t;
-
-  for (t = &stt[0]; t->section; t++) 
-    if (!strncmp (s, t->section, strlen (t->section)))
-      return t->type;
-
-  return '?';
-}
-
-#ifndef islower
-#define islower(c) ((c) >= 'a' && (c) <= 'z')
-#endif
-#ifndef toupper
-#define toupper(c) (islower(c) ? ((c) & ~0x20) : (c))
-#endif
-
-/*
-FUNCTION
-	bfd_decode_symclass
-
-DESCRIPTION
-	Return a character corresponding to the symbol
-	class of @var{symbol}, or '?' for an unknown class.
-
-SYNOPSIS
-	int bfd_decode_symclass(asymbol *symbol);
-*/
-int
-bfd_decode_symclass (symbol)
-     asymbol *symbol;
-{
-  char c;
-
-  if (bfd_is_com_section (symbol->section))
-    return 'C';
-  if (bfd_is_und_section (symbol->section))
-    return 'U';
-  if (bfd_is_ind_section (symbol->section))
-    return 'I';
-  if (symbol->flags & BSF_WEAK)
-    return 'W';
-  if (!(symbol->flags & (BSF_GLOBAL | BSF_LOCAL)))
-    return '?';
-
-  if (bfd_is_abs_section (symbol->section))
-    c = 'a';
-  else if (symbol->section)
-    c = coff_section_type (symbol->section->name);
-  else
-    return '?';
-  if (symbol->flags & BSF_GLOBAL)
-    c = toupper (c);
-  return c;
-
-  /* We don't have to handle these cases just yet, but we will soon:
-     N_SETV: 'v';
-     N_SETA: 'l';
-     N_SETT: 'x';
-     N_SETD: 'z';
-     N_SETB: 's';
-     N_INDR: 'i';
-     */
-}
-
-/*
-FUNCTION
-	bfd_symbol_info
-
-DESCRIPTION
-	Fill in the basic info about symbol that nm needs.
-	Additional info may be added by the back-ends after
-	calling this function.
-
-SYNOPSIS
-	void bfd_symbol_info(asymbol *symbol, symbol_info *ret);
-*/
-
-void
-bfd_symbol_info (symbol, ret)
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  ret->type = bfd_decode_symclass (symbol);
-  if (ret->type != 'U')
-    ret->value = symbol->value + symbol->section->vma;
-  else
-    ret->value = 0;
-  ret->name = symbol->name;
-}
-
-/*
-FUNCTION
-	bfd_copy_private_symbol_data
-
-SYNOPSIS
-	boolean bfd_copy_private_symbol_data(bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym);
-
-DESCRIPTION
-	Copy private symbol information from @var{isym} in the BFD
-	@var{ibfd} to the symbol @var{osym} in the BFD @var{obfd}.
-	Return <<true>> on success, <<false>> on error.  Possible error
-	returns are:
-
-	o <<bfd_error_no_memory>> -
-	Not enough memory exists to create private data for @var{osec}.
-
-.#define bfd_copy_private_symbol_data(ibfd, isymbol, obfd, osymbol) \
-.     BFD_SEND (obfd, _bfd_copy_private_symbol_data, \
-.		(ibfd, isymbol, obfd, osymbol))
-
-*/
-
-/* The generic version of the function which returns mini symbols.
-   This is used when the backend does not provide a more efficient
-   version.  It just uses BFD asymbol structures as mini symbols.  */
-
-long
-_bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep)
-     bfd *abfd;
-     boolean dynamic;
-     PTR *minisymsp;
-     unsigned int *sizep;
-{
-  long storage;
-  asymbol **syms = NULL;
-  long symcount;
-
-  if (dynamic)
-    storage = bfd_get_dynamic_symtab_upper_bound (abfd);
-  else
-    storage = bfd_get_symtab_upper_bound (abfd);
-  if (storage < 0)
-    goto error_return;
-
-  syms = (asymbol **) bfd_malloc ((size_t) storage);
-  if (syms == NULL)
-    goto error_return;
-
-  if (dynamic)
-    symcount = bfd_canonicalize_dynamic_symtab (abfd, syms);
-  else
-    symcount = bfd_canonicalize_symtab (abfd, syms);
-  if (symcount < 0)
-    goto error_return;
-
-  *minisymsp = (PTR) syms;
-  *sizep = sizeof (asymbol *);
-  return symcount;
-
- error_return:
-  if (syms != NULL)
-    free (syms);
-  return -1;
-}
-
-/* The generic version of the function which converts a minisymbol to
-   an asymbol.  We don't worry about the sym argument we are passed;
-   we just return the asymbol the minisymbol points to.  */
-
-/*ARGSUSED*/
-asymbol *
-_bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym)
-     bfd *abfd;
-     boolean dynamic;
-     const PTR minisym;
-     asymbol *sym;
-{
-  return *(asymbol **) minisym;
-}
-
-/* Look through stabs debugging information in .stab and .stabstr
-   sections to find the source file and line closest to a desired
-   location.  This is used by COFF and ELF targets.  It sets *pfound
-   to true if it finds some information.  The *pinfo field is used to
-   pass cached information in and out of this routine; this first time
-   the routine is called for a BFD, *pinfo should be NULL.  The value
-   placed in *pinfo should be saved with the BFD, and passed back each
-   time this function is called.  */
-
-/* We use a cache by default.  */
-
-#define ENABLE_CACHING
-
-/* We keep an array of indexentry structures to record where in the
-   stabs section we should look to find line number information for a
-   particular address.  */
-
-struct indexentry
-{
-  bfd_vma val;
-  bfd_byte *stab;
-  bfd_byte *str;
-  char *directory_name;
-  char *file_name;
-  char *function_name;
-};
-
-/* Compare two indexentry structures.  This is called via qsort.  */
-
-static int
-cmpindexentry (a, b)
-     const PTR *a;
-     const PTR *b;
-{
-  const struct indexentry *contestantA = (const struct indexentry *) a;
-  const struct indexentry *contestantB = (const struct indexentry *) b;
-
-  if (contestantA->val < contestantB->val)
-    return -1;
-  else if (contestantA->val > contestantB->val)
-    return 1;
-  else
-    return 0;
-}
-
-/* A pointer to this structure is stored in *pinfo.  */
-
-struct stab_find_info
-{
-  /* The .stab section.  */
-  asection *stabsec;
-  /* The .stabstr section.  */
-  asection *strsec;
-  /* The contents of the .stab section.  */
-  bfd_byte *stabs;
-  /* The contents of the .stabstr section.  */
-  bfd_byte *strs;
-
-  /* A table that indexes stabs by memory address.  */
-  struct indexentry *indextable;
-  /* The number of entries in indextable.  */
-  int indextablesize;
-
-#ifdef ENABLE_CACHING
-  /* Cached values to restart quickly.  */
-  struct indexentry *cached_indexentry;
-  bfd_vma cached_offset;
-  bfd_byte *cached_stab;
-  char *cached_file_name;
-#endif
-
-  /* Saved ptr to malloc'ed filename.  */
-  char *filename;
-};
-
-boolean
-_bfd_stab_section_find_nearest_line (abfd, symbols, section, offset, pfound,
-				     pfilename, pfnname, pline, pinfo)
-     bfd *abfd;
-     asymbol **symbols;
-     asection *section;
-     bfd_vma offset;
-     boolean *pfound;
-     const char **pfilename;
-     const char **pfnname;
-     unsigned int *pline;
-     PTR *pinfo;
-{
-  struct stab_find_info *info;
-  bfd_size_type stabsize, strsize;
-  bfd_byte *stab, *str, *last_stab;
-  bfd_size_type stroff;
-  struct indexentry *indexentry;
-  char *directory_name, *file_name;
-  int saw_fun;
-
-  *pfound = false;
-  *pfilename = bfd_get_filename (abfd);
-  *pfnname = NULL;
-  *pline = 0;
-
-  /* Stabs entries use a 12 byte format:
-       4 byte string table index
-       1 byte stab type
-       1 byte stab other field
-       2 byte stab desc field
-       4 byte stab value
-     FIXME: This will have to change for a 64 bit object format.
-
-     The stabs symbols are divided into compilation units.  For the
-     first entry in each unit, the type of 0, the value is the length
-     of the string table for this unit, and the desc field is the
-     number of stabs symbols for this unit.  */
-
-#define STRDXOFF (0)
-#define TYPEOFF (4)
-#define OTHEROFF (5)
-#define DESCOFF (6)
-#define VALOFF (8)
-#define STABSIZE (12)
-
-  info = (struct stab_find_info *) *pinfo;
-  if (info != NULL)
-    {
-      if (info->stabsec == NULL || info->strsec == NULL)
-	{
-	  /* No stabs debugging information.  */
-	  return true;
-	}
-
-      stabsize = info->stabsec->_raw_size;
-      strsize = info->strsec->_raw_size;
-    }
-  else
-    {
-      long reloc_size, reloc_count;
-      arelent **reloc_vector;
-      int i;
-      char *name;
-      char *file_name;
-      char *directory_name;
-      char *function_name;
-
-      info = (struct stab_find_info *) bfd_zalloc (abfd, sizeof *info);
-      if (info == NULL)
-	return false;
-
-      /* FIXME: When using the linker --split-by-file or
-	 --split-by-reloc options, it is possible for the .stab and
-	 .stabstr sections to be split.  We should handle that.  */
-
-      info->stabsec = bfd_get_section_by_name (abfd, ".stab");
-      info->strsec = bfd_get_section_by_name (abfd, ".stabstr");
-
-      if (info->stabsec == NULL || info->strsec == NULL)
-	{
-	  /* No stabs debugging information.  Set *pinfo so that we
-             can return quickly in the info != NULL case above.  */
-	  *pinfo = (PTR) info;
-	  return true;
-	}
-
-      stabsize = info->stabsec->_raw_size;
-      strsize = info->strsec->_raw_size;
-
-      info->stabs = (bfd_byte *) bfd_alloc (abfd, stabsize);
-      info->strs = (bfd_byte *) bfd_alloc (abfd, strsize);
-      if (info->stabs == NULL || info->strs == NULL)
-	return false;
-
-      if (! bfd_get_section_contents (abfd, info->stabsec, info->stabs, 0,
-				      stabsize)
-	  || ! bfd_get_section_contents (abfd, info->strsec, info->strs, 0,
-					 strsize))
-	return false;
-
-      /* If this is a relocateable object file, we have to relocate
-	 the entries in .stab.  This should always be simple 32 bit
-	 relocations against symbols defined in this object file, so
-	 this should be no big deal.  */
-      reloc_size = bfd_get_reloc_upper_bound (abfd, info->stabsec);
-      if (reloc_size < 0)
-	return false;
-      reloc_vector = (arelent **) bfd_malloc (reloc_size);
-      if (reloc_vector == NULL && reloc_size != 0)
-	return false;
-      reloc_count = bfd_canonicalize_reloc (abfd, info->stabsec, reloc_vector,
-					    symbols);
-      if (reloc_count < 0)
-	{
-	  if (reloc_vector != NULL)
-	    free (reloc_vector);
-	  return false;
-	}
-      if (reloc_count > 0)
-	{
-	  arelent **pr;
-
-	  for (pr = reloc_vector; *pr != NULL; pr++)
-	    {
-	      arelent *r;
-	      unsigned long val;
-	      asymbol *sym;
-
-	      r = *pr;
-	      if (r->howto->rightshift != 0
-		  || r->howto->size != 2
-		  || r->howto->bitsize != 32
-		  || r->howto->pc_relative
-		  || r->howto->bitpos != 0
-		  || r->howto->dst_mask != 0xffffffff)
-		{
-		  (*_bfd_error_handler)
-		    (_("Unsupported .stab relocation"));
-		  bfd_set_error (bfd_error_invalid_operation);
-		  if (reloc_vector != NULL)
-		    free (reloc_vector);
-		  return false;
-		}
-
-	      val = bfd_get_32 (abfd, info->stabs + r->address);
-	      val &= r->howto->src_mask;
-	      sym = *r->sym_ptr_ptr;
-	      val += sym->value + sym->section->vma + r->addend;
-	      bfd_put_32 (abfd, val, info->stabs + r->address);
-	    }
-	}
-
-      if (reloc_vector != NULL)
-	free (reloc_vector);
-
-      /* First time through this function, build a table matching
-	 function VM addresses to stabs, then sort based on starting
-	 VM address.  Do this in two passes: once to count how many
-	 table entries we'll need, and a second to actually build the
-	 table.  */
-
-      info->indextablesize = 0;
-      saw_fun = 1;
-      for (stab = info->stabs; stab < info->stabs + stabsize; stab += STABSIZE)
-	{
-	  if (stab[TYPEOFF] == N_SO)
-	    {
-	      /* N_SO with null name indicates EOF */
-	      if (bfd_get_32 (abfd, stab + STRDXOFF) == 0)
-		continue;
-
-	      /* if we did not see a function def, leave space for one. */
-	      if (saw_fun == 0)
-		++info->indextablesize;
-
-	      saw_fun = 0;
-
-	      /* two N_SO's in a row is a filename and directory. Skip */
-	      if (stab + STABSIZE < info->stabs + stabsize
-		  && *(stab + STABSIZE + TYPEOFF) == N_SO)
-		{
-		  stab += STABSIZE;
-		}
-	    }
-	  else if (stab[TYPEOFF] == N_FUN)
-	    {
-	      saw_fun = 1;
-	      ++info->indextablesize;
-	    }
-	}
-
-      if (saw_fun == 0)
-	++info->indextablesize;
-      
-      if (info->indextablesize == 0)
-	return true;
-      ++info->indextablesize;
-
-      info->indextable = ((struct indexentry *)
-			  bfd_alloc (abfd,
-				     (sizeof (struct indexentry)
-				      * info->indextablesize)));
-      if (info->indextable == NULL)
-	return false;
-
-      file_name = NULL;
-      directory_name = NULL;
-      saw_fun = 1;
-
-      for (i = 0, stroff = 0, stab = info->stabs, str = info->strs;
-	   i < info->indextablesize && stab < info->stabs + stabsize;
-	   stab += STABSIZE)
-	{
-	  switch (stab[TYPEOFF])
-	    {
-	    case 0:
-	      /* This is the first entry in a compilation unit.  */
-	      if ((bfd_size_type) ((info->strs + strsize) - str) < stroff)
-		break;
-	      str += stroff;
-	      stroff = bfd_get_32 (abfd, stab + VALOFF);
-	      break;
-
-	    case N_SO:
-	      /* The main file name.  */
-
-	      /* The following code creates a new indextable entry with
-	         a NULL function name if there were no N_FUNs in a file.
-	         Note that a N_SO without a file name is an EOF and
-	         there could be 2 N_SO following it with the new filename 
-	         and directory. */
-	      if (saw_fun == 0)
-		{
-		  info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF);
-		  info->indextable[i].stab = last_stab;
-		  info->indextable[i].str = str;
-		  info->indextable[i].directory_name = directory_name;
-		  info->indextable[i].file_name = file_name;
-		  info->indextable[i].function_name = NULL;
-		  ++i;
-		}
-	      saw_fun = 0;
-	      
-	      file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
-	      if (*file_name == '\0')
-		{
-		  directory_name = NULL;
-		  file_name = NULL;
-		  saw_fun = 1;
-		}
-	      else {
-		last_stab = stab;
-		if (stab + STABSIZE >= info->stabs + stabsize
-		    || *(stab + STABSIZE + TYPEOFF) != N_SO)
-		  {
-		    directory_name = NULL;
-		  }
-		else
-		  {
-		    /* Two consecutive N_SOs are a directory and a file
-		       name.  */
-		    stab += STABSIZE;
-		    directory_name = file_name;
-		    file_name = ((char *) str
-				 + bfd_get_32 (abfd, stab + STRDXOFF));
-		  }
-	      }
-	      break;
-
-	    case N_SOL:
-	      /* The name of an include file.  */
-	      file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
-	      break;
-
-	    case N_FUN:
-	      /* A function name.  */
-	      saw_fun = 1;
-	      name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
-
-	      if (*name == '\0')
-		name = NULL;
-
-	      function_name = name;
-
-	      if (name == NULL)
-		continue;
-
-	      info->indextable[i].val = bfd_get_32 (abfd, stab + VALOFF);
-	      info->indextable[i].stab = stab;
-	      info->indextable[i].str = str;
-	      info->indextable[i].directory_name = directory_name;
-	      info->indextable[i].file_name = file_name;
-	      info->indextable[i].function_name = function_name;
-	      ++i;
-	      break;
-	    }
-	}
-
-      if (saw_fun == 0)
-	{
-	  info->indextable[i].val = bfd_get_32 (abfd, last_stab + VALOFF);
-	  info->indextable[i].stab = last_stab;
-	  info->indextable[i].str = str;
-	  info->indextable[i].directory_name = directory_name;
-	  info->indextable[i].file_name = file_name;
-	  info->indextable[i].function_name = NULL;
-	  ++i;
-	}
-
-      info->indextable[i].val = (bfd_vma) -1;
-      info->indextable[i].stab = info->stabs + stabsize;
-      info->indextable[i].str = str;
-      info->indextable[i].directory_name = NULL;
-      info->indextable[i].file_name = NULL;
-      info->indextable[i].function_name = NULL;
-      ++i;
-
-      info->indextablesize = i;
-      qsort (info->indextable, i, sizeof (struct indexentry), cmpindexentry);
-
-      *pinfo = (PTR) info;
-    }
-
-  /* We are passed a section relative offset.  The offsets in the
-     stabs information are absolute.  */
-  offset += bfd_get_section_vma (abfd, section);
-
-#ifdef ENABLE_CACHING
-  if (info->cached_indexentry != NULL
-      && offset >= info->cached_offset
-      && offset < (info->cached_indexentry + 1)->val)
-    {
-      stab = info->cached_stab;
-      indexentry = info->cached_indexentry;
-      file_name = info->cached_file_name;
-    }
-  else
-#endif
-    {
-      /* Cache non-existant or invalid.  Do binary search on
-         indextable.  */
-
-      long low, high;
-      long mid = -1;
-
-      indexentry = NULL;
-
-      low = 0;
-      high = info->indextablesize - 1;
-      while (low != high)
-	{
-	  mid = (high + low) / 2;
-	  if (offset >= info->indextable[mid].val
-	      && offset < info->indextable[mid + 1].val)
-	    {
-	      indexentry = &info->indextable[mid];
-	      break;
-	    }
-
-	  if (info->indextable[mid].val > offset)
-	    high = mid;
-	  else
-	    low = mid + 1;
-	}
-
-      if (indexentry == NULL)
-	return true;
-
-      stab = indexentry->stab + STABSIZE;
-      file_name = indexentry->file_name;
-    }
-
-  directory_name = indexentry->directory_name;
-  str = indexentry->str;
-
-  for (; stab < (indexentry+1)->stab; stab += STABSIZE)
-    {
-      boolean done;
-      bfd_vma val;
-
-      done = false;
-
-      switch (stab[TYPEOFF])
-	{
-	case N_SOL:
-	  /* The name of an include file.  */
-	  val = bfd_get_32 (abfd, stab + VALOFF);
-	  if (val <= offset)
-	    {
-	      file_name = (char *) str + bfd_get_32 (abfd, stab + STRDXOFF);
-	      *pline = 0;
-	    }
-	  break;
-
-	case N_SLINE:
-	case N_DSLINE:
-	case N_BSLINE:
-	  /* A line number.  The value is relative to the start of the
-             current function.  */
-	  val = indexentry->val + bfd_get_32 (abfd, stab + VALOFF);
-	  if (val <= offset)
-	    {
-	      *pline = bfd_get_16 (abfd, stab + DESCOFF);
-
-#ifdef ENABLE_CACHING
-	      info->cached_stab = stab;
-	      info->cached_offset = val;
-	      info->cached_file_name = file_name;
-	      info->cached_indexentry = indexentry;
-#endif
-	    }
-	  if (val > offset)
-	    done = true;
-	  break;
-
-	case N_FUN:
-	case N_SO:
-	  done = true;
-	  break;
-	}
-
-      if (done)
-	break;
-    }
-
-  *pfound = true;
-
-  if (file_name[0] == '/' || directory_name == NULL)
-    *pfilename = file_name;
-  else
-    {
-      size_t dirlen;
-
-      dirlen = strlen (directory_name);
-      if (info->filename == NULL
-	  || strncmp (info->filename, directory_name, dirlen) != 0
-	  || strcmp (info->filename + dirlen, file_name) != 0)
-	{
-	  if (info->filename != NULL)
-	    free (info->filename);
-	  info->filename = (char *) bfd_malloc (dirlen +
-						strlen (file_name)
-						+ 1);
-	  if (info->filename == NULL)
-	    return false;
-	  strcpy (info->filename, directory_name);
-	  strcpy (info->filename + dirlen, file_name);
-	}
-
-      *pfilename = info->filename;
-    }
-
-  if (indexentry->function_name != NULL)
-    {
-      char *s;
-
-      /* This will typically be something like main:F(0,1), so we want
-         to clobber the colon.  It's OK to change the name, since the
-         string is in our own local storage anyhow.  */
-
-      s = strchr (indexentry->function_name, ':');
-      if (s != NULL)
-	*s = '\0';
-
-      *pfnname = indexentry->function_name;
-    }
-
-  return true;
-}
diff --git a/bfd/sysdep.h b/bfd/sysdep.h
deleted file mode 100644
index 0a58983fa2d..00000000000
--- a/bfd/sysdep.h
+++ /dev/null
@@ -1,144 +0,0 @@
-/* sysdep.h -- handle host dependencies for the BFD library
-   Copyright 1995, 96, 97, 98, 1999 Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef BFD_SYSDEP_H
-#define BFD_SYSDEP_H
-
-#include "ansidecl.h"
-
-#include "config.h"
-
-#ifdef HAVE_STDDEF_H
-#include <stddef.h>
-#endif
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#if !(defined(errno) || defined(_MSC_VER) && defined(_INC_ERRNO))
-extern int errno;
-#endif
-
-#ifdef HAVE_STRING_H
-#include <string.h>
-#else
-#ifdef HAVE_STRINGS_H
-#include <strings.h>
-#else
-extern char *strchr ();
-extern char *strrchr ();
-#endif
-#endif
-
-#ifdef HAVE_STDLIB_H
-#include <stdlib.h>
-#endif
-
-#ifdef TIME_WITH_SYS_TIME
-#include <sys/time.h>
-#include <time.h>
-#else
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#else
-#include <time.h>
-#endif
-#endif
-
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-
-#ifdef USE_BINARY_FOPEN
-#include "fopen-bin.h"
-#else
-#include "fopen-same.h"
-#endif
-
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#else
-#ifdef HAVE_SYS_FILE_H
-#include <sys/file.h>
-#endif
-#endif
-
-#ifndef O_RDONLY
-#define O_RDONLY 0
-#endif
-#ifndef O_WRONLY
-#define O_WRONLY 1
-#endif
-#ifndef O_RDWR
-#define O_RDWR 2
-#endif
-#ifndef O_ACCMODE
-#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET 0
-#endif
-#ifndef SEEK_CUR
-#define SEEK_CUR 1
-#endif
-
-#ifdef NEED_DECLARATION_STRSTR
-extern char *strstr ();
-#endif
-
-#ifdef NEED_DECLARATION_MALLOC
-extern PTR malloc ();
-#endif
-
-#ifdef NEED_DECLARATION_REALLOC
-extern PTR realloc ();
-#endif
-
-#ifdef NEED_DECLARATION_FREE
-extern void free ();
-#endif
-
-#ifdef NEED_DECLARATION_GETENV
-extern char *getenv ();
-#endif
-
-#ifdef ENABLE_NLS
-#include <libintl.h>
-#define _(String) dgettext (PACKAGE, String)
-#ifdef gettext_noop
-#define N_(String) gettext_noop (String)
-#else
-#define N_(String) (String)
-#endif
-#else
-/* Stubs that do something close enough.  */
-#define textdomain(String) (String)
-#define gettext(String) (String)
-#define dgettext(Domain,Message) (Message)
-#define dcgettext(Domain,Message,Type) (Message)
-#define bindtextdomain(Domain,Directory) (Domain)
-#define _(String) (String)
-#define N_(String) (String)
-#endif
-
-#endif /* ! defined (BFD_SYSDEP_H) */
diff --git a/bfd/targets.c b/bfd/targets.c
deleted file mode 100644
index bb6e51d854e..00000000000
--- a/bfd/targets.c
+++ /dev/null
@@ -1,1079 +0,0 @@
-/* Generic target-file-type support for the BFD library.
-   Copyright 1990, 91, 92, 93, 94, 95, 96, 97, 1998
-   Free Software Foundation, Inc.
-   Written by Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "fnmatch.h"
-
-/*
-SECTION 
-	Targets
-
-DESCRIPTION
-	Each port of BFD to a different machine requries the creation
-	of a target back end. All the back end provides to the root
-	part of BFD is a structure containing pointers to functions
-	which perform certain low level operations on files. BFD
-	translates the applications's requests through a pointer into
-	calls to the back end routines. 
-
-	When a file is opened with <<bfd_openr>>, its format and
-	target are unknown. BFD uses various mechanisms to determine
-	how to interpret the file. The operations performed are:
-
-	o Create a BFD by calling the internal routine
-	<<_bfd_new_bfd>>, then call <<bfd_find_target>> with the
-	target string supplied to <<bfd_openr>> and the new BFD pointer. 
-
-	o If a null target string was provided to <<bfd_find_target>>,
-	look up the environment variable <<GNUTARGET>> and use
-	that as the target string. 
-
-	o If the target string is still <<NULL>>, or the target string is
-	<<default>>, then use the first item in the target vector
-	as the target type, and set <<target_defaulted>> in the BFD to
-	cause <<bfd_check_format>> to loop through all the targets.
-	@xref{bfd_target}.  @xref{Formats}.
-
-	o Otherwise, inspect the elements in the target vector
-	one by one, until a match on target name is found. When found,
-	use it. 
-
-	o Otherwise return the error <<bfd_error_invalid_target>> to
-	<<bfd_openr>>.
-
-	o <<bfd_openr>> attempts to open the file using
-	<<bfd_open_file>>, and returns the BFD.
-
-	Once the BFD has been opened and the target selected, the file
-	format may be determined. This is done by calling
-	<<bfd_check_format>> on the BFD with a suggested format. 
-	If <<target_defaulted>> has been set, each possible target
-	type is tried to see if it recognizes the specified format.
-	<<bfd_check_format>> returns <<true>> when the caller guesses right.
-@menu
-@* bfd_target::
-@end menu
-*/
-
-
-/*
-
-INODE
-	bfd_target,  , Targets, Targets
-DOCDD
-SUBSECTION
-	bfd_target
-
-DESCRIPTION
-	This structure contains everything that BFD knows about a
-	target. It includes things like its byte order, name, and which
-	routines to call to do various operations.   
-
-	Every BFD points to a target structure with its <<xvec>>
-	member. 
-
-	The macros below are used to dispatch to functions through the
-	<<bfd_target>> vector. They are used in a number of macros further
-	down in @file{bfd.h}, and are also used when calling various
-	routines by hand inside the BFD implementation.  The @var{arglist}
-	argument must be parenthesized; it contains all the arguments
-	to the called function. 
-
-	They make the documentation (more) unpleasant to read, so if
-	someone wants to fix this and not break the above, please do.
-
-.#define BFD_SEND(bfd, message, arglist) \
-.               ((*((bfd)->xvec->message)) arglist)
-.
-.#ifdef DEBUG_BFD_SEND
-.#undef BFD_SEND
-.#define BFD_SEND(bfd, message, arglist) \
-.  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-.    ((*((bfd)->xvec->message)) arglist) : \
-.    (bfd_assert (__FILE__,__LINE__), NULL))
-.#endif
-
-	For operations which index on the BFD format:
-
-.#define BFD_SEND_FMT(bfd, message, arglist) \
-.            (((bfd)->xvec->message[(int)((bfd)->format)]) arglist)
-.
-.#ifdef DEBUG_BFD_SEND
-.#undef BFD_SEND_FMT
-.#define BFD_SEND_FMT(bfd, message, arglist) \
-.  (((bfd) && (bfd)->xvec && (bfd)->xvec->message) ? \
-.   (((bfd)->xvec->message[(int)((bfd)->format)]) arglist) : \
-.   (bfd_assert (__FILE__,__LINE__), NULL))
-.#endif
-
-	This is the structure which defines the type of BFD this is.  The
-	<<xvec>> member of the struct <<bfd>> itself points here.  Each
-	module that implements access to a different target under BFD,
-	defines one of these.
-
-
-	FIXME, these names should be rationalised with the names of
-	the entry points which call them. Too bad we can't have one
-	macro to define them both! 
-
-.enum bfd_flavour {
-.  bfd_target_unknown_flavour,
-.  bfd_target_aout_flavour,
-.  bfd_target_coff_flavour,
-.  bfd_target_ecoff_flavour,
-.  bfd_target_elf_flavour,
-.  bfd_target_ieee_flavour,
-.  bfd_target_nlm_flavour,
-.  bfd_target_oasys_flavour,
-.  bfd_target_tekhex_flavour,
-.  bfd_target_srec_flavour,
-.  bfd_target_ihex_flavour,
-.  bfd_target_som_flavour,
-.  bfd_target_os9k_flavour,
-.  bfd_target_versados_flavour,
-.  bfd_target_msdos_flavour,
-.  bfd_target_ovax_flavour,
-.  bfd_target_evax_flavour
-.};
-.
-.enum bfd_endian { BFD_ENDIAN_BIG, BFD_ENDIAN_LITTLE, BFD_ENDIAN_UNKNOWN };
-.
-.{* Forward declaration.  *}
-.typedef struct bfd_link_info _bfd_link_info;
-.
-.typedef struct bfd_target
-.{
-
-Identifies the kind of target, e.g., SunOS4, Ultrix, etc.
-
-.  char *name;
-
-The "flavour" of a back end is a general indication about the contents
-of a file.
-
-.  enum bfd_flavour flavour;
-
-The order of bytes within the data area of a file.
-
-.  enum bfd_endian byteorder;
-
-The order of bytes within the header parts of a file.
-
-.  enum bfd_endian header_byteorder;
-
-A mask of all the flags which an executable may have set -
-from the set <<BFD_NO_FLAGS>>, <<HAS_RELOC>>, ...<<D_PAGED>>.
-
-.  flagword object_flags;       
-
-A mask of all the flags which a section may have set - from
-the set <<SEC_NO_FLAGS>>, <<SEC_ALLOC>>, ...<<SET_NEVER_LOAD>>.
-
-.  flagword section_flags;
-
-The character normally found at the front of a symbol 
-(if any), perhaps `_'.
-
-.  char symbol_leading_char;
-
-The pad character for file names within an archive header.
-
-.  char ar_pad_char;            
-
-The maximum number of characters in an archive header.
-
-.  unsigned short ar_max_namelen;
-
-Entries for byte swapping for data. These are different from the other
-entry points, since they don't take a BFD asthe first argument.
-Certain other handlers could do the same.
-
-.  bfd_vma      (*bfd_getx64) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_getx_signed_64) PARAMS ((const bfd_byte *));
-.  void         (*bfd_putx64) PARAMS ((bfd_vma, bfd_byte *));
-.  bfd_vma      (*bfd_getx32) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_getx_signed_32) PARAMS ((const bfd_byte *));
-.  void         (*bfd_putx32) PARAMS ((bfd_vma, bfd_byte *));
-.  bfd_vma      (*bfd_getx16) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_getx_signed_16) PARAMS ((const bfd_byte *));
-.  void         (*bfd_putx16) PARAMS ((bfd_vma, bfd_byte *));
-
-Byte swapping for the headers
-
-.  bfd_vma      (*bfd_h_getx64) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_h_getx_signed_64) PARAMS ((const bfd_byte *));
-.  void         (*bfd_h_putx64) PARAMS ((bfd_vma, bfd_byte *));
-.  bfd_vma      (*bfd_h_getx32) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_h_getx_signed_32) PARAMS ((const bfd_byte *));
-.  void         (*bfd_h_putx32) PARAMS ((bfd_vma, bfd_byte *));
-.  bfd_vma      (*bfd_h_getx16) PARAMS ((const bfd_byte *));
-.  bfd_signed_vma (*bfd_h_getx_signed_16) PARAMS ((const bfd_byte *));
-.  void         (*bfd_h_putx16) PARAMS ((bfd_vma, bfd_byte *));
-
-Format dependent routines: these are vectors of entry points
-within the target vector structure, one for each format to check.
-
-Check the format of a file being read.  Return a <<bfd_target *>> or zero. 
-
-.  const struct bfd_target *(*_bfd_check_format[bfd_type_end]) PARAMS ((bfd *));
-
-Set the format of a file being written.  
-
-.  boolean             (*_bfd_set_format[bfd_type_end]) PARAMS ((bfd *));
-
-Write cached information into a file being written, at <<bfd_close>>. 
-
-.  boolean             (*_bfd_write_contents[bfd_type_end]) PARAMS ((bfd *));
-
-The general target vector.
-
-.
-.  {* Generic entry points.  *}
-.#define BFD_JUMP_TABLE_GENERIC(NAME)\
-.CAT(NAME,_close_and_cleanup),\
-.CAT(NAME,_bfd_free_cached_info),\
-.CAT(NAME,_new_section_hook),\
-.CAT(NAME,_get_section_contents),\
-.CAT(NAME,_get_section_contents_in_window)
-.
-.  {* Called when the BFD is being closed to do any necessary cleanup.  *}
-.  boolean       (*_close_and_cleanup) PARAMS ((bfd *));
-.  {* Ask the BFD to free all cached information.  *}
-.  boolean (*_bfd_free_cached_info) PARAMS ((bfd *));
-.  {* Called when a new section is created.  *}
-.  boolean       (*_new_section_hook) PARAMS ((bfd *, sec_ptr));
-.  {* Read the contents of a section.  *}
-.  boolean       (*_bfd_get_section_contents) PARAMS ((bfd *, sec_ptr, PTR, 
-.                                            file_ptr, bfd_size_type));
-.  boolean       (*_bfd_get_section_contents_in_window)
-.                          PARAMS ((bfd *, sec_ptr, bfd_window *,
-.                                   file_ptr, bfd_size_type));
-.
-.  {* Entry points to copy private data.  *}
-.#define BFD_JUMP_TABLE_COPY(NAME)\
-.CAT(NAME,_bfd_copy_private_bfd_data),\
-.CAT(NAME,_bfd_merge_private_bfd_data),\
-.CAT(NAME,_bfd_copy_private_section_data),\
-.CAT(NAME,_bfd_copy_private_symbol_data),\
-.CAT(NAME,_bfd_set_private_flags),\
-.CAT(NAME,_bfd_print_private_bfd_data)\
-.  {* Called to copy BFD general private data from one object file
-.     to another.  *}
-.  boolean	 (*_bfd_copy_private_bfd_data) PARAMS ((bfd *, bfd *));
-.  {* Called to merge BFD general private data from one object file
-.     to a common output file when linking.  *}
-.  boolean	 (*_bfd_merge_private_bfd_data) PARAMS ((bfd *, bfd *));
-.  {* Called to copy BFD private section data from one object file
-.     to another.  *}
-.  boolean       (*_bfd_copy_private_section_data) PARAMS ((bfd *, sec_ptr,
-.                                                       bfd *, sec_ptr));
-.  {* Called to copy BFD private symbol data from one symbol 
-.     to another.  *}
-.  boolean       (*_bfd_copy_private_symbol_data) PARAMS ((bfd *, asymbol *,
-.							   bfd *, asymbol *));
-.  {* Called to set private backend flags *}
-.  boolean	 (*_bfd_set_private_flags) PARAMS ((bfd *, flagword));
-.
-.  {* Called to print private BFD data *}
-.  boolean       (*_bfd_print_private_bfd_data) PARAMS ((bfd *, PTR));
-.
-.  {* Core file entry points.  *}
-.#define BFD_JUMP_TABLE_CORE(NAME)\
-.CAT(NAME,_core_file_failing_command),\
-.CAT(NAME,_core_file_failing_signal),\
-.CAT(NAME,_core_file_matches_executable_p)
-.  char *   (*_core_file_failing_command) PARAMS ((bfd *));
-.  int      (*_core_file_failing_signal) PARAMS ((bfd *));
-.  boolean  (*_core_file_matches_executable_p) PARAMS ((bfd *, bfd *));
-.
-.  {* Archive entry points.  *}
-.#define BFD_JUMP_TABLE_ARCHIVE(NAME)\
-.CAT(NAME,_slurp_armap),\
-.CAT(NAME,_slurp_extended_name_table),\
-.CAT(NAME,_construct_extended_name_table),\
-.CAT(NAME,_truncate_arname),\
-.CAT(NAME,_write_armap),\
-.CAT(NAME,_read_ar_hdr),\
-.CAT(NAME,_openr_next_archived_file),\
-.CAT(NAME,_get_elt_at_index),\
-.CAT(NAME,_generic_stat_arch_elt),\
-.CAT(NAME,_update_armap_timestamp)
-.  boolean  (*_bfd_slurp_armap) PARAMS ((bfd *));
-.  boolean  (*_bfd_slurp_extended_name_table) PARAMS ((bfd *));
-.  boolean  (*_bfd_construct_extended_name_table)
-.             PARAMS ((bfd *, char **, bfd_size_type *, const char **));
-.  void     (*_bfd_truncate_arname) PARAMS ((bfd *, CONST char *, char *));
-.  boolean  (*write_armap) PARAMS ((bfd *arch, 
-.                              unsigned int elength,
-.                              struct orl *map,
-.                              unsigned int orl_count, 
-.                              int stridx));
-.  PTR (*_bfd_read_ar_hdr_fn) PARAMS ((bfd *));
-.  bfd *    (*openr_next_archived_file) PARAMS ((bfd *arch, bfd *prev));
-.#define bfd_get_elt_at_index(b,i) BFD_SEND(b, _bfd_get_elt_at_index, (b,i))
-.  bfd *    (*_bfd_get_elt_at_index) PARAMS ((bfd *, symindex));
-.  int      (*_bfd_stat_arch_elt) PARAMS ((bfd *, struct stat *));
-.  boolean  (*_bfd_update_armap_timestamp) PARAMS ((bfd *));
-.
-.  {* Entry points used for symbols.  *}
-.#define BFD_JUMP_TABLE_SYMBOLS(NAME)\
-.CAT(NAME,_get_symtab_upper_bound),\
-.CAT(NAME,_get_symtab),\
-.CAT(NAME,_make_empty_symbol),\
-.CAT(NAME,_print_symbol),\
-.CAT(NAME,_get_symbol_info),\
-.CAT(NAME,_bfd_is_local_label_name),\
-.CAT(NAME,_get_lineno),\
-.CAT(NAME,_find_nearest_line),\
-.CAT(NAME,_bfd_make_debug_symbol),\
-.CAT(NAME,_read_minisymbols),\
-.CAT(NAME,_minisymbol_to_symbol)
-.  long  (*_bfd_get_symtab_upper_bound) PARAMS ((bfd *));
-.  long  (*_bfd_canonicalize_symtab) PARAMS ((bfd *,
-.                                             struct symbol_cache_entry **));
-.  struct symbol_cache_entry  *
-.                (*_bfd_make_empty_symbol) PARAMS ((bfd *));
-.  void          (*_bfd_print_symbol) PARAMS ((bfd *, PTR,
-.                                      struct symbol_cache_entry *,
-.                                      bfd_print_symbol_type));
-.#define bfd_print_symbol(b,p,s,e) BFD_SEND(b, _bfd_print_symbol, (b,p,s,e))
-.  void          (*_bfd_get_symbol_info) PARAMS ((bfd *,
-.                                      struct symbol_cache_entry *,
-.                                      symbol_info *));
-.#define bfd_get_symbol_info(b,p,e) BFD_SEND(b, _bfd_get_symbol_info, (b,p,e))
-.  boolean	 (*_bfd_is_local_label_name) PARAMS ((bfd *, const char *));
-.
-.  alent *    (*_get_lineno) PARAMS ((bfd *, struct symbol_cache_entry *));
-.  boolean    (*_bfd_find_nearest_line) PARAMS ((bfd *abfd,
-.                    struct sec *section, struct symbol_cache_entry **symbols,
-.                    bfd_vma offset, CONST char **file, CONST char **func,
-.                    unsigned int *line));
-. {* Back-door to allow format-aware applications to create debug symbols
-.    while using BFD for everything else.  Currently used by the assembler
-.    when creating COFF files.  *}
-.  asymbol *  (*_bfd_make_debug_symbol) PARAMS ((
-.       bfd *abfd,
-.       void *ptr,
-.       unsigned long size));
-.#define bfd_read_minisymbols(b, d, m, s) \
-.  BFD_SEND (b, _read_minisymbols, (b, d, m, s))
-.  long  (*_read_minisymbols) PARAMS ((bfd *, boolean, PTR *,
-.                                      unsigned int *));
-.#define bfd_minisymbol_to_symbol(b, d, m, f) \
-.  BFD_SEND (b, _minisymbol_to_symbol, (b, d, m, f))
-.  asymbol *(*_minisymbol_to_symbol) PARAMS ((bfd *, boolean, const PTR,
-.                                             asymbol *));
-.
-.  {* Routines for relocs.  *}
-.#define BFD_JUMP_TABLE_RELOCS(NAME)\
-.CAT(NAME,_get_reloc_upper_bound),\
-.CAT(NAME,_canonicalize_reloc),\
-.CAT(NAME,_bfd_reloc_type_lookup)
-.  long  (*_get_reloc_upper_bound) PARAMS ((bfd *, sec_ptr));
-.  long  (*_bfd_canonicalize_reloc) PARAMS ((bfd *, sec_ptr, arelent **,
-.                                            struct symbol_cache_entry **));
-.  {* See documentation on reloc types.  *}
-.  reloc_howto_type *
-.       (*reloc_type_lookup) PARAMS ((bfd *abfd,
-.                                     bfd_reloc_code_real_type code));
-.
-.  {* Routines used when writing an object file.  *}
-.#define BFD_JUMP_TABLE_WRITE(NAME)\
-.CAT(NAME,_set_arch_mach),\
-.CAT(NAME,_set_section_contents)
-.  boolean    (*_bfd_set_arch_mach) PARAMS ((bfd *, enum bfd_architecture,
-.                    unsigned long));
-.  boolean       (*_bfd_set_section_contents) PARAMS ((bfd *, sec_ptr, PTR,
-.                                            file_ptr, bfd_size_type));
-.
-.  {* Routines used by the linker.  *}
-.#define BFD_JUMP_TABLE_LINK(NAME)\
-.CAT(NAME,_sizeof_headers),\
-.CAT(NAME,_bfd_get_relocated_section_contents),\
-.CAT(NAME,_bfd_relax_section),\
-.CAT(NAME,_bfd_link_hash_table_create),\
-.CAT(NAME,_bfd_link_add_symbols),\
-.CAT(NAME,_bfd_final_link),\
-.CAT(NAME,_bfd_link_split_section),\
-.CAT(NAME,_bfd_gc_sections)
-.  int        (*_bfd_sizeof_headers) PARAMS ((bfd *, boolean));
-.  bfd_byte * (*_bfd_get_relocated_section_contents) PARAMS ((bfd *,
-.                    struct bfd_link_info *, struct bfd_link_order *,
-.                    bfd_byte *data, boolean relocateable,
-.                    struct symbol_cache_entry **));
-.
-.  boolean    (*_bfd_relax_section) PARAMS ((bfd *, struct sec *,
-.                    struct bfd_link_info *, boolean *again));
-.
-.  {* Create a hash table for the linker.  Different backends store
-.     different information in this table.  *}
-.  struct bfd_link_hash_table *(*_bfd_link_hash_table_create) PARAMS ((bfd *));
-.
-.  {* Add symbols from this object file into the hash table.  *}
-.  boolean (*_bfd_link_add_symbols) PARAMS ((bfd *, struct bfd_link_info *));
-.
-.  {* Do a link based on the link_order structures attached to each
-.     section of the BFD.  *}
-.  boolean (*_bfd_final_link) PARAMS ((bfd *, struct bfd_link_info *));
-.
-.  {* Should this section be split up into smaller pieces during linking.  *}
-.  boolean (*_bfd_link_split_section) PARAMS ((bfd *, struct sec *));
-.
-.  {* Remove sections that are not referenced from the output.  *}
-.  boolean (*_bfd_gc_sections) PARAMS ((bfd *, struct bfd_link_info *));
-.
-.  {* Routines to handle dynamic symbols and relocs.  *}
-.#define BFD_JUMP_TABLE_DYNAMIC(NAME)\
-.CAT(NAME,_get_dynamic_symtab_upper_bound),\
-.CAT(NAME,_canonicalize_dynamic_symtab),\
-.CAT(NAME,_get_dynamic_reloc_upper_bound),\
-.CAT(NAME,_canonicalize_dynamic_reloc)
-.  {* Get the amount of memory required to hold the dynamic symbols. *}
-.  long  (*_bfd_get_dynamic_symtab_upper_bound) PARAMS ((bfd *));
-.  {* Read in the dynamic symbols.  *}
-.  long  (*_bfd_canonicalize_dynamic_symtab)
-.    PARAMS ((bfd *, struct symbol_cache_entry **));
-.  {* Get the amount of memory required to hold the dynamic relocs.  *}
-.  long  (*_bfd_get_dynamic_reloc_upper_bound) PARAMS ((bfd *));
-.  {* Read in the dynamic relocs.  *}
-.  long  (*_bfd_canonicalize_dynamic_reloc)
-.    PARAMS ((bfd *, arelent **, struct symbol_cache_entry **));
-.
-
-Data for use by back-end routines, which isn't generic enough to belong
-in this structure.
-
-. PTR backend_data;
-.} bfd_target;
-
-*/
-
-/* All known xvecs (even those that don't compile on all systems).
-   Alphabetized for easy reference.
-   They are listed a second time below, since
-   we can't intermix extern's and initializers.  */
-extern const bfd_target a29kcoff_big_vec;
-extern const bfd_target a_out_adobe_vec;
-extern const bfd_target aout_arm_big_vec;
-extern const bfd_target aout_arm_little_vec;
-extern const bfd_target aout_mips_big_vec;
-extern const bfd_target aout_mips_little_vec;
-extern const bfd_target aout0_big_vec;
-extern const bfd_target apollocoff_vec;
-extern const bfd_target armcoff_little_vec;
-extern const bfd_target armcoff_big_vec;
-extern const bfd_target armpe_little_vec;
-extern const bfd_target armpe_big_vec;
-extern const bfd_target armpei_little_vec;
-extern const bfd_target armpei_big_vec;
-extern const bfd_target arm_epoc_pe_little_vec;
-extern const bfd_target arm_epoc_pe_big_vec;
-extern const bfd_target arm_epoc_pei_little_vec;
-extern const bfd_target arm_epoc_pei_big_vec;
-extern const bfd_target b_out_vec_big_host;
-extern const bfd_target b_out_vec_little_host;
-extern const bfd_target bfd_elf64_alpha_vec;
-extern const bfd_target bfd_elf32_bigarc_vec;
-extern const bfd_target bfd_elf32_bigarm_vec;
-extern const bfd_target bfd_elf32_bigarm_oabi_vec;
-extern const bfd_target bfd_elf32_littlearc_vec;
-extern const bfd_target bfd_elf32_littlearm_vec;
-extern const bfd_target bfd_elf32_littlearm_oabi_vec;
-extern const bfd_target bfd_elf32_big_generic_vec;
-extern const bfd_target bfd_elf32_bigmips_vec;
-extern const bfd_target bfd_elf64_bigmips_vec;
-extern const bfd_target bfd_elf32_d10v_vec;
-extern const bfd_target bfd_elf32_d30v_vec;
-extern const bfd_target bfd_elf32_hppa_vec;
-extern const bfd_target bfd_elf32_i386_vec;
-extern const bfd_target bfd_elf32_i860_vec;
-extern const bfd_target bfd_elf32_little_generic_vec;
-extern const bfd_target bfd_elf32_littlemips_vec;
-extern const bfd_target bfd_elf64_littlemips_vec;
-extern const bfd_target bfd_elf32_m32r_vec;
-extern const bfd_target bfd_elf32_m68k_vec;
-extern const bfd_target bfd_elf32_m88k_vec;
-extern const bfd_target bfd_elf32_mn10200_vec;
-extern const bfd_target bfd_elf32_mn10300_vec;
-extern const bfd_target bfd_elf32_powerpc_vec;
-extern const bfd_target bfd_elf32_powerpcle_vec;
-extern const bfd_target bfd_elf32_sh_vec;
-extern const bfd_target bfd_elf32_shl_vec;
-extern const bfd_target bfd_elf32_sparc_vec;
-extern const bfd_target bfd_elf32_v850_vec;
-extern const bfd_target bfd_elf32_fr30_vec;
-extern const bfd_target bfd_elf32_mcore_big_vec;
-extern const bfd_target bfd_elf32_mcore_little_vec;
-extern const bfd_target bfd_elf64_big_generic_vec;
-extern const bfd_target bfd_elf64_little_generic_vec;
-extern const bfd_target bfd_elf64_sparc_vec;
-extern const bfd_target demo_64_vec;
-extern const bfd_target ecoff_big_vec;
-extern const bfd_target ecoff_little_vec;
-extern const bfd_target ecoff_biglittle_vec;
-extern const bfd_target ecoffalpha_little_vec;
-extern const bfd_target h8300coff_vec;
-extern const bfd_target h8500coff_vec;
-extern const bfd_target host_aout_vec;
-extern const bfd_target hp300bsd_vec;
-extern const bfd_target hp300hpux_vec;
-extern const bfd_target som_vec;
-extern const bfd_target i386aout_vec;
-extern const bfd_target i386bsd_vec;
-extern const bfd_target i386dynix_vec;
-extern const bfd_target i386freebsd_vec;
-extern const bfd_target i386os9k_vec;
-extern const bfd_target i386coff_vec;
-extern const bfd_target bfd_powerpc_pe_vec;
-extern const bfd_target bfd_powerpcle_pe_vec;
-extern const bfd_target bfd_powerpc_pei_vec;
-extern const bfd_target bfd_powerpcle_pei_vec;
-extern const bfd_target i386pe_vec;
-extern const bfd_target i386pei_vec;
-extern const bfd_target go32coff_vec;
-extern const bfd_target go32stubbedcoff_vec;
-extern const bfd_target i386linux_vec;
-extern const bfd_target i386lynx_aout_vec;
-extern const bfd_target i386lynx_coff_vec;
-extern const bfd_target i386mach3_vec;
-extern const bfd_target i386msdos_vec;
-extern const bfd_target i386netbsd_vec;
-extern const bfd_target i860coff_vec;
-extern const bfd_target icoff_big_vec;
-extern const bfd_target icoff_little_vec;
-extern const bfd_target ieee_vec;
-extern const bfd_target m68kaux_coff_vec;
-extern const bfd_target m68kcoff_vec;
-extern const bfd_target m68kcoffun_vec;
-extern const bfd_target m68klinux_vec;
-extern const bfd_target m68klynx_aout_vec;
-extern const bfd_target m68klynx_coff_vec;
-extern const bfd_target m68knetbsd_vec;
-extern const bfd_target m68ksysvcoff_vec;
-extern const bfd_target m68k4knetbsd_vec;
-extern const bfd_target m88kbcs_vec;
-extern const bfd_target m88kmach3_vec;
-extern const bfd_target mcore_pe_big_vec;
-extern const bfd_target mcore_pe_little_vec;
-extern const bfd_target mcore_pei_big_vec;
-extern const bfd_target mcore_pei_little_vec;
-extern const bfd_target newsos3_vec;
-extern const bfd_target nlm32_i386_vec;
-extern const bfd_target nlm32_sparc_vec;
-extern const bfd_target nlm32_alpha_vec;
-extern const bfd_target nlm32_powerpc_vec;
-extern const bfd_target pc532netbsd_vec;
-extern const bfd_target oasys_vec;
-extern const bfd_target pc532machaout_vec;
-extern const bfd_target ppcboot_vec;
-extern const bfd_target riscix_vec;
-extern const bfd_target pmac_xcoff_vec;
-extern const bfd_target rs6000coff_vec;
-extern const bfd_target shcoff_vec;
-extern const bfd_target shlcoff_vec;
-extern const bfd_target shcoff_small_vec;
-extern const bfd_target shlcoff_small_vec;
-extern const bfd_target sparcle_aout_vec;
-extern const bfd_target sparclinux_vec;
-extern const bfd_target sparclynx_aout_vec;
-extern const bfd_target sparclynx_coff_vec;
-extern const bfd_target sparcnetbsd_vec;
-extern const bfd_target sparccoff_vec;
-extern const bfd_target sunos_big_vec;
-extern const bfd_target tekhex_vec;
-extern const bfd_target tic30_aout_vec;
-extern const bfd_target tic30_coff_vec;
-extern const bfd_target tic80coff_vec;
-extern const bfd_target vaxnetbsd_vec;
-extern const bfd_target versados_vec;
-extern const bfd_target vms_alpha_vec;
-extern const bfd_target vms_vax_vec;
-extern const bfd_target we32kcoff_vec;
-extern const bfd_target w65_vec;
-extern const bfd_target z8kcoff_vec;
-
-/* srec is always included.  */
-extern const bfd_target srec_vec;
-extern const bfd_target symbolsrec_vec;
-
-/* binary is always included.  */
-extern const bfd_target binary_vec;
-
-/* ihex is always included.  */
-extern const bfd_target ihex_vec;
-
-/* All of the xvecs for core files.  */
-extern const bfd_target aix386_core_vec;
-extern const bfd_target cisco_core_vec;
-extern const bfd_target hpux_core_vec;
-extern const bfd_target hppabsd_core_vec;
-extern const bfd_target irix_core_vec;
-extern const bfd_target netbsd_core_vec;
-extern const bfd_target osf_core_vec;
-extern const bfd_target sco5_core_vec;
-extern const bfd_target trad_core_vec;
-extern const bfd_target ptrace_core_vec;
-
-const bfd_target * const bfd_target_vector[] = {
-
-#ifdef SELECT_VECS
-
-	SELECT_VECS,
-
-#else /* not SELECT_VECS */
-
-#ifdef DEFAULT_VECTOR
-	&DEFAULT_VECTOR,
-#endif
-	/* This list is alphabetized to make it easy to compare
-	   with other vector lists -- the decls above and
-	   the case statement in configure.in.
-	   Vectors that don't compile on all systems, or aren't finished,
-	   should have an entry here with #if 0 around it, to show that
-	   it wasn't omitted by mistake.  */
-	&a29kcoff_big_vec,
-	&a_out_adobe_vec,
-#if 0				/* No one seems to use this.  */
-	&aout_mips_big_vec,
-#endif
-	&aout_mips_little_vec,
-	&b_out_vec_big_host,
-	&b_out_vec_little_host,
-
-	/* This, and other vectors, may not be used in any *.mt configuration.
-	   But that does not mean they are unnecessary.  If configured with
-	   --enable-targets=all, objdump or gdb should be able to examine
-	   the file even if we don't recognize the machine type.  */
-	&bfd_elf32_big_generic_vec,
-#ifdef BFD64
-	&bfd_elf64_alpha_vec,
-#endif
-	&bfd_elf32_bigarc_vec,
-        &bfd_elf32_bigarm_vec,
-        &bfd_elf32_bigarm_oabi_vec,
-	&bfd_elf32_bigmips_vec,
-#ifdef BFD64
-	&bfd_elf64_bigmips_vec,
-#endif
-	&bfd_elf32_d10v_vec,
-	&bfd_elf32_d30v_vec,
-	&bfd_elf32_hppa_vec,
-	&bfd_elf32_i386_vec,
-	&bfd_elf32_i860_vec,
-	&bfd_elf32_little_generic_vec,
-	&bfd_elf32_littlearc_vec,
-        &bfd_elf32_littlearm_vec,
-        &bfd_elf32_littlearm_oabi_vec,
-	&bfd_elf32_littlemips_vec,
-#ifdef BFD64
-	&bfd_elf64_littlemips_vec,
-#endif
-	&bfd_elf32_m32r_vec,
-	&bfd_elf32_mn10200_vec,
-	&bfd_elf32_mn10300_vec,
-	&bfd_elf32_m68k_vec,
-	&bfd_elf32_m88k_vec,
-	&bfd_elf32_sparc_vec,
-	&bfd_elf32_powerpc_vec,
-	&bfd_elf32_powerpcle_vec,
-	&bfd_elf32_v850_vec,
-	&bfd_elf32_fr30_vec,
-	&bfd_elf32_mcore_big_vec,
-	&bfd_elf32_mcore_little_vec,
-#ifdef BFD64			/* No one seems to use this.  */
-	&bfd_elf64_big_generic_vec,
-	&bfd_elf64_little_generic_vec,
-#endif
-#if 0
-	&bfd_elf64_sparc_vec,
-#endif
-	/* We don't include cisco_core_vec.  Although it has a magic number,
-	   the magic number isn't at the beginning of the file, and thus
-	   might spuriously match other kinds of files.  */
-#ifdef BFD64
-	&demo_64_vec,	/* Only compiled if host has long-long support */
-#endif
-	&ecoff_big_vec,
-	&ecoff_little_vec,
-	&ecoff_biglittle_vec,
-#ifdef BFD64
-	&ecoffalpha_little_vec,
-#endif
-	&h8300coff_vec,
-	&h8500coff_vec,
-#if 0
-	/* Since a.out files lack decent magic numbers, no way to recognize
-	   which kind of a.out file it is.  */
-	&host_aout_vec,
-#endif
-#if 0				/* Clashes with sunos_big_vec magic no.  */
-	&hp300bsd_vec,
-#endif
-	&hp300hpux_vec,
-#if defined (HOST_HPPAHPUX) || defined (HOST_HPPABSD) || defined (HOST_HPPAOSF)
-        &som_vec,
-#endif
-	&i386aout_vec,
-	&i386bsd_vec,
-	&i386coff_vec,
-	&i386freebsd_vec,
-	&i860coff_vec,
-	&bfd_powerpc_pe_vec,
-	&bfd_powerpcle_pe_vec,
-	&bfd_powerpc_pei_vec,
-	&bfd_powerpcle_pei_vec,
-	&go32coff_vec,
-	&go32stubbedcoff_vec,
-#if 0
-	/* Since a.out files lack decent magic numbers, no way to recognize
-	   which kind of a.out file it is.  */
-	&i386linux_vec,
-#endif
-	&i386lynx_aout_vec,
-	&i386lynx_coff_vec,
-#if 0
-	/* No distinguishing features for Mach 3 executables.  */
-	&i386mach3_vec,
-#endif
-	&i386msdos_vec,
-	&i386netbsd_vec,
-	&i386os9k_vec,
-	&i386pe_vec,
-	&i386pei_vec,
-	&armcoff_little_vec,
-	&armcoff_big_vec,
-	&armpe_little_vec,
-	&armpe_big_vec,
-	&armpei_little_vec,
-	&armpei_big_vec,
-	&arm_epoc_pe_little_vec,
-	&arm_epoc_pe_big_vec,
-	&arm_epoc_pei_little_vec,
-	&arm_epoc_pei_big_vec,
-	&icoff_big_vec,
-	&icoff_little_vec,
-	&ieee_vec,
-	&m68kcoff_vec,
-	&m68kcoffun_vec,
-#if 0
-	/* Since a.out files lack decent magic numbers, no way to recognize
-	   which kind of a.out file it is.  */
-	&m68klinux_vec,
-#endif
-	&m68klynx_aout_vec,
-	&m68klynx_coff_vec,
-	&m68knetbsd_vec,
-	&m68ksysvcoff_vec,
-	&m88kbcs_vec,
-	&m88kmach3_vec,
-	&mcore_pe_big_vec,
-	&mcore_pe_little_vec,
-	&mcore_pei_big_vec,
-	&mcore_pei_little_vec,
-	&newsos3_vec,
-	&nlm32_i386_vec,
-	&nlm32_sparc_vec,
-#ifdef BFD64
-	&nlm32_alpha_vec,
-#endif
-	&pc532netbsd_vec,
-#if 0
-	/* We have no oasys tools anymore, so we can't test any of this
-	   anymore. If you want to test the stuff yourself, go ahead...
-	   steve@cygnus.com
-	   Worse, since there is no magic number for archives, there
-	   can be annoying target mis-matches.  */
-	&oasys_vec,
-#endif
-	&pc532machaout_vec,
-#if 0
-	/* We have no way of distinguishing these from other a.out variants */
-	&aout_arm_big_vec,
-	&aout_arm_little_vec,
-	&riscix_vec,
-#endif
-#if 0
-	/* This has the same magic number as RS/6000. */
-	&pmac_xcoff_vec,
-#endif
-	&rs6000coff_vec,
-	&ppcboot_vec,
-	&shcoff_vec,
-	&shlcoff_vec,
-	&shcoff_small_vec,
-	&shlcoff_small_vec,
-	&sparcle_aout_vec,
-	&sparclinux_vec,
-	&sparclynx_aout_vec,
-	&sparclynx_coff_vec,
-	&sparcnetbsd_vec,
-	&sunos_big_vec,
-	&aout0_big_vec,
-	&tic30_aout_vec,
-	&tic30_coff_vec,
-	&tic80coff_vec,
-	&vaxnetbsd_vec,
-	&versados_vec,
-#ifdef BFD64
-	&vms_alpha_vec,
-#endif
-	&vms_vax_vec,
-	&we32kcoff_vec,
-	&z8kcoff_vec,
-
-#endif /* not SELECT_VECS */
-
-/* Always support S-records, for convenience.  */
-	&srec_vec,
-	&symbolsrec_vec,
-/* And tekhex */
-	&tekhex_vec,
-/* Likewise for binary output.  */
-	&binary_vec,
-/* Likewise for ihex.  */
-	&ihex_vec,
-
-/* Add any required traditional-core-file-handler.  */
-
-#ifdef AIX386_CORE
-	&aix386_core_vec,
-#endif
-#ifdef HPUX_CORE
-	&hpux_core_vec,
-#endif
-#ifdef HPPABSD_CORE
-	&hppabsd_core_vec,
-#endif
-#ifdef IRIX_CORE
-	&irix_core_vec,
-#endif
-#ifdef NETBSD_CORE
-	&netbsd_core_vec,
-#endif
-#ifdef OSF_CORE
-	&osf_core_vec,
-#endif
-#ifdef SCO5_CORE
-	&sco5_core_vec,
-#endif
-#ifdef	TRAD_CORE
-	&trad_core_vec,
-#endif
-
-#ifdef	PTRACE_CORE
-	&ptrace_core_vec,
-#endif
-
-	NULL /* end of list marker */
-};
-
-/* bfd_default_vector[0] contains either the address of the default vector,
-   if there is one, or zero if there isn't.  */
-
-const bfd_target *bfd_default_vector[] = {
-#ifdef DEFAULT_VECTOR
-	&DEFAULT_VECTOR,
-#endif
-	NULL
-};
-
-/* When there is an ambiguous match, bfd_check_format_matches puts the
-   names of the matching targets in an array.  This variable is the maximum
-   number of entries that the array could possibly need.  */
-const size_t _bfd_target_vector_entries = sizeof(bfd_target_vector)/sizeof(*bfd_target_vector);
-
-/* This array maps configuration triplets onto BFD vectors.  */
-
-struct targmatch
-{
-  /* The configuration triplet.  */
-  const char *triplet;
-  /* The BFD vector.  If this is NULL, then the vector is found by
-     searching forward for the next structure with a non NULL vector
-     field.  */
-  const bfd_target *vector;
-};
-
-/* targmatch.h is built by Makefile out of config.bfd.  */
-static const struct targmatch bfd_target_match[] = {
-#include "targmatch.h"
-  { NULL, NULL }
-};
-
-static const bfd_target *find_target PARAMS ((const char *));
-
-/* Find a target vector, given a name or configuration triplet.  */
-
-static const bfd_target *
-find_target (name)
-     const char *name;
-{
-  const bfd_target * const *target;
-  const struct targmatch *match;
-
-  for (target = &bfd_target_vector[0]; *target != NULL; target++)
-    if (strcmp (name, (*target)->name) == 0)
-      return *target;
-
-  /* If we couldn't match on the exact name, try matching on the
-     configuration triplet.  FIXME: We should run the triplet through
-     config.sub first, but that is hard.  */
-  for (match = &bfd_target_match[0]; match->triplet != NULL; match++)
-    {
-      if (fnmatch (match->triplet, name, 0) == 0)
-	{
-	  while (match->vector == NULL)
-	    ++match;
-	  return match->vector;
-	  break;
-	}
-    }
-
-  bfd_set_error (bfd_error_invalid_target);
-  return NULL;
-}
-
-/*
-FUNCTION
-	bfd_set_default_target
-
-SYNOPSIS
-	boolean bfd_set_default_target (const char *name);
-
-DESCRIPTION
-	Set the default target vector to use when recognizing a BFD.
-	This takes the name of the target, which may be a BFD target
-	name or a configuration triplet.
-*/
-
-boolean
-bfd_set_default_target (name)
-     const char *name;
-{
-  const bfd_target *target;
-
-  if (bfd_default_vector[0] != NULL
-      && strcmp (name, bfd_default_vector[0]->name) == 0)
-    return true;
-
-  target = find_target (name);
-  if (target == NULL)
-    return false;
-
-  bfd_default_vector[0] = target;
-  return true;
-}
-
-/*
-FUNCTION
-	bfd_find_target
-
-SYNOPSIS
-	const bfd_target *bfd_find_target(CONST char *target_name, bfd *abfd);
-
-DESCRIPTION
-	Return a pointer to the transfer vector for the object target
-	named @var{target_name}.  If @var{target_name} is <<NULL>>, choose the
-	one in the environment variable <<GNUTARGET>>; if that is null or not
-	defined, then choose the first entry in the target list.
-	Passing in the string "default" or setting the environment
-	variable to "default" will cause the first entry in the target
-	list to be returned, and "target_defaulted" will be set in the
-	BFD.  This causes <<bfd_check_format>> to loop over all the
-	targets to find the one that matches the file being read.   
-*/
-
-const bfd_target *
-bfd_find_target (target_name, abfd)
-     const char *target_name;
-     bfd *abfd;
-{
-  const char *targname;
-  const bfd_target *target;
-
-  if (target_name != NULL)
-    targname = target_name;
-  else
-    targname = getenv ("GNUTARGET");
-
-  /* This is safe; the vector cannot be null */
-  if (targname == NULL || strcmp (targname, "default") == 0)
-    {
-      abfd->target_defaulted = true;
-      if (bfd_default_vector[0] != NULL)
-	abfd->xvec = bfd_default_vector[0];
-      else
-	abfd->xvec = bfd_target_vector[0];
-      return abfd->xvec;
-    }
-
-  abfd->target_defaulted = false;
-
-  target = find_target (targname);
-  if (target == NULL)
-    return NULL;
-
-  abfd->xvec = target;
-  return target;
-}
-
-/*
-FUNCTION
-	bfd_target_list
-
-SYNOPSIS
-	const char **bfd_target_list(void);
-
-DESCRIPTION
-	Return a freshly malloced NULL-terminated
-	vector of the names of all the valid BFD targets. Do not
-	modify the names.
-
-*/
-
-const char **
-bfd_target_list ()
-{
-  int vec_length= 0;
-#if defined (HOST_HPPAHPUX) && ! defined (__STDC__)
-  /* The native compiler on the HP9000/700 has a bug which causes it
-     to loop endlessly when compiling this file.  This avoids it.  */
-  volatile
-#endif
-    const bfd_target * const *target;
-  CONST  char **name_list, **name_ptr;
-
-  for (target = &bfd_target_vector[0]; *target != NULL; target++)
-    vec_length++;
-
-  name_ptr = name_list = (CONST char **)
-    bfd_zmalloc ((vec_length + 1) * sizeof (char **));
-
-  if (name_list == NULL)
-    return NULL;
-
-  for (target = &bfd_target_vector[0]; *target != NULL; target++)
-    *(name_ptr++) = (*target)->name;
-
-  return name_list;
-}
diff --git a/bfd/targmatch.sed b/bfd/targmatch.sed
deleted file mode 100644
index 2f40e723f2c..00000000000
--- a/bfd/targmatch.sed
+++ /dev/null
@@ -1,32 +0,0 @@
-1,/START OF targmatch.h/	d
-/END OF targmatch.h/,$		d
-s/^#if/KEEP #if/
-s/^#endif/KEEP #endif/
-s/^[ 	]*#.*$//
-s/^KEEP #/#/
-s/[ 	]*\\$//
-t lab1
-	:lab1
-s/[| 	][| 	]*\([^|() 	][^|() 	]*\)[ 	]*|/{ "\1", NULL },/g
-s/[| 	][| 	]*\([^|() 	][^|() 	]*\)[ 	]*)/{ "\1",/g
-t lab2
-s/^[ 	]*targ_defvec=\([^ 	]*\)/#if !defined (SELECT_VECS) || defined (HAVE_\1)/
-t lab3
-s/.*=.*//
-s/;;//
-b
-	:lab2
-H
-d
-	:lab3
-G
-s/\n/%EOL%/g
-s/\(defined (HAVE_\)\([^)]*\)\(.*\)/\1\2\3\
-\&\2 },\
-#endif/
-s/%EOL%/\
-/g
-p
-s/.*//g
-s/\n//g
-h
diff --git a/bfd/tekhex.c b/bfd/tekhex.c
deleted file mode 100644
index c88fe2dbaf2..00000000000
--- a/bfd/tekhex.c
+++ /dev/null
@@ -1,1065 +0,0 @@
-/* BFD backend for Extended Tektronix Hex Format  objects.
-   Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-SUBSECTION
-	Tektronix Hex Format handling
-
-DESCRIPTION
-	
-	Tek Hex records can hold symbols and data, but not
-	relocations. Their main application is communication with
-	devices like PROM programmers and ICE equipment.
-	
-	It seems that the sections are descibed as being really big,
-        the example I have says that the text section is 0..ffffffff.
-	BFD would barf with this, many apps would try to alloc 4GB to
-	read in the file.
-
-	Tex Hex may contain many sections, but the data which comes in
-	has no tag saying which section it belongs to, so we create
-	one section for each block of data, called "blknnnn" which we
-	stick all the data into.
-
-	TekHex may come out of 	order and there is no header, so an
-	initial scan is required  to discover the minimum and maximum
-	addresses used to create the vma and size of the sections we
-	create.
-	We read in the data into pages of CHUNK_MASK+1 size and read
-	them out from that whenever we need to.
-
-	Any number of sections may be created for output, we save them
-	up and output them when it's time to close the bfd.
-
-
-	A TekHex record looks like:
-EXAMPLE
-	%<block length><type><checksum><stuff><cr>
-	
-DESCRIPTION
-	Where
-	o length
-	is the number of bytes in the record not including the % sign.
-	o type
-	is one of:
-	3) symbol record
-	6) data record
-	8) termination record
-	
-
-The data can come out of order, and may be discontigous. This is a
-serial protocol, so big files are unlikely, so we keep a list of 8k chunks
-*/
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libiberty.h"
-
-typedef struct
-  {
-    bfd_vma low;
-    bfd_vma high;
-  } addr_range_type;
-
-typedef struct tekhex_symbol_struct
-  {
-
-    asymbol symbol;
-    struct tekhex_symbol_struct *prev;
-
-  } tekhex_symbol_type;
-
-static const char digs[] = "0123456789ABCDEF";
-
-static char sum_block[256];
-
-#define NOT_HEX 20
-#define NIBBLE(x) hex_value(x)
-#define HEX(buffer) ((NIBBLE((buffer)[0])<<4) + NIBBLE((buffer)[1]))
-#define TOHEX(d,x) \
-(d)[1] = digs[(x) & 0xf]; \
-(d)[0] = digs[((x)>>4)&0xf];
-#define	ISHEX(x)  hex_p(x)
-
-static void tekhex_init PARAMS ((void));
-static bfd_vma getvalue PARAMS ((char **));
-static void tekhex_print_symbol
- PARAMS ((bfd *, PTR, asymbol *, bfd_print_symbol_type));
-static void tekhex_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static asymbol *tekhex_make_empty_symbol PARAMS ((bfd *));
-static int tekhex_sizeof_headers PARAMS ((bfd *, boolean));
-static boolean tekhex_write_object_contents PARAMS ((bfd *));
-static void out PARAMS ((bfd *, int, char *, char *));
-static void writesym PARAMS ((char **, CONST char *));
-static void writevalue PARAMS ((char **, bfd_vma));
-static boolean tekhex_set_section_contents
- PARAMS ((bfd*, sec_ptr, PTR, file_ptr, bfd_size_type));
-static boolean tekhex_set_arch_mach
- PARAMS ((bfd *, enum bfd_architecture, unsigned long));
-static boolean tekhex_get_section_contents
- PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type));
-static void move_section_contents
- PARAMS ((bfd *, asection *, PTR, file_ptr, bfd_size_type, boolean));
-static const bfd_target *tekhex_object_p PARAMS ((bfd *));
-static boolean tekhex_mkobject PARAMS ((bfd *));
-static long tekhex_get_symtab_upper_bound PARAMS ((bfd *));
-static long tekhex_get_symtab PARAMS ((bfd *, asymbol **));
-static void pass_over PARAMS ((bfd *, void (*)(bfd*, int, char *)));
-static void first_phase PARAMS ((bfd *, int, char *));
-static void insert_byte PARAMS ((bfd *, int, bfd_vma));
-static struct data_struct *find_chunk PARAMS ((bfd *, bfd_vma));
-static unsigned int getsym PARAMS ((char *, char **));
-
-/*
-Here's an example
-%3A6C6480004E56FFFC4E717063B0AEFFFC6D0652AEFFFC60F24E5E4E75
-%1B3709T_SEGMENT1108FFFFFFFF
-%2B3AB9T_SEGMENT7Dgcc_compiled$1087hello$c10
-%373829T_SEGMENT80int$t1$r1$$214741080char$t2$r2$0$12710
-%373769T_SEGMENT80long$int$t3$r1$$1080unsigned$int$t4$10
-%373CA9T_SEGMENT80long$unsigned$in1080short$int$t6$r1$10
-%373049T_SEGMENT80long$long$int$t71080short$unsigned$i10
-%373A29T_SEGMENT80long$long$unsign1080signed$char$t10$10
-%373D69T_SEGMENT80unsigned$char$t11080float$t12$r1$4$010
-%373D19T_SEGMENT80double$t13$r1$8$1080long$double$t14$10
-%2734D9T_SEGMENT8Bvoid$t15$151035_main10
-%2F3CA9T_SEGMENT81$1081$1681$1E81$21487main$F110
-%2832F9T_SEGMENT83i$18FFFFFFFC81$1481$214
-%07 8 10 10
-
-explanation:
-%3A6C6480004E56FFFC4E717063B0AEFFFC6D0652AEFFFC60F24E5E4E75
- ^ ^^ ^     ^-data
- | || +------ 4 char integer 0x8000
- | |+-------- checksum
- | +--------- type 6 (data record)
- +----------- length 3a chars
- <---------------------- 3a (58 chars) ------------------->
-
-%1B3709T_SEGMENT1108FFFFFFFF
-      ^         ^^ ^- 8 character integer 0xffffffff
-      |         |+-   1 character integer 0
-      |         +--   type 1 symbol (section definition)
-      +------------   9 char symbol T_SEGMENT
-
-%2B3AB9T_SEGMENT7Dgcc_compiled$1087hello$c10
-%373829T_SEGMENT80int$t1$r1$$214741080char$t2$r2$0$12710
-%373769T_SEGMENT80long$int$t3$r1$$1080unsigned$int$t4$10
-%373CA9T_SEGMENT80long$unsigned$in1080short$int$t6$r1$10
-%373049T_SEGMENT80long$long$int$t71080short$unsigned$i10
-%373A29T_SEGMENT80long$long$unsign1080signed$char$t10$10
-%373D69T_SEGMENT80unsigned$char$t11080float$t12$r1$4$010
-%373D19T_SEGMENT80double$t13$r1$8$1080long$double$t14$10
-%2734D9T_SEGMENT8Bvoid$t15$151035_main10
-%2F3CA9T_SEGMENT81$1081$1681$1E81$21487main$F110
-%2832F9T_SEGMENT83i$18FFFFFFFC81$1481$214
-%0781010
-
-Turns into
-sac@thepub$ ./objdump -dx -m m68k f
-
-f:     file format tekhex
------x--- 9/55728 -134219416 Sep 29 15:13 1995 f
-architecture: UNKNOWN!, flags 0x00000010:
-HAS_SYMS
-start address 0x00000000
-SECTION 0 [D00000000]	: size 00020000 vma 00000000 align 2**0
- ALLOC, LOAD
-SECTION 1 [D00008000]	: size 00002001 vma 00008000 align 2**0
-
-SECTION 2 [T_SEGMENT]	: size ffffffff vma 00000000 align 2**0
-
-SYMBOL TABLE:
-00000000  g       T_SEGMENT gcc_compiled$
-00000000  g       T_SEGMENT hello$c
-00000000  g       T_SEGMENT int$t1$r1$$21474
-00000000  g       T_SEGMENT char$t2$r2$0$127
-00000000  g       T_SEGMENT long$int$t3$r1$$
-00000000  g       T_SEGMENT unsigned$int$t4$
-00000000  g       T_SEGMENT long$unsigned$in
-00000000  g       T_SEGMENT short$int$t6$r1$
-00000000  g       T_SEGMENT long$long$int$t7
-00000000  g       T_SEGMENT short$unsigned$i
-00000000  g       T_SEGMENT long$long$unsign
-00000000  g       T_SEGMENT signed$char$t10$
-00000000  g       T_SEGMENT unsigned$char$t1
-00000000  g       T_SEGMENT float$t12$r1$4$0
-00000000  g       T_SEGMENT double$t13$r1$8$
-00000000  g       T_SEGMENT long$double$t14$
-00000000  g       T_SEGMENT void$t15$15
-00000000  g       T_SEGMENT _main
-00000000  g       T_SEGMENT $
-00000000  g       T_SEGMENT $
-00000000  g       T_SEGMENT $
-00000010  g       T_SEGMENT $
-00000000  g       T_SEGMENT main$F1
-fcffffff  g       T_SEGMENT i$1
-00000000  g       T_SEGMENT $
-00000010  g       T_SEGMENT $
-
-
-RELOCATION RECORDS FOR [D00000000]: (none)
-
-RELOCATION RECORDS FOR [D00008000]: (none)
-
-RELOCATION RECORDS FOR [T_SEGMENT]: (none)
-
-Disassembly of section D00000000:
-...
-00008000 ($+)7ff0 linkw fp,#-4
-00008004 ($+)7ff4 nop
-00008006 ($+)7ff6 movel #99,d0
-00008008 ($+)7ff8 cmpl fp@(-4),d0
-0000800c ($+)7ffc blts 00008014 ($+)8004
-0000800e ($+)7ffe addql #1,fp@(-4)
-00008012 ($+)8002 bras 00008006 ($+)7ff6
-00008014 ($+)8004 unlk fp
-00008016 ($+)8006 rts
-...
-
-*/
-
-static void
-tekhex_init ()
-{
-  unsigned int i;
-  static boolean inited = false;
-  int val;
-
-  if (inited == false)
-    {
-      inited = true;
-      hex_init ();
-      val = 0;
-      for (i = 0; i < 10; i++)
-	{
-	  sum_block[i + '0'] = val++;
-	}
-      for (i = 'A'; i <= 'Z'; i++)
-	{
-	  sum_block[i] = val++;
-	}
-      sum_block['$'] = val++;
-      sum_block['%'] = val++;
-      sum_block['.'] = val++;
-      sum_block['_'] = val++;
-      for (i = 'a'; i <= 'z'; i++)
-	{
-	  sum_block[i] = val++;
-	}
-    }
-}
-
-/* The maximum number of bytes on a line is FF */
-#define MAXCHUNK 0xff
-/* The number of bytes we fit onto a line on output */
-#define CHUNK 21
-
-/* We cannot output our tekhexords as we see them, we have to glue them
-   together, this is done in this structure : */
-
-struct tekhex_data_list_struct
-{
-  unsigned char *data;
-  bfd_vma where;
-  bfd_size_type size;
-  struct tekhex_data_list_struct *next;
-
-};
-typedef struct tekhex_data_list_struct tekhex_data_list_type;
-
-#define CHUNK_MASK 0x1fff
-
-struct data_struct
-  {
-    char chunk_data[CHUNK_MASK + 1];
-    char chunk_init[CHUNK_MASK + 1];
-    bfd_vma vma;
-    struct data_struct *next;
-  };
-
-typedef struct tekhex_data_struct
-{
-  tekhex_data_list_type *head;
-  unsigned int type;
-  struct tekhex_symbol_struct *symbols;
-  struct data_struct *data;
-} tdata_type;
-
-#define enda(x) (x->vma + x->size)
-
-static bfd_vma
-getvalue (srcp)
-     char **srcp;
-{
-  char *src = *srcp;
-  bfd_vma value = 0;
-  unsigned int len = hex_value(*src++);
-
-  if (len == 0)
-    len = 16;
-  while (len--)
-    {
-      value = value << 4 | hex_value(*src++);
-    }
-  *srcp = src;
-  return value;
-}
-
-static unsigned int
-getsym (dstp, srcp)
-     char *dstp;
-     char **srcp;
-{
-  char *src = *srcp;
-  unsigned int i;
-  unsigned int len = hex_value(*src++);
-
-  if (len == 0)
-    len = 16;
-  for (i = 0; i < len; i++)
-    dstp[i] = src[i];
-  dstp[i] = 0;
-  *srcp = src + i;
-  return len;
-}
-
-static struct data_struct *
-find_chunk (abfd, vma)
-     bfd *abfd;
-     bfd_vma vma;
-{
-  struct data_struct *d = abfd->tdata.tekhex_data->data;
-
-  vma &= ~CHUNK_MASK;
-  while (d && (d->vma) != vma)
-    {
-      d = d->next;
-    }
-  if (!d)
-    {
-      char *sname = bfd_alloc (abfd, 12);
-
-      /* No chunk for this address, so make one up */
-      d = (struct data_struct *)
-	bfd_alloc (abfd, sizeof (struct data_struct));
-
-      if (!sname || !d)
-	return NULL;
-
-      memset (d->chunk_init, 0, CHUNK_MASK + 1);
-      memset (d->chunk_data, 0, CHUNK_MASK + 1);
-      d->next = abfd->tdata.tekhex_data->data;
-      d->vma = vma;
-      abfd->tdata.tekhex_data->data = d;
-    }
-  return d;
-}
-
-static void
-insert_byte (abfd, value, addr)
-     bfd *abfd;
-     int value;
-     bfd_vma addr;
-{
-  /* Find the chunk that this byte needs and put it in */
-  struct data_struct *d = find_chunk (abfd, addr);
-
-  d->chunk_data[addr & CHUNK_MASK] = value;
-  d->chunk_init[addr & CHUNK_MASK] = 1;
-}
-
-/* The first pass is to find the names of all the sections, and see
-  how big the data is */
-static void
-first_phase (abfd, type, src)
-     bfd *abfd;
-     int type;
-     char *src;
-{
-  asection *section = bfd_abs_section_ptr;
-  int len;
-  char sym[17];			/* A symbol can only be 16chars long */
-
-  switch (type)
-    {
-    case '6':
-      /* Data record - read it and store it */
-      {
-	bfd_vma addr = getvalue (&src);
-
-	while (*src)
-	  {
-	    insert_byte (abfd, HEX (src), addr);
-	    src += 2;
-	    addr++;
-	  }
-      }
-
-      return;
-    case '3':
-      /* Symbol record, read the segment */
-      len = getsym (sym, &src);
-      section = bfd_get_section_by_name (abfd, sym);
-      if (section == (asection *) NULL)
-	{
-	  char *n = bfd_alloc (abfd, len + 1);
-
-	  if (!n)
-	    abort();		/* FIXME */
-	  memcpy (n, sym, len + 1);
-	  section = bfd_make_section (abfd, n);
-	}
-      while (*src)
-	{
-	  switch (*src)
-	    {
-	    case '1':		/* section range */
-	      src++;
-	      section->vma = getvalue (&src);
-	      section->_raw_size = getvalue (&src) - section->vma;
-	      section->flags = SEC_HAS_CONTENTS | SEC_LOAD | SEC_ALLOC;
-	      break;
-	    case '0':
-	    case '2':
-	    case '3':
-	    case '4':
-	    case '6':
-	    case '7':
-	    case '8':
-	      /* Symbols, add to section */
-	      {
-		tekhex_symbol_type *new =
-		(tekhex_symbol_type *) bfd_alloc (abfd,
-					       sizeof (tekhex_symbol_type));
-		char type = (*src);
-
-		if (!new)
-		  abort();	/* FIXME */
-		new->symbol.the_bfd = abfd;
-		src++;
-		abfd->symcount++;
-		abfd->flags |= HAS_SYMS;
-		new->prev = abfd->tdata.tekhex_data->symbols;
-		abfd->tdata.tekhex_data->symbols = new;
-		len = getsym (sym, &src);
-		new->symbol.name = bfd_alloc (abfd, len + 1);
-		if (!new->symbol.name)
-		  abort();	/* FIXME */
-		memcpy ((char *) (new->symbol.name), sym, len + 1);
-		new->symbol.section = section;
-		if (type <= '4')
-		  new->symbol.flags = (BSF_GLOBAL | BSF_EXPORT);
-		else
-		  new->symbol.flags = BSF_LOCAL;
-		new->symbol.value = getvalue (&src) - section->vma;
-	      }
-	    }
-	}
-    }
-}
-
-/* Pass over an tekhex, calling one of the above functions on each
-   record.  */
-
-static void
-pass_over (abfd, func)
-     bfd *abfd;
-     void (*func) PARAMS ((bfd *, int, char *));
-{
-  unsigned int chars_on_line;
-  boolean eof = false;
-
-  /* To the front of the file */
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    abort ();
-  while (eof == false)
-    {
-      char buffer[MAXCHUNK];
-      char *src = buffer;
-      char type;
-
-      /* Find first '%' */
-      eof = (boolean) (bfd_read (src, 1, 1, abfd) != 1);
-      while (*src != '%' && !eof)
-	{
-	  eof = (boolean) (bfd_read (src, 1, 1, abfd) != 1);
-	}
-      if (eof)
-	break;
-      src++;
-
-      /* Fetch the type and the length and the checksum */
-      if (bfd_read (src, 1, 5, abfd) != 5)
-	abort (); /* FIXME */
-
-      type = src[2];
-
-      if (!ISHEX (src[0]) || !ISHEX (src[1]))
-	break;
-
-      chars_on_line = HEX (src) - 5;	/* Already read five char */
-
-      if (bfd_read (src, 1, chars_on_line, abfd) != chars_on_line)
-	abort (); /* FIXME */
-      src[chars_on_line] = 0;	/* put a null at the end */
-
-      func (abfd, type, src);
-    }
-
-}
-
-static long
-tekhex_get_symtab (abfd, table)
-     bfd *abfd;
-     asymbol **table;
-{
-  tekhex_symbol_type *p = abfd->tdata.tekhex_data->symbols;
-  unsigned int c = bfd_get_symcount (abfd);
-
-  table[c] = 0;
-  while (p)
-    {
-      table[--c] = &(p->symbol);
-      p = p->prev;
-    }
-
-  return bfd_get_symcount (abfd);
-}
-
-static long
-tekhex_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  return (abfd->symcount + 1) * (sizeof (struct tekhex_asymbol_struct *));
-
-}
-
-static boolean
-tekhex_mkobject (abfd)
-     bfd *abfd;
-{
-  tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
-
-  if (!tdata)
-    return false;
-  abfd->tdata.tekhex_data = tdata;
-  tdata->type = 1;
-  tdata->head = (tekhex_data_list_type *) NULL;
-  tdata->symbols = (struct tekhex_symbol_struct *) NULL;
-  tdata->data = (struct data_struct *) NULL;
-  return true;
-}
-
-/*
-  Return true if the file looks like it's in TekHex format. Just look
-  for a percent sign and some hex digits */
-
-static const bfd_target *
-tekhex_object_p (abfd)
-     bfd *abfd;
-{
-  char b[4];
-
-  tekhex_init ();
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0
-      || bfd_read (b, 1, 4, abfd) != 4)
-    return NULL;
-
-  if (b[0] != '%' || !ISHEX (b[1]) || !ISHEX (b[2]) || !ISHEX (b[3]))
-    return (const bfd_target *) NULL;
-
-  tekhex_mkobject (abfd);
-
-  pass_over (abfd, first_phase);
-  return abfd->xvec;
-}
-
-static void
-move_section_contents (abfd, section, locationp, offset, count, get)
-     bfd *abfd;
-     asection *section;
-     PTR locationp;
-     file_ptr offset;
-     bfd_size_type count;
-     boolean get;
-{
-  bfd_vma addr;
-  char *location = (char *) locationp;
-  bfd_vma prev_number = 1;	/* Nothing can have this as a high bit*/
-  struct data_struct *d = (struct data_struct *) NULL;
-
-  for (addr = section->vma; count != 0; count--, addr++)
-    {
-
-      bfd_vma chunk_number = addr & ~CHUNK_MASK;	/* Get high bits of address */
-      bfd_vma low_bits = addr & CHUNK_MASK;
-
-      if (chunk_number != prev_number)
-	{
-	  /* Different chunk, so move pointer */
-	  d = find_chunk (abfd, chunk_number);
-	}
-
-      if (get)
-	{
-	  if (d->chunk_init[low_bits])
-	    {
-	      *location = d->chunk_data[low_bits];
-	    }
-	  else
-	    {
-	      *location = 0;
-	    }
-	}
-      else
-	{
-	  d->chunk_data[low_bits] = *location;
-	  d->chunk_init[low_bits] = (*location != 0);
-	}
-
-      location++;
-
-    }
-
-}
-
-static boolean
-tekhex_get_section_contents (abfd, section, locationp, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR locationp;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (section->flags & (SEC_LOAD | SEC_ALLOC))
-    {
-      move_section_contents (abfd, section, locationp, offset, count, true);
-      return true;
-    }
-  else
-    return false;
-}
-
-static boolean
-tekhex_set_arch_mach (abfd, arch, machine)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long machine;
-{
-  return bfd_default_set_arch_mach (abfd, arch, machine);
-}
-
-/* we have to save up all the Tekhexords for a splurge before output,
-    */
-
-static boolean
-tekhex_set_section_contents (abfd, section, locationp, offset, bytes_to_do)
-     bfd *abfd;
-     sec_ptr section;
-     PTR locationp;
-     file_ptr offset;
-     bfd_size_type bytes_to_do;
-{
-
-  if (abfd->output_has_begun == false)
-    {
-      /* The first time around, allocate enough sections to hold all the chunks */
-      asection *s = abfd->sections;
-      bfd_vma vma;
-
-      for (s = abfd->sections; s; s = s->next)
-	{
-	  if (s->flags & SEC_LOAD)
-	    {
-	      for (vma = s->vma & ~CHUNK_MASK;
-		   vma < s->vma + s->_raw_size;
-		   vma += CHUNK_MASK)
-		find_chunk (abfd, vma);
-	    }
-	}
-
-    }
-  if (section->flags & (SEC_LOAD | SEC_ALLOC))
-    {
-      move_section_contents (abfd, section, locationp, offset, bytes_to_do, false);
-      return true;
-    }
-  else
-    return false;
-
-}
-
-static void
-writevalue (dst, value)
-     char **dst;
-     bfd_vma value;
-{
-  char *p = *dst;
-  int len;
-  int shift;
-
-  for (len = 8, shift = 28; shift; shift -= 4, len--)
-    {
-      if ((value >> shift) & 0xf)
-	{
-	  *p++ = len + '0';
-	  while (len)
-	    {
-	      *p++ = digs[(value >> shift) & 0xf];
-	      shift -= 4;
-	      len--;
-	    }
-	  *dst = p;
-	  return;
-
-	}
-    }
-  *p++ = '1';
-  *p++ = '0';
-  *dst = p;
-}
-
-static void
-writesym (dst, sym)
-     char **dst;
-     CONST char *sym;
-{
-  char *p = *dst;
-  int len = (sym ? strlen (sym) : 0);
-
-  if (len >= 16)
-    {
-      *p++ = '0';
-      len = 16;
-    }
-
-  else
-    {
-      if (len == 0)
-	{
-	  *p++ = '1';
-	  sym = "$";
-	  len = 1;
-	}
-      else
-	{
-	  *p++ = digs[len];
-	}
-    }
-
-  while (len--)
-    {
-      *p++ = *sym++;
-    }
-  *dst = p;
-}
-
-static void
-out (abfd, type, start, end)
-     bfd *abfd;
-     int type;
-     char *start;
-     char *end;
-{
-  int sum = 0;
-  char *s;
-  char front[6];
-  bfd_size_type wrlen;
-
-  front[0] = '%';
-  TOHEX (front + 1, end - start + 5);
-  front[3] = type;
-
-  for (s = start; s < end; s++)
-    {
-      sum += sum_block[(unsigned char) *s];
-    }
-
-  sum += sum_block[(unsigned char) front[1]];	/*  length */
-  sum += sum_block[(unsigned char) front[2]];
-  sum += sum_block[(unsigned char) front[3]];	/* type */
-  TOHEX (front + 4, sum);
-  if (bfd_write (front, 1, 6, abfd) != 6)
-    abort ();
-  end[0] = '\n';
-  wrlen = end - start + 1;
-  if (bfd_write (start, 1, wrlen, abfd) != wrlen)
-    abort ();
-}
-
-static boolean
-tekhex_write_object_contents (abfd)
-     bfd *abfd;
-{
-  int bytes_written;
-  char buffer[100];
-  asymbol **p;
-  asection *s;
-  struct data_struct *d;
-
-  tekhex_init ();
-
-  bytes_written = 0;
-
-  /* And the raw data */
-  for (d = abfd->tdata.tekhex_data->data;
-       d != (struct data_struct *) NULL;
-       d = d->next)
-    {
-      int low;
-
-      CONST int span = 32;
-      int addr;
-
-      /* Write it in blocks of 32 bytes */
-
-      for (addr = 0; addr < CHUNK_MASK + 1; addr += span)
-	{
-	  int need = 0;
-
-	  /* Check to see if necessary */
-	  for (low = 0; !need && low < span; low++)
-	    {
-	      if (d->chunk_init[addr + low])
-		need = 1;
-	    }
-	  if (need)
-	    {
-	      char *dst = buffer;
-
-	      writevalue (&dst, addr + d->vma);
-	      for (low = 0; low < span; low++)
-		{
-		  TOHEX (dst, d->chunk_data[addr + low]);
-		  dst += 2;
-		}
-	      out (abfd, '6', buffer, dst);
-	    }
-	}
-    }
-  /* write all the section headers for the sections */
-  for (s = abfd->sections; s != (asection *) NULL; s = s->next)
-    {
-      char *dst = buffer;
-
-      writesym (&dst, s->name);
-      *dst++ = '1';
-      writevalue (&dst, s->vma);
-      writevalue (&dst, s->vma + s->_raw_size);
-      out (abfd, '3', buffer, dst);
-    }
-
-  /* And the symbols */
-  if (abfd->outsymbols)
-    {
-      for (p = abfd->outsymbols; *p; p++)
-	{
-	  int section_code = bfd_decode_symclass (*p);
-
-	  if (section_code != '?')
-	    {			/* do not include debug symbols */
-	      asymbol *s = *p;
-	      char *dst = buffer;
-
-	      writesym (&dst, s->section->name);
-
-	      switch (section_code)
-		{
-		case 'A':
-		  *dst++ = '2';
-		  break;
-		case 'a':
-		  *dst++ = '6';
-		  break;
-		case 'D':
-		case 'B':
-		case 'O':
-		  *dst++ = '4';
-		  break;
-		case 'd':
-		case 'b':
-		case 'o':
-		  *dst++ = '8';
-		  break;
-		case 'T':
-		  *dst++ = '3';
-		  break;
-		case 't':
-		  *dst++ = '7';
-		  break;
-		case 'C':
-		case 'U':
-		  bfd_set_error (bfd_error_wrong_format);
-		  return false;
-		}
-
-	      writesym (&dst, s->name);
-	      writevalue (&dst, s->value + s->section->vma);
-	      out (abfd, '3', buffer, dst);
-	    }
-	}
-    }
-
-  /* And the terminator */
-  if (bfd_write ("%0781010\n", 1, 9, abfd) != 9)
-    abort ();
-  return true;
-}
-
-static int
-tekhex_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-
-{
-  return 0;
-}
-
-static asymbol *
-tekhex_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  tekhex_symbol_type *new =
-  (tekhex_symbol_type *) bfd_zalloc (abfd, sizeof (struct tekhex_symbol_struct));
-
-  if (!new)
-    return NULL;
-  new->symbol.the_bfd = abfd;
-  new->prev = (struct tekhex_symbol_struct *) NULL;
-  return &(new->symbol);
-}
-
-static void
-tekhex_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-static void
-tekhex_print_symbol (ignore_abfd, filep, symbol, how)
-     bfd *ignore_abfd;
-     PTR filep;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) filep;
-
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-    case bfd_print_symbol_more:
-      break;
-
-    case bfd_print_symbol_all:
-      {
-	CONST char *section_name = symbol->section->name;
-
-	bfd_print_symbol_vandf ((PTR) file, symbol);
-
-	fprintf (file, " %-5s %s",
-		 section_name,
-		 symbol->name);
-      }
-    }
-}
-
-#define	tekhex_close_and_cleanup _bfd_generic_close_and_cleanup
-#define tekhex_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define tekhex_new_section_hook _bfd_generic_new_section_hook
-
-#define tekhex_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define tekhex_get_lineno _bfd_nosymbols_get_lineno
-#define tekhex_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define tekhex_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define tekhex_read_minisymbols _bfd_generic_read_minisymbols
-#define tekhex_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define tekhex_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define tekhex_bfd_relax_section bfd_generic_relax_section
-#define tekhex_bfd_gc_sections bfd_generic_gc_sections
-#define tekhex_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define tekhex_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define tekhex_bfd_final_link _bfd_generic_final_link
-#define tekhex_bfd_link_split_section _bfd_generic_link_split_section
-
-#define tekhex_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-const bfd_target tekhex_vec =
-{
-  "tekhex",			/* name */
-  bfd_target_tekhex_flavour,
-  BFD_ENDIAN_UNKNOWN,		/* target byte order */
-  BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-  (EXEC_P |			/* object flags */
-   HAS_SYMS | HAS_LINENO | HAS_DEBUG | HAS_RELOC | HAS_LOCALS |
-   WP_TEXT | D_PAGED),
-  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),	/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {
-    _bfd_dummy_target,
-    tekhex_object_p,		/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {
-    bfd_false,
-    tekhex_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    tekhex_write_object_contents,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (tekhex),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (tekhex),
-  BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-  BFD_JUMP_TABLE_WRITE (tekhex),
-  BFD_JUMP_TABLE_LINK (tekhex),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/trad-core.c b/bfd/trad-core.c
deleted file mode 100644
index 21d920b0e87..00000000000
--- a/bfd/trad-core.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/* BFD back end for traditional Unix core files (U-area and raw sections)
-   Copyright 1988, 89, 91, 92, 93, 94, 95, 96, 1998
-   Free Software Foundation, Inc.
-   Written by John Gilmore of Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libaout.h"           /* BFD a.out internal data structures */
-
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-
-#include <sys/user.h>		/* After a.out.h  */
-
-#ifdef TRAD_HEADER
-#include TRAD_HEADER
-#endif
-
-  struct trad_core_struct 
-    {
-      asection *data_section;
-      asection *stack_section;
-      asection *reg_section;
-      struct user u;
-    };
-
-#define core_upage(bfd) (&((bfd)->tdata.trad_core_data->u))
-#define core_datasec(bfd) ((bfd)->tdata.trad_core_data->data_section)
-#define core_stacksec(bfd) ((bfd)->tdata.trad_core_data->stack_section)
-#define core_regsec(bfd) ((bfd)->tdata.trad_core_data->reg_section)
-
-/* forward declarations */
-
-const bfd_target *trad_unix_core_file_p PARAMS ((bfd *abfd));
-char *		trad_unix_core_file_failing_command PARAMS ((bfd *abfd));
-int		trad_unix_core_file_failing_signal PARAMS ((bfd *abfd));
-boolean		trad_unix_core_file_matches_executable_p
-			 PARAMS ((bfd *core_bfd, bfd *exec_bfd));
-static void	swap_abort PARAMS ((void));
-
-/* Handle 4.2-style (and perhaps also sysV-style) core dump file.  */
-
-/* ARGSUSED */
-const bfd_target *
-trad_unix_core_file_p (abfd)
-     bfd *abfd;
-
-{
-  int val;
-  struct user u;
-  struct trad_core_struct *rawptr;
-
-#ifdef TRAD_CORE_USER_OFFSET
-  /* If defined, this macro is the file position of the user struct.  */
-  if (bfd_seek (abfd, TRAD_CORE_USER_OFFSET, SEEK_SET) != 0)
-    return 0;
-#endif
-    
-  val = bfd_read ((void *)&u, 1, sizeof u, abfd);
-  if (val != sizeof u)
-    {
-      /* Too small to be a core file */
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  /* Sanity check perhaps??? */
-  if (u.u_dsize > 0x1000000)	/* Remember, it's in pages... */
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  if (u.u_ssize > 0x1000000)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-
-  /* Check that the size claimed is no greater than the file size.  */
-  {
-    FILE *stream = bfd_cache_lookup (abfd);
-    struct stat statbuf;
-    if (stream == NULL)
-      return 0;
-    if (fstat (fileno (stream), &statbuf) < 0)
-      {
-	bfd_set_error (bfd_error_system_call);
-	return 0;
-      }
-    if (NBPG * (UPAGES + u.u_dsize
-#ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
-		- u.u_tsize
-#endif
-		+ u.u_ssize) > statbuf.st_size)
-      {
-	bfd_set_error (bfd_error_file_truncated);
-	return 0;
-      }
-#ifndef TRAD_CORE_ALLOW_ANY_EXTRA_SIZE
-    if (NBPG * (UPAGES + u.u_dsize + u.u_ssize)
-#ifdef TRAD_CORE_EXTRA_SIZE_ALLOWED
-	/* Some systems write the file too big.  */
-	+ TRAD_CORE_EXTRA_SIZE_ALLOWED
-#endif
-	< statbuf.st_size)
-      {
-	/* The file is too big.  Maybe it's not a core file
-	   or we otherwise have bad values for u_dsize and u_ssize).  */
-	bfd_set_error (bfd_error_wrong_format);
-	return 0;
-      }
-#endif
-  }
-
-  /* OK, we believe you.  You're a core file (sure, sure).  */
-
-  /* Allocate both the upage and the struct core_data at once, so
-     a single free() will free them both.  */
-  rawptr = (struct trad_core_struct *)
-		bfd_zmalloc (sizeof (struct trad_core_struct));
-  if (rawptr == NULL)
-    return 0;
-  
-  abfd->tdata.trad_core_data = rawptr;
-
-  rawptr->u = u; /*Copy the uarea into the tdata part of the bfd */
-
-  /* Create the sections.  This is raunchy, but bfd_close wants to free
-     them separately.  */
-
-  core_stacksec(abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_stacksec (abfd) == NULL)
-    return NULL;
-  core_datasec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_datasec (abfd) == NULL)
-    return NULL;
-  core_regsec (abfd) = (asection *) bfd_zalloc (abfd, sizeof (asection));
-  if (core_regsec (abfd) == NULL)
-    return NULL;
-
-  core_stacksec (abfd)->name = ".stack";
-  core_datasec (abfd)->name = ".data";
-  core_regsec (abfd)->name = ".reg";
-
-  core_stacksec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-  core_datasec (abfd)->flags = SEC_ALLOC + SEC_LOAD + SEC_HAS_CONTENTS;
-  core_regsec (abfd)->flags = SEC_HAS_CONTENTS;
-
-  core_datasec (abfd)->_raw_size =  NBPG * u.u_dsize
-#ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
-    - NBPG * u.u_tsize
-#endif
-      ;
-  core_stacksec (abfd)->_raw_size = NBPG * u.u_ssize;
-  core_regsec (abfd)->_raw_size = NBPG * UPAGES; /* Larger than sizeof struct u */
-
-  /* What a hack... we'd like to steal it from the exec file,
-     since the upage does not seem to provide it.  FIXME.  */
-#ifdef HOST_DATA_START_ADDR
-  core_datasec (abfd)->vma = HOST_DATA_START_ADDR;
-#else
-  core_datasec (abfd)->vma = HOST_TEXT_START_ADDR + (NBPG * u.u_tsize);
-#endif
-
-#ifdef HOST_STACK_START_ADDR
-  core_stacksec (abfd)->vma = HOST_STACK_START_ADDR;
-#else
-  core_stacksec (abfd)->vma = HOST_STACK_END_ADDR - (NBPG * u.u_ssize);
-#endif
-
-  /* This is tricky.  As the "register section", we give them the entire
-     upage and stack.  u.u_ar0 points to where "register 0" is stored.
-     There are two tricks with this, though.  One is that the rest of the
-     registers might be at positive or negative (or both) displacements
-     from *u_ar0.  The other is that u_ar0 is sometimes an absolute address
-     in kernel memory, and on other systems it is an offset from the beginning
-     of the `struct user'.
-     
-     As a practical matter, we don't know where the registers actually are,
-     so we have to pass the whole area to GDB.  We encode the value of u_ar0
-     by setting the .regs section up so that its virtual memory address
-     0 is at the place pointed to by u_ar0 (by setting the vma of the start
-     of the section to -u_ar0).  GDB uses this info to locate the regs,
-     using minor trickery to get around the offset-or-absolute-addr problem. */
-  core_regsec (abfd)->vma = 0 - (bfd_vma) u.u_ar0;
-
-  core_datasec (abfd)->filepos = NBPG * UPAGES;
-  core_stacksec (abfd)->filepos = (NBPG * UPAGES) + NBPG * u.u_dsize
-#ifdef TRAD_CORE_DSIZE_INCLUDES_TSIZE
-    - NBPG * u.u_tsize
-#endif
-      ;
-  core_regsec (abfd)->filepos = 0; /* Register segment is the upage */
-
-  /* Align to word at least */
-  core_stacksec (abfd)->alignment_power = 2;
-  core_datasec (abfd)->alignment_power = 2;
-  core_regsec (abfd)->alignment_power = 2;
-
-  abfd->sections = core_stacksec (abfd);
-  core_stacksec (abfd)->next = core_datasec (abfd);
-  core_datasec (abfd)->next = core_regsec (abfd);
-  abfd->section_count = 3;
-
-  return abfd->xvec;
-}
-
-char *
-trad_unix_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-#ifndef NO_CORE_COMMAND
-  char *com = abfd->tdata.trad_core_data->u.u_comm;
-  if (*com)
-    return com;
-  else
-#endif
-    return 0;
-}
-
-/* ARGSUSED */
-int
-trad_unix_core_file_failing_signal (ignore_abfd)
-     bfd *ignore_abfd;
-{
-#ifdef TRAD_UNIX_CORE_FILE_FAILING_SIGNAL
-  return TRAD_UNIX_CORE_FILE_FAILING_SIGNAL(ignore_abfd);
-#else
-  return -1;		/* FIXME, where is it? */
-#endif
-}
-
-/* ARGSUSED */
-boolean
-trad_unix_core_file_matches_executable_p  (core_bfd, exec_bfd)
-     bfd *core_bfd, *exec_bfd;
-{
-  return true;		/* FIXME, We have no way of telling at this point */
-}
-
-/* If somebody calls any byte-swapping routines, shoot them.  */
-static void
-swap_abort()
-{
-  abort(); /* This way doesn't require any declaration for ANSI to fuck up */
-}
-#define	NO_GET	((bfd_vma (*) PARAMS ((   const bfd_byte *))) swap_abort )
-#define	NO_PUT	((void    (*) PARAMS ((bfd_vma, bfd_byte *))) swap_abort )
-#define	NO_SIGNED_GET \
-  ((bfd_signed_vma (*) PARAMS ((const bfd_byte *))) swap_abort )
-
-const bfd_target trad_core_vec =
-  {
-    "trad-core",
-    bfd_target_unknown_flavour,
-    BFD_ENDIAN_UNKNOWN,		/* target byte order */
-    BFD_ENDIAN_UNKNOWN,		/* target headers byte order */
-    (HAS_RELOC | EXEC_P |	/* object flags */
-     HAS_LINENO | HAS_DEBUG |
-     HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-    (SEC_HAS_CONTENTS | SEC_ALLOC | SEC_LOAD | SEC_RELOC), /* section flags */
-    0,			                                   /* symbol prefix */
-    ' ',						   /* ar_pad_char */
-    16,							   /* ar_max_namelen */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit data */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 64 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 32 bit hdrs */
-    NO_GET, NO_SIGNED_GET, NO_PUT,	/* 16 bit hdrs */
-
-    {				/* bfd_check_format */
-     _bfd_dummy_target,		/* unknown format */
-     _bfd_dummy_target,		/* object file */
-     _bfd_dummy_target,		/* archive */
-     trad_unix_core_file_p	/* a core file */
-    },
-    {				/* bfd_set_format */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    {				/* bfd_write_contents */
-     bfd_false, bfd_false,
-     bfd_false, bfd_false
-    },
-    
-       BFD_JUMP_TABLE_GENERIC (_bfd_generic),
-       BFD_JUMP_TABLE_COPY (_bfd_generic),
-       BFD_JUMP_TABLE_CORE (trad_unix),
-       BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-       BFD_JUMP_TABLE_SYMBOLS (_bfd_nosymbols),
-       BFD_JUMP_TABLE_RELOCS (_bfd_norelocs),
-       BFD_JUMP_TABLE_WRITE (_bfd_generic),
-       BFD_JUMP_TABLE_LINK (_bfd_nolink),
-       BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-    (PTR) 0			/* backend_data */
-};
diff --git a/bfd/vaxnetbsd.c b/bfd/vaxnetbsd.c
deleted file mode 100644
index e137d093c6f..00000000000
--- a/bfd/vaxnetbsd.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* BFD back-end for NetBSD/VAX a.out-ish binaries.
-   Copyright (C) 1998 Free Software Foundation, Inc.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
-
-#define	BYTES_IN_WORD	4
-#undef TARGET_IS_BIG_ENDIAN_P
-
-#define	TARGET_PAGE_SIZE	1024
-#define	SEGMENT_SIZE	TARGET_PAGE_SIZE
-
-#define	DEFAULT_ARCH	bfd_arch_vax
-#define	DEFAULT_MID 	M_VAX_NETBSD
-
-#define MY(OP) CAT(vaxnetbsd_,OP)
-/* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME "a.out-vax-netbsd"
-
-#include "netbsd.h"
diff --git a/bfd/versados.c b/bfd/versados.c
deleted file mode 100644
index 0dcd1080694..00000000000
--- a/bfd/versados.c
+++ /dev/null
@@ -1,923 +0,0 @@
-/* BFD back-end for VERSAdos-E objects.
-   Copyright 1995, 96, 1997 Free Software Foundation, Inc.
-   Written by Steve Chamberlain of Cygnus Support <sac@cygnus.com>.
-
-   Versados is a Motorola trademark.
-
-   This file is part of BFD, the Binary File Descriptor library.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-/*
-   SUBSECTION
-   VERSAdos-E relocateable object file format
-
-   DESCRIPTION
-
-   This module supports reading of VERSAdos relocateable
-   object files.
-
-   A VERSAdos file looks like contains
-
-   o Indentification Record
-   o External Symbol Definition Record
-   o Object Text Recrod
-   o End Record
-
-
- */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "libbfd.h"
-#include "libiberty.h"
-
-
-static boolean versados_mkobject PARAMS ((bfd *));
-static boolean versados_scan PARAMS ((bfd *));
-static const bfd_target *versados_object_p PARAMS ((bfd *));
-
-
-#define VHEADER '1'
-#define VESTDEF '2'
-#define VOTR '3'
-#define VEND '4'
-
-
-#define ES_BASE 17		/* first symbol has esdid 17 */
-
-/* Per file target dependent information */
-
-/* one for each section */
-struct esdid
-  {
-    asection *section;		/* ptr to bfd version */
-    unsigned char *contents;	/* used to build image */
-    int pc;
-    int relocs;			/* reloc count, valid end of pass 1 */
-    int donerel;		/* have relocs been translated */
-  };
-
-typedef struct versados_data_struct
-  {
-    int es_done;		/* count of symbol index, starts at ES_BASE */
-    asymbol *symbols;		/* pointer to local symbols */
-    char *strings;		/* strings of all the above */
-    int stringlen;		/* len of string table (valid end of pass1) */
-    int nsecsyms;		/* number of sections */
-
-    int ndefs;			/* number of exported symbols (they dont get esdids) */
-    int nrefs;			/* number of imported symbols  (valid end of pass1) */
-
-    int ref_idx;		/* current processed value of the above */
-    int def_idx;
-
-    int pass_2_done;
-
-    struct esdid e[16];		/* per section info */
-    int alert;			/* to see if we're trampling */
-    asymbol *rest[256 - 16];	/* per symbol info */
-
-  }
-tdata_type;
-
-#define VDATA(abfd)       (abfd->tdata.versados_data)
-#define EDATA(abfd, n)    (abfd->tdata.versados_data->e[n])
-#define RDATA(abfd, n)    (abfd->tdata.versados_data->rest[n])
-
-struct ext_otr
-  {
-    unsigned char size;
-    char type;
-    unsigned char map[4];
-    unsigned char esdid;
-    unsigned char data[200];
-  };
-
-struct ext_vheader
-  {
-    unsigned char size;
-    char type;			/* record type */
-    char name[10];		/* module name */
-    char rev;			/* module rev number */
-    char lang;
-    char vol[4];
-    char user[2];
-    char cat[8];
-    char fname[8];
-    char ext[2];
-    char time[3];
-    char date[3];
-    char rest[211];
-  };
-
-struct ext_esd
-  {
-    unsigned char size;
-    char type;
-    unsigned char esd_entries[1];
-  };
-#define ESD_ABS 	0
-#define ESD_COMMON 	1
-#define ESD_STD_REL_SEC 2
-#define ESD_SHRT_REL_SEC 3
-#define ESD_XDEF_IN_SEC 4
-#define ESD_XREF_SYM    7
-#define ESD_XREF_SEC	6
-#define ESD_XDEF_IN_ABS 5
-union ext_any
-  {
-    unsigned char size;
-    struct ext_vheader header;
-    struct ext_esd esd;
-    struct ext_otr otr;
-  };
-
-/* Initialize by filling in the hex conversion array. */
-
-
-
-
-
-/* Set up the tdata information.  */
-
-static boolean
-versados_mkobject (abfd)
-     bfd *abfd;
-{
-  if (abfd->tdata.versados_data == NULL)
-    {
-      tdata_type *tdata = (tdata_type *) bfd_alloc (abfd, sizeof (tdata_type));
-      if (tdata == NULL)
-	return false;
-      abfd->tdata.versados_data = tdata;
-      tdata->symbols = NULL;
-      VDATA (abfd)->alert = 0x12345678;
-    }
-
-  bfd_default_set_arch_mach (abfd, bfd_arch_m68k, 0);
-  return true;
-}
-
-
-/* Report a problem in an S record file.  FIXME: This probably should
-   not call fprintf, but we really do need some mechanism for printing
-   error messages.  */
-
-
-
-static asymbol *
-versados_new_symbol (abfd, snum, name, val, sec)
-     bfd *abfd;
-     int snum;
-     const char *name;
-     bfd_vma val;
-     asection *sec;
-{
-  asymbol *n = VDATA (abfd)->symbols + snum;
-  n->name = name;
-  n->value = val;
-  n->section = sec;
-  n->the_bfd = abfd;
-  n->flags = 0;
-  return n;
-}
-
-
-static int
-get_record (abfd, ptr)
-     bfd *abfd;
-     union ext_any *ptr;
-{
-  bfd_read (&ptr->size, 1, 1, abfd);
-  if (bfd_read ((char *) ptr + 1, 1, ptr->size, abfd) != ptr->size)
-    return 0;
-  return 1;
-}
-
-int
-get_4 (pp)
-     unsigned char **pp;
-{
-  unsigned char *p = *pp;
-  *pp += 4;
-  return (p[0] << 24) | (p[1] << 16) | (p[2] << 8) | (p[3] << 0);
-}
-
-void
-get_10 (pp, name)
-     unsigned char **pp;
-     char *name;
-{
-  char *p = (char *) *pp;
-  int len = 10;
-  *pp += len;
-  while (*p != ' '
-	 && len)
-    {
-      *name++ = *p++;
-      len--;
-    }
-  *name = 0;
-}
-
-static char *
-new_symbol_string (abfd, name)
-     bfd *abfd;
-     char *name;
-{
-  char *n = VDATA (abfd)->strings;
-  strcpy (VDATA (abfd)->strings, name);
-  VDATA (abfd)->strings += strlen (VDATA (abfd)->strings) + 1;
-  return n;
-}
-
-
-static void
-process_esd (abfd, esd, pass)
-     bfd *abfd;
-     struct ext_esd *esd;
-     int pass;
-{
-  /* Read through the ext def for the est entries */
-  int togo = esd->size - 2;
-  bfd_vma size;
-  bfd_vma start;
-  asection *sec;
-  char name[11];
-  unsigned char *ptr = esd->esd_entries;
-  unsigned char *end = ptr + togo;
-  while (ptr < end)
-    {
-      int scn = *ptr & 0xf;
-      int typ = (*ptr >> 4) & 0xf;
-
-      /* Declare this section */
-      sprintf (name, "%d", scn);
-      sec = bfd_make_section_old_way (abfd, strdup (name));
-      sec->target_index = scn;
-      EDATA (abfd, scn).section = sec;
-      ptr++;
-      switch (typ)
-	{
-	default:
-	  abort ();
-	case ESD_XREF_SEC:
-	case ESD_XREF_SYM:
-	  {
-	    int snum = VDATA (abfd)->ref_idx++;
-	    get_10 (&ptr, name);
-	    if (pass == 1)
-	      {
-		VDATA (abfd)->stringlen += strlen (name) + 1;
-	      }
-	    else
-	      {
-		int esidx;
-		asymbol *s;
-		char *n = new_symbol_string (abfd, name);
-		s = versados_new_symbol (abfd, snum, n, 0,
-					 &bfd_und_section, scn);
-		esidx = VDATA (abfd)->es_done++;
-		RDATA (abfd, esidx - ES_BASE) = s;
-	      }
-	  }
-	  break;
-
-
-	case ESD_ABS:
-	  size = get_4 (&ptr);
-	  start = get_4 (&ptr);
-	  break;
-	case ESD_STD_REL_SEC:
-	case ESD_SHRT_REL_SEC:
-	  {
-	    sec->_raw_size = get_4 (&ptr);
-	    sec->flags |= SEC_ALLOC;
-	  }
-	  break;
-	case ESD_XDEF_IN_ABS:
-	  sec = (asection *) & bfd_abs_section;
-	case ESD_XDEF_IN_SEC:
-	  {
-	    int snum = VDATA (abfd)->def_idx++;
-	    long val;
-	    get_10 (&ptr, name);
-	    val = get_4 (&ptr);
-	    if (pass == 1)
-	      {
-		/* Just remember the symbol */
-		VDATA (abfd)->stringlen += strlen (name) + 1;
-	      }
-	    else
-	      {
-		asymbol *s;
-		char *n = new_symbol_string (abfd, name);
-		s = versados_new_symbol (abfd, snum + VDATA (abfd)->nrefs, n, val, sec, scn);
-		s->flags |= BSF_GLOBAL;
-	      }
-	  }
-	  break;
-	}
-    }
-}
-
-#define R_RELWORD 1
-#define R_RELLONG 2
-#define R_RELWORD_NEG 3
-#define R_RELLONG_NEG 4
-
-reloc_howto_type versados_howto_table[] =
-{
-  HOWTO (R_RELWORD, 0, 1, 16, false,
-	 0, complain_overflow_dont, 0,
-	 "+v16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG, 0, 2, 32, false,
-	 0, complain_overflow_dont, 0,
-	 "+v32", true, 0xffffffff, 0xffffffff, false),
-
-  HOWTO (R_RELWORD_NEG, 0, -1, 16, false,
-	 0, complain_overflow_dont, 0,
-	 "-v16", true, 0x0000ffff, 0x0000ffff, false),
-  HOWTO (R_RELLONG_NEG, 0, -2, 32, false,
-	 0, complain_overflow_dont, 0,
-	 "-v32", true, 0xffffffff, 0xffffffff, false),
-};
-
-
-static int
-get_offset (len, ptr)
-     int len;
-     unsigned char *ptr;
-{
-  int val = 0;
-  if (len)
-    {
-      int i;
-      val = *ptr++;
-      if (val & 0x80)
-	val |= ~0xff;
-      for (i = 1; i < len; i++)
-	val = (val << 8) | *ptr++;
-    }
-
-  return val;
-}
-
-static void
-process_otr (abfd, otr, pass)
-     bfd *abfd;
-     struct ext_otr *otr;
-     int pass;
-{
-  unsigned long shift;
-  unsigned char *srcp = otr->data;
-  unsigned char *endp = (unsigned char *) otr + otr->size;
-  unsigned int bits = (otr->map[0] << 24)
-  | (otr->map[1] << 16)
-  | (otr->map[2] << 8)
-  | (otr->map[3] << 0);
-
-  struct esdid *esdid = &EDATA (abfd, otr->esdid - 1);
-  unsigned char *contents = esdid->contents;
-  int need_contents = 0;
-  unsigned int dst_idx = esdid->pc;
-
-  for (shift = (1 << 31); shift && srcp < endp; shift >>= 1)
-    {
-      if (bits & shift)
-	{
-	  int flag = *srcp++;
-	  int esdids = (flag >> 5) & 0x7;
-	  int sizeinwords = ((flag >> 3) & 1) ? 2 : 1;
-	  int offsetlen = flag & 0x7;
-	  int j;
-
-
-	  if (esdids == 0)
-	    {
-	      /* A zero esdid means the new pc is the offset given */
-	      dst_idx += get_offset (offsetlen, srcp);
-	      srcp += offsetlen;
-	    }
-	  else
-	    {
-	      int val = get_offset (offsetlen, srcp + esdids);
-	      if (pass == 1)
-		need_contents = 1;
-	      else
-		for (j = 0; j < sizeinwords * 2; j++)
-		  {
-		    contents[dst_idx + (sizeinwords * 2) - j - 1] = val;
-		    val >>= 8;
-		  }
-
-	      for (j = 0; j < esdids; j++)
-		{
-		  int esdid = *srcp++;
-
-		  if (esdid)
-		    {
-		      int rn = EDATA (abfd, otr->esdid - 1).relocs++;
-		      if (pass == 1)
-			{
-			  /* this is the first pass over the data, 
-			     just remember that we need a reloc */
-			}
-		      else
-			{
-			  arelent *n =
-			  EDATA (abfd, otr->esdid - 1).section->relocation + rn;
-			  n->address = dst_idx;
-
-			  n->sym_ptr_ptr = (asymbol **) esdid;
-			  n->addend = 0;
-			  n->howto = versados_howto_table + ((j & 1) * 2) + (sizeinwords - 1);
-			}
-		    }
-		}
-	      srcp += offsetlen;
-	      dst_idx += sizeinwords * 2;
-	    }
-	}
-      else
-	{
-	  need_contents = 1;
-	  if (dst_idx < esdid->section->_raw_size)
-	    if (pass == 2)
-	      {
-		/* absolute code, comes in 16 bit lumps */
-		contents[dst_idx] = srcp[0];
-		contents[dst_idx + 1] = srcp[1];
-	      }
-	  dst_idx += 2;
-	  srcp += 2;
-	}
-    }
-  EDATA (abfd, otr->esdid - 1).pc = dst_idx;
-
-  if (!contents && need_contents)
-    esdid->contents = (unsigned char *) bfd_alloc (abfd, esdid->section->_raw_size);
-
-
-}
-
-static boolean
-versados_scan (abfd)
-     bfd *abfd;
-{
-  int loop = 1;
-  int i;
-  int j;
-  int nsecs = 0;
-
-  VDATA (abfd)->nrefs = 0;
-  VDATA (abfd)->ndefs = 0;
-  VDATA (abfd)->ref_idx = 0;
-  VDATA (abfd)->def_idx = 0;
-
-  while (loop)
-    {
-      union ext_any any;
-      if (!get_record (abfd, &any))
-	return true;
-      switch (any.header.type)
-	{
-	case VHEADER:
-	  break;
-	case VEND:
-	  loop = 0;
-	  break;
-	case VESTDEF:
-	  process_esd (abfd, &any.esd, 1);
-	  break;
-	case VOTR:
-	  process_otr (abfd, &any.otr, 1);
-	  break;
-	}
-    }
-
-  /* Now allocate space for the relocs and sections */
-
-  VDATA (abfd)->nrefs = VDATA (abfd)->ref_idx;
-  VDATA (abfd)->ndefs = VDATA (abfd)->def_idx;
-  VDATA (abfd)->ref_idx = 0;
-  VDATA (abfd)->def_idx = 0;
-
-  abfd->symcount = VDATA (abfd)->nrefs + VDATA (abfd)->ndefs;
-
-  for (i = 0; i < 16; i++)
-    {
-      struct esdid *esdid = &EDATA (abfd, i);
-      if (esdid->section)
-	{
-	  esdid->section->relocation
-	    = (arelent *) bfd_alloc (abfd, sizeof (arelent) * esdid->relocs);
-
-	  esdid->pc = 0;
-
-	  if (esdid->contents)
-	    esdid->section->flags |= SEC_HAS_CONTENTS | SEC_LOAD;
-
-	  esdid->section->reloc_count = esdid->relocs;
-	  if (esdid->relocs)
-	    esdid->section->flags |= SEC_RELOC;
-
-	  esdid->relocs = 0;
-
-	  /* Add an entry into the symbol table for it */
-	  nsecs++;
-	  VDATA (abfd)->stringlen += strlen (esdid->section->name) + 1;
-	}
-    }
-
-  abfd->symcount += nsecs;
-
-  VDATA (abfd)->symbols = (asymbol *) bfd_alloc (abfd,
-				       sizeof (asymbol) * (abfd->symcount));
-
-  VDATA (abfd)->strings = bfd_alloc (abfd, VDATA (abfd)->stringlen);
-
-  if ((VDATA (abfd)->symbols == NULL && abfd->symcount > 0)
-      || (VDATA (abfd)->strings == NULL && VDATA (abfd)->stringlen > 0))
-    return false;
-
-  /* Actually fill in the section symbols,
-     we stick them at the end of the table */
-
-  for (j = VDATA (abfd)->nrefs + VDATA (abfd)->ndefs, i = 0; i < 16; i++)
-    {
-      struct esdid *esdid = &EDATA (abfd, i);
-      asection *sec = esdid->section;
-      if (sec)
-	{
-	  asymbol *s = VDATA (abfd)->symbols + j;
-	  s->name = new_symbol_string (abfd, sec->name);
-	  s->section = sec;
-	  s->flags = BSF_LOCAL;
-	  s->value = 0;
-	  s->the_bfd = abfd;
-	  j++;
-	}
-    }
-  if (abfd->symcount)
-    abfd->flags |= HAS_SYMS;
-
-  /* Set this to nsecs - since we've already planted the section
-     symbols */
-  VDATA (abfd)->nsecsyms = nsecs;
-
-  VDATA (abfd)->ref_idx = 0;
-
-  return 1;
-}
-
-
-
-/* Check whether an existing file is a versados  file.  */
-
-static const bfd_target *
-versados_object_p (abfd)
-     bfd *abfd;
-{
-  struct ext_vheader ext;
-  unsigned char len;
-
-  if (bfd_seek (abfd, (file_ptr) 0, SEEK_SET) != 0)
-    return NULL;
-
-  if (bfd_read (&len, 1, 1, abfd) != 1)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  if (bfd_read (&ext.type, 1, len, abfd) != len)
-    {
-      if (bfd_get_error () != bfd_error_system_call)
-	bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* We guess that the language field will never be larger than 10.
-     In sample files, it is always either 0 or 1.  Checking for this
-     prevents confusion with Intel Hex files.  */
-  if (ext.type != VHEADER
-      || ext.lang > 10)
-    {
-      bfd_set_error (bfd_error_wrong_format);
-      return NULL;
-    }
-
-  /* OK, looks like a record, build the tdata and read in.  */
-
-  if (!versados_mkobject (abfd)
-      || !versados_scan (abfd))
-    return NULL;
-
-  return abfd->xvec;
-}
-
-
-static boolean
-versados_pass_2 (abfd)
-     bfd *abfd;
-{
-  union ext_any any;
-
-  if (VDATA (abfd)->pass_2_done)
-    return 1;
-
-  if (bfd_seek (abfd, 0, SEEK_SET) != 0)
-    return 0;
-
-  VDATA (abfd)->es_done = ES_BASE;
-
-
-  /* read records till we get to where we want to be */
-
-  while (1)
-    {
-      get_record (abfd, &any);
-      switch (any.header.type)
-	{
-	case VEND:
-	  VDATA (abfd)->pass_2_done = 1;
-	  return 1;
-	case VESTDEF:
-	  process_esd (abfd, &any.esd, 2);
-	  break;
-	case VOTR:
-	  process_otr (abfd, &any.otr, 2);
-	  break;
-	}
-    }
-}
-
-static boolean
-versados_get_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  if (!versados_pass_2 (abfd))
-    return false;
-
-  memcpy (location,
-	  EDATA (abfd, section->target_index).contents + offset,
-	  (size_t) count);
-
-  return true;
-}
-
-#define versados_get_section_contents_in_window \
-  _bfd_generic_get_section_contents_in_window
-
-static boolean
-versados_set_section_contents (abfd, section, location, offset, bytes_to_do)
-     bfd *abfd;
-     sec_ptr section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type bytes_to_do;
-{
-  return false;
-}
-
-
-/*ARGSUSED */
-static int
-versados_sizeof_headers (abfd, exec)
-     bfd *abfd;
-     boolean exec;
-{
-  return 0;
-}
-
-static asymbol *
-versados_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *new = (asymbol *) bfd_zalloc (abfd, sizeof (asymbol));
-  if (new)
-    new->the_bfd = abfd;
-  return new;
-}
-
-/* Return the amount of memory needed to read the symbol table.  */
-
-static long
-versados_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  return (bfd_get_symcount (abfd) + 1) * sizeof (asymbol *);
-}
-
-/* Return the symbol table.  */
-
-static long
-versados_get_symtab (abfd, alocation)
-     bfd *abfd;
-     asymbol **alocation;
-{
-  unsigned int symcount = bfd_get_symcount (abfd);
-  unsigned int i;
-  asymbol *s;
-
-  versados_pass_2 (abfd);
-
-  for (i = 0, s = VDATA (abfd)->symbols;
-       i < symcount;
-       s++, i++)
-    {
-      *alocation++ = s;
-    }
-
-  *alocation = NULL;
-
-  return symcount;
-}
-
-/*ARGSUSED */
-void
-versados_get_symbol_info (ignore_abfd, symbol, ret)
-     bfd *ignore_abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  bfd_symbol_info (symbol, ret);
-}
-
-/*ARGSUSED */
-void
-versados_print_symbol (ignore_abfd, afile, symbol, how)
-     bfd *ignore_abfd;
-     PTR afile;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-  FILE *file = (FILE *) afile;
-  switch (how)
-    {
-    case bfd_print_symbol_name:
-      fprintf (file, "%s", symbol->name);
-      break;
-    default:
-      bfd_print_symbol_vandf ((PTR) file, symbol);
-      fprintf (file, " %-5s %s",
-	       symbol->section->name,
-	       symbol->name);
-
-    }
-}
-
-long
-versados_get_reloc_upper_bound (abfd, asect)
-     bfd *abfd;
-     sec_ptr asect;
-{
-  return (asect->reloc_count + 1) * sizeof (arelent *);
-}
-
-
-long
-versados_canonicalize_reloc (abfd, section, relptr, symbols)
-     bfd *abfd;
-     sec_ptr section;
-     arelent **relptr;
-     asymbol **symbols;
-{
-  unsigned int count;
-  arelent *src;
-
-  versados_pass_2 (abfd);
-  src = section->relocation;
-  if (!EDATA (abfd, section->target_index).donerel)
-    {
-      EDATA (abfd, section->target_index).donerel = 1;
-      /* translate from indexes to symptr ptrs */
-      for (count = 0; count < section->reloc_count; count++)
-	{
-	  int esdid = (int) src[count].sym_ptr_ptr;
-
-	  if (esdid == 0)
-	    {
-	      src[count].sym_ptr_ptr = bfd_abs_section.symbol_ptr_ptr;
-	    }
-	  else if (esdid < ES_BASE)	/* Section relative thing */
-	    {
-	      struct esdid *e = &EDATA (abfd, esdid - 1);
-	      if (!section)
-		{
-		 /** relocation relative to section which was
-		   never declared ! */
-		}
-	      src[count].sym_ptr_ptr = e->section->symbol_ptr_ptr;
-	    }
-	  else
-	    {
-	      src[count].sym_ptr_ptr = symbols + esdid - ES_BASE;
-	    }
-
-	}
-    }
-
-  for (count = 0; count < section->reloc_count; count++)
-    {
-      *relptr++ = src++;
-    }
-  *relptr = 0;
-  return section->reloc_count;
-}
-
-#define	versados_close_and_cleanup _bfd_generic_close_and_cleanup
-#define versados_bfd_free_cached_info _bfd_generic_bfd_free_cached_info
-#define versados_new_section_hook _bfd_generic_new_section_hook
-
-#define versados_bfd_is_local_label_name bfd_generic_is_local_label_name
-#define versados_get_lineno _bfd_nosymbols_get_lineno
-#define versados_find_nearest_line _bfd_nosymbols_find_nearest_line
-#define versados_bfd_make_debug_symbol _bfd_nosymbols_bfd_make_debug_symbol
-#define versados_read_minisymbols _bfd_generic_read_minisymbols
-#define versados_minisymbol_to_symbol _bfd_generic_minisymbol_to_symbol
-
-#define versados_bfd_reloc_type_lookup _bfd_norelocs_bfd_reloc_type_lookup
-
-#define versados_set_arch_mach bfd_default_set_arch_mach
-
-#define versados_bfd_get_relocated_section_contents \
-  bfd_generic_get_relocated_section_contents
-#define versados_bfd_relax_section bfd_generic_relax_section
-#define versados_bfd_gc_sections bfd_generic_gc_sections
-#define versados_bfd_link_hash_table_create _bfd_generic_link_hash_table_create
-#define versados_bfd_link_add_symbols _bfd_generic_link_add_symbols
-#define versados_bfd_final_link _bfd_generic_final_link
-#define versados_bfd_link_split_section _bfd_generic_link_split_section
-
-const bfd_target versados_vec =
-{
-  "versados",			/* name */
-  bfd_target_versados_flavour,
-  BFD_ENDIAN_BIG,		/* target byte order */
-  BFD_ENDIAN_BIG,		/* target headers byte order */
-  (HAS_RELOC | EXEC_P |		/* object flags */
-   HAS_LINENO | HAS_DEBUG |
-   HAS_SYMS | HAS_LOCALS | WP_TEXT | D_PAGED),
-  (SEC_CODE | SEC_DATA | SEC_ROM | SEC_HAS_CONTENTS
-   | SEC_ALLOC | SEC_LOAD | SEC_RELOC),		/* section flags */
-  0,				/* leading underscore */
-  ' ',				/* ar_pad_char */
-  16,				/* ar_max_namelen */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* data */
-  bfd_getb64, bfd_getb_signed_64, bfd_putb64,
-  bfd_getb32, bfd_getb_signed_32, bfd_putb32,
-  bfd_getb16, bfd_getb_signed_16, bfd_putb16,	/* hdrs */
-
-  {
-    _bfd_dummy_target,
-    versados_object_p,		/* bfd_check_format */
-    _bfd_dummy_target,
-    _bfd_dummy_target,
-  },
-  {
-    bfd_false,
-    versados_mkobject,
-    _bfd_generic_mkarchive,
-    bfd_false,
-  },
-  {				/* bfd_write_contents */
-    bfd_false,
-    bfd_false,
-    _bfd_write_archive_contents,
-    bfd_false,
-  },
-
-  BFD_JUMP_TABLE_GENERIC (versados),
-  BFD_JUMP_TABLE_COPY (_bfd_generic),
-  BFD_JUMP_TABLE_CORE (_bfd_nocore),
-  BFD_JUMP_TABLE_ARCHIVE (_bfd_noarchive),
-  BFD_JUMP_TABLE_SYMBOLS (versados),
-  BFD_JUMP_TABLE_RELOCS (versados),
-  BFD_JUMP_TABLE_WRITE (versados),
-  BFD_JUMP_TABLE_LINK (versados),
-  BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
-
-  (PTR) 0
-};
diff --git a/bfd/vms-gsd.c b/bfd/vms-gsd.c
deleted file mode 100644
index 6a52462a06d..00000000000
--- a/bfd/vms-gsd.c
+++ /dev/null
@@ -1,920 +0,0 @@
-/* vms-gsd.c -- BFD back-end for VAX (openVMS/VAX) and
-   EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation Inc.
-
-   go and read the openVMS linker manual (esp. appendix B)
-   if you don't know what's going on here :-)
-
-   Written by Klaus K"ampf (kkaempf@rmi.de)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-#include <ctype.h>
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-
-#include "vms.h"
-
-/*-----------------------------------------------------------------------------*/
-
-/* typical sections for vax object files  */
-
-#define VAX_CODE_NAME		"$CODE"
-#define VAX_DATA_NAME		"$DATA"
-#define VAX_ADDRESS_DATA_NAME	"$ADDRESS_DATA"
-
-/* typical sections for evax object files  */
-
-#define EVAX_ABS_NAME		"$ABS$"
-#define EVAX_CODE_NAME		"$CODE$"
-#define EVAX_LINK_NAME		"$LINK$"
-#define EVAX_DATA_NAME		"$DATA$"
-#define EVAX_BSS_NAME		"$BSS$"
-#define EVAX_READONLYADDR_NAME	"$READONLY_ADDR$"
-#define EVAX_READONLY_NAME	"$READONLY$"
-#define EVAX_LITERAL_NAME	"$LITERAL$"
-#define EVAX_COMMON_NAME	"$COMMON$"
-#define EVAX_LOCAL_NAME		"$LOCAL$"
-
-struct sec_flags_struct {
-  char *name;			/* name of section */
-  int vflags_always;
-  flagword flags_always;	/* flags we set always */
-  int vflags_hassize;
-  flagword flags_hassize;	/* flags we set if the section has a size > 0 */
-};
-
-/* These flags are deccrtl/vaxcrtl (openVMS 6.2 VAX) compatible  */
-
-static struct sec_flags_struct vax_section_flags[] = {
-  { VAX_CODE_NAME,
-	(GPS_S_M_PIC|GPS_S_M_REL|GPS_S_M_SHR|GPS_S_M_EXE|GPS_S_M_RD),
-	(SEC_CODE),
-	(GPS_S_M_PIC|GPS_S_M_REL|GPS_S_M_SHR|GPS_S_M_EXE|GPS_S_M_RD),
-	(SEC_IN_MEMORY|SEC_CODE|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) },
-  { VAX_DATA_NAME,
-	(GPS_S_M_PIC|GPS_S_M_REL|GPS_S_M_RD|GPS_S_M_WRT),
-	(SEC_DATA),
-	(GPS_S_M_PIC|GPS_S_M_REL|GPS_S_M_RD|GPS_S_M_WRT),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) },
-  { VAX_ADDRESS_DATA_NAME,
-	(GPS_S_M_PIC|GPS_S_M_REL|GPS_S_M_RD),
-	(SEC_DATA|SEC_READONLY),
-	(GPS_S_M_PIC|GPS_S_M_REL|GPS_S_M_RD),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_READONLY|SEC_LOAD) },
-  { NULL,
-	(GPS_S_M_PIC|GPS_S_M_OVR|GPS_S_M_REL|GPS_S_M_GBL|GPS_S_M_RD|GPS_S_M_WRT),
-	(SEC_DATA),
-	(GPS_S_M_PIC|GPS_S_M_OVR|GPS_S_M_REL|GPS_S_M_GBL|GPS_S_M_RD|GPS_S_M_WRT),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) }
-};
-
-
-/* These flags are deccrtl/vaxcrtl (openVMS 6.2 Alpha) compatible  */
-
-static struct sec_flags_struct evax_section_flags[] = {
-  { EVAX_ABS_NAME,
-	(EGPS_S_V_SHR),
-	(SEC_DATA),
-	(EGPS_S_V_SHR),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) },
-  { EVAX_CODE_NAME,
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_SHR|EGPS_S_V_EXE),
-	(SEC_CODE),
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_SHR|EGPS_S_V_EXE),
-	(SEC_IN_MEMORY|SEC_CODE|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) },
-  { EVAX_LITERAL_NAME,
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_SHR|EGPS_S_V_RD|EGPS_S_V_NOMOD),
-	(SEC_DATA|SEC_READONLY),
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_SHR|EGPS_S_V_RD),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_READONLY|SEC_LOAD) },
-  { EVAX_LINK_NAME,
-	(EGPS_S_V_REL|EGPS_S_V_RD),
-	(SEC_DATA|SEC_READONLY),
-	(EGPS_S_V_REL|EGPS_S_V_RD),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_READONLY|SEC_LOAD) },
-  { EVAX_DATA_NAME,
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT|EGPS_S_V_NOMOD),
-	(SEC_DATA),
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) },
-  { EVAX_BSS_NAME,
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT|EGPS_S_V_NOMOD),
-	(SEC_NO_FLAGS),
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT|EGPS_S_V_NOMOD),
-	(SEC_IN_MEMORY|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) },
-  { EVAX_READONLYADDR_NAME,
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_RD),
-	(SEC_DATA|SEC_READONLY),
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_RD),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_READONLY|SEC_LOAD) },
-  { EVAX_READONLY_NAME,
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_SHR|EGPS_S_V_RD|EGPS_S_V_NOMOD),
-	(SEC_DATA|SEC_READONLY),
-	(EGPS_S_V_PIC|EGPS_S_V_REL|EGPS_S_V_SHR|EGPS_S_V_RD),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_READONLY|SEC_LOAD) },
-  { EVAX_LOCAL_NAME,
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT),
-	(SEC_DATA),
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) },
-  { NULL,
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT),
-	(SEC_DATA),
-	(EGPS_S_V_REL|EGPS_S_V_RD|EGPS_S_V_WRT),
-	(SEC_IN_MEMORY|SEC_DATA|SEC_HAS_CONTENTS|SEC_ALLOC|SEC_LOAD) }
-};
-
-/* Retrieve bfd section flags by name and size  */
-
-static flagword
-vms_secflag_by_name (abfd, section_flags, name, size)
-     bfd *abfd;
-     struct sec_flags_struct *section_flags;
-     char *name;
-     int size;
-{
-  int i = 0;
-
-  while (section_flags[i].name != NULL)
-    {
-      if ((PRIV(is_vax)?
-	    strcasecmp (name, section_flags[i].name):
-	    strcmp (name, section_flags[i].name)) == 0)
-	{
-	  if (size > 0)
-	    return section_flags[i].flags_hassize;
-	  else
-	    return section_flags[i].flags_always;
-	}
-      i++;
-    }
-  if (size > 0)
-    return section_flags[i].flags_hassize;
-  return section_flags[i].flags_always;
-}
-
-
-/* Retrieve vms section flags by name and size  */
-
-static flagword
-vms_esecflag_by_name (section_flags, name, size)
-     struct sec_flags_struct *section_flags;
-     char *name;
-     int size;
-{
-  int i = 0;
-
-  while (section_flags[i].name != NULL)
-    {
-      if (strcmp (name, section_flags[i].name) == 0)
-	{
-	  if (size > 0)
-	    return section_flags[i].vflags_hassize;
-	  else
-	    return section_flags[i].vflags_always;
-	}
-      i++;
-    }
-  if (size > 0)
-    return section_flags[i].vflags_hassize;
-  return section_flags[i].vflags_always;
-}
-
-/*-----------------------------------------------------------------------------*/
-#if VMS_DEBUG
-/* debug */
-
-struct flagdescstruct { char *name; flagword value; };
-
-/* Convert flag to printable string  */
-
-static char *
-flag2str(flagdesc, flags)
-     struct flagdescstruct *flagdesc;
-     flagword flags;
-{
-
-  static char res[64];
-  int next = 0;
-
-  res[0] = 0;
-  while (flagdesc->name != NULL)
-    {
-      if ((flags & flagdesc->value) != 0)
-	{
-	  if (next)
-	    strcat(res, ",");
-	  else
-	    next = 1;
-	  strcat (res, flagdesc->name);
-	}
-      flagdesc++;
-    }
-  return res;
-}
-#endif
-
-/*-----------------------------------------------------------------------------*/
-/* input routines */
-
-/* Process GSD/EGSD record
-   return 0 on success, -1 on error  */
-
-int
-_bfd_vms_slurp_gsd (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-#if VMS_DEBUG
-  static struct flagdescstruct gpsflagdesc[] =
-  {
-    { "PIC", 0x0001 },
-    { "LIB", 0x0002 },
-    { "OVR", 0x0004 },
-    { "REL", 0x0008 },
-    { "GBL", 0x0010 },
-    { "SHR", 0x0020 },
-    { "EXE", 0x0040 },
-    { "RD",  0x0080 },
-    { "WRT", 0x0100 },
-    { "VEC", 0x0200 },
-    { "NOMOD", 0x0400 },
-    { "COM", 0x0800 },
-    { NULL, 0 }
-  };
-
-  static struct flagdescstruct gsyflagdesc[] =
-  {
-    { "WEAK", 0x0001 },
-    { "DEF",  0x0002 },
-    { "UNI",  0x0004 },
-    { "REL",  0x0008 },
-    { "COMM", 0x0010 },
-    { "VECEP", 0x0020 },
-    { "NORM", 0x0040 },
-    { NULL, 0 }
-  };
-#endif
-
-  int gsd_type, gsd_size;
-  asection *section;
-  unsigned char *vms_rec;
-  flagword new_flags, old_flags;
-  char *name;
-  asymbol *symbol;
-  vms_symbol_entry *entry;
-  unsigned long base_addr;
-  unsigned long align_addr;
-  static int psect_idx = 0;
-
-#if VMS_DEBUG
-  vms_debug (2, "GSD/EGSD (%d/%x)\n", objtype, objtype);
-#endif
-
-  switch (objtype)
-    {
-      case EOBJ_S_C_EGSD:
- 	PRIV(vms_rec) += 8;	/* skip type, size, l_temp */
-	PRIV(rec_size) -= 8;
-	break;
-      case OBJ_S_C_GSD:
-	PRIV(vms_rec) += 1;
-	PRIV(rec_size) -= 1;
-	break;
-      default:
-	return -1;
-    }
-
-  /* calculate base address for each section  */
-  base_addr = 0L;
-
-  abfd->symcount = 0;
-
-  while (PRIV(rec_size) > 0)
-    {
-      vms_rec = PRIV(vms_rec);
-
-      if (objtype == OBJ_S_C_GSD)
-	{
-	  gsd_type = *vms_rec;
-	}
-      else
-	{
-	  _bfd_vms_get_header_values (abfd, vms_rec, &gsd_type, &gsd_size);
-	  gsd_type += EVAX_OFFSET;
-	}
-
-#if VMS_DEBUG
-  vms_debug (3, "gsd_type %d\n", gsd_type);
-#endif
-
-      switch (gsd_type)
-	{
-	  case GSD_S_C_PSC:
-	    {
-	      /*
-	       * program section definition
-	       */
-
-	      asection *old_section = 0;
-
-#if VMS_DEBUG
-  vms_debug (4, "GSD_S_C_PSC\n");
-#endif
-	      /* If this section isn't a bfd section.  */
-
-	      if (PRIV(is_vax) && (psect_idx < (abfd->section_count-1)))
-		{
-		  /* check for temporary section from TIR record.  */
-
-		  if (psect_idx < PRIV(section_count))
-		    old_section = PRIV(sections)[psect_idx];
-		  else
-		    old_section = 0;
-		}
-
-	      name = _bfd_vms_save_counted_string (vms_rec + 8);
-	      section = bfd_make_section (abfd, name);
-	      if (!section)
-		{
-		  fprintf (stderr, "bfd_make_section (%s) failed\n", name);
-		  return -1;
-		}
-	      old_flags = bfd_getl16 (vms_rec + 2);
-	      section->_raw_size = bfd_getl32(vms_rec + 4);	/* allocation */
-	      new_flags = vms_secflag_by_name (abfd, vax_section_flags, name, section->_raw_size);
-	      if (old_flags & EGPS_S_V_REL)
-		new_flags |= SEC_RELOC;
-	      if (old_flags & GPS_S_M_OVR)
-		new_flags |= SEC_IS_COMMON;
-	      if (!bfd_set_section_flags (abfd, section, new_flags))
-		{
-		  fprintf (stderr, "bfd_set_section_flags (%s, %x) failed\n", name, new_flags);
-		  return -1;
-		}
-	      section->alignment_power = vms_rec[1];
-	      align_addr = (1 << section->alignment_power);
-	      if ((base_addr % align_addr) != 0)
-		base_addr += (align_addr - (base_addr % align_addr));
-	      section->vma = (bfd_vma)base_addr;
-	      base_addr += section->_raw_size;
-
-	      /* global section is common symbol  */
-
-	      if (old_flags & GPS_S_M_GBL)
-		{
-		  entry = _bfd_vms_enter_symbol (abfd, name);
-		  if (entry == (vms_symbol_entry *)NULL)
-		    {
-		      bfd_set_error (bfd_error_no_memory);
-		      return -1;
-		    }
-		  symbol = entry->symbol;
-
-		  symbol->value = 0;
-		  symbol->section = section;
-		  symbol->flags = (BSF_GLOBAL|BSF_SECTION_SYM|BSF_OLD_COMMON);
-		}
-
-	      /* copy saved contents if old_section set  */
-
-	      if (old_section != 0)
-		{
-		  section->contents = old_section->contents;
-		  if (section->_raw_size < old_section->_raw_size)
-		    {
-		      fprintf (stderr, "Size mismatch section %s=%d, %s=%d\n", old_section->name, old_section->_raw_size, section->name, section->_raw_size);
-		      return -1;
-		    }
-		  else if (section->_raw_size > old_section->_raw_size)
-		    {
-		      section->contents = ((unsigned char *)
-				    bfd_realloc (old_section->contents, section->_raw_size));
-		      if (section->contents == NULL)
-			{
-			  bfd_set_error (bfd_error_no_memory);
-			  return -1;
-		        }
-		    }
-		}
-	      else
-		{
-		  section->contents = ((unsigned char *)
-					bfd_malloc (section->_raw_size));
-		  if (section->contents == NULL)
-		    {
-		      bfd_set_error (bfd_error_no_memory);
-		      return -1;
-		    }
-		  memset (section->contents, 0, (size_t)section->_raw_size);
-		}
-	      section->_cooked_size = section->_raw_size;
-#if VMS_DEBUG
-	      vms_debug (4, "gsd psc %d (%s, flags %04x=%s) ",
-			 section->index, name, old_flags, flag2str (gpsflagdesc, old_flags));
-	      vms_debug (4, "%d bytes at 0x%08lx (mem %p)\n",
-			 section->_raw_size, section->vma, section->contents);
-#endif
-
-	      gsd_size = vms_rec[8] + 9;
-
-	      psect_idx++;
-	    }
-	  break;
-
-	  case GSD_S_C_EPM:
-	  case GSD_S_C_EPMW:
-#if VMS_DEBUG
-		vms_debug(4, "gsd epm\n");
-#endif
-	  /*FALLTHRU*/
-	  case GSD_S_C_SYM:
-	  case GSD_S_C_SYMW:
-	    {
-	      int name_offset, value_offset;
-
-	      /*
-	       * symbol specification (definition or reference)
-	       */
-
-#if VMS_DEBUG
-  vms_debug (4, "GSD_S_C_SYM(W)\n");
-#endif
-	      old_flags = bfd_getl16 (vms_rec + 2);
-	      new_flags = BSF_NO_FLAGS;
-
-	      if (old_flags & GSY_S_M_WEAK)
-		new_flags |= BSF_WEAK;
-
-	      switch (gsd_type)
-		{
-		  case GSD_S_C_EPM:
-		    name_offset = 11;
-		    value_offset = 5;
-		    new_flags |= BSF_FUNCTION;
-		    break;
-		  case GSD_S_C_EPMW:
-		    name_offset = 12;
-		    value_offset = 6;
-		    new_flags |= BSF_FUNCTION;
-		    break;
-		  case GSD_S_C_SYM:
-		    if (old_flags & GSY_S_M_DEF)	/* symbol definition */
-		      name_offset = 9;
-		    else
-		      name_offset = 4;
-		    value_offset = 5;
-		    break;
-		  case GSD_S_C_SYMW:
-		    if (old_flags & GSY_S_M_DEF)	/* symbol definition */
-		      name_offset = 10;
-		    else
-		      name_offset = 5;
-		    value_offset = 6;
-		    break;
-		}
-
-	      /* save symbol in vms_symbol_table */
-
-	      entry = _bfd_vms_enter_symbol (abfd,
-			_bfd_vms_save_counted_string (vms_rec + name_offset));
-	      if (entry == (vms_symbol_entry *)NULL)
-		{
-		  bfd_set_error (bfd_error_no_memory);
-		  return -1;
-		}
-	      symbol = entry->symbol;
-
-	      if (old_flags & GSY_S_M_DEF)	/* symbol definition */
-		{
-		  int psect;
-
-		  symbol->value = bfd_getl32 (vms_rec+value_offset);
-		  if ((gsd_type == GSD_S_C_SYMW)
-		      || (gsd_type == GSD_S_C_EPMW))
-		    psect = bfd_getl16 (vms_rec + value_offset - 2);
-		  else
-		    psect = vms_rec[value_offset-1];
-
-		  symbol->section = (asection *)psect;
-#if VMS_DEBUG
-		  vms_debug(4, "gsd sym def #%d (%s, %d [%p], %04x=%s)\n", abfd->symcount,
-				symbol->name, (int)symbol->section, symbol->section, old_flags, flag2str(gsyflagdesc, old_flags));
-#endif
-		}
-	      else	/* symbol reference */
-		{
-		  symbol->section = bfd_make_section (abfd, BFD_UND_SECTION_NAME);
-#if VMS_DEBUG
-		  vms_debug (4, "gsd sym ref #%d (%s, %s [%p], %04x=%s)\n", abfd->symcount,
-				symbol->name, symbol->section->name, symbol->section, old_flags, flag2str (gsyflagdesc, old_flags));
-#endif
-		}
-
-	      gsd_size = vms_rec[name_offset] + name_offset + 1;
-	      symbol->flags = new_flags;
-	    }
-
-	  break;
-
-	  case GSD_S_C_PRO:
-	  case GSD_S_C_PROW:
-#if VMS_DEBUG
-		vms_debug(4, "gsd pro\n");
-#endif
-	  break;
-	  case GSD_S_C_IDC:
-#if VMS_DEBUG
-		vms_debug(4, "gsd idc\n");
-#endif
-	  break;
-	  case GSD_S_C_ENV:
-#if VMS_DEBUG
-		vms_debug(4, "gsd env\n");
-#endif
-	  break;
-	  case GSD_S_C_LSY:
-#if VMS_DEBUG
-		vms_debug(4, "gsd lsy\n");
-#endif
-	  break;
-	  case GSD_S_C_LEPM:
-#if VMS_DEBUG
-		vms_debug(4, "gsd lepm\n");
-#endif
-	  break;
-	  case GSD_S_C_LPRO:
-#if VMS_DEBUG
-		vms_debug(4, "gsd lpro\n");
-#endif
-	  break;
-	  case GSD_S_C_SPSC:
-#if VMS_DEBUG
-		vms_debug(4, "gsd spsc\n");
-#endif
-	  break;
-	  case GSD_S_C_SYMV:
-#if VMS_DEBUG
-		vms_debug(4, "gsd symv\n");
-#endif
-	  break;
-	  case GSD_S_C_EPMV:
-#if VMS_DEBUG
-		vms_debug(4, "gsd epmv\n");
-#endif
-	  break;
-	  case GSD_S_C_PROV:
-#if VMS_DEBUG
-		vms_debug(4, "gsd prov\n");
-#endif
-	  break;
-
-	case EGSD_S_C_PSC + EVAX_OFFSET:
-	  {
-	    /* program section definition  */
-
-	    name = _bfd_vms_save_counted_string (vms_rec+12);
-	    section = bfd_make_section (abfd, name);
-	    if (!section)
-	      return -1;
-	    old_flags = bfd_getl16 (vms_rec + 6);
-	    section->_raw_size = bfd_getl32 (vms_rec + 8);	/* allocation */
-	    new_flags = vms_secflag_by_name (abfd, evax_section_flags, name, (int) section->_raw_size);
-	    if (old_flags & EGPS_S_V_REL)
-	      new_flags |= SEC_RELOC;
-	    if (!bfd_set_section_flags (abfd, section, new_flags))
-	      return -1;
-	    section->alignment_power = vms_rec[4];
-	    align_addr = (1 << section->alignment_power);
-	    if ((base_addr % align_addr) != 0)
-	      base_addr += (align_addr - (base_addr % align_addr));
-	    section->vma = (bfd_vma)base_addr;
-	    base_addr += section->_raw_size;
-	    section->contents = ((unsigned char *)
-				 bfd_malloc (section->_raw_size));
-	    if (section->contents == NULL)
-	      return -1;
-	    memset (section->contents, 0, (size_t) section->_raw_size);
-	    section->_cooked_size = section->_raw_size;
-#if VMS_DEBUG
-	    vms_debug(4, "egsd psc %d (%s, flags %04x=%s) ",
-		       section->index, name, old_flags, flag2str(gpsflagdesc, old_flags));
-	    vms_debug(4, "%d bytes at 0x%08lx (mem %p)\n",
-		       section->_raw_size, section->vma, section->contents);
-#endif
-	  }
-	  break;
-
-	case EGSD_S_C_SYM + EVAX_OFFSET:
-	  {
-	    /* symbol specification (definition or reference)  */
-
-	    symbol = _bfd_vms_make_empty_symbol (abfd);
-	    if (symbol == 0)
-	      return -1;
-
-	    old_flags = bfd_getl16 (vms_rec + 6);
-	    new_flags = BSF_NO_FLAGS;
-
-	    if (old_flags & EGSY_S_V_WEAK)
-	      new_flags |= BSF_WEAK;
-
-	    if (vms_rec[6] & EGSY_S_V_DEF)	/* symbol definition */
-	      {
-		symbol->name =
-		  _bfd_vms_save_counted_string (vms_rec+32);
-		if (old_flags & EGSY_S_V_NORM)
-		  {         /* proc def */
-		    new_flags |= BSF_FUNCTION;
-		  }
-		symbol->value = bfd_getl64 (vms_rec+8);
-		symbol->section = (asection *)((unsigned long) bfd_getl32 (vms_rec+28));
-#if VMS_DEBUG
-		vms_debug(4, "egsd sym def #%d (%s, %d, %04x=%s)\n", abfd->symcount,
-			   symbol->name, (int)symbol->section, old_flags, flag2str(gsyflagdesc, old_flags));
-#endif
-	      }
-	    else	/* symbol reference */
-	      {
-	        symbol->name =
-		  _bfd_vms_save_counted_string (vms_rec+8);
-#if VMS_DEBUG
-		vms_debug(4, "egsd sym ref #%d (%s, %04x=%s)\n", abfd->symcount,
-			   symbol->name, old_flags, flag2str(gsyflagdesc, old_flags));
-#endif
-	        symbol->section = bfd_make_section (abfd, BFD_UND_SECTION_NAME);
-	      }
-
-	    symbol->flags = new_flags;
-
-	    /* save symbol in vms_symbol_table  */
-
-	    entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV(vms_symbol_table), symbol->name, true, false);
-	    if (entry == (vms_symbol_entry *)NULL)
-	      {
-		bfd_set_error (bfd_error_no_memory);
-		return -1;
-	      }
-	    if (entry->symbol != (asymbol *)NULL)
-	      {					/* FIXME ?, DEC C generates this */
-#if VMS_DEBUG
-		vms_debug(4, "EGSD_S_C_SYM: duplicate \"%s\"\n", symbol->name);
-#endif
-	      }
-	    else
-	      {
-		entry->symbol = symbol;
-		PRIV(gsd_sym_count)++;
-		abfd->symcount++;
-	      }
-	  }
-	  break;
-
-	case EGSD_S_C_IDC + EVAX_OFFSET:
-	  break;
-
-	default:
-	  (*_bfd_error_handler) (_("unknown gsd/egsd subtype %d"), gsd_type);
-	  bfd_set_error (bfd_error_bad_value);
-	  return -1;
-
-	} /* switch */
-
-      PRIV(rec_size) -= gsd_size;
-      PRIV(vms_rec) += gsd_size;
-
-    } /* while (recsize > 0) */
-
-  if (abfd->symcount > 0)
-    abfd->flags |= HAS_SYMS;
-
-  return 0;
-}
-
-/*-----------------------------------------------------------------------------*/
-/* output routines */
-
-/* Write section and symbol directory of bfd abfd  */
-
-int
-_bfd_vms_write_gsd (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-  asection *section;
-  asymbol *symbol;
-  int symnum;
-  int last_index = -1;
-  char dummy_name[10];
-  char *sname;
-  flagword new_flags, old_flags;
-  char *nptr, *uptr;
-
-#if VMS_DEBUG
-  vms_debug (2, "vms_write_gsd (%p, %d)\n", abfd, objtype);
-#endif
-
-  /* output sections  */
-
-  section = abfd->sections;
-#if VMS_DEBUG
-  vms_debug (3, "%d sections found\n", abfd->section_count);
-#endif
-
-  /* egsd is quadword aligned  */
-
-  _bfd_vms_output_alignment (abfd, 8);
-
-  _bfd_vms_output_begin (abfd, EOBJ_S_C_EGSD, -1);
-  _bfd_vms_output_long (abfd, 0);
-  _bfd_vms_output_push (abfd);		/* prepare output for subrecords */
-
-  while (section != 0)
-    {
-#if VMS_DEBUG
-  vms_debug (3, "Section #%d %s, %d bytes\n", section->index, section->name, (int)section->_raw_size);
-#endif
-
-	/* 13 bytes egsd, max 31 chars name -> should be 44 bytes */
-      if (_bfd_vms_output_check (abfd, 64) < 0)
-	{
-	  _bfd_vms_output_pop (abfd);
-	  _bfd_vms_output_end (abfd);
-	  _bfd_vms_output_begin (abfd, EOBJ_S_C_EGSD, -1);
-	  _bfd_vms_output_long (abfd, 0);
-	  _bfd_vms_output_push (abfd);		/* prepare output for subrecords */
-	}
-
-	/* Create dummy sections to keep consecutive indices */
-
-      while (section->index - last_index > 1)
-	{
-#if VMS_DEBUG
-	  vms_debug (3, "index %d, last %d\n", section->index, last_index);
-#endif
-	  _bfd_vms_output_begin (abfd, EGSD_S_C_PSC, -1);
-	  _bfd_vms_output_short (abfd, 0);
-	  _bfd_vms_output_short (abfd, 0);
-	  _bfd_vms_output_long (abfd, 0);
-	  sprintf (dummy_name, ".DUMMY%02d", last_index);
-	  _bfd_vms_output_counted (abfd, dummy_name);
-	  _bfd_vms_output_flush (abfd);
-	  last_index++;
-	}
-
-      /* Don't know if this is neccesary for the linker but for now it keeps
-	 vms_slurp_gsd happy  */
-
-      sname = (char *)section->name;
-      if (*sname == '.')
-	{
-	  sname++;
-	  if ((*sname == 't') && (strcmp (sname, "text") == 0))
-	    sname = PRIV(is_vax)?VAX_CODE_NAME:EVAX_CODE_NAME;
-	  else if ((*sname == 'd') && (strcmp (sname, "data") == 0))
-	    sname = PRIV(is_vax)?VAX_DATA_NAME:EVAX_DATA_NAME;
-	  else if ((*sname == 'b') && (strcmp (sname, "bss") == 0))
-	    sname = EVAX_BSS_NAME;
-	  else if ((*sname == 'l') && (strcmp (sname, "link") == 0))
-	    sname = EVAX_LINK_NAME;
-	  else if ((*sname == 'r') && (strcmp (sname, "rdata") == 0))
-	    sname = EVAX_READONLY_NAME;
-	  else if ((*sname == 'l') && (strcmp (sname, "literal") == 0))
-	    sname = EVAX_LITERAL_NAME;
-	  else if ((*sname == 'c') && (strcmp (sname, "comm") == 0))
-	    sname = EVAX_COMMON_NAME;
-	  else if ((*sname == 'l') && (strcmp (sname, "lcomm") == 0))
-	    sname = EVAX_LOCAL_NAME;
-	}
-      else
-	sname = _bfd_vms_length_hash_symbol (abfd, sname, EOBJ_S_C_SECSIZ);
-
-      _bfd_vms_output_begin (abfd, EGSD_S_C_PSC, -1);
-      _bfd_vms_output_short (abfd, section->alignment_power & 0xff);
-      if (bfd_is_com_section (section))
-	{
-	  new_flags = (EGPS_S_V_OVR|EGPS_S_V_REL|EGPS_S_V_GBL|EGPS_S_V_RD|EGPS_S_V_WRT|EGPS_S_V_NOMOD|EGPS_S_V_COM);
-	}
-      else
-	{
-	  new_flags = vms_esecflag_by_name (evax_section_flags, sname, section->_raw_size);
-	}
-      _bfd_vms_output_short (abfd, new_flags);
-      _bfd_vms_output_long (abfd, section->_raw_size);
-      _bfd_vms_output_counted (abfd, sname);
-      _bfd_vms_output_flush (abfd);
-
-      last_index = section->index;
-      section = section->next;
-    }
-
-  /* output symbols  */
-
-#if VMS_DEBUG
-  vms_debug (3, "%d symbols found\n", abfd->symcount);
-#endif
-
-  bfd_set_start_address (abfd, (bfd_vma)-1);
-
-  for (symnum = 0; symnum < abfd->symcount; symnum++)
-    {
-
-      symbol = abfd->outsymbols[symnum];
-      if (*(symbol->name) == '_')
-	{
-	  if (strcmp (symbol->name, "__main") == 0)
-	    bfd_set_start_address (abfd, (bfd_vma)symbol->value);
-	}
-      old_flags = symbol->flags;
-
-      if (old_flags & BSF_FILE)
-	continue;
-
-      if (((old_flags & (BSF_GLOBAL|BSF_WEAK)) == 0)	/* not xdef */
-	  && (!bfd_is_und_section (symbol->section)))	/* and not xref */
-	continue;					/* dont output */
-
-      /* 13 bytes egsd, max 64 chars name -> should be 77 bytes  */
-
-      if (_bfd_vms_output_check (abfd, 80) < 0)
-	{
-	  _bfd_vms_output_pop (abfd);
-	  _bfd_vms_output_end (abfd);
-	  _bfd_vms_output_begin (abfd, EOBJ_S_C_EGSD, -1);
-	  _bfd_vms_output_long (abfd, 0);
-	  _bfd_vms_output_push (abfd);		/* prepare output for subrecords */
-	}
-
-      _bfd_vms_output_begin (abfd, EGSD_S_C_SYM, -1);
-
-      _bfd_vms_output_short (abfd, 0);			/* data type, alignment */
-
-      new_flags = 0;
-
-      if (old_flags & BSF_WEAK)
-	new_flags |= EGSY_S_V_WEAK;
-      if (bfd_is_com_section (symbol->section))		/* .comm  */
-	new_flags |= (EGSY_S_V_WEAK|EGSY_S_V_COMM);
-
-      if (old_flags & BSF_FUNCTION)
-	{
-	  new_flags |= EGSY_S_V_NORM;
-	  new_flags |= EGSY_S_V_REL;
-	}
-      if (old_flags & (BSF_GLOBAL|BSF_WEAK))
-	{
-	  new_flags |= EGSY_S_V_DEF;
-	  if (!bfd_is_abs_section (symbol->section))
-	    new_flags |= EGSY_S_V_REL;
-	}
-      _bfd_vms_output_short (abfd, new_flags);
-
-      if (old_flags & (BSF_GLOBAL|BSF_WEAK))		/* symbol definition */
-	{
-	  if (old_flags & BSF_FUNCTION)
-	    {
-	      _bfd_vms_output_quad (abfd, symbol->value);
-	      _bfd_vms_output_quad (abfd,
-				     ((asymbol *)(symbol->udata.p))->value);
-	      _bfd_vms_output_long (abfd,
-				     (((asymbol *)(symbol->udata.p))
-				      ->section->index));
-	      _bfd_vms_output_long (abfd, symbol->section->index);
-	    }
-	  else
-	    {
-	      _bfd_vms_output_quad (abfd, symbol->value);	/* L_VALUE */
-	      _bfd_vms_output_quad (abfd, 0);			/* L_CODE_ADDRESS */
-	      _bfd_vms_output_long (abfd, 0);			/* L_CA_PSINDX */
-	      _bfd_vms_output_long (abfd, symbol->section->index);/* L_PSINDX */
-	    }
-	}
-      _bfd_vms_output_counted (abfd, _bfd_vms_length_hash_symbol (abfd, symbol->name, EOBJ_S_C_SYMSIZ));
-
-      _bfd_vms_output_flush (abfd);
-
-    }
-
-  _bfd_vms_output_alignment (abfd, 8);
-  _bfd_vms_output_pop (abfd);
-  _bfd_vms_output_end (abfd); 
-
-  return 0;
-}
diff --git a/bfd/vms-hdr.c b/bfd/vms-hdr.c
deleted file mode 100644
index 01d20aabefa..00000000000
--- a/bfd/vms-hdr.c
+++ /dev/null
@@ -1,461 +0,0 @@
-/* vms-hdr.c -- BFD back-end for VMS/VAX (openVMS/VAX) and
-   EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   HDR record handling functions
-   EMH record handling functions
-   and
-   EOM record handling functions
-   EEOM record handling functions
-
-   Written by Klaus K"ampf (kkaempf@rmi.de)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include <ctype.h>
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-
-#include "vms.h"
-
-/*---------------------------------------------------------------------------*/
-
-
-/* Read & process emh record
-   return 0 on success, -1 on error  */
-
-int
-_bfd_vms_slurp_hdr (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-  unsigned char *ptr;
-  unsigned char *vms_rec;
-  int subtype;
-
-  vms_rec = PRIV(vms_rec);
-
-#if VMS_DEBUG
-  vms_debug(2, "HDR/EMH\n");
-#endif
-
-  switch (objtype)
-    {
-      case OBJ_S_C_HDR:
-	subtype = vms_rec[1];
-	break;
-      case EOBJ_S_C_EMH:
-	subtype = bfd_getl16 (vms_rec + 4) + EVAX_OFFSET;
-	break;
-      default:
-	subtype = -1;
-    }
-
-#if VMS_DEBUG
-  vms_debug(3, "subtype %d\n", subtype);
-#endif
-
-  switch (subtype)
-    {
-
-      case MHD_S_C_MHD:
-	/*
-	 * module header
-	 */
-	PRIV(hdr_data).hdr_b_strlvl = vms_rec[2];
-	PRIV(hdr_data).hdr_l_recsiz = bfd_getl16 (vms_rec + 3);
-	PRIV(hdr_data).hdr_t_name = _bfd_vms_save_counted_string (vms_rec + 5);
-	ptr = vms_rec + 5 + vms_rec[5] + 1;
-	PRIV(hdr_data).hdr_t_version = _bfd_vms_save_counted_string (ptr);
-	ptr += *ptr + 1;
-	PRIV(hdr_data).hdr_t_date = _bfd_vms_save_sized_string (ptr, 17);
-
-      break;
-
-      case MHD_S_C_LNM:
-	/*
-	 *
-	 */
-	PRIV(hdr_data).hdr_c_lnm = _bfd_vms_save_sized_string (vms_rec, PRIV(rec_length-2));
-      break;
-
-      case MHD_S_C_SRC:
-	/*
-	 *
-	 */
-	PRIV(hdr_data).hdr_c_src = _bfd_vms_save_sized_string (vms_rec, PRIV(rec_length-2));
-      break;
-
-      case MHD_S_C_TTL:
-	/*
-	 *
-	 */
-	PRIV(hdr_data).hdr_c_ttl = _bfd_vms_save_sized_string (vms_rec, PRIV(rec_length-2));
-      break;
-
-      case MHD_S_C_CPR:
-	/*
-	 *
-	 */
-      break;
-
-      case MHD_S_C_MTC:
-	/*
-	 *
-	 */
-      break;
-
-      case MHD_S_C_GTX:
-	/*
-	 *
-	 */
-      break;
-
-      case EMH_S_C_MHD + EVAX_OFFSET:
-	/*
-	 * module header
-	 */
-	PRIV(hdr_data).hdr_b_strlvl = vms_rec[6];
-	PRIV(hdr_data).hdr_l_arch1 = bfd_getl32 (vms_rec + 8);
-	PRIV(hdr_data).hdr_l_arch2 = bfd_getl32 (vms_rec + 12);
-	PRIV(hdr_data).hdr_l_recsiz = bfd_getl32 (vms_rec + 16);
-	PRIV(hdr_data).hdr_t_name =
-	  _bfd_vms_save_counted_string (vms_rec + 20);
-	ptr = vms_rec + 20 + vms_rec[20] + 1;
-	PRIV(hdr_data).hdr_t_version =
-	  _bfd_vms_save_counted_string (ptr);
-	ptr += *ptr + 1;
-	PRIV(hdr_data).hdr_t_date =
-	  _bfd_vms_save_sized_string (ptr, 17);
-
-      break;
-
-      case EMH_S_C_LNM + EVAX_OFFSET:
-	/*
-	 *
-	 */
-	PRIV(hdr_data).hdr_c_lnm =
-	  _bfd_vms_save_sized_string (vms_rec, PRIV(rec_length-6));
-      break;
-
-      case EMH_S_C_SRC + EVAX_OFFSET:
-	/*
-	 *
-	 */
-	PRIV(hdr_data).hdr_c_src =
-	  _bfd_vms_save_sized_string (vms_rec, PRIV(rec_length-6));
-      break;
-
-      case EMH_S_C_TTL + EVAX_OFFSET:
-	/*
-	 *
-	 */
-	PRIV(hdr_data).hdr_c_ttl =
-	  _bfd_vms_save_sized_string (vms_rec, PRIV(rec_length-6));
-      break;
-
-      case EMH_S_C_CPR + EVAX_OFFSET:
-	/*
-	 *
-	 */
-      break;
-
-      case EMH_S_C_MTC + EVAX_OFFSET:
-	/*
-	 *
-	 */
-      break;
-
-      case EMH_S_C_GTX + EVAX_OFFSET:
-	/*
-	 *
-	 */
-      break;
-
-      default:
-	bfd_set_error (bfd_error_wrong_format);
-      return -1;
-
-    } /* switch */
-
-  return 0;
-}
-
-
-/*-----------------------------------------------------------------------------*/
-/* Output routines.  */
-
-
-/* Manufacure a VMS like time on a unix based system.
-   stolen from obj-vms.c  */
-
-static unsigned char *
-get_vms_time_string ()
-{
-  static unsigned char tbuf[18];
-#ifndef VMS
-#include <time.h>
-
-  char *pnt;
-  time_t timeb;
-  time (&timeb);
-  pnt = ctime (&timeb);
-  pnt[3] = 0;
-  pnt[7] = 0;
-  pnt[10] = 0;
-  pnt[16] = 0;
-  pnt[24] = 0;
-  sprintf (tbuf, "%2s-%3s-%s %s", pnt + 8, pnt + 4, pnt + 20, pnt + 11);
-#else
-#include <starlet.h>
-  struct
-  {
-    int Size;
-    unsigned char *Ptr;
-  } Descriptor;
-  Descriptor.Size = 17;
-  Descriptor.Ptr = tbuf;
-  SYS$ASCTIM (0, &Descriptor, 0, 0);
-#endif /* not VMS */
-
-#if VMS_DEBUG
-  vms_debug (6, "vmstimestring:'%s'\n", tbuf);
-#endif
-
-  return tbuf;
-}
-
-
-/* write object header for bfd abfd  */
-
-int
-_bfd_vms_write_hdr (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-  asymbol *symbol;
-  int symnum;
-  int had_case = 0;
-  int had_file = 0;
-
-
-#if VMS_DEBUG
-  vms_debug (2, "vms_write_hdr (%p)\n", abfd);
-#endif
-
-  _bfd_vms_output_alignment (abfd, 2);
-
-  /* MHD */
-
-  if (objtype == OBJ_S_C_HDR)
-    {
-    }
-  else
-    {
-      _bfd_vms_output_begin (abfd, EOBJ_S_C_EMH, EMH_S_C_MHD);
-      _bfd_vms_output_short (abfd, EOBJ_S_C_STRLVL);
-      _bfd_vms_output_long (abfd, 0);
-      _bfd_vms_output_long (abfd, 0);
-      _bfd_vms_output_long (abfd, MAX_OUTREC_SIZE);
-    }
-
-  if (bfd_get_filename (abfd) != 0)
-    {
-      /* strip path and suffix information */
-
-      char *fname, *fout, *fptr;
-
-      fptr = bfd_get_filename (abfd);
-      fname = (char *) alloca (strlen (fptr) + 1);
-      strcpy (fname, fptr);
-      fout = strrchr (fname, ']');
-      if (fout == 0)
-	fout = strchr (fname, ':');
-      if (fout != 0)
-	fout++;
-      else
-	fout = fname;
-
-      /* strip .obj suffix  */
-
-      fptr = strrchr (fname, '.');
-      if ((fptr != 0)
-	  && (strcasecmp (fptr, ".OBJ") == 0))
-	*fptr = 0;
-
-      fptr = fout;
-      while (*fptr != 0)
-	{
-	  if (islower (*fptr))
-	    *fptr = toupper (*fptr);
-	  fptr++;
-	  if ((*fptr == ';')
-	     || ((fptr - fout) > 31))
-	    *fptr = 0;
-	}
-      _bfd_vms_output_counted (abfd, fout);
-    }
-  else
-    _bfd_vms_output_counted (abfd, "NONAME");
-
-  _bfd_vms_output_counted (abfd, BFD_VERSION);
-  _bfd_vms_output_dump (abfd, get_vms_time_string (), 17);
-  _bfd_vms_output_fill (abfd, 0, 17);
-  _bfd_vms_output_flush (abfd);
-
-  /* LMN */
-
-  _bfd_vms_output_begin (abfd, EOBJ_S_C_EMH, EMH_S_C_LNM);
-  _bfd_vms_output_dump (abfd, (unsigned char *)"GAS proGIS", 10);
-  _bfd_vms_output_flush (abfd);
-
-  /* SRC */
-
-  _bfd_vms_output_begin (abfd, EOBJ_S_C_EMH, EMH_S_C_SRC);
-
-  for (symnum = 0; symnum < abfd->symcount; symnum++)
-    {
-      symbol = abfd->outsymbols[symnum];
-
-      if (symbol->flags & BSF_FILE)
-	{
-	  char *s;
-
-	  if (strncmp ((char *)symbol->name, "<CASE:", 6) == 0)
-	    {
-	      PRIV(flag_hash_long_names) = symbol->name[6] - '0';
-	      PRIV(flag_show_after_trunc) = symbol->name[7] - '0';
-
-	      if (had_file)
-		break;
-	      had_case = 1;
-	      continue;
-	    }
-
-	  _bfd_vms_output_dump (abfd, (unsigned char *)symbol->name, strlen (symbol->name));
-	  if (had_case)
-	    break;
-	  had_file = 1;
-	}
-    }
-
-  if (symnum == abfd->symcount)
-    _bfd_vms_output_dump (abfd, (unsigned char *)"noname", 6);
-
-  _bfd_vms_output_flush (abfd);
-
-  /* TTL */
-
-  _bfd_vms_output_begin (abfd, EOBJ_S_C_EMH, EMH_S_C_TTL);
-  _bfd_vms_output_dump (abfd, (unsigned char *)"TTL", 3);
-  _bfd_vms_output_flush (abfd);
-
-  /* CPR */
-
-  _bfd_vms_output_begin (abfd, EOBJ_S_C_EMH, EMH_S_C_CPR);
-  _bfd_vms_output_dump (abfd,
-			 (unsigned char *)"GNU BFD ported by Klaus Kämpf 1994-1996",
-			 39);
-  _bfd_vms_output_flush (abfd);
-
-  return 0;
-}
-
-/*-----------------------------------------------------------------------------*/
-
-/* Process EOM/EEOM record
-   return 0 on success, -1 on error  */
-
-int
-_bfd_vms_slurp_eom (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-  unsigned char *vms_rec;
-
-#if VMS_DEBUG
-  vms_debug(2, "EOM/EEOM\n");
-#endif
-
-  vms_rec = PRIV(vms_rec);
-
-  if ((objtype == OBJ_S_C_EOM) 
-     || (objtype == OBJ_S_C_EOMW))
-    {
-    }
-  else
-    {
-      PRIV(eom_data).eom_l_total_lps = bfd_getl32 (vms_rec + 4);
-      PRIV(eom_data).eom_b_comcod = *(vms_rec + 8);
-      if (PRIV(eom_data).eom_b_comcod > 1)
-	{
-	  (*_bfd_error_handler) (_("Object module NOT error-free !\n"));
-	  bfd_set_error (bfd_error_bad_value);
-	  return -1;
-	}
-      PRIV(eom_data).eom_has_transfer = false;
-      if (PRIV(rec_size) > 10)
-	{
-	   PRIV(eom_data).eom_has_transfer = true;
-	   PRIV(eom_data).eom_b_tfrflg = *(vms_rec + 9);
-	   PRIV(eom_data).eom_l_psindx = bfd_getl32 (vms_rec + 12);
-	   PRIV(eom_data).eom_l_tfradr = bfd_getl32 (vms_rec + 16);
-
-	   abfd->start_address = PRIV(eom_data).eom_l_tfradr;
-	}
-    }
-  return 0;
-}
-
-
-/* Write eom record for bfd abfd  */
-
-int
-_bfd_vms_write_eom (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-#if VMS_DEBUG
-  vms_debug (2, "vms_write_eom (%p, %d)\n", abfd, objtype);
-#endif
-
-  _bfd_vms_output_begin (abfd, objtype, -1);
-  _bfd_vms_output_long (abfd, (unsigned long)(PRIV(vms_linkage_index) >> 1));
-  _bfd_vms_output_byte (abfd, 0);	/* completion code */
-  _bfd_vms_output_byte (abfd, 0);	/* fill byte */
-
-  if (bfd_get_start_address (abfd) != (bfd_vma)-1)
-    {
-      asection *section;
-
-      section = bfd_get_section_by_name (abfd, ".link");
-      if (section == 0)
-	{
-	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return -1;
-	}
-      _bfd_vms_output_short (abfd, 0);
-      _bfd_vms_output_long (abfd, (unsigned long)(section->index));
-      _bfd_vms_output_long (abfd,
-			     (unsigned long) bfd_get_start_address (abfd));
-      _bfd_vms_output_long (abfd, 0);
-    }
-
-  _bfd_vms_output_end (abfd);
-  return 0;
-}
diff --git a/bfd/vms-misc.c b/bfd/vms-misc.c
deleted file mode 100644
index a5fdae4cc28..00000000000
--- a/bfd/vms-misc.c
+++ /dev/null
@@ -1,1145 +0,0 @@
-/* vms-misc.c -- Miscellaneous functions for VAX (openVMS/VAX) and
-   EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   Written by Klaus K"ampf (kkaempf@rmi.de)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-#if __STDC__
-#include <stdarg.h>
-#endif
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-
-#include "vms.h"
-
-/*-----------------------------------------------------------------------------*/
-#if VMS_DEBUG
-/* debug functions */
-
-/* debug function for all vms extensions
-   evaluates environment variable VMS_DEBUG for a
-   numerical value on the first call
-   all error levels below this value are printed
-  
-   levels:
-   1	toplevel bfd calls (functions from the bfd vector)
-   2	functions called by bfd calls
-   ...
-   9	almost everything
-
-   level is also identation level. Indentation is performed
-   if level > 0
-	*/
-
-#if __STDC__
-void
-_bfd_vms_debug (int level, char *format, ...)
-{
-  static int min_level = -1;
-  static FILE *output = NULL;
-  char *eptr;
-  va_list args;
-  int abslvl = (level > 0)?level:-level;
-
-  if (min_level == -1)
-    {
-      if ((eptr = getenv("VMS_DEBUG")) != NULL)
-	{
-	  min_level = atoi(eptr);
-	  output = stderr;
-	}
-      else
-	min_level = 0;
-    }
-  if (output == NULL)
-    return;
-  if (abslvl > min_level)
-    return;
-
-  while(--level>0)
-    fprintf(output, " ");
-  va_start(args, format);
-  vfprintf(output, format, args);
-  fflush(output);
-  va_end(args);
-
-  return;
-}
-
-#else /* not __STDC__ */
-
-void
-_bfd_vms_debug (level, format, a1, a2, a3, a4, a5, a6)
-     int level;
-     char *format;
-     long a1; long a2; long a3;
-     long a4; long a5; long a6;
-{
-  static int min_level = -1;
-  static FILE *output = NULL;
-  char *eptr;
-
-  if (min_level == -1)
-    {
-      if ((eptr = getenv("VMS_DEBUG")) != NULL)
-	{
-	  min_level = atoi(eptr);
-	  output = stderr;
-	}
-      else
-	min_level = 0;
-    }
-  if (output == NULL)
-    return;
-  if (level > min_level)
-    return;
-
-  while(--level>0)
-    fprintf(output, " ");
-  fprintf(output, format, a1, a2, a3, a4, a5, a6);
-  fflush(output);
-
-  return;
-}
-#endif /* __STDC__ */
-
-
-/* a debug function
-   hex dump 'size' bytes starting at 'ptr'  */
-
-void
-_bfd_hexdump (level, ptr, size, offset)
-     int level;
-     unsigned char *ptr;
-     int size;
-     int offset;
-{
-  unsigned char *lptr = ptr;
-  int count = 0;
-  long start = offset;
-
-  while (size-- > 0)
-    {
-      if ((count%16) == 0)
-	vms_debug (level, "%08lx:", start);
-      vms_debug (-level, " %02x", *ptr++);
-      count++;
-      start++;
-      if (size == 0)
-	{
-	  while ((count%16) != 0)
-	    {
-	      vms_debug (-level, "   ");
-	      count++;
-	    }
-	}
-      if ((count%16) == 0)
-	{
-	  vms_debug (-level, " ");
-	  while (lptr < ptr)
-	    {
-	      vms_debug (-level, "%c", (*lptr < 32)?'.':*lptr);
-	      lptr++;
-	    }
-	  vms_debug (-level, "\n");
-	}
-    }
-  if ((count%16) != 0)
-    vms_debug (-level, "\n");
-
-  return;
-}
-#endif
-
-
-/* hash functions
-
-   These are needed when reading an object file.  */
-
-/* allocate new vms_hash_entry
-   keep the symbol name and a pointer to the bfd symbol in the table  */
-
-struct bfd_hash_entry *
-_bfd_vms_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  vms_symbol_entry *ret;
-
-#if VMS_DEBUG
-  vms_debug (5, "_bfd_vms_hash_newfunc(%p, %p, %s)\n", entry, table, string);
-#endif
-
-  if (entry == (struct bfd_hash_entry *)NULL)
-    {
-      ret = (vms_symbol_entry *)
-	      bfd_hash_allocate (table, sizeof (vms_symbol_entry));
-      if (ret == (vms_symbol_entry *) NULL)
-	{
-	  bfd_set_error (bfd_error_no_memory);
-	  return (struct bfd_hash_entry *)NULL;
-	}
-    }
-
-  /* Call the allocation method of the base class.  */
-
-  ret = (vms_symbol_entry *) bfd_hash_newfunc ((struct bfd_hash_entry *)ret, table, string);
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_hash_newfunc ret %p\n", ret);
-#endif
-
-  ret->symbol = (asymbol *)NULL;
-
-  return (struct bfd_hash_entry *)ret;
-}
-
-
-/* object file input functions */
-
-/* Return type and length from record header (buf) on Alpha.  */
-
-void
-_bfd_vms_get_header_values (abfd, buf, type, length)
-     bfd *abfd;
-     unsigned char *buf;
-     int *type;
-     int *length;
-{
-  if (type != 0)
-    *type = bfd_getl16 (buf);
-  buf += 2;
-  if (length != 0)
-    *length = bfd_getl16 (buf);
-
-#if VMS_DEBUG
-  vms_debug (10, "_bfd_vms_get_header_values type %x, length %x\n", (type?*type:0), (length?*length:0));
-#endif
-
-
-  return;
-}
-
-
-/* Get next record from object file to vms_buf
-   set PRIV(buf_size) and return it
-  
-   this is a little tricky since it should be portable.
-  
-   the openVMS object file has 'variable length' which means that
-   read() returns data in chunks of (hopefully) correct and expected
-   size. The linker (and other tools on vms) depend on that. Unix doesn't
-   know about 'formatted' files, so reading and writing such an object
-   file in a unix environment is not trivial.
-  
-   With the tool 'file' (available on all vms ftp sites), one
-   can view and change the attributes of a file. Changing from
-   'variable length' to 'fixed length, 512 bytes' reveals the
-   record length at the first 2 bytes of every record. The same
-   happens during the transfer of object files from vms to unix,
-   at least with ucx, dec's implementation of tcp/ip.
-  
-   The vms format repeats the length at bytes 2 & 3 of every record.
-  
-   On the first call (file_format == FF_UNKNOWN) we check if
-   the first and the third byte pair (!) of the record match.
-   If they do it's an object file in an unix environment or with
-   wrong attributes (FF_FOREIGN), else we should be in a vms
-   environment where read() returns the record size (FF_NATIVE).
-  
-   reading is always done in 2 steps.
-   first just the record header is read and the length extracted
-   by get_header_values
-   then the read buffer is adjusted and the remaining bytes are
-   read in.
-  
-   all file i/o is always done on even file positions  */
-
-int
-_bfd_vms_get_record (abfd)
-     bfd *abfd;
-{
-  int test_len, test_start, remaining;
-  unsigned char *vms_buf;
-
-#if VMS_DEBUG
-  vms_debug (8, "_bfd_vms_get_record\n");
-#endif
-
-  /* minimum is 6 bytes on Alpha
-     (2 bytes length, 2 bytes record id, 2 bytes length repeated)
-
-     on VAX there's no length information in the record
-     so start with OBJ_S_C_MAXRECSIZ  */
-
-  if (PRIV(buf_size) == 0)
-    {
-      if (PRIV(is_vax))
-	{
-	  PRIV(vms_buf) = (unsigned char *) malloc (OBJ_S_C_MAXRECSIZ);
-	  PRIV(buf_size) = OBJ_S_C_MAXRECSIZ;
-	  PRIV(file_format) = FF_VAX;
-	}
-      else
-	PRIV(vms_buf) = (unsigned char *) malloc (6);
-    }
-
-  vms_buf = PRIV(vms_buf);
-
-  if (vms_buf == 0)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return -1;
-    }
-
-  switch (PRIV(file_format))
-    {
-      case FF_UNKNOWN:
-      case FF_FOREIGN:
-	test_len = 6;			/* probe 6 bytes */
-	test_start = 2;			/* where the record starts */
-      break;
-
-      case FF_NATIVE:
-	test_len = 4;
-	test_start = 0;
-      break;
-
-      case FF_VAX:
-	test_len = 0;
-	test_start = 0;
-      break;
-  }
-
-  /* skip odd alignment byte  */
-
-  if (bfd_tell (abfd) & 1)
-    {
-      if (bfd_read (PRIV(vms_buf), 1, 1, abfd) != 1)
-	{
-	  bfd_set_error (bfd_error_file_truncated);
-	  return 0;
-	}
-    }
-
-  /* read the record header on Alpha.  */
-
-  if ((test_len != 0)
-      && (bfd_read (PRIV(vms_buf), 1, test_len, abfd) != test_len))
-    {
-      bfd_set_error (bfd_error_file_truncated);
-      return 0;
-    }
-
-  /* check file format on first call  */
-
-  if (PRIV(file_format) == FF_UNKNOWN)
-    {						/* record length repeats ? */
-      if ( (vms_buf[0] == vms_buf[4])
-        && (vms_buf[1] == vms_buf[5]))
-	{
-	  PRIV(file_format) = FF_FOREIGN;	/* Y: foreign environment */
-	  test_start = 2;
-	}
-      else
-	{
-	  PRIV(file_format) = FF_NATIVE;	/* N: native environment */
-	  test_start = 0;
-	}
-    }
-
-  if (PRIV(is_vax))
-    {
-      PRIV(rec_length) = bfd_read (vms_buf, 1, PRIV(buf_size), abfd);
-      if (PRIV(rec_length) <= 0)
-	{
-	  bfd_set_error (bfd_error_file_truncated);
-	  return 0;
-	}
-      PRIV(vms_rec) = vms_buf;
-    }
-  else		/* Alpha  */
-    {
-      /* extract vms record length  */
-
-      _bfd_vms_get_header_values (abfd, vms_buf+test_start, NULL,
-				  &PRIV(rec_length));
-
-      if (PRIV(rec_length) <= 0)
-	{
-	  bfd_set_error (bfd_error_file_truncated);
-	  return 0;
-	}
-
-      /* that's what the linker manual says  */
-
-      if (PRIV(rec_length) > EOBJ_S_C_MAXRECSIZ)
-	{
-	  bfd_set_error (bfd_error_file_truncated);
-	  return 0;
-	}
-
-      /* adjust the buffer  */
-
-      if (PRIV(rec_length) > PRIV(buf_size))
-	{
-	  PRIV(vms_buf) = (unsigned char *) realloc (vms_buf, PRIV(rec_length));
-	  vms_buf = PRIV(vms_buf);
-	  if (vms_buf == 0)
-	    {
-	      bfd_set_error (bfd_error_no_memory);
-	      return -1;
-	    }
-	  PRIV(buf_size) = PRIV(rec_length);
-	}
-
-      /* read the remaining record  */
-
-      remaining = PRIV(rec_length) - test_len + test_start;
-
-#if VMS_DEBUG
-      vms_debug (10, "bfd_read remaining %d\n", remaining);
-#endif
-      if (bfd_read (vms_buf + test_len, 1, remaining, abfd) != remaining)
-	{
-	  bfd_set_error (bfd_error_file_truncated);
-	  return 0;
-	}
-      PRIV(vms_rec) = vms_buf + test_start;
-    }
-
-#if VMS_DEBUG
-  vms_debug (11, "bfd_read rec_length %d\n", PRIV(rec_length));
-#endif
-
-  return PRIV(rec_length);
-}
-
-
-/* get next vms record from file
-   update vms_rec and rec_length to new (remaining) values  */
-
-int
-_bfd_vms_next_record (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (8, "_bfd_vms_next_record (len %d, size %d)\n",
-	      PRIV(rec_length), PRIV(rec_size));
-#endif
-
-  if (PRIV(rec_length) > 0)
-    {
-      PRIV(vms_rec) += PRIV(rec_size);
-    }
-  else
-    {
-      if (_bfd_vms_get_record (abfd) <= 0)
-	return -1;
-    }
-
-  if (PRIV(is_vax))
-    {
-      PRIV(rec_type) = *(PRIV(vms_rec));
-      PRIV(rec_size) = PRIV(rec_length);
-    }
-  else
-    {
-      _bfd_vms_get_header_values (abfd, PRIV(vms_rec), &PRIV(rec_type),
-				  &PRIV(rec_size));
-    }
-  PRIV(rec_length) -= PRIV(rec_size);
-
-#if VMS_DEBUG
-  vms_debug (8, "_bfd_vms_next_record: rec %p, size %d, length %d, type %d\n",
-	      PRIV(vms_rec), PRIV(rec_size), PRIV(rec_length),
-	      PRIV(rec_type));
-#endif
-
-  return PRIV(rec_type);
-}
-
-
-
-/* Copy sized string (string with fixed length) to new allocated area
-   size is string length (size of record)  */
-
-char *
-_bfd_vms_save_sized_string (str, size)
-     unsigned char *str;
-     int size;
-{
-  char *newstr = bfd_malloc (size + 1);
-
-  if (newstr == NULL)
-    return 0;
-  strncpy (newstr, (char *)str, size);
-  newstr[size] = 0;
-
-  return newstr;
-}
-
-/* Copy counted string (string with length at first byte) to new allocated area
-   ptr points to length byte on entry  */
-
-char *
-_bfd_vms_save_counted_string (ptr)
-     unsigned char *ptr;
-{
-  int len = *ptr++;
-
-  return _bfd_vms_save_sized_string (ptr, len);
-}
-
-
-/* stack routines for vms ETIR commands */
-
-/* Push value and section index  */
-
-void
-_bfd_vms_push (abfd, val, psect)
-     bfd *abfd;
-     uquad val;
-     int psect;
-{
-  static int last_psect;
-
-#if VMS_DEBUG
-  vms_debug (4, "<push %016lx(%d) at %d>\n", val, psect, PRIV(stackptr));
-#endif
-
-  if (psect >= 0)
-    last_psect = psect;
-
-  PRIV(stack[PRIV(stackptr)]).value = val;
-  PRIV(stack[PRIV(stackptr)]).psect = last_psect;
-  PRIV(stackptr)++;
-  if (PRIV(stackptr) >= STACKSIZE)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      (*_bfd_error_handler) (_("Stack overflow (%d) in _bfd_vms_push"), PRIV(stackptr));
-      exit (1);
-    }
-  return;
-}
-
-
-/* Pop value and section index  */
-
-uquad
-_bfd_vms_pop (abfd, psect)
-     bfd *abfd;
-     int *psect;
-{
-  uquad value;
-
-  if (PRIV(stackptr) == 0)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      (*_bfd_error_handler) (_("Stack underflow in _bfd_vms_pop"));
-      exit (1);
-    }
-  PRIV(stackptr)--;
-  value = PRIV(stack[PRIV(stackptr)]).value;
-  if ((psect != NULL) && (PRIV(stack[PRIV(stackptr)]).psect >= 0))
-    *psect = PRIV(stack[PRIV(stackptr)]).psect;
-
-#if VMS_DEBUG
-  vms_debug (4, "<pop %016lx(%d)>\n", value, PRIV(stack[PRIV(stackptr)]).psect);
-#endif
-
-  return value;
-}
-
-
-/* object file output functions */
-
-/* GAS tends to write sections in little chunks (bfd_set_section_contents)
-   which we can't use directly. So we save the little chunks in linked
-   lists (one per section) and write them later.  */
-
-/* Add a new vms_section structure to vms_section_table
-   - forward chaining -  */
-
-static vms_section *
-add_new_contents (abfd, section)
-     bfd *abfd;
-     sec_ptr section;
-{
-  vms_section *sptr, *newptr;
-
-  sptr = PRIV(vms_section_table)[section->index];
-  if (sptr != NULL)
-    return sptr;
-
-  newptr = (vms_section *) bfd_malloc (sizeof (vms_section));
-  if (newptr == (vms_section *) NULL)
-    return NULL;
-  newptr->contents = (unsigned char *) bfd_alloc (abfd, (int)section->_raw_size);
-  if (newptr->contents == (unsigned char *)NULL)
-    return NULL;
-  newptr->offset = 0;
-  newptr->size = section->_raw_size;
-  newptr->next = 0;
-  PRIV(vms_section_table)[section->index] = newptr;
-  return newptr;
-}
-
-
-/* Save section data & offset to an vms_section structure
-   vms_section_table[] holds the vms_section chain  */
-
-boolean
-_bfd_save_vms_section (abfd, section, data, offset, count)
-     bfd *abfd;
-     sec_ptr section;
-     PTR data;
-     file_ptr offset;
-     bfd_size_type count;
-{
-  vms_section *sptr;
-
-  if (section->index >= VMS_SECTION_COUNT)
-    {
-      bfd_set_error (bfd_error_nonrepresentable_section);
-      return false;
-    }
-  if (count == (bfd_size_type)0)
-    return true;
-  sptr = add_new_contents (abfd, section);
-  if (sptr == NULL)
-    return false;
-  memcpy (sptr->contents + offset, data, (size_t) count);
-
-  return true;
-}
-
-
-/* Get vms_section pointer to saved contents for section # index  */
-
-vms_section *
-_bfd_get_vms_section (abfd, index)
-     bfd *abfd;
-     int index;
-{
-  if (index >=  VMS_SECTION_COUNT)
-    {
-      bfd_set_error (bfd_error_nonrepresentable_section);
-      return NULL;
-    }
-  return PRIV(vms_section_table)[index];
-}
-
-
-/* Object output routines  */
-
-/* Begin new record or record header
-   write 2 bytes rectype
-   write 2 bytes record length (filled in at flush)
-   write 2 bytes header type (ommitted if rechead == -1)  */
-
-void
-_bfd_vms_output_begin (abfd, rectype, rechead)
-     bfd *abfd;
-     int rectype;
-     int rechead;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_begin(type %d, head %d)\n", rectype,
-	      rechead);
-#endif
-
-  _bfd_vms_output_short (abfd,rectype);
-
-  /* save current output position to fill in lenght later  */
-
-  if (PRIV(push_level) > 0)
-    PRIV(length_pos) = PRIV(output_size);
-
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_begin: length_pos = %d\n",
-	      PRIV(length_pos));
-#endif
-
-  _bfd_vms_output_short (abfd,0);		/* placeholder for length */
-
-  if (rechead != -1)
-    _bfd_vms_output_short (abfd,rechead);
-
-  return;
-}
-
-
-/* Set record/subrecord alignment  */
-
-void
-_bfd_vms_output_alignment (abfd, alignto)
-     bfd *abfd;
-     int alignto;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_alignment(%d)\n", alignto);
-#endif
-
-  PRIV(output_alignment) = alignto;
-  return;
-}
-
-
-/* Prepare for subrecord fields  */
-
-void
-_bfd_vms_output_push (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (6, "vms_output_push(pushed_size = %d)\n", PRIV(output_size));
-#endif
-
-  PRIV(push_level)++;
-  PRIV(pushed_size) = PRIV(output_size);
-  return;
-}
-
-
-/* End of subrecord fields  */
-
-void
-_bfd_vms_output_pop (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (6, "vms_output_pop(pushed_size = %d)\n", PRIV(pushed_size));
-#endif
-
-  _bfd_vms_output_flush (abfd);
-  PRIV(length_pos) = 2;
-
-#if VMS_DEBUG
-  vms_debug (6, "vms_output_pop: length_pos = %d\n", PRIV(length_pos));
-#endif
-
-  PRIV(pushed_size) = 0;
-  PRIV(push_level)--;
-  return;
-}
-
-
-/* Flush unwritten output, ends current record  */
-
-void
-_bfd_vms_output_flush (abfd)
-     bfd *abfd;
-{
-  int real_size = PRIV(output_size);
-  int aligncount;
-  int length;
-
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_flush(real_size = %d, pushed_size %d at lenpos %d)\n",
-	      real_size, PRIV(pushed_size), PRIV(length_pos));
-#endif
-
-  if (PRIV(push_level) > 0)
-    length = real_size - PRIV(pushed_size);
-  else
-    length = real_size;
-
-  if (length == 0)
-    return;
-  aligncount = (PRIV(output_alignment)
-		- (length % PRIV(output_alignment))) % PRIV(output_alignment);
-
-#if VMS_DEBUG
-  vms_debug (6, "align: adding %d bytes\n", aligncount);
-#endif
-
-  while(aligncount-- > 0)
-    {
-      PRIV(output_buf)[real_size++] = 0;
-#if 0
-      /* this is why I *love* vms: inconsistency :-}
-	 alignment is added to the subrecord length
-	 but not to the record length  */
-      if (PRIV(push_level) > 0)
-#endif
-	length++;
-    }
-
-  /* put length to buffer  */
-  PRIV(output_size) = PRIV(length_pos);
-  _bfd_vms_output_short (abfd, (unsigned int)length);
-
-  if (PRIV(push_level) == 0)
-    {
-#ifndef VMS
-	/* write length first, see FF_FOREIGN in the input routines */
-      fwrite (PRIV(output_buf)+2, 2, 1, (FILE *)abfd->iostream);
-#endif
-      fwrite (PRIV(output_buf), real_size, 1, (FILE *)abfd->iostream);
-
-      PRIV(output_size) = 0;
-    }
-  else
-    {
-      PRIV(output_size) = real_size;
-      PRIV(pushed_size) = PRIV(output_size);
-    }
-
-  return;
-}
-
-
-/* End record output  */
-
-void
-_bfd_vms_output_end (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_end\n");
-#endif
-
-  _bfd_vms_output_flush (abfd);
-
-  return;
-}
-
-
-/* check remaining buffer size
-
-   return what's left.  */
-
-int
-_bfd_vms_output_check (abfd, size)
-    bfd *abfd;
-    int size;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_check(%d)\n", size);
-#endif
-
-  return (MAX_OUTREC_SIZE - (PRIV(output_size) + size + MIN_OUTREC_LUFT));
-}
-
-
-/* Output byte (8 bit) value  */
-
-void
-_bfd_vms_output_byte (abfd, value)
-     bfd *abfd;
-     unsigned int value;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_byte(%02x)\n", value);
-#endif
-
-  bfd_put_8 (abfd, value & 0xff, PRIV(output_buf) + PRIV(output_size));
-  PRIV(output_size) += 1;
-  return;
-}
-
-
-/* Output short (16 bit) value  */
-
-void
-_bfd_vms_output_short (abfd, value)
-     bfd *abfd;
-     unsigned int value;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_short (%04x)\n", value);
-#endif
-
-  bfd_put_16 (abfd, value & 0xffff, PRIV(output_buf) + PRIV(output_size));
-  PRIV(output_size) += 2;
-  return;
-}
-
-
-/* Output long (32 bit) value  */
-
-void
-_bfd_vms_output_long (abfd, value)
-     bfd *abfd;
-     unsigned long value;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_long (%08lx)\n", value);
-#endif
-
-  bfd_put_32 (abfd, value, PRIV(output_buf) + PRIV(output_size));
-  PRIV(output_size) += 4;
-  return;
-}
-
-
-/* Output quad (64 bit) value  */
-
-void
-_bfd_vms_output_quad (abfd, value)
-     bfd *abfd;
-     uquad value;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_quad(%016lx)\n", value);
-#endif
-
-  bfd_put_64(abfd, value, PRIV(output_buf) + PRIV(output_size));
-  PRIV(output_size) += 8;
-  return;
-}
-
-
-/* Output c-string as counted string  */
-
-void
-_bfd_vms_output_counted (abfd, value)
-     bfd *abfd;
-     char *value;
-{
-int len;
-
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_counted(%s)\n", value);
-#endif
-
-  len = strlen (value);
-  if (len == 0)
-    {
-      (*_bfd_error_handler) (_("_bfd_vms_output_counted called with zero bytes"));
-      return;
-    }
-  if (len > 255)
-    {
-      (*_bfd_error_handler) (_("_bfd_vms_output_counted called with too many bytes"));
-      return;
-    }
-  _bfd_vms_output_byte (abfd, len & 0xff);
-  _bfd_vms_output_dump (abfd, (unsigned char *)value, len);
-}
-
-
-/* Output character area  */
-
-void
-_bfd_vms_output_dump (abfd, data, length)
-     bfd *abfd;
-     unsigned char *data;
-     int length;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_dump(%d)\n", length);
-#endif
-
-  if (length == 0)
-    return;
-
-  memcpy (PRIV(output_buf) + PRIV(output_size), data, length);
-  PRIV(output_size) += length;
-
-  return;
-}
-
-
-/* Output count bytes of value  */
-
-void
-_bfd_vms_output_fill (abfd, value, count)
-     bfd *abfd;
-     int value;
-     int count;
-{
-#if VMS_DEBUG
-  vms_debug (6, "_bfd_vms_output_fill(val %02x times %d)\n", value, count);
-#endif
-
-  if (count == 0)
-    return;
-  memset (PRIV(output_buf) + PRIV(output_size), value, count);
-  PRIV(output_size) += count;
-
-  return;
-}
-
-/* this hash routine borrowed from GNU-EMACS, and strengthened slightly  ERY*/
-
-static int
-hash_string (ptr)
-     const char *ptr;
-{
-  register const unsigned char *p = (unsigned char *) ptr;
-  register const unsigned char *end = p + strlen (ptr);
-  register unsigned char c;
-  register int hash = 0;
-
-  while (p != end)
-    {
-      c = *p++;
-      hash = ((hash << 3) + (hash << 15) + (hash >> 28) + c);
-    }
-  return hash;
-}
-
-/* Generate a length-hashed VMS symbol name (limited to maxlen chars).  */
-
-char *
-_bfd_vms_length_hash_symbol (abfd, in, maxlen)
-     bfd *abfd;
-     const char *in;
-     int maxlen;
-{
-  long int init;
-  long int result;
-  int in_len;
-  char *pnt = 0;
-  char *new_name;
-  const char *old_name;
-  int i;
-  static char outbuf[EOBJ_S_C_SYMSIZ+1];
-  char *out = outbuf;
-
-#if VMS_DEBUG
-  vms_debug(4, "_bfd_vms_length_hash_symbol \"%s\"\n", in);
-#endif
-
-  if (maxlen > EOBJ_S_C_SYMSIZ)
-    maxlen = EOBJ_S_C_SYMSIZ;
-
-  new_name = out;		/* save this for later.  */
-
-  /* We may need to truncate the symbol, save the hash for later.  */
-
-  in_len = strlen (in);
-
-  result = (in_len > maxlen) ? hash_string (in) : 0;
-
-  old_name = in;
-
-  /* Do the length checking.  */
-
-  if (in_len <= maxlen)
-    {
-      i = in_len;
-    }
-  else
-    {
-      if (PRIV(flag_hash_long_names))
-	i = maxlen-9;
-      else
-	i = maxlen;
-    }
-
-  strncpy (out, in, i);
-  in += i;
-  out += i;
-
-  if ((in_len > maxlen)
-      && PRIV(flag_hash_long_names))
-    sprintf (out, "_%08x", result);
-  else
-    *out = 0;
-
-#if VMS_DEBUG
-  vms_debug(4, "--> [%d]\"%s\"\n", strlen (outbuf), outbuf);
-#endif
-
-  if (in_len > maxlen
-	&& PRIV(flag_hash_long_names)
-	&& PRIV(flag_show_after_trunc))
-    printf (_("Symbol %s replaced by %s\n"), old_name, new_name);
-
-  return outbuf;
-}
-
-
-/* Allocate and initialize a new symbol.  */
-
-static asymbol *
-new_symbol (abfd, name)
-     bfd *abfd;
-     char *name;
-{
-  asymbol *symbol;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (7,  "new_symbol %s\n", name);
-#endif
-
-  symbol = _bfd_vms_make_empty_symbol (abfd);
-  if (symbol == 0)
-    return symbol;
-  symbol->name = name;
-  symbol->section = bfd_make_section (abfd, BFD_UND_SECTION_NAME);
-
-  return symbol;
-}
-
-
-/* Allocate and enter a new private symbol.  */
-
-vms_symbol_entry *
-_bfd_vms_enter_symbol (abfd, name)
-     bfd *abfd;
-     char *name;
-{
-  vms_symbol_entry *entry;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (6,  "_bfd_vms_enter_symbol %s\n", name);
-#endif
-
-  entry = (vms_symbol_entry *)
-	  bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-  if (entry == 0)
-    {
-#if VMS_DEBUG
-      _bfd_vms_debug (8,  "creating hash entry for %s\n", name);
-#endif
-      entry = (vms_symbol_entry *)bfd_hash_lookup (PRIV(vms_symbol_table), name, true, false);
-      if (entry != 0)
-	{
-	  asymbol *symbol;
-	  symbol = new_symbol (abfd, name);
-	  if (symbol != 0)
-	    {
-	      entry->symbol = symbol;
-	      PRIV(gsd_sym_count)++;
-	      abfd->symcount++;
-	    }
-	  else
-	    entry = 0;
-	}
-      else
-	(*_bfd_error_handler) (_("failed to enter %s"), name);
-    }
-  else
-    {
-#if VMS_DEBUG
-      _bfd_vms_debug (8,  "found hash entry for %s\n", name);
-#endif
-    }
-
-#if VMS_DEBUG
-  _bfd_vms_debug (7, "-> entry %p, entry->symbol %p\n", entry, entry->symbol);
-#endif
-  return entry;
-}
diff --git a/bfd/vms-tir.c b/bfd/vms-tir.c
deleted file mode 100644
index 782f52bfc04..00000000000
--- a/bfd/vms-tir.c
+++ /dev/null
@@ -1,2489 +0,0 @@
-/* vms-tir.c -- BFD back-end for VAX (openVMS/VAX) and
-   EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   TIR record handling functions
-   ETIR record handling functions
-
-   go and read the openVMS linker manual (esp. appendix B)
-   if you don't know what's going on here :-)
-
-   Written by Klaus K"ampf (kkaempf@rmi.de)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-
-/* The following type abbreviations are used:
-
-	cs	counted string (ascii string with length byte)
-	by	byte (1 byte)
-	sh	short (2 byte, 16 bit)
-	lw	longword (4 byte, 32 bit)
-	qw	quadword (8 byte, 64 bit)
-	da	data stream  */
-
-#include <ctype.h>
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-
-#include "vms.h"
-
-static void image_set_ptr PARAMS ((bfd *abfd, int psect, uquad offset));
-static void image_inc_ptr PARAMS ((bfd *abfd, uquad offset));
-static void image_dump PARAMS ((bfd *abfd, unsigned char *ptr, int size, int offset));
-static void image_write_b PARAMS ((bfd *abfd, unsigned int value));
-static void image_write_w PARAMS ((bfd *abfd, unsigned int value));
-static void image_write_l PARAMS ((bfd *abfd, unsigned long value));
-static void image_write_q PARAMS ((bfd *abfd, uquad value));
-
-/*-----------------------------------------------------------------------------*/
-
-static int
-check_section (abfd, size)
-     bfd *abfd;
-     int size;
-{
-  int offset;
-
-  offset = PRIV(image_ptr) - PRIV(image_section)->contents;
-  if ((offset + size) > PRIV(image_section)->_raw_size)
-    {
-      PRIV(image_section)->contents = bfd_realloc (PRIV(image_section)->contents, offset + size);
-      if (PRIV(image_section)->contents == 0)
-	{
-	  (*_bfd_error_handler) (_("No Mem !"));
-	  return -1;
-	}
-      PRIV(image_section)->_raw_size = offset + size;
-      PRIV(image_ptr) = PRIV(image_section)->contents + offset;
-    }
-
-  return 0;
-}
-
-/* routines to fill sections contents during tir/etir read */
-
-/* Initialize image buffer pointer to be filled  */
-
-static void
-image_set_ptr (abfd, psect, offset)
-     bfd *abfd;
-     int psect;
-     uquad offset;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (4, "image_set_ptr (%d=%s, %d)\n",
-		psect, PRIV(sections)[psect]->name, offset);
-#endif
-
-  PRIV(image_ptr) = PRIV(sections)[psect]->contents + offset;
-  PRIV(image_section) = PRIV(sections)[psect];
-  return;
-}
-
-
-/* Increment image buffer pointer by offset  */
-
-static void
-image_inc_ptr (abfd, offset)
-     bfd *abfd;
-     uquad offset;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (4, "image_inc_ptr (%d)\n", offset);
-#endif
-
-  PRIV(image_ptr) += offset;
-
-  return;
-}
-
-
-/* Dump multiple bytes to section image  */
-
-static void
-image_dump (abfd, ptr, size, offset)
-    bfd *abfd;
-    unsigned char *ptr;
-    int size;
-    int offset;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (8, "image_dump from (%p, %d) to (%p)\n", ptr, size, PRIV(image_ptr));
-  _bfd_hexdump (9, ptr, size, offset);
-#endif
-
-  if (PRIV(is_vax) && check_section (abfd, size))
-    return;
-
-  while (size-- > 0)
-    *PRIV(image_ptr)++ = *ptr++;
-  return;
-}
-
-
-/* Write byte to section image  */
-
-static void
-image_write_b (abfd, value)
-     bfd *abfd;
-     unsigned int value;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (6, "image_write_b(%02x)\n", (int)value);
-#endif
-
-  if (PRIV(is_vax) && check_section (abfd, 1))
-    return;
-
-  *PRIV(image_ptr)++ = (value & 0xff);
-  return;
-}
-
-
-/* Write 2-byte word to image  */
-
-static void
-image_write_w (abfd, value)
-     bfd *abfd;
-     unsigned int value;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (6, "image_write_w(%04x)\n", (int)value);
-#endif
-
-  if (PRIV(is_vax) && check_section (abfd, 2))
-    return;
-
-  bfd_putl16 (value, PRIV(image_ptr));
-  PRIV(image_ptr) += 2;
-
-  return;
-}
-
-
-/* Write 4-byte long to image  */
-
-static void
-image_write_l (abfd, value)
-     bfd *abfd;
-     unsigned long value;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (6, "image_write_l (%08lx)\n", value);
-#endif
-
-  if (PRIV(is_vax) && check_section (abfd, 4))
-    return;
-
-  bfd_putl32 (value, PRIV(image_ptr));
-  PRIV(image_ptr) += 4;
-
-  return;
-}
-
-
-/* Write 8-byte quad to image  */
-
-static void
-image_write_q (abfd, value)
-     bfd *abfd;
-     uquad value;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (6, "image_write_q (%016lx)\n", value);
-#endif
-
-  if (PRIV(is_vax) && check_section (abfd, 8))
-    return;
-
-  bfd_putl64 (value, PRIV(image_ptr));
-  PRIV(image_ptr) += 8;
-
-  return;
-}
-
-
-#define HIGHBIT(op) ((op & 0x80000000L) == 0x80000000L)
-
-/* etir_sta
-  
-   vms stack commands
-  
-   handle sta_xxx commands in etir section
-   ptr points to data area in record
-  
-   see table B-8 of the openVMS linker manual  */
-
-static boolean
-etir_sta (abfd, cmd, ptr)
-     bfd *abfd;
-     int cmd;
-     unsigned char *ptr;
-{
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "etir_sta %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
-#endif
-
-  switch (cmd)
-    {
-      /* stack */
-
-      /* stack global
-	   arg: cs	symbol name
-
-	   stack 32 bit value of symbol (high bits set to 0)  */
-
-      case ETIR_S_C_STA_GBL:
-	{
-	  char *name;
-	  vms_symbol_entry *entry;
-
-	  name = _bfd_vms_save_counted_string (ptr);
-	  entry = (vms_symbol_entry *)
-		  bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-	  if (entry == (vms_symbol_entry *)NULL)
-	    {
-#if VMS_DEBUG
-	      _bfd_vms_debug (3, "ETIR_S_C_STA_GBL: no symbol \"%s\"\n", name);
-#endif
-	      _bfd_vms_push (abfd, (uquad)0, -1);
-	    }
-	  else
-	    {
-	      _bfd_vms_push (abfd, (uquad)(entry->symbol->value), -1);
-	    }
-	}
-      break;
-
-	/* stack longword
-	   arg: lw	value
-
-	   stack 32 bit value, sign extend to 64 bit  */
-
-      case ETIR_S_C_STA_LW:
-	_bfd_vms_push (abfd, (uquad)bfd_getl32 (ptr), -1);
-      break;
-
-	/* stack global
-	   arg: qw	value
-
-	   stack 64 bit value of symbol	 */
-
-      case ETIR_S_C_STA_QW:
-	_bfd_vms_push (abfd, (uquad)bfd_getl64(ptr), -1);
-      break;
-
-	/* stack psect base plus quadword offset
-	   arg: lw	section index
-	  	qw	signed quadword offset (low 32 bits)
-
-	   stack qw argument and section index
-	   (see ETIR_S_C_STO_OFF, ETIR_S_C_CTL_SETRB)  */
-
-      case ETIR_S_C_STA_PQ:
-  	{
-	  uquad dummy;
-	  int psect;
-
-	  psect = bfd_getl32 (ptr);
-	  if (psect >= PRIV(section_count))
-	    {
-	      (*_bfd_error_handler) (_("Bad section index in ETIR_S_C_STA_PQ"));
-	      bfd_set_error (bfd_error_bad_value);
-	      return false;
-	    }
-	  dummy = bfd_getl64 (ptr+4);
-	  _bfd_vms_push (abfd, dummy, psect);
-        }
-      break;
-
-	/* all not supported  */
-
-      case ETIR_S_C_STA_LI:
-      case ETIR_S_C_STA_MOD:
-      case ETIR_S_C_STA_CKARG:
-
-	(*_bfd_error_handler) (_("Unsupported STA cmd %d"), cmd);
-	return false;
-      break;
-
-      default:
-	(*_bfd_error_handler) (_("Reserved STA cmd %d"), cmd);
-	return false;
-      break;
-    }
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "etir_sta true\n");
-#endif
-  return true;
-}
-
-
-/*
-   etir_sto
-  
-   vms store commands
-  
-   handle sto_xxx commands in etir section
-   ptr points to data area in record
-  
-   see table B-9 of the openVMS linker manual  */
-
-static boolean
-etir_sto (abfd, cmd, ptr)
-     bfd *abfd;
-     int cmd;
-     unsigned char *ptr;
-{
-  uquad dummy;
-  int psect;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "etir_sto %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
-#endif
-
-  switch (cmd)
-    {
-
-      /* store byte: pop stack, write byte
-	 arg: -  */
-
-    case ETIR_S_C_STO_B:
-      dummy = _bfd_vms_pop (abfd, &psect);
-#if 0
-      if (is_share)		/* FIXME */
-	(*_bfd_error_handler) ("ETIR_S_C_STO_B: byte fixups not supported");
-#endif
-      image_write_b (abfd, dummy & 0xff);	/* FIXME: check top bits */
-      break;
-
-      /* store word: pop stack, write word
-	 arg: -  */
-
-    case ETIR_S_C_STO_W:
-      dummy = _bfd_vms_pop (abfd, &psect);
-#if 0
-      if (is_share)		/* FIXME */
-	(*_bfd_error_handler) ("ETIR_S_C_STO_B: word fixups not supported");
-#endif
-      image_write_w (abfd, dummy & 0xffff);	/* FIXME: check top bits */
-      break;
-
-      /* store longword: pop stack, write longword
-	 arg: -  */
-
-    case ETIR_S_C_STO_LW:
-      dummy = _bfd_vms_pop (abfd, &psect);
-      dummy += (PRIV(sections)[psect])->vma;
-      image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
-      break;
-
-      /* store quadword: pop stack, write quadword
-	 arg: -  */
-
-    case ETIR_S_C_STO_QW:
-      dummy = _bfd_vms_pop (abfd, &psect);
-      dummy += (PRIV(sections)[psect])->vma;
-      image_write_q (abfd, dummy);		/* FIXME: check top bits */
-      break;
-
-      /* store immediate repeated: pop stack for repeat count
-	 arg: lw	byte count
-	 da	data  */
-
-    case ETIR_S_C_STO_IMMR:
-      {
-	unsigned long size;
-
-	size = bfd_getl32 (ptr);
-	dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	while (dummy-- > 0L)
-	  image_dump (abfd, ptr+4, size, 0);
-      }
-      break;
-
-      /* store global: write symbol value
-	 arg: cs	global symbol name  */
-
-    case ETIR_S_C_STO_GBL:
-      {
-	vms_symbol_entry *entry;
-	char *name;
-
-	name = _bfd_vms_save_counted_string (ptr);
-	entry = (vms_symbol_entry *)bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-	if (entry == (vms_symbol_entry *)NULL)
-	  {
-	    (*_bfd_error_handler) (_("ETIR_S_C_STO_GBL: no symbol \"%s\""),
-				   name);
-	    return false;
-	  }
-	else
-	  image_write_q (abfd, (uquad)(entry->symbol->value));	/* FIXME, reloc */
-      }
-      break;
-
-      /* store code address: write address of entry point
-	 arg: cs	global symbol name (procedure)  */
-
-    case ETIR_S_C_STO_CA:
-      {
-	vms_symbol_entry *entry;
-	char *name;
-
-	name = _bfd_vms_save_counted_string (ptr);
-	entry = (vms_symbol_entry *) bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-	if (entry == (vms_symbol_entry *)NULL)
-	  {
-	    (*_bfd_error_handler) (_("ETIR_S_C_STO_CA: no symbol \"%s\""),
-				   name);
-	    return false;
-	  }
-	else
-	  image_write_q (abfd, (uquad)(entry->symbol->value));	/* FIXME, reloc */
-      }
-      break;
-
-      /* not supported  */
-
-    case ETIR_S_C_STO_RB:
-    case ETIR_S_C_STO_AB:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_RB/AB: Not supported"));
-      break;
-
-    /* store offset to psect: pop stack, add low 32 bits to base of psect
-       arg: -  */
-
-    case ETIR_S_C_STO_OFF:
-      {
-	uquad q;
-	int psect;
-
-	q = _bfd_vms_pop (abfd, &psect);
-	q += (PRIV(sections)[psect])->vma;
-	image_write_q (abfd, q);
-      }
-      break;
-
-      /* store immediate
-	 arg: lw	count of bytes
-	 da	data  */
-
-    case ETIR_S_C_STO_IMM:
-      {
-	int size;
-
-	size = bfd_getl32 (ptr);
-	image_dump (abfd, ptr+4, size, 0);
-      }
-      break;
-
-      /* this code is 'reserved to digital' according to the openVMS linker manual,
-	 however it is generated by the DEC C compiler and defined in the include file.
-	 FIXME, since the following is just a guess
-	 store global longword: store 32bit value of symbol
-	 arg: cs	symbol name  */
-
-    case ETIR_S_C_STO_GBL_LW:
-      {
-	vms_symbol_entry *entry;
-	char *name;
-
-	name = _bfd_vms_save_counted_string (ptr);
-	entry = (vms_symbol_entry *)bfd_hash_lookup (PRIV(vms_symbol_table), name, false, false);
-	if (entry == (vms_symbol_entry *)NULL)
-	  {
-#if VMS_DEBUG
-	    _bfd_vms_debug (3, "ETIR_S_C_STO_GBL_LW: no symbol \"%s\"\n", name);
-#endif
-	    image_write_l (abfd, (unsigned long)0);	/* FIXME, reloc */
-	  }
-	else
-	  image_write_l (abfd, (unsigned long)(entry->symbol->value));	/* FIXME, reloc */
-      }
-      break;
-
-      /* not supported  */
-
-    case ETIR_S_C_STO_LP_PSB:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_LP_PSB: Not supported"));
-      break;
-
-    /* */
-
-    case ETIR_S_C_STO_HINT_GBL:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_HINT_GBL: not implemented"));
-      break;
-
-    /* */
-
-    case ETIR_S_C_STO_HINT_PS:
-      (*_bfd_error_handler) (_("ETIR_S_C_STO_HINT_PS: not implemented"));
-      break;
-
-    default:
-      (*_bfd_error_handler) (_("Reserved STO cmd %d"), cmd);
-      break;
-    }
-
-  return true;
-}
-
-/* stack operator commands
-   all 32 bit signed arithmetic
-   all word just like a stack calculator
-   arguments are popped from stack, results are pushed on stack
-  
-   see table B-10 of the openVMS linker manual  */
-
-static boolean
-etir_opr (abfd, cmd, ptr)
-     bfd *abfd;
-     int cmd;
-     unsigned char *ptr;
-{
-  long op1, op2;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "etir_opr %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
-#endif
-
-  switch (cmd)
-    {
-      /* operation */
-
-      /* no-op  */
-
-    case ETIR_S_C_OPR_NOP:
-      break;
-
-      /* add  */
-
-    case ETIR_S_C_OPR_ADD:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 + op2), -1);
-      break;
-
-      /* subtract  */
-
-    case ETIR_S_C_OPR_SUB:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op2 - op1), -1);
-      break;
-
-      /* multiply  */
-
-    case ETIR_S_C_OPR_MUL:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 * op2), -1);
-      break;
-
-      /* divide  */
-
-    case ETIR_S_C_OPR_DIV:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      if (op2 == 0)
-	_bfd_vms_push (abfd, (uquad)0L, -1);
-      else
-	_bfd_vms_push (abfd, (uquad)(op2 / op1), -1);
-      break;
-
-      /* logical and  */
-
-    case ETIR_S_C_OPR_AND:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 & op2), -1);
-      break;
-
-      /* logical inclusive or	 */
-
-    case ETIR_S_C_OPR_IOR:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 | op2), -1);
-      break;
-
-      /* logical exclusive or  */
-
-    case ETIR_S_C_OPR_EOR:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 ^ op2), -1);
-      break;
-
-      /* negate  */
-
-    case ETIR_S_C_OPR_NEG:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(-op1), -1);
-      break;
-
-      /* complement  */
-
-    case ETIR_S_C_OPR_COM:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      _bfd_vms_push (abfd, (uquad)(op1 ^ -1L), -1);
-      break;
-
-      /* insert field  */
-
-    case ETIR_S_C_OPR_INSV:
-      (void)_bfd_vms_pop (abfd, NULL);
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_INSV: Not supported"));
-      break;
-
-    /* arithmetic shift  */
-
-    case ETIR_S_C_OPR_ASH:
-      op1 = (long)_bfd_vms_pop (abfd, NULL);
-      op2 = (long)_bfd_vms_pop (abfd, NULL);
-      if (op2 < 0)		/* shift right */
-	op1 >>= -op2;
-      else			/* shift left */
-	op1 <<= op2;
-      _bfd_vms_push (abfd, (uquad)op1, -1);
-      break;
-
-      /* unsigned shift  */
-
-    case ETIR_S_C_OPR_USH:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_USH: Not supported"));
-      break;
-
-      /* rotate  */
-
-    case ETIR_S_C_OPR_ROT:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_ROT: Not supported"));
-      break;
-
-      /* select  */
-
-    case ETIR_S_C_OPR_SEL:
-      if ((long)_bfd_vms_pop (abfd, NULL) & 0x01L)
-	(void)_bfd_vms_pop (abfd, NULL);
-      else
-	{
-	  op1 = (long)_bfd_vms_pop (abfd, NULL);
-	  (void)_bfd_vms_pop (abfd, NULL);
-	  _bfd_vms_push (abfd, (uquad)op1, -1);
-	}
-      break;
-
-      /* redefine symbol to current location  */
-
-    case ETIR_S_C_OPR_REDEF:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_REDEF: Not supported"));
-      break;
-
-      /* define a literal  */
-
-    case ETIR_S_C_OPR_DFLIT:
-      (*_bfd_error_handler) (_("ETIR_S_C_OPR_DFLIT: Not supported"));
-      break;
-
-    default:
-      (*_bfd_error_handler) (_("Reserved OPR cmd %d"), cmd);
-      break;
-    }
-
-  return true;
-}
-
-
-/* control commands
-  
-   see table B-11 of the openVMS linker manual  */
-
-static boolean
-etir_ctl (abfd, cmd, ptr)
-     bfd *abfd;
-     int cmd;
-     unsigned char *ptr;
-{
-  uquad	 dummy;
-  int psect;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "etir_ctl %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
-#endif
-
-  switch (cmd)
-    {
-      /* set relocation base: pop stack, set image location counter
-	 arg: -  */
-
-    case ETIR_S_C_CTL_SETRB:
-      dummy = _bfd_vms_pop (abfd, &psect);
-      image_set_ptr (abfd, psect, dummy);
-      break;
-
-      /* augment relocation base: increment image location counter by offset
-	 arg: lw	offset value  */
-
-    case ETIR_S_C_CTL_AUGRB:
-      dummy = bfd_getl32 (ptr);
-      image_inc_ptr (abfd, dummy);
-      break;
-
-      /* define location: pop index, save location counter under index
-	 arg: -  */
-
-    case ETIR_S_C_CTL_DFLOC:
-      dummy = _bfd_vms_pop (abfd, NULL);
-      /* FIXME */
-      break;
-
-      /* set location: pop index, restore location counter from index
-	 arg: -  */
-
-    case ETIR_S_C_CTL_STLOC:
-      dummy = _bfd_vms_pop (abfd, &psect);
-      /* FIXME */
-      break;
-
-      /* stack defined location: pop index, push location counter from index
-	 arg: -  */
-
-    case ETIR_S_C_CTL_STKDL:
-      dummy = _bfd_vms_pop (abfd, &psect);
-      /* FIXME */
-      break;
-
-    default:
-      (*_bfd_error_handler) (_("Reserved CTL cmd %d"), cmd);
-      break;
-    }
-  return true;
-}
-
-
-/* store conditional commands
-  
-   see table B-12 and B-13 of the openVMS linker manual  */
-
-static boolean
-etir_stc (abfd, cmd, ptr)
-     bfd *abfd;
-     int cmd;
-     unsigned char *ptr;
-{
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "etir_stc %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
-#endif
-
-  switch (cmd)
-    {
-      /* 200 Store-conditional Linkage Pair
-	 arg:  */
-
-    case ETIR_S_C_STC_LP:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_LP: not supported"));
-      break;
-
-      /* 201 Store-conditional Linkage Pair with Procedure Signature
-	 arg:	lw	linkage index
-	 cs	procedure name
-	 by	signature length
-	 da	signature  */
-
-    case ETIR_S_C_STC_LP_PSB:
-      image_inc_ptr (abfd, 16);	/* skip entry,procval */
-      break;
-
-      /* 202 Store-conditional Address at global address
-	 arg:	lw	linkage index
-	 cs	global name  */
-
-    case ETIR_S_C_STC_GBL:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_GBL: not supported"));
-      break;
-
-      /* 203 Store-conditional Code Address at global address
-	 arg:	lw	linkage index
-	 cs	procedure name  */
-
-    case ETIR_S_C_STC_GCA:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_GCA: not supported"));
-      break;
-
-      /* 204 Store-conditional Address at psect + offset
-	 arg:	lw	linkage index
-	 lw	psect index
-	 qw	offset  */
-
-    case ETIR_S_C_STC_PS:
-      (*_bfd_error_handler) (_("ETIR_S_C_STC_PS: not supported"));
-      break;
-
-      /* 205 Store-conditional NOP at address of global
-	 arg:  */
-
-    case ETIR_S_C_STC_NOP_GBL:
-
-      /* 206 Store-conditional NOP at pect + offset
-	 arg:  */
-
-    case ETIR_S_C_STC_NOP_PS:
-
-      /* 207 Store-conditional BSR at global address
-	 arg:  */
-
-    case ETIR_S_C_STC_BSR_GBL:
-
-      /* 208 Store-conditional BSR at pect + offset
-	 arg:  */
-
-    case ETIR_S_C_STC_BSR_PS:
-
-      /* 209 Store-conditional LDA at global address
-	 arg:  */
-
-    case ETIR_S_C_STC_LDA_GBL:
-
-      /* 210 Store-conditional LDA at psect + offset
-	 arg:  */
-
-    case ETIR_S_C_STC_LDA_PS:
-
-      /* 211 Store-conditional BSR or Hint at global address
-	 arg:  */
-
-    case ETIR_S_C_STC_BOH_GBL:
-
-      /* 212 Store-conditional BSR or Hint at pect + offset
-	 arg:  */
-
-    case ETIR_S_C_STC_BOH_PS:
-
-      /* 213 Store-conditional NOP,BSR or HINT at global address
-	 arg:  */
-
-    case ETIR_S_C_STC_NBH_GBL:
-
-      /* 214 Store-conditional NOP,BSR or HINT at psect + offset
-	 arg:  */
-
-    case ETIR_S_C_STC_NBH_PS:
-/* FIXME     (*_bfd_error_handler) ("ETIR_S_C_STC_xx: (%d) not supported", cmd); */
-      break;
-
-    default:
-#if VMS_DEBUG
-      _bfd_vms_debug (3,  "Reserved STC cmd %d", cmd);
-#endif
-      break;
-    }
-  return true;
-}
-
-
-static asection *
-new_section (abfd, idx)
-     bfd *abfd;
-     int idx;
-{
-  asection *section;
-  char sname[16];
-  char *name;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5,  "new_section %d\n", idx);
-#endif
-  sprintf (sname, SECTION_NAME_TEMPLATE, idx);
-
-  name = bfd_malloc (strlen (sname) + 1);
-  if (name == 0)
-    return 0;
-  strcpy (name, sname);
-
-  section = bfd_malloc (sizeof (asection));
-  if (section == 0)
-    {
-#if VMS_DEBUG
-      _bfd_vms_debug (6,  "bfd_make_section (%s) failed", name);
-#endif
-      return 0;
-    }
-
-  section->_raw_size = 0;
-  section->vma = 0;
-  section->contents = 0;
-  section->_cooked_size = 0;
-  section->name = name;
-  section->index = idx;
-
-  return section;
-}
-
-
-static int
-alloc_section (abfd, idx)
-     bfd *abfd;
-     int idx;
-{
-  asection *section;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (4,  "alloc_section %d\n", idx);
-#endif
-
-  PRIV(sections) = ((asection **)
-		    bfd_realloc (PRIV(sections), (idx+1) * sizeof (asection *)));
-  if (PRIV(sections) == 0)
-    return -1;
-
-  while (PRIV(section_count) <= idx)
-    {
-      PRIV(sections)[PRIV(section_count)] = new_section (abfd, PRIV(section_count));
-      if (PRIV(sections)[PRIV(section_count)] == 0)
-	return -1;
-      PRIV(section_count)++;
-    }
-
-  return 0;
-}
-
-
-/*
- * tir_sta
- *
- * vax stack commands
- *
- * handle sta_xxx commands in tir section
- * ptr points to data area in record
- *
- * see table 7-3 of the VAX/VMS linker manual
- */
-
-static unsigned char *
-tir_sta (bfd *abfd, unsigned char *ptr)
-{
-  int cmd = *ptr++;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "tir_sta %d\n", cmd);
-#endif
-
-  switch (cmd)
-    {
-  /* stack */
-      case TIR_S_C_STA_GBL:
-	/*
-	 * stack global
-	 * arg: cs	symbol name
-	 *
-	 * stack 32 bit value of symbol (high bits set to 0)
-	 */
-	{
-	  char *name;
-	  vms_symbol_entry *entry;
-
-	  name = _bfd_vms_save_counted_string (ptr);
-
-          entry = _bfd_vms_enter_symbol (abfd, name);
-	  if (entry == (vms_symbol_entry *)NULL)
-	    return 0;
-
-	  _bfd_vms_push (abfd, (unsigned long)(entry->symbol->value), -1);
-	  ptr += *ptr + 1;
-	}
-      break;
-
-      case TIR_S_C_STA_SB:
-	/*
-	 * stack signed byte
-	 * arg: by	value
-	 *
-	 * stack byte value, sign extend to 32 bit
-	 */
-	_bfd_vms_push (abfd, (long)*ptr++, -1);
-      break;
-
-      case TIR_S_C_STA_SW:
-	/*
-	 * stack signed short word
-	 * arg: sh	value
-	 *
-	 * stack 16 bit value, sign extend to 32 bit
-	 */
-	_bfd_vms_push (abfd, (long)bfd_getl16(ptr), -1);
-	ptr += 2;
-      break;
-
-      case TIR_S_C_STA_LW:
-	/*
-	 * stack signed longword
-	 * arg: lw	value
-	 *
-	 * stack 32 bit value
-	 */
-	_bfd_vms_push (abfd, (long)bfd_getl32 (ptr), -1);
-	ptr += 4;
-      break;
-
-      case TIR_S_C_STA_PB:
-      case TIR_S_C_STA_WPB:
-	/*
-	 * stack psect base plus byte offset (word index)
-	 * arg: by	section index
-	 *	(sh	section index)
-	 *	by	signed byte offset
-	 *
-	 */
-  	{
-	  unsigned long dummy;
-	  int psect;
-
-	  if (cmd == TIR_S_C_STA_PB)
-	    psect = *ptr++;
-	  else
-	    {
-	      psect = bfd_getl16(ptr);
-	      ptr += 2;
-	    }
-
-	  if (psect >= PRIV(section_count))
-	    {
-	      alloc_section (abfd, psect);
-	    }
-
-	  dummy = (long)*ptr++;
-	  dummy += (PRIV(sections)[psect])->vma;
-	  _bfd_vms_push (abfd, dummy, psect);
-        }
-      break;
-
-      case TIR_S_C_STA_PW:
-      case TIR_S_C_STA_WPW:
-	/*
-	 * stack psect base plus word offset (word index)
-	 * arg: by	section index
-	 *	(sh	section index)
-	 *	sh	signed short offset
-	 *
-	 */
-  	{
-	  unsigned long dummy;
-	  int psect;
-
-	  if (cmd == TIR_S_C_STA_PW)
-	    psect = *ptr++;
-	  else
-	    {
-	      psect = bfd_getl16(ptr);
-	      ptr += 2;
-	    }
-
-	  if (psect >= PRIV(section_count))
-	    {
-	      alloc_section (abfd, psect);
-	    }
-
-	  dummy = bfd_getl16(ptr); ptr+=2;
-	  dummy += (PRIV(sections)[psect])->vma;
-	  _bfd_vms_push (abfd, dummy, psect);
-        }
-      break;
-
-      case TIR_S_C_STA_PL:
-      case TIR_S_C_STA_WPL:
-	/*
-	 * stack psect base plus long offset (word index)
-	 * arg: by	section index
-	 *	(sh	section index)
-	 *	lw	signed longword offset
-	 *
-	 */
-  	{
-	  unsigned long dummy;
-	  int psect;
-
-	  if (cmd == TIR_S_C_STA_PL)
-	    psect = *ptr++;
-	  else
-	    {
-	      psect = bfd_getl16(ptr);
-	      ptr += 2;
-	    }
-
-	  if (psect >= PRIV(section_count))
-	    {
-	      alloc_section (abfd, psect);
-	    }
-
-	  dummy = bfd_getl32 (ptr); ptr += 4;
-	  dummy += (PRIV(sections)[psect])->vma;
-	  _bfd_vms_push (abfd, dummy, psect);
-        }
-      break;
-
-      case TIR_S_C_STA_UB:
-	/*
-	 * stack unsigned byte
-	 * arg: by	value
-	 *
-	 * stack byte value
-	 */
-	_bfd_vms_push (abfd, (unsigned long)*ptr++, -1);
-      break;
-
-      case TIR_S_C_STA_UW:
-	/*
-	 * stack unsigned short word
-	 * arg: sh	value
-	 *
-	 * stack 16 bit value
-	 */
-	_bfd_vms_push (abfd, (unsigned long)bfd_getl16(ptr), -1);
-	ptr += 2;
-      break;
-
-      case TIR_S_C_STA_BFI:
-	/*
-	 * stack byte from image
-	 * arg: -
-	 *
-	 */
-	/*FALLTHRU*/
-      case TIR_S_C_STA_WFI:
-	/*
-	 * stack byte from image
-	 * arg: -
-	 *
-	 */
-	/*FALLTHRU*/
-      case TIR_S_C_STA_LFI:
-	/*
-	 * stack byte from image
-	 * arg: -
-	 *
-	 */
-        (*_bfd_error_handler) (_("Stack-from-image not implemented"));
-	return NULL;
-
-      case TIR_S_C_STA_EPM:
-	/*
-	 * stack entry point mask
-	 * arg: cs	symbol name
-	 *
-	 * stack (unsigned) entry point mask of symbol
-	 * err if symbol is no entry point
-	 */
-	{
-	  char *name;
-	  vms_symbol_entry *entry;
-
-	  name = _bfd_vms_save_counted_string (ptr);
-	  entry = _bfd_vms_enter_symbol (abfd, name);
-	  if (entry == (vms_symbol_entry *)NULL)
-	    return 0;
-
-          (*_bfd_error_handler) (_("Stack-entry-mask not fully implemented"));
-	  _bfd_vms_push (abfd, 0L, -1);
-	  ptr += *ptr + 1;
-	}
-      break;
-
-      case TIR_S_C_STA_CKARG:
-	/*
-	 * compare procedure argument
-	 * arg: cs	symbol name
-	 *	by	argument index
-	 *	da	argument descriptor
-	 *
-	 * compare argument descriptor with symbol argument (ARG$V_PASSMECH)
-	 * and stack TRUE (args match) or FALSE (args dont match) value
-	 */
-        (*_bfd_error_handler) (_("PASSMECH not fully implemented"));
-	_bfd_vms_push (abfd, 1L, -1);
-	break;
-
-      case TIR_S_C_STA_LSY:
-	/*
-	 * stack local symbol value
-	 * arg:	sh	environment index
-	 *	cs	symbol name
-	 */
-	{
-	  int envidx;
-	  char *name;
-	  vms_symbol_entry *entry;
-
-	  envidx = bfd_getl16(ptr); ptr += 2;
-	  name = _bfd_vms_save_counted_string (ptr);
-	  entry = _bfd_vms_enter_symbol (abfd, name);
-	  if (entry == (vms_symbol_entry *)NULL)
-	    return 0;
-          (*_bfd_error_handler) (_("Stack-local-symbol not fully implemented"));
-	  _bfd_vms_push (abfd, 0L, -1);
-	  ptr += *ptr + 1;
-	}
-      break;
-
-      case TIR_S_C_STA_LIT:
-	/*
-	 * stack literal
- 	 * arg:	by	literal index
-	 *
-	 * stack literal
-	 */
-	ptr++;
-	_bfd_vms_push (abfd, 0L, -1);
-	(*_bfd_error_handler) (_("Stack-literal not fully implemented"));
-	break;
-
-      case TIR_S_C_STA_LEPM:
-	/*
-	 * stack local symbol entry point mask
-	 * arg:	sh	environment index
-	 *	cs	symbol name
-	 *
-	 * stack (unsigned) entry point mask of symbol
-	 * err if symbol is no entry point
-	 */
-	{
-	  int envidx;
-	  char *name;
-	  vms_symbol_entry *entry;
-
-	  envidx = bfd_getl16(ptr); ptr += 2;
-	  name = _bfd_vms_save_counted_string (ptr);
-	  entry = _bfd_vms_enter_symbol (abfd, name);
-	  if (entry == (vms_symbol_entry *)NULL)
-	    return 0;
-	  (*_bfd_error_handler) (_("Stack-local-symbol-entry-point-mask not fully implemented"));
-	  _bfd_vms_push (abfd, 0L, -1);
-	  ptr += *ptr + 1;
-	}
-      break;
-
-      default:
-	(*_bfd_error_handler) (_("Reserved STA cmd %d"), ptr[-1]);
-	return NULL;
-      break;
-  }
-
-  return ptr;
-}
-
-
-/*
- * tir_sto
- *
- * vax store commands
- *
- * handle sto_xxx commands in tir section
- * ptr points to data area in record
- *
- * see table 7-4 of the VAX/VMS linker manual
- */
-
-static unsigned char *
-tir_sto (bfd *abfd, unsigned char *ptr)
-{
-  unsigned long dummy;
-  int size;
-  int psect;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "tir_sto %d\n", *ptr);
-#endif
-
-  switch (*ptr++)
-    {
-      case TIR_S_C_STO_SB:
-	/*
-	 * store signed byte: pop stack, write byte
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	image_write_b (abfd, dummy & 0xff);	/* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_SW:
-	/*
-	 * store signed word: pop stack, write word
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	image_write_w (abfd, dummy & 0xffff);	/* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_LW:
-	/*
-	 * store longword: pop stack, write longword
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_BD:
-	/*
-	 * store byte displaced: pop stack, sub lc+1, write byte
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	dummy -= ((PRIV(sections)[psect])->vma + 1);
-	image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
-      break;
-
-      case TIR_S_C_STO_WD:
-	/*
-	 * store word displaced: pop stack, sub lc+2, write word
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	dummy -= ((PRIV(sections)[psect])->vma + 2);
-	image_write_w (abfd, dummy & 0xffff);/* FIXME: check top bits */
-      break;
-      case TIR_S_C_STO_LD:
-	/*
-	 * store long displaced: pop stack, sub lc+4, write long
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	dummy -= ((PRIV(sections)[psect])->vma + 4);
-	image_write_l (abfd, dummy & 0xffffffff);/* FIXME: check top bits */
-      break;
-      case TIR_S_C_STO_LI:
-	/*
-	 * store short literal: pop stack, write byte
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	image_write_b (abfd, dummy & 0xff);/* FIXME: check top bits */
-      break;
-      case TIR_S_C_STO_PIDR:
-	/*
-	 * store position independent data reference: pop stack, write longword
-	 * arg: -
-	 * FIXME: incomplete !
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	image_write_l (abfd, dummy & 0xffffffff);
-      break;
-      case TIR_S_C_STO_PICR:
-	/*
-	 * store position independent code reference: pop stack, write longword
-	 * arg: -
-	 * FIXME: incomplete !
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	image_write_b (abfd, 0x9f);
-	image_write_l (abfd, dummy & 0xffffffff);
-      break;
-      case TIR_S_C_STO_RIVB:
-	/*
-	 * store repeated immediate variable bytes
-	 * 1-byte count n field followed by n bytes of data
-	 * pop stack, write n bytes <stack> times
-	 */
-	size = *ptr++;
-	dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	while (dummy-- > 0L)
-	  image_dump (abfd, ptr, size, 0);
-	ptr += size;
-	break;
-      case TIR_S_C_STO_B:
-	/*
-	 * store byte from top longword
-	 */
-	dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	image_write_b (abfd, dummy & 0xff);
-	break;
-      case TIR_S_C_STO_W:
-	/*
-	 * store word from top longword
-	 */
-	dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	image_write_w (abfd, dummy & 0xffff);
-	break;
-      case TIR_S_C_STO_RB:
-	/*
-	 * store repeated byte from top longword
-	 */
-	size = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	while (size-- > 0)
-	  image_write_b (abfd, dummy & 0xff);
-	break;
-      case TIR_S_C_STO_RW:
-	/*
-	 * store repeated word from top longword
-	 */
-	size = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	dummy = (unsigned long)_bfd_vms_pop (abfd, NULL);
-	while (size-- > 0)
-	  image_write_w (abfd, dummy & 0xffff);
-	break;
-
-      case TIR_S_C_STO_RSB:
-      case TIR_S_C_STO_RSW:
-      case TIR_S_C_STO_RL:
-      case TIR_S_C_STO_VPS:
-      case TIR_S_C_STO_USB:
-      case TIR_S_C_STO_USW:
-      case TIR_S_C_STO_RUB:
-      case TIR_S_C_STO_RUW:
-      case TIR_S_C_STO_PIRR:
-	(*_bfd_error_handler) (_("Unimplemented STO cmd %d"), ptr[-1]);
-      break;
-
-      default:
-	(*_bfd_error_handler) (_("Reserved STO cmd %d"), ptr[-1]);
-      break;
-  }
-
-  return ptr;
-}
-
-
-/*
- * stack operator commands
- * all 32 bit signed arithmetic
- * all word just like a stack calculator
- * arguments are popped from stack, results are pushed on stack
- *
- * see table 7-5 of the VAX/VMS linker manual
- */
-
-static unsigned char *
-tir_opr (bfd *abfd, unsigned char *ptr)
-{
-  long op1, op2;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "tir_opr %d\n", *ptr);
-#endif
-
-  switch (*ptr++)
-    {
-  /* operation */
-      case TIR_S_C_OPR_NOP:
-	/*
-	 * no-op
-	 */
-      break;
-
-      case TIR_S_C_OPR_ADD:
-	/*
-	 * add
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(op1 + op2), -1);
-      break;
-
-      case TIR_S_C_OPR_SUB:
-	/*
-	 * subtract
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(op2 - op1), -1);
-      break;
-
-      case TIR_S_C_OPR_MUL:
-	/*
-	 * multiply
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(op1 * op2), -1);
-      break;
-
-      case TIR_S_C_OPR_DIV:
-	/*
-	 * divide
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	if (op2 == 0)
-	  _bfd_vms_push (abfd, (unsigned long)0L, -1);
-	else
-	  _bfd_vms_push (abfd, (unsigned long)(op2 / op1), -1);
-      break;
-
-      case TIR_S_C_OPR_AND:
-	/*
-	 * logical and
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(op1 & op2), -1);
-      break;
-
-      case TIR_S_C_OPR_IOR:
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	/*
-	 * logical inclusive or
-	 */
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(op1 | op2), -1);
-      break;
-
-      case TIR_S_C_OPR_EOR:
-	/*
-	 * logical exclusive or
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(op1 ^ op2), -1);
-      break;
-
-      case TIR_S_C_OPR_NEG:
-	/*
-	 * negate
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(-op1), -1);
-      break;
-
-      case TIR_S_C_OPR_COM:
-	/*
-	 * complement
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	_bfd_vms_push (abfd, (unsigned long)(op1 ^ -1L), -1);
-      break;
-
-      case TIR_S_C_OPR_INSV:
-	/*
-	 * insert field
-	 */
-	(void)_bfd_vms_pop (abfd, NULL);
-	(*_bfd_error_handler)  ("TIR_S_C_OPR_INSV incomplete");
-      break;
-
-      case TIR_S_C_OPR_ASH:
-	/*
-	 * arithmetic shift
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	if (HIGHBIT(op1))		/* shift right */
-	  op2 >>= op1;
-	else			/* shift left */
-	  op2 <<= op1;
-	_bfd_vms_push (abfd, (unsigned long)op2, -1);
-	(*_bfd_error_handler) (_("TIR_S_C_OPR_ASH incomplete"));
-      break;
-
-      case TIR_S_C_OPR_USH:
-	/*
-	 * unsigned shift
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	if (HIGHBIT(op1))		/* shift right */
-	  op2 >>= op1;
-	else			/* shift left */
-	  op2 <<= op1;
-	_bfd_vms_push (abfd, (unsigned long)op2, -1);
-	(*_bfd_error_handler) (_("TIR_S_C_OPR_USH incomplete"));
-      break;
-
-      case TIR_S_C_OPR_ROT:
-	/*
-	 * rotate
-	 */
-	op1 = (long)_bfd_vms_pop (abfd, NULL);
-	op2 = (long)_bfd_vms_pop (abfd, NULL);
-	if (HIGHBIT(0))		/* shift right */
-	  op2 >>= op1;
-	else			/* shift left */
-	  op2 <<= op1;
-	_bfd_vms_push (abfd, (unsigned long)op2, -1);
-	(*_bfd_error_handler) (_("TIR_S_C_OPR_ROT incomplete"));
-      break;
-
-      case TIR_S_C_OPR_SEL:
-	/*
-	 * select
-	 */
-	if ((long)_bfd_vms_pop (abfd, NULL) & 0x01L)
-	  (void)_bfd_vms_pop (abfd, NULL);
-	else
-	  {
-	    op1 = (long)_bfd_vms_pop (abfd, NULL);
-	    (void)_bfd_vms_pop (abfd, NULL);
-	    _bfd_vms_push (abfd, (unsigned long)op1, -1);
-	  }
-      break;
-
-      case TIR_S_C_OPR_REDEF:
-	/*
-	 * redefine symbol to current location
-	 */
-	(*_bfd_error_handler) (_("TIR_S_C_OPR_REDEF not supported"));
-      break;
-
-      case TIR_S_C_OPR_DFLIT:
-	/*
-	 * define a literal
-	 */
-	(*_bfd_error_handler) (_("TIR_S_C_OPR_DFLIT not supported"));
-      break;
-
-      default:
-	(*_bfd_error_handler) (_("Reserved OPR cmd %d"), ptr[-1]);
-      break;
-    }
-
-  return ptr;
-}
-
-
-static unsigned char *
-tir_ctl (bfd *abfd, unsigned char *ptr)
-/*
- * control commands
- *
- * see table 7-6 of the VAX/VMS linker manual
- */
-{
-  unsigned long dummy;
-  int psect;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (5, "tir_ctl %d\n", *ptr);
-#endif
-
-  switch (*ptr++)
-    {
-      case TIR_S_C_CTL_SETRB:
-	/*
-	 * set relocation base: pop stack, set image location counter
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	if (psect >= PRIV(section_count))
-	  {
-	    alloc_section (abfd, psect);
-	  }
-	image_set_ptr (abfd, psect, dummy);
-      break;
-      case TIR_S_C_CTL_AUGRB:
-	/*
-	 * augment relocation base: increment image location counter by offset
-	 * arg: lw	offset value
-	 */
-	dummy = bfd_getl32 (ptr);
-	image_inc_ptr (abfd, dummy);
-      break;
-      case TIR_S_C_CTL_DFLOC:
-	/*
-	 * define location: pop index, save location counter under index
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, NULL);
-	(*_bfd_error_handler) (_("TIR_S_C_CTL_DFLOC not fully implemented"));
-      break;
-      case TIR_S_C_CTL_STLOC:
-	/*
-	 * set location: pop index, restore location counter from index
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	(*_bfd_error_handler) (_("TIR_S_C_CTL_STLOC not fully implemented"));
-      break;
-    case TIR_S_C_CTL_STKDL:
-	/*
-	 * stack defined location: pop index, push location counter from index
-	 * arg: -
-	 */
-	dummy = _bfd_vms_pop (abfd, &psect);
-	(*_bfd_error_handler) (_("TIR_S_C_CTL_STKDL not fully implemented"));
-      break;
-    default:
-        (*_bfd_error_handler) (_("Reserved CTL cmd %d"), ptr[-1]);
-	break;
-  }
-  return ptr;
-}
-
-
-/*
- * handle command from TIR section
- */
-
-static unsigned char *
-tir_cmd (bfd *abfd, unsigned char *ptr)
-{
-  struct {
-    int mincod;
-    int maxcod;
-    unsigned char * (*explain)(bfd *, unsigned char *);
-  } tir_table[] = {
-    { 0,		 TIR_S_C_MAXSTACOD, tir_sta }
-   ,{ TIR_S_C_MINSTOCOD, TIR_S_C_MAXSTOCOD, tir_sto }
-   ,{ TIR_S_C_MINOPRCOD, TIR_S_C_MAXOPRCOD, tir_opr }
-   ,{ TIR_S_C_MINCTLCOD, TIR_S_C_MAXCTLCOD, tir_ctl }
-   ,{ -1, -1, NULL }
-  };
-  int i = 0;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (4, "tir_cmd %d/%x\n", *ptr, *ptr);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
-#endif
-
-  if (*ptr & 0x80)				/* store immediate */
-    {
-      i = 128 - (*ptr++ & 0x7f);
-      image_dump (abfd, ptr, i, 0);
-      ptr += i;
-    }
-  else
-    {
-      while (tir_table[i].mincod >= 0)
-	{
-	  if ( (tir_table[i].mincod <= *ptr) 
-	    && (*ptr <= tir_table[i].maxcod))
-	    {
-	      ptr = tir_table[i].explain (abfd, ptr);
-	      break;
-	    }
-	  i++;
-	}
-      if (tir_table[i].mincod < 0)
-	{
-	  (*_bfd_error_handler) (_("Obj code %d not found"), *ptr);
-	  ptr = 0;
-	}
-    }
-
-  return ptr;
-}
-
-
-/* handle command from ETIR section  */
-
-static int
-etir_cmd (abfd, cmd, ptr)
-     bfd *abfd;
-     int cmd;
-     unsigned char *ptr;
-{
-  static struct {
-    int mincod;
-    int maxcod;
-    boolean (*explain) PARAMS((bfd *, int, unsigned char *));
-  } etir_table[] = {
-    { ETIR_S_C_MINSTACOD, ETIR_S_C_MAXSTACOD, etir_sta },
-    { ETIR_S_C_MINSTOCOD, ETIR_S_C_MAXSTOCOD, etir_sto },
-    { ETIR_S_C_MINOPRCOD, ETIR_S_C_MAXOPRCOD, etir_opr },
-    { ETIR_S_C_MINCTLCOD, ETIR_S_C_MAXCTLCOD, etir_ctl },
-    { ETIR_S_C_MINSTCCOD, ETIR_S_C_MAXSTCCOD, etir_stc },
-    { -1, -1, NULL }
-  };
-
-  int i = 0;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (4, "etir_cmd %d/%x\n", cmd, cmd);
-  _bfd_hexdump (8, ptr, 16, (int)ptr);
-#endif
-
-  while (etir_table[i].mincod >= 0)
-    {
-      if ( (etir_table[i].mincod <= cmd) 
-	&& (cmd <= etir_table[i].maxcod))
-	{
-	  if (!etir_table[i].explain (abfd, cmd, ptr))
-	    return -1;
-	  break;
-	}
-      i++;
-    }
-
-#if VMS_DEBUG
-  _bfd_vms_debug (4, "etir_cmd: = 0\n");
-#endif
-  return 0;
-}
-
-
-/* Text Information and Relocation Records (OBJ$C_TIR)
-   handle tir record  */
-
-static int
-analyze_tir (abfd, ptr, length)
-     bfd *abfd;
-     unsigned char *ptr;
-     unsigned int length;
-{
-  unsigned char *maxptr;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (3, "analyze_tir: %d bytes\n", length);
-#endif
-
-  maxptr = ptr + length;
-
-  while (ptr < maxptr)
-    {
-      ptr = tir_cmd (abfd, ptr);
-      if (ptr == 0)
-	return -1;
-    }
-
-  return 0;
-}
-
-
-/* Text Information and Relocation Records (EOBJ$C_ETIR)
-   handle etir record  */
-
-static int
-analyze_etir (abfd, ptr, length)
-     bfd *abfd;
-     unsigned char *ptr;
-     unsigned int length;
-{
-  int cmd;
-  unsigned char *maxptr;
-  int result = 0;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (3, "analyze_etir: %d bytes\n", length);
-#endif
-
-  maxptr = ptr + length;
-
-  while (ptr < maxptr)
-    {
-      cmd = bfd_getl16 (ptr);
-      length = bfd_getl16 (ptr + 2);
-      result = etir_cmd (abfd, cmd, ptr+4);
-      if (result != 0)
-	break;
-      ptr += length;
-    }
-
-#if VMS_DEBUG
-  _bfd_vms_debug (3, "analyze_etir: = %d\n", result);
-#endif
-
-  return result;
-}
-
-
-/* process ETIR record
-  
-   return 0 on success, -1 on error  */
-
-int
-_bfd_vms_slurp_tir (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-  int result;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (2, "TIR/ETIR\n");
-#endif
-
-  switch (objtype)
-    {
-      case EOBJ_S_C_ETIR:
-	PRIV(vms_rec) += 4;	/* skip type, size */
-	PRIV(rec_size) -= 4;
-	result = analyze_etir (abfd, PRIV(vms_rec), PRIV(rec_size));
-	break;
-      case OBJ_S_C_TIR:
-	PRIV(vms_rec) += 1;	/* skip type */
-	PRIV(rec_size) -= 1;
-	result = analyze_tir (abfd, PRIV(vms_rec), PRIV(rec_size));
-	break;
-      default:
-	result = -1;
-	break;
-    }
-
-  return result;
-}
-
-
-/* process EDBG record
-   return 0 on success, -1 on error
-  
-   not implemented yet  */
-
-int
-_bfd_vms_slurp_dbg (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (2, "DBG/EDBG\n");
-#endif
-
-  abfd->flags |= (HAS_DEBUG | HAS_LINENO);
-  return 0;
-}
-
-
-/* process ETBT record
-   return 0 on success, -1 on error
-  
-   not implemented yet  */
-
-int
-_bfd_vms_slurp_tbt (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (2, "TBT/ETBT\n");
-#endif
-
-  return 0;
-}
-
-
-/* process LNK record
-   return 0 on success, -1 on error
-  
-   not implemented yet  */
-
-int
-_bfd_vms_slurp_lnk (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (2, "LNK\n");
-#endif
-
-  return 0;
-}
-
-/*----------------------------------------------------------------------*/
-/*									*/
-/*	WRITE ETIR SECTION						*/
-/*									*/
-/*	this is still under construction and therefore not documented	*/
-/*									*/
-/*----------------------------------------------------------------------*/
-
-static void start_etir_record PARAMS ((bfd *abfd, int index, uquad offset, boolean justoffset));
-static void sto_imm PARAMS ((bfd *abfd, vms_section *sptr, bfd_vma vaddr, int index));
-static void end_etir_record PARAMS ((bfd *abfd));
-
-static void
-sto_imm (abfd, sptr, vaddr, index)
-     bfd *abfd;
-     vms_section *sptr;
-     bfd_vma vaddr;
-     int index;
-{
-  int size;
-  int ssize;
-  unsigned char *cptr;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (8, "sto_imm %d bytes\n", sptr->size);
-  _bfd_hexdump (9, sptr->contents, (int)sptr->size, (int)vaddr);
-#endif
-
-  ssize = sptr->size;
-  cptr = sptr->contents;
-
-  while (ssize > 0)
-    {
-
-      size = ssize;				/* try all the rest */
-
-      if (_bfd_vms_output_check (abfd, size) < 0)
-	{					/* doesn't fit, split ! */
-	  end_etir_record (abfd);
-	  start_etir_record (abfd, index, vaddr, false);
-	  size = _bfd_vms_output_check (abfd, 0);	/* get max size */
-	  if (size > ssize)			/* more than what's left ? */
-	    size = ssize;
-	}
-
-      _bfd_vms_output_begin (abfd, ETIR_S_C_STO_IMM, -1);
-      _bfd_vms_output_long (abfd, (unsigned long)(size));
-      _bfd_vms_output_dump (abfd, cptr, size);
-      _bfd_vms_output_flush (abfd);
-
-#if VMS_DEBUG
-      _bfd_vms_debug (10, "dumped %d bytes\n", size);
-      _bfd_hexdump (10, cptr, (int)size, (int)vaddr);
-#endif
-
-      vaddr += size;
-      ssize -= size;
-      cptr += size;
-    }
-
-  return;
-}
-
-/*-------------------------------------------------------------------*/
-
-/* start ETIR record for section #index at virtual addr offset.  */
-
-static void
-start_etir_record (abfd, index, offset, justoffset)
-    bfd *abfd;
-    int index;
-    uquad offset;
-    boolean justoffset;
-{
-  if (!justoffset)
-    {
-      _bfd_vms_output_begin (abfd, EOBJ_S_C_ETIR, -1);	/* one ETIR per section */
-      _bfd_vms_output_push (abfd);
-    }
-
-  _bfd_vms_output_begin (abfd, ETIR_S_C_STA_PQ, -1);	/* push start offset */
-  _bfd_vms_output_long (abfd, (unsigned long)index);
-  _bfd_vms_output_quad (abfd, (uquad)offset);
-  _bfd_vms_output_flush (abfd);
-
-  _bfd_vms_output_begin (abfd, ETIR_S_C_CTL_SETRB, -1);	/* start = pop () */
-  _bfd_vms_output_flush (abfd);
-
-  return;
-}
-
-
-/* end etir record  */
-static void
-end_etir_record (abfd)
-    bfd *abfd;
-{
-  _bfd_vms_output_pop (abfd);
-  _bfd_vms_output_end (abfd); 
-}
-
-/* write section contents for bfd abfd  */
-
-int
-_bfd_vms_write_tir (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-  asection *section;
-  vms_section *sptr;
-  int nextoffset;
-
-#if VMS_DEBUG
-  _bfd_vms_debug (2, "vms_write_tir (%p, %d)\n", abfd, objtype);
-#endif
-
-  _bfd_vms_output_alignment (abfd, 4);
-
-  nextoffset = 0;
-  PRIV(vms_linkage_index) = 1;
-
-  /* dump all other sections  */
-
-  section = abfd->sections;
-
-  while (section != NULL)
-    {
-
-#if VMS_DEBUG
-      _bfd_vms_debug (4, "writing %d. section '%s' (%d bytes)\n", section->index, section->name, (int)(section->_raw_size));

-#endif
-
-      if (section->flags & SEC_RELOC)
-	{
-	  int i;
-
-	  if ((i = section->reloc_count) <= 0)
-	    {
-	      (*_bfd_error_handler) (_("SEC_RELOC with no relocs in section %s"),
-				     section->name);
-	    }
-#if VMS_DEBUG
-	  else
-	    {
-	      arelent **rptr;
-	      _bfd_vms_debug (4, "%d relocations:\n", i);
-	      rptr = section->orelocation;
-	      while (i-- > 0)
-		{
-		  _bfd_vms_debug (4, "sym %s in sec %s, value %08lx, addr %08lx, off %08lx, len %d: %s\n",
-			      (*(*rptr)->sym_ptr_ptr)->name,
-			      (*(*rptr)->sym_ptr_ptr)->section->name,
-			      (long)(*(*rptr)->sym_ptr_ptr)->value,
-			      (*rptr)->address, (*rptr)->addend,
-			      bfd_get_reloc_size((*rptr)->howto),
-			      (*rptr)->howto->name);
-		  rptr++;
-		}
-	    }
-#endif
-	}
-
-      if ((section->flags & SEC_HAS_CONTENTS)
-	&& (! bfd_is_com_section (section)))
-	{
-	  bfd_vma vaddr;		/* virtual addr in section */
-
-	  sptr = _bfd_get_vms_section (abfd, section->index);
-	  if (sptr == NULL)
-	    {
-	      bfd_set_error (bfd_error_no_contents);
-	      return -1;
-	    }
-
-	  vaddr = (bfd_vma)(sptr->offset);
-
-	  start_etir_record (abfd, section->index, (uquad) sptr->offset,
-			     false);
-
-	  while (sptr != NULL)				/* one STA_PQ, CTL_SETRB per vms_section */
-	    {
-
-	      if (section->flags & SEC_RELOC)			/* check for relocs */
-		{
-		  arelent **rptr = section->orelocation;
-		  int i = section->reloc_count;
-		  for (;;)
-		    {
-		      bfd_size_type addr = (*rptr)->address;
-		      int len = bfd_get_reloc_size ((*rptr)->howto);
-		      if (sptr->offset < addr)		/* sptr starts before reloc */
-			{
-			  int before = addr - sptr->offset;
-			  if (sptr->size <= before)		/* complete before */
-			    {
-			      sto_imm (abfd, sptr, vaddr, section->index);
-			      vaddr += sptr->size;
-			      break;
-			    }
-			  else				/* partly before */
-			    {
-			      int after = sptr->size - before;
-			      sptr->size = before;
-			      sto_imm (abfd, sptr, vaddr, section->index);
-			      vaddr += sptr->size;
-			      sptr->contents += before;
-			      sptr->offset += before;
-			      sptr->size = after;
-			    }
-			}
-		      else if (sptr->offset == addr)	/* sptr starts at reloc */
-			{
-			  asymbol *sym = *(*rptr)->sym_ptr_ptr;
-			  asection *sec = sym->section;
-
-			  switch ((*rptr)->howto->type)
-			    {
-			    case ALPHA_R_IGNORE:
-			      break;
-
-			    case ALPHA_R_REFLONG:
-			      {
-				if (bfd_is_und_section (sym->section))
-				  {
-				    if (_bfd_vms_output_check (abfd,
-								strlen((char *)sym->name))
-					< 0)
-				      {
-					end_etir_record (abfd);
-					start_etir_record (abfd,
-							   section->index,
-							   vaddr, false);
-				      }
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STO_GBL_LW,
-							    -1);
-				    _bfd_vms_output_counted (abfd,
-							      _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
-				    _bfd_vms_output_flush (abfd);
-				  }
-				else if (bfd_is_abs_section (sym->section))
-				  {
-				    if (_bfd_vms_output_check (abfd, 16) < 0)
-				      {
-					end_etir_record (abfd);
-					start_etir_record (abfd,
-							   section->index,
-							   vaddr, false);
-				      }
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STA_LW,
-							    -1);
-				    _bfd_vms_output_quad (abfd,
-							   (uquad)sym->value);
-				    _bfd_vms_output_flush (abfd);
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STO_LW,
-							    -1);
-				    _bfd_vms_output_flush (abfd);
-				  }
-				else
-				  {
-				    if (_bfd_vms_output_check (abfd, 32) < 0)
-				      {
-					end_etir_record (abfd);
-					start_etir_record (abfd,
-							   section->index,
-							   vaddr, false);
-				      }
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STA_PQ,
-							    -1);
-				    _bfd_vms_output_long (abfd,
-							   (unsigned long)(sec->index));
-				    _bfd_vms_output_quad (abfd,
-							   ((uquad)(*rptr)->addend
-							    + (uquad)sym->value));
-				    _bfd_vms_output_flush (abfd);
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STO_LW,
-							    -1);
-				    _bfd_vms_output_flush (abfd);
-				  }
-			      }
-			      break;
-
-			    case ALPHA_R_REFQUAD:
-			      {
-				if (bfd_is_und_section (sym->section))
-				  {
-				    if (_bfd_vms_output_check (abfd,
-								strlen((char *)sym->name))
-					< 0)
-				      {
-					end_etir_record (abfd);
-					start_etir_record (abfd,
-							   section->index,
-							   vaddr, false);
-				      }
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STO_GBL,
-							    -1);
-				    _bfd_vms_output_counted (abfd,
-							      _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
-				    _bfd_vms_output_flush (abfd);
-				  }
-				else if (bfd_is_abs_section (sym->section))
-				  {
-				    if (_bfd_vms_output_check (abfd, 16) < 0)
-				      {
-					end_etir_record (abfd);
-					start_etir_record (abfd,
-							   section->index,
-							   vaddr, false);
-				      }
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STA_QW,
-							    -1);
-				    _bfd_vms_output_quad (abfd,
-							   (uquad)sym->value);
-				    _bfd_vms_output_flush (abfd);
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STO_QW,
-							    -1);
-				    _bfd_vms_output_flush (abfd);
-				  }
-				else
-				  {
-				    if (_bfd_vms_output_check (abfd, 32) < 0)
-				      {
-					end_etir_record (abfd);
-					start_etir_record (abfd,
-							   section->index,
-							   vaddr, false);
-				      }
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STA_PQ,
-							    -1);
-				    _bfd_vms_output_long (abfd,
-							   (unsigned long)(sec->index));
-				    _bfd_vms_output_quad (abfd,
-							   ((uquad)(*rptr)->addend
-							    + (uquad)sym->value));
-				    _bfd_vms_output_flush (abfd);
-				    _bfd_vms_output_begin (abfd,
-							    ETIR_S_C_STO_OFF,
-							    -1);
-				    _bfd_vms_output_flush (abfd);
-				  }
-			      }
-			      break;
-
-			    case ALPHA_R_HINT:
-			      {
-				int hint_size;
-
-				hint_size = sptr->size;
-				sptr->size = len;
-				sto_imm (abfd, sptr, vaddr, section->index);
-				sptr->size = hint_size;
-#if 0
-				vms_output_begin(abfd, ETIR_S_C_STO_HINT_GBL, -1);
-				vms_output_long(abfd, (unsigned long)(sec->index));
-				vms_output_quad(abfd, (uquad)addr);
-
-				vms_output_counted(abfd, _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
-				vms_output_flush(abfd);
-#endif
-			      }
-			      break;
-			    case ALPHA_R_LINKAGE:
-			      {
-				if (_bfd_vms_output_check (abfd, 64) < 0)
-				  {
-				    end_etir_record (abfd);
-				    start_etir_record (abfd, section->index,
-						       vaddr, false);
-				  }
-				_bfd_vms_output_begin (abfd,
-							ETIR_S_C_STC_LP_PSB,
-							-1);
-				_bfd_vms_output_long (abfd,
-						       (unsigned long)PRIV(vms_linkage_index));
-				PRIV(vms_linkage_index) += 2;
-				_bfd_vms_output_counted (abfd,
-							  _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
-				_bfd_vms_output_byte (abfd, 0);
-				_bfd_vms_output_flush (abfd);
-			      }
-			      break;
-
-			    case ALPHA_R_CODEADDR:
-			      {
-				if (_bfd_vms_output_check (abfd,
-							    strlen((char *)sym->name))
-				    < 0)
-				  {
-				    end_etir_record (abfd);
-				    start_etir_record (abfd,
-						       section->index,
-						       vaddr, false);
-				  }
-				_bfd_vms_output_begin (abfd,
-							ETIR_S_C_STO_CA,
-							-1);
-				_bfd_vms_output_counted (abfd,
-							  _bfd_vms_length_hash_symbol (abfd, sym->name, EOBJ_S_C_SYMSIZ));
-				_bfd_vms_output_flush (abfd);
-			      }
-			      break;
-
-			    default:
-			      (*_bfd_error_handler) (_("Unhandled relocation %s"),
-						     (*rptr)->howto->name);
-			      break;
-			    }
-
-			  vaddr += len;
-
-			  if (len == sptr->size)
-			    {
-			      break;
-			    }
-			  else
-			    {
-			      sptr->contents += len;
-			      sptr->offset += len;
-			      sptr->size -= len;
-			      i--;
-			      rptr++;
-			    }
-			}
-		      else					/* sptr starts after reloc */
-			{
-			  i--;				/* check next reloc */
-			  rptr++;
-			}
-
-		      if (i==0)				/* all reloc checked */
-			{
-			  if (sptr->size > 0)
-			    {
-			      sto_imm (abfd, sptr, vaddr, section->index);	/* dump rest */
-			      vaddr += sptr->size;
-			    }
-			  break;
-			}
-		    } /* for (;;) */
-		} /* if SEC_RELOC */
-	      else						/* no relocs, just dump */
-		{
-		  sto_imm (abfd, sptr, vaddr, section->index);
-		  vaddr += sptr->size;
-		}
-
-	      sptr = sptr->next;
-
-	    } /* while (sptr != 0) */
-
-	  end_etir_record (abfd);
-
-	} /* has_contents */
-
-      section = section->next;
-    }
-
-  _bfd_vms_output_alignment(abfd, 2);
-  return 0;
-}
-
-
-/* write traceback data for bfd abfd  */
-
-int
-_bfd_vms_write_tbt (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (2, "vms_write_tbt (%p, %d)\n", abfd, objtype);
-#endif
-
-  return 0;
-}
-
-
-/* write debug info for bfd abfd  */
-
-int
-_bfd_vms_write_dbg (abfd, objtype)
-     bfd *abfd;
-     int objtype;
-{
-#if VMS_DEBUG
-  _bfd_vms_debug (2, "vms_write_dbg (%p, objtype)\n", abfd, objtype);
-#endif
-
-  return 0;
-}
diff --git a/bfd/vms.c b/bfd/vms.c
deleted file mode 100644
index a5fc13ad942..00000000000
--- a/bfd/vms.c
+++ /dev/null
@@ -1,1947 +0,0 @@
-/* vms.c -- BFD back-end for VAX (openVMS/VAX) and
-   EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
-
-   Written by Klaus K"ampf (kkaempf@rmi.de)
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-
-#include "vms.h"
-
-static boolean vms_initialize PARAMS ((bfd *));
-static int priv_section_count;
-static boolean fill_section_ptr PARAMS ((struct bfd_hash_entry *, PTR));
-static boolean vms_fixup_sections PARAMS ((bfd *));
-static boolean copy_symbols PARAMS ((struct bfd_hash_entry *, PTR));
-static bfd_reloc_status_type reloc_nil
-  PARAMS ((bfd *, arelent *, asymbol *, PTR, asection *, bfd *, char **));
-static const struct bfd_target *vms_object_p PARAMS ((bfd *abfd));
-static const struct bfd_target *vms_archive_p PARAMS ((bfd *abfd));
-static boolean vms_mkobject PARAMS ((bfd *abfd));
-static boolean vms_write_object_contents PARAMS ((bfd *abfd));
-static boolean vms_close_and_cleanup PARAMS ((bfd *abfd));
-static boolean vms_bfd_free_cached_info PARAMS ((bfd *abfd));
-static boolean vms_new_section_hook PARAMS ((bfd *abfd, asection *section));
-static boolean vms_get_section_contents
-  PARAMS ((bfd *abfd, asection *section, PTR x1, file_ptr x2,
-	   bfd_size_type x3));
-static boolean vms_get_section_contents_in_window
-  PARAMS ((bfd *abfd, asection *section, bfd_window *w, file_ptr offset,
-	   bfd_size_type count));
-static boolean vms_bfd_copy_private_bfd_data PARAMS ((bfd *src, bfd *dest));
-static boolean vms_bfd_copy_private_section_data
-  PARAMS ((bfd *srcbfd, asection *srcsec, bfd *dstbfd, asection *dstsec));
-static boolean vms_bfd_copy_private_symbol_data
-  PARAMS ((bfd *ibfd, asymbol *isym, bfd *obfd, asymbol *osym));
-static boolean vms_bfd_print_private_bfd_data
-  PARAMS ((bfd *abfd, void *file));
-static char *vms_core_file_failing_command PARAMS ((bfd *abfd));
-static int vms_core_file_failing_signal PARAMS ((bfd *abfd));
-static boolean vms_core_file_matches_executable_p
-  PARAMS ((bfd *abfd, bfd *bbfd));
-static boolean vms_slurp_armap PARAMS ((bfd *abfd));
-static boolean vms_slurp_extended_name_table PARAMS ((bfd *abfd));
-static boolean vms_construct_extended_name_table
-  PARAMS ((bfd *abfd, char **tabloc, bfd_size_type *tablen,
-	   const char **name));
-static void vms_truncate_arname
-  PARAMS ((bfd *abfd, CONST char *pathname, char *arhdr));
-static boolean vms_write_armap
-  PARAMS ((bfd *arch, unsigned int elength, struct orl *map,
-	   unsigned int orl_count, int stridx));
-static PTR vms_read_ar_hdr PARAMS ((bfd *abfd));
-static bfd *vms_get_elt_at_index PARAMS ((bfd *abfd, symindex index));
-static bfd *vms_openr_next_archived_file PARAMS ((bfd *arch, bfd *prev));
-static boolean vms_update_armap_timestamp PARAMS ((bfd *abfd));
-static int vms_generic_stat_arch_elt PARAMS ((bfd *abfd, struct stat *stat));
-static long vms_get_symtab_upper_bound PARAMS ((bfd *abfd));
-static long vms_get_symtab PARAMS ((bfd *abfd, asymbol **symbols));
-static void vms_print_symbol
-  PARAMS ((bfd *abfd, PTR file, asymbol *symbol, bfd_print_symbol_type how));
-static void vms_get_symbol_info
-  PARAMS ((bfd *abfd, asymbol *symbol, symbol_info *ret));
-static boolean vms_bfd_is_local_label_name PARAMS ((bfd *abfd, const char *));
-static alent *vms_get_lineno PARAMS ((bfd *abfd, asymbol *symbol));
-static boolean vms_find_nearest_line
-  PARAMS ((bfd *abfd, asection *section, asymbol **symbols, bfd_vma offset,
-	   const char **file, const char **func, unsigned int *line));
-static asymbol *vms_bfd_make_debug_symbol
-  PARAMS ((bfd *abfd, void *ptr, unsigned long size));
-static long vms_read_minisymbols
-  PARAMS ((bfd *abfd, boolean dynamic, PTR *minisymsp, unsigned int *sizep));
-static asymbol *vms_minisymbol_to_symbol
-  PARAMS ((bfd *abfd, boolean dynamic, const PTR minisym, asymbol *sym));
-static long vms_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect));
-static long vms_canonicalize_reloc
-  PARAMS ((bfd *abfd, asection *srcsec, arelent **location,
-	   asymbol **symbols));
-static const struct reloc_howto_struct *vms_bfd_reloc_type_lookup
-  PARAMS ((bfd *abfd, bfd_reloc_code_real_type code));
-static boolean vms_set_arch_mach
-  PARAMS ((bfd *abfd, enum bfd_architecture arch, unsigned long mach));
-static boolean vms_set_section_contents
-  PARAMS ((bfd *abfd, asection *section, PTR location, file_ptr offset,
-	   bfd_size_type count));
-static int vms_sizeof_headers PARAMS ((bfd *abfd, boolean reloc));
-static bfd_byte *vms_bfd_get_relocated_section_contents
-  PARAMS ((bfd *abfd, struct bfd_link_info *link_info,
-	   struct bfd_link_order *link_order, bfd_byte *data,
-	   boolean relocateable, asymbol **symbols));
-static boolean vms_bfd_relax_section
-  PARAMS ((bfd *abfd, asection *section, struct bfd_link_info *link_info,
-	   boolean *again));
-static boolean vms_bfd_gc_sections
-  PARAMS ((bfd *abfd, struct bfd_link_info *link_info));
-static struct bfd_link_hash_table *vms_bfd_link_hash_table_create
-  PARAMS ((bfd *abfd));
-static boolean vms_bfd_link_add_symbols
-  PARAMS ((bfd *abfd, struct bfd_link_info *link_info));
-static boolean vms_bfd_final_link
-  PARAMS ((bfd *abfd, struct bfd_link_info *link_info));
-static boolean vms_bfd_link_split_section
-  PARAMS ((bfd *abfd, asection *section));
-static long vms_get_dynamic_symtab_upper_bound PARAMS ((bfd *abfd));
-static long vms_canonicalize_dynamic_symtab
-  PARAMS ((bfd *abfd, asymbol **symbols));
-static long vms_get_dynamic_reloc_upper_bound PARAMS ((bfd *abfd));
-static long vms_canonicalize_dynamic_reloc
-  PARAMS ((bfd *abfd, arelent **arel, asymbol **symbols));
-static boolean vms_bfd_merge_private_bfd_data PARAMS ((bfd *ibfd, bfd *obfd));
-static boolean vms_bfd_set_private_flags PARAMS ((bfd *abfd, flagword flags));
-
-#define vms_make_empty_symbol _bfd_vms_make_empty_symbol
-
-/*===========================================================================*/
-
-const bfd_target vms_alpha_vec =
-{
-
-  "vms-alpha",			/* name */
-  bfd_target_evax_flavour,
-  false,			/* data byte order is little */
-  false,			/* header byte order is little */
-
-  (HAS_RELOC | HAS_SYMS
-   | WP_TEXT | D_PAGED),	/* object flags */
-  (SEC_ALLOC | SEC_LOAD | SEC_RELOC
-   | SEC_READONLY | SEC_CODE | SEC_DATA
-   | SEC_HAS_CONTENTS | SEC_IN_MEMORY),		/* sect flags */
-  0,				/* symbol_leading_char */
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16,
-
-  {_bfd_dummy_target, vms_object_p,		/* bfd_check_format */
-   vms_archive_p, _bfd_dummy_target},
-  {bfd_false, vms_mkobject,			/* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, vms_write_object_contents,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (vms),
-  BFD_JUMP_TABLE_COPY (vms),
-  BFD_JUMP_TABLE_CORE (vms),
-  BFD_JUMP_TABLE_ARCHIVE (vms),
-  BFD_JUMP_TABLE_SYMBOLS (vms),
-  BFD_JUMP_TABLE_RELOCS (vms),
-  BFD_JUMP_TABLE_WRITE (vms),
-  BFD_JUMP_TABLE_LINK (vms),
-  BFD_JUMP_TABLE_DYNAMIC (vms),
-
-  (PTR) 0
-};
-
-const bfd_target vms_vax_vec =
-{
-
-  "vms-vax",			/* name */
-  bfd_target_ovax_flavour,
-  false,			/* data byte order is little */
-  false,			/* header byte order is little */
-
-  (HAS_RELOC | HAS_SYMS 	/* object flags */
-   | WP_TEXT | D_PAGED
-   | HAS_LINENO | HAS_DEBUG | HAS_LOCALS),
-
-  (SEC_ALLOC | SEC_LOAD | SEC_RELOC
-   | SEC_READONLY | SEC_CODE | SEC_DATA
-   | SEC_HAS_CONTENTS | SEC_IN_MEMORY),		/* sect flags */
-  0,				/* symbol_leading_char */
-  ' ',				/* ar_pad_char */
-  15,				/* ar_max_namelen */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* data */
-  bfd_getl64, bfd_getl_signed_64, bfd_putl64,
-  bfd_getl32, bfd_getl_signed_32, bfd_putl32,
-  bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* hdrs */
-
-  {_bfd_dummy_target, vms_object_p,		/* bfd_check_format */
-   vms_archive_p, _bfd_dummy_target},
-  {bfd_false, vms_mkobject,			/* bfd_set_format */
-   _bfd_generic_mkarchive, bfd_false},
-  {bfd_false, vms_write_object_contents,	/* bfd_write_contents */
-   _bfd_write_archive_contents, bfd_false},
-
-  BFD_JUMP_TABLE_GENERIC (vms),
-  BFD_JUMP_TABLE_COPY (vms),
-  BFD_JUMP_TABLE_CORE (vms),
-  BFD_JUMP_TABLE_ARCHIVE (vms),
-  BFD_JUMP_TABLE_SYMBOLS (vms),
-  BFD_JUMP_TABLE_RELOCS (vms),
-  BFD_JUMP_TABLE_WRITE (vms),
-  BFD_JUMP_TABLE_LINK (vms),
-  BFD_JUMP_TABLE_DYNAMIC (vms),
-
-  (PTR) 0
-};
-
-/*===========================================================================*/
-
-/* Initialize private data  */
-
-static boolean
-vms_initialize (abfd)
-     bfd *abfd;
-{
-  int i;
-
-  if (abfd->tdata.any != 0)
-    return true;
-
-  bfd_set_start_address (abfd, (bfd_vma)-1);
-
-  abfd->tdata.any = ((struct vms_private_data_struct*)
-		     bfd_malloc (sizeof (struct vms_private_data_struct)));
-  if (abfd->tdata.any == 0)
-    return false;
-
-#ifdef __ALPHA
-  PRIV(is_vax) = 0;
-#else
-  PRIV(is_vax) = 1;
-#endif
-  PRIV(vms_buf) = 0;
-  PRIV(buf_size) = 0;
-  PRIV(rec_length) = 0;
-  PRIV(file_format) = FF_UNKNOWN;
-  PRIV(fixup_done) = false;
-  PRIV(sections) = NULL;
-
-  PRIV(stack) = ((struct stack_struct *)
-		 bfd_malloc (sizeof (struct stack_struct) * STACKSIZE));
-  if (PRIV(stack) == 0)
-    {
-     vms_init_no_mem1:
-      free (abfd->tdata.any);
-      abfd->tdata.any = 0;
-      return false;
-    }
-  PRIV(stackptr) = 0;
-
-  PRIV(vms_symbol_table) = ((struct bfd_hash_table *)
-			     bfd_malloc (sizeof (struct bfd_hash_table)));
-  if (PRIV(vms_symbol_table) == 0)
-    {
-     vms_init_no_mem2:
-      free (PRIV(stack));
-      PRIV(stack) = 0;
-      goto vms_init_no_mem1;
-    }
-
-  if (!bfd_hash_table_init (PRIV(vms_symbol_table), _bfd_vms_hash_newfunc))
-    return false;
-
-  PRIV(location_stack) = ((struct location_struct *)
-			  bfd_malloc (sizeof (struct location_struct)
-				      * LOCATION_SAVE_SIZE));
-  if (PRIV(location_stack) == 0)
-    {
-     vms_init_no_mem3:
-      free (PRIV(vms_symbol_table));
-      PRIV(vms_symbol_table) = 0;
-      goto vms_init_no_mem2;
-    }
-
-  for (i = 0; i < VMS_SECTION_COUNT; i++)
-    PRIV(vms_section_table)[i] = NULL;
-
-  PRIV(output_buf) = (unsigned char *) malloc (MAX_OUTREC_SIZE);
-  if (PRIV(output_buf) == 0)
-    {
-      free (PRIV(location_stack));
-      PRIV(location_stack) = 0;
-      goto vms_init_no_mem3;
-    }
-  PRIV(push_level) = 0;
-  PRIV(pushed_size) = 0;
-  PRIV(length_pos) = 2;
-  PRIV(output_size) = 0;
-  PRIV(output_alignment) = 1;
-
-  return true;
-}
-
-
-/* Fill symbol->section with section ptr
-   symbol->section is filled with the section index for defined symbols
-   during reading the GSD/EGSD section. But we need the pointer to the
-   bfd section later.
-
-   It has the correct value for referenced (undefined section) symbols
-
-   called from bfd_hash_traverse in vms_fixup_sections  */
-
-static boolean
-fill_section_ptr (entry, sections)
-     struct bfd_hash_entry *entry;
-     PTR sections;
-{
-  asection *sec;
-  asymbol *sym;
-
-  sym =  ((vms_symbol_entry *)entry)->symbol;
-  sec = sym->section;
-
-#if VMS_DEBUG
-  vms_debug (6, "fill_section_ptr: sym %p, sec %p\n", sym, sec);
-#endif
-
-  /* fill forward references (these contain section number, not section ptr).  */
-
-  if ((int)sec < priv_section_count)
-    {
-      sec = ((vms_symbol_entry *)entry)->symbol->section =
-	((asection **)sections)[(int)sec];
-    }
-
-  if (strcmp (sym->name, sec->name) == 0)
-    sym->flags |= BSF_SECTION_SYM;
-
-  return true;
-}
-
-
-/* Fixup sections
-   set up all pointers and arrays, counters and sizes are fixed now
-
-   we build a private sections vector for easy access since sections
-   are always referenced by an index number.
-
-   alloc PRIV(sections) according to abfd->section_count
-	copy abfd->sections to PRIV(sections)  */
-
-static boolean
-vms_fixup_sections (abfd)
-     bfd *abfd;
-{
-  asection *s;
-
-  if (PRIV(fixup_done))
-    return true;
-
-  /*
-   * traverse symbol table and fill in all section pointers
-   */
-
-  /* can't provide section count as argument to fill_section_ptr().  */
-  priv_section_count = PRIV(section_count);
-  bfd_hash_traverse (PRIV(vms_symbol_table), fill_section_ptr,
-		    (PTR)(PRIV(sections)));
-
-  PRIV(fixup_done) = true;
-
-  return true;
-}
-
-/*===========================================================================*/
-
-/* Check the format for a file being read.
-   Return a (bfd_target *) if it's an object file or zero if not.  */
-
-static const struct bfd_target *
-vms_object_p (abfd)
-     bfd *abfd;
-{
-  int err = 0;
-  int prev_type;
-  const struct bfd_target *target_vector = 0;
-  const bfd_arch_info_type *arch = 0;
-
-#if VMS_DEBUG
-  vms_debug (1, "vms_object_p(%p)\n", abfd);
-#endif
-
-  if (!vms_initialize (abfd))
-    {
-      fprintf (stderr, "vms_initialize () failed !!\n");
-      return 0;
-    }
-
-  if (bfd_seek (abfd, 0L, SEEK_SET))
-    {
-      bfd_set_error (bfd_error_file_truncated);
-      return 0;
-    }
-
-  prev_type = -1;
-
-  do
-    {
-#if VMS_DEBUG
-      vms_debug (7, "reading at %08lx\n", bfd_tell(abfd));
-#endif
-      if (_bfd_vms_next_record (abfd) < 0)
-	{
-#if VMS_DEBUG
-	  vms_debug (2, "next_record failed\n");      
-#endif
-	  bfd_set_error (bfd_error_wrong_format);
-	  return 0;
-	}
-
-      if ((prev_type == EOBJ_S_C_EGSD)
-	   && (PRIV(rec_type) != EOBJ_S_C_EGSD))
-	{
-	  if (vms_fixup_sections (abfd) == false)
-	    {
-#if VMS_DEBUG
-	      vms_debug (2, "vms_fixup_sections failed\n");
-#endif
-	      bfd_set_error (bfd_error_wrong_format);
-	      return 0;
-	    }
-	}
-
-      prev_type = PRIV(rec_type);
-
-      if (target_vector == 0)
-	{
-	  if (prev_type <= OBJ_S_C_MAXRECTYP)
-	    target_vector = &vms_vax_vec;
-	  else
-	    target_vector = &vms_alpha_vec;
-	}
-
-      switch (prev_type)
-	{
-	  case OBJ_S_C_HDR:
-	  case EOBJ_S_C_EMH:
-	    err = _bfd_vms_slurp_hdr (abfd, prev_type);
-	    break;
-	  case OBJ_S_C_EOM:
-	  case OBJ_S_C_EOMW:
-	  case EOBJ_S_C_EEOM:
-	    err = _bfd_vms_slurp_eom (abfd, prev_type);
-	    break;
-	  case OBJ_S_C_GSD:
-	  case EOBJ_S_C_EGSD:
-	    err = _bfd_vms_slurp_gsd (abfd, prev_type);
-	    break;
-	  case OBJ_S_C_TIR:
-	  case EOBJ_S_C_ETIR:
-	    err = _bfd_vms_slurp_tir (abfd, prev_type);
-	    break;
-	  case OBJ_S_C_DBG:
-	  case EOBJ_S_C_EDBG:
-	    err = _bfd_vms_slurp_dbg (abfd, prev_type);
-	    break;
-	  case OBJ_S_C_TBT:
-	  case EOBJ_S_C_ETBT:
-	    err = _bfd_vms_slurp_tbt (abfd, prev_type);
-	    break;
-	  case OBJ_S_C_LNK:
-	    err = _bfd_vms_slurp_lnk (abfd, prev_type);
-	    break;
-	  default:
-	    err = -1;
-	}
-      if (err != 0)
-	{
-#if VMS_DEBUG
-	  vms_debug (2, "slurp type %d failed with %d\n", prev_type, err);
-#endif
-	  bfd_set_error (bfd_error_wrong_format);
-	  return 0;
-	}
-    }
-  while ((prev_type != EOBJ_S_C_EEOM) && (prev_type != OBJ_S_C_EOM) && (prev_type != OBJ_S_C_EOMW));
-
-  if (target_vector == &vms_vax_vec)
-    {
-      if (vms_fixup_sections (abfd) == false)
-	{
-#if VMS_DEBUG
-	  vms_debug (2, "vms_fixup_sections failed\n");
-#endif
-	  bfd_set_error (bfd_error_wrong_format);
-	  return 0;
-	}
-
-      /* set arch_info to vax  */
- 
-      arch = bfd_scan_arch ("vax");
-      PRIV (is_vax) = 1;
-#if VMS_DEBUG
-      vms_debug (2, "arch is vax\n");
-#endif
-    }
-  else if (target_vector == &vms_alpha_vec)
-    {
-      /* set arch_info to alpha  */
- 
-      arch = bfd_scan_arch ("alpha");
-      PRIV (is_vax) = 0;
-#if VMS_DEBUG
-      vms_debug (2, "arch is alpha\n");
-#endif
-    }
-
-  if (arch == 0)
-    {
-#if VMS_DEBUG
-      vms_debug (2, "arch not found\n");
-#endif
-      bfd_set_error (bfd_error_wrong_format);
-      return 0;
-    }
-  abfd->arch_info = arch;
-
-  return target_vector;
-}
-
-
-/* Check the format for a file being read.
-   Return a (bfd_target *) if it's an archive file or zero.  */
-
-static const struct bfd_target *
-vms_archive_p (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_archive_p(%p)\n", abfd);
-#endif
-
-  return 0;
-}
-
-
-/* Set the format of a file being written.  */
-
-static boolean
-vms_mkobject (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_mkobject(%p)\n", abfd);
-#endif
-
-  if (!vms_initialize (abfd))
-    {
-      fprintf (stderr, "vms_initialize () failed !!\n");
-      return 0;
-    }
-
-  {
-#ifdef __VAX
-    const bfd_arch_info_type *arch = bfd_scan_arch ("vax");
-#else
-    const bfd_arch_info_type *arch = bfd_scan_arch ("alpha");
-#endif
-    if (arch == 0)
-      {
-	bfd_set_error(bfd_error_wrong_format);
-	return 0;
-      }
-    abfd->arch_info = arch;
-  }
-
-  return true;
-}
-
-
-/* Write cached information into a file being written, at bfd_close.  */
-
-static boolean
-vms_write_object_contents (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_write_object_contents(%p)\n", abfd);
-#endif
-
-  if (abfd->section_count > 0)			/* we have sections */
-    {
-      if (PRIV(is_vax))
-	{
-	  if (_bfd_vms_write_hdr (abfd, OBJ_S_C_HDR) != 0)
-	    return false;
-	  if (_bfd_vms_write_gsd (abfd, OBJ_S_C_GSD) != 0)
-	    return false;
-	  if (_bfd_vms_write_tir (abfd, OBJ_S_C_TIR) != 0)
-	    return false;
-	  if (_bfd_vms_write_tbt (abfd, OBJ_S_C_TBT) != 0)
-	    return false;
-	  if (_bfd_vms_write_dbg (abfd, OBJ_S_C_DBG) != 0)
-	    return false;
-	  if (abfd->section_count > 255)
-	    {
-	      if (_bfd_vms_write_eom (abfd, OBJ_S_C_EOMW) != 0)
-		return false;
-	    }
-	  else
-	    {
-	      if (_bfd_vms_write_eom (abfd, OBJ_S_C_EOM) != 0)
-		return false;
-	    }
-	}
-      else
-	{
-	  if (_bfd_vms_write_hdr (abfd, EOBJ_S_C_EMH) != 0)
-	    return false;
-	  if (_bfd_vms_write_gsd (abfd, EOBJ_S_C_EGSD) != 0)
-	    return false;
-	  if (_bfd_vms_write_tir (abfd, EOBJ_S_C_ETIR) != 0)
-	    return false;
-	  if (_bfd_vms_write_tbt (abfd, EOBJ_S_C_ETBT) != 0)
-	    return false;
-	  if (_bfd_vms_write_dbg (abfd, EOBJ_S_C_EDBG) != 0)
-	    return false;
-	  if (_bfd_vms_write_eom (abfd, EOBJ_S_C_EEOM) != 0)
-	    return false;
-	}
-    }
-  return true;
-}
-
-/*-- 4.1, generic -----------------------------------------------------------*/
-
-/* Called when the BFD is being closed to do any necessary cleanup.  */
-
-static boolean
-vms_close_and_cleanup (abfd)
-     bfd *abfd;
-{
-  asection *sec;
-  vms_section *es, *es1;
-  vms_reloc *er, *er1;
-  int i;
-
-#if VMS_DEBUG
-  vms_debug (1, "vms_close_and_cleanup(%p)\n", abfd);
-#endif
-  if (abfd == 0)
-    return true;
-
-  if (PRIV(vms_buf) != NULL)
-    {
-      free (PRIV(vms_buf));
-      PRIV(vms_buf) = NULL;
-    }
-  PRIV(buf_size) = 0;
-
-  if (PRIV(output_buf) != 0)
-    {
-      free (PRIV(output_buf));
-      PRIV(output_buf) = 0;
-    }
-
-  sec = abfd->sections;
-  while (sec != NULL)
-    {
-      if (sec->contents)
-	free (sec->contents);
-      sec = sec->next;
-    }
-
-  if (PRIV(sections) != NULL)
-    {
-      free (PRIV(sections));
-      PRIV(sections) = NULL;
-    }
-
-  if (PRIV(vms_symbol_table))
-    {
-      bfd_hash_table_free (PRIV(vms_symbol_table));
-      PRIV(vms_symbol_table) = 0;
-    }
-
-  if (PRIV(stack))
-    {
-      free (PRIV(stack));
-      PRIV(stack) = 0;
-    }
-
-  if (PRIV(location_stack))
-    {
-      free (PRIV(location_stack));
-      PRIV(location_stack) = 0;
-    }
-
-  for (i = 0; i < VMS_SECTION_COUNT; i++)
-    {
-      es = PRIV(vms_section_table)[i];
-      while (es != NULL)
-	{
-	  es1 = es->next;
-	  free (es);
-	  es = es1;
-	}
-      PRIV(vms_section_table)[i] = NULL;
-   }
-
-  free (abfd->tdata.any);
-  abfd->tdata.any = NULL;
-
-  return true;
-}
-
-
-/* Ask the BFD to free all cached information.  */
-static boolean
-vms_bfd_free_cached_info (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_free_cached_info(%p)\n", abfd);
-#endif
-  return true;
-}
-
-
-/* Called when a new section is created.  */
-
-static boolean
-vms_new_section_hook (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_new_section_hook (%p, [%d]%s), count %d\n", abfd, section->index, section->name, abfd->section_count);
-#endif
-  bfd_set_section_alignment(abfd, section, 4);
-
-  if (abfd->section_count > PRIV(section_count))
-    {
-      PRIV(sections) = ((asection **)
-			    bfd_realloc (PRIV(sections), abfd->section_count * sizeof (asection *)));
-      if (PRIV(sections) == 0)
-	return false;
-      PRIV(section_count) = abfd->section_count;
-    }
-#if VMS_DEBUG
-  vms_debug (6, "section_count: %d\n", PRIV(section_count));
-#endif
-  PRIV(sections)[section->index] = section;
-#if VMS_DEBUG
-  vms_debug (7, "%d: %s\n", section->index, section->name);
-#endif
-
-  return true;
-}
-
-
-/* Read the contents of a section.
-   buf points to a buffer of buf_size bytes to be filled with
-   section data (starting at offset into section)  */
-
-static boolean
-vms_get_section_contents (abfd, section, buf, offset, buf_size)
-     bfd *abfd;
-     asection *section;
-     PTR buf;
-     file_ptr offset;
-     bfd_size_type buf_size;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_section_contents(%p, %s, %p, off %ld, size %d)\n",
-		 abfd, section->name, buf, offset, (int)buf_size);
-#endif
-
-  /* shouldn't be called, since all sections are IN_MEMORY  */
-
-  return false;
-}
-
-/* Read the contents of a section.
-   buf points to a buffer of buf_size bytes to be filled with
-   section data (starting at offset into section)  */
-
-static boolean
-vms_get_section_contents_in_window (abfd, section, w, offset, count)
-     bfd *abfd;
-     asection *section;
-     bfd_window *w;
-     file_ptr offset;
-     bfd_size_type count;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_section_contents_in_window(%p, %s, %p, off %ld, count %d)\n",
-		 abfd, section->name, w, offset, (int)count);
-#endif
-
-  /* shouldn't be called, since all sections are IN_MEMORY  */
-
-  return false;
-}
-
-/*-- Part 4.2, copy private data --------------------------------------------*/
-
-/* Called to copy BFD general private data from one object file
-   to another.  */
-
-static boolean
-vms_bfd_copy_private_bfd_data (src, dest)
-     bfd *src;
-     bfd *dest;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_copy_private_bfd_data(%p, %p)\n", src, dest);
-#endif
-  return true;
-}
-
-
-/* Merge private BFD information from the BFD @var{ibfd} to the
-   the output file BFD @var{obfd} when linking.  Return <<true>>
-   on success, <<false>> on error.  Possible error returns are:
-
-   o <<bfd_error_no_memory>> -
-     Not enough memory exists to create private data for @var{obfd}.  */
-
-static boolean
-vms_bfd_merge_private_bfd_data (ibfd, obfd)
-     bfd *ibfd;
-     bfd *obfd;
-{
-#if VMS_DEBUG
-  vms_debug (1,"vms_bfd_merge_private_bfd_data(%p, %p)\n", ibfd, obfd);
-#endif
-  return true;
-}
-
-
-/* Set private BFD flag information in the BFD @var{abfd}.
-   Return <<true>> on success, <<false>> on error.  Possible error
-   returns are:
-
-   o <<bfd_error_no_memory>> -
-     Not enough memory exists to create private data for @var{obfd}.  */
-
-static boolean
-vms_bfd_set_private_flags (abfd, flags)
-     bfd *abfd;
-     flagword flags;
-{
-#if VMS_DEBUG
-  vms_debug (1,"vms_bfd_set_private_flags(%p, %lx)\n", abfd, (long)flags);
-#endif
-  return true;
-}
-
-
-/* Called to copy BFD private section data from one object file
-   to another.  */
-
-static boolean
-vms_bfd_copy_private_section_data (srcbfd, srcsec, dstbfd, dstsec)
-     bfd *srcbfd;
-     asection *srcsec;
-     bfd *dstbfd;
-     asection *dstsec;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_copy_private_section_data(%p, %s, %p, %s)\n",
-		 srcbfd, srcsec->name, dstbfd, dstsec->name);
-#endif
-  return true;
-}
-
-/* Called to copy BFD private symbol data from one object file
-   to another.  */
-
-static boolean 
-vms_bfd_copy_private_symbol_data (ibfd, isym, obfd, osym)
-     bfd *ibfd;
-     asymbol *isym;
-     bfd *obfd;
-     asymbol *osym;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_copy_private_symbol_data(%p, %s, %p, %s)\n",
-		 ibfd, isym->name, obfd, osym->name);
-#endif
-  return true;
-}
-
-/*-- Part 4.3, core file ----------------------------------------------------*/
-
-/* Return a read-only string explaining which program was running
-   when it failed and produced the core file abfd.  */
-
-static char *
-vms_core_file_failing_command (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_core_file_failing_command(%p)\n", abfd);
-#endif
-  return 0;
-}
-
-
-/* Returns the signal number which caused the core dump which
-   generated the file the BFD abfd is attached to.  */
-
-static int
-vms_core_file_failing_signal (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_core_file_failing_signal(%p)\n", abfd);
-#endif
-  return 0;
-}
-
-
-/* Return true if the core file attached to core_bfd was generated
-   by a run of the executable file attached to exec_bfd, false otherwise.  */
-
-static boolean
-vms_core_file_matches_executable_p (abfd, bbfd)
-     bfd *abfd;
-     bfd *bbfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_core_file_matches_executable_p(%p, %p)\n", abfd, bbfd);
-#endif
-  return false;
-}
-
-/*-- Part 4.4, archive ------------------------------------------------------*/
-
-/* ???	do something with an archive map.
-   Return false on error, true otherwise.  */
-
-static boolean
-vms_slurp_armap (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_slurp_armap(%p)\n", abfd);
-#endif
-  return false;
-}
-
-
-/* ???	do something with an extended name table.
-   Return false on error, true otherwise.  */
-
-static boolean
-vms_slurp_extended_name_table (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_slurp_extended_name_table(%p)\n", abfd);
-#endif
-  return false;
-}
-
-
-/* ???	do something with an extended name table.
-   Return false on error, true otherwise.  */
-
-static boolean
-vms_construct_extended_name_table (abfd, tabloc, tablen, name)
-     bfd *abfd;
-     char **tabloc;
-     bfd_size_type *tablen;
-     const char **name;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_construct_extended_name_table(%p)\n", abfd);
-#endif
-  return false;
-}
-
-
-/* Truncate the name of an archive to match system-dependent restrictions  */
-
-static void
-vms_truncate_arname (abfd, pathname, arhdr)
-     bfd *abfd;
-     CONST char *pathname;
-     char *arhdr;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_truncate_arname(%p, %s, %s)\n", abfd, pathname, arhdr);
-#endif
-  return;
-}
-
-
-/* ???	write archive map  */
-
-static boolean
-vms_write_armap (arch, elength, map, orl_count, stridx)
-     bfd *arch;
-     unsigned int elength;
-     struct orl *map;
-     unsigned int orl_count;
-     int stridx;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_write_armap(%p, %d, %p, %d %d)\n",
-	arch, elength, map, orl_count, stridx);
-#endif
-  return true;
-}
-
-/* Read archive header ???  */
-
-static PTR
-vms_read_ar_hdr (abfd)
-    bfd * abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_read_ar_hdr(%p)\n", abfd);
-#endif
-  return (PTR)0;
-}
-
-
-/* Provided a BFD, @var{archive}, containing an archive and NULL, open
-   an input BFD on the first contained element and returns that.
-   Subsequent calls should pass the archive and the previous return value
-   to return a created BFD to the next contained element.
-   NULL is returned when there are no more.  */
-
-static bfd *
-vms_openr_next_archived_file (arch, prev)
-     bfd *arch;
-     bfd *prev;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_openr_next_archived_file(%p, %p)\n", arch, prev);
-#endif
-  return false;
-}
-
-
-/* Return the BFD which is referenced by the symbol in ABFD indexed by
-   INDEX.  INDEX should have been returned by bfd_get_next_mapent.  */
-
-static bfd *
-vms_get_elt_at_index (abfd, index)
-     bfd *abfd;
-     symindex index;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_elt_at_index(%p, %p)\n", abfd, index);
-#endif
-  return _bfd_generic_get_elt_at_index(abfd, index);
-}
-
-
-/* ???
-   -> bfd_generic_stat_arch_elt  */
-
-static int
-vms_generic_stat_arch_elt (abfd, stat)
-     bfd *abfd;
-     struct stat *stat;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_generic_stat_arch_elt(%p, %p)\n", abfd, stat);
-#endif
-  return bfd_generic_stat_arch_elt(abfd, stat);
-}
-
-
-/* This is a new function in bfd 2.5  */
-
-static boolean
-vms_update_armap_timestamp (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_update_armap_timestamp(%p)\n", abfd);
-#endif
-  return true;
-}
-
-/*-- Part 4.5, symbols --------------------------------------------------------*/
-
-/* Return the number of bytes required to store a vector of pointers
-   to asymbols for all the symbols in the BFD abfd, including a
-   terminal NULL pointer. If there are no symbols in the BFD,
-   then return 0.  If an error occurs, return -1.  */
-
-static long
-vms_get_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_symtab_upper_bound(%p), %d symbols\n", abfd, PRIV(gsd_sym_count));
-#endif
-  return (PRIV(gsd_sym_count)+1) * sizeof(asymbol *);
-}
-
-
-/* Copy symbols from hash table to symbol vector
-
-   called from bfd_hash_traverse in vms_get_symtab
-   init counter to 0 if entry == 0  */
-
-static boolean
-copy_symbols (entry, arg)
-     struct bfd_hash_entry *entry;
-     PTR arg;
-{
-  bfd *abfd = (bfd *) arg;
-
-  if (entry == NULL)	/* init counter */
-    PRIV(symnum) = 0;
-  else			/* fill vector, inc counter */
-    PRIV(symcache)[PRIV(symnum)++] = ((vms_symbol_entry *)entry)->symbol;
-
-  return true;
-}
-
-
-/* Read the symbols from the BFD abfd, and fills in the vector
-   location with pointers to the symbols and a trailing NULL.
-
-   return # of symbols read  */
-
-static long
-vms_get_symtab (abfd, symbols)
-     bfd *abfd;
-     asymbol **symbols;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_symtab(%p, <ret>)\n", abfd);
-#endif
-
-	/* init counter */
-  (void)copy_symbols((struct bfd_hash_entry *)0, abfd);
-
-	/* traverse table and fill symbols vector */
-
-  PRIV(symcache) = symbols;
-  bfd_hash_traverse(PRIV(vms_symbol_table), copy_symbols, (PTR)abfd);
-
-  symbols[PRIV(gsd_sym_count)] = NULL;
-
-  return PRIV(gsd_sym_count);
-}
-
-
-/* Create a new asymbol structure for the BFD abfd and return a pointer
-   to it.
-   This routine is necessary because each back end has private information
-   surrounding the asymbol. Building your own asymbol and pointing to it
-   will not create the private information, and will cause problems later on.  */
-
-asymbol *
-_bfd_vms_make_empty_symbol (abfd)
-     bfd *abfd;
-{
-  asymbol *symbol = (asymbol *)bfd_zalloc(abfd, sizeof(asymbol));
-
-#if VMS_DEBUG
-  vms_debug (1, "_bfd_vms_make_empty_symbol(%p)\n", abfd);
-#endif
-
-  if (symbol == 0)
-    {
-      bfd_set_error (bfd_error_no_memory);
-      return 0;
-    }
-  symbol->the_bfd = abfd;
-
-  return symbol;
-}
-
-
-/* Print symbol to file according to how. how is one of
-   bfd_print_symbol_name	just print the name
-   bfd_print_symbol_more	print more (???)
-   bfd_print_symbol_all	print all we know, which is not much right now :-)  */
-
-static void
-vms_print_symbol (abfd, file, symbol, how)
-     bfd *abfd;
-     PTR file;
-     asymbol *symbol;
-     bfd_print_symbol_type how;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_print_symbol(%p, %p, %p, %d)\n", abfd, file, symbol, how);
-#endif
-
-  switch (how)
-    {
-      case bfd_print_symbol_name:
-      case bfd_print_symbol_more:
-	fprintf((FILE *)file," %s", symbol->name);
-      break;
-
-      break;
-
-      case bfd_print_symbol_all:
-	{
-	  CONST char *section_name = symbol->section->name;
-
-	  bfd_print_symbol_vandf((PTR)file,symbol);
-
-	  fprintf((FILE *)file," %-8s %s", section_name, symbol->name);
-        }
-      break;
-    }
-  return;
-}
-
-
-/* Return information about symbol in ret.
-
-   fill type, value and name
-   type:
-	A	absolute
-	B	bss segment symbol
-	C	common symbol
-	D	data segment symbol
-	f	filename
-	t	a static function symbol
-	T	text segment symbol
-	U	undefined
-	-	debug  */
-
-static void
-vms_get_symbol_info (abfd, symbol, ret)
-     bfd *abfd;
-     asymbol *symbol;
-     symbol_info *ret;
-{
-  asection *sec;
-
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_symbol_info(%p, %p, %p)\n", abfd, symbol, ret);
-#endif
-
-  sec = symbol->section;
-
-  if (ret == 0)
-    return;
-
-  if (bfd_is_com_section (sec))
-    ret->type = 'C';
-  else if (bfd_is_abs_section (sec))
-    ret->type = 'A';
-  else if (bfd_is_und_section (sec))
-    ret->type = 'U';
-  else if (bfd_is_ind_section (sec))
-    ret->type = 'I';
-  else if (bfd_get_section_flags (abfd, sec) & SEC_CODE)
-    ret->type = 'T';
-  else if (bfd_get_section_flags (abfd, sec) & SEC_DATA)
-    ret->type = 'D';
-  else if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC)
-    ret->type = 'B';
-  else
-    ret->type = '-';
-
-  if (ret->type != 'U')
-    ret->value = symbol->value + symbol->section->vma;
-  else
-    ret->value = 0;
-  ret->name = symbol->name;
-
-  return;
-}
-
-
-/* Return true if the given symbol sym in the BFD abfd is
-   a compiler generated local label, else return false.  */
-
-static boolean
-vms_bfd_is_local_label_name (abfd, name)
-     bfd *abfd;
-     const char *name;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_is_local_label_name(%p, %s)\n", abfd, name);
-#endif
-  return name[0] == '$';
-}
-
-
-/* Get source line number for symbol  */
-
-static alent *
-vms_get_lineno (abfd, symbol)
-     bfd *abfd;
-     asymbol *symbol;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_lineno(%p, %p)\n", abfd, symbol);
-#endif
-  return 0;
-}
-
-
-/* Provided a BFD, a section and an offset into the section, calculate and
-   return the name of the source file and the line nearest to the wanted
-   location.  */
-
-static boolean
-vms_find_nearest_line (abfd, section, symbols, offset, file, func, line)
-     bfd *abfd;
-     asection *section;
-     asymbol **symbols;
-     bfd_vma offset;
-     CONST char **file;
-     CONST char **func;
-     unsigned int *line;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_find_nearest_line(%p, %s, %p, %ld, <ret>, <ret>, <ret>)\n",
-	      abfd, section->name, symbols, (long int)offset);
-#endif
-  return false;
-}
-
-
-/* Back-door to allow format-aware applications to create debug symbols
-   while using BFD for everything else.  Currently used by the assembler
-   when creating COFF files.  */
-
-static asymbol *
-vms_bfd_make_debug_symbol (abfd, ptr, size)
-     bfd *abfd;
-     void *ptr;
-     unsigned long size;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_make_debug_symbol(%p, %p, %ld)\n", abfd, ptr, size);
-#endif
-  return 0;
-}
-
-
-/* Read minisymbols.  For minisymbols, we use the unmodified a.out
-   symbols.  The minisymbol_to_symbol function translates these into
-   BFD asymbol structures.  */
-
-static long
-vms_read_minisymbols (abfd, dynamic, minisymsp, sizep)
-     bfd *abfd;
-     boolean dynamic;
-     PTR *minisymsp;
-     unsigned int *sizep;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_read_minisymbols(%p, %d, %p, %d)\n", abfd, dynamic, minisymsp, *sizep);
-#endif
-  return _bfd_generic_read_minisymbols (abfd, dynamic, minisymsp, sizep);
-}
-
-/* Convert a minisymbol to a BFD asymbol.  A minisymbol is just an
-   unmodified a.out symbol.  The SYM argument is a structure returned
-   by bfd_make_empty_symbol, which we fill in here.  */
-
-static asymbol *
-vms_minisymbol_to_symbol (abfd, dynamic, minisym, sym)
-     bfd *abfd;
-     boolean dynamic;
-     const PTR minisym;
-     asymbol *sym;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_minisymbol_to_symbol(%p, %d, %p, %p)\n", abfd, dynamic, minisym, sym);
-#endif
-  return _bfd_generic_minisymbol_to_symbol (abfd, dynamic, minisym, sym);
-}
-
-/*-- Part 4.6, relocations --------------------------------------------------*/
-
-/* Return the number of bytes required to store the relocation information
-   associated with section sect attached to bfd abfd.
-   If an error occurs, return -1.  */
-
-static long
-vms_get_reloc_upper_bound (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_reloc_upper_bound(%p, %s)\n", abfd, section->name);
-#endif
-  return -1L;
-}
-
-
-/* Call the back end associated with the open BFD abfd and translate the
-   external form of the relocation information attached to sec into the
-   internal canonical form.  Place the table into memory at loc, which has
-   been preallocated, usually by a call to bfd_get_reloc_upper_bound.
-   Returns the number of relocs, or -1 on error.  */
-
-static long
-vms_canonicalize_reloc (abfd, section, location, symbols)
-     bfd *abfd;
-     asection *section;
-     arelent **location;
-     asymbol **symbols;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_canonicalize_reloc(%p, %s, <ret>, <ret>)\n", abfd, section->name);
-#endif
-  return false;
-}
-
-/*---------------------------------------------------------------------------*/
-/* this is just copied from ecoff-alpha, needs to be fixed probably */
-
-/* How to process the various reloc types.  */
-
-static bfd_reloc_status_type
-reloc_nil (abfd, reloc, sym, data, sec, output_bfd, error_message)
-     bfd *abfd;
-     arelent *reloc;
-     asymbol *sym;
-     PTR data;
-     asection *sec;
-     bfd *output_bfd;
-     char **error_message;
-{
-#if VMS_DEBUG
-  vms_debug (1, "reloc_nil(abfd %p, output_bfd %p)\n", abfd, output_bfd);
-  vms_debug (2, "In section %s, symbol %s\n",
-	sec->name, sym->name);
-  vms_debug (2, "reloc sym %s, addr %08lx, addend %08lx, reloc is a %s\n",
-		reloc->sym_ptr_ptr[0]->name,
-		(unsigned long)reloc->address,
-		(unsigned long)reloc->addend, reloc->howto->name);
-  vms_debug (2, "data at %p\n", data);
-/*  _bfd_hexdump (2, data, bfd_get_reloc_size(reloc->howto),0); */
-#endif
-
-  return bfd_reloc_ok;
-}
-
-/* In case we're on a 32-bit machine, construct a 64-bit "-1" value
-   from smaller values.  Start with zero, widen, *then* decrement.  */
-#define MINUS_ONE	(((bfd_vma)0) - 1)
-
-static reloc_howto_type alpha_howto_table[] =
-{
-  HOWTO (ALPHA_R_IGNORE,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 8,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "IGNORE",		/* name */
-	 true,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 true),			/* pcrel_offset */
-
-  /* A 64 bit reference to a symbol.  */
-  HOWTO (ALPHA_R_REFQUAD,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "REFQUAD",		/* name */
-	 true,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 21 bit branch.  The native assembler generates these for
-     branches within the text segment, and also fills in the PC
-     relative offset in the instruction.  */
-  HOWTO (ALPHA_R_BRADDR,	/* type */
-	 2,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 21,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "BRADDR",		/* name */
-	 true,			/* partial_inplace */
-	 0x1fffff,		/* src_mask */
-	 0x1fffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A hint for a jump to a register.  */
-  HOWTO (ALPHA_R_HINT,		/* type */
-	 2,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 14,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "HINT",		/* name */
-	 true,			/* partial_inplace */
-	 0x3fff,		/* src_mask */
-	 0x3fff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 16 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL16,	/* type */
-	 0,			/* rightshift */
-	 1,			/* size (0 = byte, 1 = short, 2 = long) */
-	 16,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "SREL16",		/* name */
-	 true,			/* partial_inplace */
-	 0xffff,		/* src_mask */
-	 0xffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* 32 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL32,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "SREL32",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit PC relative offset.  */
-  HOWTO (ALPHA_R_SREL64,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 true,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "SREL64",		/* name */
-	 true,			/* partial_inplace */
-	 MINUS_ONE,		/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Push a value on the reloc evaluation stack.  */
-  HOWTO (ALPHA_R_OP_PUSH,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "OP_PUSH",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Store the value from the stack at the given address.  Store it in
-     a bitfield of size r_size starting at bit position r_offset.  */
-  HOWTO (ALPHA_R_OP_STORE,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "OP_STORE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 MINUS_ONE,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Subtract the reloc address from the value on the top of the
-     relocation stack.  */
-  HOWTO (ALPHA_R_OP_PSUB,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "OP_PSUB",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Shift the value on the top of the relocation stack right by the
-     given value.  */
-  HOWTO (ALPHA_R_OP_PRSHIFT,	/* type */
-	 0,			/* rightshift */
-	 0,			/* size (0 = byte, 1 = short, 2 = long) */
-	 0,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "OP_PRSHIFT",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* Hack. Linkage is done by linker.  */
-  HOWTO (ALPHA_R_LINKAGE,	/* type */
-	 0,			/* rightshift */
-	 8,			/* size (0 = byte, 1 = short, 2 = long) */
-	 256,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_dont, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "LINKAGE",		/* name */
-	 false,			/* partial_inplace */
-	 0,			/* src_mask */
-	 0,			/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 32 bit reference to a symbol.  */
-  HOWTO (ALPHA_R_REFLONG,	/* type */
-	 0,			/* rightshift */
-	 2,			/* size (0 = byte, 1 = short, 2 = long) */
-	 32,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "REFLONG",		/* name */
-	 true,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-  /* A 64 bit reference to a procedure, written as 32 bit value.  */
-  HOWTO (ALPHA_R_CODEADDR,	/* type */
-	 0,			/* rightshift */
-	 4,			/* size (0 = byte, 1 = short, 2 = long) */
-	 64,			/* bitsize */
-	 false,			/* pc_relative */
-	 0,			/* bitpos */
-	 complain_overflow_signed,/* complain_on_overflow */
-	 reloc_nil,		/* special_function */
-	 "CODEADDR",		/* name */
-	 false,			/* partial_inplace */
-	 0xffffffff,		/* src_mask */
-	 0xffffffff,		/* dst_mask */
-	 false),		/* pcrel_offset */
-
-};
-
-/* Return a pointer to a howto structure which, when invoked, will perform
-   the relocation code on data from the architecture noted.  */
-
-static const struct reloc_howto_struct *
-vms_bfd_reloc_type_lookup (abfd, code)
-     bfd *abfd;
-     bfd_reloc_code_real_type code;
-{
-  int alpha_type;
-
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_reloc_type_lookup(%p, %d)\t", abfd, code);
-#endif
-
-  switch (code)
-    {
-      case BFD_RELOC_16:		alpha_type = ALPHA_R_SREL16;	break;
-      case BFD_RELOC_32:		alpha_type = ALPHA_R_REFLONG;	break;
-      case BFD_RELOC_64:		alpha_type = ALPHA_R_REFQUAD;	break;
-      case BFD_RELOC_CTOR:		alpha_type = ALPHA_R_REFQUAD;	break;
-      case BFD_RELOC_23_PCREL_S2:	alpha_type = ALPHA_R_BRADDR;	break;
-      case BFD_RELOC_ALPHA_HINT:	alpha_type = ALPHA_R_HINT;	break;
-      case BFD_RELOC_16_PCREL:		alpha_type = ALPHA_R_SREL16;	break;
-      case BFD_RELOC_32_PCREL:		alpha_type = ALPHA_R_SREL32;	break;
-      case BFD_RELOC_64_PCREL:		alpha_type = ALPHA_R_SREL64;	break;
-      case BFD_RELOC_ALPHA_LINKAGE:	alpha_type = ALPHA_R_LINKAGE;	break;
-      case BFD_RELOC_ALPHA_CODEADDR:	alpha_type = ALPHA_R_CODEADDR;	break;
-      default:
-	(*_bfd_error_handler) ("reloc (%d) is *UNKNOWN*", code);
-	return (const struct reloc_howto_struct *) NULL;
-    }
-#if VMS_DEBUG
-  vms_debug (2, "reloc is %s\n", alpha_howto_table[alpha_type].name);
-#endif
-  return &alpha_howto_table[alpha_type];
-}
-
-
-/*-- Part 4.7, writing an object file ---------------------------------------*/
-
-/* Set the architecture and machine type in BFD abfd to arch and mach.
-   Find the correct pointer to a structure and insert it into the arch_info
-   pointer.  */
-
-static boolean
-vms_set_arch_mach (abfd, arch, mach)
-     bfd *abfd;
-     enum bfd_architecture arch;
-     unsigned long mach;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_set_arch_mach(%p, %d, %ld)\n", abfd, arch, mach);
-#endif
-  abfd->arch_info = bfd_scan_arch("alpha");
-
-  return true;
-}
-
-
-/* Sets the contents of the section section in BFD abfd to the data starting
-   in memory at data. The data is written to the output section starting at
-   offset offset for count bytes.
-
-   Normally true is returned, else false. Possible error returns are:
-   o bfd_error_no_contents - The output section does not have the
-	SEC_HAS_CONTENTS attribute, so nothing can be written to it.
-   o and some more too  */
-
-static boolean
-vms_set_section_contents (abfd, section, location, offset, count)
-     bfd *abfd;
-     asection *section;
-     PTR location;
-     file_ptr offset;
-     bfd_size_type count;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_set_section_contents(%p, sec %s, loc %p, off %ld, count %d)\n",
-					abfd, section->name, location, (long int)offset, (int)count);
-  vms_debug (2, "secraw %d, seccooked %d\n", (int)section->_raw_size, (int)section->_cooked_size);
-#endif
-  return _bfd_save_vms_section(abfd, section, location, offset, count);
-}
-
-
-/*-- Part 4.8, linker -------------------------------------------------------*/
-
-/* Get the size of the section headers.  */
-
-static int
-vms_sizeof_headers (abfd, reloc)
-     bfd *abfd;
-     boolean reloc;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_sizeof_headers(%p, %s)\n", abfd, (reloc)?"True":"False");
-#endif
-  return 0;
-}
-
-
-/* Provides default handling of relocation effort for back ends
-   which can't be bothered to do it efficiently.  */
-
-static bfd_byte *
-vms_bfd_get_relocated_section_contents (abfd, link_info, link_order, data,
-					 relocateable, symbols)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-     struct bfd_link_order *link_order;
-     bfd_byte *data;
-     boolean relocateable;
-     asymbol **symbols;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_get_relocated_section_contents(%p, %p, %p, %p, %s, %p)\n",
-			abfd, link_info, link_order, data, (relocateable)?"True":"False", symbols);
-#endif
-  return 0;
-}
-
-
-/* ???  */
-
-static boolean
-vms_bfd_relax_section (abfd, section, link_info, again)
-     bfd *abfd;
-     asection *section;
-     struct bfd_link_info *link_info;
-     boolean *again;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_relax_section(%p, %s, %p, <ret>)\n",
-					abfd, section->name, link_info);
-#endif
-  return true;
-}
-
-static boolean
-vms_bfd_gc_sections (abfd, link_info)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_gc_sections(%p, %p)\n", abfd, link_info);
-#endif
-  return true;
-}
-
-
-/* Create a hash table for the linker.  Different backends store
-   different information in this table.  */
-
-static struct bfd_link_hash_table *
-vms_bfd_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_link_hash_table_create(%p)\n", abfd);
-#endif
-  return 0;
-}
-
-
-/* Add symbols from this object file into the hash table.  */
-
-static boolean
-vms_bfd_link_add_symbols (abfd, link_info)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_link_add_symbols(%p, %p)\n", abfd, link_info);
-#endif
-  return false;
-}
-
-
-/* Do a link based on the link_order structures attached to each
-   section of the BFD.  */
-
-static boolean
-vms_bfd_final_link (abfd, link_info)
-     bfd *abfd;
-     struct bfd_link_info *link_info;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_final_link(%p, %p)\n", abfd, link_info);
-#endif
-  return true;
-}
-
-/* Should this section be split up into smaller pieces during linking.  */
-
-static boolean
-vms_bfd_link_split_section (abfd, section)
-     bfd *abfd;
-     asection *section;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_link_split_section(%p, %s)\n", abfd, section->name);
-#endif
-  return false;
-}
-
-/*-- Part 4.9, dynamic symbols and relocations ------------------------------*/
-
-/* Get the amount of memory required to hold the dynamic symbols.  */
-
-static long
-vms_get_dynamic_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_dynamic_symtab_upper_bound(%p)\n", abfd);
-#endif
-  return 0;
-}
-
-static boolean
-vms_bfd_print_private_bfd_data (abfd, file)
-    bfd *abfd;
-    void *file;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_bfd_print_private_bfd_data(%p)\n", abfd);
-#endif
-  return 0;
-}
-
-
-/* Read in the dynamic symbols.  */
-
-static long
-vms_canonicalize_dynamic_symtab (abfd, symbols)
-     bfd *abfd;
-     asymbol **symbols;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_canonicalize_dynamic_symtab(%p, <ret>)\n", abfd);
-#endif
-  return 0L;
-}
-
-
-/* Get the amount of memory required to hold the dynamic relocs.  */
-
-static long
-vms_get_dynamic_reloc_upper_bound (abfd)
-     bfd *abfd;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_get_dynamic_reloc_upper_bound(%p)\n", abfd);
-#endif
-  return 0L;
-}
-
-
-/* Read in the dynamic relocs.  */
-
-static long
-vms_canonicalize_dynamic_reloc (abfd, arel, symbols)
-     bfd *abfd;
-     arelent **arel;
-     asymbol **symbols;
-{
-#if VMS_DEBUG
-  vms_debug (1, "vms_canonicalize_dynamic_reloc(%p)\n", abfd);
-#endif
-  return 0L;
-}
diff --git a/bfd/vms.h b/bfd/vms.h
deleted file mode 100644
index d6bdd02a720..00000000000
--- a/bfd/vms.h
+++ /dev/null
@@ -1,675 +0,0 @@
-#undef vms
-/* vms.h -- Header file for VMS (Alpha and Vax) support.
-   Copyright 1996, 1997 Free Software Foundation, Inc.
-
-   Written by Klaus K"ampf (kkaempf@rmi.de)
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#ifndef VMS_H
-#define VMS_H
-
-
-/* Constants starting with 'Exxx_' are for openVMS/Alpha (EVAX object language)  */
-
-/* VMS Text, information and relocation record (TIR/ETIR) definitions.  */
-
-#define TIR_S_C_STA_GBL		0
-#define TIR_S_C_STA_SB		1
-#define TIR_S_C_STA_SW		2
-#define TIR_S_C_STA_LW		3
-#define TIR_S_C_STA_PB		4
-#define TIR_S_C_STA_PW		5
-#define TIR_S_C_STA_PL		6
-#define TIR_S_C_STA_UB  	7
-#define TIR_S_C_STA_UW  	8
-#define TIR_S_C_STA_BFI 	9
-#define TIR_S_C_STA_WFI 	10
-#define TIR_S_C_STA_LFI 	11
-#define TIR_S_C_STA_EPM 	12
-#define TIR_S_C_STA_CKARG       13
-#define TIR_S_C_STA_WPB 	14
-#define TIR_S_C_STA_WPW 	15
-#define TIR_S_C_STA_WPL 	16
-#define TIR_S_C_STA_LSY 	17
-#define TIR_S_C_STA_LIT 	18
-#define TIR_S_C_STA_LEPM        19
-#define TIR_S_C_MAXSTACOD       19
-#define TIR_S_C_MINSTOCOD       20
-#define TIR_S_C_STO_SB  	20
-#define TIR_S_C_STO_SW  	21
-#define TIR_S_C_STO_L   	22
-#define TIR_S_C_STO_LW  	22
-#define TIR_S_C_STO_BD  	23
-#define TIR_S_C_STO_WD  	24
-#define TIR_S_C_STO_LD  	25
-#define TIR_S_C_STO_LI  	26
-#define TIR_S_C_STO_PIDR        27
-#define TIR_S_C_STO_PICR        28
-#define TIR_S_C_STO_RSB 	29
-#define TIR_S_C_STO_RSW 	30
-#define TIR_S_C_STO_RL  	31
-#define TIR_S_C_STO_VPS 	32
-#define TIR_S_C_STO_USB 	33
-#define TIR_S_C_STO_USW 	34
-#define TIR_S_C_STO_RUB 	35
-#define TIR_S_C_STO_RUW 	36
-#define TIR_S_C_STO_B   	37
-#define TIR_S_C_STO_W   	38
-#define TIR_S_C_STO_RB  	39
-#define TIR_S_C_STO_RW  	40
-#define TIR_S_C_STO_RIVB        41
-#define TIR_S_C_STO_PIRR        42
-#define TIR_S_C_MAXSTOCOD       42
-#define TIR_S_C_MINOPRCOD       50
-#define TIR_S_C_OPR_NOP 	50
-#define TIR_S_C_OPR_ADD 	51
-#define TIR_S_C_OPR_SUB 	52
-#define TIR_S_C_OPR_MUL 	53
-#define TIR_S_C_OPR_DIV 	54
-#define TIR_S_C_OPR_AND 	55
-#define TIR_S_C_OPR_IOR 	56
-#define TIR_S_C_OPR_EOR 	57
-#define TIR_S_C_OPR_NEG 	58
-#define TIR_S_C_OPR_COM 	59
-#define TIR_S_C_OPR_INSV        60
-#define TIR_S_C_OPR_ASH 	61
-#define TIR_S_C_OPR_USH 	62
-#define TIR_S_C_OPR_ROT 	63
-#define TIR_S_C_OPR_SEL 	64
-#define TIR_S_C_OPR_REDEF       65
-#define TIR_S_C_OPR_DFLIT       66
-#define TIR_S_C_MAXOPRCOD       66
-#define TIR_S_C_MINCTLCOD       80
-#define TIR_S_C_CTL_SETRB       80
-#define TIR_S_C_CTL_AUGRB       81
-#define TIR_S_C_CTL_DFLOC       82
-#define TIR_S_C_CTL_STLOC       83
-#define TIR_S_C_CTL_STKDL       84
-#define TIR_S_C_MAXCTLCOD       84
-
-#define ETIR_S_C_MINSTACOD 0		/* Minimum store code		*/
-#define ETIR_S_C_STA_GBL 0		/* Stack global symbol value	*/
-#define ETIR_S_C_STA_LW 1		/* Stack longword		*/
-#define ETIR_S_C_STA_QW 2		/* Stack quadword		*/
-#define ETIR_S_C_STA_PQ 3		/* Stack psect base plus quadword offset  */
-#define ETIR_S_C_STA_LI 4		/* Stack literal		*/
-#define ETIR_S_C_STA_MOD 5		/* Stack module			*/
-#define ETIR_S_C_STA_CKARG 6		/* Check Arguments		*/
-#define ETIR_S_C_MAXSTACOD 6		/* Maximum stack code		*/
-#define ETIR_S_C_MINSTOCOD 50		/* Minimum store code		*/
-#define ETIR_S_C_STO_B 50		/* Store byte			*/
-#define ETIR_S_C_STO_W 51		/* Store word			*/
-#define ETIR_S_C_STO_LW 52		/* Store longword		*/
-#define ETIR_S_C_STO_QW 53		/* Store quadword		*/
-#define ETIR_S_C_STO_IMMR 54		/* Store immediate Repeated	*/
-#define ETIR_S_C_STO_GBL 55		/* Store global			*/
-#define ETIR_S_C_STO_CA 56		/* Store code address		*/
-#define ETIR_S_C_STO_RB 57		/* Store relative branch	*/
-#define ETIR_S_C_STO_AB 58		/* Store absolute branch	*/
-#define ETIR_S_C_STO_OFF 59		/* Store offset within psect	*/
-#define ETIR_S_C_STO_IMM 61		/* Store immediate		*/
-#define ETIR_S_C_STO_GBL_LW 62		/* Store global Longword	*/
-#define ETIR_S_C_STO_LP_PSB 63		/* STO_LP_PSB not valid in level 2 use STC_LP_PSB			*/
-#define ETIR_S_C_STO_HINT_GBL 64	/* Store 14 bit HINT at global address */
-#define ETIR_S_C_STO_HINT_PS 65		/* Store 14 bit HINT at psect + offset */
-#define ETIR_S_C_MAXSTOCOD 65		/* Maximum store code		*/
-#define ETIR_S_C_MINOPRCOD 100		/* Minimum operate code		*/
-#define ETIR_S_C_OPR_NOP 100		/* No-op			*/
-#define ETIR_S_C_OPR_ADD 101		/* Add				*/
-#define ETIR_S_C_OPR_SUB 102		/* Subtract			*/
-#define ETIR_S_C_OPR_MUL 103		/* Multiply			*/
-#define ETIR_S_C_OPR_DIV 104		/* Divide			*/
-#define ETIR_S_C_OPR_AND 105		/* Logical AND			*/
-#define ETIR_S_C_OPR_IOR 106		/* Logical inclusive OR		*/
-#define ETIR_S_C_OPR_EOR 107		/* Logical exclusive OR		*/
-#define ETIR_S_C_OPR_NEG 108		/* Negate			*/
-#define ETIR_S_C_OPR_COM 109		/* Complement			*/
-#define ETIR_S_C_OPR_INSV 110		/* Insert bit field		*/
-#define ETIR_S_C_OPR_ASH 111		/* Arithmetic shift		*/
-#define ETIR_S_C_OPR_USH 112		/* Unsigned shift		*/
-#define ETIR_S_C_OPR_ROT 113		/* Rotate			*/
-#define ETIR_S_C_OPR_SEL 114		/* Select one of three longwords on top of stack  */
-#define ETIR_S_C_OPR_REDEF 115		/* Redefine this symbol after pass 2  */
-#define ETIR_S_C_OPR_DFLIT 116		/* Define a literal		*/
-#define ETIR_S_C_MAXOPRCOD 116		/* Maximum operate code		*/
-#define ETIR_S_C_MINCTLCOD 150		/* Minimum control code		*/
-#define ETIR_S_C_CTL_SETRB 150		/* Set relocation base		*/
-#define ETIR_S_C_CTL_AUGRB 151		/* Augment relocation base	*/
-#define ETIR_S_C_CTL_DFLOC 152		/* Define debug location	*/
-#define ETIR_S_C_CTL_STLOC 153		/* Set debug location		*/
-#define ETIR_S_C_CTL_STKDL 154		/* Stack debug location		*/
-#define ETIR_S_C_MAXCTLCOD 154		/* Maximum control code		*/
-#define ETIR_S_C_MINSTCCOD 200		/* Minimum store-conditional code    */
-#define ETIR_S_C_STC_LP 200		/* Store-conditional Linkage Pair    */
-#define ETIR_S_C_STC_LP_PSB 201		/* Store-conditional Linkage Pair with Procedure Signature */
-#define ETIR_S_C_STC_GBL 202		/* Store-conditional Address at global address */
-#define ETIR_S_C_STC_GCA 203		/* Store-conditional Code Address at global address */
-#define ETIR_S_C_STC_PS 204		/* Store-conditional Address at psect + offset */
-#define ETIR_S_C_STC_NOP_GBL 205	/* Store-conditional NOP at address of global */
-#define ETIR_S_C_STC_NOP_PS 206		/* Store-conditional NOP at pect + offset */
-#define ETIR_S_C_STC_BSR_GBL 207	/* Store-conditional BSR at global address */
-#define ETIR_S_C_STC_BSR_PS 208		/* Store-conditional BSR at pect + offset */
-#define ETIR_S_C_STC_LDA_GBL 209	/* Store-conditional LDA at global address */
-#define ETIR_S_C_STC_LDA_PS 210		/* Store-conditional LDA at psect + offset */
-#define ETIR_S_C_STC_BOH_GBL 211	/* Store-conditional BSR or Hint at global address */
-#define ETIR_S_C_STC_BOH_PS 212		/* Store-conditional BSR or Hint at pect + offset */
-#define ETIR_S_C_STC_NBH_GBL 213	/* Store-conditional NOP,BSR or HINT at global address */
-#define ETIR_S_C_STC_NBH_PS 214		/* Store-conditional NOP,BSR or HINT at psect + offset */
-#define ETIR_S_C_MAXSTCCOD 214		/* Maximum store-conditional code    */
-
-/* VMS Global symbol definition record (GSD/EGSD).  */
-
-#define GSD_S_K_ENTRIES 1
-#define GSD_S_C_ENTRIES 1
-#define GSD_S_C_PSC     0
-#define GSD_S_C_SYM     1
-#define GSD_S_C_EPM     2
-#define GSD_S_C_PRO     3
-#define GSD_S_C_SYMW    4
-#define GSD_S_C_EPMW    5
-#define GSD_S_C_PROW    6
-#define GSD_S_C_IDC     7
-#define GSD_S_C_ENV     8
-#define GSD_S_C_LSY     9
-#define GSD_S_C_LEPM    10
-#define GSD_S_C_LPRO    11
-#define GSD_S_C_SPSC    12
-#define GSD_S_C_SYMV    13
-#define GSD_S_C_EPMV    14
-#define GSD_S_C_PROV    15
-#define GSD_S_C_MAXRECTYP       15
-
-#define EGSD_S_K_ENTRIES 2	/* Offset to first entry in record	*/
-#define EGSD_S_C_ENTRIES 2	/* Offset to first entry in record	*/
-#define EGSD_S_C_PSC 0		/* Psect definition			*/
-#define EGSD_S_C_SYM 1		/* Symbol specification			*/
-#define EGSD_S_C_IDC 2		/* Random entity check			*/
-#define EGSD_S_C_SPSC 5		/* Shareable image psect definition	*/
-#define EGSD_S_C_SYMV 6		/* Vectored (dual-valued) versions of SYM, */
-#define EGSD_S_C_SYMM 7		/* Masked versions of SYM,		*/
-#define EGSD_S_C_SYMG 8		/* EGST - gst version of SYM		*/
-#define EGSD_S_C_MAXRECTYP 8	/* Maximum entry type defined		*/
-
-#define GPS_S_M_PIC     1
-#define GPS_S_M_LIB     2
-#define GPS_S_M_OVR     4
-#define GPS_S_M_REL     8
-#define GPS_S_M_GBL     16
-#define GPS_S_M_SHR     32
-#define GPS_S_M_EXE     64
-#define GPS_S_M_RD      128
-#define GPS_S_M_WRT     256
-#define GPS_S_M_VEC     512
-#define GPS_S_K_NAME    9
-#define GPS_S_C_NAME    9
-
-#define EGPS_S_V_PIC	0x0001
-#define EGPS_S_V_LIB	0x0002
-#define EGPS_S_V_OVR	0x0004
-#define EGPS_S_V_REL	0x0008
-#define EGPS_S_V_GBL	0x0010
-#define EGPS_S_V_SHR	0x0020
-#define EGPS_S_V_EXE	0x0040
-#define EGPS_S_V_RD	0x0080
-#define EGPS_S_V_WRT	0x0100
-#define EGPS_S_V_VEC	0x0200
-#define EGPS_S_V_NOMOD	0x0400
-#define EGPS_S_V_COM	0x0800
-
-#define GSY_S_M_WEAK    1
-#define GSY_S_M_DEF     2
-#define GSY_S_M_UNI     4
-#define GSY_S_M_REL     8
-
-#define EGSY_S_V_WEAK	0x0001
-#define EGSY_S_V_DEF	0x0002
-#define EGSY_S_V_UNI	0x0004
-#define EGSY_S_V_REL	0x0008
-#define EGSY_S_V_COMM	0x0010
-#define EGSY_S_V_VECEP	0x0020
-#define EGSY_S_V_NORM	0x0040
-
-#define LSY_S_M_DEF     2
-#define LSY_S_M_REL     8
-
-#define ENV_S_M_DEF     1
-#define ENV_S_M_NESTED  2
-
-/*
- *	Debugger symbol definitions:  These are done by hand, as no
- *					machine-readable version seems
- *					to be available.
- */
-#define DST_S_C_C		  7	/* Language == "C"	*/
-#define DST_S_C_CXX		 15	/* Language == "C++"	*/
-#define DST_S_C_VERSION		153
-#define	DST_S_C_SOURCE		155	/* Source file		*/
-#define DST_S_C_PROLOG		162
-#define	DST_S_C_BLKBEG		176	/* Beginning of block	*/
-#define	DST_S_C_BLKEND		177	/* End of block	*/
-#define DST_S_C_ENTRY		181
-#define DST_S_C_PSECT		184
-#define	DST_S_C_LINE_NUM	185	/* Line Number		*/
-#define DST_S_C_LBLORLIT	186
-#define DST_S_C_LABEL		187
-#define	DST_S_C_MODBEG		188	/* Beginning of module	*/
-#define	DST_S_C_MODEND		189	/* End of module	*/
-#define	DST_S_C_RTNBEG		190	/* Beginning of routine	*/
-#define	DST_S_C_RTNEND		191	/* End of routine	*/
-#define	DST_S_C_DELTA_PC_W	1	/* Incr PC	*/
-#define	DST_S_C_INCR_LINUM	2	/* Incr Line #	*/
-#define	DST_S_C_INCR_LINUM_W	3	/* Incr Line #	*/
-#define DST_S_C_SET_LINUM_INCR	4
-#define DST_S_C_SET_LINUM_INCR_W 5
-#define DST_S_C_RESET_LINUM_INCR 6
-#define DST_S_C_BEG_STMT_MODE	7
-#define DST_S_C_END_STMT_MODE	8
-#define	DST_S_C_SET_LINE_NUM	9	/* Set Line #	*/
-#define DST_S_C_SET_PC		10
-#define DST_S_C_SET_PC_W	11
-#define DST_S_C_SET_PC_L	12
-#define DST_S_C_SET_STMTNUM	13
-#define DST_S_C_TERM		14	/* End of lines	*/
-#define DST_S_C_TERM_W		15	/* End of lines	*/
-#define	DST_S_C_SET_ABS_PC	16	/* Set PC	*/
-#define	DST_S_C_DELTA_PC_L	17	/* Incr PC	*/
-#define DST_S_C_INCR_LINUM_L	18	/* Incr Line #	*/
-#define DST_S_C_SET_LINUM_B	19	/* Set Line #	*/
-#define DST_S_C_SET_LINUM_L	20	/* Set Line #	*/
-#define	DST_S_C_TERM_L		21	/* End of lines	*/
-/* these are used with DST_S_C_SOURCE */
-#define DST_S_C_SRC_DECLFILE	 1	/* Declare source file */
-#define DST_S_C_SRC_SETFILE	 2	/* Set source file */
-#define DST_S_C_SRC_SETREC_L	 3	/* Set record, longword value */
-#define DST_S_C_SRC_SETREC_W	 4	/* Set record, word value */
-#define DST_S_C_SRC_DEFLINES_W	10	/* # of line, word counter */
-#define DST_S_C_SRC_DEFLINES_B	11	/* # of line, byte counter */
-#define DST_S_C_SRC_FORMFEED	16	/* ^L counts as a record */
-/* the following are the codes for the various data types.  Anything not on
- * the list is included under 'advanced_type'
- */
-#define DBG_S_C_UCHAR		0x02
-#define DBG_S_C_USINT		0x03
-#define DBG_S_C_ULINT		0x04
-#define DBG_S_C_UQUAD		0x05
-#define DBG_S_C_SCHAR		0x06
-#define DBG_S_C_SSINT		0x07
-#define DBG_S_C_SLINT		0x08
-#define DBG_S_C_SQUAD		0x09
-#define DBG_S_C_REAL4		0x0a
-#define DBG_S_C_REAL8		0x0b		/* D_float double */
-#define DBG_S_C_COMPLX4		0x0c		/* 2xF_float complex float */
-#define DBG_S_C_COMPLX8		0x0d		/* 2xD_float complex double */
-#define DBG_S_C_REAL8_G		0x1b		/* G_float double */
-#define DBG_S_C_COMPLX8_G	0x1d		/* 2xG_float complex double */
-#define DBG_S_C_FUNCTION_ADDR	0x17
-#define DBG_S_C_ADVANCED_TYPE	0xa3
-/*  Some of these are just for future reference.  [pr]
- */
-#define DBG_S_C_UBITA		0x01	/* unsigned, aligned bit field */
-#define DBG_S_C_UBITU		0x22	/* unsigned, unaligned bit field */
-#define DBG_S_C_SBITA		0x29	/* signed, aligned bit field */
-#define DBG_S_C_SBITU		0x2a	/* signed, unaligned bit field */
-#define DBG_S_C_CSTRING		0x2e	/* asciz ('\0' terminated) string */
-#define DBG_S_C_WCHAR		0x38	/* wchar_t */
-/*  These are descriptor class codes.
- */
-#define DSC_K_CLASS_S		0x01	/* static (fixed length) */
-#define DSC_K_CLASS_D		0x02	/* dynamic string (not via malloc!) */
-#define DSC_K_CLASS_A		0x04	/* array */
-#define DSC_K_CLASS_UBS		0x0d	/* unaligned bit string */
-/*  These are the codes that are used to generate the definitions of struct
- *  union and enum records
- */
-#define DBG_S_C_ENUM_ITEM		0xa4
-#define DBG_S_C_ENUM_START		0xa5
-#define DBG_S_C_ENUM_END		0xa6
-#define DBG_S_C_STRUCT_ITEM		DST_K_VFLAGS_BITOFFS	/* 0xff */
-#define DBG_S_C_STRUCT_START		0xab
-#define DBG_S_C_STRUCT_END		0xac
-#define DST_K_TYPSPEC			0xaf		/* type specification */
-/* These codes are used in the generation of the symbol definition records
- */
-#define DST_K_VFLAGS_NOVAL		0x80	/* struct definition only */
-#define DST_K_VFLAGS_DSC		0xfa	/* descriptor used */
-#define DST_K_VFLAGS_TVS		0xfb	/* trailing value specified */
-#define DST_K_VS_FOLLOWS		0xfd	/* value spec follows */
-#define DST_K_VFLAGS_BITOFFS		0xff	/* value contains bit offset */
-#define DST_K_VALKIND_LITERAL	0
-#define DST_K_VALKIND_ADDR	1
-#define DST_K_VALKIND_DESC	2
-#define DST_K_VALKIND_REG	3
-#define DST_K_REG_VAX_AP	0x0c	/* R12 */
-#define DST_K_REG_VAX_FP	0x0d	/* R13 */
-#define DST_K_REG_VAX_SP	0x0e	/* R14 */
-#define DST_V_VALKIND		0	/* offset of valkind field */
-#define DST_V_INDIRECT		2	/* offset to indirect bit */
-#define DST_V_DISP		3	/* offset to displacement bit */
-#define DST_V_REGNUM		4	/* offset to register number */
-#define DST_M_INDIRECT		(1<<DST_V_INDIRECT)
-#define DST_M_DISP		(1<<DST_V_DISP)
-#define DBG_C_FUNCTION_PARAM	/* 0xc9 */	\
-	(DST_K_VALKIND_ADDR|DST_M_DISP|(DST_K_REG_VAX_AP<<DST_V_REGNUM))
-#define DBG_C_LOCAL_SYM		/* 0xd9 */	\
-	(DST_K_VALKIND_ADDR|DST_M_DISP|(DST_K_REG_VAX_FP<<DST_V_REGNUM))
-/* Kinds of value specifications
- */
-#define DST_K_VS_ALLOC_SPLIT	3	/* split lifetime */
-/* Kinds of type specifications
- */
-#define DST_K_TS_ATOM		0x01	/* atomic type specification */
-#define DST_K_TS_DSC		0x02	/* descriptor type spec */
-#define DST_K_TS_IND		0x03	/* indirect type specification */
-#define DST_K_TS_TPTR		0x04	/* typed pointer type spec */
-#define DST_K_TS_PTR		0x05	/* pointer type spec */
-#define DST_K_TS_ARRAY		0x07	/* array type spec */
-#define DST_K_TS_NOV_LENG	0x0e	/* novel length type spec */
-/*  These are the codes that are used in the suffix records to determine the
- *  actual data type
- */
-#define DBG_S_C_BASIC			DST_K_TS_ATOM
-#define DBG_S_C_BASIC_ARRAY		DST_K_TS_DSC
-#define DBG_S_C_STRUCT			DST_K_TS_IND
-#define DBG_S_C_POINTER			DST_K_TS_TPTR
-#define DBG_S_C_VOID			DST_K_TS_PTR
-#define DBG_S_C_COMPLEX_ARRAY		DST_K_TS_ARRAY
-
-/* VMS Module header record (EMH) definitions.  */
-
-#define MHD_S_C_MHD 0
-#define MHD_S_C_LNM 1
-#define MHD_S_C_SRC 2
-#define MHD_S_C_TTL 3
-#define MHD_S_C_CPR 4
-#define MHD_S_C_MTC 5
-#define MHD_S_C_GTX 6
-#define MHD_S_C_MAXHDRTYP 6
-
-#define EMH_S_C_MHD 0		/* Main header record		*/
-#define EMH_S_C_LNM 1		/* Language name and version	*/
-#define EMH_S_C_SRC 2		/* Source file specification	*/
-#define EMH_S_C_TTL 3		/* Title text of module		*/
-#define EMH_S_C_CPR 4		/* Copyright notice		*/
-#define EMH_S_C_MTC 5		/* Maintenance status		*/
-#define EMH_S_C_GTX 6		/* General text			*/
-#define EMH_S_C_MAXHDRTYP 6	/* Maximum allowable type	*/
-
-/* vms.c.  */
-
-extern asymbol *_bfd_vms_make_empty_symbol PARAMS ((bfd *abfd));
-
-/* vms-gsd.c.  */
-
-extern int _bfd_vms_slurp_gsd PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_write_gsd PARAMS ((bfd *abfd, int objtype));
-
-/* vms-mhd.c.  */
-
-extern int _bfd_vms_slurp_hdr PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_write_hdr PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_slurp_eom PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_write_eom PARAMS ((bfd *abfd, int objtype));
-
-/* vms-tir.c.  */
-
-extern int _bfd_vms_slurp_tir PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_slurp_dbg PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_slurp_tbt PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_slurp_lnk PARAMS ((bfd *abfd, int objtype));
-
-extern int _bfd_vms_write_tir PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_write_tbt PARAMS ((bfd *abfd, int objtype));
-extern int _bfd_vms_write_dbg PARAMS ((bfd *abfd, int objtype));
-
-/* The r_type field in a reloc is one of the following values.  */
-#define ALPHA_R_IGNORE		0
-#define ALPHA_R_REFQUAD		1
-#define ALPHA_R_BRADDR		2
-#define ALPHA_R_HINT		3
-#define ALPHA_R_SREL16		4
-#define ALPHA_R_SREL32		5
-#define ALPHA_R_SREL64		6
-#define ALPHA_R_OP_PUSH		7
-#define ALPHA_R_OP_STORE	8
-#define ALPHA_R_OP_PSUB		9
-#define ALPHA_R_OP_PRSHIFT	10
-#define ALPHA_R_LINKAGE		11
-#define ALPHA_R_REFLONG		12
-#define ALPHA_R_CODEADDR	13
-
-/* Object language definitions.  */
-
-#define OBJ_S_C_HDR 0		/*VAX module header record		*/
-#define OBJ_S_C_GSD 1		/*VAX global symbol definition record	*/
-#define OBJ_S_C_TIR 2		/*VAX text information record		*/
-#define OBJ_S_C_EOM 3		/*VAX end of module record		*/
-#define OBJ_S_C_DBG 4		/*VAX Debugger information record	*/
-#define OBJ_S_C_TBT 5		/*VAX Traceback information record	*/
-#define OBJ_S_C_LNK 6		/*VAX linker options record		*/
-#define OBJ_S_C_EOMW 7		/*VAX end of module word-psect record	*/
-#define OBJ_S_C_MAXRECTYP 7	/*VAX Last assigned record type		*/
-#define EOBJ_S_C_EMH 8		/*EVAX module header record		*/
-#define EOBJ_S_C_EEOM 9		/*EVAX end of module record		*/
-#define EOBJ_S_C_EGSD 10	/*EVAX global symbol definition record  */
-#define EOBJ_S_C_ETIR 11	/*EVAX text information record		*/
-#define EOBJ_S_C_EDBG 12	/*EVAX Debugger information record	*/
-#define EOBJ_S_C_ETBT 13	/*EVAX Traceback information record	*/
-#define EOBJ_S_C_MAXRECTYP 13	/*EVAX Last assigned record type	*/
-#define OBJ_S_K_SUBTYP 1
-#define OBJ_S_C_SUBTYP 1
-#define EOBJ_S_K_SUBTYP 4
-#define EOBJ_S_C_SUBTYP 4
-#define OBJ_S_C_MAXRECSIZ 2048	/*Maximum legal record size         */
-#define EOBJ_S_C_MAXRECSIZ 8192 /*Maximum legal record size         */
-#define OBJ_S_C_STRLVL 0	/*Structure level                   */
-#define EOBJ_S_C_STRLVL 2	/*Structure level                   */
-#define OBJ_S_C_SYMSIZ 31	/*Maximum symbol length		*/
-#define EOBJ_S_C_SYMSIZ 64	/*Maximum symbol length		*/
-#define EOBJ_S_C_SECSIZ 31	/*Maximum section name length		*/
-#define OBJ_S_C_STOREPLIM -1	/*Maximum repeat count on store commands  */
-#define EOBJ_S_C_STOREPLIM -1	/*Maximum repeat count on store commands  */
-#define OBJ_S_C_PSCALILIM 9	/*Maximum p-sect alignment          */
-#define EOBJ_S_C_PSCALILIM 16	/*Maximum p-sect alignment          */
-
-#define EVAX_OFFSET	256	/*type offset for EVAX codes in switch  */
-/* Miscellaneous definitions.  */
-
-#if __GNUC__
-typedef unsigned long long uquad;
-#else
-typedef unsigned long uquad;
-#endif
-
-#define MAX_OUTREC_SIZE 4096
-#define MIN_OUTREC_LUFT 64
-
-typedef struct _vms_section {
-  unsigned char *contents;
-  bfd_vma offset;
-  bfd_size_type size;
-  struct _vms_section *next;
-} vms_section;
-
-extern boolean _bfd_save_vms_section
-  PARAMS ((bfd *abfd, asection *section, PTR data, file_ptr offset,
-	   bfd_size_type count));
-extern vms_section *_bfd_get_vms_section PARAMS ((bfd *abfd, int index));
-
-typedef struct _vms_reloc {
-  struct _vms_reloc *next;
-  arelent *reloc;
-  asection *section;
-} vms_reloc;
-
-/* vms module header  */
-
-struct hdr_struc {
-  int hdr_b_strlvl;
-  long hdr_l_arch1;
-  long hdr_l_arch2;
-  long hdr_l_recsiz;
-  char *hdr_t_name;
-  char *hdr_t_version;
-  char *hdr_t_date;
-  char *hdr_c_lnm;
-  char *hdr_c_src;
-  char *hdr_c_ttl;
-};
-
-
-/* vms end of module  */
-
-struct eom_struc {
-  long eom_l_total_lps;
-  unsigned char eom_b_comcod;
-  boolean eom_has_transfer;
-  unsigned char eom_b_tfrflg;
-  long eom_l_psindx;
-  long eom_l_tfradr;
-};
-
-enum file_format_enum { FF_UNKNOWN, FF_FOREIGN, FF_NATIVE, FF_VAX };
-
-typedef struct vms_symbol_struct {
-  struct bfd_hash_entry bfd_hash;
-  asymbol *symbol;
-} vms_symbol_entry;
-
-/* stack value for push/pop commands  */
-
-struct stack_struct {
-  uquad value;
-  int psect;
-};
-#define STACKSIZE 8192
-
-/* location stack definitions for CTL_DFLOC, CTL_STLOC, and CTL_STKDL  */
-
-struct location_struct {
-  unsigned long value;
-  int psect;
-};
-#define LOCATION_SAVE_SIZE 32
-
-#define VMS_SECTION_COUNT 1024
-
-struct vms_private_data_struct {
-  int is_vax;
-  boolean fixup_done;			/* Flag to indicate if all
-					   section pointers and PRIV(sections)
-					   are set up correctly  */
-  unsigned char *vms_buf;		/* buffer to record  */
-  int buf_size;				/* max size of buffer  */
-  unsigned char *vms_rec;		/* actual record ptr  */
-  int rec_length;			/* remaining record length  */
-  int rec_size;				/* actual record size  */
-  int rec_type;				/* actual record type  */
-  enum file_format_enum file_format;
-
-  struct hdr_struc hdr_data;		/* data from HDR/EMH record  */
-  struct eom_struc eom_data;		/* data from EOM/EEOM record  */
-  int section_count;			/* # of sections in following array  */
-  asection **sections;			/* array of GSD/EGSD sections  */
-  int gsd_sym_count;			/* # of GSD/EGSD symbols  */
-  asymbol **symbols;			/* vector of GSD/EGSD symbols  */
-  struct proc_value *procedure;
-
-  struct stack_struct *stack;
-  int stackptr;
-
-  vms_section *vms_section_table[VMS_SECTION_COUNT];
-
-  struct bfd_hash_table *vms_symbol_table;
-  struct symbol_cache_entry **symcache;
-  int symnum;
-
-  struct location_struct *location_stack;
-
-  asection *image_section;		/* section for image_ptr  */
-  unsigned char *image_ptr;		/* a pointer to section->contents */
-
-  unsigned char pdsc[8];		/* procedure descriptor */
-
-  /* Output routine storage  */
-
-  unsigned char *output_buf;		/* output data  */
-  int push_level;
-  int pushed_size;
-  int length_pos;
-  int output_size;
-  int output_alignment;
-
-  /* linkage index counter
-   used by conditional store commands (ETIR_S_C_STC_)  */
-
-  int vms_linkage_index;
-
-  /* see tc-alpha.c of gas for a description.  */
-  int flag_hash_long_names;	/* -+, hash instead of truncate */
-  int flag_show_after_trunc;	/* -H, show hashing/truncation */
-};
-
-#define PRIV(name)	((struct vms_private_data_struct *)abfd->tdata.any)->name
-
-#define SECTION_NAME_TEMPLATE "__SEC__%d"
-
-#if VMS_DEBUG
-extern void _bfd_vms_debug PARAMS((int level, char *format, ...));
-extern void _bfd_hexdump
-  PARAMS ((int level, unsigned char *ptr, int size, int offset));
-
-#define vms_debug _bfd_vms_debug
-#endif
-
-extern struct bfd_hash_entry *_bfd_vms_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *entry, struct bfd_hash_table *table,
-	   const char *string));
-extern void _bfd_vms_get_header_values
-  PARAMS ((bfd *abfd, unsigned char *buf, int *type, int *length));
-extern int _bfd_vms_get_record PARAMS ((bfd *abfd));
-extern int _bfd_vms_next_record PARAMS ((bfd *abfd));
-
-extern char *_bfd_vms_save_sized_string PARAMS ((unsigned char *str, int size));
-extern char *_bfd_vms_save_counted_string PARAMS ((unsigned char *ptr));
-extern void _bfd_vms_push PARAMS ((bfd *abfd, uquad val, int psect));
-extern uquad _bfd_vms_pop PARAMS ((bfd *abfd, int *psect));
-
-extern boolean _bfd_save_vms_section
-  PARAMS ((bfd *abfd, asection *section, PTR data, file_ptr offset,
-	   bfd_size_type count));
-extern void _bfd_vms_output_begin
-  PARAMS ((bfd *abfd, int rectype, int rechead));
-extern void _bfd_vms_output_alignment PARAMS ((bfd *abfd, int alignto));
-extern void _bfd_vms_output_push PARAMS ((bfd *abfd));
-extern void _bfd_vms_output_pop PARAMS ((bfd *abfd));
-extern void _bfd_vms_output_flush PARAMS ((bfd *abfd));
-extern void _bfd_vms_output_end PARAMS ((bfd *abfd));
-extern int _bfd_vms_output_check PARAMS ((bfd *abfd, int size));
-extern void _bfd_vms_output_byte PARAMS ((bfd *abfd, unsigned int value));
-extern void _bfd_vms_output_short PARAMS ((bfd *abfd, unsigned int value));
-extern void _bfd_vms_output_long PARAMS ((bfd *abfd, unsigned long value));
-extern void _bfd_vms_output_quad PARAMS ((bfd *abfd, uquad value));
-extern void _bfd_vms_output_counted PARAMS ((bfd *abfd, char *value));
-extern void _bfd_vms_output_dump PARAMS ((bfd *abfd, unsigned char *data,
-					   int length));
-extern void _bfd_vms_output_fill PARAMS ((bfd *abfd, int value, int length));
-extern char *_bfd_vms_length_hash_symbol PARAMS ((bfd *abfd, const char *in, int maxlen));
-
-extern vms_symbol_entry *_bfd_vms_enter_symbol PARAMS ((bfd *abfd, char *name));
-
-#endif /* VMS_H */
diff --git a/bfd/xcofflink.c b/bfd/xcofflink.c
deleted file mode 100644
index c882d237328..00000000000
--- a/bfd/xcofflink.c
+++ /dev/null
@@ -1,6635 +0,0 @@
-/* POWER/PowerPC XCOFF linker support.
-   Copyright 1995, 1996, 1997 Free Software Foundation, Inc.
-   Written by Ian Lance Taylor <ian@cygnus.com>, Cygnus Support.
-
-This file is part of BFD, the Binary File Descriptor library.
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
-
-#include "bfd.h"
-#include "sysdep.h"
-#include "bfdlink.h"
-#include "libbfd.h"
-#include "coff/internal.h"
-#include "libcoff.h"
-
-/* This file holds the XCOFF linker code.  */
-
-#define STRING_SIZE_SIZE (4)
-
-/* In order to support linking different object file formats into an
-   XCOFF format, we need to be able to determine whether a particular
-   bfd_target is an XCOFF vector.  FIXME: We need to rethink this
-   whole approach.  */
-#define XCOFF_XVECP(xv) \
-  (strcmp ((xv)->name, "aixcoff-rs6000") == 0 \
-   || strcmp ((xv)->name, "xcoff-powermac") == 0)
-
-/* Get the XCOFF hash table entries for a BFD.  */
-#define obj_xcoff_sym_hashes(bfd) \
-  ((struct xcoff_link_hash_entry **) obj_coff_sym_hashes (bfd))
-
-/* XCOFF relocation types.  These probably belong in a header file
-   somewhere.  The relocations are described in the function
-   _bfd_ppc_xcoff_relocate_section in this file.  */
-
-#define R_POS   (0x00)
-#define R_NEG   (0x01)
-#define R_REL   (0x02)
-#define R_TOC   (0x03)
-#define R_RTB   (0x04)
-#define R_GL    (0x05)
-#define R_TCL   (0x06)
-#define R_BA    (0x08)
-#define R_BR    (0x0a)
-#define R_RL    (0x0c)
-#define R_RLA   (0x0d)
-#define R_REF   (0x0f)
-#define R_TRL   (0x12)
-#define R_TRLA  (0x13)
-#define R_RRTBI (0x14)
-#define R_RRTBA (0x15)
-#define R_CAI   (0x16)
-#define R_CREL  (0x17)
-#define R_RBA   (0x18)
-#define R_RBAC  (0x19)
-#define R_RBR   (0x1a)
-#define R_RBRC  (0x1b)
-
-/* The first word of global linkage code.  This must be modified by
-   filling in the correct TOC offset.  */
-
-#define XCOFF_GLINK_FIRST (0x81820000)	/* lwz r12,0(r2) */
-
-/* The remaining words of global linkage code.  */
-
-static unsigned long xcoff_glink_code[] =
-{
-  0x90410014,	/* stw r2,20(r1) */
-  0x800c0000,	/* lwz r0,0(r12) */
-  0x804c0004,	/* lwz r2,4(r12) */
-  0x7c0903a6,	/* mtctr r0 */
-  0x4e800420,	/* bctr */
-  0x0,		/* start of traceback table */
-  0x000c8000,	/* traceback table */
-  0x0		/* traceback table */
-};
-
-#define XCOFF_GLINK_SIZE \
-  (((sizeof xcoff_glink_code / sizeof xcoff_glink_code[0]) * 4) + 4)
-
-/* We reuse the SEC_ROM flag as a mark flag for garbage collection.
-   This flag will only be used on input sections.  */
-
-#define SEC_MARK (SEC_ROM)
-
-/* The ldhdr structure.  This appears at the start of the .loader
-   section.  */
-
-struct internal_ldhdr
-{
-  /* The version number: currently always 1.  */
-  unsigned long l_version;
-  /* The number of symbol table entries.  */
-  bfd_size_type l_nsyms;
-  /* The number of relocation table entries.  */
-  bfd_size_type l_nreloc;
-  /* The length of the import file string table.  */
-  bfd_size_type l_istlen;
-  /* The number of import files.  */
-  bfd_size_type l_nimpid;
-  /* The offset from the start of the .loader section to the first
-     entry in the import file table.  */
-  bfd_size_type l_impoff;
-  /* The length of the string table.  */
-  bfd_size_type l_stlen;
-  /* The offset from the start of the .loader section to the first
-     entry in the string table.  */
-  bfd_size_type l_stoff;
-};
-
-struct external_ldhdr
-{
-  bfd_byte l_version[4];
-  bfd_byte l_nsyms[4];
-  bfd_byte l_nreloc[4];
-  bfd_byte l_istlen[4];
-  bfd_byte l_nimpid[4];
-  bfd_byte l_impoff[4];
-  bfd_byte l_stlen[4];
-  bfd_byte l_stoff[4];
-};
-
-#define LDHDRSZ (8 * 4)
-
-/* The ldsym structure.  This is used to represent a symbol in the
-   .loader section.  */
-
-struct internal_ldsym
-{
-  union
-    {
-      /* The symbol name if <= SYMNMLEN characters.  */
-      char _l_name[SYMNMLEN];
-      struct
-	{
-	  /* Zero if the symbol name is more than SYMNMLEN characters.  */
-	  long _l_zeroes;
-	  /* The offset in the string table if the symbol name is more
-             than SYMNMLEN characters.  */
-	  long _l_offset;
-	} _l_l;
-    } _l;
-  /* The symbol value.  */
-  bfd_vma l_value;
-  /* The symbol section number.  */
-  short l_scnum;
-  /* The symbol type and flags.  */
-  char l_smtype;
-  /* The symbol storage class.  */
-  char l_smclas;
-  /* The import file ID.  */
-  bfd_size_type l_ifile;
-  /* Offset to the parameter type check string.  */
-  bfd_size_type l_parm;
-};
-
-struct external_ldsym
-{
-  union
-    {
-      bfd_byte _l_name[SYMNMLEN];
-      struct
-	{
-	  bfd_byte _l_zeroes[4];
-	  bfd_byte _l_offset[4];
-	} _l_l;
-    } _l;
-  bfd_byte l_value[4];
-  bfd_byte l_scnum[2];
-  bfd_byte l_smtype[1];
-  bfd_byte l_smclas[1];
-  bfd_byte l_ifile[4];
-  bfd_byte l_parm[4];
-};
-
-#define LDSYMSZ (8 + 3 * 4 + 2 + 2)
-
-/* These flags are for the l_smtype field (the lower three bits are an
-   XTY_* value).  */
-
-/* Imported symbol.  */
-#define L_IMPORT (0x40)
-/* Entry point.  */
-#define L_ENTRY (0x20)
-/* Exported symbol.  */
-#define L_EXPORT (0x10)
-
-/* The ldrel structure.  This is used to represent a reloc in the
-   .loader section.  */
-
-struct internal_ldrel
-{
-  /* The reloc address.  */
-  bfd_vma l_vaddr;
-  /* The symbol table index in the .loader section symbol table.  */
-  bfd_size_type l_symndx;
-  /* The relocation type and size.  */
-  short l_rtype;
-  /* The section number this relocation applies to.  */
-  short l_rsecnm;
-};
-
-struct external_ldrel
-{
-  bfd_byte l_vaddr[4];
-  bfd_byte l_symndx[4];
-  bfd_byte l_rtype[2];
-  bfd_byte l_rsecnm[2];
-};
-
-#define LDRELSZ (2 * 4 + 2 * 2)
-
-/* The list of import files.  */
-
-struct xcoff_import_file
-{
-  /* The next entry in the list.  */
-  struct xcoff_import_file *next;
-  /* The path.  */
-  const char *path;
-  /* The file name.  */
-  const char *file;
-  /* The member name.  */
-  const char *member;
-};
-
-/* An entry in the XCOFF linker hash table.  */
-
-struct xcoff_link_hash_entry
-{
-  struct bfd_link_hash_entry root;
-
-  /* Symbol index in output file.  Set to -1 initially.  Set to -2 if
-     there is a reloc against this symbol.  */
-  long indx;
-
-  /* If we have created a TOC entry for this symbol, this is the .tc
-     section which holds it.  */
-  asection *toc_section;
-
-  union
-    {
-      /* If we have created a TOC entry (the XCOFF_SET_TOC flag is
-	 set), this is the offset in toc_section.  */
-      bfd_vma toc_offset;
-      /* If the TOC entry comes from an input file, this is set to the
-         symbol index of the C_HIDEXT XMC_TC or XMC_TD symbol.  */
-      long toc_indx;
-    } u;
-
-  /* If this symbol is a function entry point which is called, this
-     field holds a pointer to the function descriptor.  If this symbol
-     is a function descriptor, this field holds a pointer to the
-     function entry point.  */
-  struct xcoff_link_hash_entry *descriptor;
-
-  /* The .loader symbol table entry, if there is one.  */
-  struct internal_ldsym *ldsym;
-
-  /* If XCOFF_BUILT_LDSYM is set, this is the .loader symbol table
-     index.  If XCOFF_BUILD_LDSYM is clear, and XCOFF_IMPORT is set,
-     this is the l_ifile value.  */
-  long ldindx;
-
-  /* Some linker flags.  */
-  unsigned short flags;
-  /* Symbol is referenced by a regular object.  */
-#define XCOFF_REF_REGULAR (01)
-  /* Symbol is defined by a regular object.  */
-#define XCOFF_DEF_REGULAR (02)
-  /* Symbol is defined by a dynamic object.  */
-#define XCOFF_DEF_DYNAMIC (04)
-  /* Symbol is used in a reloc being copied into the .loader section.  */
-#define XCOFF_LDREL (010)
-  /* Symbol is the entry point.  */
-#define XCOFF_ENTRY (020)
-  /* Symbol is called; this is, it appears in a R_BR reloc.  */
-#define XCOFF_CALLED (040)
-  /* Symbol needs the TOC entry filled in.  */
-#define XCOFF_SET_TOC (0100)
-  /* Symbol is explicitly imported.  */
-#define XCOFF_IMPORT (0200)
-  /* Symbol is explicitly exported.  */
-#define XCOFF_EXPORT (0400)
-  /* Symbol has been processed by xcoff_build_ldsyms.  */
-#define XCOFF_BUILT_LDSYM (01000)
-  /* Symbol is mentioned by a section which was not garbage collected.  */
-#define XCOFF_MARK (02000)
-  /* Symbol size is recorded in size_list list from hash table.  */
-#define XCOFF_HAS_SIZE (04000)
-  /* Symbol is a function descriptor.  */
-#define XCOFF_DESCRIPTOR (010000)
-  /* Multiple definitions have been for the symbol.  */
-#define XCOFF_MULTIPLY_DEFINED (020000)
-
-  /* The storage mapping class.  */
-  unsigned char smclas;
-};
-
-/* The XCOFF linker hash table.  */
-
-struct xcoff_link_hash_table
-{
-  struct bfd_link_hash_table root;
-
-  /* The .debug string hash table.  We need to compute this while
-     reading the input files, so that we know how large the .debug
-     section will be before we assign section positions.  */
-  struct bfd_strtab_hash *debug_strtab;
-
-  /* The .debug section we will use for the final output.  */
-  asection *debug_section;
-
-  /* The .loader section we will use for the final output.  */
-  asection *loader_section;
-
-  /* A count of non TOC relative relocs which will need to be
-     allocated in the .loader section.  */
-  size_t ldrel_count;
-
-  /* The .loader section header.  */
-  struct internal_ldhdr ldhdr;
-
-  /* The .gl section we use to hold global linkage code.  */
-  asection *linkage_section;
-
-  /* The .tc section we use to hold toc entries we build for global
-     linkage code.  */
-  asection *toc_section;
-
-  /* The .ds section we use to hold function descriptors which we
-     create for exported symbols.  */
-  asection *descriptor_section;
-
-  /* The list of import files.  */
-  struct xcoff_import_file *imports;
-
-  /* Required alignment of sections within the output file.  */
-  unsigned long file_align;
-
-  /* Whether the .text section must be read-only.  */
-  boolean textro;
-
-  /* Whether garbage collection was done.  */
-  boolean gc;
-
-  /* A linked list of symbols for which we have size information.  */
-  struct xcoff_link_size_list
-    {
-      struct xcoff_link_size_list *next;
-      struct xcoff_link_hash_entry *h;
-      bfd_size_type size;
-    } *size_list;
-
-  /* Magic sections: _text, _etext, _data, _edata, _end, end.  */
-  asection *special_sections[6];
-};
-
-/* Information we keep for each section in the output file during the
-   final link phase.  */
-
-struct xcoff_link_section_info
-{
-  /* The relocs to be output.  */
-  struct internal_reloc *relocs;
-  /* For each reloc against a global symbol whose index was not known
-     when the reloc was handled, the global hash table entry.  */
-  struct xcoff_link_hash_entry **rel_hashes;
-  /* If there is a TOC relative reloc against a global symbol, and the
-     index of the TOC symbol is not known when the reloc was handled,
-     an entry is added to this linked list.  This is not an array,
-     like rel_hashes, because this case is quite uncommon.  */
-  struct xcoff_toc_rel_hash
-    {
-      struct xcoff_toc_rel_hash *next;
-      struct xcoff_link_hash_entry *h;
-      struct internal_reloc *rel;
-    } *toc_rel_hashes;
-};
-
-/* Information that we pass around while doing the final link step.  */
-
-struct xcoff_final_link_info
-{
-  /* General link information.  */
-  struct bfd_link_info *info;
-  /* Output BFD.  */
-  bfd *output_bfd;
-  /* Hash table for long symbol names.  */
-  struct bfd_strtab_hash *strtab;
-  /* Array of information kept for each output section, indexed by the
-     target_index field.  */
-  struct xcoff_link_section_info *section_info;
-  /* Symbol index of last C_FILE symbol (-1 if none).  */
-  long last_file_index;
-  /* Contents of last C_FILE symbol.  */
-  struct internal_syment last_file;
-  /* Symbol index of TOC symbol.  */
-  long toc_symindx;
-  /* Start of .loader symbols.  */
-  struct external_ldsym *ldsym;
-  /* Next .loader reloc to swap out.  */
-  struct external_ldrel *ldrel;
-  /* File position of start of line numbers.  */
-  file_ptr line_filepos;
-  /* Buffer large enough to hold swapped symbols of any input file.  */
-  struct internal_syment *internal_syms;
-  /* Buffer large enough to hold output indices of symbols of any
-     input file.  */
-  long *sym_indices;
-  /* Buffer large enough to hold output symbols for any input file.  */
-  bfd_byte *outsyms;
-  /* Buffer large enough to hold external line numbers for any input
-     section.  */
-  bfd_byte *linenos;
-  /* Buffer large enough to hold any input section.  */
-  bfd_byte *contents;
-  /* Buffer large enough to hold external relocs of any input section.  */
-  bfd_byte *external_relocs;
-};
-
-static void xcoff_swap_ldhdr_in
-  PARAMS ((bfd *, const struct external_ldhdr *, struct internal_ldhdr *));
-static void xcoff_swap_ldhdr_out
-  PARAMS ((bfd *, const struct internal_ldhdr *, struct external_ldhdr *));
-static void xcoff_swap_ldsym_in
-  PARAMS ((bfd *, const struct external_ldsym *, struct internal_ldsym *));
-static void xcoff_swap_ldsym_out
-  PARAMS ((bfd *, const struct internal_ldsym *, struct external_ldsym *));
-static void xcoff_swap_ldrel_in
-  PARAMS ((bfd *, const struct external_ldrel *, struct internal_ldrel *));
-static void xcoff_swap_ldrel_out
-  PARAMS ((bfd *, const struct internal_ldrel *, struct external_ldrel *));
-static struct bfd_hash_entry *xcoff_link_hash_newfunc
-  PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static boolean xcoff_get_section_contents PARAMS ((bfd *, asection *));
-static struct internal_reloc *xcoff_read_internal_relocs
-  PARAMS ((bfd *, asection *, boolean, bfd_byte *, boolean,
-	   struct internal_reloc *));
-static boolean xcoff_link_add_object_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_link_check_archive_element
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean xcoff_link_check_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static boolean xcoff_link_check_dynamic_ar_symbols
-  PARAMS ((bfd *, struct bfd_link_info *, boolean *));
-static bfd_size_type xcoff_find_reloc
-  PARAMS ((struct internal_reloc *, bfd_size_type, bfd_vma));
-static boolean xcoff_link_add_symbols PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_link_add_dynamic_symbols
-  PARAMS ((bfd *, struct bfd_link_info *));
-static boolean xcoff_mark_symbol
-  PARAMS ((struct bfd_link_info *, struct xcoff_link_hash_entry *));
-static boolean xcoff_mark PARAMS ((struct bfd_link_info *, asection *));
-static void xcoff_sweep PARAMS ((struct bfd_link_info *));
-static boolean xcoff_build_ldsyms
-  PARAMS ((struct xcoff_link_hash_entry *, PTR));
-static boolean xcoff_link_input_bfd
-  PARAMS ((struct xcoff_final_link_info *, bfd *));
-static boolean xcoff_write_global_symbol
-  PARAMS ((struct xcoff_link_hash_entry *, PTR));
-static boolean xcoff_reloc_link_order
-  PARAMS ((bfd *, struct xcoff_final_link_info *, asection *,
-	   struct bfd_link_order *));
-static int xcoff_sort_relocs PARAMS ((const PTR, const PTR));
-
-/* Routines to swap information in the XCOFF .loader section.  If we
-   ever need to write an XCOFF loader, this stuff will need to be
-   moved to another file shared by the linker (which XCOFF calls the
-   ``binder'') and the loader.  */
-
-/* Swap in the ldhdr structure.  */
-
-static void
-xcoff_swap_ldhdr_in (abfd, src, dst)
-     bfd *abfd;
-     const struct external_ldhdr *src;
-     struct internal_ldhdr *dst;
-{
-  dst->l_version = bfd_get_32 (abfd, src->l_version);
-  dst->l_nsyms = bfd_get_32 (abfd, src->l_nsyms);
-  dst->l_nreloc = bfd_get_32 (abfd, src->l_nreloc);
-  dst->l_istlen = bfd_get_32 (abfd, src->l_istlen);
-  dst->l_nimpid = bfd_get_32 (abfd, src->l_nimpid);
-  dst->l_impoff = bfd_get_32 (abfd, src->l_impoff);
-  dst->l_stlen = bfd_get_32 (abfd, src->l_stlen);
-  dst->l_stoff = bfd_get_32 (abfd, src->l_stoff);
-}
-
-/* Swap out the ldhdr structure.  */
-
-static void
-xcoff_swap_ldhdr_out (abfd, src, dst)
-     bfd *abfd;
-     const struct internal_ldhdr *src;
-     struct external_ldhdr *dst;
-{
-  bfd_put_32 (abfd, src->l_version, dst->l_version);
-  bfd_put_32 (abfd, src->l_nsyms, dst->l_nsyms);
-  bfd_put_32 (abfd, src->l_nreloc, dst->l_nreloc);
-  bfd_put_32 (abfd, src->l_istlen, dst->l_istlen);
-  bfd_put_32 (abfd, src->l_nimpid, dst->l_nimpid);
-  bfd_put_32 (abfd, src->l_impoff, dst->l_impoff);
-  bfd_put_32 (abfd, src->l_stlen, dst->l_stlen);
-  bfd_put_32 (abfd, src->l_stoff, dst->l_stoff);
-}
-
-/* Swap in the ldsym structure.  */
-
-static void
-xcoff_swap_ldsym_in (abfd, src, dst)
-     bfd *abfd;
-     const struct external_ldsym *src;
-     struct internal_ldsym *dst;
-{
-  if (bfd_get_32 (abfd, src->_l._l_l._l_zeroes) != 0)
-    memcpy (dst->_l._l_name, src->_l._l_name, SYMNMLEN);
-  else
-    {
-      dst->_l._l_l._l_zeroes = 0;
-      dst->_l._l_l._l_offset = bfd_get_32 (abfd, src->_l._l_l._l_offset);
-    }
-  dst->l_value = bfd_get_32 (abfd, src->l_value);
-  dst->l_scnum = bfd_get_16 (abfd, src->l_scnum);
-  dst->l_smtype = bfd_get_8 (abfd, src->l_smtype);
-  dst->l_smclas = bfd_get_8 (abfd, src->l_smclas);
-  dst->l_ifile = bfd_get_32 (abfd, src->l_ifile);
-  dst->l_parm = bfd_get_32 (abfd, src->l_parm);
-}
-
-/* Swap out the ldsym structure.  */
-
-static void
-xcoff_swap_ldsym_out (abfd, src, dst)
-     bfd *abfd;
-     const struct internal_ldsym *src;
-     struct external_ldsym *dst;
-{
-  if (src->_l._l_l._l_zeroes != 0)
-    memcpy (dst->_l._l_name, src->_l._l_name, SYMNMLEN);
-  else
-    {
-      bfd_put_32 (abfd, 0, dst->_l._l_l._l_zeroes);
-      bfd_put_32 (abfd, src->_l._l_l._l_offset, dst->_l._l_l._l_offset);
-    }
-  bfd_put_32 (abfd, src->l_value, dst->l_value);
-  bfd_put_16 (abfd, src->l_scnum, dst->l_scnum);
-  bfd_put_8 (abfd, src->l_smtype, dst->l_smtype);
-  bfd_put_8 (abfd, src->l_smclas, dst->l_smclas);
-  bfd_put_32 (abfd, src->l_ifile, dst->l_ifile);
-  bfd_put_32 (abfd, src->l_parm, dst->l_parm);
-}
-
-/* Swap in the ldrel structure.  */
-
-static void
-xcoff_swap_ldrel_in (abfd, src, dst)
-     bfd *abfd;
-     const struct external_ldrel *src;
-     struct internal_ldrel *dst;
-{
-  dst->l_vaddr = bfd_get_32 (abfd, src->l_vaddr);
-  dst->l_symndx = bfd_get_32 (abfd, src->l_symndx);
-  dst->l_rtype = bfd_get_16 (abfd, src->l_rtype);
-  dst->l_rsecnm = bfd_get_16 (abfd, src->l_rsecnm);
-}
-
-/* Swap out the ldrel structure.  */
-
-static void
-xcoff_swap_ldrel_out (abfd, src, dst)
-     bfd *abfd;
-     const struct internal_ldrel *src;
-     struct external_ldrel *dst;
-{
-  bfd_put_32 (abfd, src->l_vaddr, dst->l_vaddr);
-  bfd_put_32 (abfd, src->l_symndx, dst->l_symndx);
-  bfd_put_16 (abfd, src->l_rtype, dst->l_rtype);
-  bfd_put_16 (abfd, src->l_rsecnm, dst->l_rsecnm);
-}
-
-/* Routines to read XCOFF dynamic information.  This don't really
-   belong here, but we already have the ldsym manipulation routines
-   here.  */
-
-/* Read the contents of a section.  */
-
-static boolean
-xcoff_get_section_contents (abfd, sec)
-     bfd *abfd;
-     asection *sec;
-{
-  if (coff_section_data (abfd, sec) == NULL)
-    {
-      sec->used_by_bfd = bfd_zalloc (abfd,
-				     sizeof (struct coff_section_tdata));
-      if (sec->used_by_bfd == NULL)
-	return false;
-    }
-
-  if (coff_section_data (abfd, sec)->contents == NULL)
-    {
-      coff_section_data (abfd, sec)->contents =
-	(bfd_byte *) bfd_malloc (sec->_raw_size);
-      if (coff_section_data (abfd, sec)->contents == NULL)
-	return false;
-
-      if (! bfd_get_section_contents (abfd, sec,
-				      coff_section_data (abfd, sec)->contents,
-				      (file_ptr) 0, sec->_raw_size))
-	return false;
-    }
-
-  return true;
-}
-
-/* Get the size required to hold the dynamic symbols.  */
-
-long
-_bfd_xcoff_get_dynamic_symtab_upper_bound (abfd)
-     bfd *abfd;
-{
-  asection *lsec;
-  bfd_byte *contents;
-  struct internal_ldhdr ldhdr;
-
-  if ((abfd->flags & DYNAMIC) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  lsec = bfd_get_section_by_name (abfd, ".loader");
-  if (lsec == NULL)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-  if (! xcoff_get_section_contents (abfd, lsec))
-    return -1;
-  contents = coff_section_data (abfd, lsec)->contents;
-
-  xcoff_swap_ldhdr_in (abfd, (struct external_ldhdr *) contents, &ldhdr);
-
-  return (ldhdr.l_nsyms + 1) * sizeof (asymbol *);
-}
-
-/* Get the dynamic symbols.  */
-
-long
-_bfd_xcoff_canonicalize_dynamic_symtab (abfd, psyms)
-     bfd *abfd;
-     asymbol **psyms;
-{
-  asection *lsec;
-  bfd_byte *contents;
-  struct internal_ldhdr ldhdr;
-  const char *strings;
-  struct external_ldsym *elsym, *elsymend;
-  coff_symbol_type *symbuf;
-
-  if ((abfd->flags & DYNAMIC) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  lsec = bfd_get_section_by_name (abfd, ".loader");
-  if (lsec == NULL)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-  if (! xcoff_get_section_contents (abfd, lsec))
-    return -1;
-  contents = coff_section_data (abfd, lsec)->contents;
-
-  coff_section_data (abfd, lsec)->keep_contents = true;
-
-  xcoff_swap_ldhdr_in (abfd, (struct external_ldhdr *) contents, &ldhdr);
-
-  strings = (char *) contents + ldhdr.l_stoff;
-
-  symbuf = ((coff_symbol_type *)
-	    bfd_zalloc (abfd, ldhdr.l_nsyms * sizeof (coff_symbol_type)));
-  if (symbuf == NULL)
-    return -1;
-
-  elsym = (struct external_ldsym *) (contents + LDHDRSZ);
-  elsymend = elsym + ldhdr.l_nsyms;
-  for (; elsym < elsymend; elsym++, symbuf++, psyms++)
-    {
-      struct internal_ldsym ldsym;
-
-      xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
-
-      symbuf->symbol.the_bfd = abfd;
-
-      if (ldsym._l._l_l._l_zeroes == 0)
-	symbuf->symbol.name = strings + ldsym._l._l_l._l_offset;
-      else
-	{
-	  int i;
-
-	  for (i = 0; i < SYMNMLEN; i++)
-	    if (ldsym._l._l_name[i] == '\0')
-	      break;
-	  if (i < SYMNMLEN)
-	    symbuf->symbol.name = (char *) elsym->_l._l_name;
-	  else
-	    {
-	      char *c;
-
-	      c = bfd_alloc (abfd, SYMNMLEN + 1);
-	      if (c == NULL)
-		return -1;
-	      memcpy (c, ldsym._l._l_name, SYMNMLEN);
-	      c[SYMNMLEN] = '\0';
-	      symbuf->symbol.name = c;
-	    }
-	}
-
-      if (ldsym.l_smclas == XMC_XO)
-	symbuf->symbol.section = bfd_abs_section_ptr;
-      else
-	symbuf->symbol.section = coff_section_from_bfd_index (abfd,
-							      ldsym.l_scnum);
-      symbuf->symbol.value = ldsym.l_value - symbuf->symbol.section->vma;
-
-      symbuf->symbol.flags = BSF_NO_FLAGS;
-      if ((ldsym.l_smtype & L_EXPORT) != 0)
-	symbuf->symbol.flags |= BSF_GLOBAL;
-
-      /* FIXME: We have no way to record the other information stored
-         with the loader symbol.  */
-
-      *psyms = (asymbol *) symbuf;
-    }
-
-  *psyms = NULL;
-
-  return ldhdr.l_nsyms;
-}
-
-/* Get the size required to hold the dynamic relocs.  */
-
-long
-_bfd_xcoff_get_dynamic_reloc_upper_bound (abfd)
-     bfd *abfd;
-{
-  asection *lsec;
-  bfd_byte *contents;
-  struct internal_ldhdr ldhdr;
-
-  if ((abfd->flags & DYNAMIC) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  lsec = bfd_get_section_by_name (abfd, ".loader");
-  if (lsec == NULL)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-  if (! xcoff_get_section_contents (abfd, lsec))
-    return -1;
-  contents = coff_section_data (abfd, lsec)->contents;
-
-  xcoff_swap_ldhdr_in (abfd, (struct external_ldhdr *) contents, &ldhdr);
-
-  return (ldhdr.l_nreloc + 1) * sizeof (arelent *);
-}
-
-/* The typical dynamic reloc.  */
-
-static reloc_howto_type xcoff_dynamic_reloc =
-  HOWTO (0,	                /* type */                                 
-	 0,	                /* rightshift */                           
-	 2,	                /* size (0 = byte, 1 = short, 2 = long) */ 
-	 32,	                /* bitsize */                   
-	 false,	                /* pc_relative */                          
-	 0,	                /* bitpos */                               
-	 complain_overflow_bitfield, /* complain_on_overflow */
-	 0,		        /* special_function */                     
-	 "R_POS",               /* name */                                 
-	 true,	                /* partial_inplace */                      
-	 0xffffffff,            /* src_mask */                             
-	 0xffffffff,            /* dst_mask */                             
-	 false);                /* pcrel_offset */
-
-/* Get the dynamic relocs.  */
-
-long
-_bfd_xcoff_canonicalize_dynamic_reloc (abfd, prelocs, syms)
-     bfd *abfd;
-     arelent **prelocs;
-     asymbol **syms;
-{
-  asection *lsec;
-  bfd_byte *contents;
-  struct internal_ldhdr ldhdr;
-  arelent *relbuf;
-  struct external_ldrel *elrel, *elrelend;
-
-  if ((abfd->flags & DYNAMIC) == 0)
-    {
-      bfd_set_error (bfd_error_invalid_operation);
-      return -1;
-    }
-
-  lsec = bfd_get_section_by_name (abfd, ".loader");
-  if (lsec == NULL)
-    {
-      bfd_set_error (bfd_error_no_symbols);
-      return -1;
-    }
-
-  if (! xcoff_get_section_contents (abfd, lsec))
-    return -1;
-  contents = coff_section_data (abfd, lsec)->contents;
-
-  xcoff_swap_ldhdr_in (abfd, (struct external_ldhdr *) contents, &ldhdr);
-
-  relbuf = (arelent *) bfd_alloc (abfd, ldhdr.l_nreloc * sizeof (arelent));
-  if (relbuf == NULL)
-    return -1;
-
-  elrel = ((struct external_ldrel *)
-	   (contents + LDHDRSZ + ldhdr.l_nsyms * LDSYMSZ));
-  elrelend = elrel + ldhdr.l_nreloc;
-  for (; elrel < elrelend; elrel++, relbuf++, prelocs++)
-    {
-      struct internal_ldrel ldrel;
-
-      xcoff_swap_ldrel_in (abfd, elrel, &ldrel);
-
-      if (ldrel.l_symndx >= 3)
-	relbuf->sym_ptr_ptr = syms + (ldrel.l_symndx - 3);
-      else
-	{
-	  const char *name;
-	  asection *sec;
-
-	  switch (ldrel.l_symndx)
-	    {
-	    case 0:
-	      name = ".text";
-	      break;
-	    case 1:
-	      name = ".data";
-	      break;
-	    case 2:
-	      name = ".bss";
-	      break;
-	    default:
-	      abort ();
-	      break;
-	    }
-
-	  sec = bfd_get_section_by_name (abfd, name);
-	  if (sec == NULL)
-	    {
-	      bfd_set_error (bfd_error_bad_value);
-	      return -1;
-	    }
-
-	  relbuf->sym_ptr_ptr = sec->symbol_ptr_ptr;
-	}
-
-      relbuf->address = ldrel.l_vaddr;
-      relbuf->addend = 0;
-
-      /* Most dynamic relocs have the same type.  FIXME: This is only
-         correct if ldrel.l_rtype == 0.  In other cases, we should use
-         a different howto.  */
-      relbuf->howto = &xcoff_dynamic_reloc;
-
-      /* FIXME: We have no way to record the l_rsecnm field.  */
-
-      *prelocs = relbuf;
-    }
-
-  *prelocs = NULL;
-
-  return ldhdr.l_nreloc;
-}
-
-/* Routine to create an entry in an XCOFF link hash table.  */
-
-static struct bfd_hash_entry *
-xcoff_link_hash_newfunc (entry, table, string)
-     struct bfd_hash_entry *entry;
-     struct bfd_hash_table *table;
-     const char *string;
-{
-  struct xcoff_link_hash_entry *ret = (struct xcoff_link_hash_entry *) entry;
-
-  /* Allocate the structure if it has not already been allocated by a
-     subclass.  */
-  if (ret == (struct xcoff_link_hash_entry *) NULL)
-    ret = ((struct xcoff_link_hash_entry *)
-	   bfd_hash_allocate (table, sizeof (struct xcoff_link_hash_entry)));
-  if (ret == (struct xcoff_link_hash_entry *) NULL)
-    return (struct bfd_hash_entry *) ret;
-
-  /* Call the allocation method of the superclass.  */
-  ret = ((struct xcoff_link_hash_entry *)
-	 _bfd_link_hash_newfunc ((struct bfd_hash_entry *) ret,
-				 table, string));
-  if (ret != NULL)
-    {
-      /* Set local fields.  */
-      ret->indx = -1;
-      ret->toc_section = NULL;
-      ret->u.toc_indx = -1;
-      ret->descriptor = NULL;
-      ret->ldsym = NULL;
-      ret->ldindx = -1;
-      ret->flags = 0;
-      ret->smclas = XMC_UA;
-    }
-
-  return (struct bfd_hash_entry *) ret;
-}
-
-/* Create a XCOFF link hash table.  */
-
-struct bfd_link_hash_table *
-_bfd_xcoff_bfd_link_hash_table_create (abfd)
-     bfd *abfd;
-{
-  struct xcoff_link_hash_table *ret;
-
-  ret = ((struct xcoff_link_hash_table *)
-	 bfd_alloc (abfd, sizeof (struct xcoff_link_hash_table)));
-  if (ret == (struct xcoff_link_hash_table *) NULL)
-    return (struct bfd_link_hash_table *) NULL;
-  if (! _bfd_link_hash_table_init (&ret->root, abfd, xcoff_link_hash_newfunc))
-    {
-      bfd_release (abfd, ret);
-      return (struct bfd_link_hash_table *) NULL;
-    }
-
-  ret->debug_strtab = _bfd_xcoff_stringtab_init ();
-  ret->debug_section = NULL;
-  ret->loader_section = NULL;
-  ret->ldrel_count = 0;
-  memset (&ret->ldhdr, 0, sizeof (struct internal_ldhdr));
-  ret->linkage_section = NULL;
-  ret->toc_section = NULL;
-  ret->descriptor_section = NULL;
-  ret->imports = NULL;
-  ret->file_align = 0;
-  ret->textro = false;
-  ret->gc = false;
-  memset (ret->special_sections, 0, sizeof ret->special_sections);
-
-  /* The linker will always generate a full a.out header.  We need to
-     record that fact now, before the sizeof_headers routine could be
-     called.  */
-  xcoff_data (abfd)->full_aouthdr = true;
-
-  return &ret->root;
-}
-
-/* Look up an entry in an XCOFF link hash table.  */
-
-#define xcoff_link_hash_lookup(table, string, create, copy, follow) \
-  ((struct xcoff_link_hash_entry *) \
-   bfd_link_hash_lookup (&(table)->root, (string), (create), (copy),\
-			 (follow)))
-
-/* Traverse an XCOFF link hash table.  */
-
-#define xcoff_link_hash_traverse(table, func, info)			\
-  (bfd_link_hash_traverse						\
-   (&(table)->root,							\
-    (boolean (*) PARAMS ((struct bfd_link_hash_entry *, PTR))) (func),	\
-    (info)))
-
-/* Get the XCOFF link hash table from the info structure.  This is
-   just a cast.  */
-
-#define xcoff_hash_table(p) ((struct xcoff_link_hash_table *) ((p)->hash))
-
-/* Read internal relocs for an XCOFF csect.  This is a wrapper around
-   _bfd_coff_read_internal_relocs which tries to take advantage of any
-   relocs which may have been cached for the enclosing section.  */
-
-static struct internal_reloc *
-xcoff_read_internal_relocs (abfd, sec, cache, external_relocs,
-			    require_internal, internal_relocs)
-     bfd *abfd;
-     asection *sec;
-     boolean cache;
-     bfd_byte *external_relocs;
-     boolean require_internal;
-     struct internal_reloc *internal_relocs;
-{
-  if (coff_section_data (abfd, sec) != NULL
-      && coff_section_data (abfd, sec)->relocs == NULL
-      && xcoff_section_data (abfd, sec) != NULL)
-    {
-      asection *enclosing;
-
-      enclosing = xcoff_section_data (abfd, sec)->enclosing;
-
-      if (enclosing != NULL
-	  && (coff_section_data (abfd, enclosing) == NULL
-	      || coff_section_data (abfd, enclosing)->relocs == NULL)
-	  && cache
-	  && enclosing->reloc_count > 0)
-	{
-	  if (_bfd_coff_read_internal_relocs (abfd, enclosing, true,
-					      external_relocs, false,
-					      (struct internal_reloc *) NULL)
-	      == NULL)
-	    return NULL;
-	}
-
-      if (enclosing != NULL
-	  && coff_section_data (abfd, enclosing) != NULL
-	  && coff_section_data (abfd, enclosing)->relocs != NULL)
-	{
-	  size_t off;
-
-	  off = ((sec->rel_filepos - enclosing->rel_filepos)
-		 / bfd_coff_relsz (abfd));
-	  if (! require_internal)
-	    return coff_section_data (abfd, enclosing)->relocs + off;
-	  memcpy (internal_relocs,
-		  coff_section_data (abfd, enclosing)->relocs + off,
-		  sec->reloc_count * sizeof (struct internal_reloc));
-	  return internal_relocs;
-	}
-    }
-
-  return _bfd_coff_read_internal_relocs (abfd, sec, cache, external_relocs,
-					 require_internal, internal_relocs);
-}
-
-/* Given an XCOFF BFD, add symbols to the global hash table as
-   appropriate.  */
-
-boolean
-_bfd_xcoff_bfd_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  switch (bfd_get_format (abfd))
-    {
-    case bfd_object:
-      return xcoff_link_add_object_symbols (abfd, info);
-
-    case bfd_archive:
-      /* If the archive has a map, do the usual search.  We then need
-         to check the archive for stripped dynamic objects, because
-         they will not appear in the archive map even though they
-         should, perhaps, be included.  If the archive has no map, we
-         just consider each object file in turn, since that apparently
-         is what the AIX native linker does.  */
-      if (bfd_has_map (abfd))
-	{
-	  if (! (_bfd_generic_link_add_archive_symbols
-		 (abfd, info, xcoff_link_check_archive_element)))
-	    return false;
-	}
-
-      {
-	bfd *member;
-
-	member = bfd_openr_next_archived_file (abfd, (bfd *) NULL);
-	while (member != NULL)
-	  {
-	    if (bfd_check_format (member, bfd_object)
-		&& (! bfd_has_map (abfd)
-		    || ((member->flags & DYNAMIC) != 0
-			&& (member->flags & HAS_SYMS) == 0)))
-	      {
-		boolean needed;
-
-		if (! xcoff_link_check_archive_element (member, info, &needed))
-		  return false;
-		if (needed)
-		  member->archive_pass = -1;
-	      }
-	    member = bfd_openr_next_archived_file (abfd, member);
-	  }
-      }
-
-      return true;
-
-    default:
-      bfd_set_error (bfd_error_wrong_format);
-      return false;
-    }
-}
-
-/* Add symbols from an XCOFF object file.  */
-
-static boolean
-xcoff_link_add_object_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
-  if (! xcoff_link_add_symbols (abfd, info))
-    return false;
-  if (! info->keep_memory)
-    {
-      if (! _bfd_coff_free_symbols (abfd))
-	return false;
-    }
-  return true;
-}
-
-/* Check a single archive element to see if we need to include it in
-   the link.  *PNEEDED is set according to whether this element is
-   needed in the link or not.  This is called via
-   _bfd_generic_link_add_archive_symbols.  */
-
-static boolean
-xcoff_link_check_archive_element (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  if (! _bfd_coff_get_external_symbols (abfd))
-    return false;
-
-  if (! xcoff_link_check_ar_symbols (abfd, info, pneeded))
-    return false;
-
-  if (*pneeded)
-    {
-      if (! xcoff_link_add_symbols (abfd, info))
-	return false;
-    }
-
-  if (! info->keep_memory || ! *pneeded)
-    {
-      if (! _bfd_coff_free_symbols (abfd))
-	return false;
-    }
-
-  return true;
-}
-
-/* Look through the symbols to see if this object file should be
-   included in the link.  */
-
-static boolean
-xcoff_link_check_ar_symbols (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  bfd_size_type symesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-
-  *pneeded = false;
-
-  if ((abfd->flags & DYNAMIC) != 0
-      && ! info->static_link
-      && info->hash->creator == abfd->xvec)
-    return xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded);
-
-  symesz = bfd_coff_symesz (abfd);
-  esym = (bfd_byte *) obj_coff_external_syms (abfd);
-  esym_end = esym + obj_raw_syment_count (abfd) * symesz;
-  while (esym < esym_end)
-    {
-      struct internal_syment sym;
-
-      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym);
-
-      if (sym.n_sclass == C_EXT && sym.n_scnum != N_UNDEF)
-	{
-	  const char *name;
-	  char buf[SYMNMLEN + 1];
-	  struct bfd_link_hash_entry *h;
-
-	  /* This symbol is externally visible, and is defined by this
-             object file.  */
-
-	  name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
-	  if (name == NULL)
-	    return false;
-	  h = bfd_link_hash_lookup (info->hash, name, false, false, true);
-
-	  /* We are only interested in symbols that are currently
-	     undefined.  If a symbol is currently known to be common,
-	     XCOFF linkers do not bring in an object file which
-	     defines it.  We also don't bring in symbols to satisfy
-	     undefined references in shared objects.  */
-	  if (h != (struct bfd_link_hash_entry *) NULL
-	      && h->type == bfd_link_hash_undefined
-	      && (info->hash->creator != abfd->xvec
-		  || (((struct xcoff_link_hash_entry *) h)->flags
-		      & XCOFF_DEF_DYNAMIC) == 0))
-	    {
-	      if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-		return false;
-	      *pneeded = true;
-	      return true;
-	    }
-	}
-
-      esym += (sym.n_numaux + 1) * symesz;
-    }
-
-  /* We do not need this object file.  */
-  return true;
-}
-
-/* Look through the loader symbols to see if this dynamic object
-   should be included in the link.  The native linker uses the loader
-   symbols, not the normal symbol table, so we do too.  */
-
-static boolean
-xcoff_link_check_dynamic_ar_symbols (abfd, info, pneeded)
-     bfd *abfd;
-     struct bfd_link_info *info;
-     boolean *pneeded;
-{
-  asection *lsec;
-  bfd_byte *buf;
-  struct internal_ldhdr ldhdr;
-  const char *strings;
-  struct external_ldsym *elsym, *elsymend;
-
-  *pneeded = false;
-
-  lsec = bfd_get_section_by_name (abfd, ".loader");
-  if (lsec == NULL)
-    {
-      /* There are no symbols, so don't try to include it.  */
-      return true;
-    }
-
-  if (! xcoff_get_section_contents (abfd, lsec))
-    return false;
-  buf = coff_section_data (abfd, lsec)->contents;
-
-  xcoff_swap_ldhdr_in (abfd, (struct external_ldhdr *) buf, &ldhdr);
-
-  strings = (char *) buf + ldhdr.l_stoff;
-
-  elsym = (struct external_ldsym *) (buf + LDHDRSZ);
-  elsymend = elsym + ldhdr.l_nsyms;
-  for (; elsym < elsymend; elsym++)
-    {
-      struct internal_ldsym ldsym;
-      char nambuf[SYMNMLEN + 1];
-      const char *name;
-      struct bfd_link_hash_entry *h;
-
-      xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
-
-      /* We are only interested in exported symbols.  */
-      if ((ldsym.l_smtype & L_EXPORT) == 0)
-	continue;
-
-      if (ldsym._l._l_l._l_zeroes == 0)
-	name = strings + ldsym._l._l_l._l_offset;
-      else
-	{
-	  memcpy (nambuf, ldsym._l._l_name, SYMNMLEN);
-	  nambuf[SYMNMLEN] = '\0';
-	  name = nambuf;
-	}
-
-      h = bfd_link_hash_lookup (info->hash, name, false, false, true);
-
-      /* We are only interested in symbols that are currently
-         undefined.  At this point we know that we are using an XCOFF
-         hash table.  */
-      if (h != NULL
-	  && h->type == bfd_link_hash_undefined
-	  && (((struct xcoff_link_hash_entry *) h)->flags
-	      & XCOFF_DEF_DYNAMIC) == 0)
-	{
-	  if (! (*info->callbacks->add_archive_element) (info, abfd, name))
-	    return false;
-	  *pneeded = true;
-	  return true;
-	}
-    }
-
-  /* We do not need this shared object.  */
-
-  if (buf != NULL && ! coff_section_data (abfd, lsec)->keep_contents)
-    {
-      free (coff_section_data (abfd, lsec)->contents);
-      coff_section_data (abfd, lsec)->contents = NULL;
-    }
-
-  return true;
-}
-
-/* Returns the index of reloc in RELOCS with the least address greater
-   than or equal to ADDRESS.  The relocs are sorted by address.  */
-
-static bfd_size_type
-xcoff_find_reloc (relocs, count, address)
-     struct internal_reloc *relocs;
-     bfd_size_type count;
-     bfd_vma address;
-{
-  bfd_size_type min, max, this;
-
-  if (count < 2)
-    {
-      if (count == 1 && relocs[0].r_vaddr < address)
-	return 1;
-      else
-	return 0;
-    }
-
-  min = 0;
-  max = count;
-
-  /* Do a binary search over (min,max].  */
-  while (min + 1 < max)
-    {
-      bfd_vma raddr;
-
-      this = (max + min) / 2;
-      raddr = relocs[this].r_vaddr;
-      if (raddr > address)
-	max = this;
-      else if (raddr < address)
-	min = this;
-      else
-	{
-	  min = this;
-	  break;
-	}
-    }
-
-  if (relocs[min].r_vaddr < address)
-    return min + 1;
-
-  while (min > 0
-	 && relocs[min - 1].r_vaddr == address)
-    --min;
-
-  return min;
-}
-
-/* Add all the symbols from an object file to the hash table.
-
-   XCOFF is a weird format.  A normal XCOFF .o files will have three
-   COFF sections--.text, .data, and .bss--but each COFF section will
-   contain many csects.  These csects are described in the symbol
-   table.  From the linker's point of view, each csect must be
-   considered a section in its own right.  For example, a TOC entry is
-   handled as a small XMC_TC csect.  The linker must be able to merge
-   different TOC entries together, which means that it must be able to
-   extract the XMC_TC csects from the .data section of the input .o
-   file.
-
-   From the point of view of our linker, this is, of course, a hideous
-   nightmare.  We cope by actually creating sections for each csect,
-   and discarding the original sections.  We then have to handle the
-   relocation entries carefully, since the only way to tell which
-   csect they belong to is to examine the address.  */
-
-static boolean
-xcoff_link_add_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  unsigned int n_tmask;
-  unsigned int n_btshft;
-  boolean default_copy;
-  bfd_size_type symcount;
-  struct xcoff_link_hash_entry **sym_hash;
-  asection **csect_cache;
-  bfd_size_type linesz;
-  asection *o;
-  asection *last_real;
-  boolean keep_syms;
-  asection *csect;
-  unsigned int csect_index;
-  asection *first_csect;
-  bfd_size_type symesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-  struct reloc_info_struct
-    {
-      struct internal_reloc *relocs;
-      asection **csects;
-      bfd_byte *linenos;
-    } *reloc_info = NULL;
-
-  keep_syms = obj_coff_keep_syms (abfd);
-
-  if ((abfd->flags & DYNAMIC) != 0
-      && ! info->static_link)
-    {
-      if (! xcoff_link_add_dynamic_symbols (abfd, info))
-	return false;
-    }
-
-  if (info->hash->creator == abfd->xvec)
-    {
-      /* We need to build a .loader section, so we do it here.  This
-	 won't work if we're producing an XCOFF output file with no
-	 XCOFF input files.  FIXME.  */
-      if (xcoff_hash_table (info)->loader_section == NULL)
-	{
-	  asection *lsec;
-
-	  lsec = bfd_make_section_anyway (abfd, ".loader");
-	  if (lsec == NULL)
-	    goto error_return;
-	  xcoff_hash_table (info)->loader_section = lsec;
-	  lsec->flags |= SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-	}
-      /* Likewise for the linkage section.  */
-      if (xcoff_hash_table (info)->linkage_section == NULL)
-	{
-	  asection *lsec;
-
-	  lsec = bfd_make_section_anyway (abfd, ".gl");
-	  if (lsec == NULL)
-	    goto error_return;
-	  xcoff_hash_table (info)->linkage_section = lsec;
-	  lsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-			  | SEC_IN_MEMORY);
-	  lsec->alignment_power = 2;
-	}
-      /* Likewise for the TOC section.  */
-      if (xcoff_hash_table (info)->toc_section == NULL)
-	{
-	  asection *tsec;
-
-	  tsec = bfd_make_section_anyway (abfd, ".tc");
-	  if (tsec == NULL)
-	    goto error_return;
-	  xcoff_hash_table (info)->toc_section = tsec;
-	  tsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-			  | SEC_IN_MEMORY);
-	  tsec->alignment_power = 2;
-	}
-      /* Likewise for the descriptor section.  */
-      if (xcoff_hash_table (info)->descriptor_section == NULL)
-	{
-	  asection *dsec;
-
-	  dsec = bfd_make_section_anyway (abfd, ".ds");
-	  if (dsec == NULL)
-	    goto error_return;
-	  xcoff_hash_table (info)->descriptor_section = dsec;
-	  dsec->flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS
-			  | SEC_IN_MEMORY);
-	  dsec->alignment_power = 2;
-	}
-      /* Likewise for the .debug section.  */
-      if (xcoff_hash_table (info)->debug_section == NULL
-	  && info->strip != strip_all)
-	{
-	  asection *dsec;
-
-	  dsec = bfd_make_section_anyway (abfd, ".debug");
-	  if (dsec == NULL)
-	    goto error_return;
-	  xcoff_hash_table (info)->debug_section = dsec;
-	  dsec->flags |= SEC_HAS_CONTENTS | SEC_IN_MEMORY;
-	}
-    }
-
-  if ((abfd->flags & DYNAMIC) != 0
-      && ! info->static_link)
-    return true;
-
-  n_tmask = coff_data (abfd)->local_n_tmask;
-  n_btshft = coff_data (abfd)->local_n_btshft;
-
-  /* Define macros so that ISFCN, et. al., macros work correctly.  */
-#define N_TMASK n_tmask
-#define N_BTSHFT n_btshft
-
-  if (info->keep_memory)
-    default_copy = false;
-  else
-    default_copy = true;
-
-  symcount = obj_raw_syment_count (abfd);
-
-  /* We keep a list of the linker hash table entries that correspond
-     to each external symbol.  */
-  sym_hash = ((struct xcoff_link_hash_entry **)
-	      bfd_alloc (abfd,
-			 (symcount
-			  * sizeof (struct xcoff_link_hash_entry *))));
-  if (sym_hash == NULL && symcount != 0)
-    goto error_return;
-  coff_data (abfd)->sym_hashes = (struct coff_link_hash_entry **) sym_hash;
-  memset (sym_hash, 0,
-	  (size_t) symcount * sizeof (struct xcoff_link_hash_entry *));
-
-  /* Because of the weird stuff we are doing with XCOFF csects, we can
-     not easily determine which section a symbol is in, so we store
-     the information in the tdata for the input file.  */
-  csect_cache = ((asection **)
-		 bfd_alloc (abfd, symcount * sizeof (asection *)));
-  if (csect_cache == NULL && symcount != 0)
-    goto error_return;
-  xcoff_data (abfd)->csects = csect_cache;
-  memset (csect_cache, 0, (size_t) symcount * sizeof (asection *));
-
-  /* While splitting sections into csects, we need to assign the
-     relocs correctly.  The relocs and the csects must both be in
-     order by VMA within a given section, so we handle this by
-     scanning along the relocs as we process the csects.  We index
-     into reloc_info using the section target_index.  */
-  reloc_info = ((struct reloc_info_struct *)
-		bfd_malloc ((abfd->section_count + 1)
-			    * sizeof (struct reloc_info_struct)));
-  if (reloc_info == NULL)
-    goto error_return;
-  memset ((PTR) reloc_info, 0,
-	  (abfd->section_count + 1) * sizeof (struct reloc_info_struct));
-
-  /* Read in the relocs and line numbers for each section.  */
-  linesz = bfd_coff_linesz (abfd);
-  last_real = NULL;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      last_real = o;
-      if ((o->flags & SEC_RELOC) != 0)
-	{
-	  reloc_info[o->target_index].relocs =
-	    xcoff_read_internal_relocs (abfd, o, true, (bfd_byte *) NULL,
-					false, (struct internal_reloc *) NULL);
-	  reloc_info[o->target_index].csects =
-	    (asection **) bfd_malloc (o->reloc_count * sizeof (asection *));
-	  if (reloc_info[o->target_index].csects == NULL)
-	    goto error_return;
-	  memset (reloc_info[o->target_index].csects, 0,
-		  o->reloc_count * sizeof (asection *));
-	}
-
-      if ((info->strip == strip_none || info->strip == strip_some)
-	  && o->lineno_count > 0)
-	{
-	  bfd_byte *linenos;
-
-	  linenos = (bfd_byte *) bfd_malloc (o->lineno_count * linesz);
-	  if (linenos == NULL)
-	    goto error_return;
-	  reloc_info[o->target_index].linenos = linenos;
-	  if (bfd_seek (abfd, o->line_filepos, SEEK_SET) != 0
-	      || (bfd_read (linenos, linesz, o->lineno_count, abfd)
-		  != linesz * o->lineno_count))
-	    goto error_return;
-	}
-    }
-
-  /* Don't let the linker relocation routines discard the symbols.  */
-  obj_coff_keep_syms (abfd) = true;
-
-  csect = NULL;
-  csect_index = 0;
-  first_csect = NULL;
-
-  symesz = bfd_coff_symesz (abfd);
-  BFD_ASSERT (symesz == bfd_coff_auxesz (abfd));
-  esym = (bfd_byte *) obj_coff_external_syms (abfd);
-  esym_end = esym + symcount * symesz;
-  while (esym < esym_end)
-    {
-      struct internal_syment sym;
-      union internal_auxent aux;
-      const char *name;
-      char buf[SYMNMLEN + 1];
-      int smtyp;
-      flagword flags;
-      asection *section;
-      bfd_vma value;
-      struct xcoff_link_hash_entry *set_toc;
-
-      bfd_coff_swap_sym_in (abfd, (PTR) esym, (PTR) &sym);
-
-      /* In this pass we are only interested in symbols with csect
-         information.  */
-      if (sym.n_sclass != C_EXT && sym.n_sclass != C_HIDEXT)
-	{
-	  if (sym.n_sclass == C_FILE && csect != NULL)
-	    {
-	      xcoff_section_data (abfd, csect)->last_symndx =
-		((esym
-		  - (bfd_byte *) obj_coff_external_syms (abfd))
-		 / symesz);
-	      csect = NULL;
-	    }
-
-	  if (csect != NULL)
-	    *csect_cache = csect;
-	  else if (first_csect == NULL || sym.n_sclass == C_FILE)
-	    *csect_cache = coff_section_from_bfd_index (abfd, sym.n_scnum);
-	  else
-	    *csect_cache = NULL;
-	  esym += (sym.n_numaux + 1) * symesz;
-	  sym_hash += sym.n_numaux + 1;
-	  csect_cache += sym.n_numaux + 1;
-	  continue;
-	}
-
-      name = _bfd_coff_internal_syment_name (abfd, &sym, buf);
-      if (name == NULL)
-	goto error_return;
-
-      /* If this symbol has line number information attached to it,
-         and we're not stripping it, count the number of entries and
-         add them to the count for this csect.  In the final link pass
-         we are going to attach line number information by symbol,
-         rather than by section, in order to more easily handle
-         garbage collection.  */
-      if ((info->strip == strip_none || info->strip == strip_some)
-	  && sym.n_numaux > 1
-	  && csect != NULL
-	  && ISFCN (sym.n_type))
-	{
-	  union internal_auxent auxlin;
-
-	  bfd_coff_swap_aux_in (abfd, (PTR) (esym + symesz),
-				sym.n_type, sym.n_sclass,
-				0, sym.n_numaux, (PTR) &auxlin);
-	  if (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0)
-	    {
-	      asection *enclosing;
-	      bfd_size_type linoff;
-
-	      enclosing = xcoff_section_data (abfd, csect)->enclosing;
-	      if (enclosing == NULL)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: `%s' has line numbers but no enclosing section"),
-		     bfd_get_filename (abfd), name);
-		  bfd_set_error (bfd_error_bad_value);
-		  goto error_return;
-		}
-	      linoff = (auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr
-			- enclosing->line_filepos);
-	      if (linoff < enclosing->lineno_count * linesz)
-		{
-		  struct internal_lineno lin;
-		  bfd_byte *linpstart;
-
-		  linpstart = (reloc_info[enclosing->target_index].linenos
-			       + linoff);
-		  bfd_coff_swap_lineno_in (abfd, (PTR) linpstart, (PTR) &lin);
-		  if (lin.l_lnno == 0
-		      && ((bfd_size_type) lin.l_addr.l_symndx
-			  == ((esym
-			       - (bfd_byte *) obj_coff_external_syms (abfd))
-			      / symesz)))
-		    {
-		      bfd_byte *linpend, *linp;
-
-		      linpend = (reloc_info[enclosing->target_index].linenos
-				 + enclosing->lineno_count * linesz);
-		      for (linp = linpstart + linesz;
-			   linp < linpend;
-			   linp += linesz)
-			{
-			  bfd_coff_swap_lineno_in (abfd, (PTR) linp,
-						   (PTR) &lin);
-			  if (lin.l_lnno == 0)
-			    break;
-			}
-		      csect->lineno_count += (linp - linpstart) / linesz;
-		      /* The setting of line_filepos will only be
-                         useful if all the line number entries for a
-                         csect are contiguous; this only matters for
-                         error reporting.  */
-		      if (csect->line_filepos == 0)
-			csect->line_filepos =
-			  auxlin.x_sym.x_fcnary.x_fcn.x_lnnoptr;
-		    }
-		}
-	    }
-	}
-
-      /* Pick up the csect auxiliary information.  */
-
-      if (sym.n_numaux == 0)
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: class %d symbol `%s' has no aux entries"),
-	     bfd_get_filename (abfd), sym.n_sclass, name);
-	  bfd_set_error (bfd_error_bad_value);
-	  goto error_return;
-	}
-
-      bfd_coff_swap_aux_in (abfd,
-			    (PTR) (esym + symesz * sym.n_numaux),
-			    sym.n_type, sym.n_sclass,
-			    sym.n_numaux - 1, sym.n_numaux,
-			    (PTR) &aux);
-
-      smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp);
-
-      flags = BSF_GLOBAL;
-      section = NULL;
-      value = 0;
-      set_toc = NULL;
-
-      switch (smtyp)
-	{
-	default:
-	  (*_bfd_error_handler)
-	    (_("%s: symbol `%s' has unrecognized csect type %d"),
-	     bfd_get_filename (abfd), name, smtyp);
-	  bfd_set_error (bfd_error_bad_value);
-	  goto error_return;
-
-	case XTY_ER:
-	  /* This is an external reference.  */
-	  if (sym.n_sclass == C_HIDEXT
-	      || sym.n_scnum != N_UNDEF
-	      || aux.x_csect.x_scnlen.l != 0)
-	    {
-	      (*_bfd_error_handler)
-		(_("%s: bad XTY_ER symbol `%s': class %d scnum %d scnlen %d"),
-		 bfd_get_filename (abfd), name, sym.n_sclass, sym.n_scnum,
-		 aux.x_csect.x_scnlen.l);
-	      bfd_set_error (bfd_error_bad_value);
-	      goto error_return;
-	    }
-
-	  /* An XMC_XO external reference is actually a reference to
-             an absolute location.  */
-	  if (aux.x_csect.x_smclas != XMC_XO)
-	    section = bfd_und_section_ptr;
-	  else
-	    {
-	      section = bfd_abs_section_ptr;
-	      value = sym.n_value;
-	    }
-	  break;
-
-	case XTY_SD:
-	  /* This is a csect definition.  */
-
-	  if (csect != NULL)
-	    {
-	      xcoff_section_data (abfd, csect)->last_symndx =
-		((esym
-		  - (bfd_byte *) obj_coff_external_syms (abfd))
-		 / symesz);
-	    }
-
-	  csect = NULL;
-	  csect_index = -1;
-
-	  /* When we see a TOC anchor, we record the TOC value.  */
-	  if (aux.x_csect.x_smclas == XMC_TC0)
-	    {
-	      if (sym.n_sclass != C_HIDEXT
-		  || aux.x_csect.x_scnlen.l != 0)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: XMC_TC0 symbol `%s' is class %d scnlen %d"),
-		     bfd_get_filename (abfd), name, sym.n_sclass,
-		     aux.x_csect.x_scnlen.l);
-		  bfd_set_error (bfd_error_bad_value);
-		  goto error_return;
-		}
-	      xcoff_data (abfd)->toc = sym.n_value;
-	    }
-
-	  /* We must merge TOC entries for the same symbol.  We can
-	     merge two TOC entries if they are both C_HIDEXT, they
-	     both have the same name, they are both 4 bytes long, and
-	     they both have a relocation table entry for an external
-	     symbol with the same name.  Unfortunately, this means
-	     that we must look through the relocations.  Ick.  */
-	  if (aux.x_csect.x_smclas == XMC_TC
-	      && sym.n_sclass == C_HIDEXT
-	      && aux.x_csect.x_scnlen.l == 4
-	      && info->hash->creator == abfd->xvec)
-	    {
-	      asection *enclosing;
-	      struct internal_reloc *relocs;
-	      bfd_size_type relindx;
-	      struct internal_reloc *rel;
-
-	      enclosing = coff_section_from_bfd_index (abfd, sym.n_scnum);
-	      if (enclosing == NULL)
-		goto error_return;
-
-	      relocs = reloc_info[enclosing->target_index].relocs;
-	      relindx = xcoff_find_reloc (relocs, enclosing->reloc_count,
-					  sym.n_value);
-	      rel = relocs + relindx;
-	      if (relindx < enclosing->reloc_count
-		  && rel->r_vaddr == (bfd_vma) sym.n_value
-		  && rel->r_size == 31
-		  && rel->r_type == R_POS)
-		{
-		  bfd_byte *erelsym;
-		  struct internal_syment relsym;
-
-		  erelsym = ((bfd_byte *) obj_coff_external_syms (abfd)
-			     + rel->r_symndx * symesz);
-		  bfd_coff_swap_sym_in (abfd, (PTR) erelsym, (PTR) &relsym);
-		  if (relsym.n_sclass == C_EXT)
-		    {
-		      const char *relname;
-		      char relbuf[SYMNMLEN + 1];
-		      boolean copy;
-		      struct xcoff_link_hash_entry *h;
-
-		      /* At this point we know that the TOC entry is
-			 for an externally visible symbol.  */
-		      relname = _bfd_coff_internal_syment_name (abfd, &relsym,
-								relbuf);
-		      if (relname == NULL)
-			goto error_return;
-
-		      /* We only merge TOC entries if the TC name is
-                         the same as the symbol name.  This handles
-                         the normal case, but not common cases like
-                         SYM.P4 which gcc generates to store SYM + 4
-                         in the TOC.  FIXME.  */
-		      if (strcmp (name, relname) == 0)
-			{
-			  copy = (! info->keep_memory
-				  || relsym._n._n_n._n_zeroes != 0
-				  || relsym._n._n_n._n_offset == 0);
-			  h = xcoff_link_hash_lookup (xcoff_hash_table (info),
-						      relname, true, copy,
-						      false);
-			  if (h == NULL)
-			    goto error_return;
-
-			  /* At this point h->root.type could be
-			     bfd_link_hash_new.  That should be OK,
-			     since we know for sure that we will come
-			     across this symbol as we step through the
-			     file.  */
-
-			  /* We store h in *sym_hash for the
-			     convenience of the relocate_section
-			     function.  */
-			  *sym_hash = h;
-
-			  if (h->toc_section != NULL)
-			    {
-			      asection **rel_csects;
-
-			      /* We already have a TOC entry for this
-				 symbol, so we can just ignore this
-				 one.  */
-			      rel_csects =
-				reloc_info[enclosing->target_index].csects;
-			      rel_csects[relindx] = bfd_und_section_ptr;
-			      break;
-			    }
-
-			  /* We are about to create a TOC entry for
-			     this symbol.  */
-			  set_toc = h;
-			}
-		    }
-		}
-	    }
-
-	  /* We need to create a new section.  We get the name from
-	     the csect storage mapping class, so that the linker can
-	     accumulate similar csects together.  */
-	  {
-	    static const char *csect_name_by_class[] =
-	      {
-		".pr", ".ro", ".db", ".tc", ".ua", ".rw", ".gl", ".xo",
-		".sv", ".bs", ".ds", ".uc", ".ti", ".tb", NULL, ".tc0",
-		".td"
-	      };
-	    const char *csect_name;
-	    asection *enclosing;
-
-	    if ((aux.x_csect.x_smclas >=
-		 sizeof csect_name_by_class / sizeof csect_name_by_class[0])
-		|| csect_name_by_class[aux.x_csect.x_smclas] == NULL)
-	      {
-		(*_bfd_error_handler)
-		  (_("%s: symbol `%s' has unrecognized smclas %d"),
-		   bfd_get_filename (abfd), name, aux.x_csect.x_smclas);
-		bfd_set_error (bfd_error_bad_value);
-		goto error_return;
-	      }
-
-	    csect_name = csect_name_by_class[aux.x_csect.x_smclas];
-	    csect = bfd_make_section_anyway (abfd, csect_name);
-	    if (csect == NULL)
-	      goto error_return;
-	    enclosing = coff_section_from_bfd_index (abfd, sym.n_scnum);
-	    if (enclosing == NULL)
-	      goto error_return;
-	    if (! bfd_is_abs_section (enclosing)
-		&& ((bfd_vma) sym.n_value < enclosing->vma
-		    || ((bfd_vma) sym.n_value + aux.x_csect.x_scnlen.l
-			> enclosing->vma + enclosing->_raw_size)))
-	      {
-		(*_bfd_error_handler)
-		  (_("%s: csect `%s' not in enclosing section"),
-		   bfd_get_filename (abfd), name);
-		bfd_set_error (bfd_error_bad_value);
-		goto error_return;
-	      }
-	    csect->vma = sym.n_value;
-	    csect->filepos = (enclosing->filepos
-			      + sym.n_value
-			      - enclosing->vma);
-	    csect->_raw_size = aux.x_csect.x_scnlen.l;
-	    csect->flags |= SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS;
-	    csect->alignment_power = SMTYP_ALIGN (aux.x_csect.x_smtyp);
-
-	    /* Record the enclosing section in the tdata for this new
-	       section.  */
-	    csect->used_by_bfd =
-	      (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
-	    if (csect->used_by_bfd == NULL)
-	      goto error_return;
-	    coff_section_data (abfd, csect)->tdata =
-	      bfd_zalloc (abfd, sizeof (struct xcoff_section_tdata));
-	    if (coff_section_data (abfd, csect)->tdata == NULL)
-	      goto error_return;
-	    xcoff_section_data (abfd, csect)->enclosing = enclosing;
-	    xcoff_section_data (abfd, csect)->lineno_count =
-	      enclosing->lineno_count;
-
-	    if (enclosing->owner == abfd)
-	      {
-		struct internal_reloc *relocs;
-		bfd_size_type relindx;
-		struct internal_reloc *rel;
-		asection **rel_csect;
-
-		relocs = reloc_info[enclosing->target_index].relocs;
-		relindx = xcoff_find_reloc (relocs, enclosing->reloc_count,
-					    csect->vma);
-		rel = relocs + relindx;
-		rel_csect = (reloc_info[enclosing->target_index].csects
-			     + relindx);
-		csect->rel_filepos = (enclosing->rel_filepos
-				      + relindx * bfd_coff_relsz (abfd));
-		while (relindx < enclosing->reloc_count
-		       && *rel_csect == NULL
-		       && rel->r_vaddr < csect->vma + csect->_raw_size)
-		  {
-		    *rel_csect = csect;
-		    csect->flags |= SEC_RELOC;
-		    ++csect->reloc_count;
-		    ++relindx;
-		    ++rel;
-		    ++rel_csect;
-		  }
-	      }
-
-	    /* There are a number of other fields and section flags
-	       which we do not bother to set.  */
-
-	    csect_index = ((esym
-			    - (bfd_byte *) obj_coff_external_syms (abfd))
-			   / symesz);
-
-	    xcoff_section_data (abfd, csect)->first_symndx = csect_index;
-
-	    if (first_csect == NULL)
-	      first_csect = csect;
-
-	    /* If this symbol is C_EXT, we treat it as starting at the
-	       beginning of the newly created section.  */
-	    if (sym.n_sclass == C_EXT)
-	      {
-		section = csect;
-		value = 0;
-	      }
-
-	    /* If this is a TOC section for a symbol, record it.  */
-	    if (set_toc != NULL)
-	      set_toc->toc_section = csect;
-	  }
-	  break;
-
-	case XTY_LD:
-	  /* This is a label definition.  The x_scnlen field is the
-             symbol index of the csect.  I believe that this must
-             always follow the appropriate XTY_SD symbol, so I will
-             insist on it.  */
-	  {
-	    boolean bad;
-
-	    bad = false;
-	    if (aux.x_csect.x_scnlen.l < 0
-		|| (aux.x_csect.x_scnlen.l
-		    >= esym - (bfd_byte *) obj_coff_external_syms (abfd)))
-	      bad = true;
-	    if (! bad)
-	      {
-		section = xcoff_data (abfd)->csects[aux.x_csect.x_scnlen.l];
-		if (section == NULL
-		    || (section->flags & SEC_HAS_CONTENTS) == 0)
-		  bad = true;
-	      }
-	    if (bad)
-	      {
-		(*_bfd_error_handler)
-		  (_("%s: misplaced XTY_LD `%s'"),
-		   bfd_get_filename (abfd), name);
-		bfd_set_error (bfd_error_bad_value);
-		goto error_return;
-	      }
-
-	    value = sym.n_value - csect->vma;
-	  }
-	  break;
-
-	case XTY_CM:
-	  /* This is an unitialized csect.  We could base the name on
-             the storage mapping class, but we don't bother except for
-             an XMC_TD symbol.  If this csect is externally visible,
-             it is a common symbol.  We put XMC_TD symbols in sections
-             named .tocbss, and rely on the linker script to put that
-             in the TOC area.  */
-
-	  if (csect != NULL)
-	    {
-	      xcoff_section_data (abfd, csect)->last_symndx =
-		((esym
-		  - (bfd_byte *) obj_coff_external_syms (abfd))
-		 / symesz);
-	    }
-
-	  if (aux.x_csect.x_smclas == XMC_TD)
-	    csect = bfd_make_section_anyway (abfd, ".tocbss");
-	  else
-	    csect = bfd_make_section_anyway (abfd, ".bss");
-	  if (csect == NULL)
-	    goto error_return;
-	  csect->vma = sym.n_value;
-	  csect->_raw_size = aux.x_csect.x_scnlen.l;
-	  csect->flags |= SEC_ALLOC;
-	  csect->alignment_power = SMTYP_ALIGN (aux.x_csect.x_smtyp);
-	  /* There are a number of other fields and section flags
-	     which we do not bother to set.  */
-
-	  csect_index = ((esym
-			  - (bfd_byte *) obj_coff_external_syms (abfd))
-			 / symesz);
-
-	  csect->used_by_bfd =
-	    (PTR) bfd_zalloc (abfd, sizeof (struct coff_section_tdata));
-	  if (csect->used_by_bfd == NULL)
-	    goto error_return;
-	  coff_section_data (abfd, csect)->tdata =
-	    bfd_zalloc (abfd, sizeof (struct xcoff_section_tdata));
-	  if (coff_section_data (abfd, csect)->tdata == NULL)
-	    goto error_return;
-	  xcoff_section_data (abfd, csect)->first_symndx = csect_index;
-
-	  if (first_csect == NULL)
-	    first_csect = csect;
-
-	  if (sym.n_sclass == C_EXT)
-	    {
-	      csect->flags |= SEC_IS_COMMON;
-	      csect->_raw_size = 0;
-	      section = csect;
-	      value = aux.x_csect.x_scnlen.l;
-	    }
-
-	  break;
-	}
-
-      /* Check for magic symbol names.  */
-      if ((smtyp == XTY_SD || smtyp == XTY_CM)
-	  && aux.x_csect.x_smclas != XMC_TC
-	  && aux.x_csect.x_smclas != XMC_TD)
-	{
-	  int i;
-
-	  i = -1;
-	  if (name[0] == '_')
-	    {
-	      if (strcmp (name, "_text") == 0)
-		i = 0;
-	      else if (strcmp (name, "_etext") == 0)
-		i = 1;
-	      else if (strcmp (name, "_data") == 0)
-		i = 2;
-	      else if (strcmp (name, "_edata") == 0)
-		i = 3;
-	      else if (strcmp (name, "_end") == 0)
-		i = 4;
-	    }
-	  else if (name[0] == 'e' && strcmp (name, "end") == 0)
-	    i = 5;
-
-	  if (i != -1)
-	    xcoff_hash_table (info)->special_sections[i] = csect;
-	}
-
-      /* Now we have enough information to add the symbol to the
-         linker hash table.  */
-
-      if (sym.n_sclass == C_EXT)
-	{
-	  boolean copy;
-
-	  BFD_ASSERT (section != NULL);
-
-	  /* We must copy the name into memory if we got it from the
-             syment itself, rather than the string table.  */
-	  copy = default_copy;
-	  if (sym._n._n_n._n_zeroes != 0
-	      || sym._n._n_n._n_offset == 0)
-	    copy = true;
-
-	  /* The AIX linker appears to only detect multiple symbol
-	     definitions when there is a reference to the symbol.  If
-	     a symbol is defined multiple times, and the only
-	     references are from the same object file, the AIX linker
-	     appears to permit it.  It does not merge the different
-	     definitions, but handles them independently.  On the
-	     other hand, if there is a reference, the linker reports
-	     an error.
-
-	     This matters because the AIX <net/net_globals.h> header
-	     file actually defines an initialized array, so we have to
-	     actually permit that to work.
-
-	     Just to make matters even more confusing, the AIX linker
-	     appears to permit multiple symbol definitions whenever
-	     the second definition is in an archive rather than an
-	     object file.  This may be a consequence of the manner in
-	     which it handles archives: I think it may load the entire
-	     archive in as separate csects, and then let garbage
-	     collection discard symbols.
-
-	     We also have to handle the case of statically linking a
-	     shared object, which will cause symbol redefinitions,
-	     although this is an easier case to detect.  */
-
-	  if (info->hash->creator == abfd->xvec)
-	    {
-	      if (! bfd_is_und_section (section))
-		*sym_hash = xcoff_link_hash_lookup (xcoff_hash_table (info),
-						    name, true, copy, false);
-	      else
-		*sym_hash = ((struct xcoff_link_hash_entry *)
-			     bfd_wrapped_link_hash_lookup (abfd, info, name,
-							   true, copy, false));
-	      if (*sym_hash == NULL)
-		goto error_return;
-	      if (((*sym_hash)->root.type == bfd_link_hash_defined
-		   || (*sym_hash)->root.type == bfd_link_hash_defweak)
-		  && ! bfd_is_und_section (section)
-		  && ! bfd_is_com_section (section))
-		{
-		  /* This is a second definition of a defined symbol.  */
-		  if ((abfd->flags & DYNAMIC) != 0
-		      && ((*sym_hash)->smclas != XMC_GL
-			  || aux.x_csect.x_smclas == XMC_GL
-			  || ((*sym_hash)->root.u.def.section->owner->flags
-			      & DYNAMIC) == 0))
-		    {
-		      /* The new symbol is from a shared library, and
-                         either the existing symbol is not global
-                         linkage code or this symbol is global linkage
-                         code.  If the existing symbol is global
-                         linkage code and the new symbol is not, then
-                         we want to use the new symbol.  */
-		      section = bfd_und_section_ptr;
-		      value = 0;
-		    }
-		  else if (((*sym_hash)->root.u.def.section->owner->flags
-			    & DYNAMIC) != 0)
-		    {
-		      /* The existing symbol is from a shared library.
-                         Replace it.  */
-		      (*sym_hash)->root.type = bfd_link_hash_undefined;
-		      (*sym_hash)->root.u.undef.abfd =
-			(*sym_hash)->root.u.def.section->owner;
-		    }
-		  else if (abfd->my_archive != NULL)
-		    {
-		      /* This is a redefinition in an object contained
-                         in an archive.  Just ignore it.  See the
-                         comment above.  */
-		      section = bfd_und_section_ptr;
-		      value = 0;
-		    }
-		  else if ((*sym_hash)->root.next != NULL
-			   || info->hash->undefs_tail == &(*sym_hash)->root)
-		    {
-		      /* This symbol has been referenced.  In this
-                         case, we just continue and permit the
-                         multiple definition error.  See the comment
-                         above about the behaviour of the AIX linker.  */
-		    }
-		  else if ((*sym_hash)->smclas == aux.x_csect.x_smclas)
-		    {
-		      /* The symbols are both csects of the same
-                         class.  There is at least a chance that this
-                         is a semi-legitimate redefinition.  */
-		      section = bfd_und_section_ptr;
-		      value = 0;
-		      (*sym_hash)->flags |= XCOFF_MULTIPLY_DEFINED;
-		    }
-		}
-	      else if (((*sym_hash)->flags & XCOFF_MULTIPLY_DEFINED) != 0
-		       && ((*sym_hash)->root.type == bfd_link_hash_defined
-			   || (*sym_hash)->root.type == bfd_link_hash_defweak)
-		       && (bfd_is_und_section (section)
-			   || bfd_is_com_section (section)))
-		{
-		  /* This is a reference to a multiply defined symbol.
-		     Report the error now.  See the comment above
-		     about the behaviour of the AIX linker.  We could
-		     also do this with warning symbols, but I'm not
-		     sure the XCOFF linker is wholly prepared to
-		     handle them, and that would only be a warning,
-		     not an error.  */
-		  if (! ((*info->callbacks->multiple_definition)
-			 (info, (*sym_hash)->root.root.string,
-			  (bfd *) NULL, (asection *) NULL, 0,
-			  (*sym_hash)->root.u.def.section->owner,
-			  (*sym_hash)->root.u.def.section,
-			  (*sym_hash)->root.u.def.value)))
-		    goto error_return;
-		  /* Try not to give this error too many times.  */
-		  (*sym_hash)->flags &= ~XCOFF_MULTIPLY_DEFINED;
-		}
-	    }
-
-	  /* _bfd_generic_link_add_one_symbol may call the linker to
-	     generate an error message, and the linker may try to read
-	     the symbol table to give a good error.  Right now, the
-	     line numbers are in an inconsistent state, since they are
-	     counted both in the real sections and in the new csects.
-	     We need to leave the count in the real sections so that
-	     the linker can report the line number of the error
-	     correctly, so temporarily clobber the link to the csects
-	     so that the linker will not try to read the line numbers
-	     a second time from the csects.  */
-	  BFD_ASSERT (last_real->next == first_csect);
-	  last_real->next = NULL;
-	  if (! (_bfd_generic_link_add_one_symbol
-		 (info, abfd, name, flags, section, value,
-		  (const char *) NULL, copy, true,
-		  (struct bfd_link_hash_entry **) sym_hash)))
-	    goto error_return;
-	  last_real->next = first_csect;
-
-	  if (smtyp == XTY_CM)
-	    {
-	      if ((*sym_hash)->root.type != bfd_link_hash_common
-		  || (*sym_hash)->root.u.c.p->section != csect)
-		{
-		  /* We don't need the common csect we just created.  */
-		  csect->_raw_size = 0;
-		}
-	      else
-		{
-		  (*sym_hash)->root.u.c.p->alignment_power
-		     = csect->alignment_power;
-		}
-	    }
-
-	  if (info->hash->creator == abfd->xvec)
-	    {
-	      int flag;
-
-	      if (smtyp == XTY_ER || smtyp == XTY_CM)
-		flag = XCOFF_REF_REGULAR;
-	      else
-		flag = XCOFF_DEF_REGULAR;
-	      (*sym_hash)->flags |= flag;
-
-	      if ((*sym_hash)->smclas == XMC_UA
-		  || flag == XCOFF_DEF_REGULAR)
-		(*sym_hash)->smclas = aux.x_csect.x_smclas;
-	    }
-	}
-
-      *csect_cache = csect;
-
-      esym += (sym.n_numaux + 1) * symesz;
-      sym_hash += sym.n_numaux + 1;
-      csect_cache += sym.n_numaux + 1;
-    }
-
-  BFD_ASSERT (last_real == NULL || last_real->next == first_csect);
-
-  /* Make sure that we have seen all the relocs.  */
-  for (o = abfd->sections; o != first_csect; o = o->next)
-    {
-      /* Reset the section size and the line number count, since the
-	 data is now attached to the csects.  Don't reset the size of
-	 the .debug section, since we need to read it below in
-	 bfd_xcoff_size_dynamic_sections.  */
-      if (strcmp (bfd_get_section_name (abfd, o), ".debug") != 0)
-	o->_raw_size = 0;
-      o->lineno_count = 0;
-
-      if ((o->flags & SEC_RELOC) != 0)
-	{
-	  bfd_size_type i;
-	  struct internal_reloc *rel;
-	  asection **rel_csect;
-
-	  rel = reloc_info[o->target_index].relocs;
-	  rel_csect = reloc_info[o->target_index].csects;
-	  for (i = 0; i < o->reloc_count; i++, rel++, rel_csect++)
-	    {
-	      if (*rel_csect == NULL)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: reloc %s:%d not in csect"),
-		     bfd_get_filename (abfd), o->name, i);
-		  bfd_set_error (bfd_error_bad_value);
-		  goto error_return;
-		}
-
-	      /* We identify all symbols which are called, so that we
-		 can create glue code for calls to functions imported
-		 from dynamic objects.  */
-	      if (info->hash->creator == abfd->xvec
-		  && *rel_csect != bfd_und_section_ptr
-		  && (rel->r_type == R_BR
-		      || rel->r_type == R_RBR)
-		  && obj_xcoff_sym_hashes (abfd)[rel->r_symndx] != NULL)
-		{
-		  struct xcoff_link_hash_entry *h;
-
-		  h = obj_xcoff_sym_hashes (abfd)[rel->r_symndx];
-		  h->flags |= XCOFF_CALLED;
-		  /* If the symbol name starts with a period, it is
-                     the code of a function.  If the symbol is
-                     currently undefined, then add an undefined symbol
-                     for the function descriptor.  This should do no
-                     harm, because any regular object that defines the
-                     function should also define the function
-                     descriptor.  It helps, because it means that we
-                     will identify the function descriptor with a
-                     dynamic object if a dynamic object defines it.  */
-		  if (h->root.root.string[0] == '.'
-		      && h->descriptor == NULL)
-		    {
-		      struct xcoff_link_hash_entry *hds;
-
-		      hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
-						    h->root.root.string + 1,
-						    true, false, true);
-		      if (hds == NULL)
-			goto error_return;
-		      if (hds->root.type == bfd_link_hash_new)
-			{
-			  if (! (_bfd_generic_link_add_one_symbol
-				 (info, abfd, hds->root.root.string,
-				  (flagword) 0, bfd_und_section_ptr,
-				  (bfd_vma) 0, (const char *) NULL, false,
-				  true,
-				  (struct bfd_link_hash_entry **) &hds)))
-			    goto error_return;
-			}
-		      hds->flags |= XCOFF_DESCRIPTOR;
-		      BFD_ASSERT ((hds->flags & XCOFF_CALLED) == 0
-				  && (h->flags & XCOFF_DESCRIPTOR) == 0);
-		      hds->descriptor = h;
-		      h->descriptor = hds;
-		    }
-		}
-	    }
-
-	  free (reloc_info[o->target_index].csects);
-	  reloc_info[o->target_index].csects = NULL;
-
-	  /* Reset SEC_RELOC and the reloc_count, since the reloc
-	     information is now attached to the csects.  */
-	  o->flags &=~ SEC_RELOC;
-	  o->reloc_count = 0;
-
-	  /* If we are not keeping memory, free the reloc information.  */
-	  if (! info->keep_memory
-	      && coff_section_data (abfd, o) != NULL
-	      && coff_section_data (abfd, o)->relocs != NULL
-	      && ! coff_section_data (abfd, o)->keep_relocs)
-	    {
-	      free (coff_section_data (abfd, o)->relocs);
-	      coff_section_data (abfd, o)->relocs = NULL;
-	    }
-	}
-
-      /* Free up the line numbers.  FIXME: We could cache these
-         somewhere for the final link, to avoid reading them again.  */
-      if (reloc_info[o->target_index].linenos != NULL)
-	{
-	  free (reloc_info[o->target_index].linenos);
-	  reloc_info[o->target_index].linenos = NULL;
-	}
-    }
-
-  free (reloc_info);
-
-  obj_coff_keep_syms (abfd) = keep_syms;
-
-  return true;
-
- error_return:
-  if (reloc_info != NULL)
-    {
-      for (o = abfd->sections; o != NULL; o = o->next)
-	{
-	  if (reloc_info[o->target_index].csects != NULL)
-	    free (reloc_info[o->target_index].csects);
-	  if (reloc_info[o->target_index].linenos != NULL)
-	    free (reloc_info[o->target_index].linenos);
-	}
-    free (reloc_info);
-    }
-  obj_coff_keep_syms (abfd) = keep_syms;
-  return false;
-}
-
-#undef N_TMASK
-#undef N_BTSHFT
-
-/* This function is used to add symbols from a dynamic object to the
-   global symbol table.  */
-
-static boolean
-xcoff_link_add_dynamic_symbols (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  asection *lsec;
-  bfd_byte *buf;
-  struct internal_ldhdr ldhdr;
-  const char *strings;
-  struct external_ldsym *elsym, *elsymend;
-  struct xcoff_import_file *n;
-  const char *bname;
-  const char *mname;
-  const char *s;
-  unsigned int c;
-  struct xcoff_import_file **pp;
-
-  /* We can only handle a dynamic object if we are generating an XCOFF
-     output file.  */
-  if (info->hash->creator != abfd->xvec)
-    {
-      (*_bfd_error_handler)
-	(_("%s: XCOFF shared object when not producing XCOFF output"),
-	 bfd_get_filename (abfd));
-      bfd_set_error (bfd_error_invalid_operation);
-      return false;
-    }
-
-  /* The symbols we use from a dynamic object are not the symbols in
-     the normal symbol table, but, rather, the symbols in the export
-     table.  If there is a global symbol in a dynamic object which is
-     not in the export table, the loader will not be able to find it,
-     so we don't want to find it either.  Also, on AIX 4.1.3, shr.o in
-     libc.a has symbols in the export table which are not in the
-     symbol table.  */
-
-  /* Read in the .loader section.  FIXME: We should really use the
-     o_snloader field in the a.out header, rather than grabbing the
-     section by name.  */
-  lsec = bfd_get_section_by_name (abfd, ".loader");
-  if (lsec == NULL)
-    {
-      (*_bfd_error_handler)
-	(_("%s: dynamic object with no .loader section"),
-	 bfd_get_filename (abfd));
-      bfd_set_error (bfd_error_no_symbols);
-      return false;
-    }
-
-  if (! xcoff_get_section_contents (abfd, lsec))
-    return false;
-  buf = coff_section_data (abfd, lsec)->contents;
-
-  /* Remove the sections from this object, so that they do not get
-     included in the link.  */
-  abfd->sections = NULL;
-
-  xcoff_swap_ldhdr_in (abfd, (struct external_ldhdr *) buf, &ldhdr);
-
-  strings = (char *) buf + ldhdr.l_stoff;
-
-  elsym = (struct external_ldsym *) (buf + LDHDRSZ);
-  elsymend = elsym + ldhdr.l_nsyms;
-  BFD_ASSERT (sizeof (struct external_ldsym) == LDSYMSZ);
-  for (; elsym < elsymend; elsym++)
-    {
-      struct internal_ldsym ldsym;
-      char nambuf[SYMNMLEN + 1];
-      const char *name;
-      struct xcoff_link_hash_entry *h;
-
-      xcoff_swap_ldsym_in (abfd, elsym, &ldsym);
-
-      /* We are only interested in exported symbols.  */
-      if ((ldsym.l_smtype & L_EXPORT) == 0)
-	continue;
-
-      if (ldsym._l._l_l._l_zeroes == 0)
-	name = strings + ldsym._l._l_l._l_offset;
-      else
-	{
-	  memcpy (nambuf, ldsym._l._l_name, SYMNMLEN);
-	  nambuf[SYMNMLEN] = '\0';
-	  name = nambuf;
-	}
-
-      /* Normally we could not call xcoff_link_hash_lookup in an add
-	 symbols routine, since we might not be using an XCOFF hash
-	 table.  However, we verified above that we are using an XCOFF
-	 hash table.  */
-
-      h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, true,
-				  true, true);
-      if (h == NULL)
-	return false;
-
-      h->flags |= XCOFF_DEF_DYNAMIC;
-
-      /* If the symbol is undefined, and the BFD it was found in is
-	 not a dynamic object, change the BFD to this dynamic object,
-	 so that we can get the correct import file ID.  */
-      if ((h->root.type == bfd_link_hash_undefined
-	   || h->root.type == bfd_link_hash_undefweak)
-	  && (h->root.u.undef.abfd == NULL
-	      || (h->root.u.undef.abfd->flags & DYNAMIC) == 0))
-	h->root.u.undef.abfd = abfd;
-
-      if (h->root.type == bfd_link_hash_new)
-	{
-	  h->root.type = bfd_link_hash_undefined;
-	  h->root.u.undef.abfd = abfd;
-	  /* We do not want to add this to the undefined symbol list.  */
-	}
-
-      if (h->smclas == XMC_UA
-	  || h->root.type == bfd_link_hash_undefined
-	  || h->root.type == bfd_link_hash_undefweak)
-	h->smclas = ldsym.l_smclas;
-
-      /* Unless this is an XMC_XO symbol, we don't bother to actually
-         define it, since we don't have a section to put it in anyhow.
-         Instead, the relocation routines handle the DEF_DYNAMIC flag
-         correctly.  */
-
-      if (h->smclas == XMC_XO
-	  && (h->root.type == bfd_link_hash_undefined
-	      || h->root.type == bfd_link_hash_undefweak))
-	{
-	  /* This symbol has an absolute value.  */
-	  h->root.type = bfd_link_hash_defined;
-	  h->root.u.def.section = bfd_abs_section_ptr;
-	  h->root.u.def.value = ldsym.l_value;
-	}
-
-      /* If this symbol defines a function descriptor, then it
-	 implicitly defines the function code as well.  */
-      if (h->smclas == XMC_DS
-	  || (h->smclas == XMC_XO && name[0] != '.'))
-	h->flags |= XCOFF_DESCRIPTOR;
-      if ((h->flags & XCOFF_DESCRIPTOR) != 0)
-	{
-	  struct xcoff_link_hash_entry *hds;
-
-	  hds = h->descriptor;
-	  if (hds == NULL)
-	    {
-	      char *dsnm;
-
-	      dsnm = bfd_malloc (strlen (name) + 2);
-	      if (dsnm == NULL)
-		return false;
-	      dsnm[0] = '.';
-	      strcpy (dsnm + 1, name);
-	      hds = xcoff_link_hash_lookup (xcoff_hash_table (info), dsnm,
-					    true, true, true);
-	      free (dsnm);
-	      if (hds == NULL)
-		return false;
-
-	      if (hds->root.type == bfd_link_hash_new)
-		{
-		  hds->root.type = bfd_link_hash_undefined;
-		  hds->root.u.undef.abfd = abfd;
-		  /* We do not want to add this to the undefined
-                     symbol list.  */
-		}
-
-	      hds->descriptor = h;
-	      h->descriptor = hds;
-	    }
-
-	  hds->flags |= XCOFF_DEF_DYNAMIC;
-	  if (hds->smclas == XMC_UA)
-	    hds->smclas = XMC_PR;
-
-	  /* An absolute symbol appears to actually define code, not a
-	     function descriptor.  This is how some math functions are
-	     implemented on AIX 4.1.  */
-	  if (h->smclas == XMC_XO
-	      && (hds->root.type == bfd_link_hash_undefined
-		  || hds->root.type == bfd_link_hash_undefweak))
-	    {
-	      hds->smclas = XMC_XO;
-	      hds->root.type = bfd_link_hash_defined;
-	      hds->root.u.def.section = bfd_abs_section_ptr;
-	      hds->root.u.def.value = ldsym.l_value;
-	    }
-	}
-    }
-
-  if (buf != NULL && ! coff_section_data (abfd, lsec)->keep_contents)
-    {
-      free (coff_section_data (abfd, lsec)->contents);
-      coff_section_data (abfd, lsec)->contents = NULL;
-    }
-
-  /* Record this file in the import files.  */
-
-  n = ((struct xcoff_import_file *)
-       bfd_alloc (abfd, sizeof (struct xcoff_import_file)));
-  if (n == NULL)
-    return false;
-  n->next = NULL;
-
-  /* For some reason, the path entry in the import file list for a
-     shared object appears to always be empty.  The file name is the
-     base name.  */
-  n->path = "";
-  if (abfd->my_archive == NULL)
-    {
-      bname = bfd_get_filename (abfd);
-      mname = "";
-    }
-  else
-    {
-      bname = bfd_get_filename (abfd->my_archive);
-      mname = bfd_get_filename (abfd);
-    }
-  s = strrchr (bname, '/');
-  if (s != NULL)
-    bname = s + 1;
-  n->file = bname;
-  n->member = mname;
-
-  /* We start c at 1 because the first import file number is reserved
-     for LIBPATH.  */
-  for (pp = &xcoff_hash_table (info)->imports, c = 1;
-       *pp != NULL;
-       pp = &(*pp)->next, ++c)
-    ;
-  *pp = n;
-
-  xcoff_data (abfd)->import_file_id = c;
-
-  return true;
-}
-
-/* Routines that are called after all the input files have been
-   handled, but before the sections are laid out in memory.  */
-
-/* Mark a symbol as not being garbage, including the section in which
-   it is defined.  */
-
-static INLINE boolean
-xcoff_mark_symbol (info, h)
-     struct bfd_link_info *info;
-     struct xcoff_link_hash_entry *h;
-{
-  if ((h->flags & XCOFF_MARK) != 0)
-    return true;
-
-  h->flags |= XCOFF_MARK;
-  if (h->root.type == bfd_link_hash_defined
-      || h->root.type == bfd_link_hash_defweak)
-    {
-      asection *hsec;
-
-      hsec = h->root.u.def.section;
-      if (! bfd_is_abs_section (hsec)
-	  && (hsec->flags & SEC_MARK) == 0)
-	{
-	  if (! xcoff_mark (info, hsec))
-	    return false;
-	}
-    }
-
-  if (h->toc_section != NULL
-      && (h->toc_section->flags & SEC_MARK) == 0)
-    {
-      if (! xcoff_mark (info, h->toc_section))
-	return false;
-    }
-
-  return true;
-}
-
-/* The mark phase of garbage collection.  For a given section, mark
-   it, and all the sections which define symbols to which it refers.
-   Because this function needs to look at the relocs, we also count
-   the number of relocs which need to be copied into the .loader
-   section.  */
-
-static boolean
-xcoff_mark (info, sec)
-     struct bfd_link_info *info;
-     asection *sec;
-{
-  if (bfd_is_abs_section (sec)
-      || (sec->flags & SEC_MARK) != 0)
-    return true;
-
-  sec->flags |= SEC_MARK;
-
-  if (sec->owner->xvec == info->hash->creator
-      && coff_section_data (sec->owner, sec) != NULL
-      && xcoff_section_data (sec->owner, sec) != NULL)
-    {
-      register struct xcoff_link_hash_entry **hp, **hpend;
-      struct internal_reloc *rel, *relend;
-
-      /* Mark all the symbols in this section.  */
-
-      hp = (obj_xcoff_sym_hashes (sec->owner)
-	    + xcoff_section_data (sec->owner, sec)->first_symndx);
-      hpend = (obj_xcoff_sym_hashes (sec->owner)
-	       + xcoff_section_data (sec->owner, sec)->last_symndx);
-      for (; hp < hpend; hp++)
-	{
-	  register struct xcoff_link_hash_entry *h;
-
-	  h = *hp;
-	  if (h != NULL
-	      && (h->flags & XCOFF_MARK) == 0)
-	    {
-	      if (! xcoff_mark_symbol (info, h))
-		return false;
-	    }
-	}
-
-      /* Look through the section relocs.  */
-
-      if ((sec->flags & SEC_RELOC) != 0
-	  && sec->reloc_count > 0)
-	{
-	  rel = xcoff_read_internal_relocs (sec->owner, sec, true,
-					    (bfd_byte *) NULL, false,
-					    (struct internal_reloc *) NULL);
-	  if (rel == NULL)
-	    return false;
-	  relend = rel + sec->reloc_count;
-	  for (; rel < relend; rel++)
-	    {
-	      asection *rsec;
-	      struct xcoff_link_hash_entry *h;
-
-	      if ((unsigned int) rel->r_symndx
-		  > obj_raw_syment_count (sec->owner))
-		continue;
-
-	      h = obj_xcoff_sym_hashes (sec->owner)[rel->r_symndx];
-	      if (h != NULL
-		  && (h->flags & XCOFF_MARK) == 0)
-		{
-		  if (! xcoff_mark_symbol (info, h))
-		    return false;
-		}
-
-	      rsec = xcoff_data (sec->owner)->csects[rel->r_symndx];
-	      if (rsec != NULL
-		  && (rsec->flags & SEC_MARK) == 0)
-		{
-		  if (! xcoff_mark (info, rsec))
-		    return false;
-		}
-
-	      /* See if this reloc needs to be copied into the .loader
-                 section.  */
-	      switch (rel->r_type)
-		{
-		default:
-		  if (h == NULL
-		      || h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak
-		      || h->root.type == bfd_link_hash_common
-		      || ((h->flags & XCOFF_CALLED) != 0
-			  && (h->root.type == bfd_link_hash_undefined
-			      || h->root.type == bfd_link_hash_undefweak)
-			  && h->root.root.string[0] == '.'
-			  && h->descriptor != NULL
-			  && ((h->descriptor->flags & XCOFF_DEF_DYNAMIC) != 0
-			      || ((h->descriptor->flags & XCOFF_IMPORT) != 0
-				  && (h->descriptor->flags
-				      & XCOFF_DEF_REGULAR) == 0))))
-		    break;
-		  /* Fall through.  */
-		case R_POS:
-		case R_NEG:
-		case R_RL:
-		case R_RLA:
-		  ++xcoff_hash_table (info)->ldrel_count;
-		  if (h != NULL)
-		    h->flags |= XCOFF_LDREL;
-		  break;
-		case R_TOC:
-		case R_GL:
-		case R_TCL:
-		case R_TRL:
-		case R_TRLA:
-		  /* We should never need a .loader reloc for a TOC
-		     relative reloc.  */
-		  break;
-		}
-	    }
-
-	  if (! info->keep_memory
-	      && coff_section_data (sec->owner, sec) != NULL
-	      && coff_section_data (sec->owner, sec)->relocs != NULL
-	      && ! coff_section_data (sec->owner, sec)->keep_relocs)
-	    {
-	      free (coff_section_data (sec->owner, sec)->relocs);
-	      coff_section_data (sec->owner, sec)->relocs = NULL;
-	    }
-	}
-    }
-
-  return true;
-}
-
-/* The sweep phase of garbage collection.  Remove all garbage
-   sections.  */
-
-static void
-xcoff_sweep (info)
-     struct bfd_link_info *info;
-{
-  bfd *sub;
-
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      asection *o;
-
-      for (o = sub->sections; o != NULL; o = o->next)
-	{
-	  if ((o->flags & SEC_MARK) == 0)
-	    {
-	      /* Keep all sections from non-XCOFF input files.  Keep
-                 special sections.  Keep .debug sections for the
-                 moment.  */
-	      if (sub->xvec != info->hash->creator
-		  || o == xcoff_hash_table (info)->debug_section
-		  || o == xcoff_hash_table (info)->loader_section
-		  || o == xcoff_hash_table (info)->linkage_section
-		  || o == xcoff_hash_table (info)->toc_section
-		  || o == xcoff_hash_table (info)->descriptor_section
-		  || strcmp (o->name, ".debug") == 0)
-		o->flags |= SEC_MARK;
-	      else
-		{
-		  o->_raw_size = 0;
-		  o->reloc_count = 0;
-		  o->lineno_count = 0;
-		}
-	    }
-	}
-    }
-}
-
-/* Record the number of elements in a set.  This is used to output the
-   correct csect length.  */
-
-boolean
-bfd_xcoff_link_record_set (output_bfd, info, harg, size)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct bfd_link_hash_entry *harg;
-     bfd_size_type size;
-{
-  struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
-  struct xcoff_link_size_list *n;
-
-  if (! XCOFF_XVECP (output_bfd->xvec))
-    return true;
-
-  /* This will hardly ever be called.  I don't want to burn four bytes
-     per global symbol, so instead the size is kept on a linked list
-     attached to the hash table.  */
-
-  n = ((struct xcoff_link_size_list *)
-       bfd_alloc (output_bfd, sizeof (struct xcoff_link_size_list)));
-  if (n == NULL)
-    return false;
-  n->next = xcoff_hash_table (info)->size_list;
-  n->h = h;
-  n->size = size;
-  xcoff_hash_table (info)->size_list = n;
-
-  h->flags |= XCOFF_HAS_SIZE;
-
-  return true;
-}
-
-/* Import a symbol.  */
-
-boolean
-bfd_xcoff_import_symbol (output_bfd, info, harg, val, imppath, impfile,
-			 impmember)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct bfd_link_hash_entry *harg;
-     bfd_vma val;
-     const char *imppath;
-     const char *impfile;
-     const char *impmember;
-{
-  struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
-
-  if (! XCOFF_XVECP (output_bfd->xvec))
-    return true;
-
-  /* A symbol name which starts with a period is the code for a
-     function.  If the symbol is undefined, then add an undefined
-     symbol for the function descriptor, and import that instead.  */
-  if (h->root.root.string[0] == '.'
-      && h->root.type == bfd_link_hash_undefined
-      && val == (bfd_vma) -1)
-    {
-      struct xcoff_link_hash_entry *hds;
-
-      hds = h->descriptor;
-      if (hds == NULL)
-	{
-	  hds = xcoff_link_hash_lookup (xcoff_hash_table (info),
-					h->root.root.string + 1,
-					true, false, true);
-	  if (hds == NULL)
-	    return false;
-	  if (hds->root.type == bfd_link_hash_new)
-	    {
-	      hds->root.type = bfd_link_hash_undefined;
-	      hds->root.u.undef.abfd = h->root.u.undef.abfd;
-	    }
-	  hds->flags |= XCOFF_DESCRIPTOR;
-	  BFD_ASSERT ((hds->flags & XCOFF_CALLED) == 0
-		      && (h->flags & XCOFF_DESCRIPTOR) == 0);
-	  hds->descriptor = h;
-	  h->descriptor = hds;
-	}
-
-      /* Now, if the descriptor is undefined, import the descriptor
-         rather than the symbol we were told to import.  FIXME: Is
-         this correct in all cases?  */
-      if (hds->root.type == bfd_link_hash_undefined)
-	h = hds;
-    }
-
-  h->flags |= XCOFF_IMPORT;
-
-  if (val != (bfd_vma) -1)
-    {
-      if (h->root.type == bfd_link_hash_defined
-	  && (! bfd_is_abs_section (h->root.u.def.section)
-	      || h->root.u.def.value != val))
-	{
-	  if (! ((*info->callbacks->multiple_definition)
-		 (info, h->root.root.string, h->root.u.def.section->owner,
-		  h->root.u.def.section, h->root.u.def.value,
-		  output_bfd, bfd_abs_section_ptr, val)))
-	    return false;
-	}
-
-      h->root.type = bfd_link_hash_defined;
-      h->root.u.def.section = bfd_abs_section_ptr;
-      h->root.u.def.value = val;
-    }
-
-  /* We overload the ldindx field to hold the l_ifile value for this
-     symbol.  */
-  BFD_ASSERT (h->ldsym == NULL);
-  BFD_ASSERT ((h->flags & XCOFF_BUILT_LDSYM) == 0);
-  if (imppath == NULL)
-    h->ldindx = -1;
-  else
-    {
-      unsigned int c;
-      struct xcoff_import_file **pp;
-
-      /* We start c at 1 because the first entry in the import list is
-         reserved for the library search path.  */
-      for (pp = &xcoff_hash_table (info)->imports, c = 1;
-	   *pp != NULL;
-	   pp = &(*pp)->next, ++c)
-	{
-	  if (strcmp ((*pp)->path, imppath) == 0
-	      && strcmp ((*pp)->file, impfile) == 0
-	      && strcmp ((*pp)->member, impmember) == 0)
-	    break;
-	}
-
-      if (*pp == NULL)
-	{
-	  struct xcoff_import_file *n;
-
-	  n = ((struct xcoff_import_file *)
-	       bfd_alloc (output_bfd, sizeof (struct xcoff_import_file)));
-	  if (n == NULL)
-	    return false;
-	  n->next = NULL;
-	  n->path = imppath;
-	  n->file = impfile;
-	  n->member = impmember;
-	  *pp = n;
-	}
-
-      h->ldindx = c;
-    }
-
-  return true;
-}
-
-/* Export a symbol.  */
-
-boolean
-bfd_xcoff_export_symbol (output_bfd, info, harg, syscall)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     struct bfd_link_hash_entry *harg;
-     boolean syscall;
-{
-  struct xcoff_link_hash_entry *h = (struct xcoff_link_hash_entry *) harg;
-
-  if (! XCOFF_XVECP (output_bfd->xvec))
-    return true;
-
-  h->flags |= XCOFF_EXPORT;
-
-  /* FIXME: I'm not at all sure what syscall is supposed to mean, so
-     I'm just going to ignore it until somebody explains it.  */
-
-  /* See if this is a function descriptor.  It may be one even though
-     it is not so marked.  */
-  if ((h->flags & XCOFF_DESCRIPTOR) == 0
-      && h->root.root.string[0] != '.')
-    {
-      char *fnname;
-      struct xcoff_link_hash_entry *hfn;
-
-      fnname = (char *) bfd_malloc (strlen (h->root.root.string) + 2);
-      if (fnname == NULL)
-	return false;
-      fnname[0] = '.';
-      strcpy (fnname + 1, h->root.root.string);
-      hfn = xcoff_link_hash_lookup (xcoff_hash_table (info),
-				    fnname, false, false, true);
-      free (fnname);
-      if (hfn != NULL
-	  && hfn->smclas == XMC_PR
-	  && (hfn->root.type == bfd_link_hash_defined
-	      || hfn->root.type == bfd_link_hash_defweak))
-	{
-	  h->flags |= XCOFF_DESCRIPTOR;
-	  h->descriptor = hfn;
-	  hfn->descriptor = h;
-	}
-    }
-
-  /* Make sure we don't garbage collect this symbol.  */
-  if (! xcoff_mark_symbol (info, h))
-    return false;
-
-  /* If this is a function descriptor, make sure we don't garbage
-     collect the associated function code.  We normally don't have to
-     worry about this, because the descriptor will be attached to a
-     section with relocs, but if we are creating the descriptor
-     ourselves those relocs will not be visible to the mark code.  */
-  if ((h->flags & XCOFF_DESCRIPTOR) != 0)
-    {
-      if (! xcoff_mark_symbol (info, h->descriptor))
-	return false;
-    }
-
-  return true;
-}
-
-/* Count a reloc against a symbol.  This is called for relocs
-   generated by the linker script, typically for global constructors
-   and destructors.  */
-
-boolean
-bfd_xcoff_link_count_reloc (output_bfd, info, name)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *name;
-{
-  struct xcoff_link_hash_entry *h;
-
-  if (! XCOFF_XVECP (output_bfd->xvec))
-    return true;
-
-  h = ((struct xcoff_link_hash_entry *)
-       bfd_wrapped_link_hash_lookup (output_bfd, info, name, false, false,
-				     false));
-  if (h == NULL)
-    {
-      (*_bfd_error_handler) (_("%s: no such symbol"), name);
-      bfd_set_error (bfd_error_no_symbols);
-      return false;
-    }
-
-  h->flags |= XCOFF_REF_REGULAR | XCOFF_LDREL;
-  ++xcoff_hash_table (info)->ldrel_count;
-  
-  /* Mark the symbol to avoid garbage collection.  */
-  if (! xcoff_mark_symbol (info, h))
-    return false;
-
-  return true;
-}
-
-/* This function is called for each symbol to which the linker script
-   assigns a value.  */
-
-boolean
-bfd_xcoff_record_link_assignment (output_bfd, info, name)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *name;
-{
-  struct xcoff_link_hash_entry *h;
-
-  if (! XCOFF_XVECP (output_bfd->xvec))
-    return true;
-
-  h = xcoff_link_hash_lookup (xcoff_hash_table (info), name, true, true,
-			      false);
-  if (h == NULL)
-    return false;
-
-  h->flags |= XCOFF_DEF_REGULAR;
-
-  return true;
-}
-
-/* This structure is used to pass information through
-   xcoff_link_hash_traverse.  */
-
-struct xcoff_loader_info
-{
-  /* Set if a problem occurred.  */
-  boolean failed;
-  /* Output BFD.  */
-  bfd *output_bfd;
-  /* Link information structure.  */
-  struct bfd_link_info *info;
-  /* Whether all defined symbols should be exported.  */
-  boolean export_defineds;
-  /* Number of ldsym structures.  */
-  size_t ldsym_count;
-  /* Size of string table.  */
-  size_t string_size;
-  /* String table.  */
-  bfd_byte *strings;
-  /* Allocated size of string table.  */
-  size_t string_alc;
-};
-
-/* Build the .loader section.  This is called by the XCOFF linker
-   emulation before_allocation routine.  We must set the size of the
-   .loader section before the linker lays out the output file.
-   LIBPATH is the library path to search for shared objects; this is
-   normally built from the -L arguments passed to the linker.  ENTRY
-   is the name of the entry point symbol (the -e linker option).
-   FILE_ALIGN is the alignment to use for sections within the file
-   (the -H linker option).  MAXSTACK is the maximum stack size (the
-   -bmaxstack linker option).  MAXDATA is the maximum data size (the
-   -bmaxdata linker option).  GC is whether to do garbage collection
-   (the -bgc linker option).  MODTYPE is the module type (the
-   -bmodtype linker option).  TEXTRO is whether the text section must
-   be read only (the -btextro linker option).  EXPORT_DEFINEDS is
-   whether all defined symbols should be exported (the -unix linker
-   option).  SPECIAL_SECTIONS is set by this routine to csects with
-   magic names like _end.  */
-
-boolean
-bfd_xcoff_size_dynamic_sections (output_bfd, info, libpath, entry,
-				 file_align, maxstack, maxdata, gc,
-				 modtype, textro, export_defineds,
-				 special_sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     const char *libpath;
-     const char *entry;
-     unsigned long file_align;
-     unsigned long maxstack;
-     unsigned long maxdata;
-     boolean gc;
-     int modtype;
-     boolean textro;
-     boolean export_defineds;
-     asection **special_sections;
-{
-  struct xcoff_link_hash_entry *hentry;
-  asection *lsec;
-  struct xcoff_loader_info ldinfo;
-  int i;
-  size_t impsize, impcount;
-  struct xcoff_import_file *fl;
-  struct internal_ldhdr *ldhdr;
-  bfd_size_type stoff;
-  register char *out;
-  asection *sec;
-  bfd *sub;
-  struct bfd_strtab_hash *debug_strtab;
-  bfd_byte *debug_contents = NULL;
-
-  if (! XCOFF_XVECP (output_bfd->xvec))
-    {
-      for (i = 0; i < 6; i++)
-	special_sections[i] = NULL;
-      return true;
-    }
-
-  ldinfo.failed = false;
-  ldinfo.output_bfd = output_bfd;
-  ldinfo.info = info;
-  ldinfo.export_defineds = export_defineds;
-  ldinfo.ldsym_count = 0;
-  ldinfo.string_size = 0;
-  ldinfo.strings = NULL;
-  ldinfo.string_alc = 0;
-
-  xcoff_data (output_bfd)->maxstack = maxstack;
-  xcoff_data (output_bfd)->maxdata = maxdata;
-  xcoff_data (output_bfd)->modtype = modtype;
-
-  xcoff_hash_table (info)->file_align = file_align;
-  xcoff_hash_table (info)->textro = textro;
-
-  hentry = xcoff_link_hash_lookup (xcoff_hash_table (info), entry,
-				   false, false, true);
-  if (hentry != NULL)
-    hentry->flags |= XCOFF_ENTRY;
-
-  /* Garbage collect unused sections.  */
-  if (info->relocateable
-      || ! gc
-      || hentry == NULL
-      || (hentry->root.type != bfd_link_hash_defined
-	  && hentry->root.type != bfd_link_hash_defweak))
-    {
-      gc = false;
-      xcoff_hash_table (info)->gc = false;
-
-      /* We still need to call xcoff_mark, in order to set ldrel_count
-         correctly.  */
-      for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-	{
-	  asection *o;
-
-	  for (o = sub->sections; o != NULL; o = o->next)
-	    {
-	      if ((o->flags & SEC_MARK) == 0)
-		{
-		  if (! xcoff_mark (info, o))
-		    goto error_return;
-		}
-	    }
-	}
-    }
-  else
-    {
-      if (! xcoff_mark (info, hentry->root.u.def.section))
-	goto error_return;
-      xcoff_sweep (info);
-      xcoff_hash_table (info)->gc = true;
-    }
-
-  /* Return special sections to the caller.  */
-  for (i = 0; i < 6; i++)
-    {
-      asection *sec;
-
-      sec = xcoff_hash_table (info)->special_sections[i];
-      if (sec != NULL
-	  && gc
-	  && (sec->flags & SEC_MARK) == 0)
-	sec = NULL;
-      special_sections[i] = sec;
-    }
-
-  if (info->input_bfds == NULL)
-    {
-      /* I'm not sure what to do in this bizarre case.  */
-      return true;
-    }
-
-  xcoff_link_hash_traverse (xcoff_hash_table (info), xcoff_build_ldsyms,
-			    (PTR) &ldinfo);
-  if (ldinfo.failed)
-    goto error_return;
-
-  /* Work out the size of the import file names.  Each import file ID
-     consists of three null terminated strings: the path, the file
-     name, and the archive member name.  The first entry in the list
-     of names is the path to use to find objects, which the linker has
-     passed in as the libpath argument.  For some reason, the path
-     entry in the other import file names appears to always be empty.  */
-  impsize = strlen (libpath) + 3;
-  impcount = 1;
-  for (fl = xcoff_hash_table (info)->imports; fl != NULL; fl = fl->next)
-    {
-      ++impcount;
-      impsize += (strlen (fl->path)
-		  + strlen (fl->file)
-		  + strlen (fl->member)
-		  + 3);
-    }
-
-  /* Set up the .loader section header.  */
-  ldhdr = &xcoff_hash_table (info)->ldhdr;
-  ldhdr->l_version = 1;
-  ldhdr->l_nsyms = ldinfo.ldsym_count;
-  ldhdr->l_nreloc = xcoff_hash_table (info)->ldrel_count;
-  ldhdr->l_istlen = impsize;
-  ldhdr->l_nimpid = impcount;
-  ldhdr->l_impoff = (LDHDRSZ
-		     + ldhdr->l_nsyms * LDSYMSZ
-		     + ldhdr->l_nreloc * LDRELSZ);
-  ldhdr->l_stlen = ldinfo.string_size;
-  stoff = ldhdr->l_impoff + impsize;
-  if (ldinfo.string_size == 0)
-    ldhdr->l_stoff = 0;
-  else
-    ldhdr->l_stoff = stoff;
-
-  /* We now know the final size of the .loader section.  Allocate
-     space for it.  */
-  lsec = xcoff_hash_table (info)->loader_section;
-  lsec->_raw_size = stoff + ldhdr->l_stlen;
-  lsec->contents = (bfd_byte *) bfd_zalloc (output_bfd, lsec->_raw_size);
-  if (lsec->contents == NULL)
-    goto error_return;
-
-  /* Set up the header.  */
-  xcoff_swap_ldhdr_out (output_bfd, ldhdr,
-			(struct external_ldhdr *) lsec->contents);
-
-  /* Set up the import file names.  */
-  out = (char *) lsec->contents + ldhdr->l_impoff;
-  strcpy (out, libpath);
-  out += strlen (libpath) + 1;
-  *out++ = '\0';
-  *out++ = '\0';
-  for (fl = xcoff_hash_table (info)->imports; fl != NULL; fl = fl->next)
-    {
-      register const char *s;
-
-      s = fl->path;
-      while ((*out++ = *s++) != '\0')
-	;
-      s = fl->file;
-      while ((*out++ = *s++) != '\0')
-	;
-      s = fl->member;
-      while ((*out++ = *s++) != '\0')
-	;
-    }
-
-  BFD_ASSERT ((bfd_size_type) ((bfd_byte *) out - lsec->contents) == stoff);
-
-  /* Set up the symbol string table.  */
-  if (ldinfo.string_size > 0)
-    {
-      memcpy (out, ldinfo.strings, ldinfo.string_size);
-      free (ldinfo.strings);
-      ldinfo.strings = NULL;
-    }
-
-  /* We can't set up the symbol table or the relocs yet, because we
-     don't yet know the final position of the various sections.  The
-     .loader symbols are written out when the corresponding normal
-     symbols are written out in xcoff_link_input_bfd or
-     xcoff_write_global_symbol.  The .loader relocs are written out
-     when the corresponding normal relocs are handled in
-     xcoff_link_input_bfd.  */
-
-  /* Allocate space for the magic sections.  */
-  sec = xcoff_hash_table (info)->linkage_section;
-  if (sec->_raw_size > 0)
-    {
-      sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->_raw_size);
-      if (sec->contents == NULL)
-	goto error_return;
-    }
-  sec = xcoff_hash_table (info)->toc_section;
-  if (sec->_raw_size > 0)
-    {
-      sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->_raw_size);
-      if (sec->contents == NULL)
-	goto error_return;
-    }
-  sec = xcoff_hash_table (info)->descriptor_section;
-  if (sec->_raw_size > 0)
-    {
-      sec->contents = (bfd_byte *) bfd_zalloc (output_bfd, sec->_raw_size);
-      if (sec->contents == NULL)
-	goto error_return;
-    }
-
-  /* Now that we've done garbage collection, figure out the contents
-     of the .debug section.  */
-  debug_strtab = xcoff_hash_table (info)->debug_strtab;
-
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      asection *subdeb;
-      bfd_size_type symcount;
-      unsigned long *debug_index;
-      asection **csectpp;
-      bfd_byte *esym, *esymend;
-      bfd_size_type symesz;
-
-      if (sub->xvec != info->hash->creator)
-	continue;
-      subdeb = bfd_get_section_by_name (sub, ".debug");
-      if (subdeb == NULL || subdeb->_raw_size == 0)
-	continue;
-
-      if (info->strip == strip_all
-	  || info->strip == strip_debugger
-	  || info->discard == discard_all)
-	{
-	  subdeb->_raw_size = 0;
-	  continue;
-	}
-
-      if (! _bfd_coff_get_external_symbols (sub))
-	goto error_return;
-
-      symcount = obj_raw_syment_count (sub);
-      debug_index = ((unsigned long *)
-		     bfd_zalloc (sub, symcount * sizeof (unsigned long)));
-      if (debug_index == NULL)
-	goto error_return;
-      xcoff_data (sub)->debug_indices = debug_index;
-
-      /* Grab the contents of the .debug section.  We use malloc and
-	 copy the names into the debug stringtab, rather than
-	 bfd_alloc, because I expect that, when linking many files
-	 together, many of the strings will be the same.  Storing the
-	 strings in the hash table should save space in this case.  */
-      debug_contents = (bfd_byte *) bfd_malloc (subdeb->_raw_size);
-      if (debug_contents == NULL)
-	goto error_return;
-      if (! bfd_get_section_contents (sub, subdeb, (PTR) debug_contents,
-				      (file_ptr) 0, subdeb->_raw_size))
-	goto error_return;
-
-      csectpp = xcoff_data (sub)->csects;
-
-      symesz = bfd_coff_symesz (sub);
-      esym = (bfd_byte *) obj_coff_external_syms (sub);
-      esymend = esym + symcount * symesz;
-      while (esym < esymend)
-	{
-	  struct internal_syment sym;
-
-	  bfd_coff_swap_sym_in (sub, (PTR) esym, (PTR) &sym);
-
-	  *debug_index = (unsigned long) -1;
-
-	  if (sym._n._n_n._n_zeroes == 0
-	      && *csectpp != NULL
-	      && (! gc
-		  || ((*csectpp)->flags & SEC_MARK) != 0
-		  || *csectpp == bfd_abs_section_ptr)
-	      && bfd_coff_symname_in_debug (sub, &sym))
-	    {
-	      char *name;
-	      bfd_size_type indx;
-
-	      name = (char *) debug_contents + sym._n._n_n._n_offset;
-	      indx = _bfd_stringtab_add (debug_strtab, name, true, true);
-	      if (indx == (bfd_size_type) -1)
-		goto error_return;
-	      *debug_index = indx;
-	    }
-
-	  esym += (sym.n_numaux + 1) * symesz;
-	  csectpp += sym.n_numaux + 1;
-	  debug_index += sym.n_numaux + 1;
-	}
-
-      free (debug_contents);
-      debug_contents = NULL;
-
-      /* Clear the size of subdeb, so that it is not included directly
-	 in the output file.  */
-      subdeb->_raw_size = 0;
-
-      if (! info->keep_memory)
-	{
-	  if (! _bfd_coff_free_symbols (sub))
-	    goto error_return;
-	}
-    }
-
-  if (info->strip != strip_all)
-    xcoff_hash_table (info)->debug_section->_raw_size =
-      _bfd_stringtab_size (debug_strtab);
-
-  return true;
-
- error_return:
-  if (ldinfo.strings != NULL)
-    free (ldinfo.strings);
-  if (debug_contents != NULL)
-    free (debug_contents);
-  return false;
-}
-
-/* Add a symbol to the .loader symbols, if necessary.  */
-
-static boolean
-xcoff_build_ldsyms (h, p)
-     struct xcoff_link_hash_entry *h;
-     PTR p;
-{
-  struct xcoff_loader_info *ldinfo = (struct xcoff_loader_info *) p;
-  size_t len;
-
-  /* If this is a final link, and the symbol was defined as a common
-     symbol in a regular object file, and there was no definition in
-     any dynamic object, then the linker will have allocated space for
-     the symbol in a common section but the XCOFF_DEF_REGULAR flag
-     will not have been set.  */
-  if (h->root.type == bfd_link_hash_defined
-      && (h->flags & XCOFF_DEF_REGULAR) == 0
-      && (h->flags & XCOFF_REF_REGULAR) != 0
-      && (h->flags & XCOFF_DEF_DYNAMIC) == 0
-      && (bfd_is_abs_section (h->root.u.def.section)
-	  || (h->root.u.def.section->owner->flags & DYNAMIC) == 0))
-    h->flags |= XCOFF_DEF_REGULAR;
-
-  /* If all defined symbols should be exported, mark them now.  We
-     don't want to export the actual functions, just the function
-     descriptors.  */
-  if (ldinfo->export_defineds
-      && (h->flags & XCOFF_DEF_REGULAR) != 0
-      && h->root.root.string[0] != '.')
-    {
-      boolean export;
-
-      /* We don't export a symbol which is being defined by an object
-	 included from an archive which contains a shared object.  The
-	 rationale is that if an archive contains both an unshared and
-	 a shared object, then there must be some reason that the
-	 unshared object is unshared, and we don't want to start
-	 providing a shared version of it.  In particular, this solves
-	 a bug involving the _savefNN set of functions.  gcc will call
-	 those functions without providing a slot to restore the TOC,
-	 so it is essential that these functions be linked in directly
-	 and not from a shared object, which means that a shared
-	 object which also happens to link them in must not export
-	 them.  This is confusing, but I haven't been able to think of
-	 a different approach.  Note that the symbols can, of course,
-	 be exported explicitly.  */
-      export = true;
-      if ((h->root.type == bfd_link_hash_defined
-	   || h->root.type == bfd_link_hash_defweak)
-	  && h->root.u.def.section->owner != NULL
-	  && h->root.u.def.section->owner->my_archive != NULL)
-	{
-	  bfd *arbfd, *member;
-
-	  arbfd = h->root.u.def.section->owner->my_archive;
-	  member = bfd_openr_next_archived_file (arbfd, (bfd *) NULL);
-	  while (member != NULL)
-	    {
-	      if ((member->flags & DYNAMIC) != 0)
-		{
-		  export = false;
-		  break;
-		}
-	      member = bfd_openr_next_archived_file (arbfd, member);
-	    }
-	}
-
-      if (export)
-	h->flags |= XCOFF_EXPORT;
-    }
-
-  /* We don't want to garbage collect symbols which are not defined in
-     XCOFF files.  This is a convenient place to mark them.  */
-  if (xcoff_hash_table (ldinfo->info)->gc
-      && (h->flags & XCOFF_MARK) == 0
-      && (h->root.type == bfd_link_hash_defined
-	  || h->root.type == bfd_link_hash_defweak)
-      && (h->root.u.def.section->owner == NULL
-	  || (h->root.u.def.section->owner->xvec
-	      != ldinfo->info->hash->creator)))
-    h->flags |= XCOFF_MARK;
-
-  /* If this symbol is called and defined in a dynamic object, or it
-     is imported, then we need to set up global linkage code for it.
-     (Unless we did garbage collection and we didn't need this
-     symbol.)  */
-  if ((h->flags & XCOFF_CALLED) != 0
-      && (h->root.type == bfd_link_hash_undefined
-	  || h->root.type == bfd_link_hash_undefweak)
-      && h->root.root.string[0] == '.'
-      && h->descriptor != NULL
-      && ((h->descriptor->flags & XCOFF_DEF_DYNAMIC) != 0
-	  || ((h->descriptor->flags & XCOFF_IMPORT) != 0
-	      && (h->descriptor->flags & XCOFF_DEF_REGULAR) == 0))
-      && (! xcoff_hash_table (ldinfo->info)->gc
-	  || (h->flags & XCOFF_MARK) != 0))
-    {
-      asection *sec;
-      struct xcoff_link_hash_entry *hds;
-
-      sec = xcoff_hash_table (ldinfo->info)->linkage_section;
-      h->root.type = bfd_link_hash_defined;
-      h->root.u.def.section = sec;
-      h->root.u.def.value = sec->_raw_size;
-      h->smclas = XMC_GL;
-      h->flags |= XCOFF_DEF_REGULAR;
-      sec->_raw_size += XCOFF_GLINK_SIZE;
-
-      /* The global linkage code requires a TOC entry for the
-         descriptor.  */
-      hds = h->descriptor;
-      BFD_ASSERT ((hds->root.type == bfd_link_hash_undefined
-		   || hds->root.type == bfd_link_hash_undefweak)
-		  && (hds->flags & XCOFF_DEF_REGULAR) == 0);
-      hds->flags |= XCOFF_MARK;
-      if (hds->toc_section == NULL)
-	{
-	  hds->toc_section = xcoff_hash_table (ldinfo->info)->toc_section;
-	  hds->u.toc_offset = hds->toc_section->_raw_size;
-	  hds->toc_section->_raw_size += 4;
-	  ++xcoff_hash_table (ldinfo->info)->ldrel_count;
-	  ++hds->toc_section->reloc_count;
-	  hds->indx = -2;
-	  hds->flags |= XCOFF_SET_TOC | XCOFF_LDREL;
-
-	  /* We need to call xcoff_build_ldsyms recursively here,
-             because we may already have passed hds on the traversal.  */
-	  xcoff_build_ldsyms (hds, p);
-	}
-    }
-
-  /* If this symbol is exported, but not defined, we need to try to
-     define it.  */
-  if ((h->flags & XCOFF_EXPORT) != 0
-      && (h->flags & XCOFF_IMPORT) == 0
-      && (h->flags & XCOFF_DEF_REGULAR) == 0
-      && (h->flags & XCOFF_DEF_DYNAMIC) == 0
-      && (h->root.type == bfd_link_hash_undefined
-	  || h->root.type == bfd_link_hash_undefweak))
-    {
-      if ((h->flags & XCOFF_DESCRIPTOR) != 0
-	  && (h->descriptor->root.type == bfd_link_hash_defined
-	      || h->descriptor->root.type == bfd_link_hash_defweak))
-	{
-	  asection *sec;
-
-	  /* This is an undefined function descriptor associated with
-             a defined entry point.  We can build up a function
-             descriptor ourselves.  Believe it or not, the AIX linker
-             actually does this, and there are cases where we need to
-             do it as well.  */
-	  sec = xcoff_hash_table (ldinfo->info)->descriptor_section;
-	  h->root.type = bfd_link_hash_defined;
-	  h->root.u.def.section = sec;
-	  h->root.u.def.value = sec->_raw_size;
-	  h->smclas = XMC_DS;
-	  h->flags |= XCOFF_DEF_REGULAR;
-	  sec->_raw_size += 12;
-
-	  /* A function descriptor uses two relocs: one for the
-             associated code, and one for the TOC address.  */
-	  xcoff_hash_table (ldinfo->info)->ldrel_count += 2;
-	  sec->reloc_count += 2;
-
-	  /* We handle writing out the contents of the descriptor in
-             xcoff_write_global_symbol.  */
-	}
-      else
-	{
-	  (*_bfd_error_handler)
-	    (_("warning: attempt to export undefined symbol `%s'"),
-	     h->root.root.string);
-	  h->ldsym = NULL;
-	  return true;
-	}
-    }
-
-  /* If this is still a common symbol, and it wasn't garbage
-     collected, we need to actually allocate space for it in the .bss
-     section.  */
-  if (h->root.type == bfd_link_hash_common
-      && (! xcoff_hash_table (ldinfo->info)->gc
-	  || (h->flags & XCOFF_MARK) != 0)
-      && h->root.u.c.p->section->_raw_size == 0)
-    {
-      BFD_ASSERT (bfd_is_com_section (h->root.u.c.p->section));
-      h->root.u.c.p->section->_raw_size = h->root.u.c.size;
-    }
-
-  /* We need to add a symbol to the .loader section if it is mentioned
-     in a reloc which we are copying to the .loader section and it was
-     not defined or common, or if it is the entry point, or if it is
-     being exported.  */
-
-  if (((h->flags & XCOFF_LDREL) == 0
-       || h->root.type == bfd_link_hash_defined
-       || h->root.type == bfd_link_hash_defweak
-       || h->root.type == bfd_link_hash_common)
-      && (h->flags & XCOFF_ENTRY) == 0
-      && (h->flags & XCOFF_EXPORT) == 0)
-    {
-      h->ldsym = NULL;
-      return true;
-    }
-
-  /* We don't need to add this symbol if we did garbage collection and
-     we did not mark this symbol.  */
-  if (xcoff_hash_table (ldinfo->info)->gc
-      && (h->flags & XCOFF_MARK) == 0)
-    {
-      h->ldsym = NULL;
-      return true;
-    }
-
-  /* We may have already processed this symbol due to the recursive
-     call above.  */
-  if ((h->flags & XCOFF_BUILT_LDSYM) != 0)
-    return true;
-
-  /* We need to add this symbol to the .loader symbols.  */
-
-  BFD_ASSERT (h->ldsym == NULL);
-  h->ldsym = ((struct internal_ldsym *)
-	      bfd_zalloc (ldinfo->output_bfd,
-			  sizeof (struct internal_ldsym)));
-  if (h->ldsym == NULL)
-    {
-      ldinfo->failed = true;
-      return false;
-    }
-
-  if ((h->flags & XCOFF_IMPORT) != 0)
-    h->ldsym->l_ifile = h->ldindx;
-
-  /* The first 3 symbol table indices are reserved to indicate the
-     sections.  */
-  h->ldindx = ldinfo->ldsym_count + 3;
-
-  ++ldinfo->ldsym_count;
-
-  len = strlen (h->root.root.string);
-  if (len <= SYMNMLEN)
-    strncpy (h->ldsym->_l._l_name, h->root.root.string, SYMNMLEN);
-  else
-    {
-      if (ldinfo->string_size + len + 3 > ldinfo->string_alc)
-	{
-	  size_t newalc;
-	  bfd_byte *newstrings;
-
-	  newalc = ldinfo->string_alc * 2;
-	  if (newalc == 0)
-	    newalc = 32;
-	  while (ldinfo->string_size + len + 3 > newalc)
-	    newalc *= 2;
-
-	  newstrings = ((bfd_byte *)
-			bfd_realloc ((PTR) ldinfo->strings, newalc));
-	  if (newstrings == NULL)
-	    {
-	      ldinfo->failed = true;
-	      return false;
-	    }
-	  ldinfo->string_alc = newalc;
-	  ldinfo->strings = newstrings;
-	}
-
-      bfd_put_16 (ldinfo->output_bfd, len + 1,
-		  ldinfo->strings + ldinfo->string_size);
-      strcpy (ldinfo->strings + ldinfo->string_size + 2, h->root.root.string);
-      h->ldsym->_l._l_l._l_zeroes = 0;
-      h->ldsym->_l._l_l._l_offset = ldinfo->string_size + 2;
-      ldinfo->string_size += len + 3;
-    }
-
-  h->flags |= XCOFF_BUILT_LDSYM;
-
-  return true;
-}
-
-/* Do the final link step.  */
-
-boolean
-_bfd_xcoff_bfd_final_link (abfd, info)
-     bfd *abfd;
-     struct bfd_link_info *info;
-{
-  bfd_size_type symesz;
-  struct xcoff_final_link_info finfo;
-  asection *o;
-  struct bfd_link_order *p;
-  size_t max_contents_size;
-  size_t max_sym_count;
-  size_t max_lineno_count;
-  size_t max_reloc_count;
-  size_t max_output_reloc_count;
-  file_ptr rel_filepos;
-  unsigned int relsz;
-  file_ptr line_filepos;
-  unsigned int linesz;
-  bfd *sub;
-  bfd_byte *external_relocs = NULL;
-  char strbuf[STRING_SIZE_SIZE];
-
-  if (info->shared)
-    abfd->flags |= DYNAMIC;
-
-  symesz = bfd_coff_symesz (abfd);
-
-  finfo.info = info;
-  finfo.output_bfd = abfd;
-  finfo.strtab = NULL;
-  finfo.section_info = NULL;
-  finfo.last_file_index = -1;
-  finfo.toc_symindx = -1;
-  finfo.internal_syms = NULL;
-  finfo.sym_indices = NULL;
-  finfo.outsyms = NULL;
-  finfo.linenos = NULL;
-  finfo.contents = NULL;
-  finfo.external_relocs = NULL;
-
-  finfo.ldsym = ((struct external_ldsym *)
-		 (xcoff_hash_table (info)->loader_section->contents
-		  + LDHDRSZ));
-  finfo.ldrel = ((struct external_ldrel *)
-		 (xcoff_hash_table (info)->loader_section->contents
-		  + LDHDRSZ
-		  + xcoff_hash_table (info)->ldhdr.l_nsyms * LDSYMSZ));
-
-  xcoff_data (abfd)->coff.link_info = info;
-
-  finfo.strtab = _bfd_stringtab_init ();
-  if (finfo.strtab == NULL)
-    goto error_return;
-
-  /* Count the line number and relocation entries required for the
-     output file.  Determine a few maximum sizes.  */
-  max_contents_size = 0;
-  max_lineno_count = 0;
-  max_reloc_count = 0;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order)
-	    {
-	      asection *sec;
-
-	      sec = p->u.indirect.section;
-
-	      /* Mark all sections which are to be included in the
-		 link.  This will normally be every section.  We need
-		 to do this so that we can identify any sections which
-		 the linker has decided to not include.  */
-	      sec->linker_mark = true;
-
-	      if (info->strip == strip_none
-		  || info->strip == strip_some)
-		o->lineno_count += sec->lineno_count;
-
-	      o->reloc_count += sec->reloc_count;
-
-	      if (sec->_raw_size > max_contents_size)
-		max_contents_size = sec->_raw_size;
-	      if (sec->lineno_count > max_lineno_count)
-		max_lineno_count = sec->lineno_count;
-	      if (coff_section_data (sec->owner, sec) != NULL
-		  && xcoff_section_data (sec->owner, sec) != NULL
-		  && (xcoff_section_data (sec->owner, sec)->lineno_count
-		      > max_lineno_count))
-		max_lineno_count =
-		  xcoff_section_data (sec->owner, sec)->lineno_count;
-	      if (sec->reloc_count > max_reloc_count)
-		max_reloc_count = sec->reloc_count;
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    ++o->reloc_count;
-	}
-    }
-
-  /* Compute the file positions for all the sections.  */
-  if (abfd->output_has_begun)
-    {
-      if (xcoff_hash_table (info)->file_align != 0)
-	abort ();
-    }
-  else
-    {
-      bfd_vma file_align;
-
-      file_align = xcoff_hash_table (info)->file_align;
-      if (file_align != 0)
-	{
-	  boolean saw_contents;
-	  int indx;
-	  asection **op;
-	  file_ptr sofar;
-
-	  /* Insert .pad sections before every section which has
-             contents and is loaded, if it is preceded by some other
-             section which has contents and is loaded.  */
-	  saw_contents = true;
-	  for (op = &abfd->sections; *op != NULL; op = &(*op)->next)
-	    {
-	      if (strcmp ((*op)->name, ".pad") == 0)
-		saw_contents = false;
-	      else if (((*op)->flags & SEC_HAS_CONTENTS) != 0
-		       && ((*op)->flags & SEC_LOAD) != 0)
-		{
-		  if (! saw_contents)
-		    saw_contents = true;
-		  else
-		    {
-		      asection *n, *hold;
-
-		      hold = *op;
-		      *op = NULL;
-		      n = bfd_make_section_anyway (abfd, ".pad");
-		      BFD_ASSERT (*op == n);
-		      n->next = hold;
-		      n->flags = SEC_HAS_CONTENTS;
-		      n->alignment_power = 0;
-		      saw_contents = false;
-		    }
-		}
-	    }
-
-	  /* Reset the section indices after inserting the new
-             sections.  */
-	  indx = 0;
-	  for (o = abfd->sections; o != NULL; o = o->next)
-	    {
-	      ++indx;
-	      o->target_index = indx;
-	    }
-	  BFD_ASSERT ((unsigned int) indx == abfd->section_count);
-
-	  /* Work out appropriate sizes for the .pad sections to force
-             each section to land on a page boundary.  This bit of
-             code knows what compute_section_file_positions is going
-             to do.  */
-	  sofar = bfd_coff_filhsz (abfd);
-	  sofar += bfd_coff_aoutsz (abfd);
-	  sofar += abfd->section_count * bfd_coff_scnhsz (abfd);
-	  for (o = abfd->sections; o != NULL; o = o->next)
-	    if (o->reloc_count >= 0xffff || o->lineno_count >= 0xffff)
-	      sofar += bfd_coff_scnhsz (abfd);
-
-	  for (o = abfd->sections; o != NULL; o = o->next)
-	    {
-	      if (strcmp (o->name, ".pad") == 0)
-		{
-		  bfd_vma pageoff;
-
-		  BFD_ASSERT (o->_raw_size == 0);
-		  pageoff = sofar & (file_align - 1);
-		  if (pageoff != 0)
-		    {
-		      o->_raw_size = file_align - pageoff;
-		      sofar += file_align - pageoff;
-		      o->flags |= SEC_HAS_CONTENTS;
-		    }
-		}
-	      else
-		{
-		  if ((o->flags & SEC_HAS_CONTENTS) != 0)
-		    sofar += BFD_ALIGN (o->_raw_size,
-					1 << o->alignment_power);
-		}
-	    }
-	}
-
-      if (! bfd_coff_compute_section_file_positions (abfd))
-	goto error_return;
-    }
-
-  /* Allocate space for the pointers we need to keep for the relocs.  */
-  {
-    unsigned int i;
-
-    /* We use section_count + 1, rather than section_count, because
-       the target_index fields are 1 based.  */
-    finfo.section_info =
-      ((struct xcoff_link_section_info *)
-       bfd_malloc ((abfd->section_count + 1)
-		   * sizeof (struct xcoff_link_section_info)));
-    if (finfo.section_info == NULL)
-      goto error_return;
-    for (i = 0; i <= abfd->section_count; i++)
-      {
-	finfo.section_info[i].relocs = NULL;
-	finfo.section_info[i].rel_hashes = NULL;
-	finfo.section_info[i].toc_rel_hashes = NULL;
-      }
-  }
-
-  /* Set the file positions for the relocs.  */
-  rel_filepos = obj_relocbase (abfd);
-  relsz = bfd_coff_relsz (abfd);
-  max_output_reloc_count = 0;
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if (o->reloc_count == 0)
-	o->rel_filepos = 0;
-      else
-	{
-	  /* A stripped file has no relocs.  However, we still
-             allocate the buffers, so that later code doesn't have to
-             worry about whether we are stripping or not.  */
-	  if (info->strip == strip_all)
-	    o->rel_filepos = 0;
-	  else
-	    {
-	      o->flags |= SEC_RELOC;
-	      o->rel_filepos = rel_filepos;
-	      rel_filepos += o->reloc_count * relsz;
-	    }
-
-	  /* We don't know the indices of global symbols until we have
-             written out all the local symbols.  For each section in
-             the output file, we keep an array of pointers to hash
-             table entries.  Each entry in the array corresponds to a
-             reloc.  When we find a reloc against a global symbol, we
-             set the corresponding entry in this array so that we can
-             fix up the symbol index after we have written out all the
-             local symbols.
-
-	     Because of this problem, we also keep the relocs in
-	     memory until the end of the link.  This wastes memory.
-	     We could backpatch the file later, I suppose, although it
-	     would be slow.  */
-	  finfo.section_info[o->target_index].relocs =
-	    ((struct internal_reloc *)
-	     bfd_malloc (o->reloc_count * sizeof (struct internal_reloc)));
-	  finfo.section_info[o->target_index].rel_hashes =
-	    ((struct xcoff_link_hash_entry **)
-	     bfd_malloc (o->reloc_count
-		     * sizeof (struct xcoff_link_hash_entry *)));
-	  if (finfo.section_info[o->target_index].relocs == NULL
-	      || finfo.section_info[o->target_index].rel_hashes == NULL)
-	    goto error_return;
-
-	  if (o->reloc_count > max_output_reloc_count)
-	    max_output_reloc_count = o->reloc_count;
-	}
-    }
-
-  /* We now know the size of the relocs, so we can determine the file
-     positions of the line numbers.  */
-  line_filepos = rel_filepos;
-  finfo.line_filepos = line_filepos;
-  linesz = bfd_coff_linesz (abfd);
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      if (o->lineno_count == 0)
-	o->line_filepos = 0;
-      else
-	{
-	  o->line_filepos = line_filepos;
-	  line_filepos += o->lineno_count * linesz;
-	}
-
-      /* Reset the reloc and lineno counts, so that we can use them to
-	 count the number of entries we have output so far.  */
-      o->reloc_count = 0;
-      o->lineno_count = 0;
-    }
-
-  obj_sym_filepos (abfd) = line_filepos;
-
-  /* Figure out the largest number of symbols in an input BFD.  Take
-     the opportunity to clear the output_has_begun fields of all the
-     input BFD's.  We want at least 6 symbols, since that is the
-     number which xcoff_write_global_symbol may need.  */
-  max_sym_count = 6;
-  for (sub = info->input_bfds; sub != NULL; sub = sub->link_next)
-    {
-      size_t sz;
-
-      sub->output_has_begun = false;
-      sz = obj_raw_syment_count (sub);
-      if (sz > max_sym_count)
-	max_sym_count = sz;
-    }
-
-  /* Allocate some buffers used while linking.  */
-  finfo.internal_syms = ((struct internal_syment *)
-			 bfd_malloc (max_sym_count
-				     * sizeof (struct internal_syment)));
-  finfo.sym_indices = (long *) bfd_malloc (max_sym_count * sizeof (long));
-  finfo.outsyms = ((bfd_byte *)
-		   bfd_malloc ((size_t) ((max_sym_count + 1) * symesz)));
-  finfo.linenos = (bfd_byte *) bfd_malloc (max_lineno_count
-					   * bfd_coff_linesz (abfd));
-  finfo.contents = (bfd_byte *) bfd_malloc (max_contents_size);
-  finfo.external_relocs = (bfd_byte *) bfd_malloc (max_reloc_count * relsz);
-  if ((finfo.internal_syms == NULL && max_sym_count > 0)
-      || (finfo.sym_indices == NULL && max_sym_count > 0)
-      || finfo.outsyms == NULL
-      || (finfo.linenos == NULL && max_lineno_count > 0)
-      || (finfo.contents == NULL && max_contents_size > 0)
-      || (finfo.external_relocs == NULL && max_reloc_count > 0))
-    goto error_return;
-
-  obj_raw_syment_count (abfd) = 0;
-  xcoff_data (abfd)->toc = (bfd_vma) -1;
-
-  /* We now know the position of everything in the file, except that
-     we don't know the size of the symbol table and therefore we don't
-     know where the string table starts.  We just build the string
-     table in memory as we go along.  We process all the relocations
-     for a single input file at once.  */
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      for (p = o->link_order_head; p != NULL; p = p->next)
-	{
-	  if (p->type == bfd_indirect_link_order
-	      && p->u.indirect.section->owner->xvec == abfd->xvec)
-	    {
-	      sub = p->u.indirect.section->owner;
-	      if (! sub->output_has_begun)
-		{
-		  if (! xcoff_link_input_bfd (&finfo, sub))
-		    goto error_return;
-		  sub->output_has_begun = true;
-		}
-	    }
-	  else if (p->type == bfd_section_reloc_link_order
-		   || p->type == bfd_symbol_reloc_link_order)
-	    {
-	      if (! xcoff_reloc_link_order (abfd, &finfo, o, p))
-		goto error_return;
-	    }
-	  else
-	    {
-	      if (! _bfd_default_link_order (abfd, info, o, p))
-		goto error_return;
-	    }
-	}
-    }
-
-  /* Free up the buffers used by xcoff_link_input_bfd.  */
-
-  if (finfo.internal_syms != NULL)
-    {
-      free (finfo.internal_syms);
-      finfo.internal_syms = NULL;
-    }
-  if (finfo.sym_indices != NULL)
-    {
-      free (finfo.sym_indices);
-      finfo.sym_indices = NULL;
-    }
-  if (finfo.linenos != NULL)
-    {
-      free (finfo.linenos);
-      finfo.linenos = NULL;
-    }
-  if (finfo.contents != NULL)
-    {
-      free (finfo.contents);
-      finfo.contents = NULL;
-    }
-  if (finfo.external_relocs != NULL)
-    {
-      free (finfo.external_relocs);
-      finfo.external_relocs = NULL;
-    }
-
-  /* The value of the last C_FILE symbol is supposed to be -1.  Write
-     it out again.  */
-  if (finfo.last_file_index != -1)
-    {
-      finfo.last_file.n_value = -1;
-      bfd_coff_swap_sym_out (abfd, (PTR) &finfo.last_file,
-			     (PTR) finfo.outsyms);
-      if (bfd_seek (abfd,
-		    (obj_sym_filepos (abfd)
-		     + finfo.last_file_index * symesz),
-		    SEEK_SET) != 0
-	  || bfd_write (finfo.outsyms, symesz, 1, abfd) != symesz)
-	goto error_return;
-    }
-
-  /* Write out all the global symbols which do not come from XCOFF
-     input files.  */
-  xcoff_link_hash_traverse (xcoff_hash_table (info),
-			    xcoff_write_global_symbol,
-			    (PTR) &finfo);
-
-  if (finfo.outsyms != NULL)
-    {
-      free (finfo.outsyms);
-      finfo.outsyms = NULL;
-    }
-
-  /* Now that we have written out all the global symbols, we know the
-     symbol indices to use for relocs against them, and we can finally
-     write out the relocs.  */
-  external_relocs = (bfd_byte *) bfd_malloc (max_output_reloc_count * relsz);
-  if (external_relocs == NULL && max_output_reloc_count != 0)
-    goto error_return;
-
-  for (o = abfd->sections; o != NULL; o = o->next)
-    {
-      struct internal_reloc *irel;
-      struct internal_reloc *irelend;
-      struct xcoff_link_hash_entry **rel_hash;
-      struct xcoff_toc_rel_hash *toc_rel_hash;
-      bfd_byte *erel;
-
-      /* A stripped file has no relocs.  */
-      if (info->strip == strip_all)
-	{
-	  o->reloc_count = 0;
-	  continue;
-	}
-
-      if (o->reloc_count == 0)
-	continue;
-
-      irel = finfo.section_info[o->target_index].relocs;
-      irelend = irel + o->reloc_count;
-      rel_hash = finfo.section_info[o->target_index].rel_hashes;
-      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
-	{
-	  if (*rel_hash != NULL)
-	    {
-	      if ((*rel_hash)->indx < 0)
-		{
-		  if (! ((*info->callbacks->unattached_reloc)
-			 (info, (*rel_hash)->root.root.string,
-			  (bfd *) NULL, o, irel->r_vaddr)))
-		    goto error_return;
-		  (*rel_hash)->indx = 0;
-		}
-	      irel->r_symndx = (*rel_hash)->indx;
-	    }
-	}
-
-      for (toc_rel_hash = finfo.section_info[o->target_index].toc_rel_hashes;
-	   toc_rel_hash != NULL;
-	   toc_rel_hash = toc_rel_hash->next)
-	{
-	  if (toc_rel_hash->h->u.toc_indx < 0)
-	    {
-	      if (! ((*info->callbacks->unattached_reloc)
-		     (info, toc_rel_hash->h->root.root.string,
-		      (bfd *) NULL, o, toc_rel_hash->rel->r_vaddr)))
-		goto error_return;
-	      toc_rel_hash->h->u.toc_indx = 0;
-	    }
-	  toc_rel_hash->rel->r_symndx = toc_rel_hash->h->u.toc_indx;
-	}
-
-      /* XCOFF requires that the relocs be sorted by address.  We tend
-         to produce them in the order in which their containing csects
-         appear in the symbol table, which is not necessarily by
-         address.  So we sort them here.  There may be a better way to
-         do this.  */
-      qsort ((PTR) finfo.section_info[o->target_index].relocs,
-	     o->reloc_count, sizeof (struct internal_reloc),
-	     xcoff_sort_relocs);
-
-      irel = finfo.section_info[o->target_index].relocs;
-      irelend = irel + o->reloc_count;
-      erel = external_relocs;
-      for (; irel < irelend; irel++, rel_hash++, erel += relsz)
-	bfd_coff_swap_reloc_out (abfd, (PTR) irel, (PTR) erel);
-
-      if (bfd_seek (abfd, o->rel_filepos, SEEK_SET) != 0
-	  || bfd_write ((PTR) external_relocs, relsz, o->reloc_count,
-			abfd) != relsz * o->reloc_count)
-	goto error_return;
-    }
-
-  if (external_relocs != NULL)
-    {
-      free (external_relocs);
-      external_relocs = NULL;
-    }
-
-  /* Free up the section information.  */
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
-
-      for (i = 0; i < abfd->section_count; i++)
-	{
-	  if (finfo.section_info[i].relocs != NULL)
-	    free (finfo.section_info[i].relocs);
-	  if (finfo.section_info[i].rel_hashes != NULL)
-	    free (finfo.section_info[i].rel_hashes);
-	}
-      free (finfo.section_info);
-      finfo.section_info = NULL;
-    }
-
-  /* Write out the loader section contents.  */
-  BFD_ASSERT ((bfd_byte *) finfo.ldrel
-	      == (xcoff_hash_table (info)->loader_section->contents
-		  + xcoff_hash_table (info)->ldhdr.l_impoff));
-  o = xcoff_hash_table (info)->loader_section;
-  if (! bfd_set_section_contents (abfd, o->output_section,
-				  o->contents, o->output_offset,
-				  o->_raw_size))
-    goto error_return;
-
-  /* Write out the magic sections.  */
-  o = xcoff_hash_table (info)->linkage_section;
-  if (o->_raw_size > 0
-      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
-				     o->output_offset, o->_raw_size))
-    goto error_return;
-  o = xcoff_hash_table (info)->toc_section;
-  if (o->_raw_size > 0
-      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
-				     o->output_offset, o->_raw_size))
-    goto error_return;
-  o = xcoff_hash_table (info)->descriptor_section;
-  if (o->_raw_size > 0
-      && ! bfd_set_section_contents (abfd, o->output_section, o->contents,
-				     o->output_offset, o->_raw_size))
-    goto error_return;
-
-  /* Write out the string table.  */
-  if (bfd_seek (abfd,
-		(obj_sym_filepos (abfd)
-		 + obj_raw_syment_count (abfd) * symesz),
-		SEEK_SET) != 0)
-    goto error_return;
-  bfd_h_put_32 (abfd,
-		_bfd_stringtab_size (finfo.strtab) + STRING_SIZE_SIZE,
-		(bfd_byte *) strbuf);
-  if (bfd_write (strbuf, 1, STRING_SIZE_SIZE, abfd) != STRING_SIZE_SIZE)
-    goto error_return;
-  if (! _bfd_stringtab_emit (abfd, finfo.strtab))
-    goto error_return;
-
-  _bfd_stringtab_free (finfo.strtab);
-
-  /* Write out the debugging string table.  */
-  o = xcoff_hash_table (info)->debug_section;
-  if (o != NULL)
-    {
-      struct bfd_strtab_hash *debug_strtab;
-
-      debug_strtab = xcoff_hash_table (info)->debug_strtab;
-      BFD_ASSERT (o->output_section->_raw_size - o->output_offset
-		  >= _bfd_stringtab_size (debug_strtab));
-      if (bfd_seek (abfd,
-		    o->output_section->filepos + o->output_offset,
-		    SEEK_SET) != 0)
-	goto error_return;
-      if (! _bfd_stringtab_emit (abfd, debug_strtab))
-	goto error_return;
-    }
-
-  /* Setting bfd_get_symcount to 0 will cause write_object_contents to
-     not try to write out the symbols.  */
-  bfd_get_symcount (abfd) = 0;
-
-  return true;
-
- error_return:
-  if (finfo.strtab != NULL)
-    _bfd_stringtab_free (finfo.strtab);
-  if (finfo.section_info != NULL)
-    {
-      unsigned int i;
-
-      for (i = 0; i < abfd->section_count; i++)
-	{
-	  if (finfo.section_info[i].relocs != NULL)
-	    free (finfo.section_info[i].relocs);
-	  if (finfo.section_info[i].rel_hashes != NULL)
-	    free (finfo.section_info[i].rel_hashes);
-	}
-      free (finfo.section_info);
-    }
-  if (finfo.internal_syms != NULL)
-    free (finfo.internal_syms);
-  if (finfo.sym_indices != NULL)
-    free (finfo.sym_indices);
-  if (finfo.outsyms != NULL)
-    free (finfo.outsyms);
-  if (finfo.linenos != NULL)
-    free (finfo.linenos);
-  if (finfo.contents != NULL)
-    free (finfo.contents);
-  if (finfo.external_relocs != NULL)
-    free (finfo.external_relocs);
-  if (external_relocs != NULL)
-    free (external_relocs);
-  return false;
-}
-
-/* Link an input file into the linker output file.  This function
-   handles all the sections and relocations of the input file at once.  */
-
-static boolean
-xcoff_link_input_bfd (finfo, input_bfd)
-     struct xcoff_final_link_info *finfo;
-     bfd *input_bfd;
-{
-  bfd *output_bfd;
-  const char *strings;
-  bfd_size_type syment_base;
-  unsigned int n_tmask;
-  unsigned int n_btshft;
-  boolean copy, hash;
-  bfd_size_type isymesz;
-  bfd_size_type osymesz;
-  bfd_size_type linesz;
-  bfd_byte *esym;
-  bfd_byte *esym_end;
-  struct xcoff_link_hash_entry **sym_hash;
-  struct internal_syment *isymp;
-  asection **csectpp;
-  unsigned long *debug_index;
-  long *indexp;
-  unsigned long output_index;
-  bfd_byte *outsym;
-  unsigned int incls;
-  asection *oline;
-  boolean keep_syms;
-  asection *o;
-
-  /* We can just skip DYNAMIC files, unless this is a static link.  */
-  if ((input_bfd->flags & DYNAMIC) != 0
-      && ! finfo->info->static_link)
-    return true;
-
-  /* Move all the symbols to the output file.  */
-
-  output_bfd = finfo->output_bfd;
-  strings = NULL;
-  syment_base = obj_raw_syment_count (output_bfd);
-  isymesz = bfd_coff_symesz (input_bfd);
-  osymesz = bfd_coff_symesz (output_bfd);
-  linesz = bfd_coff_linesz (input_bfd);
-  BFD_ASSERT (linesz == bfd_coff_linesz (output_bfd));
-
-  n_tmask = coff_data (input_bfd)->local_n_tmask;
-  n_btshft = coff_data (input_bfd)->local_n_btshft;
-
-  /* Define macros so that ISFCN, et. al., macros work correctly.  */
-#define N_TMASK n_tmask
-#define N_BTSHFT n_btshft
-
-  copy = false;
-  if (! finfo->info->keep_memory)
-    copy = true;
-  hash = true;
-  if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-    hash = false;
-
-  if (! _bfd_coff_get_external_symbols (input_bfd))
-    return false;
-
-  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
-  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
-  sym_hash = obj_xcoff_sym_hashes (input_bfd);
-  csectpp = xcoff_data (input_bfd)->csects;
-  debug_index = xcoff_data (input_bfd)->debug_indices;
-  isymp = finfo->internal_syms;
-  indexp = finfo->sym_indices;
-  output_index = syment_base;
-  outsym = finfo->outsyms;
-  incls = 0;
-  oline = NULL;
-
-  while (esym < esym_end)
-    {
-      struct internal_syment isym;
-      union internal_auxent aux;
-      int smtyp = 0;
-      boolean skip;
-      boolean require;
-      int add;
-
-      bfd_coff_swap_sym_in (input_bfd, (PTR) esym, (PTR) isymp);
-
-      /* If this is a C_EXT or C_HIDEXT symbol, we need the csect
-         information.  */
-      if (isymp->n_sclass == C_EXT || isymp->n_sclass == C_HIDEXT)
-	{
-	  BFD_ASSERT (isymp->n_numaux > 0);
-	  bfd_coff_swap_aux_in (input_bfd,
-				(PTR) (esym + isymesz * isymp->n_numaux),
-				isymp->n_type, isymp->n_sclass,
-				isymp->n_numaux - 1, isymp->n_numaux,
-				(PTR) &aux);
-	  smtyp = SMTYP_SMTYP (aux.x_csect.x_smtyp);
-	}
-
-      /* Make a copy of *isymp so that the relocate_section function
-	 always sees the original values.  This is more reliable than
-	 always recomputing the symbol value even if we are stripping
-	 the symbol.  */
-      isym = *isymp;
-
-      /* If this symbol is in the .loader section, swap out the
-         .loader symbol information.  If this is an external symbol
-         reference to a defined symbol, though, then wait until we get
-         to the definition.  */
-      if (isym.n_sclass == C_EXT
-	  && *sym_hash != NULL
-	  && (*sym_hash)->ldsym != NULL
-	  && (smtyp != XTY_ER
-	      || (*sym_hash)->root.type == bfd_link_hash_undefined))
-	{
-	  struct xcoff_link_hash_entry *h;
-	  struct internal_ldsym *ldsym;
-
-	  h = *sym_hash;
-	  ldsym = h->ldsym;
-	  if (isym.n_scnum > 0)
-	    {
-	      ldsym->l_scnum = (*csectpp)->output_section->target_index;
-	      ldsym->l_value = (isym.n_value
-				+ (*csectpp)->output_section->vma
-				+ (*csectpp)->output_offset
-				- (*csectpp)->vma);
-	    }
-	  else
-	    {
-	      ldsym->l_scnum = isym.n_scnum;
-	      ldsym->l_value = isym.n_value;
-	    }
-
-	  ldsym->l_smtype = smtyp;
-	  if (((h->flags & XCOFF_DEF_REGULAR) == 0
-	       && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-	      || (h->flags & XCOFF_IMPORT) != 0)
-	    ldsym->l_smtype |= L_IMPORT;
-	  if (((h->flags & XCOFF_DEF_REGULAR) != 0
-	       && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-	      || (h->flags & XCOFF_EXPORT) != 0)
-	    ldsym->l_smtype |= L_EXPORT;
-	  if ((h->flags & XCOFF_ENTRY) != 0)
-	    ldsym->l_smtype |= L_ENTRY;
-
-	  ldsym->l_smclas = aux.x_csect.x_smclas;
-
-	  if (ldsym->l_ifile == (bfd_size_type) -1)
-	    ldsym->l_ifile = 0;
-	  else if (ldsym->l_ifile == 0)
-	    {
-	      if ((ldsym->l_smtype & L_IMPORT) == 0)
-		ldsym->l_ifile = 0;
-	      else
-		{
-		  bfd *impbfd;
-
-		  if (h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak)
-		    impbfd = h->root.u.def.section->owner;
-		  else if (h->root.type == bfd_link_hash_undefined
-			   || h->root.type == bfd_link_hash_undefweak)
-		    impbfd = h->root.u.undef.abfd;
-		  else
-		    impbfd = NULL;
-
-		  if (impbfd == NULL)
-		    ldsym->l_ifile = 0;
-		  else
-		    {
-		      BFD_ASSERT (impbfd->xvec == finfo->output_bfd->xvec);
-		      ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
-		    }
-		}
-	    }
-
-	  ldsym->l_parm = 0;
-
-	  BFD_ASSERT (h->ldindx >= 0);
-	  BFD_ASSERT (LDSYMSZ == sizeof (struct external_ldsym));
-	  xcoff_swap_ldsym_out (finfo->output_bfd, ldsym,
-				finfo->ldsym + h->ldindx - 3);
-	  h->ldsym = NULL;
-
-	  /* Fill in snentry now that we know the target_index.  */
-	  if ((h->flags & XCOFF_ENTRY) != 0
-	      && (h->root.type == bfd_link_hash_defined
-		  || h->root.type == bfd_link_hash_defweak))
-	    xcoff_data (output_bfd)->snentry =
-	      h->root.u.def.section->output_section->target_index;
-	}
-
-      *indexp = -1;
-
-      skip = false;
-      require = false;
-      add = 1 + isym.n_numaux;
-
-      /* If we are skipping this csect, we want to skip this symbol.  */
-      if (*csectpp == NULL)
-	skip = true;
-
-      /* If we garbage collected this csect, we want to skip this
-         symbol.  */
-      if (! skip
-	  && xcoff_hash_table (finfo->info)->gc
-	  && ((*csectpp)->flags & SEC_MARK) == 0
-	  && *csectpp != bfd_abs_section_ptr)
-	skip = true;
-
-      /* An XCOFF linker always skips C_STAT symbols.  */
-      if (! skip
-	  && isymp->n_sclass == C_STAT)
-	skip = true;
-
-      /* We skip all but the first TOC anchor.  */
-      if (! skip
-	  && isymp->n_sclass == C_HIDEXT
-	  && aux.x_csect.x_smclas == XMC_TC0)
-	{
-	  if (finfo->toc_symindx != -1)
-	    skip = true;
-	  else
-	    {
-	      bfd_vma tocval, tocend;
-
-	      tocval = ((*csectpp)->output_section->vma
-			+ (*csectpp)->output_offset
-			+ isym.n_value
-			- (*csectpp)->vma);
-	      /* We want to find out if tocval is a good value to use
-                 as the TOC anchor--that is, whether we can access all
-                 of the TOC using a 16 bit offset from tocval.  This
-                 test assumes that the TOC comes at the end of the
-                 output section, as it does in the default linker
-                 script.  FIXME: This doesn't handle .tocbss sections
-                 created from XMC_TD common symbols correctly.  */
-
-	      tocend = ((*csectpp)->output_section->vma
-			+ (*csectpp)->output_section->_raw_size);
-
-	      if (tocval + 0x10000 < tocend)
-		{
-		  (*_bfd_error_handler)
-		    (_("TOC overflow: 0x%lx > 0x10000; try -mminimal-toc when compiling"),
-		     (unsigned long) (tocend - tocval));
-		  bfd_set_error (bfd_error_file_too_big);
-		  return false;
-		}
-
-	      if (tocval + 0x8000 < tocend)
-		{
-		  bfd_vma tocadd;
-
-		  tocadd = tocend - (tocval + 0x8000);
-		  tocval += tocadd;
-		  isym.n_value += tocadd;
-		}
-
-	      finfo->toc_symindx = output_index;
-	      xcoff_data (finfo->output_bfd)->toc = tocval;
-	      xcoff_data (finfo->output_bfd)->sntoc =
-		(*csectpp)->output_section->target_index;
-	      require = true;
-	    }
-	}
-
-      /* If we are stripping all symbols, we want to skip this one.  */
-      if (! skip
-	  && finfo->info->strip == strip_all)
-	skip = true;
-
-      /* We can skip resolved external references.  */
-      if (! skip
-	  && isym.n_sclass == C_EXT
-	  && smtyp == XTY_ER
-	  && (*sym_hash)->root.type != bfd_link_hash_undefined)
-	skip = true;
-
-      /* We can skip common symbols if they got defined somewhere
-         else.  */
-      if (! skip
-	  && isym.n_sclass == C_EXT
-	  && smtyp == XTY_CM
-	  && ((*sym_hash)->root.type != bfd_link_hash_common
-	      || (*sym_hash)->root.u.c.p->section != *csectpp)
-	  && ((*sym_hash)->root.type != bfd_link_hash_defined
-	      || (*sym_hash)->root.u.def.section != *csectpp))
-	skip = true;
-
-      /* Skip local symbols if we are discarding them.  */
-      if (! skip
-	  && finfo->info->discard == discard_all
-	  && isym.n_sclass != C_EXT
-	  && (isym.n_sclass != C_HIDEXT
-	      || smtyp != XTY_SD))
-	skip = true;
-
-      /* If we stripping debugging symbols, and this is a debugging
-         symbol, then skip it.  */
-      if (! skip
-	  && finfo->info->strip == strip_debugger
-	  && isym.n_scnum == N_DEBUG)
-	skip = true;
-
-      /* If some symbols are stripped based on the name, work out the
-	 name and decide whether to skip this symbol.  We don't handle
-	 this correctly for symbols whose names are in the .debug
-	 section; to get it right we would need a new bfd_strtab_hash
-	 function to return the string given the index.  */
-      if (! skip
-	  && (finfo->info->strip == strip_some
-	      || finfo->info->discard == discard_l)
-	  && (debug_index == NULL || *debug_index == (unsigned long) -1))
-	{
-	  const char *name;
-	  char buf[SYMNMLEN + 1];
-
-	  name = _bfd_coff_internal_syment_name (input_bfd, &isym, buf);
-	  if (name == NULL)
-	    return false;
-
-	  if ((finfo->info->strip == strip_some
-	       && (bfd_hash_lookup (finfo->info->keep_hash, name, false,
-				    false) == NULL))
-	      || (finfo->info->discard == discard_l
-		  && (isym.n_sclass != C_EXT
-		      && (isym.n_sclass != C_HIDEXT
-			  || smtyp != XTY_SD))
-		  && bfd_is_local_label_name (input_bfd, name)))
-	    skip = true;
-	}
-
-      /* We can not skip the first TOC anchor.  */
-      if (skip
-	  && require
-	  && finfo->info->strip != strip_all)
-	skip = false;
-
-      /* We now know whether we are to skip this symbol or not.  */
-      if (! skip)
-	{
-	  /* Adjust the symbol in order to output it.  */
-
-	  if (isym._n._n_n._n_zeroes == 0
-	      && isym._n._n_n._n_offset != 0)
-	    {
-	      /* This symbol has a long name.  Enter it in the string
-		 table we are building.  If *debug_index != -1, the
-		 name has already been entered in the .debug section.  */
-	      if (debug_index != NULL && *debug_index != (unsigned long) -1)
-		isym._n._n_n._n_offset = *debug_index;
-	      else
-		{
-		  const char *name;
-		  bfd_size_type indx;
-
-		  name = _bfd_coff_internal_syment_name (input_bfd, &isym,
-							 (char *) NULL);
-		  if (name == NULL)
-		    return false;
-		  indx = _bfd_stringtab_add (finfo->strtab, name, hash, copy);
-		  if (indx == (bfd_size_type) -1)
-		    return false;
-		  isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
-		}
-	    }
-
-	  if (isym.n_sclass != C_BSTAT
-	      && isym.n_sclass != C_ESTAT
-	      && isym.n_sclass != C_DECL
-	      && isym.n_scnum > 0)
-	    {
-	      isym.n_scnum = (*csectpp)->output_section->target_index;
-	      isym.n_value += ((*csectpp)->output_section->vma
-			       + (*csectpp)->output_offset
-			       - (*csectpp)->vma);
-	    }
-
-	  /* The value of a C_FILE symbol is the symbol index of the
-	     next C_FILE symbol.  The value of the last C_FILE symbol
-	     is -1.  We try to get this right, below, just before we
-	     write the symbols out, but in the general case we may
-	     have to write the symbol out twice.  */
-	  if (isym.n_sclass == C_FILE)
-	    {
-	      if (finfo->last_file_index != -1
-		  && finfo->last_file.n_value != (long) output_index)
-		{
-		  /* We must correct the value of the last C_FILE entry.  */
-		  finfo->last_file.n_value = output_index;
-		  if ((bfd_size_type) finfo->last_file_index >= syment_base)
-		    {
-		      /* The last C_FILE symbol is in this input file.  */
-		      bfd_coff_swap_sym_out (output_bfd,
-					     (PTR) &finfo->last_file,
-					     (PTR) (finfo->outsyms
-						    + ((finfo->last_file_index
-							- syment_base)
-						       * osymesz)));
-		    }
-		  else
-		    {
-		      /* We have already written out the last C_FILE
-			 symbol.  We need to write it out again.  We
-			 borrow *outsym temporarily.  */
-		      bfd_coff_swap_sym_out (output_bfd,
-					     (PTR) &finfo->last_file,
-					     (PTR) outsym);
-		      if (bfd_seek (output_bfd,
-				    (obj_sym_filepos (output_bfd)
-				     + finfo->last_file_index * osymesz),
-				    SEEK_SET) != 0
-			  || (bfd_write (outsym, osymesz, 1, output_bfd)
-			      != osymesz))
-			return false;
-		    }
-		}
-
-	      finfo->last_file_index = output_index;
-	      finfo->last_file = isym;
-	    }
-
-	  /* The value of a C_BINCL or C_EINCL symbol is a file offset
-             into the line numbers.  We update the symbol values when
-             we handle the line numbers.  */
-	  if (isym.n_sclass == C_BINCL
-	      || isym.n_sclass == C_EINCL)
-	    {
-	      isym.n_value = finfo->line_filepos;
-	      ++incls;
-	    }
-
-	  /* Output the symbol.  */
-
-	  bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym);
-
-	  *indexp = output_index;
-
-	  if (isym.n_sclass == C_EXT)
-	    {
-	      long indx;
-	      struct xcoff_link_hash_entry *h;
-
-	      indx = ((esym - (bfd_byte *) obj_coff_external_syms (input_bfd))
-		      / isymesz);
-	      h = obj_xcoff_sym_hashes (input_bfd)[indx];
-	      BFD_ASSERT (h != NULL);
-	      h->indx = output_index;
-	    }
-
-	  /* If this is a symbol in the TOC which we may have merged
-             (class XMC_TC), remember the symbol index of the TOC
-             symbol.  */
-	  if (isym.n_sclass == C_HIDEXT
-	      && aux.x_csect.x_smclas == XMC_TC
-	      && *sym_hash != NULL)
-	    {
-	      BFD_ASSERT (((*sym_hash)->flags & XCOFF_SET_TOC) == 0);
-	      BFD_ASSERT ((*sym_hash)->toc_section != NULL);
-	      (*sym_hash)->u.toc_indx = output_index;
-	    }
-
-	  output_index += add;
-	  outsym += add * osymesz;
-	}
-
-      esym += add * isymesz;
-      isymp += add;
-      csectpp += add;
-      sym_hash += add;
-      if (debug_index != NULL)
-	debug_index += add;
-      ++indexp;
-      for (--add; add > 0; --add)
-	*indexp++ = -1;
-    }
-
-  /* Fix up the aux entries and the C_BSTAT symbols.  This must be
-     done in a separate pass, because we don't know the correct symbol
-     indices until we have already decided which symbols we are going
-     to keep.  */
-
-  esym = (bfd_byte *) obj_coff_external_syms (input_bfd);
-  esym_end = esym + obj_raw_syment_count (input_bfd) * isymesz;
-  isymp = finfo->internal_syms;
-  indexp = finfo->sym_indices;
-  csectpp = xcoff_data (input_bfd)->csects;
-  outsym = finfo->outsyms;
-  while (esym < esym_end)
-    {
-      int add;
-
-      add = 1 + isymp->n_numaux;
-
-      if (*indexp < 0)
-	esym += add * isymesz;
-      else
-	{
-	  int i;
-
-	  if (isymp->n_sclass == C_BSTAT)
-	    {
-	      struct internal_syment isym;
-	      unsigned long indx;
-
-	      /* The value of a C_BSTAT symbol is the symbol table
-                 index of the containing csect.  */
-	      bfd_coff_swap_sym_in (output_bfd, (PTR) outsym, (PTR) &isym);
-	      indx = isym.n_value;
-	      if (indx < obj_raw_syment_count (input_bfd))
-		{
-		  long symindx;
-
-		  symindx = finfo->sym_indices[indx];
-		  if (symindx < 0)
-		    isym.n_value = 0;
-		  else
-		    isym.n_value = symindx;
-		  bfd_coff_swap_sym_out (output_bfd, (PTR) &isym,
-					 (PTR) outsym);
-		}
-	    }
-
-	  esym += isymesz;
-	  outsym += osymesz;
-
-	  for (i = 0; i < isymp->n_numaux && esym < esym_end; i++)
-	    {
-	      union internal_auxent aux;
-
-	      bfd_coff_swap_aux_in (input_bfd, (PTR) esym, isymp->n_type,
-				    isymp->n_sclass, i, isymp->n_numaux,
-				    (PTR) &aux);
-
-	      if (isymp->n_sclass == C_FILE)
-		{
-		  /* This is the file name (or some comment put in by
-		     the compiler).  If it is long, we must put it in
-		     the string table.  */
-		  if (aux.x_file.x_n.x_zeroes == 0
-		      && aux.x_file.x_n.x_offset != 0)
-		    {
-		      const char *filename;
-		      bfd_size_type indx;
-
-		      BFD_ASSERT (aux.x_file.x_n.x_offset
-				  >= STRING_SIZE_SIZE);
-		      if (strings == NULL)
-			{
-			  strings = _bfd_coff_read_string_table (input_bfd);
-			  if (strings == NULL)
-			    return false;
-			}
-		      filename = strings + aux.x_file.x_n.x_offset;
-		      indx = _bfd_stringtab_add (finfo->strtab, filename,
-						 hash, copy);
-		      if (indx == (bfd_size_type) -1)
-			return false;
-		      aux.x_file.x_n.x_offset = STRING_SIZE_SIZE + indx;
-		    }
-		}
-	      else if ((isymp->n_sclass == C_EXT
-			|| isymp->n_sclass == C_HIDEXT)
-		       && i + 1 == isymp->n_numaux)
-		{
-		  /* We don't support type checking.  I don't know if
-                     anybody does.  */
-		  aux.x_csect.x_parmhash = 0;
-		  /* I don't think anybody uses these fields, but we'd
-                     better clobber them just in case.  */
-		  aux.x_csect.x_stab = 0;
-		  aux.x_csect.x_snstab = 0;
-		  if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_LD)
-		    {
-		      unsigned long indx;
-
-		      indx = aux.x_csect.x_scnlen.l;
-		      if (indx < obj_raw_syment_count (input_bfd))
-			{
-			  long symindx;
-
-			  symindx = finfo->sym_indices[indx];
-			  if (symindx < 0)
-			    aux.x_sym.x_tagndx.l = 0;
-			  else
-			    aux.x_sym.x_tagndx.l = symindx;
-			}
-		    }
-		}
-	      else if (isymp->n_sclass != C_STAT || isymp->n_type != T_NULL)
-		{
-		  unsigned long indx;
-
-		  if (ISFCN (isymp->n_type)
-		      || ISTAG (isymp->n_sclass)
-		      || isymp->n_sclass == C_BLOCK
-		      || isymp->n_sclass == C_FCN)
-		    {
-		      indx = aux.x_sym.x_fcnary.x_fcn.x_endndx.l;
-		      if (indx > 0
-			  && indx < obj_raw_syment_count (input_bfd))
-			{
-			  /* We look forward through the symbol for
-                             the index of the next symbol we are going
-                             to include.  I don't know if this is
-                             entirely right.  */
-			  while (finfo->sym_indices[indx] < 0
-				 && indx < obj_raw_syment_count (input_bfd))
-			    ++indx;
-			  if (indx >= obj_raw_syment_count (input_bfd))
-			    indx = output_index;
-			  else
-			    indx = finfo->sym_indices[indx];
-			  aux.x_sym.x_fcnary.x_fcn.x_endndx.l = indx;
-			}
-		    }
-
-		  indx = aux.x_sym.x_tagndx.l;
-		  if (indx > 0 && indx < obj_raw_syment_count (input_bfd))
-		    {
-		      long symindx;
-
-		      symindx = finfo->sym_indices[indx];
-		      if (symindx < 0)
-			aux.x_sym.x_tagndx.l = 0;
-		      else
-			aux.x_sym.x_tagndx.l = symindx;
-		    }
-		}
-
-	      /* Copy over the line numbers, unless we are stripping
-		 them.  We do this on a symbol by symbol basis in
-		 order to more easily handle garbage collection.  */
-	      if ((isymp->n_sclass == C_EXT
-		   || isymp->n_sclass == C_HIDEXT)
-		  && i == 0
-		  && isymp->n_numaux > 1
-		  && ISFCN (isymp->n_type)
-		  && aux.x_sym.x_fcnary.x_fcn.x_lnnoptr != 0)
-		{
-		  if (finfo->info->strip != strip_none
-		      && finfo->info->strip != strip_some)
-		    aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = 0;
-		  else
-		    {
-		      asection *enclosing;
-		      unsigned int enc_count;
-		      bfd_size_type linoff;
-		      struct internal_lineno lin;
-
-		      o = *csectpp;
-		      enclosing = xcoff_section_data (abfd, o)->enclosing;
-		      enc_count = xcoff_section_data (abfd, o)->lineno_count;
-		      if (oline != enclosing)
-			{
-			  if (bfd_seek (input_bfd,
-					enclosing->line_filepos,
-					SEEK_SET) != 0
-			      || (bfd_read (finfo->linenos, linesz,
-					    enc_count, input_bfd)
-				  != linesz * enc_count))
-			    return false;
-			  oline = enclosing;
-			}
-
-		      linoff = (aux.x_sym.x_fcnary.x_fcn.x_lnnoptr
-				- enclosing->line_filepos);
-
-		      bfd_coff_swap_lineno_in (input_bfd,
-					       (PTR) (finfo->linenos + linoff),
-					       (PTR) &lin);
-		      if (lin.l_lnno != 0
-			  || ((bfd_size_type) lin.l_addr.l_symndx
-			      != ((esym
-				   - isymesz
-				   - ((bfd_byte *)
-				      obj_coff_external_syms (input_bfd)))
-				  / isymesz)))
-			aux.x_sym.x_fcnary.x_fcn.x_lnnoptr = 0;
-		      else
-			{
-			  bfd_byte *linpend, *linp;
-			  bfd_vma offset;
-			  bfd_size_type count;
-
-			  lin.l_addr.l_symndx = *indexp;
-			  bfd_coff_swap_lineno_out (output_bfd, (PTR) &lin,
-						    (PTR) (finfo->linenos
-							   + linoff));
-
-			  linpend = (finfo->linenos
-				     + enc_count * linesz);
-			  offset = (o->output_section->vma
-				    + o->output_offset
-				    - o->vma);
-			  for (linp = finfo->linenos + linoff + linesz;
-			       linp < linpend;
-			       linp += linesz)
-			    {
-			      bfd_coff_swap_lineno_in (input_bfd, (PTR) linp,
-						       (PTR) &lin);
-			      if (lin.l_lnno == 0)
-				break;
-			      lin.l_addr.l_paddr += offset;
-			      bfd_coff_swap_lineno_out (output_bfd,
-							(PTR) &lin,
-							(PTR) linp);
-			    }
-
-			  count = (linp - (finfo->linenos + linoff)) / linesz;
-
-			  aux.x_sym.x_fcnary.x_fcn.x_lnnoptr =
-			    (o->output_section->line_filepos
-			     + o->output_section->lineno_count * linesz);
-
-			  if (bfd_seek (output_bfd,
-					aux.x_sym.x_fcnary.x_fcn.x_lnnoptr,
-					SEEK_SET) != 0
-			      || (bfd_write (finfo->linenos + linoff,
-					     linesz, count, output_bfd)
-				  != linesz * count))
-			    return false;
-
-			  o->output_section->lineno_count += count;
-
-			  if (incls > 0)
-			    {
-			      struct internal_syment *iisp, *iispend;
-			      long *iindp;
-			      bfd_byte *oos;
-			      int iiadd;
-
-			      /* Update any C_BINCL or C_EINCL symbols
-                                 that refer to a line number in the
-                                 range we just output.  */
-			      iisp = finfo->internal_syms;
-			      iispend = (iisp
-					 + obj_raw_syment_count (input_bfd));
-			      iindp = finfo->sym_indices;
-			      oos = finfo->outsyms;
-			      while (iisp < iispend)
-				{
-				  if (*iindp >= 0
-				      && (iisp->n_sclass == C_BINCL
-					  || iisp->n_sclass == C_EINCL)
-				      && ((bfd_size_type) iisp->n_value
-					  >= enclosing->line_filepos + linoff)
-				      && ((bfd_size_type) iisp->n_value
-					  < (enclosing->line_filepos
-					     + enc_count * linesz)))
-				    {
-				      struct internal_syment iis;
-
-				      bfd_coff_swap_sym_in (output_bfd,
-							    (PTR) oos,
-							    (PTR) &iis);
-				      iis.n_value =
-					(iisp->n_value
-					 - enclosing->line_filepos
-					 - linoff
-					 + aux.x_sym.x_fcnary.x_fcn.x_lnnoptr);
-				      bfd_coff_swap_sym_out (output_bfd,
-							     (PTR) &iis,
-							     (PTR) oos);
-				      --incls;
-				    }
-
-				  iiadd = 1 + iisp->n_numaux;
-				  if (*iindp >= 0)
-				    oos += iiadd * osymesz;
-				  iisp += iiadd;
-				  iindp += iiadd;
-				}
-			    }
-			}
-		    }
-		}
-
-	      bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, isymp->n_type,
-				     isymp->n_sclass, i, isymp->n_numaux,
-				     (PTR) outsym);
-	      outsym += osymesz;
-	      esym += isymesz;
-	    }
-	}
-
-      indexp += add;
-      isymp += add;
-      csectpp += add;
-    }
-
-  /* If we swapped out a C_FILE symbol, guess that the next C_FILE
-     symbol will be the first symbol in the next input file.  In the
-     normal case, this will save us from writing out the C_FILE symbol
-     again.  */
-  if (finfo->last_file_index != -1
-      && (bfd_size_type) finfo->last_file_index >= syment_base)
-    {
-      finfo->last_file.n_value = output_index;
-      bfd_coff_swap_sym_out (output_bfd, (PTR) &finfo->last_file,
-			     (PTR) (finfo->outsyms
- 				    + ((finfo->last_file_index - syment_base)
- 				       * osymesz)));
-    }
-
-  /* Write the modified symbols to the output file.  */
-  if (outsym > finfo->outsyms)
-    {
-      if (bfd_seek (output_bfd,
-		    obj_sym_filepos (output_bfd) + syment_base * osymesz,
-		    SEEK_SET) != 0
-	  || (bfd_write (finfo->outsyms, outsym - finfo->outsyms, 1,
-			output_bfd)
-	      != (bfd_size_type) (outsym - finfo->outsyms)))
-	return false;
-
-      BFD_ASSERT ((obj_raw_syment_count (output_bfd)
-		   + (outsym - finfo->outsyms) / osymesz)
-		  == output_index);
-
-      obj_raw_syment_count (output_bfd) = output_index;
-    }
-
-  /* Don't let the linker relocation routines discard the symbols.  */
-  keep_syms = obj_coff_keep_syms (input_bfd);
-  obj_coff_keep_syms (input_bfd) = true;
-
-  /* Relocate the contents of each section.  */
-  for (o = input_bfd->sections; o != NULL; o = o->next)
-    {
-      bfd_byte *contents;
-
-      if (! o->linker_mark)
-	{
-	  /* This section was omitted from the link.  */
-	  continue;
-	}
-
-      if ((o->flags & SEC_HAS_CONTENTS) == 0
-	  || o->_raw_size == 0
-	  || (o->flags & SEC_IN_MEMORY) != 0)
-	continue;
-
-      /* We have set filepos correctly for the sections we created to
-         represent csects, so bfd_get_section_contents should work.  */
-      if (coff_section_data (input_bfd, o) != NULL
-	  && coff_section_data (input_bfd, o)->contents != NULL)
-	contents = coff_section_data (input_bfd, o)->contents;
-      else
-	{
-	  if (! bfd_get_section_contents (input_bfd, o, finfo->contents,
-					  (file_ptr) 0, o->_raw_size))
-	    return false;
-	  contents = finfo->contents;
-	}
-
-      if ((o->flags & SEC_RELOC) != 0)
-	{
-	  int target_index;
-	  struct internal_reloc *internal_relocs;
-	  struct internal_reloc *irel;
-	  bfd_vma offset;
-	  struct internal_reloc *irelend;
-	  struct xcoff_link_hash_entry **rel_hash;
-	  long r_symndx;
-
-	  /* Read in the relocs.  */
-	  target_index = o->output_section->target_index;
-	  internal_relocs = (xcoff_read_internal_relocs
-			     (input_bfd, o, false, finfo->external_relocs,
-			      true,
-			      (finfo->section_info[target_index].relocs
-			       + o->output_section->reloc_count)));
-	  if (internal_relocs == NULL)
-	    return false;
-
-	  /* Call processor specific code to relocate the section
-             contents.  */
-	  if (! bfd_coff_relocate_section (output_bfd, finfo->info,
-					   input_bfd, o,
-					   contents,
-					   internal_relocs,
-					   finfo->internal_syms,
-					   xcoff_data (input_bfd)->csects))
-	    return false;
-
-	  offset = o->output_section->vma + o->output_offset - o->vma;
-	  irel = internal_relocs;
-	  irelend = irel + o->reloc_count;
-	  rel_hash = (finfo->section_info[target_index].rel_hashes
-		      + o->output_section->reloc_count);
-	  for (; irel < irelend; irel++, rel_hash++)
-	    {
-	      struct xcoff_link_hash_entry *h = NULL;
-	      struct internal_ldrel ldrel;
-	      boolean quiet;
-
-	      *rel_hash = NULL;
-
-	      /* Adjust the reloc address and symbol index.  */
-
-	      irel->r_vaddr += offset;
-
-	      r_symndx = irel->r_symndx;
-
-	      if (r_symndx == -1)
-		h = NULL;
-	      else
-		h = obj_xcoff_sym_hashes (input_bfd)[r_symndx];
-
-	      if (r_symndx != -1 && finfo->info->strip != strip_all)
-		{
-		  if (h != NULL
-		      && h->smclas != XMC_TD
-		      && (irel->r_type == R_TOC
-			  || irel->r_type == R_GL
-			  || irel->r_type == R_TCL
-			  || irel->r_type == R_TRL
-			  || irel->r_type == R_TRLA))
-		    {
-		      /* This is a TOC relative reloc with a symbol
-                         attached.  The symbol should be the one which
-                         this reloc is for.  We want to make this
-                         reloc against the TOC address of the symbol,
-                         not the symbol itself.  */
-		      BFD_ASSERT (h->toc_section != NULL);
-		      BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
-		      if (h->u.toc_indx != -1)
-			irel->r_symndx = h->u.toc_indx;
-		      else
-			{
-			  struct xcoff_toc_rel_hash *n;
-			  struct xcoff_link_section_info *si;
-
-			  n = ((struct xcoff_toc_rel_hash *)
-			       bfd_alloc (finfo->output_bfd,
-					  sizeof (struct xcoff_toc_rel_hash)));
-			  if (n == NULL)
-			    return false;
-			  si = finfo->section_info + target_index;
-			  n->next = si->toc_rel_hashes;
-			  n->h = h;
-			  n->rel = irel;
-			  si->toc_rel_hashes = n;
-			}
-		    }
-		  else if (h != NULL)
-		    {
-		      /* This is a global symbol.  */
-		      if (h->indx >= 0)
-			irel->r_symndx = h->indx;
-		      else
-			{
-			  /* This symbol is being written at the end
-			     of the file, and we do not yet know the
-			     symbol index.  We save the pointer to the
-			     hash table entry in the rel_hash list.
-			     We set the indx field to -2 to indicate
-			     that this symbol must not be stripped.  */
-			  *rel_hash = h;
-			  h->indx = -2;
-			}
-		    }
-		  else
-		    {
-		      long indx;
-
-		      indx = finfo->sym_indices[r_symndx];
-
-		      if (indx == -1)
-			{
-			  struct internal_syment *is;
-
-			  /* Relocations against a TC0 TOC anchor are
-			     automatically transformed to be against
-			     the TOC anchor in the output file.  */
-			  is = finfo->internal_syms + r_symndx;
-			  if (is->n_sclass == C_HIDEXT
-			      && is->n_numaux > 0)
-			    {
-			      PTR auxptr;
-			      union internal_auxent aux;
-
-			      auxptr = ((PTR)
-					(((bfd_byte *)
-					  obj_coff_external_syms (input_bfd))
-					 + ((r_symndx + is->n_numaux)
-					    * isymesz)));
-			      bfd_coff_swap_aux_in (input_bfd, auxptr,
-						    is->n_type, is->n_sclass,
-						    is->n_numaux - 1,
-						    is->n_numaux,
-						    (PTR) &aux);
-			      if (SMTYP_SMTYP (aux.x_csect.x_smtyp) == XTY_SD
-				  && aux.x_csect.x_smclas == XMC_TC0)
-				indx = finfo->toc_symindx;
-			    }
-			}
-
-		      if (indx != -1)
-			irel->r_symndx = indx;
-		      else
-			{
-			  struct internal_syment *is;
-			  const char *name;
-			  char buf[SYMNMLEN + 1];
-
-			  /* This reloc is against a symbol we are
-			     stripping.  It would be possible to handle
-			     this case, but I don't think it's worth it.  */
-			  is = finfo->internal_syms + r_symndx;
-
-			  name = (_bfd_coff_internal_syment_name
-				  (input_bfd, is, buf));
-			  if (name == NULL)
-			    return false;
-
-			  if (! ((*finfo->info->callbacks->unattached_reloc)
-				 (finfo->info, name, input_bfd, o,
-				  irel->r_vaddr)))
-			    return false;
-			}
-		    }
-		}
-
-	      quiet = false;
-	      switch (irel->r_type)
-		{
-		default:
-		  if (h == NULL
-		      || h->root.type == bfd_link_hash_defined
-		      || h->root.type == bfd_link_hash_defweak
-		      || h->root.type == bfd_link_hash_common)
-		    break;
-		  /* Fall through.  */
-		case R_POS:
-		case R_NEG:
-		case R_RL:
-		case R_RLA:
-		  /* This reloc needs to be copied into the .loader
-		     section.  */
-		  ldrel.l_vaddr = irel->r_vaddr;
-		  if (r_symndx == -1)
-		    ldrel.l_symndx = -1;
-		  else if (h == NULL
-			   || (h->root.type == bfd_link_hash_defined
-			       || h->root.type == bfd_link_hash_defweak
-			       || h->root.type == bfd_link_hash_common))
-		    {
-		      asection *sec;
-
-		      if (h == NULL)
-			sec = xcoff_data (input_bfd)->csects[r_symndx];
-		      else if (h->root.type == bfd_link_hash_common)
-			sec = h->root.u.c.p->section;
-		      else
-			sec = h->root.u.def.section;
-		      sec = sec->output_section;
-
-		      if (strcmp (sec->name, ".text") == 0)
-			ldrel.l_symndx = 0;
-		      else if (strcmp (sec->name, ".data") == 0)
-			ldrel.l_symndx = 1;
-		      else if (strcmp (sec->name, ".bss") == 0)
-			ldrel.l_symndx = 2;
-		      else
-			{
-			  (*_bfd_error_handler)
-			    (_("%s: loader reloc in unrecognized section `%s'"),
-			     bfd_get_filename (input_bfd),
-			     sec->name);
-			  bfd_set_error (bfd_error_nonrepresentable_section);
-			  return false;
-			}
-		    }
-		  else
-		    {
-		      if (! finfo->info->relocateable
-			  && (h->flags & XCOFF_DEF_DYNAMIC) == 0
-			  && (h->flags & XCOFF_IMPORT) == 0)
-			{
-			  /* We already called the undefined_symbol
-			     callback for this relocation, in
-			     _bfd_ppc_xcoff_relocate_section.  Don't
-			     issue any more warnings.  */
-			  quiet = true;
-			}
-		      if (h->ldindx < 0 && ! quiet)
-			{
-			  (*_bfd_error_handler)
-			    (_("%s: `%s' in loader reloc but not loader sym"),
-			     bfd_get_filename (input_bfd),
-			     h->root.root.string);
-			  bfd_set_error (bfd_error_bad_value);
-			  return false;
-			}
-		      ldrel.l_symndx = h->ldindx;
-		    }
-		  ldrel.l_rtype = (irel->r_size << 8) | irel->r_type;
-		  ldrel.l_rsecnm = o->output_section->target_index;
-		  if (xcoff_hash_table (finfo->info)->textro
-		      && strcmp (o->output_section->name, ".text") == 0
-		      && ! quiet)
-		    {
-		      (*_bfd_error_handler)
-			(_("%s: loader reloc in read-only section %s"),
-			 bfd_get_filename (input_bfd),
-			 bfd_get_section_name (finfo->output_bfd,
-					       o->output_section));
-		      bfd_set_error (bfd_error_invalid_operation);
-		      return false;
-		    }
-		  xcoff_swap_ldrel_out (output_bfd, &ldrel,
-					finfo->ldrel);
-		  BFD_ASSERT (sizeof (struct external_ldrel) == LDRELSZ);
-		  ++finfo->ldrel;
-		  break;
-
-		case R_TOC:
-		case R_GL:
-		case R_TCL:
-		case R_TRL:
-		case R_TRLA:
-		  /* We should never need a .loader reloc for a TOC
-		     relative reloc.  */
-		  break;
-		}
-	    }
-
-	  o->output_section->reloc_count += o->reloc_count;
-	}
-
-      /* Write out the modified section contents.  */
-      if (! bfd_set_section_contents (output_bfd, o->output_section,
-				      contents, o->output_offset,
-				      (o->_cooked_size != 0
-				       ? o->_cooked_size
-				       : o->_raw_size)))
-	return false;
-    }
-
-  obj_coff_keep_syms (input_bfd) = keep_syms;
-
-  if (! finfo->info->keep_memory)
-    {
-      if (! _bfd_coff_free_symbols (input_bfd))
-	return false;
-    }
-
-  return true;
-}
-
-#undef N_TMASK
-#undef N_BTSHFT
-
-/* Write out a non-XCOFF global symbol.  */
-
-static boolean
-xcoff_write_global_symbol (h, p)
-     struct xcoff_link_hash_entry *h;
-     PTR p;
-{
-  struct xcoff_final_link_info *finfo = (struct xcoff_final_link_info *) p;
-  bfd *output_bfd;
-  bfd_byte *outsym;
-  struct internal_syment isym;
-  union internal_auxent aux;
-
-  output_bfd = finfo->output_bfd;
-  outsym = finfo->outsyms;
-
-  /* If this symbol was garbage collected, just skip it.  */
-  if (xcoff_hash_table (finfo->info)->gc
-      && (h->flags & XCOFF_MARK) == 0)
-    return true;
-
-  /* If we need a .loader section entry, write it out.  */
-  if (h->ldsym != NULL)
-    {
-      struct internal_ldsym *ldsym;
-      bfd *impbfd;
-
-      ldsym = h->ldsym;
-
-      if (h->root.type == bfd_link_hash_undefined
-	  || h->root.type == bfd_link_hash_undefweak)
-	{
-	  ldsym->l_value = 0;
-	  ldsym->l_scnum = N_UNDEF;
-	  ldsym->l_smtype = XTY_ER;
-	  impbfd = h->root.u.undef.abfd;
-	}
-      else if (h->root.type == bfd_link_hash_defined
-	       || h->root.type == bfd_link_hash_defweak)
-	{
-	  asection *sec;
-
-	  sec = h->root.u.def.section;
-	  ldsym->l_value = (sec->output_section->vma
-			    + sec->output_offset
-			    + h->root.u.def.value);
-	  ldsym->l_scnum = sec->output_section->target_index;
-	  ldsym->l_smtype = XTY_SD;
-	  impbfd = sec->owner;
-	}
-      else
-	abort ();
-
-      if (((h->flags & XCOFF_DEF_REGULAR) == 0
-	   && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-	  || (h->flags & XCOFF_IMPORT) != 0)
-	ldsym->l_smtype |= L_IMPORT;
-      if (((h->flags & XCOFF_DEF_REGULAR) != 0
-	   && (h->flags & XCOFF_DEF_DYNAMIC) != 0)
-	  || (h->flags & XCOFF_EXPORT) != 0)
-	ldsym->l_smtype |= L_EXPORT;
-      if ((h->flags & XCOFF_ENTRY) != 0)
-	ldsym->l_smtype |= L_ENTRY;
-
-      ldsym->l_smclas = h->smclas;
-
-      if (ldsym->l_ifile == (bfd_size_type) -1)
-	ldsym->l_ifile = 0;
-      else if (ldsym->l_ifile == 0)
-	{
-	  if ((ldsym->l_smtype & L_IMPORT) == 0)
-	    ldsym->l_ifile = 0;
-	  else if (impbfd == NULL)
-	    ldsym->l_ifile = 0;
-	  else
-	    {
-	      BFD_ASSERT (impbfd->xvec == output_bfd->xvec);
-	      ldsym->l_ifile = xcoff_data (impbfd)->import_file_id;
-	    }
-	}
-
-      ldsym->l_parm = 0;
-
-      BFD_ASSERT (h->ldindx >= 0);
-      BFD_ASSERT (LDSYMSZ == sizeof (struct external_ldsym));
-      xcoff_swap_ldsym_out (output_bfd, ldsym, finfo->ldsym + h->ldindx - 3);
-      h->ldsym = NULL;
-    }
-
-  /* If this symbol needs global linkage code, write it out.  */
-  if (h->root.type == bfd_link_hash_defined
-      && (h->root.u.def.section
-	  == xcoff_hash_table (finfo->info)->linkage_section))
-    {
-      bfd_byte *p;
-      bfd_vma tocoff;
-      unsigned int i;
-
-      p = h->root.u.def.section->contents + h->root.u.def.value;
-
-      /* The first instruction in the global linkage code loads a
-         specific TOC element.  */
-      tocoff = (h->descriptor->toc_section->output_section->vma
-		+ h->descriptor->toc_section->output_offset
-		- xcoff_data (output_bfd)->toc);
-      if ((h->descriptor->flags & XCOFF_SET_TOC) != 0)
-	tocoff += h->descriptor->u.toc_offset;
-      bfd_put_32 (output_bfd, XCOFF_GLINK_FIRST | (tocoff & 0xffff), p);
-      for (i = 0, p += 4;
-	   i < sizeof xcoff_glink_code / sizeof xcoff_glink_code[0];
-	   i++, p += 4)
-	bfd_put_32 (output_bfd, xcoff_glink_code[i], p);
-    }
-
-  /* If we created a TOC entry for this symbol, write out the required
-     relocs.  */
-  if ((h->flags & XCOFF_SET_TOC) != 0)
-    {
-      asection *tocsec;
-      asection *osec;
-      int oindx;
-      struct internal_reloc *irel;
-      struct internal_ldrel ldrel;
-      struct internal_syment irsym;
-      union internal_auxent iraux;
-
-      tocsec = h->toc_section;
-      osec = tocsec->output_section;
-      oindx = osec->target_index;
-      irel = finfo->section_info[oindx].relocs + osec->reloc_count;
-      irel->r_vaddr = (osec->vma
-		       + tocsec->output_offset
-		       + h->u.toc_offset);
-      if (h->indx >= 0)
-	irel->r_symndx = h->indx;
-      else
-	{
-	  h->indx = -2;
-	  irel->r_symndx = obj_raw_syment_count (output_bfd);
-	}
-      irel->r_type = R_POS;
-      irel->r_size = 31;
-      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
-      ++osec->reloc_count;
-
-      BFD_ASSERT (h->ldindx >= 0);
-      ldrel.l_vaddr = irel->r_vaddr;
-      ldrel.l_symndx = h->ldindx;
-      ldrel.l_rtype = (31 << 8) | R_POS;
-      ldrel.l_rsecnm = oindx;
-      xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-      ++finfo->ldrel;
-
-      /* We need to emit a symbol to define a csect which holds the
-         reloc.  */
-      if (finfo->info->strip != strip_all)
-	{
-	  if (strlen (h->root.root.string) <= SYMNMLEN)
-	    strncpy (irsym._n._n_name, h->root.root.string, SYMNMLEN);
-	  else
-	    {
-	      boolean hash;
-	      bfd_size_type indx;
-
-	      hash = true;
-	      if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-		hash = false;
-	      indx = _bfd_stringtab_add (finfo->strtab, h->root.root.string,
-					 hash, false);
-	      if (indx == (bfd_size_type) -1)
-		return false;
-	      irsym._n._n_n._n_zeroes = 0;
-	      irsym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
-	    }
-
-	  irsym.n_value = irel->r_vaddr;
-	  irsym.n_scnum = osec->target_index;
-	  irsym.n_sclass = C_HIDEXT;
-	  irsym.n_type = T_NULL;
-	  irsym.n_numaux = 1;
-
-	  bfd_coff_swap_sym_out (output_bfd, (PTR) &irsym, (PTR) outsym);
-	  outsym += bfd_coff_symesz (output_bfd);
-
-	  memset (&iraux, 0, sizeof iraux);
-	  iraux.x_csect.x_smtyp = XTY_SD;
-	  iraux.x_csect.x_scnlen.l = 4;
-	  iraux.x_csect.x_smclas = XMC_TC;
-
-	  bfd_coff_swap_aux_out (output_bfd, (PTR) &iraux, T_NULL, C_HIDEXT,
-				 0, 1, (PTR) outsym);
-	  outsym += bfd_coff_auxesz (output_bfd);
-
-	  if (h->indx >= 0)
-	    {
-	      /* We aren't going to write out the symbols below, so we
-		 need to write them out now.  */
-	      if (bfd_seek (output_bfd,
-			    (obj_sym_filepos (output_bfd)
-			     + (obj_raw_syment_count (output_bfd)
-				* bfd_coff_symesz (output_bfd))),
-			    SEEK_SET) != 0
-		  || (bfd_write (finfo->outsyms, outsym - finfo->outsyms, 1,
-				 output_bfd)
-		      != (bfd_size_type) (outsym - finfo->outsyms)))
-		return false;
-	      obj_raw_syment_count (output_bfd) +=
-		(outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
-
-	      outsym = finfo->outsyms;
-	    }
-	}
-    }
-
-  /* If this symbol is a specially defined function descriptor, write
-     it out.  The first word is the address of the function code
-     itself, the second word is the address of the TOC, and the third
-     word is zero.  */
-  if ((h->flags & XCOFF_DESCRIPTOR) != 0
-      && h->root.type == bfd_link_hash_defined
-      && (h->root.u.def.section
-	  == xcoff_hash_table (finfo->info)->descriptor_section))
-    {
-      asection *sec;
-      asection *osec;
-      int oindx;
-      bfd_byte *p;
-      struct xcoff_link_hash_entry *hentry;
-      asection *esec;
-      struct internal_reloc *irel;
-      struct internal_ldrel ldrel;
-      asection *tsec;
-
-      sec = h->root.u.def.section;
-      osec = sec->output_section;
-      oindx = osec->target_index;
-      p = sec->contents + h->root.u.def.value;
-
-      hentry = h->descriptor;
-      BFD_ASSERT (hentry != NULL
-		  && (hentry->root.type == bfd_link_hash_defined
-		      || hentry->root.type == bfd_link_hash_defweak));
-      esec = hentry->root.u.def.section;
-      bfd_put_32 (output_bfd,
-		  (esec->output_section->vma
-		   + esec->output_offset
-		   + hentry->root.u.def.value),
-		  p);
-
-      irel = finfo->section_info[oindx].relocs + osec->reloc_count;
-      irel->r_vaddr = (osec->vma
-		       + sec->output_offset
-		       + h->root.u.def.value);
-      irel->r_symndx = esec->output_section->target_index;
-      irel->r_type = R_POS;
-      irel->r_size = 31;
-      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
-      ++osec->reloc_count;
-
-      ldrel.l_vaddr = irel->r_vaddr;
-      if (strcmp (esec->output_section->name, ".text") == 0)
-	ldrel.l_symndx = 0;
-      else if (strcmp (esec->output_section->name, ".data") == 0)
-	ldrel.l_symndx = 1;
-      else if (strcmp (esec->output_section->name, ".bss") == 0)
-	ldrel.l_symndx = 2;
-      else
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: loader reloc in unrecognized section `%s'"),
-	     bfd_get_filename (output_bfd),
-	     esec->output_section->name);
-	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
-	}
-      ldrel.l_rtype = (31 << 8) | R_POS;
-      ldrel.l_rsecnm = oindx;
-      xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-      ++finfo->ldrel;
-
-      bfd_put_32 (output_bfd, xcoff_data (output_bfd)->toc, p + 4);
-
-      tsec = coff_section_from_bfd_index (output_bfd,
-					  xcoff_data (output_bfd)->sntoc);
-
-      ++irel;
-      irel->r_vaddr = (osec->vma
-		       + sec->output_offset
-		       + h->root.u.def.value
-		       + 4);
-      irel->r_symndx = tsec->output_section->target_index;
-      irel->r_type = R_POS;
-      irel->r_size = 31;
-      finfo->section_info[oindx].rel_hashes[osec->reloc_count] = NULL;
-      ++osec->reloc_count;
-
-      ldrel.l_vaddr = irel->r_vaddr;
-      if (strcmp (tsec->output_section->name, ".text") == 0)
-	ldrel.l_symndx = 0;
-      else if (strcmp (tsec->output_section->name, ".data") == 0)
-	ldrel.l_symndx = 1;
-      else if (strcmp (tsec->output_section->name, ".bss") == 0)
-	ldrel.l_symndx = 2;
-      else
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: loader reloc in unrecognized section `%s'"),
-	     bfd_get_filename (output_bfd),
-	     tsec->output_section->name);
-	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
-	}
-      ldrel.l_rtype = (31 << 8) | R_POS;
-      ldrel.l_rsecnm = oindx;
-      xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-      ++finfo->ldrel;
-    }
-
-  if (h->indx >= 0 || finfo->info->strip == strip_all)
-    {
-      BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
-    }
-
-  if (h->indx != -2
-      && (finfo->info->strip == strip_all
-	  || (finfo->info->strip == strip_some
-	      && (bfd_hash_lookup (finfo->info->keep_hash,
-				   h->root.root.string, false, false)
-		  == NULL))))
-    {
-      BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
-    }
-
-  if (h->indx != -2
-      && (h->flags & (XCOFF_REF_REGULAR | XCOFF_DEF_REGULAR)) == 0)
-    {
-      BFD_ASSERT (outsym == finfo->outsyms);
-      return true;
-    }
-
-  memset (&aux, 0, sizeof aux);
-
-  h->indx = obj_raw_syment_count (output_bfd);
-
-  if (strlen (h->root.root.string) <= SYMNMLEN)
-    strncpy (isym._n._n_name, h->root.root.string, SYMNMLEN);
-  else
-    {
-      boolean hash;
-      bfd_size_type indx;
-
-      hash = true;
-      if ((output_bfd->flags & BFD_TRADITIONAL_FORMAT) != 0)
-	hash = false;
-      indx = _bfd_stringtab_add (finfo->strtab, h->root.root.string, hash,
-				 false);
-      if (indx == (bfd_size_type) -1)
-	return false;
-      isym._n._n_n._n_zeroes = 0;
-      isym._n._n_n._n_offset = STRING_SIZE_SIZE + indx;
-    }
-
-  if (h->root.type == bfd_link_hash_undefined
-      || h->root.type == bfd_link_hash_undefweak)
-    {
-      isym.n_value = 0;
-      isym.n_scnum = N_UNDEF;
-      isym.n_sclass = C_EXT;
-      aux.x_csect.x_smtyp = XTY_ER;
-    }
-  else if ((h->root.type == bfd_link_hash_defined
-	    || h->root.type == bfd_link_hash_defweak)
-	   && h->smclas == XMC_XO)
-    {
-      BFD_ASSERT (bfd_is_abs_section (h->root.u.def.section));
-      isym.n_value = h->root.u.def.value;
-      isym.n_scnum = N_UNDEF;
-      isym.n_sclass = C_EXT;
-      aux.x_csect.x_smtyp = XTY_ER;
-    }
-  else if (h->root.type == bfd_link_hash_defined
-	   || h->root.type == bfd_link_hash_defweak)
-    {
-      struct xcoff_link_size_list *l;
-
-      isym.n_value = (h->root.u.def.section->output_section->vma
-		      + h->root.u.def.section->output_offset
-		      + h->root.u.def.value);
-      isym.n_scnum = h->root.u.def.section->output_section->target_index;
-      isym.n_sclass = C_HIDEXT;
-      aux.x_csect.x_smtyp = XTY_SD;
-
-      if ((h->flags & XCOFF_HAS_SIZE) != 0)
-	{
-	  for (l = xcoff_hash_table (finfo->info)->size_list;
-	       l != NULL;
-	       l = l->next)
-	    {
-	      if (l->h == h)
-		{
-		  aux.x_csect.x_scnlen.l = l->size;
-		  break;
-		}
-	    }
-	}
-    }
-  else if (h->root.type == bfd_link_hash_common)
-    {
-      isym.n_value = (h->root.u.c.p->section->output_section->vma
-		      + h->root.u.c.p->section->output_offset);
-      isym.n_scnum = h->root.u.c.p->section->output_section->target_index;
-      isym.n_sclass = C_EXT;
-      aux.x_csect.x_smtyp = XTY_CM;
-      aux.x_csect.x_scnlen.l = h->root.u.c.size;
-    }
-  else
-    abort ();
-
-  isym.n_type = T_NULL;
-  isym.n_numaux = 1;
-
-  bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym);
-  outsym += bfd_coff_symesz (output_bfd);
-
-  aux.x_csect.x_smclas = h->smclas;
-
-  bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, T_NULL, isym.n_sclass, 0, 1,
-			 (PTR) outsym);
-  outsym += bfd_coff_auxesz (output_bfd);
-
-  if ((h->root.type == bfd_link_hash_defined
-       || h->root.type == bfd_link_hash_defweak)
-      && h->smclas != XMC_XO)
-    {
-      /* We just output an SD symbol.  Now output an LD symbol.  */
-
-      h->indx += 2;
-
-      isym.n_sclass = C_EXT;
-      bfd_coff_swap_sym_out (output_bfd, (PTR) &isym, (PTR) outsym);
-      outsym += bfd_coff_symesz (output_bfd);
-
-      aux.x_csect.x_smtyp = XTY_LD;
-      aux.x_csect.x_scnlen.l = obj_raw_syment_count (output_bfd);
-
-      bfd_coff_swap_aux_out (output_bfd, (PTR) &aux, T_NULL, C_EXT, 0, 1,
-			     (PTR) outsym);
-      outsym += bfd_coff_auxesz (output_bfd);
-    }
-
-  if (bfd_seek (output_bfd,
-		(obj_sym_filepos (output_bfd)
-		 + (obj_raw_syment_count (output_bfd)
-		    * bfd_coff_symesz (output_bfd))),
-		SEEK_SET) != 0
-      || (bfd_write (finfo->outsyms, outsym - finfo->outsyms, 1, output_bfd)
-	  != (bfd_size_type) (outsym - finfo->outsyms)))
-    return false;
-  obj_raw_syment_count (output_bfd) +=
-    (outsym - finfo->outsyms) / bfd_coff_symesz (output_bfd);
-
-  return true;
-}
-
-/* Handle a link order which is supposed to generate a reloc.  */
-
-static boolean
-xcoff_reloc_link_order (output_bfd, finfo, output_section, link_order)
-     bfd *output_bfd;
-     struct xcoff_final_link_info *finfo;
-     asection *output_section;
-     struct bfd_link_order *link_order;
-{
-  reloc_howto_type *howto;
-  struct xcoff_link_hash_entry *h;
-  asection *hsec;
-  bfd_vma hval;
-  bfd_vma addend;
-  struct internal_reloc *irel;
-  struct xcoff_link_hash_entry **rel_hash_ptr;
-  struct internal_ldrel ldrel;
-
-  if (link_order->type == bfd_section_reloc_link_order)
-    {
-      /* We need to somehow locate a symbol in the right section.  The
-         symbol must either have a value of zero, or we must adjust
-         the addend by the value of the symbol.  FIXME: Write this
-         when we need it.  The old linker couldn't handle this anyhow.  */
-      abort ();
-    }
-
-  howto = bfd_reloc_type_lookup (output_bfd, link_order->u.reloc.p->reloc);
-  if (howto == NULL)
-    {
-      bfd_set_error (bfd_error_bad_value);
-      return false;
-    }
-
-  h = ((struct xcoff_link_hash_entry *)
-       bfd_wrapped_link_hash_lookup (output_bfd, finfo->info,
-				     link_order->u.reloc.p->u.name,
-				     false, false, true));
-  if (h == NULL)
-    {
-      if (! ((*finfo->info->callbacks->unattached_reloc)
-	     (finfo->info, link_order->u.reloc.p->u.name, (bfd *) NULL,
-	      (asection *) NULL, (bfd_vma) 0)))
-	return false;
-      return true;
-    }
-
-  if (h->root.type == bfd_link_hash_common)
-    {
-      hsec = h->root.u.c.p->section;
-      hval = 0;
-    }
-  else if (h->root.type == bfd_link_hash_defined
-	   || h->root.type == bfd_link_hash_defweak)
-    {
-      hsec = h->root.u.def.section;
-      hval = h->root.u.def.value;
-    }
-  else
-    {
-      hsec = NULL;
-      hval = 0;
-    }
-
-  addend = link_order->u.reloc.p->addend;
-  if (hsec != NULL)
-    addend += (hsec->output_section->vma
-	       + hsec->output_offset
-	       + hval);
-
-  if (addend != 0)
-    {
-      bfd_size_type size;
-      bfd_byte *buf;
-      bfd_reloc_status_type rstat;
-      boolean ok;
-
-      size = bfd_get_reloc_size (howto);
-      buf = (bfd_byte *) bfd_zmalloc (size);
-      if (buf == NULL)
-	return false;
-
-      rstat = _bfd_relocate_contents (howto, output_bfd, addend, buf);
-      switch (rstat)
-	{
-	case bfd_reloc_ok:
-	  break;
-	default:
-	case bfd_reloc_outofrange:
-	  abort ();
-	case bfd_reloc_overflow:
-	  if (! ((*finfo->info->callbacks->reloc_overflow)
-		 (finfo->info, link_order->u.reloc.p->u.name,
-		  howto->name, addend, (bfd *) NULL, (asection *) NULL,
-		  (bfd_vma) 0)))
-	    {
-	      free (buf);
-	      return false;
-	    }
-	  break;
-	}
-      ok = bfd_set_section_contents (output_bfd, output_section, (PTR) buf,
-				     (file_ptr) link_order->offset, size);
-      free (buf);
-      if (! ok)
-	return false;
-    }
-
-  /* Store the reloc information in the right place.  It will get
-     swapped and written out at the end of the final_link routine.  */
-
-  irel = (finfo->section_info[output_section->target_index].relocs
-	  + output_section->reloc_count);
-  rel_hash_ptr = (finfo->section_info[output_section->target_index].rel_hashes
-		  + output_section->reloc_count);
-
-  memset (irel, 0, sizeof (struct internal_reloc));
-  *rel_hash_ptr = NULL;
-
-  irel->r_vaddr = output_section->vma + link_order->offset;
-
-  if (h->indx >= 0)
-    irel->r_symndx = h->indx;
-  else
-    {
-      /* Set the index to -2 to force this symbol to get written out.  */
-      h->indx = -2;
-      *rel_hash_ptr = h;
-      irel->r_symndx = 0;
-    }
-
-  irel->r_type = howto->type;
-  irel->r_size = howto->bitsize - 1;
-  if (howto->complain_on_overflow == complain_overflow_signed)
-    irel->r_size |= 0x80;
-
-  ++output_section->reloc_count;
-
-  /* Now output the reloc to the .loader section.  */
-
-  ldrel.l_vaddr = irel->r_vaddr;
-
-  if (hsec != NULL)
-    {
-      const char *secname;
-
-      secname = hsec->output_section->name;
-
-      if (strcmp (secname, ".text") == 0)
-	ldrel.l_symndx = 0;
-      else if (strcmp (secname, ".data") == 0)
-	ldrel.l_symndx = 1;
-      else if (strcmp (secname, ".bss") == 0)
-	ldrel.l_symndx = 2;
-      else
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: loader reloc in unrecognized section `%s'"),
-	     bfd_get_filename (output_bfd), secname);
-	  bfd_set_error (bfd_error_nonrepresentable_section);
-	  return false;
-	}
-    }
-  else
-    {
-      if (h->ldindx < 0)
-	{
-	  (*_bfd_error_handler)
-	    (_("%s: `%s' in loader reloc but not loader sym"),
-	     bfd_get_filename (output_bfd),
-	     h->root.root.string);
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	}
-      ldrel.l_symndx = h->ldindx;
-    }
-
-  ldrel.l_rtype = (irel->r_size << 8) | irel->r_type;
-  ldrel.l_rsecnm = output_section->target_index;
-  xcoff_swap_ldrel_out (output_bfd, &ldrel, finfo->ldrel);
-  ++finfo->ldrel;
-
-  return true;
-}
-
-/* Sort relocs by VMA.  This is called via qsort.  */
-
-static int
-xcoff_sort_relocs (p1, p2)
-     const PTR p1;
-     const PTR p2;
-{
-  const struct internal_reloc *r1 = (const struct internal_reloc *) p1;
-  const struct internal_reloc *r2 = (const struct internal_reloc *) p2;
-
-  if (r1->r_vaddr > r2->r_vaddr)
-    return 1;
-  else if (r1->r_vaddr < r2->r_vaddr)
-    return -1;
-  else
-    return 0;
-}
-
-/* This is the relocation function for the RS/6000/POWER/PowerPC.
-   This is currently the only processor which uses XCOFF; I hope that
-   will never change.  */
-
-boolean
-_bfd_ppc_xcoff_relocate_section (output_bfd, info, input_bfd,
-				 input_section, contents, relocs, syms,
-				 sections)
-     bfd *output_bfd;
-     struct bfd_link_info *info;
-     bfd *input_bfd;
-     asection *input_section;
-     bfd_byte *contents;
-     struct internal_reloc *relocs;
-     struct internal_syment *syms;
-     asection **sections;
-{
-  struct internal_reloc *rel;
-  struct internal_reloc *relend;
-
-  rel = relocs;
-  relend = rel + input_section->reloc_count;
-  for (; rel < relend; rel++)
-    {
-      long symndx;
-      struct xcoff_link_hash_entry *h;
-      struct internal_syment *sym;
-      bfd_vma addend;
-      bfd_vma val;
-      struct reloc_howto_struct howto;
-      bfd_reloc_status_type rstat;
-
-      /* Relocation type R_REF is a special relocation type which is
-         merely used to prevent garbage collection from occurring for
-         the csect including the symbol which it references.  */
-      if (rel->r_type == R_REF)
-	continue;
-
-      symndx = rel->r_symndx;
-
-      if (symndx == -1)
-	{
-	  h = NULL;
-	  sym = NULL;
-	  addend = 0;
-	}
-      else
-	{    
-	  h = obj_xcoff_sym_hashes (input_bfd)[symndx];
-	  sym = syms + symndx;
-	  addend = - sym->n_value;
-	}
-
-      /* We build the howto information on the fly.  */
-
-      howto.type = rel->r_type;
-      howto.rightshift = 0;
-      howto.size = 2;
-      howto.bitsize = (rel->r_size & 0x1f) + 1;
-      howto.pc_relative = false;
-      howto.bitpos = 0;
-      if ((rel->r_size & 0x80) != 0)
-	howto.complain_on_overflow = complain_overflow_signed;
-      else
-	howto.complain_on_overflow = complain_overflow_bitfield;
-      howto.special_function = NULL;
-      howto.name = "internal";
-      howto.partial_inplace = true;
-      if (howto.bitsize == 32)
-	howto.src_mask = howto.dst_mask = 0xffffffff;
-      else
-	{
-	  howto.src_mask = howto.dst_mask = (1 << howto.bitsize) - 1;
-	  if (howto.bitsize == 16)
-	    howto.size = 1;
-	}
-      howto.pcrel_offset = false;
-
-      val = 0;
-
-      if (h == NULL)
-	{
-	  asection *sec;
-
-	  if (symndx == -1)
-	    {
-	      sec = bfd_abs_section_ptr;
-	      val = 0;
-	    }
-	  else
-	    {
-	      sec = sections[symndx];
-	      /* Hack to make sure we use the right TOC anchor value
-                 if this reloc is against the TOC anchor.  */
-	      if (sec->name[3] == '0'
-		  && strcmp (sec->name, ".tc0") == 0)
-		val = xcoff_data (output_bfd)->toc;
-	      else
-		val = (sec->output_section->vma
-		       + sec->output_offset
-		       + sym->n_value
-		       - sec->vma);
-	    }
-	}
-      else
-	{
-	  if (h->root.type == bfd_link_hash_defined
-	      || h->root.type == bfd_link_hash_defweak)
-	    {
-	      asection *sec;
-
-	      sec = h->root.u.def.section;
-	      val = (h->root.u.def.value
-		     + sec->output_section->vma
-		     + sec->output_offset);
-	    }
-	  else if (h->root.type == bfd_link_hash_common)
-	    {
-	      asection *sec;
-
-	      sec = h->root.u.c.p->section;
-	      val = (sec->output_section->vma
-		     + sec->output_offset);
-	    }
-	  else if ((h->flags & XCOFF_DEF_DYNAMIC) != 0
-		   || (h->flags & XCOFF_IMPORT) != 0)
-	    {
-	      /* Every symbol in a shared object is defined somewhere.  */
-	      val = 0;
-	    }
-	  else if (! info->relocateable)
-	    {
-	      if (! ((*info->callbacks->undefined_symbol)
-		     (info, h->root.root.string, input_bfd, input_section,
-		      rel->r_vaddr - input_section->vma)))
-		return false;
-
-	      /* Don't try to process the reloc.  It can't help, and
-                 it may generate another error.  */
-	      continue;
-	    }
-	}
-
-      /* I took the relocation type definitions from two documents:
-	 the PowerPC AIX Version 4 Application Binary Interface, First
-	 Edition (April 1992), and the PowerOpen ABI, Big-Endian
-	 32-Bit Hardware Implementation (June 30, 1994).  Differences
-	 between the documents are noted below.  */
-
-      switch (rel->r_type)
-	{
-	case R_RTB:
-	case R_RRTBI:
-	case R_RRTBA:
-	  /* These relocs are defined by the PowerPC ABI to be
-             relative branches which use half of the difference
-             between the symbol and the program counter.  I can't
-             quite figure out when this is useful.  These relocs are
-             not defined by the PowerOpen ABI.  */
-	default:
-	  (*_bfd_error_handler)
-	    (_("%s: unsupported relocation type 0x%02x"),
-	     bfd_get_filename (input_bfd), (unsigned int) rel->r_type);
-	  bfd_set_error (bfd_error_bad_value);
-	  return false;
-	case R_POS:
-	  /* Simple positive relocation.  */
-	  break;
-	case R_NEG:
-	  /* Simple negative relocation.  */
-	  val = - val;
-	  break;
-	case R_REL:
-	  /* Simple PC relative relocation.  */
-	  howto.pc_relative = true;
-	  break;
-	case R_TOC:
-	  /* TOC relative relocation.  The value in the instruction in
-             the input file is the offset from the input file TOC to
-             the desired location.  We want the offset from the final
-             TOC to the desired location.  We have:
-	         isym = iTOC + in
-		 iinsn = in + o
-		 osym = oTOC + on
-		 oinsn = on + o
-	     so we must change insn by on - in.
-	     */
-	case R_GL:
-	  /* Global linkage relocation.  The value of this relocation
-             is the address of the entry in the TOC section.  */
-	case R_TCL:
-	  /* Local object TOC address.  I can't figure out the
-             difference between this and case R_GL.  */
-	case R_TRL:
-	  /* TOC relative relocation.  A TOC relative load instruction
-             which may be changed to a load address instruction.
-             FIXME: We don't currently implement this optimization.  */
-	case R_TRLA:
-	  /* TOC relative relocation.  This is a TOC relative load
-             address instruction which may be changed to a load
-             instruction.  FIXME: I don't know if this is the correct
-             implementation.  */
-	  if (h != NULL && h->smclas != XMC_TD)
-	    {
-	      if (h->toc_section == NULL)
-		{
-		  (*_bfd_error_handler)
-		    (_("%s: TOC reloc at 0x%x to symbol `%s' with no TOC entry"),
-		     bfd_get_filename (input_bfd), rel->r_vaddr,
-		     h->root.root.string);
-		  bfd_set_error (bfd_error_bad_value);
-		  return false;
-		}
-
-	      BFD_ASSERT ((h->flags & XCOFF_SET_TOC) == 0);
-	      val = (h->toc_section->output_section->vma
-		     + h->toc_section->output_offset);
-	    }
-
-	  val = ((val - xcoff_data (output_bfd)->toc)
-		 - (sym->n_value - xcoff_data (input_bfd)->toc));
-	  addend = 0;
-	  break;
-	case R_BA:
-	  /* Absolute branch.  We don't want to mess with the lower
-             two bits of the instruction.  */
-	case R_CAI:
-	  /* The PowerPC ABI defines this as an absolute call which
-             may be modified to become a relative call.  The PowerOpen
-             ABI does not define this relocation type.  */
-	case R_RBA:
-	  /* Absolute branch which may be modified to become a
-             relative branch.  */
-	case R_RBAC:
-	  /* The PowerPC ABI defines this as an absolute branch to a
-             fixed address which may be modified to an absolute branch
-             to a symbol.  The PowerOpen ABI does not define this
-             relocation type.  */
-	case R_RBRC:
-	  /* The PowerPC ABI defines this as an absolute branch to a
-             fixed address which may be modified to a relative branch.
-             The PowerOpen ABI does not define this relocation type.  */
-	  howto.src_mask &= ~3;
-	  howto.dst_mask = howto.src_mask;
-	  break;
-	case R_BR:
-	  /* Relative branch.  We don't want to mess with the lower
-             two bits of the instruction.  */
-	case R_CREL:
-	  /* The PowerPC ABI defines this as a relative call which may
-             be modified to become an absolute call.  The PowerOpen
-             ABI does not define this relocation type.  */
-	case R_RBR:
-	  /* A relative branch which may be modified to become an
-             absolute branch.  FIXME: We don't implement this,
-             although we should for symbols of storage mapping class
-             XMC_XO.  */
-	  howto.pc_relative = true;
-	  howto.src_mask &= ~3;
-	  howto.dst_mask = howto.src_mask;
-	  break;
-	case R_RL:
-	  /* The PowerPC AIX ABI describes this as a load which may be
-             changed to a load address.  The PowerOpen ABI says this
-             is the same as case R_POS.  */
-	  break;
-	case R_RLA:
-	  /* The PowerPC AIX ABI describes this as a load address
-             which may be changed to a load.  The PowerOpen ABI says
-             this is the same as R_POS.  */
-	  break;
-	}
-
-      /* If we see an R_BR or R_RBR reloc which is jumping to global
-         linkage code, and it is followed by an appropriate cror nop
-         instruction, we replace the cror with lwz r2,20(r1).  This
-         restores the TOC after the glink code.  Contrariwise, if the
-         call is followed by a lwz r2,20(r1), but the call is not
-         going to global linkage code, we can replace the load with a
-         cror.  */
-      if ((rel->r_type == R_BR || rel->r_type == R_RBR)
-	  && h != NULL
-	  && h->root.type == bfd_link_hash_defined
-	  && (rel->r_vaddr - input_section->vma + 8
-	      <= input_section->_cooked_size))
-	{
-	  bfd_byte *pnext;
-	  unsigned long next;
-
-	  pnext = contents + (rel->r_vaddr - input_section->vma) + 4;
-	  next = bfd_get_32 (input_bfd, pnext);
-
-	  /* The _ptrgl function is magic.  It is used by the AIX
-             compiler to call a function through a pointer.  */
-	  if (h->smclas == XMC_GL
-	      || strcmp (h->root.root.string, "._ptrgl") == 0)
-	    {
-	      if (next == 0x4def7b82		/* cror 15,15,15 */
-		  || next == 0x4ffffb82)	/* cror 31,31,31 */
-		bfd_put_32 (input_bfd, 0x80410014, pnext); /* lwz r1,20(r1) */
-	    }
-	  else
-	    {
-	      if (next == 0x80410014)		/* lwz r1,20(r1) */
-		bfd_put_32 (input_bfd, 0x4ffffb82, pnext); /* cror 31,31,31 */
-	    }
-	}
-
-      /* A PC relative reloc includes the section address.  */
-      if (howto.pc_relative)
-	addend += input_section->vma;
-
-      rstat = _bfd_final_link_relocate (&howto, input_bfd, input_section,
-					contents,
-					rel->r_vaddr - input_section->vma,
-					val, addend);
-
-      switch (rstat)
-	{
-	default:
-	  abort ();
-	case bfd_reloc_ok:
-	  break;
-	case bfd_reloc_overflow:
-	  {
-	    const char *name;
-	    char buf[SYMNMLEN + 1];
-	    char howto_name[10];
-
-	    if (symndx == -1)
-	      name = "*ABS*";
-	    else if (h != NULL)
-	      name = h->root.root.string;
-	    else
-	      {
-		name = _bfd_coff_internal_syment_name (input_bfd, sym, buf);
-		if (name == NULL)
-		  return false;
-	      }
-	    sprintf (howto_name, "0x%02x", rel->r_type);
-
-	    if (! ((*info->callbacks->reloc_overflow)
-		   (info, name, howto_name, (bfd_vma) 0, input_bfd,
-		    input_section, rel->r_vaddr - input_section->vma)))
-	      return false;
-	  }
-	}
-    }
-
-  return true;
-}