| conf.c (241047) | conf.c (241068) |
|---|---|
| 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/loader/conf.c 241047 2012-09-29 15:08:55Z ae $"); | 28__FBSDID("$FreeBSD: head/sys/boot/i386/loader/conf.c 241068 2012-09-30 12:24:15Z ae $"); |
| 29 30#include <stand.h> 31#include <bootstrap.h> 32#include "libi386/libi386.h" 33#if defined(LOADER_ZFS_SUPPORT) 34#include "../zfs/libzfs.h" 35#endif 36 --- 67 unchanged lines hidden (view full) --- 104 * rather than reading the file go first. 105 */ 106extern struct file_format i386_elf; 107extern struct file_format i386_elf_obj; 108extern struct file_format amd64_elf; 109extern struct file_format amd64_elf_obj; 110 111struct file_format *file_formats[] = { | 29 30#include <stand.h> 31#include <bootstrap.h> 32#include "libi386/libi386.h" 33#if defined(LOADER_ZFS_SUPPORT) 34#include "../zfs/libzfs.h" 35#endif 36 --- 67 unchanged lines hidden (view full) --- 104 * rather than reading the file go first. 105 */ 106extern struct file_format i386_elf; 107extern struct file_format i386_elf_obj; 108extern struct file_format amd64_elf; 109extern struct file_format amd64_elf_obj; 110 111struct file_format *file_formats[] = { |
| 112#ifdef LOADER_PREFER_AMD64 113 &amd64_elf, 114 &amd64_elf_obj, 115#endif |
|
| 112 &i386_elf, 113 &i386_elf_obj, | 116 &i386_elf, 117 &i386_elf_obj, |
| 118#ifndef LOADER_PREFER_AMD64 |
|
| 114 &amd64_elf, 115 &amd64_elf_obj, | 119 &amd64_elf, 120 &amd64_elf_obj, |
| 121#endif |
|
| 116 NULL 117}; 118 119/* 120 * Consoles 121 * 122 * We don't prototype these in libi386.h because they require 123 * data structures from bootstrap.h as well. --- 30 unchanged lines hidden --- | 122 NULL 123}; 124 125/* 126 * Consoles 127 * 128 * We don't prototype these in libi386.h because they require 129 * data structures from bootstrap.h as well. --- 30 unchanged lines hidden --- |