diff options
| author | kib <kib@FreeBSD.org> | 2013-02-10 20:08:33 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2013-02-10 20:08:33 +0000 |
| commit | f24ec7b4ea849ae616cee98559659baa93f5763d (patch) | |
| tree | 4684a554a4ed75c276cbd7fbb38d87b18cfdccf5 /sys/kern/imgact_elf.c | |
| parent | 6e3d604447905a0a85c64afe8b442f3a3590e930 (diff) | |
| download | FreeBSD-src-f24ec7b4ea849ae616cee98559659baa93f5763d.zip FreeBSD-src-f24ec7b4ea849ae616cee98559659baa93f5763d.tar.gz | |
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@gmail.com>
MFC after: 1 week
Diffstat (limited to 'sys/kern/imgact_elf.c')
| -rw-r--r-- | sys/kern/imgact_elf.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index 4c1cb5b..e6f385a 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -826,16 +826,6 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) 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, |
