diff options
| author | Nick Kralevich <nnk@google.com> | 2015-12-23 12:34:05 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-12-23 12:34:05 -0800 |
| commit | 3a3baa46fe749282281171904f0ed868736566e5 (patch) | |
| tree | a6f1bb06c03485286e631517b819e89bb43fb7c5 | |
| parent | 8f0d0ef099f269c33bd5ec1021658954630dd865 (diff) | |
| parent | 9e44bd4ae074fa88f0e13ab944211b9a99d06629 (diff) | |
| download | ndk-3a3baa46fe749282281171904f0ed868736566e5.tar.gz | |
Merge "enable -fstack-protector-strong on mips and mips64"
am: 9e44bd4ae0
* commit '9e44bd4ae074fa88f0e13ab944211b9a99d06629':
enable -fstack-protector-strong on mips and mips64
4 files changed, 4 insertions, 0 deletions
diff --git a/build/core/toolchains/mips64el-linux-android-4.9/setup.mk b/build/core/toolchains/mips64el-linux-android-4.9/setup.mk index fa6225ea1..171e218d3 100644 --- a/build/core/toolchains/mips64el-linux-android-4.9/setup.mk +++ b/build/core/toolchains/mips64el-linux-android-4.9/setup.mk @@ -29,6 +29,7 @@ TARGET_CFLAGS := \ -finline-functions \ -ffunction-sections \ -funwind-tables \ + -fstack-protector-strong \ -fmessage-length=0 \ -fno-inline-functions-called-once \ -fgcse-after-reload \ diff --git a/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk b/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk index b4ead73cd..66518cec9 100644 --- a/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk +++ b/build/core/toolchains/mips64el-linux-android-clang3.6/setup.mk @@ -51,6 +51,7 @@ TARGET_CFLAGS := \ -finline-functions \ -ffunction-sections \ -funwind-tables \ + -fstack-protector-strong \ -fmessage-length=0 \ -Wno-invalid-command-line-argument \ -Wno-unused-command-line-argument \ diff --git a/build/core/toolchains/mipsel-linux-android-4.9/setup.mk b/build/core/toolchains/mipsel-linux-android-4.9/setup.mk index 27a178a1a..5999d9490 100644 --- a/build/core/toolchains/mipsel-linux-android-4.9/setup.mk +++ b/build/core/toolchains/mipsel-linux-android-4.9/setup.mk @@ -29,6 +29,7 @@ TARGET_CFLAGS := \ -finline-functions \ -ffunction-sections \ -funwind-tables \ + -fstack-protector-strong \ -fmessage-length=0 \ -fno-inline-functions-called-once \ -fgcse-after-reload \ diff --git a/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk b/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk index 03b12943e..5bc796eab 100644 --- a/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk +++ b/build/core/toolchains/mipsel-linux-android-clang3.6/setup.mk @@ -51,6 +51,7 @@ TARGET_CFLAGS := \ -finline-functions \ -ffunction-sections \ -funwind-tables \ + -fstack-protector-strong \ -fmessage-length=0 \ -Wno-invalid-command-line-argument \ -Wno-unused-command-line-argument \ |