Deleted Added
full compact
elf64_freebsd.c (162814) elf64_freebsd.c (163708)
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
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

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

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
27#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
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

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

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
27#include <sys/cdefs.h>
28__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/elf64_freebsd.c 162814 2006-09-29 20:27:41Z ru $");
28__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/elf64_freebsd.c 163708 2006-10-26 20:04:22Z ru $");
29
30#define __ELF_WORD_SIZE 64
31#include <sys/param.h>
32#include <sys/exec.h>
33#include <sys/linker.h>
34#include <string.h>
35#include <machine/bootinfo.h>
36#include <machine/elf.h>

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

59extern p2_entry_t PT2[];
60
61u_int32_t entry_hi;
62u_int32_t entry_lo;
63
64extern void amd64_tramp();
65
66/*
29
30#define __ELF_WORD_SIZE 64
31#include <sys/param.h>
32#include <sys/exec.h>
33#include <sys/linker.h>
34#include <string.h>
35#include <machine/bootinfo.h>
36#include <machine/elf.h>

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

59extern p2_entry_t PT2[];
60
61u_int32_t entry_hi;
62u_int32_t entry_lo;
63
64extern void amd64_tramp();
65
66/*
67 * There is an a.out kernel and one or more a.out modules loaded.
67 * There is an ELF kernel and one or more ELF modules loaded.
68 * We wish to start executing the kernel image, so make such
69 * preparations as are required, and do so.
70 */
71static int
72elf64_exec(struct preloaded_file *fp)
73{
74 struct file_metadata *md;
75 Elf_Ehdr *ehdr;

--- 51 unchanged lines hidden ---
68 * We wish to start executing the kernel image, so make such
69 * preparations as are required, and do so.
70 */
71static int
72elf64_exec(struct preloaded_file *fp)
73{
74 struct file_metadata *md;
75 Elf_Ehdr *ehdr;

--- 51 unchanged lines hidden ---