On Mon, Sep 9, 2024 at 2:41 AM Daniel Gomez (Samsung)
<d+samsung@xxxxxxxxxx> wrote:
>
> On Sun, Sep 8, 2024 at 1:56 AM Masahiro Yamada <masahiroy@xxxxxxxxxx> wrote:
> >
> > On Fri, Sep 6, 2024 at 8:01 PM Daniel Gomez via B4 Relay
> > <devnull+da.gomez.samsung.com@xxxxxxxxxx> wrote:
> > >
> > > 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"
> >
> >
> >
> >
> > Is this what Nicolas suggested?
> > https://lore.kernel.org/lkml/20240807-sexy-roadrunner-of-acceptance-a84bbf@lindesnes/
> >
> >
> > I thought he suggested replacing #ifdef __APPLE__
> > with -D_UUID_T -D__GETHOSTUUID_H.
> >
> >
> > You added -D_UUID_T -D__GETHOSTUUID_H,
> > keeping #ifdef __APPLE__.
>
> I forgot to remove this.
>
> Based on your suggestion in the other thread to use/overwrite
> HOSTCFLAGS via the command line, it seems I should drop this patch.
> Can you confirm?
Yes, I think this patch is unnecessary because:
[1] You can feed "-D_UUID_T -D__GETHOSTUUID_H"
from the HOSTCFLAGS env variable
[2] uuid_t may be dropped if I succeed in
refactoring modpost in the future
--
Best Regards
Masahiro Yamada
