error: patch failed: soft-fp/op-common.h:1510
error: soft-fp/op-common.h: patch does not apply
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Applying: Fix -Werror=constant-logical-operand errors in soft-fp
Patch failed at 0001 Fix -Werror=constant-logical-operand errors in soft-fp