diff options
author | dim <dim@FreeBSD.org> | 2015-05-15 22:19:35 +0000 |
---|---|---|
committer | dim <dim@FreeBSD.org> | 2015-05-15 22:19:35 +0000 |
commit | 3d6328870a394d251b2eecd37f16321c6ae39441 (patch) | |
tree | 54ce9ba29f7de100cd776c8cda1a893900d2b62c /tools | |
parent | 8ef81eaec380c1f06f1afa3af7a1882426d9be67 (diff) | |
download | FreeBSD-src-3d6328870a394d251b2eecd37f16321c6ae39441.zip FreeBSD-src-3d6328870a394d251b2eecd37f16321c6ae39441.tar.gz |
Provide reallocarray() in -legacy, if needed, to allow building head on
previous releases.
Also add a stdlib.h wrapper, which declares the function, otherwise the
compiler may assume it returns int, which can cause segfaults on LP64
architectures.
Reviewed by: bapt
Differential Revision: https://reviews.freebsd.org/D2558
Diffstat (limited to 'tools')
-rw-r--r-- | tools/build/Makefile | 8 | ||||
-rw-r--r-- | tools/build/stdlib.h | 42 |
2 files changed, 50 insertions, 0 deletions
diff --git a/tools/build/Makefile b/tools/build/Makefile index 6aead63..2617d8d 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -25,6 +25,14 @@ CFLAGS+= -I${.CURDIR}/../../contrib/libc-vis \ -I${.CURDIR}/../../lib/libc/include .endif +_WITH_REALLOCARRAY!= grep -c reallocarray /usr/include/stdlib.h || true +.if ${_WITH_REALLOCARRAY} == 0 +.PATH: ${.CURDIR}/../../lib/libc/stdlib +INCS+= stdlib.h +SRCS+= reallocarray.c +CFLAGS+= -I${.CURDIR}/../../lib/libc/include +.endif + .if empty(SRCS) SRCS= dummy.c .endif diff --git a/tools/build/stdlib.h b/tools/build/stdlib.h new file mode 100644 index 0000000..5f9b90b --- /dev/null +++ b/tools/build/stdlib.h @@ -0,0 +1,42 @@ +/*- + * Copyright (c) 2015 Dimitry Andric <dim@FreeBSD.org> + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _LEGACY_STDLIB_H_ +#define _LEGACY_STDLIB_H_ + +#include_next <stdlib.h> + +__BEGIN_DECLS + +#if __BSD_VISIBLE +void *reallocarray(void *, size_t, size_t); +#endif /* __BSD_VISIBLE */ + +__END_DECLS + +#endif /* !_LEGACY_STDLIB_H_ */ |