2003-01-23 Roland McGrath <roland@redhat.com>

	* util.c [LINUX && SPARC]: Do renaming kludges around <asm/reg.h>
	like signal.c does.

diff --git a/util.c b/util.c
index 7b6262062993ac459167e149e3ee31e5c6d571c8..8343e2425df70ebf0f8eec0bed7449fc14fbfc9d 100644 (file)
--- a/util.c
+++ b/util.c
@@ -72,7 +72,13 @@
 
 #if defined(LINUX) && defined(SPARC)
 
-#include <asm/reg.h>
+# define fpq kernel_fpq
+# define fq kernel_fq
+# define fpu kernel_fpu
+# include <asm/reg.h>
+# undef fpq
+# undef fq
+# undef fpu
 
 #if !defined(__GLIBC__)
 
@@ -608,7 +614,8 @@ char *laddr;
                                /* Ran into 'end of memory' - stupid "printpath" */
                                return 0;
                        }
-                       perror("ptrace: umoven");
+                       if (addr != 0)
+                               perror("ptrace: umoven");
                        return -1;
                }
                started = 1;