summaryrefslogtreecommitdiff
path: root/gnu/lib/libmalloc
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1993-10-26 06:52:16 +0000
committercgd <cgd@NetBSD.org>1993-10-26 06:52:16 +0000
commit47850d1d3b2a2fb2566b52f68597922601d30eb4 (patch)
tree355984157c8bbf15c151f0e7174d12e51af952f3 /gnu/lib/libmalloc
parent842069a9cb9297acea4e015cddb642b2b01d0729 (diff)
combine malloc, free, and realloc into one file, because that's what
libc does, and we don't want things to get screwed up at link-time.
Diffstat (limited to 'gnu/lib/libmalloc')
-rw-r--r--gnu/lib/libmalloc/Makefile6
-rw-r--r--gnu/lib/libmalloc/combined.c12
2 files changed, 16 insertions, 2 deletions
diff --git a/gnu/lib/libmalloc/Makefile b/gnu/lib/libmalloc/Makefile
index b5aeb2606f3..02b52c5ff20 100644
--- a/gnu/lib/libmalloc/Makefile
+++ b/gnu/lib/libmalloc/Makefile
@@ -1,9 +1,11 @@
-# $Id: Makefile,v 1.1 1993/09/23 21:10:40 cgd Exp $
+# $Id: Makefile,v 1.2 1993/10/26 06:52:16 cgd Exp $
CFLAGS+= -I${.CURDIR}
LIB= gnumalloc
-SRCS+= malloc.c free.c cfree.c realloc.c calloc.c morecore.c
+SRCS+= combined.c
+#SRCS+= malloc.c free.c realloc.c
+SRCS+= cfree.c calloc.c morecore.c
SRCS+= memalign.c valloc.c mcheck.c mtrace.c mstats.c vm-limit.c
SRCS+= ralloc.c
NOMAN= noman
diff --git a/gnu/lib/libmalloc/combined.c b/gnu/lib/libmalloc/combined.c
new file mode 100644
index 00000000000..6228f568e82
--- /dev/null
+++ b/gnu/lib/libmalloc/combined.c
@@ -0,0 +1,12 @@
+/*
+ * this file (combined.c) is malloc.c, free.c, and realloc.c, combined into
+ * one file, because the malloc.o in libc defined malloc, realloc, and free,
+ * and libc sometimes invokes realloc, which can greatly confuse things
+ * in the linking process...
+ *
+ * $Id: combined.c,v 1.1 1993/10/26 06:52:17 cgd Exp $
+ */
+
+#include "malloc.c"
+#include "free.c"
+#include "realloc.c"