diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 1ccc41255..11a14634c 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-28  Shaun Jackman  <sjackman@gmail.com>
+
+	* libgloss/syscalls.c (get_errno): Add an output register constraint.
+
 2005-04-19  Eric Christopher  <echristo@redhat.com>
 
 	* mips/regs.S: Sign extend constants for mips64 and unify
diff --git a/libgloss/arm/syscalls.c b/libgloss/arm/syscalls.c
index e89022806..a215d7a50 100644
--- a/libgloss/arm/syscalls.c
+++ b/libgloss/arm/syscalls.c
@@ -179,7 +179,9 @@ get_errno (void)
 #ifdef ARM_RDI_MONITOR
   return do_AngelSWI (AngelSWI_Reason_Errno, NULL);
 #else
-  asm ("swi %a0" :: "i" (SWI_GetErrno));
+  register r0 asm("r0");
+  asm ("swi %a1" : "=3Dr"(r0) : "i" (SWI_GetErrno));
+  return r0;
 #endif
 }