Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-29 10:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

libctf: look for BSD versus GNU qsort_r signatures

Browse Source 
We cannot just look for any declaration of qsort_r, because some
operating systems have a qsort_r that has a different prototype
but which still has a pair of pointers in the right places (the last two
args are interchanged): so use AC_LINK_IFELSE to check for both
known variants of qsort_r(), and swap their args into a consistent order
in a suitable inline function.  (The code for this is taken almost
unchanged from gnulib.)

(Now we are not using AC_LIBOBJ any more, we can use a better name for
the qsort_r replacement as well.)

libctf/
	* qsort_r.c: Rename to...
	* ctf-qsort_r.c: ... this.
	(_quicksort): Define to ctf_qsort_r.
	* ctf-decls.h (qsort_r): Remove.
	(ctf_qsort_r): Add.
	(struct ctf_qsort_arg): New, transport the real ARG and COMPAR.
	(ctf_qsort_compar_thunk): Rearrange the arguments to COMPAR.
	* Makefile.am (libctf_a_LIBADD): Remove.
	(libctf_a_SOURCES): New, add ctf-qsort_r.c.
	* ctf-archive.c (ctf_arc_write): Call ctf_qsort_r, not qsort_r.
	* ctf-create.c (ctf_update): Likewise.
	* configure.ac: Check for BSD versus GNU qsort_r signature.
	* Makefile.in: Regenerate.
	* config.h.in: Likewise.
	* configure: Likewise.
This commit is contained in:
Nick Alcock
2019-06-03 14:02:09 +01:00
parent 941accce38
commit 6b22174ff1
10 changed files with 237 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libctf/config.h.in
View File

@@ -9,10 +9,6 @@
/* Define to 1 if you have the <byteswap.h> header file. */
#undef HAVE_BYTESWAP_H
/* Define to 1 if you have the declaration of `qsort_r', and to 0 if you
don't. */
#undef HAVE_DECL_QSORT_R
/* Define to 1 if you have the <endian.h> header file. */
#undef HAVE_ENDIAN_H
@@ -31,6 +27,15 @@
/* Define to 1 if you have the `pread' function. */
#undef HAVE_PREAD
/* Define to 1 if you have the `qsort_r' function. */
#undef HAVE_QSORT_R
/* Whether a qsort_r exists with a void *arg as its last arg. */
#undef HAVE_QSORT_R_ARG_LAST
/* Whether a qsort_r exists with the compar function as its last arg. */
#undef HAVE_QSORT_R_COMPAR_LAST
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H