summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremaste <emaste@FreeBSD.org>2017-01-20 02:50:24 +0000
committeremaste <emaste@FreeBSD.org>2017-01-20 02:50:24 +0000
commit9f2fdaa6ac36c62cc5148b6d163438e6ff16aa31 (patch)
treeaadbdf6d70e7e9b2fdb2d7c4748ace6438f39e77
parent25df61d106d0c54f35eec01213a92e1a69382361 (diff)
downloadFreeBSD-src-9f2fdaa6ac36c62cc5148b6d163438e6ff16aa31.zip
FreeBSD-src-9f2fdaa6ac36c62cc5148b6d163438e6ff16aa31.tar.gz
MFC r311647: libunwind: add noexec stack annotation
Sponsored by: The FreeBSD Foundation
-rw-r--r--contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S2
-rw-r--r--contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S2
2 files changed, 4 insertions, 0 deletions
diff --git a/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S b/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
index 534d795..d916695 100644
--- a/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
+++ b/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
@@ -483,3 +483,5 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind14Registers_or1k6jumptoEv)
/* RISCVTODO */
#endif
+
+ .section .note.GNU-stack,"",@progbits
diff --git a/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S b/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
index ebc9d53..cebcd76 100644
--- a/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
+++ b/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
@@ -469,3 +469,5 @@ DEFINE_LIBUNWIND_FUNCTION(unw_getcontext)
/* RISCVTODO */
#endif
+
+ .section .note.GNU-stack,"",@progbits
OpenPOWER on IntegriCloud