Fix the i686 build with hardening

This is a follow-up of issues #3 and #4 that solve several problems for hardened builds, but not the cpuid part.

The __cpuid fix doesn't solve the __asm issue, and @keszybz accidentally tested a numactl build. This pull request reverts all the changes made for the issue #3 and fixes the i686 hardened build:
http://koji.fedoraproject.org/koji/taskinfo?taskID=5934627

I have tested the output of cpuid on the (limited) hardware I own, and it's the same with or without this patch.