From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Wed, 16 Nov 2022 14:27:41 +0000 (+0000)
Subject: Revert "cheri: malloc: avoid switch over uintptr_t"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3caf385850a96d7536f4b988e225d6fc600d6185;p=thirdparty%2Fglibc.git

Revert "cheri: malloc: avoid switch over uintptr_t"

This reverts commit dc8f9560104f0803e53fa23bfd011aa9878d5a97.
---

diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
index e908bfd0624..00b766219b0 100644
--- a/malloc/mcheck-impl.c
+++ b/malloc/mcheck-impl.c
@@ -74,7 +74,7 @@ checkhdr (const struct hdr *hdr)
        an error and report it.  */
     return MCHECK_OK;
 
-  switch (hdr->magic ^ ((unsigned long) hdr->prev + (unsigned long) hdr->next))
+  switch (hdr->magic ^ ((uintptr_t) hdr->prev + (uintptr_t) hdr->next))
     {
     default:
       status = MCHECK_HEAD;