S/390: dl-machine.h: Use numbered labels in inline assembly.

[platform/upstream/glibc.git] / Rules

diff --git a/Rules b/Rules
index e8e1117..4f9cdf3 100644 (file)
--- a/Rules
+++ b/Rules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2013 Free Software Foundation, Inc.
+# Copyright (C) 1991-2014 Free Software Foundation, Inc.
 # This file is part of the GNU C Library.
 
 # The GNU C Library is free software; you can redistribute it and/or
@@ -95,13 +95,24 @@ else
 others: $(addprefix $(objpfx),$(extra-objs))
 endif
 ifeq ($(run-built-tests),no)
-tests: $(addprefix $(objpfx),$(tests) $(test-srcs))
-xtests: tests
+tests: $(addprefix $(objpfx),$(tests) $(test-srcs)) $(tests-special)
+xtests: tests $(xtests-special)
 else
-tests: $(tests:%=$(objpfx)%.out)
-xtests: tests $(xtests:%=$(objpfx)%.out)
+tests: $(tests:%=$(objpfx)%.out) $(tests-special)
+xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-special)
 endif
 
+tests-special-notdir = $(patsubst $(objpfx)%, %, $(tests-special))
+xtests-special-notdir = $(patsubst $(objpfx)%, %, $(xtests-special))
+tests:
+       $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
+         $(sort $(tests) $(tests-special-notdir:.out=)) \
+         > $(objpfx)subdir-tests.sum
+xtests:
+       $(..)scripts/merge-test-results.sh -s $(objpfx) $(subdir) \
+         $(sort $(xtests) $(xtests-special-notdir:.out=)) \
+         > $(objpfx)subdir-xtests.sum
+
 ifeq ($(build-programs),yes)
 binaries-all-notests = $(others) $(sysdep-others)
 binaries-all-tests = $(tests) $(xtests) $(test-srcs)
@@ -180,45 +191,17 @@ ifneq "$(strip $(tests) $(xtests) $(test-srcs))" ""
 # from the test programs and whatever input files are present.
 
 make-test-out = $(test-wrapper-env) \
-               GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+               $(run-program-env) \
                $($*-ENV) $(host-test-program-cmd) $($*-ARGS)
 $(objpfx)%.out: %.input $(objpfx)%
-       $(make-test-out) > $@ < $(word 1,$^)
+       $(make-test-out) > $@ < $(word 1,$^); \
+       $(evaluate-test)
 $(objpfx)%.out: /dev/null $(objpfx)%   # Make it 2nd arg for canned sequence.
-       $(make-test-out) > $@
+       $(make-test-out) > $@; \
+       $(evaluate-test)
 
 endif  # tests
 
-# Build and run benchmark programs.
-binaries-bench := $(addprefix $(objpfx)bench-,$(bench))
-
-run-bench = $(test-wrapper-env) \
-           GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
-           $($*-ENV) $(run-via-rtld-prefix) $${run}
-
-bench: $(binaries-bench)
-       for run in $^; do \
-         echo "Running $${run}"; \
-         $(run-bench) >>  $(objpfx)bench.out-tmp; \
-       done; \
-       if [ -f $(objpfx)bench.out ]; then \
-         mv -f $(objpfx)bench.out $(objpfx)bench.out.old; \
-       fi; \
-       mv -f $(objpfx)bench.out-tmp $(objpfx)bench.out
-
-$(binaries-bench): %: %.o \
-  $(sort $(filter $(common-objpfx)lib%,$(link-libc))) \
-  $(addprefix $(csu-objpfx),start.o) $(+preinit) $(+postinit)
-       $(+link)
-
-$(objpfx)bench-%.c: %-inputs bench-skeleton.c
-       { if [ -n "$($*-INCLUDE)" ]; then \
-         cat $($*-INCLUDE); \
-       fi; \
-       $(..)scripts/bench.pl $(patsubst %-inputs,%,$<) \
-         $($*-ITER) $($*-ARGLIST) $($*-RET); } > $@-tmp
-       mv -f $@-tmp $@
-
 \f
 .PHONY: distclean realclean subdir_distclean subdir_realclean \
        subdir_clean subdir_mostlyclean subdir_testclean