[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r20198 - in /fsf/trunk/libc: ./ debug/ elf/ grp/ gshadow/ libio/ misc/ nptl/ nptl/sysdeps/unix/sysv/linux/ pwd/ shadow/ stdi...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r20198 - in /fsf/trunk/libc: ./ debug/ elf/ grp/ gshadow/ libio/ misc/ nptl/ nptl/sysdeps/unix/sysv/linux/ pwd/ shadow/ stdi...
- From: eglibc@xxxxxxxxxx
- Date: Fri, 17 Aug 2012 16:54:28 -0000
Author: eglibc
Date: Fri Aug 17 16:54:26 2012
New Revision: 20198
Log:
Import glibc-mainline for 2012-08-17
Added:
fsf/trunk/libc/sysdeps/pthread/Makeconfig
Removed:
fsf/trunk/libc/sysdeps/pthread/configure
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/Makeconfig
fsf/trunk/libc/debug/Makefile
fsf/trunk/libc/elf/dl-close.c
fsf/trunk/libc/grp/Makefile
fsf/trunk/libc/gshadow/Makefile
fsf/trunk/libc/libio/Makefile
fsf/trunk/libc/libio/genops.c
fsf/trunk/libc/libio/libioP.h
fsf/trunk/libc/misc/Makefile
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/Makefile
fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/Makefile
fsf/trunk/libc/pwd/Makefile
fsf/trunk/libc/shadow/Makefile
fsf/trunk/libc/stdio-common/Makefile
fsf/trunk/libc/stdio-common/isoc99_scanf.c
fsf/trunk/libc/stdlib/Makefile
fsf/trunk/libc/sysdeps/mach/hurd/Makeconfig
fsf/trunk/libc/sysdeps/mach/hurd/configure.in
fsf/trunk/libc/wcsmbs/Makefile
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Aug 17 16:54:26 2012
@@ -1,3 +1,54 @@
+2012-08-17 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * libio/genops.c (_IO_unbuffer_write): Conditionalize locking code on
+ [_IO_MTSAFE_IO].
+ * libio/libioP.h [!_IO_MTSAFE_IO && !NOT_IN_libc]
+ (_IO_acquire_lock, _IO_acquire_lock_clear_flags2, _IO_release_lock):
+ New macros.
+
+ * Makeconfig [$(libc-reentrant) = yes] (libio-mtsafe): New variable.
+ * libio/Makefile (CPPFLAGS): Append $(libio-mtsafe) unconditionally
+ rather than -D_IO_MTSAFE_IO conditionally.
+ * stdio-common/Makefile (CPPFLAGS): Likewise.
+ * wcsmbs/Makefile (CPPFLAGS): Likewise.
+ * stdlib/Makefile (CFLAGS-strfmon.c, CFLAGS-strfmon_l.c):
+ Use $(libio-mtsafe).
+ * debug/Makefile (CFLAGS-sprintf_chk.c): Use $(libio-mtsafe) instead
+ of -D_IO_MTSAFE_IO.
+ (CFLAGS-snprintf_chk.c, CFLAGS-vsprintf_chk.c): Likewise.
+ (CFLAGS-vsnprintf_chk.c, CFLAGS-asprintf_chk.c): Likewise.
+ (CFLAGS-vasprintf_chk.c, CFLAGS-obprintf_chk.c): Likewise.
+ (CFLAGS-dprintf_chk.c, CFLAGS-vdprintf_chk.c): Likewise.
+ (CFLAGS-printf_chk.c, CFLAGS-fprintf_chk.c): Likewise.
+ (CFLAGS-vprintf_chk.c, CFLAGS-vfprintf_chk.c): Likewise.
+ (CFLAGS-gets_chk.c, CFLAGS-fgets_chk.c): Likewise.
+ (CFLAGS-fgets_u_chk.c, CFLAGS-fread_chk.c): Likewise.
+ (CFLAGS-fread_u_chk.c): Likewise.
+ (CFLAGS-swprintf_chk.c, CFLAGS-vswprintf_chk.c): Likewise.
+ (CFLAGS-wprintf_chk.c, CFLAGS-fwprintf_chk.c): Likewise.
+ (CFLAGS-vwprintf_chk.c, CFLAGS-vfwprintf_chk.c): Likewise.
+ (CFLAGS-fgetws_chk.c, CFLAGS-fgetws_u_chk.c): Likewise.
+ * grp/Makefile (CFLAGS-fgetgrent_r.c, CFLAGS-putgrent.c): Likewise.
+ * gshadow/Makefile (CFLAGS-fgetsgent_r.c, CFLAGS-putsgent.c): Likewise.
+ * misc/Makefile (CFLAGS-mntent_r.c): Likewise.
+ * pwd/Makefile (CFLAGS-fgetpwent_r.c): Likewise.
+ * shadow/Makefile (CFLAGS-fgetspent_r.c, CFLAGS-putspent.c): Likewise.
+
+ * libio/Makefile: Test [$(libc-reentrant) = yes]
+ instead of [$(filter %REENTRANT, $(defines)) nonempty].
+
+ * Makeconfig
+ [$(libc-reentrant) = yes] (defines): Append -D_LIBC_REENTRANT.
+ * sysdeps/pthread/configure: File removed.
+ * sysdeps/pthread/Makeconfig: New file.
+ * sysdeps/mach/hurd/Makeconfig (libc-reentrant): New variable.
+ * sysdeps/mach/hurd/configure.in: Don't touch DEFINES here.
+
+2012-08-16 Gary Benson <gbenson@xxxxxxxxxx>
+
+ * elf/dl-close.c (_dl_close_worker): Also set r->r_map when
+ unmapping the first object in a namespace.
+
2012-08-16 Roland McGrath <roland@xxxxxxxxxxxxx>
* inet/getnetgrent_r.c (internal_setnetgrent): Renamed to ...
Modified: fsf/trunk/libc/Makeconfig
==============================================================================
--- fsf/trunk/libc/Makeconfig (original)
+++ fsf/trunk/libc/Makeconfig Fri Aug 17 16:54:26 2012
@@ -1005,6 +1005,13 @@
sysd-rules-targets := $(sort $(foreach p,$(sysd-rules-patterns),\
$(firstword $(subst :, ,$p))))
+# A sysdeps Makeconfig fragment may set libc-reentrant to yes.
+ifeq (yes,$(libc-reentrant))
+defines += -D_LIBC_REENTRANT
+
+libio-mtsafe = -D_IO_MTSAFE_IO
+endif
+
endif # Makeconfig not yet included
# Local Variables:
Modified: fsf/trunk/libc/debug/Makefile
==============================================================================
--- fsf/trunk/libc/debug/Makefile (original)
+++ fsf/trunk/libc/debug/Makefile Fri Aug 17 16:54:26 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1998-2001,2004-2008, 2009, 2011, 2012 Free Software Foundation, Inc.
+# Copyright (C) 1998-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -48,32 +48,32 @@
static-only-routines := warning-nop stack_chk_fail_local
CFLAGS-backtrace.c = -fno-omit-frame-pointer
-CFLAGS-sprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-snprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vsprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vsnprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-asprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vasprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-obprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-dprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vdprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-printf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vfprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-gets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgets_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgets_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fread_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fread_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-swprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-vswprintf_chk.c = -D_IO_MTSAFE_IO
-CFLAGS-wprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-vfwprintf_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgetws_chk.c = -D_IO_MTSAFE_IO $(exceptions)
-CFLAGS-fgetws_u_chk.c = -D_IO_MTSAFE_IO $(exceptions)
+CFLAGS-sprintf_chk.c = $(libio-mtsafe)
+CFLAGS-snprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vsprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vsnprintf_chk.c = $(libio-mtsafe)
+CFLAGS-asprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vasprintf_chk.c = $(libio-mtsafe)
+CFLAGS-obprintf_chk.c = $(libio-mtsafe)
+CFLAGS-dprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vdprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-printf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vfprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-gets_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgets_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgets_u_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fread_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fread_u_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-swprintf_chk.c = $(libio-mtsafe)
+CFLAGS-vswprintf_chk.c = $(libio-mtsafe)
+CFLAGS-wprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fwprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vwprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-vfwprintf_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgetws_chk.c = $(libio-mtsafe) $(exceptions)
+CFLAGS-fgetws_u_chk.c = $(libio-mtsafe) $(exceptions)
CFLAGS-read_chk.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-pread_chk.c = -fexceptions -fasynchronous-unwind-tables
CFLAGS-pread64_chk.c = -fexceptions -fasynchronous-unwind-tables
Modified: fsf/trunk/libc/elf/dl-close.c
==============================================================================
--- fsf/trunk/libc/elf/dl-close.c (original)
+++ fsf/trunk/libc/elf/dl-close.c Fri Aug 17 16:54:26 2012
@@ -641,7 +641,7 @@
#ifdef SHARED
assert (nsid != LM_ID_BASE);
#endif
- ns->_ns_loaded = imap->l_next;
+ r->r_map = ns->_ns_loaded = imap->l_next;
}
--ns->_ns_nloaded;
Modified: fsf/trunk/libc/grp/Makefile
==============================================================================
--- fsf/trunk/libc/grp/Makefile (original)
+++ fsf/trunk/libc/grp/Makefile Fri Aug 17 16:54:26 2012
@@ -1,5 +1,4 @@
-# Copyright (C) 1991,1992,1996-2000,2003,2004,2012
-# Free Software Foundation, Inc.
+# Copyright (C) 1991-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -44,8 +43,8 @@
CFLAGS-getgrent_r.c = -fexceptions
CFLAGS-getgrent.c = -fexceptions
CFLAGS-fgetgrent.c = -fexceptions
-CFLAGS-fgetgrent_r.c = -fexceptions -D_IO_MTSAFE_IO
-CFLAGS-putgrent.c = -fexceptions -D_IO_MTSAFE_IO
+CFLAGS-fgetgrent_r.c = -fexceptions $(libio-mtsafe)
+CFLAGS-putgrent.c = -fexceptions $(libio-mtsafe)
CFLAGS-initgroups.c = -DUSE_NSCD=1 -fexceptions
CFLAGS-getgrgid.c = -fexceptions
Modified: fsf/trunk/libc/gshadow/Makefile
==============================================================================
--- fsf/trunk/libc/gshadow/Makefile (original)
+++ fsf/trunk/libc/gshadow/Makefile Fri Aug 17 16:54:26 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 2009 Free Software Foundation, Inc.
+# Copyright (C) 2009-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -29,8 +29,8 @@
CFLAGS-getsgent_r.c = -fexceptions
CFLAGS-getsgent.c = -fexceptions
CFLAGS-fgetsgent.c = -fexceptions
-CFLAGS-fgetsgent_r.c = -fexceptions -D_IO_MTSAFE_IO
-CFLAGS-putsgent.c = -fexceptions -D_IO_MTSAFE_IO
+CFLAGS-fgetsgent_r.c = -fexceptions $(libio-mtsafe)
+CFLAGS-putsgent.c = -fexceptions $(libio-mtsafe)
CFLAGS-getsgnam.c = -fexceptions
CFLAGS-getsgnam_r.c = -fexceptions
Modified: fsf/trunk/libc/libio/Makefile
==============================================================================
--- fsf/trunk/libc/libio/Makefile (original)
+++ fsf/trunk/libc/libio/Makefile Fri Aug 17 16:54:26 2012
@@ -70,13 +70,13 @@
oldiofsetpos64
endif
-ifneq (,$(filter %REENTRANT, $(defines)))
+ifeq (yes,$(libc-reentrant))
routines += clearerr_u feof_u ferror_u fputc_u getc_u getchar_u \
iofflush_u putc_u putchar_u peekc iofread_u iofwrite_u iofgets_u \
iofputs_u
+endif
-CPPFLAGS += -D_IO_MTSAFE_IO
-endif
+CPPFLAGS += $(libio-mtsafe)
# Support for exception handling.
CFLAGS-fileops.c = $(exceptions)
Modified: fsf/trunk/libc/libio/genops.c
==============================================================================
--- fsf/trunk/libc/libio/genops.c (original)
+++ fsf/trunk/libc/libio/genops.c Fri Aug 17 16:54:26 2012
@@ -952,6 +952,7 @@
/* Iff stream is un-orientated, it wasn't used. */
&& fp->_mode != 0)
{
+#ifdef _IO_MTSAFE_IO
int cnt;
#define MAXTRIES 2
for (cnt = 0; cnt < MAXTRIES; ++cnt)
@@ -961,6 +962,7 @@
/* Give the other thread time to finish up its use of the
stream. */
__sched_yield ();
+#endif
if (! dealloc_buffers && !(fp->_flags & _IO_USER_BUF))
{
@@ -974,8 +976,10 @@
_IO_SETBUF (fp, NULL, 0);
+#ifdef _IO_MTSAFE_IO
if (cnt < MAXTRIES && fp->_lock != NULL)
_IO_lock_unlock (*fp->_lock);
+#endif
}
/* Make sure that never again the wide char functions can be
Modified: fsf/trunk/libc/libio/libioP.h
==============================================================================
--- fsf/trunk/libc/libio/libioP.h (original)
+++ fsf/trunk/libc/libio/libioP.h Fri Aug 17 16:54:26 2012
@@ -933,3 +933,17 @@
if ((fp->_flags & _IO_USER_LOCK) == 0)
_IO_funlockfile (fp);
}
+
+#if !defined _IO_MTSAFE_IO && !defined NOT_IN_libc
+# define _IO_acquire_lock(_fp) \
+ do { \
+ _IO_FILE *_IO_acquire_lock_file = NULL
+# define _IO_acquire_lock_clear_flags2(_fp) \
+ do { \
+ _IO_FILE *_IO_acquire_lock_file = (_fp)
+# define _IO_release_lock(_fp) \
+ if (_IO_acquire_lock_file != NULL) \
+ _IO_acquire_lock_file->_flags2 &= ~(_IO_FLAGS2_FORTIFY \
+ | _IO_FLAGS2_SCANF_STD); \
+ } while (0)
+#endif
Modified: fsf/trunk/libc/misc/Makefile
==============================================================================
--- fsf/trunk/libc/misc/Makefile (original)
+++ fsf/trunk/libc/misc/Makefile Fri Aug 17 16:54:26 2012
@@ -95,7 +95,6 @@
CFLAGS-getusershell.c = -fexceptions
CFLAGS-err.c = -fexceptions
CFLAGS-tst-tsearch.c = $(stack-align-test-flags)
-CFLAGS-mntent_r.c = -D_IO_MTSAFE_IO
include ../Rules
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Fri Aug 17 16:54:26 2012
@@ -1,3 +1,14 @@
+2012-08-15 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+2012-08-15 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+2012-08-15 Roland McGrath <roland@xxxxxxxxxxxxx>
+
+ * Makefile (CFLAGS-flockfile.c): Use $(libio-mtsafe) instead
+ of -D_IO_MTSAFE_IO.
+ (CFLAGS-ftrylockfile.c, CFLAGS-funlockfile.c): Likewise.
+ * sysdeps/unix/sysv/linux/Makefile (CFLAGS-fork.c): Likewise.
+
2012-08-16 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* pthread_cond_timedwait.c (__pthread_cond_timedwait)
Modified: fsf/trunk/libc/nptl/Makefile
==============================================================================
--- fsf/trunk/libc/nptl/Makefile (original)
+++ fsf/trunk/libc/nptl/Makefile Fri Aug 17 16:54:26 2012
@@ -341,9 +341,9 @@
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
Modified: fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/Makefile
==============================================================================
--- fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/Makefile (original)
+++ fsf/trunk/libc/nptl/sysdeps/unix/sysv/linux/Makefile Fri Aug 17 16:54:26 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>, 2002.
@@ -29,7 +29,7 @@
endif
ifeq ($(subdir),posix)
-CFLAGS-fork.c = -D_IO_MTSAFE_IO
+CFLAGS-fork.c = $(libio-mtsafe)
CFLAGS-getpid.o = -fomit-frame-pointer
CFLAGS-getpid.os = -fomit-frame-pointer
endif
Modified: fsf/trunk/libc/pwd/Makefile
==============================================================================
--- fsf/trunk/libc/pwd/Makefile (original)
+++ fsf/trunk/libc/pwd/Makefile Fri Aug 17 16:54:26 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,1996-1999,2003,2004 Free Software Foundation, Inc.
+# Copyright (C) 1991-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -36,6 +36,6 @@
CFLAGS-getpwent_r.c = -fexceptions
CFLAGS-getpwent.c = -fexceptions
CFLAGS-getpw.c = -fexceptions
-CFLAGS-fgetpwent_r.c = -D_IO_MTSAFE_IO
+CFLAGS-fgetpwent_r.c = $(libio-mtsafe)
endif
Modified: fsf/trunk/libc/shadow/Makefile
==============================================================================
--- fsf/trunk/libc/shadow/Makefile (original)
+++ fsf/trunk/libc/shadow/Makefile Fri Aug 17 16:54:26 2012
@@ -1,4 +1,4 @@
-# Copyright (C) 1996, 2003, 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996-2012 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -30,8 +30,8 @@
CFLAGS-getspent_r.c = -fexceptions
CFLAGS-getspent.c = -fexceptions
CFLAGS-fgetspent.c = -fexceptions
-CFLAGS-fgetspent_r.c = -fexceptions -D_IO_MTSAFE_IO
-CFLAGS-putspent.c = -fexceptions -D_IO_MTSAFE_IO
+CFLAGS-fgetspent_r.c = -fexceptions $(libio-mtsafe)
+CFLAGS-putspent.c = -fexceptions $(libio-mtsafe)
CFLAGS-getspnam.c = -fexceptions
CFLAGS-getspnam_r.c = -fexceptions
Modified: fsf/trunk/libc/stdio-common/Makefile
==============================================================================
--- fsf/trunk/libc/stdio-common/Makefile (original)
+++ fsf/trunk/libc/stdio-common/Makefile Fri Aug 17 16:54:26 2012
@@ -123,9 +123,7 @@
bug14-ENV = LOCPATH=$(common-objpfx)localedata
tst-grouping-ENV = LOCPATH=$(common-objpfx)localedata
-ifneq (,$(filter %REENTRANT, $(defines)))
-CPPFLAGS += -D_IO_MTSAFE_IO
-endif
+CPPFLAGS += $(libio-mtsafe)
$(objpfx)tst-setvbuf1.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1
$(built-program-cmd) > $@ 2>&1
Modified: fsf/trunk/libc/stdio-common/isoc99_scanf.c
==============================================================================
--- fsf/trunk/libc/stdio-common/isoc99_scanf.c (original)
+++ fsf/trunk/libc/stdio-common/isoc99_scanf.c Fri Aug 17 16:54:26 2012
@@ -28,13 +28,17 @@
va_list arg;
int done;
+#ifdef _IO_MTSAFE_IO
_IO_acquire_lock_clear_flags2 (stdin);
+#endif
stdin->_flags2 |= _IO_FLAGS2_SCANF_STD;
va_start (arg, format);
done = _IO_vfscanf (stdin, format, arg, NULL);
va_end (arg);
+#ifdef _IO_MTSAFE_IO
_IO_release_lock (stdin);
+#endif
return done;
}
Modified: fsf/trunk/libc/stdlib/Makefile
==============================================================================
--- fsf/trunk/libc/stdlib/Makefile (original)
+++ fsf/trunk/libc/stdlib/Makefile Fri Aug 17 16:54:26 2012
@@ -100,10 +100,8 @@
CFLAGS-system.os = -fomit-frame-pointer
CFLAGS-fmtmsg.c = -fexceptions
-ifneq (,$(filter %REENTRANT, $(defines)))
-CFLAGS-strfmon.c = -D_IO_MTSAFE_IO
-CFLAGS-strfmon_l.c = -D_IO_MTSAFE_IO
-endif
+CFLAGS-strfmon.c = $(libio-mtsafe)
+CFLAGS-strfmon_l.c = $(libio-mtsafe)
CFLAGS-tst-bsearch.c = $(stack-align-test-flags)
CFLAGS-tst-qsort.c = $(stack-align-test-flags)
Modified: fsf/trunk/libc/sysdeps/mach/hurd/Makeconfig
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/Makeconfig (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/Makeconfig Fri Aug 17 16:54:26 2012
@@ -2,3 +2,6 @@
# See Makefile in this directory for the rule that builds this.
# We must define this variable earlier than sysdeps Makefiles are included.
static-start-installed-name = crt0.o
+
+# GNU libc on the Hurd is always reentrant.
+libc-reentrant = yes
Modified: fsf/trunk/libc/sysdeps/mach/hurd/configure.in
==============================================================================
--- fsf/trunk/libc/sysdeps/mach/hurd/configure.in (original)
+++ fsf/trunk/libc/sysdeps/mach/hurd/configure.in Fri Aug 17 16:54:26 2012
@@ -1,7 +1,4 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
-
-# GNU libc on the Hurd is always reentrant.
-DEFINES="$DEFINES -D_LIBC_REENTRANT"
dnl We need this setting because of the need for PLT calls in ld.so.
AC_DEFINE([NO_HIDDEN])
Added: fsf/trunk/libc/sysdeps/pthread/Makeconfig
==============================================================================
--- fsf/trunk/libc/sysdeps/pthread/Makeconfig (added)
+++ fsf/trunk/libc/sysdeps/pthread/Makeconfig Fri Aug 17 16:54:26 2012
@@ -1,0 +1,2 @@
+# Compile libc code to do internal locking.
+libc-reentrant = yes
Removed: fsf/trunk/libc/sysdeps/pthread/configure
==============================================================================
--- fsf/trunk/libc/sysdeps/pthread/configure (original)
+++ fsf/trunk/libc/sysdeps/pthread/configure (removed)
@@ -1,3 +1,0 @@
-# Local configure fragment for sysdeps/pthread.
-
-DEFINES="$DEFINES -D_LIBC_REENTRANT"
Modified: fsf/trunk/libc/wcsmbs/Makefile
==============================================================================
--- fsf/trunk/libc/wcsmbs/Makefile (original)
+++ fsf/trunk/libc/wcsmbs/Makefile Fri Aug 17 16:54:26 2012
@@ -72,9 +72,8 @@
CFLAGS-isoc99_fwscanf.c += $(exceptions)
CFLAGS-isoc99_vwscanf.c += $(exceptions)
CFLAGS-isoc99_vfwscanf.c += $(exceptions)
-ifneq (,$(filter %REENTRANT, $(defines)))
-CPPFLAGS += -D_IO_MTSAFE_IO
-endif
+
+CPPFLAGS += $(libio-mtsafe)
# We need to find the default version of strtold_l in stdlib.
CPPFLAGS-wcstold_l.c = -I../stdlib
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits