aboutsummaryrefslogtreecommitdiffstats
path: root/backend/Tunneling.v
diff options
context:
space:
mode:
authorFrançois Pottier <francois.pottier@inria.fr>2015-10-23 15:08:33 +0200
committerFrançois Pottier <francois.pottier@inria.fr>2015-10-23 15:17:50 +0200
commit136986c204af19341aeb455d72fe817b16fa6fff (patch)
tree02e9178d9f2cf942bd32366891d480ff161406f6 /backend/Tunneling.v
parentc46723c0169145d41d1879c236f53314456f1ba1 (diff)
parent1cb3d93ff278ebbd0c6967c5f9401a97f9b618b4 (diff)
downloadcompcert-136986c204af19341aeb455d72fe817b16fa6fff.tar.gz
compcert-136986c204af19341aeb455d72fe817b16fa6fff.zip
Merge remote branch 'upstream/master' into clean
Conflicts: Makefile.extr
Diffstat (limited to 'backend/Tunneling.v')
-rw-r--r--backend/Tunneling.v2
1 files changed, 1 insertions, 1 deletions
diff --git a/backend/Tunneling.v b/backend/Tunneling.v
index bdc8117e..fa7ff787 100644
--- a/backend/Tunneling.v
+++ b/backend/Tunneling.v
@@ -55,7 +55,7 @@ Require Import LTL.
<< L1: nop L2;
L2: nop L1;
>>
- Coq warns us of this fact by not accepting the definition
+ Coq warns us of this fact by not accepting the definition
of [branch_target] above.
To handle this problem, we proceed in two passes. The first pass