On 5/25/2025 9:15 AM, Philippe Mathieu-Daudé wrote: > On 3/5/25 22:04, Pierrick Bouvier wrote: >> On 5/2/25 3:05 PM, Philippe Mathieu-Daudé wrote: >>> Signed-off-by: Philippe Mathieu-Daudé <[email protected]> >>> --- >>> semihosting/meson.build | 4 +--- >>> 1 file changed, 1 insertion(+), 3 deletions(-) >>> >>> diff --git a/semihosting/meson.build b/semihosting/meson.build >>> index f3d38dda91d..a0a1c081f43 100644 >>> --- a/semihosting/meson.build >>> +++ b/semihosting/meson.build >>> @@ -3,9 +3,7 @@ specific_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: >>> files( >>> 'syscalls.c', >>> )) >>> -specific_ss.add(when: ['CONFIG_SEMIHOSTING', 'CONFIG_SYSTEM_ONLY'], >>> if_true: files( >>> - 'uaccess.c', >>> -)) >>> +libsystem_ss.add(files('uaccess.c')) >>> common_ss.add(when: 'CONFIG_SEMIHOSTING', if_false: files('stubs- >>> all.c')) >>> user_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: files('user.c')) >> >> Fails to build with: >> ./configure --disable-tcg && ninja -C build >> FAILED: libsystem.a.p/semihosting_uaccess.c.o >> ../semihosting/uaccess.c >> ../semihosting/uaccess.c: In function ‘uaccess_strlen_user’: >> ../semihosting/uaccess.c:43:17: error: implicit declaration of >> function ‘probe_access_flags’ [-Wimplicit-function-declaration] >> 43 | flags = probe_access_flags(env, addr, 0, MMU_DATA_LOAD, >> | ^~~~~~~~~~~~~~~~~~ >> ../semihosting/uaccess.c:43:17: error: nested extern declaration of >> ‘probe_access_flags’ [-Werror=nested-externs] >> >> CONFIG_SEMIHOSTING conditional must be kept. >> -libsystem_ss.add(files('uaccess.c')) >> +libsystem_ss.add(when: 'CONFIG_SEMIHOSTING', if_true: >> files('uaccess.c')) > > This produces: > > ../../meson.build:4119:28: ERROR: Entry CONFIG_SEMIHOSTING not in > configuration dictionary. > >
I'm not sure what is the context of this patch, semihosting is already common upstream. Regards, Pierrick
