43 files changed, 233 insertions, 49 deletions

diff --git a/src/lib/libc/include/namespace.h b/src/lib/libc/include/namespace.h
index 4a51f15ddf..b0cad502a3 100644
--- a/src/lib/libc/include/namespace.h
+++ b/src/lib/libc/include/namespace.h
@@ -1,18 +1,158 @@
-/*      $OpenBSD: namespace.h,v 1.2 1996/08/19 08:28:08 tholo Exp $     */
+/*      $OpenBSD: namespace.h,v 1.3 2015/08/31 02:53:56 guenther Exp $  */
 
+#ifndef _LIBC_NAMESPACE_H_
+#define _LIBC_NAMESPACE_H_
+
+/* These will be replaced with symbol renaming ala PROTO_NORMAL */
 #define catclose        _catclose
 #define catgets         _catgets
 #define catopen         _catopen
-#define err             _err
-#define errx            _errx
 #define strtoq          _strtoq
 #define strtouq         _strtouq
 #define sys_errlist     _sys_errlist
 #define sys_nerr        _sys_nerr
 #define sys_siglist     _sys_siglist
-#define verr            _verr
-#define verrx           _verrx
-#define vwarn           _vwarn
-#define vwarnx          _vwarnx
-#define warn            _warn
-#define warnx           _warnx
+
+/*
+ * Copyright (c) 2015 Philip Guenther <guenther@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/*
+ * The goal: calls from inside libc to other libc functions should be via
+ * identifiers that are of hidden visibility and--to avoid confusion--are
+ * in the reserved namespace.  By doing this these calls are protected
+ * from overriding by applications and on many platforms can avoid creation
+ * or use of GOT or PLT entries.  I've chosen a prefix of underbar-C-underbar
+ * ("_libc_") for this.  These will not be declared directly; instead, the
+ * gcc "asm labels" extension will be used rename the function.
+ *
+ * For syscalls which are cancellation points, such as wait4(), there
+ * are identifiers that do not provide cancellation:
+ *      _libc_wait4             hidden alias, for use internal to libc only
+ *      _thread_sys_wait4       global name, for use outside libc only
+ * ...and identifiers that do provide cancellation:
+ *      wait4                   weak alias, for general use
+ *      _libc_wait4_cancel      hidden alias, for use internal to libc only
+ * Inside libc, the bare name ("wait4") binds to the version *without*
+ * cancellation; the few times where cancellation is desired it can be
+ * obtained by calling CANCEL(x) instead of just x.
+ *
+ * Some other calls need to be wrapped for reasons other than cancellation,
+ * such as to provide functionality beyond the underlying syscall (e.g.,
+ * setlogin).  For these, there are identifiers for the raw call, without
+ * the wrapping:
+ *      _libc_setlogin          hidden alias, for use internal to libc only
+ *      _thread_sys_setlogin    global name, for use outside libc only
+ * ...and identifiers that do provide the libc wrapping:
+ *      setlogin                weak alias, for general use
+ *      _libc_setlogin_wrap     hidden alias, for use internal to libc only
+ * Inside libc, the bare name ("setlogin") binds to the wrapper; when the
+ * raw version is necessary it can be obtained by calling HIDDEN(x) instead of
+ * just x.
+ *
+ * For syscalls which are not cancellation points, such as getpid(),
+ * the identifiers are just:
+ *      _libc_getpid            hidden alias, for use internal to libc only
+ *      _thread_sys_getpid      global name, for use outside libc only
+ *      getpid                  weak alias, for use outside libc only
+ *
+ * By using gcc's "asm label" extension, we can usually avoid having
+ * to type those prefixes in the .h and .c files.  However, for those
+ * cases where a non-default binding is necessary we can use these macros
+ * to get the desired identifier:
+ *
+ *   CANCEL(x)
+ *      This expands to the internal, hidden name of a cancellation
+ *      wrapper: _libc_x_cancel.  ex: CANCEL(fsync)(fd)
+ *
+ *   WRAP(x)
+ *      This expands to the internal, hidden name of a non-cancellation
+ *      wrapper: _libc_x_wrap.  ex: WRAP(sigpending)(set)
+ *
+ *
+ * In order to actually set up the desired asm labels, we use these in
+ * the internal .h files:
+ *   PROTO_NORMAL(x)            Symbols used both internally and externally
+ *      This makes gcc convert use of x to use _libc_x instead
+ *      ex: PROTO_NORMAL(getpid)
+ *
+ *   PROTO_STD_DEPRECATED(x)    Standard C symbols that we don't want to use
+ *      This just marks the symbol as deprecated, with no renaming.
+ *      ex: PROTO_STD_DEPRECATED(strcpy)
+ *
+ *   PROTO_DEPRECATED(x)        Symbols not in ISO C that we don't want to use
+ *      This marks the symbol as both weak and deprecated, with no renaming
+ *      ex: PROTO_DEPRECATED(creat)
+ *
+ *   PROTO_CANCEL(x)            Functions that have cancellation wrappers
+ *      Like PROTO_NORMAL(x), but also declares _libc_x_cancel
+ *      ex: PROTO_CANCEL(wait4)
+ *
+ *   PROTO_WRAP(x)              Functions that have wrappers for other reasons
+ *      This makes gcc convert use of x to use _libc_x_wrap instead.
+ *      ex: PROTO_WRAP(setlogin)
+ *
+ *
+ * Finally, to create the expected aliases, we use these in the .c files
+ * where the definitions are:
+ *   DEF_STRONG(x)              Symbols reserved to or specified by ISO C
+ *      This defines x as a strong alias for _libc_x; this must only
+ *      be used for symbols that are reserved by the C standard
+ *      (or reserved in the external identifier namespace).
+ *      Matches with PROTO_NORMAL()
+ *      ex: DEF_STRONG(fopen)
+ *
+ *   DEF_WEAK(x)                Symbols used internally and not in ISO C
+ *      This defines x as a weak alias for _libc_x
+ *      Matches with PROTO_NORMAL()
+ *      ex: DEF_WEAK(lseek)
+ *
+ *   DEF_CANCEL(x)              Symbols that have a cancellation wrapper
+ *      This defines x as a weak alias for _libc_x_cancel.
+ *      Matches with PROTO_CANCEL()
+ *      ex: DEF_CANCEL(read)
+ *
+ *   DEF_WRAP(x)
+ *      This defines x as a weak alias for _libc_x_wrap.
+ *      Matches with PROTO_WRAP()
+ *      ex: DEF_WRAP(setlogin)
+ *
+ *   DEF_SYS(x)
+ *      This defines _thread_sys_x as a strong alias for _libc_x.  This should
+ *      only be needed for syscalls that have C instead of asm stubs.
+ *      Matches with PROTO_NORMAL(), PROTO_CANCEL(), or PROTO_WRAP()
+ *      ex: DEF_SYS(pread)
+ */
+
+#define HIDDEN(x)               _libc_##x
+#define CANCEL(x)               _libc_##x##_cancel
+#define WRAP(x)                 _libc_##x##_wrap
+#define HIDDEN_STRING(x)        "_libc_" __STRING(x)
+#define WRAP_STRING(x)          "_libc_" __STRING(x) "_wrap"
+
+#define PROTO_NORMAL(x)         __dso_hidden typeof(x) x asm(HIDDEN_STRING(x))
+#define PROTO_STD_DEPRECATED(x) typeof(x) x __attribute__((deprecated))
+#define PROTO_DEPRECATED(x)     typeof(x) x __attribute__((deprecated, weak))
+#define PROTO_CANCEL(x)         PROTO_NORMAL(x), CANCEL(x)
+#define PROTO_WRAP(x)           __dso_hidden typeof(x) x asm(WRAP_STRING(x))
+
+#define DEF_STRONG(x)           __strong_alias(x, HIDDEN(x))
+#define DEF_WEAK(x)             __weak_alias(x, HIDDEN(x))
+#define DEF_CANCEL(x)           __weak_alias(x, CANCEL(x))
+#define DEF_WRAP(x)             __weak_alias(x, WRAP(x))
+#define DEF_SYS(x)              __strong_alias(_thread_sys_##x, HIDDEN(x))
+
+#endif  /* _LIBC_NAMESPACE_H_ */
+
diff --git a/src/lib/libc/string/bcmp.c b/src/lib/libc/string/bcmp.c
index f64672990c..5d446bf096 100644
--- a/src/lib/libc/string/bcmp.c
+++ b/src/lib/libc/string/bcmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bcmp.c,v 1.10 2014/06/10 04:17:37 deraadt Exp $       */
+/*      $OpenBSD: bcmp.c,v 1.11 2015/08/31 02:53:57 guenther Exp $      */
 
 /*
  * Copyright (c) 1987 Regents of the University of California.
@@ -49,3 +49,4 @@ bcmp(const void *b1, const void *b2, size_t length)
         while (--length);
         return (0);
 }
+DEF_WEAK(bcmp);
diff --git a/src/lib/libc/string/bcopy.c b/src/lib/libc/string/bcopy.c
index fcaa843c71..ef0d368053 100644
--- a/src/lib/libc/string/bcopy.c
+++ b/src/lib/libc/string/bcopy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bcopy.c,v 1.6 2014/11/30 19:43:56 deraadt Exp $ */
+/*      $OpenBSD: bcopy.c,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -110,3 +110,4 @@ bcopy(const void *src0, void *dst0, size_t length)
 done:
         return;
 }
+DEF_WEAK(bcopy);
diff --git a/src/lib/libc/string/bzero.c b/src/lib/libc/string/bzero.c
index fdd3d9cc8d..5173de26dd 100644
--- a/src/lib/libc/string/bzero.c
+++ b/src/lib/libc/string/bzero.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: bzero.c,v 1.8 2014/06/10 04:17:37 deraadt Exp $       */
+/*      $OpenBSD: bzero.c,v 1.9 2015/08/31 02:53:57 guenther Exp $      */
 
 /*
  * Copyright (c) 1987 Regents of the University of California.
@@ -42,3 +42,4 @@ bzero(void *b, size_t length)
         for (p = b; length--;)
                 *p++ = '\0';
 }
+DEF_WEAK(bzero);
diff --git a/src/lib/libc/string/explicit_bzero.c b/src/lib/libc/string/explicit_bzero.c
index 3e33ca85b8..003ea7cc4c 100644
--- a/src/lib/libc/string/explicit_bzero.c
+++ b/src/lib/libc/string/explicit_bzero.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: explicit_bzero.c,v 1.3 2014/06/21 02:34:26 matthew Exp $ */
+/*      $OpenBSD: explicit_bzero.c,v 1.4 2015/08/31 02:53:57 guenther Exp $ */
 /*
  * Public domain.
  * Written by Matthew Dempsky.
@@ -17,3 +17,4 @@ explicit_bzero(void *buf, size_t len)
         memset(buf, 0, len);
         __explicit_bzero_hook(buf, len);
 }
+DEF_WEAK(explicit_bzero);
diff --git a/src/lib/libc/string/ffs.c b/src/lib/libc/string/ffs.c
index de4480a7ef..a75fd9d79f 100644
--- a/src/lib/libc/string/ffs.c
+++ b/src/lib/libc/string/ffs.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ffs.c,v 1.8 2014/06/10 04:17:37 deraadt Exp $ */
+/*      $OpenBSD: ffs.c,v 1.9 2015/08/31 02:53:57 guenther Exp $        */
 
 /*
  * Public domain.
@@ -38,3 +38,4 @@ ffs(int mask)
 
         return (bit + t[ r & 0xf ]);
 }
+DEF_WEAK(ffs);
diff --git a/src/lib/libc/string/memccpy.c b/src/lib/libc/string/memccpy.c
index 485c55fcab..635061b8cb 100644
--- a/src/lib/libc/string/memccpy.c
+++ b/src/lib/libc/string/memccpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memccpy.c,v 1.6 2005/08/08 08:05:37 espie Exp $       */
+/*      $OpenBSD: memccpy.c,v 1.7 2015/08/31 02:53:57 guenther Exp $    */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -46,3 +46,4 @@ memccpy(void *t, const void *f, int c, size_t n)
         }
         return (0);
 }
