diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 57945e8ad34c10a080bbc645a51b158df074d9bb..271642d2a5690df10646c960048e8e9de677112f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-23  Ben Elliston  <bje@au.ibm.com>
+
+	* gcc.misc-tests/dectest.exp (TORTURE_OPTIONS): Include -Os.
+	Remove target conditional torture options for i?86 and x86_64
+	GNU/Linux.
+
 2006-01-22  Gabriel Dos Reis  <gdr@integrable-solutions.net>
 
 	PR c++/10891
diff --git a/gcc/testsuite/gcc.misc-tests/dectest.exp b/gcc/testsuite/gcc.misc-tests/dectest.exp
index 15b6c24efa73b4f1af53e4179d55017bee6f2381..9b1a726c056ab6b9cc647028f902fb7505626369 100644
--- a/gcc/testsuite/gcc.misc-tests/dectest.exp
+++ b/gcc/testsuite/gcc.misc-tests/dectest.exp
@@ -21,18 +21,12 @@
 #
 # Contributed by Ben Elliston <bje@au.ibm.com>.
 
-set TORTURE_OPTIONS [list {} -O1 -O2 -O3 -msoft-float]
+set TORTURE_OPTIONS [list {} -O1 -O2 -O3 -Os -msoft-float]
 
 # On x86 and x86-64 systems, -Os makes the stack alignment too small,
 # leading to segmentation faults when executing SSE instructions.
 # Force the alignment of the stack to 2^4 (16) bytes.
 
-if {[istarget i?86-*-linux-gnu] || [istarget x86_64-*-linux-gnu]} {
-    lappend TORTURE_OPTIONS {-Os -mpreferred-stack-boundary=4}
-} else {
-    lappend TORTURE_OPTIONS {-Os}
-}
-
 proc target-specific-flags {} {
   set result "-frounding-math "
   return $result