Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework ksym defines and includes.

This commit is contained in:
matt 2015-05-20 04:37:45 +00:00
parent cdbc8d4e56
commit 0828cd07d4
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/libc/gen/nlist_elf32.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: nlist_elf32.c,v 1.37 2015/05/20 02:45:20 matt Exp $ */
/* $NetBSD: nlist_elf32.c,v 1.38 2015/05/20 04:37:45 matt Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou
@ -36,7 +36,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: nlist_elf32.c,v 1.37 2015/05/20 02:45:20 matt Exp $");
__RCSID("$NetBSD: nlist_elf32.c,v 1.38 2015/05/20 04:37:45 matt Exp $");
#endif /* LIBC_SCCS and not lint */
/* If not included by nlist_elf64.c, ELFSIZE won't be defined. */
@ -50,7 +50,6 @@ __RCSID("$NetBSD: nlist_elf32.c,v 1.37 2015/05/20 02:45:20 matt Exp $");
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/ioctl.h>
#include <sys/ksyms.h>
#include <assert.h>
#include <errno.h>
@ -64,6 +63,8 @@ __RCSID("$NetBSD: nlist_elf32.c,v 1.37 2015/05/20 02:45:20 matt Exp $");
#include <sys/exec_elf.h>
#endif
#include <sys/ksyms.h> /* after sys/exec_elf.h */
#if (defined(NLIST_ELF32) && (ELFSIZE == 32)) || \
(defined(NLIST_ELF64) && (ELFSIZE == 64))

5
sys/compat/netbsd32/netbsd32_ioctl.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: netbsd32_ioctl.c,v 1.71 2015/05/20 02:45:20 matt Exp $ */
/* $NetBSD: netbsd32_ioctl.c,v 1.72 2015/05/20 04:37:45 matt Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.71 2015/05/20 02:45:20 matt Exp $");
__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.72 2015/05/20 04:37:45 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@ -54,6 +54,7 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.71 2015/05/20 02:45:20 matt Exp
#include <sys/envsys.h>
#include <sys/wdog.h>
#include <sys/clockctl.h>
#include <sys/exec_elf.h>
#include <sys/ksyms.h>
#ifdef __sparc__

8
sys/sys/ksyms.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: ksyms.h,v 1.31 2015/05/20 02:45:20 matt Exp $ */
/* $NetBSD: ksyms.h,v 1.32 2015/05/20 04:37:45 matt Exp $ */
/*
* Copyright (c) 2001, 2003 Anders Magnusson (ragge@ludd.luth.se).
@ -30,10 +30,8 @@
#ifndef _SYS_KSYMS_H_
#define _SYS_KSYMS_H_
#include <sys/exec_elf.h>
#ifdef _KSYMS_PRIVATE
#include <sys/exec_elf.h>
#include <sys/queue.h>
struct ksyms_symtab {
@ -92,12 +90,14 @@ struct ksyms_ogsymbol {
#define kg_value _un.ku_value
};
#ifdef ELFSIZE
struct ksyms_gsymbol {
const char *kg_name;
union {
Elf_Sym ku_sym;
} _un;
};
#endif
struct ksyms_gvalue {
const char *kv_name;