Similar to what was required for x86 in #12719 / PR#12752 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>