+DEF_WEAK(memccpy);
diff --git a/src/lib/libc/string/memchr.c b/src/lib/libc/string/memchr.c
index 4573e3ceb1..a6a4bd60d0 100644
--- a/src/lib/libc/string/memchr.c
+++ b/src/lib/libc/string/memchr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memchr.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: memchr.c,v 1.8 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -46,3 +46,4 @@ memchr(const void *s, int c, size_t n)
         }
         return (NULL);
 }
+DEF_STRONG(memchr);
diff --git a/src/lib/libc/string/memcmp.c b/src/lib/libc/string/memcmp.c
index 49384a6fb9..0df2c54d2a 100644
--- a/src/lib/libc/string/memcmp.c
+++ b/src/lib/libc/string/memcmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memcmp.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: memcmp.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -49,3 +49,4 @@ memcmp(const void *s1, const void *s2, size_t n)
         }
         return (0);
 }
+DEF_STRONG(memcmp);
diff --git a/src/lib/libc/string/memcpy.c b/src/lib/libc/string/memcpy.c
index 1b9715e471..73136edd72 100644
--- a/src/lib/libc/string/memcpy.c
+++ b/src/lib/libc/string/memcpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memcpy.c,v 1.1 2014/11/30 19:43:56 deraadt Exp $ */
+/*      $OpenBSD: memcpy.c,v 1.2 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -97,3 +97,4 @@ memcpy(void *dst0, const void *src0, size_t length)
 done:
         return (dst0);
 }
+DEF_STRONG(memcpy);
diff --git a/src/lib/libc/string/memmem.c b/src/lib/libc/string/memmem.c
index 5793a7dfd7..823443b08a 100644
--- a/src/lib/libc/string/memmem.c
+++ b/src/lib/libc/string/memmem.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memmem.c,v 1.3 2013/05/30 01:10:45 ajacoutot Exp $ */
+/*      $OpenBSD: memmem.c,v 1.4 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 2005 Pascal Gloor <pascal.gloor@spale.com>
  *
@@ -61,3 +61,4 @@ memmem(const void *l, size_t l_len, const void *s, size_t s_len)
 
         return NULL;
 }
+DEF_WEAK(memmem);
diff --git a/src/lib/libc/string/memmove.c b/src/lib/libc/string/memmove.c
index 1baad53544..2f1deb2c70 100644
--- a/src/lib/libc/string/memmove.c
+++ b/src/lib/libc/string/memmove.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memmove.c,v 1.1 2014/11/30 19:43:56 deraadt Exp $ */
+/*      $OpenBSD: memmove.c,v 1.2 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -110,3 +110,4 @@ memmove(void *dst0, const void *src0, size_t length)
 done:
         return (dst0);
 }
+DEF_STRONG(memmove);
diff --git a/src/lib/libc/string/memrchr.c b/src/lib/libc/string/memrchr.c
index bd27ebc620..26a33995b7 100644
--- a/src/lib/libc/string/memrchr.c
+++ b/src/lib/libc/string/memrchr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memrchr.c,v 1.2 2007/11/27 16:22:12 martynas Exp $    */
+/*      $OpenBSD: memrchr.c,v 1.3 2015/08/31 02:53:57 guenther Exp $    */
 
 /*
  * Copyright (c) 2007 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -36,3 +36,4 @@ memrchr(const void *s, int c, size_t n)
         }
         return(NULL);
 }
+DEF_WEAK(memrchr);
diff --git a/src/lib/libc/string/memset.c b/src/lib/libc/string/memset.c
index 61709c139d..242529ee0f 100644
--- a/src/lib/libc/string/memset.c
+++ b/src/lib/libc/string/memset.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: memset.c,v 1.6 2008/03/15 21:40:39 ray Exp $ */
+/*      $OpenBSD: memset.c,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -45,3 +45,4 @@ memset(void *dst, int c, size_t n)
         }
         return (dst);
 }
+DEF_STRONG(memset);
diff --git a/src/lib/libc/string/stpncpy.c b/src/lib/libc/string/stpncpy.c
index c7c2a57c4c..6bdee5de16 100644
--- a/src/lib/libc/string/stpncpy.c
+++ b/src/lib/libc/string/stpncpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: stpncpy.c,v 1.2 2012/07/11 10:44:59 naddy Exp $       */
+/*      $OpenBSD: stpncpy.c,v 1.3 2015/08/31 02:53:57 guenther Exp $    */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -54,3 +54,4 @@ stpncpy(char *dst, const char *src, size_t n)
         }
         return (dst);
 }
