From 3192fd8e464f2364347979fd58ae95d03bbe74e6 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@gnu.org>
Date: Wed, 1 Mar 2006 04:20:27 +0000
Subject: [PATCH] * Makeconfig (+includes): Add back $(includes)

	after $(+sysdep-includes).

	* Makerules ($(common-objpfx)%.make): Use -DASSEMBLER.
---
 ChangeLog                                  | 7 +++++++
 Makeconfig                                 | 2 +-
 Makerules                                  | 2 +-
 nptl/ChangeLog                             | 5 +++++
 nptl/sysdeps/unix/sysv/linux/ia64/clone2.S | 4 ++--
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3dd2cb6..799d1bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-02-28  Roland McGrath  <roland@redhat.com>
+
+	* Makeconfig (+includes): Add back $(includes)
+	after $(+sysdep-includes).
+
+	* Makerules ($(common-objpfx)%.make): Use -DASSEMBLER.
+
 2006-02-28  Jakub Jelinek  <jakub@redhat.com>
 
 	* posix/sys/types.h [!__GNUC_PREREQ (2, 7)] (int64_t, u_int64_t):
diff --git a/Makeconfig b/Makeconfig
index a0638f8..cc44b00 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -647,7 +647,7 @@ endif	# $(+cflags) == ""
 # current directory.
 +sysdep-includes = $(addprefix -I,$(+sysdep_dirs))
 +includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \
-	    $(+sysdep-includes) \
+	    $(+sysdep-includes) $(includes) \
 	    $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
 
 # Since libio has several internal header files, we use a -I instead
diff --git a/Makerules b/Makerules
index 13d9248..98a0640 100644
--- a/Makerules
+++ b/Makerules
@@ -149,7 +149,7 @@ ifndef subdir
 $(common-objpfx)%.make: $(..)%.make.c $(..)Makerules $(common-before-compile)
 	rm -f $@T $@.dT
 	(echo '# Generated from $*.make.c by Makerules.'; \
-	 $(CC) $(CFLAGS) $(CPPFLAGS) -E $< \
+	 $(CC) $(CFLAGS) $(CPPFLAGS) -E -DASSEMBLER $< \
 	       -MD -MP -MT '$$(common-objpfx)$*.make' -MF $@.dT \
 	 | sed -n '/@@@/{s/@@@[	 ]*\(.*\)@@@/\1/;s/[	 ]*$$//p;}'; \
 	 echo 'common-generated += $(@F)'; \
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1713a83..8c761fd 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 675a997..91f28ba 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
-- 
2.7.4