commit bb86926aa0eda0e198da90aecfbbc67ea5e75e2e
author Daniel Verkamp <dverkamp@google.com> Tue Feb 11 13:36:22 2025 -0800
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 11 13:36:22 2025 -0800
tree f18ec88a710558f34f09137410092d8f6248c681
parent 09c438862ecc7907e7f6755a4293169883edc5bd
parent 42992d6413ea2b241d245fa456d36cd8b4eae2d8

Merge "librust_baremetal: statically choose x86_64 memset" into main am: 42992d6413

Original change: https://android-review.googlesource.com/c/platform/bionic/+/3489695

Change-Id: Ie3b3d24d7173d6c58c44be2cfda3502807341f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

libc/Android.bp

diff --git a/libc/Android.bp b/libc/Android.bp
index f13a76c..a5bc482 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -2110,6 +2110,12 @@
             enabled: false,
         },
         x86_64: {
+            asflags: [
+                // Statically choose the SSE2 memset_generic as memset for
+                // baremetal, where we do not have the dynamic function
+                // dispatch machinery.
+                "-Dmemset_generic=memset",
+            ],
             srcs: [
                 "arch-x86_64/string/sse2-memmove-slm.S",
                 "arch-x86_64/string/sse2-memset-slm.S",