+DEF_WEAK(stpncpy);
diff --git a/src/lib/libc/string/strcasecmp.c b/src/lib/libc/string/strcasecmp.c
index 2be09136c0..edbd638722 100644
--- a/src/lib/libc/string/strcasecmp.c
+++ b/src/lib/libc/string/strcasecmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strcasecmp.c,v 1.6 2005/08/08 08:05:37 espie Exp $    */
+/*      $OpenBSD: strcasecmp.c,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
 
 /*
  * Copyright (c) 1987, 1993
@@ -85,6 +85,7 @@ strcasecmp(const char *s1, const char *s2)
                         return (0);
         return (cm[*us1] - cm[*--us2]);
 }
+DEF_WEAK(strcasecmp);
 
 int
 strncasecmp(const char *s1, const char *s2, size_t n)
@@ -103,3 +104,4 @@ strncasecmp(const char *s1, const char *s2, size_t n)
         }
         return (0);
 }
+DEF_WEAK(strncasecmp);
diff --git a/src/lib/libc/string/strcasestr.c b/src/lib/libc/string/strcasestr.c
index aa74c0176d..abb3e15549 100644
--- a/src/lib/libc/string/strcasestr.c
+++ b/src/lib/libc/string/strcasestr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strcasestr.c,v 1.3 2006/03/31 05:34:55 deraadt Exp $  */
+/*      $OpenBSD: strcasestr.c,v 1.4 2015/08/31 02:53:57 guenther Exp $ */
 /*      $NetBSD: strcasestr.c,v 1.2 2005/02/09 21:35:47 kleink Exp $    */
 
 /*-
@@ -58,3 +58,4 @@ strcasestr(const char *s, const char *find)
         }
         return ((char *)s);
 }
+DEF_WEAK(strcasestr);
diff --git a/src/lib/libc/string/strchr.c b/src/lib/libc/string/strchr.c
index 596e407c9b..b396b45b3b 100644
--- a/src/lib/libc/string/strchr.c
+++ b/src/lib/libc/string/strchr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strchr.c,v 1.2 2015/05/15 22:29:37 millert Exp $ */
+/*      $OpenBSD: strchr.c,v 1.3 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -43,3 +43,4 @@ strchr(const char *p, int ch)
         }
         /* NOTREACHED */
 }
