Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix SSP builds (Vladimir Kirillov)

This commit is contained in:
christos 2011-04-12 19:49:48 +00:00
parent a4abc0e6c7
commit e6eca274ad
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libpthread/pthread_cancelstub.c
View File

@ -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 @@ pwrite(int d, const void *buf, size_t nbytes, off_t offset)
#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 @@ STUB(readlink)(const char * __restrict path, char * __restrict buf,
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 @@ STUB(read)(int d, void *buf, size_t nbytes)
return retval;
}
#else
#define STUB(fun) fun
#endif
ssize_t
readv(int d, const struct iovec *iov, int iovcnt)

8
lib/librumphijack/hijack.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hijack.c,v 1.86 2011/03/14 15:15:47 pooka Exp $ */
/* $NetBSD: hijack.c,v 1.87 2011/04/12 19:49:48 christos Exp $ */
/*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
__RCSID("$NetBSD: hijack.c,v 1.86 2011/03/14 15:15:47 pooka Exp $");
__RCSID("$NetBSD: hijack.c,v 1.87 2011/04/12 19:49:48 christos Exp $");
#define __ssp_weak_name(fun) _hijack_ ## fun
@ -1972,6 +1972,7 @@ FDCALL(int, shutdown, DUALCALL_SHUTDOWN, \
#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,
@ -1980,6 +1981,7 @@ STUB(readlink)(const char * __restrict path, char * __restrict buf,
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)
@ -2130,7 +2132,7 @@ PATHCALL(int, symlink, DUALCALL_SYMLINK, \
(const char *, const char *), \
(target, path))
PATHCALL(ssize_t, readlink, DUALCALL_READLINK, \
PATHCALL(ssize_t, _sys_readlink, DUALCALL_READLINK, \
(const char *path, char *buf, size_t bufsiz), \
(const char *, char *, size_t), \
(path, buf, bufsiz))