OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2003-04-11 Roland McGrath <roland@redhat.com> 

* Makefile ($(objpfx)multidir.mk): New target, generated makefile that
	sets variable `multidir'; include that.
	(generated): Add it.
	($(objpfx)$(multidir)/crti.o): New target.
	[$(multidir) != .] (generated-dirs, extra-objs, omit-deps): Add it.
This commit is contained in:
Roland McGrath 2003-04-12 00:00:30 +00:00
parent 4a2939f997
commit 49916ec40a
3 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
linuxthreads/sysdeps/unix/sysv/linux/sparc/Makefile
View File

@ -1,11 +0,0 @@
ifeq ($(subdir),linuxthreads)
# gcc has /usr/lib{,64}/crti.o hardcoded in the specs file, because otherwise
# it would normally find {64,32}bit crt[in].o.
LDFLAGS-pthread.so += -specs=$(objpfx)specs
before-compile += $(objpfx)specs
generated += specs
$(objpfx)specs:
$(CC) $(CFLAGS) $(CPPFLAGS) -dumpspecs \
| sed 's~\(/usr/lib\(\|64\)/\|^\|\([^/a-z]\)\)\(crt[in]\.o\)~\3'$(objpfx)'\4~g' > $@.new
mv -f $@.new $@
endif

9
linuxthreads/sysdeps/unix/sysv/linux/x86_64/Makefile
View File

@ -1,12 +1,3 @@
ifeq ($(subdir),linuxthreads)
CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions -fno-asynchronous-unwind-tables
# gcc -m64 has /usr/lib64/crti.o hardcoded in the specs file, because otherwise
# it would normally find 32bit crti.o.
LDFLAGS-pthread.so += -specs=$(objpfx)specs
before-compile += $(objpfx)specs
generated += specs
$(objpfx)specs:
$(CC) $(CFLAGS) $(CPPFLAGS) -dumpspecs \
| sed 's,\(/usr/lib\(\|64\)/\|^\|\([^/a-z]\)\)\(crt[in]\.o\),\3./\4,g' > $@.new
mv -f $@.new $@
endif

22
nptl/Makefile
View File

@ -327,7 +327,27 @@ $(objpfx)defs.h: $(objpfx)pt-initfini.s
$(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h
$(compile.S) -g0 $(ASFLAGS-.os) -o $@
generated += crti.S defs.h pt-initfini.s $(objpfx)tst-atfork2.mtrace \
# Set the `multidir' variable by grabbing the variable from the compiler.
# We do it once and save the result in a generated makefile.
-include $(objpfx)multidir.mk
$(objpfx)multidir.mk: $(common-objpfx)config.make
dir=`$(CC) $(CFLAGS) $(CPPFLAGS) -print-multi-directory`; \
echo "multidir := $$dir" > $@T
mv -f $@T $@
generated += crti.S defs.h pt-initfini.s multidir.mk
extra-objs += crti.o
omit-deps += crti
ifneq (,$(filter-out .,$(multidir)))
generated-dirs := $(firstword $(subst /, , $(multidir)))
extra-objs += $(multidir)/crti.o
omit-deps += $(multidir)/crti
$(objpfx)$(multidir)/crti.o: $(objpfx)crti.o $(objpfx)$(multidir)/
ln -f $< $@
endif
generated += $(objpfx)tst-atfork2.mtrace \
$(addsuffix .so,$(strip $(modules-names)))
$(objpfx)version.d: $(objpfx)banner.h