litmus: two change for ARMV8 compatibility. Hopfully compatible with ARMv7