diff options
| author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-28 16:29:34 +0100 |
|---|---|---|
| committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2020-03-28 16:29:34 +0100 |
| commit | 5e84a1aea751e8c4c46a2899a2901bb59a1f049b (patch) | |
| tree | 2bf1a4fd8ba97b1e079a181e1fab27233c27d611 | |
| parent | 69247e1024f99f628f9b00eb9ecc30ef30e51d3f (diff) | |
| download | compcert-kvx-5e84a1aea751e8c4c46a2899a2901bb59a1f049b.tar.gz compcert-kvx-5e84a1aea751e8c4c46a2899a2901bb59a1f049b.zip | |
run yarpgen correctly on arm
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | test/monniaux/yarpgen/Makefile | 14 |
2 files changed, 12 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 119fa44e..bf83a026 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -81,7 +81,7 @@ build_arm: - ./config_arm.sh - make -j "$NJOBS" - make -C test DIRS="c compression spass regression" CCOMPOPTS=-static SIMU='qemu-arm' EXECUTE='qemu-arm' all test - - make -C test/monniaux/yarpgen -k TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' + - make -C test/monniaux/yarpgen -k TARGET_CC='arm-linux-gnueabihf-gcc' EXECUTE='qemu-arm' CCOMPOPTS='-static' TARGET_CFLAGS='-static' BITS=32 rules: - if: '$CI_COMMIT_BRANCH == "mppa-work"' when: always diff --git a/test/monniaux/yarpgen/Makefile b/test/monniaux/yarpgen/Makefile index dbd6ae75..339d6808 100644 --- a/test/monniaux/yarpgen/Makefile +++ b/test/monniaux/yarpgen/Makefile @@ -10,6 +10,11 @@ YARPGEN=./yarpgen GENERATOR=yarpgen endif +ifdef BITS +YARPGEN+=-m $(BITS) +CFLAGS+=-m$(BITS) +endif + MAX=129 PREFIX=ran%06.f @@ -49,13 +54,16 @@ tests_s: $(TESTS_CCOMP_TARGET_S) $(CC) $(CFLAGS) -S -o $@ $< %.target.o : %.target.s - $(TARGET_CC) -c -o $@ $< + $(TARGET_CC) $(CFLAGS) -c -o $@ $< + +%.host.o : %.host.s + $(CC) $(CFLAGS) -c -o $@ $< %.target.out : %.target - $(EXECUTE) $< > $@ + $(EXECUTE) $< | tee $@ %.host.out : %.host - ./$< > $@ + ./$< | tee $@ ran%/func.ccomp.target.s ran%/func.gcc.target.s ran%/func.ccomp.host.s ran%/func.gcc.host.s ran%/init.gcc.host.s : ran%/init.h |