+DEF_STRONG(strchr);
diff --git a/src/lib/libc/string/strcmp.c b/src/lib/libc/string/strcmp.c
index d1b6c50d79..be175563d4 100644
--- a/src/lib/libc/string/strcmp.c
+++ b/src/lib/libc/string/strcmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strcmp.c,v 1.8 2014/06/10 04:17:37 deraadt Exp $      */
+/*      $OpenBSD: strcmp.c,v 1.9 2015/08/31 02:53:57 guenther Exp $     */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -45,3 +45,4 @@ strcmp(const char *s1, const char *s2)
                         return (0);
         return (*(unsigned char *)s1 - *(unsigned char *)--s2);
 }
+DEF_STRONG(strcmp);
diff --git a/src/lib/libc/string/strcoll.c b/src/lib/libc/string/strcoll.c
index 2df983bd65..47a6ea4f24 100644
--- a/src/lib/libc/string/strcoll.c
+++ b/src/lib/libc/string/strcoll.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strcoll.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strcoll.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -42,3 +42,4 @@ strcoll(const char *s1, const char *s2)
         /* LC_COLLATE is unimplemented, hence always "C" */
         return (strcmp(s1, s2));
 }
+DEF_STRONG(strcoll);
diff --git a/src/lib/libc/string/strcspn.c b/src/lib/libc/string/strcspn.c
index 1eb233614d..3c1f5a4cec 100644
--- a/src/lib/libc/string/strcspn.c
+++ b/src/lib/libc/string/strcspn.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strcspn.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strcspn.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -56,3 +56,4 @@ strcspn(const char *s1, const char *s2)
         }
         /* NOTREACHED */
 }
