[binutils-gdb] BFD whitespace fixes

Alan Modra amodra@sourceware.org
Wed Dec 6 07:33:00 GMT 2017


https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=07d6d2b8345ef3dc82eab49635acac9ee67dbb18

commit 07d6d2b8345ef3dc82eab49635acac9ee67dbb18
Author: Alan Modra <amodra@gmail.com>
Date:   Wed Dec 6 09:26:00 2017 +1030

    BFD whitespace fixes
    
    Binutils is supposed to use tabs.  In my git config I have
    whitespace = indent-with-non-tab,space-before-tab,trailing-space
    and I got annoyed enough seeing red in "git diff" output to fix
    the problems.
    
    	* doc/header.sed: Trim trailing space when splitting lines.
    	* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
    	* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
    	* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
    	* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
    	* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
    	* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
    	* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
    	* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
    	* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
    	* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
    	* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
    	* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
    	* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
    	* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
    	* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
    	* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
    	* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
    	* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
    	* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
    	* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
    	* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
    	* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
    	* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
    	* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
    	* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
    	* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
    	* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
    	* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
    	* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
    	* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
    	* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
    	* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
    	* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
    	* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
    	* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
    	* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
    	* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
    	* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
    	* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
    	* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
    	* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
    	* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
    	* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
    	* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
    	* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
    	* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
    	* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
    	* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
    	* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
    	* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
    	* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
    	* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
    	* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
    	* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
    	* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
    	* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
    	* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
    	* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
    	* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
    	* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
    	* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
    	* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
    	* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
    	* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
    	* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
    	* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
    	* xsym.c, * xsym.h: Whitespace fixes.
    	* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.

Diff:
---
 bfd/ChangeLog          |   72 +
 bfd/aix386-core.c      |    2 +-
 bfd/aout-adobe.c       |   38 +-
 bfd/aout-arm.c         |   34 +-
 bfd/aout-cris.c        |    4 +-
 bfd/aout-ns32k.c       |   14 +-
 bfd/aout-target.h      |    4 +-
 bfd/aout-tic30.c       |   26 +-
 bfd/aoutf1.h           |    2 +-
 bfd/aoutx.h            |  224 +-
 bfd/arc-got.h          |   26 +-
 bfd/arc-plt.def        |    8 +-
 bfd/arc-plt.h          |   12 +-
 bfd/archive.c          |   22 +-
 bfd/archive64.c        |    2 +-
 bfd/archures.c         |  538 ++---
 bfd/armnetbsd.c        |    6 +-
 bfd/bfd-in.h           |   22 +-
 bfd/bfd-in2.h          |  818 +++----
 bfd/bfd.c              |  112 +-
 bfd/bfdio.c            |  124 +-
 bfd/binary.c           |   54 +-
 bfd/bout.c             |   40 +-
 bfd/cache.c            |   42 +-
 bfd/cisco-core.c       |   32 +-
 bfd/coff-alpha.c       |    8 +-
 bfd/coff-apollo.c      |   14 +-
 bfd/coff-arm.c         |  362 +--
 bfd/coff-h8300.c       |    2 +-
 bfd/coff-i386.c        |   12 +-
 bfd/coff-i860.c        |   94 +-
 bfd/coff-i960.c        |   16 +-
 bfd/coff-m68k.c        |   20 +-
 bfd/coff-m88k.c        |    2 +-
 bfd/coff-mcore.c       |  136 +-
 bfd/coff-mips.c        |    6 +-
 bfd/coff-ppc.c         |  636 ++---
 bfd/coff-rs6000.c      |  240 +-
 bfd/coff-sh.c          |  134 +-
 bfd/coff-stgo32.c      |    4 +-
 bfd/coff-tic4x.c       |   22 +-
 bfd/coff-tic54x.c      |   30 +-
 bfd/coff-tic80.c       |   12 +-
 bfd/coff-we32k.c       |   14 +-
 bfd/coff-x86_64.c      |   42 +-
 bfd/coff-z80.c         |   20 +-
 bfd/coff-z8k.c         |   50 +-
 bfd/coff64-rs6000.c    |   74 +-
 bfd/coffcode.h         |   83 +-
 bfd/coffgen.c          |  138 +-
 bfd/cofflink.c         |  204 +-
 bfd/coffswap.h         |    2 +-
 bfd/compress.c         |    4 +-
 bfd/corefile.c         |   26 +-
 bfd/cpu-alpha.c        |    2 +-
 bfd/cpu-arm.c          |   24 +-
 bfd/cpu-avr.c          |    2 +-
 bfd/cpu-bfin.c         |   16 +-
 bfd/cpu-cr16.c         |   14 +-
 bfd/cpu-cr16c.c        |    2 +-
 bfd/cpu-crx.c          |    8 +-
 bfd/cpu-d10v.c         |    2 +-
 bfd/cpu-frv.c          |    6 +-
 bfd/cpu-ft32.c         |   48 +-
 bfd/cpu-i370.c         |   28 +-
 bfd/cpu-i960.c         |   12 +-
 bfd/cpu-ia64-opc.c     |    6 +-
 bfd/cpu-ip2k.c         |    2 +-
 bfd/cpu-lm32.c         |   23 +-
 bfd/cpu-m32r.c         |    2 +-
 bfd/cpu-mcore.c        |   22 +-
 bfd/cpu-microblaze.c   |   22 +-
 bfd/cpu-mips.c         |   64 +-
 bfd/cpu-moxie.c        |   14 +-
 bfd/cpu-mt.c           |   10 +-
 bfd/cpu-nios2.c        |    2 +-
 bfd/cpu-ns32k.c        |   16 +-
 bfd/cpu-or1k.c         |   12 +-
 bfd/cpu-powerpc.c      |   54 +-
 bfd/cpu-pru.c          |    2 +-
 bfd/cpu-sh.c           |   82 +-
 bfd/cpu-spu.c          |    2 +-
 bfd/cpu-v850.c         |   12 +-
 bfd/cpu-v850_rh850.c   |   16 +-
 bfd/cpu-xgate.c        |    2 +-
 bfd/cpu-z80.c          |    6 +-
 bfd/doc/header.sed     |    2 +-
 bfd/dwarf1.c           |   16 +-
 bfd/dwarf2.c           |  146 +-
 bfd/ecoff.c            |  150 +-
 bfd/ecofflink.c        |  190 +-
 bfd/ecoffswap.h        |  190 +-
 bfd/elf-bfd.h          |   12 +-
 bfd/elf-eh-frame.c     |   16 +-
 bfd/elf-hppa.h         |   12 +-
 bfd/elf-m10200.c       |    6 +-
 bfd/elf-m10300.c       |   68 +-
 bfd/elf-s390-common.c  |    8 +-
 bfd/elf-strtab.c       |    4 +-
 bfd/elf-vxworks.c      |   18 +-
 bfd/elf.c              |  294 +--
 bfd/elf32-am33lin.c    |    6 +-
 bfd/elf32-arc.c        |   52 +-
 bfd/elf32-arm.c        |  938 ++++----
 bfd/elf32-avr.c        | 2288 +++++++++---------
 bfd/elf32-avr.h        |   12 +-
 bfd/elf32-bfin.c       |  362 +--
 bfd/elf32-cr16.c       | 3338 +++++++++++++-------------
 bfd/elf32-cr16c.c      |   12 +-
 bfd/elf32-cris.c       |   64 +-
 bfd/elf32-crx.c        |   10 +-
 bfd/elf32-d10v.c       |  130 +-
 bfd/elf32-d30v.c       |    8 +-
 bfd/elf32-dlx.c        |  264 +--
 bfd/elf32-epiphany.c   |   72 +-
 bfd/elf32-fr30.c       |  102 +-
 bfd/elf32-frv.c        |   78 +-
 bfd/elf32-ft32.c       |  110 +-
 bfd/elf32-h8300.c      |   26 +-
 bfd/elf32-hppa.c       |   36 +-
 bfd/elf32-i386.c       |  272 +--
 bfd/elf32-i860.c       |  196 +-
 bfd/elf32-i960.c       |    6 +-
 bfd/elf32-ip2k.c       |  262 +--
 bfd/elf32-lm32.c       | 2204 ++++++++---------
 bfd/elf32-m32c.c       |  154 +-
 bfd/elf32-m32r.c       | 1950 +++++++--------
 bfd/elf32-m68hc11.c    |  704 +++---
 bfd/elf32-m68hc12.c    |   72 +-
 bfd/elf32-m68hc1x.c    |  766 +++---
 bfd/elf32-m68hc1x.h    |   14 +-
 bfd/elf32-m68k.c       |  114 +-
 bfd/elf32-m88k.c       |    2 +-
 bfd/elf32-mcore.c      |  132 +-
 bfd/elf32-mep.c        |   80 +-
 bfd/elf32-metag.c      |   58 +-
 bfd/elf32-microblaze.c | 1474 ++++++------
 bfd/elf32-mips.c       |   48 +-
 bfd/elf32-moxie.c      |   14 +-
 bfd/elf32-msp430.c     |  158 +-
 bfd/elf32-mt.c         |  278 +--
 bfd/elf32-nds32.c      |  154 +-
 bfd/elf32-nds32.h      |    8 +-
 bfd/elf32-nios2.c      |    2 +-
 bfd/elf32-or1k.c       | 3098 ++++++++++++------------
 bfd/elf32-pj.c         |   74 +-
 bfd/elf32-ppc.c        |   70 +-
 bfd/elf32-ppc.h        |    2 +-
 bfd/elf32-pru.c        |   20 +-
 bfd/elf32-rl78.c       |  264 +--
 bfd/elf32-rx.c         |  254 +-
 bfd/elf32-s390.c       |  282 +--
 bfd/elf32-score.c      | 3012 ++++++++++++------------
 bfd/elf32-score.h      |   74 +-
 bfd/elf32-score7.c     | 2670 ++++++++++-----------
 bfd/elf32-sh-symbian.c |   40 +-
 bfd/elf32-sh.c         |    2 +-
 bfd/elf32-sh64.c       |    4 +-
 bfd/elf32-sparc.c      |    6 +-
 bfd/elf32-spu.c        |   50 +-
 bfd/elf32-tic6x.c      |   58 +-
 bfd/elf32-tilegx.c     |   18 +-
 bfd/elf32-tilegx.h     |   14 +-
 bfd/elf32-tilepro.c    |  770 +++---
 bfd/elf32-tilepro.h    |   12 +-
 bfd/elf32-v850.c       |  444 ++--
 bfd/elf32-vax.c        |   50 +-
 bfd/elf32-wasm32.c     |   74 +-
 bfd/elf32-xc16x.c      |  134 +-
 bfd/elf32-xgate.c      |   34 +-
 bfd/elf32-xgate.h      |    2 +-
 bfd/elf32-xstormy16.c  |  150 +-
 bfd/elf32-xtensa.c     |   90 +-
 bfd/elf64-alpha.c      |  176 +-
 bfd/elf64-hppa.c       |   60 +-
 bfd/elf64-ia64-vms.c   |  710 +++---
 bfd/elf64-mips.c       |   30 +-
 bfd/elf64-mmix.c       |   40 +-
 bfd/elf64-ppc.c        |   46 +-
 bfd/elf64-s390.c       |  154 +-
 bfd/elf64-sh64.c       |  192 +-
 bfd/elf64-sparc.c      |   42 +-
 bfd/elf64-tilegx.c     |   18 +-
 bfd/elf64-tilegx.h     |   14 +-
 bfd/elf64-x86-64.c     |  360 +--
 bfd/elfcore.h          |    4 +-
 bfd/elflink.c          |   16 +-
 bfd/elfn32-mips.c      |   56 +-
 bfd/elfnn-aarch64.c    |  182 +-
 bfd/elfnn-ia64.c       |   92 +-
 bfd/elfnn-riscv.c      |   40 +-
 bfd/elfxx-aarch64.c    |   70 +-
 bfd/elfxx-aarch64.h    |    6 +-
 bfd/elfxx-ia64.c       |   46 +-
 bfd/elfxx-ia64.h       |    2 +-
 bfd/elfxx-mips.c       |  334 +--
 bfd/elfxx-riscv.c      |   20 +-
 bfd/elfxx-sparc.c      |  372 +--
 bfd/elfxx-tilegx.c     |  606 ++---
 bfd/elfxx-x86.c        |    6 +-
 bfd/elfxx-x86.h        |    8 +-
 bfd/freebsd.h          |    2 +-
 bfd/hash.c             |   18 +-
 bfd/host-aout.c        |    2 +-
 bfd/hp300hpux.c        |   42 +-
 bfd/hppabsd-core.c     |    2 +-
 bfd/hpux-core.c        |  138 +-
 bfd/i386aout.c         |   14 +-
 bfd/i386linux.c        |    2 +-
 bfd/i386lynx.c         |   20 +-
 bfd/i386mach3.c        |    2 +-
 bfd/i386msdos.c        |   10 +-
 bfd/i386netbsd.c       |    2 +-
 bfd/ieee.c             |   24 +-
 bfd/ihex.c             |   92 +-
 bfd/irix-core.c        |   12 +-
 bfd/libaout.h          |   70 +-
 bfd/libbfd-in.h        |    8 +-
 bfd/libbfd.c           |   16 +-
 bfd/libbfd.h           |   14 +-
 bfd/libcoff-in.h       |   12 +-
 bfd/libcoff.h          |   33 +-
 bfd/libnlm.h           |   56 +-
 bfd/libpei.h           |   30 +-
 bfd/libxcoff.h         |    2 +-
 bfd/linker.c           |   88 +-
 bfd/lynx-core.c        |   10 +-
 bfd/m68k4knetbsd.c     |    2 +-
 bfd/m68klinux.c        |    2 +-
 bfd/m68knetbsd.c       |    2 +-
 bfd/m88kmach3.c        |    2 +-
 bfd/mach-o-aarch64.c   |   32 +-
 bfd/mach-o-arm.c       |  134 +-
 bfd/mach-o-i386.c      |  194 +-
 bfd/mach-o-target.c    |   72 +-
 bfd/mach-o-x86-64.c    |  122 +-
 bfd/mach-o.c           |  884 +++----
 bfd/mach-o.h           |   26 +-
 bfd/merge.c            |    4 +-
 bfd/mipsbsd.c          |    4 +-
 bfd/mmo.c              |    6 +-
 bfd/netbsd-core.c      |    4 +-
 bfd/netbsd.h           |    4 +-
 bfd/newsos3.c          |    2 +-
 bfd/nlm-target.h       |   72 +-
 bfd/nlm32-ppc.c        |  528 ++---
 bfd/nlm32-sparc.c      |    6 +-
 bfd/nlmcode.h          |    2 +-
 bfd/ns32k.h            |   12 +-
 bfd/ns32knetbsd.c      |    2 +-
 bfd/oasys.c            |   72 +-
 bfd/opncls.c           |   60 +-
 bfd/pc532-mach.c       |    2 +-
 bfd/pdp11.c            |  112 +-
 bfd/pe-arm.c           |    6 +-
 bfd/pe-i386.c          |    8 +-
 bfd/pe-mcore.c         |    6 +-
 bfd/pe-mips.c          |   80 +-
 bfd/pe-x86_64.c        |   10 +-
 bfd/peXXigen.c         |  328 +--
 bfd/pef.c              |   68 +-
 bfd/pef.h              |    6 +-
 bfd/pei-arm.c          |    2 +-
 bfd/pei-i386.c         |    8 +-
 bfd/pei-mcore.c        |    2 +-
 bfd/pei-x86_64.c       |   18 +-
 bfd/peicode.h          |  158 +-
 bfd/plugin.c           |   72 +-
 bfd/ppcboot.c          |    4 +-
 bfd/ptrace-core.c      |    2 +-
 bfd/reloc.c            |  272 +--
 bfd/riscix.c           |   82 +-
 bfd/rs6000-core.c      |   20 +-
 bfd/section.c          |   86 +-
 bfd/som.c              |  302 +--
 bfd/som.h              |    8 +-
 bfd/sparclinux.c       |    2 +-
 bfd/sparcnetbsd.c      |    2 +-
 bfd/srec.c             |   66 +-
 bfd/stabs.c            |    6 +-
 bfd/sunos.c            |   44 +-
 bfd/syms.c             |  168 +-
 bfd/targets.c          |  256 +-
 bfd/tekhex.c           |   76 +-
 bfd/trad-core.c        |    2 +-
 bfd/vax1knetbsd.c      |    2 +-
 bfd/vaxnetbsd.c        |    2 +-
 bfd/verilog.c          |   50 +-
 bfd/versados.c         |   66 +-
 bfd/vms-alpha.c        | 6152 ++++++++++++++++++++++++------------------------
 bfd/vms-lib.c          | 1600 ++++++-------
 bfd/vms-misc.c         |   12 +-
 bfd/wasm-module.c      |  250 +-
 bfd/wasm-module.h      |   10 +-
 bfd/xcofflink.c        |   36 +-
 bfd/xsym.c             |   62 +-
 bfd/xsym.h             |   72 +-
 297 files changed, 26255 insertions(+), 26170 deletions(-)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 91027d2..3e4df01 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,77 @@
 2017-12-06  Alan Modra  <amodra@gmail.com>
 
