[PATCH v2 2/8] file2alias: fix uuid_t definitions for macos

From: Daniel Gomez via B4 Relay
Date: Fri Sep 06 2024 - 07:03:30 EST

Next message: Daniel Gomez via B4 Relay: "[PATCH v2 5/8] scripts: add bee-headers support"
Previous message: Daniel Gomez via B4 Relay: "[PATCH v2 4/8] arm64: nvhe: add bee-headers support"
In reply to: Masahiro Yamada: "Re: [PATCH v2 4/8] arm64: nvhe: add bee-headers support"
Next in thread: Masahiro Yamada: "Re: [PATCH v2 2/8] file2alias: fix uuid_t definitions for macos"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

From: Daniel Gomez <da.gomez@xxxxxxxxxxx>

The uuid_t struct defined in sys/types.h on macOS hosts conflicts with
the one defined in file2alias, resulting in the typedef redefinition
error below. To resolve this conflict, define the _UUID_T and
__GETHOSTUUID_ in file2alias HOSTCFLAGS.

Error:
HOSTCC scripts/mod/file2alias.o scripts/mod/file2alias.c:45:3:
error: typedef redefinition with different types ('struct uuid_t' vs
'__darwin_uuid_t' (aka 'unsigned char[16]')) 45 | } uuid_t; |
^
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
sys/_types/_uuid_t.h:31:25: note: previous definition is here 31 |
typedef __darwin_uuid_t uuid_t; | ^
scripts/mod/file2alias.c:1354:7: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1354 |
uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1354:19: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1354 |
uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1354:31: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1354 |
uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1354:43: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1354 |
uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1354:55: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1354 |
uuid->b[0], uuid->b[1], uuid->b[2], uuid->b[3], uuid->b[4], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1355:7: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1355 |
uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1355:19: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1355 |
uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1355:31: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1355 |
uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1355:43: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1355 |
uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1355:55: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1355 |
uuid->b[5], uuid->b[6], uuid->b[7], uuid->b[8], uuid->b[9], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1356:7: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1356 |
uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1356:20: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1356 |
uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1356:33: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1356 |
uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1356:46: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1356 |
uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1356:59: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1356 |
uuid->b[10], uuid->b[11], uuid->b[12], uuid->b[13], uuid->b[14], |
~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
scripts/mod/file2alias.c:1357:7: error: member reference base
type 'typeof (((struct tee_client_device_id *)0)->uuid)' (aka
'unsigned char[16]') is not a structure or union 1357 |
uuid->b[15]); | ~~~~^ ~
/Library/Developer/CommandLineTools/SDKs/MacOSX14.sdk/usr/include/
secure/_stdio.h:47:56: note: expanded from macro 'sprintf' 47 |
__builtin___sprintf_chk (str, 0, __darwin_obsz(str), __VA_ARGS__)
| ^~~~~~~~~~~
17 errors generated.

Suggested-by: Nicolas Schier <nicolas@xxxxxxxxx>
Signed-off-by: Daniel Gomez <da.gomez@xxxxxxxxxxx>
---
scripts/mod/Makefile | 2 ++
scripts/mod/file2alias.c | 3 +++
2 files changed, 5 insertions(+)

diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
index c729bc936bae..75c12c045f21 100644
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
@@ -8,6 +8,8 @@ modpost-objs := modpost.o file2alias.o sumversion.o symsearch.o

devicetable-offsets-file := devicetable-offsets.h

+HOSTCFLAGS_file2alias.o += -D_UUID_T -D__GETHOSTUUID_H
+
$(obj)/$(devicetable-offsets-file): $(obj)/devicetable-offsets.s FORCE
$(call filechk,offsets,__DEVICETABLE_OFFSETS_H__)

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 99dce93a4188..ab743f6d60ef 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -11,6 +11,9 @@
*/

#include "modpost.h"
+#ifdef __APPLE__
+#define uuid_t sys_uuid_t
+#endif
#include "devicetable-offsets.h"

/* We use the ELF typedefs for kernel_ulong_t but bite the bullet and

--
2.46.0

Next message: Daniel Gomez via B4 Relay: "[PATCH v2 5/8] scripts: add bee-headers support"
Previous message: Daniel Gomez via B4 Relay: "[PATCH v2 4/8] arm64: nvhe: add bee-headers support"
In reply to: Masahiro Yamada: "Re: [PATCH v2 4/8] arm64: nvhe: add bee-headers support"
Next in thread: Masahiro Yamada: "Re: [PATCH v2 2/8] file2alias: fix uuid_t definitions for macos"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]