tell Google3 we do not need executable stack

Change-Id: I5ff3599448d027fcac43a53e98a801ce672ce5ee
Reviewed-on: https://skia-review.googlesource.com/10861
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>

diff --git a/src/jumper/SkJumper_generated.S b/src/jumper/SkJumper_generated.S
index 5cce458..eab093c 100644 (file)
--- a/src/jumper/SkJumper_generated.S
+++ b/src/jumper/SkJumper_generated.S
@@ -10,6 +10,7 @@
     #define HIDDEN .private_extern
 #else
     #define HIDDEN .hidden
+    .section .note.GNU-stack,"",%progbits
 #endif
 .text
 #if defined(__aarch64__)

diff --git a/src/jumper/build_stages.py b/src/jumper/build_stages.py
index 4bedeb5..576c3ba 100755 (executable)
--- a/src/jumper/build_stages.py
+++ b/src/jumper/build_stages.py
@@ -12,7 +12,7 @@ import sys
 #clang = ['clang++']
 clang = ['ccache', 'clang-4.0', '-x', 'c++']
 
-ndk = '/Users/mtklein/brew/opt/android-ndk/'
+ndk = '/Users/mtklein/ndk/'
 objdump = 'gobjdump'
 
 #ndk = '/home/mtklein/ndk/'
@@ -138,6 +138,7 @@ print '#if defined(__MACH__)'
 print '    #define HIDDEN .private_extern'
 print '#else'
 print '    #define HIDDEN .hidden'
+print '    .section .note.GNU-stack,"",%progbits'
 print '#endif'
 
 print '.text'