Author: kib
Date: Fri Apr 8 10:23:48 2016
New Revision: 297702
URL: https://svnweb.freebsd.org/changeset/base/297702
Log:
Use the ABI-prescribed name for SHT_X86_64_UNWIND in the loader and
kernel linker, after the r297686.
Sponsored by: The FreeBSD Foundation
Modified:
head/sys/boot/common/load_elf_obj.c
head/sys/kern/link_elf_obj.c
Modified: head/sys/boot/common/load_elf_obj.c
==============================================================================
--- head/sys/boot/common/load_elf_obj.c Fri Apr 8 10:21:43 2016
(r297701)
+++ head/sys/boot/common/load_elf_obj.c Fri Apr 8 10:23:48 2016
(r297702)
@@ -222,7 +222,7 @@ __elfN(obj_loadimage)(struct preloaded_f
case SHT_PROGBITS:
case SHT_NOBITS:
#if defined(__i386__) || defined(__amd64__)
- case SHT_AMD64_UNWIND:
+ case SHT_X86_64_UNWIND:
#endif
lastaddr = roundup(lastaddr, shdr[i].sh_addralign);
shdr[i].sh_addr = (Elf_Addr)lastaddr;
Modified: head/sys/kern/link_elf_obj.c
==============================================================================
--- head/sys/kern/link_elf_obj.c Fri Apr 8 10:21:43 2016
(r297701)
+++ head/sys/kern/link_elf_obj.c Fri Apr 8 10:23:48 2016
(r297702)
@@ -258,7 +258,7 @@ link_elf_link_preload(linker_class_t cls
case SHT_PROGBITS:
case SHT_NOBITS:
#ifdef __amd64__
- case SHT_AMD64_UNWIND:
+ case SHT_X86_64_UNWIND:
#endif
ef->nprogtab++;
break;
@@ -331,13 +331,13 @@ link_elf_link_preload(linker_class_t cls
case SHT_PROGBITS:
case SHT_NOBITS:
#ifdef __amd64__
- case SHT_AMD64_UNWIND:
+ case SHT_X86_64_UNWIND:
#endif
ef->progtab[pb].addr = (void *)shdr[i].sh_addr;
if (shdr[i].sh_type == SHT_PROGBITS)
ef->progtab[pb].name = "<<PROGBITS>>";
#ifdef __amd64__
- else if (shdr[i].sh_type == SHT_AMD64_UNWIND)
+ else if (shdr[i].sh_type == SHT_X86_64_UNWIND)
ef->progtab[pb].name = "<<UNWIND>>";
#endif
else
@@ -597,7 +597,7 @@ link_elf_load_file(linker_class_t cls, c
case SHT_PROGBITS:
case SHT_NOBITS:
#ifdef __amd64__
- case SHT_AMD64_UNWIND:
+ case SHT_X86_64_UNWIND:
#endif
ef->nprogtab++;
break;
@@ -712,7 +712,7 @@ link_elf_load_file(linker_class_t cls, c
case SHT_PROGBITS:
case SHT_NOBITS:
#ifdef __amd64__
- case SHT_AMD64_UNWIND:
+ case SHT_X86_64_UNWIND:
#endif
alignmask = shdr[i].sh_addralign - 1;
mapsize += alignmask;
@@ -782,7 +782,7 @@ link_elf_load_file(linker_class_t cls, c
case SHT_PROGBITS:
case SHT_NOBITS:
#ifdef __amd64__
- case SHT_AMD64_UNWIND:
+ case SHT_X86_64_UNWIND:
#endif
alignmask = shdr[i].sh_addralign - 1;
mapbase += alignmask;
@@ -797,7 +797,7 @@ link_elf_load_file(linker_class_t cls, c
} else if (shdr[i].sh_type == SHT_PROGBITS)
ef->progtab[pb].name = "<<PROGBITS>>";
#ifdef __amd64__
- else if (shdr[i].sh_type == SHT_AMD64_UNWIND)
+ else if (shdr[i].sh_type == SHT_X86_64_UNWIND)
ef->progtab[pb].name = "<<UNWIND>>";
#endif
else
@@ -823,7 +823,7 @@ link_elf_load_file(linker_class_t cls, c
ef->progtab[pb].sec = i;
if (shdr[i].sh_type == SHT_PROGBITS
#ifdef __amd64__
- || shdr[i].sh_type == SHT_AMD64_UNWIND
+ || shdr[i].sh_type == SHT_X86_64_UNWIND
#endif
) {
error = vn_rdwr(UIO_READ, nd.ni_vp,
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
