From 3dfe29ec75a1adfe9f05e8437ff8b67f309d4acd Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Tue, 9 Aug 2005 05:55:16 +0000
Subject: Compile cleanups for NPTL support.

---
 libc/stdlib/malloc-standard/Makefile         |  7 +++----
 libc/stdlib/malloc-standard/thread-freeres.c | 11 +++++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'libc/stdlib/malloc-standard')

diff --git a/libc/stdlib/malloc-standard/Makefile b/libc/stdlib/malloc-standard/Makefile
index b5f53f2bf..28f67b058 100644
--- a/libc/stdlib/malloc-standard/Makefile
+++ b/libc/stdlib/malloc-standard/Makefile
@@ -32,10 +32,9 @@ endif
 # calloc.c can be found at uClibc/libc/stdlib/calloc.c
 # valloc.c can be found at uClibc/libc/stdlib/valloc.c
 CSRC=malloc.c calloc.c realloc.c free.c memalign.c mallopt.c mallinfo.c
-#ifeq ($(PTHREADS_NATIVE),y)
-#CSRC+=thread-freeres.c
-#CFLAGS += -I$(TOPDIR)/libpthread/nptl/compat
-#endif
+ifeq ($(PTHREADS_NATIVE),y)
+CSRC += thread-freeres.c
+endif
 COBJS=$(patsubst %.c,%.o, $(CSRC))
 OBJS=$(COBJS)
 
diff --git a/libc/stdlib/malloc-standard/thread-freeres.c b/libc/stdlib/malloc-standard/thread-freeres.c
index 37cd234ed..f61b38b4a 100644
--- a/libc/stdlib/malloc-standard/thread-freeres.c
+++ b/libc/stdlib/malloc-standard/thread-freeres.c
@@ -42,8 +42,19 @@ do {									      \
 
 DEFINE_HOOK (__libc_thread_subfreeres, (void));
 
+/*
+ * This needs a lot of work.
+ */
+#if 0
 void __attribute__ ((section ("__libc_thread_freeres_fn")))
 __libc_thread_freeres (void)
 {
   RUN_HOOK (__libc_thread_subfreeres, ());
 }
+#else
+void
+__libc_thread_freeres (void)
+{
+  return;
+}
+#endif
-- 
cgit v1.2.3