]> git.ipfire.org Git - thirdparty/binutils-gdb.git/blobdiff - bfd/Makefile.am
Also install diagnostics.h
[thirdparty/binutils-gdb.git] / bfd / Makefile.am
index 03b644261ad26087de0cfdea219cebefd4f59e38..3f3487f6a46d6c70b14958e34c05c01c0068d890 100644 (file)
@@ -1,23 +1,23 @@
 ## Process this file with automake to generate Makefile.in
 #
-#   Copyright (C) 2012-2015 Free Software Foundation, Inc.
+#   Copyright (C) 2012-2018 Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; see the file COPYING3.  If not see
 # <http://www.gnu.org/licenses/>.
 #
 
-AUTOMAKE_OPTIONS = 1.11 no-dist foreign
+AUTOMAKE_OPTIONS = no-dist foreign
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
 
 INCDIR = $(srcdir)/../include
@@ -32,7 +32,8 @@ if INSTALL_LIBBFD
 bfdlibdir = @bfdlibdir@
 bfdincludedir = @bfdincludedir@
 bfdlib_LTLIBRARIES = libbfd.la
-bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h
+bfdinclude_HEADERS = $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
+                    $(INCDIR)/bfdlink.h $(INCDIR)/diagnostics.h
 else !INSTALL_LIBBFD
 # Empty these so that the respective installation directories will not be created.
 bfdlibdir =
@@ -107,14 +108,11 @@ ALL_MACHINES = \
        cpu-frv.lo \
        cpu-ft32.lo \
        cpu-h8300.lo \
-       cpu-h8500.lo \
        cpu-hppa.lo \
-       cpu-i370.lo \
        cpu-i386.lo \
+       cpu-iamcu.lo \
        cpu-l1om.lo \
        cpu-k1om.lo \
-       cpu-i860.lo \
-       cpu-i960.lo \
        cpu-ia64.lo \
        cpu-ip2k.lo \
        cpu-iq2000.lo \
@@ -126,9 +124,9 @@ ALL_MACHINES = \
        cpu-m68hc11.lo \
        cpu-m68hc12.lo \
        cpu-m9s12x.lo \
+       cpu-s12z.lo \
        cpu-m9s12xg.lo \
        cpu-m68k.lo \
-       cpu-m88k.lo \
        cpu-mcore.lo \
        cpu-mep.lo \
        cpu-metag.lo \
@@ -139,6 +137,7 @@ ALL_MACHINES = \
        cpu-msp430.lo \
        cpu-mt.lo \
        cpu-nds32.lo \
+       cpu-nfp.lo \
        cpu-nios2.lo \
        cpu-ns32k.lo \
        cpu-or1k.lo \
@@ -146,7 +145,9 @@ ALL_MACHINES = \
        cpu-pj.lo \
        cpu-plugin.lo \
        cpu-powerpc.lo \
+       cpu-pru.lo \
        cpu-rs6000.lo \
+       cpu-riscv.lo \
        cpu-rl78.lo \
        cpu-rx.lo \
        cpu-s390.lo \
@@ -165,8 +166,7 @@ ALL_MACHINES = \
        cpu-v850_rh850.lo \
        cpu-vax.lo \
        cpu-visium.lo \
-       cpu-w65.lo \
-       cpu-we32k.lo \
+       cpu-wasm32.lo \
        cpu-xc16x.lo \
        cpu-xgate.lo \
        cpu-xstormy16.lo \
@@ -193,14 +193,11 @@ ALL_MACHINES_CFILES = \
        cpu-frv.c \
        cpu-ft32.c \
        cpu-h8300.c \
-       cpu-h8500.c \
        cpu-hppa.c \
-       cpu-i370.c \
        cpu-i386.c \
+       cpu-iamcu.c \
        cpu-l1om.c \
        cpu-k1om.c \
-       cpu-i860.c \
-       cpu-i960.c \
        cpu-ia64.c \
        cpu-ip2k.c \
        cpu-iq2000.c \
