Date: Fri, 19 Jul 2002 20:12:09 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 14493 for review Message-ID: <200207200312.g6K3C9c1007696@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=14493 Change 14493 by peter@peter_daintree on 2002/07/19 20:11:10 IFC @14492 Affected files ... .. //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#4 integrate .. //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#4 integrate .. //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#6 integrate .. //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#4 integrate .. //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#6 integrate .. //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#5 integrate .. //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#7 integrate .. //depot/projects/ia64/sys/conf/files#34 integrate .. //depot/projects/ia64/sys/conf/files.ia64#10 integrate .. //depot/projects/ia64/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#7 integrate .. //depot/projects/ia64/sys/i386/linux/imgact_linux.c#5 integrate .. //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#11 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#4 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#5 integrate .. //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#5 integrate .. //depot/projects/ia64/sys/ia64/ia32/syscalls.master#5 integrate .. //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/ia64/sys/ia64/include/elf.h#7 integrate .. //depot/projects/ia64/sys/kern/imgact_aout.c#7 integrate .. //depot/projects/ia64/sys/kern/imgact_elf.c#12 integrate .. //depot/projects/ia64/sys/kern/imgact_gzip.c#5 integrate .. //depot/projects/ia64/sys/kern/init_main.c#11 integrate .. //depot/projects/ia64/sys/kern/kern_exec.c#19 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#8 integrate .. //depot/projects/ia64/sys/sys/elf_generic.h#5 integrate .. //depot/projects/ia64/sys/sys/imgact.h#6 integrate .. //depot/projects/ia64/sys/sys/imgact_elf.h#6 integrate .. //depot/projects/ia64/sys/sys/sysent.h#8 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#13 integrate .. //depot/projects/ia64/sys/vm/vm_extern.h#9 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#28 integrate Differences ... ==== //depot/projects/ia64/contrib/groff/tmac/groff_mdoc.man#4 (text+ko) ==== @@ -45,8 +45,6 @@ .\" times and is guaranteed to give a worst case performance .\" for an already extremely slow package. .\" -.\" $FreeBSD: src/contrib/groff/tmac/groff_mdoc.man,v 1.2 2002/06/18 00:41:47 dougb Exp $ -.\" . .Dd July 20, 2001 .Os @@ -837,7 +835,7 @@ .It FreeBSD 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1, 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1, -4.2, 4.3, 4.4, 4.5, 4.6, 5.0 +4.2, 4.3, 4.4, 4.5, 5.0 .El .Ed .Pp ==== //depot/projects/ia64/sys/alpha/alpha/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.10 2002/07/20 02:56:09 peter Exp $ */ #include <sys/param.h> @@ -32,10 +32,48 @@ #include <sys/proc.h> #include <sys/namei.h> #include <sys/fcntl.h> +#include <sys/sysent.h> +#include <sys/imgact_elf.h> +#include <sys/syscall.h> +#include <sys/signalvar.h> #include <sys/vnode.h> #include <sys/linker.h> #include <machine/elf.h> +#include <machine/md_var.h> + +struct sysentvec elf64_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF64", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; +static Elf64_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_ALPHA, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf64_freebsd_sysvec + }; + +SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf64_insert_brand_entry, + &freebsd_brand_info); + /* Process one elf relocation with addend. */ int elf_reloc(linker_file_t lf, const void *data, int type) @@ -85,7 +123,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend; + addr += addend; if (*where != addr) *where = addr; break; ==== //depot/projects/ia64/sys/alpha/linux/linux_sysvec.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.82 2002/06/02 20:05:40 schweikh Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.83 2002/07/20 02:56:09 peter Exp $ */ /* XXX we use functions that might not exist. */ @@ -189,7 +189,7 @@ &linux_szsigcode, 0, "Linux ELF", - elf_coredump, + elf64_coredump, exec_linux_imgact_try, LINUX_MINSIGSTKSZ }; @@ -231,7 +231,7 @@ case MOD_LOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_insert_brand_entry(*brandinfo) < 0) + if (elf64_insert_brand_entry(*brandinfo) < 0) error = EINVAL; if (error == 0) { SET_FOREACH(lihp, linux_ioctl_handler_set) @@ -244,12 +244,12 @@ case MOD_UNLOAD: for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_brand_inuse(*brandinfo)) + if (elf64_brand_inuse(*brandinfo)) error = EBUSY; if (error == 0) { for (brandinfo = &linux_brandlist[0]; *brandinfo != NULL; ++brandinfo) - if (elf_remove_brand_entry(*brandinfo) < 0) + if (elf64_remove_brand_entry(*brandinfo) < 0) error = EINVAL; } if (error == 0) { ==== //depot/projects/ia64/sys/alpha/osf1/imgact_osf1.c#4 (text+ko) ==== @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.11 2002/06/02 20:05:41 schweikh Exp $ + * $FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.12 2002/07/20 02:56:09 peter Exp $ */ #include <sys/types.h> @@ -178,7 +178,7 @@ /* * Destroy old process VM and create a new one (with a new stack). */ - exec_new_vmspace(imgp); + exec_new_vmspace(imgp, VM_MIN_ADDRESS, VM_MAXUSER_ADDRESS, USRSTACK); /* * The vm space can now be changed. ==== //depot/projects/ia64/sys/compat/pecoff/imgact_pecoff.c#6 (text+ko) ==== @@ -1,5 +1,5 @@ /* $NetBSD$ */ -/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.15 2002/04/09 20:10:40 jhb Exp $ */ +/* $FreeBSD: src/sys/compat/pecoff/imgact_pecoff.c,v 1.16 2002/07/20 02:56:09 peter Exp $ */ /* * Copyright (c) 2000 Masaru OKI ==== //depot/projects/ia64/sys/compat/svr4/imgact_svr4.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.15 2002/06/02 20:05:43 schweikh Exp $ + * $FreeBSD: src/sys/compat/svr4/imgact_svr4.c,v 1.16 2002/07/20 02:56:09 peter Exp $ */ #include <sys/param.h> ==== //depot/projects/ia64/sys/compat/svr4/svr4_sysvec.c#7 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.25 2002/07/09 14:59:27 robert Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_sysvec.c,v 1.26 2002/07/20 02:56:09 peter Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/ia64/sys/conf/files#34 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.666 2002/07/17 05:22:00 imp Exp $ +# $FreeBSD: src/sys/conf/files,v 1.667 2002/07/20 02:56:09 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/ia64/sys/conf/files.ia64#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.ia64,v 1.33 2002/07/15 15:47:34 jhb Exp $ +# $FreeBSD: src/sys/conf/files.ia64,v 1.34 2002/07/20 02:56:09 peter Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and ==== //depot/projects/ia64/sys/i386/i386/elf_machdep.c#4 (text+ko) ==== @@ -22,13 +22,53 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/i386/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/i386/i386/elf_machdep.c,v 1.10 2002/07/20 02:56:10 peter Exp $ */ #include <sys/param.h> +#include <sys/kernel.h> #include <sys/systm.h> #include <sys/linker.h> +#include <sys/sysent.h> +#include <sys/imgact_elf.h> +#include <sys/syscall.h> +#include <sys/signalvar.h> +#include <sys/vnode.h> #include <machine/elf.h> +#include <machine/md_var.h> + +struct sysentvec elf32_freebsd_sysvec = { + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, + "FreeBSD ELF32", + __elfN(coredump), + NULL, + MINSIGSTKSZ +}; + +static Elf32_Brandinfo freebsd_brand_info = { + ELFOSABI_FREEBSD, + EM_386, + "FreeBSD", + "", + "/usr/libexec/ld-elf.so.1", + &elf32_freebsd_sysvec + }; + +SYSINIT(elf32, SI_SUB_EXEC, SI_ORDER_ANY, + (sysinit_cfunc_t) elf32_insert_brand_entry, + &freebsd_brand_info); struct sysentvec elf32_freebsd_sysvec = { SYS_MAXSYSCALL, ==== //depot/projects/ia64/sys/i386/ibcs2/imgact_coff.c#7 (text+ko) ==== @@ -26,7 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.51 2002/06/02 20:05:48 schweikh Exp $ + * $FreeBSD: src/sys/i386/ibcs2/imgact_coff.c,v 1.52 2002/07/20 02:56:10 peter Exp $ */ #include <sys/param.h> ==== //depot/projects/ia64/sys/i386/linux/imgact_linux.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.41 2002/06/02 20:05:51 schweikh Exp $ + * $FreeBSD: src/sys/i386/linux/imgact_linux.c,v 1.42 2002/07/20 02:56:10 peter Exp $ */ #include <sys/param.h> ==== //depot/projects/ia64/sys/i386/linux/linux_sysvec.c#11 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.100 2002/06/02 20:05:52 schweikh Exp $ + * $FreeBSD: src/sys/i386/linux/linux_sysvec.c,v 1.101 2002/07/20 02:56:10 peter Exp $ */ /* XXX we use functions that might not exist. */ ==== //depot/projects/ia64/sys/ia64/ia32/ia32_proto.h#4 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp + * $FreeBSD: src/sys/ia64/ia32/ia32_proto.h,v 1.2 2002/07/20 02:56:34 peter Exp $ + * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp */ #ifndef _IA32_SYSPROTO_H_ @@ -251,6 +251,12 @@ #endif /* COMPAT_43 */ + +#ifdef COMPAT_FREEBSD4 + + +#endif /* COMPAT_FREEBSD4 */ + #undef PAD_ #undef PADL_ #undef PADR_ ==== //depot/projects/ia64/sys/ia64/ia32/ia32_syscall.h#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp + * $FreeBSD: src/sys/ia64/ia32/ia32_syscall.h,v 1.2 2002/07/20 02:56:34 peter Exp $ + * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp */ #define IA32_SYS_syscall 0 ==== //depot/projects/ia64/sys/ia64/ia32/ia32_sysent.c#5 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD$ - * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp + * $FreeBSD: src/sys/ia64/ia32/ia32_sysent.c,v 1.2 2002/07/20 02:56:34 peter Exp $ + * created from FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp */ #include <sys/param.h> ==== //depot/projects/ia64/sys/ia64/ia32/syscalls.master#5 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.1 2002/04/10 19:34:51 dfr Exp $ + $FreeBSD: src/sys/ia64/ia32/syscalls.master,v 1.2 2002/07/20 02:56:10 peter Exp $ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; from: src/sys/kern/syscalls.master 1.107 ; ==== //depot/projects/ia64/sys/ia64/ia64/elf_machdep.c#6 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/ia64/elf_machdep.c,v 1.4 2002/04/25 01:22:15 marcel Exp $ + * $FreeBSD: src/sys/ia64/ia64/elf_machdep.c,v 1.5 2002/07/20 02:56:10 peter Exp $ */ #include <sys/param.h> @@ -42,19 +42,19 @@ #include <machine/md_var.h> struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf64_freebsd_fixup, - sendsig, - sigcode, - &szsigcode, - 0, + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, "FreeBSD ELF64", __elfN(coredump), NULL, ==== //depot/projects/ia64/sys/ia64/include/elf.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/ia64/include/elf.h,v 1.8 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/ia64/include/elf.h,v 1.9 2002/07/20 02:56:10 peter Exp $ */ #ifndef _MACHINE_ELF_H_ ==== //depot/projects/ia64/sys/kern/imgact_aout.c#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/imgact_aout.c,v 1.78 2002/07/06 07:00:01 jeff Exp $ + * $FreeBSD: src/sys/kern/imgact_aout.c,v 1.79 2002/07/20 02:56:11 peter Exp $ */ #include "opt_kstack_pages.h" ==== //depot/projects/ia64/sys/kern/imgact_elf.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.112 2002/07/06 07:00:01 jeff Exp $ + * $FreeBSD: src/sys/kern/imgact_elf.c,v 1.113 2002/07/20 02:56:11 peter Exp $ */ #include <sys/param.h> @@ -162,7 +162,7 @@ if (hdr->e_version != ELF_TARG_VER) return ENOEXEC; - + return 0; } @@ -375,12 +375,12 @@ map_len = round_page_ps((vm_offset_t)vmaddr + memsz, pagesize) - map_addr; /* This had damn well better be true! */ - if (map_len != 0) { + if (map_len != 0) { rv = __elfN(map_insert)(&vmspace->vm_map, NULL, 0, map_addr, map_addr + map_len, VM_PROT_ALL, VM_PROT_ALL, 0); if (rv != KERN_SUCCESS) { - return EINVAL; + return EINVAL; } } @@ -388,7 +388,7 @@ vm_offset_t off; vm_object_reference(object); rv = vm_map_find(exec_map, - object, + object, trunc_page(offset + filsz), &data_buf, PAGE_SIZE, @@ -479,8 +479,8 @@ } /* XXXKSE */ - NDINIT(nd, LOOKUP, LOCKLEAF|FOLLOW, UIO_SYSSPACE, file, curthread); - + NDINIT(nd, LOOKUP, LOCKLEAF|FOLLOW, UIO_SYSSPACE, file, curthread); + if ((error = namei(nd)) != 0) { nd->ni_vp = NULL; goto fail; @@ -509,7 +509,7 @@ VOP_UNLOCK(nd->ni_vp, 0, curthread); /* XXXKSE */ if (error) - goto fail; + goto fail; hdr = (const Elf_Ehdr *)imgp->image_header; if ((error = __elfN(check_header)(hdr)) != 0) @@ -618,7 +618,7 @@ return ENOEXEC; } phdr = (const Elf_Phdr*)(imgp->image_header + hdr->e_phoff); - + /* * From this point on, we may have resources that need to be freed. */ @@ -644,11 +644,11 @@ for (i = 0; i < MAX_BRANDS; i++) { Elf_Brandinfo *bi = elf_brand_list[i]; - if (bi != NULL && + if (bi != NULL && hdr->e_machine == bi->machine && (hdr->e_ident[EI_OSABI] == bi->brand - || 0 == - strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], + || 0 == + strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], bi->compat_3_brand, strlen(bi->compat_3_brand)))) { brand_info = bi; break; @@ -760,11 +760,11 @@ for (i = 0; i < MAX_BRANDS; i++) { Elf_Brandinfo *bi = elf_brand_list[i]; - if (bi != NULL && + if (bi != NULL && hdr->e_machine == bi->machine && (hdr->e_ident[EI_OSABI] == bi->brand - || 0 == - strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], + || 0 == + strncmp((const char *)&hdr->e_ident[OLD_EI_BRAND], bi->compat_3_brand, strlen(bi->compat_3_brand)))) { brand_info = bi; break; @@ -810,19 +810,19 @@ imgp->proc->p_sysent = brand_info->sysvec; if (interp != NULL) { path = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); - snprintf(path, MAXPATHLEN, "%s%s", + snprintf(path, MAXPATHLEN, "%s%s", brand_info->emul_path, interp); if ((error = __elfN(load_file)(imgp->proc, path, &addr, &imgp->entry_addr, pagesize)) != 0) { - if ((error = __elfN(load_file) + if ((error = __elfN(load_file) (imgp->proc, interp, &addr, &imgp->entry_addr, pagesize)) != 0) { - uprintf("ELF interpreter %s not found\n", path); + uprintf("ELF interpreter %s not found\n", path); free(path, M_TEMP); goto fail; } - } + } free(path, M_TEMP); } @@ -887,7 +887,7 @@ suword(base, (long) imgp->argc); *stack_base = (register_t *)base; return 0; -} +} /* * Code for generating ELF core dumps. @@ -969,7 +969,7 @@ php = (Elf_Phdr *)((char *)hdr + sizeof(Elf_Ehdr)) + 1; offset = hdrsize; for (i = 0; i < seginfo.count; i++) { - error = vn_rdwr_inchunks(UIO_WRITE, vp, + error = vn_rdwr_inchunks(UIO_WRITE, vp, (caddr_t)(uintptr_t)php->p_vaddr, php->p_filesz, offset, UIO_USERSPACE, IO_UNIT | IO_DIRECT, cred, (int *)NULL, curthread); /* XXXKSE */ @@ -980,7 +980,7 @@ } } free(hdr, M_TEMP); - + return error; } ==== //depot/projects/ia64/sys/kern/imgact_gzip.c#5 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/kern/imgact_gzip.c,v 1.46 2002/03/25 13:52:45 phk Exp $ + * $FreeBSD: src/sys/kern/imgact_gzip.c,v 1.47 2002/07/20 02:56:11 peter Exp $ * * This module handles execution of a.out files which have been run through * "gzip". This saves diskspace, but wastes cpu-cycles and VM. ==== //depot/projects/ia64/sys/kern/init_main.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)init_main.c 8.9 (Berkeley) 1/21/94 - * $FreeBSD: src/sys/kern/init_main.c,v 1.198 2002/07/14 03:43:33 julian Exp $ + * $FreeBSD: src/sys/kern/init_main.c,v 1.199 2002/07/20 02:56:11 peter Exp $ */ #include "opt_init_path.h" ==== //depot/projects/ia64/sys/kern/kern_exec.c#19 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/kern/kern_exec.c,v 1.175 2002/07/14 17:58:35 alc Exp $ + * $FreeBSD: src/sys/kern/kern_exec.c,v 1.176 2002/07/20 02:56:11 peter Exp $ */ #include "opt_ktrace.h" ==== //depot/projects/ia64/sys/powerpc/powerpc/elf_machdep.c#4 (text+ko) ==== @@ -22,7 +22,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/powerpc/powerpc/elf_machdep.c,v 1.10 2002/04/25 01:22:16 marcel Exp $ + * $FreeBSD: src/sys/powerpc/powerpc/elf_machdep.c,v 1.11 2002/07/20 02:56:11 peter Exp $ */ #include <sys/param.h> @@ -32,24 +32,29 @@ #include <sys/proc.h> #include <sys/namei.h> #include <sys/fcntl.h> +#include <sys/sysent.h> +#include <sys/imgact_elf.h> +#include <sys/syscall.h> +#include <sys/signalvar.h> #include <sys/vnode.h> #include <sys/linker.h> #include <machine/elf.h> +#include <machine/md_var.h> struct sysentvec elf32_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf32_freebsd_fixup, - sendsig, - sigcode, - &szsigcode, - 0, + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf32_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, "FreeBSD ELF32", __elfN(coredump), NULL, @@ -109,7 +114,7 @@ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; - addr += addend; + addr += addend; if (*where != addr) *where = addr; break; ==== //depot/projects/ia64/sys/sparc64/sparc64/elf_machdep.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ * POSSIBILITY OF SUCH DAMAGE. * * from: NetBSD: mdreloc.c,v 1.5 2001/04/25 12:24:51 kleink Exp - * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.6 2002/06/22 20:46:59 mux Exp $ + * $FreeBSD: src/sys/sparc64/sparc64/elf_machdep.c,v 1.7 2002/07/20 02:56:11 peter Exp $ */ #include <sys/param.h> @@ -54,19 +54,19 @@ #include "linker_if.h" struct sysentvec elf64_freebsd_sysvec = { - SYS_MAXSYSCALL, - sysent, - 0, - 0, - 0, - 0, - 0, - 0, - elf64_freebsd_fixup, - sendsig, - sigcode, - &szsigcode, - 0, + SYS_MAXSYSCALL, + sysent, + 0, + 0, + 0, + 0, + 0, + 0, + elf64_freebsd_fixup, + sendsig, + sigcode, + &szsigcode, + 0, "FreeBSD ELF64", __elfN(coredump), NULL, ==== //depot/projects/ia64/sys/sys/elf_generic.h#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/elf_generic.h,v 1.5 2002/05/30 08:32:18 dfr Exp $ + * $FreeBSD: src/sys/sys/elf_generic.h,v 1.6 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_ELF_GENERIC_H_ ==== //depot/projects/ia64/sys/sys/imgact.h#6 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/imgact.h,v 1.27 2002/07/06 07:00:01 jeff Exp $ + * $FreeBSD: src/sys/sys/imgact.h,v 1.28 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_IMGACT_H_ ==== //depot/projects/ia64/sys/sys/imgact_elf.h#6 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/imgact_elf.h,v 1.23 2002/06/02 20:05:56 schweikh Exp $ + * $FreeBSD: src/sys/sys/imgact_elf.h,v 1.24 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_IMGACT_ELF_H_ ==== //depot/projects/ia64/sys/sys/sysent.h#8 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/sysent.h,v 1.37 2002/03/23 08:46:52 bde Exp $ + * $FreeBSD: src/sys/sys/sysent.h,v 1.38 2002/07/20 02:56:11 peter Exp $ */ #ifndef _SYS_SYSENT_H_ ==== //depot/projects/ia64/sys/ufs/ffs/ffs_softdep.c#13 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.120 2002/07/19 07:29:38 mckusick Exp $"); +__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.121 2002/07/20 01:09:35 peter Exp $"); /* * For now we want the safety net that the DIAGNOSTIC and DEBUG flags provide. @@ -1627,7 +1627,8 @@ WORKLIST_INSERT(&bp->b_dep, &adp->ad_list); if (lbn >= NXADDR) { FREE_LOCK(&lk); - panic("softdep_setup_allocext: lbn %d > NXADDR", lbn); + panic("softdep_setup_allocext: lbn %lld > NXADDR", + (long long)lbn); } /* * The list of allocdirects must be kept in sorted and ascending ==== //depot/projects/ia64/sys/vm/vm_extern.h#9 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)vm_extern.h 8.2 (Berkeley) 1/12/94 - * $FreeBSD: src/sys/vm/vm_extern.h,v 1.57 2002/07/07 23:05:27 peter Exp $ + * $FreeBSD: src/sys/vm/vm_extern.h,v 1.58 2002/07/20 02:56:12 peter Exp $ */ #ifndef _VM_EXTERN_H_ ==== //depot/projects/ia64/sys/vm/vm_map.c#28 (text+ko) ==== @@ -61,7 +61,7 @@ * any improvements or extensions that they make and grant Carnegie the * rights to redistribute these changes. * - * $FreeBSD: src/sys/vm/vm_map.c,v 1.263 2002/07/18 10:28:00 peter Exp $ + * $FreeBSD: src/sys/vm/vm_map.c,v 1.264 2002/07/20 02:56:12 peter Exp $ */ /* @@ -2586,7 +2586,7 @@ * mapped to it, then create a new one. The new vmspace is null. */ void -vmspace_exec(struct proc *p, vm_offset_t minuser, vm_offset_t maxuser) +vmspace_exec(struct proc *p, vm_offset_t minuser, vm_offset_t maxuser) { struct vmspace *oldvmspace = p->p_vmspace; struct vmspace *newvmspace; To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200207200312.g6K3C9c1007696>