AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
after $(+sysdep-includes).

	* Makerules ($(common-objpfx)%.make): Use -DASSEMBLER.
This commit is contained in:
Roland McGrath 2006-03-01 04:20:27 +00:00
parent 556c18b2b8
commit 3192fd8e46
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2006-02-28 Jakub Jelinek <jakub@redhat.com>
* posix/sys/types.h [!__GNUC_PREREQ (2, 7)] (int64_t, u_int64_t): * posix/sys/types.h [!__GNUC_PREREQ (2, 7)] (int64_t, u_int64_t):

2
Makeconfig
View File

@ -647,7 +647,7 @@ endif # $(+cflags) == ""
# current directory. # current directory.
+sysdep-includes = $(addprefix -I,$(+sysdep_dirs)) +sysdep-includes = $(addprefix -I,$(+sysdep_dirs))
+includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \ +includes = -I$(..)include $(if $(subdir),$(objpfx:%/=-I%)) \
$(+sysdep-includes) \ $(+sysdep-includes) $(includes) \
$(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes) $(patsubst %/,-I%,$(..)) $(libio-include) -I. $(sysincludes)
# Since libio has several internal header files, we use a -I instead # Since libio has several internal header files, we use a -I instead

2
Makerules
View File

@ -149,7 +149,7 @@ ifndef subdir
$(common-objpfx)%.make: $(..)%.make.c $(..)Makerules $(common-before-compile) $(common-objpfx)%.make: $(..)%.make.c $(..)Makerules $(common-before-compile)
rm -f $@T $@.dT rm -f $@T $@.dT
(echo '# Generated from $*.make.c by Makerules.'; \ (echo '# Generated from $*.make.c by Makerules.'; \
$(CC) $(CFLAGS) $(CPPFLAGS) -E $< \ $(CC) $(CFLAGS) $(CPPFLAGS) -E -DASSEMBLER $< \
-MD -MP -MT '$$(common-objpfx)$*.make' -MF $@.dT \ -MD -MP -MT '$$(common-objpfx)$*.make' -MF $@.dT \
| sed -n '/@@@/{s/@@@[ ]*\(.*\)@@@/\1/;s/[ ]*$$//p;}'; \ | sed -n '/@@@/{s/@@@[ ]*\(.*\)@@@/\1/;s/[ ]*$$//p;}'; \
echo 'common-generated += $(@F)'; \ echo 'common-generated += $(@F)'; \

5
nptl/ChangeLog
View File

@ -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> 2006-02-27 Jakub Jelinek <jakub@redhat.com>
* Makefile (libpthread-routines): Add * Makefile (libpthread-routines): Add

4
nptl/sysdeps/unix/sysv/linux/ia64/clone2.S
View File

@ -2,8 +2,8 @@
So, #include ourselves and in that incarnation we can use #include_next. */ So, #include ourselves and in that incarnation we can use #include_next. */
#ifndef INCLUDED_SELF #ifndef INCLUDED_SELF
# define INCLUDED_SELF # define INCLUDED_SELF
# include <clone.S> # include <clone2.S>
#else #else
# define RESET_PID # define RESET_PID
# include_next <clone.S> # include_next <clone2.S>
#endif #endif