This patch implements the work-around suggested by Dean in PR32620 comment 1 to fix the problem in that bug. The only difference is that the change was required in two places, not just one.
With this patch, the test "XRay-x86_64-linux :: TestCases/Linux/fdr-mode.cc" should now pass on a x86_64 linux machine that does not have support for rdtscp.