amdgcn: Fix elf.h build issue

Allow building on systems with elf.h that includes AMDGPU definitions,
partially or completely.

gcc/ChangeLog:

	* config/gcn/mkoffload.c (EM_AMDGPU): Undefine before defining.
	(ELFOSABI_AMDGPU_HSA): Likewise.
	(ELFABIVERSION_AMDGPU_HSA): Likewise.
	(EF_AMDGPU_MACH_AMDGCN_GFX803): Likewise.
	(EF_AMDGPU_MACH_AMDGCN_GFX900): Likewise.
	(EF_AMDGPU_MACH_AMDGCN_GFX906): Likewise.
	(reserved): Delete.

(cherry picked from commit 42b47dae498aa7b849b9c9a165b22146de1934a1)

diff --git a/gcc/ChangeLog.omp b/gcc/ChangeLog.omp
index a39c6cb3fdf6e3eed53d42a7589d7e4f5cbd6c9f..9e6e95f667b73d748f670b7e58b9d551054840ba 100644 (file)
--- a/gcc/ChangeLog.omp
+++ b/gcc/ChangeLog.omp
@@ -1,3 +1,15 @@
+2020-07-17  Andrew Stubbs  <ams@codesourcery.com>
+
+       Backport from mainline (42b47dae498):
+
+       * config/gcn/mkoffload.c (EM_AMDGPU): Undefine before defining.
+       (ELFOSABI_AMDGPU_HSA): Likewise.
+       (ELFABIVERSION_AMDGPU_HSA): Likewise.
+       (EF_AMDGPU_MACH_AMDGCN_GFX803): Likewise.
+       (EF_AMDGPU_MACH_AMDGCN_GFX900): Likewise.
+       (EF_AMDGPU_MACH_AMDGCN_GFX906): Likewise.
+       (reserved): Delete.
+
 2020-07-16  Andrew Stubbs  <ams@codesourcery.com>
 
        Backport from mainline (a4f49061b6d):

diff --git a/gcc/config/gcn/mkoffload.c b/gcc/config/gcn/mkoffload.c
index 9a8416db72623af7fc13358912bb8967878e39f0..7efbbd83ee384e4b63b04c1423e02a5aabf64c4e 100644 (file)
--- a/gcc/config/gcn/mkoffload.c
+++ b/gcc/config/gcn/mkoffload.c
@@ -36,17 +36,23 @@
 #include "simple-object.h"
 #include "elf.h"
 
-/* These probably won't be in elf.h for a while.  */
-#ifndef EM_AMDGPU
+/* These probably won't (all) be in elf.h for a while.  */
+#undef  EM_AMDGPU
 #define EM_AMDGPU              0xe0;
 
+#undef  ELFOSABI_AMDGPU_HSA
 #define ELFOSABI_AMDGPU_HSA     64
+#undef  ELFABIVERSION_AMDGPU_HSA
 #define ELFABIVERSION_AMDGPU_HSA 1
 
+#undef  EF_AMDGPU_MACH_AMDGCN_GFX803
 #define EF_AMDGPU_MACH_AMDGCN_GFX803 0x2a
+#undef  EF_AMDGPU_MACH_AMDGCN_GFX900
 #define EF_AMDGPU_MACH_AMDGCN_GFX900 0x2c
+#undef  EF_AMDGPU_MACH_AMDGCN_GFX906
 #define EF_AMDGPU_MACH_AMDGCN_GFX906 0x2f
 
+#ifndef R_AMDGPU_NONE
 #define R_AMDGPU_NONE          0
 #define R_AMDGPU_ABS32_LO      1       /* (S + A) & 0xFFFFFFFF  */
 #define R_AMDGPU_ABS32_HI      2       /* (S + A) >> 32  */
@@ -59,7 +65,6 @@
 #define R_AMDGPU_GOTPCREL32_HI 9       /* (G + GOT + A - P) >> 32  */
 #define R_AMDGPU_REL32_LO      10      /* (S + A - P) & 0xFFFFFFFF  */
 #define R_AMDGPU_REL32_HI      11      /* (S + A - P) >> 32  */
-#define reserved               12
 #define R_AMDGPU_RELATIVE64    13      /* B + A  */
 #endif