diff options
Diffstat (limited to 'sysdeps/arm')
| -rw-r--r-- | sysdeps/arm/bits/endian.h | 3 | ||||
| -rw-r--r-- | sysdeps/arm/dl-machine.h | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/sysdeps/arm/bits/endian.h b/sysdeps/arm/bits/endian.h index ad3b5393bc..7fe486e89d 100644 --- a/sysdeps/arm/bits/endian.h +++ b/sysdeps/arm/bits/endian.h @@ -1,7 +1,8 @@ -/* ARM is little-endian. */ +/* ARM is (usually) little-endian but with a big-endian FPU. */ #ifndef _ENDIAN_H # error "Never use <bits/endian.h> directly; include <endian.h> instead." #endif #define __BYTE_ORDER __LITTLE_ENDIAN +#define __FLOAT_WORD_ORDER __BIG_ENDIAN diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index 66ab4c6de2..53aa806ec2 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -416,7 +416,13 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc, break; case R_ARM_GLOB_DAT: case R_ARM_JUMP_SLOT: - *reloc_addr = value; +#ifdef RTLD_BOOTSTRAP + /* Fix weak undefined references. */ + if (sym != NULL && sym->st_value == 0) + *reloc_addr = 0; + else +#endif + *reloc_addr = value; break; case R_ARM_ABS32: { |