[patch] missing-asm-gnu-stack-sections.diff

missing-asm-gnu-stack-sections.diff (text/plain), 1.61 KB, created by Attila Tóth on 2017-12-23 22:21:42 UTC

diff -urNp rustc-1.19.0-orig/src/compiler-rt/lib/builtins/assembly.h rustc-1.19.0-dwok/src/compiler-rt/lib/builtins/assembly.h
--- rustc-1.19.0-orig/src/compiler-rt/lib/builtins/assembly.h	2017-07-18 00:13:27.000000000 +0200
+++ rustc-1.19.0-dwok/src/compiler-rt/lib/builtins/assembly.h	2017-12-23 21:11:40.809286379 +0100
@@ -44,7 +44,7 @@
 #endif
 #define CONST_SECTION .section .rodata
 
-#if defined(__GNU__) || defined(__ANDROID__) || defined(__FreeBSD__)
+#if defined(__GNU__) || defined(__linux__) || defined(__ANDROID__) || defined(__FreeBSD__)
 #define NO_EXEC_STACK_DIRECTIVE .section .note.GNU-stack,"",%progbits
 #else
 #define NO_EXEC_STACK_DIRECTIVE
diff -urNp rustc-1.19.0-orig/src/compiler-rt/lib/builtins/x86_64/chkstk2.S rustc-1.19.0-dwok/src/compiler-rt/lib/builtins/x86_64/chkstk2.S
--- rustc-1.19.0-orig/src/compiler-rt/lib/builtins/x86_64/chkstk2.S	2017-07-18 00:13:27.000000000 +0200
+++ rustc-1.19.0-dwok/src/compiler-rt/lib/builtins/x86_64/chkstk2.S	2017-12-23 21:45:41.915425499 +0100
@@ -40,3 +40,6 @@ END_COMPILERRT_FUNCTION(___chkstk)
 END_COMPILERRT_FUNCTION(__alloca)
 
 #endif // __x86_64__
+
+NO_EXEC_STACK_DIRECTIVE
+
diff -urNp rustc-1.19.0-orig/src/compiler-rt/lib/builtins/x86_64/chkstk.S rustc-1.19.0-dwok/src/compiler-rt/lib/builtins/x86_64/chkstk.S
--- rustc-1.19.0-orig/src/compiler-rt/lib/builtins/x86_64/chkstk.S	2017-07-18 00:13:27.000000000 +0200
+++ rustc-1.19.0-dwok/src/compiler-rt/lib/builtins/x86_64/chkstk.S	2017-12-23 21:45:28.663255815 +0100
@@ -37,3 +37,6 @@ DEFINE_COMPILERRT_FUNCTION(___chkstk_ms)
 END_COMPILERRT_FUNCTION(___chkstk_ms)
 
 #endif // __x86_64__
+
+NO_EXEC_STACK_DIRECTIVE
+