diff options
| author | Andreas Schwab <schwab@redhat.com> | 2010-03-09 15:47:50 +0100 |
|---|---|---|
| committer | Andreas Schwab <schwab@redhat.com> | 2010-03-09 15:47:50 +0100 |
| commit | 35be409292e2aaab331d21d2bc42ed4c44477281 (patch) | |
| tree | df56d1f09cc5c8aca42b2be2af61f775f25a5b23 /sysdeps/x86_64/dl-machine.h | |
| parent | 7bea85290bebde69cfb5aa057afb70e019154b4d (diff) | |
| parent | 462a5227b0d3220ab68f65272bd5b9d6d4f49b1f (diff) | |
Merge remote branch 'origin/master' into fedora/master
Diffstat (limited to 'sysdeps/x86_64/dl-machine.h')
| -rw-r--r-- | sysdeps/x86_64/dl-machine.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/x86_64/dl-machine.h b/sysdeps/x86_64/dl-machine.h index 61a0556d5e..f615e9591f 100644 --- a/sysdeps/x86_64/dl-machine.h +++ b/sysdeps/x86_64/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. x86-64 version. - Copyright (C) 2001-2005, 2006, 2008, 2009 Free Software Foundation, Inc. + Copyright (C) 2001-2006, 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Andreas Jaeger <aj@suse.de>. @@ -419,7 +419,7 @@ elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, case R_X86_64_PC32: value += reloc->r_addend - (Elf64_Addr) reloc_addr; *(unsigned int *) reloc_addr = value; - if (__builtin_expect (value != (unsigned int) value, 0)) + if (__builtin_expect (value != (int) value, 0)) { fmt = "\ %s: Symbol `%s' causes overflow in R_X86_64_PC32 relocation\n"; |