diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-03-31 10:46:16 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-03-31 10:46:16 +0200 |
| commit | 035047ca6c4f62c8481ffa9e4cc0783ea6a1b784 (patch) | |
| tree | 28f0e627f194d334b8f6872f783188e580451ee5 /Makefile | |
| parent | b3de120011683866149ac2a9fbd0da38e2eef96c (diff) | |
| parent | 47a6b116069cff9c71466bde1fd87d0775ec9175 (diff) | |
| download | compcert-kvx-035047ca6c4f62c8481ffa9e4cc0783ea6a1b784.tar.gz compcert-kvx-035047ca6c4f62c8481ffa9e4cc0783ea6a1b784.zip | |
Merge branch 'master' into dwarf
Conflicts:
Makefile
driver/Driver.ml
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -204,6 +204,8 @@ compcert.ini: Makefile.config VERSION echo "has_runtime_lib=$(HAS_RUNTIME_LIB)"; \ echo "asm_supports_cfi=$(ASM_SUPPORTS_CFI)"; \ echo "advanced_debug=$(ADVANCED_DEBUG)"; \ + echo "struct_passing_style=$(STRUCT_PASSING)"; \ + echo "struct_return_style=$(STRUCT_RETURN)"; \ version=`cat VERSION`; \ echo version=$$version) \ > compcert.ini |