This is an automated email from the ASF dual-hosted git repository.
jamesge pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-brpc.git
The following commit(s) were added to refs/heads/master by this push:
new c0453d9 Fix the compile error when using GCC compiler with asan
enabled on Linux platform.
new 25b68db Merge pull request #1289 from warriorpaw/master
c0453d9 is described below
commit c0453d9130c60f05306ac97f40b6de9873b47e08
Author: warriorpaw <[email protected]>
AuthorDate: Thu Nov 19 22:28:46 2020 +0800
Fix the compile error when using GCC compiler with asan enabled on Linux
platform.
Only reproduced and tested with x64 linux and gcc 7 / 8 / 10.
Not sure if this error exist on other platforms.
---
src/bthread/context.cpp | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/bthread/context.cpp b/src/bthread/context.cpp
index 9c6d832..5098bc3 100644
--- a/src/bthread/context.cpp
+++ b/src/bthread/context.cpp
@@ -294,6 +294,7 @@ __asm (
" jmp *%edx\n"
".size bthread_jump_fcontext,.-bthread_jump_fcontext\n"
".section .note.GNU-stack,\"\",%progbits\n"
+".previous\n"
);
#endif
@@ -328,6 +329,7 @@ __asm (
" hlt\n"
".size bthread_make_fcontext,.-bthread_make_fcontext\n"
".section .note.GNU-stack,\"\",%progbits\n"
+".previous\n"
);
#endif
@@ -371,6 +373,7 @@ __asm (
" jmp *%r8\n"
".size bthread_jump_fcontext,.-bthread_jump_fcontext\n"
".section .note.GNU-stack,\"\",%progbits\n"
+".previous\n"
);
#endif
@@ -397,6 +400,7 @@ __asm (
" hlt\n"
".size bthread_make_fcontext,.-bthread_make_fcontext\n"
".section .note.GNU-stack,\"\",%progbits\n"
+".previous\n"
);
#endif
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