+	* doc/header.sed: Trim trailing space when splitting lines.
+	* aix386-core.c, * aout-adobe.c, * aout-arm.c, * aout-cris.c,
+	* aout-ns32k.c, * aout-target.h, * aout-tic30.c, * aoutf1.h, * aoutx.h,
+	* arc-got.h, * arc-plt.def, * arc-plt.h, * archive.c, * archive64.c,
+	* archures.c, * armnetbsd.c, * bfd-in.h, * bfd.c, * bfdio.c, * binary.c,
+	* bout.c, * cache.c, * cisco-core.c, * coff-alpha.c, * coff-apollo.c,
+	* coff-arm.c, * coff-h8300.c, * coff-i386.c, * coff-i860.c,
+	* coff-i960.c, * coff-m68k.c, * coff-m88k.c, * coff-mcore.c,
+	* coff-mips.c, * coff-ppc.c, * coff-rs6000.c, * coff-sh.c,
+	* coff-stgo32.c, * coff-tic4x.c, * coff-tic54x.c, * coff-tic80.c,
+	* coff-we32k.c, * coff-x86_64.c, * coff-z80.c, * coff-z8k.c,
+	* coff64-rs6000.c, * coffcode.h, * coffgen.c, * cofflink.c,
+	* coffswap.h, * compress.c, * corefile.c, * cpu-alpha.c, * cpu-arm.c,
+	* cpu-avr.c, * cpu-bfin.c, * cpu-cr16.c, * cpu-cr16c.c, * cpu-crx.c,
+	* cpu-d10v.c, * cpu-frv.c, * cpu-ft32.c, * cpu-i370.c, * cpu-i960.c,
+	* cpu-ia64-opc.c, * cpu-ip2k.c, * cpu-lm32.c, * cpu-m32r.c,
+	* cpu-mcore.c, * cpu-microblaze.c, * cpu-mips.c, * cpu-moxie.c,
+	* cpu-mt.c, * cpu-nios2.c, * cpu-ns32k.c, * cpu-or1k.c, * cpu-powerpc.c,
+	* cpu-pru.c, * cpu-sh.c, * cpu-spu.c, * cpu-v850.c, * cpu-v850_rh850.c,
+	* cpu-xgate.c, * cpu-z80.c, * dwarf1.c, * dwarf2.c, * ecoff.c,
+	* ecofflink.c, * ecoffswap.h, * elf-bfd.h, * elf-eh-frame.c,
+	* elf-hppa.h, * elf-m10200.c, * elf-m10300.c, * elf-s390-common.c,
+	* elf-strtab.c, * elf-vxworks.c, * elf.c, * elf32-am33lin.c,
+	* elf32-arc.c, * elf32-arm.c, * elf32-avr.c, * elf32-avr.h,
+	* elf32-bfin.c, * elf32-cr16.c, * elf32-cr16c.c, * elf32-cris.c,
+	* elf32-crx.c, * elf32-d10v.c, * elf32-d30v.c, * elf32-dlx.c,
+	* elf32-epiphany.c, * elf32-fr30.c, * elf32-frv.c, * elf32-ft32.c,
+	* elf32-h8300.c, * elf32-hppa.c, * elf32-i386.c, * elf32-i860.c,
+	* elf32-i960.c, * elf32-ip2k.c, * elf32-lm32.c, * elf32-m32c.c,
+	* elf32-m32r.c, * elf32-m68hc11.c, * elf32-m68hc12.c, * elf32-m68hc1x.c,
+	* elf32-m68hc1x.h, * elf32-m68k.c, * elf32-m88k.c, * elf32-mcore.c,
+	* elf32-mep.c, * elf32-metag.c, * elf32-microblaze.c, * elf32-mips.c,
+	* elf32-moxie.c, * elf32-msp430.c, * elf32-mt.c, * elf32-nds32.c,
+	* elf32-nds32.h, * elf32-nios2.c, * elf32-or1k.c, * elf32-pj.c,
+	* elf32-ppc.c, * elf32-ppc.h, * elf32-pru.c, * elf32-rl78.c,
+	* elf32-rx.c, * elf32-s390.c, * elf32-score.c, * elf32-score.h,
+	* elf32-score7.c, * elf32-sh-symbian.c, * elf32-sh.c, * elf32-sh64.c,
+	* elf32-sparc.c, * elf32-spu.c, * elf32-tic6x.c, * elf32-tilegx.c,
+	* elf32-tilegx.h, * elf32-tilepro.c, * elf32-tilepro.h, * elf32-v850.c,
+	* elf32-vax.c, * elf32-wasm32.c, * elf32-xc16x.c, * elf32-xgate.c,
+	* elf32-xgate.h, * elf32-xstormy16.c, * elf32-xtensa.c, * elf64-alpha.c,
+	* elf64-hppa.c, * elf64-ia64-vms.c, * elf64-mips.c, * elf64-mmix.c,
+	* elf64-ppc.c, * elf64-s390.c, * elf64-sh64.c, * elf64-sparc.c,
+	* elf64-tilegx.c, * elf64-tilegx.h, * elf64-x86-64.c, * elfcore.h,
+	* elflink.c, * elfn32-mips.c, * elfnn-aarch64.c, * elfnn-ia64.c,
+	* elfnn-riscv.c, * elfxx-aarch64.c, * elfxx-aarch64.h, * elfxx-ia64.c,
+	* elfxx-ia64.h, * elfxx-mips.c, * elfxx-riscv.c, * elfxx-sparc.c,
+	* elfxx-tilegx.c, * elfxx-x86.c, * elfxx-x86.h, * freebsd.h, * hash.c,
+	* host-aout.c, * hp300hpux.c, * hppabsd-core.c, * hpux-core.c,
+	* i386aout.c, * i386linux.c, * i386lynx.c, * i386mach3.c, * i386msdos.c,
+	* i386netbsd.c, * ieee.c, * ihex.c, * irix-core.c, * libaout.h,
+	* libbfd-in.h, * libbfd.c, * libcoff-in.h, * libnlm.h, * libpei.h,
+	* libxcoff.h, * linker.c, * lynx-core.c, * m68k4knetbsd.c,
+	* m68klinux.c, * m68knetbsd.c, * m88kmach3.c, * mach-o-aarch64.c,
+	* mach-o-arm.c, * mach-o-i386.c, * mach-o-target.c, * mach-o-x86-64.c,
+	* mach-o.c, * mach-o.h, * merge.c, * mipsbsd.c, * mmo.c, * netbsd.h,
+	* netbsd-core.c, * newsos3.c, * nlm-target.h, * nlm32-ppc.c,
+	* nlm32-sparc.c, * nlmcode.h, * ns32k.h, * ns32knetbsd.c, * oasys.c,
+	* opncls.c, * pc532-mach.c, * pdp11.c, * pe-arm.c, * pe-i386.c,
+	* pe-mcore.c, * pe-mips.c, * pe-x86_64.c, * peXXigen.c, * pef.c,
+	* pef.h, * pei-arm.c, * pei-i386.c, * pei-mcore.c, * pei-x86_64.c,
+	* peicode.h, * plugin.c, * ppcboot.c, * ptrace-core.c, * reloc.c,
+	* riscix.c, * rs6000-core.c, * section.c, * som.c, * som.h,
+	* sparclinux.c, * sparcnetbsd.c, * srec.c, * stabs.c, * sunos.c,
+	* syms.c, * targets.c, * tekhex.c, * trad-core.c, * vax1knetbsd.c,
+	* vaxnetbsd.c, * verilog.c, * versados.c, * vms-alpha.c, * vms-lib.c,
+	* vms-misc.c, * wasm-module.c, * wasm-module.h, * xcofflink.c,
+	* xsym.c, * xsym.h: Whitespace fixes.
+	* bfd-in2.h, * libbfd.h, * libcoff.h: Regenerate.
+
+2017-12-06  Alan Modra  <amodra@gmail.com>
+
 	* elf32-lm32.c (lm32_elf_check_relocs): Skip non-ALLOC sections.
 	* elf32-m32r.c (m32r_elf_check_relocs): Likewise.
 	* elf32-nds32.c (nds32_elf_check_relocs): Likewise.
