diff --git a/libc/Android.bp b/libc/Android.bp
index 9c2d713..cdbdf63 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1710,6 +1710,8 @@
             strip: {
                 keep_symbols_and_debug_frame: true,
             },
+
+            whole_static_libs: [ "libgcc_stripped" ],
         },
         arm64: {
             version_script: ":libc.arm64.map",
diff --git a/libm/Android.bp b/libm/Android.bp
index bf05b17..de32185 100644
--- a/libm/Android.bp
+++ b/libm/Android.bp
@@ -286,6 +286,7 @@
             pack_relocations: false,
             ldflags: ["-Wl,--hash-style=both"],
             version_script: ":libm.arm.map",
+            whole_static_libs: [ "libgcc_stripped" ],
         },
 
         arm64: {