--- 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.
it/etc/git/post-merge?id=8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6'>commit</a><a href='/guix/diff/etc/git/post-merge?id=8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/etc/git/post-merge'>
<input type='hidden' name='id' value='8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6'/><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=8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6'>root</a>/<a href='/guix/log/etc?id=8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6'>etc</a>/<a href='/guix/log/etc/git?id=8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6'>git</a>/<a href='/guix/log/etc/git/post-merge?id=8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6'>post-merge</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/etc/git/post-merge?id=8dcf48ab941c8e9fb9a31d460133dd5acc4e54e6&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2024-05-25 16:23:56 +0200'>2024-05-25</span></td><td><a href='/guix/commit/etc/git/post-merge?id=73b3f941d7d911a1b2bb2bf77d37cb3a12ed4291'>maint: Suggest ‘guix git authenticate’ for initial authentication.</a><span class='msg-avail'>...<span class='msg-tooltip'>The previous recommendation, running ‘make authenticate’, was insecure
because it led users to run code from the very repository they want to
authenticate:

  https://lists.gnu.org/archive/html/guix-devel/2024-04/msg00252.html

* Makefile.am (commit_v1_0_0, channel_intro_commit)
(channel_intro_signer, GUIX_GIT_KEYRING, authenticate): Remove.
* Makefile.am (.git/hooks/%): New target, generalization of previous
‘.git/hooks/pre-push’ target.
(nodist_noinst_DATA): Add ‘.git/hooks/post-merge’.
* doc/contributing.texi (Building from Git): Suggest ‘guix git
authenticate’ instead of ‘make authenticate’.
* etc/git/post-merge: New file.
* etc/git/pre-push: Run ‘guix git authenticate’ instead of ‘make
authenticate’.

Reviewed-by: Maxim Cournoyer &lt;maxim.cournoyer@gmail.com&gt;
Reported-by: Skyler Ferris &lt;skyvine@protonmail.com&gt;
Change-Id: Ia415aa8375013d0dd095e891116f6ce841d93efd
</span></span></td><td>Ludovic Courtès</td></tr>