diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2021-01-08 20:48:59 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2021-01-08 20:48:59 +0100 |
| commit | 33b07cec89afcd871408fd034c12056194d441b4 (patch) | |
| tree | c51548ebd506de99716920221ff2cb1fb904fb70 | |
| parent | 760fd5da7fd3db73fb7da3413bab9e476b4cbddb (diff) | |
| download | compcert-kvx-33b07cec89afcd871408fd034c12056194d441b4.tar.gz compcert-kvx-33b07cec89afcd871408fd034c12056194d441b4.zip | |
fix merge
| -rw-r--r-- | test/c/Makefile | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/test/c/Makefile b/test/c/Makefile index 85ffef43..9b42563a 100644 --- a/test/c/Makefile +++ b/test/c/Makefile @@ -1,13 +1,7 @@ include ../../Makefile.config CCOMP=../../ccomp -<<<<<<< HEAD CCOMPFLAGS=$(CCOMPOPTS) -stdlib ../../runtime -dc -dclight -dasm $(SSA_MODE) -======= -# TODO - temporary -# CCOMPOPTS:=$(CCOMPOPTS) -fall-loads-nontrap -fduplicate 2 -fprepass -CCOMPFLAGS=$(CCOMPOPTS) -stdlib ../../runtime -dc -dclight -dasm ->>>>>>> origin/kvx-work CFLAGS+=-O2 -Wall EXECUTE:=timeout --signal=SIGTERM 20s $(EXECUTE) |