[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r21767 - in /trunk/libc: ChangeLog.eglibc elf/dl-reloc.c include/features.h io/sys/stat.h ports/sysdeps/mips/dl-machine.h
- To: commits@xxxxxxxxxx
- Subject: [Commits] r21767 - in /trunk/libc: ChangeLog.eglibc elf/dl-reloc.c include/features.h io/sys/stat.h ports/sysdeps/mips/dl-machine.h
- From: joseph@xxxxxxxxxx
- Date: Sat, 17 Nov 2012 17:30:43 -0000
Author: joseph
Date: Sat Nov 17 17:30:42 2012
New Revision: 21767
Log:
* elf/dl-reloc.c, include/features.h, io/sys/stat.h,
ports/sysdeps/mips/dl-machine.h: Revert unnecessary differences
from glibc.
Modified:
trunk/libc/ChangeLog.eglibc
trunk/libc/elf/dl-reloc.c
trunk/libc/include/features.h
trunk/libc/io/sys/stat.h
trunk/libc/ports/sysdeps/mips/dl-machine.h
Modified: trunk/libc/ChangeLog.eglibc
==============================================================================
--- trunk/libc/ChangeLog.eglibc (original)
+++ trunk/libc/ChangeLog.eglibc Sat Nov 17 17:30:42 2012
@@ -1,3 +1,9 @@
+2012-11-17 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
+
+ * 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@xxxxxxxxxx>
* debug/tst-backtrace5.c (handle_signal): Adjust for VDSO.
Modified: trunk/libc/elf/dl-reloc.c
==============================================================================
--- trunk/libc/elf/dl-reloc.c (original)
+++ trunk/libc/elf/dl-reloc.c Sat Nov 17 17:30:42 2012
@@ -271,17 +271,6 @@
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 @@
%s: out of memory to store relocation results for %s\n");
goto fatal;
}
-#endif
}
#endif
}
Modified: trunk/libc/include/features.h
==============================================================================
--- trunk/libc/include/features.h (original)
+++ trunk/libc/include/features.h Sat Nov 17 17:30:42 2012
@@ -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.
Modified: trunk/libc/io/sys/stat.h
==============================================================================
--- trunk/libc/io/sys/stat.h (original)
+++ trunk/libc/io/sys/stat.h Sat Nov 17 17:30:42 2012
@@ -447,7 +447,7 @@
__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
Modified: trunk/libc/ports/sysdeps/mips/dl-machine.h
==============================================================================
--- trunk/libc/ports/sysdeps/mips/dl-machine.h (original)
+++ trunk/libc/ports/sysdeps/mips/dl-machine.h Sat Nov 17 17:30:42 2012
@@ -572,8 +572,7 @@
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 @@
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
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits