Merge remote-tracking branch 'origin/master' into wip/orf-rebootwip/orf-reboot

Conflicts:
	compiler/rename/RnNames.hs
	compiler/typecheck/TcRnMonad.hs
	utils/haddock

1 files changed, 35 insertions, 0 deletions

diff --git a/utils/mkUserGuidePart/Options/CodeGen.hs b/utils/mkUserGuidePart/Options/CodeGen.hs
new file mode 100644
index 0000000000..0d9cabb27d
--- /dev/null
+++ b/utils/mkUserGuidePart/Options/CodeGen.hs
@@ -0,0 +1,35 @@
+module Options.CodeGen where
+
+import Types
+
+codegenOptions :: [Flag]
+codegenOptions =
+  [ flag { flagName = "-fasm"
+         , flagDescription =
+           "Use the :ref:`native code generator <native-code-gen>`"
+         , flagType = DynamicFlag
+         , flagReverse = "-fllvm"
+         }
+  , flag { flagName = "-fllvm"
+         , flagDescription =
+           "Compile using the :ref:`LLVM code generator <llvm-code-gen>`"
+         , flagType = DynamicFlag
+         , flagReverse = "-fasm"
+         }
+  , flag { flagName = "-fno-code"
+         , flagDescription = "Omit code generation"
+         , flagType = DynamicFlag
+         }
+  , flag { flagName = "-fwrite-interface"
+         , flagDescription = "Always write interface files"
+         , flagType = DynamicFlag
+         }
+  , flag { flagName = "-fbyte-code"
+         , flagDescription = "Generate byte-code"
+         , flagType = DynamicFlag
+         }
+  , flag { flagName = "-fobject-code"
+         , flagDescription = "Generate object code"
+         , flagType = DynamicFlag
+         }
+  ]