Date: Sat, 5 Apr 2003 14:50:38 -0800 (PST) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 28264 for review Message-ID: <200304052250.h35MocaN032716@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=28264 Change 28264 by peter@peter_overcee on 2003/04/05 14:50:01 Update other platforms for elf32/64 stuff. Just an initial guess so far. Affected files ... .. //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#2 edit .. //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#4 edit .. //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#6 edit .. //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#3 edit .. //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#2 edit Differences ... ==== //depot/projects/hammer/sys/boot/alpha/libalpha/elf_freebsd.c#2 (text+ko) ==== @@ -90,16 +90,16 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *afp); +static int elf64_exec(struct preloaded_file *afp); int bi_load(struct bootinfo_v1 *, vm_offset_t *, struct preloaded_file *); -struct file_format alpha_elf = { elf_loadfile, elf_exec }; +struct file_format alpha_elf = { elf64_loadfile, elf64_exec }; vm_offset_t ffp_save, ptbr_save; static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { static struct bootinfo_v1 bootinfo_v1; struct file_metadata *md; ==== //depot/projects/hammer/sys/boot/arc/lib/elf_freebsd.c#2 (text+ko) ==== @@ -90,16 +90,16 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); int bi_load(struct bootinfo_v1 *, vm_offset_t *, struct preloaded_file *); -struct file_format alpha_elf = { elf_loadfile, elf_exec }; +struct file_format alpha_elf = { elf64_loadfile, elf64_exec }; vm_offset_t ffp_save, ptbr_save; static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { #if 0 static struct bootinfo_v1 bootinfo_v1; ==== //depot/projects/hammer/sys/boot/efi/libefi/elf_freebsd.c#4 (text+ko) ==== @@ -94,9 +94,9 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); -struct file_format ia64_elf = { elf_loadfile, elf_exec }; +struct file_format ia64_elf = { elf64_loadfile, elf64_exec }; static __inline u_int64_t disable_ic() @@ -136,7 +136,7 @@ } static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { struct file_metadata *md; Elf_Ehdr *hdr; ==== //depot/projects/hammer/sys/boot/i386/libi386/elf_freebsd.c#6 (text+ko) ==== ==== //depot/projects/hammer/sys/boot/ia64/libski/elf_freebsd.c#3 (text+ko) ==== @@ -91,9 +91,9 @@ #define _KERNEL -static int elf_exec(struct preloaded_file *amp); +static int elf64_exec(struct preloaded_file *amp); -struct file_format ia64_elf = { elf_loadfile, elf_exec }; +struct file_format ia64_elf = { elf64_loadfile, elf64_exec }; #define PTE_MA_WB 0 #define PTE_MA_UC 4 @@ -154,7 +154,7 @@ } static int -elf_exec(struct preloaded_file *fp) +elf64_exec(struct preloaded_file *fp) { struct file_metadata *md; Elf_Ehdr *hdr; ==== //depot/projects/hammer/sys/boot/ofw/libofw/elf_freebsd.c#2 (text+ko) ==== @@ -42,13 +42,13 @@ extern vm_offset_t reloc; /* From <arch>/conf.c */ int -ofw_elf_loadfile(char *filename, vm_offset_t dest, +__elfN(ofw_loadfile)(char *filename, vm_offset_t dest, struct preloaded_file **result) { int r; void *addr; - r = elf_loadfile(filename, dest, result); + r = __elfN(loadfile)(filename, dest, result); if (r != 0) return (r); @@ -56,7 +56,7 @@ } int -ofw_elf_exec(struct preloaded_file *fp) +__elfN(ofw_exec)(struct preloaded_file *fp) { struct file_metadata *fmp; vm_offset_t mdp; @@ -83,6 +83,6 @@ struct file_format ofw_elf = { - ofw_elf_loadfile, - ofw_elf_exec + __elfN(ofw_loadfile), + __elfN(ofw_exec) };
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304052250.h35MocaN032716>