import glibc-2.17-292.el7.src.rpm
Signed-off-by: zhangbinchen <zhangbinchen@openanolis.org>
This commit is contained in:
zhangbinchen
commit
ff0128648f
929 changed files with 436800 additions and 0 deletions
181
glibc-rh731833-misc-6.patch
Normal file
181
glibc-rh731833-misc-6.patch
Normal file
|
|
@ -0,0 +1,181 @@
|
|||
From a06663ebed17775761f501e5f0cdddff159959ac Mon Sep 17 00:00:00 2001
|
||||
From: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
|
||||
Date: Tue, 23 Jul 2013 07:39:57 -0500
|
||||
Subject: [PATCH 42/42] PowerPC: use _dl_static_init to set GLRO(gl_pagesize)
|
||||
|
||||
This patch fixes dlfcn/tststatic5 for PowerPC where pagesize
|
||||
variable was not properly initialized in certain cases. This patch
|
||||
is based on other architecture code.
|
||||
(cherry picked from commit 7b1f8b581f9387230788e4d8a67cdbcf464dac85)
|
||||
---
|
||||
sysdeps/unix/sysv/linux/powerpc/Makefile | 6 +++
|
||||
sysdeps/unix/sysv/linux/powerpc/Versions | 6 +++
|
||||
sysdeps/unix/sysv/linux/powerpc/dl-static.c | 84 +++++++++++++++++++++++++++++
|
||||
sysdeps/unix/sysv/linux/powerpc/ldsodefs.h | 33 ++++++++++++
|
||||
5 files changed, 137 insertions(+)
|
||||
create mode 100644 sysdeps/unix/sysv/linux/powerpc/dl-static.c
|
||||
create mode 100644 sysdeps/unix/sysv/linux/powerpc/ldsodefs.h
|
||||
|
||||
diff --git glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile
|
||||
index 4ff7e84..cf4de97 100644
|
||||
--- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile
|
||||
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Makefile
|
||||
@@ -15,6 +15,12 @@ endif
|
||||
|
||||
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)
|
||||
diff --git glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Versions glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Versions
|
||||
index 289c4fe..9b583fb 100644
|
||||
--- glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Versions
|
||||
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/Versions
|
||||
@@ -1,3 +1,9 @@
|
||||
+ld {
|
||||
+ GLIBC_PRIVATE {
|
||||
+ # used for loading by static libraries
|
||||
+ _dl_var_init;
|
||||
+ }
|
||||
+}
|
||||
libc {
|
||||
GLIBC_PRIVATE {
|
||||
__vdso_get_tbfreq;
|
||||
diff --git glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/dl-static.c glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/dl-static.c
|
||||
new file mode 100644
|
||||
index 0000000..8289c61
|
||||
--- /dev/null
|
||||
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/dl-static.c
|
||||
@@ -0,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
|
||||
diff --git glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h
|
||||
new file mode 100644
|
||||
index 0000000..fcedf32
|
||||
--- /dev/null
|
||||
+++ glibc-2.17-c758a686/sysdeps/unix/sysv/linux/powerpc/ldsodefs.h
|
||||
@@ -0,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 */
|
||||
--
|
||||
1.7.11.7
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue