aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2022-04-20 00:21:33 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-04-20 00:21:33 +0000
commite8b094b4a565ba9b7dad1fb730d1719c49a74738 (patch)
tree7cc557ef0a538dfdaee7c87f930e7d47d7a779d6
parent61a1d4cbde4a2e4cc857862ecadc3ea0919907dd (diff)
parent782759fa98d1e04a7a934c5304312e89148a1ea3 (diff)
downloadmusl-e8b094b4a565ba9b7dad1fb730d1719c49a74738.tar.gz
Disable stack protector and stack variable initialization for crt objects am: 782759fa98
Original change: https://android-review.googlesource.com/c/platform/external/musl/+/2063091 Change-Id: Ic071d6554dc68413c973a7c7c7ca0160507b34f2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--Android.bp21
1 files changed, 16 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp
index 2404954b..4dcff0c4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
],
}