From owner-svn-src-all@freebsd.org Fri Apr 8 10:23:49 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C0565B07B86; Fri, 8 Apr 2016 10:23:49 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 7F34A1D1B; Fri, 8 Apr 2016 10:23:49 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u38ANmY1069812; Fri, 8 Apr 2016 10:23:48 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u38ANmmA069810; Fri, 8 Apr 2016 10:23:48 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201604081023.u38ANmmA069810@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Fri, 8 Apr 2016 10:23:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r297702 - in head/sys: boot/common kern X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Apr 2016 10:23:49 -0000 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 = "<>"; #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 = "<>"; #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 = "<>"; #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 = "<>"; #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,