about summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-08-17 09:35:15 -0700
committerRoland McGrath <roland@hack.frob.com>2012-08-17 09:35:15 -0700
commitc75ccd4c3a84993ea392f23f2cf75f7274e22cc1 (patch)
tree49f67c33b43674aa355a7c1931ccdbbdf2e4ce31 /nptl
parentd9195db871b11e139050dfa00e333ca8b2f7a677 (diff)
downloadglibc-c75ccd4c3a84993ea392f23f2cf75f7274e22cc1.tar.gz
glibc-c75ccd4c3a84993ea392f23f2cf75f7274e22cc1.tar.xz
glibc-c75ccd4c3a84993ea392f23f2cf75f7274e22cc1.zip
Clean up definition of _LIBC_REENTRANT and _IO_MTSAFE_IO.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog6
-rw-r--r--nptl/Makefile6
2 files changed, 9 insertions, 3 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 6f5527242d..8a8cbb8d3d 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,9 @@
+2012-08-15  Roland McGrath  <roland@hack.frob.com>
+
+	* Makefile (CFLAGS-flockfile.c): Use $(libio-mtsafe) instead
+	of -D_IO_MTSAFE_IO.
+	(CFLAGS-ftrylockfile.c, CFLAGS-funlockfile.c): Likewise.
+
 2012-08-16  Joseph Myers  <joseph@codesourcery.com>
 
 	* pthread_cond_timedwait.c (__pthread_cond_timedwait)
diff --git a/nptl/Makefile b/nptl/Makefile
index ef8e874cd8..8cd168d451 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -341,9 +341,9 @@ extra-objs += $(crti-objs) $(crtn-objs)
 extra-objs += pt-crti.o
 endif
 
-CFLAGS-flockfile.c = -D_IO_MTSAFE_IO
-CFLAGS-ftrylockfile.c = -D_IO_MTSAFE_IO
-CFLAGS-funlockfile.c = -D_IO_MTSAFE_IO
+CFLAGS-flockfile.c = $(libio-mtsafe)
+CFLAGS-ftrylockfile.c = $(libio-mtsafe)
+CFLAGS-funlockfile.c = $(libio-mtsafe)
 
 link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
 		    $(common-objpfx)libc.a