[src/trunk]: src/lib Fix SSP builds (Vladimir Kirillov)

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6dca0d3ef5df
branches:  trunk
changeset: 764158:6dca0d3ef5df
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Apr 12 19:49:48 2011 +0000

description:
Fix SSP builds (Vladimir Kirillov)

diffstat:

 lib/libpthread/pthread_cancelstub.c |  17 ++++++++++++-----
 lib/librumphijack/hijack.c          |   8 +++++---
 2 files changed, 17 insertions(+), 8 deletions(-)

diffs (102 lines):

diff -r 1c232d0625c3 -r 6dca0d3ef5df lib/libpthread/pthread_cancelstub.c
--- a/lib/libpthread/pthread_cancelstub.c       Tue Apr 12 18:53:23 2011 +0000
+++ b/lib/libpthread/pthread_cancelstub.c       Tue Apr 12 19:49:48 2011 +0000
@@ -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)
diff -r 1c232d0625c3 -r 6dca0d3ef5df lib/librumphijack/hijack.c
--- a/lib/librumphijack/hijack.c        Tue Apr 12 18:53:23 2011 +0000
+++ b/lib/librumphijack/hijack.c        Tue Apr 12 19:49:48 2011 +0000
@@ -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 @@
 
 #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 @@
        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 @@
        (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))