X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=bfd%2FMakefile.am;h=cea3794c30bf075b32d75783cb6edc16a62733ba;hb=e00e81980c70659d0efe686b31a55db5faaa91f9;hp=8098ee4566dd836726cfe707ccf3abf115d4b4ba;hpb=a3c629886c2cdaa6ee89513b64c7f989ba30eba3;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/Makefile.am b/bfd/Makefile.am index 8098ee4566..cea3794c30 100644 --- a/bfd/Makefile.am +++ b/bfd/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to generate Makefile.in # -# Copyright 2012 Free Software Foundation +# Copyright (C) 2012-2014 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 @@ -20,9 +20,6 @@ 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) @@ -136,9 +133,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 \ @@ -161,6 +159,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 \ @@ -219,9 +218,10 @@ ALL_MACHINES_CFILES = \ cpu-moxie.c \ cpu-msp430.c \ cpu-mt.c \ + cpu-nds32.c \ cpu-ns32k.c \ - cpu-openrisc.c \ - cpu-or32.c \ + cpu-nios2.c \ + cpu-or1k.c \ cpu-pdp11.c \ cpu-pj.c \ cpu-plugin.c \ @@ -244,6 +244,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 \ @@ -280,7 +281,6 @@ BFD32_BACKENDS = \ coff-m68k.lo \ coff-m88k.lo \ coff-mips.lo \ - coff-or32.lo \ coff-rs6000.lo \ coff-sh.lo \ coff-sparc.lo \ @@ -344,12 +344,12 @@ BFD32_BACKENDS = \ elf32-mep.lo \ elf32-metag.lo \ elf32-microblaze.lo \ - elf32-mips.lo \ elf32-moxie.lo \ elf32-msp430.lo \ elf32-mt.lo \ - elf32-openrisc.lo \ - elf32-or32.lo \ + elf32-nds32.lo \ + elf32-nios2.lo \ + elf32-or1k.lo \ elf32-pj.lo \ elf32-ppc.lo \ elf32-rl78.lo \ @@ -366,13 +366,13 @@ BFD32_BACKENDS = \ elf32-tilepro.lo \ elf32-v850.lo \ elf32-vax.lo \ + elf32-visium.lo \ elf32-xc16x.lo \ elf32-xgate.lo \ elf32-xstormy16.lo \ elf32-xtensa.lo \ elf32.lo \ elflink.lo \ - elfxx-mips.lo \ elfxx-sparc.lo \ elfxx-tilegx.lo \ epoc-pe-arm.lo \ @@ -469,7 +469,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 \ @@ -533,12 +532,12 @@ BFD32_BACKENDS_CFILES = \ elf32-mep.c \ elf32-metag.c \ elf32-microblaze.c \ - elf32-mips.c \ elf32-moxie.c \ elf32-msp430.c \ elf32-mt.c \ - elf32-openrisc.c \ - elf32-or32.c \ + elf32-nds32.c \ + elf32-nios2.c \ + elf32-or1k.c \ elf32-pj.c \ elf32-ppc.c \ elf32-rl78.c \ @@ -555,13 +554,13 @@ BFD32_BACKENDS_CFILES = \ elf32-tilepro.c \ elf32-v850.c \ elf32-vax.c \ + elf32-visium.c \ elf32-xc16x.c \ elf32-xgate.c \ elf32-xstormy16.c \ elf32-xtensa.c \ elf32.c \ elflink.c \ - elfxx-mips.c \ elfxx-sparc.c \ elfxx-tilegx.c \ epoc-pe-arm.c \ @@ -638,15 +637,17 @@ BFD32_BACKENDS_CFILES = \ # elf32-ia64.c requires a 64-bit bfd_vma, and hence can not be put in # BFD32_BACKENDS. BFD64_BACKENDS = \ + elf32-aarch64.lo \ elf64-aarch64.lo \ + elfxx-aarch64.lo \ aix5ppc-core.lo \ aout64.lo \ coff-alpha.lo \ coff-x86_64.lo \ coff64-rs6000.lo \ demo64.lo \ - elf-nacl.lo \ elf32-ia64.lo \ + elf32-mips.lo \ elf32-score.lo \ elf32-score7.lo \ elf64-alpha.lo \ @@ -665,6 +666,7 @@ BFD64_BACKENDS = \ elf64.lo \ elfn32-mips.lo \ elfxx-ia64.lo \ + elfxx-mips.lo \ mach-o-x86-64.lo \ mmo.lo \ nlm32-alpha.lo \ @@ -677,14 +679,13 @@ BFD64_BACKENDS = \ vms-alpha.lo BFD64_BACKENDS_CFILES = \ - elf64-aarch64.c \ aix5ppc-core.c \ aout64.c \ coff-alpha.c \ coff-x86_64.c \ coff64-rs6000.c \ demo64.c \ - elf-nacl.c \ + elf32-mips.c \ elf32-score.c \ elf32-score7.c \ elf64-alpha.c \ @@ -701,7 +702,9 @@ 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 \ mmo.c \ nlm32-alpha.c \ @@ -733,15 +736,14 @@ OPTIONAL_BACKENDS_CFILES = \ sco5-core.c \ 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@ @@ -762,6 +764,7 @@ SOURCE_CFILES = \ $(OPTIONAL_BACKENDS_CFILES) BUILD_CFILES = \ + elf32-aarch64.c elf64-aarch64.c \ elf32-ia64.c elf64-ia64.c peigen.c pepigen.c pex64igen.c CFILES = $(SOURCE_CFILES) $(BUILD_CFILES) @@ -769,7 +772,7 @@ 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 elf32-hppa.h \ + elf-bfd.h elf-hppa.h elf-linux-psinfo.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 \ @@ -910,6 +913,18 @@ elf64-target.h : elfxx-target.h 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 + 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 + 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 @@ -1011,14 +1026,15 @@ CLEANFILES = bfd.h dep.sed stmp-bfd-h DEP DEPA DEP1 DEP2 libbfd.a stamp-lib \ DISTCLEANFILES = $(BUILD_CFILES) $(BUILD_HFILES) libtool-soversion -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}" ;\