diff options
author | Alexander Potapenko <glider@google.com> | 2022-02-07 19:25:59 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-02-07 19:25:59 +0000 |
commit | 82187f9b33d9ec86dcd87219a4338aa3a0e43584 (patch) | |
tree | 0d2ffec5c699dd6db3d4b5f0e4642e5174fed477 | |
parent | 85563c35e9da65d104b1a30bba65d55c8baa1a1a (diff) | |
parent | 9d91925e4505e3f6bad18d0bd438c64bcb3a107f (diff) | |
download | configs-82187f9b33d9ec86dcd87219a4338aa3a0e43584.tar.gz |
Merge "Require CONFIG_INIT_STACK_ALL_ZERO on arches that support it" am: 4ca2ff98bf am: 9d91925e45
Original change: https://android-review.googlesource.com/c/kernel/configs/+/1972679
Change-Id: Ibc4fe16a0111a629a9c5e0dec72f397032bf1005
-rw-r--r-- | android-5.10/android-base-conditional.xml | 14 | ||||
-rw-r--r-- | android-5.15/android-base-conditional.xml | 14 |
2 files changed, 28 insertions, 0 deletions
diff --git a/android-5.10/android-base-conditional.xml b/android-5.10/android-base-conditional.xml index 404044d..53ea697 100644 --- a/android-5.10/android-base-conditional.xml +++ b/android-5.10/android-base-conditional.xml @@ -220,3 +220,17 @@ <value type="bool">y</value> </config> </group> + +<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> +<group> + <conditions> + <config> + <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> + <value type="bool">y</value> + </config> + </conditions> + <config> + <key>CONFIG_INIT_STACK_ALL_ZERO</key> + <value type="bool">y</value> + </config> +</group>
\ No newline at end of file diff --git a/android-5.15/android-base-conditional.xml b/android-5.15/android-base-conditional.xml index c6e47d7..11d3d95 100644 --- a/android-5.15/android-base-conditional.xml +++ b/android-5.15/android-base-conditional.xml @@ -228,3 +228,17 @@ <value type="bool">y</value> </config> </group> + +<!-- CONFIG_INIT_STACK_ALL_ZERO requirement --> +<group> + <conditions> + <config> + <key>CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO</key> + <value type="bool">y</value> + </config> + </conditions> + <config> + <key>CONFIG_INIT_STACK_ALL_ZERO</key> + <value type="bool">y</value> + </config> +</group>
\ No newline at end of file |