svn commit: r246636 - head/sys/kern

[Konstantin Belousov]

Author: kib
Date: Sun Feb 10 20:08:33 2013
New Revision: 246636
URL: http://svnweb.freebsd.org/changeset/base/246636

Log:
  Remove the ia64-specific code fragment, which effect is more cleanly
  done by the call to trans_prot() function a line before.
  
  Discussed with:	Oliver Pinter <oliver.pntr at gmail.com>
  MFC after:	1 week

Modified:
  head/sys/kern/imgact_elf.c

Modified: head/sys/kern/imgact_elf.c
==============================================================================
--- head/sys/kern/imgact_elf.c	Sun Feb 10 19:57:19 2013	(r246635)
+++ head/sys/kern/imgact_elf.c	Sun Feb 10 20:08:33 2013	(r246636)
@@ -826,16 +826,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
-
 			error = __elfN(load_section)(imgp, phdr[i].p_offset,
 			    (caddr_t)(uintptr_t)phdr[i].p_vaddr + et_dyn_addr,
 			    phdr[i].p_memsz, phdr[i].p_filesz, prot,