diff options
| author | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
|---|---|---|
| committer | Iavor S. Diatchki <iavor.diatchki@gmail.com> | 2012-01-07 13:56:17 -0800 |
| commit | f784eb7585901e2297d504dcf777ebc58d60aaa5 (patch) | |
| tree | 7bf8bc625882724f5db96121c327ee3e80ae781a /compiler/main/SysTools.lhs | |
| parent | 7655c718d56666a918c06f6d4e32d98482620b9c (diff) | |
| parent | a5b365ac3ea7277817541f8bc3341eecfb083490 (diff) | |
| download | haskell-f784eb7585901e2297d504dcf777ebc58d60aaa5.tar.gz | |
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'compiler/main/SysTools.lhs')
| -rw-r--r-- | compiler/main/SysTools.lhs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/compiler/main/SysTools.lhs b/compiler/main/SysTools.lhs index 23906c69bc..75b4d542a5 100644 --- a/compiler/main/SysTools.lhs +++ b/compiler/main/SysTools.lhs @@ -192,6 +192,7 @@ initSysTools mbMinusB Nothing -> pgmError ("No entry for " ++ show key ++ " in " ++ show settingsFile) ; targetArch <- readSetting "target arch" ; targetOS <- readSetting "target os" + ; targetWordSize <- readSetting "target word size" ; targetHasGnuNonexecStack <- readSetting "target has GNU nonexec stack" ; targetHasIdentDirective <- readSetting "target has .ident directive" ; targetHasSubsectionsViaSymbols <- readSetting "target has subsections via symbols" @@ -257,6 +258,7 @@ initSysTools mbMinusB sTargetPlatform = Platform { platformArch = targetArch, platformOS = targetOS, + platformWordSize = targetWordSize, platformHasGnuNonexecStack = targetHasGnuNonexecStack, platformHasIdentDirective = targetHasIdentDirective, platformHasSubsectionsViaSymbols = targetHasSubsectionsViaSymbols |