[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r21241 - in /fsf/trunk/libc: ./ libio/ manual/ math/ sysdeps/generic/ sysdeps/unix/sysv/linux/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r21241 - in /fsf/trunk/libc: ./ libio/ manual/ math/ sysdeps/generic/ sysdeps/unix/sysv/linux/
- From: eglibc@xxxxxxxxxx
- Date: Fri, 19 Oct 2012 00:01:55 -0000
Author: eglibc
Date: Fri Oct 19 00:01:54 2012
New Revision: 21241
Log:
Import glibc-mainline for 2012-10-19
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/NEWS
fsf/trunk/libc/libio/fileops.c
fsf/trunk/libc/libio/freopen64.c
fsf/trunk/libc/libio/fseeko64.c
fsf/trunk/libc/libio/ftello64.c
fsf/trunk/libc/libio/iofgetpos64.c
fsf/trunk/libc/libio/iofopen64.c
fsf/trunk/libc/libio/iofsetpos64.c
fsf/trunk/libc/libio/oldiofgetpos64.c
fsf/trunk/libc/libio/oldiofsetpos64.c
fsf/trunk/libc/manual/memory.texi
fsf/trunk/libc/math/Makefile
fsf/trunk/libc/sysdeps/generic/_G_config.h
fsf/trunk/libc/sysdeps/unix/sysv/linux/_G_config.h
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Fri Oct 19 00:01:54 2012
@@ -1,3 +1,70 @@
+2012-10-18 Markus Trippelsdorf <markus@xxxxxxxxxxxxxxx>
+
+ * math/Makefile: Comment on slow compilation of test-tgmath2.c.
+
+2012-10-18 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * sysdeps/generic/_G_config.h (_G_OPEN64): Remove.
+ (_G_LSEEK64): Likewise.
+ (_G_MMAP64): Likewise.
+ (_G_FSTAT64): Likewise.
+ * sysdeps/unix/sysv/linux/_G_config.h (_G_OPEN64): Remove.
+ (_G_LSEEK64): Likewise.
+ (_G_MMAP64): Likewise.
+ (_G_FSTAT64): Likewise.
+ * libio/fileops.c (mmap_remap_check) [_G_MMAP64]: Make code
+ unconditional. Call __mmap64 directly.
+ (mmap_remap_check) [!_G_MMAP64]: Remove conditional code.
+ (mmap_remap_check) [_G_LSEEK64]: Make code unconditional. Call
+ __lseek64 directly.
+ (mmap_remap_check) [!_G_LSEEK64]: Remove conditional code.
+ (decide_maybe_mmap) [_G_MMAP64]: Make code unconditional. Call
+ __mmap64 directly.
+ (decide_maybe_mmap) [!_G_MMAP64]: Remove conditional code.
+ (decide_maybe_mmap) [_G_LSEEK64]: Make code unconditional. Call
+ __lseek64 directly.
+ (decide_maybe_mmap) [!_G_LSEEK64]: Remove conditional code.
+ (_IO_file_sync_mmap) [_G_LSEEK64]: Make code unconditional. Call
+ __lseek64 directly.
+ (_IO_file_sync_mmap) [!_G_LSEEK64]: Remove conditional code.
+ (_IO_file_seek) [_G_LSEEK64]: Make code unconditional. Call
+ __lseek64 directly.
+ (_IO_file_seek) [!_G_LSEEK64]: Remove conditional code.
+ (_IO_file_stat) [_G_FSTAT64]: Make code unconditional. Call
+ __fxstat64 directly.
+ (_IO_file_stat) [!_G_FSTAT64]: Remove conditional code.
+ * libio/freopen64.c (freopen64) [_G_OPEN64]: Make code
+ unconditional.
+ (freopen64) [!_G_OPEN64]: Remove conditional code.
+ * libio/fseeko64.c (fseeko64) [_G_LSEEK64]: Make code
+ unconditional.
+ (fseeko64) [!_G_LSEEK64]: Remove conditional code.
+ * libio/ftello64.c (ftello64) [_G_LSEEK64]: Make code
+ unconditional.
+ (ftello64) [!_G_LSEEK64]: Remove conditional code.
+ * libio/iofgetpos64.c (_IO_new_fgetpos64) [_G_LSEEK64]: Make code
+ unconditional.
+ (_IO_new_fgetpos64) [!_G_LSEEK64]: Remove conditional code.
+ * libio/iofopen64.c (_IO_fopen64) [_G_OPEN64]: Make code
+ unconditional.
+ (_IO_fopen64) [!_G_OPEN64]: Remove conditional code.
+ * libio/iofsetpos64.c (_IO_new_fsetpos64) [_G_LSEEK64]: Make code
+ unconditional.
+ (_IO_new_fsetpos64) [!_G_LSEEK64]: Remove conditional code.
+ * libio/oldiofgetpos64.c (_IO_old_fgetpos64) [_G_LSEEK64]: Make code
+ unconditional.
+ (_IO_old_fgetpos64) [!_G_LSEEK64]: Remove conditional code.
+ * libio/oldiofsetpos64.c (_IO_old_fsetpos64) [_G_LSEEK64]: Make code
+ unconditional.
+ (_IO_old_fsetpos64) [!_G_LSEEK64]: Remove conditional code.
+
+2012-10-18 Siddhesh Poyarekar <siddhesh@xxxxxxxxxx>
+
+ [BZ #12140]
+ * manual/memory.texi (Malloc Tunable Parameters): Add note
+ about free list pointers overwriting some perturb bytes.
+ Wording suggested by Roland McGrath.
+
2012-10-17 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* math/libm-test.inc (gamma_test): Do not call feclearexcept.
Modified: fsf/trunk/libc/NEWS
==============================================================================
--- fsf/trunk/libc/NEWS (original)
+++ fsf/trunk/libc/NEWS Fri Oct 19 00:01:54 2012
@@ -10,13 +10,13 @@
* The following bugs are resolved with this release:
1349, 3479, 5044, 5298, 5400, 6530, 6778, 6808, 9685, 9914, 10014, 10038,
- 10631, 11438, 11607, 13412, 13542, 13629, 13679, 13696, 13717, 13741,
- 13939, 13966, 14042, 14090, 14150, 14151, 14154, 14157, 14166, 14173,
- 14195, 14237, 14251, 14252, 14283, 14298, 14303, 14307, 14328, 14331,
- 14336, 14337, 14347, 14349, 14376, 14417, 14459, 14476, 14477, 14505,
- 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544, 14545,
- 14557, 14562, 14568, 14576, 14579, 14583, 14587, 14602, 14621, 14638,
- 14645, 14648, 14652, 14660, 14661, 14716.
+ 10631, 11438, 11607, 12140, 13412, 13542, 13629, 13679, 13696, 13717,
+ 13741, 13939, 13966, 14042, 14090, 14150, 14151, 14154, 14157, 14166,
+ 14173, 14195, 14237, 14251, 14252, 14283, 14298, 14303, 14307, 14328,
+ 14331, 14336, 14337, 14347, 14349, 14376, 14417, 14459, 14476, 14477,
+ 14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543, 14544,
+ 14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587, 14602, 14621,
+ 14638, 14645, 14648, 14652, 14660, 14661, 14716.
* Support for STT_GNU_IFUNC symbols added for s390 and s390x.
Optimized versions of memcpy, memset, and memcmp added for System z10 and
Modified: fsf/trunk/libc/libio/fileops.c
==============================================================================
--- fsf/trunk/libc/libio/fileops.c (original)
+++ fsf/trunk/libc/libio/fileops.c Fri Oct 19 00:01:54 2012
@@ -671,13 +671,8 @@
#else
(void) __munmap (fp->_IO_buf_base,
fp->_IO_buf_end - fp->_IO_buf_base);
-# ifdef _G_MMAP64
- p = _G_MMAP64 (NULL, st.st_size, PROT_READ, MAP_SHARED,
- fp->_fileno, 0);
-# else
- p = __mmap (NULL, st.st_size, PROT_READ, MAP_SHARED,
- fp->_fileno, 0);
-# endif
+ p = __mmap64 (NULL, st.st_size, PROT_READ, MAP_SHARED,
+ fp->_fileno, 0);
if (p == MAP_FAILED)
goto punt;
#endif
@@ -704,13 +699,8 @@
if (fp->_offset < fp->_IO_buf_end - fp->_IO_buf_base)
{
- if (
-# ifdef _G_LSEEK64
- _G_LSEEK64
-# else
- __lseek
-# endif
- (fp->_fileno, fp->_IO_buf_end - fp->_IO_buf_base, SEEK_SET)
+ if (__lseek64 (fp->_fileno, fp->_IO_buf_end - fp->_IO_buf_base,
+ SEEK_SET)
!= fp->_IO_buf_end - fp->_IO_buf_base)
fp->_flags |= _IO_ERR_SEEN;
else
@@ -775,24 +765,14 @@
/* Try to map the file. */
void *p;
-# ifdef _G_MMAP64
- p = _G_MMAP64 (NULL, st.st_size, PROT_READ, MAP_SHARED, fp->_fileno, 0);
-# else
- p = __mmap (NULL, st.st_size, PROT_READ, MAP_SHARED, fp->_fileno, 0);
-# endif
+ p = __mmap64 (NULL, st.st_size, PROT_READ, MAP_SHARED, fp->_fileno, 0);
if (p != MAP_FAILED)
{
/* OK, we managed to map the file. Set the buffer up and use a
special jump table with simplified underflow functions which
never tries to read anything from the file. */
- if (
-# ifdef _G_LSEEK64
- _G_LSEEK64
-# else
- __lseek
-# endif
- (fp->_fileno, st.st_size, SEEK_SET) != st.st_size)
+ if (__lseek64 (fp->_fileno, st.st_size, SEEK_SET) != st.st_size)
{
(void) __munmap (p, st.st_size);
fp->_offset = _IO_pos_BAD;
@@ -944,13 +924,8 @@
if (_IO_in_backup (fp))
delta -= eGptr () - Gbase ();
#endif
- if (
-# ifdef _G_LSEEK64
- _G_LSEEK64
-# else
- __lseek
-# endif
- (fp->_fileno, fp->_IO_read_ptr - fp->_IO_buf_base, SEEK_SET)
+ if (__lseek64 (fp->_fileno, fp->_IO_read_ptr - fp->_IO_buf_base,
+ SEEK_SET)
!= fp->_IO_read_ptr - fp->_IO_buf_base)
{
fp->_flags |= _IO_ERR_SEEN;
@@ -1236,11 +1211,7 @@
_IO_off64_t offset;
int dir;
{
-#ifdef _G_LSEEK64
- return _G_LSEEK64 (fp->_fileno, offset, dir);
-#else
- return lseek (fp->_fileno, offset, dir);
-#endif
+ return __lseek64 (fp->_fileno, offset, dir);
}
libc_hidden_def (_IO_file_seek)
@@ -1249,11 +1220,7 @@
_IO_FILE *fp;
void *st;
{
-#ifdef _G_FSTAT64
- return _G_FSTAT64 (fp->_fileno, (struct stat64 *) st);
-#else
- return fstat (fp->_fileno, (struct stat *) st);
-#endif
+ return __fxstat64 (_STAT_VER, fp->_fileno, (struct stat64 *) st);
}
libc_hidden_def (_IO_file_stat)
Modified: fsf/trunk/libc/libio/freopen64.c
==============================================================================
--- fsf/trunk/libc/libio/freopen64.c (original)
+++ fsf/trunk/libc/libio/freopen64.c Fri Oct 19 00:01:54 2012
@@ -40,7 +40,6 @@
const char* mode;
FILE *fp;
{
-#ifdef _G_OPEN64
FILE *result;
CHECK_FILE (fp, NULL);
if (!(fp->_flags & _IO_IS_FILEBUF))
@@ -101,8 +100,4 @@
free ((char *) gfilename);
_IO_release_lock (fp);
return result;
-#else
- __set_errno (ENOSYS);
- return NULL;
-#endif
}
Modified: fsf/trunk/libc/libio/fseeko64.c
==============================================================================
--- fsf/trunk/libc/libio/fseeko64.c (original)
+++ fsf/trunk/libc/libio/fseeko64.c Fri Oct 19 00:01:54 2012
@@ -37,17 +37,12 @@
__off64_t offset;
int whence;
{
-#ifdef _G_LSEEK64
int result;
CHECK_FILE (fp, -1);
_IO_acquire_lock (fp);
result = _IO_fseek (fp, offset, whence);
_IO_release_lock (fp);
return result;
-#else
- __set_errno (ENOSYS);
- return -1;
-#endif
}
#endif
Modified: fsf/trunk/libc/libio/ftello64.c
==============================================================================
--- fsf/trunk/libc/libio/ftello64.c (original)
+++ fsf/trunk/libc/libio/ftello64.c Fri Oct 19 00:01:54 2012
@@ -35,7 +35,6 @@
ftello64 (fp)
_IO_FILE *fp;
{
-#ifdef _G_LSEEK64
_IO_off64_t pos;
CHECK_FILE (fp, -1L);
_IO_acquire_lock (fp);
@@ -55,10 +54,6 @@
return -1L;
}
return pos;
-#else
- __set_errno (ENOSYS);
- return -1;
-#endif
}
#endif
Modified: fsf/trunk/libc/libio/iofgetpos64.c
==============================================================================
--- fsf/trunk/libc/libio/iofgetpos64.c (original)
+++ fsf/trunk/libc/libio/iofgetpos64.c Fri Oct 19 00:01:54 2012
@@ -35,7 +35,6 @@
_IO_FILE *fp;
_IO_fpos64_t *posp;
{
-#ifdef _G_LSEEK64
_IO_off64_t pos;
int result = 0;
CHECK_FILE (fp, EOF);
@@ -66,10 +65,6 @@
}
_IO_release_lock (fp);
return result;
-#else
- __set_errno (ENOSYS);
- return EOF;
-#endif
}
strong_alias (_IO_new_fgetpos64, __new_fgetpos64)
Modified: fsf/trunk/libc/libio/iofopen64.c
==============================================================================
--- fsf/trunk/libc/libio/iofopen64.c (original)
+++ fsf/trunk/libc/libio/iofopen64.c Fri Oct 19 00:01:54 2012
@@ -36,12 +36,7 @@
const char *filename;
const char *mode;
{
-#ifdef _G_OPEN64
return __fopen_internal (filename, mode, 0);
-#else
- __set_errno (ENOSYS);
- return NULL;
-#endif
}
#ifdef weak_alias
Modified: fsf/trunk/libc/libio/iofsetpos64.c
==============================================================================
--- fsf/trunk/libc/libio/iofsetpos64.c (original)
+++ fsf/trunk/libc/libio/iofsetpos64.c Fri Oct 19 00:01:54 2012
@@ -35,7 +35,6 @@
_IO_FILE *fp;
const _IO_fpos64_t *posp;
{
-#ifdef _G_LSEEK64
int result;
CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp);
@@ -60,10 +59,6 @@
}
_IO_release_lock (fp);
return result;
-#else
- __set_errno (ENOSYS);
- return EOF;
-#endif
}
strong_alias (_IO_new_fsetpos64, __new_fsetpos64)
Modified: fsf/trunk/libc/libio/oldiofgetpos64.c
==============================================================================
--- fsf/trunk/libc/libio/oldiofgetpos64.c (original)
+++ fsf/trunk/libc/libio/oldiofgetpos64.c Fri Oct 19 00:01:54 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1996, 1997, 1998, 1999, 2000, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -37,7 +36,6 @@
_IO_FILE *fp;
_IO_fpos64_t *posp;
{
-#ifdef _G_LSEEK64
_IO_off64_t pos;
CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp);
@@ -57,10 +55,6 @@
}
posp->__pos = pos;
return 0;
-#else
- __set_errno (ENOSYS);
- return EOF;
-#endif
}
#ifdef weak_alias
Modified: fsf/trunk/libc/libio/oldiofsetpos64.c
==============================================================================
--- fsf/trunk/libc/libio/oldiofsetpos64.c (original)
+++ fsf/trunk/libc/libio/oldiofsetpos64.c Fri Oct 19 00:01:54 2012
@@ -1,5 +1,4 @@
-/* Copyright (C) 1993, 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004
- Free Software Foundation, Inc.
+/* Copyright (C) 1993-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
@@ -37,7 +36,6 @@
_IO_FILE *fp;
const _IO_fpos64_t *posp;
{
-#ifdef _G_LSEEK64
int result;
CHECK_FILE (fp, EOF);
_IO_acquire_lock (fp);
@@ -56,10 +54,6 @@
result = 0;
_IO_release_lock (fp);
return result;
-#else
- __set_errno (ENOSYS);
- return EOF;
-#endif
}
#ifdef weak_alias
Modified: fsf/trunk/libc/manual/memory.texi
==============================================================================
--- fsf/trunk/libc/manual/memory.texi (original)
+++ fsf/trunk/libc/manual/memory.texi Fri Oct 19 00:01:54 2012
@@ -706,7 +706,10 @@
If non-zero, memory blocks are filled with values depending on some
low order bits of this parameter when they are allocated (except when
allocated by @code{calloc}) and freed. This can be used to debug the
-use of uninitialized or freed heap memory.
+use of uninitialized or freed heap memory. Note that this option does not
+guarantee that the freed block will have any specific values. It only
+guarantees that the content the block had before it was freed will be
+overwritten.
@end table
@end deftypefun
Modified: fsf/trunk/libc/math/Makefile
==============================================================================
--- fsf/trunk/libc/math/Makefile (original)
+++ fsf/trunk/libc/math/Makefile Fri Oct 19 00:01:54 2012
@@ -126,6 +126,9 @@
CFLAGS-test-double.c = -fno-inline -ffloat-store -fno-builtin -frounding-math
CFLAGS-test-ldouble.c = -fno-inline -ffloat-store -fno-builtin -frounding-math
CFLAGS-test-tgmath.c = -fno-builtin
+# The following testcase uses very long lines (>3 million), so it may take a
+# while to compile it. See: http://llvm.org/bugs/show_bug.cgi?id=14106 and
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=54402
CFLAGS-test-tgmath2.c = -fno-builtin
CFLAGS-test-tgmath-ret.c = -fno-builtin
CFLAGS-test-powl.c = -fno-builtin
Modified: fsf/trunk/libc/sysdeps/generic/_G_config.h
==============================================================================
--- fsf/trunk/libc/sysdeps/generic/_G_config.h (original)
+++ fsf/trunk/libc/sysdeps/generic/_G_config.h Fri Oct 19 00:01:54 2012
@@ -49,11 +49,6 @@
#define _G_IO_IO_FILE_VERSION 0x20001
-#define _G_OPEN64 __open64
-#define _G_LSEEK64 __lseek64
-#define _G_MMAP64 __mmap64
-#define _G_FSTAT64(fd,buf) __fxstat64 (_STAT_VER, fd, buf)
-
/* This is defined by <bits/stat.h> if `st_blksize' exists. */
#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/_G_config.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/_G_config.h (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/_G_config.h Fri Oct 19 00:01:54 2012
@@ -50,11 +50,6 @@
#define _G_IO_IO_FILE_VERSION 0x20001
-#define _G_OPEN64 __open64
-#define _G_LSEEK64 __lseek64
-#define _G_MMAP64 __mmap64
-#define _G_FSTAT64(fd,buf) __fxstat64 (_STAT_VER, fd, buf)
-
/* This is defined by <bits/stat.h> if `st_blksize' exists. */
#define _G_HAVE_ST_BLKSIZE defined (_STATBUF_ST_BLKSIZE)
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits