summaryrefslogtreecommitdiff
path: root/libobjc/memory.c
diff options
context:
space:
mode:
authornicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2010-09-12 14:55:21 +0000
committernicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2010-09-12 14:55:21 +0000
commitdb7e33267fda5add42f0a51d27027732313bd97c (patch)
tree3eea0fc31fc22bc008c32ffdfb470e34e07e329e /libobjc/memory.c
parent83c813acdbc5efa020220bd0eb01ac374155370f (diff)
downloadgcc-db7e33267fda5add42f0a51d27027732313bd97c.tar.gz
In libobjc/:
* Makefile.in (%_gc.lo): New pattern rules to build the garbage-collected version of the library. Removed rules for specific files that are no longer needed. Standardized all rules. (C_SOURCE_FILES, OBJC_SOURCE_FILES): New variables. (OBJS, OBJS_GC): Compute these from C_SOURCE_FILES and OBJC_SOURCE_FILES. (INCLUDES): Removed the unused include -I$(srcdir)/objc. * memory.c (objc_calloc): Fixed call to GC_malloc when building with Garbage Colletion. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@164231 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc/memory.c')
-rw-r--r--libobjc/memory.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libobjc/memory.c b/libobjc/memory.c
index 2ebd429293d..19a450ad860 100644
--- a/libobjc/memory.c
+++ b/libobjc/memory.c
@@ -78,7 +78,7 @@ objc_calloc (size_t nelem, size_t size)
{
/* Note that GC_malloc returns cleared memory (see documentation) so
there is no need to clear it. */
- void *res = (void *)(GC_malloc (nelem, size));
+ void *res = (void *)(GC_malloc (nelem * size));
if (! res)
_objc_abort ("Virtual memory exhausted\n");
return res;