Add support for Nuxi CloudABI on x86-64

[deliverable/binutils-gdb.git] / bfd / Makefile.in

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 2ad992ff6ce72d0f1f313c16cde7c90eb21fcec3..aac3eb2b9dcdd5bbafef8104172d1d5190396c76 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -16,7 +16,7 @@
 @SET_MAKE@
 
 #
-#   Copyright 2012 Free Software Foundation
+#   Copyright (C) 2012-2015 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
@@ -75,12 +75,13 @@ am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \
        $(top_srcdir)/../config/plugins.m4 \
        $(top_srcdir)/../config/po.m4 \
        $(top_srcdir)/../config/progtest.m4 \
-       $(top_srcdir)/../config/stdint.m4 $(top_srcdir)/../libtool.m4 \
+       $(top_srcdir)/../config/stdint.m4 \
+       $(top_srcdir)/../config/zlib.m4 $(top_srcdir)/../libtool.m4 \
        $(top_srcdir)/../ltoptions.m4 $(top_srcdir)/../ltsugar.m4 \
        $(top_srcdir)/../ltversion.m4 $(top_srcdir)/../lt~obsolete.m4 \
        $(top_srcdir)/bfd.m4 $(top_srcdir)/warning.m4 \
-       $(top_srcdir)/acinclude.m4 $(top_srcdir)/../config/zlib.m4 \
-       $(top_srcdir)/configure.in
+       $(top_srcdir)/acinclude.m4 $(top_srcdir)/version.m4 \
+       $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -121,11 +122,10 @@ am__installdirs = "$(DESTDIR)$(bfdlibdir)" \
 LTLIBRARIES = $(bfdlib_LTLIBRARIES) $(noinst_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__objects_1 = archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo \
-       cache.lo coffgen.lo corefile.lo format.lo init.lo libbfd.lo \
-       opncls.lo reloc.lo section.lo syms.lo targets.lo hash.lo \
-       linker.lo srec.lo binary.lo tekhex.lo ihex.lo stabs.lo \
-       stab-syms.lo merge.lo dwarf2.lo simple.lo compress.lo \
-       verilog.lo
+       cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo \
+       init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo \
+       section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo \
+       binary.lo ihex.lo srec.lo tekhex.lo verilog.lo
 am_libbfd_la_OBJECTS = $(am__objects_1)
 libbfd_la_OBJECTS = $(am_libbfd_la_OBJECTS)
 libbfd_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -335,11 +335,10 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 wordsize = @wordsize@
+zlibdir = @zlibdir@
+zlibinc = @zlibinc@
 AUTOMAKE_OPTIONS = 1.11 no-dist foreign
 ACLOCAL_AMFLAGS = -I . -I .. -I ../config
-
-# Uncomment the following line when doing a release.
-# RELEASE=y
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 SUBDIRS = doc po
@@ -353,7 +352,13 @@ libbfd_la_LDFLAGS = $(am__append_1) -release `cat libtool-soversion` \
 @INSTALL_LIBBFD_TRUE@  $(INCDIR)/bfdlink.h $(am__append_2)
 @INSTALL_LIBBFD_FALSE@rpath_bfdlibdir = @bfdlibdir@
 @INSTALL_LIBBFD_FALSE@noinst_LTLIBRARIES = libbfd.la
-AM_CFLAGS = $(WARN_CFLAGS)
+
+# This is where we get zlib from.  zlibdir is -L../zlib and zlibinc is
+# -I../zlib, unless we were configured with --with-system-zlib, in which
+# case both are empty.
+ZLIB = @zlibdir@ -lz
+ZLIBINC = @zlibinc@
+AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
 AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
 @PLUGINS_TRUE@LIBDL = @lt_cv_dlopen_libs@
 
@@ -369,20 +374,18 @@ BFD_H = bfd.h
 # debugger).
 BFD32_LIBS = \
        archive.lo archures.lo bfd.lo bfdio.lo bfdwin.lo \
-       cache.lo coffgen.lo corefile.lo \
-       format.lo init.lo libbfd.lo opncls.lo reloc.lo \
-       section.lo syms.lo targets.lo hash.lo linker.lo \
-       srec.lo binary.lo tekhex.lo ihex.lo stabs.lo stab-syms.lo \
-       merge.lo dwarf2.lo simple.lo compress.lo verilog.lo
+       cache.lo coff-bfd.lo compress.lo corefile.lo format.lo hash.lo \
+       init.lo libbfd.lo linker.lo merge.lo opncls.lo reloc.lo \
+       section.lo simple.lo stab-syms.lo stabs.lo syms.lo targets.lo \
+       binary.lo ihex.lo srec.lo tekhex.lo verilog.lo
 
 BFD64_LIBS = archive64.lo
 BFD32_LIBS_CFILES = \
        archive.c archures.c bfd.c bfdio.c bfdwin.c \
-       cache.c coffgen.c corefile.c \
-       format.c init.c libbfd.c opncls.c reloc.c \
-       section.c syms.c targets.c hash.c linker.c \
-       srec.c binary.c tekhex.c ihex.c stabs.c stab-syms.c \
-       merge.c dwarf2.c simple.c compress.c verilog.c
+       cache.c coff-bfd.c compress.c corefile.c format.c hash.c \
+       init.c libbfd.c linker.c merge.c opncls.c reloc.c \
+       section.c simple.c stab-syms.c stabs.c syms.c targets.c \
+       binary.c ihex.c srec.c tekhex.c verilog.c
 
 BFD64_LIBS_CFILES = archive64.c
 
@@ -405,6 +408,7 @@ ALL_MACHINES = \
        cpu-epiphany.lo \
        cpu-fr30.lo \
        cpu-frv.lo \
+       cpu-ft32.lo \
        cpu-h8300.lo \
        cpu-h8500.lo \
        cpu-hppa.lo \
@@ -437,10 +441,10 @@ ALL_MACHINES = \
        cpu-moxie.lo \
        cpu-msp430.lo \
        cpu-mt.lo \
+       cpu-nds32.lo \
        cpu-nios2.lo \
        cpu-ns32k.lo \
-       cpu-openrisc.lo \
-       cpu-or32.lo \
+       cpu-or1k.lo \
        cpu-pdp11.lo \
        cpu-pj.lo \
        cpu-plugin.lo \
@@ -463,6 +467,7 @@ ALL_MACHINES = \
        cpu-v850.lo \
        cpu-v850_rh850.lo \
        cpu-vax.lo \
+       cpu-visium.lo \
        cpu-w65.lo \
        cpu-we32k.lo \
        cpu-xc16x.lo \
@@ -489,6 +494,7 @@ ALL_MACHINES_CFILES = \
        cpu-epiphany.c \
        cpu-fr30.c \
        cpu-frv.c \
+       cpu-ft32.c \
        cpu-h8300.c \
        cpu-h8500.c \
        cpu-hppa.c \
@@ -521,10 +527,10 @@ ALL_MACHINES_CFILES = \
        cpu-moxie.c \
        cpu-msp430.c \
        cpu-mt.c \
+       cpu-nds32.c \
        cpu-ns32k.c \
        cpu-nios2.c \
-       cpu-openrisc.c \
-       cpu-or32.c \
+       cpu-or1k.c \
        cpu-pdp11.c \
        cpu-pj.c \
        cpu-plugin.c \
@@ -547,6 +553,7 @@ ALL_MACHINES_CFILES = \
        cpu-v850.c \
        cpu-v850_rh850.c \
        cpu-vax.c \
+       cpu-visium.c \
        cpu-w65.c \
        cpu-we32k.c \
        cpu-xc16x.c \
@@ -584,7 +591,6 @@ BFD32_BACKENDS = \
        coff-m68k.lo \
        coff-m88k.lo \
        coff-mips.lo \
-       coff-or32.lo \
        coff-rs6000.lo \
        coff-sh.lo \
        coff-sparc.lo \
@@ -599,8 +605,10 @@ BFD32_BACKENDS = \
        coff-we32k.lo \
        coff-z80.lo \
        coff-z8k.lo \
+       coffgen.lo \
        cofflink.lo \
        dwarf1.lo \
+       dwarf2.lo \
        ecoff.lo \
        ecofflink.lo \
        elf-attrs.lo \
@@ -627,6 +635,7 @@ BFD32_BACKENDS = \
        elf32-epiphany.lo \
        elf32-fr30.lo \
        elf32-frv.lo \
+       elf32-ft32.lo \
        elf32-gen.lo \
        elf32-h8300.lo \
        elf32-hppa.lo \
@@ -651,9 +660,9 @@ BFD32_BACKENDS = \
        elf32-moxie.lo \
        elf32-msp430.lo \
        elf32-mt.lo \
+       elf32-nds32.lo \
        elf32-nios2.lo \
-       elf32-openrisc.lo \
-       elf32-or32.lo \
+       elf32-or1k.lo \
        elf32-pj.lo \
        elf32-ppc.lo \
        elf32-rl78.lo \
@@ -670,6 +679,7 @@ BFD32_BACKENDS = \
        elf32-tilepro.lo \
        elf32-v850.lo \
        elf32-vax.lo \
+       elf32-visium.lo \
        elf32-xc16x.lo \
        elf32-xgate.lo \
        elf32-xstormy16.lo \
@@ -772,7 +782,6 @@ BFD32_BACKENDS_CFILES = \
        coff-m68k.c \
        coff-m88k.c \
        coff-mips.c \
-       coff-or32.c \
        coff-rs6000.c \
        coff-sh.c \
        coff-sparc.c \
@@ -787,8 +796,10 @@ BFD32_BACKENDS_CFILES = \
        coff-we32k.c \
        coff-z80.c \
        coff-z8k.c \
+       coffgen.c \
        cofflink.c \
        dwarf1.c \
+       dwarf2.c \
        ecoff.c \
        ecofflink.c \
        elf-attrs.c \
@@ -815,6 +826,7 @@ BFD32_BACKENDS_CFILES = \
        elf32-epiphany.c \
        elf32-fr30.c \
        elf32-frv.c \
+       elf32-ft32.c \
        elf32-gen.c \
        elf32-h8300.c \
        elf32-hppa.c \
@@ -839,9 +851,9 @@ BFD32_BACKENDS_CFILES = \
        elf32-moxie.c \
        elf32-msp430.c \
        elf32-mt.c \
+       elf32-nds32.c \
        elf32-nios2.c \
-       elf32-openrisc.c \
-       elf32-or32.c \
+       elf32-or1k.c \
        elf32-pj.c \
        elf32-ppc.c \
        elf32-rl78.c \
@@ -858,6 +870,7 @@ BFD32_BACKENDS_CFILES = \
        elf32-tilepro.c \
        elf32-v850.c \
        elf32-vax.c \
+       elf32-visium.c \
        elf32-xc16x.c \
        elf32-xgate.c \
        elf32-xstormy16.c \
@@ -943,6 +956,7 @@ BFD32_BACKENDS_CFILES = \
 BFD64_BACKENDS = \
        elf32-aarch64.lo \
        elf64-aarch64.lo \
+       elfxx-aarch64.lo \
        aix5ppc-core.lo \
        aout64.lo \
        coff-alpha.lo \
@@ -1005,6 +1019,7 @@ BFD64_BACKENDS_CFILES = \
        elf64-x86-64.c \
        elf64.c \
        elfn32-mips.c \
+       elfxx-aarch64.c \
        elfxx-ia64.c \
        elfxx-mips.c \
        mach-o-x86-64.c \
@@ -1039,16 +1054,15 @@ OPTIONAL_BACKENDS_CFILES = \
        trad-core.c
 
 
-# We want to rerun configure if configure.in, config.bfd or
-# configure.host change. configure.in is needed since the version
-# number in Makefile comes from configure.in.
+# Reconfigure if config.bfd or configure.host changes.
+# development.sh is used to determine -Werror default.
 CONFIG_STATUS_DEPENDENCIES = \
-       $(srcdir)/configure.in \
        $(srcdir)/config.bfd \
-       $(srcdir)/configure.host
+       $(srcdir)/configure.host \
+       $(srcdir)/development.sh
 
 
-# These are defined by configure.in:
+# These are defined by configure:
 WORDSIZE = @wordsize@
 ALL_BACKENDS = @all_backends@
 BFD_BACKENDS = @bfd_backends@
@@ -1108,7 +1122,7 @@ OFILES = $(BFD_BACKENDS) $(BFD_MACHINES) @COREFILE@ @bfd64_libs@
 libbfd_la_SOURCES = $(BFD32_LIBS_CFILES)
 EXTRA_libbfd_la_SOURCES = $(CFILES)
 libbfd_la_DEPENDENCIES = $(OFILES) ofiles
-libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL)
+libbfd_la_LIBADD = `cat ofiles` @SHARED_LIBADD@ $(LIBDL) $(ZLIB)
 
 # libtool will build .libs/libbfd.a.  We create libbfd.a in the build
 # directory so that we don't have to convert all the programs that use
