mischief/openbsd-src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2025-01-10 06:47:55 -08:00
Code

remove last bits of a.out support

Browse Source
This commit is contained in:
deraadt 2013-10-15 02:46:31 +00:00
parent 1ab398d4f9
commit 7913751813
2 changed files with 2 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sbin/modload/modload.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: modload.c,v 1.44 2011/06/09 04:57:01 deraadt Exp $ */ /* $OpenBSD: modload.c,v 1.45 2013/10/15 02:46:31 deraadt Exp $ */
/* $NetBSD: modload.c,v 1.30 2001/11/08 15:33:15 christos Exp $ */ /* $NetBSD: modload.c,v 1.30 2001/11/08 15:33:15 christos Exp $ */
/* /*
@ -143,11 +143,7 @@ verify_entry(const char *entry, char *filename)
memset(names, 0, sizeof(names)); memset(names, 0, sizeof(names));
if (asprintf(&s, "_%s", entry) == -1) if (asprintf(&s, "_%s", entry) == -1)
err(1, "malloc"); err(1, "malloc");
#ifdef _AOUT_INCLUDE_
names[0].n_un.n_name = s;
#else
names[0].n_name = s; names[0].n_name = s;
#endif
n = nlist(filename, names); n = nlist(filename, names);
if (n == -1) if (n == -1)

16
sbin/modload/modload.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: modload.h,v 1.4 2002/06/09 08:13:07 todd Exp $ */ /* $OpenBSD: modload.h,v 1.5 2013/10/15 02:46:31 deraadt Exp $ */
/* $NetBSD: modload.h,v 1.2 2001/11/08 15:33:15 christos Exp $ */ /* $NetBSD: modload.h,v 1.2 2001/11/08 15:33:15 christos Exp $ */
/* /*
@ -43,24 +43,10 @@ void elf_linkcmd(char *, size_t, const char *, const char *,
const char *, const void *, const char *); const char *, const void *, const char *);
void elf_mod_symload(int); void elf_mod_symload(int);
int a_out_mod_sizes(int, size_t *, int *, struct lmc_resrv *,
struct stat *);
void *a_out_mod_load(int);
void a_out_linkcmd(char *, size_t, const char *, const char *,
const char *, const void *, const char *);
void a_out_mod_symload(int);
#ifndef USE_AOUT
#define mod_sizes elf_mod_sizes #define mod_sizes elf_mod_sizes
#define mod_load elf_mod_load #define mod_load elf_mod_load
#define mod_symload elf_mod_symload #define mod_symload elf_mod_symload
#define linkcmd elf_linkcmd #define linkcmd elf_linkcmd
#else
#define mod_sizes a_out_mod_sizes
#define mod_load a_out_mod_load
#define mod_symload a_out_mod_symload
#define linkcmd a_out_linkcmd
#endif
void loadbuf(void *, size_t); void loadbuf(void *, size_t);
void loadspace(size_t); void loadspace(size_t);