Skip to content

Commit 4aa4ebd

Browse files
committed
---
yaml --- r: 174011 b: refs/heads/batch c: 8341ee4 h: refs/heads/master i: 174009: 1a317a4 174007: d2c7ccb v: v3
1 parent 00312a0 commit 4aa4ebd

File tree

3 files changed

+25
-1
lines changed

3 files changed

+25
-1
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
2929
refs/heads/issue-18208-method-dispatch-2: 9e1eae4fb9b6527315b4441cf8a0f5ca911d1671
3030
refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
32-
refs/heads/batch: 7a05dc273dc193c747853e35231e165b2665e3f0
32+
refs/heads/batch: 8341ee4075e46d4f5470c6081be4135cdffd21ed
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
3434
refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#include "macros.S"
2+
3+
// Mark stack as non-executable
4+
#if defined(__linux__) && defined(__ELF__)
5+
.section .note.GNU-stack, "", %progbits
6+
#endif
7+
8+
/* See i386/morestack.S for the lengthy, general explanation. */
9+
10+
.global rust_stack_exhausted
11+
12+
.hidden __morestack
13+
14+
// FIXME(POWERPC): this might not be perfectly right but works for now
15+
__morestack:
16+
.cfi_startproc
17+
bl rust_stack_exhausted
18+
// the above function ensures that it never returns
19+
.cfi_endproc
20+
.end __morestack
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
// Mark stack as non-executable
2+
#if defined(__linux__) && defined(__ELF__)
3+
.section .note.GNU-stack, "", %progbits
4+
#endif

0 commit comments

Comments
 (0)