Module Name: xsrc
Committed By: christos
Date: Tue Dec 14 14:43:43 UTC 2021
Modified Files:
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc: addrinterface.h
addrtypes.h
xsrc/external/mit/MesaLib.old/dist/src/amd/common: ac_gpu_info.h
ac_surface.h
xsrc/external/mit/MesaLib.old/dist/src/util: u_atomic.h
xsrc/external/mit/libdrm/dist/amdgpu: amdgpu.h
Log Message:
lint fixes:
1. avoid typedef re-definitions (perhaps introduce c11 mode for lint)
2. add __lint__ wherever __GNUC__ is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h \
xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h \
xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h
cvs rdiff -u -r1.1.1.11 -r1.2 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h:1.1.1.1 Sun Jul 11 16:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrinterface.h Tue Dec 14 09:43:42 2021
@@ -45,7 +45,10 @@ extern "C"
#define ADDRLIB_VERSION ((ADDRLIB_VERSION_MAJOR << 16) | ADDRLIB_VERSION_MINOR)
/// Virtually all interface functions need ADDR_HANDLE as first parameter
+#ifndef ADDR_HANDLE_TYPEDEF
+#define ADDR_HANDLE_TYPEDEF
typedef VOID* ADDR_HANDLE;
+#endif
/// Client handle used in callbacks
typedef VOID* ADDR_CLIENT_HANDLE;
Index: xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h:1.1.1.1 Sun Jul 11 16:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/addrlib/inc/addrtypes.h Tue Dec 14 09:43:42 2021
@@ -67,7 +67,7 @@ typedef int INT;
****************************************************************************************************
*/
#ifndef ADDR_CDECL
- #if defined(__GNUC__)
+ #if defined(__GNUC__) || defined(__lint__)
#define ADDR_CDECL __attribute__((cdecl))
#else
#define ADDR_CDECL __cdecl
@@ -75,7 +75,7 @@ typedef int INT;
#endif
#ifndef ADDR_STDCALL
- #if defined(__GNUC__)
+ #if defined(__GNUC__) || defined(__lint__)
#if defined(__amd64__) || defined(__x86_64__)
#define ADDR_STDCALL
#else
@@ -89,13 +89,13 @@ typedef int INT;
#ifndef ADDR_FASTCALL
#if defined(BRAHMA_ARM)
#define ADDR_FASTCALL
- #elif defined(__GNUC__)
+ #elif defined(__GNUC__) || defined(__lint__)
#if defined(__i386__)
#define ADDR_FASTCALL __attribute__((regparm(0)))
#else
#define ADDR_FASTCALL
#endif
- #else
+ #elif
#define ADDR_FASTCALL __fastcall
#endif
#endif
@@ -112,7 +112,7 @@ typedef int INT;
#define GC_FASTCALL ADDR_FASTCALL
#endif
-#if defined(__GNUC__)
+#if defined(__GNUC__) || defined(__lint__)
#define ADDR_INLINE static inline // inline needs to be static to link
#else
// win32, win64, other platforms
@@ -656,7 +656,7 @@ typedef enum _AddrTileType
//
// 64-bit integer types depend on the compiler
//
-#if defined( __GNUC__ ) || defined( __WATCOMC__ )
+#if defined( __GNUC__ ) || defined( __WATCOMC__ ) || defined(__lint__)
#define INT_64 long long
#define UINT_64 unsigned long long
@@ -689,7 +689,7 @@ typedef enum _AddrTileType
// ADDR64X is used to print addresses in hex form on both Windows and Linux
//
-#if defined( __GNUC__ ) || defined( __WATCOMC__ )
+#if defined( __GNUC__ ) || defined( __WATCOMC__ ) || defined(__lint__)
#define ADDR64X "llx"
#define ADDR64D "lld"
Index: xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h:1.1.1.1 Sun Jul 11 16:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_gpu_info.h Tue Dec 14 09:43:43 2021
@@ -36,7 +36,10 @@ extern "C" {
#endif
/* Prior to C11 the following may trigger a typedef redeclaration warning */
+#ifndef AMDGPU_DEVICE_TYPEDEF
+#define AMDGPU_DEVICE_TYPEDEF
typedef struct amdgpu_device *amdgpu_device_handle;
+#endif
struct amdgpu_gpu_info;
struct radeon_info {
Index: xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h:1.1.1.1 Sun Jul 11 16:36:22 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/amd/common/ac_surface.h Tue Dec 14 09:43:43 2021
@@ -36,7 +36,10 @@ extern "C" {
#endif
/* Forward declarations. */
+#ifndef ADDR_HANDLE_TYPEDEF
+#define ADDR_HANDLE_TYPEDEF
typedef void* ADDR_HANDLE;
+#endif
struct amdgpu_gpu_info;
struct radeon_info;
Index: xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h
diff -u xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h:1.1.1.1 xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h:1.2
--- xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h:1.1.1.1 Sun Jul 11 16:36:33 2021
+++ xsrc/external/mit/MesaLib.old/dist/src/util/u_atomic.h Tue Dec 14 09:43:43 2021
@@ -24,7 +24,7 @@
#define PIPE_ATOMIC_OS_SOLARIS
#elif defined(_MSC_VER)
#define PIPE_ATOMIC_MSVC_INTRINSIC
-#elif defined(__GNUC__)
+#elif defined(__GNUC__) || defined(__lint__)
#define PIPE_ATOMIC_GCC_INTRINSIC
#else
#error "Unsupported platform"
Index: xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h
diff -u xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h:1.1.1.11 xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h:1.2
--- xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h:1.1.1.11 Sat Jul 10 20:27:20 2021
+++ xsrc/external/mit/libdrm/dist/amdgpu/amdgpu.h Tue Dec 14 09:43:43 2021
@@ -114,7 +114,10 @@ enum amdgpu_sw_info {
* "initialize" function and should be pass as the first
* parameter to any API call
*/
+#ifndef AMDGPU_DEVICE_TYPEDEF
+#define AMDGPU_DEVICE_TYPEDEF
typedef struct amdgpu_device *amdgpu_device_handle;
+#endif
/**
* Define GPU Context type as pointer to opaque structure
