[binutils-gdb] binutils/readelf: handle AMDGPU OS ABIs

[Simon Marchi]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=37870be8740a4f903a61d43e6c1adede415473a9

commit 37870be8740a4f903a61d43e6c1adede415473a9
Author: Simon Marchi <simon.marchi@efficios.com>
Date:   Wed Mar 16 09:01:04 2022 -0400

    binutils/readelf: handle AMDGPU OS ABIs
    
    When the machine is EM_AMDGPU, handle the various OS ABIs described
    here:
    
      https://llvm.org/docs/AMDGPUUsage.html#header
    
    For a binary with the HSA OS ABI, the change looks like:
    
    -  OS/ABI:                            <unknown: 40>
    +  OS/ABI:                            AMD HSA
    
    binutils/ChangeLog:
    
            * readelf.c (get_osabi_name): Handle EM_AMDGPU OS ABIs.
    
    include/ChangeLog:
    
            * elf/common.h (ELFOSABI_AMDGPU_PAL, ELFOSABI_AMDGPU_MESA3D):
            New.
    
    Change-Id: I383590c390f7dc2fe0f902f50038735626d71863

Diff:
---
 binutils/ChangeLog   |  4 ++++
 binutils/readelf.c   | 11 +++++++++++
 include/ChangeLog    |  5 +++++
 include/elf/common.h |  2 ++
 4 files changed, 22 insertions(+)

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index bb71e5ca288..694ad49fee5 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,7 @@
+2022-03-16  Simon Marchi  <simon.marchi@efficios.com>
+
+	* readelf.c (get_osabi_name): Handle EM_AMDGPU OS ABIs.
+
 2022-03-16  Nick Clifton  <nickc@redhat.com>
 
 	* po/sr.po: Updated Serbian translation.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 8b46052c7de..e8974aacec5 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -4284,6 +4284,17 @@ get_osabi_name (Filedata * filedata, unsigned int osabi)
       if (osabi >= 64)
 	switch (filedata->file_header.e_machine)
 	  {
+	  case EM_AMDGPU:
+	    switch (osabi)
+	      {
+	      case ELFOSABI_AMDGPU_HSA:    return "AMD HSA";
+	      case ELFOSABI_AMDGPU_PAL:    return "AMD PAL";
+	      case ELFOSABI_AMDGPU_MESA3D: return "AMD Mesa3D";
+	      default:
+		break;
+	      }
+	    break;
+
 	  case EM_ARM:
 	    switch (osabi)
 	      {
diff --git a/include/ChangeLog b/include/ChangeLog
index 26a64f42b79..297dcd69443 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2022-03-16  Simon Marchi  <simon.marchi@efficios.com>
+
+	* elf/common.h (ELFOSABI_AMDGPU_PAL, ELFOSABI_AMDGPU_MESA3D):
+	New.
+
 2022-03-16  Simon Marchi  <simon.marchi@efficios.com>
 
 	* elf/amdgpu.h: New.
diff --git a/include/elf/common.h b/include/elf/common.h
index a1cace406a4..70d63e3299c 100644
--- a/include/elf/common.h
+++ b/include/elf/common.h
@@ -79,7 +79,9 @@
 #define ELFOSABI_C6000_ELFABI 64 /* Bare-metal TMS320C6000 */
 #define ELFOSABI_AMDGPU_HSA  64 /* AMD HSA Runtime */
 #define ELFOSABI_C6000_LINUX 65 /* Linux TMS320C6000 */
+#define ELFOSABI_AMDGPU_PAL  65 /* AMD PAL Runtime */
 #define ELFOSABI_ARM_FDPIC   65 /* ARM FDPIC */
+#define ELFOSABI_AMDGPU_MESA3D 66 /* AMD Mesa3D Runtime */
 #define ELFOSABI_ARM	     97	/* ARM */
 #define ELFOSABI_STANDALONE 255	/* Standalone (embedded) application */