Skip to content

Commit

Permalink
rt/arch/arm: fix syntax used for noexec stack
Browse files Browse the repository at this point in the history
  • Loading branch information
@thestinger
thestinger committed Apr 1, 2013
1 parent be79258 commit 26fc76a
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion src/rt/arch/arm/_context.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Mark stack as non-executable
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack, "", @progbits
.section .note.GNU-stack, "", %progbits
#endif

.text
Expand Down
2 changes: 1 addition & 1 deletion src/rt/arch/arm/ccall.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Mark stack as non-executable
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack, "", @progbits
.section .note.GNU-stack, "", %progbits
#endif

.text
Expand Down
2 changes: 1 addition & 1 deletion src/rt/arch/arm/morestack.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Mark stack as non-executable
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack, "", @progbits
.section .note.GNU-stack, "", %progbits
#endif

.text
Expand Down
2 changes: 1 addition & 1 deletion src/rt/arch/arm/record_sp.S
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Mark stack as non-executable
#if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack, "", @progbits
.section .note.GNU-stack, "", %progbits
#endif

.text
Expand Down

5 comments on commit 26fc76a

@bors
Copy link
Contributor

@bors bors commented on 26fc76a Apr 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at https://github.com/thestinger/rust/commit/26fc76acb6bd86375cc1fef218b3f91708a8f699

@bors
Copy link
Contributor

@bors bors commented on 26fc76a Apr 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging thestinger/rust/arm = 26fc76a into auto

@bors
Copy link
Contributor

@bors bors commented on 26fc76a Apr 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thestinger/rust/arm = 26fc76a merged ok, testing candidate = 8e9fd72

@bors
Copy link
Contributor

@bors bors commented on 26fc76a Apr 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

all tests pass:
http://buildbot.rust-lang.org/builders/auto-linux/builds/715
http://buildbot.rust-lang.org/builders/auto-win/builds/710
http://buildbot.rust-lang.org/builders/auto-mac/builds/723

@bors
Copy link
Contributor

@bors bors commented on 26fc76a Apr 1, 2013

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding incoming to auto = 8e9fd72

Please sign in to comment.