diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index bfacf61a5d..ebc5edb937 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2010-02-25  David S. Miller  <davem@davemloft.net>
+
+	* gdb.base/catch-syscall.exp: Allow to run on sparc*-*-linux and
+	fix logic for setting all_syscalls_numbers.
+
 2010-02-24  Phil Muldoon  <pmuldoon@redhat.com>
 
 	* Makefile.in: Add py-block and py-symbol.
diff --git a/gdb/testsuite/gdb.base/catch-syscall.exp b/gdb/testsuite/gdb.base/catch-syscall.exp
index 4d5c3cb4cc..ee385adcd3 100644
--- a/gdb/testsuite/gdb.base/catch-syscall.exp
+++ b/gdb/testsuite/gdb.base/catch-syscall.exp
@@ -54,7 +54,8 @@ if {![istarget "hppa*-hp-hpux*"] && ![istarget "*-linux*"]} then {
 # on some architecture.
 #if { ![istarget "i\[34567\]86-*-linux*"]
 if { ![istarget "x86_64-*-linux*"] && ![istarget "i\[34567\]86-*-linux*"]
-     && ![istarget "powerpc-*-linux*"] && ![istarget "powerpc64-*-linux*"] } {
+     && ![istarget "powerpc-*-linux*"] && ![istarget "powerpc64-*-linux*"]
+     && ![istarget "sparc-*-linux*"] && ![istarget "sparc64-*-linux*"] } {
      continue
 }
 
@@ -415,10 +416,11 @@ proc do_syscall_tests_without_xml {} {
 proc fill_all_syscalls_numbers {} {
     global all_syscalls_numbers
 
-    # For Linux on x86, PPC and PPC64, the numbers for the syscalls "close" and
-    # "chroot" are the same.
-    if { ![istarget "i\[34567\]86-*-linux*"]
-         || ![istarget "powerpc-*-linux*"] || ![istarget "powerpc64-*-linux*"] } {
+    # For Linux on x86, PPC, PPC64, SPARC and SPARC64, the numbers for the syscalls
+    # "close" and "chroot" are the same.
+    if { [istarget "i\[34567\]86-*-linux*"]
+         || [istarget "powerpc-*-linux*"] || [istarget "powerpc64-*-linux*"]
+         || [istarget "sparc-*-linux*"] || [istarget "sparc64-*-linux*"] } {
          set all_syscalls_numbers { "6" "61" }
     }
 }