@@ -212,9 +209,9 @@ ALL_MACHINES_CFILES = \
        cpu-m68hc11.c \
        cpu-m68hc12.c \
        cpu-m9s12x.c \
+       cpu-s12z.c \
        cpu-m9s12xg.c \
        cpu-m68k.c \
-       cpu-m88k.c \
        cpu-mcore.c \
        cpu-mep.c \
        cpu-metag.c \
@@ -225,6 +222,7 @@ ALL_MACHINES_CFILES = \
        cpu-msp430.c \
        cpu-mt.c \
        cpu-nds32.c \
+       cpu-nfp.c \
        cpu-ns32k.c \
        cpu-nios2.c \
        cpu-or1k.c \
@@ -232,7 +230,9 @@ ALL_MACHINES_CFILES = \
        cpu-pj.c \
        cpu-plugin.c \
        cpu-powerpc.c \
+       cpu-pru.c \
        cpu-rs6000.c \
+       cpu-riscv.c \
        cpu-rl78.c \
        cpu-rx.c \
        cpu-s390.c \
@@ -251,8 +251,7 @@ ALL_MACHINES_CFILES = \
        cpu-v850_rh850.c \
        cpu-vax.c \
        cpu-visium.c \
-       cpu-w65.c \
-       cpu-we32k.c \
+       cpu-wasm32.c \
        cpu-xc16x.c \
        cpu-xgate.c \
        cpu-xstormy16.c \
@@ -263,42 +262,21 @@ ALL_MACHINES_CFILES = \
 # The .o files needed by all of the 32 bit vectors that are configured into
 # target_vector in targets.c if configured with --enable-targets=all.
 BFD32_BACKENDS = \
-       aout-adobe.lo \
-       aout-arm.lo \
        aout-cris.lo \
        aout-ns32k.lo \
-       aout-sparcle.lo \
        aout-tic30.lo \
-       aout0.lo \
        aout32.lo \
-       armnetbsd.lo \
-       bout.lo \
        cf-i386lynx.lo \
-       cf-sparclynx.lo \
-       coff-apollo.lo \
-       coff-arm.lo \
-       coff-aux.lo \
        coff-go32.lo \
-       coff-h8300.lo \
-       coff-h8500.lo \
        coff-i386.lo \
-       coff-i860.lo \
-       coff-i960.lo \
-       coff-m68k.lo \
-       coff-m88k.lo \
        coff-mips.lo \
        coff-rs6000.lo \
        coff-sh.lo \
-       coff-sparc.lo \
        coff-stgo32.lo \
-       coff-svm68k.lo \
        coff-tic30.lo \
        coff-tic4x.lo \
        coff-tic54x.lo \
        coff-tic80.lo \
-       coff-u68k.lo \
-       coff-w65.lo \
-       coff-we32k.lo \
        coff-z80.lo \
        coff-z8k.lo \
        coffgen.lo \
@@ -313,6 +291,7 @@ BFD32_BACKENDS = \
        elf-m10200.lo \
        elf-m10300.lo \
        elf-nacl.lo \
+       elf-properties.lo \
        elf-strtab.lo \
        elf-vxworks.lo \
        elf.lo \
@@ -335,10 +314,8 @@ BFD32_BACKENDS = \
        elf32-gen.lo \
        elf32-h8300.lo \
        elf32-hppa.lo \
-       elf32-i370.lo \
        elf32-i386.lo \
-       elf32-i860.lo \
-       elf32-i960.lo \
+       elfxx-x86.lo \
        elf32-ip2k.lo \
        elf32-iq2000.lo \
        elf32-lm32.lo \
@@ -348,7 +325,7 @@ BFD32_BACKENDS = \
        elf32-m68hc12.lo \
        elf32-m68hc1x.lo \
        elf32-m68k.lo \
-       elf32-m88k.lo \
+       elf32-s12z.lo \
        elf32-mcore.lo \
        elf32-mep.lo \
        elf32-metag.lo \
@@ -361,13 +338,11 @@ BFD32_BACKENDS = \
        elf32-or1k.lo \
        elf32-pj.lo \
        elf32-ppc.lo \
