From 9290e553761b1cab417d5413cf12940b03849f12 Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Tue, 27 Jan 2009 15:32:55 +0000 Subject: [PATCH] PR glibc/1048 * sysdeps/unix/sysv/linux/mips/dl-static.c: New file to support variable page size for MIPS. * sysdeps/unix/sysv/linux/mips/ldsodefs.h: Likewise. * sysdeps/unix/sysv/linux/mips/Makefile: Build dl-static in elf. * sysdeps/unix/sysv/linux/mips/Versions: Add _dl_var_init. --- ChangeLog.mips | 10 +++ sysdeps/unix/sysv/linux/mips/Makefile | 9 +++ sysdeps/unix/sysv/linux/mips/Versions | 6 ++ sysdeps/unix/sysv/linux/mips/dl-static.c | 92 ++++++++++++++++++++++++ sysdeps/unix/sysv/linux/mips/ldsodefs.h | 33 +++++++++ 5 files changed, 150 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/mips/dl-static.c create mode 100644 sysdeps/unix/sysv/linux/mips/ldsodefs.h diff --git a/ChangeLog.mips b/ChangeLog.mips index 8d8d38ebe0..d48e4df81c 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,3 +1,13 @@ +2009-01-27 Maciej W. Rozycki + Atsushi Nemoto + + PR glibc/1048 + * sysdeps/unix/sysv/linux/mips/dl-static.c: New file to support + variable page size for MIPS. + * sysdeps/unix/sysv/linux/mips/ldsodefs.h: Likewise. + * sysdeps/unix/sysv/linux/mips/Makefile: Build dl-static in elf. + * sysdeps/unix/sysv/linux/mips/Versions: Add _dl_var_init. + 2009-01-12 Joseph Myers * sysdeps/unix/sysv/linux/mips/bits/resource.h (enum diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index 72fa87b3ff..110fccb6ed 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -126,3 +126,12 @@ else mv -f $(@:.h=.d)-t $(@:.h=.d) endif endif + +ifeq ($(subdir),elf) +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 diff --git a/sysdeps/unix/sysv/linux/mips/Versions b/sysdeps/unix/sysv/linux/mips/Versions index 50bfac5599..09df42df29 100644 --- a/sysdeps/unix/sysv/linux/mips/Versions +++ b/sysdeps/unix/sysv/linux/mips/Versions @@ -1,3 +1,9 @@ +ld { + GLIBC_PRIVATE { + # used for loading by static libraries + _dl_var_init; + } +} libc { # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk. # When you get an error from errlist-compat.awk, you need to add a new diff --git a/sysdeps/unix/sysv/linux/mips/dl-static.c b/sysdeps/unix/sysv/linux/mips/dl-static.c new file mode 100644 index 0000000000..3a99e7ed85 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/dl-static.c @@ -0,0 +1,92 @@ +/* Variable initialization. MIPS version. + Copyright (C) 2001, 2002, 2003, 2005 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include + +#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 +#include + +__libc_lock_define_initialized_recursive (static, _dl_static_lock) + +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; + + __libc_lock_lock_recursive (_dl_static_lock); + + 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); + } + + __libc_lock_unlock_recursive (_dl_static_lock); +} + +#endif diff --git a/sysdeps/unix/sysv/linux/mips/ldsodefs.h b/sysdeps/unix/sysv/linux/mips/ldsodefs.h new file mode 100644 index 0000000000..8d5efec8fb --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/ldsodefs.h @@ -0,0 +1,33 @@ +/* Run-time dynamic linker data structures for loaded ELF shared objects. MIPS. + Copyright (C) 2001, 2003 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#ifndef _LDSODEFS_H + +/* Get the real definitions. */ +#include_next + +/* 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 */