Age | Commit message (Collapse) | Author |
|
* Use merge strategy -s ours to skip release commits on maint
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Reference
https://code.google.com/p/pcsx2/issues/detail?id=1195
|
|
|
|
|
|
|
|
|
|
|
|
more piles of #if crap in the template.
|
|
|
|
|
|
updated copy of cpuid.h with the latest from gcc 4.6
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This ensures that the compiler has support for xgetbv.
This also fixes MSVC by checking for _xgetbv.
Also, restored copy of cpuid.h, this should not be modified.
|
|
|
|
* Use merge strategy -s ours to skip over release commit.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reverts commit f88b8cf5508d3ba446cb94f800c56d34279cf91e, reversing
changes made to a87ac60f15c2593ececb02ba16ab842c20e760d2.
|
|
This reverts commit 04e2ebb979942cada74f10ea022342716c6851bf, reversing
changes made to 25d687550a0322ffaf270f25faf2b4a78a97142c.
|
|
that feature enabled
|
|
Conflicts:
volk/gen/make_cpuid_c.py
|