Testsuite: remove arch conditional in T8832

Taken from !3658

5 files changed, 5 insertions, 25 deletions

diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index 42993eb11d..b5041800ed 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -57,16 +57,16 @@ T9509:
 
 T13317:
 	$(RM) -f T13317.o T13317.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl-stats T13317.hs | grep 'KnownBranch'
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl-stats T13317.hs | grep 'KnownBranch'
 
 T13367:
 	$(RM) -f T13317.o T13317.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl -dsuppress-ticks T13367.hs | grep 'foo'
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T13367.hs | grep 'foo'
         # There should be only one copy of the string "foo"#
 
 T8832:
 	$(RM) -f T8832.o T8832.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | egrep '^[a-zA-Z0-9]+ ='
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-ticks T8832.hs | egrep '^[a-zA-Z0-9]+ ='
 
 T12603:
 	$(RM) -f T12603.o T12603.hi
diff --git a/testsuite/tests/simplCore/should_compile/T8832.hs b/testsuite/tests/simplCore/should_compile/T8832.hs
index 0cbff6976b..a0d72a899b 100644
--- a/testsuite/tests/simplCore/should_compile/T8832.hs
+++ b/testsuite/tests/simplCore/should_compile/T8832.hs
@@ -1,8 +1,5 @@
 {-# LANGUAGE CPP #-}
 
--- I'm concerned that the -ddump-simpl output may differ on 32 and 64-bit
--- platforms.  So far I've only put in output for 64-bit platforms.
-
 module T8832 where
 
 import Data.Bits
@@ -17,16 +14,12 @@ T(i,Int)
 T(i8,Int8)
 T(i16,Int16)
 T(i32,Int32)
-#if defined(T8832_WORDSIZE_64)
 T(i64,Int64)
-#endif
 
 T(w,Word)
 T(w8,Word8)
 T(w16,Word16)
 T(w32,Word32)
-#if defined(T8832_WORDSIZE_64)
 T(w64,Word64)
-#endif
 
 T(z,Integer)
diff --git a/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-64 b/testsuite/tests/simplCore/should_compile/T8832.stdout
index e99bbde15b..e99bbde15b 100644
--- a/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-64
+++ b/testsuite/tests/simplCore/should_compile/T8832.stdout
diff --git a/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32 b/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
deleted file mode 100644
index 53b2c046c1..0000000000
--- a/testsuite/tests/simplCore/should_compile/T8832.stdout-ws-32
+++ /dev/null
@@ -1,9 +0,0 @@
-i = GHC.Types.I# 0#
-i8 = GHC.Int.I8# 0#8
-i16 = GHC.Int.I16# 0#16
-i32 = GHC.Int.I32# 0#32
-w = GHC.Types.W# 0##
-w8 = GHC.Word.W8# 0##8
-w16 = GHC.Word.W16# 0##16
-w32 = GHC.Word.W32# 0##32
-z = GHC.Num.Integer.IS 0#
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index a37eccf65f..4915d4b273 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -169,12 +169,8 @@ test('T5996',
      normal,
      makefile_test, ['T5996'])
 test('T8537', normal, compile, [''])
-test('T8832',
-     normal,
-     run_command, ['$MAKE -s --no-print-directory T8832 T8832_WORDSIZE_OPTS=' +
-      ('-DT8832_WORDSIZE_64' if wordsize(64) else '')])
-test('T8848', normal,
-     makefile_test, ['T8848'])
+test('T8832', normal, makefile_test, ['T8832'])
+test('T8848', normal, makefile_test, ['T8848'])
 test('T8848a', only_ways(['optasm']), compile, ['-ddump-rules'])
 test('T8331', only_ways(['optasm']), compile, ['-ddump-rules'])
 test('T6056', only_ways(['optasm']), multimod_compile, ['T6056', '-v0 -ddump-rule-firings'])