squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #26321 - srwalter:remove-i386-textrel, r=alexcrichton

Browse source 
This prevents a relocation in the text section.  Text relocations are
incompatible with hardened kernels.

https://github.com/rust-lang/rust/issues/5714
This commit is contained in:
bors 2015-06-17 20:04:19 +00:00
commit 8af39cebc5
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/rt/arch/i386/morestack.S
View file

@ -75,7 +75,7 @@
#else
#if defined(__linux__) || defined(__FreeBSD__)
#define MORESTACK __morestack
#define EXHAUSTED rust_stack_exhausted
#define EXHAUSTED rust_stack_exhausted@plt
#else
#define MORESTACK ___morestack
#define EXHAUSTED _rust_stack_exhausted
@ -83,7 +83,6 @@
#endif
.globl MORESTACK
.globl EXHAUSTED
// FIXME: What about __WIN32__?
#if defined(__linux__) || defined(__FreeBSD__)
@ -138,7 +137,7 @@ MORESTACK:
// re-align the stack
subl $12,%esp
calll EXHAUSTED
call EXHAUSTED
// the exhaustion function guarantees that it can't return
.cfi_endproc