aboutsummaryrefslogtreecommitdiff
path: root/newlib
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2014-12-16 20:46:25 +0000
committerDJ Delorie <dj@redhat.com>2014-12-16 20:46:25 +0000
commitae4a2bd820432ae02e02f5133783f66757051ffa (patch)
tree65adbece7d3fadd3dd040f1757de634651e82f70 /newlib
parent52edca9f86f192ffabca35853ab45154f09ea833 (diff)
downloadnewlib-ae4a2bd820432ae02e02f5133783f66757051ffa.zip
newlib-ae4a2bd820432ae02e02f5133783f66757051ffa.tar.gz
newlib-ae4a2bd820432ae02e02f5133783f66757051ffa.tar.bz2
* libc/stdlib/nano-mallocr.c (ALIGN_TO): Do not assume that
integers are as big as pointers.
Diffstat (limited to 'newlib')
-rw-r--r--newlib/ChangeLog5
-rw-r--r--newlib/libc/stdlib/nano-mallocr.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/newlib/ChangeLog b/newlib/ChangeLog
index 0786ef4..d5f5e66 100644
--- a/newlib/ChangeLog
+++ b/newlib/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-16 DJ Delorie <dj@redhat.com>
+
+ * libc/stdlib/nano-mallocr.c (ALIGN_TO): Do not assume that
+ integers are as big as pointers.
+
2014-12-16 Richard Earnshaw <rearnsha@arm.com>
* libc/machine/aarch64/strcpy.S: Improve handling of short strings.
diff --git a/newlib/libc/stdlib/nano-mallocr.c b/newlib/libc/stdlib/nano-mallocr.c
index cc9c87f..8d6ca5c 100644
--- a/newlib/libc/stdlib/nano-mallocr.c
+++ b/newlib/libc/stdlib/nano-mallocr.c
@@ -105,7 +105,7 @@
#define current_mallinfo __malloc_current_mallinfo
#define ALIGN_TO(size, align) \
- (((size) + (align) -1) & ~((align) -1))
+ (((size) + (align) -1L) & ~((align) -1L))
/* Alignment of allocated block */
#define MALLOC_ALIGN (8U)