Module Name: src
Committed By: pooka
Date: Mon Dec 9 18:06:27 UTC 2013
Modified Files:
src/sys/kern: kern_stub.c
Log Message:
As long as we're using #ifdef to decide which stubs get generated, might
as well use __strong_alias instead of __weak_alias. Some toolchains
such as the cygwin pecoff one get weak aliases a bit wrong, so avoiding
unnecessary weak alises helps there.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/kern/kern_stub.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_stub.c
diff -u src/sys/kern/kern_stub.c:1.37 src/sys/kern/kern_stub.c:1.38
--- src/sys/kern/kern_stub.c:1.37 Sun Feb 19 21:06:54 2012
+++ src/sys/kern/kern_stub.c Mon Dec 9 18:06:27 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_stub.c,v 1.37 2012/02/19 21:06:54 rmind Exp $ */
+/* $NetBSD: kern_stub.c,v 1.38 2013/12/09 18:06:27 pooka Exp $ */
/*-
* Copyright (c) 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.37 2012/02/19 21:06:54 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.38 2013/12/09 18:06:27 pooka Exp $");
#include "opt_ptrace.h"
#include "opt_ktrace.h"
@@ -89,7 +89,7 @@ bool default_bus_space_handle_is_equal(b
* error in case process won't see signal immediately (blocked or ignored).
*/
#ifndef PTRACE
-__weak_alias(sys_ptrace,sys_nosys);
+__strong_alias(sys_ptrace,sys_nosys);
#endif /* PTRACE */
/*
@@ -97,29 +97,29 @@ __weak_alias(sys_ptrace,sys_nosys);
* but not kill the process: utrace() is a debugging feature.
*/
#ifndef KTRACE
-__weak_alias(ktr_csw,nullop); /* Probes */
-__weak_alias(ktr_emul,nullop);
-__weak_alias(ktr_geniov,nullop);
-__weak_alias(ktr_genio,nullop);
-__weak_alias(ktr_mibio,nullop);
-__weak_alias(ktr_namei,nullop);
-__weak_alias(ktr_namei2,nullop);
-__weak_alias(ktr_psig,nullop);
-__weak_alias(ktr_syscall,nullop);
-__weak_alias(ktr_sysret,nullop);
-__weak_alias(ktr_kuser,nullop);
-__weak_alias(ktr_mib,nullop);
-__weak_alias(ktr_execarg,nullop);
-__weak_alias(ktr_execenv,nullop);
-__weak_alias(ktr_execfd,nullop);
-
-__weak_alias(sys_fktrace,sys_nosys); /* Syscalls */
-__weak_alias(sys_ktrace,sys_nosys);
-__weak_alias(sys_utrace,sys_nosys);
+__strong_alias(ktr_csw,nullop); /* Probes */
+__strong_alias(ktr_emul,nullop);
+__strong_alias(ktr_geniov,nullop);
+__strong_alias(ktr_genio,nullop);
+__strong_alias(ktr_mibio,nullop);
+__strong_alias(ktr_namei,nullop);
+__strong_alias(ktr_namei2,nullop);
+__strong_alias(ktr_psig,nullop);
+__strong_alias(ktr_syscall,nullop);
+__strong_alias(ktr_sysret,nullop);
+__strong_alias(ktr_kuser,nullop);
+__strong_alias(ktr_mib,nullop);
+__strong_alias(ktr_execarg,nullop);
+__strong_alias(ktr_execenv,nullop);
+__strong_alias(ktr_execfd,nullop);
+
+__strong_alias(sys_fktrace,sys_nosys); /* Syscalls */
+__strong_alias(sys_ktrace,sys_nosys);
+__strong_alias(sys_utrace,sys_nosys);
int ktrace_on; /* Misc */
-__weak_alias(ktruser,enosys);
-__weak_alias(ktr_point,nullop);
+__strong_alias(ktruser,enosys);
+__strong_alias(ktr_point,nullop);
#endif /* KTRACE */
__weak_alias(device_register, voidop);
