diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:32:04 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-23 23:32:04 +0200 |
| commit | b934acf0e93c5a220551ed6e686bb9d45a24a8cc (patch) | |
| tree | 6b76174cee7beb11e7446bdc3ed5b96e02aa92c4 /Makerules | |
| parent | 0c9a20fba32aa9330b9220b363a378e78e97dbf5 (diff) | |
| parent | af15c191766fd413ef6fedc9d54b87962332ca71 (diff) | |
Merge commit 'refs/top-bases/baseline' into baseline
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 17 |
1 files changed, 5 insertions, 12 deletions
@@ -418,7 +418,6 @@ elide-routines.os += $(static-only-routines) elide-routines.o += $(shared-only-routines) elide-routines.op += $(shared-only-routines) elide-routines.og += $(shared-only-routines) -elide-routines.ob += $(shared-only-routines) # Shared library building. @@ -865,7 +864,7 @@ ifeq (no,$(cross-compiling)) symbolic-link-prog := $(common-objpfx)elf/sln symbolic-link-list := $(common-objpfx)elf/symlink.list define make-shlib-link -echo $(<F) $@ >> $(symbolic-link-list) +echo `$(..)scripts/rellns-sh -p $< $@` $@ >> $(symbolic-link-list) endef else # cross-compiling # We need a definition that can be used by elf/Makefile's install rules. @@ -875,7 +874,7 @@ endif ifndef make-shlib-link define make-shlib-link rm -f $@ -$(LN_S) $(<F) $@ +$(LN_S) `$(..)scripts/rellns-sh -p $< $@` $@ endef endif @@ -929,7 +928,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \ cat $<; \ echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \ '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ - ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \ + ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \ ) > $@.new mv -f $@.new $@ @@ -1265,9 +1264,7 @@ mostlyclean: common-mostlyclean do-tests-clean: -rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) $(xtests) \ - $(test-srcs)) \ - $(addsuffix -bp.out,$(tests) $(xtests) \ - $(test-srcs))) + $(test-srcs))) # Remove the object files. common-mostlyclean: @@ -1276,12 +1273,8 @@ common-mostlyclean: $(addsuffix .o,$(tests) $(xtests) \ $(test-srcs) $(others) \ $(sysdep-others)) \ - $(addsuffix -bp,$(tests) $(xtests) \ - $(test-srcs)) \ $(addsuffix .out,$(tests) $(xtests) \ - $(test-srcs)) \ - $(addsuffix -bp.out,$(tests) $(xtests) \ - $(test-srcs))) + $(test-srcs))) -rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \ $(install-lib) $(install-lib.so) \ $(install-lib.so:%.so=%_pic.a)) |