| Message ID | 20250509110721.90447-3-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | semihosting/uaccess: Compile once | expand |
Hi Philippe, On 5/9/25 4:07 AM, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > semihosting/meson.build | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/semihosting/meson.build b/semihosting/meson.build > index f3d38dda91d..d0819891bc3 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', > -)) > +system_ss.add(when: 'CONFIG_TCG', if_true: 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')) It doesn't compile applied on master [1]. Does it compile on your side? If yes, could you include the additional patches allowing you to get rid of CONFIG_USER_ONLY in included headers? My previous answer on v1 was giving a solution, and an associated meson patch. In case we can't remove CONFIG_USER_ONLY from the headers included, it's the only possible solution I still see today. [1] https://github.com/pbo-linaro/qemu-ci/actions/runs/14927715244/job/41936282521 Regards, Pierrick
diff --git a/semihosting/meson.build b/semihosting/meson.build index f3d38dda91d..d0819891bc3 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', -)) +system_ss.add(when: 'CONFIG_TCG', if_true: 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'))
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- semihosting/meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)