diff options
author | Michael Hanson <mihanson@linhes.org> | 2012-02-20 21:32:43 (GMT) |
---|---|---|
committer | Michael Hanson <mihanson@linhes.org> | 2012-02-20 21:32:43 (GMT) |
commit | 30c420f9bf1a561d360abb83ef9226583e7c5b58 (patch) | |
tree | c861adc3fb699d8acb366b686cde52d28c40f759 /abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch | |
parent | e70a067f9eab0330e559b3d03c97cca3e02cd4ae (diff) | |
parent | 21c364279485a642183b45c081c3936ba6230953 (diff) | |
download | linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.zip linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.tar.gz linhes_pkgbuild-30c420f9bf1a561d360abb83ef9226583e7c5b58.tar.bz2 |
Merge branch 'testing' of linhes.org:linhes_pkgbuild into testing
Diffstat (limited to 'abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch')
-rw-r--r-- | abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch b/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch new file mode 100644 index 0000000..0e4f7cf --- /dev/null +++ b/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch @@ -0,0 +1,17 @@ +Index: src/trusted/service_runtime/linux/nacl_bootstrap.gyp +diff --git a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp +index 66d95ca4dc98653219c965b899dbd5ad35d2960c..083e3fdd24ff4562d2037f8d17a06540e05357b8 100644 +--- a/src/trusted/service_runtime/linux/nacl_bootstrap.gyp ++++ b/src/trusted/service_runtime/linux/nacl_bootstrap.gyp +@@ -84,6 +84,11 @@ + '-fasan', + '-faddress-sanitizer', + '-w', ++ # We filter these out because release_extra_cflags or another ++ # such thing might be adding them in, and those options wind up ++ # coming after the -fno-stack-protector we added above. ++ '-fstack-protector', ++ '-fstack-protector-all', + ], + 'conditions': [ + ['clang==1', { |