merge x86
Merge branch 'zhy' of github.com:zhyage/gpsTest into zhy
ok with make