[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r12952 - in /fsf/glibc-2_13-branch/libc: ./ elf/ sysdeps/powerpc/powerpc64/power7/ sysdeps/unix/sysv/linux/powerpc/powerpc64...
- To: commits@xxxxxxxxxx
- Subject: [commits] r12952 - in /fsf/glibc-2_13-branch/libc: ./ elf/ sysdeps/powerpc/powerpc64/power7/ sysdeps/unix/sysv/linux/powerpc/powerpc64...
- From: eglibc@xxxxxxxxxx
- Date: Thu, 24 Feb 2011 08:06:12 -0000
Author: eglibc
Date: Thu Feb 24 00:06:10 2011
New Revision: 12952
Log:
Import glibc-2.13 for 2011-02-24
Added:
fsf/glibc-2_13-branch/libc/sysdeps/powerpc/powerpc64/power7/Makefile (with props)
fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/Makefile (with props)
fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/tst-writev.c
Modified:
fsf/glibc-2_13-branch/libc/ChangeLog
fsf/glibc-2_13-branch/libc/NEWS
fsf/glibc-2_13-branch/libc/elf/rtld.c
fsf/glibc-2_13-branch/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
Modified: fsf/glibc-2_13-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_13-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_13-branch/libc/ChangeLog Thu Feb 24 00:06:10 2011
@@ -1,3 +1,27 @@
+2010-09-28 Andreas Schwab <schwab@xxxxxxxxxx>
+ Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #12489]
+ * elf/rtld.c (dl_main): Move setting of GLRO(dl_init_all_dirs)
+ before performing relro protection. At old place add assertion
+ to make sure nothing changed.
+
+2011-02-16 Ryan S. Arnold <rsa@xxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h:
+ (INTERNAL_VSYSCALL_NCS INTERNAL_SYSCALL_NCS): Remove erroneous (int)
+ cast from r3.
+ * sysdeps/wordsize-64/Makefile: New file. Add tst-writev to
+ 'tests' variable.
+ * sysdeps/wordsize-64/tst-writev.c: New file.
+
+2011-02-15 Ryan S. Arnold <rsa@xxxxxxxxxx>
+
+ * sysdeps/powerpc/powerpc64/power7/Makefile: New file which adds
+ -mno-vsx to the CFLAGS-rtld.c variable to avoid using VSX registers and
+ insns in _dl_start to prevent a TOC reference before relocs are
+ resolved.
+
2011-02-02 Ulrich Drepper <drepper@xxxxxxxxx>
* elf/dl-runtime.c (_dl_call_pltexit): Pass correct address of the
Modified: fsf/glibc-2_13-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_13-branch/libc/NEWS (original)
+++ fsf/glibc-2_13-branch/libc/NEWS Thu Feb 24 00:06:10 2011
@@ -13,7 +13,7 @@
11655, 11701, 11840, 11856, 11883, 11903, 11904, 11968, 11979, 12005,
12037, 12067, 12077, 12078, 12092, 12093, 12107, 12108, 12113, 12140,
12159, 12167, 12191, 12194, 12201, 12204, 12205, 12207, 12348, 12378,
- 12394, 12397
+ 12394, 12397, 12489
* New Linux interfaces: prlimit, prlimit64, fanotify_init, fanotify_mark
Modified: fsf/glibc-2_13-branch/libc/elf/rtld.c
==============================================================================
--- fsf/glibc-2_13-branch/libc/elf/rtld.c (original)
+++ fsf/glibc-2_13-branch/libc/elf/rtld.c Thu Feb 24 00:06:10 2011
@@ -1,5 +1,5 @@
/* Run time dynamic linker.
- Copyright (C) 1995-2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+ Copyright (C) 1995-2010, 2011 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
@@ -2179,6 +2179,10 @@
we need it in the memory handling later. */
GLRO(dl_initial_searchlist) = *GL(dl_ns)[LM_ID_BASE]._ns_main_searchlist;
+ /* Remember the last search directory added at startup, now that
+ malloc will no longer be the one from dl-minimal.c. */
+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+
if (prelinked)
{
if (main_map->l_info [ADDRIDX (DT_GNU_CONFLICT)] != NULL)
@@ -2298,9 +2302,8 @@
lossage);
}
- /* Remember the last search directory added at startup, now that
- malloc will no longer be the one from dl-minimal.c. */
- GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+ /* Make sure no new search directories have been added. */
+ assert (GLRO(dl_init_all_dirs) == GL(dl_all_dirs));
if (! prelinked && rtld_multiple_ref)
{
Added: fsf/glibc-2_13-branch/libc/sysdeps/powerpc/powerpc64/power7/Makefile
==============================================================================
Binary file - no diff available.
Propchange: fsf/glibc-2_13-branch/libc/sysdeps/powerpc/powerpc64/power7/Makefile
------------------------------------------------------------------------------
svn:mime-type = audio/x-669-mod
Modified: fsf/glibc-2_13-branch/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h
==============================================================================
--- fsf/glibc-2_13-branch/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h (original)
+++ fsf/glibc-2_13-branch/libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/sysdep.h Thu Feb 24 00:06:10 2011
@@ -172,7 +172,7 @@
: "r9", "r10", "r11", "r12", \
"cr0", "ctr", "lr", "memory"); \
err = (long int) r0; \
- (int) r3; \
+ r3; \
})
#undef INLINE_SYSCALL
@@ -219,7 +219,7 @@
: "r9", "r10", "r11", "r12", \
"cr0", "ctr", "memory"); \
err = r0; \
- (int) r3; \
+ r3; \
})
#define INTERNAL_SYSCALL(name, err, nr, args...) \
INTERNAL_SYSCALL_NCS (__NR_##name, err, nr, args)
Added: fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/Makefile
==============================================================================
Binary file - no diff available.
Propchange: fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/Makefile
------------------------------------------------------------------------------
svn:mime-type = audio/x-669-mod
Added: fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/tst-writev.c
==============================================================================
--- fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/tst-writev.c (added)
+++ fsf/glibc-2_13-branch/libc/sysdeps/wordsize-64/tst-writev.c Thu Feb 24 00:06:10 2011
@@ -1,0 +1,107 @@
+/* Copyright (C) 2011 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+ Contributed by Ryan S. Arnold <rsa@xxxxxxxxxx>, 2011.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#include <fcntl.h>
+#include <paths.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <sys/uio.h>
+
+
+/* The purpose of this test is to verify that the INTERNAL_[V]SYSCALL_NCS
+ macros on 64-bit platforms don't cast the return type to (int) which would
+ erroneously sign extend the return value should the high bit of the bottom
+ half of the word be '1'. */
+
+#if 0
+/* Used to test the non power-of-2 code path. */
+#undef IOV_MAX
+#define IOV_MAX 1000
+#endif
+
+/* writev() should report that it has written EXPECTED number of bytes. */
+#define EXPECTED ((size_t) INT32_MAX + 1)
+
+static int
+do_test (void)
+{
+ struct iovec iv[IOV_MAX];
+ /* POSIX doesn't guarantee that IOV_MAX is pow of 2 but we're optimistic. */
+ size_t bufsz = EXPECTED / IOV_MAX;
+ size_t bufrem = EXPECTED % IOV_MAX;
+
+ /* If there's a remainder then IOV_MAX probably isn't a power of 2 and we
+ need to make bufsz bigger so that the last iovec, iv[IOV_MAX-1], is free
+ for the remainder. */
+ if (bufrem)
+ {
+ bufsz = bufsz + 1;
+ bufrem = EXPECTED - (bufsz * (IOV_MAX - 1));
+ }
+
+ /* We writev to /dev/null since we're just testing writev's return value. */
+ int fd = open (_PATH_DEVNULL, O_WRONLY);
+ if (fd == -1)
+ {
+ printf ("Unable to open /dev/null for writing.\n");
+ return -1;
+ }
+
+ iv[0].iov_base = malloc (bufsz);
+ if (iv[0].iov_base == NULL)
+ {
+ printf ("malloc (%zu) failed.\n", bufsz);
+ close (fd);
+ return -1;
+ }
+ iv[0].iov_len = bufsz;
+
+ /* We optimistically presume that there isn't a remainder and set all iovec
+ instances to the same base and len as the first instance. */
+ for (int i = 1; i < IOV_MAX; i++)
+ {
+ /* We don't care what the data is so reuse the allocation from iv[0]; */
+ iv[i].iov_base = iv[0].iov_base;
+ iv[i].iov_len = iv[0].iov_len;
+ }
+
+ /* If there is a remainder then we correct the last iov_len. */
+ if (bufrem)
+ iv[IOV_MAX - 1].iov_len = bufrem;
+
+ /* Write junk to /dev/null with the writev syscall in order to get a return
+ of INT32_MAX+1 bytes to verify that the INTERNAL_SYSCALL wrappers aren't
+ mangling the result if the signbit of a 32-bit number is set. */
+ ssize_t ret = writev (fd, iv, IOV_MAX);
+
+ free (iv[0].iov_base);
+ close (fd);
+
+ if (ret != (ssize_t) EXPECTED)
+ {
+ printf ("writev() return value: %zd != EXPECTED: %zd\n", ret, EXPECTED);
+ return 1;
+ }
+
+ return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"