Mesa (master): ac/rgp: BSD elf library compatibility

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 1aeebac4e6b688f8697b6f7f6b8d2303bb92d633
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1aeebac4e6b688f8697b6f7f6b8d2303bb92d633

Author: James Park <jpark37 at lagfreegames.com>
Date:   Tue Feb 23 01:55:28 2021 -0800

ac/rgp: BSD elf library compatibility

Allow compilation on Windows using modified BSD elf library.

Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9210>

---

 src/amd/common/ac_rgp.c                 | 2 +-
 src/amd/common/ac_rgp.h                 | 2 +-
 src/amd/common/ac_rgp_elf_object_pack.c | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/amd/common/ac_rgp.c b/src/amd/common/ac_rgp.c
index 9907c1fdb2e..961b5d3a945 100644
--- a/src/amd/common/ac_rgp.c
+++ b/src/amd/common/ac_rgp.c
@@ -847,7 +847,7 @@ static void ac_sqtt_dump_data(struct radeon_info *rad_info,
       struct sqtt_file_chunk_code_object_database code_object;
       struct sqtt_code_object_database_record code_object_record;
       uint32_t elf_size_calc = 0;
-      uint flags = ac_chip_class_to_elf_gfxip_level(rad_info->chip_class);
+      uint32_t flags = ac_chip_class_to_elf_gfxip_level(rad_info->chip_class);
 
       fseek(output, sizeof(struct sqtt_file_chunk_code_object_database), SEEK_CUR);
       file_offset += sizeof(struct sqtt_file_chunk_code_object_database);
diff --git a/src/amd/common/ac_rgp.h b/src/amd/common/ac_rgp.h
index 76d541410ca..bb7407b77d5 100644
--- a/src/amd/common/ac_rgp.h
+++ b/src/amd/common/ac_rgp.h
@@ -108,6 +108,6 @@ struct rgp_pso_correlation {
 void
 ac_rgp_file_write_elf_object(FILE *output, size_t file_elf_start,
                              struct rgp_code_object_record *record,
-                             uint32_t *written_size, uint flags);
+                             uint32_t *written_size, uint32_t flags);
 
 #endif
diff --git a/src/amd/common/ac_rgp_elf_object_pack.c b/src/amd/common/ac_rgp_elf_object_pack.c
index a98f19ab646..e70954ce467 100644
--- a/src/amd/common/ac_rgp_elf_object_pack.c
+++ b/src/amd/common/ac_rgp_elf_object_pack.c
@@ -34,7 +34,7 @@
 #include <stdint.h>
 #include <stdio.h>
 #include <string.h>
-#include "elf.h"
+#include <libelf.h>
 #include "ac_msgpack.h"
 #include "ac_rgp.h"
 #include "main/macros.h"
@@ -364,7 +364,7 @@ struct ac_rgp_elf_note_msgpack_hdr {
 void
 ac_rgp_file_write_elf_object(FILE *output, size_t file_elf_start,
                              struct rgp_code_object_record *record,
-                             uint32_t *written_size, uint flags)
+                             uint32_t *written_size, uint32_t flags)
 {
    Elf64_Ehdr elf_hdr;
    Elf64_Shdr sec_hdr[5];