summaryrefslogtreecommitdiffstats
path: root/libc/stdlib
diff options
context:
space:
mode:
author"Steven J. Hill" <sjhill@realitydiluted.com>2005-08-09 05:55:16 +0000
committer"Steven J. Hill" <sjhill@realitydiluted.com>2005-08-09 05:55:16 +0000
commit3dfe29ec75a1adfe9f05e8437ff8b67f309d4acd (patch)
tree2f6590386d1c091a8ee72cce290c0798f82f974c /libc/stdlib
parent75f9a2b1874f3c50727c6b91fd5b5735a2a5deb3 (diff)
downloaduClibc-alpine-3dfe29ec75a1adfe9f05e8437ff8b67f309d4acd.tar.bz2
uClibc-alpine-3dfe29ec75a1adfe9f05e8437ff8b67f309d4acd.tar.xz
Compile cleanups for NPTL support.
Diffstat (limited to 'libc/stdlib')
-rw-r--r--libc/stdlib/malloc-standard/Makefile7
-rw-r--r--libc/stdlib/malloc-standard/thread-freeres.c11
2 files changed, 14 insertions, 4 deletions
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