aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-02-28 07:09:47 +0000
committerRoland McGrath <roland@gnu.org>2006-02-28 07:09:47 +0000
commit5c67709f59ccf092af82c77eef005a2180824b7f (patch)
tree9f46b90d4de686e7e19ffb976a895cd36856a9f7
parenta883978723ca006fa66c5a13c28c4791779bd0e0 (diff)
downloadglibc-5c67709f59ccf092af82c77eef005a2180824b7f.tar.xz
glibc-5c67709f59ccf092af82c77eef005a2180824b7f.zip
2006-02-27 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/sleep.c: Use #include_next after #include of self to get main source tree's file. * sysdeps/unix/sysv/linux/alpha/clone.S: Likewise. * sysdeps/unix/sysv/linux/i386/clone.S: Likewise. * sysdeps/unix/sysv/linux/i386/vfork.S: Likewise. * sysdeps/unix/sysv/linux/ia64/clone2.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Likewise. * sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Likewise. * sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise. * sysdeps/unix/sysv/linux/sh/clone.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. * sysdeps/unix/sysv/linux/x86_64/vfork.S: Likewise.
-rw-r--r--sysdeps/unix/sysv/linux/alpha/nptl/clone.S11
1 files changed, 9 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/alpha/nptl/clone.S b/sysdeps/unix/sysv/linux/alpha/nptl/clone.S
index eea1cbeed1..675a997e97 100644
--- a/sysdeps/unix/sysv/linux/alpha/nptl/clone.S
+++ b/sysdeps/unix/sysv/linux/alpha/nptl/clone.S
@@ -1,2 +1,9 @@
-#define RESET_PID
-#include <sysdeps/unix/sysv/linux/alpha/clone.S>
+/* We want an #include_next, but we are the main source file.
+ So, #include ourselves and in that incarnation we can use #include_next. */
+#ifndef INCLUDED_SELF
+# define INCLUDED_SELF
+# include <clone.S>
+#else
+# define RESET_PID
+# include_next <clone.S>
+#endif