+DEF_STRONG(strcspn);
diff --git a/src/lib/libc/string/strdup.c b/src/lib/libc/string/strdup.c
index a6aa1e03b0..9aebf399c1 100644
--- a/src/lib/libc/string/strdup.c
+++ b/src/lib/libc/string/strdup.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strdup.c,v 1.6 2005/08/08 08:05:37 espie Exp $        */
+/*      $OpenBSD: strdup.c,v 1.7 2015/08/31 02:53:57 guenther Exp $     */
 
 /*
  * Copyright (c) 1988, 1993
@@ -47,3 +47,4 @@ strdup(const char *str)
         (void)memcpy(copy, str, siz);
         return(copy);
 }
+DEF_WEAK(strdup);
diff --git a/src/lib/libc/string/strerror.c b/src/lib/libc/string/strerror.c
index 13996f08e9..c6f05446fd 100644
--- a/src/lib/libc/string/strerror.c
+++ b/src/lib/libc/string/strerror.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strerror.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strerror.c,v 1.8 2015/08/31 02:53:57 guenther Exp $ */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -39,3 +39,4 @@ strerror(int num)
         (void)strerror_r(num, buf, sizeof(buf));
         return (buf);
 }
+DEF_STRONG(strerror);
diff --git a/src/lib/libc/string/strerror_r.c b/src/lib/libc/string/strerror_r.c
index b85136055b..90aa012360 100644
--- a/src/lib/libc/string/strerror_r.c
+++ b/src/lib/libc/string/strerror_r.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: strerror_r.c,v 1.8 2013/06/01 21:26:18 stsp Exp $ */
+/* $OpenBSD: strerror_r.c,v 1.9 2015/08/31 02:53:57 guenther Exp $ */
 /* Public Domain <marc@snafu.org> */
 
 #ifdef NLS
