diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2012-02-21 00:46:01 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2012-02-21 00:46:01 +0000 |
| commit | 0e7dfaef514bbb3ec08934c6f7f42953bc149257 (patch) | |
| tree | 3a2373ee1f9a7a0bc8d09b5e261e393a9fae2ae3 /nptl/Makefile | |
| parent | 599af3ca61ab0841bd968c8965e2efb2c1df2dd3 (diff) | |
| download | glibc-0e7dfaef514bbb3ec08934c6f7f42953bc149257.tar glibc-0e7dfaef514bbb3ec08934c6f7f42953bc149257.tar.gz glibc-0e7dfaef514bbb3ec08934c6f7f42953bc149257.tar.bz2 glibc-0e7dfaef514bbb3ec08934c6f7f42953bc149257.zip | |
Remove old initfini mechanism.
Diffstat (limited to 'nptl/Makefile')
| -rw-r--r-- | nptl/Makefile | 49 |
1 files changed, 1 insertions, 48 deletions
diff --git a/nptl/Makefile b/nptl/Makefile index b43e448a92..c39230d818 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -334,25 +334,12 @@ 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) -else extra-objs += pt-crti.o endif -endif CFLAGS-flockfile.c = -D_IO_MTSAFE_IO CFLAGS-ftrylockfile.c = -D_IO_MTSAFE_IO @@ -551,47 +538,13 @@ $(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 - sed -n -e '1,/@HEADER_ENDS/p' \ - -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \ - -e '/@TRAILER_BEGINS/,$$p' $< > $@ -$(objpfx)crtn.S: $(objpfx)pt-initfini.s - sed -n -e '1,/@HEADER_ENDS/p' \ - -e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \ - -e '/@TRAILER_BEGINS/,$$p' $< > $@ - -$(objpfx)defs.h: $(objpfx)pt-initfini.s - sed -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \ - $(AWK) -f ../csu/defs.awk > $@ - -$(objpfx)crti.o: $(objpfx)crti.S $(objpfx)defs.h - $(compile.S) -g0 $(ASFLAGS-.os) -o $@ - -$(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 $< $@ @@ -600,7 +553,7 @@ $(objpfx)$(multidir)/crtn.o: $(objpfx)crtn.o $(objpfx)$(multidir)/ ln -f $< $@ endif -generated += crti.S crtn.S defs.h pt-initfini.s libpthread_nonshared.a \ +generated += libpthread_nonshared.a \ multidir.mk tst-atfork2.mtrace tst-cancel-wrappers.out \ tst-tls6.out |