← Back to branch summary

~ubuntu-branches/ubuntu/precise/eglibc/precise-201308281639

« back to all changes in this revision

Viewing changes to elf/dl-conflict.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2012-02-08 01:58:09 UTC
  • mfrom: (1.5.3) (288.1.12 precise)
  • Revision ID: package-import@ubuntu.com-20120208015809-ulscst7uteq3e22z
Tags: 2.15~pre6-0ubuntu10
Merge from Debian (r5151, 2.13-26).

Show diffs side-by-side

added added

removed removed

Lines of Context:
elf/dl-conflict.c
1
1
/* Resolve conflicts against already prelinked libraries.
2
 
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
 
2
   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2008, 2011 Free Software Foundation, Inc.
3
3
   This file is part of the GNU C Library.
4
4
   Contributed by Jakub Jelinek <jakub@redhat.com>, 2001.
5
5
 
69
69
    GL(dl_num_cache_relocations) += conflictend - conflict;
70
70
 
71
71
    for (; conflict < conflictend; ++conflict)
72
 
      elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset);
 
72
      elf_machine_rela (l, conflict, NULL, NULL, (void *) conflict->r_offset,
 
73
                        0);
73
74
  }
74
75
#endif
75
76
}