diff --git a/bfd/aix386-core.c b/bfd/aix386-core.c
index 4e16d90..6930667 100644
--- a/bfd/aix386-core.c
+++ b/bfd/aix386-core.c
@@ -1,6 +1,6 @@
 /* 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.
+	Cygnus Support.
    Copyright (C) 1988-2017 Free Software Foundation, Inc.
    Written by Minh Tran-Le <TRANLE@INTELLICORP.COM>.
    Converted to back end form by Ian Lance Taylor <ian@cygnus.com>.
diff --git a/bfd/aout-adobe.c b/bfd/aout-adobe.c
index 487ed8c..945c431 100644
--- a/bfd/aout-adobe.c
+++ b/bfd/aout-adobe.c
@@ -452,29 +452,29 @@ aout_adobe_sizeof_headers (bfd *ignore_abfd ATTRIBUTE_UNUSED,
 #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_bfd_reloc_name_lookup		    _bfd_norelocs_bfd_reloc_name_lookup
-#define aout_32_close_and_cleanup                   aout_32_bfd_free_cached_info
-#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_close_and_cleanup		    aout_32_bfd_free_cached_info
+#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_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_lookup_section_flags	    bfd_generic_lookup_section_flags
-#define aout_32_bfd_merge_sections	            bfd_generic_merge_sections
-#define aout_32_bfd_is_group_section	            bfd_generic_is_group_section
-#define aout_32_bfd_discard_group	            bfd_generic_discard_group
-#define aout_32_section_already_linked              _bfd_generic_section_already_linked
-#define aout_32_bfd_define_common_symbol            bfd_generic_define_common_symbol
-#define aout_32_bfd_define_start_stop               bfd_generic_define_start_stop
-#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_link_just_syms	            _bfd_generic_link_just_syms
+#define aout_32_bfd_merge_sections		    bfd_generic_merge_sections
+#define aout_32_bfd_is_group_section		    bfd_generic_is_group_section
+#define aout_32_bfd_discard_group		    bfd_generic_discard_group
+#define aout_32_section_already_linked		    _bfd_generic_section_already_linked
+#define aout_32_bfd_define_common_symbol	    bfd_generic_define_common_symbol
+#define aout_32_bfd_define_start_stop		    bfd_generic_define_start_stop
+#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_link_just_syms		    _bfd_generic_link_just_syms
 #define aout_32_bfd_copy_link_hash_symbol_type \
   _bfd_generic_copy_link_hash_symbol_type
-#define aout_32_bfd_final_link		            _bfd_generic_final_link
-#define aout_32_bfd_link_split_section	            _bfd_generic_link_split_section
-#define aout_32_bfd_link_check_relocs               _bfd_generic_link_check_relocs
+#define aout_32_bfd_final_link			    _bfd_generic_final_link
+#define aout_32_bfd_link_split_section		    _bfd_generic_link_split_section
+#define aout_32_bfd_link_check_relocs		    _bfd_generic_link_check_relocs
 #define aout_32_set_reloc			    _bfd_generic_set_reloc
 
 const bfd_target aout_adobe_vec =
diff --git a/bfd/aout-arm.c b/bfd/aout-arm.c
index ce9987e..eb9723d 100644
--- a/bfd/aout-arm.c
+++ b/bfd/aout-arm.c
@@ -44,8 +44,8 @@
 
 #define MY(OP) CONCAT2 (arm_aout_,OP)
 #define N_BADMAG(x) ((((x)->a_info & ~007200) != ZMAGIC) && \
-                     (((x)->a_info & ~006000) != OMAGIC) && \
-                     ((x)->a_info != NMAGIC))
+		     (((x)->a_info & ~006000) != OMAGIC) && \
+		     ((x)->a_info != NMAGIC))
 #define N_MAGIC(x) ((x)->a_info & ~07200)
 
 #define MY_bfd_reloc_type_lookup arm_aout_bfd_reloc_type_lookup
@@ -111,7 +111,7 @@ MY (reloc_howto) (bfd *abfd,
 		       | 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_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);
     }
@@ -122,7 +122,7 @@ MY (reloc_howto) (bfd *abfd,
 		      | 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_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);
     }
@@ -156,7 +156,7 @@ MY (put_reloc) (bfd *abfd,
   if (howto->type == 3 || howto->type == 7)
     r_length = 3;
 
-  r_pcrel  = howto->type & 4; 	/* PC Relative done?  */
+  r_pcrel  = howto->type & 4;	/* PC Relative done?  */
   r_neg = howto->type & 8;	/* Negative relocation.  */
 
   if (bfd_header_big_endian (abfd))
@@ -298,8 +298,8 @@ MY (bfd_reloc_type_lookup) (bfd *abfd,
     switch (bfd_arch_bits_per_address (abfd))
       {
       case 32:
-        code = BFD_RELOC_32;
-        break;
+	code = BFD_RELOC_32;
+	break;
       default:
 	return NULL;
       }
@@ -465,17 +465,17 @@ extern const bfd_target arm_aout_be_vec;
 
 const bfd_target arm_aout_le_vec =
 {
-  "a.out-arm-little",           /* Name.  */
+  "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.  */
+  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.  */
+  AR_PAD_CHAR,			/* AR_pad_char.  */
+  15,				/* AR_max_namelen.  */
   0,				/* match priority.  */
   bfd_getl64, bfd_getl_signed_64, bfd_putl64,
   bfd_getl32, bfd_getl_signed_32, bfd_putl32,
@@ -507,11 +507,11 @@ const bfd_target arm_aout_le_vec =
 
 const bfd_target arm_aout_be_vec =
 {
-  "a.out-arm-big",              /* Name.  */
+  "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.  */
+  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),
diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index 6cd14e3..ce97226 100644
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -24,7 +24,7 @@
    functions.  Beware; some of the information there is outdated.  */
 
 #define N_HEADER_IN_TEXT(x) 0
-#define N_TXTOFF(x)         32
+#define N_TXTOFF(x)	    32
 #define ENTRY_CAN_BE_ZERO
 #define TEXT_START_ADDR     0
 
@@ -253,7 +253,7 @@ MY (swap_ext_reloc_in) (bfd *abfd,
     {
       _bfd_error_handler
 	/* xgettext:c-format */
-        (_("%B: Bad relocation record imported: %d"), abfd, r_index);
+	(_("%B: Bad relocation record imported: %d"), abfd, r_index);
 
       bfd_set_error (bfd_error_wrong_format);
 
diff --git a/bfd/aout-ns32k.c b/bfd/aout-ns32k.c
index 6e39324..ec4f691 100644
--- a/bfd/aout-ns32k.c
+++ b/bfd/aout-ns32k.c
@@ -31,7 +31,7 @@
 
 reloc_howto_type * MYNS (bfd_reloc_type_lookup) (bfd *, bfd_reloc_code_real_type);
 reloc_howto_type * MYNS (bfd_reloc_name_lookup) (bfd *, const char *);
-bfd_boolean        MYNS (write_object_contents) (bfd *);
+bfd_boolean	   MYNS (write_object_contents) (bfd *);
 
 /* Avoid multiple definitions from aoutx if supporting
    standard a.out format(s) as well as this one.  */
@@ -67,10 +67,10 @@ void bfd_ns32k_arch (void);
    sym1: .long foo	 # 2's complement not pc relative
 
    self:  movd @self, r0 # pc relative displacement
-          movd foo, r0   # non pc relative displacement
+	  movd foo, r0   # non pc relative displacement
 
    self:  movd self, r0  # pc relative immediate
-          movd foo, r0   # non 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
@@ -135,10 +135,10 @@ reloc_howto_type MY (howto_table)[] =
 
 #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
+#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
 
 static reloc_howto_type *
 MY (reloc_howto) (bfd *abfd ATTRIBUTE_UNUSED,
diff --git a/bfd/aout-target.h b/bfd/aout-target.h
index 65bc44c..59d4ad0 100644
--- a/bfd/aout-target.h
+++ b/bfd/aout-target.h
@@ -669,11 +669,11 @@ const bfd_target MY (vec) =
      bfd_getl32, bfd_getl_signed_32, bfd_putl32,
      bfd_getl16, bfd_getl_signed_16, bfd_putl16, /* Headers.  */
 #endif
-    {_bfd_dummy_target, MY_object_p, 		/* bfd_check_format.  */
+    {_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_false, MY_write_object_contents,	/* bfd_write_contents.  */
        _bfd_write_archive_contents, bfd_false},
 
      BFD_JUMP_TABLE_GENERIC (MY),
diff --git a/bfd/aout-tic30.c b/bfd/aout-tic30.c
index 068428c..223fc77 100644
--- a/bfd/aout-tic30.c
+++ b/bfd/aout-tic30.c
@@ -21,10 +21,10 @@
 
 #define TARGET_IS_BIG_ENDIAN_P
 #define N_HEADER_IN_TEXT(x)	1
-#define TEXT_START_ADDR 	1024
-#define TARGET_PAGE_SIZE 	128
-#define SEGMENT_SIZE   		TARGET_PAGE_SIZE
-#define DEFAULT_ARCH 		bfd_arch_tic30
+#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
 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
@@ -43,11 +43,11 @@
 
 #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_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
+#define MY_set_sizes		  tic30_aout_set_sizes
 
 #ifndef MY_exec_hdr_flags
 #define MY_exec_hdr_flags 1
@@ -324,9 +324,9 @@ tic30_aout_reloc_howto (bfd *abfd,
  (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 >> 16) & 0xFF), ADDR	   );	\
  bfd_put_8 (BFD, (bfd_byte) ((DATA >>  8) & 0xFF), ADDR + 1);	\
- bfd_put_8 (BFD, (bfd_byte) ( DATA        & 0xFF), ADDR + 2)
+ 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.  */
@@ -840,12 +840,12 @@ tic30_aout_set_arch_mach (bfd *abfd,
 #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
+#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
+#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
@@ -855,7 +855,7 @@ tic30_aout_set_arch_mach (bfd *abfd,
 				_bfd_nocore_core_file_matches_executable_p
 #endif
 #ifndef	MY_core_file_pid
-#define	MY_core_file_pid  		_bfd_nocore_core_file_pid
+#define	MY_core_file_pid		_bfd_nocore_core_file_pid
 #endif
 #ifndef	MY_core_file_p
 #define	MY_core_file_p			_bfd_dummy_target
diff --git a/bfd/aoutf1.h b/bfd/aoutf1.h
index e693b03..58315d7 100644
--- a/bfd/aoutf1.h
+++ b/bfd/aoutf1.h
@@ -775,7 +775,7 @@ static const struct aout_backend_data sunos4_aout_backend =
   MY_finish_dynamic_link
 };
 
-#define	MY_core_file_failing_command 	sunos4_core_file_failing_command
+#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
 
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index d096ed5..6ece9d0 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -178,59 +178,59 @@ DESCRIPTION
 
 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),
+  /*	 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,  3,  0,  FALSE, 0, complain_overflow_dont,     0, "R_SPARC_NONE",FALSE, 0, 0x00000000, TRUE),
-  HOWTO (0,             0,  3,  0,  FALSE, 0, complain_overflow_dont,     0, "R_SPARC_NONE",FALSE, 0, 0x00000000, TRUE),
+  HOWTO (0,		0,  3,	0,  FALSE, 0, complain_overflow_dont,	  0, "R_SPARC_NONE",FALSE, 0, 0x00000000, TRUE),
+  HOWTO (0,		0,  3,	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),
+  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),
+  /* 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),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
-  HOWTO (16,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"JMP_TABLE", FALSE,         0,0x00000000, FALSE),
+  HOWTO (16,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"JMP_TABLE", FALSE,	       0,0x00000000, FALSE),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
@@ -246,7 +246,7 @@ EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
-  HOWTO (32,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"RELATIVE",  FALSE,         0,0x00000000, FALSE),
+  HOWTO (32,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"RELATIVE",	FALSE,	       0,0x00000000, FALSE),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
@@ -254,7 +254,7 @@ EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
 EMPTY_HOWTO (-1),
-  HOWTO (40,	       0,  2,	 0, FALSE, 0, complain_overflow_bitfield,0,"BASEREL",   FALSE,         0,0x00000000, FALSE),
+  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]))
@@ -357,9 +357,9 @@ FUNCTION
 
 SYNOPSIS
 	void aout_@var{size}_swap_exec_header_in,
-           (bfd *abfd,
-            struct external_exec *bytes,
-            struct internal_exec *execp);
+	   (bfd *abfd,
+	    struct external_exec *bytes,
+	    struct internal_exec *execp);
 
 DESCRIPTION
 	Swap the information in an executable header @var{raw_bytes} taken
@@ -442,7 +442,7 @@ FUNCTION
 SYNOPSIS
 	const bfd_target *aout_@var{size}_some_aout_object_p
 	 (bfd *abfd,
-          struct internal_exec *execp,
+	  struct internal_exec *execp,
 	  const bfd_target *(*callback_to_real_object_p) (bfd *));
 
 DESCRIPTION
@@ -637,12 +637,12 @@ NAME (aout, some_aout_object_p) (bfd *abfd,
       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.  */
+	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)
@@ -701,7 +701,7 @@ SYNOPSIS
 	enum machine_type  aout_@var{size}_machine_type
 	 (enum bfd_architecture arch,
 	  unsigned long machine,
-          bfd_boolean *unknown);
+	  bfd_boolean *unknown);
 
 DESCRIPTION
 	Keep track of machine architecture and machine type for
@@ -733,21 +733,21 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
 	  || machine == bfd_mach_sparc_v8plus
 	  || machine == bfd_mach_sparc_v8plusa
 	  || machine == bfd_mach_sparc_v8plusb
-          || machine == bfd_mach_sparc_v8plusc
-          || machine == bfd_mach_sparc_v8plusd
-          || machine == bfd_mach_sparc_v8pluse
-          || machine == bfd_mach_sparc_v8plusv
-          || machine == bfd_mach_sparc_v8plusm
-          || machine == bfd_mach_sparc_v8plusm8
+	  || machine == bfd_mach_sparc_v8plusc
+	  || machine == bfd_mach_sparc_v8plusd
+	  || machine == bfd_mach_sparc_v8pluse
+	  || machine == bfd_mach_sparc_v8plusv
+	  || machine == bfd_mach_sparc_v8plusm
+	  || machine == bfd_mach_sparc_v8plusm8
 	  || machine == bfd_mach_sparc_v9
 	  || machine == bfd_mach_sparc_v9a
 	  || machine == bfd_mach_sparc_v9b
-          || machine == bfd_mach_sparc_v9c
-          || machine == bfd_mach_sparc_v9d
-          || machine == bfd_mach_sparc_v9e
-          || machine == bfd_mach_sparc_v9v
+	  || machine == bfd_mach_sparc_v9c
+	  || machine == bfd_mach_sparc_v9d
+	  || machine == bfd_mach_sparc_v9e
+	  || machine == bfd_mach_sparc_v9v
 	  || machine == bfd_mach_sparc_v9m
-          || machine == bfd_mach_sparc_v9m8)
+	  || machine == bfd_mach_sparc_v9m8)
 	arch_flags = M_SPARC;
       else if (machine == bfd_mach_sparc_sparclet)
 	arch_flags = M_SPARCLET;
@@ -826,7 +826,7 @@ NAME (aout, machine_type) (enum bfd_architecture arch,
     case bfd_arch_ns32k:
       switch (machine)
 	{
-	case 0:    	arch_flags = M_NS32532; break;
+	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;
@@ -946,8 +946,8 @@ adjust_o_magic (bfd *abfd, struct internal_exec *execp)
   else
     {
       /* The VMA of the .bss section is set by the VMA of the
-         .data section plus the size of the .data section.  We may
-         need to add padding bytes to make this true.  */
+	 .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)
 	{
@@ -996,8 +996,8 @@ adjust_z_magic (bfd *abfd, struct internal_exec *execp)
   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.  */
+	 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));
@@ -1175,11 +1175,11 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd)
 	      str;
 	    }),
 	   obj_textsec (abfd)->vma, obj_textsec (abfd)->size,
