diff options
Diffstat (limited to 'Makerules')
| -rw-r--r-- | Makerules | 20 |
1 files changed, 6 insertions, 14 deletions
@@ -409,19 +409,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.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. @@ -601,11 +597,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' |