Sat Apr 20 15:57:17 2024 UTC (19d)
Fix build of mesa 21

This definition is missing from elftoolchain's elfdefinitions.h (via libelf.h),
which conflicts with sys/exec_elf.h so we can't get it from sys/exec_elf.h.


(maya)
diff -r1.1.1.1 -r1.2 xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c
cvs diff -r1.1.1.1 -r1.2 xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c (expand / switch to unified diff)

--- xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c 2022/05/09 01:23:25 1.1.1.1
+++ xsrc/external/mit/MesaLib/dist/src/amd/common/ac_rtld.c 2024/04/20 15:57:17 1.2
@@ -55,26 +55,30 @@ @@ -55,26 +55,30 @@
55#define R_AMDGPU_ABS32_HI 2 55#define R_AMDGPU_ABS32_HI 2
56#define R_AMDGPU_ABS64 3 56#define R_AMDGPU_ABS64 3
57#define R_AMDGPU_REL32 4 57#define R_AMDGPU_REL32 4
58#define R_AMDGPU_REL64 5 58#define R_AMDGPU_REL64 5
59#define R_AMDGPU_ABS32 6 59#define R_AMDGPU_ABS32 6
60#define R_AMDGPU_GOTPCREL 7 60#define R_AMDGPU_GOTPCREL 7
61#define R_AMDGPU_GOTPCREL32_LO 8 61#define R_AMDGPU_GOTPCREL32_LO 8
62#define R_AMDGPU_GOTPCREL32_HI 9 62#define R_AMDGPU_GOTPCREL32_HI 9
63#define R_AMDGPU_REL32_LO 10 63#define R_AMDGPU_REL32_LO 10
64#define R_AMDGPU_REL32_HI 11 64#define R_AMDGPU_REL32_HI 11
65#define R_AMDGPU_RELATIVE64 13 65#define R_AMDGPU_RELATIVE64 13
66#endif 66#endif
67 67
 68#ifndef STN_UNDEF
 69#define STN_UNDEF 0
 70#endif
 71
68/* For the UMR disassembler. */ 72/* For the UMR disassembler. */
69#define DEBUGGER_END_OF_CODE_MARKER 0xbf9f0000 /* invalid instruction */ 73#define DEBUGGER_END_OF_CODE_MARKER 0xbf9f0000 /* invalid instruction */
70#define DEBUGGER_NUM_MARKERS 5 74#define DEBUGGER_NUM_MARKERS 5
71 75
72struct ac_rtld_section { 76struct ac_rtld_section {
73 bool is_rx : 1; 77 bool is_rx : 1;
74 bool is_pasted_text : 1; 78 bool is_pasted_text : 1;
75 uint64_t offset; 79 uint64_t offset;
76 const char *name; 80 const char *name;
77}; 81};
78 82
79struct ac_rtld_part { 83struct ac_rtld_part {
80 Elf *elf; 84 Elf *elf;