Deleted Added
full compact
link_elf_obj.c (85736) link_elf_obj.c (86469)
1/*-
2 * Copyright (c) 1998-2000 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-2000 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 * $FreeBSD: head/sys/kern/link_elf_obj.c 85736 2001-10-30 15:21:45Z green $
26 * $FreeBSD: head/sys/kern/link_elf_obj.c 86469 2001-11-16 21:08:40Z iedowse $
27 */
28
29#include "opt_ddb.h"
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/lock.h>

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

733 ef->dynamic = (Elf_Dyn *) (mapbase + phdyn->p_vaddr - base_vaddr);
734
735 lf->address = ef->address;
736 lf->size = mapsize;
737
738 error = parse_dynamic(ef);
739 if (error)
740 goto out;
27 */
28
29#include "opt_ddb.h"
30
31#include <sys/param.h>
32#include <sys/systm.h>
33#include <sys/kernel.h>
34#include <sys/lock.h>

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

733 ef->dynamic = (Elf_Dyn *) (mapbase + phdyn->p_vaddr - base_vaddr);
734
735 lf->address = ef->address;
736 lf->size = mapsize;
737
738 error = parse_dynamic(ef);
739 if (error)
740 goto out;
741 error = linker_load_dependancies(lf);
741 error = linker_load_dependencies(lf);
742 if (error)
743 goto out;
744#if 0 /* this will be more trouble than it's worth for now */
745 for (dp = ef->dynamic; dp->d_tag != DT_NULL; dp++) {
746 if (dp->d_tag != DT_NEEDED)
747 continue;
748 modname = ef->strtab + dp->d_un.d_val;
749 error = linker_load_module(modname, lf);

--- 425 unchanged lines hidden ---
742 if (error)
743 goto out;
744#if 0 /* this will be more trouble than it's worth for now */
745 for (dp = ef->dynamic; dp->d_tag != DT_NULL; dp++) {
746 if (dp->d_tag != DT_NEEDED)
747 continue;
748 modname = ef->strtab + dp->d_un.d_val;
749 error = linker_load_module(modname, lf);

--- 425 unchanged lines hidden ---