diff options
author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-11-17 17:30:42 +0000 |
---|---|---|
committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2012-11-17 17:30:42 +0000 |
commit | 976bc9d4ac64f30edc1e8fa8ec7552703f04a6de (patch) | |
tree | 6882908693b03257f3d27f65e161aebc6bde80a2 | |
parent | c1cadd7a47cbc4a77530e6012e44697b75db098d (diff) |
* elf/dl-reloc.c, include/features.h, io/sys/stat.h,
ports/sysdeps/mips/dl-machine.h: Revert unnecessary differences
from glibc.
git-svn-id: svn://svn.eglibc.org/trunk@21767 7b3dc134-2b1b-0410-93df-9e9f96275f8d
-rw-r--r-- | libc/ChangeLog.eglibc | 6 | ||||
-rw-r--r-- | libc/elf/dl-reloc.c | 12 | ||||
-rw-r--r-- | libc/include/features.h | 8 | ||||
-rw-r--r-- | libc/io/sys/stat.h | 2 | ||||
-rw-r--r-- | libc/ports/sysdeps/mips/dl-machine.h | 7 |
5 files changed, 10 insertions, 25 deletions
diff --git a/libc/ChangeLog.eglibc b/libc/ChangeLog.eglibc index e1b722cec..26c57f01f 100644 --- a/libc/ChangeLog.eglibc +++ b/libc/ChangeLog.eglibc @@ -1,3 +1,9 @@ +2012-11-17 Joseph Myers <joseph@codesourcery.com> + + * elf/dl-reloc.c, include/features.h, io/sys/stat.h, + ports/sysdeps/mips/dl-machine.h: Revert unnecessary differences + from glibc. + 2012-02-20 Paul Pluzhnikov <ppluzhnikov@google.com> * debug/tst-backtrace5.c (handle_signal): Adjust for VDSO. diff --git a/libc/elf/dl-reloc.c b/libc/elf/dl-reloc.c index e6f77262b..f26d99296 100644 --- a/libc/elf/dl-reloc.c +++ b/libc/elf/dl-reloc.c @@ -271,17 +271,6 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], relocations. If the shared object lacks a PLT (for example if it only contains lead function) the l_info[DT_PLTRELSZ] will be NULL. */ -#ifdef ELF_MACHINE_NO_PLT - l->l_reloc_result = calloc (sizeof (l->l_reloc_result[0]), 1); - if (l->l_reloc_result == NULL) - { - errstring = N_("\ -%s: out of memory to store relocation results for %s\n"); - _dl_fatal_printf (errstring, - rtld_progname ?: "<program name unknown>", - l->l_name); - } -#else if (l->l_info[DT_PLTRELSZ] == NULL) { errstring = N_("%s: no PLTREL found in object %s\n"); @@ -299,7 +288,6 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[], %s: out of memory to store relocation results for %s\n"); goto fatal; } -#endif } #endif } diff --git a/libc/include/features.h b/libc/include/features.h index 10d29811a..c69fc2da2 100644 --- a/libc/include/features.h +++ b/libc/include/features.h @@ -391,14 +391,6 @@ # define __USE_EXTERN_INLINES 1 #endif -/* There are some functions that must be declared 'extern inline' even with - -Os when building LIBC, or they'll end up undefined. */ -#if __GNUC_PREREQ (2, 7) && defined __OPTIMIZE__ \ - && (defined _LIBC || !defined __OPTIMIZE_SIZE__) && !defined __NO_INLINE__ \ - && defined __extern_inline -# define __USE_EXTERN_INLINES_IN_LIBC 1 -#endif - /* This is here only because every header file already includes this one. Get the definitions of all the appropriate `__stub_FUNCTION' symbols. diff --git a/libc/io/sys/stat.h b/libc/io/sys/stat.h index 12ca9d000..1b1fd7169 100644 --- a/libc/io/sys/stat.h +++ b/libc/io/sys/stat.h @@ -447,7 +447,7 @@ extern int __xmknodat (int __ver, int __fd, const char *__path, __mode_t __mode, __dev_t *__dev) __THROW __nonnull ((3, 5)); -#if defined __GNUC__ && __GNUC__ >= 2 && defined __USE_EXTERN_INLINES_IN_LIBC +#if defined __GNUC__ && __GNUC__ >= 2 && defined __USE_EXTERN_INLINES /* Inlined versions of the real stat and mknod functions. */ __extern_inline int diff --git a/libc/ports/sysdeps/mips/dl-machine.h b/libc/ports/sysdeps/mips/dl-machine.h index d2218fc8f..cc7da7625 100644 --- a/libc/ports/sysdeps/mips/dl-machine.h +++ b/libc/ports/sysdeps/mips/dl-machine.h @@ -572,8 +572,7 @@ elf_machine_rel (struct link_map *map, const ElfW(Rel) *reloc, const ElfW(Sym) *sym, const struct r_found_version *version, void *const reloc_addr, int skip_ifunc) { - elf_machine_reloc (map, (ElfW(Addr)) reloc->r_info, - sym, version, reloc_addr, 0, 1); + elf_machine_reloc (map, reloc->r_info, sym, version, reloc_addr, 0, 1); } auto inline void @@ -613,8 +612,8 @@ elf_machine_rela (struct link_map *map, const ElfW(Rela) *reloc, const ElfW(Sym) *sym, const struct r_found_version *version, void *const reloc_addr, int skip_ifunc) { - elf_machine_reloc (map, (ElfW(Addr)) reloc->r_info, sym, version, - reloc_addr, reloc->r_addend, 0); + elf_machine_reloc (map, reloc->r_info, sym, version, reloc_addr, + reloc->r_addend, 0); } auto inline void |