From c75ccd4c3a84993ea392f23f2cf75f7274e22cc1 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Fri, 17 Aug 2012 09:35:15 -0700 Subject: Clean up definition of _LIBC_REENTRANT and _IO_MTSAFE_IO. --- nptl/ChangeLog | 6 ++++++ nptl/Makefile | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'nptl') 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 + + * 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 * 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 -- cgit 1.4.1