+       elf32-pru.lo \
        elf32-rl78.lo \
        elf32-rx.lo \
        elf32-s390.lo \
-       elf32-sh-symbian.lo \
        elf32-sh.lo \
-       elf32-sh64-com.lo \
-       elf32-sh64.lo \
        elf32-sparc.lo \
        elf32-spu.lo \
        elf32-tic6x.lo \
@@ -376,6 +351,7 @@ BFD32_BACKENDS = \
        elf32-v850.lo \
        elf32-vax.lo \
        elf32-visium.lo \
+       elf32-wasm32.lo \
        elf32-xc16x.lo \
        elf32-xgate.lo \
        elf32-xstormy16.lo \
@@ -384,44 +360,20 @@ BFD32_BACKENDS = \
        elflink.lo \
        elfxx-sparc.lo \
        elfxx-tilegx.lo \
-       epoc-pe-arm.lo \
-       epoc-pei-arm.lo \
-       hp300bsd.lo \
-       hp300hpux.lo \
        i386aout.lo \
        i386bsd.lo \
-       i386dynix.lo \
-       i386freebsd.lo \
-       i386linux.lo \
        i386lynx.lo \
-       i386mach3.lo \
        i386msdos.lo \
-       i386netbsd.lo \
-       i386os9k.lo \
-       ieee.lo \
-       m68k4knetbsd.lo \
-       m68klinux.lo \
-       m68knetbsd.lo \
-       m88kmach3.lo \
-       m88kopenbsd.lo \
        mach-o.lo \
        mach-o-i386.lo \
-       mipsbsd.lo \
-       newsos3.lo \
-       nlm.lo \
-       nlm32-i386.lo \
-       nlm32-ppc.lo \
-       nlm32-sparc.lo \
-       nlm32.lo \
+       mach-o-arm.lo \
        ns32knetbsd.lo \
-       oasys.lo \
        pc532-mach.lo \
        pdp11.lo \
        pe-arm-wince.lo \
        pe-arm.lo \
        pe-i386.lo \
        pe-mcore.lo \
-       pe-mips.lo \
        pe-ppc.lo \
        pe-sh.lo \
        pef.lo \
@@ -429,67 +381,39 @@ BFD32_BACKENDS = \
        pei-arm.lo \
        pei-i386.lo \
        pei-mcore.lo \
-       pei-mips.lo \
        pei-ppc.lo \
        pei-sh.lo \
        peigen.lo \
        plugin.lo \
        ppcboot.lo \
        reloc16.lo \
-       riscix.lo \
        som.lo \
-       sparclinux.lo \
-       sparclynx.lo \
-       sparcnetbsd.lo \
-       sunos.lo \
        vax1knetbsd.lo \
-       vaxbsd.lo \
        vaxnetbsd.lo \
-       versados.lo \
        vms-lib.lo \
        vms-misc.lo \
+       wasm-module.lo \
        xcofflink.lo \
        xsym.lo \
        xtensa-isa.lo \
        xtensa-modules.lo
 
 BFD32_BACKENDS_CFILES = \
-       aout-adobe.c \
-       aout-arm.c \
        aout-cris.c \
        aout-ns32k.c \
-       aout-sparcle.c \
        aout-tic30.c \
-       aout0.c \
        aout32.c \
-       armnetbsd.c \
-       bout.c \
        cf-i386lynx.c \
-       cf-sparclynx.c \
-       coff-apollo.c \
-       coff-arm.c \
-       coff-aux.c \
        coff-go32.c \
-       coff-h8300.c \
-       coff-h8500.c \
        coff-i386.c \
-       coff-i860.c \
-       coff-i960.c \
-       coff-m68k.c \
-       coff-m88k.c \
        coff-mips.c \
        coff-rs6000.c \
        coff-sh.c \
-       coff-sparc.c \
        coff-stgo32.c \
-       coff-svm68k.c \
        coff-tic30.c \
        coff-tic4x.c \
        coff-tic54x.c \
        coff-tic80.c \
