diff options
| author | marcel <marcel@FreeBSD.org> | 2014-07-07 00:27:09 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2014-07-07 00:27:09 +0000 |
| commit | 9f28abd980752efcf77578cd494f1015083c2a2b (patch) | |
| tree | 98db2559cee662a9de7212211dd5c69176b58254 /sys/kern/imgact_elf.c | |
| parent | 43f783bfcf60b349841acd57895767177114e4ae (diff) | |
| download | FreeBSD-src-9f28abd980752efcf77578cd494f1015083c2a2b.zip FreeBSD-src-9f28abd980752efcf77578cd494f1015083c2a2b.tar.gz | |
Remove ia64.
This includes:
o All directories named *ia64*
o All files named *ia64*
o All ia64-specific code guarded by __ia64__
o All ia64-specific makefile logic
o Mention of ia64 in comments and documentation
This excludes:
o Everything under contrib/
o Everything under crypto/
o sys/xen/interface
o sys/sys/elf_common.h
Discussed at: BSDcan
Diffstat (limited to 'sys/kern/imgact_elf.c')
| -rw-r--r-- | sys/kern/imgact_elf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index b085a70..6342119 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -130,7 +130,7 @@ SYSCTL_INT(__CONCAT(_kern_elf, __ELF_WORD_SIZE), OID_AUTO, __XSTRING(__CONCAT(ELF, __ELF_WORD_SIZE)) ": enable non-executable stack"); #if __ELF_WORD_SIZE == 32 -#if defined(__amd64__) || defined(__ia64__) +#if defined(__amd64__) int i386_read_exec = 0; SYSCTL_INT(_kern_elf32, OID_AUTO, read_exec, CTLFLAG_RW, &i386_read_exec, 0, "enable execution from readable segments"); @@ -2112,7 +2112,7 @@ __elfN(trans_prot)(Elf_Word flags) if (flags & PF_R) prot |= VM_PROT_READ; #if __ELF_WORD_SIZE == 32 -#if defined(__amd64__) || defined(__ia64__) +#if defined(__amd64__) if (i386_read_exec && (flags & PF_R)) prot |= VM_PROT_EXECUTE; #endif |
