From 3616e02ef3ee521c2f7c83c136d05c9e105f84e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= <marek.olsak@amd.com>
Date: Wed, 17 Mar 2021 16:51:04 -0400
Subject: [PATCH] amd/addrlib: define endianess differently

This removes a Mesa-specific change.

Acked-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9668>
---
 src/amd/addrlib/meson.build           | 7 +++++++
 src/amd/addrlib/src/core/addrcommon.h | 9 ---------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/amd/addrlib/meson.build b/src/amd/addrlib/meson.build
index 7609cc94eb3..8bafa9af3a4 100644
--- a/src/amd/addrlib/meson.build
+++ b/src/amd/addrlib/meson.build
@@ -54,6 +54,13 @@ files_addrlib = files(
 
 # Skip the addrlib definition of ADDR_FASTCALL so as not to use regparm.
 cpp_args_addrlib = ['-DADDR_FASTCALL=']
+
+if host_machine.endian() == 'little'
+  cpp_args_addrlib += '-DLITTLEENDIAN_CPU'
+else
+  cpp_args_addrlib += '-DBIGENDIAN_CPU'
+endif
+
 foreach w : ['-Wno-unused-variable', '-Wno-unused-local-typedefs',
              '-Wno-unused-but-set-variable', '-Wno-maybe-uninitialized']
   if cpp.has_argument(w)
diff --git a/src/amd/addrlib/src/core/addrcommon.h b/src/amd/addrlib/src/core/addrcommon.h
index 6114fbbb07e..d592f04be54 100644
--- a/src/amd/addrlib/src/core/addrcommon.h
+++ b/src/amd/addrlib/src/core/addrcommon.h
@@ -46,15 +46,6 @@
     #include <assert.h>
 #endif
 
-#include "util/macros.h"
-#include "util/u_endian.h"
-
-#if UTIL_ARCH_LITTLE_ENDIAN
-#define LITTLEENDIAN_CPU
-#elif UTIL_ARCH_BIG_ENDIAN
-#define BIGENDIAN_CPU
-#endif
-
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Platform specific debug break defines