34c34,35
< HasHardQuad(false) {
---
> HasHardQuad(false),
> UsePopc(false) {
38,44c39,40
< if (CPUName.empty()) {
< if (is64Bit)
< CPUName = "v9";
< else
< CPUName = "v8";
< }
< IsV9 = CPUName == "v9";
---
> if (CPUName.empty())
> CPUName = (is64Bit) ? "v9" : "v8";
47a44,47
>
> // Popc is a v9-only instruction.
> if (!IsV9)
> UsePopc = false;