Deleted Added
full compact
link_elf_obj.c (43309) link_elf_obj.c (43311)
1/*-
2 * Copyright (c) 1998 Doug Rabson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
1/*-
2 * Copyright (c) 1998 Doug Rabson
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 9 unchanged lines hidden (view full) ---

18 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
19 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
20 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
21 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
22 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
23 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
24 * SUCH DAMAGE.
25 *
26 * $Id: link_elf.c,v 1.13 1999/01/27 21:49:56 dillon Exp $
26 * $Id: link_elf.c,v 1.14 1999/01/27 23:45:39 dillon Exp $
27 */
28
29#include <sys/param.h>
30#include <sys/kernel.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/proc.h>
34#include <sys/namei.h>

--- 891 unchanged lines hidden (view full) ---

926
927 return ENOENT;
928}
929
930static int
931link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t* symval)
932{
933 elf_file_t ef = lf->priv;
27 */
28
29#include <sys/param.h>
30#include <sys/kernel.h>
31#include <sys/systm.h>
32#include <sys/malloc.h>
33#include <sys/proc.h>
34#include <sys/namei.h>

--- 891 unchanged lines hidden (view full) ---

926
927 return ENOENT;
928}
929
930static int
931link_elf_symbol_values(linker_file_t lf, c_linker_sym_t sym, linker_symval_t* symval)
932{
933 elf_file_t ef = lf->priv;
934 Elf_Sym* es = (Elf_Sym*) sym;
934 const Elf_Sym* es = (const Elf_Sym*) sym;
935
936 if (es >= ef->symtab && ((es - ef->symtab) < ef->nchains)) {
937 symval->name = ef->strtab + es->st_name;
938 symval->value = (caddr_t) ef->address + es->st_value;
939 symval->size = es->st_size;
940 return 0;
941 }
942 if (ef->symtab == ef->ddbsymtab)

--- 43 unchanged lines hidden ---
935
936 if (es >= ef->symtab && ((es - ef->symtab) < ef->nchains)) {
937 symval->name = ef->strtab + es->st_name;
938 symval->value = (caddr_t) ef->address + es->st_value;
939 symval->size = es->st_size;
940 return 0;
941 }
942 if (ef->symtab == ef->ddbsymtab)

--- 43 unchanged lines hidden ---