summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Stubbs <ams@codesourcery.com>2009-09-15 18:02:48 -0400
committerAustin Foxley <austinf@cetoncorp.com>2009-09-18 11:45:11 -0700
commitd1b18e3843158ccb14ee78cf044493e290f86377 (patch)
tree01594c96b018f44736ac6e7146b322d370449e68
parent0d5b9c86de553d3e620d0594268f3978f31220b6 (diff)
downloaduClibc-alpine-d1b18e3843158ccb14ee78cf044493e290f86377.tar.bz2
uClibc-alpine-d1b18e3843158ccb14ee78cf044493e290f86377.tar.xz
sh/user.h: clean up conflicts from kernel user.h
This patch makes sufficient modifications to the SH sys/user.h to be able to build and run gdbserver with Linux kernel 2.6.30. The problem is that both the kernel and library headers define the same symbols, thus making it impossible in include both headers. The patch undefines the kernel symbols in favour of the library symbols. Signed-off-by: Andrew Stubbs <ams@codesourcery.com> Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
-rw-r--r--libc/sysdeps/linux/sh/sys/user.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/libc/sysdeps/linux/sh/sys/user.h b/libc/sysdeps/linux/sh/sys/user.h
index b1adc13b7..91b00916b 100644
--- a/libc/sysdeps/linux/sh/sys/user.h
+++ b/libc/sysdeps/linux/sh/sys/user.h
@@ -22,6 +22,17 @@
#include <unistd.h>
#include <asm/ptrace.h>
+/* asm/ptrace.h polutes the namespace. */
+#undef PTRACE_GETREGS
+#undef PTRACE_SETREGS
+#undef PTRACE_GETFPREGS
+#undef PTRACE_SETFPREGS
+#undef PTRACE_GETFDPIC
+#undef PTRACE_GETFDPIC_EXEC
+#undef PTRACE_GETFDPIC_INTERP
+#undef PTRACE_GETDSPREGS
+#undef PTRACE_SETDSPREGS
+
/*
* Core file format: The core file is written in such a way that gdb
* can understand it and provide useful information to the user (under