Author: hans Date: Tue Feb 14 11:29:27 2017 New Revision: 295074 URL: http://llvm.org/viewvc/llvm-project?rev=295074&view=rev Log: Merging r294886: ------------------------------------------------------------------------ r294886 | weimingz | 2017-02-11 21:10:25 -0800 (Sat, 11 Feb 2017) | 9 lines
[Builtin][ARM] Fix subsf3vfp for non-HF target Reviewers: rengolin, compnerd Reviewed By: compnerd Subscribers: hans, aemerson Differential Revision: https://reviews.llvm.org/D29869 ------------------------------------------------------------------------ Modified: compiler-rt/branches/release_40/ (props changed) compiler-rt/branches/release_40/lib/builtins/arm/subsf3vfp.S Propchange: compiler-rt/branches/release_40/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 14 11:29:27 2017 @@ -1 +1 @@ -/compiler-rt/trunk:292517,293120,293536 +/compiler-rt/trunk:292517,293120,293536,294886 Modified: compiler-rt/branches/release_40/lib/builtins/arm/subsf3vfp.S URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_40/lib/builtins/arm/subsf3vfp.S?rev=295074&r1=295073&r2=295074&view=diff ============================================================================== --- compiler-rt/branches/release_40/lib/builtins/arm/subsf3vfp.S (original) +++ compiler-rt/branches/release_40/lib/builtins/arm/subsf3vfp.S Tue Feb 14 11:29:27 2017 @@ -21,7 +21,7 @@ DEFINE_COMPILERRT_FUNCTION(__subsf3vfp) #if defined(COMPILER_RT_ARMHF_TARGET) vsub.f32 s0, s0, s1 -#elsee +#else vmov s14, r0 // move first param from r0 into float register vmov s15, r1 // move second param from r1 into float register vsub.f32 s14, s14, s15 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
