diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-03 17:10:55 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2013-03-03 17:10:55 +0000 |
| commit | d15f124ff59606604c0243ee19cd67bc99ecd09f (patch) | |
| tree | f0b18e431b15b797d5f5dc980928cd1a26b8f74a /libc/Makerules | |
| parent | c1078e9067234e88d5c1ca8af18ae67b64141d66 (diff) | |
Merge changes between r22241 and r22552 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@22553 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/Makerules')
| -rw-r--r-- | libc/Makerules | 31 |
1 files changed, 8 insertions, 23 deletions
diff --git a/libc/Makerules b/libc/Makerules index 7cc82627b..d1d6ca24f 100644 --- a/libc/Makerules +++ b/libc/Makerules @@ -432,20 +432,15 @@ static-only-routines = endif endif -# Bounded pointer thunks are only built for *.ob -elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks)) - elide-routines.oS += $(filter-out $(static-only-routines),\ - $(routines) $(aux) $(sysdep_routines)) \ - $(elide-bp-thunks) -elide-routines.os += $(static-only-routines) $(elide-bp-thunks) + $(routines) $(aux) $(sysdep_routines)) +elide-routines.os += $(static-only-routines) # If we have versioned code we don't need the old versions in any of the # static libraries. -elide-routines.o += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.op += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.og += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.ob += $(shared-only-routines) +elide-routines.o += $(shared-only-routines) +elide-routines.op += $(shared-only-routines) +elide-routines.og += $(shared-only-routines) # Shared library building. @@ -633,11 +628,7 @@ headers := $(headers) $(sysdep_headers) # This is the list of all object files, gotten by # replacing every ".c" in `sources' with a ".o". -# We also add bounded-pointer thunks, which are later -# elided for all suffixes except for `.ob'. -override objects := $(addprefix $(objpfx),$(sources:.c=.o) \ - $(patsubst %,$(bppfx)%.o,\ - $(filter $(routines) $(sysdep_routines),$(bp-thunks)))) +override objects := $(addprefix $(objpfx),$(sources:.c=.o)) # The makefile may define $(extra-libs) with `libfoo libbar' @@ -1340,9 +1331,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: @@ -1351,12 +1340,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)) |