> +#define ELFW(type) _ElfW (ELF, __ELF_NATIVE_CLASS, type) This warrants a comment along the lines of the one for ElfW. The substance of the change looks fine to me. Thanks, Roland