diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-05-07 13:02:59 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-05-07 13:02:59 +0200 |
| commit | 10def48b639b8e83ae6cc8bf9c14da8c12e98370 (patch) | |
| tree | 845a0160e69cdfe4c7c152a6ef8ad34a6abcae23 | |
| parent | 4705c24a336d831dd5afb02288fda17c0093c438 (diff) | |
| parent | 56bac3dc3d45c219db5d9c7b6a97794c00f8115e (diff) | |
| download | compcert-10def48b639b8e83ae6cc8bf9c14da8c12e98370.tar.gz compcert-10def48b639b8e83ae6cc8bf9c14da8c12e98370.zip | |
Merge branch 'master' into json_export
| -rw-r--r-- | arm/Op.v | 8 | ||||
| -rw-r--r-- | backend/PrintAsm.ml | 2 | ||||
| -rw-r--r-- | common/Values.v | 2 |
3 files changed, 6 insertions, 6 deletions
@@ -878,10 +878,10 @@ Proof. apply Values.Val.add_inject; auto. apply eval_shift_inj; auto. apply Values.Val.add_inject; auto. - apply Values.Val.sun_inject; auto. - apply Values.Val.sun_inject; auto. apply eval_shift_inj; auto. - apply Values.Val.sun_inject; auto. apply eval_shift_inj; auto. - apply (@Values.Val.sun_inject f (Vint i) (Vint i) v v'); auto. + apply Values.Val.sub_inject; auto. + apply Values.Val.sub_inject; auto. apply eval_shift_inj; auto. + apply Values.Val.sub_inject; auto. apply eval_shift_inj; auto. + apply (@Values.Val.sub_inject f (Vint i) (Vint i) v v'); auto. inv H4; inv H2; simpl; auto. apply Values.Val.add_inject; auto. inv H4; inv H2; simpl; auto. diff --git a/backend/PrintAsm.ml b/backend/PrintAsm.ml index 11854ace..0438a40f 100644 --- a/backend/PrintAsm.ml +++ b/backend/PrintAsm.ml @@ -94,7 +94,7 @@ module Printer(Target:TARGET) = fprintf oc " %s\n" name_sec; Target.print_align oc align; if not (C2C.atom_is_static name) then - fprintf oc " .global %a\n" Target.symbol name; + fprintf oc " .globl %a\n" Target.symbol name; fprintf oc "%a:\n" Target.symbol name; print_init_data oc name v.gvar_init; Target.print_var_info oc name; diff --git a/common/Values.v b/common/Values.v index a4ead481..8877f9a7 100644 --- a/common/Values.v +++ b/common/Values.v @@ -1545,7 +1545,7 @@ Proof. repeat rewrite Int.add_assoc. decEq. apply Int.add_commut. Qed. -Remark sun_inject: +Remark sub_inject: forall v1 v1' v2 v2', inject f v1 v1' -> inject f v2 v2' -> |