summaryrefslogtreecommitdiff
path: root/libc/sysdeps/linux
diff options
context:
space:
mode:
authorEric Andersen <andersen@codepoet.org>2001-05-16 21:48:24 +0000
committerEric Andersen <andersen@codepoet.org>2001-05-16 21:48:24 +0000
commit858387985650a4b72bb5b5fe02e864f8e76a3731 (patch)
tree8817a027ee6d50a1052f182ab58c0c000363bfb9 /libc/sysdeps/linux
parentf2eb46b4e6cf7ac023106a0d688d0e55b88cabaa (diff)
Move the default ptrace.c to common, but let arches override it (such
as m68k which has some asm in its version). -Erik
Diffstat (limited to 'libc/sysdeps/linux')
-rw-r--r--libc/sysdeps/linux/arm/Makefile2
-rw-r--r--libc/sysdeps/linux/common/Makefile2
-rw-r--r--libc/sysdeps/linux/common/ptrace.c51
-rw-r--r--libc/sysdeps/linux/powerpc/Makefile1
-rw-r--r--libc/sysdeps/linux/sparc/Makefile4
5 files changed, 54 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile
index f63b5ff62..8c543ac4e 100644
--- a/libc/sysdeps/linux/arm/Makefile
+++ b/libc/sysdeps/linux/arm/Makefile
@@ -36,7 +36,7 @@ CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0))
SSRC=longjmp.S setjmp.S vfork.S
SOBJS=$(patsubst %.S,%.o, $(SSRC))
-CSRC=ptrace.c
+CSRC=
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(SOBJS) $(MOBJ) $(COBJS)
diff --git a/libc/sysdeps/linux/common/Makefile b/libc/sysdeps/linux/common/Makefile
index 1e1957227..1d4326b4c 100644
--- a/libc/sysdeps/linux/common/Makefile
+++ b/libc/sysdeps/linux/common/Makefile
@@ -26,7 +26,7 @@ include $(TOPDIR)Rules.mak
CSRC= waitpid.c getdents.c kernel_version.c statfix.c getdnnm.c tell.c gethstnm.c \
mkfifo.c setegid.c wait.c errno.c getpagesize.c seteuid.c wait3.c setpgrp.c \
- getdtablesize.c create_module.c
+ getdtablesize.c create_module.c ptrace.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
MSRC=syscalls.c
diff --git a/libc/sysdeps/linux/common/ptrace.c b/libc/sysdeps/linux/common/ptrace.c
new file mode 100644
index 000000000..bc4debdac
--- /dev/null
+++ b/libc/sysdeps/linux/common/ptrace.c
@@ -0,0 +1,51 @@
+/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Library General Public License as
+ published by the Free Software Foundation; either version 2 of the
+ License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Library General Public License for more details.
+
+ You should have received a copy of the GNU Library General Public
+ License along with the GNU C Library; see the file COPYING.LIB. If not,
+ write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
+
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/ptrace.h>
+#include <stdarg.h>
+
+
+extern long int __ptrace (enum __ptrace_request, pid_t, void *, void *);
+
+long int
+ptrace (enum __ptrace_request request, ...)
+{
+ long int res, ret;
+ va_list ap;
+ pid_t pid;
+ void *addr, *data;
+
+ va_start (ap, request);
+ pid = va_arg (ap, pid_t);
+ addr = va_arg (ap, void *);
+ data = va_arg (ap, void *);
+ va_end (ap);
+
+ if (request > 0 && request < 4)
+ data = &ret;
+
+ res = __ptrace(request, pid, addr, data);
+ if (res >= 0 && request > 0 && request < 4) {
+ __set_errno(0);
+ return ret;
+ }
+
+ return res;
+}
diff --git a/libc/sysdeps/linux/powerpc/Makefile b/libc/sysdeps/linux/powerpc/Makefile
index 4614627a7..b34b6c27a 100644
--- a/libc/sysdeps/linux/powerpc/Makefile
+++ b/libc/sysdeps/linux/powerpc/Makefile
@@ -39,7 +39,6 @@ endif
SSRC=longjmp.S setjmp.S vfork.S
SOBJS=$(patsubst %.S,%.o, $(SSRC))
-#CSRC=ptrace.c
CSRC=
COBJS=$(patsubst %.c,%.o, $(CSRC))
diff --git a/libc/sysdeps/linux/sparc/Makefile b/libc/sysdeps/linux/sparc/Makefile
index ba1c37f99..c713f18a0 100644
--- a/libc/sysdeps/linux/sparc/Makefile
+++ b/libc/sysdeps/linux/sparc/Makefile
@@ -28,11 +28,9 @@ CRT0=crt0.S
CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0))
SSRC=__longjmp.S setjmp.S vfork.S
-#SSRC=__longjmp.S _start.S setjmp.S vfork.S
SOBJS=$(patsubst %.S,%.o, $(SSRC))
-CSRC=fork.c ptrace.c
-#CSRC=fork.c ptrace.c
+CSRC=fork.c
COBJS=$(patsubst %.c,%.o, $(CSRC))
OBJS=$(SOBJS) $(MOBJ) $(COBJS)