Hello. Sure. I guess we want to keep the asmdefs.h pristine compared to https://github.com/ARM-software/optimized-routines/blob/master/string/aarch64/asmdefs.h so I can add another header, let's say aarch64/ilp32defs.h, that would define the necessary macros and revert their removal from .S files. Would that be acceptable solution? Radek