diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index f2a190ed9d..670f46b770 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-12  Mark Kettenis  <kettenis@gnu.org>
+
+	* gdb.arch/i386-sse.exp: Compile with -msse when using GCC.
+
 2005-07-10  Mark Kettenis  <kettenis@gnu.org>
 
 	* gdb.mi/mi2-stack.exp (test_stack_locals_listing): Remove test for
diff --git a/gdb/testsuite/gdb.arch/i386-sse.exp b/gdb/testsuite/gdb.arch/i386-sse.exp
index 702ee7127a..f77adaa649 100644
--- a/gdb/testsuite/gdb.arch/i386-sse.exp
+++ b/gdb/testsuite/gdb.arch/i386-sse.exp
@@ -1,4 +1,4 @@
-# Copyright 2004 Free Software Foundation, Inc.
+# Copyright 2004, 2005 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -34,7 +34,17 @@ if ![istarget "i?86-*-*"] then {
 set testfile "i386-sse"
 set srcfile ${testfile}.c
 set binfile ${objdir}/${subdir}/${testfile}
-if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } {
+
+if [get_compiler_info ${binfile}] {
+    return -1
+}
+
+set additional_flags ""
+if [test_compiler_info gcc*] {
+    set additional_flags "additional_flags=-msse"
+}
+
+if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable [list debug $additional_flags]] != "" } {
     unsupported "compiler does not support SSE"
     return
 }