Roland McGrath <roland@redhat.com> writes:

>> -static inline void
>> +inline void
>> +__attribute ((always_inline))
>>  elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
>>  		  const Elf64_Sym *sym, const struct r_found_version *version,
>>  		  void *const reloc_addr_arg)
>
> Does this really do the right thing in all of 3.[345]?
> I would think this would generate an external entry point too.

It seems so :-(

$ nm dl-conflict.os
                 U _dl_argv_internal
                 U _dl_dprintf
                 U _dl_reloc_bad_type
00000000000000a0 T _dl_resolve_conflicts
0000000000000000 t elf_machine_rela.0
                 U _GLOBAL_OFFSET_TABLE_
0000000000000017 r .LC0
0000000000000000 r .LC1
0000000000000000 r .LC2
                 U _rtld_local
                 U _rtld_local_ro

So, should I add #ifndef RESOLVE here also?

Andreas
-- 
 Andreas Jaeger, aj@suse.de, http://www.suse.de/~aj
  SUSE Linux AG, Maxfeldstr. 5, 90409 Nürnberg, Germany
   GPG fingerprint = 93A3 365E CE47 B889 DF7F  FED1 389A 563C C272 A126