From ab362965f775c613975535079f0a4a998b15224a Mon Sep 17 00:00:00 2001 From: emaste Date: Sat, 7 Jan 2017 14:40:58 +0000 Subject: [PATCH] libunwind: add noexec stack annotation Reported by: vangyzen Reviewed by: kib MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D9075 --- contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S | 2 ++ contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S | 2 ++ 2 files changed, 4 insertions(+) diff --git a/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S b/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S index 8e37c13036f6..34b7429d012a 100644 --- a/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S +++ b/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S @@ -527,3 +527,5 @@ DEFINE_LIBUNWIND_PRIVATE_FUNCTION(_ZN9libunwind15Registers_riscv6jumptoEv) ret // jump to ra #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 ebc9d538e7fb..cebcd760df12 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