@@ -1272,6 +1286,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-apollo.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-arm.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-aux.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-bfd.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-go32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-h8300.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-h8500.Plo@am__quote@
@@ -1281,7 +1296,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m68k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-m88k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-mips.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-or32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-rs6000.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-sh.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/coff-sparc.Plo@am__quote@
@@ -1318,6 +1332,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-epiphany.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-fr30.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-frv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ft32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-h8300.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-h8500.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-hppa.Plo@am__quote@
@@ -1350,10 +1365,10 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-moxie.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-msp430.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-mt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nds32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-nios2.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-ns32k.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-openrisc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-or32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-or1k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pdp11.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-pj.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-plugin.Plo@am__quote@
@@ -1376,6 +1391,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-v850.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-v850_rh850.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-vax.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-visium.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-w65.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-we32k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpu-xc16x.Plo@am__quote@
@@ -1414,6 +1430,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-epiphany.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-fr30.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-frv.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-ft32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-gen.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-h8300.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-hppa.Plo@am__quote@
@@ -1440,9 +1457,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-moxie.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-msp430.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-mt.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-nds32.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-nios2.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-openrisc.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-or32.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-or1k.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-pj.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-ppc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-rl78.Plo@am__quote@
@@ -1461,6 +1478,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-tilepro.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-v850.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-vax.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-visium.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-xc16x.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-xgate.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf32-xstormy16.Plo@am__quote@
@@ -1483,6 +1501,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elf64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elflink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfn32-mips.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-aarch64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-ia64.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-mips.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/elfxx-sparc.Plo@am__quote@
@@ -1993,12 +2012,14 @@ elf64-target.h : elfxx-target.h
 
 elf32-aarch64.c : elfnn-aarch64.c
        rm -f elf32-aarch64.c
-       sed -e s/NN/32/g < $(srcdir)/elfnn-aarch64.c > elf32-aarch64.new
+       echo "#line 1 \"$(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
-       sed -e s/NN/64/g < $(srcdir)/elfnn-aarch64.c > elf64-aarch64.new
+       echo "#line 1 \"$(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
@@ -2084,14 +2105,15 @@ stmp-lcoff-h: $(LIBCOFF_H_FILES)
        $(SHELL) $(srcdir)/../move-if-change libcoff.h-new $(srcdir)/libcoff.h
        touch stmp-lcoff-h
 
-bfdver.h: $(srcdir)/version.h $(srcdir)/Makefile.in
+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_string="\"$(VERSION)\"" ;\
        bfd_soversion="$(VERSION)" ;\
        bfd_version_package="\"$(PKGVERSION)\"" ;\
        report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\
-       if test "x$(RELEASE)" = x ; then \
+       . $(srcdir)/development.sh ;\
+       if test "$$development" = true ; then \
          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}" ;\