[src/trunk]: src/common/lib/libc/hash Don't define weak aliases if _STANDALONE.

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

details:   https://anonhg.NetBSD.org/src/rev/9eb8641772b1
branches:  trunk
changeset: 746845:9eb8641772b1
user:      skrll <skrll%NetBSD.org@localhost>
date:      Fri Aug 21 09:40:51 2009 +0000

description:
Don't define weak aliases if _STANDALONE.

diffstat:

 common/lib/libc/hash/rmd160/rmd160.c |  10 ++++++----
 common/lib/libc/hash/sha1/sha1.c     |  10 ++++++----
 common/lib/libc/hash/sha2/sha2.c     |  10 ++++++----
 3 files changed, 18 insertions(+), 12 deletions(-)

diffs (129 lines):

diff -r 80f3ced8b834 -r 9eb8641772b1 common/lib/libc/hash/rmd160/rmd160.c
--- a/common/lib/libc/hash/rmd160/rmd160.c      Fri Aug 21 09:20:47 2009 +0000
+++ b/common/lib/libc/hash/rmd160/rmd160.c      Fri Aug 21 09:40:51 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rmd160.c,v 1.4 2008/02/16 17:37:13 apb Exp $ */
+/*     $NetBSD: rmd160.c,v 1.5 2009/08/21 09:40:51 skrll Exp $ */
 /*     $KAME: rmd160.c,v 1.2 2003/07/25 09:37:55 itojun Exp $  */
 /*     $OpenBSD: rmd160.c,v 1.3 2001/09/26 21:40:13 markus Exp $       */
 /*
@@ -33,14 +33,14 @@
 #include <sys/cdefs.h>
 
 #if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: rmd160.c,v 1.4 2008/02/16 17:37:13 apb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmd160.c,v 1.5 2009/08/21 09:40:51 skrll Exp $");
 
 #include <lib/libkern/libkern.h>
 
 #else
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: rmd160.c,v 1.4 2008/02/16 17:37:13 apb Exp $");
+__RCSID("$NetBSD: rmd160.c,v 1.5 2009/08/21 09:40:51 skrll Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -111,12 +111,14 @@
        0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-#if !defined(_KERNEL) && defined(__weak_alias)
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#if defined(__weak_alias)
 __weak_alias(RMD160Init,_RMD160Init) 
 __weak_alias(RMD160Update,_RMD160Update)
 __weak_alias(RMD160Final,_RMD160Final)
 __weak_alias(RMD160Transform,_RMD160Transform)
 #endif
+#endif
 
 void
 RMD160Init(RMD160_CTX *ctx)
diff -r 80f3ced8b834 -r 9eb8641772b1 common/lib/libc/hash/sha1/sha1.c
--- a/common/lib/libc/hash/sha1/sha1.c  Fri Aug 21 09:20:47 2009 +0000
+++ b/common/lib/libc/hash/sha1/sha1.c  Fri Aug 21 09:40:51 2009 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sha1.c,v 1.4 2009/03/16 05:59:21 cegger Exp $  */
+/*     $NetBSD: sha1.c,v 1.5 2009/08/21 09:40:51 skrll Exp $   */
 /*     $OpenBSD: sha1.c,v 1.9 1997/07/23 21:12:32 kstailey Exp $       */
 
 /*
@@ -20,14 +20,14 @@
 #include <sys/cdefs.h>
 
 #if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: sha1.c,v 1.4 2009/03/16 05:59:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sha1.c,v 1.5 2009/08/21 09:40:51 skrll Exp $");
 
 #include <lib/libkern/libkern.h>
 
 #else
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha1.c,v 1.4 2009/03/16 05:59:21 cegger Exp $");
+__RCSID("$NetBSD: sha1.c,v 1.5 2009/08/21 09:40:51 skrll Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -71,12 +71,14 @@
 #define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
 
 
-#if !defined(_KERNEL) && defined(__weak_alias)
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#if defined(__weak_alias)
 __weak_alias(SHA1Transform,_SHA1Transform)
 __weak_alias(SHA1Init,_SHA1Init)
 __weak_alias(SHA1Update,_SHA1Update)
 __weak_alias(SHA1Final,_SHA1Final)
 #endif
+#endif
 
 typedef union {
     u_char c[64];
diff -r 80f3ced8b834 -r 9eb8641772b1 common/lib/libc/hash/sha2/sha2.c
--- a/common/lib/libc/hash/sha2/sha2.c  Fri Aug 21 09:20:47 2009 +0000
+++ b/common/lib/libc/hash/sha2/sha2.c  Fri Aug 21 09:40:51 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sha2.c,v 1.18 2009/06/25 14:05:18 joerg Exp $ */
+/* $NetBSD: sha2.c,v 1.19 2009/08/21 09:40:51 skrll Exp $ */
 /*     $KAME: sha2.c,v 1.9 2003/07/20 00:28:38 itojun Exp $    */
 
 /*
@@ -43,7 +43,7 @@
 #include <sys/cdefs.h>
 
 #if defined(_KERNEL) || defined(_STANDALONE)
-__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.18 2009/06/25 14:05:18 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sha2.c,v 1.19 2009/08/21 09:40:51 skrll Exp $");
 
 #include <sys/param.h> /* XXX: to pull <machine/macros.h> for vax memset(9) */
 #include <lib/libkern/libkern.h>
@@ -51,7 +51,7 @@
 #else
 
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: sha2.c,v 1.18 2009/06/25 14:05:18 joerg Exp $");
+__RCSID("$NetBSD: sha2.c,v 1.19 2009/08/21 09:40:51 skrll Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "namespace.h"
@@ -282,7 +282,8 @@
        0x5be0cd19137e2179ULL
 };
 
-#if !defined(_KERNEL) && defined(__weak_alias)
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#if defined(__weak_alias)
 __weak_alias(SHA224_Init,_SHA224_Init) 
 __weak_alias(SHA224_Update,_SHA224_Update)
 __weak_alias(SHA224_Final,_SHA224_Final)
@@ -303,6 +304,7 @@
 __weak_alias(SHA512_Final,_SHA512_Final)
 __weak_alias(SHA512_Transform,_SHA512_Transform)
 #endif
+#endif
 
 /*** SHA-256: *********************************************************/
 int