cherry-pick for 2.31 branch: x86: Replace evex-no-scale.s with evex-no-scale-[32|64].s

[Roland McGrath via binutils]

I'd like to cherry-pick commit
19449d7c67690c641b1ec9c13ff3531677a5afcc from trunk to the 2.31
branch.
It fixes a test suite regression for --target=x86_64-elf.

OK?


Thanks,
Roland