diff options
author | Colin Cross <ccross@android.com> | 2022-04-20 06:13:12 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-20 06:13:12 +0000 |
commit | 290a1979eb2d43b7b086862ad236d20020a2c1ab (patch) | |
tree | 7cc557ef0a538dfdaee7c87f930e7d47d7a779d6 | |
parent | ddcfdef55abd7768a64c43c9bff4cdf6fb9e1922 (diff) | |
parent | 26b2bf86f98512e22bc5ad110c2f78411717ce9d (diff) | |
download | musl-290a1979eb2d43b7b086862ad236d20020a2c1ab.tar.gz |
Disable stack protector and stack variable initialization for crt objects am: 782759fa98 am: e8b094b4a5 am: 26b2bf86f9
Original change: https://android-review.googlesource.com/c/platform/external/musl/+/2063091
Change-Id: I7058e51debf46455ae45d7fad0df344f6b9dca41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | Android.bp | 21 |
1 files changed, 16 insertions, 5 deletions
@@ -389,10 +389,21 @@ cc_genrule { // The musl CRT objects // +cc_defaults { + name: "libc_musl_crt_defaults", + defaults: ["libc_musl_defaults"], + cflags: [ + // These are required to make sure the C code in crt/*.c + // doesn't have any dependencies on libc. + "-fno-stack-protector", + "-ftrivial-auto-var-init=uninitialized", + ], +} + cc_object { name: "libc_musl_crt1", defaults: [ - "libc_musl_defaults", + "libc_musl_crt_defaults", "libc_musl_crt1_sources", ], } @@ -400,7 +411,7 @@ cc_object { cc_object { name: "libc_musl_crti", defaults: [ - "libc_musl_defaults", + "libc_musl_crt_defaults", "libc_musl_crti_sources", ], } @@ -408,7 +419,7 @@ cc_object { cc_object { name: "libc_musl_crtn", defaults: [ - "libc_musl_defaults", + "libc_musl_crt_defaults", "libc_musl_crtn_sources", ], } @@ -416,7 +427,7 @@ cc_object { cc_object { name: "libc_musl_rcrt1", defaults: [ - "libc_musl_defaults", + "libc_musl_crt_defaults", "libc_musl_rcrt1_sources", ], } @@ -424,7 +435,7 @@ cc_object { cc_object { name: "libc_musl_Scrt1", defaults: [ - "libc_musl_defaults", + "libc_musl_crt_defaults", "libc_musl_Scrt1_sources", ], } |