Merge branch 'master' into merge-job

[deliverable/binutils-gdb.git] / binutils / elfedit.c

diff --git a/binutils/elfedit.c b/binutils/elfedit.c
index 7c475c903d7cc1f1f246077c2b21bc9fc916498c..fd3e404b218dd98cc0a8c0e20d15df4c5f46856a 100644 (file)
--- a/binutils/elfedit.c
+++ b/binutils/elfedit.c
@@ -1,5 +1,6 @@
 /* elfedit.c -- Update the ELF header of an ELF format file
    Copyright (C) 2010-2020 Free Software Foundation, Inc.
+   Copyright (C) 2019-2020 Advanced Micro Devices, Inc. All rights reserved.
 
    This file is part of GNU Binutils.
 
@@ -292,6 +293,7 @@ elf_class (int mach)
       return ELF_CLASS_32;
     case EM_L1OM:
     case EM_K1OM:
+    case EM_AMDGPU:
       return ELF_CLASS_64;
     case EM_X86_64:
     case EM_NONE:
@@ -819,6 +821,8 @@ elf_machine (const char *mach)
     return EM_X86_64;
   if (strcasecmp (mach, "x86-64") == 0)
     return EM_X86_64;
+  if (strcasecmp (mach, "amdgcn") == 0)
+    return EM_AMDGPU;
   if (strcasecmp (mach, "none") == 0)
     return EM_NONE;