diff options
| author | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-10 10:05:12 +0200 |
|---|---|---|
| committer | Bernhard Schommer <bernhardschommer@gmail.com> | 2015-09-10 10:05:12 +0200 |
| commit | be6dc9e64912901b8217f56656d770f957d15cb4 (patch) | |
| tree | 8777f4731052528ff2f9265a7ce2ba2bd81db3a8 /powerpc/CBuiltins.ml | |
| parent | 2dce91b8e2cae0b49c8870df6c727e25aaa180d8 (diff) | |
| parent | 9d85d044fad9d35efe2612b7a5518f7f9074572f (diff) | |
| download | compcert-kvx-be6dc9e64912901b8217f56656d770f957d15cb4.tar.gz compcert-kvx-be6dc9e64912901b8217f56656d770f957d15cb4.zip | |
Merge branch 'master' into atomic-builtins
Conflicts:
powerpc/CBuiltins.ml
Diffstat (limited to 'powerpc/CBuiltins.ml')
| -rw-r--r-- | powerpc/CBuiltins.ml | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/powerpc/CBuiltins.ml b/powerpc/CBuiltins.ml index 2013c9cf..b61028d3 100644 --- a/powerpc/CBuiltins.ml +++ b/powerpc/CBuiltins.ml @@ -118,13 +118,12 @@ let builtins = { (TPtr (TVoid [],[]),[],false); (* isel *) "__builtin_isel", - (TInt (IInt, []),[TInt(IInt, []);TInt(IInt, []);TInt(IInt, [])],false); + (TInt (IInt, []),[TInt(IBool, []);TInt(IInt, []);TInt(IInt, [])],false); (* atomic operations *) "__builtin_atomic_exchange", (TVoid [], [TPtr (TInt(IInt, []),[]);TPtr (TInt(IInt, []),[]);TPtr (TInt(IInt, []),[])],false); "__builtin_atomic_load", (TVoid [], [TPtr (TInt(IInt, []),[]);TPtr (TInt(IInt, []),[])],false) - ] } |