@@ -125,6 +125,7 @@ strerror_r(int errnum, char *strerrbuf, size_t buflen)
         errno = ret_errno ? ret_errno : save_errno;
         return (ret_errno);
 }
+DEF_WEAK(strerror_r);
 
 #define USIGPREFIX "Unknown signal: "
 
diff --git a/src/lib/libc/string/strlcat.c b/src/lib/libc/string/strlcat.c
index 14c53a1f69..073b0d4259 100644
--- a/src/lib/libc/string/strlcat.c
+++ b/src/lib/libc/string/strlcat.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $    */
+/*      $OpenBSD: strlcat.c,v 1.16 2015/08/31 02:53:57 guenther Exp $   */
 
 /*
  * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -53,3 +53,4 @@ strlcat(char *dst, const char *src, size_t dsize)
 
         return(dlen + (src - osrc));    /* count does not include NUL */
 }
+DEF_WEAK(strlcat);
diff --git a/src/lib/libc/string/strlcpy.c b/src/lib/libc/string/strlcpy.c
index e9a7fe4be7..5fcf084aaa 100644
--- a/src/lib/libc/string/strlcpy.c
+++ b/src/lib/libc/string/strlcpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $    */
+/*      $OpenBSD: strlcpy.c,v 1.13 2015/08/31 02:53:57 guenther Exp $   */
 
 /*
  * Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -48,3 +48,4 @@ strlcpy(char *dst, const char *src, size_t dsize)
 
         return(src - osrc - 1); /* count does not include NUL */
 }
+DEF_WEAK(strlcpy);
diff --git a/src/lib/libc/string/strlen.c b/src/lib/libc/string/strlen.c
index 7e0e27b1d8..a5721d3e7f 100644
--- a/src/lib/libc/string/strlen.c
+++ b/src/lib/libc/string/strlen.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strlen.c,v 1.8 2014/06/10 04:17:37 deraadt Exp $      */
+/*      $OpenBSD: strlen.c,v 1.9 2015/08/31 02:53:57 guenther Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -41,3 +41,4 @@ strlen(const char *str)
         return (s - str);
 }
 
+DEF_STRONG(strlen);
diff --git a/src/lib/libc/string/strmode.c b/src/lib/libc/string/strmode.c
index 6f0fa34ed8..609b8931fb 100644
--- a/src/lib/libc/string/strmode.c
+++ b/src/lib/libc/string/strmode.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strmode.c,v 1.7 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strmode.c,v 1.8 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -138,3 +138,4 @@ strmode(int mode, char *p)
         *p++ = ' ';             /* will be a '+' if ACL's implemented */
         *p = '\0';
 }
+DEF_WEAK(strmode);
diff --git a/src/lib/libc/string/strncat.c b/src/lib/libc/string/strncat.c
index c4df4f2fad..b3388accf3 100644
--- a/src/lib/libc/string/strncat.c
+++ b/src/lib/libc/string/strncat.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strncat.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strncat.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -55,3 +55,4 @@ strncat(char *dst, const char *src, size_t n)
         }
         return (dst);
 }
