diff options
author | Cyril SIX <cyril.six@kalray.eu> | 2020-12-01 15:27:51 +0100 |
---|---|---|
committer | Cyril SIX <cyril.six@kalray.eu> | 2020-12-01 15:27:51 +0100 |
commit | 035a1a9f4b636206acbae4506c5fc4ef322de0c1 (patch) | |
tree | 84c7f2e07dc1629407674644f0c67b058d1967bd /common | |
parent | 790161a565674a5f90bfefc11e5f2a07a73a9f6c (diff) | |
parent | b8647d11c1af9bfe19fd8be33f8e88f92de77888 (diff) | |
download | compcert-kvx-035a1a9f4b636206acbae4506c5fc4ef322de0c1.tar.gz compcert-kvx-035a1a9f4b636206acbae4506c5fc4ef322de0c1.zip |
Merge remote-tracking branch 'origin/kvx-work' into kvx-test-prepass
Conflicts:
arm/Op.v
common/Values.v
kvx/Op.v
Diffstat (limited to 'common')
-rw-r--r-- | common/Values.v | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/common/Values.v b/common/Values.v index 65b0b5ef..41138e8e 100644 --- a/common/Values.v +++ b/common/Values.v @@ -2727,4 +2727,3 @@ Proof. destruct v2; try congruence; rewrite !EQ; auto. Qed. - |