Merge branch 'master' into amd-common

Change-Id: I92319e949f4ed9069a1e1dbbc8d79bf147c72846

diff --cc bfd/Makefile.am
Simple merge

diff --cc bfd/Makefile.in
Simple merge

diff --cc bfd/archures.c
Simple merge

diff --cc bfd/bfd-in2.h
Simple merge

diff --cc bfd/config.bfd
Simple merge

diff --cc bfd/configure
Simple merge

diff --cc bfd/configure.ac
Simple merge

diff --cc bfd/targets.c
Simple merge

diff --cc binutils/readelf.c
index c0ca8609b7e14abe2c6294cc6ad343055177226e,17c27ceedaee42512894119fc99de8349dc74c5e..0ca8aabe7e843281c86fd172b23987453a5d89c2
--- 1/binutils/readelf.c
--- 2/binutils/readelf.c
+++ b/binutils/readelf.c
@@@ -1589,9 -1588,9 +1590,13 @@@ dump_relocations (Filedata *          f
            rtype = elf_nfp_reloc_type (type);
          break;
  
+       case EM_Z80:
+         rtype = elf_z80_reloc_type (type);
+         break;
++
 +      case EM_AMDGPU:
 +        rtype = elf_amdgcn_reloc_type (type);
 +        break;
        }
  
        if (rtype == NULL)