summaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/dl-machine.h3
-rw-r--r--sysdeps/i386/fpu/__math.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index ea938c3b88..3e0f9b126c 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -263,7 +263,8 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
switch (ELF32_R_TYPE (reloc->r_info))
{
case R_386_COPY:
- if (sym->st_size != refsym->st_size)
+ if (sym->st_size > refsym->st_size
+ || (_dl_verbose && sym->st_size < refsym->st_size))
{
const char *strtab;
diff --git a/sysdeps/i386/fpu/__math.h b/sysdeps/i386/fpu/__math.h
index e6f5a31581..d5945e8ca2 100644
--- a/sysdeps/i386/fpu/__math.h
+++ b/sysdeps/i386/fpu/__math.h
@@ -433,7 +433,7 @@ logb (double __x)
register double __value, __junk;
__asm __volatile__
("fxtract\n\t"
- : "=t" (__value), "=u" (__junk) : "0" (__x));
+ : "=t" (__junk), "=u" (__value) : "0" (__x));
return __value;
}