summaryrefslogtreecommitdiff
path: root/libobjc/memory.c
diff options
context:
space:
mode:
authornicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2011-06-03 19:15:23 +0000
committernicola <nicola@138bc75d-0d04-0410-961f-82ee72b054a4>2011-06-03 19:15:23 +0000
commitc0eeb2f4155daaeb1e15f5482216bb089b5c5e74 (patch)
tree43cb298fe356fef3fd9afe487864fd08bd5a3f09 /libobjc/memory.c
parent3ddc2a17c4bc01a654b1d7ed5ae41723e8794591 (diff)
downloadgcc-c0eeb2f4155daaeb1e15f5482216bb089b5c5e74.tar.gz
In libobjc/:
2011-06-03 Nicola Pero <nicola.pero@meta-innovation.com> * Makefile.in (OBJC_DEPRECATED_H): Removed objc_valloc.h, objc_malloc.h and objc_unexpected_exception.h. (exception.lo): Do not use -Wno-deprecated-declarations. (exception_gc.lo): Likewise. * objc/objc-api.h: Do not include deprecated/objc_valloc.h, deprecated/objc_malloc.h and deprecated/objc_unexpected_exception.h. * objc/deprecated/objc_valloc.h: Removed. * objc/deprecated/objc_malloc.h: Removed. * objc/deprecated/objc_unexpected_exception.h: Removed. * exception.c (_objc_unexpected_exception): Removed. (objc_exception_throw): Do not check for _objc_unexpected_exception. * memory.c (objc_valloc, _objc_malloc, _objc_atomic_malloc, _objc_valloc, _objc_realloc, _objc_calloc, _objc_free): Removed. * libobjc.def (_objc_unexpected_exception, objc_valloc): Removed. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@174615 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc/memory.c')
-rw-r--r--libobjc/memory.c35
1 files changed, 0 insertions, 35 deletions
diff --git a/libobjc/memory.c b/libobjc/memory.c
index b0519fc87a1..c02176ef874 100644
--- a/libobjc/memory.c
+++ b/libobjc/memory.c
@@ -133,38 +133,3 @@ objc_free (void *mem)
}
#endif /* !OBJC_WITH_GC */
-
-/* The rest of the file contains deprecated code. */
-
-#if OBJC_WITH_GC
-
-void *
-objc_valloc (size_t size)
-{
- void *res = (void *)(GC_malloc (size));
- if (! res)
- _objc_abort ("Virtual memory exhausted\n");
- return res;
-}
-
-#else
-
-void *
-objc_valloc (size_t size)
-{
- void *res = (void *)(malloc (size));
- if (! res)
- _objc_abort ("Virtual memory exhausted\n");
- return res;
-}
-
-#endif /* !OBJC_WITH_GC */
-
-/* Hook functions for memory allocation and disposal. Deprecated and
- currently unused. */
-void *(*_objc_malloc) (size_t) = malloc;
-void *(*_objc_atomic_malloc) (size_t) = malloc;
-void *(*_objc_valloc) (size_t) = malloc;
-void *(*_objc_realloc) (void *, size_t) = realloc;
-void *(*_objc_calloc) (size_t, size_t) = calloc;
-void (*_objc_free) (void *) = free;