Skip to content

Commit 746d5bd

Browse files
committed
---
yaml --- r: 173737 b: refs/heads/auto c: 8341ee4 h: refs/heads/master i: 173735: 856c052 v: v3
1 parent adafe1a commit 746d5bd

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
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 7a05dc273dc193c747853e35231e165b2665e3f0
13+
refs/heads/auto: 8341ee4075e46d4f5470c6081be4135cdffd21ed
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
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)