Disable stack protector and stack variable initialization for crt objects am: 782759fa98 am: e8b094b4a5 am: 26b2bf86f9 am: 290a1979eb am: 19fb1cd886
Original change: https://android-review.googlesource.com/c/platform/external/musl/+/2063091
Change-Id: I56bee618d7776020491281040e1f5601bdfd7073
Signed-off-by: Automerger Merge Worker <[email protected]>
diff --git a/Android.bp b/Android.bp
index 2404954..4dcff0c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -389,10 +389,21 @@
// 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 {
name: "libc_musl_crti",
defaults: [
- "libc_musl_defaults",
+ "libc_musl_crt_defaults",
"libc_musl_crti_sources",
],
}
@@ -408,7 +419,7 @@
cc_object {
name: "libc_musl_crtn",
defaults: [
- "libc_musl_defaults",
+ "libc_musl_crt_defaults",
"libc_musl_crtn_sources",
],
}
@@ -416,7 +427,7 @@
cc_object {
name: "libc_musl_rcrt1",
defaults: [
- "libc_musl_defaults",
+ "libc_musl_crt_defaults",
"libc_musl_rcrt1_sources",
],
}
@@ -424,7 +435,7 @@
cc_object {
name: "libc_musl_Scrt1",
defaults: [
- "libc_musl_defaults",
+ "libc_musl_crt_defaults",
"libc_musl_Scrt1_sources",
],
}
