diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | Makeconfig | 2 | ||||
| -rw-r--r-- | Makerules | 2 | ||||
| -rw-r--r-- | nptl/ChangeLog | 5 | ||||
| -rw-r--r-- | nptl/sysdeps/unix/sysv/linux/ia64/clone2.S | 4 |
5 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 3dd2cb6dc7..799d1bb296 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 a0638f8343..cc44b00012 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 13d9248479..98a06400b5 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 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 |