legacy armv6 rework

Change-Id: Ib433fe0d18188e9db8158eb4dd486ee71f5c3ad0