svn commit: r246897 - stable/9/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sun Feb 17 06:06:11 2013
New Revision: 246897
URL: http://svnweb.freebsd.org/changeset/base/246897

Log:
  MFC r246636:
  Remove the ia64-specific code fragment, which effect is more cleanly
  done by the call to trans_prot() function a line before.

Modified:
  stable/9/sys/kern/imgact_elf.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/imgact_elf.c
==============================================================================
--- stable/9/sys/kern/imgact_elf.c	Sun Feb 17 04:43:22 2013	(r246896)
+++ stable/9/sys/kern/imgact_elf.c	Sun Feb 17 06:06:11 2013	(r246897)
@@ -829,16 +829,6 @@ __CONCAT(exec_, __elfN(imgact))(struct i
 			if (phdr[i].p_memsz == 0)
 				break;
 			prot = __elfN(trans_prot)(phdr[i].p_flags);
-
-#if defined(__ia64__) && __ELF_WORD_SIZE == 32 && defined(IA32_ME_HARDER)
-			/*
-			 * Some x86 binaries assume read == executable,
-			 * notably the M3 runtime and therefore cvsup
-			 */
-			if (prot & VM_PROT_READ)
-				prot |= VM_PROT_EXECUTE;
-#endif
-
 			if ((error = __elfN(load_section)(vmspace,
 			    imgp->object, phdr[i].p_offset,
 			    (caddr_t)(uintptr_t)phdr[i].p_vaddr + et_dyn_addr,