solve remaining conflicts
Prevent gcc from generating bogus constructs such as fdtox %f8, %f7which are incorrect, and caused wrong code to be generated by gas 2.14; nowgas 2.15 will reject such code.Obtained from gcc PR #10904.
branches: 1.1.1;Initial revision