diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-11-01 15:38:30 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-11-01 15:38:30 +0000 |
| commit | 6d455ce3bce1e1e07eaaf02ff74e645488d28c76 (patch) | |
| tree | ade8cfff13cb548be387e9db96d4f0acb3bbee3f | |
| parent | e8e98b3e796835d63aeee282e78a108f585c01e7 (diff) | |
| download | angle_dx11-6d455ce3bce1e1e07eaaf02ff74e645488d28c76.tar.gz | |
Update makefiles after merge of Chromium at 232403
This commit was generated by merge_from_chromium.py.
Change-Id: I88ab7170ec8a80ec9df4bf17e5234146518ba893
| -rw-r--r-- | src/preprocessor.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | src/preprocessor.target.linux-x86.mk | 4 | ||||
| -rw-r--r-- | src/translator.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | src/translator.target.linux-x86.mk | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/preprocessor.target.darwin-x86.mk b/src/preprocessor.target.darwin-x86.mk index 3b83a86f..8411f3f5 100644 --- a/src/preprocessor.target.darwin-x86.mk +++ b/src/preprocessor.target.darwin-x86.mk @@ -62,11 +62,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -146,11 +146,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ diff --git a/src/preprocessor.target.linux-x86.mk b/src/preprocessor.target.linux-x86.mk index 3b83a86f..8411f3f5 100644 --- a/src/preprocessor.target.linux-x86.mk +++ b/src/preprocessor.target.linux-x86.mk @@ -62,11 +62,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -146,11 +146,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ diff --git a/src/translator.target.darwin-x86.mk b/src/translator.target.darwin-x86.mk index c296878b..550bf55c 100644 --- a/src/translator.target.darwin-x86.mk +++ b/src/translator.target.darwin-x86.mk @@ -102,11 +102,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -189,11 +189,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ diff --git a/src/translator.target.linux-x86.mk b/src/translator.target.linux-x86.mk index c296878b..550bf55c 100644 --- a/src/translator.target.linux-x86.mk +++ b/src/translator.target.linux-x86.mk @@ -102,11 +102,11 @@ MY_CFLAGS_Debug := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -g \ -fomit-frame-pointer \ @@ -189,11 +189,11 @@ MY_CFLAGS_Release := \ -Wno-extra \ -Wno-ignored-qualifiers \ -Wno-type-limits \ + -fno-stack-protector \ -Wno-address \ -Wno-format-security \ -Wno-return-type \ -Wno-sequence-point \ - -fno-stack-protector \ -Os \ -fno-ident \ -fdata-sections \ |