← Back to branch summary

~vcs-imports/eglibc/trunk

« back to all changes in this revision

Viewing changes to libc/sysdeps/i386/dl-machine.h

  • Committer: joseph
  • Date: 2013-06-04 15:48:26 UTC
  • Revision ID: svn-v4:7b3dc134-2b1b-0410-93df-9e9f96275f8d:trunk:23218
Merge changes between r23097 and r23217 from /fsf/trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libc/sysdeps/i386/dl-machine.h
464
464
              strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]);
465
465
              _dl_error_printf ("\
466
466
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
467
 
                                rtld_progname ?: "<program name unknown>",
468
 
                                strtab + refsym->st_name);
 
467
                                RTLD_PROGNAME, strtab + refsym->st_name);
469
468
            }
470
469
          memcpy (reloc_addr_arg, (void *) value,
471
470
                  MIN (sym->st_size, refsym->st_size));
610
609
              strtab = (const char *) D_PTR (map, l_info[DT_STRTAB]);
611
610
              _dl_error_printf ("\
612
611
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
613
 
                                rtld_progname ?: "<program name unknown>",
614
 
                                strtab + refsym->st_name);
 
612
                                RTLD_PROGNAME, strtab + refsym->st_name);
615
613
            }
616
614
          memcpy (reloc_addr_arg, (void *) value,
617
615
                  MIN (sym->st_size, refsym->st_size));