public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/arm/morello/main] Revert "cheri: malloc: avoid switch over uintptr_t"
@ 2022-11-18 11:35 Szabolcs Nagy
  0 siblings, 0 replies; only message in thread
From: Szabolcs Nagy @ 2022-11-18 11:35 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3caf385850a96d7536f4b988e225d6fc600d6185

commit 3caf385850a96d7536f4b988e225d6fc600d6185
Author: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date:   Wed Nov 16 14:27:41 2022 +0000

    Revert "cheri: malloc: avoid switch over uintptr_t"
    
    This reverts commit dc8f9560104f0803e53fa23bfd011aa9878d5a97.

Diff:
---
 malloc/mcheck-impl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/malloc/mcheck-impl.c b/malloc/mcheck-impl.c
index e908bfd062..00b766219b 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;

^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2022-11-18 11:35 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-18 11:35 [glibc/arm/morello/main] Revert "cheri: malloc: avoid switch over uintptr_t" Szabolcs Nagy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).