+DEF_STRONG(strncat);
diff --git a/src/lib/libc/string/strncmp.c b/src/lib/libc/string/strncmp.c
index 0a4ddc1d9e..535d2a60fd 100644
--- a/src/lib/libc/string/strncmp.c
+++ b/src/lib/libc/string/strncmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strncmp.c,v 1.8 2014/06/10 04:17:37 deraadt Exp $     */
+/*      $OpenBSD: strncmp.c,v 1.9 2015/08/31 02:53:57 guenther Exp $    */
 
 /*
  * Copyright (c) 1989 The Regents of the University of California.
@@ -45,3 +45,4 @@ strncmp(const char *s1, const char *s2, size_t n)
         } while (--n != 0);
         return (0);
 }
+DEF_STRONG(strncmp);
diff --git a/src/lib/libc/string/strncpy.c b/src/lib/libc/string/strncpy.c
index 5003a199a9..d6d8647fc7 100644
--- a/src/lib/libc/string/strncpy.c
+++ b/src/lib/libc/string/strncpy.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strncpy.c,v 1.7 2014/06/10 04:17:37 deraadt Exp $     */
+/*      $OpenBSD: strncpy.c,v 1.8 2015/08/31 02:53:57 guenther Exp $    */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -56,3 +56,4 @@ strncpy(char *dst, const char *src, size_t n)
         }
         return (dst);
 }
+DEF_STRONG(strncpy);
diff --git a/src/lib/libc/string/strndup.c b/src/lib/libc/string/strndup.c
index 27701ac555..a6e5bff7ca 100644
--- a/src/lib/libc/string/strndup.c
+++ b/src/lib/libc/string/strndup.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strndup.c,v 1.1 2010/05/18 22:24:55 tedu Exp $        */
+/*      $OpenBSD: strndup.c,v 1.2 2015/08/31 02:53:57 guenther Exp $    */
 
 /*
  * Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -37,3 +37,4 @@ strndup(const char *str, size_t maxlen)
 
         return copy;
 }
+DEF_WEAK(strndup);
diff --git a/src/lib/libc/string/strnlen.c b/src/lib/libc/string/strnlen.c
index 872cfa6cce..26e9743f18 100644
--- a/src/lib/libc/string/strnlen.c
+++ b/src/lib/libc/string/strnlen.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strnlen.c,v 1.5 2014/06/10 04:17:37 deraadt Exp $     */
+/*      $OpenBSD: strnlen.c,v 1.6 2015/08/31 02:53:57 guenther Exp $    */
 
 /*
  * Copyright (c) 2010 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -30,3 +30,4 @@ strnlen(const char *str, size_t maxlen)
 
         return (size_t)(cp - str);
 }
+DEF_WEAK(strnlen);
diff --git a/src/lib/libc/string/strpbrk.c b/src/lib/libc/string/strpbrk.c
index cd3b71c0d3..336c22dedd 100644
--- a/src/lib/libc/string/strpbrk.c
+++ b/src/lib/libc/string/strpbrk.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strpbrk.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strpbrk.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
 /*
  * Copyright (c) 1985 Regents of the University of California.
  * All rights reserved.
@@ -46,3 +46,4 @@ strpbrk(const char *s1, const char *s2)
         }
         return (NULL);
 }
+DEF_STRONG(strpbrk);
diff --git a/src/lib/libc/string/strrchr.c b/src/lib/libc/string/strrchr.c
index 181f56ea69..9375572144 100644
--- a/src/lib/libc/string/strrchr.c
+++ b/src/lib/libc/string/strrchr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strrchr.c,v 1.2 2015/05/15 22:29:37 millert Exp $ */
+/*      $OpenBSD: strrchr.c,v 1.3 2015/08/31 02:53:57 guenther Exp $ */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -45,3 +45,4 @@ strrchr(const char *p, int ch)
         }
         /* NOTREACHED */
 }
+DEF_STRONG(strrchr);
diff --git a/src/lib/libc/string/strsep.c b/src/lib/libc/string/strsep.c
index 2ffc4b4c46..97c3cbf1f5 100644
--- a/src/lib/libc/string/strsep.c
+++ b/src/lib/libc/string/strsep.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strsep.c,v 1.7 2014/02/05 20:42:32 stsp Exp $ */
+/*      $OpenBSD: strsep.c,v 1.8 2015/08/31 02:53:57 guenther Exp $     */
 
 /*-
  * Copyright (c) 1990, 1993
@@ -68,3 +68,4 @@ strsep(char **stringp, const char *delim)
         }
         /* NOTREACHED */
 }
