summary refs log tree commit diff
path: root/nptl
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2006-03-01 04:20:27 +0000
committerRoland McGrath <roland@gnu.org>2006-03-01 04:20:27 +0000
commit3192fd8e464f2364347979fd58ae95d03bbe74e6 (patch)
treecf688dbca33d8f7c36e031856c37d03d91ddae50 /nptl
parent556c18b2b87ca7de710fe08b580547eac5251c59 (diff)
downloadglibc-3192fd8e464f2364347979fd58ae95d03bbe74e6.tar.gz
glibc-3192fd8e464f2364347979fd58ae95d03bbe74e6.tar.xz
glibc-3192fd8e464f2364347979fd58ae95d03bbe74e6.zip
* Makeconfig (+includes): Add back $(includes)
	after $(+sysdep-includes).

	* Makerules ($(common-objpfx)%.make): Use -DASSEMBLER.
Diffstat (limited to 'nptl')
-rw-r--r--nptl/ChangeLog5
-rw-r--r--nptl/sysdeps/unix/sysv/linux/ia64/clone2.S4
2 files changed, 7 insertions, 2 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1713a8367d..8c761fdd90 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* sysdeps/unix/sysv/linux/ia64/clone2.S: Include <clone2.S>
+	instead of <clone.S>.
+
 2006-02-27  Jakub Jelinek  <jakub@redhat.com>
 
 	* Makefile (libpthread-routines): Add
diff --git a/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S b/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S
index 675a997e97..91f28bab37 100644
--- a/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S
+++ b/nptl/sysdeps/unix/sysv/linux/ia64/clone2.S
@@ -2,8 +2,8 @@
    So, #include ourselves and in that incarnation we can use #include_next.  */
 #ifndef INCLUDED_SELF
 # define INCLUDED_SELF
-# include <clone.S>
+# include <clone2.S>
 #else
 # define RESET_PID
-# include_next <clone.S>
+# include_next <clone2.S>
 #endif