--- ghc-9.2.5/testsuite/tests/numeric/should_run/T7014.primops.orig	2023-03-12 14:42:11.338540492 +0100
+++ ghc-9.2.5/testsuite/tests/numeric/should_run/T7014.primops	2023-03-12 14:42:13.735608896 +0100
@@ -1,9 +1,9 @@
 and#
 or#
 uncheckedShift.*#
++#
+-#
+*#
-\+#
-\-#
-\*#
 quotInt#
 remInt#
 plusFloat#
--- ghc-9.2.5/testsuite/tests/hsc2hs/Makefile.orig	2023-03-12 14:40:03.825939306 +0100
+++ ghc-9.2.5/testsuite/tests/hsc2hs/Makefile	2023-03-12 14:40:07.961054835 +0100
@@ -54,7 +54,7 @@
 ifeq "$(WINDOWS)" "YES"
 	grep '{-# LINE 1 \"T12504\\\\path\\\\to\\\\$@\.hsc\" #-}' T12504/path/to/$@.hs
 else
+	grep '{-# LINE 1 "T12504/path/to/$@\.hsc" #-}' T12504/path/to/$@.hs
-	grep '{-# LINE 1 \"T12504/path/to/$@\.hsc\" #-}' T12504/path/to/$@.hs
 endif
 
 .PHONY: T15758
--- ghc-9.2.5/testsuite/tests/simplCore/should_compile/Makefile.orig	2023-03-12 14:41:16.204974035 +0100
+++ ghc-9.2.5/testsuite/tests/simplCore/should_compile/Makefile	2023-03-12 14:41:17.832020067 +0100
@@ -253,7 +253,7 @@
 # g should have been collapsed into one defininition by CSE.
 .PHONY: T13340
 T13340:
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '+#'
-	'$(TEST_HC)' $(TEST_HC_OPTS) -c -O T13340.hs -ddump-simpl -dsuppress-all | grep -c '\+#'
 
 
 # We expect to see all dictionaries specialized away.
amples/lightweight-desktop.tmpl?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>tree</a><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>commit</a><a href='/guix/diff/gnu/system/examples/lightweight-desktop.tmpl?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/system/examples/lightweight-desktop.tmpl'>
<input type='hidden' name='id' value='21b712acc73f6a0a8f9d44ae32438539b78b3db6'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>root</a>/<a href='/guix/log/gnu?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>gnu</a>/<a href='/guix/log/gnu/system?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>system</a>/<a href='/guix/log/gnu/system/examples?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>examples</a>/<a href='/guix/log/gnu/system/examples/lightweight-desktop.tmpl?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6'>lightweight-desktop.tmpl</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/system/examples/lightweight-desktop.tmpl?id=21b712acc73f6a0a8f9d44ae32438539b78b3db6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-13 21:17:40 +0200'>2020-10-13</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=1197b8b20f4fca4ce03bbc5fa75e18d54e3717c0'>installer: Add Emacs EXWM desktop environment.</a><span class='msg-avail'>...</span></td><td>Jan (janneke) Nieuwenhuizen</td></tr>
<tr><td><span title='2020-08-28 23:27:53 +0200'>2020-08-28</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=be1c00ae3c3dc7086ada05f34c36e85adb839038'>system: Remove extra line from 'lightweight-desktop.tmpl'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2020-04-02 11:48:25 +0200'>2020-04-02</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=c7af96871737ffa0e2be879e200573bc60603c8c'>system: Add xterm to lightweight-desktop example.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-03-25 23:37:06 +0100'>2019-03-25</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=cf848cc0a17a3a58d600116896f6e7abfb0440d4'>accounts: Add default value for the 'home-directory' field of &lt;user-account&gt;.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2019-01-23 18:01:16 +0100'>2019-01-23</span></td><td><a href='/guix/commit/gnu/system/examples/lightweight-desktop.tmpl?id=907dd32720cf7ae94876c1da2df775f524f5f795'>gnu: Replace all cons* with beginner-friendly (append (list ...)).</a><span class='msg-avail'>...</span></td><td>Pierre Neidhardt</td></tr>