diff options
| author | Martin Liska <mliska@suse.cz> | 2019-11-05 14:54:57 +0100 |
|---|---|---|
| committer | Martin Liska <marxin@gcc.gnu.org> | 2019-11-05 13:54:57 +0000 |
| commit | 3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8 (patch) | |
| tree | c3eb5c5658e168b819d23dd20aa46d614089c649 /libsanitizer/sanitizer_common/sanitizer_asm.h | |
| parent | 9bae89924afc811bd10e249856bf78dd19f20df2 (diff) | |
| download | gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.zip gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.tar.gz gcc-3ca75cd55030a53a858bdbe9aba6d87f6b1e90b8.tar.bz2 | |
Libsanitizer: merge from trunk with merge.sh.
2019-11-05 Martin Liska <mliska@suse.cz>
* all source files: Merge from upstream r375507.
From-SVN: r277834
Diffstat (limited to 'libsanitizer/sanitizer_common/sanitizer_asm.h')
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_asm.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libsanitizer/sanitizer_common/sanitizer_asm.h b/libsanitizer/sanitizer_common/sanitizer_asm.h index 184d118..803af32 100644 --- a/libsanitizer/sanitizer_common/sanitizer_asm.h +++ b/libsanitizer/sanitizer_common/sanitizer_asm.h @@ -60,7 +60,9 @@ #if defined(__ELF__) && (defined(__GNU__) || defined(__FreeBSD__) || \ defined(__Fuchsia__) || defined(__linux__)) -#define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits // NOLINT +// clang-format off +#define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits // NOLINT +// clang-format on #else #define NO_EXEC_STACK_DIRECTIVE #endif |