Merge branch 'master' into merge-job

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

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index f31a7345994d0275169d62a09989781cd637619c..1aa307a5b036b50e628f2102ab3a41f4533126ba 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -1,6 +1,7 @@
 ## Process this file with automake to generate Makefile.in
 #
-#   Copyright (C) 2012-2019 Free Software Foundation, Inc.
+#   Copyright (C) 2012-2020 Free Software Foundation, Inc.
+#   Copyright (C) 2019-2020 Advanced Micro Devices, Inc. All rights reserved.
 #
 # 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
@@ -53,7 +54,7 @@ ZLIBINC = @zlibinc@
 WARN_CFLAGS = @WARN_CFLAGS@
 NO_WERROR = @NO_WERROR@
 AM_CFLAGS = $(WARN_CFLAGS) $(ZLIBINC)
-AM_CPPFLAGS = -DBINDIR='"$(bindir)"'
+AM_CPPFLAGS = -DBINDIR='"$(bindir)"' -DLIBDIR='"$(libdir)"'
 if PLUGINS
 bfdinclude_HEADERS += $(INCDIR)/plugin-api.h
 LIBDL = @lt_cv_dlopen_libs@
@@ -92,13 +93,13 @@ BFD64_LIBS_CFILES = archive64.c
 ALL_MACHINES = \
        cpu-aarch64.lo \
        cpu-alpha.lo \
+       cpu-amdgcn.lo \
        cpu-arc.lo \
        cpu-arm.lo \
        cpu-avr.lo \
        cpu-bfin.lo \
        cpu-bpf.lo \
        cpu-cr16.lo \
-       cpu-cr16c.lo \
        cpu-cris.lo \
        cpu-crx.lo \
        cpu-csky.lo \
@@ -161,7 +162,6 @@ ALL_MACHINES = \
        cpu-tic4x.lo \
        cpu-tic54x.lo \
        cpu-tic6x.lo \
-       cpu-tic80.lo \
        cpu-tilegx.lo \
        cpu-tilepro.lo \
        cpu-v850.lo \
@@ -179,13 +179,13 @@ ALL_MACHINES = \
 ALL_MACHINES_CFILES = \
        cpu-aarch64.c \
        cpu-alpha.c \
+       cpu-amdgcn.c \
        cpu-arc.c \
        cpu-arm.c \
        cpu-avr.c \
        cpu-bfin.c \
        cpu-bpf.c \
        cpu-cr16.c \
-       cpu-cr16c.c \
        cpu-cris.c \
        cpu-crx.c \
        cpu-csky.c \
@@ -248,7 +248,6 @@ ALL_MACHINES_CFILES = \
        cpu-tic4x.c \
        cpu-tic54x.c \
        cpu-tic6x.c \
-       cpu-tic80.c \
        cpu-tilegx.c \
        cpu-tilepro.c \
        cpu-v850.c \
@@ -280,7 +279,6 @@ BFD32_BACKENDS = \
        coff-tic30.lo \
        coff-tic4x.lo \
        coff-tic54x.lo \
-       coff-tic80.lo \
        coff-z80.lo \
        coff-z8k.lo \
        coffgen.lo \
@@ -304,7 +302,6 @@ BFD32_BACKENDS = \
        elf32-avr.lo \
        elf32-bfin.lo \
        elf32-cr16.lo \
-       elf32-cr16c.lo \
        elf32-cris.lo \
        elf32-crx.lo \
        elf32-csky.lo \
@@ -360,6 +357,7 @@ BFD32_BACKENDS = \
        elf32-xgate.lo \
        elf32-xstormy16.lo \
        elf32-xtensa.lo \
+       elf32-z80.lo \
        elf32.lo \
        elflink.lo \
        elfxx-sparc.lo \
@@ -417,7 +415,6 @@ BFD32_BACKENDS_CFILES = \
        coff-tic30.c \
        coff-tic4x.c \
        coff-tic54x.c \
-       coff-tic80.c \
        coff-z80.c \
        coff-z8k.c \
        coffgen.c \
@@ -441,7 +438,6 @@ BFD32_BACKENDS_CFILES = \
        elf32-avr.c \
        elf32-bfin.c \
        elf32-cr16.c \
-       elf32-cr16c.c \
        elf32-cris.c \
        elf32-crx.c \
        elf32-csky.c \
@@ -497,6 +493,7 @@ BFD32_BACKENDS_CFILES = \
        elf32-xgate.c \
        elf32-xstormy16.c \
        elf32-xtensa.c \
+       elf32-z80.c \
        elf32.c \
        elflink.c \
        elfxx-sparc.c \
@@ -557,6 +554,7 @@ BFD64_BACKENDS = \
        elf32-score.lo \
        elf32-score7.lo \
        elf64-alpha.lo \
+       elf64-amdgcn.lo \
        elf64-gen.lo \
        elf64-hppa.lo \
        elf64-ia64.lo \
@@ -598,6 +596,7 @@ BFD64_BACKENDS_CFILES = \
        elf32-score.c \
        elf32-score7.c \
        elf64-alpha.c \
+       elf64-amdgcn.c \
        elf64-gen.c \
        elf64-hppa.c \
        elf64-ia64-vms.c \