-	   	obj_textsec (abfd)->alignment_power,
+		obj_textsec (abfd)->alignment_power,
 	   obj_datasec (abfd)->vma, obj_datasec (abfd)->size,
-	   	obj_datasec (abfd)->alignment_power,
+		obj_datasec (abfd)->alignment_power,
 	   obj_bsssec (abfd)->vma, obj_bsssec (abfd)->size,
-	   	obj_bsssec (abfd)->alignment_power);
+		obj_bsssec (abfd)->alignment_power);
 #endif
 #endif
 
@@ -1201,9 +1201,9 @@ NAME (aout, adjust_sizes_and_vmas) (bfd *abfd)
 #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)->size,
-	   	obj_textsec (abfd)->filepos,
+		obj_textsec (abfd)->filepos,
 	   obj_datasec (abfd)->vma, obj_datasec (abfd)->size,
-	   	obj_datasec (abfd)->filepos,
+		obj_datasec (abfd)->filepos,
 	   obj_bsssec (abfd)->vma, obj_bsssec (abfd)->size);
 #endif
 
@@ -1215,7 +1215,7 @@ FUNCTION
 	aout_@var{size}_new_section_hook
 
 SYNOPSIS
-        bfd_boolean aout_@var{size}_new_section_hook,
+	bfd_boolean aout_@var{size}_new_section_hook,
 	   (bfd *abfd,
 	    asection *newsect);
 
@@ -1283,8 +1283,8 @@ NAME (aout, set_section_contents) (bfd *abfd,
 	    /* xgettext:c-format */
 	   (_("%B: can not represent section `%A' in a.out object file format"),
 	     abfd, section);
-          bfd_set_error (bfd_error_nonrepresentable_section);
-          return FALSE;
+	  bfd_set_error (bfd_error_nonrepresentable_section);
+	  return FALSE;
 	}
     }
 
@@ -1502,8 +1502,8 @@ translate_from_native_sym_flags (bfd *abfd, aout_symbol_type *cache_ptr)
     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.  */
+	   the linker handle set symbols, but they are now handled in
+	   the add_symbols routine instead.  */
 	switch (cache_ptr->type & N_TYPE)
 	  {
 	  case N_SETA:
@@ -1635,8 +1635,8 @@ translate_to_native_sym_flags (bfd *abfd,
 	    /* xgettext:c-format */
 	   (_("%B: can not represent section `%A' in a.out object file format"),
 	     abfd, sec);
-          bfd_set_error (bfd_error_nonrepresentable_section);
-          return FALSE;
+	  bfd_set_error (bfd_error_nonrepresentable_section);
+	  return FALSE;
 	}
     }
 
@@ -2213,7 +2213,7 @@ NAME (aout, swap_ext_reloc_in) (bfd *abfd,
   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.  */
+	 to see the file even if it is bad.  */
       r_extern = 0;
       r_index = N_ABS;
     }
@@ -2286,7 +2286,7 @@ NAME (aout, swap_std_reloc_in) (bfd *abfd,
   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.  */
+	 to see the file even if it is bad.  */
       r_extern = 0;
       r_index = N_ABS;
     }
@@ -2949,7 +2949,7 @@ NAME (aout, link_hash_newfunc) (struct bfd_hash_entry *entry,
      subclass.  */
   if (ret == NULL)
     ret = (struct aout_link_hash_entry *) bfd_hash_allocate (table,
-                                                             sizeof (* ret));
+							     sizeof (* ret));
   if (ret == NULL)
     return NULL;
 
