diff options
Diffstat (limited to 'x86/SelectOpproof.v')
| -rw-r--r-- | x86/SelectOpproof.v | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/x86/SelectOpproof.v b/x86/SelectOpproof.v index b59f4a87..5703c758 100644 --- a/x86/SelectOpproof.v +++ b/x86/SelectOpproof.v @@ -1016,8 +1016,6 @@ Proof. - constructor; auto. Qed. -<<<<<<< HEAD - (* floating-point division without HELPERS *) Theorem eval_divf_base: forall le a b x y, @@ -1038,7 +1036,7 @@ Proof. intros; unfold divfs_base. TrivialExists. Qed. -======= + (** Platform-specific known builtins *) Theorem eval_platform_builtin: @@ -1051,5 +1049,4 @@ Proof. intros. discriminate. Qed. ->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf End CMCONSTR. |