Date: Sat, 21 Sep 2002 19:00:44 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 17900 for review Message-ID: <200209220200.g8M20inS055514@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=17900 Change 17900 by peter@peter_overcee on 2002/09/21 18:59:57 finish up (almost). The kld relocator for PC32 still needs to be finished. Affected files ... .. //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#3 edit Differences ... ==== //depot/projects/hammer/sys/x86_64/x86_64/elf_machdep.c#3 (text+ko) ==== @@ -72,13 +72,13 @@ exec_setregs }; -static Elf32_Brandinfo freebsd_brand_info = { +static Elf64_Brandinfo freebsd_brand_info = { ELFOSABI_FREEBSD, EM_X86_64, "FreeBSD", "", "/usr/libexec/ld-elf.so.1", - &elf32_freebsd_sysvec + &elf64_freebsd_sysvec }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -89,7 +89,6 @@ int elf_reloc(linker_file_t lf, const void *data, int type) { -#if 0 Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; @@ -119,10 +118,10 @@ switch (rtype) { - case R_386_NONE: /* none */ + case R_X86_64_NONE: /* none */ break; - case R_386_32: /* S + A */ + case R_X86_64_64: /* S + A */ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; @@ -131,16 +130,17 @@ *where = addr; break; - case R_386_PC32: /* S + A - P */ + case R_X86_64_PC32: /* S + A - P */ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; addr += addend - (Elf_Addr)where; + XXX needs to be 32 bit *where, not 64 bit if (*where != addr) *where = addr; break; - case R_386_COPY: /* none */ + case R_X86_64_COPY: /* none */ /* * There shouldn't be copy relocations in kernel * objects. @@ -149,7 +149,7 @@ return -1; break; - case R_386_GLOB_DAT: /* S */ + case R_X86_64_GLOB_DAT: /* S */ addr = elf_lookup(lf, symidx, 1); if (addr == 0) return -1; @@ -157,7 +157,7 @@ *where = addr; break; - case R_386_RELATIVE: /* B + A */ + case R_X86_64_RELATIVE: /* B + A */ addr = relocbase + addend; if (*where != addr) *where = addr; @@ -168,6 +168,5 @@ rtype); return -1; } -#endif return(0); } 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?200209220200.g8M20inS055514>