@@ -3347,13 +3347,13 @@ aout_link_check_ar_symbols (bfd *abfd,
 	     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
+	     If the current definition is common, we have a case in
 	     which we have already seen an object file including:
-	         int a;
+		 int a;
 	     and this object file from the archive includes:
-	         int a = 5;
+		 int a = 5;
 	     In such a case, whether to include this object is target
-             dependant for backward compatibility.
+	     dependant for backward compatibility.
 
 	     FIXME: The SunOS 4.1.3 linker will pull in the archive
 	     element if the symbol is defined in the .data section,
@@ -3610,7 +3610,7 @@ aout_link_includes_newfunc (struct bfd_hash_entry *entry,
      subclass.  */
   if (ret == NULL)
     ret = (struct aout_link_includes_entry *)
-        bfd_hash_allocate (table, sizeof (* ret));
+	bfd_hash_allocate (table, sizeof (* ret));
   if (ret == NULL)
     return NULL;
 
@@ -3682,7 +3682,7 @@ aout_link_write_other_symbol (struct bfd_hash_entry *bh, void *data)
       return TRUE;
     case bfd_link_hash_new:
       /* This can happen for set symbols when sets are not being
-         built.  */
+	 built.  */
       return TRUE;
     case bfd_link_hash_undefined:
       type = N_UNDF | N_EXT;
@@ -4144,10 +4144,10 @@ aout_link_input_section_std (struct aout_final_link_info *flaginfo,
 		      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.  */
+			     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;
@@ -4278,8 +4278,8 @@ aout_link_input_section_std (struct aout_final_link_info *flaginfo,
 	    }
 
 	  /* Now warn if a global symbol is undefined.  We could not
-             do this earlier, because check_dynamic_reloc might want
-             to skip this reloc.  */
+	     do this earlier, because check_dynamic_reloc might want
+	     to skip this reloc.  */
 	  if (hundef && ! bfd_link_pic (flaginfo->info) && ! r_baserel)
 	    {
 	      const char *name;
@@ -4481,10 +4481,10 @@ aout_link_input_section_ext (struct aout_final_link_info *flaginfo,
 		      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.  */
+			     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;
@@ -4604,7 +4604,7 @@ aout_link_input_section_ext (struct aout_final_link_info *flaginfo,
 	      int type;
 
 	      /* For base relative relocs, r_index is always an index
-                 into the symbol table, even if r_extern is 0.  */
+		 into the symbol table, even if r_extern is 0.  */
 	      sym = syms + r_index;
 	      type = H_GET_8 (input_bfd, sym->e_type);
 	      if ((type & N_TYPE) == N_TEXT
@@ -4676,8 +4676,8 @@ aout_link_input_section_ext (struct aout_final_link_info *flaginfo,
 	    }
 
 	  /* Now warn if a global symbol is undefined.  We could not
-             do this earlier, because check_dynamic_reloc might want
-             to skip this reloc.  */
+	     do this earlier, because check_dynamic_reloc might want
+	     to skip this reloc.  */
 	  if (hundef
 	      && ! bfd_link_pic (flaginfo->info)
 	      && r_type != (unsigned int) RELOC_BASE10
@@ -4899,15 +4899,15 @@ aout_link_write_symbols (struct aout_final_link_info *flaginfo, bfd *input_bfd)
       bfd_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.  */
+	 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.  */
+	 not copied into the output file.  We will change it later if
+	 we do copy the symbol over.  */
       *symbol_map = -1;
 
       type = H_GET_8 (input_bfd, sym->e_type);
@@ -4941,7 +4941,7 @@ aout_link_write_symbols (struct aout_final_link_info *flaginfo, bfd *input_bfd)
 	  h = *sym_hash;
 
 	  /* Use the name from the hash table, in case the symbol was
-             wrapped.  */
+	     wrapped.  */
 	  if (h != NULL
 	      && h->root.type != bfd_link_hash_warning)
 	    name = h->root.root.string;
@@ -5211,8 +5211,8 @@ aout_link_write_symbols (struct aout_final_link_info *flaginfo, bfd *input_bfd)
 		}
 
 	      /* If we have already included a header file with the
-                 same value, then replace this one with an N_EXCL
-                 symbol.  */
+		 same value, then replace this one with an N_EXCL
+		 symbol.  */
 	      copy = (bfd_boolean) (! flaginfo->info->keep_memory);
 	      incl_entry = aout_link_includes_lookup (&flaginfo->includes,
 						      name, TRUE, copy);
@@ -5224,9 +5224,9 @@ aout_link_write_symbols (struct aout_final_link_info *flaginfo, bfd *input_bfd)
 	      if (t == NULL)
 		{
 		  /* This is the first time we have seen this header
-                     file with this set of stabs strings.  */
+		     file with this set of stabs strings.  */
 		  t = (struct aout_link_includes_totals *)
-                      bfd_hash_allocate (&flaginfo->includes.root,
+		      bfd_hash_allocate (&flaginfo->includes.root,
 					 sizeof *t);
 		  if (t == NULL)
 		    return FALSE;
@@ -5239,8 +5239,8 @@ aout_link_write_symbols (struct aout_final_link_info *flaginfo, bfd *input_bfd)
 		  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.  */
+		     it to be an N_EXCL entry, and mark all the
+		     included symbols to prevent outputting them.  */
 		  type = (int) N_EXCL;
 
 		  nest = 0;
diff --git a/bfd/arc-got.h b/bfd/arc-got.h
index f1f6c0e..1320289 100644
--- a/bfd/arc-got.h
+++ b/bfd/arc-got.h
@@ -227,10 +227,10 @@ arc_fill_got_info_for_reloc (enum tls_type_e type,
     {
       case GOT_NORMAL:
 	{
-  	  bfd_vma offset
+	  bfd_vma offset
 	    = ADD_SYMBOL_REF_SEC_AND_RELOC (got, bfd_link_pic (info)
 						 || h != NULL, h);
-  	  new_got_entry_to_list (list, type, offset, TLS_GOT_NONE);
+	  new_got_entry_to_list (list, type, offset, TLS_GOT_NONE);
 	}
 	break;
 
@@ -262,14 +262,14 @@ arc_fill_got_info_for_reloc (enum tls_type_e type,
 
 
 static bfd_vma
-relocate_fix_got_relocs_for_got_info (struct got_entry **          list_p,
-				      enum tls_type_e              type,
-				      struct bfd_link_info *       info,
-				      bfd *                        output_bfd,
-				      unsigned long                r_symndx,
-				      Elf_Internal_Sym *           local_syms,
-			  	      asection **                  local_sections,
-			     	      struct elf_link_hash_entry * h,
+relocate_fix_got_relocs_for_got_info (struct got_entry **	   list_p,
+				      enum tls_type_e		   type,
+				      struct bfd_link_info *	   info,
+				      bfd *			   output_bfd,
+				      unsigned long		   r_symndx,
+				      Elf_Internal_Sym *	   local_syms,
+				      asection **		   local_sections,
+				      struct elf_link_hash_entry * h,
 				      struct arc_relocation_data * reloc_data)
 {
   struct elf_link_hash_table *htab = elf_hash_table (info);
@@ -460,14 +460,14 @@ create_got_dynrelocs_for_single_entry (struct got_entry *list,
       enum tls_got_entries e = list->existing_entries;
 
       BFD_ASSERT (list->type != GOT_TLS_GD
-    	      || list->existing_entries == TLS_GOT_MOD_AND_OFF);
+		  || list->existing_entries == TLS_GOT_MOD_AND_OFF);
 
       bfd_vma dynindx = (h == NULL || h->dynindx == -1) ? 0 : h->dynindx;
 
       if (e == TLS_GOT_MOD_AND_OFF || e == TLS_GOT_MOD)
 	{
 	      ADD_RELA (output_bfd, got, got_offset, dynindx,
-	    	    R_ARC_TLS_DTPMOD, 0);
+			R_ARC_TLS_DTPMOD, 0);
 	      ARC_DEBUG ("arc_info: TLS_DYNRELOC: type = %d, \
 GOT_OFFSET = %#lx, GOT_VMA = %#lx, INDEX = %ld, ADDEND = 0x0\n",
 			 list->type,
@@ -509,7 +509,7 @@ static void
 create_got_dynrelocs_for_got_info (struct got_entry **list_p,
 				   bfd *output_bfd,
 				   struct bfd_link_info *  info,
-			     	   struct elf_link_hash_entry *h)
+				   struct elf_link_hash_entry *h)
 {
   if (list_p == NULL)
     return;
diff --git a/bfd/arc-plt.def b/bfd/arc-plt.def
index 2c3bed8..7c413f9 100644
--- a/bfd/arc-plt.def
+++ b/bfd/arc-plt.def
@@ -58,7 +58,7 @@ PLT_TYPE_END (ELF_ARCV2_ABS)
 
 /* Non Arc V2 Related PLT entries.  */
 
-PLT_TYPE_START (ELF_ARC_PIC) 
+PLT_TYPE_START (ELF_ARC_PIC)
   PLT_ENTRY (0x2730,0x7f8b,0x0000,0x0000) /* ld %r11, [pcl,0] : 0 to be replaced by _DYNAMIC@GOTPC+4 */
   PLT_ENTRY (0x2730,0x7f8a,0x0000,0x0000) /* ld %r10, [pcl,0] : 0 to be replaced by -DYNAMIC@GOTPC+8  */
   PLT_ENTRY (0x2020,0x0280)		 /* j [%r10] */
@@ -74,9 +74,9 @@ PLT_TYPE_START (ELF_ARC_PIC)
 
   ELEM_RELOC (4, 32, 0xFFFFFFFF, SGOT | RELATIVE_INSN_32 | MIDDLE_ENDIAN, 0)
 
-PLT_TYPE_END (ELF_ARC_PIC) 
+PLT_TYPE_END (ELF_ARC_PIC)
 
-PLT_TYPE_START (ELF_ARC_ABS) 
+PLT_TYPE_START (ELF_ARC_ABS)
   PLT_ENTRY (0x1600,0x700b,0x0000,0x0000) /* ld %r11, [0] */
   PLT_ENTRY (0x1600,0x700a,0x0000,0x0000) /* ld %r10, [0] */
   PLT_ENTRY (0x2020,0x0280)		 /* j [%r10] */
@@ -91,4 +91,4 @@ PLT_TYPE_START (ELF_ARC_ABS)
 
   ELEM_RELOC (4, 32, 0xFFFFFFFF, SGOT | RELATIVE_INSN_32 | MIDDLE_ENDIAN, 0)
 
-PLT_TYPE_END (ELF_ARC_ABS) 
+PLT_TYPE_END (ELF_ARC_ABS)
diff --git a/bfd/arc-plt.h b/bfd/arc-plt.h
index 93fa002..989e3fb 100644
--- a/bfd/arc-plt.h
+++ b/bfd/arc-plt.h
@@ -43,11 +43,11 @@ enum plt_reloc_symbol
   MIDDLE_ENDIAN = (1 << 11)
 };
 
-#define IS_RELATIVE(S)      ((S & (RELATIVE | RELATIVE_INSN_24 | RELATIVE_INSN_32)) != 0)
-#define IS_INSN_32(S)       ((S & RELATIVE_INSN_32) != 0)
-#define IS_INSN_24(S)       ((S & RELATIVE_INSN_24) != 0)
+#define IS_RELATIVE(S)	    ((S & (RELATIVE | RELATIVE_INSN_24 | RELATIVE_INSN_32)) != 0)
+#define IS_INSN_32(S)	    ((S & RELATIVE_INSN_32) != 0)
+#define IS_INSN_24(S)	    ((S & RELATIVE_INSN_24) != 0)
 #define IS_MIDDLE_ENDIAN(S) ((S & MIDDLE_ENDIAN) != 0)
-#define SYM_ONLY(S)         (S & 0xFF)
+#define SYM_ONLY(S)	    (S & 0xFF)
 
 struct plt_reloc
 {
@@ -115,7 +115,7 @@ struct plt_version_t
 #define PLT_TYPE_END(NAME) \
     {0, 0, 0, LAST_RELOC, 0} \
   };
-#define PLT_ENTRY(...) 
+#define PLT_ENTRY(...)
 #define PLT_ELEM(...)
 #define ENTRY_RELOC(...) { __VA_ARGS__ },
 #define ELEM_RELOC(...)
@@ -152,7 +152,7 @@ struct plt_version_t
 #define PLT_TYPE_END(NAME) \
     {0, 0, 0, LAST_RELOC, 0} \
   };
-#define PLT_ENTRY(...) 
+#define PLT_ENTRY(...)
 #define PLT_ELEM(...)
 #define ENTRY_RELOC(...)
 #define ELEM_RELOC(...) { __VA_ARGS__ },
diff --git a/bfd/archive.c b/bfd/archive.c
index 0b98df3..021ed8b 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -1437,16 +1437,16 @@ normalize (bfd *abfd ATTRIBUTE_UNUSED, const char *file)
 
      Relative path  Reference path  Result
      -------------  --------------  ------
-     bar.o          lib.a           bar.o
-     foo/bar.o      lib.a           foo/bar.o
-     bar.o          foo/lib.a       ../bar.o
-     foo/bar.o      baz/lib.a       ../foo/bar.o
-     bar.o          ../lib.a        <parent of current dir>/bar.o
-   ; ../bar.o       ../lib.a        bar.o
-   ; ../bar.o       lib.a           ../bar.o
-     foo/bar.o      ../lib.a        <parent of current dir>/foo/bar.o
-     bar.o          ../../lib.a     <grandparent>/<parent>/bar.o
-     bar.o          foo/baz/lib.a   ../../bar.o
+     bar.o	    lib.a	    bar.o
+     foo/bar.o	    lib.a	    foo/bar.o
+     bar.o	    foo/lib.a	    ../bar.o
+     foo/bar.o	    baz/lib.a	    ../foo/bar.o
+     bar.o	    ../lib.a	    <parent of current dir>/bar.o
+   ; ../bar.o	    ../lib.a	    bar.o
+   ; ../bar.o	    lib.a	    ../bar.o
+     foo/bar.o	    ../lib.a	    <parent of current dir>/foo/bar.o
+     bar.o	    ../../lib.a	    <grandparent>/<parent>/bar.o
+     bar.o	    foo/baz/lib.a   ../../bar.o
 
    Note - the semicolons above are there to prevent the BFD chew
    utility from interpreting those lines as prototypes to put into
@@ -2018,7 +2018,7 @@ bfd_generic_stat_arch_elt (bfd *abfd, struct stat *buf)
     return -1;
 #define foo(arelt, stelt, size)				\
   buf->stelt = strtol (hdr->arelt, &aloser, size);	\
-  if (aloser == hdr->arelt)	      			\
+  if (aloser == hdr->arelt)				\
     return -1;
 
   /* Some platforms support special notations for large IDs.  */
diff --git a/bfd/archive64.c b/bfd/archive64.c
index 17d1816..47da430 100644
--- a/bfd/archive64.c
+++ b/bfd/archive64.c
@@ -177,7 +177,7 @@ _bfd_archive_64_bit_write_armap (bfd *arch,
   if (!_bfd_ar_sizepad (hdr.ar_size, sizeof (hdr.ar_size), mapsize))
     return FALSE;
   _bfd_ar_spacepad (hdr.ar_date, sizeof (hdr.ar_date), "%ld",
-                    time (NULL));
+		    time (NULL));
   /* This, at least, is what Intel coff sets the values to.: */
   _bfd_ar_spacepad (hdr.ar_uid, sizeof (hdr.ar_uid), "%ld", 0);
   _bfd_ar_spacepad (hdr.ar_gid, sizeof (hdr.ar_gid), "%ld", 0);
diff --git a/bfd/archures.c b/bfd/archures.c
index bd5f933..4b3aef6 100644
--- a/bfd/archures.c
+++ b/bfd/archures.c
@@ -70,62 +70,62 @@ DESCRIPTION
 .{
 .  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
-.#define bfd_mach_fido   9
-.#define bfd_mach_mcf_isa_a_nodiv 10
-.#define bfd_mach_mcf_isa_a 11
-.#define bfd_mach_mcf_isa_a_mac 12
-.#define bfd_mach_mcf_isa_a_emac 13
-.#define bfd_mach_mcf_isa_aplus 14
-.#define bfd_mach_mcf_isa_aplus_mac 15
-.#define bfd_mach_mcf_isa_aplus_emac 16
-.#define bfd_mach_mcf_isa_b_nousp 17
-.#define bfd_mach_mcf_isa_b_nousp_mac 18
-.#define bfd_mach_mcf_isa_b_nousp_emac 19
-.#define bfd_mach_mcf_isa_b 20
-.#define bfd_mach_mcf_isa_b_mac 21
-.#define bfd_mach_mcf_isa_b_emac 22
-.#define bfd_mach_mcf_isa_b_float 23
-.#define bfd_mach_mcf_isa_b_float_mac 24
-.#define bfd_mach_mcf_isa_b_float_emac 25
-.#define bfd_mach_mcf_isa_c 26
-.#define bfd_mach_mcf_isa_c_mac 27
-.#define bfd_mach_mcf_isa_c_emac 28
-.#define bfd_mach_mcf_isa_c_nodiv 29
-.#define bfd_mach_mcf_isa_c_nodiv_mac 30
-.#define bfd_mach_mcf_isa_c_nodiv_emac 31
-.  bfd_arch_vax,       {* DEC Vax *}
-.  bfd_arch_i960,      {* Intel 960 *}
+.  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
+.#define bfd_mach_fido			9
+.#define bfd_mach_mcf_isa_a_nodiv	10
+.#define bfd_mach_mcf_isa_a		11
+.#define bfd_mach_mcf_isa_a_mac		12
+.#define bfd_mach_mcf_isa_a_emac	13
+.#define bfd_mach_mcf_isa_aplus		14
+.#define bfd_mach_mcf_isa_aplus_mac	15
+.#define bfd_mach_mcf_isa_aplus_emac	16
+.#define bfd_mach_mcf_isa_b_nousp	17
+.#define bfd_mach_mcf_isa_b_nousp_mac	18
+.#define bfd_mach_mcf_isa_b_nousp_emac	19
+.#define bfd_mach_mcf_isa_b		20
+.#define bfd_mach_mcf_isa_b_mac		21
+.#define bfd_mach_mcf_isa_b_emac	22
+.#define bfd_mach_mcf_isa_b_float	23
+.#define bfd_mach_mcf_isa_b_float_mac	24
+.#define bfd_mach_mcf_isa_b_float_emac	25
+.#define bfd_mach_mcf_isa_c		26
+.#define bfd_mach_mcf_isa_c_mac		27
+.#define bfd_mach_mcf_isa_c_emac	28
+.#define bfd_mach_mcf_isa_c_nodiv	29
+.#define bfd_mach_mcf_isa_c_nodiv_mac	30
+.#define bfd_mach_mcf_isa_c_nodiv_emac	31
+.  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".  *}
+.	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
+.#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_or1k,      {* OpenRISC 1000 *}
-.#define bfd_mach_or1k           1
-.#define bfd_mach_or1knd         2
+.  bfd_arch_or1k,      {* OpenRISC 1000.  *}
+.#define bfd_mach_or1k		1
+.#define bfd_mach_or1knd	2
 .
-.  bfd_arch_sparc,     {* SPARC *}
+.  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
@@ -163,9 +163,9 @@ DESCRIPTION
 .   && (mach) != bfd_mach_sparc_v8plusv \
 .   && (mach) != bfd_mach_sparc_v8plusm \
 .   && (mach) != bfd_mach_sparc_v8plusm8)
-.  bfd_arch_spu,       {* PowerPC SPU *}
+.  bfd_arch_spu,       {* PowerPC SPU.  *}
 .#define bfd_mach_spu		256
-.  bfd_arch_mips,      {* MIPS Rxxxx *}
+.  bfd_arch_mips,      {* MIPS Rxxxx.  *}
 .#define bfd_mach_mips3000		3000
 .#define bfd_mach_mips3900		3900
 .#define bfd_mach_mips4000		4000
@@ -190,29 +190,29 @@ DESCRIPTION
 .#define bfd_mach_mips14000		14000
 .#define bfd_mach_mips16000		16000
 .#define bfd_mach_mips16		16
-.#define bfd_mach_mips5                 5
-.#define bfd_mach_mips_loongson_2e      3001
-.#define bfd_mach_mips_loongson_2f      3002
-.#define bfd_mach_mips_loongson_3a      3003
-.#define bfd_mach_mips_sb1              12310201 {* octal 'SB', 01 *}
+.#define bfd_mach_mips5			5
+.#define bfd_mach_mips_loongson_2e	3001
+.#define bfd_mach_mips_loongson_2f	3002
+.#define bfd_mach_mips_loongson_3a	3003
+.#define bfd_mach_mips_sb1		12310201 {* octal 'SB', 01.  *}
 .#define bfd_mach_mips_octeon		6501
 .#define bfd_mach_mips_octeonp		6601
 .#define bfd_mach_mips_octeon2		6502
-.#define bfd_mach_mips_octeon3          6503
-.#define bfd_mach_mips_xlr              887682   {* decimal 'XLR'  *}
-.#define bfd_mach_mips_interaptiv_mr2   736550   {* decimal 'IA2'  *}
-.#define bfd_mach_mipsisa32             32
-.#define bfd_mach_mipsisa32r2           33
-.#define bfd_mach_mipsisa32r3           34
-.#define bfd_mach_mipsisa32r5           36
-.#define bfd_mach_mipsisa32r6           37
-.#define bfd_mach_mipsisa64             64
-.#define bfd_mach_mipsisa64r2           65
-.#define bfd_mach_mipsisa64r3           66
-.#define bfd_mach_mipsisa64r5           68
-.#define bfd_mach_mipsisa64r6           69
-.#define bfd_mach_mips_micromips        96
-.  bfd_arch_i386,      {* Intel 386 *}
+.#define bfd_mach_mips_octeon3		6503
+.#define bfd_mach_mips_xlr		887682	 {* decimal 'XLR'.  *}
+.#define bfd_mach_mips_interaptiv_mr2	736550	 {* decimal 'IA2'.  *}
+.#define bfd_mach_mipsisa32		32
+.#define bfd_mach_mipsisa32r2		33
+.#define bfd_mach_mipsisa32r3		34
+.#define bfd_mach_mipsisa32r5		36
+.#define bfd_mach_mipsisa32r6		37
+.#define bfd_mach_mipsisa64		64
+.#define bfd_mach_mipsisa64r2		65
+.#define bfd_mach_mipsisa64r3		66
+.#define bfd_mach_mipsisa64r5		68
+.#define bfd_mach_mipsisa64r6		69
+.#define bfd_mach_mips_micromips	96
+.  bfd_arch_i386,      {* Intel 386.  *}
 .#define bfd_mach_i386_intel_syntax	(1 << 0)
 .#define bfd_mach_i386_i8086		(1 << 1)
 .#define bfd_mach_i386_i386		(1 << 2)
@@ -221,40 +221,40 @@ DESCRIPTION
 .#define bfd_mach_i386_i386_intel_syntax (bfd_mach_i386_i386 | bfd_mach_i386_intel_syntax)
 .#define bfd_mach_x86_64_intel_syntax	(bfd_mach_x86_64 | bfd_mach_i386_intel_syntax)
 .#define bfd_mach_x64_32_intel_syntax	(bfd_mach_x64_32 | bfd_mach_i386_intel_syntax)
-.  bfd_arch_l1om,   {* Intel L1OM *}
+.  bfd_arch_l1om,      {* Intel L1OM.  *}
 .#define bfd_mach_l1om			(1 << 5)
 .#define bfd_mach_l1om_intel_syntax	(bfd_mach_l1om | bfd_mach_i386_intel_syntax)
-.  bfd_arch_k1om,   {* Intel K1OM *}
+.  bfd_arch_k1om,      {* Intel K1OM.  *}
 .#define bfd_mach_k1om			(1 << 6)
 .#define bfd_mach_k1om_intel_syntax	(bfd_mach_k1om | bfd_mach_i386_intel_syntax)
 .#define bfd_mach_i386_nacl		(1 << 7)
 .#define bfd_mach_i386_i386_nacl	(bfd_mach_i386_i386 | bfd_mach_i386_nacl)
 .#define bfd_mach_x86_64_nacl		(bfd_mach_x86_64 | bfd_mach_i386_nacl)
 .#define bfd_mach_x64_32_nacl		(bfd_mach_x64_32 | bfd_mach_i386_nacl)
-.  bfd_arch_iamcu,   {* Intel MCU *}
+.  bfd_arch_iamcu,     {* Intel MCU.  *}
 .#define bfd_mach_iamcu			(1 << 8)
 .#define bfd_mach_i386_iamcu		(bfd_mach_i386_i386 | bfd_mach_iamcu)
 .#define bfd_mach_i386_iamcu_intel_syntax (bfd_mach_i386_iamcu | bfd_mach_i386_intel_syntax)
-.  bfd_arch_we32k,     {* AT&T WE32xxx *}
-.  bfd_arch_tahoe,     {* CCI/Harris Tahoe *}
-.  bfd_arch_i860,      {* Intel 860 *}
-.  bfd_arch_i370,      {* IBM 360/370 Mainframes *}
-.  bfd_arch_romp,      {* IBM ROMP PC/RT *}
-.  bfd_arch_convex,    {* Convex *}
-.  bfd_arch_m88k,      {* Motorola 88xxx *}
-.  bfd_arch_m98k,      {* Motorola 98xxx *}
-.  bfd_arch_pyramid,   {* Pyramid Technology *}
-.  bfd_arch_h8300,     {* Renesas H8/300 (formerly Hitachi H8/300) *}
-.#define bfd_mach_h8300    1
-.#define bfd_mach_h8300h   2
-.#define bfd_mach_h8300s   3
-.#define bfd_mach_h8300hn  4
-.#define bfd_mach_h8300sn  5
-.#define bfd_mach_h8300sx  6
-.#define bfd_mach_h8300sxn 7
-.  bfd_arch_pdp11,     {* DEC PDP-11 *}
+.  bfd_arch_we32k,     {* AT&T WE32xxx.  *}
+.  bfd_arch_tahoe,     {* CCI/Harris Tahoe.  *}
+.  bfd_arch_i860,      {* Intel 860.  *}
+.  bfd_arch_i370,      {* IBM 360/370 Mainframes.  *}
+.  bfd_arch_romp,      {* IBM ROMP PC/RT.  *}
+.  bfd_arch_convex,    {* Convex.  *}
+.  bfd_arch_m88k,      {* Motorola 88xxx.  *}
+.  bfd_arch_m98k,      {* Motorola 98xxx.  *}
+.  bfd_arch_pyramid,   {* Pyramid Technology.  *}
+.  bfd_arch_h8300,     {* Renesas H8/300 (formerly Hitachi H8/300).  *}
+.#define bfd_mach_h8300		1
+.#define bfd_mach_h8300h	2
+.#define bfd_mach_h8300s	3
+.#define bfd_mach_h8300hn	4
+.#define bfd_mach_h8300sn	5
+.#define bfd_mach_h8300sx	6
+.#define bfd_mach_h8300sxn	7
+.  bfd_arch_pdp11,     {* DEC PDP-11.  *}
 .  bfd_arch_plugin,
-.  bfd_arch_powerpc,   {* PowerPC *}
+.  bfd_arch_powerpc,   {* PowerPC.  *}
 .#define bfd_mach_ppc		32
 .#define bfd_mach_ppc64		64
 .#define bfd_mach_ppc_403	403
@@ -274,121 +274,121 @@ DESCRIPTION
 .#define bfd_mach_ppc_rs64ii	642
 .#define bfd_mach_ppc_rs64iii	643
 .#define bfd_mach_ppc_7400	7400
-.#define bfd_mach_ppc_e500      500
-.#define bfd_mach_ppc_e500mc    5001
-.#define bfd_mach_ppc_e500mc64  5005
-.#define bfd_mach_ppc_e5500     5006
-.#define bfd_mach_ppc_e6500     5007
-.#define bfd_mach_ppc_titan     83
-.#define bfd_mach_ppc_vle       84
-.  bfd_arch_rs6000,    {* IBM RS/6000 *}
+.#define bfd_mach_ppc_e500	500
+.#define bfd_mach_ppc_e500mc	5001
+.#define bfd_mach_ppc_e500mc64	5005
+.#define bfd_mach_ppc_e5500	5006
+.#define bfd_mach_ppc_e6500	5007
+.#define bfd_mach_ppc_titan	83
+.#define bfd_mach_ppc_vle	84
+.  bfd_arch_rs6000,    {* IBM RS/6000.  *}
 .#define bfd_mach_rs6k		6000
 .#define bfd_mach_rs6k_rs1	6001
 .#define bfd_mach_rs6k_rsc	6003
 .#define bfd_mach_rs6k_rs2	6002
-.  bfd_arch_hppa,      {* HP PA RISC *}
+.  bfd_arch_hppa,      {* HP PA RISC.  *}
 .#define bfd_mach_hppa10	10
 .#define bfd_mach_hppa11	11
 .#define bfd_mach_hppa20	20
 .#define bfd_mach_hppa20w	25
-.  bfd_arch_d10v,      {* Mitsubishi D10V *}
+.  bfd_arch_d10v,      {* Mitsubishi D10V.  *}
 .#define bfd_mach_d10v		1
 .#define bfd_mach_d10v_ts2	2
 .#define bfd_mach_d10v_ts3	3
-.  bfd_arch_d30v,      {* Mitsubishi D30V *}
-.  bfd_arch_dlx,       {* DLX *}
-.  bfd_arch_m68hc11,   {* Motorola 68HC11 *}
-.  bfd_arch_m68hc12,   {* Motorola 68HC12 *}
+.  bfd_arch_d30v,      {* Mitsubishi D30V.  *}
+.  bfd_arch_dlx,       {* DLX.  *}
+.  bfd_arch_m68hc11,   {* Motorola 68HC11.  *}
+.  bfd_arch_m68hc12,   {* Motorola 68HC12.  *}
 .#define bfd_mach_m6812_default 0
-.#define bfd_mach_m6812         1
-.#define bfd_mach_m6812s        2
-.  bfd_arch_m9s12x,   {* Freescale S12X *}
-.  bfd_arch_m9s12xg,  {* Freescale XGATE *}
-.  bfd_arch_z8k,       {* Zilog Z8000 *}
+.#define bfd_mach_m6812		1
+.#define bfd_mach_m6812s	2
+.  bfd_arch_m9s12x,    {* Freescale S12X.  *}
+.  bfd_arch_m9s12xg,   {* Freescale XGATE.  *}
+.  bfd_arch_z8k,       {* Zilog Z8000.  *}
 .#define bfd_mach_z8001		1
 .#define bfd_mach_z8002		2
-.  bfd_arch_h8500,     {* Renesas H8/500 (formerly Hitachi H8/500) *}
-.  bfd_arch_sh,        {* Renesas / SuperH SH (formerly Hitachi SH) *}
-.#define bfd_mach_sh            1
-.#define bfd_mach_sh2        0x20
-.#define bfd_mach_sh_dsp     0x2d
-.#define bfd_mach_sh2a       0x2a
-.#define bfd_mach_sh2a_nofpu 0x2b
+.  bfd_arch_h8500,     {* Renesas H8/500 (formerly Hitachi H8/500).  *}
+.  bfd_arch_sh,	       {* Renesas / SuperH SH (formerly Hitachi SH).  *}
+.#define bfd_mach_sh				1
+.#define bfd_mach_sh2				0x20
+.#define bfd_mach_sh_dsp			0x2d
+.#define bfd_mach_sh2a				0x2a
+.#define bfd_mach_sh2a_nofpu			0x2b
 .#define bfd_mach_sh2a_nofpu_or_sh4_nommu_nofpu 0x2a1
-.#define bfd_mach_sh2a_nofpu_or_sh3_nommu 0x2a2
-.#define bfd_mach_sh2a_or_sh4  0x2a3
-.#define bfd_mach_sh2a_or_sh3e 0x2a4
-.#define bfd_mach_sh2e       0x2e
-.#define bfd_mach_sh3        0x30
-.#define bfd_mach_sh3_nommu  0x31
-.#define bfd_mach_sh3_dsp    0x3d
-.#define bfd_mach_sh3e       0x3e
-.#define bfd_mach_sh4        0x40
-.#define bfd_mach_sh4_nofpu  0x41
-.#define bfd_mach_sh4_nommu_nofpu  0x42
-.#define bfd_mach_sh4a       0x4a
-.#define bfd_mach_sh4a_nofpu 0x4b
-.#define bfd_mach_sh4al_dsp  0x4d
-.#define bfd_mach_sh5        0x50
-.  bfd_arch_alpha,     {* Dec Alpha *}
-.#define bfd_mach_alpha_ev4  0x10
-.#define bfd_mach_alpha_ev5  0x20
-.#define bfd_mach_alpha_ev6  0x30
+.#define bfd_mach_sh2a_nofpu_or_sh3_nommu	0x2a2
+.#define bfd_mach_sh2a_or_sh4			0x2a3
+.#define bfd_mach_sh2a_or_sh3e			0x2a4
+.#define bfd_mach_sh2e				0x2e
+.#define bfd_mach_sh3				0x30
+.#define bfd_mach_sh3_nommu			0x31
+.#define bfd_mach_sh3_dsp			0x3d
+.#define bfd_mach_sh3e				0x3e
+.#define bfd_mach_sh4				0x40
+.#define bfd_mach_sh4_nofpu			0x41
+.#define bfd_mach_sh4_nommu_nofpu		0x42
+.#define bfd_mach_sh4a				0x4a
+.#define bfd_mach_sh4a_nofpu			0x4b
+.#define bfd_mach_sh4al_dsp			0x4d
+.#define bfd_mach_sh5				0x50
+.  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_unknown	0
 .#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
-.#define bfd_mach_arm_5 	7
+.#define bfd_mach_arm_3M	4
+.#define bfd_mach_arm_4		5
+.#define bfd_mach_arm_4T	6
+.#define bfd_mach_arm_5		7
 .#define bfd_mach_arm_5T	8
 .#define bfd_mach_arm_5TE	9
 .#define bfd_mach_arm_XScale	10
 .#define bfd_mach_arm_ep9312	11
 .#define bfd_mach_arm_iWMMXt	12
 .#define bfd_mach_arm_iWMMXt2	13
-.  bfd_arch_nds32,     {* Andes NDS32 *}
-.#define bfd_mach_n1            1
-.#define bfd_mach_n1h           2
-.#define bfd_mach_n1h_v2        3
-.#define bfd_mach_n1h_v3        4
-.#define bfd_mach_n1h_v3m       5
-.  bfd_arch_ns32k,     {* National Semiconductors ns32000 *}
-.  bfd_arch_w65,       {* WDC 65816 *}
-.  bfd_arch_tic30,     {* Texas Instruments TMS320C30 *}
-.  bfd_arch_tic4x,     {* Texas Instruments TMS320C3X/4X *}
-.#define bfd_mach_tic3x         30
-.#define bfd_mach_tic4x         40
-.  bfd_arch_tic54x,    {* Texas Instruments TMS320C54X *}
-.  bfd_arch_tic6x,     {* Texas Instruments TMS320C6X *}
-.  bfd_arch_tic80,     {* TI TMS320c80 (MVP) *}
-.  bfd_arch_v850,      {* NEC V850 *}
-.  bfd_arch_v850_rh850,{* NEC V850 (using RH850 ABI) *}
-.#define bfd_mach_v850          1
-.#define bfd_mach_v850e 	'E'
-.#define bfd_mach_v850e1        '1'
-.#define bfd_mach_v850e2        0x4532
-.#define bfd_mach_v850e2v3      0x45325633
-.#define bfd_mach_v850e3v5      0x45335635 {* ('E'|'3'|'V'|'5') *}
-.  bfd_arch_arc,       {* ARC Cores *}
-.#define bfd_mach_arc_a4        0
-.#define bfd_mach_arc_a5        1
-.#define bfd_mach_arc_arc600    2
-.#define bfd_mach_arc_arc601    4
-.#define bfd_mach_arc_arc700    3
-.#define bfd_mach_arc_arcv2     5
-. bfd_arch_m32c,     {* Renesas M16C/M32C.  *}
-.#define bfd_mach_m16c        0x75
-.#define bfd_mach_m32c        0x78
-.  bfd_arch_m32r,      {* Renesas M32R (formerly Mitsubishi M32R/D) *}
+.  bfd_arch_nds32,     {* Andes NDS32.  *}
+.#define bfd_mach_n1		1
+.#define bfd_mach_n1h		2
+.#define bfd_mach_n1h_v2	3
+.#define bfd_mach_n1h_v3	4
+.#define bfd_mach_n1h_v3m	5
+.  bfd_arch_ns32k,     {* National Semiconductors ns32000.  *}
+.  bfd_arch_w65,       {* WDC 65816.  *}
+.  bfd_arch_tic30,     {* Texas Instruments TMS320C30.  *}
+.  bfd_arch_tic4x,     {* Texas Instruments TMS320C3X/4X.  *}
+.#define bfd_mach_tic3x		30
+.#define bfd_mach_tic4x		40
+.  bfd_arch_tic54x,    {* Texas Instruments TMS320C54X.  *}
+.  bfd_arch_tic6x,     {* Texas Instruments TMS320C6X.  *}
+.  bfd_arch_tic80,     {* TI TMS320c80 (MVP).  *}
+.  bfd_arch_v850,      {* NEC V850.  *}
+.  bfd_arch_v850_rh850,{* NEC V850 (using RH850 ABI).  *}
+.#define bfd_mach_v850		1
+.#define bfd_mach_v850e		'E'
+.#define bfd_mach_v850e1	'1'
+.#define bfd_mach_v850e2	0x4532
+.#define bfd_mach_v850e2v3	0x45325633
+.#define bfd_mach_v850e3v5	0x45335635 {* ('E'|'3'|'V'|'5').  *}
+.  bfd_arch_arc,       {* ARC Cores.  *}
+.#define bfd_mach_arc_a4	0
+.#define bfd_mach_arc_a5	1
+.#define bfd_mach_arc_arc600	2
+.#define bfd_mach_arc_arc601	4
+.#define bfd_mach_arc_arc700	3
+.#define bfd_mach_arc_arcv2	5
+. bfd_arch_m32c,       {* Renesas M16C/M32C.  *}
+.#define bfd_mach_m16c		0x75
+.#define bfd_mach_m32c		0x78
+.  bfd_arch_m32r,      {* Renesas M32R (formerly Mitsubishi M32R/D).  *}
 .#define bfd_mach_m32r		1 {* For backwards compatibility.  *}
 .#define bfd_mach_m32rx		'x'
 .#define bfd_mach_m32r2		'2'
-.  bfd_arch_mn10200,   {* Matsushita MN10200 *}
-.  bfd_arch_mn10300,   {* Matsushita MN10300 *}
-.#define bfd_mach_mn10300		300
+.  bfd_arch_mn10200,   {* Matsushita MN10200.  *}
+.  bfd_arch_mn10300,   {* Matsushita MN10300.  *}
+.#define bfd_mach_mn10300	300
 .#define bfd_mach_am33		330
 .#define bfd_mach_am33_2	332
 .  bfd_arch_fr30,
@@ -399,12 +399,12 @@ DESCRIPTION
 .#define bfd_mach_fr300		300
 .#define bfd_mach_fr400		400
 .#define bfd_mach_fr450		450
-.#define bfd_mach_frvtomcat	499	{* fr500 prototype *}
+.#define bfd_mach_frvtomcat	499	{* fr500 prototype.  *}
 .#define bfd_mach_fr500		500
 .#define bfd_mach_fr550		550
-.  bfd_arch_moxie,       {* The moxie processor *}
+.  bfd_arch_moxie,     {* The moxie processor.  *}
 .#define bfd_mach_moxie		1
-.  bfd_arch_ft32,       {* The ft32 processor *}
+.  bfd_arch_ft32,      {* The ft32 processor.  *}
 .#define bfd_mach_ft32		1
 .#define bfd_mach_ft32b		2
 .  bfd_arch_mcore,
@@ -414,22 +414,22 @@ DESCRIPTION
 .#define bfd_mach_mep_c5	0x6335
 .  bfd_arch_metag,
 .#define bfd_mach_metag		1
-.  bfd_arch_ia64,      {* HP/Intel ia64 *}
+.  bfd_arch_ia64,      {* HP/Intel ia64.  *}
 .#define bfd_mach_ia64_elf64	64
 .#define bfd_mach_ia64_elf32	32
 .  bfd_arch_ip2k,      {* Ubicom IP2K microcontrollers. *}
 .#define bfd_mach_ip2022	1
 .#define bfd_mach_ip2022ext	2
 . bfd_arch_iq2000,     {* Vitesse IQ2000.  *}
-.#define bfd_mach_iq2000        1
-.#define bfd_mach_iq10          2
-.  bfd_arch_epiphany,	{* Adapteva EPIPHANY *}
+.#define bfd_mach_iq2000	1
+.#define bfd_mach_iq10		2
+.  bfd_arch_epiphany,  {* Adapteva EPIPHANY.  *}
 .#define bfd_mach_epiphany16	1
 .#define bfd_mach_epiphany32	2
 .  bfd_arch_mt,
-.#define bfd_mach_ms1           1
-.#define bfd_mach_mrisc2        2
-.#define bfd_mach_ms2           3
+.#define bfd_mach_ms1		1
+.#define bfd_mach_mrisc2	2
+.#define bfd_mach_ms2		3
 .  bfd_arch_pj,
 .  bfd_arch_avr,       {* Atmel AVR microcontrollers.  *}
 .#define bfd_mach_avr1		1
@@ -442,23 +442,23 @@ DESCRIPTION
 .#define bfd_mach_avr5		5
 .#define bfd_mach_avr51		51
 .#define bfd_mach_avr6		6
-.#define bfd_mach_avrtiny   100
-.#define bfd_mach_avrxmega1 101
-.#define bfd_mach_avrxmega2 102
-.#define bfd_mach_avrxmega3 103
-.#define bfd_mach_avrxmega4 104
-.#define bfd_mach_avrxmega5 105
-.#define bfd_mach_avrxmega6 106
-.#define bfd_mach_avrxmega7 107
-.  bfd_arch_bfin,        {* ADI Blackfin *}
-.#define bfd_mach_bfin          1
-.  bfd_arch_cr16,       {* National Semiconductor CompactRISC (ie CR16). *}
+.#define bfd_mach_avrtiny	100
+.#define bfd_mach_avrxmega1	101
+.#define bfd_mach_avrxmega2	102
+.#define bfd_mach_avrxmega3	103
+.#define bfd_mach_avrxmega4	104
+.#define bfd_mach_avrxmega5	105
+.#define bfd_mach_avrxmega6	106
+.#define bfd_mach_avrxmega7	107
+.  bfd_arch_bfin,      {* ADI Blackfin.  *}
+.#define bfd_mach_bfin		1
+.  bfd_arch_cr16,      {* National Semiconductor CompactRISC (ie CR16).  *}
 .#define bfd_mach_cr16		1
-.  bfd_arch_cr16c,       {* National Semiconductor CompactRISC. *}
+.  bfd_arch_cr16c,     {* National Semiconductor CompactRISC.  *}
 .#define bfd_mach_cr16c		1
 .  bfd_arch_crx,       {*  National Semiconductor CRX.  *}
 .#define bfd_mach_crx		1
-.  bfd_arch_cris,      {* Axis CRIS *}
+.  bfd_arch_cris,      {* Axis CRIS.  *}
 .#define bfd_mach_cris_v0_v10	255
 .#define bfd_mach_cris_v32	32
 .#define bfd_mach_cris_v10_v32	1032
@@ -466,77 +466,77 @@ DESCRIPTION
 .#define bfd_mach_riscv32	132
 .#define bfd_mach_riscv64	164
 .  bfd_arch_rl78,
-.#define bfd_mach_rl78	0x75
-.  bfd_arch_rx,        {* Renesas RX.  *}
-.#define bfd_mach_rx            0x75
-.  bfd_arch_s390,      {* IBM s390 *}
-.#define bfd_mach_s390_31       31
-.#define bfd_mach_s390_64       64
-.  bfd_arch_score,     {* Sunplus score *}
-.#define bfd_mach_score3         3
-.#define bfd_mach_score7         7
+.#define bfd_mach_rl78		0x75
+.  bfd_arch_rx,	       {* Renesas RX.  *}
+.#define bfd_mach_rx		0x75
+.  bfd_arch_s390,      {* IBM s390.  *}
+.#define bfd_mach_s390_31	31
+.#define bfd_mach_s390_64	64
+.  bfd_arch_score,     {* Sunplus score.  *}
+.#define bfd_mach_score3	3
+.#define bfd_mach_score7	7
 .  bfd_arch_mmix,      {* Donald Knuth's educational processor.  *}
 .  bfd_arch_xstormy16,
 .#define bfd_mach_xstormy16	1
 .  bfd_arch_msp430,    {* Texas Instruments MSP430 architecture.  *}
-.#define bfd_mach_msp11          11
-.#define bfd_mach_msp110         110
-.#define bfd_mach_msp12          12
-.#define bfd_mach_msp13          13
-.#define bfd_mach_msp14          14
-.#define bfd_mach_msp15          15
-.#define bfd_mach_msp16          16
-.#define bfd_mach_msp20          20
-.#define bfd_mach_msp21          21
-.#define bfd_mach_msp22          22
-.#define bfd_mach_msp23          23
-.#define bfd_mach_msp24          24
-.#define bfd_mach_msp26          26
-.#define bfd_mach_msp31          31
-.#define bfd_mach_msp32          32
-.#define bfd_mach_msp33          33
-.#define bfd_mach_msp41          41
-.#define bfd_mach_msp42          42
-.#define bfd_mach_msp43          43
-.#define bfd_mach_msp44          44
-.#define bfd_mach_msp430x        45
-.#define bfd_mach_msp46          46
-.#define bfd_mach_msp47          47
-.#define bfd_mach_msp54          54
-.  bfd_arch_xc16x,     {* Infineon's XC16X Series.               *}
-.#define bfd_mach_xc16x         1
-.#define bfd_mach_xc16xl        2
-.#define bfd_mach_xc16xs        3
-.  bfd_arch_xgate,   {* Freescale XGATE *}
-.#define bfd_mach_xgate         1
+.#define bfd_mach_msp11		11
+.#define bfd_mach_msp110	110
+.#define bfd_mach_msp12		12
+.#define bfd_mach_msp13		13
+.#define bfd_mach_msp14		14
+.#define bfd_mach_msp15		15
+.#define bfd_mach_msp16		16
+.#define bfd_mach_msp20		20
+.#define bfd_mach_msp21		21
+.#define bfd_mach_msp22		22
+.#define bfd_mach_msp23		23
+.#define bfd_mach_msp24		24
+.#define bfd_mach_msp26		26
+.#define bfd_mach_msp31		31
+.#define bfd_mach_msp32		32
+.#define bfd_mach_msp33		33
+.#define bfd_mach_msp41		41
+.#define bfd_mach_msp42		42
+.#define bfd_mach_msp43		43
+.#define bfd_mach_msp44		44
+.#define bfd_mach_msp430x	45
+.#define bfd_mach_msp46		46
+.#define bfd_mach_msp47		47
+.#define bfd_mach_msp54		54
+.  bfd_arch_xc16x,     {* Infineon's XC16X Series.  *}
+.#define bfd_mach_xc16x		1
+.#define bfd_mach_xc16xl	2
+.#define bfd_mach_xc16xs	3
+.  bfd_arch_xgate,     {* Freescale XGATE.  *}
+.#define bfd_mach_xgate		1
 .  bfd_arch_xtensa,    {* Tensilica's Xtensa cores.  *}
 .#define bfd_mach_xtensa	1
 .  bfd_arch_z80,
-.#define bfd_mach_z80strict      1 {* No undocumented opcodes.  *}
-.#define bfd_mach_z80            3 {* With ixl, ixh, iyl, and iyh.  *}
-.#define bfd_mach_z80full        7 {* All undocumented instructions.  *}
-.#define bfd_mach_r800           11 {* R800: successor with multiplication.  *}
-.  bfd_arch_lm32,      {* Lattice Mico32 *}
-.#define bfd_mach_lm32      1
-.  bfd_arch_microblaze,{* Xilinx MicroBlaze. *}
-.  bfd_arch_tilepro,   {* Tilera TILEPro *}
-.  bfd_arch_tilegx, {* Tilera TILE-Gx *}
-.#define bfd_mach_tilepro   1
-.#define bfd_mach_tilegx    1
-.#define bfd_mach_tilegx32  2
-.  bfd_arch_aarch64,   {* AArch64  *}
+.#define bfd_mach_z80strict	1 {* No undocumented opcodes.  *}
+.#define bfd_mach_z80		3 {* With ixl, ixh, iyl, and iyh.  *}
+.#define bfd_mach_z80full	7 {* All undocumented instructions.  *}
+.#define bfd_mach_r800		11 {* R800: successor with multiplication.  *}
+.  bfd_arch_lm32,      {* Lattice Mico32.  *}
+.#define bfd_mach_lm32		1
+.  bfd_arch_microblaze,{* Xilinx MicroBlaze.  *}
+.  bfd_arch_tilepro,   {* Tilera TILEPro.  *}
+.  bfd_arch_tilegx,    {* Tilera TILE-Gx.  *}
+.#define bfd_mach_tilepro	1
+.#define bfd_mach_tilegx	1
+.#define bfd_mach_tilegx32	2
+.  bfd_arch_aarch64,   {* AArch64.  *}
 .#define bfd_mach_aarch64 0
 .#define bfd_mach_aarch64_ilp32	32
-.  bfd_arch_nios2,	{* Nios II *}
+.  bfd_arch_nios2,     {* Nios II.  *}
 .#define bfd_mach_nios2		0
 .#define bfd_mach_nios2r1	1
 .#define bfd_mach_nios2r2	2
-.  bfd_arch_visium,	{* Visium *}
+.  bfd_arch_visium,    {* Visium.  *}
 .#define bfd_mach_visium	1
-.  bfd_arch_wasm32,     {* WebAssembly *}
-.#define bfd_mach_wasm32        1
-.  bfd_arch_pru,	{* PRU *}
-.#define bfd_mach_pru	0
+.  bfd_arch_wasm32,    {* WebAssembly.  *}
+.#define bfd_mach_wasm32	1
+.  bfd_arch_pru,       {* PRU.  *}
+.#define bfd_mach_pru		0
 .  bfd_arch_last
 .  };
 */
@@ -564,8 +564,8 @@ DESCRIPTION
 .     The default arch should be the first entry for an arch so that
 .     all the entries for that arch can be accessed via <<next>>.  *}
 .  bfd_boolean the_default;
-.  const struct bfd_arch_info * (*compatible)
-.    (const struct bfd_arch_info *a, const struct bfd_arch_info *b);
+.  const struct bfd_arch_info * (*compatible) (const struct bfd_arch_info *,
+.					       const struct bfd_arch_info *);
 .
 .  bfd_boolean (*scan) (const struct bfd_arch_info *, const char *);
 .
@@ -1390,8 +1390,8 @@ SYNOPSIS
 
 DESCRIPTION
 	Return the number of octets (8-bit quantities) per target byte
-        (minimum addressable unit).  In most cases, this will be one, but some
-        DSP targets have 16, 32, or even 48 bits per byte.
+	(minimum addressable unit).  In most cases, this will be one, but some
+	DSP targets have 16, 32, or even 48 bits per byte.
 */
 
 unsigned int
@@ -1412,8 +1412,8 @@ SYNOPSIS
 DESCRIPTION
 	See bfd_octets_per_byte.
 
-        This routine is provided for those cases where a bfd * is not
-        available
+	This routine is provided for those cases where a bfd * is not
+	available
 */
 
 unsigned int
diff --git a/bfd/armnetbsd.c b/bfd/armnetbsd.c
index 2653ec0..a34946e 100644
--- a/bfd/armnetbsd.c
+++ b/bfd/armnetbsd.c
@@ -25,15 +25,15 @@
 #define	SEGMENT_SIZE		TARGET_PAGE_SIZE
 
 #define	DEFAULT_ARCH		bfd_arch_arm
-#define	DEFAULT_MID 		M_ARM6_NETBSD
+#define	DEFAULT_MID		M_ARM6_NETBSD
 /*#define MACHTYPE_OK(mtype) ((mtype) == M_ARM6_NETBSD)*/
 
 /* Do not "beautify" the CONCAT* macro args.  Traditional C will not
    remove whitespace added here, and thus will fail to concatenate
    the tokens.  */
-#define MY(OP) 			CONCAT2 (arm_aout_nbsd_, OP)
+#define MY(OP)			CONCAT2 (arm_aout_nbsd_, OP)
 
 /* This needs to start with a.out so GDB knows it is an a.out variant.  */
-#define TARGETNAME 		"a.out-arm-netbsd"
+#define TARGETNAME		"a.out-arm-netbsd"
 
 #include "netbsd.h"
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index 98c1bc3..4d2589e 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -104,7 +104,7 @@ typedef BFD_HOST_U_64_BIT bfd_uint64_t;
 #endif
 
 /* Declaring a type wide enough to hold a host long and a host pointer.  */
-#define BFD_HOSTPTR_T	@BFD_HOSTPTR_T@
+#define BFD_HOSTPTR_T @BFD_HOSTPTR_T@
 typedef BFD_HOSTPTR_T bfd_hostptr_t;
 
 /* Forward declaration.  */
@@ -247,7 +247,7 @@ 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.  */
+struct orl		/* Output ranlib.  */
 {
   char **name;		/* Symbol name.  */
   union
@@ -265,7 +265,7 @@ typedef struct lineno_cache_entry
   union
   {
     struct bfd_symbol *sym;	/* Function name.  */
-    bfd_vma offset;	    		/* Offset into section.  */
+    bfd_vma offset;		/* Offset into section.  */
   } u;
 }
 alent;
@@ -329,11 +329,11 @@ 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.  */
+  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.  */
@@ -371,7 +371,7 @@ struct bfd_hash_table
      only if the argument is NULL.  */
   struct bfd_hash_entry *(*newfunc)
     (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-   /* An objalloc for this hash table.  This is a struct objalloc *,
+  /* An objalloc for this hash table.  This is a struct objalloc *,
      but we use void * to avoid requiring the inclusion of objalloc.h.  */
   void *memory;
   /* The number of slots in the hash table.  */
@@ -489,7 +489,7 @@ extern int bfd_stat (bfd *, struct stat *);
   (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__),	\
    bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
 #define bfd_write(BUF, ELTSIZE, NITEMS, ABFD)				\
-  (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__),	\
+  (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
    bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
 #else
 #define bfd_read(BUF, ELTSIZE, NITEMS, ABFD)				\
@@ -935,7 +935,7 @@ extern void bfd_elf32_arm_keep_private_stub_output_sections
 /* ELF ARM mapping symbol support.  */
 #define BFD_ARM_SPECIAL_SYM_TYPE_MAP	(1 << 0)
 #define BFD_ARM_SPECIAL_SYM_TYPE_TAG	(1 << 1)
-#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER  (1 << 2)
+#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER	(1 << 2)
 #define BFD_ARM_SPECIAL_SYM_TYPE_ANY	(~0)
 
 extern bfd_boolean bfd_is_arm_special_symbol_name
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index db1c480..b6c0f27 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -1,7 +1,7 @@
-/* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically 
-   generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c", 
-   "bfdio.c", "bfdwin.c", "section.c", "archures.c", "reloc.c", 
-   "syms.c", "bfd.c", "archive.c", "corefile.c", "targets.c", "format.c", 
+/* DO NOT EDIT!  -*- buffer-read-only: t -*-  This file is automatically
+   generated from "bfd-in.h", "init.c", "opncls.c", "libbfd.c",
+   "bfdio.c", "bfdwin.c", "section.c", "archures.c", "reloc.c",
+   "syms.c", "bfd.c", "archive.c", "corefile.c", "targets.c", "format.c",
    "linker.c", "simple.c" and "compress.c".
    Run "make headers" in your build bfd/ to regenerate.  */
 
@@ -111,7 +111,7 @@ typedef BFD_HOST_U_64_BIT bfd_uint64_t;
 #endif
 
 /* Declaring a type wide enough to hold a host long and a host pointer.  */
-#define BFD_HOSTPTR_T	@BFD_HOSTPTR_T@
+#define BFD_HOSTPTR_T @BFD_HOSTPTR_T@
 typedef BFD_HOSTPTR_T bfd_hostptr_t;
 
 /* Forward declaration.  */
@@ -254,7 +254,7 @@ 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.  */
+struct orl		/* Output ranlib.  */
 {
   char **name;		/* Symbol name.  */
   union
@@ -272,7 +272,7 @@ typedef struct lineno_cache_entry
   union
   {
     struct bfd_symbol *sym;	/* Function name.  */
-    bfd_vma offset;	    		/* Offset into section.  */
+    bfd_vma offset;		/* Offset into section.  */
   } u;
 }
 alent;
@@ -336,11 +336,11 @@ 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.  */
+  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.  */
@@ -378,7 +378,7 @@ struct bfd_hash_table
      only if the argument is NULL.  */
   struct bfd_hash_entry *(*newfunc)
     (struct bfd_hash_entry *, struct bfd_hash_table *, const char *);
-   /* An objalloc for this hash table.  This is a struct objalloc *,
+  /* An objalloc for this hash table.  This is a struct objalloc *,
      but we use void * to avoid requiring the inclusion of objalloc.h.  */
   void *memory;
   /* The number of slots in the hash table.  */
@@ -496,7 +496,7 @@ extern int bfd_stat (bfd *, struct stat *);
   (_bfd_warn_deprecated ("bfd_read", __FILE__, __LINE__, __FUNCTION__),	\
    bfd_bread ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
 #define bfd_write(BUF, ELTSIZE, NITEMS, ABFD)				\
-  (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__),	\
+  (_bfd_warn_deprecated ("bfd_write", __FILE__, __LINE__, __FUNCTION__), \
    bfd_bwrite ((BUF), (ELTSIZE) * (NITEMS), (ABFD)))
 #else
 #define bfd_read(BUF, ELTSIZE, NITEMS, ABFD)				\
@@ -942,7 +942,7 @@ extern void bfd_elf32_arm_keep_private_stub_output_sections
 /* ELF ARM mapping symbol support.  */
 #define BFD_ARM_SPECIAL_SYM_TYPE_MAP	(1 << 0)
 #define BFD_ARM_SPECIAL_SYM_TYPE_TAG	(1 << 1)
-#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER  (1 << 2)
+#define BFD_ARM_SPECIAL_SYM_TYPE_OTHER	(1 << 2)
 #define BFD_ARM_SPECIAL_SYM_TYPE_ANY	(~0)
 
 extern bfd_boolean bfd_is_arm_special_symbol_name
@@ -1173,9 +1173,9 @@ char *bfd_follow_build_id_debuglink (bfd *abfd, const char *dir);
 
 #define bfd_put(bits, abfd, val, ptr)                  \
   ((bits) == 8 ? bfd_put_8  (abfd, val, ptr)           \
-   : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)                \
-   : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)                \
-   : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)                \
+   : (bits) == 16 ? bfd_put_16 (abfd, val, ptr)        \
+   : (bits) == 32 ? bfd_put_32 (abfd, val, ptr)        \
+   : (bits) == 64 ? bfd_put_64 (abfd, val, ptr)        \
    : (abort (), (void) 0))
 
 
@@ -1274,31 +1274,31 @@ typedef struct bfd_section
      synthesized from other information.  */
   flagword flags;
 
-#define SEC_NO_FLAGS   0x000
+#define SEC_NO_FLAGS                      0x0
 
   /* 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
+#define SEC_ALLOC                         0x1
 
   /* Tells the OS to load the section from the file when loading.
      This is clear for a .bss section.  */
-#define SEC_LOAD       0x002
+#define SEC_LOAD                          0x2
 
   /* The section contains data still to be relocated, so there is
      some relocation information too.  */
-#define SEC_RELOC      0x004
+#define SEC_RELOC                         0x4
 
   /* A signal to the OS that the section contains read only data.  */
-#define SEC_READONLY   0x008
+#define SEC_READONLY                      0x8
 
   /* The section contains code only.  */
-#define SEC_CODE       0x010
+#define SEC_CODE                         0x10
 
   /* The section contains data only.  */
-#define SEC_DATA       0x020
+#define SEC_DATA                         0x20
 
   /* The section will reside in ROM.  */
-#define SEC_ROM        0x040
+#define SEC_ROM                          0x40
 
   /* The section contains constructor information. This section
      type is used by the linker to create lists of constructors and
@@ -1310,19 +1310,19 @@ typedef struct bfd_section
      sections called <<__CTOR_LIST__>> and relocate the data
      contained within - exactly the operations it would peform on
      standard data.  */
-#define SEC_CONSTRUCTOR 0x080
+#define SEC_CONSTRUCTOR                  0x80
 
   /* 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 0x100
+#define SEC_HAS_CONTENTS                0x100
 
   /* An instruction to the linker to not output the section
      even if it has information which would normally be written.  */
-#define SEC_NEVER_LOAD 0x200
+#define SEC_NEVER_LOAD                  0x200
 
   /* The section contains thr[...]

[diff truncated at 100000 bytes]



More information about the Binutils-cvs mailing list