openwrt/toolchain/fortify-headers/patches/001-__ppoll_time64.patch

--- a/include/poll.h
+++ b/include/poll.h
@@ -39,7 +39,7 @@ _FORTIFY_FN(poll) int poll(struct pollfd
 	return __orig_poll(__f, __n, __s);
 }
 
-#ifdef _GNU_SOURCE
+#if defined(_GNU_SOURCE) && !(defined(_REDIR_TIME64) && _REDIR_TIME64)
 #undef ppoll
 _FORTIFY_FN(ppoll) int ppoll(struct pollfd *__f, nfds_t __n, const struct timespec *__s,
                              const sigset_t *__m)
fortify-headers: fix inconsistent time_t version of ppoll Bug: fortify/poll.h includes poll.h, which redirects ppoll to __ppoll_time64 if the _REDIR_TIME64 macro is 1. Then fortify/poll.h will #undef ppoll and use the 32 bit version. Fix: we should not do this when _REDIR_TIME64 is 1. [1] https://forum.openwrt.org/t/idle-cpu-usage-of-usbmuxd/140331/15 [2] https://github.com/openwrt/openwrt/issues/12574 Signed-off-by: Georgi Valkov <gvalkov@gmail.com> 2023-05-10 00:02:29 +00:00			`--- a/include/poll.h`
			`+++ b/include/poll.h`
			`@@ -39,7 +39,7 @@ _FORTIFY_FN(poll) int poll(struct pollfd`
			`return __orig_poll(__f, __n, __s);`
			`}`

			`-#ifdef _GNU_SOURCE`
fortify-headers: fix build error when _REDIR_TIME64 is not defined some targets do not define the _REDIR_TIME64 macro resulting in a build error regression since ddfe5678a448ac8875e94f2fb4ddca67416fa14a fix by checking if the macro is defined [1] https://github.com/openwrt/openwrt/issues/12587 Fixes: #12587 Fixes: ddfe5678a448 ("fortify-headers: fix inconsistent time_t version of ppoll") Signed-off-by: Georgi Valkov <gvalkov@gmail.com> 2023-05-12 23:22:12 +00:00			`+#if defined(_GNU_SOURCE) && !(defined(_REDIR_TIME64) && _REDIR_TIME64)`
fortify-headers: fix inconsistent time_t version of ppoll Bug: fortify/poll.h includes poll.h, which redirects ppoll to __ppoll_time64 if the _REDIR_TIME64 macro is 1. Then fortify/poll.h will #undef ppoll and use the 32 bit version. Fix: we should not do this when _REDIR_TIME64 is 1. [1] https://forum.openwrt.org/t/idle-cpu-usage-of-usbmuxd/140331/15 [2] https://github.com/openwrt/openwrt/issues/12574 Signed-off-by: Georgi Valkov <gvalkov@gmail.com> 2023-05-10 00:02:29 +00:00			`#undef ppoll`
			`_FORTIFY_FN(ppoll) int ppoll(struct pollfd __f, nfds_t __n, const struct timespec __s,`
			`const sigset_t *__m)`