Deleted Added
full compact
ia32_sysvec.c (123423) ia32_sysvec.c (123742)
1/*-
2 * Copyright (c) 2002 Doug Rabson
3 * Copyright (c) 2003 Peter Wemm
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2002 Doug Rabson
3 * Copyright (c) 2003 Peter Wemm
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:

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

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
23 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
24 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
25 * SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/compat/ia32/ia32_sysvec.c 123423 2003-12-11 01:05:09Z peter $");
29__FBSDID("$FreeBSD: head/sys/compat/ia32/ia32_sysvec.c 123742 2003-12-23 02:42:39Z peter $");
30
31#include "opt_compat.h"
32
33#define __ELF_WORD_SIZE 32
34
35#include <sys/param.h>
36#include <sys/exec.h>
37#include <sys/fcntl.h>

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

124 FREEBSD32_PS_STRINGS,
125 VM_PROT_ALL,
126 ia32_copyout_strings,
127 ia32_setregs,
128 ia32_fixlimits
129};
130
131
30
31#include "opt_compat.h"
32
33#define __ELF_WORD_SIZE 32
34
35#include <sys/param.h>
36#include <sys/exec.h>
37#include <sys/fcntl.h>

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

124 FREEBSD32_PS_STRINGS,
125 VM_PROT_ALL,
126 ia32_copyout_strings,
127 ia32_setregs,
128 ia32_fixlimits
129};
130
131
132const char freebsd32_emul_path[] = "/compat/ia32";
133
134static Elf32_Brandinfo ia32_brand_info = {
135 ELFOSABI_FREEBSD,
136 EM_386,
137 "FreeBSD",
132static Elf32_Brandinfo ia32_brand_info = {
133 ELFOSABI_FREEBSD,
134 EM_386,
135 "FreeBSD",
138 "/compat/ia32",
139 "/usr/libexec/ld-elf.so.1",
140 &ia32_freebsd_sysvec
136 NULL,
137 "/libexec/ld-elf.so.1",
138 &ia32_freebsd_sysvec,
139 "/libexec/ld-elf-32.so.1",
141 };
142
143SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY,
144 (sysinit_cfunc_t) elf32_insert_brand_entry,
145 &ia32_brand_info);
146
140 };
141
142SYSINIT(ia32, SI_SUB_EXEC, SI_ORDER_ANY,
143 (sysinit_cfunc_t) elf32_insert_brand_entry,
144 &ia32_brand_info);
145
146static Elf32_Brandinfo ia32_brand_oinfo = {
147 ELFOSABI_FREEBSD,
148 EM_386,
149 "FreeBSD",
150 NULL,
151 "/usr/libexec/ld-elf.so.1",
152 &ia32_freebsd_sysvec,
153 "/usr/libexec/ld-elf-32.so.1",
154 };
155
156SYSINIT(oia32, SI_SUB_EXEC, SI_ORDER_ANY,
157 (sysinit_cfunc_t) elf32_insert_brand_entry,
158 &ia32_brand_oinfo);
159
147/* XXX may be freebsd32 MI */
148static register_t *
149ia32_copyout_strings(struct image_params *imgp)
150{
151 int argc, envc;
152 u_int32_t *vectp;
153 char *stringp, *destp;
154 u_int32_t *stack_base;

--- 155 unchanged lines hidden ---
160/* XXX may be freebsd32 MI */
161static register_t *
162ia32_copyout_strings(struct image_params *imgp)
163{
164 int argc, envc;
165 u_int32_t *vectp;
166 char *stringp, *destp;
167 u_int32_t *stack_base;

--- 155 unchanged lines hidden ---