-       coff-u68k.c \
-       coff-w65.c \
-       coff-we32k.c \
        coff-z80.c \
        coff-z8k.c \
        coffgen.c \
@@ -504,6 +428,7 @@ BFD32_BACKENDS_CFILES = \
        elf-m10200.c \
        elf-m10300.c \
        elf-nacl.c \
+       elf-properties.c \
        elf-strtab.c \
        elf-vxworks.c \
        elf.c \
@@ -526,10 +451,8 @@ BFD32_BACKENDS_CFILES = \
        elf32-gen.c \
        elf32-h8300.c \
        elf32-hppa.c \
-       elf32-i370.c \
        elf32-i386.c \
-       elf32-i860.c \
-       elf32-i960.c \
+       elfxx-x86.c \
        elf32-ip2k.c \
        elf32-iq2000.c \
        elf32-lm32.c \
@@ -539,7 +462,7 @@ BFD32_BACKENDS_CFILES = \
        elf32-m68hc12.c \
        elf32-m68hc1x.c \
        elf32-m68k.c \
-       elf32-m88k.c \
+       elf32-s12z.c \
        elf32-mcore.c \
        elf32-mep.c \
        elf32-metag.c \
@@ -552,13 +475,11 @@ BFD32_BACKENDS_CFILES = \
        elf32-or1k.c \
        elf32-pj.c \
        elf32-ppc.c \
+       elf32-pru.c \
        elf32-rl78.c \
        elf32-rx.c \
        elf32-s390.c \
-       elf32-sh-symbian.c \
        elf32-sh.c \
-       elf32-sh64-com.c \
-       elf32-sh64.c \
        elf32-sparc.c \
        elf32-spu.c \
        elf32-tic6x.c \
@@ -567,6 +488,7 @@ BFD32_BACKENDS_CFILES = \
        elf32-v850.c \
        elf32-vax.c \
        elf32-visium.c \
+       elf32-wasm32.c \
        elf32-xc16x.c \
        elf32-xgate.c \
        elf32-xstormy16.c \
@@ -575,44 +497,20 @@ BFD32_BACKENDS_CFILES = \
        elflink.c \
        elfxx-sparc.c \
        elfxx-tilegx.c \
-       epoc-pe-arm.c \
-       epoc-pei-arm.c \
-       hp300bsd.c \
-       hp300hpux.c \
        i386aout.c \
        i386bsd.c \
-       i386dynix.c \
-       i386freebsd.c \
-       i386linux.c \
        i386lynx.c \
-       i386mach3.c \
        i386msdos.c \
-       i386netbsd.c \
-       i386os9k.c \
-       ieee.c \
-       m68k4knetbsd.c \
-       m68klinux.c \
-       m68knetbsd.c \
-       m88kmach3.c \
-       m88kopenbsd.c \
        mach-o.c \
        mach-o-i386.c \
-       mipsbsd.c \
-       newsos3.c \
-       nlm.c \
-       nlm32-i386.c \
-       nlm32-ppc.c \
-       nlm32-sparc.c \
-       nlm32.c \
+       mach-o-arm.c \
        ns32knetbsd.c \
-       oasys.c \
        pc532-mach.c \
        pdp11.c \
        pe-arm-wince.c \
        pe-arm.c \
        pe-i386.c \
        pe-mcore.c \
-       pe-mips.c \
        pe-ppc.c \
        pe-sh.c \
        pef.c \
@@ -620,24 +518,17 @@ BFD32_BACKENDS_CFILES = \
        pei-arm.c \
        pei-i386.c \
        pei-mcore.c \
-       pei-mips.c \
        pei-ppc.c \
        pei-sh.c \
        plugin.c \
        ppcboot.c \
        reloc16.c \
-       riscix.c \
        som.c \
-       sparclinux.c \
-       sparclynx.c \
-       sparcnetbsd.c \
-       sunos.c \
        vax1knetbsd.c \
-       vaxbsd.c \
        vaxnetbsd.c \
