[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r13608 - in /fsf/trunk/ports: ./ sysdeps/arm/ sysdeps/unix/sysv/linux/arm/eabi/
- To: commits@xxxxxxxxxx
- Subject: [commits] r13608 - in /fsf/trunk/ports: ./ sysdeps/arm/ sysdeps/unix/sysv/linux/arm/eabi/
- From: eglibc@xxxxxxxxxx
- Date: Wed, 27 Apr 2011 07:03:42 -0000
Author: eglibc
Date: Wed Apr 27 00:03:41 2011
New Revision: 13608
Log:
Import glibc-ports-mainline for 2011-04-27
Added:
fsf/trunk/ports/sysdeps/arm/dl-irel.h
Modified:
fsf/trunk/ports/ChangeLog.arm
fsf/trunk/ports/sysdeps/arm/dl-machine.h
fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
Modified: fsf/trunk/ports/ChangeLog.arm
==============================================================================
--- fsf/trunk/ports/ChangeLog.arm (original)
+++ fsf/trunk/ports/ChangeLog.arm Wed Apr 27 00:03:41 2011
@@ -1,3 +1,15 @@
+2011-04-26 Manjunath Matti <manjunath81@xxxxxxxxx>
+
+ * sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
+ (CALL_MCOUNT): Redefine to empty.
+
+2011-04-26 Richard Sandiford <richard.sandiford@xxxxxxxxxx>
+
+ * sysdeps/arm/dl-machine.h (elf_machine_rel): Handle STT_GNU_IFUNC
+ and R_ARM_IRELATIVE.
+ (elf_machine_rela): Likewise.
+ * sysdeps/arm/dl-irel.h: New file.
+
2011-04-11 Joseph Myers <joseph@xxxxxxxxxxxxxxxx>
* sysdeps/arm/dl-tls.h (TLS_DTV_UNALLOCATED): Define.
Added: fsf/trunk/ports/sysdeps/arm/dl-irel.h
==============================================================================
--- fsf/trunk/ports/sysdeps/arm/dl-irel.h (added)
+++ fsf/trunk/ports/sysdeps/arm/dl-irel.h Wed Apr 27 00:03:41 2011
@@ -1,0 +1,45 @@
+/* Machine-dependent ELF indirect relocation inline functions.
+ ARM version.
+ Copyright (C) 2009, 2010 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 _DL_IREL_H
+#define _DL_IREL_H
+
+#include <stdio.h>
+#include <unistd.h>
+
+#define ELF_MACHINE_IREL 1
+
+static inline void
+__attribute ((always_inline))
+elf_irel (const Elf32_Rel *reloc)
+{
+ Elf32_Addr *const reloc_addr = (void *) reloc->r_offset;
+ const unsigned long int r_type = ELF32_R_TYPE (reloc->r_info);
+
+ if (__builtin_expect (r_type == R_ARM_IRELATIVE, 1))
+ {
+ Elf32_Addr value = ((Elf32_Addr (*) (void)) (*reloc_addr)) ();
+ *reloc_addr = value;
+ }
+ else
+ __libc_fatal ("unexpected reloc type in static binary");
+}
+
+#endif /* dl-irel.h */
Modified: fsf/trunk/ports/sysdeps/arm/dl-machine.h
==============================================================================
--- fsf/trunk/ports/sysdeps/arm/dl-machine.h (original)
+++ fsf/trunk/ports/sysdeps/arm/dl-machine.h Wed Apr 27 00:03:41 2011
@@ -374,6 +374,12 @@
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
+ if (sym != NULL
+ && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC,
+ 0)
+ && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1))
+ value = ((Elf32_Addr (*) (void)) value) ();
+
switch (r_type)
{
case R_ARM_COPY:
@@ -487,7 +493,8 @@
*reloc_addr = value;
}
break;
-#if defined USE_TLS && !defined RTLD_BOOTSTRAP
+#if !defined RTLD_BOOTSTRAP
+#if defined USE_TLS
case R_ARM_TLS_DTPMOD32:
/* Get the information from the link map returned by the
resolv function. */
@@ -506,6 +513,12 @@
CHECK_STATIC_TLS (map, sym_map);
*reloc_addr += sym->st_value + sym_map->l_tls_offset;
}
+ break;
+#endif
+ case R_ARM_IRELATIVE:
+ value = map->l_addr + *reloc_addr;
+ value = ((Elf32_Addr (*) (void)) value) ();
+ *reloc_addr = value;
break;
#endif
default:
@@ -536,6 +549,12 @@
# endif
struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);
Elf32_Addr value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
+
+ if (sym != NULL
+ && __builtin_expect (ELFW(ST_TYPE) (sym->st_info) == STT_GNU_IFUNC,
+ 0)
+ && __builtin_expect (sym->st_shndx != SHN_UNDEF, 1))
+ value = ((Elf32_Addr (*) (void)) value) ();
switch (r_type)
{
@@ -588,7 +607,8 @@
*reloc_addr = value;
}
break;
-#if defined USE_TLS && !defined RTLD_BOOTSTRAP
+#if !defined RTLD_BOOTSTRAP
+#if defined USE_TLS
case R_ARM_TLS_DTPMOD32:
/* Get the information from the link map returned by the
resolv function. */
@@ -607,6 +627,12 @@
*reloc_addr = (sym->st_value + sym_map->l_tls_offset
+ reloc->r_addend);
}
+ break;
+#endif
+ case R_ARM_IRELATIVE:
+ value = map->l_addr + *reloc_addr;
+ value = ((Elf32_Addr (*) (void)) value) ();
+ *reloc_addr = value;
break;
#endif
default:
Modified: fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S
==============================================================================
--- fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S (original)
+++ fsf/trunk/ports/sysdeps/unix/sysv/linux/arm/eabi/libc-do-syscall.S Wed Apr 27 00:03:41 2011
@@ -29,6 +29,9 @@
.syntax unified
.hidden __libc_do_syscall
+#undef CALL_MCOUNT
+#define CALL_MCOUNT
+
ENTRY (__libc_do_syscall)
.fnstart
push {r7, lr}