about summary refs log tree commit diff
path: root/benchtests
diff options
context:
space:
mode:
authorZack Weinberg <zackw@panix.com>2017-05-08 15:52:26 -0400
committerZack Weinberg <zackw@panix.com>2017-05-09 07:06:29 -0400
commit2bfdaeddaad93425b93c42ef7a75443b96824942 (patch)
treeba08f29a6a80c64d9327e57a915d39f6e0750cee /benchtests
parent61f4fa7fd71407b56c32e6be5147d84536697569 (diff)
downloadglibc-2bfdaeddaad93425b93c42ef7a75443b96824942.tar.gz
glibc-2bfdaeddaad93425b93c42ef7a75443b96824942.tar.xz
glibc-2bfdaeddaad93425b93c42ef7a75443b96824942.zip
Rename cppflags-iterator.mk to libof-iterator.mk, remove extra-modules.mk.
cppflags-iterator.mk no longer has anything to do with CPPFLAGS; all
it does is set libof-$(foo) for a list of files.  extra-modules.mk
does the same thing, but with a different input variable, and doesn't
let the caller control the module.  Therefore, this patch gives
cppflags-iterator.mk a better name, removes extra-modules.mk, and
updates all uses of both.

	* extra-modules.mk: Delete file.
	* cppflags-iterator.mk: Rename to ...
	* libof-iterator.mk: ...this.  Adjust comments.

	* Makerules, extra-lib.mk, benchtests/Makefile, elf/Makefile
	* elf/rtld-Rules, iconv/Makefile, locale/Makefile, malloc/Makefile
	* nscd/Makefile, sunrpc/Makefile, sysdeps/s390/Makefile:
	Use libof-iterator.mk instead of cppflags-iterator.mk or
	extra-modules.mk.

	* benchtests/strcoll-inputs/filelist#en_US.UTF-8: Remove
	extra-modules.mk and cppflags-iterator.mk, add libof-iterator.mk.
Diffstat (limited to 'benchtests')
-rw-r--r--benchtests/Makefile2
-rw-r--r--benchtests/strcoll-inputs/filelist#en_US.UTF-83
2 files changed, 2 insertions, 3 deletions
diff --git a/benchtests/Makefile b/benchtests/Makefile
index a96e9533b3..7f5fda5ef4 100644
--- a/benchtests/Makefile
+++ b/benchtests/Makefile
@@ -123,7 +123,7 @@ endif
 cpp-srcs-left := $(binaries-benchset:=.c) $(binaries-bench:=.c) \
 		 $(binaries-bench-malloc:=.c)
 lib := nonlib
-include $(patsubst %,$(..)cppflags-iterator.mk,$(cpp-srcs-left))
+include $(patsubst %,$(..)libof-iterator.mk,$(cpp-srcs-left))
 
 bench-extra-objs = json-lib.o
 
diff --git a/benchtests/strcoll-inputs/filelist#en_US.UTF-8 b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
index b7b38017d8..6cee2374f4 100644
--- a/benchtests/strcoll-inputs/filelist#en_US.UTF-8
+++ b/benchtests/strcoll-inputs/filelist#en_US.UTF-8
@@ -9667,7 +9667,6 @@ hr.po
 libc.pot
 ko.po
 ru.po
-extra-modules.mk
 intl
 tst-gettext4-fr.po
 tstcodeset.po
@@ -13252,7 +13251,6 @@ sigset.h
 atomic.h
 utmp.h
 stdlib-bsearch.h
-cppflags-iterator.mk
 iconvdata
 MISSING
 ibm1164.h
@@ -15245,3 +15243,4 @@ w_exp2l.c
 bug-nexttoward.c
 w_dreml.c
 s_nanf.c
+libof-iterator.mk