+DEF_WEAK(strsep);
diff --git a/src/lib/libc/string/strsignal.c b/src/lib/libc/string/strsignal.c
index aa541cefed..a71a291fbc 100644
--- a/src/lib/libc/string/strsignal.c
+++ b/src/lib/libc/string/strsignal.c
@@ -39,3 +39,4 @@ strsignal(int sig)
 
         return __strsignal(sig, buf);
 }
+DEF_WEAK(strsignal);
diff --git a/src/lib/libc/string/strspn.c b/src/lib/libc/string/strspn.c
index 385649c041..0ce41cbb49 100644
--- a/src/lib/libc/string/strspn.c
+++ b/src/lib/libc/string/strspn.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strspn.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strspn.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
 /*
  * Copyright (c) 1989 The Regents of the University of California.
  * All rights reserved.
@@ -49,3 +49,4 @@ cont:
                         goto cont;
         return (p - 1 - s1);
 }
+DEF_STRONG(strspn);
diff --git a/src/lib/libc/string/strstr.c b/src/lib/libc/string/strstr.c
index 95a865bf79..ccd0871700 100644
--- a/src/lib/libc/string/strstr.c
+++ b/src/lib/libc/string/strstr.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strstr.c,v 1.5 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strstr.c,v 1.6 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -54,3 +54,4 @@ strstr(const char *s, const char *find)
         }
         return ((char *)s);
 }
+DEF_STRONG(strstr);
diff --git a/src/lib/libc/string/strtok.c b/src/lib/libc/string/strtok.c
index 6ba6b21cd6..c5765756fc 100644
--- a/src/lib/libc/string/strtok.c
+++ b/src/lib/libc/string/strtok.c
@@ -36,6 +36,7 @@ strtok(char *s, const char *delim)
 
         return strtok_r(s, delim, &last);
 }
+DEF_STRONG(strtok);
 
 char *
 strtok_r(char *s, const char *delim, char **last)
@@ -83,3 +84,4 @@ cont:
         }
         /* NOTREACHED */
 }
+DEF_WEAK(strtok_r);
diff --git a/src/lib/libc/string/strxfrm.c b/src/lib/libc/string/strxfrm.c
index 6f289c901e..97df097b29 100644
--- a/src/lib/libc/string/strxfrm.c
+++ b/src/lib/libc/string/strxfrm.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: strxfrm.c,v 1.6 2005/08/08 08:05:37 espie Exp $ */
+/*      $OpenBSD: strxfrm.c,v 1.7 2015/08/31 02:53:57 guenther Exp $ */
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
@@ -49,3 +49,4 @@ strxfrm(char *dst, const char *src, size_t n)
                 return (strlen(src));
         return (strlcpy(dst, src, n));
 }
+DEF_STRONG(strxfrm);
diff --git a/src/lib/libc/string/timingsafe_bcmp.c b/src/lib/libc/string/timingsafe_bcmp.c
index 0b736154ca..0409ec3244 100644
--- a/src/lib/libc/string/timingsafe_bcmp.c
+++ b/src/lib/libc/string/timingsafe_bcmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: timingsafe_bcmp.c,v 1.2 2014/06/10 04:17:37 deraadt Exp $     */
+/*      $OpenBSD: timingsafe_bcmp.c,v 1.3 2015/08/31 02:53:57 guenther Exp $    */
 /*
  * Copyright (c) 2010 Damien Miller.  All rights reserved.
  *
@@ -27,3 +27,4 @@ timingsafe_bcmp(const void *b1, const void *b2, size_t n)
                 ret |= *p1++ ^ *p2++;
         return (ret != 0);
 }
+DEF_WEAK(timingsafe_bcmp);
diff --git a/src/lib/libc/string/timingsafe_memcmp.c b/src/lib/libc/string/timingsafe_memcmp.c
index 04e2ac5e20..373f8cb197 100644
--- a/src/lib/libc/string/timingsafe_memcmp.c
+++ b/src/lib/libc/string/timingsafe_memcmp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: timingsafe_memcmp.c,v 1.1 2014/06/13 02:12:17 matthew Exp $   */
+/*      $OpenBSD: timingsafe_memcmp.c,v 1.2 2015/08/31 02:53:57 guenther Exp $  */
 /*
  * Copyright (c) 2014 Google Inc.
  *
@@ -44,3 +44,4 @@ timingsafe_memcmp(const void *b1, const void *b2, size_t len)
 
         return (res);
 }
+DEF_WEAK(timingsafe_memcmp);