Use the most recent change from arm to fix build on riscv64.

While here, generalize the arm expression the way we usually do.

Approved by: portmgr (tier-2 blanket)