diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-23 06:30:23 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-05-23 06:30:23 +0000 |
| commit | 16fef9bbcea817e662d06e6103fb767977787294 (patch) | |
| tree | 1a75c07af9af46350eaad5ad4fb3d8b8305c1fca /cpukit | |
| parent | 2010-05-23 Ralf Corsépius <ralf.corsepius@rtems.org> (diff) | |
| download | rtems-16fef9bbcea817e662d06e6103fb767977787294.tar.bz2 | |
2010-05-23 Ralf Corsépius <ralf.corsepius@rtems.org>
PR 1528/cpukit
* libcsupport/src/malloc_boundary.c: Cast to intptr_t* instead of
int32_t* for 16 bit target compliance.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/libcsupport/src/malloc_boundary.c | 8 |
2 files changed, 11 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 9415329cf3..73be38c91d 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2010-05-23 Ralf Corsépius <ralf.corsepius@rtems.org> + + PR 1528/cpukit + * libcsupport/src/malloc_boundary.c: Cast to intptr_t* instead of + int32_t* for 16 bit target compliance. + 2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org> * libblock/include/rtems/nvdisk.h, libblock/src/nvdisk-sram.c: @@ -10,6 +16,7 @@ 16bit target compliance. 2010-05-22 Ralf Corsépius <ralf.corsepius@rtems.org> + * libfs/src/rfs/rtems-rfs-bitmaps-ut.c: Use "16 bit int" arg in call to srand if "32 bit int" doesn't fit into "int". diff --git a/cpukit/libcsupport/src/malloc_boundary.c b/cpukit/libcsupport/src/malloc_boundary.c index f8f6d34bce..fd80774747 100644 --- a/cpukit/libcsupport/src/malloc_boundary.c +++ b/cpukit/libcsupport/src/malloc_boundary.c @@ -75,18 +75,18 @@ static void rtems_malloc_boundary_at_malloc( { void *return_this; struct mallocNode *mp = (struct mallocNode *)pointer; - int *fp, *nfp; + intptr_t *fp, *nfp; int i; _RTEMS_Lock_allocator(); mp->memory = mp + 1; return_this = mp->memory; mp->size = size - (sizeof(struct mallocNode) + SENTINELSIZE); - fp = (int *)&size - 2; + fp = (intptr_t *)&size - 2; for (i = 0 ; i < CALLCHAINSIZE ; i++) { mp->callChain[i] = fp[1]; - nfp = (int *)(fp[0]); - if((nfp <= fp) || (nfp > (int *)(INT32_C(0x1000000) /* 1 << 24 */))) + nfp = (intptr_t *)(fp[0]); + if((nfp <= fp) || (nfp > (intptr_t *)(INT32_C(0x1000000) /* 1 << 24 */))) break; fp = nfp; } |