0003-linux-user-syscall.c-fix-build-without-RLIMIT_RTTIME.patch 1.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. From 84863e007d4ef0858e74a1250e2472954924c617 Mon Sep 17 00:00:00 2001
  2. From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  3. Date: Sat, 14 May 2022 16:10:16 +0200
  4. Subject: [PATCH] linux-user/syscall.c: fix build without RLIMIT_RTTIME
  5. RLIMIT_RTTIME is not provided by uclibc-ng or by musl prior to version
  6. 1.2.0 and
  7. https://github.com/bminor/musl/commit/2507e7f5312e79620f6337935d0a6c9045ccba09
  8. resulting in the following build failure since
  9. https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:
  10. ../linux-user/syscall.c: In function 'target_to_host_resource':
  11. ../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
  12. 1057 | return RLIMIT_RTTIME;
  13. | ^~~~~~~~~~~~~
  14. | RLIMIT_NOFILE
  15. Fixes:
  16. - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26
  17. Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  18. [Upstream status:
  19. https://patchwork.ozlabs.org/project/qemu-devel/patch/20220523105239.1499162-1-fontaine.fabrice@gmail.com]
  20. ---
  21. Changes v1 -> v2 (after review of Laurent Vivier):
  22. - Use an ifdef block instead of defining RLIMIT_RTTIME
  23. linux-user/syscall.c | 2 ++
  24. 1 file changed, 2 insertions(+)
  25. diff --git a/linux-user/syscall.c b/linux-user/syscall.c
  26. index dd0d92ba4e..488facb356 100644
  27. --- a/linux-user/syscall.c
  28. +++ b/linux-user/syscall.c
  29. @@ -1053,8 +1053,10 @@ static inline int target_to_host_resource(int code)
  30. return RLIMIT_RSS;
  31. case TARGET_RLIMIT_RTPRIO:
  32. return RLIMIT_RTPRIO;
  33. +#ifdef RLIMIT_RTTIME
  34. case TARGET_RLIMIT_RTTIME:
  35. return RLIMIT_RTTIME;
  36. +#endif
  37. case TARGET_RLIMIT_SIGPENDING:
  38. return RLIMIT_SIGPENDING;
  39. case TARGET_RLIMIT_STACK:
  40. --
  41. 2.35.1