diff options
author | Cyril SIX <cyril.six@kalray.eu> | 2018-11-14 11:49:34 +0100 |
---|---|---|
committer | Cyril SIX <cyril.six@kalray.eu> | 2018-11-14 11:49:34 +0100 |
commit | a220a09ae6ce52400a563ea6ee65aa36b2ea9dfb (patch) | |
tree | 680798b800e104d0e766a3ab7a0f39469b2671fa /test/mppa/sort/.gitignore | |
parent | 0b86431038c1e874d7d7030ab41a8f56b0a9991f (diff) | |
parent | 154230f3d9cad4f8de59e8fcaa9d0fe4ae151a98 (diff) | |
download | compcert-kvx-a220a09ae6ce52400a563ea6ee65aa36b2ea9dfb.tar.gz compcert-kvx-a220a09ae6ce52400a563ea6ee65aa36b2ea9dfb.zip |
Merge branch 'mppa_asmbloc_nobreg' into mppa_k1c
Conflicts:
mppa_k1c/Asm.v
mppa_k1c/Asmexpand.ml
mppa_k1c/TargetPrinter.ml
test/mppa/Makefile
test/mppa/builtins/clzll.c
test/mppa/generate.sh
Diffstat (limited to 'test/mppa/sort/.gitignore')
-rw-r--r-- | test/mppa/sort/.gitignore | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/mppa/sort/.gitignore b/test/mppa/sort/.gitignore index c8f4f4e5..a8d6921c 100644 --- a/test/mppa/sort/.gitignore +++ b/test/mppa/sort/.gitignore @@ -1,9 +1,9 @@ -insertion-test-k1c -insertion-test-x86 -merge-test-k1c -selection-test-k1c -test-k1c -merge-test-x86 -selection-test-x86 -test-x86 -test-ccomp +main-test-ccomp-k1c +main-test-gcc-k1c +main-test-gcc-x86 +merge-test-gcc-k1c +merge-test-gcc-x86 +selection-test-gcc-k1c +selection-test-gcc-x86 +insertion-test-gcc-k1c +insertion-test-gcc-x86 |