From 0f48659e36e72c091f988d9ea5a2dd505960ab0f Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Fri, 20 Jul 2012 19:20:34 +0000 Subject: Move localplt baselines to sysdeps directories. --- elf/Makefile | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'elf/Makefile') diff --git a/elf/Makefile b/elf/Makefile index 90541991d2..b99937624c 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -947,15 +947,6 @@ $(all-built-dso:=.jmprel): %.jmprel: % Makefile mv -f $@T $@ common-generated += $(all-built-dso:$(common-objpfx)%=%.jmprel) -check-data := $(firstword $(wildcard \ - $(foreach D,$(add-ons) scripts,\ - $(patsubst %,$(..)$D/data/localplt-%.data,\ - $(abi-name) \ - $(addsuffix -$(config-os),\ - $(config-machine) \ - $(base-machine)) \ - generic)))) - tests: $(objpfx)check-localplt.out localplt-built-dso := $(addprefix $(common-objpfx),\ @@ -970,12 +961,14 @@ ifeq ($(have-thread-library),yes) localplt-built-dso += $(filter-out %_nonshared.a, $(shared-thread-library)) endif +vpath localplt.data $(+sysdep_dirs) + $(objpfx)check-localplt.out: $(..)scripts/check-localplt.awk \ $(..)scripts/localplt.awk \ $(localplt-built-dso:=.jmprel) \ - $(check-data) - LC_ALL=C $(AWK) -f $(filter-out $< $(check-data),$^) | \ - LC_ALL=C $(AWK) -f $< $(check-data) - \ + localplt.data + LC_ALL=C $(AWK) -f $(filter-out $< %localplt.data,$^) | \ + LC_ALL=C $(AWK) -f $< $(filter %localplt.data,$^) - \ > $@ endif -- cgit 1.4.1