[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r10809 - in /branches/eglibc-2_12/libc: ./ elf/ libio/ nis/nss_nis/ nptl/ nptl/sysdeps/unix/sysv/linux/sh/ posix/ wcsmbs/
- To: commits@xxxxxxxxxx
- Subject: [commits] r10809 - in /branches/eglibc-2_12/libc: ./ elf/ libio/ nis/nss_nis/ nptl/ nptl/sysdeps/unix/sysv/linux/sh/ posix/ wcsmbs/
- From: joseph@xxxxxxxxxx
- Date: Thu, 24 Jun 2010 15:03:28 -0000
Author: joseph
Date: Thu Jun 24 08:03:28 2010
New Revision: 10809
Log:
Merge changes between r10688 and r10808 from /fsf/glibc-2_12-branch.
Modified:
branches/eglibc-2_12/libc/ChangeLog
branches/eglibc-2_12/libc/elf/dl-reloc.c
branches/eglibc-2_12/libc/libio/stdio.h
branches/eglibc-2_12/libc/nis/nss_nis/nis-initgroups.c
branches/eglibc-2_12/libc/nptl/ChangeLog
branches/eglibc-2_12/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
branches/eglibc-2_12/libc/posix/getopt.h
branches/eglibc-2_12/libc/wcsmbs/wchar.h
Modified: branches/eglibc-2_12/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_12/libc/ChangeLog (original)
+++ branches/eglibc-2_12/libc/ChangeLog Thu Jun 24 08:03:28 2010
@@ -1,3 +1,19 @@
+2010-06-02 Kirill A. Shutemov <kirill@xxxxxxxxxxxxx>
+
+ * elf/dl-reloc.c: Flush cache after solving TEXTRELs if arch
+ requires it.
+
+2010-06-02 Andreas Schwab <schwab@xxxxxxxxxx>
+
+ * nis/nss_nis/nis-initgroups.c (get_uid): Properly resize buffer.
+
+2010-06-07 Jakub Jelinek <jakub@xxxxxxxxxx>
+
+ * libio/stdio.h (sscanf, vsscanf): Use __REDIRECT_NTH instead of
+ __REDIRECT followed by __THROW.
+ * wcsmbs/wchar.h (swscanf, vswscanf): Likewise.
+ * posix/getopt.h (getopt): Likewise.
+
2010-05-26 H.J. Lu <hongjiu.lu@xxxxxxxxx>
[BZ #11640]
Modified: branches/eglibc-2_12/libc/elf/dl-reloc.c
==============================================================================
--- branches/eglibc-2_12/libc/elf/dl-reloc.c (original)
+++ branches/eglibc-2_12/libc/elf/dl-reloc.c Thu Jun 24 08:03:28 2010
@@ -1,5 +1,5 @@
/* Relocate a shared object and resolve its references to other loaded objects.
- Copyright (C) 1995-2006, 2008, 2009 Free Software Foundation, Inc.
+ Copyright (C) 1995-2006, 2008, 2009, 2010 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
@@ -319,6 +319,10 @@
goto call_error;
}
+#ifdef CLEAR_CACHE
+ CLEAR_CACHE (textrels->start, textrels->start + textrels->len);
+#endif
+
textrels = textrels->next;
}
Modified: branches/eglibc-2_12/libc/libio/stdio.h
==============================================================================
--- branches/eglibc-2_12/libc/libio/stdio.h (original)
+++ branches/eglibc-2_12/libc/libio/stdio.h Thu Jun 24 08:03:28 2010
@@ -447,9 +447,9 @@
__isoc99_fscanf) __wur;
extern int __REDIRECT (scanf, (__const char *__restrict __format, ...),
__isoc99_scanf) __wur;
-extern int __REDIRECT (sscanf, (__const char *__restrict __s,
- __const char *__restrict __format, ...),
- __isoc99_sscanf) __THROW;
+extern int __REDIRECT_NTH (sscanf, (__const char *__restrict __s,
+ __const char *__restrict __format, ...),
+ __isoc99_sscanf);
# else
extern int __isoc99_fscanf (FILE *__restrict __stream,
__const char *__restrict __format, ...) __wur;
@@ -501,11 +501,11 @@
extern int __REDIRECT (vscanf, (__const char *__restrict __format,
_G_va_list __arg), __isoc99_vscanf)
__attribute__ ((__format__ (__scanf__, 1, 0))) __wur;
-extern int __REDIRECT (vsscanf,
- (__const char *__restrict __s,
- __const char *__restrict __format, _G_va_list __arg),
- __isoc99_vsscanf)
- __THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
+extern int __REDIRECT_NTH (vsscanf,
+ (__const char *__restrict __s,
+ __const char *__restrict __format,
+ _G_va_list __arg), __isoc99_vsscanf)
+ __attribute__ ((__format__ (__scanf__, 2, 0)));
# else
extern int __isoc99_vfscanf (FILE *__restrict __s,
__const char *__restrict __format,
Modified: branches/eglibc-2_12/libc/nis/nss_nis/nis-initgroups.c
==============================================================================
--- branches/eglibc-2_12/libc/nis/nss_nis/nis-initgroups.c (original)
+++ branches/eglibc-2_12/libc/nis/nss_nis/nis-initgroups.c Thu Jun 24 08:03:28 2010
@@ -139,7 +139,7 @@
if (r != ERANGE)
break;
- extend_alloca (buf, buflen, 2 * buflen);
+ buf = extend_alloca (buf, buflen, 2 * buflen);
}
return 1;
Modified: branches/eglibc-2_12/libc/nptl/ChangeLog
==============================================================================
--- branches/eglibc-2_12/libc/nptl/ChangeLog (original)
+++ branches/eglibc-2_12/libc/nptl/ChangeLog Thu Jun 24 08:03:28 2010
@@ -1,3 +1,8 @@
+2010-06-01 Takashi Yoshii <takashi.yoshii.zj@xxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/sh/lowlevellock.S: Fix incorrect
+ location of ifndef __ASSUME_FUTEX_CLOCK_REALTIME.
+
2010-04-09 Ulrich Drepper <drepper@xxxxxxxxxx>
[BZ #11390]
Modified: branches/eglibc-2_12/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
==============================================================================
--- branches/eglibc-2_12/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S (original)
+++ branches/eglibc-2_12/libc/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S Thu Jun 24 08:03:28 2010
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009
+/* Copyright (C) 2003, 2004, 2005, 2007, 2008, 2009, 2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -282,6 +282,7 @@
rts
mov.l @r15+, r12
+# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.align 2
# ifdef PIC
.Lgot:
@@ -293,7 +294,6 @@
.long __have_futex_clock_realtime
# endif
-# ifndef __ASSUME_FUTEX_CLOCK_REALTIME
.Lreltmo:
/* Check for a valid timeout value. */
mov.l @(4,r6), r1
Modified: branches/eglibc-2_12/libc/posix/getopt.h
==============================================================================
--- branches/eglibc-2_12/libc/posix/getopt.h (original)
+++ branches/eglibc-2_12/libc/posix/getopt.h Thu Jun 24 08:03:28 2010
@@ -1,5 +1,5 @@
/* Declarations for getopt.
- Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009
+ Copyright (C) 1989-1994,1996-1999,2001,2003,2004,2009,2010
Free Software Foundation, Inc.
This file is part of the GNU C Library.
@@ -158,9 +158,9 @@
additional functionality can be disable at runtime. This redirection
helps to also do this at runtime. */
# ifdef __REDIRECT
- extern int __REDIRECT (getopt, (int ___argc, char *const *___argv,
- const char *__shortopts),
- __posix_getopt) __THROW;
+ extern int __REDIRECT_NTH (getopt, (int ___argc, char *const *___argv,
+ const char *__shortopts),
+ __posix_getopt);
# else
extern int __posix_getopt (int ___argc, char *const *___argv,
const char *__shortopts) __THROW;
Modified: branches/eglibc-2_12/libc/wcsmbs/wchar.h
==============================================================================
--- branches/eglibc-2_12/libc/wcsmbs/wchar.h (original)
+++ branches/eglibc-2_12/libc/wcsmbs/wchar.h Thu Jun 24 08:03:28 2010
@@ -658,10 +658,10 @@
extern int __REDIRECT (wscanf, (__const wchar_t *__restrict __format, ...),
__isoc99_wscanf)
/* __attribute__ ((__format__ (__wscanf__, 1, 2))) */;
-extern int __REDIRECT (swscanf, (__const wchar_t *__restrict __s,
- __const wchar_t *__restrict __format, ...),
- __isoc99_swscanf)
- __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
+extern int __REDIRECT_NTH (swscanf, (__const wchar_t *__restrict __s,
+ __const wchar_t *__restrict __format,
+ ...), __isoc99_swscanf)
+ /* __attribute__ ((__format__ (__wscanf__, 2, 3))) */;
# else
extern int __isoc99_fwscanf (__FILE *__restrict __stream,
__const wchar_t *__restrict __format, ...);
@@ -712,10 +712,10 @@
extern int __REDIRECT (vwscanf, (__const wchar_t *__restrict __format,
__gnuc_va_list __arg), __isoc99_vwscanf)
/* __attribute__ ((__format__ (__wscanf__, 1, 0))) */;
-extern int __REDIRECT (vswscanf, (__const wchar_t *__restrict __s,
- __const wchar_t *__restrict __format,
- __gnuc_va_list __arg), __isoc99_vswscanf)
- __THROW /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
+extern int __REDIRECT_NTH (vswscanf, (__const wchar_t *__restrict __s,
+ __const wchar_t *__restrict __format,
+ __gnuc_va_list __arg), __isoc99_vswscanf)
+ /* __attribute__ ((__format__ (__wscanf__, 2, 0))) */;
# else
extern int __isoc99_vfwscanf (__FILE *__restrict __s,
__const wchar_t *__restrict __format,