From 97981e13b7f7b1ffd1c9ccf3d96d574b7b3caada Mon Sep 17 00:00:00 2001 From: Andrew Stubbs Date: Mon, 23 Nov 2020 17:18:27 +0000 Subject: [PATCH] Tweak plugin-gcn.c defines Ensure the code will continue to compile when elf.h gets these definitions. libgomp/ChangeLog: * plugin/plugin-gcn.c: Don't redefine relocations if elf.h has them. (reserved): Delete unused define. --- libgomp/plugin/plugin-gcn.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libgomp/plugin/plugin-gcn.c b/libgomp/plugin/plugin-gcn.c index 0be350bba28..ebb6fbcfdba 100644 --- a/libgomp/plugin/plugin-gcn.c +++ b/libgomp/plugin/plugin-gcn.c @@ -52,6 +52,7 @@ #define HSA_AMD_AGENT_INFO_COMPUTE_UNIT_COUNT 0xA002 /* These probably won't be in elf.h for a while. */ +#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 */ @@ -64,8 +65,8 @@ #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 /* GCN specific definitions for asynchronous queues. */ -- 2.30.2