-       versados.c \
        vms-lib.c \
        vms-misc.c \
+       wasm-module.c \
        xcofflink.c \
        xsym.c \
        xtensa-isa.c \
@@ -657,7 +548,6 @@ BFD64_BACKENDS = \
        coff-alpha.lo \
        coff-x86_64.lo \
        coff64-rs6000.lo \
-       demo64.lo \
        elf32-ia64.lo \
        elf32-mips.lo \
        elf32-score.lo \
@@ -667,22 +557,25 @@ BFD64_BACKENDS = \
        elf64-hppa.lo \
        elf64-ia64.lo \
        elf64-ia64-vms.lo \
+       elfxx-ia64.lo \
+       elfn32-mips.lo \
        elf64-mips.lo \
+       elfxx-mips.lo \
        elf64-mmix.lo \
+       elf64-nfp.lo \
        elf64-ppc.lo \
+       elf32-riscv.lo \
+       elf64-riscv.lo \
+       elfxx-riscv.lo \
        elf64-s390.lo \
-       elf64-sh64.lo \
        elf64-sparc.lo \
        elf64-tilegx.lo \
        elf64-x86-64.lo \
+       elfxx-x86.lo \
        elf64.lo \
-       elfn32-mips.lo \
-       elfxx-ia64.lo \
-       elfxx-mips.lo \
+       mach-o-aarch64.lo \
        mach-o-x86-64.lo \
        mmo.lo \
-       nlm32-alpha.lo \
-       nlm64.lo \
        pe-x86_64.lo \
        pei-ia64.lo \
        pei-x86_64.lo \
@@ -696,7 +589,6 @@ BFD64_BACKENDS_CFILES = \
        coff-alpha.c \
        coff-x86_64.c \
        coff64-rs6000.c \
-       demo64.c \
        elf32-mips.c \
        elf32-score.c \
        elf32-score7.c \
@@ -706,21 +598,22 @@ BFD64_BACKENDS_CFILES = \
        elf64-ia64-vms.c \
        elf64-mips.c \
        elf64-mmix.c \
+       elf64-nfp.c \
        elf64-ppc.c \
        elf64-s390.c \
-       elf64-sh64.c \
        elf64-sparc.c \
        elf64-tilegx.c \
        elf64-x86-64.c \
+       elfxx-x86.c \
        elf64.c \
        elfn32-mips.c \
        elfxx-aarch64.c \
        elfxx-ia64.c \
        elfxx-mips.c \
+       elfxx-riscv.c \
+       mach-o-aarch64.c \
        mach-o-x86-64.c \
        mmo.c \
-       nlm32-alpha.c \
-       nlm64.c \
        pe-x86_64.c \
        pei-ia64.c \
        pei-x86_64.c \
@@ -732,6 +625,7 @@ OPTIONAL_BACKENDS = \
        hpux-core.lo \
        irix-core.lo \
        lynx-core.lo \
+       netbsd-core.lo \
        osf-core.lo \
        rs6000-core.lo \
        sco5-core.lo \
@@ -743,6 +637,7 @@ OPTIONAL_BACKENDS_CFILES = \
        hpux-core.c \
        irix-core.c \
        lynx-core.c \
+       netbsd-core.c \
        osf-core.c \
        rs6000-core.c \
        sco5-core.c \
@@ -763,7 +658,7 @@ BFD_MACHINES = @bfd_machines@
 TDEFAULTS = @tdefaults@
 HAVEVECS = @havevecs@
 
-INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) \
+AM_CPPFLAGS += @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) \
        $(HAVEVECS) @INCINTL@
 
 # C source files that correspond to .o's.
@@ -777,19 +672,21 @@ SOURCE_CFILES = \
 
 BUILD_CFILES = \
        elf32-aarch64.c elf64-aarch64.c \
-       elf32-ia64.c elf64-ia64.c peigen.c pepigen.c pex64igen.c
+       elf32-ia64.c elf64-ia64.c \
+       elf32-riscv.c elf64-riscv.c \
+       peigen.c pepigen.c pex64igen.c
 
 CFILES = $(SOURCE_CFILES) $(BUILD_CFILES)
 
 ## This is a list of all .h files which are in the source tree.
 SOURCE_HFILES = \
