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

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

7 files changed, 29 insertions, 12 deletions

diff --git a/testsuite/tests/driver/T365.hs b/testsuite/tests/driver/T365.hs
new file mode 100644
index 0000000000..fe09bb2fb0
--- /dev/null
+++ b/testsuite/tests/driver/T365.hs
@@ -0,0 +1,4 @@
+{-# OPTIONS_GHC -F -pgmF ./test_preprocessor.txt #-}
+module Main where
+
+main = print "Hello World"
diff --git a/testsuite/tests/driver/T365.stderr b/testsuite/tests/driver/T365.stderr
new file mode 100644
index 0000000000..560217e498
--- /dev/null
+++ b/testsuite/tests/driver/T365.stderr
@@ -0,0 +1 @@
+./test_preprocessor.txt: runInteractiveProcess: invalid argument (Exec format error)
diff --git a/testsuite/tests/driver/T8602/T8602.stderr b/testsuite/tests/driver/T8602/T8602.stderr
index 3bbfa20e3d..f3bb7e1546 100644
--- a/testsuite/tests/driver/T8602/T8602.stderr
+++ b/testsuite/tests/driver/T8602/T8602.stderr
@@ -1,2 +1,2 @@
 A B C
-phase `Haskell pre-processor' failed (exitcode = 1)
+`t8602' failed in phase `Haskell pre-processor'. (Exit code: 1)
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index 4a4f93003e..17e0784cbc 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -400,7 +400,7 @@ test('T8959a',
 
 test('T703', normal, run_command, ['$MAKE -s --no-print-directory T703'])
 test('T2182', normal, run_command, ['$MAKE -s --no-print-directory T2182'])
-test('T8101', normal, compile, ['-Wall -fno-code'])
+test('T8101', expect_broken(10600), compile, ['-Wall -fno-code'])
 test('T8101b', expect_broken(10600), multimod_compile,
      ['T8101b', '-Wall -fno-code'])
 
@@ -446,3 +446,10 @@ test('T10182',
      extra_clean(['T10182.o', 'T10182a.o', 'T10182.o-boot', 'T10182.hi', 'T10182a.hi', 'T10182.hi-boot']),
      run_command,
      ['$MAKE -s --no-print-directory T10182'])
+     
+test('T365',
+     [extra_clean(['test_preprocessor.txt']),
+      pre_cmd('touch test_preprocessor.txt'),
+      unless(opsys('mingw32'), skip)],
+      compile_fail,
+      [''])
diff --git a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32 b/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32
index 9fe325728e..898dc7a5c4 100644
--- a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32
+++ b/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32
@@ -1,6 +1,7 @@
-[1 of 3] Compiling A                ( A.hs, tmp_sigof01m\A.o )
-[2 of 3] Compiling B[sig of A]      ( B.hsig, nothing )
-[3 of 3] Compiling Main             ( Main.hs, tmp_sigof01m\Main.o )
+[1 of 4] Compiling A                ( A.hs, tmp_sigof01m\A.o )
+[2 of 4] Compiling B[boot]          ( B.hs-boot, tmp_sigof01m\B.o-boot )
+[3 of 4] Compiling B[merge]         ( B.hi, tmp_sigof01m\B.o )
+[4 of 4] Compiling Main             ( Main.hs, tmp_sigof01m\Main.o )
 Linking tmp_sigof01m/Main.exe ...
 False
 T
diff --git a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32
index 3c8a1fa00c..7fde989bc4 100644
--- a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32
+++ b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32
@@ -1,6 +1,8 @@
-[1 of 3] Compiling MapAsSet[sig of Data.Map.Lazy] ( MapAsSet.hsig, nothing )
-[2 of 3] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing )
-[3 of 3] Compiling Main             ( Double.hs, tmp_sigof02dm\Main.o )
+[1 of 5] Compiling MapAsSet[boot]   ( MapAsSet.hs-boot, tmp_sigof02dm\MapAsSet.o-boot )
+[2 of 5] Compiling MapAsSet[merge]  ( MapAsSet.hi, tmp_sigof02dm\MapAsSet.o )
+[3 of 5] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02dm\Map.o-boot )
+[4 of 5] Compiling Map[merge]       ( Map.hi, tmp_sigof02dm\Map.o )
+[5 of 5] Compiling Main             ( Double.hs, tmp_sigof02dm\Main.o )
 Linking tmp_sigof02dm/Double.exe ...
 False
 fromList [0,6]
diff --git a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32
index 65b1857c49..f7cca89866 100644
--- a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32
+++ b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32
@@ -1,8 +1,10 @@
-[1 of 2] Compiling Map[sig of Data.Map.Strict] ( Map.hsig, nothing )
-[2 of 2] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o )
+[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m\Map.o-boot )
+[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m\Map.o )
+[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o )
 Linking tmp_sigof02m/StrictMain.exe ...
-[1 of 2] Compiling Map[sig of Data.Map.Lazy] ( Map.hsig, nothing ) [sig-of changed]
-[2 of 2] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o ) [Map changed]
+[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m\Map.o-boot ) [sig-of changed]
+[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m\Map.o ) [sig-of changed]
+[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o ) [Map changed]
 Linking tmp_sigof02m/LazyMain.exe ...
 False
 [(0,"foo"),(6,"foo")]