* elflink.h (elf_merge_symbol): In the case of a new defined

	* elflink.h (elf_merge_symbol): In the case of a new defined
	symbol overriding an old defined symbol, return the hash table
	entry which we modify, even if it is the target of an
	indirection.
	(elf_link_add_object_symbols): If the real name of the symbol gets
	overridden, convert the versioned symbol into an indirect symbol
	to the real symbol.