-       aout-target.h aoutf1.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
-       elf-bfd.h elf-hppa.h elf-linux-psinfo.h elf32-hppa.h \
+       aout-target.h aoutx.h coffcode.h coffswap.h ecoffswap.h \
+       elf-bfd.h elf-hppa.h elf-linux-core.h elf32-hppa.h \
        elf64-hppa.h elfcode.h elfcore.h \
-       freebsd.h genlink.h go32stub.h \
-       libaout.h libbfd.h libcoff.h libecoff.h libhppa.h libieee.h \
-       libnlm.h liboasys.h libpei.h libxcoff.h mach-o.h \
-       netbsd.h nlm-target.h nlmcode.h nlmswap.h ns32k.h \
+       genlink.h go32stub.h \
+       libaout.h libbfd.h libcoff.h libecoff.h libhppa.h \
+       libpei.h libxcoff.h mach-o.h \
+       netbsd.h ns32k.h \
        pef.h pef-traceback.h peicode.h som.h version.h \
        vms.h xsym.h
 
@@ -858,7 +755,7 @@ noinst_LIBRARIES = libbfd.a
 libbfd_a_SOURCES =
 
 stamp-lib: libbfd.la
-       libtooldir=`$(LIBTOOL) --config | sed -n -e 's/^objdir=//p'`; \
+       libtooldir=`$(LIBTOOL) --config | $(SED) -n -e 's/^objdir=//p'`; \
        if [ -f $$libtooldir/libbfd.a ]; then \
          cp $$libtooldir/libbfd.a libbfd.tmp; \
          $(RANLIB) libbfd.tmp; \
@@ -873,7 +770,7 @@ libbfd.a: stamp-lib ; @true
 # itself, but is included by targets.c.
 targmatch.h: config.bfd targmatch.sed
        rm -f targmatch.h
-       sed -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
+       $(SED) -f $(srcdir)/targmatch.sed < $(srcdir)/config.bfd > targmatch.new
        mv -f targmatch.new targmatch.h
 
 # When compiling archures.c and targets.c, supply the default target
@@ -917,49 +814,61 @@ endif
 
 elf32-target.h : elfxx-target.h
        rm -f elf32-target.h
-       sed -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfxx-target.h > elf32-target.new
        mv -f elf32-target.new elf32-target.h
 
 elf64-target.h : elfxx-target.h
        rm -f elf64-target.h
-       sed -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfxx-target.h > elf64-target.new
        mv -f elf64-target.new elf64-target.h
 
 elf32-aarch64.c : elfnn-aarch64.c
        rm -f elf32-aarch64.c
        echo "#line 1 \"$(srcdir)/elfnn-aarch64.c\"" > elf32-aarch64.new
-       sed -e s/NN/32/g < $(srcdir)/elfnn-aarch64.c >> elf32-aarch64.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfnn-aarch64.c >> elf32-aarch64.new
        mv -f elf32-aarch64.new elf32-aarch64.c
 
 elf64-aarch64.c : elfnn-aarch64.c
        rm -f elf64-aarch64.c
        echo "#line 1 \"$(srcdir)/elfnn-aarch64.c\"" > elf64-aarch64.new
-       sed -e s/NN/64/g < $(srcdir)/elfnn-aarch64.c >> elf64-aarch64.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfnn-aarch64.c >> elf64-aarch64.new
        mv -f elf64-aarch64.new elf64-aarch64.c
 
 elf32-ia64.c : elfnn-ia64.c
        rm -f elf32-ia64.c
-       sed -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
+       $(SED) -e s/NN/32/g < $(srcdir)/elfnn-ia64.c > elf32-ia64.new
        mv -f elf32-ia64.new elf32-ia64.c
 
 elf64-ia64.c : elfnn-ia64.c
        rm -f elf64-ia64.c
