This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: RFC: Should we link dynamic tests to use the newly built glibcdirctly
On Sat, Oct 06, 2012 at 04:13:32PM -0700, H.J. Lu wrote:
> Hi,
>
> The current dynamic tests requires
>
> ../ld.so --library-path ...
>
> to run. It isn't easy to run it under gdb. Should we link dynamic tests
> to use the newly built glibc directly? Like
>
> gcc -nostdlib -nostartfiles -o
> /export/build/gnu/glibc/build-x86_64-linux/string/test-strstr-ifunc
> -Wl,-dynamic-linker=/export/build/gnu/glibc/build-x86_64-linux/elf/ld-linux-x86-64.so.2
> -Wl,-z,combreloc -Wl,-z,relro -Wl,--hash-style=both
> /export/build/gnu/glibc/build-x86_64-linux/csu/crt1.o
> /export/build/gnu/glibc/build-x86_64-linux/csu/crti.o `gcc
> --print-file-name=crtbegin.o`
> /export/build/gnu/glibc/build-x86_64-linux/string/test-strstr-ifunc.o
> -Wl,-rpath=/export/build/gnu/glibc/build-x86_64-linux:/export/build/gnu/glibc/build-x86_64-linux/math:/export/build/gnu/glibc/build-x86_64-linux/elf:/export/build/gnu/glibc/build-x86_64-linux/dlfcn:/export/build/gnu/glibc/build-x86_64-linux/nss:/export/build/gnu/glibc/build-x86_64-linux/nis:/export/build/gnu/glibc/build-x86_64-linux/rt:/export/build/gnu/glibc/build-x86_64-linux/resolv:/export/build/gnu/glibc/build-x86_64-linux/crypt:/export/build/gnu/glibc/build-x86_64-linux/nptl
> /export/build/gnu/glibc/build-x86_64-linux/libc.so.6
> /export/build/gnu/glibc/build-x86_64-linux/libc_nonshared.a
> -Wl,--as-needed /export/build/gnu/glibc/build-x86_64-linux/elf/ld.so
> -Wl,--no-as-needed -lgcc -Wl,--as-needed -lgcc_s -Wl,--no-as-needed
> `gcc --print-file-name=crtend.o`
> /export/build/gnu/glibc/build-x86_64-linux/csu/crtn.o
>
> instead of
>
> gcc -nostdlib -nostartfiles -o
> /export/build/gnu/glibc/build-x86_64-linux/string/test-strstr-ifunc
> -Wl,-dynamic-linker=/lib64/ld-linux-x86-64.so.2 -Wl,-z,combreloc
> -Wl,-z,relro -Wl,--hash-style=both
> /export/build/gnu/glibc/build-x86_64-linux/csu/crt1.o
> /export/build/gnu/glibc/build-x86_64-linux/csu/crti.o `gcc
> --print-file-name=crtbegin.o`
> /export/build/gnu/glibc/build-x86_64-linux/string/test-strstr-ifunc.o
> -Wl,-rpath-link=/export/build/gnu/glibc/build-x86_64-linux:/export/build/gnu/glibc/build-x86_64-linux/math:/export/build/gnu/glibc/build-x86_64-linux/elf:/export/build/gnu/glibc/build-x86_64-linux/dlfcn:/export/build/gnu/glibc/build-x86_64-linux/nss:/export/build/gnu/glibc/build-x86_64-linux/nis:/export/build/gnu/glibc/build-x86_64-linux/rt:/export/build/gnu/glibc/build-x86_64-linux/resolv:/export/build/gnu/glibc/build-x86_64-linux/crypt:/export/build/gnu/glibc/build-x86_64-linux/nptl
> /export/build/gnu/glibc/build-x86_64-linux/libc.so.6
> /export/build/gnu/glibc/build-x86_64-linux/libc_nonshared.a
> -Wl,--as-needed /export/build/gnu/glibc/build-x86_64-linux/elf/ld.so
> -Wl,--no-as-needed -lgcc -Wl,--as-needed -lgcc_s -Wl,--no-as-needed
> `gcc --print-file-name=crtend.o`
> /export/build/gnu/glibc/build-x86_64-linux/csu/crtn.o
>
> Then we can run it under gdb directly.
>
Here is the patch to implement it. Any comments?
Thanks.
H.J.
--
>From dbc67fddb578067249ca1b3540bafd308bfb8e0d Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sun, 7 Oct 2012 12:32:27 -0700
Subject: [PATCH] Link dynamic tests with newly built glibc
---
Makeconfig | 32 ++++++++++++++++++++------------
Makerules | 8 ++++----
Rules | 2 +-
catgets/Makefile | 10 +++++-----
elf/Makefile | 4 ++--
localedata/Makefile | 12 ++++++------
nptl/Makefile | 8 ++++----
rt/Makefile | 2 +-
stdio-common/Makefile | 2 +-
string/Makefile | 2 +-
timezone/Makefile | 4 ++--
12 files changed, 97 insertions(+), 39 deletions(-)
create mode 100644 ChangeLog.dynamic-test
2012-10-07 H.J. Lu <hongjiu.lu@intel.com>
* Makeconfig (link-pie): Replace $(config-LDFLAGS) with
$(rtld-LDFLAGS).
(link-before-libc): Remove $(config-LDFLAGS).
(+link): Add $(rtld-LDFLAGS) after $(+link-before-libc).
(+link-tests): Add $(rtld-tests-LDFLAGS) after $(+link-before-libc).
(config-LDFLAGS): Renamed to ...
(rtld-LDFLAGS): This.
(rtld-tests-LDFLAGS): New macro.
(link-libc-rpath-link): Likewise.
(link-libc-tests-rpath-link): Likewise.
(link-libc-before-gnulib): Remove -Wl,-rpath-link=$(rpath-link).
(link-libc): Prepand $(link-libc-rpath-link).
(link-libc-tests): Prepand $(link-libc-tests-rpath-link).
* Makerules ($(LINK.o)): Replace $(config-LDFLAGS) with
$(rtld-LDFLAGS).
($(common-objpfx)shlib.lds): Likewise.
(build-module-helper): Likewise.
($(common-objpfx)format.lds): Likewise.
* Rules (make-test-out): Replace $(built-program-cmd) with
$(built-program-file).
* catgets/Makefile ($(objpfx)test1.cat): Likewise.
($(objpfx)test2.cat): Likewise.
($(objpfx)de/libc.cat): Likewise.
($(objpfx)test-gencat.out): Likewise.
($(objpfx)sample.SJIS.cat): Likewise.
* elf/Makefile (tst-stackguard1-ARGS): Likewise.
(tst-stackguard1-static-ARGS): Set to $(tst-stackguard1-ARGS).
* localedata/Makefile ($(addprefix $(objpfx),$(CTYPE_FILES))):
Replace $(built-program-cmd) with $(built-program-file).
($(objpfx)tst-locale.out): Likewise.
($(objpfx)tst-rpmatch.out): Likewise.
($(objpfx)tst-ctype.out): Likewise.
($(objpfx)tst-wctype.out): Likewise.
($(objpfx)tst-langinfo.out): Likewise.
* rt/Makefile (tst-mqueue7-ARGS): Likewise.
* stdio-common/Makefile ($(objpfx)tst-setvbuf1.out): Likewise.
* string/Makefile ($(objpfx)tst-svc.out): Likewise.
* timezone/Makefile (build-testdata): Likewise.
nptl/
2012-10-07 H.J. Lu <hongjiu.lu@intel.com>
* Makefile (tst-cancel7-ARGS: Replace $(built-program-cmd) with
$(built-program-file).
(tst-exec4-ARGS): Likewise.
(tst-stackguard1-ARGS): Likewise.
(tst-stackguard1-static-ARGS): Set to $(tst-stackguard1-ARGS).
diff --git a/Makeconfig b/Makeconfig
index 6a54bf3..ac7b5ae 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -414,7 +414,7 @@ endif
# Command for linking PIE programs with the C library.
ifndef +link-pie
+link-pie = $(CC) -pie -Wl,-O1 -nostdlib -nostartfiles -o $@ \
- $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
+ $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
$(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
$(addprefix $(csu-objpfx),S$(start-installed-name)) \
$(+preinit) $(+prectorS) \
@@ -445,7 +445,7 @@ endif
ifndef +link
ifeq (yes,$(build-shared))
+link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \
- $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
+ $(sysdep-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
$(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
$(addprefix $(csu-objpfx),$(start-installed-name)) \
$(+preinit) $(+prector) \
@@ -455,8 +455,10 @@ ifeq (yes,$(build-shared))
$(common-objpfx)libc% $(+postinit),$^) \
$(link-extra-libs)
+link-after-libc = $(+postctor) $(+postinit)
-+link = $(+link-before-libc) $(link-libc) $(+link-after-libc)
-+link-tests = $(+link-before-libc) $(link-libc-tests) $(+link-after-libc)
++link = $(+link-before-libc) $(rtld-LDFLAGS) $(link-libc) \
+ $(+link-after-libc)
++link-tests = $(+link-before-libc) $(rtld-tests-LDFLAGS) \
+ $(link-libc-tests) $(+link-after-libc)
else
+link = $(+link-static)
+link-tests = $(+link-static-tests)
@@ -474,9 +476,12 @@ ifndef +link-bounded
$(common-objpfx)libc% $(+postinit),$^) \
$(link-extra-libs-bounded) $(link-libc-bounded) $(+postctorT) $(+postinit)
endif
-ifndef config-LDFLAGS
ifeq (yes,$(build-shared))
-config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
+ifndef rtld-LDFLAGS
+rtld-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
+endif
+ifndef rtld-tests-LDFLAGS
+rtld-tests-LDFLAGS = -Wl,-dynamic-linker=$(common-objpfx)elf/ld.so
endif
endif
ifndef link-libc
@@ -484,12 +489,15 @@ ifeq (yes,$(build-shared))
# We need the versioned name of libc.so in the deps of $(others) et al
# so that the symlink to libc.so is created before anything tries to
# run the linked programs.
-link-libc-before-gnulib = -Wl,-rpath-link=$(rpath-link) \
- $(common-objpfx)libc.so$(libc.so-version) \
- $(common-objpfx)$(patsubst %,$(libtype.oS),c) \
- $(as-needed) $(common-objpfx)elf/ld.so $(no-as-needed)
-link-libc = $(link-libc-before-gnulib) $(gnulib)
-link-libc-tests = $(link-libc-before-gnulib) $(gnulib-tests)
+link-libc-rpath-link = -Wl,-rpath-link=$(rpath-link)
+link-libc-tests-rpath-link = -Wl,-rpath=$(rpath-link)
+link-libc-before-gnulib = $(common-objpfx)libc.so$(libc.so-version) \
+ $(common-objpfx)$(patsubst %,$(libtype.oS),c) \
+ $(as-needed) $(common-objpfx)elf/ld.so \
+ $(no-as-needed)
+link-libc = $(link-libc-rpath-link) $(link-libc-before-gnulib) $(gnulib)
+link-libc-tests = $(link-libc-tests-rpath-link) \
+ $(link-libc-before-gnulib) $(gnulib-tests)
# This is how to find at build-time things that will be installed there.
rpath-dirs = math elf dlfcn nss nis rt resolv crypt
rpath-link = \
diff --git a/Makerules b/Makerules
index 1281b94..f3fef3e 100644
--- a/Makerules
+++ b/Makerules
@@ -447,7 +447,7 @@ lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp)
define build-shlib-helper
$(LINK.o) -shared $(static-libgcc) -Wl,-O1 $(sysdep-LDFLAGS) \
- $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) $(config-LDFLAGS) \
+ $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) $(rtld-LDFLAGS) \
$(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \
$(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \
-Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \
@@ -465,7 +465,7 @@ else
$(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
$(LINK.o) -shared -Wl,-O1 \
-nostdlib -nostartfiles \
- $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \
+ $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS.so) \
-Wl,--verbose 2>&1 | \
sed > $@T \
-e '/^=========/,/^=========/!d;/^=========/d' \
@@ -505,7 +505,7 @@ $(build-shlib-helper) -o $@ $(shlib-lds-flags) \
endef
define build-module-helper
-$(LINK.o) -shared $(static-libgcc) $(sysdep-LDFLAGS) $(config-LDFLAGS) \
+$(LINK.o) -shared $(static-libgcc) $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \
$(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \
-B$(csu-objpfx) $(load-map-file) \
$(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \
@@ -909,7 +909,7 @@ $(common-objpfx)format.lds: $(..)scripts/output-format.sed \
ifneq (unknown,$(output-format))
echo > $@.new 'OUTPUT_FORMAT($(output-format))'
else
- $(LINK.o) -shared $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \
+ $(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS.so) \
-x c /dev/null -o $@.so -Wl,--verbose -v 2>&1 \
| sed -n -f $< > $@.new
test -s $@.new
diff --git a/Rules b/Rules
index 17d938e..91a93eb 100644
--- a/Rules
+++ b/Rules
@@ -176,7 +176,7 @@ ifneq "$(strip $(tests) $(xtests) $(test-srcs))" ""
# from the test programs and whatever input files are present.
make-test-out = GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
- $($*-ENV) $(built-program-cmd) $($*-ARGS)
+ $($*-ENV) $(built-program-file) $($*-ARGS)
$(objpfx)%-bp.out: %.input $(objpfx)%-bp
$(make-test-out) > $@ < $(word 1,$^)
$(objpfx)%.out: %.input $(objpfx)%
diff --git a/catgets/Makefile b/catgets/Makefile
index ec8fe1e..8e9d206 100644
--- a/catgets/Makefile
+++ b/catgets/Makefile
@@ -58,15 +58,15 @@ tests: $(objpfx)de/libc.cat $(objpfx)test1.cat $(objpfx)test2.cat \
$(objpfx)test1.cat: test1.msg $(objpfx)gencat
LC_ALL=hr_HR.ISO-8859-2 LOCPATH=$(common-objpfx)localedata \
GCONV_PATH=$(common-objpfx)iconvdata \
- $(built-program-cmd) -H $(objpfx)test1.h $@ $<
+ $(built-program-file) -H $(objpfx)test1.h $@ $<
$(objpfx)test2.cat: test2.msg $(objpfx)gencat
LOCPATH=$(common-objpfx)localedata \
GCONV_PATH=$(common-objpfx)iconvdata \
- $(built-program-cmd) -H $(objpfx)test2.h $@ $<
+ $(built-program-file) -H $(objpfx)test2.h $@ $<
$(objpfx)de/libc.cat: $(objpfx)de.msg $(objpfx)gencat
$(make-target-directory)
LC_ALL=de_DE.ISO-8859-1 LOCPATH=$(common-objpfx)localedata \
- GCONV_PATH=$(common-objpfx)iconvdata $(built-program-cmd) $@ $<
+ GCONV_PATH=$(common-objpfx)iconvdata $(built-program-file) $@ $<
$(objpfx)tst-catgets.out: $(objpfx)de/libc.cat
# Generate a non-simple input file.
@@ -75,9 +75,9 @@ $(objpfx)de.msg: xopen-msg.awk $(..)po/de.po
$(objpfx)test-gencat.out: test-gencat.sh $(objpfx)test-gencat \
$(objpfx)sample.SJIS.cat
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-file)'
$(objpfx)sample.SJIS.cat: sample.SJIS $(objpfx)gencat
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
- $(built-program-cmd) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@
+ $(built-program-file) -H $(objpfx)test-gencat.h < $(word 1,$^) > $@
endif
diff --git a/elf/Makefile b/elf/Makefile
index e91c3b4..55ece3b 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -1044,8 +1044,8 @@ order2mod2.so-no-z-defs = yes
LDFLAGS-order2mod1.so = $(no-as-needed)
LDFLAGS-order2mod2.so = $(no-as-needed)
-tst-stackguard1-ARGS = --command "$(built-program-cmd) --child"
-tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
+tst-stackguard1-ARGS = --command "$(built-program-file) --child"
+tst-stackguard1-static-ARGS = $(tst-stackguard1-ARGS)
$(objpfx)tst-leaks1: $(libdl)
$(objpfx)tst-leaks1-mem: $(objpfx)tst-leaks1.out
diff --git a/localedata/Makefile b/localedata/Makefile
index 5be2413..084bdb8 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -133,7 +133,7 @@ generated-dirs += $(LOCALES)
$(addprefix $(objpfx),$(CTYPE_FILES)): %: \
gen-locale.sh $(common-objpfx)locale/localedef Makefile \
$(addprefix charmaps/,$(CHARMAPS)) $(addprefix locales/,$(LOCALE_SRCS))
- @$(SHELL) gen-locale.sh $(common-objpfx) '$(built-program-cmd)' $@
+ @$(SHELL) gen-locale.sh $(common-objpfx) '$(built-program-file)' $@
$(addsuffix .out,$(addprefix $(objpfx),$(tests))): %: \
$(addprefix $(objpfx),$(CTYPE_FILES))
@@ -159,11 +159,11 @@ $(objpfx)tst-numeric.out: tst-numeric.sh $(objpfx)tst-numeric tst-numeric.data \
> $@
$(objpfx)tst-locale.out: tst-locale.sh $(common-objpfx)locale/localedef \
$(ld-test-srcs) $(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
+ $(SHELL) $< $(common-objpfx) '$(built-program-file)' > $@
$(objpfx)tst-rpmatch.out: tst-rpmatch.sh $(objpfx)tst-rpmatch \
$(objpfx)tst-fmon.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)' > $@
+ $(SHELL) $< $(common-objpfx) '$(built-program-file)' > $@
$(objpfx)tst-trans.out: tst-trans.sh $(objpfx)tst-trans \
$(addprefix $(objpfx),$(CTYPE_FILES))
$(SHELL) $< $(common-objpfx) '$(run-program-prefix)'
@@ -175,15 +175,15 @@ $(objpfx)tst-mbswcs.out: tst-mbswcs.sh $(objpfx)tst-mbswcs1 \
$(objpfx)tst-ctype.out: tst-ctype.sh $(objpfx)tst-ctype \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-file)'
$(objpfx)tst-wctype.out: tst-wctype.sh $(objpfx)tst-wctype \
$(objpfx)sort-test.out tst-wctype.input \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-file)'
$(objpfx)tst-langinfo.out: tst-langinfo.sh $(objpfx)tst-langinfo \
$(objpfx)sort-test.out \
$(addprefix $(objpfx),$(CTYPE_FILES))
- $(SHELL) $< $(common-objpfx) '$(built-program-cmd)'
+ $(SHELL) $< $(common-objpfx) '$(built-program-file)'
$(objpfx)tst-digits.out: $(objpfx)tst-locale.out
$(objpfx)tst-mbswcs6.out: $(addprefix $(objpfx),$(CTYPE_FILES))
endif
diff --git a/nptl/Makefile b/nptl/Makefile
index 67c2627..02e494f 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -438,7 +438,7 @@ CFLAGS-tst-initializers1-c99.c = $(CFLAGS-tst-initializers1-<)
CFLAGS-tst-initializers1-gnu89.c = $(CFLAGS-tst-initializers1-<)
CFLAGS-tst-initializers1-gnu99.c = $(CFLAGS-tst-initializers1-<)
-tst-cancel7-ARGS = --command "$(built-program-cmd)"
+tst-cancel7-ARGS = --command "$(built-program-file)"
tst-cancelx7-ARGS = $(tst-cancel7-ARGS)
tst-umask1-ARGS = $(objpfx)tst-umask1.temp
@@ -593,7 +593,7 @@ $(objpfx)tst-cancel-wrappers.out: tst-cancel-wrappers.sh
endif
endif
-tst-exec4-ARGS = $(built-program-cmd)
+tst-exec4-ARGS = $(built-program-file)
$(objpfx)tst-execstack: $(libdl)
$(objpfx)tst-execstack.out: $(objpfx)tst-execstack-mod.so
@@ -601,8 +601,8 @@ LDFLAGS-tst-execstack = -Wl,-z,noexecstack
$(objpfx)tst-fini1mod.so: $(shared-thread-library)
-tst-stackguard1-ARGS = --command "$(built-program-cmd) --child"
-tst-stackguard1-static-ARGS = --command "$(objpfx)tst-stackguard1-static --child"
+tst-stackguard1-ARGS = --command "$(built-program-file) --child"
+tst-stackguard1-static-ARGS = $(tst-stackguard1-ARGS)
# The tests here better do not run in parallel
ifneq ($(filter %tests,$(MAKECMDGOALS)),)
diff --git a/rt/Makefile b/rt/Makefile
index 941c471..3f95dd2 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -77,4 +77,4 @@ ifeq (yes,$(build-bounded))
$(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library)
endif
-tst-mqueue7-ARGS = -- $(built-program-cmd)
+tst-mqueue7-ARGS = -- $(built-program-file)
diff --git a/stdio-common/Makefile b/stdio-common/Makefile
index 5e2e48d..050f8bb 100644
--- a/stdio-common/Makefile
+++ b/stdio-common/Makefile
@@ -127,7 +127,7 @@ tst-grouping-ENV = LOCPATH=$(common-objpfx)localedata
CPPFLAGS += $(libio-mtsafe)
$(objpfx)tst-setvbuf1.out: tst-setvbuf1.expect $(objpfx)tst-setvbuf1
- $(built-program-cmd) > $@ 2>&1
+ $(built-program-file) > $@ 2>&1
cmp tst-setvbuf1.expect $@
ifeq ($(build-shared),yes)
diff --git a/string/Makefile b/string/Makefile
index 6f2c6c3..5693be7 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -80,6 +80,6 @@ ifeq ($(cross-compiling),no)
tests: $(objpfx)tst-svc.out
$(objpfx)tst-svc.out: tst-svc.input $(objpfx)tst-svc
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
- $(built-program-cmd) < $(word 1,$^) > $@
+ $(built-program-file) < $(word 1,$^) > $@
@cmp tst-svc.expect $(objpfx)tst-svc.out
endif
diff --git a/timezone/Makefile b/timezone/Makefile
index 9e55a6a..844ee98 100644
--- a/timezone/Makefile
+++ b/timezone/Makefile
@@ -71,7 +71,7 @@ CFLAGS-scheck.c = -Wno-strict-prototypes -DNOID -DHAVE_GETTEXT
testdata = $(objpfx)testdata
define build-testdata
GCONV_PATH=${common-objpfx}iconvdata LANGUAGE=C LC_ALL=C \
- $(built-program-cmd) -d $(testdata) -y ./yearistype $<
+ $(built-program-file) -d $(testdata) -y ./yearistype $<
endef
$(objpfx)test-tz.out: $(addprefix $(testdata)/, America/New_York Etc/UTC UTC)
@@ -84,7 +84,7 @@ $(objpfx)tst-timezone.out: $(addprefix $(testdata)/, \
test-tz-ENV = TZDIR=$(testdata)
tst-timezone-ENV = TZDIR=$(testdata)
-# Note this must come second in the deps list for $(built-program-cmd) to work.
+# Note this must come second in the deps list for $(built-program-file) to work.
zic-deps = $(objpfx)zic $(leapseconds) yearistype
$(testdata)/America/New_York: northamerica $(zic-deps)
--
1.7.11.4