Module Name: src
Committed By: pooka
Date: Mon Apr 26 22:58:53 UTC 2010
Modified Files:
src/sys/kern: kern_stub.c subr_kobj.c
src/sys/sys: kobj.h
Log Message:
Add an optional hook for adjusting module string table after load.
Currently to be used for rump "SAOS" namespace trick.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/kern/kern_stub.c
cvs rdiff -u -r1.40 -r1.41 src/sys/kern/subr_kobj.c
cvs rdiff -u -r1.13 -r1.14 src/sys/sys/kobj.h
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.26 src/sys/kern/kern_stub.c:1.27
--- src/sys/kern/kern_stub.c:1.26 Mon Apr 19 18:24:27 2010
+++ src/sys/kern/kern_stub.c Mon Apr 26 22:58:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_stub.c,v 1.26 2010/04/19 18:24:27 dyoung Exp $ */
+/* $NetBSD: kern_stub.c,v 1.27 2010/04/26 22:58:53 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.26 2010/04/19 18:24:27 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_stub.c,v 1.27 2010/04/26 22:58:53 pooka Exp $");
#include "opt_ptrace.h"
#include "opt_ktrace.h"
@@ -129,6 +129,8 @@
__weak_alias(bus_space_tag_destroy, voidop);
__weak_alias(bus_space_is_equal, default_bus_space_is_equal);
+__weak_alias(kobj_renamespace, nullop);
+
#if !defined(KERN_SA)
/*
* Scheduler activations system calls. These need to remain, even when
Index: src/sys/kern/subr_kobj.c
diff -u src/sys/kern/subr_kobj.c:1.40 src/sys/kern/subr_kobj.c:1.41
--- src/sys/kern/subr_kobj.c:1.40 Fri Nov 27 17:54:11 2009
+++ src/sys/kern/subr_kobj.c Mon Apr 26 22:58:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_kobj.c,v 1.40 2009/11/27 17:54:11 pooka Exp $ */
+/* $NetBSD: subr_kobj.c,v 1.41 2010/04/26 22:58:53 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.40 2009/11/27 17:54:11 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_kobj.c,v 1.41 2010/04/26 22:58:53 pooka Exp $");
#include "opt_modular.h"
@@ -337,6 +337,15 @@
}
/*
+ * Adjust module symbol namespace, if necessary (e.g. with rump)
+ */
+ error = kobj_renamespace(ko->ko_symtab, ko->ko_symcnt,
+ &ko->ko_strtab, &ko->ko_strtabsz);
+ if (error != 0) {
+ goto out;
+ }
+
+ /*
* Do we have a string table for the section names?
*/
if (hdr->e_shstrndx != 0 && shdr[hdr->e_shstrndx].sh_size != 0 &&
Index: src/sys/sys/kobj.h
diff -u src/sys/sys/kobj.h:1.13 src/sys/sys/kobj.h:1.14
--- src/sys/sys/kobj.h:1.13 Tue Jan 19 22:17:45 2010
+++ src/sys/sys/kobj.h Mon Apr 26 22:58:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: kobj.h,v 1.13 2010/01/19 22:17:45 pooka Exp $ */
+/* $NetBSD: kobj.h,v 1.14 2010/04/26 22:58:53 pooka Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,6 +29,9 @@
#ifndef _SYS_KOBJ_H_
#define _SYS_KOBJ_H_
+#define ELFSIZE ARCH_ELFSIZE
+#include <sys/exec_elf.h>
+
typedef struct kobj *kobj_t;
/* External interface. */
@@ -44,4 +47,7 @@
int kobj_reloc(kobj_t, uintptr_t, const void *, bool, bool);
int kobj_machdep(kobj_t, void *, size_t, bool);
+/* implementation interface. */
+int kobj_renamespace(Elf_Sym *, size_t, char **, size_t *);
+
#endif /* !_SYS_KOBJ_H_ */
