Module Name: src
Committed By: pooka
Date: Thu Nov 26 07:40:34 UTC 2009
Modified Files:
src/common/lib/libc/arch/i386/atomic: atomic.S
src/common/lib/libc/arch/x86_64/atomic: atomic.S
Log Message:
Use strong alias within the kernel namespace regardless of if we're
dealing with a hard or soft kernel (kernel linker doesn't support
weak symbols).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/common/lib/libc/arch/i386/atomic/atomic.S
cvs rdiff -u -r1.14 -r1.15 src/common/lib/libc/arch/x86_64/atomic/atomic.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/i386/atomic/atomic.S
diff -u src/common/lib/libc/arch/i386/atomic/atomic.S:1.17 src/common/lib/libc/arch/i386/atomic/atomic.S:1.18
--- src/common/lib/libc/arch/i386/atomic/atomic.S:1.17 Thu Apr 2 00:19:02 2009
+++ src/common/lib/libc/arch/i386/atomic/atomic.S Thu Nov 26 07:40:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.S,v 1.17 2009/04/02 00:19:02 enami Exp $ */
+/* $NetBSD: atomic.S,v 1.18 2009/11/26 07:40:34 pooka Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -32,13 +32,17 @@
#include <sys/param.h>
#include <machine/asm.h>
+#ifdef _KERNEL
+#define ALIAS(f, t) STRONG_ALIAS(f,t)
+#else
+#define ALIAS(f, t) WEAK_ALIAS(f,t)
+#endif
+
#ifdef _HARDKERNEL
#define LOCK(n) .Lpatch/**/n: lock
-#define ALIAS(f, t) STRONG_ALIAS(f,t)
#define ENDLABEL(a) _ALIGN_TEXT; LABEL(a)
#else
#define LOCK(n) lock
-#define ALIAS(f, t) WEAK_ALIAS(f,t)
#define ENDLABEL(a) /* nothing */
#endif
Index: src/common/lib/libc/arch/x86_64/atomic/atomic.S
diff -u src/common/lib/libc/arch/x86_64/atomic/atomic.S:1.14 src/common/lib/libc/arch/x86_64/atomic/atomic.S:1.15
--- src/common/lib/libc/arch/x86_64/atomic/atomic.S:1.14 Mon Jan 12 02:53:29 2009
+++ src/common/lib/libc/arch/x86_64/atomic/atomic.S Thu Nov 26 07:40:34 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic.S,v 1.14 2009/01/12 02:53:29 pooka Exp $ */
+/* $NetBSD: atomic.S,v 1.15 2009/11/26 07:40:34 pooka Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -32,13 +32,17 @@
#include <sys/param.h>
#include <machine/asm.h>
+#ifdef _KERNEL
+#define ALIAS(f, t) STRONG_ALIAS(f,t)
+#else
+#define ALIAS(f, t) WEAK_ALIAS(f,t)
+#endif
+
#ifdef _HARDKERNEL
#define LOCK(n) .Lpatch/**/n: lock
-#define ALIAS(f, t) STRONG_ALIAS(f,t)
#define ENDLABEL(a) _ALIGN_TEXT; LABEL(a)
#else
#define LOCK(n) lock
-#define ALIAS(f, t) WEAK_ALIAS(f,t)
#define ENDLABEL(a) /* nothing */
#endif
