Module Name: src Committed By: christos Date: Tue Apr 12 19:52:04 UTC 2011
Modified Files: src/lib/libpthread: pthread_cancelstub.c Log Message: Fix SSP builds (Vladimir Kirillov) To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/lib/libpthread/pthread_cancelstub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/lib/libpthread/pthread_cancelstub.c diff -u src/lib/libpthread/pthread_cancelstub.c:1.31 src/lib/libpthread/pthread_cancelstub.c:1.32 --- src/lib/libpthread/pthread_cancelstub.c:1.31 Wed Jan 26 13:48:57 2011 +++ src/lib/libpthread/pthread_cancelstub.c Tue Apr 12 15:52:04 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_cancelstub.c,v 1.31 2011/01/26 18:48:57 christos Exp $ */ +/* $NetBSD: pthread_cancelstub.c,v 1.32 2011/04/12 19:52:04 christos Exp $ */ /*- * Copyright (c) 2002, 2007 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__RCSID("$NetBSD: pthread_cancelstub.c,v 1.31 2011/01/26 18:48:57 christos Exp $"); +__RCSID("$NetBSD: pthread_cancelstub.c,v 1.32 2011/04/12 19:52:04 christos Exp $"); #ifndef lint @@ -472,7 +472,10 @@ #if _FORTIFY_SOURCE > 0 #define STUB(fun) __ssp_weak_name(fun) + +ssize_t STUB(readlink)(const char * __restrict, char * __restrict, size_t); ssize_t _sys_readlink(const char * __restrict, char * __restrict, size_t); + ssize_t STUB(readlink)(const char * __restrict path, char * __restrict buf, size_t bufsiz) @@ -480,15 +483,16 @@ return _sys_readlink(path, buf, bufsiz); } +char *STUB(getcwd)(char *, size_t); char *_sys_getcwd(char *, size_t); + char * STUB(getcwd)(char *buf, size_t size) { return _sys_getcwd(buf, size); } -#else -#define STUB(fun) fun -#endif + +ssize_t STUB(read)(int, void *, size_t); ssize_t STUB(read)(int d, void *buf, size_t nbytes) @@ -503,6 +507,9 @@ return retval; } +#else +#define STUB(fun) fun +#endif ssize_t readv(int d, const struct iovec *iov, int iovcnt)