3 files changed, 11 insertions, 6 deletions
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile
index e29cf113b..37ea6e05b 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile
@@ -52,6 +52,11 @@ CSRC-LIBC-ST += libc-lowlevellock.c
 CSRC-LIBP-ST += rtld-libc-lowlevellock.c
 endif
 
+#
+# Needed to get pthread types.
+#
+CFLAGS-pt-fork.c = -D_GNU_SOURCE
+
 COBJ-LIBP-ST = $(patsubst %.c, %.o, $(CSRC-LIBP-ST))
 COBJ-LIBP-SH = $(patsubst %.c, %.os, $(CSRC-LIBP-SH))
 COBJ-LIBC-ST = $(patsubst %.c, %.o, $(CSRC-LIBC-ST))
@@ -69,16 +74,16 @@ endif
 	$(AR) $(ARFLAGS) $(PTDIR)../$(LIBPTHREAD_SHARED_ARCHIVE) $(COBJ-LIBP-SH)
 
 $(COBJ-LIBP-ST): %.o : %.c
-	$(CC) $(CFLAGS-LIBP) -c $< -o $@
+	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBP) -c $< -o $@
 
 $(COBJ-LIBP-SH): %.os : %.c
-	$(CC) $(CFLAGS-LIBP) -DSHARED -c $< -o $@
+	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBP) -DSHARED -c $< -o $@
 
 $(COBJ-LIBC-ST): %.o : %.c
-	$(CC) $(CFLAGS-LIBC) -c $< -o $@
+	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBC) -c $< -o $@
 
 $(COBJ-LIBC-SH): %.os : %.c
-	$(CC) $(CFLAGS-LIBC) -DSHARED -c $< -o $@
+	$(CC) $(CFLAGS-$<) $(CFLAGS-LIBC) -DSHARED -c $< -o $@
 
 objs-pthread-libc: $(COBJ-LIBC-ST) $(COBJ-LIBC-SH)
 ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
index 0e43e56e2..1978413ea 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/Makefile
@@ -27,7 +27,7 @@ ASRC-LIBP-SH = $(ASRC-LIBP-ST)
 CSRC-LIBP-ST = pthread_once.c
 CSRC-LIBP-SH = $(CSRC-LIBP-ST)
 
-CSRC-LIBC-ST = fork.c
+CSRC-LIBC-ST = fork-nptl.c
 CSRC-LIBC-SH = $(CSRC-LIBC-ST)
 
 AOBJ-LIBP-ST = $(patsubst %.S, %.o, $(ASRC-LIBP-ST))
@@ -38,7 +38,7 @@ COBJ-LIBC-ST = $(patsubst %.c, %.o, $(CSRC-LIBC-ST))
 COBJ-LIBC-SH = $(patsubst %.c, %.os, $(CSRC-LIBC-SH))
 
 ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
-CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__
+CFLAGS-fork-nptl.c = -D__USE_STDIO_FUTEXES__
 endif
 
 ar-target all: $(AOBJ-LIBP-ST) $(AOBJ-LIBP-SH) $(COBJ-LIBP-ST) $(COBJ-LIBP-SH)
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/fork.c b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/fork-nptl.c
index 06b7e1c69..06b7e1c69 100644
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/mips/fork.c
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/mips/fork-nptl.c