summaryrefslogtreecommitdiffstats
path: root/abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2012-02-19 20:11:23 (GMT)
committerBritney Fransen <brfransen@gmail.com>2012-02-19 20:11:23 (GMT)
commit443b2a8694fbf63ed61f9624b4741a6bae28374b (patch)
treee5e7aff374bd411ac44476eda377b3062f7d4856 /abs/extra/community/chromium/nacl-cflags-remove-fstack-protector.patch
parent52880d521a89b52cd7d36e34e872c091b2c8f899 (diff)
parent08478d8a9de5eaeec46a8c0140e6c19e8158f2ad (diff)
downloadlinhes_pkgbuild-443b2a8694fbf63ed61f9624b4741a6bae28374b.zip
linhes_pkgbuild-443b2a8694fbf63ed61f9624b4741a6bae28374b.tar.gz
linhes_pkgbuild-443b2a8694fbf63ed61f9624b4741a6bae28374b.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.patch17
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', {