d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stdlib.h: Fix qsort_r compatibility with GCC 12.

Browse Source 
GCC 12 (unlike GCC 9) does not match a function argument passed to the
old qsort_r() API (as is used in the qsort_r_compat test) to a
function pointer type via __generic.  It treats the function type as a
distinct type from a function pointer.  As a workaround, add a second
definition of qsort_r for GCC 12 which uses the bare function type.

Reviewed by:	emaste
Differential Revision:	https://reviews.freebsd.org/D37410
This commit is contained in:
John Baldwin 2023-01-19 14:48:52 -08:00
parent 16fbf01912
commit 43703bc489
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/stdlib.h
View File

@ -352,9 +352,15 @@ void __qsort_r_compat(void *, size_t, size_t, void *,
__sym_compat(qsort_r, __qsort_r_compat, FBSD_1.0);
#endif
#if defined(__generic) && !defined(__cplusplus)
#if __GNUC__ == 12
#define qsort_r(base, nel, width, arg4, arg5) \
__generic(arg5, int (void *, const void *, const void *), \
__qsort_r_compat, qsort_r)(base, nel, width, arg4, arg5)
#else
#define qsort_r(base, nel, width, arg4, arg5) \
__generic(arg5, int (*)(void *, const void *, const void *), \
__qsort_r_compat, qsort_r)(base, nel, width, arg4, arg5)
#endif
#elif defined(__cplusplus)
__END_DECLS
extern "C++" {