use cpuid.h on GCC for cpuid, correct rdtsc on GCC
correct the build of the static library timing test
Merge remote-tracking branch 'upstream/master'

Conflicts:
	rdtsc.h