commit fed0ce9c09391eb31841e1cde72c5980f255d39a
author Elliott Hughes <enh@google.com> Wed Dec 11 09:53:34 2024 -0800
committer Elliott Hughes <enh@google.com> Wed Dec 11 09:54:54 2024 -0800
tree 050cf2c79f6107b4a02b7b03bf3832ff593e1bb5
parent 1a2c4f89ce1b78466ab26e7568a6739cced6944c

<bionic/macros.h>: replace align_up()/align_down() with clang's builtins.

Change-Id: If39cf028e9a22fc2008ee9d1ba683a4d0d038325

linker/linker_note_gnu_property.cpp

diff --git a/linker/linker_note_gnu_property.cpp b/linker/linker_note_gnu_property.cpp
index 082a604..d221b8d 100644
--- a/linker/linker_note_gnu_property.cpp
+++ b/linker/linker_note_gnu_property.cpp
@@ -137,7 +137,7 @@
     // Loop on program property array.
     const ElfW(Prop)* property = reinterpret_cast<const ElfW(Prop)*>(&note_nhdr->n_desc[offset]);
     const ElfW(Word) property_size =
-        align_up(sizeof(ElfW(Prop)) + property->pr_datasz, sizeof(ElfW(Addr)));
+        __builtin_align_up(sizeof(ElfW(Prop)) + property->pr_datasz, sizeof(ElfW(Addr)));
     if ((note_nhdr->nhdr.n_descsz - offset) < property_size) {
       DL_ERR_AND_LOG(
           "\"%s\" .note.gnu.property: property descriptor size is "