-       sed -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
+       $(SED) -e s/NN/64/g < $(srcdir)/elfnn-ia64.c > elf64-ia64.new
        mv -f elf64-ia64.new elf64-ia64.c
 
+elf32-riscv.c : elfnn-riscv.c
+       rm -f elf32-riscv.c
+       echo "#line 1 \"$(srcdir)/elfnn-riscv.c\"" > elf32-riscv.new
+       sed -e s/NN/32/g < $(srcdir)/elfnn-riscv.c >> elf32-riscv.new
+       mv -f elf32-riscv.new elf32-riscv.c
+
+elf64-riscv.c : elfnn-riscv.c
+       rm -f elf64-riscv.c
+       echo "#line 1 \"$(srcdir)/elfnn-riscv.c\"" > elf64-riscv.new
+       sed -e s/NN/64/g < $(srcdir)/elfnn-riscv.c >> elf64-riscv.new
+       mv -f elf64-riscv.new elf64-riscv.c
+
 peigen.c : peXXigen.c
        rm -f peigen.c
-       sed -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
+       $(SED) -e s/XX/pe/g < $(srcdir)/peXXigen.c > peigen.new
        mv -f peigen.new peigen.c
 
 pepigen.c : peXXigen.c
        rm -f pepigen.c
-       sed -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
+       $(SED) -e s/XX/pep/g < $(srcdir)/peXXigen.c > pepigen.new
        mv -f pepigen.new pepigen.c
 
 pex64igen.c: peXXigen.c
        rm -f pex64igen.c
-       sed -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
+       $(SED) -e s/XX/pex64/g < $(srcdir)/peXXigen.c > pex64igen.new
        mv -f pex64igen.new pex64igen.c
 
 BFD_H_DEPS= $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h
@@ -989,12 +898,13 @@ stmp-bfd-h: bfd-in3.h
        rm -f bfd-tmp.h
        touch stmp-bfd-h
 
-BFD_H_FILES = bfd-in.h init.c opncls.c libbfd.c section.c archures.c \
-       reloc.c syms.c bfd.c bfdio.c bfdwin.c \
-       archive.c corefile.c targets.c format.c compress.c
+BFD_H_FILES = 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 compress.c
 BFD64_H_FILES = archive64.c
-LIBBFD_H_FILES = libbfd-in.h init.c libbfd.c bfdio.c bfdwin.c \
-       cache.c reloc.c archures.c elf.c
+LIBBFD_H_FILES = libbfd-in.h libbfd.c bfdio.c bfdwin.c \
+       cache.c reloc.c archures.c linker.c
 LIBCOFF_H_FILES = libcoff-in.h coffcode.h
 
 # Could really use a "copy-if-change"...
@@ -1040,18 +950,18 @@ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion
 
 bfdver.h: $(srcdir)/version.h $(srcdir)/development.sh $(srcdir)/Makefile.in
        @echo "creating $@"
-       @bfd_version=`echo "$(VERSION)" | sed -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
+       @bfd_version=`echo "$(VERSION)" | $(SED) -e 's/\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\)\.*\([^\.]*\).*/\1.00\2.00\3.00\4.00\5/' -e 's/\([^\.]*\)\..*\(..\)\..*\(..\)\..*\(..\)\..*\(..\)$$/\1\2\3\4\5/'` ;\
        bfd_version_string="\"$(VERSION)\"" ;\
        bfd_soversion="$(VERSION)" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
        report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
        . $(srcdir)/development.sh ;\
        if test "$$development" = true ; then \
-         bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
+         bfd_version_date=`$(SED) -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\
          bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\
          bfd_soversion="$(VERSION).$${bfd_version_date}" ;\
        fi ;\
-       sed -e "s,@bfd_version@,$$bfd_version," \
+       $(SED) -e "s,@bfd_version@,$$bfd_version," \
            -e "s,@bfd_version_string@,$$bfd_version_string," \
            -e "s,@bfd_version_package@,$$bfd_version_package," \
            -e "s,@report_bugs_to@,$$report_bugs_to," \