diff options
Diffstat (limited to 'arm')
| -rw-r--r-- | arm/SelectOp.vp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arm/SelectOp.vp b/arm/SelectOp.vp index ed4c2c95..5506157c 100644 --- a/arm/SelectOp.vp +++ b/arm/SelectOp.vp @@ -516,16 +516,14 @@ Nondetfunction builtin_arg (e: expr) := | _ => BA e end. -<<<<<<< HEAD (* floats *) Definition divf_base (e1: expr) (e2: expr) := Eop Odivf (e1 ::: e2 ::: Enil). Definition divfs_base (e1: expr) (e2: expr) := Eop Odivfs (e1 ::: e2 ::: Enil). -======= + (** Platform-specific known builtins *) Definition platform_builtin (b: platform_builtin) (args: exprlist) : option expr := None. ->>>>>>> 91381b65f5aa76e5195caae9ef331b3f5f95afaf |