Merge remote-tracking branch 'origin/master' into amd-common

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

diff --git a/binutils/elfedit.c b/binutils/elfedit.c
index 98d4fd7203a2065d12cf0e798d07c2761ebfce35..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-2018 Free Software Foundation, Inc.
+   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.
 
@@ -225,7 +226,7 @@ update_gnu_property (const char *file_name, FILE *file)
                        if (disable_x86_features)
                          bitmask &= ~disable_x86_features;
                        if (old_bitmask != bitmask)
-                         BYTE_PUT (ptr, bitmask);
+                         byte_put (ptr, bitmask, 4);
                        goto out;
                      }
 
@@ -260,7 +261,10 @@ elf_x86_feature (const char *feature, int enable)
   else if (strcasecmp (feature, "shstk") == 0)
     x86_feature = GNU_PROPERTY_X86_FEATURE_1_SHSTK;
   else
-    return -1;
+    {
+      error (_("Unknown x86 feature: %s\n"), feature);
+      return -1;
+    }
 
   if (enable)
     {
@@ -289,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:
@@ -816,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;