diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-02-08 01:45:26 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-02-08 01:45:26 +0000 |
| commit | 3add8e1353d62d77fdd9b4ca363cdfe7006b0efb (patch) | |
| tree | 39d3a6907fc55059bf6705f1ea8a372a23bdeff5 /nptl/Makefile | |
| parent | a22f12b477654522f5be86a0148c30b7a24bd507 (diff) | |
| download | glibc-3add8e1353d62d77fdd9b4ca363cdfe7006b0efb.tar.gz glibc-3add8e1353d62d77fdd9b4ca363cdfe7006b0efb.tar.xz glibc-3add8e1353d62d77fdd9b4ca363cdfe7006b0efb.zip | |
Support crti.S and crtn.S provided directly by architectures.
Diffstat (limited to 'nptl/Makefile')
| -rw-r--r-- | nptl/Makefile | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index 0c317b0479..81661b3133 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -335,15 +335,23 @@ ifneq (,$(patsubst .,,$(multidir))) generated-dirs := $(firstword $(subst /, , $(multidir))) crti-objs += $(multidir)/crti.o crtn-objs += $(multidir)/crtn.o +# Conditionals on the existence of a sysdeps version of crti.S are +# temporary until all targets either have such a file or have been +# removed, after which the old approach of postprocessing compiler +# output will be removed. +ifeq (,$(wildcard $(sysdirs:%=%/crti.S))) omit-deps += $(multidir)/crti $(multidir)/crtn +endif $(objpfx)$(multidir): mkdir -p $@ endif extra-objs += $(crti-objs) $(crtn-objs) +ifeq (,$(wildcard $(sysdirs:%=%/crti.S))) omit-deps += crti crtn CFLAGS-pt-initfini.s = -g0 -fPIC -fno-inline-functions $(fno-unit-at-a-time) endif +endif CFLAGS-flockfile.c = -D_IO_MTSAFE_IO CFLAGS-ftrylockfile.c = -D_IO_MTSAFE_IO @@ -542,15 +550,24 @@ $(addprefix $(objpfx),$(tests) $(test-srcs)): $(objpfx)libpthread.a endif ifeq ($(build-shared),yes) +ifeq (,$(wildcard $(sysdirs:%=%/crti.S))) vpath pt-initfini.c $(sysdirs) $(objpfx)pt-initfini.s: pt-initfini.c $(compile.c) -S $(CFLAGS-pt-initfini.s) -finhibit-size-directive \ $(patsubst -f%,-fno-%,$(exceptions)) -o $@ +endif $(objpfx)tst-cleanup0.out: /dev/null $(objpfx)tst-cleanup0 $(make-test-out) 2>&1 | cmp - tst-cleanup0.expect > $@ +ifneq (,$(wildcard $(sysdirs:%=%/crti.S))) + +$(objpfx)crti.o: $(objpfx)pt-crti.o + ln -f $< $@ + +else + # We only have one kind of startup code files. Static binaries and # shared libraries are build using the PIC version. $(objpfx)crti.S: $(objpfx)pt-initfini.s @@ -572,6 +589,8 @@ $(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h $(objpfx)crtn.o: $(objpfx)crtn.S $(objpfx)defs.h $(compile.S) -g0 $(ASFLAGS-.os) -o $@ +endif + ifneq ($(multidir),.) $(objpfx)$(multidir)/crti.o: $(objpfx)crti.o $(objpfx)$(multidir)/ ln -f $< $@ |