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 /extraction/extraction.v | |
| 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 'extraction/extraction.v')
| -rw-r--r-- | extraction/extraction.v | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extraction/extraction.v b/extraction/extraction.v index 8ac776ef..6ab2ce3a 100644 --- a/extraction/extraction.v +++ b/extraction/extraction.v @@ -167,7 +167,7 @@ Set Extraction AccessOpaque. Cd "extraction". Separate Extraction - Asmgen.addptrofs + Asm.dummy_function Asmgen.addptrofs Asmgen.storeind_ptr Compiler.transf_c_program Compiler.transf_cminor_program Cexec.do_initial_state Cexec.do_step Cexec.at_final_state Ctypes.merge_attributes Ctypes.remove_attributes Ctypes.build_composite_env |