aboutsummaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorCyril SIX <cyril.six@kalray.eu>2018-11-21 11:16:42 +0100
committerCyril SIX <cyril.six@kalray.eu>2018-11-21 11:16:42 +0100
commitb873e06abcee1c7f6a51aaabb973b550a52a5b61 (patch)
tree70ccd9c7cbba08e20b782217b1a2268b1afce3e9 /.gitignore
parent65db9a4a02c30d8dd5ca89b6fe3e4524cd4c29a5 (diff)
parenteb7bd26e2b9eeed21d204bad26fa56c8a7937ffb (diff)
downloadcompcert-kvx-b873e06abcee1c7f6a51aaabb973b550a52a5b61.tar.gz
compcert-kvx-b873e06abcee1c7f6a51aaabb973b550a52a5b61.zip
Merge tag 'v3.4' into mppa_k1c
Conflicts: .gitignore
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index c0cd712f..42bf23b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -54,6 +54,7 @@
/cparser/pre_parser_messages.ml
/cparser/pre_parser.automaton
/cparser/pre_parser.messages
+/cparser/pre_parser.conflicts
/cparser/handcrafted.messages.bak
/cparser/handcrafted.messages.raw
/cparser/deLexer
@@ -75,3 +76,5 @@ runtime/mppa_k1c/i64_smod.s
runtime/mppa_k1c/i64_udiv.s
runtime/mppa_k1c/i64_udivmod.s
runtime/mppa_k1c/i64_umod.s
+# Test generated data
+/test/clightgen/*.v