diff options
| author | Cyril SIX <cyril.six@kalray.eu> | 2019-09-03 10:52:23 +0200 |
|---|---|---|
| committer | Cyril SIX <cyril.six@kalray.eu> | 2019-09-03 10:52:23 +0200 |
| commit | 0cb5a0b65b4fbeb5bc1c14f75951798f20500177 (patch) | |
| tree | 767381d2490c86dcee95da2631ac5c94e14de8f5 /arm/CBuiltins.ml | |
| parent | 1fbd5d18a9f4398d7ecb9b9ab148a96f575fd1e0 (diff) | |
| parent | 2f7f68f69b6408e4de6210c827b108eff011af51 (diff) | |
| download | compcert-kvx-0cb5a0b65b4fbeb5bc1c14f75951798f20500177.tar.gz compcert-kvx-0cb5a0b65b4fbeb5bc1c14f75951798f20500177.zip | |
Merge remote-tracking branch 'origin/mppa-work-upstream-merge' into mppa-work
Conflicts:
configure
mppa_k1c/Archi.v
mppa_k1c/Asmexpand.ml
Diffstat (limited to 'arm/CBuiltins.ml')
| -rw-r--r-- | arm/CBuiltins.ml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm/CBuiltins.ml b/arm/CBuiltins.ml index ec4f4aaa..d6a1ea35 100644 --- a/arm/CBuiltins.ml +++ b/arm/CBuiltins.ml @@ -18,10 +18,10 @@ open C let builtins = { - Builtins.typedefs = [ + builtin_typedefs = [ "__builtin_va_list", TPtr(TVoid [], []) ]; - Builtins.functions = [ + builtin_functions = [ (* Integer arithmetic *) "__builtin_clz", (TInt(IInt, []), [TInt(IUInt, [])], false); |