* Makeconfig (+includes): Add back $(includes)

	after $(+sysdep-includes).

	* Makerules ($(common-objpfx)%.make): Use -DASSEMBLER.

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):

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

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)'; \

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

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