diff options
| author | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
|---|---|---|
| committer | Kavon Farvardin <kavon@farvard.in> | 2018-09-23 15:29:37 -0500 |
| commit | 84c2ad99582391005b5e873198b15e9e9eb4f78d (patch) | |
| tree | caa8c2f2ec7e97fbb4977263c6817c9af5025cf4 /utils/genapply/Main.hs | |
| parent | 8ddb47cfcf5776e9a3c55fd37947c8a95e00fa12 (diff) | |
| parent | e68b439fe5de61b9a2ca51af472185c62ccb8b46 (diff) | |
| download | haskell-wip/T13904.tar.gz | |
update to current master againwip/T13904
Diffstat (limited to 'utils/genapply/Main.hs')
| -rw-r--r-- | utils/genapply/Main.hs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/utils/genapply/Main.hs b/utils/genapply/Main.hs index 90ae5d7ac0..b30c9f8c46 100644 --- a/utils/genapply/Main.hs +++ b/utils/genapply/Main.hs @@ -19,6 +19,10 @@ module Main(main) where -- Needed for TAG_BITS #include "../../includes/MachDeps.h" +#if MIN_VERSION_base(4,11,0) +import Prelude hiding ((<>)) +#endif + import Text.PrettyPrint import Data.Word import Data.Bits @@ -854,7 +858,7 @@ genApplyFast regstatus args = nest 4 (vcat [ text "Sp_adj" <> parens (int (-sp_offset)) <> semi, saveRegOffs reg_locs, - mkJump regstatus fun_ret_label [] [] <> semi + mkJump regstatus fun_ret_label [] args <> semi ]), char '}' ]), |