Skip site navigation (1)Skip section navigation (2) 
Date:      Sun, 4 Nov 2018 00:32:29 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r340107 - head/libexec/rtld-elf
Message-ID:  <201811040032.wA40WTr6014399@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: kib
Date: Sun Nov  4 00:32:28 2018
New Revision: 340107
URL: https://svnweb.freebsd.org/changeset/base/340107

Log:
  Remove Obj_Entry textsize member.
  
  It is unused after r340102, and more important, I do not see how to
  define textsize in both practically useful and correct way, for binaries
  with more that one executable segments.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  head/libexec/rtld-elf/map_object.c
  head/libexec/rtld-elf/rtld.c
  head/libexec/rtld-elf/rtld.h

Modified: head/libexec/rtld-elf/map_object.c
==============================================================================
--- head/libexec/rtld-elf/map_object.c	Sat Nov  3 23:37:13 2018	(r340106)
+++ head/libexec/rtld-elf/map_object.c	Sun Nov  4 00:32:28 2018	(r340107)
@@ -287,7 +287,6 @@ map_object(int fd, const char *path, const struct stat
     }
     obj->mapbase = mapbase;
     obj->mapsize = mapsize;
-    obj->textsize = text_end - base_vaddr;
     obj->vaddrbase = base_vaddr;
     obj->relocbase = mapbase - base_vaddr;
     obj->dynamic = (const Elf_Dyn *)(obj->relocbase + phdyn->p_vaddr);

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Sat Nov  3 23:37:13 2018	(r340106)
+++ head/libexec/rtld-elf/rtld.c	Sun Nov  4 00:32:28 2018	(r340107)
@@ -1415,10 +1415,6 @@ digest_phdr(const Elf_Phdr *phdr, int phnum, caddr_t e
 		  obj->vaddrbase;
 	    }
 	    nsegs++;
-	    if ((ph->p_flags & PF_X) == PF_X) {
-		obj->textsize = MAX(obj->textsize,
-		    round_page(ph->p_vaddr + ph->p_memsz) - obj->vaddrbase);
-	    }
 	    break;
 
 	case PT_DYNAMIC:

Modified: head/libexec/rtld-elf/rtld.h
==============================================================================
--- head/libexec/rtld-elf/rtld.h	Sat Nov  3 23:37:13 2018	(r340106)
+++ head/libexec/rtld-elf/rtld.h	Sun Nov  4 00:32:28 2018	(r340107)
@@ -151,7 +151,6 @@ typedef struct Struct_Obj_Entry {
     /* These items are computed by map_object() or by digest_phdr(). */
     caddr_t mapbase;		/* Base address of mapped region */
     size_t mapsize;		/* Size of mapped region in bytes */
-    size_t textsize;		/* Size of text segment in bytes */
     Elf_Addr vaddrbase;		/* Base address in shared object file */
     caddr_t relocbase;		/* Relocation constant = mapbase - vaddrbase */
     const Elf_Dyn *dynamic;	/* Dynamic section */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811040032.wA40WTr6014399>