[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r23582 - in /fsf/trunk/libc: ./ nptl/ sysdeps/unix/sysv/linux/powerpc/
- To: commits@xxxxxxxxxx
- Subject: [Commits] r23582 - in /fsf/trunk/libc: ./ nptl/ sysdeps/unix/sysv/linux/powerpc/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 24 Jul 2013 00:02:22 -0000
Author: eglibc
Date: Wed Jul 24 00:02:20 2013
New Revision: 23582
Log:
Import glibc-mainline for 2013-07-24
Added:
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-static.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/nptl/ChangeLog
fsf/trunk/libc/nptl/tst-cancel4.c
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile
fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Versions
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Wed Jul 24 00:02:20 2013
@@ -1,3 +1,11 @@
+2013-07-23 Adhemerval Zanella <azanella@xxxxxxxxxxxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/powerpc/dl-static.c: New file to support
+ variable page size.
+ * sysdeps/unix/sysv/linux/powerpc/ldsodefs.h: Likewise.
+ * sysdeps/unix/sysv/linux/powerpc/Makefile: Build dl-static in elf.
+ * sysdeps/unix/sysv/linux/powerpc/Versions: Add _dl_var_init.
+
2013-07-22 Andreas Krebbel <Andreas.Krebbel@xxxxxxxxxx>
* sysdeps/s390/fpu/libm-test-ulps: Refresh.
Modified: fsf/trunk/libc/nptl/ChangeLog
==============================================================================
--- fsf/trunk/libc/nptl/ChangeLog (original)
+++ fsf/trunk/libc/nptl/ChangeLog Wed Jul 24 00:02:20 2013
@@ -1,3 +1,11 @@
+2013-07-23 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * tst-cancel4.c (WRITE_BUFFER_SIZE): Adjust comment.
+
+2013-07-22 David S. Miller <davem@xxxxxxxxxxxxx>
+
+ * tst-cancel4.c (WRITE_BUFFER_SIZE): Increase to 16384.
+
2013-07-19 Dominik Vogt <vogt@xxxxxxxxxx>
* pthread_mutex_lock.c: Fix whitespace.
Modified: fsf/trunk/libc/nptl/tst-cancel4.c
==============================================================================
--- fsf/trunk/libc/nptl/tst-cancel4.c (original)
+++ fsf/trunk/libc/nptl/tst-cancel4.c Wed Jul 24 00:02:20 2013
@@ -83,7 +83,30 @@
# define IPC_ADDVAL 0
#endif
-#define WRITE_BUFFER_SIZE 4096
+/* The WRITE_BUFFER_SIZE value needs to be choosen such that if we set
+ the socket send buffer size to '1', a write of this size on that
+ socket will block.
+
+ The Linux kernel imposes a minimum send socket buffer size which
+ has changed over the years. As of Linux 3.10 the value is:
+
+ 2 * (2048 + SKB_DATA_ALIGN(sizeof(struct sk_buff)))
+
+ which is attempting to make sure that with standard MTUs,
+ TCP can always queue up at least 2 full sized packets.
+
+ Furthermore, there is logic in the socket send paths that
+ will allow one more packet (of any size) to be queued up as
+ long as some socket buffer space remains. Blocking only
+ occurs when we try to queue up a new packet and the send
+ buffer space has already been fully consumed.
+
+ Therefore we must set this value to the largest possible value of
+ the formula above (and since it depends upon the size of "struct
+ sk_buff", it is dependent upon machine word size etc.) plus some
+ slack space. */
+
+#define WRITE_BUFFER_SIZE 16384
/* Cleanup handling test. */
static int cl_called;
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Makefile Wed Jul 24 00:02:20 2013
@@ -15,6 +15,12 @@
ifeq ($(subdir),elf)
sysdep_routines += dl-vdso
+ifeq ($(build-shared),yes)
+# This is needed for DSO loading from static binaries.
+sysdep-dl-routines += dl-static
+sysdep_routines += dl-static
+sysdep-rtld-routines += dl-static
+endif
endif
ifeq ($(subdir),misc)
Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Versions
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Versions (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/Versions Wed Jul 24 00:02:20 2013
@@ -1,3 +1,9 @@
+ld {
+ GLIBC_PRIVATE {
+ # used for loading by static libraries
+ _dl_var_init;
+ }
+}
libc {
GLIBC_PRIVATE {
__vdso_get_tbfreq;
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-static.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-static.c (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/dl-static.c Wed Jul 24 00:02:20 2013
@@ -1,0 +1,84 @@
+/* Variable initialization. PowerPC version.
+ Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <ldsodefs.h>
+
+#ifdef SHARED
+
+void
+_dl_var_init (void *array[])
+{
+ /* It has to match "variables" below. */
+ enum
+ {
+ DL_PAGESIZE = 0
+ };
+
+ GLRO(dl_pagesize) = *((size_t *) array[DL_PAGESIZE]);
+}
+
+#else
+
+static void *variables[] =
+{
+ &GLRO(dl_pagesize)
+};
+
+static void
+_dl_unprotect_relro (struct link_map *l)
+{
+ ElfW(Addr) start = ((l->l_addr + l->l_relro_addr)
+ & ~(GLRO(dl_pagesize) - 1));
+ ElfW(Addr) end = ((l->l_addr + l->l_relro_addr + l->l_relro_size)
+ & ~(GLRO(dl_pagesize) - 1));
+
+ if (start != end)
+ __mprotect ((void *) start, end - start, PROT_READ | PROT_WRITE);
+}
+
+void
+_dl_static_init (struct link_map *l)
+{
+ struct link_map *rtld_map = l;
+ struct r_scope_elem **scope;
+ const ElfW(Sym) *ref = NULL;
+ lookup_t loadbase;
+ void (*f) (void *[]);
+ size_t i;
+
+ loadbase = _dl_lookup_symbol_x ("_dl_var_init", l, &ref, l->l_local_scope,
+ NULL, 0, 1, NULL);
+
+ for (scope = l->l_local_scope; *scope != NULL; scope++)
+ for (i = 0; i < (*scope)->r_nlist; i++)
+ if ((*scope)->r_list[i] == loadbase)
+ {
+ rtld_map = (*scope)->r_list[i];
+ break;
+ }
+
+ if (ref != NULL)
+ {
+ f = (void (*) (void *[])) DL_SYMBOL_ADDRESS (loadbase, ref);
+ _dl_unprotect_relro (rtld_map);
+ f (variables);
+ _dl_protect_relro (rtld_map);
+ }
+}
+
+#endif
Added: fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h (added)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h Wed Jul 24 00:02:20 2013
@@ -1,0 +1,33 @@
+/* Run-time dynamic linker data structures for loaded ELF shared objects.
+ PowerPC version.
+ Copyright (C) 2013 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
+ 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, see
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef _LDSODEFS_H
+
+/* Get the real definitions. */
+#include_next <ldsodefs.h>
+
+/* Now define our stuff. */
+
+/* We need special support to initialize DSO loaded for statically linked
+ binaries. */
+extern void _dl_static_init (struct link_map *map);
+#undef DL_STATIC_INIT
+#define DL_STATIC_INIT(map) _dl_static_init (map)
+
+#endif /* ldsodefs.h */
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits